From 3e5f817d054d48436eae2515dac808dd4fce0126 Mon Sep 17 00:00:00 2001
From: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
Date: Wed, 22 Jun 2022 23:47:41 +0200
Subject: Revert "[wip] libre: fop: update to 2.7"

This reverts commit 647ba3ab648c010ad8c2e6d18a07c0e260381ca8.

This commit was not ready and was pushed accidentally

Signed-off-by: Denis 'GNUtoo' Carikli <GNUtoo@cyberdimension.org>
---
 libre/fop/PKGBUILD | 24 ++++++++++--------------
 1 file changed, 10 insertions(+), 14 deletions(-)

diff --git a/libre/fop/PKGBUILD b/libre/fop/PKGBUILD
index 67b4743c6..cafd7fc36 100644
--- a/libre/fop/PKGBUILD
+++ b/libre/fop/PKGBUILD
@@ -4,24 +4,19 @@
 # Maintainer: Omar Vega Ramos <ovruni@gnu.org.pe>
 
 pkgname=fop
-pkgver=2.7
+pkgver=2.2
 pkgrel=1.parabola1
 pkgdesc='XSL-FO implementation in Java.'
 arch=('any')
 url='http://xmlgraphics.apache.org/fop/'
 license=('APACHE')
 depends=('java-xmlgraphics-commons' 'java-commons-logging' 'java-commons-io' 'java-batik'
-         'java-qdox' 'fontbox' 'tomcat8')
+         'java-avalon-framework' 'java-qdox' 'fontbox' 'tomcat8')
 makedepends=('apache-ant' 'jh')
-source=("https://dlcdn.apache.org/xmlgraphics/${pkgname}/source/${pkgname}-${pkgver}-src.tar.gz"{,.asc}
+source=("http://ftp-stud.hs-esslingen.de/pub/Mirrors/ftp.apache.org/dist/xmlgraphics/$pkgname/source/$pkgname-$pkgver-src.tar.gz"
         'fop.conf')
-sha256sums=('b4f1a5212989cebc7d17c7275fbd23de73cc57259d9288c01436556254ad86d4'
-            'SKIP'
+sha256sums=('5052fef87fc4b888bd49d29bf626255c9d3443b628f21393c11ea121d44a6552'
             'd2900605dc271f5938d0820ca30bdec8060724976b56e43d827157bd6975da96')
-sha512sums=('bffbc0a97db8bbc826cf9af89fbf4a7e6f705585ea4915c0954df57c6d7af50d323387bb4bb9e2d13047826352d9eb7cbf4f23d5146ce246965b4c531e015633'
-            'SKIP'
-            'dc180d2c36ef6843405238b41093b80d5b6088828f7e2bb2eb716102d7452d2cc8c6abe5abfd94e4fce9531202440e932250c80debb042a9bb51fa205c1df858')
-validpgpkeys=('5C9A30FF22B2C02F30261C305B93F1DF7CDB6DEA') # Simon Steiner
 backup=('etc/fop.conf')
 
 prepare() {
@@ -35,15 +30,16 @@ prepare() {
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   ant -f "$pkgname/build.xml" package \
-    -lib /usr/share/java/commons-io.jar \
-    -lib /usr/share/java/commons-logging.jar \
-    -lib /usr/share/java/fontbox.jar \
     -lib /usr/share/java/serializer.jar \
-    -lib /usr/share/java/xml-apis-ext.jar \
     -lib /usr/share/java/xmlgraphics-commons.jar \
+    -lib /usr/share/java/avalon-framework-api.jar \
+    -lib /usr/share/java/avalon-framework-impl.jar \
+    -lib /usr/share/java/commons-io.jar \
     -lib /usr/share/java/batik/batik-all.jar \
     -lib /usr/share/java/batik/batik-libs.jar \
-    -lib /usr/share/java/tomcat8/servlet-api.jar
+    -lib /usr/share/java/tomcat8/servlet-api.jar \
+    -lib /usr/share/java/xml-apis-ext.jar \
+    -lib /usr/share/java/fontbox.jar
 }
 
 package() {
-- 
cgit v1.2.3