3 files changed, 2 insertions, 76 deletions
diff --git a/dev-java/xpp2/Manifest b/dev-java/xpp2/Manifest
index 40312a5ce931..85d7977fd345 100644
--- a/dev-java/xpp2/Manifest
+++ b/dev-java/xpp2/Manifest
@@ -1,5 +1,4 @@
 AUX xpp2-2.1.10-fix-java5+.patch 872 BLAKE2B a8fa53326a2fefa40f726a4cd3e5e2828b3d2e50907736be1b2639489692ff2a0ff683d1538123163d5fe52d2935d97832d643d7365829ca1eaa7c7936623e75 SHA512 495dfb83a773d11fb1f9f423f1bfa532770710b4b16c1f6e64e517e8148958a5160ddbbc43dd4cdc7ecc51126fba1062a10277bc9234b58e46a044e81180b3a5
 DIST PullParser2.1.10.tgz 2310288 BLAKE2B 0c1f3aedf88aae18e7cab40b04055fa7a20f6bfe05973e6cbe3b459b408dfa193834d22a6d77b3d1ba3802e115d89f73e3f423efc7571efc8f09bb73625950d6 SHA512 87a091e415a31cde27ca1193735743b60f516feb336a9a3577792636e54ab8d671a22e74eb8aa41268f6251c688c68fe92a28f735ec78b96b919909f80c59590
-EBUILD xpp2-2.1.10-r3.ebuild 1854 BLAKE2B 886333476332b887bfb6e02a235a6d7f50fbca065b5533a774881077d622bd7c12de73632d2cdae2fa9983781fe7ef88f10f51bccf3249b4e936247c93bbf3ae SHA512 4e011582986248939e206b8a2652e2d2a5d902615e29e3f15e87f92121093b73977fc7a36f6c0a354dde4c2562026e73c665a66187b40ba6384902d87ebeb198
-EBUILD xpp2-2.1.10-r4.ebuild 2400 BLAKE2B 9c7e4e9660d9e7b809c7503dad6224e78fe6ef49557888ac66b99ffd44263d50d82eea0be1f16eb7a06dcb05008b7b16702c1e5560608c2b78a0f77160476964 SHA512 d15b1c37d618aa308aa7459fb7628ba9a3f1ad832d77e4e24e6d02373fa75da6a5093be688ba771670d3d4f610d2c2adc2872a62eef3beb0cbd66473e2263a23
+EBUILD xpp2-2.1.10-r4.ebuild 2396 BLAKE2B 9616be3c427fc97b51d9ef43909b9b21188e9a167fd6e2a4edec59c1439d39e4d974dc60f9fdf1ba0d013e27894661ec4c28471aeeaaf8f04e0b2dde49aa7e98 SHA512 0aae9f8c45b4cb1500396a0afb987be8e1914ec882c58ec76e6397a3da798bd3473db8dbf7f24d65561229fde3ae39ccf0bcb802ad58a110e008b6c2b0495242
 MISC metadata.xml 459 BLAKE2B 6b230c468ed9a62380563114c50b9b3cbd58237df4327ddc6194dba9524c6a0872c04354927d800544b1095db4a7f3c3ee0b0d37f16d23578da1b84f79628218 SHA512 f41891c17a7ab0a61bff751bdef3cb45f9385de1c10219aa19a8cc194b780b0db7d46ee89ed5403b193f473178828e79e88fa80833b5bdd56f8c9d3a532fff9d
diff --git a/dev-java/xpp2/xpp2-2.1.10-r3.ebuild b/dev-java/xpp2/xpp2-2.1.10-r3.ebuild
deleted file mode 100644
index c4b5aaa7a88b..000000000000
--- a/dev-java/xpp2/xpp2-2.1.10-r3.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="pull-parser:pull-parser:2"
-
-inherit java-pkg-2 java-ant-2
-
-MY_PN="PullParser"
-MY_P="${MY_PN}${PV}"
-
-DESCRIPTION="A streaming pull XML parser used to quickly process input elements"
-HOMEPAGE="https://web.archive.org/web/20130904163229/http://www.extreme.indiana.edu/xgws/xsoap/xpp/xpp2/"
-SRC_URI="https://web.archive.org/web/20130904173708/http://www.extreme.indiana.edu/xgws/xsoap/xpp/download/PullParser2/${MY_P}.tgz"
-
-LICENSE="Apache-1.1 IBM"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
-IUSE="test"
-
-# Some failures, partly because we haven't patched Xerces but probably
-# also because this software is ancient. :(
-RESTRICT="test"
-
-CDEPEND="dev-java/xerces:2"
-DEPEND=">=virtual/jdk-1.8:*
-	test? ( dev-java/junit:4 )
-	${CDEPEND}"
-RDEPEND=">=virtual/jre-1.8:*
-	${CDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-java5+.patch"
-)
-
-EANT_GENTOO_CLASSPATH="xerces-2"
-EANT_EXTRA_ARGS="-Dx2_present=true -Djunit.present=true"
-EANT_BUILD_TARGET="intf intf_jar impl x2impl"
-EANT_DOC_TARGET="api"
-EANT_TEST_TARGET="junit"
-
-src_prepare() {
-	default
-
-	rm -r build/ lib/ || die
-
-	# Our usual rewriting stomps over the existing classpath, which
-	# isn't helpful here.
-	sed -i -r \
-		-e 's/\bclasspath="/\0${gentoo.classpath}:/g' \
-		-e 's/\$\{java\.class\.path\}/${gentoo.classpath}/g' \
-		build.xml || die
-}
-
-src_install() {
-	local suffix
-
-	for suffix in "" -intf -standard -x2; do
-		java-pkg_newjar build/lib/${MY_PN}${suffix}-${PV}.jar ${MY_PN}${suffix}.jar
-	done
-
-	dodoc README.html
-	use doc && java-pkg_dojavadoc doc/api
-	use source && java-pkg_dosrc $(find src/java -name org -o -name javax)
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
diff --git a/dev-java/xpp2/xpp2-2.1.10-r4.ebuild b/dev-java/xpp2/xpp2-2.1.10-r4.ebuild
index 0e785ac7de74..cc77774f1703 100644
--- a/dev-java/xpp2/xpp2-2.1.10-r4.ebuild
+++ b/dev-java/xpp2/xpp2-2.1.10-r4.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-1.1 IBM"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 # Some failures, partly because we haven't patched Xerces but probably
 # also because this software is ancient. :(