From 238189f296a7448edb5b6fba928d845785238318 Mon Sep 17 00:00:00 2001
From: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Date: Wed, 22 Jun 2022 23:46:20 +0200
Subject: Revert "merge"

This commit was not ready and was pushed accidentally

This reverts commit da0f2620f74ece0808593d8eaabce84c9e1831d1.

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
---
 libre/java-commons-io/PKGBUILD          | 26 ++++----------------------
 libre/java-xmlgraphics-commons/PKGBUILD |  2 +-
 2 files changed, 5 insertions(+), 23 deletions(-)

diff --git a/libre/java-commons-io/PKGBUILD b/libre/java-commons-io/PKGBUILD
index ebe9b4147..74258d0f3 100644
--- a/libre/java-commons-io/PKGBUILD
+++ b/libre/java-commons-io/PKGBUILD
@@ -5,7 +5,7 @@
 
 _pkgname=commons-io
 pkgname=java-${_pkgname}
-pkgver=2.11.0
+pkgver=2.5
 pkgrel=1.parabola1
 pkgdesc="IO related classes for Java."
 arch=('any')
@@ -13,30 +13,12 @@ url="https://commons.apache.org/io/"
 license=('APACHE')
 depends=('java-runtime')
 makedepends=('apache-ant' 'jh')
-source=("https://archive.apache.org/dist/commons/io/source/${_pkgname}-${pkgver}-src.tar.gz"{,.asc})
-sha256sums=('5a55361cf2b97228f94b3c65e3a4af784581debe322be551c44b2776db1c6483'
-            'SKIP')
-sha512sums=('e2ab8ebc9c328093a460f8f5f96c80bb45f5073ec7aaa0beabdcdeac2e97324292eab2e2cb8b64d8e78b2c5d89048ba84e50daa0965dffcbe2fd0da7ab789ee3'
-            'SKIP')
-validpgpkeys=('2DB4F1EF0FA761ECC4EA935C86FDC7E2A11262CB') # Gary David Gregory (Code signing key) <ggregory@apache.org>
-prepare() {
-  cd "${srcdir}/${_pkgname}-${pkgver}-src"
-  mkdir -p build/classes
-}
+source=("https://archive.apache.org/dist/commons/io/source/${_pkgname}-${pkgver}-src.tar.gz")
+sha256sums=('631f75ea09870b40bb140dff456a36be6965619ba51fa23f4c7d4b966520be60')
 
 build() {
   cd "${srcdir}/${_pkgname}-${pkgver}-src"
-  # ant jar javadoc -Dcomponent.version=${pkgver}
-
-  CLASSPATH="/usr/share/java/junit.jar"
-  javac -cp "${CLASSPATH}" -d "build/classes" -encoding UTF-8 \
-    $(find "src" -name \*.java)
-
-
-  # javadoc -classpath $CLASSPATH -d "build/javadoc" \
-  #   -sourcepath "src" -subpackages org
-
-  # jar -cvf "${pkgname}.jar" -C "build/classes" .
+  ant jar javadoc -Dcomponent.version=${pkgver}
 }
 
 package() {
diff --git a/libre/java-xmlgraphics-commons/PKGBUILD b/libre/java-xmlgraphics-commons/PKGBUILD
index 078f0d8a7..44406cf9b 100644
--- a/libre/java-xmlgraphics-commons/PKGBUILD
+++ b/libre/java-xmlgraphics-commons/PKGBUILD
@@ -12,7 +12,7 @@ depends=('java-runtime')
 makedepends=('java-commons-io' 'java-commons-logging' 'java-environment' 'jh')
 source=("https://archive.apache.org/dist/xmlgraphics/commons/source/${_libname}-${pkgver}-src.tar.gz"{,.asc})
 sha512sums=('7d3993fc920767512f94edef3342757f0ffc9c9dbad80695fe3d77b0ec162380d9b467682ae41238e7ee719601709edb41b2dab06c385dfd9fa898577d8d2c22'
-           'SKIP')
+            'SKIP')
 validpgpkeys=('5C9A30FF22B2C02F30261C305B93F1DF7CDB6DEA') # Simon Steiner (CODE SIGNING KEY) <ssteiner@apache.org>
 
 prepare() {
-- 
cgit v1.2.3