gentoo auto-resync : 16:11:2023 - 16:48:05

3 files changed, 39 insertions, 14 deletions

diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 248a2895b3b8..61f8cffe22b8 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 fdd64745cac5..19ddb69b9b55 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -3,5 +3,5 @@ DIST java-config-2.3.1.tar.gz 26165 BLAKE2B 948506663513db369d0ed8ffdfaa54c64398
 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-2.3.2.ebuild 1192 BLAKE2B 2d3f3f5190ae4f0d0fbda0cbdc861083c968b62ceac30fe2b10ec2b26b7ea62846af8382c526aee36ff6f5c8eae3a9d0192b9f3d0f51e6b5678f19890588176a SHA512 86bea587f2f0f3289db9638e6f8868bd00aa0fd68c617c48752a35dc7eda281a2ff7d222732ec1a5bc0cc27d2ab60f687d8c55a47a043648995965d3096add70
-EBUILD java-config-9999.ebuild 1250 BLAKE2B 2388218b40493fb54352f18e4c385517db08513bd9773aa7dcde235fe4b4dbc03e5319a230444fa89c51609e11a058579f5717fdc9cfa8db393b4a8f62b6dc56 SHA512 af5b49161bc8f1c79b593b8ceb4c204c61c0957fa966ea8484445a0fee15aaee5d4131cec08b94eae0c3514f202003a2fa493794af11d47510c385f6098f2308
+EBUILD java-config-9999.ebuild 1618 BLAKE2B 4aef07c625dc1c49843b238c3a8cad5a2e31bbbaa81e21a8912fd7712190ff8092231c148f1e692e94f2fb9f95bb766dad2c22521fd3b4e8b5bcc7f6db830ee2 SHA512 b927f57001e1552cfde37828e81d3d3d15877060013a70141ade8b997ccecd388984913e7bacc5dc53c4d5f29a0026fb3ce6faac7492af54e540d9407ddcc220
 MISC metadata.xml 700 BLAKE2B 68549e234091289be40cb10d939856b6fb8a498b94b0e8611b20211476bcaf200e4713f0ffe112f3822180fc4908e51ac343ce70df0a70156b23ccd14f33ad23 SHA512 9566655dd9cdc8c1db17d236a21c4c131894c4aee492b64a8e32a6eda80d0190ffe6964392438d8cbc18ab08a2bcfe8afe80a956d4b08b342b7a7549e1429535
diff --git a/dev-java/java-config/java-config-9999.ebuild b/dev-java/java-config/java-config-9999.ebuild
index 852afb28806a..a4dc516e9ab8 100644
--- a/dev-java/java-config/java-config-9999.ebuild
+++ b/dev-java/java-config/java-config-9999.ebuild
@@ -3,13 +3,11 @@
 
 EAPI=8
 
-# jython depends on java-config, so don't add it or things will break
 PYTHON_COMPAT=( python3_{10..12} )
-DISTUTILS_USE_PEP517=setuptools
 
-inherit distutils-r1 prefix
+inherit meson python-r1
 
-if [[ ${PV} = *9999 ]]; then
+if [[ ${PV} = 9999 ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/java-config.git"
 else
@@ -24,27 +22,54 @@ LICENSE="GPL-2"
 SLOT="2"
 IUSE="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}]
 "
 
-python_configure_all() {
-	# setup.py fails to update this file
-	eprefixify src/launcher.bash
+src_configure() {
+	local python_only=false
+	python_foreach_impl my_src_configure
 }
 
-python_install_all() {
-	distutils-r1_python_install_all
+my_src_configure() {
+	local emesonargs=(
+		-Darch="${ARCH}"
+		-Dpython-only="${python_only}"
+		-Deprefix="${EPREFIX}"
+	)
 
-	# This replaces the file installed by java-config-wrapper.
-	dosym java-config-2 /usr/bin/java-config
+	meson_src_configure
+	python_only=true
 }
 
-python_test() {
-	esetup.py test
+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[@]}"
+}
+
+my_src_install() {
+	meson_src_install
+
+	local pydirs=(
+		"${D}$(python_get_sitedir)"
+	)
+	python_optimize "${pydirs[@]}"
 }