java-pkg-2.eclass now automatically calls java-pkg_ensure-test so no need to use it in ebuilds.

Package-Manager: portage-2.1.2_rc2-r3

3 files changed, 17 insertions, 19 deletions

diff --git a/dev-java/lucene/ChangeLog b/dev-java/lucene/ChangeLog
index da103b10b1f2..3f338a68943e 100644
--- a/dev-java/lucene/ChangeLog
+++ b/dev-java/lucene/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/lucene
 # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/ChangeLog,v 1.23 2006/10/29 21:42:12 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/ChangeLog,v 1.24 2006/12/08 12:14:53 betelgeuse Exp $
+
+  08 Dec 2006; Petteri Räty <betelgeuse@gentoo.org> lucene-1.4.3-r2.ebuild:
+  java-pkg-2.eclass now automatically calls java-pkg_ensure-test so no need to
+  use it in ebuilds.
 
   29 Oct 2006; Petteri Räty <betelgeuse@gentoo.org> lucene-1.4.3-r2.ebuild:
   Now depens on ant-tasks only with the test use flag turned on (bug #110337).
diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest
index ca4536900e6d..0d221698771d 100644
--- a/dev-java/lucene/Manifest
+++ b/dev-java/lucene/Manifest
@@ -7,18 +7,18 @@ EBUILD lucene-1.4.1.ebuild 1121 RMD160 db9626f7a683d968e9ddb90f57caad32dad85539
 MD5 d8d2ca7642c62102d493f0ee7534da07 lucene-1.4.1.ebuild 1121
 RMD160 db9626f7a683d968e9ddb90f57caad32dad85539 lucene-1.4.1.ebuild 1121
 SHA256 c1e7312c3f515b3a19f56fac94f6fd247b3a788636fb56f54a143b74057da2b0 lucene-1.4.1.ebuild 1121
-EBUILD lucene-1.4.3-r2.ebuild 1101 RMD160 3062c7c64be24e35177d26dfcd971973b4ec03aa SHA1 2c188abce1f2f86979e4af020786a7ee76d565a8 SHA256 ebdccecbace49ff7dcf40ed6b5144b6e83e3b3b84505a0d8f7bb7478fee09edf
-MD5 4b1df6323f33780a29ee7729bd1f6ec1 lucene-1.4.3-r2.ebuild 1101
-RMD160 3062c7c64be24e35177d26dfcd971973b4ec03aa lucene-1.4.3-r2.ebuild 1101
-SHA256 ebdccecbace49ff7dcf40ed6b5144b6e83e3b3b84505a0d8f7bb7478fee09edf lucene-1.4.3-r2.ebuild 1101
+EBUILD lucene-1.4.3-r2.ebuild 1039 RMD160 ce97a3b9504086832e9cf81f20a47a8324a2778c SHA1 64c97aeddf2804c31f21b565e15baa103574b656 SHA256 03fe115c9f4e9ab769cf1c090af8910ca7fc42b570ffbebb5bb7ca7757f2efe7
+MD5 77beaf3ffb7d5a560949390076f274e7 lucene-1.4.3-r2.ebuild 1039
+RMD160 ce97a3b9504086832e9cf81f20a47a8324a2778c lucene-1.4.3-r2.ebuild 1039
+SHA256 03fe115c9f4e9ab769cf1c090af8910ca7fc42b570ffbebb5bb7ca7757f2efe7 lucene-1.4.3-r2.ebuild 1039
 EBUILD lucene-1.4.3.ebuild 1170 RMD160 40ac10e1eb29012a90721e17ed41b6e01369c0a1 SHA1 bf6c225b0ce2f3dd2ecb9eb50467725f5c2011a6 SHA256 9df80ee63eb34d962219b58152702a3e796ecc622cbb3fbf3903db7ce9bd5d5a
 MD5 89ff4b187a0827924f8acc36cb3fe84b lucene-1.4.3.ebuild 1170
 RMD160 40ac10e1eb29012a90721e17ed41b6e01369c0a1 lucene-1.4.3.ebuild 1170
 SHA256 9df80ee63eb34d962219b58152702a3e796ecc622cbb3fbf3903db7ce9bd5d5a lucene-1.4.3.ebuild 1170
-MISC ChangeLog 2989 RMD160 7f5ccb4cddf5028e8f80d19dc9b7bad2d5fb6dc9 SHA1 47e3a3153111cb51a6bcb7042c256b99085299b8 SHA256 46662e5887108502d6657667b57c89a802e2737007fb5e1754da873554633957
-MD5 fbef36560aa3510ce37b21cfb54b1423 ChangeLog 2989
-RMD160 7f5ccb4cddf5028e8f80d19dc9b7bad2d5fb6dc9 ChangeLog 2989
-SHA256 46662e5887108502d6657667b57c89a802e2737007fb5e1754da873554633957 ChangeLog 2989
+MISC ChangeLog 3167 RMD160 904ef1591b1230775d42b3771ad46b68a29223f1 SHA1 d5cc3a993f93559185bdf5879070039be730e348 SHA256 f3025a2445a2ae1f3abd39c9a9ce26c99bab7a71d4ba039a1f1d95f47a8fcecb
+MD5 9cb9c92bfbf426f754e644b6b754648e ChangeLog 3167
+RMD160 904ef1591b1230775d42b3771ad46b68a29223f1 ChangeLog 3167
+SHA256 f3025a2445a2ae1f3abd39c9a9ce26c99bab7a71d4ba039a1f1d95f47a8fcecb ChangeLog 3167
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -35,7 +35,7 @@ SHA256 2a543b1c331e9d4b66fb868741b4cffe832758e0137bbca6540adfb8cc7cefc2 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.5 (GNU/Linux)
 
-iD8DBQFFRSBAcxLzpIGCsLQRAivwAJ4yqPFwt0nb9lLVpOXI2oCr8L0lCwCePeaa
-AswgLJQRIal9+q9eTLtCvno=
-=sc7G
+iD8DBQFFeVdGcxLzpIGCsLQRAuYxAJ9DCswc3MjwSQY9G1RqUkHK4bE/UACaA8WJ
+K6p/Cn0716AugJZQy6L089s=
+=m8oq
 -----END PGP SIGNATURE-----
diff --git a/dev-java/lucene/lucene-1.4.3-r2.ebuild b/dev-java/lucene/lucene-1.4.3-r2.ebuild
index 3e97f044151b..81237c769296 100644
--- a/dev-java/lucene/lucene-1.4.3-r2.ebuild
+++ b/dev-java/lucene/lucene-1.4.3-r2.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/lucene/lucene-1.4.3-r2.ebuild,v 1.7 2006/10/29 21:42:12 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-1.4.3-r2.ebuild,v 1.8 2006/12/08 12:14:53 betelgeuse Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -16,11 +16,6 @@ DEPEND=">=virtual/jdk-1.2
 	test? ( dev-java/junit dev-java/ant-tasks )"
 RDEPEND=">=virtual/jdk-1.2"
 
-pkg_setup() {
-	java-pkg_ensure-test
-	java-pkg-2_pkg_setup
-}
-
 src_unpack() {
 	unpack ${A}
 	cd ${S}/lib
@@ -28,7 +23,6 @@ src_unpack() {
 	use test && java-pkg_jar-from junit
 }
 
-
 src_compile() {
 	eant jar-core $(use_doc javadocs)
 }