diff options
Diffstat (limited to 'dev-java/java-config')
-rw-r--r-- | dev-java/java-config/Manifest | 8 | ||||
-rw-r--r-- | dev-java/java-config/java-config-2.3.1-r1.ebuild | 43 | ||||
-rw-r--r-- | dev-java/java-config/java-config-2.3.4.ebuild (renamed from dev-java/java-config/java-config-2.3.3-r1.ebuild) | 12 | ||||
-rw-r--r-- | dev-java/java-config/java-config-9999.ebuild | 4 |
4 files changed, 12 insertions, 55 deletions
diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest index 0278d197ed91..d8c92461c3b1 100644 --- a/dev-java/java-config/Manifest +++ b/dev-java/java-config/Manifest @@ -1,6 +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 -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-9999.ebuild 1745 BLAKE2B 27d584230b5fcf22c3e73a2437789e48caac5ad4deab8676914d5d55aef8b2a5a80dbfab45c3078cff7100b8719dc0ca518527ea894a9d6ca24ed5a363ff5a63 SHA512 ffbb3ecde7a588675111ad1908d56016fff4ec72297037fe9a3708abf244515a4fc427385d0448270d4799ad946574524a74be3496053e91d19f98e0fc6622c7 +DIST java-config-2.3.4.tar.gz 33833 BLAKE2B 36cb628375a05530f515d886d819bc99a7ed233bec2956db3562349ae845be57363a2b6629ab5536be15c5f64387d0760cca7959b76a5685918732ee7bf62300 SHA512 9df42a70aceb400a9fab73668151da783e98e767fa6289c13427095d7a3268bd4bb15de9ef980b82692e7c1cb0eaf5326c19a632679419d78a419294579fb29e +EBUILD java-config-2.3.4.ebuild 1741 BLAKE2B d13d4c7dc6c38b0a448a2713b5a34a6c5e8a1d60cb8a59293e390112c8ff5a512db67bf230440339998546100c4fcf41b29f0c856168bf2203169e3db4bf7555 SHA512 bf7865da5d551f1d9c739dd731d477ebb802beeaa05dfe778f3ac0eeb1a72aeb5b806f819221488be2aa75e103ea357f768e6db5fe12306dcc643b2a41a70b4f +EBUILD java-config-9999.ebuild 1745 BLAKE2B a10434eee03920bed7267eabcf5271f367a2625aba9f7c4d58653f69a2640a416afa85866bae9d4d35f625828aac25a9bebdcf28ba43ce552f5365c752ac8f02 SHA512 7000b7515412a7187282d0b567d4141f13ec5f96a4a9c619abf22cc8fbdfc258de2725ec39d43f98a00501092f2308fcee6c3238261390506eef7387ef0f9615 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.4.ebuild index ab1cb1b890e9..42aee8aa4ad6 100644 --- a/dev-java/java-config/java-config-2.3.3-r1.ebuild +++ b/dev-java/java-config/java-config-2.3.4.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit meson python-r1 @@ -20,7 +20,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Java" LICENSE="GPL-2" SLOT="2" -IUSE="test" +IUSE="+compat test" RESTRICT="!test? ( test )" REQUIRED_USE="${PYTHON_REQUIRED_USE}" @@ -64,8 +64,10 @@ src_install() { 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 + if use compat; then + # Symlink java-config-2 to java-config for now. + dosym java-config /usr/bin/java-config-2 + fi } my_src_install() { diff --git a/dev-java/java-config/java-config-9999.ebuild b/dev-java/java-config/java-config-9999.ebuild index 1b124ce70a3a..b667c1052848 100644 --- a/dev-java/java-config/java-config-9999.ebuild +++ b/dev-java/java-config/java-config-9999.ebuild @@ -1,9 +1,9 @@ -# Copyright 1999-2023 Gentoo Authors +# Copyright 1999-2024 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 -PYTHON_COMPAT=( python3_{10..12} ) +PYTHON_COMPAT=( python3_{10..13} ) inherit meson python-r1 |