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

Package-Manager: portage-2.1.1_pre2-r4

6 files changed, 117 insertions, 14 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/Manifest b/dev-java/fop/Manifest
index fb581430bb73..f9c83ad48ace 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -1,18 +1,38 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 c5d21bb0bea438f6733f3fc5042c1555 ChangeLog 2953
+AUX 0.20.5-buildxml.patch 547 RMD160 b5a1bd9c8cb14c45ef81670fc36d2b1a3f57cd67 SHA1 f2f307aae71739c7ce700f38458a9ed17380b0fb SHA256 c1eb54b875f7d598b8e743070370ea1be4773f173892dd7d078782246be278a9
 MD5 a85f49d46070d6405ecab8d2a099524f files/0.20.5-buildxml.patch 547
+RMD160 b5a1bd9c8cb14c45ef81670fc36d2b1a3f57cd67 files/0.20.5-buildxml.patch 547
+SHA256 c1eb54b875f7d598b8e743070370ea1be4773f173892dd7d078782246be278a9 files/0.20.5-buildxml.patch 547
+AUX 0.20.5-startscript.patch 2435 RMD160 c0f245edc7007e7fce5faba4adcc1f4baa214bc0 SHA1 c02282ffc2df30f40f4051fc7385342b771aa146 SHA256 fcdfe5a333fef2ce56813b48ac42b61b98db88664ab8b7c7d0a529bbf338fb35
 MD5 656bb7d30e63d5e57f79489637c243ce files/0.20.5-startscript.patch 2435
-MD5 198aedddc6ad08dbc64dec1545524d8d files/digest-fop-0.20.5-r1 67
-MD5 198aedddc6ad08dbc64dec1545524d8d files/digest-fop-0.20.5-r3 67
+RMD160 c0f245edc7007e7fce5faba4adcc1f4baa214bc0 files/0.20.5-startscript.patch 2435
+SHA256 fcdfe5a333fef2ce56813b48ac42b61b98db88664ab8b7c7d0a529bbf338fb35 files/0.20.5-startscript.patch 2435
+DIST fop-0.20.5-src.tar.gz 7885256 RMD160 c4b776b2b406710548bb343ca2f3dcf03af1a68b SHA1 c0971a8091e38635d07016beb9b66182a45e0a32 SHA256 0c3db9596520ae91747f55984f13d5474e195182c2c274a7556e509864a9ac88
+EBUILD fop-0.20.5-r1.ebuild 1283 RMD160 af0ebe0cb3150d452509c65594b8a7dfd3bfe708 SHA1 ac3b4e2f88c95f90fb3d8f0397c0611c660c7546 SHA256 5ab8a94e9b4786af5489497c6c51c40e98c9ebe2717f70462392690ac049b558
 MD5 6888a76ca900a9c5561ab964ba88868c fop-0.20.5-r1.ebuild 1283
+RMD160 af0ebe0cb3150d452509c65594b8a7dfd3bfe708 fop-0.20.5-r1.ebuild 1283
+SHA256 5ab8a94e9b4786af5489497c6c51c40e98c9ebe2717f70462392690ac049b558 fop-0.20.5-r1.ebuild 1283
+EBUILD fop-0.20.5-r3.ebuild 1649 RMD160 d9afde47a23a1f72efb9be3878ccab75b7d624f4 SHA1 7eb641b21f1cf35e2293e0d5bb1b073c67359c3b SHA256 5fb3adec0ac6f61da9fe868cf3ca41bcb4e606f84b96731f120d18fdab3f20ef
 MD5 ae622af96cf7f3f2ebb52bf682848c49 fop-0.20.5-r3.ebuild 1649
+RMD160 d9afde47a23a1f72efb9be3878ccab75b7d624f4 fop-0.20.5-r3.ebuild 1649
+SHA256 5fb3adec0ac6f61da9fe868cf3ca41bcb4e606f84b96731f120d18fdab3f20ef fop-0.20.5-r3.ebuild 1649
+EBUILD fop-0.20.5-r5.ebuild 1763 RMD160 62ac783864e6149298238ed7b4468c4dad157094 SHA1 4527f0ab07e9fff778b38314d0f05557181b4878 SHA256 bf9d59d768f296ac85cbf9252d8b1df54f7363e956db1d5e149d0c18a9aa6478
+MD5 00f8b97f9bf76200d495d2ca07936c16 fop-0.20.5-r5.ebuild 1763
+RMD160 62ac783864e6149298238ed7b4468c4dad157094 fop-0.20.5-r5.ebuild 1763
+SHA256 bf9d59d768f296ac85cbf9252d8b1df54f7363e956db1d5e149d0c18a9aa6478 fop-0.20.5-r5.ebuild 1763
+MISC ChangeLog 3122 RMD160 9126f14643cfd407e67d7b692ea92e2529c73a6e SHA1 57aea85d8e12958aec7fbc971bc77e5393dc9052 SHA256 0851489448b922b01f5b5312e4e12b4e344f43c6866c47618c87111e7ca18085
+MD5 718db5a6530e56d6aa568d9bda0426d6 ChangeLog 3122
+RMD160 9126f14643cfd407e67d7b692ea92e2529c73a6e ChangeLog 3122
+SHA256 0851489448b922b01f5b5312e4e12b4e344f43c6866c47618c87111e7ca18085 ChangeLog 3122
+MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFD1OTJndWRXhKOboURAlZqAJ4hIUADjWon44UuGlcqGUPbxoUmhACfeh8e
-sI2BPtqxhUCZiQpPdDCcTD8=
-=21tr
------END PGP SIGNATURE-----
+RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
+SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
+MD5 dc0b3ccf557b9eddc4c893e56dc66dad files/digest-fop-0.20.5-r1 247
+RMD160 332f6b1c6f24cbd51ced77a15eb1da292f7e016a files/digest-fop-0.20.5-r1 247
+SHA256 c2097261b476e1be64661a809f51796287b810042510bd5d83e799158b10b9db files/digest-fop-0.20.5-r1 247
+MD5 dc0b3ccf557b9eddc4c893e56dc66dad files/digest-fop-0.20.5-r3 247
+RMD160 332f6b1c6f24cbd51ced77a15eb1da292f7e016a files/digest-fop-0.20.5-r3 247
+SHA256 c2097261b476e1be64661a809f51796287b810042510bd5d83e799158b10b9db files/digest-fop-0.20.5-r3 247
+MD5 dc0b3ccf557b9eddc4c893e56dc66dad files/digest-fop-0.20.5-r5 247
+RMD160 332f6b1c6f24cbd51ced77a15eb1da292f7e016a files/digest-fop-0.20.5-r5 247
+SHA256 c2097261b476e1be64661a809f51796287b810042510bd5d83e799158b10b9db files/digest-fop-0.20.5-r5 247
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
+}