gentoo auto-resync : 07:08:2024 - 12:37:20

4 files changed, 2 insertions, 127 deletions

diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest
index 48035f9edf03..469116a8f9fd 100644
--- a/dev-java/java-config/Manifest
+++ b/dev-java/java-config/Manifest
@@ -1,8 +1,4 @@
-DIST java-config-2.3.1.tar.gz 26165 BLAKE2B 948506663513db369d0ed8ffdfaa54c643989431430ea03440551a6a4b6725d8eec38f5cb4fde3b64e8936c0f43de0e65a7368469032c646c7b6b3bb7ec3ed13 SHA512 62db555b2d8a37a03b6a03aa133010848d54be33ba6e3c43807abefe665a9d8ff2790baf1af79b98d4a7bd3e9ba6bc64382a24c3fcf7038338123dabd146b7b4
-DIST java-config-2.3.3.tar.gz 33837 BLAKE2B dc522a61775272e520521a06c80ac33cbe40010a40051857df8abdbda72cc064969cb00dbf8f7d06efabd352d9cf2c711808205579c7cef73ce4bb7fe2845c8d SHA512 f999ccbdd47f2552913467d3b0c6704fc6511f2bc9d0a6f62d38a9c2e9899f11b239f2039b025f7fdee5e0713d2aaf13c1a9a9baf4f1551bb97d85b12d3f28e9
 DIST java-config-2.3.4.tar.gz 33833 BLAKE2B 36cb628375a05530f515d886d819bc99a7ed233bec2956db3562349ae845be57363a2b6629ab5536be15c5f64387d0760cca7959b76a5685918732ee7bf62300 SHA512 9df42a70aceb400a9fab73668151da783e98e767fa6289c13427095d7a3268bd4bb15de9ef980b82692e7c1cb0eaf5326c19a632679419d78a419294579fb29e
-EBUILD java-config-2.3.1-r1.ebuild 1115 BLAKE2B 56a55948eb49929d4f9852662fcaaa17432abfba9c43367186d017bbc5854fe6a66aafe7313f3000db280500573badbc422dc5ee9f0e82ff15cf48ac4149d4b3 SHA512 8d13961648a6ff645dc1b6bffbc0389cb2b73455e798ab71f87f1d03c540efdef30dd276d70e7c5b6a181a8aa0916c91194a77a7b505b86ffd941a9ea0d69fd6
-EBUILD java-config-2.3.3-r1.ebuild 1717 BLAKE2B d27e002a008385ce859d191512e57932083276b5546a6a454a45fc811b6e2d5eef94ac22d45b89e1916c7dc7d2d0bcc181798800d6acd78678a8ab53a50667df SHA512 2ad4119601732d4827857340c4efe65bbac5fa6ae2082c150713433f52d7aba7cdccae36d81fde32a36d0cc6c0888b80ecc47b9d85bb91b044a312df82e2993e
-EBUILD java-config-2.3.4.ebuild 1745 BLAKE2B 2960c01b67cdf2c21310f3cbcc4f3571568a4224b66894a61c87ad4a1d3b4817aa7af21cc1c6445a05cc6836dcdf3a2da821aad5d5ac186c44fd3d28d6bf6107 SHA512 71492ebdfc527147051260ea5dbaa4f0b6cfdf3117a7044b3e20abd2f14cb8a8e048853f4fada3f2fc0ce8aafc1c5d39cc749a2984ffe919280ad07db83a5a44
+EBUILD java-config-2.3.4.ebuild 1741 BLAKE2B bded2a20c13a7f4564847ac98a22899b43ec9f3755e3c2dbc46fd6d1dec736df46053e746496aa55d367b69c130bcc2fa19262a167c70d2c5ce7e5859f17cf01 SHA512 af216cb651e6b77c0004b469aa75537dc76856b4b9d272c450650d4367c30e4b40b26907d44673f27681650bd6559359c8e6f174bce8cabaffb8584837ad27fe
 EBUILD java-config-9999.ebuild 1745 BLAKE2B 27d584230b5fcf22c3e73a2437789e48caac5ad4deab8676914d5d55aef8b2a5a80dbfab45c3078cff7100b8719dc0ca518527ea894a9d6ca24ed5a363ff5a63 SHA512 ffbb3ecde7a588675111ad1908d56016fff4ec72297037fe9a3708abf244515a4fc427385d0448270d4799ad946574524a74be3496053e91d19f98e0fc6622c7
 MISC metadata.xml 802 BLAKE2B 300762f5d21abce3b3c37d88e678125c0c760813acb3b3171c1d151da89bd404d6914874d93b52580ca245d14d1fbdfd5801ab7e0204ece3bee7ec084180de1a SHA512 76efa4ab5aaeecce7d952d2a48b0d63027d5dc7d0fed45c947817c4e599e0dd2b8ea664d951a2f4b2fa2885a2a46a9750b5687f328691701d72d93d8ead494d3
diff --git a/dev-java/java-config/java-config-2.3.1-r1.ebuild b/dev-java/java-config/java-config-2.3.1-r1.ebuild
deleted file mode 100644
index 13f2ded5c0e8..000000000000
--- a/dev-java/java-config/java-config-2.3.1-r1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# jython depends on java-config, so don't add it or things will break
-PYTHON_COMPAT=( python3_{9..11} )
-DISTUTILS_USE_SETUPTOOLS=no
-
-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}]"
-
-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-r1.ebuild b/dev-java/java-config/java-config-2.3.3-r1.ebuild
deleted file mode 100644
index ab1cb1b890e9..000000000000
--- a/dev-java/java-config/java-config-2.3.3-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# 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[@]}"
-
-	# This replaces the file installed by java-config-wrapper.
-	dosym java-config-2 /usr/bin/java-config
-}
-
-my_src_install() {
-	meson_src_install
-
-	local pydirs=(
-		"${D}$(python_get_sitedir)"
-	)
-	python_optimize "${pydirs[@]}"
-}
diff --git a/dev-java/java-config/java-config-2.3.4.ebuild b/dev-java/java-config/java-config-2.3.4.ebuild
index 90c000f935f3..5e3221048e7a 100644
--- a/dev-java/java-config/java-config-2.3.4.ebuild
+++ b/dev-java/java-config/java-config-2.3.4.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} = 9999 ]]; then
 	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"
+	KEYWORDS="amd64 ~arm arm64 ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 fi
 
 DESCRIPTION="Java environment configuration query tool"