commit: 8934a71af509eba66011ced1686eff2bf9611ba4 Author: Florian Schmaus <flow <AT> gentoo <DOT> org> AuthorDate: Thu Nov 16 20:29:17 2023 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Thu Nov 16 20:30:16 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8934a71a
dev-java/java-config: drop 2.3.2 Closes: https://bugs.gentoo.org/917353 Closes: https://bugs.gentoo.org/917346 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> dev-java/java-config/Manifest | 1 - .../files/2.3.2-fix-deprecated-test-methods.patch | 82 ---------------------- dev-java/java-config/java-config-2.3.2.ebuild | 46 ------------ profiles/package.mask | 4 -- 4 files changed, 133 deletions(-) diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest index cf19fbf41cb0..3bcc3e4b9642 100644 --- a/dev-java/java-config/Manifest +++ b/dev-java/java-config/Manifest @@ -1,3 +1,2 @@ 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 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?= <[email protected]> -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 <[email protected]> ---- 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/profiles/package.mask b/profiles/package.mask index c3c0212f72d7..13795b317928 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -33,10 +33,6 @@ #--- END OF EXAMPLES --- -# Florian Schmaus <[email protected]> (2023-11-15) -# Installs launcher.bash into wrong position. Bug #917346. -=dev-java/java-config-2.3.2 - # Arthur Zamarin <[email protected]> (2023-11-10) # No reverse dependencies, no tests, no upstream activity. All ebuild # maintenance on this package was done randomly by @python project members,
