Remove old.

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>
Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x93491BB8

3 files changed, 12 insertions, 141 deletions

diff --git a/dev-java/fop/ChangeLog b/dev-java/fop/ChangeLog
index 4e57cb27c556..5d297ad2a6eb 100644
--- a/dev-java/fop/ChangeLog
+++ b/dev-java/fop/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/fop
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.86 2015/07/19 08:33:32 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.87 2015/07/22 14:11:36 monsieurp Exp $
+
+  22 Jul 2015; Patrice Clement <monsieurp@gentoo.org> -fop-2.0.ebuild:
+  Remove old.
 
   19 Jul 2015; Patrice Clement <monsieurp@gentoo.org> fop-2.0-r1.ebuild:
   Stable for amd64. Stable for ppc+ppc64+x86 with ALLARCHES. Fix bug 555326.
diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index c43d4710923e..8298d327b69f 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -3,17 +3,16 @@ Hash: SHA256
 
 DIST fop-2.0-src.zip 26381859 SHA256 70da9622ce25891d989b8ab25692738c5dd6eb2de6ee9b9300d5487f0378d2ec SHA512 428793303fcf143cffaecadc22cfdb8a065bad0108cceebcabc479d92dbe9834b4f81fd27f3e0314546d848e1960b2fe1a9d443999d8f336f7e87fce771beb7a WHIRLPOOL cfd0ec06fba6fe089fb0bea803668e8c89f80eddd198efda20573274ea0cfa750248f12b50827ab89571a4923f51b307d241ff0a4f236cf4a6e28ea49c8d1ac7
 EBUILD fop-2.0-r1.ebuild 3138 SHA256 9ed99ee400e0a7ac4bb3dac85e512c10ebf2ec736ee4817fda3bddfe9f936338 SHA512 984f53b4fff8bff076e7632b640040577f237cf24d6efbc43f741735f1d50a3e349719944d3d8c0ddcf406fd15dc41f17907bf86861cda7a38e4067bceda61d7 WHIRLPOOL d85296a3d2adfd6f549036ee743f7ec235ff1108b84d48e0304846b6e3d578096942e498763b8b6ae46df7e248f8af8e958e8a68af0b86bc98805f39871794b8
-EBUILD fop-2.0.ebuild 3216 SHA256 3f55783eeca74cef988d75e630a0947584c29d2d37d0c4e8adb5a651454d169c SHA512 5659a896ab0e9ad9bf5e94614ad07f1726a739ac6bf1e79b6698247ae5c52f19acc68d4f4554e0619dae5744a8018c74de5b7f81651bf2eb7e2be2c2236a51b6 WHIRLPOOL e6200c170a716187e24404a6628f4d188d40bb7e18cd7189622c067ebfe160c4d9d75dda11cd80d17f7693e9a9b0dac912563ccffd08b333a00052efbd4dbd38
-MISC ChangeLog 11410 SHA256 87fc8e8f8ab1812e5850451cc46700bb3d65e4c1a4cbf768c0d79722398ca3da SHA512 e41f8a7550558181ac647afef1b1356ecb3e03d99b1b4ed229b84661cc919a27d406062d902db0d47aa7d122671a7ec305e365b0e967a7cf98bbe61be2b5900c WHIRLPOOL 562296e77ee00efdf49ccae735d2126808a9e1cb083dc05aa247fb9c89d0e0687802fe6399f70c3b7d89aecae8d9e45d3b0b8d1248c61144d6ac16ef287bd30e
+MISC ChangeLog 11496 SHA256 d8a6ae1439146b760f5086667b69ac8a5982fdaced5dee57fc7f37c5e48720fc SHA512 e3419f68bc302d6cc3fb77d9f39f99bbaba656b361aad14add3bbc92001087ffd3ab2789efb3e7bcd59b125df16e95911778c7c20b65b3d393cf84bd0cad6e9a WHIRLPOOL 27413d61ba3cd257e87ecd2a3e1c17ee3f857af23259ffac5f412b7c18145e737f94069cf9d345c7ee9d0f1021fe9865b9b13c385b4a2193091479a50266213e
 MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVq28qAAoJEJGRpfGTSRu4bvwH/1/OVuzBHjeqUTygfhR3qp90
-BkW4YQ4tNd3Ya9jvxnLVMbxvD+O2xrcV+GdtscO/SdE45QcdhmgkKT8oMdCFF0m2
-N0ejfEseVmuWN6gSMUZfA+7bu6e7CIRUKD855AI+MG11v92ACnn4tL78CrO2ynnU
-zD0/usvH3iZjN7eqH0E4oi2487C3g9F0RHGE0Lt6fPxAfdcRM/t1AjKsecE/uXY8
-CjW3yYiwoDyVDLv7l4UjU9p4y6HAbvY2xJOZH0a9V4bghx1oQidoepWg8hGl3PnO
-hq+ERuTXEKwWnv5z8nDno9pJ5P2/wNq3UU7VvRzaLTY69Fvf6n8VTvfItjQE8Gg=
-=Qc+a
+iQEcBAEBCAAGBQJVr7LhAAoJEJGRpfGTSRu4e58IAK16t8Ekj1tQP+MLjN6eNMCJ
+8impGptkqklPBmUHz4idQJLzVZIjPY/+aTNMkkzkEY5OQmuwlNYhAg1L2Ydx+9tU
+tWaeAeOiEEhmIRwUmjY0/+Sg1fgwiAauyzwWYToUDeBY7JnUrHyiTHdVNZxuWQLm
+Xx7GgLH2CZmdjhXqd3mvnx21wWNyomC2QLSPDGr3mpHp/IZG4N8KfVDZonLREy32
+iZEQSQRnQhtgamY8wRZrghicqMP9MG5kuvBV9siu845JDwMc+2/r9aNNz6QO+t8z
+uYrR0PkVajkrh64AoA6mo3ug45SOwn6gkxxhZkQLf2Xvn8VNo6p7TLdid1SjYM8=
+=bArT
 -----END PGP SIGNATURE-----
diff --git a/dev-java/fop/fop-2.0.ebuild b/dev-java/fop/fop-2.0.ebuild
deleted file mode 100644
index 73c6483a1a97..000000000000
--- a/dev-java/fop/fop-2.0.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-2.0.ebuild,v 1.11 2015/07/11 17:58:30 monsieurp Exp $
-
-# 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 eutils java-pkg-2 java-ant-2
-
-DESCRIPTION="Formatting Objects Processor is a print formatter driven by XSL"
-HOMEPAGE="http://xmlgraphics.apache.org/fop/"
-SRC_URI="mirror://apache/xmlgraphics/${PN}/source/${P}-src.zip"
-
-KEYWORDS="amd64 x86 ppc ppc64 ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
-LICENSE="Apache-2.0"
-SLOT="2"
-IUSE=""
-
-MY_P="${PN}-${SLOT}"
-
-# Tests are broken even in 2.0
-RESTRICT="test"
-
-CDEPEND="dev-java/batik:1.8
-	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.8
-	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
-
-	# Doesn't support everything upstream launcher does...
-	java-pkg_dolauncher ${MY_P} --main org.apache.fop.cli.Main
-
-	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
-}