no longer use packed jars, #63281. Thanks too Jan Brinkmann <lucky@the-luckyduck.de>

3 files changed, 36 insertions, 9 deletions

diff --git a/dev-java/lucene/ChangeLog b/dev-java/lucene/ChangeLog
index c8b123b15b9b..39368418f2cb 100644
--- a/dev-java/lucene/ChangeLog
+++ b/dev-java/lucene/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/lucene
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/ChangeLog,v 1.11 2004/10/22 11:28:24 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/ChangeLog,v 1.12 2004/10/26 12:35:56 axxo Exp $
+
+  26 Oct 2004; <keanu@gentoo.org> lucene-1.4.1.ebuild:
+  no longer use packed jars, #63281. Thanks too Jan Brinkmann
+  <lucky@the-luckyduck.de>
 
   22 Oct 2004; Dylan Carlson <absinthe@gentoo.org> lucene-1.3-r1.ebuild,
   lucene-1.3.ebuild, lucene-1.4.1.ebuild, lucene-1.4.ebuild:
diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest
index f463082762bc..19b3ebf5cf4a 100644
--- a/dev-java/lucene/Manifest
+++ b/dev-java/lucene/Manifest
@@ -1,10 +1,20 @@
-MD5 75382adbcb24d7ea732e3ca1c8c99d83 ChangeLog 1369
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 MD5 dc784f64c53fdf70a13d05fc6fb1ff60 lucene-1.3-r1.ebuild 1004
-MD5 f9cf6f08ba7171c6b2697b04b1553663 lucene-1.3.ebuild 995
-MD5 ec274c89ba9bda0ae132a025e9bad568 lucene-1.4.1.ebuild 1022
 MD5 e3d4dbabdc4dec0e4927a8c8b0e42fdf lucene-1.4.ebuild 1042
+MD5 f9cf6f08ba7171c6b2697b04b1553663 lucene-1.3.ebuild 995
+MD5 d0d67c71dd907ad61559c68c8adb75f4 lucene-1.4.1.ebuild 1176
+MD5 2145b912f9bbe2f71c4f2712d7d3f528 ChangeLog 1510
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 MD5 549b80eb695d78b55dea8a631a0459a8 files/digest-lucene-1.3 72
-MD5 549b80eb695d78b55dea8a631a0459a8 files/digest-lucene-1.3-r1 72
 MD5 d330ca472f9e54660d9c2ec948ef4679 files/digest-lucene-1.4 72
 MD5 84b227f88b109a09a80f28cdc619bebc files/digest-lucene-1.4.1 68
+MD5 549b80eb695d78b55dea8a631a0459a8 files/digest-lucene-1.3-r1 72
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.2.6 (GNU/Linux)
+
+iD8DBQFBfkTl/rLF9B432nYRArySAJ9iuTC0E9BW4kOseiPVPb/yTe1rYwCfXGC6
+EGmXtHs7N3aVjzeTvXgo+CM=
+=vYf/
+-----END PGP SIGNATURE-----
diff --git a/dev-java/lucene/lucene-1.4.1.ebuild b/dev-java/lucene/lucene-1.4.1.ebuild
index 3a8cd06fc0ad..f4260277f05c 100644
--- a/dev-java/lucene/lucene-1.4.1.ebuild
+++ b/dev-java/lucene/lucene-1.4.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-1.4.1.ebuild,v 1.3 2004/10/22 11:28:24 absinthe Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-1.4.1.ebuild,v 1.4 2004/10/26 12:35:56 axxo Exp $
 
 inherit java-pkg
 
@@ -10,23 +10,36 @@ SRC_URI="http://cvs.apache.org/dist/jakarta/lucene/v1.4.1/${P}-src.tar.gz"
 LICENSE="Apache-1.1"
 SLOT="1"
 KEYWORDS="~x86 ~ppc ~amd64"
-IUSE="jikes doc"
+IUSE="jikes doc junit"
 DEPEND=">=virtual/jdk-1.2
 		>=dev-java/ant-1.5
-		jikes? ( dev-java/jikes )"
+		jikes? ( dev-java/jikes )
+		junit? ( dev-java/junit )"
 RDEPEND=">=virtual/jdk-1.2"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}/lib
+	rm -f *.jar
+	java-pkg_jar-from junit
+}
+
+
 src_compile() {
 	local antflags="jar-core"
 	use jikes && antflags="${antflags} -Dbuild.compiler=jikes"
 	use doc && antflags="${antflags} javadocs"
 	ant ${antflags} || die "compilation failed"
+
+	if use junit; then
+		ant test || die "Junit test failed"
+	fi
 }
 
 src_install() {
 	dodoc CHANGES.txt README.txt
 	cd build
 	mv lucene-1.5-rc1-dev.jar ${PN}.jar || die "mv failed"
-	java-pkg_dojar ${PN}.jar || die "dojar failed"
+	java-pkg_dojar ${PN}.jar
 	use doc && java-pkg_dohtml -r docs/*
 }