3 files changed, 128 insertions, 13 deletions
diff --git a/dev-java/fop/ChangeLog b/dev-java/fop/ChangeLog
index eecd08ec8bd5..d0347c92bb9f 100644
--- a/dev-java/fop/ChangeLog
+++ b/dev-java/fop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/fop
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.61 2009/01/05 20:27:57 serkan Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.62 2009/05/20 22:06:50 caster Exp $
+
+*fop-0.95 (20 May 2009)
+
+  20 May 2009; Vlastimil Babka <caster@gentoo.org> +fop-0.95.ebuild:
+  Version bump, bug #202775. Thanks to Jiri Tyr and Mike Weissman.
 
   05 Jan 2009; Serkan Kaba <serkan@gentoo.org> fop-0.93-r1.ebuild:
   Migrate to EAPI 2 to fix the dependencies.
diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index 19d47398eff1..eaff6e565764 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -1,16 +1,8 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST fop-0.93-src.tar.gz 11719875 RMD160 c047f7512a08120cfed07536c0849b2a999e96d4 SHA1 3efc0020fdbf14a12851acf6020ea723aebe2af6 SHA256 020a94181750b0653749cd977561283eb018689fb425dfa36fd02c50295a34c2
 DIST fop-0.94-src.tar.gz 11853559 RMD160 36f0b928f3511a8da7746b767c31112f3f0f45a2 SHA1 77bdaa5eaa1ba2c5d0c15925e74059680eb1c855 SHA256 b1db5b7a46c529a4b5034a3986b013320452dd2af0984f294b1ddc8a852fa099
+DIST fop-0.95-src.zip 15153053 RMD160 e3b4d34259083ead5ac99b18b5bf6dd44c6b4b62 SHA1 4579e2e65f4441407386a0835d740270089b1eb6 SHA256 690e4dd4a4b6fdf5b18469bf6768115fb5d444c3253bba47e69b0079a739e32a
 EBUILD fop-0.93-r1.ebuild 3106 RMD160 22aa1c42b614d3d10433ebcb1720be4c613319fc SHA1 8cf133f0a8f1c5c49346c2297eca11819db0e5a9 SHA256 f61b90b9f64599609ef922d80084f7c3fe9037fa9a908889212225fd67aa1760
 EBUILD fop-0.94-r1.ebuild 3235 RMD160 eb024934461f860107a0dd9b3692a13a3c2461ec SHA1 58da7fdd52a37db18a237ed53b3d83a7ac87246f SHA256 52351a7cb9181f8dcc3697876374c2031e5c44b2a4f7df667739dd82e44b5897
-MISC ChangeLog 7973 RMD160 75dfb74abf36ca85a24c022ac57dfe48067dbb28 SHA1 c17b95145397abf4fd7c5c11c945c9c78caddb7b SHA256 a6f730784ddb2100132e3c7e1383ad34e65fe10ac98d637441228c1598cc4ca3
+EBUILD fop-0.95.ebuild 3548 RMD160 3b01c2d7c076dfa01ebb6f702c4216feedd78635 SHA1 9d8bbcb3e732032168246003a1cfadbc1813e47e SHA256 1c65bf84e054d62c7b7b94172716227f3a3e45ad883516dda96fef88604d0447
+MISC ChangeLog 8135 RMD160 2165b7fb5904a3774912f1bdc84e322a9c50f336 SHA1 d05395620849efb60a3f79e420ce695e3b3cc241 SHA256 6613c32d20a4b75b38be11040d788df581ad2b036390f500a3e60c4dcec2ec7f
 MISC metadata.xml 427 RMD160 c01df4ec3df7d28b39560a96df475e6f010ddcba SHA1 2d6f93956f852096914452f8e44a0620e3951e55 SHA256 0b6fb333d87a73eff05b69a66715578f1853ed64584307dcaee983ea627af25a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.9 (GNU/Linux)
-
-iEYEARECAAYFAklibVMACgkQRh6X64ivZaI/4QCfSC78BxseMGFExZuZ/u2QCYwv
-DPsAn0v0gJX3jeTVhpGAdf/+AdJl8FNx
-=Tr8h
------END PGP SIGNATURE-----
diff --git a/dev-java/fop/fop-0.95.ebuild b/dev-java/fop/fop-0.95.ebuild
new file mode 100644
index 000000000000..e67c93b19ab1
--- /dev/null
+++ b/dev-java/fop/fop-0.95.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-0.95.ebuild,v 1.1 2009/05/20 22:06:51 caster 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=2
+JAVA_PKG_IUSE="doc examples source"
+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"
+LICENSE="Apache-2.0"
+SLOT="0"
+# doesn't work with java.awt.headless
+RESTRICT="test"
+KEYWORDS="~amd64 ~ia64 ~ppc ~ppc64 ~x86"
+IUSE="hyphenation jai jimi"
+
+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.3
+	dev-java/xml-commons-external:1.3
+	dev-java/xalan:0
+	jai? ( dev-java/sun-jai-bin )
+	jimi? ( dev-java/sun-jimi )"
+
+RDEPEND=">=virtual/jre-1.4
+	${COMMON_DEPEND}"
+
+DEPEND=">=virtual/jdk-1.4
+	hyphenation? ( dev-java/offo-hyphenation )
+	app-arch/unzip
+	${COMMON_DEPEND}"
+#	test? (
+#		=dev-java/junit-3.8*
+#		dev-java/xmlunit
+#	)"
+
+java_prepare() {
+	# automagic is bad
+	java-ant_ignore-system-classes || die
+
+	cd "${S}/lib"
+	rm -v *.jar || die
+
+	java-pkg_jarfrom --build-only ant-core ant.jar
+	java-pkg_jarfrom avalon-framework-4.2 avalon-framework.jar \
+		avalon-framework-4.2.0.jar
+	java-pkg_jarfrom batik-1.7
+	java-pkg_jarfrom commons-io-1 commons-io.jar commons-io-1.3.1.jar
+	java-pkg_jarfrom commons-logging commons-logging.jar \
+		commons-logging-1.0.4.jar
+	java-pkg_jarfrom --virtual servlet-api-2.2 servlet.jar servlet-2.2.jar
+	java-pkg_jarfrom xmlgraphics-commons-1.3
+	java-pkg_jarfrom xalan xalan.jar xalan-2.7.0.jar
+	java-pkg_jarfrom xml-commons-external-1.3
+
+	use jai && java-pkg_jar-from sun-jai-bin
+	use jimi && java-pkg_jar-from sun-jimi
+}
+
+EANT_DOC_TARGET="javadocs"
+EANT_BUILD_TARGET="package"
+
+src_compile() {
+	# because I killed the automagic tests; all our JDK's have JCE
+	local af="-Djdk14.present=true -Djce.present=true"
+	use hyphenation && af="${af} -Duser.hyph.dir=/usr/share/offo-hyphenation/hyph/"
+	use jai && af="${af} -Djai.present=true"
+	use jimi && af="${af} -Djimi.present=true"
+
+	export ANT_OPTS="-Xmx256m"
+	java-pkg-2_src_compile ${af} -Djavahome.jdk14="${JAVA_HOME}"
+}
+
+src_test() {
+	java-pkg_jar-from --into lib xmlunit-1
+	java-pkg_jar-from --into lib junit
+
+	ANT_OPTS="-Xmx1g -Djava.awt.headless=true" eant -Djunit.fork=off junit
+}
+
+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 || die
+	fi
+
+	# doesn't support everything upstream launcher does...
+	java-pkg_dolauncher ${PN} --main org.apache.fop.cli.Main
+
+	dodoc NOTICE README || die
+
+	use doc && java-pkg_dojavadoc build/javadocs
+	use examples && java-pkg_doexamples examples/* conf
+	use source && java-pkg_dosrc src/java/org src/java-1.4/* src/sandbox/org
+}
+
+pkg_postinst(){
+	elog "The SVG Renderer and the MIF Handler have not been resurrected"
+	elog "They are currently non-functional."
+	elog
+	elog "The API of FOP has changed considerably and is not backwards-compatible"
+	elog "with versions 0.20.5 and 0.91beta. Version 0.92 introduced the new"
+	elog "stable API."
+}