gentoo auto-resync : 16:11:2023 - 22:53:04

4 files changed, 77 insertions, 131 deletions

diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 19ddb69b9b55..e6d19ab02285 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,7 +1,6 @@
-AUX 2.3.2-fix-deprecated-test-methods.patch 3689 BLAKE2B 079c031052c0c967b1fd026f7b966a458f99a2d5bc72c5784fa71159666c7a606516aef516dd0738e2027927473a07984d10d52e929b5ddc8703061ee6601214 SHA512 66dbc17f2ba664526aaef24cdcaec37d39b4f338e83650240e414505299f8184bedd057f43cbd10b8e2180a2d6492de70702a6e4325b34dc2cf9c5da89a895d2
 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
+DIST java-config-2.3.3.tar.gz 33837 BLAKE2B dc522a61775272e520521a06c80ac33cbe40010a40051857df8abdbda72cc064969cb00dbf8f7d06efabd352d9cf2c711808205579c7cef73ce4bb7fe2845c8d SHA512 f999ccbdd47f2552913467d3b0c6704fc6511f2bc9d0a6f62d38a9c2e9899f11b239f2039b025f7fdee5e0713d2aaf13c1a9a9baf4f1551bb97d85b12d3f28e9
 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-2.3.3.ebuild 1618 BLAKE2B 4aef07c625dc1c49843b238c3a8cad5a2e31bbbaa81e21a8912fd7712190ff8092231c148f1e692e94f2fb9f95bb766dad2c22521fd3b4e8b5bcc7f6db830ee2 SHA512 b927f57001e1552cfde37828e81d3d3d15877060013a70141ade8b997ccecd388984913e7bacc5dc53c4d5f29a0026fb3ce6faac7492af54e540d9407ddcc220
 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/files/2.3.2-fix-deprecated-test-methods.patch b/dev-java/java-config/files/2.3.2-fix-deprecated-test-methods.patch
deleted file mode 100644
index 4bc4eb04fbc1..000000000000
--- a/dev-java/java-config/files/2.3.2-fix-deprecated-test-methods.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From bc36c65ae319bd36b51ecbb7fd2ff3271ba08b05 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Holger=20Hoffst=C3=A4tte?= <holger@applied-asynchrony.com>
-Date: Tue, 14 Nov 2023 18:27:18 +0100
-Subject: [PATCH] update deprecated test methods for python-3.12 compatibility
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Signed-off-by: Holger Hoffstätte <holger@applied-asynchrony.com>
---- a/tests/testsuite/EnvironmentManager.py
-+++ b/tests/testsuite/EnvironmentManager.py
-@@ -11,7 +11,7 @@ def setUp(self):
-     def test_load_packages(self):
-         self.em.packages = {}
-         self.em.load_packages()
--        self.assertEquals(len(self.em.get_packages()), 11)
-+        self.assertEqual(len(self.em.get_packages()), 11)
- 
-     def test_get_package(self):
-         self.em.get_package('ant-cores')
---- a/tests/testsuite/VersionManager.py
-+++ b/tests/testsuite/VersionManager.py
-@@ -38,28 +38,28 @@ def test_get_vm(self):
- 
-     def test_filter_depend_vanilla(self):
-         os.environ["USE"] = ""
--        self.assertEquals(self.verman.filter_depend(self.example_dep_vanilla), self.example_dep_vanilla)
-+        self.assertEqual(self.verman.filter_depend(self.example_dep_vanilla), self.example_dep_vanilla)
- 
-     def test_filter_depend_or(self):
-         # Oh you only realise how ugly things are once you write unittests.
-         os.environ["USE"] = ""
-         rmatch = "|| =virtual/jdk-1.5 =virtual/jdk-1.4 dev-java/ant-core java-virtuals/jaf"
--        self.assertEquals(self.verman.filter_depend(self.example_dep_or), rmatch)
-+        self.assertEqual(self.verman.filter_depend(self.example_dep_or), rmatch)
-     
-     def test_filter_depend_use_enabled(self):
-         os.environ["USE"] = "java"
-         rmatch = ">=virtual/jdk-1.5* dev-java/ant-core java-virtuals/jaf"
--        self.assertEquals(self.verman.filter_depend(self.example_dep_use), rmatch)
-+        self.assertEqual(self.verman.filter_depend(self.example_dep_use), rmatch)
- 
-     def test_filter_depend_use_disabled(self):
-         os.environ["USE"] = ""
-         rmatch = "dev-java/ant-core java-virtuals/jaf"
--        self.assertEquals(self.verman.filter_depend(self.example_dep_use), rmatch)
-+        self.assertEqual(self.verman.filter_depend(self.example_dep_use), rmatch)
- 
-     def test_filter_depend_use_unset(self):
-         del os.environ["USE"]
-         rmatch = self.example_dep_use
--        self.assertEquals(self.verman.filter_depend(self.example_dep_use), rmatch)
-+        self.assertEqual(self.verman.filter_depend(self.example_dep_use), rmatch)
- 
-     def test_version_satisfies(self):
-         vm = self.em.get_vm('sun-jdk-1.6')
-@@ -88,13 +88,13 @@ def test_version_satisfies(self):
- 
-     def test_get_lowest(self):
-         target = self.verman.get_lowest(">=virtual/jdk-1.4")
--        self.assertEquals(target, '1.4')
-+        self.assertEqual(target, '1.4')
-         
-         target = self.verman.get_lowest(self.example_dep_vanilla)
--        self.assertEquals(target, '1.5')
-+        self.assertEqual(target, '1.5')
- 
-         target = self.verman.get_lowest(self.example_dep_or)
--        self.assertEquals(target, '1.4')
-+        self.assertEqual(target, '1.4')
-         
-     def test_get_lowest_with_package_dep(self):
-         pass
-@@ -108,7 +108,7 @@ def test_get_lowest_with_package_dep(self):
-     #def test_matches(self):
- 
-     def test_version_cmp(self):
--        self.assertEquals(self.verman.version_cmp('1.5.2', '1.5.2'), 0)
-+        self.assertEqual(self.verman.version_cmp('1.5.2', '1.5.2'), 0)
-         self.assertTrue(self.verman.version_cmp('1.5', '1.5.1') < 0)
-         self.assertTrue(self.verman.version_cmp('1.5.1', '1.5') > 0)
- 
diff --git a/dev-java/java-config/java-config-2.3.2.ebuild b/dev-java/java-config/java-config-2.3.2.ebuild
deleted file mode 100644
index 001b3d072062..000000000000
--- a/dev-java/java-config/java-config-2.3.2.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# 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_{10..12} )
-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}]
-"
-
-PATCHES=( "${FILESDIR}/2.3.2-fix-deprecated-test-methods.patch" )
-
-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-2.3.3.ebuild b/dev-java/java-config/java-config-2.3.3.ebuild
new file mode 100644
index 000000000000..a4dc516e9ab8
--- /dev/null
+++ b/dev-java/java-config/java-config-2.3.3.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2023 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="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[@]}"
+}
+
+my_src_install() {
+	meson_src_install
+
+	local pydirs=(
+		"${D}$(python_get_sitedir)"
+	)
+	python_optimize "${pydirs[@]}"
+}