4 files changed, 51 insertions, 4 deletions
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index a88370918814..9b13c4e9af0c 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 bffb2fac95cc..3f326f520c7b 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,4 +1,6 @@
 DIST java-config-2.3.1.tar.gz 26165 BLAKE2B 948506663513db369d0ed8ffdfaa54c643989431430ea03440551a6a4b6725d8eec38f5cb4fde3b64e8936c0f43de0e65a7368469032c646c7b6b3bb7ec3ed13 SHA512 62db555b2d8a37a03b6a03aa133010848d54be33ba6e3c43807abefe665a9d8ff2790baf1af79b98d4a7bd3e9ba6bc64382a24c3fcf7038338123dabd146b7b4
+DIST java-config-2.3.2.tar.gz 26297 BLAKE2B 02b3cf34abb48d67189b40478095564b6ca11fceca9fef0a3258c246d451ba793b6f050b3f9435b39c16b9d75802cbd387c8f663301176cac108e35a7bab3f4b SHA512 f00b73a33ccfc824dbc5facd75cd581389c2568e22bad92ed9a088917a3b42058198b547a8cdc6ce40fe3a109eec7c8405131775ad7fcb2eda0dd85d4637c527
 EBUILD java-config-2.3.1-r1.ebuild 1115 BLAKE2B 56a55948eb49929d4f9852662fcaaa17432abfba9c43367186d017bbc5854fe6a66aafe7313f3000db280500573badbc422dc5ee9f0e82ff15cf48ac4149d4b3 SHA512 8d13961648a6ff645dc1b6bffbc0389cb2b73455e798ab71f87f1d03c540efdef30dd276d70e7c5b6a181a8aa0916c91194a77a7b505b86ffd941a9ea0d69fd6
-EBUILD java-config-9999.ebuild 1244 BLAKE2B 5283826b1745e436b629d2c5f5eab6870aa790894849f1b397d2cde4ed1e51377444a6a04ab09f5b84e4d5b6519c882c4728c7abaa0b1fe9ddd908a61a11760d SHA512 b6ddd53b8c9dced1ad66b3835ef4fd288e507c6310d3123ec86882a26e2092c81b0166ec40028318a218d58d273f13e3acf8e2583df31d12c97f51d5e37d44c0
+EBUILD java-config-2.3.2.ebuild 1124 BLAKE2B b68daddae2e3e47d83fd52dea3eabf7494920ba70fd585c75d42b3becb576e347495ea974f909307fc52c2010d9d638fddd53e82fe70080a343f93c7db13bfa7 SHA512 673a37b6e8646906822a9f629402a1923d6234f7f1b6fbd89211abbcaa916b4d81dd418a4a96f627fb1d3255e7990fa74adc0fcf6fb11f214c66b75a2c278390
+EBUILD java-config-9999.ebuild 1249 BLAKE2B f55232b1cf31ace4716f165e952a69c83f382f44a319c63e55beab7ce5f880c8f9cbbcf9d3fc8e7a0222131779e89d5f9069480fbb7a39614c4ad7891d75c6ee SHA512 1605149b9b080d80a28d6e9974c2e8df17506a9641de443e8bcb6cec327d6e1193fa41a78845f8408e1a63b35b07e6096a0c05c62d0c08c526bba42b73293cf3
 MISC metadata.xml 700 BLAKE2B 68549e234091289be40cb10d939856b6fb8a498b94b0e8611b20211476bcaf200e4713f0ffe112f3822180fc4908e51ac343ce70df0a70156b23ccd14f33ad23 SHA512 9566655dd9cdc8c1db17d236a21c4c131894c4aee492b64a8e32a6eda80d0190ffe6964392438d8cbc18ab08a2bcfe8afe80a956d4b08b342b7a7549e1429535
diff --git a/dev-java/java-config/java-config-2.3.2.ebuild b/dev-java/java-config/java-config-2.3.2.ebuild
new file mode 100644
index 000000000000..adc444cdbd70
--- /dev/null
+++ b/dev-java/java-config/java-config-2.3.2.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# jython depends on java-config, so don't add it or things will break
+PYTHON_COMPAT=( python3_{9..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 prefix
+
+DESCRIPTION="Java environment configuration query tool"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
+SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )"
+
+# baselayout-java is added as a dep till it can be added to eclass.
+RDEPEND="
+	sys-apps/baselayout-java
+	sys-apps/portage[${PYTHON_USEDEP}]
+"
+
+python_configure_all() {
+	# setup.py fails to update this file
+	eprefixify src/launcher.bash
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	# This replaces the file installed by java-config-wrapper.
+	dosym java-config-2 /usr/bin/java-config
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/dev-java/java-config/java-config-9999.ebuild b/dev-java/java-config/java-config-9999.ebuild
index ee9dad46c7c3..95a5c2abb069 100644
--- a/dev-java/java-config/java-config-9999.ebuild
+++ b/dev-java/java-config/java-config-9999.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 # jython depends on java-config, so don't add it or things will break
 PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_SETUPTOOLS=no
+DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1 prefix
 
@@ -30,7 +30,8 @@ DEPEND="test? ( sys-apps/portage[${PYTHON_USEDEP}] )"
 # baselayout-java is added as a dep till it can be added to eclass.
 RDEPEND="
 	sys-apps/baselayout-java
-	sys-apps/portage[${PYTHON_USEDEP}]"
+	sys-apps/portage[${PYTHON_USEDEP}]
+"
 
 python_configure_all() {
 	# setup.py fails to update this file