Migrate to split-ant, cleanup.

Package-Manager: portage-2.1.2.7

3 files changed, 19 insertions, 26 deletions

diff --git a/dev-java/blowfishj/ChangeLog b/dev-java/blowfishj/ChangeLog
index dd9b0b0142ad..e933ce98eed3 100644
--- a/dev-java/blowfishj/ChangeLog
+++ b/dev-java/blowfishj/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-java/blowfishj
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/blowfishj/ChangeLog,v 1.8 2007/01/14 17:24:59 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blowfishj/ChangeLog,v 1.9 2007/05/20 22:05:01 caster Exp $
+
+  20 May 2007; Vlastimil Babka <caster@gentoo.org> blowfishj-2.14-r1.ebuild:
+  Migrate to split-ant, cleanup.
 
   14 Jan 2007; Petteri Räty <betelgeuse@gentoo.org>
   blowfishj-2.14-r1.ebuild:
diff --git a/dev-java/blowfishj/Manifest b/dev-java/blowfishj/Manifest
index 6896305cf6f8..0bb8217ad90b 100644
--- a/dev-java/blowfishj/Manifest
+++ b/dev-java/blowfishj/Manifest
@@ -1,19 +1,16 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST blowfishj-2.14-src.tar.gz 33726 RMD160 121f358bcea9bfd855ca4ec8f0175d1bbc6f8dfb SHA1 487de767c4461259ecebce31be2c226266abd0c4 SHA256 d49ff16dbf320f8988886507c0065312b4660d4dfdbffb894db7ff7d6f5bfaa9
-EBUILD blowfishj-2.14-r1.ebuild 1016 RMD160 cb39a5d67e105ede38bd95e6df878b666e14b684 SHA1 4da01f1845c9c0ca559f99ebef32083b8839ec5e SHA256 1f7bd7b21849dbcf70a59dd6a2c957581ae4c16b0db19417b0e567067cb4e223
-MD5 94ba3e78a4b86eea9ab6e20e4aff3682 blowfishj-2.14-r1.ebuild 1016
-RMD160 cb39a5d67e105ede38bd95e6df878b666e14b684 blowfishj-2.14-r1.ebuild 1016
-SHA256 1f7bd7b21849dbcf70a59dd6a2c957581ae4c16b0db19417b0e567067cb4e223 blowfishj-2.14-r1.ebuild 1016
+EBUILD blowfishj-2.14-r1.ebuild 1005 RMD160 8cd31bd8ad659cb638d1be05a9250e1a0683eeba SHA1 bce230ac3ad8ad03b15e6d6ec621e43cf0125d53 SHA256 6075902550c375df4dcf83857897ca19b2edb9cf8a59ee330352820a3e209ba4
+MD5 0c0efa68748628b57547f600fbec13cb blowfishj-2.14-r1.ebuild 1005
+RMD160 8cd31bd8ad659cb638d1be05a9250e1a0683eeba blowfishj-2.14-r1.ebuild 1005
+SHA256 6075902550c375df4dcf83857897ca19b2edb9cf8a59ee330352820a3e209ba4 blowfishj-2.14-r1.ebuild 1005
 EBUILD blowfishj-2.14.ebuild 868 RMD160 14e537f7a5628febc008ff3c8269c357787863a8 SHA1 d8aa5ea029b4c4d63527e9a67051ad1ea901745c SHA256 d2dbc66391a8ecb82cbd255098699c3b6b01ea4341455ccc9683757a2125b5cd
 MD5 4ce66a9ca4d0f2c705e3742492f4de77 blowfishj-2.14.ebuild 868
 RMD160 14e537f7a5628febc008ff3c8269c357787863a8 blowfishj-2.14.ebuild 868
 SHA256 d2dbc66391a8ecb82cbd255098699c3b6b01ea4341455ccc9683757a2125b5cd blowfishj-2.14.ebuild 868
-MISC ChangeLog 1285 RMD160 727fc39b4171b8eb04c16a32b3b28a974c96d246 SHA1 4538a012b97beec01264a2cfcd6b6f536ae02476 SHA256 e53dbc37175099533fd274b0d6af0de8989590a0dd04f105420a931f88a79ce1
-MD5 09e8e5ec42f7ff23ea3ae1cd5a395feb ChangeLog 1285
-RMD160 727fc39b4171b8eb04c16a32b3b28a974c96d246 ChangeLog 1285
-SHA256 e53dbc37175099533fd274b0d6af0de8989590a0dd04f105420a931f88a79ce1 ChangeLog 1285
+MISC ChangeLog 1392 RMD160 001a731d3458c535d1d70df9dd55084890b48f43 SHA1 21ab48d5038b61628b0a7b01d1b1d63bf64373cf SHA256 23e507a7e6dd1d7156215bbf1a5847cf70b2cd8d25f044f382f24f836c501bd3
+MD5 fbb6b3a8fa9ebab1257cb6d46d559748 ChangeLog 1392
+RMD160 001a731d3458c535d1d70df9dd55084890b48f43 ChangeLog 1392
+SHA256 23e507a7e6dd1d7156215bbf1a5847cf70b2cd8d25f044f382f24f836c501bd3 ChangeLog 1392
 MISC metadata.xml 522 RMD160 ab382f3ad86313eec98c13871d4eefbf4de48de1 SHA1 84dede61acfde50f469a6b334a79b410380871f6 SHA256 8055cd829b1b896e8f07b66a4ba191cf9b3d53b108ba2a06952eefe49bcda855
 MD5 5a9bb067d26215a78abc77163d5de6fd metadata.xml 522
 RMD160 ab382f3ad86313eec98c13871d4eefbf4de48de1 metadata.xml 522
@@ -24,10 +21,3 @@ SHA256 897ea050a2d2ff1527b36b313551f4c49a37db1100db5597e7002383936b43c6 files/di
 MD5 1bb0aecd52e4c88af228e412251aeb7a files/digest-blowfishj-2.14-r1 253
 RMD160 12e58e9a098e7e14c16509fa36174d6a1e3a9e93 files/digest-blowfishj-2.14-r1 253
 SHA256 897ea050a2d2ff1527b36b313551f4c49a37db1100db5597e7002383936b43c6 files/digest-blowfishj-2.14-r1 253
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.6 (GNU/Linux)
-
-iD4DBQFFqmd1cxLzpIGCsLQRAtN1AJ0UXptKrXe/5i7ujzpjPiJ4eQGMTQCYmIgq
-owjz+81qmPjkFMxpAmGKog==
-=hMaU
------END PGP SIGNATURE-----
diff --git a/dev-java/blowfishj/blowfishj-2.14-r1.ebuild b/dev-java/blowfishj/blowfishj-2.14-r1.ebuild
index 807f530a56af..a53eddb05db4 100644
--- a/dev-java/blowfishj/blowfishj-2.14-r1.ebuild
+++ b/dev-java/blowfishj/blowfishj-2.14-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/blowfishj/blowfishj-2.14-r1.ebuild,v 1.3 2007/01/14 17:24:59 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/blowfishj/blowfishj-2.14-r1.ebuild,v 1.4 2007/05/20 22:05:01 caster Exp $
+
+JAVA_PKG_IUSE="doc source test"
 
 inherit java-pkg-2 java-ant-2
 
@@ -10,13 +12,11 @@ HOMEPAGE="http://blowfishj.sourceforge.net/index.html"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~x86 ~amd64 ~ppc"
+KEYWORDS="~amd64 ~ppc ~x86"
 IUSE="doc test source"
 
 DEPEND=">=virtual/jdk-1.4
-	dev-java/ant-core
-	app-arch/unzip
-	test? ( dev-java/junit dev-java/ant-tasks ) "
+	test? ( =dev-java/junit-3* dev-java/ant-junit ) "
 RDEPEND=">=virtual/jre-1.4"
 
 src_unpack() {
@@ -29,11 +29,11 @@ src_unpack() {
 }
 
 src_test() {
-	eant test -DJunit.present=true || die "test failed"
+	ANT_TASKS="ant-junit" eant test -DJunit.present=true
 }
 
 src_install() {
-	java-pkg_newjar target/${P}.jar ${PN}.jar
+	java-pkg_newjar target/${P}.jar
 
 	use doc && java-pkg_dojavadoc dist/docs/api
 	use source && java-pkg_dosrc src/java/net