Fixed to work with JAVA_PKG_STRICT and changed src_test dependencies to use the test use flag instead of junit.

Package-Manager: portage-2.1.1

3 files changed, 36 insertions, 16 deletions

diff --git a/dev-java/junitperf/ChangeLog b/dev-java/junitperf/ChangeLog
index dde89a572e9a..ff744bb1d6cc 100644
--- a/dev-java/junitperf/ChangeLog
+++ b/dev-java/junitperf/ChangeLog
@@ -1,6 +1,11 @@
 # 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.8 2006/08/07 19:08:07 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junitperf/ChangeLog,v 1.9 2006/09/09 07:27:38 betelgeuse Exp $
+
+  09 Sep 2006; Petteri Räty <betelgeuse@gentoo.org>
+  junitperf-1.9.1-r1.ebuild:
+  Fixed to work with JAVA_PKG_STRICT and changed src_test dependencies to use
+  the test use flag instead of junit.
 
   07 Aug 2006; Joshua Nichols <nichoj@gentoo.org> junitperf-1.9.1-r1.ebuild:
   Removed jikes in DEPEND, bug #143102.
diff --git a/dev-java/junitperf/Manifest b/dev-java/junitperf/Manifest
index 0f1fdf82e1b4..f049650283c3 100644
--- 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 919 RMD160 1b6ee452386b5541aa1148be969f4f1c26076c40 SHA1 eb363fb19003203e9a76c179581b6356bcbe8756 SHA256 c939146b3722830f8b3421a63a12855827432e3c155c24441e0bc12ed0258a6e
-MD5 f7624c12871f1d12866688cbb942c720 junitperf-1.9.1-r1.ebuild 919
-RMD160 1b6ee452386b5541aa1148be969f4f1c26076c40 junitperf-1.9.1-r1.ebuild 919
-SHA256 c939146b3722830f8b3421a63a12855827432e3c155c24441e0bc12ed0258a6e junitperf-1.9.1-r1.ebuild 919
+EBUILD junitperf-1.9.1-r1.ebuild 1025 RMD160 f31ba730eb92f3c756dcfa3ecfe3414732b8239f SHA1 34c80ed984669e63418a3114f2bab9f59713979e SHA256 31eacee0a831a333554fc9f4d67bdfa69fe6a51e9ff90288673907e64094d0bd
+MD5 2bfb9ed2c8773dd46f26714c356596b0 junitperf-1.9.1-r1.ebuild 1025
+RMD160 f31ba730eb92f3c756dcfa3ecfe3414732b8239f junitperf-1.9.1-r1.ebuild 1025
+SHA256 31eacee0a831a333554fc9f4d67bdfa69fe6a51e9ff90288673907e64094d0bd junitperf-1.9.1-r1.ebuild 1025
 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 1383 RMD160 cf4e5f095f92cc572cb62591fa8ae41918bb7a59 SHA1 465d37506aef808b0fa2e3b24f7504546f4a2139 SHA256 c426af4f266895bad7f51a376ec12494dd9926e10de7c52d93ed509b60070edf
-MD5 359a83f408852f9d47096e3828b80ef1 ChangeLog 1383
-RMD160 cf4e5f095f92cc572cb62591fa8ae41918bb7a59 ChangeLog 1383
-SHA256 c426af4f266895bad7f51a376ec12494dd9926e10de7c52d93ed509b60070edf ChangeLog 1383
+MISC ChangeLog 1586 RMD160 0e4c411954944cdda2265126b1b3a3064c8e4d74 SHA1 fd14c99fee3bdc70f2e5b44fd470bb6e3f4681c0 SHA256 3c2b0cf7c748fa541754786470e45ffdca12e08c16c8a7f0e4fa1a9d77df4aed
+MD5 dc40caaecc15fc1a531820daa79f2084 ChangeLog 1586
+RMD160 0e4c411954944cdda2265126b1b3a3064c8e4d74 ChangeLog 1586
+SHA256 3c2b0cf7c748fa541754786470e45ffdca12e08c16c8a7f0e4fa1a9d77df4aed ChangeLog 1586
 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 v1.4.5 (GNU/Linux)
+
+iD8DBQFFAmz1cxLzpIGCsLQRAmCWAJ0bEnwIpRh8NO4SBqz/8bO06OXApwCdGe+z
+cbkjMnfxIV6bkyRcN4LgTLc=
+=ob/4
+-----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 6b0b5cf98273..29a806f752f5 100644
--- a/dev-java/junitperf/junitperf-1.9.1-r1.ebuild
+++ b/dev-java/junitperf/junitperf-1.9.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2006 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.2 2006/08/07 19:08:07 nichoj Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/junitperf/junitperf-1.9.1-r1.ebuild,v 1.3 2006/09/09 07:27:38 betelgeuse Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -10,19 +10,24 @@ HOMEPAGE="http://www.clarkware.com/software/JUnitPerf.html"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~ppc ~x86"
-IUSE="doc junit source"
+IUSE="doc test source"
+
+RDEPEND=">=virtual/jre-1.3
+	dev-java/junit"
+
 DEPEND=">=virtual/jdk-1.3
+	${RDEPEND}
 	app-arch/unzip
 	dev-java/ant-core
-	junit? ( dev-java/ant-tasks )
+	test? ( dev-java/ant-tasks )
 	source? ( app-arch/zip )"
 
-RDEPEND=">=virtual/jre-1.3
-	dev-java/junit"
 
 src_unpack () {
 	unpack ${A}
-	rm ${S}/lib/*.jar
+	rm "${S}"/lib/*.jar
+	cd "${S}"/lib
+	java-pkg_jar-from junit
 }
 
 src_compile() {
@@ -30,7 +35,7 @@ src_compile() {
 }
 
 src_test() {
-	eant test
+	eant -lib $(java-pkg_getjar ant-tasks ant-junit.jar) test
 }
 
 src_install() {