From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1010125-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 854771382C5
for <garchives@archives.gentoo.org>; Sat, 17 Mar 2018 13:37:30 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id C4889E08C9;
Sat, 17 Mar 2018 13:37:29 +0000 (UTC)
Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 8D08CE08C9
for <gentoo-commits@lists.gentoo.org>; Sat, 17 Mar 2018 13:37:28 +0000 (UTC)
Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84])
(using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 755F6335CA2
for <gentoo-commits@lists.gentoo.org>; Sat, 17 Mar 2018 13:37:27 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id DBDB6260
for <gentoo-commits@lists.gentoo.org>; Sat, 17 Mar 2018 13:37:24 +0000 (UTC)
From: "Pacho Ramos" <pacho@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Pacho Ramos" <pacho@gentoo.org>
Message-ID: <1521293709.e3799537ae865f6ee23e4fdbecb4b0b1c3318925.pacho@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-java/lucene/
X-VCS-Repository: repo/gentoo
X-VCS-Files: dev-java/lucene/lucene-3.5.0-r2.ebuild dev-java/lucene/lucene-3.6.2-r2.ebuild
X-VCS-Directories: dev-java/lucene/
X-VCS-Committer: pacho
X-VCS-Committer-Name: Pacho Ramos
X-VCS-Revision: e3799537ae865f6ee23e4fdbecb4b0b1c3318925
X-VCS-Branch: master
Date: Sat, 17 Mar 2018 13:37:24 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: 274a8926-ce4b-44aa-9458-34bdc3a69ede
X-Archives-Hash: 54b0be7c87331c4a3d74abd0ac04959c
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
+}