Version bump. Fix bug 551966.

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, 134 insertions, 6 deletions

diff --git a/dev-java/fop/ChangeLog b/dev-java/fop/ChangeLog
index b90909687420..242b649ee399 100644
--- a/dev-java/fop/ChangeLog
+++ b/dev-java/fop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/fop
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.71 2014/08/10 20:13:16 slyfox Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.72 2015/06/26 23:05:10 monsieurp Exp $
+
+*fop-2.0 (27 Jun 2015)
+
+  27 Jun 2015; Patrice Clement <monsieurp@gentoo.org> +fop-2.0.ebuild:
+  Version bump. Fix bug 551966.
 
   10 Aug 2014; Sergei Trofimovich <slyfox@gentoo.org> fop-1.1.ebuild:
   QA: drop trailing '.' from DESCRIPTION
diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index a84f073f5e10..97775a0e0382 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -3,14 +3,20 @@ Hash: SHA256
 
 DIST fop-0.95-src.zip 15153053 SHA256 690e4dd4a4b6fdf5b18469bf6768115fb5d444c3253bba47e69b0079a739e32a SHA512 8b40796cc0c5038197a01b4dbdef1efe6158954fe3486658a554113ad2a54196e8eb6530844669cb18ef948cd859b5ec4221fb299a19b537892f15cb01054e79 WHIRLPOOL dced6b252073622cf1ee92d216da280a2f67164779b45a1125ff65a7d856e2cb688b5623edd27742ad68cda0ead1758b8acd473ae2ef196bb469bd3c597f8c3a
 DIST fop-1.1-src.zip 27577477 SHA256 0886058bcb076899d9c46f65491eaa9b7144c1c632425feb29fbbc30194ccddb SHA512 bda305b0b94c02bca3a39130080b13fd1391d8ef84f6e9b31adf7279fb9434a65910c51b146b5e0844cff921c0fd2a5786f7e479b29f59cc4c729c2f50bb37a1 WHIRLPOOL 1ddb58d0e822a18ad78c4140d45e9773819a73f9e2a0d8d39026a717ceaed3c60c308cb041e33ed8dbd9ffd2bb6ccdd29d1413eeb312150266c5ad9cf094176f
+DIST fop-2.0-src.zip 26381859 SHA256 70da9622ce25891d989b8ab25692738c5dd6eb2de6ee9b9300d5487f0378d2ec SHA512 428793303fcf143cffaecadc22cfdb8a065bad0108cceebcabc479d92dbe9834b4f81fd27f3e0314546d848e1960b2fe1a9d443999d8f336f7e87fce771beb7a WHIRLPOOL cfd0ec06fba6fe089fb0bea803668e8c89f80eddd198efda20573274ea0cfa750248f12b50827ab89571a4923f51b307d241ff0a4f236cf4a6e28ea49c8d1ac7
 EBUILD fop-0.95.ebuild 3593 SHA256 7bf4dce4d8ae354898f501c562b3bfc414e745370932c26d77b3f57b280cb74e SHA512 bcf51ee7e636b2fa205b500d7c12bfaee515f3d0f48aa6ab6430ac6eec3b1678b717498b1bd716f1e36495015fc207b759dda86d2bb37728a584f5b99bf2ed07 WHIRLPOOL 4cc1c97e7df37138bebbf7e555cd4b24e70792f5aa66c778b137c014bc747c50d8e85896787a78b5d5f6d87a16d1bf1326e057a6d22e703057714bced635ac92
 EBUILD fop-1.1.ebuild 2871 SHA256 add24441393c6f689174a19dbf7ccb0add48861342aac2b77c89f6b4750ffdee SHA512 036957655d1c392c9bec7b1c0201250aae0d50a7f1e92b8837ea241cf760ab6f2f1f6eef360db14d74af9582242c0839fd338262862060277fa395f18c37052a WHIRLPOOL 6346d77c829c8ba4d41b8ebead585075d064ae377ba09e903041ec1f14d69a6c475c1a7fdb745fe8411e45aed9b8b41ddd7b6601b4563048671809c10fc6b20e
-MISC ChangeLog 9150 SHA256 200af1c6f161129c296a9b0575bd67992c54bbb23af340a2e9c5e562614fea4a SHA512 4d08622ee7930aa07011f700ed93adad80fc8bd8675b1925d49b45a0e862cdc7fa7be01dd713d0de27c28133aa012627fdfdc3f4a127ef2b2fde17d88a184e17 WHIRLPOOL c68e6fc06b8d2f53619c9bca2b6d242ac5536964548a10e559ed78f8300b04526b0f1ecd00d1d23024ff62ae806e8c1e156bf24b1d34dadf5e4fcd7df3f419d0
+EBUILD fop-2.0.ebuild 3007 SHA256 a7293c0b19babc293a0d6f83d21bcf8974fa8a3902016ec371fa1c9e5bb62dba SHA512 31e72c842d17981f0990cbb3a6cf635127b4a69373409f3b196d713e6f60a0e3ed62e1ddd2e63c1e6c9729dc2f731af2f63de529af16a28a5f9e6ba812669ff6 WHIRLPOOL b9e1036b9170cbde9847f2cdd93f6bd38988dd2c0e79f33109b11438031bc229267148c0a917c4e5c0687e3e1fbecc1e028b33614a95e2aabb47047f376e243b
+MISC ChangeLog 9281 SHA256 15d80debc8ce88c3303812bd02e5526be1b76f2fb005664a1865cc56f79575c5 SHA512 f305b383632eeebcd23765ee9580143a4bc3b13edd032790478a7152da288b100a2a5917f9dcb0ab0acaec2d51f307b3135c19693880afcdd84b8c4135370117 WHIRLPOOL a7440313aa2a543ff17ba259d794b96fbe0178ad64fce95785bd8e82c20797a155353254f48a8245fcf4548bdff47f4d26242bb2202811462af8f520c3850f7e
 MISC metadata.xml 427 SHA256 0b6fb333d87a73eff05b69a66715578f1853ed64584307dcaee983ea627af25a SHA512 8159585ad34a54a6d67ffe9e6803befbc2eae42ecde0c03f450c7f877675b0ddee4805c43a6aeec9df8e1e05329b1b7f08ccea836fb90025623fabd4a2d14778 WHIRLPOOL 386b9e1d7460698bce806b89fb65a029aef49a6bc050fd289d3c5ae48f65502eb3d70d107f3a7099ed04fa78cd5bd686912563ce616dc321654edaa767c83ada
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlPn0l0ACgkQcaHudmEf86qsugCfWlxqYtdhGJZl5fezlj3RpZOi
-eYEAn2kWSoYmVxAOnhI81uPpakQi8Ler
-=xX91
+iQEcBAEBCAAGBQJVjekhAAoJEJGRpfGTSRu4klgH/1jIDORxYnW0u5ni8JWTjpQd
+t8eUCgjNWAiTfGuTgtAMLekN5PGiRSAFziMGM1n6zRBMjvnacjpJHOQ7GDDowve0
+WKKl1eSNCo/R6OFgMQqWzzSPO6C+Ws1UUNLqaGIB2YjU/0/9qaErgLY47kc+Z3in
+4+yScTG32nAGTlmK1cxJzBe9Y+Tltwb3UqYodCXnCFJr1fueMrazCwFkeUcN8Hr2
+iudH3pQauAFrU8gvcVL2h/KENheuPOZ4+Dmvz9Dni7l5wImiaUAxFebF/jNfXy56
+L++zkR7H5E5FxBIK7WtLH6VidtFb9iEHw73YQtMw8jsEM+fq/BJW36K6zWcHvLw=
+=DQue
 -----END PGP SIGNATURE-----
diff --git a/dev-java/fop/fop-2.0.ebuild b/dev-java/fop/fop-2.0.ebuild
new file mode 100644
index 000000000000..0542d803345b
--- /dev/null
+++ b/dev-java/fop/fop-2.0.ebuild
@@ -0,0 +1,117 @@
+# 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.1 2015/06/26 23:05:10 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"
+WANT_ANT_TASKS="ant-trax"
+
+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 ~amd64-linux ~ppc-macos ~sparc-solaris ~x86-linux ~x86-macos ~x86-solaris"
+IUSE="hyphenation jai"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+# Doesn't work with java.awt.headless, requires Mockito.
+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
+	jai? ( dev-java/sun-jai-bin:0 )"
+
+RDEPEND=">=virtual/jre-1.6
+	${CDEPEND}"
+
+DEPEND=">=virtual/jdk-1.6
+	dev-java/qdox:1.12
+	hyphenation? ( dev-java/offo-hyphenation:0 )
+	app-arch/unzip
+	${CDEPEND}
+	test? (
+		dev-java/ant-junit:0
+		dev-java/junit:4
+		dev-java/xmlunit:1
+		dev-java/mockito:0
+	)"
+
+java_prepare() {
+	find "${S}" -name '*.jar' -print -delete || die
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+EANT_DOC_TARGET="javadocs"
+EANT_BUILD_TARGET="package"
+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
+"
+
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH}
+	mockito
+	junit-4
+	xmlunit-1
+"
+
+EANT_EXTRA_ARGS="-Djce.present=true"
+EANT_DOC_TARGET="javadocs"
+EANT_TEST_TARGET="junit"
+#EANT_TEST_EXTRA_ARGS="-Djunit.present=true -Dxmlunit.present=true"
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+="$(java-pkg_getjars --build-only qdox-1.12)"
+
+	use jai && EANT_EXTRA_ARGS+=" -Djai.present=true" && EANT_GENTOO_CLASSPATH+=",sun-jai-bin"
+	use hyphenation && EANT_EXTRA_ARGS+=" -Dhyphenation.present=true -Duser.hyph.dir=${EPREFIX}/usr/share/offo-hyphenation/hyph/"
+
+	java-pkg-2_src_compile
+}
+
+# Tests are broken even in 2.0
+src_test() {
+	EANT_ANT_TASKS="ant-junit" \
+		java-pkg-2_src_test
+}
+
+src_install() {
+	java-pkg_dojar build/fop.jar build/fop-sandbox.jar
+
+	if use hyphenation ; then
+		java-pkg_dojar build/fop-hyph.jar
+		insinto /usr/share/${PN}/
+		doins -r hyph
+	fi
+
+	# Doesn't support everything upstream launcher does...
+	java-pkg_dolauncher ${PN} --main org.apache.fop.cli.Main
+
+	dodoc NOTICE README
+
+	use doc && java-pkg_dojavadoc build/javadocs
+	use examples && java-pkg_doexamples examples/* conf
+	use source && java-pkg_dosrc src/java/org src/sandbox/org
+}