Migrate to splitted ant.

Package-Manager: portage-2.1.2.3

diff --git a/dev-java/junitperf/ChangeLog b/dev-java/junitperf/ChangeLog
index 842f3bf37d145aaa036e215d132a746e1be6f16e..ed5d30bef10e473ed8ecc0dc5d612bab880309ce 100644 (file)
--- a/dev-java/junitperf/ChangeLog
+++ b/dev-java/junitperf/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/junitperf
-# Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/junitperf/ChangeLog,v 1.10 2006/09/10 21:57:15 caster Exp $
+# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junitperf/ChangeLog,v 1.11 2007/04/13 09:26:08 betelgeuse Exp $
+
+  13 Apr 2007; Petteri Räty <betelgeuse@gentoo.org>
+  junitperf-1.9.1-r1.ebuild:
+  Migrate to splitted ant.
 
   10 Sep 2006; Vlastimil Babka <caster@gentoo.org>
   junitperf-1.9.1-r1.ebuild:

diff --git a/dev-java/junitperf/Manifest b/dev-java/junitperf/Manifest
index 22c709bc9d477493e75ba0a7533a84086c562210..343d63f964ba9c7b3bac3f6f20c202976ced2c5b 100644 (file)
--- a/dev-java/junitperf/Manifest
+++ b/dev-java/junitperf/Manifest
@@ -1,16 +1,19 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST junitperf-1.9.1.zip 110600 RMD160 919f8f46cdcd1bb696d6c30e41f311efc0ae14ea SHA1 ab21c22a7bdef167ba3956325ca2ec2c7fd3203a SHA256 ff350b8b6bcf79826b96ab786303dc22f0d096d2e9d333c52ac567cc4d26b79a
-EBUILD junitperf-1.9.1-r1.ebuild 973 RMD160 22c31f4ac691c415933b34bb92ecebc2e4a0cd40 SHA1 f9157db2d0d02c924a523f8a976f0cc768318d21 SHA256 525445c0801054feb743617f739efa108f6d9b91fbdab51c026634e412925730
-MD5 a9f1035b31968ec7baf4611101e3252a junitperf-1.9.1-r1.ebuild 973
-RMD160 22c31f4ac691c415933b34bb92ecebc2e4a0cd40 junitperf-1.9.1-r1.ebuild 973
-SHA256 525445c0801054feb743617f739efa108f6d9b91fbdab51c026634e412925730 junitperf-1.9.1-r1.ebuild 973
+EBUILD junitperf-1.9.1-r1.ebuild 1004 RMD160 e0dab09b59a30f20c79ac76c378a0afc08fd92a7 SHA1 5f74d13d403f03eaafa04fb507f253c67a9252c4 SHA256 3f65905a3e53689271704880131b360c5372662d08cd76ba35111073c2a462cf
+MD5 6c85ffab64c4aa182bec3f160660efcc junitperf-1.9.1-r1.ebuild 1004
+RMD160 e0dab09b59a30f20c79ac76c378a0afc08fd92a7 junitperf-1.9.1-r1.ebuild 1004
+SHA256 3f65905a3e53689271704880131b360c5372662d08cd76ba35111073c2a462cf junitperf-1.9.1-r1.ebuild 1004
 EBUILD junitperf-1.9.1.ebuild 1072 RMD160 f2a642be0d992aa842bb5c85aaf38d9eb13f370f SHA1 ff677c31eaabbcb78b60d1d68de800bfa98a13e7 SHA256 21af75526b814f0c2bdd418d3b057e0e557cb630e5a98e7e450f566367f8ffd7
 MD5 7c0aebebfccbb7d11738f1c0e1c1ac38 junitperf-1.9.1.ebuild 1072
 RMD160 f2a642be0d992aa842bb5c85aaf38d9eb13f370f junitperf-1.9.1.ebuild 1072
 SHA256 21af75526b814f0c2bdd418d3b057e0e557cb630e5a98e7e450f566367f8ffd7 junitperf-1.9.1.ebuild 1072
-MISC ChangeLog 1715 RMD160 9d349dc6bade8bebb21afa1a444f1c2add00186e SHA1 8d776cb92f2eba0bdcd8b6541f4b380a11f32580 SHA256 7f7a945e68d6a495aeda823ab1b38b16aba1391d23d9db8a08cbbe5794220808
-MD5 d66b8f197b3bf55111042adba4ad4128 ChangeLog 1715
-RMD160 9d349dc6bade8bebb21afa1a444f1c2add00186e ChangeLog 1715
-SHA256 7f7a945e68d6a495aeda823ab1b38b16aba1391d23d9db8a08cbbe5794220808 ChangeLog 1715
+MISC ChangeLog 1829 RMD160 84b6c5741c1dbde516c8402919d5a4c489c30838 SHA1 d7f016ad3b05062f43444f678a364e81a31ff809 SHA256 96f02fc36337db3bd2ca9cc5863f4e27c8e75a8e4bcf15834d198730955a6fc0
+MD5 ea5b6477c9274c76ce68f3c36fec7862 ChangeLog 1829
+RMD160 84b6c5741c1dbde516c8402919d5a4c489c30838 ChangeLog 1829
+SHA256 96f02fc36337db3bd2ca9cc5863f4e27c8e75a8e4bcf15834d198730955a6fc0 ChangeLog 1829
 MISC metadata.xml 158 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 SHA1 77cd509a8b3c377b9a24480b48a5d5481b7874f1 SHA256 ea882ceccfd160b16cf7e79de423bdcc12b3fa000f124491a6df36f5783894fb
 MD5 123cf9440c1d4ac78f2caba1624765f9 metadata.xml 158
 RMD160 493079b5fb71d66863beea1b023901c90ba81be5 metadata.xml 158
@@ -21,3 +24,10 @@ SHA256 1f30a3522cef6d5ce7e2296712b3077ed921b7c57e5c229c4028bd397d0aaac4 files/di
 MD5 0ef8ab8f55fcb4997c0d8b70bd2d8395 files/digest-junitperf-1.9.1-r1 238
 RMD160 2ac392bb9b329dd1365daaf9198ffc699896675a files/digest-junitperf-1.9.1-r1 238
 SHA256 1f30a3522cef6d5ce7e2296712b3077ed921b7c57e5c229c4028bd397d0aaac4 files/digest-junitperf-1.9.1-r1 238
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.3 (GNU/Linux)
+
+iD8DBQFGH0y1cxLzpIGCsLQRAqKqAJ48QtpKeg3e0p7jK5TUOuTcQq1nvACZAU/3
+PNB2L1li981LZXscNCOdRyg=
+=6wtp
+-----END PGP SIGNATURE-----

diff --git a/dev-java/junitperf/junitperf-1.9.1-r1.ebuild b/dev-java/junitperf/junitperf-1.9.1-r1.ebuild
index 7fe0e30ae6c7cd9148a483bb8a5cedb2d6a2daec..5d4422341ba6a7bff4c86575ee7210bd73f2fafd 100644 (file)
--- a/dev-java/junitperf/junitperf-1.9.1-r1.ebuild
+++ b/dev-java/junitperf/junitperf-1.9.1-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/junitperf/junitperf-1.9.1-r1.ebuild,v 1.4 2006/09/10 21:57:15 caster Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junitperf/junitperf-1.9.1-r1.ebuild,v 1.5 2007/04/13 09:26:08 betelgeuse Exp $
+
+JAVA_PKG_IUSE="doc test source"
 
 inherit java-pkg-2 java-ant-2
 
@@ -10,7 +12,8 @@ HOMEPAGE="http://www.clarkware.com/software/JUnitPerf.html"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc test source"
+
+IUSE=""
 
 RDEPEND=">=virtual/jre-1.3
        dev-java/junit"
@@ -18,9 +21,7 @@ RDEPEND=">=virtual/jre-1.3
 DEPEND=">=virtual/jdk-1.3
        ${RDEPEND}
        app-arch/unzip
-       dev-java/ant-core
-       test? ( dev-java/ant-tasks )
-       source? ( app-arch/zip )"
+       test? ( || ( dev-java/ant-junit dev-java/ant-tasks ) )"
 
 
 src_unpack () {
@@ -35,12 +36,12 @@ src_compile() {
 }
 
 src_test() {
-       eant test
+       ANT_TASKS="ant-junit" eant test
 }
 
 src_install() {
        java-pkg_dojar lib/${PN}.jar
-       dodoc README
-       use doc && java-pkg_dohtml -r docs/api/*
+       dodoc README || die
+       use doc && java-pkg_dojavadoc docs/api
        use source && java-pkg_dosrc src/app/*
 }