3 files changed, 2 insertions, 82 deletions
diff --git a/dev-java/lucene/Manifest b/dev-java/lucene/Manifest
index 944fc9c585eb..06c505bdaabc 100644
--- a/dev-java/lucene/Manifest
+++ b/dev-java/lucene/Manifest
@@ -1,4 +1,3 @@
 DIST lucene-2.4.1.tar.gz 5057003 BLAKE2B 3e2a29cfa94b367f1e62f60a2f7b7e195c788048564fb061ade4b1babcb2fd71e36b282049d3816c3faaaa3dacc07f4a7dbdb0504a659ea3ab8e06e247debcba SHA512 cf227eea4aeee904ccf5316ee7f2399864bf28b9c01e044ef27232dd483c3a5f0ecc8836633f44acfa41ffee6bf1c530e756ef45fa77ac1d15e1f83129b7aa5e
-EBUILD lucene-2.4.1-r2.ebuild 1802 BLAKE2B 71e720f396d65c1621d956d0536c3655a1530014861df0350dc506b7e03f2acd4f75ab70f0f7768ae867523ee49e1b7fac11095502fbba65d350ecf8223d1d41 SHA512 2551db0ac39d6ca7516b71e86202cef50e7784ee49f715f03703b205509e89983e735cc66ce3970abca9212390edbb06a948399310845e758855fb4764e2c985
-EBUILD lucene-2.4.1-r3.ebuild 2074 BLAKE2B 46e4ac4faf9de5e5a8017c80cb373e84cd4f9934b441f8ea57c5250f046a0f44b744bdf0057c198456c2f228d8e537efee1514b337962c7dce30e6b3a20b6694 SHA512 02dbcafbf53a6e2eba563ce9f0df44f327acd7732d1c293ad722d816918a8c14537f2b18d8af2572c539c04fec58169a6806619d7d6bf0d4c8bb1339d4d1df0f
+EBUILD lucene-2.4.1-r3.ebuild 2072 BLAKE2B 4b247db9d5730206b28ec413615a99a8d097c80085469e589e567c81eeb0f14143f9b3b276411083136bf91f6241a66802faf0805c13137dea010711dec10297 SHA512 d2bc9f55e5efe2f7b5a0af5a8f6731fff2b59f9322dcf0d86ea6e3b25eb914e944183a9216faf272c1ff8868d23a078862bf31aa6d82f4115916c4f5e87e5138
 MISC metadata.xml 235 BLAKE2B 5144dc07ec1e929d9a5734dc5c96258dbc8292cd9710c8deb32bdb3b585964b29e7f28563f2b71fc10e8601805c8d75549315d5997c5c0544bacfbd1c554c365 SHA512 da42efb5c9e4e199aa88b5ff4c2ba647284a3f82d251ddabd7e888ffb7e0efe68f6060aa06ebf8c059f3affdf275ee787566acb355ccbc9f072f9f7f3e28f729
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..000000000000
--- 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 <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-r3.ebuild b/dev-java/lucene/lucene-2.4.1-r3.ebuild
index 762e6681fc1e..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"