[gentoo-commits] proj/sci:master commit in: dev-java/lucene/

[gentoo-commits] proj/sci:master commit in: dev-java/lucene/

[Andrew Ammerlaan]

commit:     a89b80956fb1dd2904d4504092a542698234b36e
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Sun Mar 21 13:24:33 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Sun Mar 21 13:24:33 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=a89b8095

dev-java/lucene: add dep on morfologik

Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 dev-java/lucene/lucene-5.2.1.ebuild | 2 ++
 dev-java/lucene/lucene-8.4.0.ebuild | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/dev-java/lucene/lucene-5.2.1.ebuild b/dev-java/lucene/lucene-5.2.1.ebuild
index beadf6aab..40641e8f7 100644
--- a/dev-java/lucene/lucene-5.2.1.ebuild
+++ b/dev-java/lucene/lucene-5.2.1.ebuild
@@ -32,6 +32,7 @@ CDEPEND="
 		dev-java/commons-beanutils:1.7
 		dev-java/commons-codec:0
 		dev-java/icu4j:56
+		dev-java/morfologik:0
 	)"
 
 DEPEND="
@@ -123,6 +124,7 @@ src_compile() {
 			commons-beanutils-1.7
 			commons-codec
 			icu4j-56
+			morfologik
 			"
 		EANT_BUILD_TARGET+=" build-modules"
 		EANT_DOC_TARGET+=" javadocs-modules"

diff --git a/dev-java/lucene/lucene-8.4.0.ebuild b/dev-java/lucene/lucene-8.4.0.ebuild
index c6856b6f7..8e1290012 100644
--- a/dev-java/lucene/lucene-8.4.0.ebuild
+++ b/dev-java/lucene/lucene-8.4.0.ebuild
@@ -32,6 +32,7 @@ CDEPEND="
 		dev-java/commons-beanutils:1.7
 		dev-java/commons-codec:0
 		dev-java/icu4j:56
+		dev-java/morfologik:0
 	)"
 
 DEPEND="
@@ -138,6 +139,7 @@ src_compile() {
 			commons-beanutils-1.7
 			commons-codec
 			icu4j-56
+			morfologik
 			"
 		EANT_BUILD_TARGET+=" build-modules"
 		EANT_DOC_TARGET+=" javadocs-modules"

[gentoo-commits] proj/sci:master commit in: dev-java/lucene/

[Andrew Ammerlaan]

commit:     5b2adbc1e60ab3673e33c1301b16fba07e83f6f1
Author:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Mon Mar 22 11:26:13 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Mon Mar 22 11:26:13 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=5b2adbc1

dev-java/lucene: fix USE="modules"

Disabled the modules that we are missing deps for.
Most of them work though, added keywords

Bug: https://bugs.gentoo.org/733258
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>

 dev-java/lucene/lucene-5.2.1.ebuild | 70 ++++++++++++++++++++++++++++++-------
 dev-java/lucene/lucene-8.4.0.ebuild | 67 ++++++++++++++++++++++++++++-------
 2 files changed, 111 insertions(+), 26 deletions(-)

diff --git a/dev-java/lucene/lucene-5.2.1.ebuild b/dev-java/lucene/lucene-5.2.1.ebuild
index 40641e8f7..8038db195 100644
--- a/dev-java/lucene/lucene-5.2.1.ebuild
+++ b/dev-java/lucene/lucene-5.2.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.apache.org/dist/lucene/java/${PV}/${P}-src.tgz"
 
 LICENSE="Apache-2.0"
 SLOT="5.2"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 
 CDEPEND="
 	dev-java/ant-core:0
@@ -23,6 +23,10 @@ CDEPEND="
 	dev-java/hamcrest-core:0
 	dev-java/jflex:0
 	modules? (
+		dev-java/ant-apache-log4j:0
+		dev-java/antlr:3.5
+		dev-java/asm:9
+		dev-java/asm-commons:9
 		dev-java/junit:4
 		dev-java/jakarta-regexp:1.4
 		dev-java/commons-compress:0
@@ -32,7 +36,7 @@ CDEPEND="
 		dev-java/commons-beanutils:1.7
 		dev-java/commons-codec:0
 		dev-java/icu4j:56
-		dev-java/morfologik:0
+		dev-java/log4j:0
 	)"
 
 DEPEND="
@@ -108,6 +112,46 @@ src_prepare() {
 			-v "-Xdoclint:none --allow-script-in-comments"
 	fi
 
+	if use modules; then
+		mkdir -p analysis/icu/lib
+		java-pkg_jar-from --into analysis/icu/lib icu4j-56
+		# disable morfologik, dependency does not build
+		# disable uima, dependency does not build
+		# disable phonetic, dependency does not exist
+		sed -i \
+			-e 's/morfologik,//g' \
+			-e 's/,uima//g' \
+			-e 's/phonetic,//g' \
+			-e 's/,compile-test//g' \
+			analysis/build.xml || die
+		rm -r analysis/morfologik || die
+		rm -r analysis/uima || die
+		rm -r analysis/phonetic || die
+		# do not compile all the tests just because we want the modules
+		sed -i \
+			-e 's/name="build-modules" depends="compile-test"/name="build-modules"/g' \
+			build.xml || die
+		sed -i \
+			-e 's/, compile-test//g' \
+			module-build.xml || die
+		mkdir -p expressions/lib
+		# facet requires hppc which does not compile
+		sed -i \
+			-e '/<ant dir="${common.dir}\/facet" target="jar-core" inheritall="false">/,+2d' \
+			module-build.xml || die
+		rm -r facet || die
+		# requires spatial4j, which does not exist
+		sed -i \
+			-e '/<ant dir="${common.dir}\/spatial" target="jar-core" inheritAll="false">/,+2d' \
+			module-build.xml || die
+		rm -r spatial || die
+		# these require modules which we have disabled
+		rm -r benchmark || die
+		rm -r demo || die
+		# fails to build for unknown reasons
+		rm -r replicator || die
+	fi
+
 	java-pkg-2_src_prepare
 }
 
@@ -116,6 +160,10 @@ src_compile() {
 
 	if use modules; then
 	    EANT_GENTOO_CLASSPATH+="
+			ant-apache-log4j
+			antlr-3.5
+			asm-9
+			asm-commons-9
 			jakarta-regexp-1.4
 			commons-compress
 			commons-collections
@@ -124,7 +172,7 @@ src_compile() {
 			commons-beanutils-1.7
 			commons-codec
 			icu4j-56
-			morfologik
+			log4j
 			"
 		EANT_BUILD_TARGET+=" build-modules"
 		EANT_DOC_TARGET+=" javadocs-modules"
@@ -147,21 +195,17 @@ src_test() {
 
 src_install() {
 	einstalldocs
-	java-pkg_newjar build/core/${PN}-core-${PV}.jar ${PN}-core.jar
-
-	if use modules; then
-		local i j
-		for i in $(find build/modules -name \*-${PV}.jar); do
-		    j=${i##*/}
-			java-pkg_newjar $i ${j%%-${PV}.jar}.jar
-		done
-	fi
+	local i j
+	for i in $(find build -name \*-${PV}.jar); do
+	    j=${i##*/}
+		java-pkg_newjar $i ${j%%-${PV}.jar}.jar
+	done
 	if use doc; then
 		dodoc -r docs
 		java-pkg_dohtml -r build/docs
 	fi
 	if use source; then
 	     java-pkg_dosrc core/src/java/org
-	  	 use modules && java-pkg_dosrc modules
+	  	 use modules && java-pkg_dosrc */src */*/src
 	fi
 }

diff --git a/dev-java/lucene/lucene-8.4.0.ebuild b/dev-java/lucene/lucene-8.4.0.ebuild
index 8e1290012..b9967b3e5 100644
--- a/dev-java/lucene/lucene-8.4.0.ebuild
+++ b/dev-java/lucene/lucene-8.4.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.apache.org/dist/lucene/java/${PV}/${P}-src.tgz"
 
 LICENSE="Apache-2.0"
 SLOT="8.4"
-KEYWORDS=""
+KEYWORDS="~amd64 ~x86"
 
 CDEPEND="
 	dev-java/ant-core:0
@@ -23,6 +23,10 @@ CDEPEND="
 	dev-java/hamcrest-core:0
 	dev-java/jflex:0
 	modules? (
+		dev-java/ant-apache-log4j:0
+		dev-java/antlr:4
+		dev-java/asm:9
+		dev-java/asm-commons:9
 		dev-java/junit:4
 		dev-java/jakarta-regexp:1.4
 		dev-java/commons-compress:0
@@ -32,7 +36,7 @@ CDEPEND="
 		dev-java/commons-beanutils:1.7
 		dev-java/commons-codec:0
 		dev-java/icu4j:56
-		dev-java/morfologik:0
+		dev-java/log4j:0
 	)"
 
 DEPEND="
@@ -121,6 +125,43 @@ src_prepare() {
 	if use modules; then
 		mkdir -p analysis/icu/lib
 		java-pkg_jar-from --into analysis/icu/lib icu4j-56
+		# disable morfologik, dependency does not build
+		# disable opennlp, dependency does not exist
+		# disable phonetic, dependency does not exist
+		sed -i \
+			-e 's/morfologik,//g' \
+			-e 's/opennlp,//g' \
+			-e 's/phonetic,//g' \
+			-e 's/,compile-test//g' \
+			analysis/build.xml || die
+		rm -r analysis/morfologik || die
+		rm -r analysis/opennlp || die
+		rm -r analysis/phonetic || die
+		# do not compile all the tests just because we want the modules
+		sed -i \
+			-e 's/name="build-modules" depends="compile-test"/name="build-modules"/g' \
+			build.xml || die
+		sed -i \
+			-e 's/, compile-test//g' \
+			module-build.xml || die
+		mkdir -p expressions/lib
+		# facet requires hppc which does not compile
+		sed -i \
+			-e '/<ant dir="${common.dir}\/facet" target="jar-core" inheritall="false">/,+2d' \
+			module-build.xml || die
+		rm -r facet || die
+		# requires spatial4j, which does not exist
+		sed -i \
+			-e '/<ant dir="${common.dir}\/spatial-extras" target="jar-core" inheritAll="false">/,+2d' \
+			module-build.xml || die
+		rm -r spatial-extras || die
+		# these require modules which we have disabled
+		rm -r benchmark || die
+		rm -r demo || die
+		# this fails due to missing log4j, even though it is included in classpath
+		rm -r luke || die
+		# fails to build for unknown reasons
+		rm -r replicator || die
 	fi
 
 	java-pkg-2_src_prepare
@@ -131,6 +172,10 @@ src_compile() {
 
 	if use modules; then
 	    EANT_GENTOO_CLASSPATH+="
+			ant-apache-log4j
+			antlr-4
+			asm-9
+			asm-commons-9
 			jakarta-regexp-1.4
 			commons-compress
 			commons-collections
@@ -139,7 +184,7 @@ src_compile() {
 			commons-beanutils-1.7
 			commons-codec
 			icu4j-56
-			morfologik
+			log4j
 			"
 		EANT_BUILD_TARGET+=" build-modules"
 		EANT_DOC_TARGET+=" javadocs-modules"
@@ -162,21 +207,17 @@ src_test() {
 
 src_install() {
 	einstalldocs
-	java-pkg_newjar build/core/${PN}-core-${PV}.jar ${PN}-core.jar
-
-	if use modules; then
-		local i j
-		for i in $(find build/modules -name \*-${PV}.jar); do
-		    j=${i##*/}
-			java-pkg_newjar $i ${j%%-${PV}.jar}.jar
-		done
-	fi
+	local i j
+	for i in $(find build -name \*-${PV}.jar); do
+	    j=${i##*/}
+		java-pkg_newjar $i ${j%%-${PV}.jar}.jar
+	done
 	if use doc; then
 		dodoc -r docs
 		java-pkg_dohtml -r build/docs
 	fi
 	if use source; then
 	     java-pkg_dosrc core/src/java/org
-	  	 use modules && java-pkg_dosrc modules
+	  	 use modules && java-pkg_dosrc */src */*/src
 	fi
 }

[gentoo-commits] proj/sci:master commit in: dev-java/lucene/

[Andrew Ammerlaan]

commit:     a4fbc23d861a8624ea0d432dc9cec2843f3f118e
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Nov 30 13:19:12 2021 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Nov 30 13:19:12 2021 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=a4fbc23d

dev-java/lucene: switch to icu4j slot 52

slot 56 removed from ::gentoo

Package-Manager: Portage-3.0.28, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-java/lucene/lucene-3.6.2-r2.ebuild | 4 ++--
 dev-java/lucene/lucene-5.2.1.ebuild    | 6 +++---
 dev-java/lucene/lucene-8.4.0.ebuild    | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/dev-java/lucene/lucene-3.6.2-r2.ebuild b/dev-java/lucene/lucene-3.6.2-r2.ebuild
index 97e5c8d6e..31fd5ed60 100644
--- a/dev-java/lucene/lucene-3.6.2-r2.ebuild
+++ b/dev-java/lucene/lucene-3.6.2-r2.ebuild
@@ -31,7 +31,7 @@ CDEPEND="
 		dev-java/commons-logging:0
 		dev-java/commons-beanutils:1.7
 		dev-java/commons-codec:0
-		dev-java/icu4j:56
+		dev-java/icu4j:52
 	)"
 
 DEPEND="
@@ -119,7 +119,7 @@ src_compile() {
 			commons-logging
 			commons-beanutils-1.7
 			commons-codec
-			icu4j-56
+			icu4j-52
 			"
 		EANT_BUILD_TARGET+=" build-contrib"
 		EANT_DOC_TARGET+=" javadocs-all"

diff --git a/dev-java/lucene/lucene-5.2.1.ebuild b/dev-java/lucene/lucene-5.2.1.ebuild
index 8038db195..6c7e3aed3 100644
--- a/dev-java/lucene/lucene-5.2.1.ebuild
+++ b/dev-java/lucene/lucene-5.2.1.ebuild
@@ -35,7 +35,7 @@ CDEPEND="
 		dev-java/commons-logging:0
 		dev-java/commons-beanutils:1.7
 		dev-java/commons-codec:0
-		dev-java/icu4j:56
+		dev-java/icu4j:52
 		dev-java/log4j:0
 	)"
 
@@ -114,7 +114,7 @@ src_prepare() {
 
 	if use modules; then
 		mkdir -p analysis/icu/lib
-		java-pkg_jar-from --into analysis/icu/lib icu4j-56
+		java-pkg_jar-from --into analysis/icu/lib icu4j-52
 		# disable morfologik, dependency does not build
 		# disable uima, dependency does not build
 		# disable phonetic, dependency does not exist
@@ -171,7 +171,7 @@ src_compile() {
 			commons-logging
 			commons-beanutils-1.7
 			commons-codec
-			icu4j-56
+			icu4j-52
 			log4j
 			"
 		EANT_BUILD_TARGET+=" build-modules"

diff --git a/dev-java/lucene/lucene-8.4.0.ebuild b/dev-java/lucene/lucene-8.4.0.ebuild
index b9967b3e5..de72b14c6 100644
--- a/dev-java/lucene/lucene-8.4.0.ebuild
+++ b/dev-java/lucene/lucene-8.4.0.ebuild
@@ -35,7 +35,7 @@ CDEPEND="
 		dev-java/commons-logging:0
 		dev-java/commons-beanutils:1.7
 		dev-java/commons-codec:0
-		dev-java/icu4j:56
+		dev-java/icu4j:52
 		dev-java/log4j:0
 	)"
 
@@ -124,7 +124,7 @@ src_prepare() {
 
 	if use modules; then
 		mkdir -p analysis/icu/lib
-		java-pkg_jar-from --into analysis/icu/lib icu4j-56
+		java-pkg_jar-from --into analysis/icu/lib icu4j-52
 		# disable morfologik, dependency does not build
 		# disable opennlp, dependency does not exist
 		# disable phonetic, dependency does not exist
@@ -183,7 +183,7 @@ src_compile() {
 			commons-logging
 			commons-beanutils-1.7
 			commons-codec
-			icu4j-56
+			icu4j-52
 			log4j
 			"
 		EANT_BUILD_TARGET+=" build-modules"

[gentoo-commits] proj/sci:master commit in: dev-java/lucene/

[Andrew Ammerlaan]

commit:     1a2a8921c045392f417a367a7e90d3ba7d5514ed
Author:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
AuthorDate: Tue Jan  4 15:19:38 2022 +0000
Commit:     Andrew Ammerlaan <andrewammerlaan <AT> gentoo <DOT> org>
CommitDate: Tue Jan  4 15:19:38 2022 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=1a2a8921

dev-java/lucene: update icu4j requirement

Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> gentoo.org>

 dev-java/lucene/lucene-3.6.2-r2.ebuild | 6 +++---
 dev-java/lucene/lucene-5.2.1.ebuild    | 8 ++++----
 dev-java/lucene/lucene-8.4.0.ebuild    | 8 ++++----
 3 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/dev-java/lucene/lucene-3.6.2-r2.ebuild b/dev-java/lucene/lucene-3.6.2-r2.ebuild
index 31fd5ed60..bdec54f4c 100644
--- a/dev-java/lucene/lucene-3.6.2-r2.ebuild
+++ b/dev-java/lucene/lucene-3.6.2-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -31,7 +31,7 @@ CDEPEND="
 		dev-java/commons-logging:0
 		dev-java/commons-beanutils:1.7
 		dev-java/commons-codec:0
-		dev-java/icu4j:52
+		dev-java/icu4j:70
 	)"
 
 DEPEND="
@@ -119,7 +119,7 @@ src_compile() {
 			commons-logging
 			commons-beanutils-1.7
 			commons-codec
-			icu4j-52
+			icu4j-70
 			"
 		EANT_BUILD_TARGET+=" build-contrib"
 		EANT_DOC_TARGET+=" javadocs-all"

diff --git a/dev-java/lucene/lucene-5.2.1.ebuild b/dev-java/lucene/lucene-5.2.1.ebuild
index 6c7e3aed3..e6cea2888 100644
--- a/dev-java/lucene/lucene-5.2.1.ebuild
+++ b/dev-java/lucene/lucene-5.2.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,7 +35,7 @@ CDEPEND="
 		dev-java/commons-logging:0
 		dev-java/commons-beanutils:1.7
 		dev-java/commons-codec:0
-		dev-java/icu4j:52
+		dev-java/icu4j:70
 		dev-java/log4j:0
 	)"
 
@@ -114,7 +114,7 @@ src_prepare() {
 
 	if use modules; then
 		mkdir -p analysis/icu/lib
-		java-pkg_jar-from --into analysis/icu/lib icu4j-52
+		java-pkg_jar-from --into analysis/icu/lib icu4j-70
 		# disable morfologik, dependency does not build
 		# disable uima, dependency does not build
 		# disable phonetic, dependency does not exist
@@ -171,7 +171,7 @@ src_compile() {
 			commons-logging
 			commons-beanutils-1.7
 			commons-codec
-			icu4j-52
+			icu4j-70
 			log4j
 			"
 		EANT_BUILD_TARGET+=" build-modules"

diff --git a/dev-java/lucene/lucene-8.4.0.ebuild b/dev-java/lucene/lucene-8.4.0.ebuild
index de72b14c6..9d58ad6e6 100644
--- a/dev-java/lucene/lucene-8.4.0.ebuild
+++ b/dev-java/lucene/lucene-8.4.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -35,7 +35,7 @@ CDEPEND="
 		dev-java/commons-logging:0
 		dev-java/commons-beanutils:1.7
 		dev-java/commons-codec:0
-		dev-java/icu4j:52
+		dev-java/icu4j:70
 		dev-java/log4j:0
 	)"
 
@@ -124,7 +124,7 @@ src_prepare() {
 
 	if use modules; then
 		mkdir -p analysis/icu/lib
-		java-pkg_jar-from --into analysis/icu/lib icu4j-52
+		java-pkg_jar-from --into analysis/icu/lib icu4j-70
 		# disable morfologik, dependency does not build
 		# disable opennlp, dependency does not exist
 		# disable phonetic, dependency does not exist
@@ -183,7 +183,7 @@ src_compile() {
 			commons-logging
 			commons-beanutils-1.7
 			commons-codec
-			icu4j-52
+			icu4j-70
 			log4j
 			"
 		EANT_BUILD_TARGET+=" build-modules"