Version bump to 1.1, fixes bug #335858. Ebuild changes contributed by Ivan Baidakou (dmol).

Package-Manager: portage-2.1.12.11/cvs/Linux x86_64
Manifest-Sign-Key: 0x6D34E57D

3 files changed, 115 insertions, 11 deletions

diff --git a/dev-java/fop/ChangeLog b/dev-java/fop/ChangeLog
index 553945488a48..d4eaecfe3fbf 100644
--- a/dev-java/fop/ChangeLog
+++ b/dev-java/fop/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/fop
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.69 2012/10/18 08:40:33 ottxor Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.70 2013/07/08 14:23:45 tomwij Exp $
+
+*fop-1.1 (08 Jul 2013)
+
+  08 Jul 2013; Tom Wijsman <TomWij@gentoo.org> +fop-1.1.ebuild:
+  Version bump to 1.1, fixes bug #335858. Ebuild changes contributed by Ivan
+  Baidakou (dmol).
 
   18 Oct 2012; Christoph Junghans <ottxor@gentoo.org> fop-0.95.ebuild:
   added prefix support (bug #435376)
diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index 0f8a76799f31..76332e7ba1f7 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -2,17 +2,19 @@
 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
 EBUILD fop-0.95.ebuild 3593 SHA256 7bf4dce4d8ae354898f501c562b3bfc414e745370932c26d77b3f57b280cb74e SHA512 bcf51ee7e636b2fa205b500d7c12bfaee515f3d0f48aa6ab6430ac6eec3b1678b717498b1bd716f1e36495015fc207b759dda86d2bb37728a584f5b99bf2ed07 WHIRLPOOL 4cc1c97e7df37138bebbf7e555cd4b24e70792f5aa66c778b137c014bc747c50d8e85896787a78b5d5f6d87a16d1bf1326e057a6d22e703057714bced635ac92
-MISC ChangeLog 8853 SHA256 30e24d6b33c2ad3f6607f670b1a03de4dd5aa5c359e8212ccacd85afc21e5eae SHA512 584ce9cd4bf561483e1ce1724ede6a0fe0bdbb1621c8e5b8f9e07673e961b3133b2dd2eff9229074c1e6a2e5f5607082fe7a651b0662cf582c8f927b927527bb WHIRLPOOL 25112d7e322f98ddab28eda48d447bad694b1596b9406a3560a083e4b6037d059af0d9c8ef23e6873ce2490b67af9b7dc60b77579b0716554f8f44730488ca62
+EBUILD fop-1.1.ebuild 2872 SHA256 61860cd8c272ffbf2376b2cbd4b0fade20aad370f4c01313a74a42c623f29550 SHA512 b93d34618c438e6f3255bf746d5cc6bc15adfcbd14dfb72ca20a812c1de89ba79f26f1ef7f09e757017f6f4f7def3dace5c1ce027be812b4128b956cebf6e2dd WHIRLPOOL e40061592695e96496d1947e55c9779e779ad39c88801a3dc9535419e06fd2a0483eda2dea01f5fd25d06430595df60ec4b6fe4acf1bacb68142a66fe655c06c
+MISC ChangeLog 9038 SHA256 9c61455d8e99c75d0c752397d1a50b481eb10ab6c877321ef2afb7ad5cb20ead SHA512 189b418e91d1f1c7c07d633e3ff29ff028f6a2ad5e78c8a017f98df083a8873b16732365567ed305c455ce8c67f804aaa60280095f78544d5bbc672287ccf664 WHIRLPOOL 62b73262377739adec2f071bae667b15ec40aced330271d72e43c6ea34a8272b633d44d5e9bdf30227d4f89c843279268241ec40c29ebf1b6ec5b77b48e8aef8
 MISC metadata.xml 427 SHA256 0b6fb333d87a73eff05b69a66715578f1853ed64584307dcaee983ea627af25a SHA512 8159585ad34a54a6d67ffe9e6803befbc2eae42ecde0c03f450c7f877675b0ddee4805c43a6aeec9df8e1e05329b1b7f08ccea836fb90025623fabd4a2d14778 WHIRLPOOL 386b9e1d7460698bce806b89fb65a029aef49a6bc050fd289d3c5ae48f65502eb3d70d107f3a7099ed04fa78cd5bd686912563ce616dc321654edaa767c83ada
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQEcBAEBCAAGBQJQf8CCAAoJEOeBhlrCAAWGgMgIAK/+fe/3fI+QhLvsC1bklhpj
-8mF4r2kC9DYJEEbo1G+10ladgWFm3gvsgePWL+BTQZIwPntfVfLpcSphRM6vttpV
-OzvbU64xReBRIPxFXcp7e9AJtSigok099Da9mdirymcgQMzRQZAtiHy21UcO2Zv8
-jocazO0Q1HbAp5v5T/nKZcRqeVgdCF9/FQ+n4tHW6QFg0uL8ECsRATVCo7Gd/FNE
-CofFUpfs1PAaN9uBZwm/HDvISkmJRoskPWghMudCP/BkSNAJKGMaz3IdokzVi36y
-TPxoAQDI6NN+Zz+VDRJvVllv1m3DWMgoIXUchE4KExMojLQvRpbhffxam3s89z0=
-=Bfoz
+iQEcBAEBCAAGBQJR2sq3AAoJEJWyH81tNOV9sKUIAMXDaJGF0B/G7cDwBi63Dgdm
+2KJ6HP6/HNvNQ8D8B3HQt811gLqvqQGs2KqrGWGyx/LVt92y9yDlXqhFiKFTElsX
+TraXYaqBRW94F5y7cOq6MPJ3WJpTbit/+WCDOTrFdKH1iF/HyuvKTpqKd4PIAp3q
+kCG3nPmv3uRSs3nvemL1+IgiY9AWDn1S4nFOoHXNYcAylZs+9dKXXSJjFQrOEuRp
+BxVXnni7yFa9JIrlaXHF9Un8V4s1uAJQACD0WdWsETfgMgW6Ajw8S9+zJP0EkHFC
+Qf1LMXTRU/pRfGLa3jwc/YzCgIeYKE91v+PzFwDfAMqlBmPVtTokh6/+WX7523k=
+=7wfz
 -----END PGP SIGNATURE-----
diff --git a/dev-java/fop/fop-1.1.ebuild b/dev-java/fop/fop-1.1.ebuild
new file mode 100644
index 000000000000..e6a70838f7c7
--- /dev/null
+++ b/dev-java/fop/fop-1.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-1.1.ebuild,v 1.1 2013/07/08 14:23:45 tomwij 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 ~ppc ~amd64-linux ~x86-linux ~ppc-macos ~x86-macos ~sparc-solaris ~x86-solaris"
+IUSE="hyphenation jai"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+# Doesn't work with java.awt.headless, requires Mockito.
+RESTRICT="test"
+
+COMMON_DEPEND="
+	dev-java/avalon-framework:4.2
+	dev-java/batik:1.7
+	dev-java/commons-io:1
+	dev-java/commons-logging:0
+	java-virtuals/servlet-api:2.2
+	dev-java/xmlgraphics-commons:1.5
+	dev-java/xml-commons-external:1.3
+	dev-java/ant-core:0
+	jai? ( dev-java/sun-jai-bin )"
+
+RDEPEND=">=virtual/jre-1.5
+	${COMMON_DEPEND}"
+
+DEPEND=">=virtual/jdk-1.5
+	dev-java/qdox:1.12
+	hyphenation? ( dev-java/offo-hyphenation )
+	app-arch/unzip
+	${COMMON_DEPEND}
+	test? (
+		dev-java/junit:4
+		dev-java/xmlunit
+	)"
+
+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,avalon-framework-4.2,batik-1.7,servlet-api-2.2,commons-io-1,commons-logging,xmlgraphics-commons-1.5,xml-commons-external-1.3"
+EANT_EXTRA_ARGS="-Djce.present=true"
+EANT_DOC_TARGET="javadocs"
+EANT_TEST_GENTOO_CLASSPATH="${EANT_GENTOO_CLASSPATH},junit-4"
+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
+}
+
+src_test() {
+	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
+}