6 files changed, 84 insertions, 67 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index e3774c6c1415..f111f398e86c 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 0278d197ed91..48035f9edf03 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,6 +1,8 @@
 DIST java-config-2.3.1.tar.gz 26165 BLAKE2B 948506663513db369d0ed8ffdfaa54c643989431430ea03440551a6a4b6725d8eec38f5cb4fde3b64e8936c0f43de0e65a7368469032c646c7b6b3bb7ec3ed13 SHA512 62db555b2d8a37a03b6a03aa133010848d54be33ba6e3c43807abefe665a9d8ff2790baf1af79b98d4a7bd3e9ba6bc64382a24c3fcf7038338123dabd146b7b4
 DIST java-config-2.3.3.tar.gz 33837 BLAKE2B dc522a61775272e520521a06c80ac33cbe40010a40051857df8abdbda72cc064969cb00dbf8f7d06efabd352d9cf2c711808205579c7cef73ce4bb7fe2845c8d SHA512 f999ccbdd47f2552913467d3b0c6704fc6511f2bc9d0a6f62d38a9c2e9899f11b239f2039b025f7fdee5e0713d2aaf13c1a9a9baf4f1551bb97d85b12d3f28e9
+DIST java-config-2.3.4.tar.gz 33833 BLAKE2B 36cb628375a05530f515d886d819bc99a7ed233bec2956db3562349ae845be57363a2b6629ab5536be15c5f64387d0760cca7959b76a5685918732ee7bf62300 SHA512 9df42a70aceb400a9fab73668151da783e98e767fa6289c13427095d7a3268bd4bb15de9ef980b82692e7c1cb0eaf5326c19a632679419d78a419294579fb29e
 EBUILD java-config-2.3.1-r1.ebuild 1115 BLAKE2B 56a55948eb49929d4f9852662fcaaa17432abfba9c43367186d017bbc5854fe6a66aafe7313f3000db280500573badbc422dc5ee9f0e82ff15cf48ac4149d4b3 SHA512 8d13961648a6ff645dc1b6bffbc0389cb2b73455e798ab71f87f1d03c540efdef30dd276d70e7c5b6a181a8aa0916c91194a77a7b505b86ffd941a9ea0d69fd6
 EBUILD java-config-2.3.3-r1.ebuild 1717 BLAKE2B d27e002a008385ce859d191512e57932083276b5546a6a454a45fc811b6e2d5eef94ac22d45b89e1916c7dc7d2d0bcc181798800d6acd78678a8ab53a50667df SHA512 2ad4119601732d4827857340c4efe65bbac5fa6ae2082c150713433f52d7aba7cdccae36d81fde32a36d0cc6c0888b80ecc47b9d85bb91b044a312df82e2993e
+EBUILD java-config-2.3.4.ebuild 1745 BLAKE2B 2960c01b67cdf2c21310f3cbcc4f3571568a4224b66894a61c87ad4a1d3b4817aa7af21cc1c6445a05cc6836dcdf3a2da821aad5d5ac186c44fd3d28d6bf6107 SHA512 71492ebdfc527147051260ea5dbaa4f0b6cfdf3117a7044b3e20abd2f14cb8a8e048853f4fada3f2fc0ce8aafc1c5d39cc749a2984ffe919280ad07db83a5a44
 EBUILD java-config-9999.ebuild 1745 BLAKE2B 27d584230b5fcf22c3e73a2437789e48caac5ad4deab8676914d5d55aef8b2a5a80dbfab45c3078cff7100b8719dc0ca518527ea894a9d6ca24ed5a363ff5a63 SHA512 ffbb3ecde7a588675111ad1908d56016fff4ec72297037fe9a3708abf244515a4fc427385d0448270d4799ad946574524a74be3496053e91d19f98e0fc6622c7
 MISC metadata.xml 802 BLAKE2B 300762f5d21abce3b3c37d88e678125c0c760813acb3b3171c1d151da89bd404d6914874d93b52580ca245d14d1fbdfd5801ab7e0204ece3bee7ec084180de1a SHA512 76efa4ab5aaeecce7d952d2a48b0d63027d5dc7d0fed45c947817c4e599e0dd2b8ea664d951a2f4b2fa2885a2a46a9750b5687f328691701d72d93d8ead494d3
diff --git a/dev-java/java-config/java-config-2.3.4.ebuild b/dev-java/java-config/java-config-2.3.4.ebuild
new file mode 100644
index 000000000000..90c000f935f3
--- /dev/null
+++ b/dev-java/java-config/java-config-2.3.4.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{10..12} )
+
+inherit meson python-r1
+
+if [[ ${PV} = 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/java-config.git"
+else
+	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+fi
+
+DESCRIPTION="Java environment configuration query tool"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
+
+LICENSE="GPL-2"
+SLOT="2"
+IUSE="+compat test"
+RESTRICT="!test? ( test )"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )"
+
+# baselayout-java is added as a dep till it can be added to eclass.
+RDEPEND="
+	${PYTHON_DEPS}
+	sys-apps/baselayout-java
+	sys-apps/portage[${PYTHON_USEDEP}]
+"
+
+src_configure() {
+	local python_only=false
+	python_foreach_impl my_src_configure
+}
+
+my_src_configure() {
+	local emesonargs=(
+		-Darch="${ARCH}"
+		-Dpython-only="${python_only}"
+		-Deprefix="${EPREFIX}"
+	)
+
+	meson_src_configure
+	python_only=true
+}
+
+src_compile() {
+	python_foreach_impl meson_src_compile
+}
+
+src_test() {
+	python_foreach_impl meson_src_test --no-rebuild --verbose
+}
+
+src_install() {
+	python_foreach_impl my_src_install
+
+	local scripts
+	mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/bin/* || die)
+	python_replicate_script "${scripts[@]}"
+
+	if use compat; then
+		# Symlink java-config-2 to java-config for now.
+		dosym java-config /usr/bin/java-config-2
+	fi
+}
+
+my_src_install() {
+	meson_src_install
+
+	local pydirs=(
+		"${D}$(python_get_sitedir)"
+	)
+	python_optimize "${pydirs[@]}"
+}
diff --git a/dev-java/maven-bin/Manifest b/dev-java/maven-bin/Manifest
index 8f7bb105c9f1..12140e25be82 100644
--- a/dev-java/maven-bin/Manifest
+++ b/dev-java/maven-bin/Manifest
@@ -1,9 +1,7 @@
 DIST apache-maven-3.8.8-bin.tar.gz 8296049 BLAKE2B af6353193365ed33e8f2f0a7e4d31933132751f142ebbdb68aab7a74ad2dda6593bf34cef9d8d56d6c93ff93293b75517a10a5c1c048733b8c911f4ac150bdf6 SHA512 332088670d14fa9ff346e6858ca0acca304666596fec86eea89253bd496d3c90deae2be5091be199f48e09d46cec817c6419d5161fb4ee37871503f472765d00
 DIST apache-maven-3.9.6-bin.tar.gz 9410508 BLAKE2B 2a99f002912e6c0fcf9f78f0553553898cf39c17bd7c8b58269c8a7d061c425c62a2f557a686fd2b1f114ef1f47aab6e9b318555235bb436e8c7e5c8b1a0dd9d SHA512 706f01b20dec0305a822ab614d51f32b07ee11d0218175e55450242e49d2156386483b506b3a4e8a03ac8611bae96395fd5eec15f50d3013d5deed6d1ee18224
-DIST apache-maven-3.9.7-bin.tar.gz 9581488 BLAKE2B 2cdf5c06cf59913314bc50813f37061d6db3413991511588889863ddbedb590fc601247c9e25a31eca2d4d12a1e7fa4b3ca39575cd096c11c220346014ffa65b SHA512 f64913f89756264f2686e241f3f4486eca5d0dfdbb97077b0efc389cad376053824d58caa35c39648453ca58639f85335f9be9c8f217bfdb0c2d5ff2a9428fac
 DIST apache-maven-3.9.8-bin.tar.gz 9083702 BLAKE2B c636ea861d1c96938490453600cac513caf54843ffc26f45e22a655e737af93689d492e3b3055b184a33a1975aaa50a681a29412ebfd036dfd8e2c61043f6291 SHA512 7d171def9b85846bf757a2cec94b7529371068a0670df14682447224e57983528e97a6d1b850327e4ca02b139abaab7fcb93c4315119e6f0ffb3f0cbc0d0b9a2
 EBUILD maven-bin-3.8.8-r1.ebuild 1384 BLAKE2B f07df89e9b3f821f21112a5110c7bce978db18c303e139e939d856d34d1a01cee5fe543943226e64af19d15d45cba4fc605fd228b169f6902d161e04d8cc8fe1 SHA512 02e5fd63a1add7cce804259a3bc6409abdf55eedf458e8c6f909e224a7ae02152b6c82f8afb0775c30f833a101b29d680e0fbb69133df737e6875256d2731fd2
 EBUILD maven-bin-3.9.6.ebuild 1384 BLAKE2B e7e7b39349f9eb1dd725c0cbb1f14836c1bcbafb805c3047b2f8d143f20eb7cffee4a29da471b77b33f8af35c7e2ee30c3ed0bcafeccab3c4a86af9dd567ca19 SHA512 bc9fdda8cb612a29535e42233be846a16307e683d3c449794cd029a4d675966e04da651bb0b20291f1cc385b52f9d7573e013fad2ed3edb044d3bbb7974ee661
-EBUILD maven-bin-3.9.7.ebuild 1385 BLAKE2B 7904a126651d83e60d1948b52319eb3ac7c08caea00104991664751267219a4b1f433b6d82e4fcbf368a96efd1b9885f9d07cdb4ede4209bbcb32af7289be8e3 SHA512 811956914e5abdaf0aea4a258ad11091cb17a40e9130d15b25c450762f3648bd1f1fa2f55f313e45921f16da9763c05397587dd0df45c69ff6673a60bb7ca4ea
-EBUILD maven-bin-3.9.8.ebuild 1385 BLAKE2B 7904a126651d83e60d1948b52319eb3ac7c08caea00104991664751267219a4b1f433b6d82e4fcbf368a96efd1b9885f9d07cdb4ede4209bbcb32af7289be8e3 SHA512 811956914e5abdaf0aea4a258ad11091cb17a40e9130d15b25c450762f3648bd1f1fa2f55f313e45921f16da9763c05397587dd0df45c69ff6673a60bb7ca4ea
+EBUILD maven-bin-3.9.8.ebuild 1383 BLAKE2B 97483b786cf23d33149f8ea7abcf8133da943d6732c0d1287bcaaadff98dceefac9f9005e26072efb5bc06096df37c89023d110473843a99dac48ff62d875fd7 SHA512 902589d27c818d79f38d57451abc68687d3606f7964966efd9f97f5262190654e0efccf13f6a375ae6251838a70bd3700c7d3c3ab7be101784a71b37ae5322bd
 MISC metadata.xml 611 BLAKE2B 5ef6682d362deee6aff000f37dccd97c48e90e3071133a44d9f0ec2a5c6876fdd1a5f44b064eb6992a06cfda27c0c0e599e0bd0474997611aedce017febda203 SHA512 5ba3e55ea839b5e616f37321960021c58846089cb0b51982617f45946ba25747ac10eef70409f9848fbb8267fb2cc0c90c319fb66aeb52ffa5e0e1cd6d5840ff
diff --git a/dev-java/maven-bin/maven-bin-3.9.7.ebuild b/dev-java/maven-bin/maven-bin-3.9.7.ebuild
deleted file mode 100644
index d30a1ed61465..000000000000
--- a/dev-java/maven-bin/maven-bin-3.9.7.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2024 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"
-HOMEPAGE="https://maven.apache.org/"
-SRC_URI="mirror://apache/maven/maven-${MY_MV}/${PV}/binaries/${MY_P}-bin.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="Apache-2.0"
-SLOT="3.9"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="
-	>=virtual/jdk-1.8:*
-	app-eselect/eselect-java"
-
-RDEPEND="
-	>=virtual/jre-1.8:*"
-
-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" "${EPREFIX}/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/maven-bin/maven-bin-3.9.8.ebuild b/dev-java/maven-bin/maven-bin-3.9.8.ebuild
index d30a1ed61465..16060561ede9 100644
--- a/dev-java/maven-bin/maven-bin-3.9.8.ebuild
+++ b/dev-java/maven-bin/maven-bin-3.9.8.ebuild
@@ -17,7 +17,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="Apache-2.0"
 SLOT="3.9"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="
 	>=virtual/jdk-1.8:*