diff options
Diffstat (limited to 'dev-java/java-config')
| -rw-r--r-- | dev-java/java-config/Manifest | 5 | ||||
| -rw-r--r-- | dev-java/java-config/files/2.3.2-fix-deprecated-test-methods.patch | 82 | ||||
| -rw-r--r-- | dev-java/java-config/java-config-2.3.2.ebuild | 4 | ||||
| -rw-r--r-- | dev-java/java-config/java-config-9999.ebuild | 2 |
4 files changed, 89 insertions, 4 deletions
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest index 3f326f520c7b..fdd64745cac5 100644 --- a/dev-java/java-config/Manifest +++ b/dev-java/java-config/Manifest @@ -1,6 +1,7 @@ +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 EBUILD java-config-2.3.1-r1.ebuild 1115 BLAKE2B 56a55948eb49929d4f9852662fcaaa17432abfba9c43367186d017bbc5854fe6a66aafe7313f3000db280500573badbc422dc5ee9f0e82ff15cf48ac4149d4b3 SHA512 8d13961648a6ff645dc1b6bffbc0389cb2b73455e798ab71f87f1d03c540efdef30dd276d70e7c5b6a181a8aa0916c91194a77a7b505b86ffd941a9ea0d69fd6 -EBUILD java-config-2.3.2.ebuild 1124 BLAKE2B b68daddae2e3e47d83fd52dea3eabf7494920ba70fd585c75d42b3becb576e347495ea974f909307fc52c2010d9d638fddd53e82fe70080a343f93c7db13bfa7 SHA512 673a37b6e8646906822a9f629402a1923d6234f7f1b6fbd89211abbcaa916b4d81dd418a4a96f627fb1d3255e7990fa74adc0fcf6fb11f214c66b75a2c278390 -EBUILD java-config-9999.ebuild 1249 BLAKE2B f55232b1cf31ace4716f165e952a69c83f382f44a319c63e55beab7ce5f880c8f9cbbcf9d3fc8e7a0222131779e89d5f9069480fbb7a39614c4ad7891d75c6ee SHA512 1605149b9b080d80a28d6e9974c2e8df17506a9641de443e8bcb6cec327d6e1193fa41a78845f8408e1a63b35b07e6096a0c05c62d0c08c526bba42b73293cf3 +EBUILD java-config-2.3.2.ebuild 1192 BLAKE2B 2d3f3f5190ae4f0d0fbda0cbdc861083c968b62ceac30fe2b10ec2b26b7ea62846af8382c526aee36ff6f5c8eae3a9d0192b9f3d0f51e6b5678f19890588176a SHA512 86bea587f2f0f3289db9638e6f8868bd00aa0fd68c617c48752a35dc7eda281a2ff7d222732ec1a5bc0cc27d2ab60f687d8c55a47a043648995965d3096add70 +EBUILD java-config-9999.ebuild 1250 BLAKE2B 2388218b40493fb54352f18e4c385517db08513bd9773aa7dcde235fe4b4dbc03e5319a230444fa89c51609e11a058579f5717fdc9cfa8db393b4a8f62b6dc56 SHA512 af5b49161bc8f1c79b593b8ceb4c204c61c0957fa966ea8484445a0fee15aaee5d4131cec08b94eae0c3514f202003a2fa493794af11d47510c385f6098f2308 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 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 |