[gentoo-commits] repo/gentoo:master commit in: dev-java/fop/files/, dev-java/fop/

["Arthur Zamarin" <arthurzam@gentoo.org>]

commit:     c10da10bc5d295f20ed764377f3e1ca63ff77b95
Author:     Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu May  5 16:19:59 2022 +0000
Commit:     Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Mon May  9 17:21:20 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c10da10b

dev-java/fop: drop 2.0-r3

Closes: https://bugs.gentoo.org/834482
Closes: https://bugs.gentoo.org/634744
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>

 dev-java/fop/Manifest                     |   1 -
 dev-java/fop/files/headless-launcher.bash |   1 -
 dev-java/fop/fop-2.0-r3.ebuild            | 129 ------------------------------
 3 files changed, 131 deletions(-)

diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index 27bd73277440..0cbe07fc9d42 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -1,3 +1,2 @@
-DIST fop-2.0-src.zip 26381859 BLAKE2B 8500de6a23e93c14fdb4f27c59bafba27a64e6aaffb7a761f16de5bd523e2fdb83593ab53a66de79bf7b7d6c2b887ab97a34accb18be416b26448753babe2395 SHA512 428793303fcf143cffaecadc22cfdb8a065bad0108cceebcabc479d92dbe9834b4f81fd27f3e0314546d848e1960b2fe1a9d443999d8f336f7e87fce771beb7a
 DIST fop-2.7-jars.tar.xz 7348 BLAKE2B 79a5b4f1948bbc9628e571a9873494e2d2088d7a90296e81e03cafa6ecd8f9d1c8dd6779d15c47a0e110304aa07e706c56412e3766a84e0a66c8224fdd92f61c SHA512 71c39cbb20416dc29beb8628ae8bac2a663c0b0d1f0418a241f3795a2d5e01159572c210b5a2d2eff8274247dc3631980de50fea4f94182ddde095d0e5e605c6
 DIST fop-2.7-src.tar.gz 26799877 BLAKE2B 00bcbd4cc915aad67c0dac54e85b7c5d10576115a0a8a16517846af249137c73b10c8b0ff161c9957f7c49686eefbf9777dc452b038573c996e29cbad951176a SHA512 bffbc0a97db8bbc826cf9af89fbf4a7e6f705585ea4915c0954df57c6d7af50d323387bb4bb9e2d13047826352d9eb7cbf4f23d5146ce246965b4c531e015633

diff --git a/dev-java/fop/files/headless-launcher.bash b/dev-java/fop/files/headless-launcher.bash
deleted file mode 100644
index a01c56f5e6ef..000000000000
--- a/dev-java/fop/files/headless-launcher.bash
+++ /dev/null
@@ -1 +0,0 @@
-[[ "${!#}" = "-awt" ]] || gjl_java_args="-Djava.awt.headless=true"

diff --git a/dev-java/fop/fop-2.0-r3.ebuild b/dev-java/fop/fop-2.0-r3.ebuild
deleted file mode 100644
index 6265183f67ad..000000000000
--- a/dev-java/fop/fop-2.0-r3.ebuild
+++ /dev/null
@@ -1,129 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# TODO: if 'doc' use flag is used then should build also extra docs ('docs' ant target), currently it cannot
-#       be built as it needs forrest which we do not have
-# TODO: package and use optional dependency jeuclid
-
-EAPI="5"
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="Formatting Objects Processor is a print formatter driven by XSL"
-HOMEPAGE="https://xmlgraphics.apache.org/fop/"
-SRC_URI="mirror://apache/xmlgraphics/${PN}/source/${P}-src.zip"
-
-KEYWORDS="amd64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
-LICENSE="Apache-2.0"
-SLOT="0"
-
-# Tests are broken even in 2.0
-RESTRICT="test"
-
-CDEPEND="
-	dev-java/batik:1.9
-	dev-java/ant-core:0
-	dev-java/fontbox:1.7
-	dev-java/commons-io:1
-	dev-java/commons-logging:0
-	java-virtuals/servlet-api:3.0
-	dev-java/avalon-framework:4.2
-	dev-java/xmlgraphics-commons:2
-	dev-java/xml-commons-external:1.3
-	dev-java/qdox:1.12"
-
-RDEPEND=">=virtual/jre-1.6
-	${CDEPEND}"
-
-DEPEND=">=virtual/jdk-1.6
-	app-arch/unzip
-	${CDEPEND}"
-
-#	test? (
-#		dev-java/ant-junit:0
-#		dev-java/junit:4
-#		dev-java/xmlunit:1
-#		dev-java/mockito:0
-#	)"
-
-JAVA_ANT_ENCODING="ISO-8859-1"
-JAVA_ANT_REWRITE_CLASSPATH="true"
-
-EANT_GENTOO_CLASSPATH="
-	ant-core
-	batik-1.9
-	fontbox-1.7
-	commons-io-1
-	commons-logging
-	servlet-api-3.0
-	avalon-framework-4.2
-	xmlgraphics-commons-2
-	xml-commons-external-1.3
-"
-
-TARGETS=(
-	resourcegen
-	jar-hyphenation
-	jar-sandbox
-	jar-main
-)
-
-java_prepare() {
-	find "${S}"/lib -type f | xargs rm -v
-}
-
-src_compile() {
-	# https://bugs.gentoo.org/show_bug.cgi?id=554386
-	# http://wiki.apache.org/xmlgraphics-fop/HowTo/BuildFOPAlternatively
-	java-pkg_jar-from --into lib qdox-1.12 qdox.jar
-	java-pkg_jar-from --into lib xmlgraphics-commons-2 xmlgraphics-commons.jar
-	java-pkg_jar-from --into lib commons-logging commons-logging.jar
-	java-pkg_jar-from --into lib commons-io-1 commons-io.jar
-	java-pkg_jar-from --into lib fontbox-1.7 fontbox.jar
-	java-pkg_jar-from --into lib xml-commons-external-1.3 xml-apis-ext.jar
-	java-pkg_jar-from --into lib xml-commons-external-1.3 xml-apis.jar
-	java-pkg_jar-from --into lib avalon-framework-4.2 avalon-framework.jar
-	java-pkg_jar-from --virtual --into lib servlet-api-3.0 servlet-api.jar
-
-	for target in ${TARGETS[@]}; do
-		EANT_BUILD_TARGET="${target}" \
-			java-pkg-2_src_compile
-	done
-
-	if use doc; then
-		sed -i -e 's/failonerror=\"true\"/failonerror=\"false\"/;' ./build.xml
-		EANT_BUILD_TARGET="javadocs" \
-			java-pkg-2_src_compile
-	fi
-}
-
-src_install() {
-	java-pkg_dojar \
-		build/${PN}.jar \
-		build/${PN}-sandbox.jar \
-		build/${PN}-hyph.jar
-
-	java-pkg_dolauncher \
-		${PN} --main org.apache.fop.cli.Main \
-		-pre "${FILESDIR}/headless-launcher.bash"
-
-	dodoc NOTICE README
-
-	if use doc; then
-		java-pkg_dojavadoc \
-			build/javadocs
-	fi
-
-	if use examples; then
-		java-pkg_doexamples \
-			examples/* conf
-	fi
-
-	if use source; then
-		java-pkg_dosrc \
-			src/java/org \
-			src/sandbox/org
-	fi
-}