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

2022-04-23 Thread Miroslav Šulc 
commit: aa0e54ff3fe19e24ce05e211a536ca3b73ee867b
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sat Apr 23 06:09:09 2022 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Sat Apr 23 07:05:05 2022 +
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  pogatzki.net>
Signed-off-by: Miroslav Šulc  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..
--- 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  task
-   # doesn't use it - it's to fool the  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
-}

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

2022-04-22 Thread Arthur Zamarin 
commit: 73ecf2182ed1f5aa5f328e4183b5f814bda96f6b
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Apr 22 18:10:14 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Apr 22 18:10:14 2022 +
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  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"

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

2022-04-22 Thread Arthur Zamarin 
commit: 270ea26e426e2e1fcbb4069a7cd21f258ad76dda
Author: Arthur Zamarin  gentoo  org>
AuthorDate: Fri Apr 22 18:10:07 2022 +
Commit: Arthur Zamarin  gentoo  org>
CommitDate: Fri Apr 22 18:10:07 2022 +
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  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"

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

2022-03-15 Thread Sam James 
commit: 2cc45c52ab7a9f777692f0fece48ff29cd84f678
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Sat Jan 22 19:57:36 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 15 23:20:40 2022 +
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  pogatzki.net>
Signed-off-by: Sam James  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 
3e2a29cfa94b367f1e62f60a2f7b7e195c788048564fb061ade4b1babcb2fd71e36b282049d3816c3f3dacc07f4a7dbdb0504a659ea3ab8e06e247debcba
 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..
--- 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 '/j...@gentoo.org
   Java
 
-
-  Include extra

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

2022-03-15 Thread Sam James 
commit: f4a8605e553d660c2aa9a0f43f7afdd11ba6e0ca
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Tue Mar 15 09:53:19 2022 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 15 17:20:22 2022 +
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  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/24574
Signed-off-by: Sam James  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 ..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  task
+   # doesn't use it - it's to fool the  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
+}

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

2021-06-11 Thread Miroslav Šulc 
commit: 8030543c8917c6f4ce5d6eb2fe9acc4eac5a23db
Author: Volkmar W. Pogatzki  pogatzki  net>
AuthorDate: Fri Jun 11 06:16:47 2021 +
Commit: Miroslav Šulc  gentoo  org>
CommitDate: Fri Jun 11 08:33:14 2021 +
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  pogatzki.net>
Closes: https://github.com/gentoo/gentoo/pull/21196
Signed-off-by: Miroslav Šulc  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 
426539a4b4a8887485c4301b2127ad4815646d1a81bca877ed2b0e68d886fcaf89532a080754b79696c0f9e9c5f304be28487e0f9aa11178565a20f29911
 DIST lucene-2.4.1.tar.gz 5057003 BLAKE2B 
3e2a29cfa94b367f1e62f60a2f7b7e195c788048564fb061ade4b1babcb2fd71e36b282049d3816c3f3dacc07f4a7dbdb0504a659ea3ab8e06e247debcba
 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..000
--- 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..000
--- 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"
-

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

2020-05-04 Thread Jonas Stein 
commit: 3c06631cae93d4c673abc71edae0d737508231bc
Author: Jonas Stein  gentoo  org>
AuthorDate: Mon May  4 22:42:32 2020 +
Commit: Jonas Stein  gentoo  org>
CommitDate: Mon May  4 22:42:55 2020 +
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  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 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-
-  robb...@gentoo.org
-  Maintainer for actual Lucene issues.
-
 
   j...@gentoo.org
   Java

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

2018-11-04 Thread Pacho Ramos 
commit: 7bddd4f74f9f6df3291f9205206784dc82846eeb
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Nov  4 12:59:14 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Nov  4 13:50:07 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7bddd4f7

dev-java/lucene: Drop old

Signed-off-by: Pacho Ramos  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..000
--- 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

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

2018-04-18 Thread Aaron Bauman 
commit: 1ee348ca97f5a37256755f7f25d4621322a9e822
Author: Aaron Bauman  gentoo  org>
AuthorDate: Wed Apr 18 14:13:06 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Wed Apr 18 14:13:47 2018 +
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

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

2018-03-17 Thread Pacho Ramos 
commit: e3799537ae865f6ee23e4fdbecb4b0b1c3318925
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Mar 17 13:29:42 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Mar 17 13:35:09 2018 +
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 000..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##*/}
+

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

2018-01-03 Thread Patrice Clement 
commit: ec1c6909bd1b08ef3f86f8dd0ca9b2b6e0f52523
Author: Patrice Clement  gentoo  org>
AuthorDate: Tue Jan  2 20:17:51 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Jan  3 10:08:27 2018 +
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 000..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
+}

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

2018-01-03 Thread Patrice Clement 
commit: 47f231718ad4c15c4c5616287321760790b0d828
Author: Patrice Clement  gentoo  org>
AuthorDate: Wed Jan  3 10:07:13 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Jan  3 10:08:39 2018 +
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 000..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 '/

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

2018-01-03 Thread Patrice Clement 
commit: 728948b68b16a07b09b1a1f123f8b575efec15aa
Author: Patrice Clement  gentoo  org>
AuthorDate: Tue Jan  2 20:52:17 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Jan  3 10:08:33 2018 +
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 
426539a4b4a8887485c4301b2127ad4815646d1a81bca877ed2b0e68d886fcaf89532a080754b79696c0f9e9c5f304be28487e0f9aa11178565a20f29911
-DIST lucene-2.4.1-src.tar.gz 5057003 BLAKE2B 
3e2a29cfa94b367f1e62f60a2f7b7e195c788048564fb061ade4b1babcb2fd71e36b282049d3816c3f3dacc07f4a7dbdb0504a659ea3ab8e06e247debcba
 SHA512 
cf227eea4aeee904ccf5316ee7f2399864bf28b9c01e044ef27232dd483c3a5f0ecc8836633f44acfa41ffee6bf1c530e756ef45fa77ac1d15e1f83129b7aa5e
 DIST lucene-2.4.1.tar.gz 5057003 BLAKE2B 
3e2a29cfa94b367f1e62f60a2f7b7e195c788048564fb061ade4b1babcb2fd71e36b282049d3816c3f3dacc07f4a7dbdb0504a659ea3ab8e06e247debcba
 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..000
--- 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  task
-   # doesn't use it - it's to fool the  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
-}

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

2018-01-03 Thread Patrice Clement 
commit: c99a234da1053250650fbb3c337afecb3ca17c35
Author: Patrice Clement  gentoo  org>
AuthorDate: Wed Jan  3 10:08:09 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Jan  3 10:08:41 2018 +
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..000
--- 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 '/

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

2018-01-03 Thread Patrice Clement 
commit: 2910da6cfb7f63d5064e275b9c5bc37d3cf70501
Author: Patrice Clement  gentoo  org>
AuthorDate: Tue Jan  2 20:18:47 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Jan  3 10:08:29 2018 +
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..000
--- 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
-}

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

2018-01-03 Thread Patrice Clement 
commit: ac63c743ed180ae3fe320b4029a445c54ee0
Author: Patrice Clement  gentoo  org>
AuthorDate: Wed Jan  3 09:41:26 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Jan  3 10:08:35 2018 +
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 000..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

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

2018-01-03 Thread Patrice Clement 
commit: 0b5f524923e10fd94a7f5deb80844d8b8acccf81
Author: Patrice Clement  gentoo  org>
AuthorDate: Tue Jan  2 20:51:17 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Jan  3 10:08:31 2018 +
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 
426539a4b4a8887485c4301b2127ad4815646d1a81bca877ed2b0e68d886fcaf89532a080754b79696c0f9e9c5f304be28487e0f9aa11178565a20f29911
 DIST lucene-2.4.1-src.tar.gz 5057003 BLAKE2B 
3e2a29cfa94b367f1e62f60a2f7b7e195c788048564fb061ade4b1babcb2fd71e36b282049d3816c3f3dacc07f4a7dbdb0504a659ea3ab8e06e247debcba
 SHA512 
cf227eea4aeee904ccf5316ee7f2399864bf28b9c01e044ef27232dd483c3a5f0ecc8836633f44acfa41ffee6bf1c530e756ef45fa77ac1d15e1f83129b7aa5e
+DIST lucene-2.4.1.tar.gz 5057003 BLAKE2B 
3e2a29cfa94b367f1e62f60a2f7b7e195c788048564fb061ade4b1babcb2fd71e36b282049d3816c3f3dacc07f4a7dbdb0504a659ea3ab8e06e247debcba
 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 000..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  task
+   # doesn't use it - it's to fool the  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
+}

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

2018-01-03 Thread Patrice Clement 
commit: 2e568ada41b1b78e81e024668b9f0373b5874538
Author: Patrice Clement  gentoo  org>
AuthorDate: Wed Jan  3 09:42:06 2018 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Wed Jan  3 10:08:37 2018 +
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..000
--- 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
-}

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

2017-04-08 Thread Patrice Clement 
commit: bb91aa16f98f47fa7ac0a806883f270fd065fdf2
Author: Harri Nieminen  gmail  com>
AuthorDate: Sat Apr  1 18:08:01 2017 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sat Apr  8 21:52:11 2017 +
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"

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

2016-04-07 Thread James Le Cuirot 
commit: fa5bbf8a9bcc25b62560fc94641426f1d16600b4
Author: James Le Cuirot  gentoo  org>
AuthorDate: Thu Apr  7 09:26:16 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Thu Apr  7 09:26:52 2016 +
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"

[gentoo-commits] repo/gentoo:master commit in: dev-java/lucene/, dev-java/lucene/files/

2016-02-14 Thread James Le Cuirot 
commit: 7a41afbdab648a65ff254089a8d5ef714506e0ee
Author: James Le Cuirot  gentoo  org>
AuthorDate: Sun Feb 14 21:51:42 2016 +
Commit: James Le Cuirot  gentoo  org>
CommitDate: Sun Feb 14 21:52:14 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a41afbd

dev-java/lucene: Remove ridiculous number of unused versions

Package-Manager: portage-2.2.27

 dev-java/lucene/Manifest|  12 
 dev-java/lucene/files/disable-contrib.patch |  45 
 dev-java/lucene/files/lucene-manifest   |  10 ---
 dev-java/lucene/lucene-1.9.1.ebuild |  54 --
 dev-java/lucene/lucene-2.1.0-r1.ebuild  |  51 -
 dev-java/lucene/lucene-2.1.0-r2.ebuild  |  51 -
 dev-java/lucene/lucene-2.2.0-r1.ebuild  |  51 -
 dev-java/lucene/lucene-2.2.0.ebuild |  51 -
 dev-java/lucene/lucene-2.3.0.ebuild |  53 --
 dev-java/lucene/lucene-2.3.1.ebuild |  53 --
 dev-java/lucene/lucene-2.3.2-r1.ebuild  |  55 ---
 dev-java/lucene/lucene-2.3.2-r2.ebuild  |  55 ---
 dev-java/lucene/lucene-2.3.2.ebuild |  53 --
 dev-java/lucene/lucene-2.4.0.ebuild |  59 
 dev-java/lucene/lucene-2.4.1.ebuild |  58 ---
 dev-java/lucene/lucene-2.9.1-r1.ebuild  |  57 ---
 dev-java/lucene/lucene-2.9.4.ebuild |  62 
 dev-java/lucene/lucene-3.0.0.ebuild |  57 ---
 dev-java/lucene/lucene-3.0.3.ebuild |  62 
 dev-java/lucene/lucene-3.4.0.ebuild | 106 
 20 files changed, 1055 deletions(-)

diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest
index 20b51b1..da13b83 100644
--- a/dev-java/lucene/Manifest
+++ b/dev-java/lucene/Manifest
@@ -1,16 +1,4 @@
 DIST lucene-1.4.3-src.tar.gz 768320 SHA256 
62051daecebbae50c4e9d1c4d840f32fc58d85b0a5b370095c98e346c9ba1049 SHA512 
426539a4b4a8887485c4301b2127ad4815646d1a81bca877ed2b0e68d886fcaf89532a080754b79696c0f9e9c5f304be28487e0f9aa11178565a20f29911
 WHIRLPOOL 
dea750d36a33689fa46926271a5c3be62b011e327ce9fa671a480a7ff9ce4d430d678fbf6f82befd81510d574e303f71b627d15b438492a8a34d5f60b5569b95
-DIST lucene-1.9.1-src.tar.gz 6135056 SHA256 
a06bd64ce779f3d4e4b539c280f6a882efb2fd8cba4ebbed02a2b6f92658524f SHA512 
fb9f29e0d38d6525d7f6f86d339867a08bfe77ba18a023885a3ecb093d217840c274c767b6e1451f7c58135919c6159122756ebde4640a47420526502395a994
 WHIRLPOOL 
c9d83447742d2d0a2a30e73eb6ed2659db9be77d8bba0de716bdcf73af4bbbf0bf789251a8657c72aed217bf2b2deecb0ce044cf38d1b9a835cf66c338e9d548
-DIST lucene-2.1.0-src.tar.gz 8154476 SHA256 
b18c6bff8d74ddd6baabf9288aec45c34e90d74f6688657a4af2cbd0847e6ad9 SHA512 
9e9970c6f44b568867d0b714852d063758e8958eac76fa21ef7ab3f0e51f62bc2073d24faf8ad14bce560d6539287e65b82a5db0a35834dc0a0787729cf4a7aa
 WHIRLPOOL 
a38d6ce7015c5a2511d0a2d1d848d9762818c11ca9821cff47ded077f5934135a140e8b0ac1e4eea5085ff925535669fc56b10d18e86d73e124b7dd2fe1e0f71
-DIST lucene-2.2.0-src.tar.gz 6054069 SHA256 
c40372fbe4b586cf715c84194cef83df26bb65cc026aca1c3be22a5e81bd1370 SHA512 
afb40d3e71e2f5e45150b4e84635b9022bfe495de2fd6bc18e9792398a62258396f242266babd7209dfa1706e61c54c982d6ee70264b7807b60e6f25321c9cc7
 WHIRLPOOL 
a0ccdf8823bc8eac432f1b0e5048f33b01249c01cc7da4033dbcefdd7b0259eb31020ec996adbafeb37284959f177f90e22131544d5ad9080da686fc4af7bd7e
-DIST lucene-2.3.0-src.tar.gz 4591950 SHA256 
c020207987cb3bf415bf168b64245da3900de086312b82ce9b11d275146420b6 SHA512 
ee3aa3388932f38a06a23d75bc1ad0043238155f3b474c651ed716dc0b8f4158f49cb79002c31197f28e6d2286b7dc22d00e801d63ec153605b7af2b70a0387e
 WHIRLPOOL 
0f259265c152bca2356940085581e8ff46e98ab5415d68d0714683582aea2f7746f939d8e0e30bc0987d0970b6735cf6346eee2be784efad4be442a950a8a88f
-DIST lucene-2.3.1-src.tar.gz 4597493 SHA256 
84ddee3a667242917c8117d9e273d9e81ef7f4015c69a7758f12b8018054e646 SHA512 
95269c89485c4b23566459543365788c4c4c9c4b0bce6273dff63185e1dfabf643c37fd166227ffd89e4a6ea223aba19c79f3fdf7429a0cd69aadf34b863c8f2
 WHIRLPOOL 
a6b211db97749187b3ee0036933fad3a2cf97208a5a9553cafc5c0bb33c3a3fc9a502203f4b855b6a8c4ffa3faa7b1041c879c44dccd48a5da407cf5fc458bfe
-DIST lucene-2.3.2-src.tar.gz 4602041 SHA256 
d0cc4b8a40900bbb3243d2e9d9987e0ea0e7d359a299bc9acf296b208416 SHA512 
42bf988b2eed45ea8d8a3523d9fcf4e384e0e9729a25a54e518a34faf960370a8f7d824f537df7155dc2b64ac11e1b30a8e1ea745a0e054c86722f6e8551360d
 WHIRLPOOL 
d8db8e2962624f11e35d69f49a4bf000ebec33a6b01d42e71b5e19cc160c0a29167f94d6b96bd9d45154aa7292469d31c502670bfd0c54e78d333c89e6f33c03
-DIST lucene-2.4.0-src.tar.gz 5053702 SHA256 
01509848b8cf2e6675a38fc06124c7622cdd573e975ebcc893c36903b416b7c7 SHA512 
d01893a92e979d229103c30c02b96a328bdb04984c7af8633cb4c8acc0a9008f999da240489408a8412fcb42eb19ff2ade3bfea823ae735d50baab3228b89af4
 WHIRLPOOL