* [gentoo-commits] repo/gentoo:master commit in: dev-java/lucene/
@ 2021-06-11 8:33 Miroslav Šulc
0 siblings, 0 replies; 23+ messages in thread
From: Miroslav Šulc @ 2021-06-11 8:33 UTC (permalink / raw
To: gentoo-commits
commit: 8030543c8917c6f4ce5d6eb2fe9acc4eac5a23db
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Fri Jun 11 06:16:47 2021 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Fri Jun 11 08:33:14 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8030543c
dev-java/lucene: unused slots with >=virtual/jdk-1.6
Package-Manager: Portage-3.0.18, Repoman-3.0.2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/21196
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/lucene/Manifest | 2 -
dev-java/lucene/lucene-1.4.3-r4.ebuild | 52 -------------
dev-java/lucene/lucene-3.5.0-r2.ebuild | 136 ---------------------------------
3 files changed, 190 deletions(-)
diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest
index 9ba9127489e..b9163763753 100644
--- a/dev-java/lucene/Manifest
+++ b/dev-java/lucene/Manifest
@@ -1,4 +1,2 @@
-DIST lucene-1.4.3-src.tar.gz 768320 BLAKE2B 8017b672b0104be007582a67cff5cb130187afcf9608bec0cb2b6bae9b3ea8c67486b324740c99e4db8f23879dd614a098f778f6b52b429d3dd1906387e9b61e SHA512 426539a4b4a8887485c4301b2127ad4815646d1a81bca877ed2b0e68d886fcaf844449532a080754b79696c0f9e9c5f304be28487e0f9aa11178565a20f29911
DIST lucene-2.4.1.tar.gz 5057003 BLAKE2B 3e2a29cfa94b367f1e62f60a2f7b7e195c788048564fb061ade4b1babcb2fd71e36b282049d3816c3faaaa3dacc07f4a7dbdb0504a659ea3ab8e06e247debcba SHA512 cf227eea4aeee904ccf5316ee7f2399864bf28b9c01e044ef27232dd483c3a5f0ecc8836633f44acfa41ffee6bf1c530e756ef45fa77ac1d15e1f83129b7aa5e
-DIST lucene-3.5.0-src.tgz 39564076 BLAKE2B 5018f0e07a9df3f2f55c540e94e349e64e2c02c99acf14946e4471e16ace4f17a18e306aca6187028cde4434f0d6b38090442baaddaa79ef12ff34a8461f9e98 SHA512 58846190ed0e8c0747e14cb46bf27255d0e4ee93aa0969cf16140713ce20c8fc3f451353437313f14416c92b7b6825d4ce3416d9c7ce4cb1854f31877c2af275
DIST lucene-3.6.2-src.tgz 32139784 BLAKE2B 48fe88efeae8396e084f827aa66530480f40aee3a2e59c8524420059f004a73be4c1e50c98345ad0ad4808ff8a0a996f9406523bf5c124616657ec91f9797f70 SHA512 e9a08a1b5303c44e4feecc0bb6e7013e4a9420517ae4e98999bd318ec25b5b2ff3b6de8b51db8f68afc0fdc3149829297023a95b103d4f99e7db68deee4c3965
diff --git a/dev-java/lucene/lucene-1.4.3-r4.ebuild b/dev-java/lucene/lucene-1.4.3-r4.ebuild
deleted file mode 100644
index a5604d395c7..00000000000
--- a/dev-java/lucene/lucene-1.4.3-r4.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc examples source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance, full-featured Java text search engine"
-HOMEPAGE="https://lucene.apache.org"
-SRC_URI="mirror://apache/lucene/java/archive/${P}-src.tar.gz"
-
-KEYWORDS="amd64 x86"
-LICENSE="Apache-1.1"
-SLOT="1"
-
-DEPEND="
- >=virtual/jdk-1.6
- test? ( dev-java/ant-junit:0 )"
-
-RDEPEND="
- >=virtual/jre-1.6"
-
-src_prepare() {
- default
- java-pkg_clean
-}
-
-src_compile() {
- eant jar-core $(use_doc javadocs)
-}
-
-src_test() {
- java-ant_rewrite-classpath build.xml
- EANT_GENTOO_CLASSPATH="junit ant-core" \
- ANT_TASKS="ant-junit" \
- eant test
-}
-
-src_install() {
- einstalldocs
- java-pkg_newjar build/lucene-1.5-rc1-dev.jar
-
- if use doc; then
- dodoc -r docs/*
- java-pkg_dojavadoc build/docs/api
- fi
-
- use examples && java-pkg_doexamples src/demo
- use source && java-pkg_dosrc src/java/org
-}
diff --git a/dev-java/lucene/lucene-3.5.0-r2.ebuild b/dev-java/lucene/lucene-3.5.0-r2.ebuild
deleted file mode 100644
index 6d0031e124b..00000000000
--- a/dev-java/lucene/lucene-3.5.0-r2.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test contrib"
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_BSFIX_NAME="build.xml common-build.xml contrib-build.xml"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
-HOMEPAGE="https://lucene.apache.org"
-SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="3.5"
-KEYWORDS="amd64 x86"
-
-CDEPEND="
- dev-java/junit:4
- dev-java/ant-junit:0
- dev-java/ant-core:0
- contrib? (
- dev-java/jakarta-regexp:1.4
- dev-java/commons-compress:0
- dev-java/commons-collections:0
- dev-java/commons-digester:0
- dev-java/commons-logging:0
- dev-java/commons-beanutils:1.7
- )"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.6
- test? (
- dev-java/junit:4
- dev-java/ant-core:0
- )"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-DOCS=(
- CHANGES.txt README.txt
- NOTICE.txt CHANGES.txt
- JRE_VERSION_MIGRATION.txt
-)
-
-# All tests fail with the following error:
-# junit.framework.AssertionFailedError: ensure your setUp() calls super.setUp()!!!
-RESTRICT="test"
-
-src_prepare() {
- default
- java-pkg_clean
- sed -i \
- -e '/-Xmax/ d' \
- common-build.xml || die
-
- # FIXME: contrib builds do not work if junit not included
- #java-pkg_jar-from --build-only --into lib \
- # junit-4 junit.jar junit-4.7.jar
- java-pkg_jar-from --build-only --into lib \
- ant-core ant.jar ant-1.7.1.jar
- java-pkg_jar-from --build-only --into lib \
- ant-junit ant-junit.jar ant-junit-1.7.1.jar
-
- if use contrib; then
- cd contrib/ || die
- java-pkg_jar-from --build-only --into queries/lib \
- jakarta-regexp:1.4 jakarta-regexp.jar jakarta-regexpt-1.4.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-compress commons-compress.jar commons-compress-1.1.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-collections commons-collections.jar commons-collections-3.1.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-digester commons-digester.jar commons-digester-1.7.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-logging commons-logging.jar commons-logging-1.0.4.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-beanutils:1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
- fi
-}
-
-src_compile() {
- # FIXME: docs do not build if behind a proxy, -autoproxy does not work
- java-ant_xml-rewrite -f common-build.xml \
- -c -e javadoc \
- -a failonerror \
- -v "false"
-
- ANT_TASKS="none" \
- eant -Dversion=${PV} \
- -Dfailonjavadocwarning=false \
- jar-core \
- $(use_doc javadocs-core)
-
- if use contrib; then
- ANT_TASKS="none" \
- eant -Dversion=${PV} \
- -Dfailonjavadocwarning=false \
- build-contrib \
- $(use_doc javadocs-all)
- fi
-}
-
-src_test() {
- # FIXME: test does not get run, even when selected
- java-ant_rewrite-classpath common-build.xml
- EANT_GENTOO_CLASSPATH="junit-4 ant-core ant-junit" \
- ANT_TASKS="ant-junit" \
- eant test-core
-}
-
-src_install() {
- einstalldocs
- java-pkg_newjar build/${PN}-core-${PV}.jar ${PN}-core.jar
-
- if use contrib; then
- local i j
- for i in $(find build/contrib -name \*-${PV}.jar); do
- j=${i##*/}
- java-pkg_newjar $i ${j%%-${PV}.jar}.jar
- done
- fi
- if use doc; then
- dodoc -r docs
- java-pkg_dohtml -r build/docs/api
- fi
- if use source; then
- java-pkg_dosrc src/java/org
- use contrib && java-pkg_dosrc contrib
- fi
-}
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/lucene/
@ 2024-09-10 19:11 Miroslav Šulc
0 siblings, 0 replies; 23+ messages in thread
From: Miroslav Šulc @ 2024-09-10 19:11 UTC (permalink / raw
To: gentoo-commits
commit: 27b910c7a7f170919d4abad18de0487b5651efb1
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Sep 10 07:54:22 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Sep 10 19:11:19 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27b910c7
dev-java/lucene: drop 2.4.1-r4
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/lucene/lucene-2.4.1-r4.ebuild | 82 ----------------------------------
1 file changed, 82 deletions(-)
diff --git a/dev-java/lucene/lucene-2.4.1-r4.ebuild b/dev-java/lucene/lucene-2.4.1-r4.ebuild
deleted file mode 100644
index c69bb031e695..000000000000
--- a/dev-java/lucene/lucene-2.4.1-r4.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2 verify-sig
-
-DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
-HOMEPAGE="https://lucene.apache.org"
-SRC_URI="https://archive.apache.org/dist/${PN}/java/${P}-src.tar.gz
- verify-sig? ( https://archive.apache.org/dist/${PN}/java/${P}-src.tar.gz.asc )"
-
-LICENSE="Apache-2.0"
-SLOT="2.4"
-KEYWORDS="~amd64 ~x86"
-
-VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/lucene.apache.org.asc"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-lucene )"
-
-# Restricting to jdk:1.8 since it fails to build with openjdk-17
-# BUILD FAILED
-# /var/tmp/portage/dev-java/lucene-2.4.1-r3/work/lucene-2.4.1/build.xml:52: \
-# rmic does not exist under Java 15 and higher,
-# use rmic of an older JDK and explicitly set the executable attribute
-DEPEND="
- dev-java/javacc:0
- virtual/jdk:1.8
- test? (
- >=dev-java/ant-1.10.14-r3:0[junit]
- dev-java/junit:0
- )"
-
-RDEPEND=">=virtual/jre-1.8:*"
-
-PATCHES=(
- "${FILESDIR}/lucene-2.4.1-skipFailingTest.patch"
- "${FILESDIR}/lucene-2.4.1-javacc.home.patch"
-)
-
-src_prepare() {
- default #780585
- java-pkg-2_src_prepare
- java-pkg_clean
-
- cat > build.properties <<-EOF || die
- junit-location.jar=$(java-pkg_getjars --build-only junit)
- javacc.home=${EPREFIX}/usr/share/javacc/lib/
- EOF
- # stop scrambling the build.xml
- touch "${T}/java-ant-2_src_configure-run"
-
- rm docs/skin/images/instruction_arrow.png || die #: broken IDAT window length
- rm docs/images/instruction_arrow.png || die #: broken IDAT window length
-}
-
-src_compile() {
- eant javacc
-
- eant \
- -Dversion=${PV} \
- jar-core \
- jar-demo \
- $(use_doc javadocs-core javadocs-demo)
-}
-
-src_test() {
- eant test-core
-}
-
-src_install() {
- einstalldocs
- 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
- dodoc -r docs
- java-pkg_dohtml -r build/docs/api
- fi
- use source && java-pkg_dosrc src/java/org
-}
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/lucene/
@ 2024-09-10 19:11 Miroslav Šulc
0 siblings, 0 replies; 23+ messages in thread
From: Miroslav Šulc @ 2024-09-10 19:11 UTC (permalink / raw
To: gentoo-commits
commit: e1d13e8e5bc9400061795a9c4d2eb1088f770f85
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Sep 10 07:52:54 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Sep 10 19:11:15 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1d13e8e
dev-java/lucene: add comment about not using eant for tests
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/lucene/lucene-2.4.1-r5.ebuild | 2 ++
1 file changed, 2 insertions(+)
diff --git a/dev-java/lucene/lucene-2.4.1-r5.ebuild b/dev-java/lucene/lucene-2.4.1-r5.ebuild
index a3429854eef1..2a1641800238 100644
--- a/dev-java/lucene/lucene-2.4.1-r5.ebuild
+++ b/dev-java/lucene/lucene-2.4.1-r5.ebuild
@@ -65,6 +65,8 @@ src_compile() {
}
src_test() {
+ # we found that running tests with eant creates completely different output than
+ # runnning with ant. no idea what exactly is causing that difference,
ant test-core
}
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/lucene/
@ 2024-09-10 6:46 Miroslav Šulc
0 siblings, 0 replies; 23+ messages in thread
From: Miroslav Šulc @ 2024-09-10 6:46 UTC (permalink / raw
To: gentoo-commits
commit: f67b3c2d36cf8921b18772d84247bb3626c676f9
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Thu Jun 20 16:56:03 2024 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Tue Sep 10 06:40:38 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f67b3c2d
dev-java/lucene: 2.4.1-r5 build without BSFIX, drop java-ant-2
Changes since 2.4.1-r4:
- no longer inherits java-ant-2.eclass
- handles javac.source and javac.target in build.properties
- no longer uses the use_doc function which can now get deprecated
- uses 'ant test' instead of 'eant test' which generates a different
output with summaries instead of details.
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/lucene/lucene-2.4.1-r5.ebuild | 81 ++++++++++++++++++++++++++++++++++
1 file changed, 81 insertions(+)
diff --git a/dev-java/lucene/lucene-2.4.1-r5.ebuild b/dev-java/lucene/lucene-2.4.1-r5.ebuild
new file mode 100644
index 000000000000..a3429854eef1
--- /dev/null
+++ b/dev-java/lucene/lucene-2.4.1-r5.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 verify-sig
+
+DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
+HOMEPAGE="https://lucene.apache.org"
+SRC_URI="https://archive.apache.org/dist/${PN}/java/${P}-src.tar.gz
+ verify-sig? ( https://archive.apache.org/dist/${PN}/java/${P}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="2.4"
+KEYWORDS="~amd64 ~x86"
+
+VERIFY_SIG_OPENPGP_KEY_PATH="/usr/share/openpgp-keys/lucene.apache.org.asc"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-apache-lucene )"
+
+# Restricting to jdk:1.8 since it fails to build with openjdk-17
+# BUILD FAILED
+# /var/tmp/portage/dev-java/lucene-2.4.1-r3/work/lucene-2.4.1/build.xml:52: \
+# rmic does not exist under Java 15 and higher,
+# use rmic of an older JDK and explicitly set the executable attribute
+DEPEND="
+ dev-java/javacc:0
+ virtual/jdk:1.8
+ test? (
+ >=dev-java/ant-1.10.14-r3:0[junit]
+ dev-java/junit:0
+ )"
+
+RDEPEND=">=virtual/jre-1.8:*"
+
+PATCHES=(
+ "${FILESDIR}/lucene-2.4.1-skipFailingTest.patch"
+ "${FILESDIR}/lucene-2.4.1-javacc.home.patch"
+)
+
+src_prepare() {
+ default #780585
+ java-pkg-2_src_prepare
+ java-pkg_clean
+
+ cat > build.properties <<-EOF || die
+ ant.build.javac.source=$(java-pkg_get-source)
+ ant.build.javac.target=$(java-pkg_get-target)
+ javac.source=$(java-pkg_get-source)
+ javac.target=$(java-pkg_get-target)
+ javacc.home=${EPREFIX}/usr/share/javacc/lib/
+ junit-location.jar=$(java-pkg_getjars --build-only junit)
+ EOF
+
+ rm docs/skin/images/instruction_arrow.png || die #: broken IDAT window length
+ rm docs/images/instruction_arrow.png || die #: broken IDAT window length
+}
+
+src_compile() {
+ eant javacc
+
+ eant -Dversion=${PV} jar-core jar-demo
+ use doc && eant -Dversion=${PV} javadocs-core javadocs-demo
+}
+
+src_test() {
+ ant test-core
+}
+
+src_install() {
+ einstalldocs
+ 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
+ dodoc -r docs
+ java-pkg_dohtml -r build/docs/api
+ fi
+ use source && java-pkg_dosrc src/java/org
+}
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/lucene/
@ 2022-04-23 7:05 Miroslav Šulc
0 siblings, 0 replies; 23+ messages in thread
From: Miroslav Šulc @ 2022-04-23 7:05 UTC (permalink / raw
To: gentoo-commits
commit: aa0e54ff3fe19e24ce05e211a536ca3b73ee867b
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Apr 23 06:09:09 2022 +0000
Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org>
CommitDate: Sat Apr 23 07:05:05 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aa0e54ff
dev-java/lucene: drop 2.4.1-r2
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org>
dev-java/lucene/lucene-2.4.1-r2.ebuild | 79 ----------------------------------
1 file changed, 79 deletions(-)
diff --git a/dev-java/lucene/lucene-2.4.1-r2.ebuild b/dev-java/lucene/lucene-2.4.1-r2.ebuild
deleted file mode 100644
index b3f32a4fea35..000000000000
--- a/dev-java/lucene/lucene-2.4.1-r2.ebuild
+++ /dev/null
@@ -1,79 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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="https://lucene.apache.org"
-SRC_URI="https://archive.apache.org/dist/${PN}/java/${P}-src.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="2.4"
-KEYWORDS="amd64 x86"
-
-CDEPEND="
- dev-java/javacc:0"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.6
- test? (
- dev-java/junit:0
- dev-java/ant-core:0
- )"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-src_prepare() {
- default
- java-pkg_clean
- sed -i -e '/-Xmax/ d' common-build.xml || die
-
- # Portage marks shese files as bogus for some reason.
- find . -type f -name instruction_arrow.png -exec rm -v {} \; || die
-}
-
-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-core 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() {
- einstalldocs
- 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
- dodoc -r docs
- java-pkg_dohtml -r build/docs/api
- fi
- use source && java-pkg_dosrc src/java/org
-}
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/lucene/
@ 2022-04-22 18:10 Arthur Zamarin
0 siblings, 0 replies; 23+ messages in thread
From: Arthur Zamarin @ 2022-04-22 18:10 UTC (permalink / raw
To: gentoo-commits
commit: 73ecf2182ed1f5aa5f328e4183b5f814bda96f6b
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 22 18:10:14 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 22 18:10:14 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73ecf218
dev-java/lucene: Stabilize 2.4.1-r3 x86, #836284
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-java/lucene/lucene-2.4.1-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/lucene/lucene-2.4.1-r3.ebuild b/dev-java/lucene/lucene-2.4.1-r3.ebuild
index 191b844f3126..01cdd2a220ea 100644
--- a/dev-java/lucene/lucene-2.4.1-r3.ebuild
+++ b/dev-java/lucene/lucene-2.4.1-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.apache.org/dist/${PN}/java/${P}-src.tar.gz -> ${P}.tar.
LICENSE="Apache-2.0"
SLOT="2.4"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
CDEPEND="
dev-java/javacc:0"
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/lucene/
@ 2022-04-22 18:10 Arthur Zamarin
0 siblings, 0 replies; 23+ messages in thread
From: Arthur Zamarin @ 2022-04-22 18:10 UTC (permalink / raw
To: gentoo-commits
commit: 270ea26e426e2e1fcbb4069a7cd21f258ad76dda
Author: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 22 18:10:07 2022 +0000
Commit: Arthur Zamarin <arthurzam <AT> gentoo <DOT> org>
CommitDate: Fri Apr 22 18:10:07 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=270ea26e
dev-java/lucene: Stabilize 2.4.1-r3 amd64, #836284
Signed-off-by: Arthur Zamarin <arthurzam <AT> gentoo.org>
dev-java/lucene/lucene-2.4.1-r3.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/dev-java/lucene/lucene-2.4.1-r3.ebuild b/dev-java/lucene/lucene-2.4.1-r3.ebuild
index 762e6681fc1e..191b844f3126 100644
--- a/dev-java/lucene/lucene-2.4.1-r3.ebuild
+++ b/dev-java/lucene/lucene-2.4.1-r3.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.apache.org/dist/${PN}/java/${P}-src.tar.gz -> ${P}.tar.
LICENSE="Apache-2.0"
SLOT="2.4"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
CDEPEND="
dev-java/javacc:0"
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/lucene/
@ 2022-03-15 23:20 Sam James
0 siblings, 0 replies; 23+ messages in thread
From: Sam James @ 2022-03-15 23:20 UTC (permalink / raw
To: gentoo-commits
commit: 2cc45c52ab7a9f777692f0fece48ff29cd84f678
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Sat Jan 22 19:57:36 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 23:20:40 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2cc45c52
dev-java/lucene: Drop 3.6.2-r2
This version has no consumers and prevents the removal of
commons-digester slot 0.
Package-Manager: Portage-3.0.28, Repoman-3.0.3
RepoMan-Options: --force
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/lucene/Manifest | 1 -
dev-java/lucene/lucene-3.6.2-r2.ebuild | 189 ---------------------------------
dev-java/lucene/metadata.xml | 3 -
3 files changed, 193 deletions(-)
diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest
index b91637637531..32bc29febef6 100644
--- a/dev-java/lucene/Manifest
+++ b/dev-java/lucene/Manifest
@@ -1,2 +1 @@
DIST lucene-2.4.1.tar.gz 5057003 BLAKE2B 3e2a29cfa94b367f1e62f60a2f7b7e195c788048564fb061ade4b1babcb2fd71e36b282049d3816c3faaaa3dacc07f4a7dbdb0504a659ea3ab8e06e247debcba SHA512 cf227eea4aeee904ccf5316ee7f2399864bf28b9c01e044ef27232dd483c3a5f0ecc8836633f44acfa41ffee6bf1c530e756ef45fa77ac1d15e1f83129b7aa5e
-DIST lucene-3.6.2-src.tgz 32139784 BLAKE2B 48fe88efeae8396e084f827aa66530480f40aee3a2e59c8524420059f004a73be4c1e50c98345ad0ad4808ff8a0a996f9406523bf5c124616657ec91f9797f70 SHA512 e9a08a1b5303c44e4feecc0bb6e7013e4a9420517ae4e98999bd318ec25b5b2ff3b6de8b51db8f68afc0fdc3149829297023a95b103d4f99e7db68deee4c3965
diff --git a/dev-java/lucene/lucene-3.6.2-r2.ebuild b/dev-java/lucene/lucene-3.6.2-r2.ebuild
deleted file mode 100644
index 091821750c1b..000000000000
--- a/dev-java/lucene/lucene-3.6.2-r2.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test contrib"
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_BSFIX_NAME="build.xml common-build.xml contrib-build.xml"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
-HOMEPAGE="https://lucene.apache.org"
-SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="3.6"
-KEYWORDS="amd64 x86"
-
-CDEPEND="
- dev-java/ant-ivy:2
- dev-java/ant-junit:0
- dev-java/ant-core:0
- dev-java/hamcrest-core:0
- contrib? (
- dev-java/jakarta-regexp:1.4
- dev-java/commons-compress:0
- dev-java/commons-collections:0
- dev-java/commons-digester:0
- dev-java/commons-logging:0
- dev-java/commons-beanutils:1.7
- )"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.6
- test? (
- dev-java/junit:4
- )"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-DOCS=(
- CHANGES.txt README.txt
- NOTICE.txt CHANGES.txt
- JRE_VERSION_MIGRATION.txt
-)
-
-# All tests fail with the following error:
-# junit.framework.AssertionFailedError: ensure your setUp() calls super.setUp()!!!
-RESTRICT="test"
-
-src_prepare() {
- default
- java-pkg_clean
- sed -i \
- -e '/-Xmax/ d' \
- common-build.xml || die
-
- # FIXME: contrib builds do not work if junit not included
- #java-pkg_jar-from --build-only --into lib \
- # junit-4 junit.jar junit-4.7.jar
- java-pkg_jar-from --build-only --into lib \
- ant-core ant.jar ant-1.7.1.jar
- java-pkg_jar-from --build-only --into lib \
- ant-junit ant-junit.jar ant-junit-1.7.1.jar
-
- if use contrib; then
- cd contrib/ || die
- java-pkg_jar-from --build-only --into queries/lib \
- jakarta-regexp:1.4 jakarta-regexp.jar jakarta-regexpt-1.4.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-compress commons-compress.jar commons-compress-1.1.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-collections commons-collections.jar commons-collections-3.1.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-digester commons-digester.jar commons-digester-1.7.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-logging commons-logging.jar commons-logging-1.0.4.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-beanutils:1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
- fi
-}
-
-src_prepare() {
- default
- java-pkg_clean
- sed -i \
- -e '/-Xmax/ d' \
- -e '/property="ivy.available"/s,resource="${ivy.resource}",file="." type="dir",g' \
- -e '/<ivy:retrieve/d' \
- common-build.xml || die
- mkdir -p {.,queries,benchmark,analyzers/phonetic}/lib || die
- java-pkg_jar-from --build-only --into lib \
- ant-core ant.jar ant-1.7.1.jar
- java-pkg_jar-from --build-only --into lib \
- ant-junit ant-junit.jar ant-junit-1.7.1.jar
- java-pkg_jar-from --build-only --into lib \
- ant-ivy:2
- java-pkg_jar-from --build-only --into lib \
- junit-4 junit.jar junit-4.10.jar
- java-pkg_jar-from --build-only --into lib \
- hamcrest-core
-
- # Always needed anyway
- cd "${S}"/test-framework/ || die
- java-pkg_jar-from --build-only --into lib \
- ant-core ant.jar ant-1.7.1.jar
- java-pkg_jar-from --build-only --into lib \
- ant-junit ant-junit.jar ant-junit-1.7.1.jar
- java-pkg_jar-from --build-only --into lib \
- junit-4 junit.jar junit-4.10.jar
- java-pkg_jar-from --build-only --into lib \
- hamcrest-core
-
- if use contrib; then
- cd "${S}"/contrib/ || die
- # queries
- java-pkg_jar-from --build-only --into queries/lib \
- jakarta-regexp:1.4 jakarta-regexp.jar jakarta-regexp-1.4.jar
- # benchmark
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-compress commons-compress.jar commons-compress-1.1.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-collections commons-collections.jar commons-collections-3.1.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-digester commons-digester.jar commons-digester-1.7.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-logging commons-logging.jar commons-logging-1.0.4.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-beanutils:1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
- # analyzers/phonetic
- java-pkg_jar-from --build-only --into analyzers/phonetic/lib \
- commons-codec commons-codec.jar commons-codec-1.6.jar
- fi
-}
-
-src_compile() {
- # FIXME: docs do not build if behind a proxy, -autoproxy does not work
- java-ant_xml-rewrite -f common-build.xml \
- -c -e javadoc \
- -a failonerror \
- -v "false"
-
- ANT_TASKS="none" \
- eant -Dversion=${PV} \
- -Dfailonjavadocwarning=false \
- jar-core \
- $(use_doc javadocs-core)
-
- if use contrib; then
- ANT_TASKS="none" \
- eant -Dversion=${PV} \
- -Dfailonjavadocwarning=false \
- build-contrib \
- $(use_doc javadocs-all)
- fi
-}
-
-src_test() {
- # FIXME: test does not get run, even when selected
- java-ant_rewrite-classpath common-build.xml
- EANT_GENTOO_CLASSPATH="junit-4 ant-core ant-junit" \
- ANT_TASKS="ant-junit" \
- eant test-core
-}
-
-src_install() {
- einstalldocs
- java-pkg_newjar build/core/${PN}-core-${PV}.jar ${PN}-core.jar
-
- if use contrib; then
- local i j
- for i in $(find build/contrib -name \*-${PV}.jar); do
- j=${i##*/}
- java-pkg_newjar $i ${j%%-${PV}.jar}.jar
- done
- fi
- if use doc; then
- dodoc -r docs
- java-pkg_dohtml -r build/docs/api
- fi
- if use source; then
- java-pkg_dosrc core/src/java/org
- use contrib && java-pkg_dosrc contrib
- fi
-}
diff --git a/dev-java/lucene/metadata.xml b/dev-java/lucene/metadata.xml
index fc70b0ebf07e..9a0df749aac0 100644
--- a/dev-java/lucene/metadata.xml
+++ b/dev-java/lucene/metadata.xml
@@ -5,7 +5,4 @@
<email>java@gentoo.org</email>
<name>Java</name>
</maintainer>
-<use>
- <flag name="contrib">Include extra functionality from contrib/</flag>
-</use>
</pkgmetadata>
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/lucene/
@ 2022-03-15 17:23 Sam James
0 siblings, 0 replies; 23+ messages in thread
From: Sam James @ 2022-03-15 17:23 UTC (permalink / raw
To: gentoo-commits
commit: f4a8605e553d660c2aa9a0f43f7afdd11ba6e0ca
Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net>
AuthorDate: Tue Mar 15 09:53:19 2022 +0000
Commit: Sam James <sam <AT> gentoo <DOT> org>
CommitDate: Tue Mar 15 17:20:22 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f4a8605e
dev-java/lucene: Restrict to jdk:1.8
Package-Manager: Portage-3.0.30, Repoman-3.0.3
Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/24574
Signed-off-by: Sam James <sam <AT> gentoo.org>
dev-java/lucene/lucene-2.4.1-r3.ebuild | 83 ++++++++++++++++++++++++++++++++++
1 file changed, 83 insertions(+)
diff --git a/dev-java/lucene/lucene-2.4.1-r3.ebuild b/dev-java/lucene/lucene-2.4.1-r3.ebuild
new file mode 100644
index 000000000000..762e6681fc1e
--- /dev/null
+++ b/dev-java/lucene/lucene-2.4.1-r3.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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="https://lucene.apache.org"
+SRC_URI="https://archive.apache.org/dist/${PN}/java/${P}-src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.4"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="
+ dev-java/javacc:0"
+
+# Restricting to jdk:1.8 since it fails to build with openjdk-17
+# BUILD FAILED
+# /var/tmp/portage/dev-java/lucene-2.4.1-r3/work/lucene-2.4.1/build.xml:52: rmic does not exist under Java 15 and higher,
+# use rmic of an older JDK and explicitly set the executable attribute
+DEPEND="
+ ${CDEPEND}
+ virtual/jdk:1.8
+ test? (
+ dev-java/junit:0
+ dev-java/ant-core:0
+ )"
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.8:*"
+
+src_prepare() {
+ default
+ java-pkg_clean
+ sed -i -e '/-Xmax/ d' common-build.xml || die
+
+ # Portage marks shese files as bogus for some reason.
+ find . -type f -name instruction_arrow.png -exec rm -v {} \; || die
+}
+
+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-core 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() {
+ einstalldocs
+ 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
+ dodoc -r docs
+ java-pkg_dohtml -r build/docs/api
+ fi
+ use source && java-pkg_dosrc src/java/org
+}
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/lucene/
@ 2020-05-04 22:43 Jonas Stein
0 siblings, 0 replies; 23+ messages in thread
From: Jonas Stein @ 2020-05-04 22:43 UTC (permalink / raw
To: gentoo-commits
commit: 3c06631cae93d4c673abc71edae0d737508231bc
Author: Jonas Stein <jstein <AT> gentoo <DOT> org>
AuthorDate: Mon May 4 22:42:32 2020 +0000
Commit: Jonas Stein <jstein <AT> gentoo <DOT> org>
CommitDate: Mon May 4 22:42:55 2020 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c06631c
dev-java/lucene: Drop maintainer
Drop robbat2 as requested on IRC.
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Jonas Stein <jstein <AT> gentoo.org>
dev-java/lucene/metadata.xml | 4 ----
1 file changed, 4 deletions(-)
diff --git a/dev-java/lucene/metadata.xml b/dev-java/lucene/metadata.xml
index 27faa4347b9..524a5553a33 100644
--- a/dev-java/lucene/metadata.xml
+++ b/dev-java/lucene/metadata.xml
@@ -1,10 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<maintainer type="person">
- <email>robbat2@gentoo.org</email>
- <description>Maintainer for actual Lucene issues.</description>
-</maintainer>
<maintainer type="project">
<email>java@gentoo.org</email>
<name>Java</name>
^ permalink raw reply related [flat|nested] 23+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: dev-java/lucene/
@ 2018-11-04 13:50 Pacho Ramos
0 siblings, 0 replies; 23+ messages in thread
From: Pacho Ramos @ 2018-11-04 13:50 UTC (permalink / raw
To: gentoo-commits
commit: 7bddd4f74f9f6df3291f9205206784dc82846eeb
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sun Nov 4 12:59:14 2018 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sun Nov 4 13:50:07 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bddd4f7
dev-java/lucene: Drop old
Signed-off-by: Pacho Ramos <pacho <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
dev-java/lucene/lucene-3.5.0-r1.ebuild | 136 ------------------------
dev-java/lucene/lucene-3.6.2-r1.ebuild | 189 ---------------------------------
2 files changed, 325 deletions(-)
diff --git a/dev-java/lucene/lucene-3.5.0-r1.ebuild b/dev-java/lucene/lucene-3.5.0-r1.ebuild
deleted file mode 100644
index 1c1898386a2..00000000000
--- a/dev-java/lucene/lucene-3.5.0-r1.ebuild
+++ /dev/null
@@ -1,136 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test contrib"
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_BSFIX_NAME="build.xml common-build.xml contrib-build.xml"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
-HOMEPAGE="https://lucene.apache.org"
-SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="3.5"
-KEYWORDS="amd64 x86"
-
-CDEPEND="
- dev-java/junit:4
- dev-java/ant-junit:0
- dev-java/ant-nodeps:0
- contrib? (
- dev-java/jakarta-regexp:1.4
- dev-java/commons-compress:0
- dev-java/commons-collections:0
- dev-java/commons-digester:0
- dev-java/commons-logging:0
- dev-java/commons-beanutils:1.7
- )"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.6
- test? (
- dev-java/junit:4
- dev-java/ant-core:0
- )"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-DOCS=(
- CHANGES.txt README.txt
- NOTICE.txt CHANGES.txt
- JRE_VERSION_MIGRATION.txt
-)
-
-# All tests fail with the following error:
-# junit.framework.AssertionFailedError: ensure your setUp() calls super.setUp()!!!
-RESTRICT="test"
-
-src_prepare() {
- default
- java-pkg_clean
- sed -i \
- -e '/-Xmax/ d' \
- common-build.xml || die
-
- # FIXME: contrib builds do not work if junit not included
- #java-pkg_jar-from --build-only --into lib \
- # junit-4 junit.jar junit-4.7.jar
- java-pkg_jar-from --build-only --into lib \
- ant-core ant.jar ant-1.7.1.jar
- java-pkg_jar-from --build-only --into lib \
- ant-junit ant-junit.jar ant-junit-1.7.1.jar
-
- if use contrib; then
- cd contrib/ || die
- java-pkg_jar-from --build-only --into queries/lib \
- jakarta-regexp:1.4 jakarta-regexp.jar jakarta-regexpt-1.4.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-compress commons-compress.jar commons-compress-1.1.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-collections commons-collections.jar commons-collections-3.1.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-digester commons-digester.jar commons-digester-1.7.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-logging commons-logging.jar commons-logging-1.0.4.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-beanutils:1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
- fi
-}
-
-src_compile() {
- # FIXME: docs do not build if behind a proxy, -autoproxy does not work
- java-ant_xml-rewrite -f common-build.xml \
- -c -e javadoc \
- -a failonerror \
- -v "false"
-
- ANT_TASKS="none" \
- eant -Dversion=${PV} \
- -Dfailonjavadocwarning=false \
- jar-core \
- $(use_doc javadocs-core)
-
- if use contrib; then
- ANT_TASKS="none" \
- eant -Dversion=${PV} \
- -Dfailonjavadocwarning=false \
- build-contrib \
- $(use_doc javadocs-all)
- fi
-}
-
-src_test() {
- # FIXME: test does not get run, even when selected
- java-ant_rewrite-classpath common-build.xml
- EANT_GENTOO_CLASSPATH="junit-4 ant-core ant-junit" \
- ANT_TASKS="ant-junit" \
- eant test-core
-}
-
-src_install() {
- einstalldocs
- java-pkg_newjar build/${PN}-core-${PV}.jar ${PN}-core.jar
-
- if use contrib; then
- local i j
- for i in $(find build/contrib -name \*-${PV}.jar); do
- j=${i##*/}
- java-pkg_newjar $i ${j%%-${PV}.jar}.jar
- done
- fi
- if use doc; then
- dodoc -r docs
- java-pkg_dohtml -r build/docs/api
- fi
- if use source; then
- java-pkg_dosrc src/java/org
- use contrib && java-pkg_dosrc contrib
- fi
-}
diff --git a/dev-java/lucene/lucene-3.6.2-r1.ebuild b/dev-java/lucene/lucene-3.6.2-r1.ebuild
deleted file mode 100644
index 4dcb812a206..00000000000
--- a/dev-java/lucene/lucene-3.6.2-r1.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-JAVA_PKG_IUSE="doc source test contrib"
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_BSFIX_NAME="build.xml common-build.xml contrib-build.xml"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
-HOMEPAGE="https://lucene.apache.org"
-SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="3.6"
-KEYWORDS="amd64 x86"
-
-CDEPEND="
- dev-java/ant-ivy:2
- dev-java/ant-junit:0
- dev-java/ant-nodeps:0
- dev-java/hamcrest-core:0
- contrib? (
- dev-java/jakarta-regexp:1.4
- dev-java/commons-compress:0
- dev-java/commons-collections:0
- dev-java/commons-digester:0
- dev-java/commons-logging:0
- dev-java/commons-beanutils:1.7
- )"
-
-DEPEND="
- ${CDEPEND}
- >=virtual/jdk-1.6
- test? (
- dev-java/junit:4
- )"
-
-RDEPEND="
- ${CDEPEND}
- >=virtual/jre-1.6"
-
-DOCS=(
- CHANGES.txt README.txt
- NOTICE.txt CHANGES.txt
- JRE_VERSION_MIGRATION.txt
-)
-
-# All tests fail with the following error:
-# junit.framework.AssertionFailedError: ensure your setUp() calls super.setUp()!!!
-RESTRICT="test"
-
-src_prepare() {
- default
- java-pkg_clean
- sed -i \
- -e '/-Xmax/ d' \
- common-build.xml || die
-
- # FIXME: contrib builds do not work if junit not included
- #java-pkg_jar-from --build-only --into lib \
- # junit-4 junit.jar junit-4.7.jar
- java-pkg_jar-from --build-only --into lib \
- ant-core ant.jar ant-1.7.1.jar
- java-pkg_jar-from --build-only --into lib \
- ant-junit ant-junit.jar ant-junit-1.7.1.jar
-
- if use contrib; then
- cd contrib/ || die
- java-pkg_jar-from --build-only --into queries/lib \
- jakarta-regexp:1.4 jakarta-regexp.jar jakarta-regexpt-1.4.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-compress commons-compress.jar commons-compress-1.1.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-collections commons-collections.jar commons-collections-3.1.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-digester commons-digester.jar commons-digester-1.7.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-logging commons-logging.jar commons-logging-1.0.4.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-beanutils:1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
- fi
-}
-
-src_prepare() {
- default
- java-pkg_clean
- sed -i \
- -e '/-Xmax/ d' \
- -e '/property="ivy.available"/s,resource="${ivy.resource}",file="." type="dir",g' \
- -e '/<ivy:retrieve/d' \
- common-build.xml || die
- mkdir -p {.,queries,benchmark,analyzers/phonetic}/lib || die
- java-pkg_jar-from --build-only --into lib \
- ant-core ant.jar ant-1.7.1.jar
- java-pkg_jar-from --build-only --into lib \
- ant-junit ant-junit.jar ant-junit-1.7.1.jar
- java-pkg_jar-from --build-only --into lib \
- ant-ivy:2
- java-pkg_jar-from --build-only --into lib \
- junit-4 junit.jar junit-4.10.jar
- java-pkg_jar-from --build-only --into lib \
- hamcrest-core
-
- # Always needed anyway
- cd "${S}"/test-framework/ || die
- java-pkg_jar-from --build-only --into lib \
- ant-core ant.jar ant-1.7.1.jar
- java-pkg_jar-from --build-only --into lib \
- ant-junit ant-junit.jar ant-junit-1.7.1.jar
- java-pkg_jar-from --build-only --into lib \
- junit-4 junit.jar junit-4.10.jar
- java-pkg_jar-from --build-only --into lib \
- hamcrest-core
-
- if use contrib; then
- cd "${S}"/contrib/ || die
- # queries
- java-pkg_jar-from --build-only --into queries/lib \
- jakarta-regexp:1.4 jakarta-regexp.jar jakarta-regexp-1.4.jar
- # benchmark
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-compress commons-compress.jar commons-compress-1.1.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-collections commons-collections.jar commons-collections-3.1.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-digester commons-digester.jar commons-digester-1.7.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-logging commons-logging.jar commons-logging-1.0.4.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-beanutils:1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
- # analyzers/phonetic
- java-pkg_jar-from --build-only --into analyzers/phonetic/lib \
- commons-codec commons-codec.jar commons-codec-1.6.jar
- fi
-}
-
-src_compile() {
- # FIXME: docs do not build if behind a proxy, -autoproxy does not work
- java-ant_xml-rewrite -f common-build.xml \
- -c -e javadoc \
- -a failonerror \
- -v "false"
-
- ANT_TASKS="none" \
- eant -Dversion=${PV} \
- -Dfailonjavadocwarning=false \
- jar-core \
- $(use_doc javadocs-core)
-
- if use contrib; then
- ANT_TASKS="none" \
- eant -Dversion=${PV} \
- -Dfailonjavadocwarning=false \
- build-contrib \
- $(use_doc javadocs-all)
- fi
-}
-
-src_test() {
- # FIXME: test does not get run, even when selected
- java-ant_rewrite-classpath common-build.xml
- EANT_GENTOO_CLASSPATH="junit-4 ant-core ant-junit" \
- ANT_TASKS="ant-junit" \
- eant test-core
-}
-
-src_install() {
- einstalldocs
- java-pkg_newjar build/core/${PN}-core-${PV}.jar ${PN}-core.jar
-
- if use contrib; then
- local i j
- for i in $(find build/contrib -name \*-${PV}.jar); do
- j=${i##*/}
- java-pkg_newjar $i ${j%%-${PV}.jar}.jar
- done
- fi
- if use doc; then
- dodoc -r docs
- java-pkg_dohtml -r build/docs/api
- fi
- if use source; then
- java-pkg_dosrc core/src/java/org
- use contrib && java-pkg_dosrc contrib
- fi
-}
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/lucene/
@ 2018-04-18 14:13 Aaron Bauman
0 siblings, 0 replies; 23+ messages in thread
From: Aaron Bauman @ 2018-04-18 14:13 UTC (permalink / raw
To: gentoo-commits
commit: 1ee348ca97f5a37256755f7f25d4621322a9e822
Author: Aaron Bauman <bman <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 18 14:13:06 2018 +0000
Commit: Aaron Bauman <bman <AT> gentoo <DOT> org>
CommitDate: Wed Apr 18 14:13:47 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ee348ca
dev-java/lucene: amd64 stable wrt bug #650716
Bug: https://bugs.gentoo.org/650716
Package-Manager: Portage-2.3.29, Repoman-2.3.9
dev-java/lucene/lucene-3.5.0-r2.ebuild | 2 +-
dev-java/lucene/lucene-3.6.2-r2.ebuild | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/lucene/lucene-3.5.0-r2.ebuild b/dev-java/lucene/lucene-3.5.0-r2.ebuild
index 9eaf6f89d18..a5b2c1d755b 100644
--- a/dev-java/lucene/lucene-3.5.0-r2.ebuild
+++ b/dev-java/lucene/lucene-3.5.0-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
LICENSE="Apache-2.0"
SLOT="3.5"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
CDEPEND="
dev-java/junit:4
diff --git a/dev-java/lucene/lucene-3.6.2-r2.ebuild b/dev-java/lucene/lucene-3.6.2-r2.ebuild
index 6ff6151e9bb..00ad0d23efe 100644
--- a/dev-java/lucene/lucene-3.6.2-r2.ebuild
+++ b/dev-java/lucene/lucene-3.6.2-r2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
LICENSE="Apache-2.0"
SLOT="3.6"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
CDEPEND="
dev-java/ant-ivy:2
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/lucene/
@ 2018-03-17 13:37 Pacho Ramos
0 siblings, 0 replies; 23+ messages in thread
From: Pacho Ramos @ 2018-03-17 13:37 UTC (permalink / raw
To: gentoo-commits
commit: e3799537ae865f6ee23e4fdbecb4b0b1c3318925
Author: Pacho Ramos <pacho <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 17 13:29:42 2018 +0000
Commit: Pacho Ramos <pacho <AT> gentoo <DOT> org>
CommitDate: Sat Mar 17 13:35:09 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3799537
dev-java/lucene: Drop dependencies on obsolete dev-java/ant-trax and dev-java/ant-nodeps (#466558)
Package-Manager: Portage-2.3.24, Repoman-2.3.6
dev-java/lucene/lucene-3.5.0-r2.ebuild | 136 ++++++++++++++++++++++++
dev-java/lucene/lucene-3.6.2-r2.ebuild | 189 +++++++++++++++++++++++++++++++++
2 files changed, 325 insertions(+)
diff --git a/dev-java/lucene/lucene-3.5.0-r2.ebuild b/dev-java/lucene/lucene-3.5.0-r2.ebuild
new file mode 100644
index 00000000000..9eaf6f89d18
--- /dev/null
+++ b/dev-java/lucene/lucene-3.5.0-r2.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test contrib"
+JAVA_PKG_BSFIX_ALL="no"
+JAVA_PKG_BSFIX_NAME="build.xml common-build.xml contrib-build.xml"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
+HOMEPAGE="https://lucene.apache.org"
+SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="3.5"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="
+ dev-java/junit:4
+ dev-java/ant-junit:0
+ dev-java/ant-core:0
+ contrib? (
+ dev-java/jakarta-regexp:1.4
+ dev-java/commons-compress:0
+ dev-java/commons-collections:0
+ dev-java/commons-digester:0
+ dev-java/commons-logging:0
+ dev-java/commons-beanutils:1.7
+ )"
+
+DEPEND="
+ ${CDEPEND}
+ >=virtual/jdk-1.6
+ test? (
+ dev-java/junit:4
+ dev-java/ant-core:0
+ )"
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
+
+DOCS=(
+ CHANGES.txt README.txt
+ NOTICE.txt CHANGES.txt
+ JRE_VERSION_MIGRATION.txt
+)
+
+# All tests fail with the following error:
+# junit.framework.AssertionFailedError: ensure your setUp() calls super.setUp()!!!
+RESTRICT="test"
+
+src_prepare() {
+ default
+ java-pkg_clean
+ sed -i \
+ -e '/-Xmax/ d' \
+ common-build.xml || die
+
+ # FIXME: contrib builds do not work if junit not included
+ #java-pkg_jar-from --build-only --into lib \
+ # junit-4 junit.jar junit-4.7.jar
+ java-pkg_jar-from --build-only --into lib \
+ ant-core ant.jar ant-1.7.1.jar
+ java-pkg_jar-from --build-only --into lib \
+ ant-junit ant-junit.jar ant-junit-1.7.1.jar
+
+ if use contrib; then
+ cd contrib/ || die
+ java-pkg_jar-from --build-only --into queries/lib \
+ jakarta-regexp:1.4 jakarta-regexp.jar jakarta-regexpt-1.4.jar
+ java-pkg_jar-from --build-only --into benchmark/lib \
+ commons-compress commons-compress.jar commons-compress-1.1.jar
+ java-pkg_jar-from --build-only --into benchmark/lib \
+ commons-collections commons-collections.jar commons-collections-3.1.jar
+ java-pkg_jar-from --build-only --into benchmark/lib \
+ commons-digester commons-digester.jar commons-digester-1.7.jar
+ java-pkg_jar-from --build-only --into benchmark/lib \
+ commons-logging commons-logging.jar commons-logging-1.0.4.jar
+ java-pkg_jar-from --build-only --into benchmark/lib \
+ commons-beanutils:1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
+ fi
+}
+
+src_compile() {
+ # FIXME: docs do not build if behind a proxy, -autoproxy does not work
+ java-ant_xml-rewrite -f common-build.xml \
+ -c -e javadoc \
+ -a failonerror \
+ -v "false"
+
+ ANT_TASKS="none" \
+ eant -Dversion=${PV} \
+ -Dfailonjavadocwarning=false \
+ jar-core \
+ $(use_doc javadocs-core)
+
+ if use contrib; then
+ ANT_TASKS="none" \
+ eant -Dversion=${PV} \
+ -Dfailonjavadocwarning=false \
+ build-contrib \
+ $(use_doc javadocs-all)
+ fi
+}
+
+src_test() {
+ # FIXME: test does not get run, even when selected
+ java-ant_rewrite-classpath common-build.xml
+ EANT_GENTOO_CLASSPATH="junit-4 ant-core ant-junit" \
+ ANT_TASKS="ant-junit" \
+ eant test-core
+}
+
+src_install() {
+ einstalldocs
+ java-pkg_newjar build/${PN}-core-${PV}.jar ${PN}-core.jar
+
+ if use contrib; then
+ local i j
+ for i in $(find build/contrib -name \*-${PV}.jar); do
+ j=${i##*/}
+ java-pkg_newjar $i ${j%%-${PV}.jar}.jar
+ done
+ fi
+ if use doc; then
+ dodoc -r docs
+ java-pkg_dohtml -r build/docs/api
+ fi
+ if use source; then
+ java-pkg_dosrc src/java/org
+ use contrib && java-pkg_dosrc contrib
+ fi
+}
diff --git a/dev-java/lucene/lucene-3.6.2-r2.ebuild b/dev-java/lucene/lucene-3.6.2-r2.ebuild
new file mode 100644
index 00000000000..6ff6151e9bb
--- /dev/null
+++ b/dev-java/lucene/lucene-3.6.2-r2.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test contrib"
+JAVA_PKG_BSFIX_ALL="no"
+JAVA_PKG_BSFIX_NAME="build.xml common-build.xml contrib-build.xml"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
+HOMEPAGE="https://lucene.apache.org"
+SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="3.6"
+KEYWORDS="~amd64 ~x86"
+
+CDEPEND="
+ dev-java/ant-ivy:2
+ dev-java/ant-junit:0
+ dev-java/ant-core:0
+ dev-java/hamcrest-core:0
+ contrib? (
+ dev-java/jakarta-regexp:1.4
+ dev-java/commons-compress:0
+ dev-java/commons-collections:0
+ dev-java/commons-digester:0
+ dev-java/commons-logging:0
+ dev-java/commons-beanutils:1.7
+ )"
+
+DEPEND="
+ ${CDEPEND}
+ >=virtual/jdk-1.6
+ test? (
+ dev-java/junit:4
+ )"
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
+
+DOCS=(
+ CHANGES.txt README.txt
+ NOTICE.txt CHANGES.txt
+ JRE_VERSION_MIGRATION.txt
+)
+
+# All tests fail with the following error:
+# junit.framework.AssertionFailedError: ensure your setUp() calls super.setUp()!!!
+RESTRICT="test"
+
+src_prepare() {
+ default
+ java-pkg_clean
+ sed -i \
+ -e '/-Xmax/ d' \
+ common-build.xml || die
+
+ # FIXME: contrib builds do not work if junit not included
+ #java-pkg_jar-from --build-only --into lib \
+ # junit-4 junit.jar junit-4.7.jar
+ java-pkg_jar-from --build-only --into lib \
+ ant-core ant.jar ant-1.7.1.jar
+ java-pkg_jar-from --build-only --into lib \
+ ant-junit ant-junit.jar ant-junit-1.7.1.jar
+
+ if use contrib; then
+ cd contrib/ || die
+ java-pkg_jar-from --build-only --into queries/lib \
+ jakarta-regexp:1.4 jakarta-regexp.jar jakarta-regexpt-1.4.jar
+ java-pkg_jar-from --build-only --into benchmark/lib \
+ commons-compress commons-compress.jar commons-compress-1.1.jar
+ java-pkg_jar-from --build-only --into benchmark/lib \
+ commons-collections commons-collections.jar commons-collections-3.1.jar
+ java-pkg_jar-from --build-only --into benchmark/lib \
+ commons-digester commons-digester.jar commons-digester-1.7.jar
+ java-pkg_jar-from --build-only --into benchmark/lib \
+ commons-logging commons-logging.jar commons-logging-1.0.4.jar
+ java-pkg_jar-from --build-only --into benchmark/lib \
+ commons-beanutils:1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
+ fi
+}
+
+src_prepare() {
+ default
+ java-pkg_clean
+ sed -i \
+ -e '/-Xmax/ d' \
+ -e '/property="ivy.available"/s,resource="${ivy.resource}",file="." type="dir",g' \
+ -e '/<ivy:retrieve/d' \
+ common-build.xml || die
+ mkdir -p {.,queries,benchmark,analyzers/phonetic}/lib || die
+ java-pkg_jar-from --build-only --into lib \
+ ant-core ant.jar ant-1.7.1.jar
+ java-pkg_jar-from --build-only --into lib \
+ ant-junit ant-junit.jar ant-junit-1.7.1.jar
+ java-pkg_jar-from --build-only --into lib \
+ ant-ivy:2
+ java-pkg_jar-from --build-only --into lib \
+ junit-4 junit.jar junit-4.10.jar
+ java-pkg_jar-from --build-only --into lib \
+ hamcrest-core
+
+ # Always needed anyway
+ cd "${S}"/test-framework/ || die
+ java-pkg_jar-from --build-only --into lib \
+ ant-core ant.jar ant-1.7.1.jar
+ java-pkg_jar-from --build-only --into lib \
+ ant-junit ant-junit.jar ant-junit-1.7.1.jar
+ java-pkg_jar-from --build-only --into lib \
+ junit-4 junit.jar junit-4.10.jar
+ java-pkg_jar-from --build-only --into lib \
+ hamcrest-core
+
+ if use contrib; then
+ cd "${S}"/contrib/ || die
+ # queries
+ java-pkg_jar-from --build-only --into queries/lib \
+ jakarta-regexp:1.4 jakarta-regexp.jar jakarta-regexp-1.4.jar
+ # benchmark
+ java-pkg_jar-from --build-only --into benchmark/lib \
+ commons-compress commons-compress.jar commons-compress-1.1.jar
+ java-pkg_jar-from --build-only --into benchmark/lib \
+ commons-collections commons-collections.jar commons-collections-3.1.jar
+ java-pkg_jar-from --build-only --into benchmark/lib \
+ commons-digester commons-digester.jar commons-digester-1.7.jar
+ java-pkg_jar-from --build-only --into benchmark/lib \
+ commons-logging commons-logging.jar commons-logging-1.0.4.jar
+ java-pkg_jar-from --build-only --into benchmark/lib \
+ commons-beanutils:1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
+ # analyzers/phonetic
+ java-pkg_jar-from --build-only --into analyzers/phonetic/lib \
+ commons-codec commons-codec.jar commons-codec-1.6.jar
+ fi
+}
+
+src_compile() {
+ # FIXME: docs do not build if behind a proxy, -autoproxy does not work
+ java-ant_xml-rewrite -f common-build.xml \
+ -c -e javadoc \
+ -a failonerror \
+ -v "false"
+
+ ANT_TASKS="none" \
+ eant -Dversion=${PV} \
+ -Dfailonjavadocwarning=false \
+ jar-core \
+ $(use_doc javadocs-core)
+
+ if use contrib; then
+ ANT_TASKS="none" \
+ eant -Dversion=${PV} \
+ -Dfailonjavadocwarning=false \
+ build-contrib \
+ $(use_doc javadocs-all)
+ fi
+}
+
+src_test() {
+ # FIXME: test does not get run, even when selected
+ java-ant_rewrite-classpath common-build.xml
+ EANT_GENTOO_CLASSPATH="junit-4 ant-core ant-junit" \
+ ANT_TASKS="ant-junit" \
+ eant test-core
+}
+
+src_install() {
+ einstalldocs
+ java-pkg_newjar build/core/${PN}-core-${PV}.jar ${PN}-core.jar
+
+ if use contrib; then
+ local i j
+ for i in $(find build/contrib -name \*-${PV}.jar); do
+ j=${i##*/}
+ java-pkg_newjar $i ${j%%-${PV}.jar}.jar
+ done
+ fi
+ if use doc; then
+ dodoc -r docs
+ java-pkg_dohtml -r build/docs/api
+ fi
+ if use source; then
+ java-pkg_dosrc core/src/java/org
+ use contrib && java-pkg_dosrc contrib
+ fi
+}
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/lucene/
@ 2018-01-03 10:08 Patrice Clement
0 siblings, 0 replies; 23+ messages in thread
From: Patrice Clement @ 2018-01-03 10:08 UTC (permalink / raw
To: gentoo-commits
commit: c99a234da1053250650fbb3c337afecb3ca17c35
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 3 10:08:09 2018 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Jan 3 10:08:41 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c99a234d
dev-java/lucene: clean up old.
Closes: https://bugs.gentoo.org/642302
Package-Manager: Portage-2.3.13, Repoman-2.3.3
dev-java/lucene/lucene-3.6.2.ebuild | 130 ------------------------------------
1 file changed, 130 deletions(-)
diff --git a/dev-java/lucene/lucene-3.6.2.ebuild b/dev-java/lucene/lucene-3.6.2.ebuild
deleted file mode 100644
index a760e4fc197..00000000000
--- a/dev-java/lucene/lucene-3.6.2.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-JAVA_PKG_IUSE="doc source test contrib"
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_BSFIX_NAME="build.xml common-build.xml contrib-build.xml"
-#JAVA_PKG_DEBUG=1
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
-HOMEPAGE="http://lucene.apache.org"
-SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
-LICENSE="Apache-2.0"
-SLOT="${PV:0:3}"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-RDEPEND=">=virtual/jdk-1.5
- contrib? (
- dev-java/commons-beanutils:1.7
- >=dev-java/commons-codec-1.6:0
- dev-java/commons-collections:0
- dev-java/commons-compress:0
- dev-java/commons-digester:0
- dev-java/commons-logging:0
- dev-java/jakarta-regexp:1.4
- )"
-DEPEND="${RDEPEND}
- dev-java/ant-nodeps:0
- test? ( >=dev-java/junit-4.12:4
- dev-java/hamcrest-core )
- dev-java/ant-junit:0
- >=dev-java/ant-ivy-2.2.0:2"
-
-#dev-java/javacc:0 - no longer needed, files are prebuilt
-
-java_prepare() {
- #find -name "*.jar" -type f | xargs rm -v
- sed -i \
- -e '/-Xmax/ d' \
- -e '/property="ivy.available"/s,resource="${ivy.resource}",file="." type="dir",g' \
- -e '/<ivy:retrieve/d' \
- common-build.xml
- mkdir -p {.,queries,benchmark,analyzers/phonetic}/lib
- java-pkg_jar-from --build-only --into lib \
- ant-core ant.jar ant-1.7.1.jar
- java-pkg_jar-from --build-only --into lib \
- ant-junit ant-junit.jar ant-junit-1.7.1.jar
- java-pkg_jar-from --build-only --into lib \
- ant-ivy:2
- java-pkg_jar-from --build-only --into lib \
- junit-4 junit.jar junit-4.10.jar
- java-pkg_jar-from --build-only --into lib \
- hamcrest-core
- # Always needed anyway
- cd "${S}"/test-framework/
- java-pkg_jar-from --build-only --into lib \
- ant-core ant.jar ant-1.7.1.jar
- java-pkg_jar-from --build-only --into lib \
- ant-junit ant-junit.jar ant-junit-1.7.1.jar
- java-pkg_jar-from --build-only --into lib \
- junit-4 junit.jar junit-4.10.jar
- java-pkg_jar-from --build-only --into lib \
- hamcrest-core
-
- if use contrib ; then
- cd "${S}"/contrib/
- # queries
- java-pkg_jar-from --build-only --into queries/lib \
- jakarta-regexp:1.4 jakarta-regexp.jar jakarta-regexp-1.4.jar
- # benchmark
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-compress commons-compress.jar commons-compress-1.1.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-collections commons-collections.jar commons-collections-3.1.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-digester commons-digester.jar commons-digester-1.7.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-logging commons-logging.jar commons-logging-1.0.4.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-beanutils:1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
- # analyzers/phonetic
- java-pkg_jar-from --build-only --into analyzers/phonetic/lib \
- commons-codec commons-codec.jar commons-codec-1.6.jar
- fi
-}
-
-src_compile() {
- # FIXME: docs do not build if behind a proxy, -autoproxy does not work
- einfo "Building main"
- ANT_TASKS="none" eant -Dversion=${PV} \
- -Dfailonjavadocwarning=false \
- jar-core $(use_doc javadocs-core )
- if use contrib ; then
- einfo "Building contrib"
- ANT_TASKS="none" eant -Dversion=${PV} \
- -Dfailonjavadocwarning=false \
- build-contrib $(use_doc javadocs-all )
- fi
-}
-
-src_test() {
- # FIXME: test does not get run, even when selected
- java-ant_rewrite-classpath common-build.xml
- EANT_GENTOO_CLASSPATH="junit ant-core ant-junit" ANT_TASKS="ant-junit" eant test-core
-}
-
-src_install() {
- dodoc CHANGES.txt README.txt NOTICE.txt CHANGES.txt \
- JRE_VERSION_MIGRATION.txt|| die
- java-pkg_newjar build/core/${PN}-core-${PV}.jar ${PN}-core.jar
- if use contrib; then
- for i in `find build/contrib -name \*-${PV}.jar`
- do
- j=${i##*/}
- java-pkg_newjar $i ${j%%-${PV}.jar}.jar
- done
- fi
- if use doc; then
- dohtml -r docs/* || die
- java-pkg_dohtml -r build/docs/api
- fi
- if use source; then
- java-pkg_dosrc core/src/java/org || die
- if use contrib; then
- java-pkg_dosrc contrib || die
- fi
- fi
-}
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/lucene/
@ 2018-01-03 10:08 Patrice Clement
0 siblings, 0 replies; 23+ messages in thread
From: Patrice Clement @ 2018-01-03 10:08 UTC (permalink / raw
To: gentoo-commits
commit: 2e568ada41b1b78e81e024668b9f0373b5874538
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 3 09:42:06 2018 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Jan 3 10:08:37 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2e568ada
dev-java/lucene: clean up old.
Bug: https://bugs.gentoo.org/642302
Package-Manager: Portage-2.3.13, Repoman-2.3.3
dev-java/lucene/lucene-3.5.0.ebuild | 104 ------------------------------------
1 file changed, 104 deletions(-)
diff --git a/dev-java/lucene/lucene-3.5.0.ebuild b/dev-java/lucene/lucene-3.5.0.ebuild
deleted file mode 100644
index 0a804109766..00000000000
--- a/dev-java/lucene/lucene-3.5.0.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="3"
-JAVA_PKG_IUSE="doc source test contrib"
-JAVA_PKG_BSFIX_ALL="no"
-JAVA_PKG_BSFIX_NAME="build.xml common-build.xml contrib-build.xml"
-#JAVA_PKG_DEBUG=1
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
-HOMEPAGE="http://lucene.apache.org"
-SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
-LICENSE="Apache-2.0"
-SLOT="3.5"
-KEYWORDS="amd64 x86"
-IUSE=""
-DEPEND=">=virtual/jdk-1.5
- dev-java/ant-nodeps:0
- dev-java/junit:4
- dev-java/ant-junit:0
- contrib? (
- dev-java/jakarta-regexp:1.4
- dev-java/commons-compress:0
- dev-java/commons-collections:0
- dev-java/commons-digester:0
- dev-java/commons-logging:0
- dev-java/commons-beanutils:1.7
- )"
-RDEPEND=">=virtual/jdk-1.5"
-
-#dev-java/javacc:0 - no longer needed, files are prebuilt
-
-java_prepare() {
- #find -name "*.jar" -type f | xargs rm -v
- sed -i \
- -e '/-Xmax/ d' \
- common-build.xml
- # FIXME: contrib builds do not work if junit not included
- #java-pkg_jar-from --build-only --into lib \
- # junit-4 junit.jar junit-4.7.jar
- java-pkg_jar-from --build-only --into lib \
- ant-core ant.jar ant-1.7.1.jar
- java-pkg_jar-from --build-only --into lib \
- ant-junit ant-junit.jar ant-junit-1.7.1.jar
-
- if use contrib ; then
- cd contrib/
- java-pkg_jar-from --build-only --into queries/lib \
- jakarta-regexp:1.4 jakarta-regexp.jar jakarta-regexpt-1.4.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-compress commons-compress.jar commons-compress-1.1.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-collections commons-collections.jar commons-collections-3.1.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-digester commons-digester.jar commons-digester-1.7.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-logging commons-logging.jar commons-logging-1.0.4.jar
- java-pkg_jar-from --build-only --into benchmark/lib \
- commons-beanutils:1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
- fi
-}
-
-src_compile() {
- # FIXME: docs do not build if behind a proxy, -autoproxy does not work
- ANT_TASKS="none" eant -Dversion=${PV} \
- -Dfailonjavadocwarning=false \
- jar-core $(use_doc javadocs-core )
- if use contrib ; then
- ANT_TASKS="none" eant -Dversion=${PV} \
- -Dfailonjavadocwarning=false \
- build-contrib $(use_doc javadocs-all )
- fi
-}
-
-src_test() {
- # FIXME: test does not get run, even when selected
- java-ant_rewrite-classpath common-build.xml
- EANT_GENTOO_CLASSPATH="junit ant-core ant-junit" ANT_TASKS="ant-junit" eant test-core
-}
-
-src_install() {
- dodoc CHANGES.txt README.txt NOTICE.txt CHANGES.txt \
- JRE_VERSION_MIGRATION.txt|| die
- java-pkg_newjar build/${PN}-core-${PV}.jar ${PN}-core.jar
- if use contrib; then
- for i in `find build/contrib -name \*-${PV}.jar`
- do
- j=${i##*/}
- java-pkg_newjar $i ${j%%-${PV}.jar}.jar
- done
- fi
- if use doc; then
- dohtml -r docs/* || die
- java-pkg_dohtml -r build/docs/api
- fi
- if use source; then
- java-pkg_dosrc src/java/org || die
- if use contrib; then
- java-pkg_dosrc contrib || die
- fi
- fi
-}
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/lucene/
@ 2018-01-03 10:08 Patrice Clement
0 siblings, 0 replies; 23+ messages in thread
From: Patrice Clement @ 2018-01-03 10:08 UTC (permalink / raw
To: gentoo-commits
commit: 47f231718ad4c15c4c5616287321760790b0d828
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 3 10:07:13 2018 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Jan 3 10:08:39 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=47f23171
dev-java/lucene: EAPI 6 bump.
Bug: https://bugs.gentoo.org/642302
Package-Manager: Portage-2.3.13, Repoman-2.3.3
RepoMan-Options: --force
dev-java/lucene/lucene-3.6.2-r1.ebuild | 189 +++++++++++++++++++++++++++++++++
1 file changed, 189 insertions(+)
diff --git a/dev-java/lucene/lucene-3.6.2-r1.ebuild b/dev-java/lucene/lucene-3.6.2-r1.ebuild
new file mode 100644
index 00000000000..4dcb812a206
--- /dev/null
+++ b/dev-java/lucene/lucene-3.6.2-r1.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test contrib"
+JAVA_PKG_BSFIX_ALL="no"
+JAVA_PKG_BSFIX_NAME="build.xml common-build.xml contrib-build.xml"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
+HOMEPAGE="https://lucene.apache.org"
+SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="3.6"
+KEYWORDS="amd64 x86"
+
+CDEPEND="
+ dev-java/ant-ivy:2
+ dev-java/ant-junit:0
+ dev-java/ant-nodeps:0
+ dev-java/hamcrest-core:0
+ contrib? (
+ dev-java/jakarta-regexp:1.4
+ dev-java/commons-compress:0
+ dev-java/commons-collections:0
+ dev-java/commons-digester:0
+ dev-java/commons-logging:0
+ dev-java/commons-beanutils:1.7
+ )"
+
+DEPEND="
+ ${CDEPEND}
+ >=virtual/jdk-1.6
+ test? (
+ dev-java/junit:4
+ )"
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
+
+DOCS=(
+ CHANGES.txt README.txt
+ NOTICE.txt CHANGES.txt
+ JRE_VERSION_MIGRATION.txt
+)
+
+# All tests fail with the following error:
+# junit.framework.AssertionFailedError: ensure your setUp() calls super.setUp()!!!
+RESTRICT="test"
+
+src_prepare() {
+ default
+ java-pkg_clean
+ sed -i \
+ -e '/-Xmax/ d' \
+ common-build.xml || die
+
+ # FIXME: contrib builds do not work if junit not included
+ #java-pkg_jar-from --build-only --into lib \
+ # junit-4 junit.jar junit-4.7.jar
+ java-pkg_jar-from --build-only --into lib \
+ ant-core ant.jar ant-1.7.1.jar
+ java-pkg_jar-from --build-only --into lib \
+ ant-junit ant-junit.jar ant-junit-1.7.1.jar
+
+ if use contrib; then
+ cd contrib/ || die
+ java-pkg_jar-from --build-only --into queries/lib \
+ jakarta-regexp:1.4 jakarta-regexp.jar jakarta-regexpt-1.4.jar
+ java-pkg_jar-from --build-only --into benchmark/lib \
+ commons-compress commons-compress.jar commons-compress-1.1.jar
+ java-pkg_jar-from --build-only --into benchmark/lib \
+ commons-collections commons-collections.jar commons-collections-3.1.jar
+ java-pkg_jar-from --build-only --into benchmark/lib \
+ commons-digester commons-digester.jar commons-digester-1.7.jar
+ java-pkg_jar-from --build-only --into benchmark/lib \
+ commons-logging commons-logging.jar commons-logging-1.0.4.jar
+ java-pkg_jar-from --build-only --into benchmark/lib \
+ commons-beanutils:1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
+ fi
+}
+
+src_prepare() {
+ default
+ java-pkg_clean
+ sed -i \
+ -e '/-Xmax/ d' \
+ -e '/property="ivy.available"/s,resource="${ivy.resource}",file="." type="dir",g' \
+ -e '/<ivy:retrieve/d' \
+ common-build.xml || die
+ mkdir -p {.,queries,benchmark,analyzers/phonetic}/lib || die
+ java-pkg_jar-from --build-only --into lib \
+ ant-core ant.jar ant-1.7.1.jar
+ java-pkg_jar-from --build-only --into lib \
+ ant-junit ant-junit.jar ant-junit-1.7.1.jar
+ java-pkg_jar-from --build-only --into lib \
+ ant-ivy:2
+ java-pkg_jar-from --build-only --into lib \
+ junit-4 junit.jar junit-4.10.jar
+ java-pkg_jar-from --build-only --into lib \
+ hamcrest-core
+
+ # Always needed anyway
+ cd "${S}"/test-framework/ || die
+ java-pkg_jar-from --build-only --into lib \
+ ant-core ant.jar ant-1.7.1.jar
+ java-pkg_jar-from --build-only --into lib \
+ ant-junit ant-junit.jar ant-junit-1.7.1.jar
+ java-pkg_jar-from --build-only --into lib \
+ junit-4 junit.jar junit-4.10.jar
+ java-pkg_jar-from --build-only --into lib \
+ hamcrest-core
+
+ if use contrib; then
+ cd "${S}"/contrib/ || die
+ # queries
+ java-pkg_jar-from --build-only --into queries/lib \
+ jakarta-regexp:1.4 jakarta-regexp.jar jakarta-regexp-1.4.jar
+ # benchmark
+ java-pkg_jar-from --build-only --into benchmark/lib \
+ commons-compress commons-compress.jar commons-compress-1.1.jar
+ java-pkg_jar-from --build-only --into benchmark/lib \
+ commons-collections commons-collections.jar commons-collections-3.1.jar
+ java-pkg_jar-from --build-only --into benchmark/lib \
+ commons-digester commons-digester.jar commons-digester-1.7.jar
+ java-pkg_jar-from --build-only --into benchmark/lib \
+ commons-logging commons-logging.jar commons-logging-1.0.4.jar
+ java-pkg_jar-from --build-only --into benchmark/lib \
+ commons-beanutils:1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
+ # analyzers/phonetic
+ java-pkg_jar-from --build-only --into analyzers/phonetic/lib \
+ commons-codec commons-codec.jar commons-codec-1.6.jar
+ fi
+}
+
+src_compile() {
+ # FIXME: docs do not build if behind a proxy, -autoproxy does not work
+ java-ant_xml-rewrite -f common-build.xml \
+ -c -e javadoc \
+ -a failonerror \
+ -v "false"
+
+ ANT_TASKS="none" \
+ eant -Dversion=${PV} \
+ -Dfailonjavadocwarning=false \
+ jar-core \
+ $(use_doc javadocs-core)
+
+ if use contrib; then
+ ANT_TASKS="none" \
+ eant -Dversion=${PV} \
+ -Dfailonjavadocwarning=false \
+ build-contrib \
+ $(use_doc javadocs-all)
+ fi
+}
+
+src_test() {
+ # FIXME: test does not get run, even when selected
+ java-ant_rewrite-classpath common-build.xml
+ EANT_GENTOO_CLASSPATH="junit-4 ant-core ant-junit" \
+ ANT_TASKS="ant-junit" \
+ eant test-core
+}
+
+src_install() {
+ einstalldocs
+ java-pkg_newjar build/core/${PN}-core-${PV}.jar ${PN}-core.jar
+
+ if use contrib; then
+ local i j
+ for i in $(find build/contrib -name \*-${PV}.jar); do
+ j=${i##*/}
+ java-pkg_newjar $i ${j%%-${PV}.jar}.jar
+ done
+ fi
+ if use doc; then
+ dodoc -r docs
+ java-pkg_dohtml -r build/docs/api
+ fi
+ if use source; then
+ java-pkg_dosrc core/src/java/org
+ use contrib && java-pkg_dosrc contrib
+ fi
+}
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/lucene/
@ 2018-01-03 10:08 Patrice Clement
0 siblings, 0 replies; 23+ messages in thread
From: Patrice Clement @ 2018-01-03 10:08 UTC (permalink / raw
To: gentoo-commits
commit: 728948b68b16a07b09b1a1f123f8b575efec15aa
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 2 20:52:17 2018 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Jan 3 10:08:33 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=728948b6
dev-java/lucene: clean up old.
Bug: https://bugs.gentoo.org/642302
Package-Manager: Portage-2.3.13, Repoman-2.3.3
dev-java/lucene/Manifest | 1 -
dev-java/lucene/lucene-2.4.1-r1.ebuild | 57 ----------------------------------
2 files changed, 58 deletions(-)
diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest
index ca24d46c108..9ba9127489e 100644
--- a/dev-java/lucene/Manifest
+++ b/dev-java/lucene/Manifest
@@ -1,5 +1,4 @@
DIST lucene-1.4.3-src.tar.gz 768320 BLAKE2B 8017b672b0104be007582a67cff5cb130187afcf9608bec0cb2b6bae9b3ea8c67486b324740c99e4db8f23879dd614a098f778f6b52b429d3dd1906387e9b61e SHA512 426539a4b4a8887485c4301b2127ad4815646d1a81bca877ed2b0e68d886fcaf844449532a080754b79696c0f9e9c5f304be28487e0f9aa11178565a20f29911
-DIST lucene-2.4.1-src.tar.gz 5057003 BLAKE2B 3e2a29cfa94b367f1e62f60a2f7b7e195c788048564fb061ade4b1babcb2fd71e36b282049d3816c3faaaa3dacc07f4a7dbdb0504a659ea3ab8e06e247debcba SHA512 cf227eea4aeee904ccf5316ee7f2399864bf28b9c01e044ef27232dd483c3a5f0ecc8836633f44acfa41ffee6bf1c530e756ef45fa77ac1d15e1f83129b7aa5e
DIST lucene-2.4.1.tar.gz 5057003 BLAKE2B 3e2a29cfa94b367f1e62f60a2f7b7e195c788048564fb061ade4b1babcb2fd71e36b282049d3816c3faaaa3dacc07f4a7dbdb0504a659ea3ab8e06e247debcba SHA512 cf227eea4aeee904ccf5316ee7f2399864bf28b9c01e044ef27232dd483c3a5f0ecc8836633f44acfa41ffee6bf1c530e756ef45fa77ac1d15e1f83129b7aa5e
DIST lucene-3.5.0-src.tgz 39564076 BLAKE2B 5018f0e07a9df3f2f55c540e94e349e64e2c02c99acf14946e4471e16ace4f17a18e306aca6187028cde4434f0d6b38090442baaddaa79ef12ff34a8461f9e98 SHA512 58846190ed0e8c0747e14cb46bf27255d0e4ee93aa0969cf16140713ce20c8fc3f451353437313f14416c92b7b6825d4ce3416d9c7ce4cb1854f31877c2af275
DIST lucene-3.6.2-src.tgz 32139784 BLAKE2B 48fe88efeae8396e084f827aa66530480f40aee3a2e59c8524420059f004a73be4c1e50c98345ad0ad4808ff8a0a996f9406523bf5c124616657ec91f9797f70 SHA512 e9a08a1b5303c44e4feecc0bb6e7013e4a9420517ae4e98999bd318ec25b5b2ff3b6de8b51db8f68afc0fdc3149829297023a95b103d4f99e7db68deee4c3965
diff --git a/dev-java/lucene/lucene-2.4.1-r1.ebuild b/dev-java/lucene/lucene-2.4.1-r1.ebuild
deleted file mode 100644
index ae751585ba3..00000000000
--- a/dev-java/lucene/lucene-2.4.1-r1.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-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 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
-}
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/lucene/
@ 2018-01-03 10:08 Patrice Clement
0 siblings, 0 replies; 23+ messages in thread
From: Patrice Clement @ 2018-01-03 10:08 UTC (permalink / raw
To: gentoo-commits
commit: ec1c6909bd1b08ef3f86f8dd0ca9b2b6e0f52523
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 2 20:17:51 2018 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Jan 3 10:08:27 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ec1c6909
dev-java/lucene: EAPI 6 bump.
Commit straight to stable as discussed with zlogne on IRC.
Bug: https://bugs.gentoo.org/642302
Package-Manager: Portage-2.3.13, Repoman-2.3.3
RepoMan-Options: --force
dev-java/lucene/lucene-1.4.3-r4.ebuild | 52 ++++++++++++++++++++++++++++++++++
1 file changed, 52 insertions(+)
diff --git a/dev-java/lucene/lucene-1.4.3-r4.ebuild b/dev-java/lucene/lucene-1.4.3-r4.ebuild
new file mode 100644
index 00000000000..327f41c136f
--- /dev/null
+++ b/dev-java/lucene/lucene-1.4.3-r4.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc examples source test"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="High-performance, full-featured Java text search engine"
+HOMEPAGE="https://lucene.apache.org"
+SRC_URI="mirror://apache/lucene/java/archive/${P}-src.tar.gz"
+
+KEYWORDS="amd64 x86 ~x86-fbsd"
+LICENSE="Apache-1.1"
+SLOT="1"
+
+DEPEND="
+ >=virtual/jdk-1.6
+ test? ( dev-java/ant-junit:0 )"
+
+RDEPEND="
+ >=virtual/jre-1.6"
+
+src_prepare() {
+ default
+ java-pkg_clean
+}
+
+src_compile() {
+ eant jar-core $(use_doc javadocs)
+}
+
+src_test() {
+ java-ant_rewrite-classpath build.xml
+ EANT_GENTOO_CLASSPATH="junit ant-core" \
+ ANT_TASKS="ant-junit" \
+ eant test
+}
+
+src_install() {
+ einstalldocs
+ java-pkg_newjar build/lucene-1.5-rc1-dev.jar
+
+ if use doc; then
+ dodoc -r docs/*
+ java-pkg_dojavadoc build/docs/api
+ fi
+
+ use examples && java-pkg_doexamples src/demo
+ use source && java-pkg_dosrc src/java/org
+}
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/lucene/
@ 2018-01-03 10:08 Patrice Clement
0 siblings, 0 replies; 23+ messages in thread
From: Patrice Clement @ 2018-01-03 10:08 UTC (permalink / raw
To: gentoo-commits
commit: 2910da6cfb7f63d5064e275b9c5bc37d3cf70501
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 2 20:18:47 2018 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Jan 3 10:08:29 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2910da6c
dev-java/lucene: clean up old.
Bye bye EAPI 3 ebuild.
Bug: https://bugs.gentoo.org/642302
Package-Manager: Portage-2.3.13, Repoman-2.3.3
dev-java/lucene/lucene-1.4.3-r3.ebuild | 47 ----------------------------------
1 file changed, 47 deletions(-)
diff --git a/dev-java/lucene/lucene-1.4.3-r3.ebuild b/dev-java/lucene/lucene-1.4.3-r3.ebuild
deleted file mode 100644
index 3d238b00857..00000000000
--- a/dev-java/lucene/lucene-1.4.3-r3.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-JAVA_PKG_IUSE="doc examples source test"
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
-HOMEPAGE="http://lucene.apache.org"
-SRC_URI="mirror://apache/lucene/java/archive/${P}-src.tar.gz"
-LICENSE="Apache-1.1"
-SLOT="1"
-KEYWORDS="amd64 x86 ~x86-fbsd"
-IUSE=""
-DEPEND=">=virtual/jdk-1.4
- test? (
- =dev-java/junit-3*
- dev-java/ant-junit
- )"
-RDEPEND=">=virtual/jdk-1.4"
-
-src_unpack() {
- unpack ${A}
-
- cd "${S}/lib" || die
- rm -v *.jar || die
-}
-
-src_compile() {
- eant jar-core $(use_doc javadocs)
-}
-
-src_test() {
- java-ant_rewrite-classpath build.xml
- EANT_GENTOO_CLASSPATH="junit ant-core" ANT_TASKS="ant-junit" eant test
-}
-
-src_install() {
- dodoc CHANGES.txt README.txt || die
- java-pkg_newjar build/lucene-1.5-rc1-dev.jar
-
- if use doc; then
- dohtml -r docs/*
- java-pkg_dojavadoc build/docs/api
- fi
- use examples && java-pkg_doexamples src/demo
- use source && java-pkg_dosrc src/java/org
-}
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/lucene/
@ 2018-01-03 10:08 Patrice Clement
0 siblings, 0 replies; 23+ messages in thread
From: Patrice Clement @ 2018-01-03 10:08 UTC (permalink / raw
To: gentoo-commits
commit: ac63c743ed18aaaa0ae3fe320b4029a445c54ee0
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Wed Jan 3 09:41:26 2018 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Jan 3 10:08:35 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ac63c743
dev-java/lucene: EAPI 6 bump.
Bug: https://bugs.gentoo.org/642302
Package-Manager: Portage-2.3.13, Repoman-2.3.3
RepoMan-Options: --force
dev-java/lucene/lucene-3.5.0-r1.ebuild | 136 +++++++++++++++++++++++++++++++++
1 file changed, 136 insertions(+)
diff --git a/dev-java/lucene/lucene-3.5.0-r1.ebuild b/dev-java/lucene/lucene-3.5.0-r1.ebuild
new file mode 100644
index 00000000000..1c1898386a2
--- /dev/null
+++ b/dev-java/lucene/lucene-3.5.0-r1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+JAVA_PKG_IUSE="doc source test contrib"
+JAVA_PKG_BSFIX_ALL="no"
+JAVA_PKG_BSFIX_NAME="build.xml common-build.xml contrib-build.xml"
+
+inherit java-pkg-2 java-ant-2
+
+DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
+HOMEPAGE="https://lucene.apache.org"
+SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
+
+LICENSE="Apache-2.0"
+SLOT="3.5"
+KEYWORDS="amd64 x86"
+
+CDEPEND="
+ dev-java/junit:4
+ dev-java/ant-junit:0
+ dev-java/ant-nodeps:0
+ contrib? (
+ dev-java/jakarta-regexp:1.4
+ dev-java/commons-compress:0
+ dev-java/commons-collections:0
+ dev-java/commons-digester:0
+ dev-java/commons-logging:0
+ dev-java/commons-beanutils:1.7
+ )"
+
+DEPEND="
+ ${CDEPEND}
+ >=virtual/jdk-1.6
+ test? (
+ dev-java/junit:4
+ dev-java/ant-core:0
+ )"
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
+
+DOCS=(
+ CHANGES.txt README.txt
+ NOTICE.txt CHANGES.txt
+ JRE_VERSION_MIGRATION.txt
+)
+
+# All tests fail with the following error:
+# junit.framework.AssertionFailedError: ensure your setUp() calls super.setUp()!!!
+RESTRICT="test"
+
+src_prepare() {
+ default
+ java-pkg_clean
+ sed -i \
+ -e '/-Xmax/ d' \
+ common-build.xml || die
+
+ # FIXME: contrib builds do not work if junit not included
+ #java-pkg_jar-from --build-only --into lib \
+ # junit-4 junit.jar junit-4.7.jar
+ java-pkg_jar-from --build-only --into lib \
+ ant-core ant.jar ant-1.7.1.jar
+ java-pkg_jar-from --build-only --into lib \
+ ant-junit ant-junit.jar ant-junit-1.7.1.jar
+
+ if use contrib; then
+ cd contrib/ || die
+ java-pkg_jar-from --build-only --into queries/lib \
+ jakarta-regexp:1.4 jakarta-regexp.jar jakarta-regexpt-1.4.jar
+ java-pkg_jar-from --build-only --into benchmark/lib \
+ commons-compress commons-compress.jar commons-compress-1.1.jar
+ java-pkg_jar-from --build-only --into benchmark/lib \
+ commons-collections commons-collections.jar commons-collections-3.1.jar
+ java-pkg_jar-from --build-only --into benchmark/lib \
+ commons-digester commons-digester.jar commons-digester-1.7.jar
+ java-pkg_jar-from --build-only --into benchmark/lib \
+ commons-logging commons-logging.jar commons-logging-1.0.4.jar
+ java-pkg_jar-from --build-only --into benchmark/lib \
+ commons-beanutils:1.7 commons-beanutils.jar commons-beanutils-1.7.0.jar
+ fi
+}
+
+src_compile() {
+ # FIXME: docs do not build if behind a proxy, -autoproxy does not work
+ java-ant_xml-rewrite -f common-build.xml \
+ -c -e javadoc \
+ -a failonerror \
+ -v "false"
+
+ ANT_TASKS="none" \
+ eant -Dversion=${PV} \
+ -Dfailonjavadocwarning=false \
+ jar-core \
+ $(use_doc javadocs-core)
+
+ if use contrib; then
+ ANT_TASKS="none" \
+ eant -Dversion=${PV} \
+ -Dfailonjavadocwarning=false \
+ build-contrib \
+ $(use_doc javadocs-all)
+ fi
+}
+
+src_test() {
+ # FIXME: test does not get run, even when selected
+ java-ant_rewrite-classpath common-build.xml
+ EANT_GENTOO_CLASSPATH="junit-4 ant-core ant-junit" \
+ ANT_TASKS="ant-junit" \
+ eant test-core
+}
+
+src_install() {
+ einstalldocs
+ java-pkg_newjar build/${PN}-core-${PV}.jar ${PN}-core.jar
+
+ if use contrib; then
+ local i j
+ for i in $(find build/contrib -name \*-${PV}.jar); do
+ j=${i##*/}
+ java-pkg_newjar $i ${j%%-${PV}.jar}.jar
+ done
+ fi
+ if use doc; then
+ dodoc -r docs
+ java-pkg_dohtml -r build/docs/api
+ fi
+ if use source; then
+ java-pkg_dosrc src/java/org
+ use contrib && java-pkg_dosrc contrib
+ fi
+}
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/lucene/
@ 2018-01-03 10:08 Patrice Clement
0 siblings, 0 replies; 23+ messages in thread
From: Patrice Clement @ 2018-01-03 10:08 UTC (permalink / raw
To: gentoo-commits
commit: 0b5f524923e10fd94a7f5deb80844d8b8acccf81
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 2 20:51:17 2018 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Wed Jan 3 10:08:31 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b5f5249
dev-java/lucene: EAPI 6 bump.
Commit straight to stable as per IRC discussion with zlogene.
Bug: https://bugs.gentoo.org/642302
Package-Manager: Portage-2.3.13, Repoman-2.3.3
RepoMan-Options: --force
dev-java/lucene/Manifest | 1 +
dev-java/lucene/lucene-2.4.1-r2.ebuild | 79 ++++++++++++++++++++++++++++++++++
2 files changed, 80 insertions(+)
diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest
index 6a13c955c2c..ca24d46c108 100644
--- a/dev-java/lucene/Manifest
+++ b/dev-java/lucene/Manifest
@@ -1,4 +1,5 @@
DIST lucene-1.4.3-src.tar.gz 768320 BLAKE2B 8017b672b0104be007582a67cff5cb130187afcf9608bec0cb2b6bae9b3ea8c67486b324740c99e4db8f23879dd614a098f778f6b52b429d3dd1906387e9b61e SHA512 426539a4b4a8887485c4301b2127ad4815646d1a81bca877ed2b0e68d886fcaf844449532a080754b79696c0f9e9c5f304be28487e0f9aa11178565a20f29911
DIST lucene-2.4.1-src.tar.gz 5057003 BLAKE2B 3e2a29cfa94b367f1e62f60a2f7b7e195c788048564fb061ade4b1babcb2fd71e36b282049d3816c3faaaa3dacc07f4a7dbdb0504a659ea3ab8e06e247debcba SHA512 cf227eea4aeee904ccf5316ee7f2399864bf28b9c01e044ef27232dd483c3a5f0ecc8836633f44acfa41ffee6bf1c530e756ef45fa77ac1d15e1f83129b7aa5e
+DIST lucene-2.4.1.tar.gz 5057003 BLAKE2B 3e2a29cfa94b367f1e62f60a2f7b7e195c788048564fb061ade4b1babcb2fd71e36b282049d3816c3faaaa3dacc07f4a7dbdb0504a659ea3ab8e06e247debcba SHA512 cf227eea4aeee904ccf5316ee7f2399864bf28b9c01e044ef27232dd483c3a5f0ecc8836633f44acfa41ffee6bf1c530e756ef45fa77ac1d15e1f83129b7aa5e
DIST lucene-3.5.0-src.tgz 39564076 BLAKE2B 5018f0e07a9df3f2f55c540e94e349e64e2c02c99acf14946e4471e16ace4f17a18e306aca6187028cde4434f0d6b38090442baaddaa79ef12ff34a8461f9e98 SHA512 58846190ed0e8c0747e14cb46bf27255d0e4ee93aa0969cf16140713ce20c8fc3f451353437313f14416c92b7b6825d4ce3416d9c7ce4cb1854f31877c2af275
DIST lucene-3.6.2-src.tgz 32139784 BLAKE2B 48fe88efeae8396e084f827aa66530480f40aee3a2e59c8524420059f004a73be4c1e50c98345ad0ad4808ff8a0a996f9406523bf5c124616657ec91f9797f70 SHA512 e9a08a1b5303c44e4feecc0bb6e7013e4a9420517ae4e98999bd318ec25b5b2ff3b6de8b51db8f68afc0fdc3149829297023a95b103d4f99e7db68deee4c3965
diff --git a/dev-java/lucene/lucene-2.4.1-r2.ebuild b/dev-java/lucene/lucene-2.4.1-r2.ebuild
new file mode 100644
index 00000000000..018d8ba1bac
--- /dev/null
+++ b/dev-java/lucene/lucene-2.4.1-r2.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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="https://lucene.apache.org"
+SRC_URI="https://archive.apache.org/dist/${PN}/java/${P}-src.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="2.4"
+KEYWORDS="amd64 x86 ~x86-fbsd"
+
+CDEPEND="
+ dev-java/javacc:0"
+
+DEPEND="
+ ${CDEPEND}
+ >=virtual/jdk-1.6
+ test? (
+ dev-java/junit:0
+ dev-java/ant-core:0
+ )"
+
+RDEPEND="
+ ${CDEPEND}
+ >=virtual/jre-1.6"
+
+src_prepare() {
+ default
+ java-pkg_clean
+ sed -i -e '/-Xmax/ d' common-build.xml || die
+
+ # Portage marks shese files as bogus for some reason.
+ find . -type f -name instruction_arrow.png -exec rm -v {} \; || die
+}
+
+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() {
+ einstalldocs
+ 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
+ dodoc -r docs
+ java-pkg_dohtml -r build/docs/api
+ fi
+ use source && java-pkg_dosrc src/java/org
+}
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/lucene/
@ 2017-04-08 21:57 Patrice Clement
0 siblings, 0 replies; 23+ messages in thread
From: Patrice Clement @ 2017-04-08 21:57 UTC (permalink / raw
To: gentoo-commits
commit: bb91aa16f98f47fa7ac0a806883f270fd065fdf2
Author: Harri Nieminen <moikkis <AT> gmail <DOT> com>
AuthorDate: Sat Apr 1 18:08:01 2017 +0000
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Sat Apr 8 21:52:11 2017 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bb91aa16
dev-java/lucene: fix toolong DESCRIPTION.
Package-Manager: Portage-2.3.5, Repoman-2.3.2
dev-java/lucene/lucene-3.5.0.ebuild | 5 ++---
dev-java/lucene/lucene-3.6.2.ebuild | 5 ++---
2 files changed, 4 insertions(+), 6 deletions(-)
diff --git a/dev-java/lucene/lucene-3.5.0.ebuild b/dev-java/lucene/lucene-3.5.0.ebuild
index 85cc9362c52..0a804109766 100644
--- a/dev-java/lucene/lucene-3.5.0.ebuild
+++ b/dev-java/lucene/lucene-3.5.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="3"
@@ -9,8 +9,7 @@ JAVA_PKG_BSFIX_NAME="build.xml common-build.xml contrib-build.xml"
inherit java-pkg-2 java-ant-2
-DESCRIPTION="High-performance, full-featured text search engine library
-written entirely in Java"
+DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
HOMEPAGE="http://lucene.apache.org"
SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
LICENSE="Apache-2.0"
diff --git a/dev-java/lucene/lucene-3.6.2.ebuild b/dev-java/lucene/lucene-3.6.2.ebuild
index ecdf10a6fac..a760e4fc197 100644
--- a/dev-java/lucene/lucene-3.6.2.ebuild
+++ b/dev-java/lucene/lucene-3.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
EAPI="3"
@@ -9,8 +9,7 @@ JAVA_PKG_BSFIX_NAME="build.xml common-build.xml contrib-build.xml"
inherit java-pkg-2 java-ant-2
-DESCRIPTION="High-performance, full-featured text search engine library
-written entirely in Java"
+DESCRIPTION="High-performance, full-featured text search engine written entirely in Java"
HOMEPAGE="http://lucene.apache.org"
SRC_URI="mirror://apache/lucene/java/${PV}/${P}-src.tgz"
LICENSE="Apache-2.0"
^ permalink raw reply related [flat|nested] 23+ messages in thread* [gentoo-commits] repo/gentoo:master commit in: dev-java/lucene/
@ 2016-04-07 9:26 James Le Cuirot
0 siblings, 0 replies; 23+ messages in thread
From: James Le Cuirot @ 2016-04-07 9:26 UTC (permalink / raw
To: gentoo-commits
commit: fa5bbf8a9bcc25b62560fc94641426f1d16600b4
Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 7 09:26:16 2016 +0000
Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Thu Apr 7 09:26:52 2016 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa5bbf8a
dev-java/lucene: Relax junit version restriction in 3.6.2
I can't see any reason why this was restricted to 4.10 other than
that's what upstream used. 4.12 works fine.
Package-Manager: portage-2.2.28
dev-java/lucene/lucene-3.6.2.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/dev-java/lucene/lucene-3.6.2.ebuild b/dev-java/lucene/lucene-3.6.2.ebuild
index 20f5c6f..74a379f 100644
--- a/dev-java/lucene/lucene-3.6.2.ebuild
+++ b/dev-java/lucene/lucene-3.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -30,7 +30,7 @@ RDEPEND=">=virtual/jdk-1.5
)"
DEPEND="${RDEPEND}
dev-java/ant-nodeps:0
- test? ( =dev-java/junit-4.10*:4
+ test? ( >=dev-java/junit-4.12:4
dev-java/hamcrest-core )
dev-java/ant-junit:0
>=dev-java/ant-ivy-2.2.0:2"
^ permalink raw reply related [flat|nested] 23+ messages in thread
end of thread, other threads:[~2024-09-10 19:11 UTC | newest]
Thread overview: 23+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-11 8:33 [gentoo-commits] repo/gentoo:master commit in: dev-java/lucene/ Miroslav Šulc
-- strict thread matches above, loose matches on Subject: below --
2024-09-10 19:11 Miroslav Šulc
2024-09-10 19:11 Miroslav Šulc
2024-09-10 6:46 Miroslav Šulc
2022-04-23 7:05 Miroslav Šulc
2022-04-22 18:10 Arthur Zamarin
2022-04-22 18:10 Arthur Zamarin
2022-03-15 23:20 Sam James
2022-03-15 17:23 Sam James
2020-05-04 22:43 Jonas Stein
2018-11-04 13:50 Pacho Ramos
2018-04-18 14:13 Aaron Bauman
2018-03-17 13:37 Pacho Ramos
2018-01-03 10:08 Patrice Clement
2018-01-03 10:08 Patrice Clement
2018-01-03 10:08 Patrice Clement
2018-01-03 10:08 Patrice Clement
2018-01-03 10:08 Patrice Clement
2018-01-03 10:08 Patrice Clement
2018-01-03 10:08 Patrice Clement
2018-01-03 10:08 Patrice Clement
2017-04-08 21:57 Patrice Clement
2016-04-07 9:26 James Le Cuirot
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox