Require >=jdk-1.5 for javacc-5.0 and drop SLOT 2. #315557

(Portage version: 2.1.11.13/cvs/Linux x86_64)

4 files changed, 131 insertions, 9 deletions

diff --git a/dev-java/lucene/ChangeLog b/dev-java/lucene/ChangeLog
index 005d4bfe7583..124abb46f143 100644
--- a/dev-java/lucene/ChangeLog
+++ b/dev-java/lucene/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-java/lucene
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/ChangeLog,v 1.89 2012/06/04 05:22:42 xmw Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/ChangeLog,v 1.90 2012/09/27 16:01:26 sera Exp $
+
+*lucene-2.4.1-r1 (27 Sep 2012)
+*lucene-2.3.2-r2 (27 Sep 2012)
+*lucene-2.2.0-r1 (27 Sep 2012)
+
+  27 Sep 2012; Ralph Sennhauser <sera@gentoo.org> -lucene-2.1.0.ebuild,
+  +lucene-2.2.0-r1.ebuild, +lucene-2.3.2-r2.ebuild, +lucene-2.4.1-r1.ebuild:
+  Require >=jdk-1.5 for javacc-5.0 and drop SLOT 2. #315557
 
   04 Jun 2012; Michael Weber <xmw@gentoo.org> lucene-3.0.3.ebuild:
   ppc stable (bug 356809)
diff --git a/dev-java/lucene/lucene-2.1.0.ebuild b/dev-java/lucene/lucene-2.2.0-r1.ebuild
index 8970995e7b07..b32954314c1e 100644
--- a/dev-java/lucene/lucene-2.1.0.ebuild
+++ b/dev-java/lucene/lucene-2.2.0-r1.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-2.1.0.ebuild,v 1.9 2011/12/19 11:35:15 sera Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-2.2.0-r1.ebuild,v 1.1 2012/09/27 16:01:26 sera Exp $
+
+EAPI=3
 
 JAVA_PKG_IUSE="doc source test"
 JAVA_PKG_BSFIX_ALL="no"
@@ -12,14 +14,14 @@ DESCRIPTION="High-performance, full-featured text search engine written entirely
 HOMEPAGE="http://lucene.apache.org"
 SRC_URI="mirror://apache/lucene/java/archive/${P}-src.tar.gz"
 LICENSE="Apache-2.0"
-SLOT="2"
-KEYWORDS="amd64 ppc x86 ~x86-fbsd"
+SLOT="2.2"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
 IUSE=""
-DEPEND=">=virtual/jdk-1.4
+DEPEND=">=virtual/jdk-1.5
 	dev-java/ant-nodeps
 	dev-java/javacc
 	test? ( dev-java/ant-junit =dev-java/junit-3* )"
-RDEPEND=">=virtual/jdk-1.4"
+RDEPEND=">=virtual/jdk-1.5"
 
 src_compile() {
 	# regenerate javacc files just because we can
@@ -27,13 +29,13 @@ src_compile() {
 	# doesn't use it - it's to fool the <available> test, first time
 	# it's useful not to have ignoresystemclasses=true...
 	ANT_TASKS="ant-nodeps javacc" eant \
-		-Djavacc.home=/usr/share/javacc/lib javacc
+		-Djavacc.home="${EPREFIX}"/usr/share/javacc/lib javacc
 	ANT_TASKS="none" eant -Dversion=${PV} jar-core jar-demo $(use_doc javadocs)
 }
 
 src_test() {
 	java-ant_rewrite-classpath common-build.xml
-	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test
+	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test-core
 }
 
 src_install() {
diff --git a/dev-java/lucene/lucene-2.3.2-r2.ebuild b/dev-java/lucene/lucene-2.3.2-r2.ebuild
new file mode 100644
index 000000000000..2a56aa2004fa
--- /dev/null
+++ b/dev-java/lucene/lucene-2.3.2-r2.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-2.3.2-r2.ebuild,v 1.1 2012/09/27 16:01:26 sera Exp $
+
+EAPI=3
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_PKG_BSFIX_ALL="no"
+JAVA_PKG_BSFIX_NAME="build.xml common-build.xml"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
+HOMEPAGE="http://lucene.apache.org"
+# when doing version bump, SRC_URI of the previous version should most probably
+# be changed to java/archive/ !
+SRC_URI="mirror://apache/lucene/java/${P}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="2.3"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE=""
+DEPEND=">=virtual/jdk-1.5
+	dev-java/ant-nodeps
+	dev-java/javacc
+	test? ( dev-java/ant-junit =dev-java/junit-3* )"
+RDEPEND=">=virtual/jdk-1.5"
+
+src_compile() {
+	# regenerate javacc files just because we can
+	# put javacc.jar on ant's classpath here even when <javacc> task
+	# doesn't use it - it's to fool the <available> test, first time
+	# it's useful not to have ignoresystemclasses=true...
+	ANT_TASKS="ant-nodeps javacc" eant \
+		-Djavacc.home="${EPREFIX}"/usr/share/javacc/lib javacc
+	ANT_TASKS="none" eant -Dversion=${PV} jar-core jar-demo $(use_doc javadocs-core javadocs-demo)
+}
+
+src_test() {
+	java-ant_rewrite-classpath common-build.xml
+	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test-core
+}
+
+src_install() {
+	dodoc CHANGES.txt README.txt || die
+	java-pkg_newjar build/${PN}-core-${PV}.jar ${PN}-core.jar
+	java-pkg_newjar build/${PN}-demos-${PV}.jar ${PN}-demos.jar
+
+	if use doc; then
+		dohtml -r docs/* || die
+		# for the core and demo subdirs
+		java-pkg_dohtml -r build/docs/api
+	fi
+	use source && java-pkg_dosrc src/java/org
+}
diff --git a/dev-java/lucene/lucene-2.4.1-r1.ebuild b/dev-java/lucene/lucene-2.4.1-r1.ebuild
new file mode 100644
index 000000000000..8c8aef88b3b5
--- /dev/null
+++ b/dev-java/lucene/lucene-2.4.1-r1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-java/lucene/lucene-2.4.1-r1.ebuild,v 1.1 2012/09/27 16:01:26 sera Exp $
+
+EAPI=3
+
+JAVA_PKG_IUSE="doc source test"
+JAVA_PKG_BSFIX_ALL="no"
+JAVA_PKG_BSFIX_NAME="build.xml common-build.xml"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
+HOMEPAGE="http://lucene.apache.org"
+# when doing version bump, SRC_URI of the previous version should most probably
+# be changed to java/archive/ !
+SRC_URI="mirror://apache/lucene/java/${P}-src.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="2.4"
+KEYWORDS="~amd64 ~ppc ~x86 ~x86-fbsd"
+IUSE=""
+DEPEND=">=virtual/jdk-1.5
+	dev-java/ant-nodeps
+	dev-java/javacc
+	test? ( dev-java/ant-junit =dev-java/junit-3* )"
+RDEPEND=">=virtual/jdk-1.5"
+
+src_prepare() {
+	sed -i -e '/-Xmax/ d' common-build.xml
+}
+
+src_compile() {
+	# regenerate javacc files just because we can
+	# put javacc.jar on ant's classpath here even when <javacc> task
+	# doesn't use it - it's to fool the <available> test, first time
+	# it's useful not to have ignoresystemclasses=true...
+	ANT_TASKS="ant-nodeps javacc" eant \
+		-Djavacc.home="${EPREFIX}"/usr/share/javacc/lib javacc
+	ANT_TASKS="none" eant -Dversion=${PV} jar-core jar-demo $(use_doc javadocs-core javadocs-demo)
+}
+
+src_test() {
+	java-ant_rewrite-classpath common-build.xml
+	EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test-core
+}
+
+src_install() {
+	dodoc CHANGES.txt README.txt || die
+	java-pkg_newjar build/${PN}-core-${PV}.jar ${PN}-core.jar
+	java-pkg_newjar build/${PN}-demos-${PV}.jar ${PN}-demos.jar
+
+	if use doc; then
+		dohtml -r docs/* || die
+		# for the core and demo subdirs
+		java-pkg_dohtml -r build/docs/api
+	fi
+	use source && java-pkg_dosrc src/java/org
+}