Revision bump to use new Java system.

Package-Manager: portage-2.1.1_pre2-r4

6 files changed, 81 insertions, 16 deletions

diff --git a/dev-java/lucene/ChangeLog b/dev-java/lucene/ChangeLog
index 0488e805f3ab..f794255ac429 100644
--- a/dev-java/lucene/ChangeLog
+++ b/dev-java/lucene/ChangeLog
@@ -1,6 +1,12 @@
 # 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.16 2006/03/03 04:30:23 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/ChangeLog,v 1.17 2006/07/14 16:46:06 nichoj Exp $
+
+*lucene-1.4.3-r2 (14 Jul 2006)
+
+  14 Jul 2006; Joshua Nichols <jnichols@gentoo.org> lucene-1.4.3.ebuild,
+  +lucene-1.4.3-r2.ebuild:
+  Revision bump to use new Java system.
 
   03 Mar 2006; Robin H. Johnson <robbat2@gentoo.org> lucene-1.4.3.ebuild:
   Quick fix to actually install docs under build/docs/.
diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest
index c85e0e57816a..9a755d21dfa8 100644
--- a/dev-java/lucene/Manifest
+++ b/dev-java/lucene/Manifest
@@ -1,18 +1,31 @@
-MD5 78b4ec1a33a5b83422bfa703da5a5f73 ChangeLog 2032
-RMD160 0514f286e78241e19a0bc9c15fd02e1efe8b2507 ChangeLog 2032
-SHA256 8e498ad8a31408ac5718fbd7153a7ca7433aab83ca497e510665ebeb87b66d7e ChangeLog 2032
-MD5 84b227f88b109a09a80f28cdc619bebc files/digest-lucene-1.4.1 68
-RMD160 7821dc82afa7c798516ca6ef5194d27e920cdd2d files/digest-lucene-1.4.1 68
-SHA256 fd4774ec42812b50ad8d648884764c5051523ca84290ccbd9c054f9293216093 files/digest-lucene-1.4.1 68
-MD5 cbf4009f520eea7048444d3c15497b21 files/digest-lucene-1.4.3 68
-RMD160 ec6440d3851a77bb857df48fa235fa40c7db78f0 files/digest-lucene-1.4.3 68
-SHA256 71546cc61e2e942585e77dff16b435b92175b0aebc1131e2e05a48aa9f34e19f files/digest-lucene-1.4.3 68
+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
-MD5 b8249abeae13e3af0ea4e314afe14c0e lucene-1.4.3.ebuild 1171
-RMD160 6af7ec92e8ceaa8ad0909619042218858ad2420f lucene-1.4.3.ebuild 1171
-SHA256 358b1dc88cc36f79d4e98d3261b0bb6c2042a7fd7e63b3720a72b14836d2bbb0 lucene-1.4.3.ebuild 1171
+EBUILD lucene-1.4.3-r2.ebuild 1012 RMD160 8b6a05f13cd4ad0deb98a5d9ffa6dd58c209e283 SHA1 132e156a6d548835902559146473ffdbe4fe9190 SHA256 1073ed02824af3a74185d6fe63842f1074aaf95a3d67f8cb1318db41380510f5
+MD5 110f2529c60f3ee73eed49fada7d5a53 lucene-1.4.3-r2.ebuild 1012
+RMD160 8b6a05f13cd4ad0deb98a5d9ffa6dd58c209e283 lucene-1.4.3-r2.ebuild 1012
+SHA256 1073ed02824af3a74185d6fe63842f1074aaf95a3d67f8cb1318db41380510f5 lucene-1.4.3-r2.ebuild 1012
+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 2204 RMD160 13447eb3a4ac8bb0a8ae2eb744ef6fa7efd5703c SHA1 7334109fb79726e492fd304ae6c05cf61fe845ca SHA256 ceed65dd387f928eab419693461515f8fb4426e8e7fecc82193f69f34422dfad
+MD5 d45ab4960ac6fd566db3bf16b7ed3422 ChangeLog 2204
+RMD160 13447eb3a4ac8bb0a8ae2eb744ef6fa7efd5703c ChangeLog 2204
+SHA256 ceed65dd387f928eab419693461515f8fb4426e8e7fecc82193f69f34422dfad ChangeLog 2204
+MISC metadata.xml 157 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 SHA1 c37a6b9922aef61b5b3387655bccb6e3b16e0e26 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9
 MD5 a6ec7d7724fbd068ffb39b5be56134ed metadata.xml 157
 RMD160 ab0b3741457dee7531f59c4da0f0e9e8399af084 metadata.xml 157
 SHA256 295d02c5805b0257938eb80314b371daac94b8d6ea85629a902de7a824adc0c9 metadata.xml 157
+MD5 84b227f88b109a09a80f28cdc619bebc files/digest-lucene-1.4.1 68
+RMD160 7821dc82afa7c798516ca6ef5194d27e920cdd2d files/digest-lucene-1.4.1 68
+SHA256 fd4774ec42812b50ad8d648884764c5051523ca84290ccbd9c054f9293216093 files/digest-lucene-1.4.1 68
+MD5 da735d3f5336c345c46257a9186fd020 files/digest-lucene-1.4.3 250
+RMD160 6d86a59a67c2db8125199e3ea6a5a79f39072540 files/digest-lucene-1.4.3 250
+SHA256 2a543b1c331e9d4b66fb868741b4cffe832758e0137bbca6540adfb8cc7cefc2 files/digest-lucene-1.4.3 250
+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
diff --git a/dev-java/lucene/files/digest-lucene-1.4.3 b/dev-java/lucene/files/digest-lucene-1.4.3
index 4f9ad3476b2d..ad8755a6dd84 100644
--- a/dev-java/lucene/files/digest-lucene-1.4.3
+++ b/dev-java/lucene/files/digest-lucene-1.4.3
@@ -1 +1,3 @@
 MD5 ebc81ec083eb64a937cd3b51e72fa3c7 lucene-1.4.3-src.tar.gz 768320
+RMD160 e865c15885722e87c437d36e60fabd333976fb14 lucene-1.4.3-src.tar.gz 768320
+SHA256 62051daecebbae50c4e9d1c4d840f32fc58d85b0a5b370095c98e346c9ba1049 lucene-1.4.3-src.tar.gz 768320
diff --git a/dev-java/lucene/files/digest-lucene-1.4.3-r2 b/dev-java/lucene/files/digest-lucene-1.4.3-r2
new file mode 100644
index 000000000000..ad8755a6dd84
--- /dev/null
+++ b/dev-java/lucene/files/digest-lucene-1.4.3-r2
@@ -0,0 +1,3 @@
+MD5 ebc81ec083eb64a937cd3b51e72fa3c7 lucene-1.4.3-src.tar.gz 768320
+RMD160 e865c15885722e87c437d36e60fabd333976fb14 lucene-1.4.3-src.tar.gz 768320
+SHA256 62051daecebbae50c4e9d1c4d840f32fc58d85b0a5b370095c98e346c9ba1049 lucene-1.4.3-src.tar.gz 768320
diff --git a/dev-java/lucene/lucene-1.4.3-r2.ebuild b/dev-java/lucene/lucene-1.4.3-r2.ebuild
new file mode 100644
index 000000000000..f79949a497a7
--- /dev/null
+++ b/dev-java/lucene/lucene-1.4.3-r2.ebuild
@@ -0,0 +1,41 @@
+# 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.1 2006/07/14 16:46:06 nichoj Exp $
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
+HOMEPAGE="http://jakarta.apache.org/lucene"
+SRC_URI="mirror://apache/jakarta/lucene/source/${P}-src.tar.gz"
+LICENSE="Apache-1.1"
+SLOT="1"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="doc test source"
+DEPEND=">=virtual/jdk-1.2
+	>=dev-java/ant-1.5
+	test? ( dev-java/junit )"
+RDEPEND=">=virtual/jdk-1.2"
+
+ant_src_unpack() {
+	unpack ${A}
+	cd ${S}/lib
+	rm -f *.jar
+	use test && java-pkg_jar-from junit
+}
+
+
+src_compile() {
+	eant jar-core $(use_doc javadocs)
+}
+
+src_test() {
+	eant test
+}
+
+src_install() {
+	dodoc CHANGES.txt README.txt
+	java-pkg_newjar build/lucene-1.5-rc1-dev.jar ${PN}.jar
+
+	use doc && java-pkg_dohtml -r docs/* build/docs/*
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/lucene/lucene-1.4.3.ebuild b/dev-java/lucene/lucene-1.4.3.ebuild
index 86d9e8a7ca22..c84cfcef1bf6 100644
--- a/dev-java/lucene/lucene-1.4.3.ebuild
+++ b/dev-java/lucene/lucene-1.4.3.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.ebuild,v 1.4 2006/03/03 04:30:24 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-1.4.3.ebuild,v 1.5 2006/07/14 16:46:06 nichoj Exp $
 
 inherit java-pkg
 
@@ -11,11 +11,11 @@ LICENSE="Apache-1.1"
 SLOT="1"
 KEYWORDS="~amd64 ~ppc x86"
 IUSE="doc jikes junit source"
-DEPEND=">=virtual/jdk-1.2
+DEPEND=">=virtual/jdk-1.3
 	>=dev-java/ant-1.5
 	jikes? ( dev-java/jikes )
 	junit? ( dev-java/junit )"
-RDEPEND=">=virtual/jdk-1.2"
+RDEPEND=">=virtual/jdk-1.3"
 
 src_unpack() {
 	unpack ${A}