Migrate to splitted ant.

Package-Manager: portage-2.1.2.3

diff --git a/dev-java/fop/ChangeLog b/dev-java/fop/ChangeLog
index c97683787dcb14732d68988db46817aed79e499c..cafa0b7d9260bd0aa4f8fcbf5bbdedfa53c0b3a0 100644 (file)
--- a/dev-java/fop/ChangeLog
+++ b/dev-java/fop/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/fop
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.35 2007/02/13 08:48:45 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/ChangeLog,v 1.36 2007/04/11 16:32:19 betelgeuse Exp $
+
+  11 Apr 2007; Petteri Räty <betelgeuse@gentoo.org> fop-0.20.5-r7.ebuild:
+  Migrate to splitted ant.
 
   13 Feb 2007; Markus Rothe <corsair@gentoo.org> fop-0.20.5-r7.ebuild:
   Added ~ppc64; bug #153229

diff --git a/dev-java/fop/Manifest b/dev-java/fop/Manifest
index 80d949bde85ae91ba4804698d44d13083afb3038..26e525a407a9b60ef85aa3f82d7f8545ff35ebf4 100644 (file)
--- 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 1647 RMD160 5d7dfd46f6156a40fef92fef37176a6dbe3fd831
 MD5 7d2783d8bcb05078de21abcf06d4a7c0 fop-0.20.5-r3.ebuild 1647
 RMD160 5d7dfd46f6156a40fef92fef37176a6dbe3fd831 fop-0.20.5-r3.ebuild 1647
 SHA256 18fc547bfa28db34d8deaf2ec668a6fc8a4c01fa45f34b5d5e9e22f77c4a1e94 fop-0.20.5-r3.ebuild 1647
-EBUILD fop-0.20.5-r7.ebuild 1881 RMD160 d2bf85b164b051ac03c41d7e3770eed360c2c68d SHA1 fce8f8c20a3c06e96e6eeedfc08fd121c2488883 SHA256 5612c5477574ea1e80816dce3f987acdf7dac1b79160272248d0deb6bf73ddaf
-MD5 00d81b4923bb310b19f9fe7f1c85f0e8 fop-0.20.5-r7.ebuild 1881
-RMD160 d2bf85b164b051ac03c41d7e3770eed360c2c68d fop-0.20.5-r7.ebuild 1881
-SHA256 5612c5477574ea1e80816dce3f987acdf7dac1b79160272248d0deb6bf73ddaf fop-0.20.5-r7.ebuild 1881
-MISC ChangeLog 4330 RMD160 2ece084e084fff704e9217a343b9151cdc1d0ed0 SHA1 537df5373a3b0d32fafb630b4fb53001272ac108 SHA256 8d5b99bb409a748e8a26687c28f54384888e9270e1e07da7f3948932b8626c40
-MD5 69734e8a68028eebcf207077e9308567 ChangeLog 4330
-RMD160 2ece084e084fff704e9217a343b9151cdc1d0ed0 ChangeLog 4330
-SHA256 8d5b99bb409a748e8a26687c28f54384888e9270e1e07da7f3948932b8626c40 ChangeLog 4330
+EBUILD fop-0.20.5-r7.ebuild 1972 RMD160 79e72bc00ad61360ea9a095f6e76022f19a91e61 SHA1 1d0c47348881f4692e56045e2b275436e8f13aab SHA256 4b09505157d749a02f4ece85728ba598f14e4e0063b8c45fc71699d13838eb9c
+MD5 28b27db95a340b444df842cf60948c69 fop-0.20.5-r7.ebuild 1972
+RMD160 79e72bc00ad61360ea9a095f6e76022f19a91e61 fop-0.20.5-r7.ebuild 1972
+SHA256 4b09505157d749a02f4ece85728ba598f14e4e0063b8c45fc71699d13838eb9c fop-0.20.5-r7.ebuild 1972
+MISC ChangeLog 4436 RMD160 0ea23ce18c67b8acf4e4b5543bcb049d09bd4714 SHA1 8abec70addabec39b7d2f263b3da64956bfb72c3 SHA256 fccec923813861f9bcc60068b08734e732516e426e25ea8a8fd71fa6ace99667
+MD5 45b9293177517a3c60ac957e6adbcc54 ChangeLog 4436
+RMD160 0ea23ce18c67b8acf4e4b5543bcb049d09bd4714 ChangeLog 4436
+SHA256 fccec923813861f9bcc60068b08734e732516e426e25ea8a8fd71fa6ace99667 ChangeLog 4436
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -33,3 +36,10 @@ SHA256 c2097261b476e1be64661a809f51796287b810042510bd5d83e799158b10b9db files/di
 MD5 dc0b3ccf557b9eddc4c893e56dc66dad files/digest-fop-0.20.5-r7 247
 RMD160 332f6b1c6f24cbd51ced77a15eb1da292f7e016a files/digest-fop-0.20.5-r7 247
 SHA256 c2097261b476e1be64661a809f51796287b810042510bd5d83e799158b10b9db files/digest-fop-0.20.5-r7 247
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGHQ2XcxLzpIGCsLQRAuR4AJ4yjU5Mi1fVJ/M64oDgLQ+uV/jSBACgnIy1
+2PQQ8Z94bUF9DYDFM0+MOP4=
+=kj4H
+-----END PGP SIGNATURE-----

diff --git a/dev-java/fop/fop-0.20.5-r7.ebuild b/dev-java/fop/fop-0.20.5-r7.ebuild
index 965341a9281e5e1fb50253491dde367fd7d542f7..b74f761cfc3480ae20a57ab47c35462257627a48 100644 (file)
--- a/dev-java/fop/fop-0.20.5-r7.ebuild
+++ b/dev-java/fop/fop-0.20.5-r7.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 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-r7.ebuild,v 1.4 2007/02/13 08:48:45 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/fop/fop-0.20.5-r7.ebuild,v 1.5 2007/04/11 16:32:19 betelgeuse Exp $
 
 inherit eutils java-pkg-2 java-ant-2
 
@@ -26,18 +26,19 @@ RDEPEND="=virtual/jre-1.4*
        ${COMMON_DEP}"
 DEPEND="=virtual/jdk-1.4*
        ${COMMON_DEP}
-       >=dev-java/ant-1.5.4"
+       || ( dev-java/ant-trax dev-java/ant-tasks )
+       >=dev-java/ant-core-1.5.4"
 
 S=${WORKDIR}/${P/_/}
 
 src_unpack() {
        unpack ${A}
 
-       cd ${S}
+       cd "${S}"
        epatch ${FILESDIR}/${PV}-no-autodetection.patch
 
-       cd ${S}/lib
-       rm -f *.jar
+       cd "${S}/lib"
+       rm -v *.jar || die
        java-pkg_jar-from ant-core ant.jar
        java-pkg_jar-from avalon-framework-4.1
        java-pkg_jar-from batik-1.5 batik-all.jar batik.jar
@@ -55,7 +56,7 @@ src_compile() {
        use jai && jaip="-Djai.present=true"
        use jimi && jimip="-Djimi.present=true"
 
-       eant ${jaip} ${jimip} package $(use_doc javadocs)
+       ANT_TASKS="ant-trax" eant ${jaip} ${jimip} package $(use_doc javadocs)
 }
 
 src_install() {
@@ -65,8 +66,8 @@ src_install() {
        echo 'FOP_HOME=/usr/share/fop/' > ${D}/etc/env.d/java/22fop
        java-pkg_dolauncher ${PN} --main org.apache.fop.apps.Fop
 
+       dodoc CHANGES STATUS README || die
        if use doc; then
-               dodoc CHANGES STATUS README
                java-pkg_dohtml -r ReleaseNotes.html build/javadocs/*
        fi