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 -}
