Revision bump to use new Java system. Addresses bug #139959.

(Portage version: 2.1.1_pre2-r4)

5 files changed, 84 insertions, 1 deletions

diff --git a/dev-java/fop/ChangeLog b/dev-java/fop/ChangeLog
index 5dcd8caa80ea..a0b5af9df8c3 100644
--- a/dev-java/fop/ChangeLog
+++ b/dev-java/fop/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/fop
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.26 2006/01/08 19:03:04 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.27 2006/07/14 16:29:08 nichoj Exp $
+
+*fop-0.20.5-r5 (14 Jul 2006)
+
+  14 Jul 2006; Joshua Nichols <jnichols@gentoo.org> +fop-0.20.5-r5.ebuild:
+  Revision bump to use new Java system. Addresses bug #139959.
 
   08 Jan 2006; Joshua Nichols <nichoj@gentoo.org> Manifest:
   Re-marked stable on amd64 (bug #116310).
diff --git a/dev-java/fop/files/digest-fop-0.20.5-r1 b/dev-java/fop/files/digest-fop-0.20.5-r1
index 97307f640a5d..f4b8ca285900 100644
--- a/dev-java/fop/files/digest-fop-0.20.5-r1
+++ b/dev-java/fop/files/digest-fop-0.20.5-r1
@@ -1 +1,3 @@
 MD5 1a31eb1357e5d4b8d32d4cb3edae2da2 fop-0.20.5-src.tar.gz 7885256
+RMD160 c4b776b2b406710548bb343ca2f3dcf03af1a68b fop-0.20.5-src.tar.gz 7885256
+SHA256 0c3db9596520ae91747f55984f13d5474e195182c2c274a7556e509864a9ac88 fop-0.20.5-src.tar.gz 7885256
diff --git a/dev-java/fop/files/digest-fop-0.20.5-r3 b/dev-java/fop/files/digest-fop-0.20.5-r3
index 97307f640a5d..f4b8ca285900 100644
--- a/dev-java/fop/files/digest-fop-0.20.5-r3
+++ b/dev-java/fop/files/digest-fop-0.20.5-r3
@@ -1 +1,3 @@
 MD5 1a31eb1357e5d4b8d32d4cb3edae2da2 fop-0.20.5-src.tar.gz 7885256
+RMD160 c4b776b2b406710548bb343ca2f3dcf03af1a68b fop-0.20.5-src.tar.gz 7885256
+SHA256 0c3db9596520ae91747f55984f13d5474e195182c2c274a7556e509864a9ac88 fop-0.20.5-src.tar.gz 7885256
diff --git a/dev-java/fop/files/digest-fop-0.20.5-r5 b/dev-java/fop/files/digest-fop-0.20.5-r5
new file mode 100644
index 000000000000..f4b8ca285900
--- /dev/null
+++ b/dev-java/fop/files/digest-fop-0.20.5-r5
@@ -0,0 +1,3 @@
+MD5 1a31eb1357e5d4b8d32d4cb3edae2da2 fop-0.20.5-src.tar.gz 7885256
+RMD160 c4b776b2b406710548bb343ca2f3dcf03af1a68b fop-0.20.5-src.tar.gz 7885256
+SHA256 0c3db9596520ae91747f55984f13d5474e195182c2c274a7556e509864a9ac88 fop-0.20.5-src.tar.gz 7885256
diff --git a/dev-java/fop/fop-0.20.5-r5.ebuild b/dev-java/fop/fop-0.20.5-r5.ebuild
new file mode 100644
index 000000000000..08f212845cfd
--- /dev/null
+++ b/dev-java/fop/fop-0.20.5-r5.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-0.20.5-r5.ebuild,v 1.1 2006/07/14 16:29:08 nichoj Exp $
+
+inherit eutils java-pkg-2 java-ant-2
+
+MY_V=${PV/_/}
+DESCRIPTION="Formatting Objects Processor is a print formatter driven by XSL"
+SRC_URI="mirror://apache/xml/fop/fop-${MY_V}-src.tar.gz"
+HOMEPAGE="http://xml.apache.org/fop/"
+LICENSE="Apache-1.1"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples jai jimi"
+
+# Doesn't like Java 1.5
+COMMON_DEP="
+	jai? ( dev-java/sun-jai-bin )
+	jimi? ( dev-java/sun-jimi )
+	=dev-java/avalon-framework-4.1*
+	~dev-java/batik-1.5
+	dev-java/xalan
+	>=dev-java/xerces-2.6.2
+	!dev-java/fop-bin"
+RDEPEND="|| ( =virtual/jre-1.4* =virtual/jre-1.3* )
+	${COMMON_DEP}"
+DEPEND="|| ( =virtual/jdk-1.4* =virtual/jdk-1.3* )
+	${COMMON_DEP}
+	>=dev-java/ant-1.5.4"
+
+S=${WORKDIR}/${P/_/}
+
+ant_src_unpack() {
+	unpack ${A}
+
+	cd ${S}
+	epatch ${FILESDIR}/${PV}-buildxml.patch
+
+	cd ${S}/lib
+	rm -f *.jar
+	java-pkg_jar-from avalon-framework-4.1
+	java-pkg_jar-from batik-1.5 batik-all.jar batik.jar
+	java-pkg_jar-from xalan
+	java-pkg_jar-from xerces-2
+	use jai && java-pkg_jar-from sun-jai-bin
+	use jimi && java-pkg_jar-from sun-jimi
+}
+
+src_compile() {
+	java-pkg_filter-compiler jikes
+
+	eant package $(use_doc javadocs)
+}
+
+src_install() {
+	java-pkg_dojar build/fop.jar
+
+	dodir /etc/env.d/java/
+	echo 'FOP_HOME=/usr/share/fop/' > ${D}/etc/env.d/java/22fop
+	java-pkg_dolauncher ${PN} --main org.apache.fop.apps.Fop
+
+	if use doc; then
+		dodoc CHANGES STATUS README
+		java-pkg_dohtml -r ReleaseNotes.html build/javadocs/*
+	fi
+
+	if use examples; then
+		dodir /usr/share/doc/${PF}/examples
+		cp -pPR examples ${D}/usr/share/doc/${PF}/examples
+	fi
+}