From 2f210c93c08515a806199783aabe37d12a0197cb Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 30 May 2023 21:21:38 +0100 Subject: gentoo auto-resync : 30:05:2023 - 21:21:38 --- dev-java/java-config/Manifest | 4 +-- dev-java/java-config/java-config-2.3.1-r1.ebuild | 43 ++++++++++++++++++++++++ dev-java/java-config/java-config-2.3.1.ebuild | 38 --------------------- dev-java/java-config/java-config-9999.ebuild | 7 +++- 4 files changed, 51 insertions(+), 41 deletions(-) create mode 100644 dev-java/java-config/java-config-2.3.1-r1.ebuild delete mode 100644 dev-java/java-config/java-config-2.3.1.ebuild (limited to 'dev-java/java-config') diff --git a/dev-java/java-config/Manifest b/dev-java/java-config/Manifest index 71c17b6fbf8a..4794b32be934 100644 --- a/dev-java/java-config/Manifest +++ b/dev-java/java-config/Manifest @@ -1,4 +1,4 @@ DIST java-config-2.3.1.tar.gz 26165 BLAKE2B 948506663513db369d0ed8ffdfaa54c643989431430ea03440551a6a4b6725d8eec38f5cb4fde3b64e8936c0f43de0e65a7368469032c646c7b6b3bb7ec3ed13 SHA512 62db555b2d8a37a03b6a03aa133010848d54be33ba6e3c43807abefe665a9d8ff2790baf1af79b98d4a7bd3e9ba6bc64382a24c3fcf7038338123dabd146b7b4 -EBUILD java-config-2.3.1.ebuild 1012 BLAKE2B 36f542af255c625b192dc0c3f0cac30b2f491705d2c244a91cda8192d92894116efa02849631db17de4c767a2b809a58046a89f8e62262b54b63967ae3cebfe4 SHA512 c87f776061e367916355a9ccfddf49198e34e08e8b6b38cf31e60058f5c4df8bb477474425845dcd20069e71cc603fa60961fa673124ed5d5ba82179c024250d -EBUILD java-config-9999.ebuild 1141 BLAKE2B 2d551c219e3a89b04676f7cb6874cb86a89d4e21c3bcdc3414243bac95f8c84bc1d66a25ecb26979349b317c4d617d88537e153343f4f6c6578b704ba2b8bab5 SHA512 ce51aef294b85f167c75ac02c3b3de07e20933948b85b11d7c438cc346f6670b26a276d3782c8db7a35fbf29a982f660b08471e61c510383c1f0301783fc0408 +EBUILD java-config-2.3.1-r1.ebuild 1115 BLAKE2B 56a55948eb49929d4f9852662fcaaa17432abfba9c43367186d017bbc5854fe6a66aafe7313f3000db280500573badbc422dc5ee9f0e82ff15cf48ac4149d4b3 SHA512 8d13961648a6ff645dc1b6bffbc0389cb2b73455e798ab71f87f1d03c540efdef30dd276d70e7c5b6a181a8aa0916c91194a77a7b505b86ffd941a9ea0d69fd6 +EBUILD java-config-9999.ebuild 1244 BLAKE2B 5283826b1745e436b629d2c5f5eab6870aa790894849f1b397d2cde4ed1e51377444a6a04ab09f5b84e4d5b6519c882c4728c7abaa0b1fe9ddd908a61a11760d SHA512 b6ddd53b8c9dced1ad66b3835ef4fd288e507c6310d3123ec86882a26e2092c81b0166ec40028318a218d58d273f13e3acf8e2583df31d12c97f51d5e37d44c0 MISC metadata.xml 561 BLAKE2B b4008379c9254490bad41d6bdd747fbe15d8b72fb01d6bbab635e9a7c15ff456eb6199012479912b95cacfce20787c865181e5c05fcd72574a2964e484144ff0 SHA512 5164814ae329b2f1fa8a714ed669cf42a32fac4c920cb902520122a321ea165ad7a8ec13d39c16d05ed07bc42d17c742813797081290129690163064efd1a8cf 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 new file mode 100644 index 000000000000..13f2ded5c0e8 --- /dev/null +++ b/dev-java/java-config/java-config-2.3.1-r1.ebuild @@ -0,0 +1,43 @@ +# 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.1.ebuild b/dev-java/java-config/java-config-2.3.1.ebuild deleted file mode 100644 index dd3b743d548d..000000000000 --- a/dev-java/java-config/java-config-2.3.1.ebuild +++ /dev/null @@ -1,38 +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 - -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_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-9999.ebuild b/dev-java/java-config/java-config-9999.ebuild index ce28aa1533a0..ee9dad46c7c3 100644 --- a/dev-java/java-config/java-config-9999.ebuild +++ b/dev-java/java-config/java-config-9999.ebuild @@ -7,7 +7,7 @@ EAPI=7 PYTHON_COMPAT=( python3_{9..11} ) DISTUTILS_USE_SETUPTOOLS=no -inherit distutils-r1 +inherit distutils-r1 prefix if [[ ${PV} = *9999 ]]; then inherit git-r3 @@ -32,6 +32,11 @@ 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 -- cgit v1.2.3