6 files changed, 4 insertions, 70 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index b121785e7826..f57d2d48e67a 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index 3efc09e01e76..8fbd6d1d6a55 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -1,9 +1,7 @@
 DIST apache-maven-3.8.7-bin.tar.gz 8293440 BLAKE2B 0a586cf0eb2a579d99bbe5736f294369b774ee4b041b37ecd4721eb3b988e274fd6d88bb34cc20a48c98c4f70c256dd74441c0f57119f90958af05e8c16f89c6 SHA512 21c2be0a180a326353e8f6d12289f74bc7cd53080305f05358936f3a1b6dd4d91203f4cc799e81761cf5c53c5bbe9dcc13bdb27ec8f57ecf21b2f9ceec3c8d27
 DIST apache-maven-3.8.8-bin.tar.gz 8296049 BLAKE2B af6353193365ed33e8f2f0a7e4d31933132751f142ebbdb68aab7a74ad2dda6593bf34cef9d8d56d6c93ff93293b75517a10a5c1c048733b8c911f4ac150bdf6 SHA512 332088670d14fa9ff346e6858ca0acca304666596fec86eea89253bd496d3c90deae2be5091be199f48e09d46cec817c6419d5161fb4ee37871503f472765d00
-DIST apache-maven-3.9.0-bin.tar.gz 9024147 BLAKE2B ba2545a44a20c7ed7791ea116fbb72d549409d955f8403355e13cf86b95ffda685d5ee0c3d3377f2b5481b25a2f0e6f45d51e89b1ba5913c9be0688a98f8d585 SHA512 1ea149f4e48bc7b34d554aef86f948eca7df4e7874e30caf449f3708e4f8487c71a5e5c072a05f17c60406176ebeeaf56b5f895090c7346f8238e2da06cf6ecd
 DIST apache-maven-3.9.1-bin.tar.gz 9039409 BLAKE2B e1925202d8b5363f16cd734aca409091a1e7f56fa9220aa6060a79fae6dfd37772daf04bc15edc2918757ac718ea41e861583c86dff40b0e3172fa0a7cdfbcef SHA512 d3be5956712d1c2cf7a6e4c3a2db1841aa971c6097c7a67f59493a5873ccf8c8b889cf988e4e9801390a2b1ae5a0669de07673acb090a083232dbd3faf82f3e3
 EBUILD maven-bin-3.8.7.ebuild 1372 BLAKE2B a33c01293f6df1f11f774464a1d1f59ab451d370f12a257938df3ca162294a5552c7529bfb32f37375ebc068129fa94abfde2c5a3e8dd20552bfbd4ca59ecf57 SHA512 418c8e3ee4717295d162419b1fea11656c3aef0125c7ba986e9b2f2963c4f7e563c7de92cb75bcc00c688da4612d125583e52d01c26a0c4a980095a220b7ccb8
-EBUILD maven-bin-3.8.8.ebuild 1374 BLAKE2B 0e4ffe7791605de36fcec218f368d0a9323cd1ae9b98b122b6431cf4bc38ab8e47d5a4d4fac4ee232472d3a78d3dd1855894520ca96219768e9a759e444a632f SHA512 5697cf091533bb21beedd022bbe778f285398577c5cc85793bf2931dc91aae77486ce354049f6e4dc1b6bfd1e87694eb465bb750240ca08fbd174d7d6f7e583c
-EBUILD maven-bin-3.9.0.ebuild 1372 BLAKE2B 5e7c245e7888d018784a15d894ff5277c792b7f2a0f4a0ab4a354a26adb2ab7b23d80d549d0197394ec5ac9b7f5e0c9ceee3911e04362ee895f982ffce9af082 SHA512 4579ec07fca112b9765b1710dd70b321d5fc73e6c33a116d6f3e27d2a52ed8e7dd16acf9a1fa45846c7f89189fa4618d92553dc3a9079892b08dcc9415739524
+EBUILD maven-bin-3.8.8.ebuild 1373 BLAKE2B b7815ce2d08cfb7a7d8be7cc229732e1a4de9b3b71a54fff87e2699d8e76170ae5bf5f9fdd53391a1a10ea8d06468bd512765b18ffbb94b8642e1b65148eff0a SHA512 88fae13b1074c68f20738a6a56586fc9b2742a985d5c213b8b5175d6582af8531f6ca1a0d3d30918440defc33ac49076958878f1bf06ed53cbec183139e2c9b5
 EBUILD maven-bin-3.9.1.ebuild 1372 BLAKE2B 5e7c245e7888d018784a15d894ff5277c792b7f2a0f4a0ab4a354a26adb2ab7b23d80d549d0197394ec5ac9b7f5e0c9ceee3911e04362ee895f982ffce9af082 SHA512 4579ec07fca112b9765b1710dd70b321d5fc73e6c33a116d6f3e27d2a52ed8e7dd16acf9a1fa45846c7f89189fa4618d92553dc3a9079892b08dcc9415739524
 MISC metadata.xml 611 BLAKE2B 5ef6682d362deee6aff000f37dccd97c48e90e3071133a44d9f0ec2a5c6876fdd1a5f44b064eb6992a06cfda27c0c0e599e0bd0474997611aedce017febda203 SHA512 5ba3e55ea839b5e616f37321960021c58846089cb0b51982617f45946ba25747ac10eef70409f9848fbb8267fb2cc0c90c319fb66aeb52ffa5e0e1cd6d5840ff
diff --git a/dev-java/maven-bin/maven-bin-3.8.8.ebuild b/dev-java/maven-bin/maven-bin-3.8.8.ebuild
index 9248c8bb462c..4d87e94d00d0 100644
--- a/dev-java/maven-bin/maven-bin-3.8.8.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.8.8.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="https://maven.apache.org/"
 
 LICENSE="Apache-2.0"
 SLOT="3.8"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*
diff --git a/dev-java/maven-bin/maven-bin-3.9.0.ebuild b/dev-java/maven-bin/maven-bin-3.9.0.ebuild
deleted file mode 100644
index 59bdf23384c1..000000000000
--- a/dev-java/maven-bin/maven-bin-3.9.0.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit java-pkg-2
-
-MY_PN=apache-${PN%%-bin}
-MY_PV=${PV/_alpha/-alpha-}
-MY_P="${MY_PN}-${MY_PV}"
-MY_MV="${PV%%.*}"
-
-DESCRIPTION="Project Management and Comprehension Tool for Java"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-HOMEPAGE="https://maven.apache.org/"
-
-LICENSE="Apache-2.0"
-SLOT="3.9"
-KEYWORDS="amd64 x86"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	app-eselect/eselect-java"
-
-RDEPEND="
-	>=virtual/jre-1.8:*"
-
-S="${WORKDIR}/${MY_P}"
-
-MAVEN="${PN}-${SLOT}"
-MAVEN_SHARE="/usr/share/${MAVEN}"
-
-QA_FLAGS_IGNORED=(
-	"${MAVEN_SHARE}/lib/jansi-native/linux32/libjansi.so"
-	"${MAVEN_SHARE}/lib/jansi-native/linux64/libjansi.so"
-)
-
-# TODO:
-# We should use jars from packages, instead of what is bundled.
-src_install() {
-	dodir "${MAVEN_SHARE}"
-
-	cp -Rp bin boot conf lib "${ED}/${MAVEN_SHARE}" || die "failed to copy"
-
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/boot/*.jar
-	java-pkg_regjar "${ED}/${MAVEN_SHARE}"/lib/*.jar
-
-	dodoc NOTICE README.txt
-
-	dodir /usr/bin
-	dosym "${MAVEN_SHARE}/bin/mvn" /usr/bin/mvn-${SLOT}
-
-	# See bug #342901.
-	echo "CONFIG_PROTECT=\"${MAVEN_SHARE}/conf\"" > "${T}/25${MAVEN}" || die
-	doenvd "${T}/25${MAVEN}"
-}
-
-pkg_postinst() {
-	eselect maven update mvn-${SLOT}
-}
-
-pkg_postrm() {
-	eselect maven update
-}
diff --git a/dev-java/snakeyaml/Manifest b/dev-java/snakeyaml/Manifest
index 38f1b9fc7335..3bb52a992d64 100644
--- a/dev-java/snakeyaml/Manifest
+++ b/dev-java/snakeyaml/Manifest
@@ -1,5 +1,5 @@
 DIST snakeyaml-1.33.tar.gz 406196 BLAKE2B 9b7e7d7a5d35d433445737f4b5cc07744e3686a71cc4b9e44ce46153831b76f01da7ef6bc60ea82a7173283a77d0da500bea2bc7ee76bdde4ebda00aa6054aa8 SHA512 ad367d7e7bcb2225094d132df77d91e7401026af02f4ede14a2a4fc5cf78f0cfa1e4400f16f43a669faa2f0e444d36c3745e3c9df3d9114d62fee070c4c99414
 DIST snakeyaml-2.0.tar.gz 405458 BLAKE2B 69d81e0b23080ff86c1f6fe8a924a504d627c353bf9c026703ef54f14e572458e77c501415260667bcb18008ee96ca99cab7ed43c004d36fed781500f09054cf SHA512 ef4da2ae5f5e6cd7b68aabb0d37a4fdbd33be899cd1d4dad3210cc791ca85af57661f623898449841b930eaffc9e61cef337efa4e6371710307ef3758f0af329
 EBUILD snakeyaml-1.33.ebuild 2339 BLAKE2B 798becfef801473ced001ec15e00a5ddc799369e5a97eff1140236716fe463d592b68eb0ea9f0b5395b1956575ee0b6e070f631fbe135d546f988d945b574f85 SHA512 a9192e54c120b9469ec55d52fd2cfc7ca84e553da4b93ef6c0b2e4495bf5bbd49a65130fcda7a4f38a5d6cf4deda7d190bc50d65259d183af5d3b93deb8f5c9f
-EBUILD snakeyaml-2.0.ebuild 2319 BLAKE2B 7ca6114ab35e0430ea71b39fa6bc7fb924c7345ec1fca00491d2546ac42ce53bb7d2c4640d086023297e4b6ed3963dda90a9afa441445375a704c914b97edddf SHA512 99f72310b5c37023027086e045d03fb8064adf38db4b0e110cf42c0448e5ce9bca652aff9202b66c79bc0c65035c1f3b81db52fd04b8f98e3a44b724e1a5248b
+EBUILD snakeyaml-2.0.ebuild 2316 BLAKE2B fdb2c964c1d3e12caff12f134458d132ccba92aedcfc8e6594e5e1eda2d80e0e8ec6340d94633f121f49fc470a86a8cd71dc73c08b4ece735b302bbd32bfb6ce SHA512 6be8f1937cfaf838e20ba230464bd04a5247cef153f0c1fa8312294ea2e5404a536f42ae8abacfe020467481e91e3c6ca219623a7664b5632df9fbd2b109780d
 MISC metadata.xml 548 BLAKE2B b9d917044a58addef7e75a2714a1a2f70c6ac4db0b30469b93c034b5aca8cd834652c5446b42c99e6785c222667c523b6325341e8f35be342622ad1486411ba6 SHA512 bfb8134a7351f7d0fe4a6433a4655ad8baa207641cb9939591209d05c3caf2d92593891b4b2dced236bb2186d3e410c54ba28682251c5d5f1d5d590e4e94ee61
diff --git a/dev-java/snakeyaml/snakeyaml-2.0.ebuild b/dev-java/snakeyaml/snakeyaml-2.0.ebuild
index 9066dbd63aba..6bc7f5c89542 100644
--- a/dev-java/snakeyaml/snakeyaml-2.0.ebuild
+++ b/dev-java/snakeyaml/snakeyaml-2.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/snakeyaml-snakeyaml-59ddbb3304bb"
 
 LICENSE="Apache-2.0"
 SLOT="2"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ppc64 ~x86"
 
 # Compile dependencies
 # POM: pom.xml