6 files changed, 6 insertions, 72 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 30c44e17e163..1b1b40246b76 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/coursier-bin/Manifest b/dev-java/coursier-bin/Manifest
index 6ea69d5293e5..578a4247706a 100644
--- a/dev-java/coursier-bin/Manifest
+++ b/dev-java/coursier-bin/Manifest
@@ -1,5 +1,5 @@
-DIST coursier-bin-2.1.0_rc2.gz 21077153 BLAKE2B 19ff645670b3f94162672b669063491f10e4ae8aee645fe0205f4f0dc80e9380ab045c665cdca792d93f1723348c8d267b01bfabc4db5014765757417d1cdc6e SHA512 9b822f8642a10afe7933c8f7bf246aea73b42e0d6ef5db0f9e4f9edee96a31a3d00111a8e1ba2e77898135131b6158dd3be5ca5ba3bac9ca95866aef881e5b80
 DIST coursier-bin-2.1.0_rc3.gz 21120545 BLAKE2B 55d4236c408b9883d49fa64ed79f269fc935171abe161c3bef8e92da396f12881c9cf7750dd8e8d5b955c390cfb29304a8406c3db702c3a477219acbf0c0b989 SHA512 1a31d7ced6c8c1137b6e330723c90e12f010a815592a4e11129c7bd5611528edc62166415937c6fa5dc92732b277bce1b971e6dee27f9b1350ac71b4b7afc290
-EBUILD coursier-bin-2.1.0_rc2.ebuild 670 BLAKE2B c596581520bb6dbefff42ed78c10bf3419c69b71e94678ff382680e60b029790934f25123390953b6127a3d82d4a0746963aaa7ac14e177e248c31dad33f4c9f SHA512 7a4f03558dc0d98a7b6ec5cacc0d07693407c49706ef1def77558b4aae1a232f57f5afe30afceb618b685431a2c8aeffc5dce2d955a5be05c2c2ba72b391bcda
-EBUILD coursier-bin-2.1.0_rc3.ebuild 670 BLAKE2B c596581520bb6dbefff42ed78c10bf3419c69b71e94678ff382680e60b029790934f25123390953b6127a3d82d4a0746963aaa7ac14e177e248c31dad33f4c9f SHA512 7a4f03558dc0d98a7b6ec5cacc0d07693407c49706ef1def77558b4aae1a232f57f5afe30afceb618b685431a2c8aeffc5dce2d955a5be05c2c2ba72b391bcda
+DIST coursier-bin-2.1.0_rc5.gz 20759374 BLAKE2B 5e44db9b22a1b3febb5e815401249ed4df663efd8dbbfe8a54a05ae8fbb23a4cae6407e5845ef199098ac8f49e01138a3a2ac5c21998ae3e5addec3159093895 SHA512 5c276e13b65b2a3058a1d4010c97b59e28637c3e17e2f448fbb65dd4e97325846add95557836339d5026ee92bcba82ec5c0948a2ad8a31d7b60ce59c0c36160c
+EBUILD coursier-bin-2.1.0_rc3.ebuild 669 BLAKE2B 64c5e7d805585716260ef0de20153ea5b0c0b2930fbaf50eb8753663394175ae9998e9818a3e515f67fb562f3f62074966c1e5923c5d4df55b94377f4c7be52d SHA512 b95890ce9de7392330b27f14075f235ab5433c6e3fd79b6a2e72c1588c8795b9af2f9da075bd22fa20b303aa9c1cbd3e1252fa6ef56a0da1296e34db555c2d0c
+EBUILD coursier-bin-2.1.0_rc5.ebuild 670 BLAKE2B afce78b8fb3f3049c7343b13a3dc481684abd2fde0ebfb967db926537b3b403ff34c8819538cf2c037ebe5851a914a8a066813a492d2915edc85f180281f88f6 SHA512 47df75c07d6870a6c5677c20e473036f586ec7bdcc87f3100b602c330902eb1e6ecf5c6f6443e4cbf73bd8fa992220c2c93d6e36b7f72067ac233dcc5944da23
 MISC metadata.xml 329 BLAKE2B c2e27cd10921c61cd06ac3d92c90fe1f7bb509d81b1cbdcb3cb51dc2ba6f2097713120f58a28d5750a60e800e7248e9aec3c455b92de9e6c7cc94427876ccc5e SHA512 77d12f0c7125ff3cbaa4cd159a838dbd2bd266c8fa1292533267cdf7e1a858f16b9eadb6efc55218df028426616d556cdc8a6664c7cfc4c9cf482f750bc9587b
diff --git a/dev-java/coursier-bin/coursier-bin-2.1.0_rc3.ebuild b/dev-java/coursier-bin/coursier-bin-2.1.0_rc3.ebuild
index 32691c5ffc9b..4c77d05f1d13 100644
--- a/dev-java/coursier-bin/coursier-bin-2.1.0_rc3.ebuild
+++ b/dev-java/coursier-bin/coursier-bin-2.1.0_rc3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -14,7 +14,7 @@ DESCRIPTION="Java/Scala artifact fetching, bundling and deploying"
 HOMEPAGE="https://get-coursier.io/"
 SRC_URI="https://github.com/coursier/coursier/releases/download/v$(get_orig_coursier_pv)/cs-x86_64-pc-linux.gz -> ${P}.gz"
 
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 LICENSE="Apache-2.0"
 SLOT="0"
 
diff --git a/dev-java/coursier-bin/coursier-bin-2.1.0_rc2.ebuild b/dev-java/coursier-bin/coursier-bin-2.1.0_rc5.ebuild
index 32691c5ffc9b..9bf4cb6eb641 100644
--- a/dev-java/coursier-bin/coursier-bin-2.1.0_rc2.ebuild
+++ b/dev-java/coursier-bin/coursier-bin-2.1.0_rc5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index 6864ebe2bc0f..423f6b0c24a2 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -1,5 +1,3 @@
-DIST apache-maven-3.8.6-bin.tar.gz 8676320 BLAKE2B 7ad7695aaed86b478044dd0ce59d359c8eb3644ddf0bc3ea501a9eb5c373e2bdacbe8cdf8c85edab930d84d446ff1cb25975281bb7c9cb517a005accba9e413d SHA512 f790857f3b1f90ae8d16281f902c689e4f136ebe584aba45e4b1fa66c80cba826d3e0e52fdd04ed44b4c66f6d3fe3584a057c26dfcac544a60b301e6d0f91c26
 DIST apache-maven-3.8.7-bin.tar.gz 8293440 BLAKE2B 0a586cf0eb2a579d99bbe5736f294369b774ee4b041b37ecd4721eb3b988e274fd6d88bb34cc20a48c98c4f70c256dd74441c0f57119f90958af05e8c16f89c6 SHA512 21c2be0a180a326353e8f6d12289f74bc7cd53080305f05358936f3a1b6dd4d91203f4cc799e81761cf5c53c5bbe9dcc13bdb27ec8f57ecf21b2f9ceec3c8d27
-EBUILD maven-bin-3.8.6.ebuild 1372 BLAKE2B 1297b0ab442c8498aa62588d80bf58d2891e0b1f6b798718708c7ce6971908f6a2953c0316f29b03bce194e24a3016b8ffd93a2c8e5b1d5b987c4ed74a21cb9a SHA512 9c3e9b68c8bfb0295167c3323681356edf205fd2dacd37e848b2e3818bae286cd64ff0e899fe47fe98440bfc8906c5db299c495ff11ebf65d7a2d46a7e011ea2
 EBUILD maven-bin-3.8.7.ebuild 1372 BLAKE2B a33c01293f6df1f11f774464a1d1f59ab451d370f12a257938df3ca162294a5552c7529bfb32f37375ebc068129fa94abfde2c5a3e8dd20552bfbd4ca59ecf57 SHA512 418c8e3ee4717295d162419b1fea11656c3aef0125c7ba986e9b2f2963c4f7e563c7de92cb75bcc00c688da4612d125583e52d01c26a0c4a980095a220b7ccb8
 MISC metadata.xml 611 BLAKE2B 5ef6682d362deee6aff000f37dccd97c48e90e3071133a44d9f0ec2a5c6876fdd1a5f44b064eb6992a06cfda27c0c0e599e0bd0474997611aedce017febda203 SHA512 5ba3e55ea839b5e616f37321960021c58846089cb0b51982617f45946ba25747ac10eef70409f9848fbb8267fb2cc0c90c319fb66aeb52ffa5e0e1cd6d5840ff
diff --git a/dev-java/maven-bin/maven-bin-3.8.6.ebuild b/dev-java/maven-bin/maven-bin-3.8.6.ebuild
deleted file mode 100644
index 2866b9890bf2..000000000000
--- a/dev-java/maven-bin/maven-bin-3.8.6.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 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.8"
-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
-}