Fixed tests running with java-strict. Also calls ensure-test to make sure test depend...

Package-Manager: portage-2.1.1_pre4-r2

diff --git a/dev-java/lucene/ChangeLog b/dev-java/lucene/ChangeLog
index e9fd3fb1ee4c93f2d0d95a39ad3b2b1646ca8342..18960017bc6e5465c5ee4ac01f846a4af8f80d8f 100644 (file)
--- 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.18 2006/07/22 20:49:46 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/ChangeLog,v 1.19 2006/08/05 21:18:04 nichoj Exp $
+
+  05 Aug 2006; Joshua Nichols <nichoj@gentoo.org> lucene-1.4.3-r2.ebuild:
+  Fixed tests running with java-strict. Also calls ensure-test to make sure
+  test dependencies get pulled in via USE=test.
 
   22 Jul 2006; Krzysiek Pawlik <nelchael@gentoo.org> lucene-1.4.3-r2.ebuild:
   ant_src_unpack -> src_unpack

diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest
index c2f05804c68856df2a91298768abb3a71d552ff8..5386d6b59a91fcfa911f6f72b8327b2f65bf0025 100644 (file)
--- a/dev-java/lucene/Manifest
+++ b/dev-java/lucene/Manifest
@@ -1,24 +1,21 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 DIST lucene-1.4.1-src.tar.gz 764565
 DIST lucene-1.4.3-src.tar.gz 768320 RMD160 e865c15885722e87c437d36e60fabd333976fb14 SHA1 7a7b62aa57ca4bae3a83c37aeb494592a677ef01 SHA256 62051daecebbae50c4e9d1c4d840f32fc58d85b0a5b370095c98e346c9ba1049
 EBUILD lucene-1.4.1.ebuild 1121 RMD160 db9626f7a683d968e9ddb90f57caad32dad85539 SHA1 79cf380931647355613e6afe640da2640a07d5fe SHA256 c1e7312c3f515b3a19f56fac94f6fd247b3a788636fb56f54a143b74057da2b0
 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 1010 RMD160 7e7128cdc0c2459b29b6b5a1cb703c13187aac2d SHA1 0b2f67f2bd59f97533406521ffbd449c79a1632a SHA256 1a5bb73729fc9ce7f739d4d8567a5454063d23e623880d8e767d12945d7f43ba
-MD5 a41495d8494f8a98e1d17dd647a8d73c lucene-1.4.3-r2.ebuild 1010
-RMD160 7e7128cdc0c2459b29b6b5a1cb703c13187aac2d lucene-1.4.3-r2.ebuild 1010
-SHA256 1a5bb73729fc9ce7f739d4d8567a5454063d23e623880d8e767d12945d7f43ba lucene-1.4.3-r2.ebuild 1010
+EBUILD lucene-1.4.3-r2.ebuild 1069 RMD160 a16d3e60dfc5f8bab443d1314f86ebc1bde21600 SHA1 b473cf3c24ede7c06f6ad8d5eec9968c671a1d29 SHA256 9fdc96cab94f10ec988975a58edb765be26a61f54d289c01d15028237555a3e6
+MD5 393432a8f0b33d052bf343c0e64dfb31 lucene-1.4.3-r2.ebuild 1069
+RMD160 a16d3e60dfc5f8bab443d1314f86ebc1bde21600 lucene-1.4.3-r2.ebuild 1069
+SHA256 9fdc96cab94f10ec988975a58edb765be26a61f54d289c01d15028237555a3e6 lucene-1.4.3-r2.ebuild 1069
 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 2315 RMD160 e79b648de00e66bf9841b6de1f89f6e903453302 SHA1 2bd59d104ab3f5089729c6f7834cee191c7dacd9 SHA256 be5b4d1ff3d8510ac34a06fb8c0ce6843b61701cdad108e8968c4571a1d6c01f
-MD5 822b3de60ba12abd162b89cd4b9007b9 ChangeLog 2315
-RMD160 e79b648de00e66bf9841b6de1f89f6e903453302 ChangeLog 2315
-SHA256 be5b4d1ff3d8510ac34a06fb8c0ce6843b61701cdad108e8968c4571a1d6c01f ChangeLog 2315
+MISC ChangeLog 2512 RMD160 b17d6053879d65f214d5e871c816d16cfd97120f SHA1 2467074905f5e42d79ca822e978b2313b17501df SHA256 f90cc949d02454fde39df285a5d735147bd0ea60a8e8f555fbe1e1661dd78ef7
+MD5 81fa2ac7290a81f9ccb142b864b04d82 ChangeLog 2512
+RMD160 b17d6053879d65f214d5e871c816d16cfd97120f ChangeLog 2512
+SHA256 f90cc949d02454fde39df285a5d735147bd0ea60a8e8f555fbe1e1661dd78ef7 ChangeLog 2512
 MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
@@ -32,10 +29,3 @@ SHA256 2a543b1c331e9d4b66fb868741b4cffe832758e0137bbca6540adfb8cc7cefc2 files/di
 MD5 da735d3f5336c345c46257a9186fd020 files/digest-lucene-1.4.3-r2 250
 RMD160 6d86a59a67c2db8125199e3ea6a5a79f39072540 files/digest-lucene-1.4.3-r2 250
 SHA256 2a543b1c331e9d4b66fb868741b4cffe832758e0137bbca6540adfb8cc7cefc2 files/digest-lucene-1.4.3-r2 250
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.4 (GNU/Linux)
-
-iD8DBQFEwo9zgo/w9rxVVVERAk6HAJoDfvcRFd/1SWwsOQgfeE1+7eyt7ACgwlOT
-Xq254h5Cu0NRdx+qvb04TsQ=
-=iFQR
------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 d8d13c96f9ae36c4726230f3df8ac2e718783d82..e5c038d7fabed76acd3ef409e0a370daaf4b1b2b 100644 (file)
--- 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.2 2006/07/22 20:49:46 nelchael Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-1.4.3-r2.ebuild,v 1.3 2006/08/05 21:18:04 nichoj Exp $
 
 inherit java-pkg-2 java-ant-2
 
@@ -16,6 +16,11 @@ DEPEND=">=virtual/jdk-1.2
        test? ( dev-java/junit )"
 RDEPEND=">=virtual/jdk-1.2"
 
+pkg_setup() {
+       java-pkg_ensure-test
+       java-pkg-2_pkg_setup
+}
+
 src_unpack() {
        unpack ${A}
        cd ${S}/lib