ant_src_unpack -> src_unpack

(Portage version: 2.1.1_pre3-r3)
 (Signed Manifest commit)

3 files changed, 21 insertions, 85 deletions

diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index f9c83ad48ace..aa892ef62985 100644
--- a/dev-java/fop/Manifest
+++ b/dev-java/fop/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 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
@@ -15,14 +18,14 @@ EBUILD fop-0.20.5-r3.ebuild 1649 RMD160 d9afde47a23a1f72efb9be3878ccab75b7d624f4
 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
+EBUILD fop-0.20.5-r6.ebuild 1761 RMD160 509db6ae3324e9483b0f64549f1713c6e663ba3c SHA1 8e954b6787fb1d6c8a410686b75392ac649ded6e SHA256 08d2b2b4268f8eaaade84e1e82083fcd0e013fba2231f2e10e6529ea928b7a06
+MD5 0b12c5644758a818e8390bce08baa49a fop-0.20.5-r6.ebuild 1761
+RMD160 509db6ae3324e9483b0f64549f1713c6e663ba3c fop-0.20.5-r6.ebuild 1761
+SHA256 08d2b2b4268f8eaaade84e1e82083fcd0e013fba2231f2e10e6529ea928b7a06 fop-0.20.5-r6.ebuild 1761
+MISC ChangeLog 3287 RMD160 206ae3b8914f5658ca0494d7dfe228a51322803e SHA1 0dd9d132a1d208d81dec7f6659dfd6f4bb98376a SHA256 6a8f124ac513f5f96662d6b887660593541f8e42a5d6428fb8da427f9056cda5
+MD5 970adc9aad9faeafdd39fc545b24c4ae ChangeLog 3287
+RMD160 206ae3b8914f5658ca0494d7dfe228a51322803e ChangeLog 3287
+SHA256 6a8f124ac513f5f96662d6b887660593541f8e42a5d6428fb8da427f9056cda5 ChangeLog 3287
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -33,6 +36,13 @@ SHA256 c2097261b476e1be64661a809f51796287b810042510bd5d83e799158b10b9db files/di
 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
+MD5 dc0b3ccf557b9eddc4c893e56dc66dad files/digest-fop-0.20.5-r6 247
+RMD160 332f6b1c6f24cbd51ced77a15eb1da292f7e016a files/digest-fop-0.20.5-r6 247
+SHA256 c2097261b476e1be64661a809f51796287b810042510bd5d83e799158b10b9db files/digest-fop-0.20.5-r6 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.4 (GNU/Linux)
+
+iD4DBQFEwpZLgo/w9rxVVVERAs0SAKCGgfAIOPEv1+bX8B1VgnhdPHuTNgCYhSqq
+i0Y/yJ005nZEjyGfuLzmvw==
+=mHgf
+-----END PGP SIGNATURE-----
diff --git a/dev-java/fop/files/digest-fop-0.20.5-r5 b/dev-java/fop/files/digest-fop-0.20.5-r5
deleted file mode 100644
index f4b8ca285900..000000000000
--- a/dev-java/fop/files/digest-fop-0.20.5-r5
+++ /dev/null
@@ -1,3 +0,0 @@
-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
deleted file mode 100644
index 08f212845cfd..000000000000
--- a/dev-java/fop/fop-0.20.5-r5.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# 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
-}