[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/, dev-java/java-config/files/

[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/, dev-java/java-config/files/

[Patrice Clement]

commit:     01881f349f8420f045a164bdd7762fac0f7142c2
Author:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 20 19:45:05 2020 +0000
Commit:     Patrice Clement <monsieurp <AT> gentoo <DOT> org>
CommitDate: Mon Jul 20 19:45:05 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=01881f34

dev-java/java-config: clean up old.

Package-Manager: Portage-2.3.99, Repoman-2.3.23
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org>

 dev-java/java-config/Manifest                      |  1 -
 .../files/java-config-2.2.0-prefix.patch           | 15 -------
 .../java-config/files/java-config-2.2.0-py38.patch | 52 ----------------------
 dev-java/java-config/java-config-2.2.0-r4.ebuild   | 44 ------------------
 4 files changed, 112 deletions(-)

diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index f75ce7c90ed..9cc9cc4e6e3 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,2 +1 @@
-DIST java-config-2.2.0.tar.bz2 51851 BLAKE2B 7b7c15dc988d2f5f54ebacba224f57193577e24f99a798657b40d83d723280562e314ba71319958a83be44defc6a48ac1114cce37eaeddea025ea31f26cf331a SHA512 a491cfe86bde8afadfc5b875740d79f9077526d8650ffb034fdad67a7ffa1b02646f67b1ef0eab7b0fe3ae57b5d767fa6a0d5593fe07416993d60588a8ed595a
 DIST java-config-2.3.1.tar.gz 26165 BLAKE2B 948506663513db369d0ed8ffdfaa54c643989431430ea03440551a6a4b6725d8eec38f5cb4fde3b64e8936c0f43de0e65a7368469032c646c7b6b3bb7ec3ed13 SHA512 62db555b2d8a37a03b6a03aa133010848d54be33ba6e3c43807abefe665a9d8ff2790baf1af79b98d4a7bd3e9ba6bc64382a24c3fcf7038338123dabd146b7b4

diff --git a/dev-java/java-config/files/java-config-2.2.0-prefix.patch b/dev-java/java-config/files/java-config-2.2.0-prefix.patch
deleted file mode 100644
index 068538a69f9..00000000000
--- a/dev-java/java-config/files/java-config-2.2.0-prefix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Wait for the java team to upstream this patch.
-Bug: 591156
---- /setup.py	2013-02-15 07:12:09.000000000 +0900
-+++ /setup.py.new	2016-08-13 16:38:22.000000000 +0900
-@@ -87,8 +87,8 @@
- 		elif arch in ['hpux']:
- 			defaults = '*= hp-jdk-bin'
- 
--		os.mkdir(self.root + '/usr/share/java-config-2/config/')
--		with open(self.root + '/usr/share/java-config-2/config/jdk-defaults.conf', 'w') as f:
-+		os.mkdir(self.root + eprefix + '/usr/share/java-config-2/config/')
-+		with open(self.root + eprefix + '/usr/share/java-config-2/config/jdk-defaults.conf', 'w') as f:
- 			f.write("# This files contain the default support jdk's\n")
- 			f.write(defaults + "\n")
- 

diff --git a/dev-java/java-config/files/java-config-2.2.0-py38.patch b/dev-java/java-config/files/java-config-2.2.0-py38.patch
deleted file mode 100644
index cb59e1f36be..00000000000
--- a/dev-java/java-config/files/java-config-2.2.0-py38.patch
+++ /dev/null
@@ -1,52 +0,0 @@
-From 5e7cc49184e657bd446998f4b08e9106e5215ce5 Mon Sep 17 00:00:00 2001
-From: Georgy Yakovlev <gyakovlev@gentoo.org>
-Date: Thu, 7 May 2020 02:45:57 -0700
-Subject: [PATCH] replace is with ==
-
----
- src/java-config-2 | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/src/java-config-2 b/src/java-config-2
-index 8ad2539..84ecd30 100755
---- a/src/java-config-2
-+++ b/src/java-config-2
-@@ -199,7 +199,7 @@ def set_user_vm(option, opt, value, parser):
-     if not vm:
-         fatalError("Could not find a vm matching: %s" % value)
-     else:
--        if os.getuid() is 0:
-+        if os.getuid() == 0:
-             fatalError("The user 'root' should always use the System VM")
-         else:
-             try:
-@@ -227,7 +227,7 @@ def user_classpath_target():
- # Deprecated
- def set_system_classpath(option, opt, value, parser):
-     deprecation_notice()
--    if os.getuid() is 0:
-+    if os.getuid() == 0:
-         pkgs = value.split(',')
-         manager.set_classpath(system_classpath_target(), pkgs)
-         
-@@ -252,7 +252,7 @@ def set_user_classpath(option, opt, value, parser):
- # Deprecated
- def append_system_classpath(option, opt, value, parser):
-     deprecation_notice()
--    if os.getuid() is 0:
-+    if os.getuid() == 0:
-         pkgs = value.split(',')
-         manager.append_classpath(system_classpath_target(), pkgs)
- 
-@@ -277,7 +277,7 @@ def append_user_classpath(option, opt, value, parser):
- # Deprecated
- def clean_system_classpath(option, opt, value, parser):
-     deprecation_notice()
--    if os.getuid() is 0:
-+    if os.getuid() == 0:
-         manager.clean_classpath(system_classpath_target())
-         update_env()
-     else:
--- 
-2.26.2
-

diff --git a/dev-java/java-config/java-config-2.2.0-r4.ebuild b/dev-java/java-config/java-config-2.2.0-r4.ebuild
deleted file mode 100644
index 8f03a425121..00000000000
--- a/dev-java/java-config/java-config-2.2.0-r4.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-# jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python3_{6,7,8} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-inherit distutils-r1
-
-DESCRIPTION="Java environment configuration query tool"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java"
-SRC_URI="https://dev.gentoo.org/~gyakovlev/distfiles/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="2"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86"
-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="
-	!dev-java/java-config-wrapper
-	sys-apps/baselayout-java
-	sys-apps/portage[${PYTHON_USEDEP}]"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.2.0-prefix.patch
-	"${FILESDIR}"/${PN}-2.2.0-py38.patch
-)
-
-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
-}

[gentoo-commits] repo/gentoo:master commit in: dev-java/java-config/, dev-java/java-config/files/

[Florian Schmaus]

commit:     7748663ef13c9363c7f25b486fe48c865b4373d1
Author:     Holger Hoffstätte <holger <AT> applied-asynchrony <DOT> com>
AuthorDate: Tue Nov 14 16:59:58 2023 +0000
Commit:     Florian Schmaus <flow <AT> gentoo <DOT> org>
CommitDate: Tue Nov 14 20:15:16 2023 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7748663e

dev-java/java-config: update PYTHON_COMPAT: remove 3.9, add 3.12

Also add a fix for deprecated test methods which would fail with 3.12.

Signed-off-by: Holger Hoffstätte <holger <AT> applied-asynchrony.com>
Closes: https://github.com/gentoo/gentoo/pull/33823
Signed-off-by: Florian Schmaus <flow <AT> gentoo.org>

 .../files/2.3.2-fix-deprecated-test-methods.patch  | 82 ++++++++++++++++++++++
 dev-java/java-config/java-config-2.3.2.ebuild      |  4 +-
 dev-java/java-config/java-config-9999.ebuild       |  2 +-
 3 files changed, 86 insertions(+), 2 deletions(-)

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
new file mode 100644
index 000000000000..4bc4eb04fbc1
--- /dev/null
+++ b/dev-java/java-config/files/2.3.2-fix-deprecated-test-methods.patch
@@ -0,0 +1,82 @@
+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
index adc444cdbd70..001b3d072062 100644
--- a/dev-java/java-config/java-config-2.3.2.ebuild
+++ b/dev-java/java-config/java-config-2.3.2.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 # jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1 prefix
@@ -27,6 +27,8 @@ RDEPEND="
 	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

diff --git a/dev-java/java-config/java-config-9999.ebuild b/dev-java/java-config/java-config-9999.ebuild
index 95a5c2abb069..852afb28806a 100644
--- a/dev-java/java-config/java-config-9999.ebuild
+++ b/dev-java/java-config/java-config-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 # jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python3_{9..11} )
+PYTHON_COMPAT=( python3_{10..12} )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1 prefix