commit: fc540f14ab0344e452b5a9e2197ff47be05fbac5 Author: Volkmar W. Pogatzki <gentoo <AT> pogatzki <DOT> net> AuthorDate: Wed Mar 13 08:10:49 2024 +0000 Commit: Miroslav Šulc <fordfrog <AT> gentoo <DOT> org> CommitDate: Mon May 20 08:15:25 2024 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fc540f14
dev-java/lucene: switch to dev-java/ant - Updates to >=dev-java/ant-1.10.14-r3:0[junit] - Skips the failing test (patched out) - Adds verify-sig - Shortens SRC_URI Closes: https://bugs.gentoo.org/312437 Closes: https://bugs.gentoo.org/931063 Signed-off-by: Volkmar W. Pogatzki <gentoo <AT> pogatzki.net> Closes: https://github.com/gentoo/gentoo/pull/35723 Signed-off-by: Miroslav Šulc <fordfrog <AT> gentoo.org> dev-java/lucene/Manifest | 3 +- .../lucene/files/lucene-2.4.1-javacc.home.patch | 13 ++++ .../files/lucene-2.4.1-skipFailingTest.patch | Bin 0 -> 1012 bytes dev-java/lucene/lucene-2.4.1-r3.ebuild | 83 --------------------- dev-java/lucene/lucene-2.4.1-r4.ebuild | 82 ++++++++++++++++++++ 5 files changed, 97 insertions(+), 84 deletions(-) diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest index 32bc29febef6..8c052711ebb3 100644 --- a/dev-java/lucene/Manifest +++ b/dev-java/lucene/Manifest @@ -1 +1,2 @@ -DIST lucene-2.4.1.tar.gz 5057003 BLAKE2B 3e2a29cfa94b367f1e62f60a2f7b7e195c788048564fb061ade4b1babcb2fd71e36b282049d3816c3faaaa3dacc07f4a7dbdb0504a659ea3ab8e06e247debcba SHA512 cf227eea4aeee904ccf5316ee7f2399864bf28b9c01e044ef27232dd483c3a5f0ecc8836633f44acfa41ffee6bf1c530e756ef45fa77ac1d15e1f83129b7aa5e +DIST lucene-2.4.1-src.tar.gz 5057003 BLAKE2B 3e2a29cfa94b367f1e62f60a2f7b7e195c788048564fb061ade4b1babcb2fd71e36b282049d3816c3faaaa3dacc07f4a7dbdb0504a659ea3ab8e06e247debcba SHA512 cf227eea4aeee904ccf5316ee7f2399864bf28b9c01e044ef27232dd483c3a5f0ecc8836633f44acfa41ffee6bf1c530e756ef45fa77ac1d15e1f83129b7aa5e +DIST lucene-2.4.1-src.tar.gz.asc 189 BLAKE2B 614fc428936d49caac1072e5c4fe5a31d86545220483f1e60fee6560b3bf1d661eb718013c8211ff701758aff37ebe3ffe18bb0a94d90b75962d1e74b8005f6b SHA512 38eee5a062ca11c638b3a0e131ffe133b49e9c759216d854f2be99e27a8445408b1097df28436e6155f551df0ddf9ca16a286652c9ce12dc114228bbd125dba2 diff --git a/dev-java/lucene/files/lucene-2.4.1-javacc.home.patch b/dev-java/lucene/files/lucene-2.4.1-javacc.home.patch new file mode 100644 index 000000000000..9668b6de1ff4 --- /dev/null +++ b/dev-java/lucene/files/lucene-2.4.1-javacc.home.patch @@ -0,0 +1,13 @@ +diff --git a/common-build.xml b/common-build.xml +index 3fa75d1..1e695cf 100644 +--- a/common-build.xml ++++ b/common-build.xml +@@ -110,7 +110,7 @@ + <available + property="javacc.present" + classname="org.javacc.parser.Main" +- classpath="${javacc.home}/bin/lib/javacc.jar" ++ classpath="${javacc.home}/javacc.jar" + /> + + <available diff --git a/dev-java/lucene/files/lucene-2.4.1-skipFailingTest.patch b/dev-java/lucene/files/lucene-2.4.1-skipFailingTest.patch new file mode 100644 index 000000000000..3921253f1f29 Binary files /dev/null and b/dev-java/lucene/files/lucene-2.4.1-skipFailingTest.patch differ diff --git a/dev-java/lucene/lucene-2.4.1-r3.ebuild b/dev-java/lucene/lucene-2.4.1-r3.ebuild deleted file mode 100644 index 01cdd2a220ea..000000000000 --- a/dev-java/lucene/lucene-2.4.1-r3.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# 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 -} diff --git a/dev-java/lucene/lucene-2.4.1-r4.ebuild b/dev-java/lucene/lucene-2.4.1-r4.ebuild new file mode 100644 index 000000000000..c69bb031e695 --- /dev/null +++ b/dev-java/lucene/lucene-2.4.1-r4.ebuild @@ -0,0 +1,82 @@ +# 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 +}
