gentoo auto-resync : 11:09:2024 - 12:30:54

3 files changed, 3 insertions, 84 deletions

diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest
index 186ab7a9da5c..e1541fb8a665 100644
--- a/dev-java/lucene/Manifest
+++ b/dev-java/lucene/Manifest
@@ -2,6 +2,5 @@ AUX lucene-2.4.1-javacc.home.patch 349 BLAKE2B 84c84886c40848052358b835c2bd5f3de
 AUX lucene-2.4.1-skipFailingTest.patch 1010 BLAKE2B f415e401c30daf4fff339b2419301d2b7b63287b42069c7e5a1cee6e55c1fffee20d341770299ae4193d5a02be7c5e7f1e93c8d7c395972eb123f07a85d7ce93 SHA512 70bad0a13a2726528881bd996407e09aa80401601da031ade74a4f2f8f7ccc502e5c345b543ce575dfcbf1495ffa71ce7440ccf608dbd821f0c37e42eea40dbc
 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
-EBUILD lucene-2.4.1-r4.ebuild 2083 BLAKE2B d862647f006b0115168d1299934927e80f6db03fdc95b66985343736e4fa50e7e96e3a5e37d9c637ae5670e16974ddecdf5bf1046cf26481d1849498395f4e9a SHA512 163b9ad1667e8a1be7cec2d1b62dc0304b3e9d144570a185f89470b710c1439b6de80ad4b4245bcd03acfc667ac28cf5b3401b314af3755d573fc28e6d1cd5f7
-EBUILD lucene-2.4.1-r5.ebuild 2177 BLAKE2B ab63805dad7dfafd8c0e8580ee073dd49c8e85522df841e1962c94496b2574d94fd11c016b2df1eceb0bce701a9ac7533dc69514e31f207eff3e5f080c3f550d SHA512 195b23d807007c4f3de2c4d4d871821573e63068839bc806ed42d3c1b8bc704a376b32e42a08a1efab49c7008655d1392ccd3a0fa04a09dbe4e4ce3366a00091
+EBUILD lucene-2.4.1-r5.ebuild 2330 BLAKE2B 24021fa5613b65c5435d06739962b2a5d01723a1adb806b5b9f715090d659a5679474c5cfdd51d4f60c4fffff7974f465053b707c5c9e5f7e19699198ffb1eae SHA512 bbbf404024727ff19d1975e4dab9889641c0cb888e3632ed31121b4d7eeaa7b05a95af65a78545a9aeeaa8b5cb3e7a9fd85d3ee57aa6ad4e06e9d1845bd2728e
 MISC metadata.xml 235 BLAKE2B 5144dc07ec1e929d9a5734dc5c96258dbc8292cd9710c8deb32bdb3b585964b29e7f28563f2b71fc10e8601805c8d75549315d5997c5c0544bacfbd1c554c365 SHA512 da42efb5c9e4e199aa88b5ff4c2ba647284a3f82d251ddabd7e888ffb7e0efe68f6060aa06ebf8c059f3affdf275ee787566acb355ccbc9f072f9f7f3e28f729
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
-}
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
 }