From 8a0c1f4e33e6093e789a0c8318c1a4349e20a910 Mon Sep 17 00:00:00 2001 From: "Liguros - Gitlab CI/CD [develop]" Date: Fri, 17 Nov 2023 18:22:14 +0000 Subject: Adding metadata --- dev-java/asm/asm-9.6.ebuild | 2 +- dev-java/java-config/java-config-2.3.3-r1.ebuild | 78 ++++++++++++++++++++++++ dev-java/java-config/java-config-2.3.3.ebuild | 75 ----------------------- dev-java/java-config/java-config-9999.ebuild | 7 ++- dev-java/java-config/metadata.xml | 3 + dev-java/jcommander/jcommander-1.64-r1.ebuild | 2 +- dev-java/testng/testng-6.11.ebuild | 2 +- 7 files changed, 90 insertions(+), 79 deletions(-) create mode 100644 dev-java/java-config/java-config-2.3.3-r1.ebuild delete mode 100644 dev-java/java-config/java-config-2.3.3.ebuild (limited to 'dev-java') diff --git a/dev-java/asm/asm-9.6.ebuild b/dev-java/asm/asm-9.6.ebuild index f121718f5735..ac4e0a56d01f 100644 --- a/dev-java/asm/asm-9.6.ebuild +++ b/dev-java/asm/asm-9.6.ebuild @@ -24,7 +24,7 @@ S="${WORKDIR}/asm-${MY_P}" LICENSE="BSD" SLOT="9" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~x64-macos" +KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~x64-macos" DEPEND=">=virtual/jdk-11:*" RDEPEND=">=virtual/jre-1.8:*" 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 new file mode 100644 index 000000000000..51366439cd17 --- /dev/null +++ b/dev-java/java-config/java-config-2.3.3-r1.ebuild @@ -0,0 +1,78 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{8,9,10,11,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.3.ebuild b/dev-java/java-config/java-config-2.3.3.ebuild deleted file mode 100644 index 1e9cd093225e..000000000000 --- a/dev-java/java-config/java-config-2.3.3.ebuild +++ /dev/null @@ -1,75 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{8,9,10,11,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[@]}" -} - -my_src_install() { - meson_src_install - - local pydirs=( - "${D}$(python_get_sitedir)" - ) - python_optimize "${pydirs[@]}" -} diff --git a/dev-java/java-config/java-config-9999.ebuild b/dev-java/java-config/java-config-9999.ebuild index 1e9cd093225e..e8df70c6d869 100644 --- a/dev-java/java-config/java-config-9999.ebuild +++ b/dev-java/java-config/java-config-9999.ebuild @@ -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}" @@ -63,6 +63,11 @@ src_install() { local scripts mapfile -t scripts < <(awk '/^#!.*python/ {print FILENAME} {nextfile}' "${ED}"/usr/bin/* || die) python_replicate_script "${scripts[@]}" + + 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/metadata.xml b/dev-java/java-config/metadata.xml index 5cfe5c36b1ed..c4dca7ea7b4c 100644 --- a/dev-java/java-config/metadata.xml +++ b/dev-java/java-config/metadata.xml @@ -12,5 +12,8 @@ packages and be used to query for the path to various JDK tools. + + Install bin/java-config-2 symlink pointing to java-config + gentoo-staging \ No newline at end of file diff --git a/dev-java/jcommander/jcommander-1.64-r1.ebuild b/dev-java/jcommander/jcommander-1.64-r1.ebuild index 56c20292fbc5..3fc26c3aa562 100644 --- a/dev-java/jcommander/jcommander-1.64-r1.ebuild +++ b/dev-java/jcommander/jcommander-1.64-r1.ebuild @@ -16,7 +16,7 @@ S="${WORKDIR}/${P}" LICENSE="Apache-2.0" SLOT="1.64" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" DEPEND=">=virtual/jdk-1.8:*" RDEPEND=">=virtual/jre-1.8:*" diff --git a/dev-java/testng/testng-6.11.ebuild b/dev-java/testng/testng-6.11.ebuild index fa7a919959da..92baedcd8ee8 100644 --- a/dev-java/testng/testng-6.11.ebuild +++ b/dev-java/testng/testng-6.11.ebuild @@ -28,7 +28,7 @@ SRC_URI="https://github.com/testng-team/${PN}/archive/${PV}.tar.gz -> ${P}.tar.g S="${WORKDIR}/${P}" LICENSE="Apache-2.0" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="amd64 ~arm arm64 ppc64 x86" SLOT="0" CP_DEPEND=" -- cgit v1.3