Set SLOT back to 0. Create launcher using PN instead of PN-SLOT. Fix bug 555144.

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, 144 insertions, 9 deletions

diff --git a/dev-java/fop/ChangeLog b/dev-java/fop/ChangeLog
index 60685f520958..a18ccf76cf73 100644
--- a/dev-java/fop/ChangeLog
+++ b/dev-java/fop/ChangeLog
@@ -1,6 +1,12 @@
 # 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.84 2015/07/11 17:58:30 monsieurp Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.85 2015/07/17 12:58:54 monsieurp Exp $
+
+*fop-2.0-r1 (17 Jul 2015)
+
+  17 Jul 2015; Patrice Clement <monsieurp@gentoo.org> +fop-2.0-r1.ebuild:
+  Set SLOT back to 0. Create launcher using PN instead of PN-SLOT. Fix bug
+  555144.
 
   11 Jul 2015; Patrice Clement <monsieurp@gentoo.org>
   -files/fop-2.0-build.xml.patch, fop-2.0.ebuild:
diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index 754e0d64a455..2eebf97e56a2 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -2,17 +2,18 @@
 Hash: SHA256
 
 DIST fop-2.0-src.zip 26381859 SHA256 70da9622ce25891d989b8ab25692738c5dd6eb2de6ee9b9300d5487f0378d2ec SHA512 428793303fcf143cffaecadc22cfdb8a065bad0108cceebcabc479d92dbe9834b4f81fd27f3e0314546d848e1960b2fe1a9d443999d8f336f7e87fce771beb7a WHIRLPOOL cfd0ec06fba6fe089fb0bea803668e8c89f80eddd198efda20573274ea0cfa750248f12b50827ab89571a4923f51b307d241ff0a4f236cf4a6e28ea49c8d1ac7
+EBUILD fop-2.0-r1.ebuild 3142 SHA256 760c98d9d46234905d3835b8c88375ad71bd2dbfa4cb48c5efb1b96605010944 SHA512 f13fe01c893530d03acf2c946e270dcc40b9bd88c78cc6a59dd6cafaf7b93a6a046f945b2c7db5d807d528a30148db1cc7a8c27d1a751c6429f6cb54def2b99e WHIRLPOOL fbefb78b4ffb2f74212cd6e0ad16f7c7888f9174caf111cb7fd06b0c41e09745c7ffde485d4b13d563047138e6a3ad5d43170033f0a01fa1c412c0a17695d1c5
 EBUILD fop-2.0.ebuild 3216 SHA256 3f55783eeca74cef988d75e630a0947584c29d2d37d0c4e8adb5a651454d169c SHA512 5659a896ab0e9ad9bf5e94614ad07f1726a739ac6bf1e79b6698247ae5c52f19acc68d4f4554e0619dae5744a8018c74de5b7f81651bf2eb7e2be2c2236a51b6 WHIRLPOOL e6200c170a716187e24404a6628f4d188d40bb7e18cd7189622c067ebfe160c4d9d75dda11cd80d17f7693e9a9b0dac912563ccffd08b333a00052efbd4dbd38
-MISC ChangeLog 11072 SHA256 d210e5e84ecb7beb165ad11405062646dac61a2137b1c6b7a258bfd36c029fb6 SHA512 dfc4b656b39cc3f2c931a478baa86cbfa1c208a07eb6e5bec62a1d7de01f258463136fbcdf746ade3011cd2994a0085bfaae1fdb8ca3973ee6e9219c54241dd2 WHIRLPOOL 8b2fe4faaf09136643b7506380ffc201136517bb923094c9a9c0e16825f2b5d63dfda08e8e0ba32f0f4a44cf1efe451cf863041ad9fcae6eceed27502a36db5f
+MISC ChangeLog 11259 SHA256 75d43f687b344b33fdb82dac20628b0c8133fb03f1b0fe9486c829367ce0844c SHA512 93cc792047095ef04dfcf1009bf84ea8340bef160538a8cd3c1a67e9feeef35c7b9822365dd9496ad6d6acc1d2077b6ca1afda1ea8d5010cbd5bf073182e99d9 WHIRLPOOL 3317b97036381b4dc3f27d3f156d0149519e6745474be2258a142071365433243077908232385f5331b9933121fa5c34b52ade75d0798e3c953d7e550a5ebcae
 MISC metadata.xml 159 SHA256 a4ced33e98b00e3a3f725c4c40ef8e76c338db53389465ef871105fbe6e8cbbb SHA512 74dc9ada199a90543b8e1c168c7054f2e973fbfa2551e2b959d67501f2538e269cfb4b2f0905a88a1afa04c20b33961336310ba876f80d47c8e7615b2d7c830a WHIRLPOOL a0ac49efeca233ec4d8f63eb69c8e46e1d4ecbd926693c25b1b8c7415e4c565680936aec46f0c4197116fd7a19a3bb571beee493c18bdae1e5e978e3db84f17a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJVoWemAAoJEJGRpfGTSRu4HmUH/0K+JChizUyflPS8Z7vKlIpP
-oFG2b04vmiXqlVoc3zXk+bnFluSqz1XFi7Q9bqohl59ZaIP9hs5tglEJClIHmRpd
-/F9IbzaWTjImhLfn5mcXIlPh8YCM7dKvEjIOu/nGZbPKlsqjd8X9m6K5RVvyJNbC
-gNFmNJgkQ4CdjG2YTXR/nIq1q+SSsIqyzyxacmG5XgARL1I2ciDCNIMhbNGi8B1h
-zLxvCEA7bP+yYamJ13tZkS83f/L46TDo4eGgpdxxCgruy/b7Q0OP3uv+y8O9EzX9
-R+mJTdI70RNtEWpnDpTJbA6rXGXb3Qgsaf2ayFDwcwz2QAuo7zLNxXnFBZlvJlA=
-=SwGl
+iQEcBAEBCAAGBQJVqQpgAAoJEJGRpfGTSRu4Se0IAJ3GCpC1XAh5mDPeH+mymvKb
+SE9aAUt1+mZKtPk/jZhYZWCCcx5F2mkn2JPDxDgQu3LoCKfXwey3Xgl6ZYCDta5X
+1u8R7EmxvwAf0JpO0FHS95/Y2E73TTA8v5MVEKEd9uEsQQJJe344yeE6xC6PEVZr
+bOi1GdatK8tVgTH6gTKw8h2DsLmPgi/Hqh08Ume8iK+X9I0rJttyh3Xnpa3B4A2b
+INGPEm7j+D39/PZSmes47zf7wT8EXr0kYxeOzBQc7sFiMkpIxJBnJSIV3dqDTR6z
+ciojdVyqUFcRB1OVA/gNnZ/+UIIkd16to5Yb94fHYyu6UWujCtBuQmP+QXbgRLw=
+=YQKR
 -----END PGP SIGNATURE-----
diff --git a/dev-java/fop/fop-2.0-r1.ebuild b/dev-java/fop/fop-2.0-r1.ebuild
new file mode 100644
index 000000000000..af05b6e0764f
--- /dev/null
+++ b/dev-java/fop/fop-2.0-r1.ebuild
@@ -0,0 +1,128 @@
+# 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-r1.ebuild,v 1.1 2015/07/17 12:58:54 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="0"
+IUSE=""
+
+# 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
+
+	java-pkg_dolauncher ${PN} --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
+}