Migrate to splitted ant.

Package-Manager: portage-2.1.2.3

diff --git a/dev-java/tagsoup/ChangeLog b/dev-java/tagsoup/ChangeLog
index d69b694f9d68c852034880c0c7908236cecc1c2b..ef521e1e9a2dff18b588bab8529a63403d7fb020 100644 (file)
--- a/dev-java/tagsoup/ChangeLog
+++ b/dev-java/tagsoup/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/tagsoup
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tagsoup/ChangeLog,v 1.13 2007/02/14 08:21:14 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tagsoup/ChangeLog,v 1.14 2007/04/04 13:29:39 betelgeuse Exp $
+
+  04 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
+  tagsoup-0.10.2-r1.ebuild:
+  Migrate to splitted ant.
 
   14 Feb 2007; Markus Rothe <corsair@gentoo.org> tagsoup-0.10.2-r1.ebuild:
   Added ~ppc64

diff --git a/dev-java/tagsoup/Manifest b/dev-java/tagsoup/Manifest
index 8b95ef2911638205d5834f26ef21b3ad0a8419c1..000f9c6355e06def5e543e6cb2c779248cdbe565 100644 (file)
--- a/dev-java/tagsoup/Manifest
+++ b/dev-java/tagsoup/Manifest
@@ -1,16 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST tagsoup-0.10.2-src.zip 63115 RMD160 4f1e6c5e56e50f742f460829952044b40c08bae8 SHA1 ec8e5ef85f1095ce630492e8e3332981b75ae210 SHA256 40648a99e910769cf029a3e526f564f254bd05add803871387e5d0b1fa2affc1
-EBUILD tagsoup-0.10.2-r1.ebuild 906 RMD160 74fce4d5d8b205a5bc23fc8b2ee753787d67b98f SHA1 a23d4527d0d756f539dbd22ec655f53627b6be7e SHA256 057a3c0aa28af6945127c4116eabb51da9023499fd35f576b0b98df2fad64491
-MD5 3123cc562edc459fc098e48a2222fdd8 tagsoup-0.10.2-r1.ebuild 906
-RMD160 74fce4d5d8b205a5bc23fc8b2ee753787d67b98f tagsoup-0.10.2-r1.ebuild 906
-SHA256 057a3c0aa28af6945127c4116eabb51da9023499fd35f576b0b98df2fad64491 tagsoup-0.10.2-r1.ebuild 906
+EBUILD tagsoup-0.10.2-r1.ebuild 970 RMD160 654c8ca9e61ba5470f42126be2dc61546944b717 SHA1 d47a17b2c9339741cffdd635e9b429bc82a75893 SHA256 58f46614a50f992ccb77b259b462b5044db3db9627dfe602fe72426efab6e496
+MD5 dc06b499215f9eb5d8c5b2b1c3df2136 tagsoup-0.10.2-r1.ebuild 970
+RMD160 654c8ca9e61ba5470f42126be2dc61546944b717 tagsoup-0.10.2-r1.ebuild 970
+SHA256 58f46614a50f992ccb77b259b462b5044db3db9627dfe602fe72426efab6e496 tagsoup-0.10.2-r1.ebuild 970
 EBUILD tagsoup-0.10.2.ebuild 1165 RMD160 3df1f38c68cdaabdb066a7ed17f136f3595d7cc4 SHA1 bd5631e66c25d9de33f2eef846b63679d6e974af SHA256 a87776b4279b04e43cbd66beba5ac13a3e68abec48696b0184dd89ef5df29fc8
 MD5 a1d0fad121118497e2024676ec80c8f0 tagsoup-0.10.2.ebuild 1165
 RMD160 3df1f38c68cdaabdb066a7ed17f136f3595d7cc4 tagsoup-0.10.2.ebuild 1165
 SHA256 a87776b4279b04e43cbd66beba5ac13a3e68abec48696b0184dd89ef5df29fc8 tagsoup-0.10.2.ebuild 1165
-MISC ChangeLog 1867 RMD160 53805bffdf687ef0dea3f6a3f2ca35cde44fcd88 SHA1 126e1bbf1f08bd1de2142f3014326f755e215bad SHA256 9daa76578d2fa0c9ec7b2975822ef46e597adc637d49f654e822784892655fa6
-MD5 94bbd5d92a8291e6b927db4f9779ef03 ChangeLog 1867
-RMD160 53805bffdf687ef0dea3f6a3f2ca35cde44fcd88 ChangeLog 1867
-SHA256 9daa76578d2fa0c9ec7b2975822ef46e597adc637d49f654e822784892655fa6 ChangeLog 1867
+MISC ChangeLog 1979 RMD160 1d93d856edd003ef5e20a421b7d6cccee68768d9 SHA1 3f1602c812011fbf06c32b8dd50c354dc13bbca2 SHA256 df72544ed8baaa4a8817923b891057b441d24c3acf96b0bc7c4ed47574b5dd5a
+MD5 043c556fc57531d6c55fe1f32728e775 ChangeLog 1979
+RMD160 1d93d856edd003ef5e20a421b7d6cccee68768d9 ChangeLog 1979
+SHA256 df72544ed8baaa4a8817923b891057b441d24c3acf96b0bc7c4ed47574b5dd5a ChangeLog 1979
 MISC metadata.xml 423 RMD160 d59c03d53cbf6de7942604cbf69e24e16473fe7a SHA1 69edd979c37d4cf050f81b314a8d380097c4bc29 SHA256 c66aba8d54011bf2679dd23b327fcb991c0378061bbf0fc97b984301477a11ad
 MD5 c8c7cf9dcee8db7bcbe94b0fe702792b metadata.xml 423
 RMD160 d59c03d53cbf6de7942604cbf69e24e16473fe7a metadata.xml 423
@@ -21,3 +24,10 @@ SHA256 766e889557d0d9386cca9d90299bd0272f9c0abf4b5a69bc92fb3f897c7f39fe files/di
 MD5 0f1e79192e6367cc6fcda70d44ee522d files/digest-tagsoup-0.10.2-r1 244
 RMD160 658b43f2b6e78255e77aa26402b60f8b3dd9064c files/digest-tagsoup-0.10.2-r1 244
 SHA256 766e889557d0d9386cca9d90299bd0272f9c0abf4b5a69bc92fb3f897c7f39fe files/digest-tagsoup-0.10.2-r1 244
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGE6hKcxLzpIGCsLQRAhEnAKCP7bBw6frCaBuPag2ZFr6sTtysugCfUxhV
+xwh1oDrSJoNeHwqGVvrziPo=
+=r97F
+-----END PGP SIGNATURE-----

diff --git a/dev-java/tagsoup/tagsoup-0.10.2-r1.ebuild b/dev-java/tagsoup/tagsoup-0.10.2-r1.ebuild
index 220c922a19318a29e1967bc438fde149199cc45f..1cba14c016c7ff57f3b4376cf4fd98645e792623 100644 (file)
--- a/dev-java/tagsoup/tagsoup-0.10.2-r1.ebuild
+++ b/dev-java/tagsoup/tagsoup-0.10.2-r1.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/tagsoup/tagsoup-0.10.2-r1.ebuild,v 1.5 2007/02/14 08:21:14 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/tagsoup/tagsoup-0.10.2-r1.ebuild,v 1.6 2007/04/04 13:29:39 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc source"
 
 inherit java-pkg-2 java-ant-2
 
@@ -16,18 +18,17 @@ IUSE="doc source"
 # Needs the xslt task so full ant here
 DEPEND=">=virtual/jdk-1.4
        app-arch/unzip
-       dev-java/ant
-       source? ( app-arch/zip )"
+       || ( dev-java/ant-trax dev-java/ant-tasks )"
 RDEPEND=">=virtual/jre-1.4"
 
 src_compile() {
-       eant $(use_doc docs-api) dist
+       ANT_TASKS="ant-trax" eant $(use_doc docs-api) dist
 }
 
 src_install() {
        java-pkg_newjar dist/lib/${P}.jar ${PN}.jar
 
-       dodoc CHANGES README TODO
+       dodoc CHANGES README TODO || die
        use doc && java-pkg_dojavadoc docs/api
        use source && java-pkg_dosrc src/{java,templates}/*
 }