diff options
| author | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2023-11-17 18:22:14 +0000 |
|---|---|---|
| committer | Liguros - Gitlab CI/CD [develop] <gitlab@liguros.net> | 2023-11-17 18:22:14 +0000 |
| commit | 8a0c1f4e33e6093e789a0c8318c1a4349e20a910 (patch) | |
| tree | a7bf10d5443bf4b319325aacbbc7a13da836cb8a /dev-java | |
| parent | c1272386bb1612391da49818314e6bcbfa581163 (diff) | |
| download | baldeagleos-repo-8a0c1f4e33e6093e789a0c8318c1a4349e20a910.tar.gz baldeagleos-repo-8a0c1f4e33e6093e789a0c8318c1a4349e20a910.tar.xz baldeagleos-repo-8a0c1f4e33e6093e789a0c8318c1a4349e20a910.zip | |
Adding metadata
Diffstat (limited to 'dev-java')
| -rw-r--r-- | dev-java/asm/asm-9.6.ebuild | 2 | ||||
| -rw-r--r-- | dev-java/java-config/java-config-2.3.3-r1.ebuild (renamed from dev-java/java-config/java-config-2.3.3.ebuild) | 3 | ||||
| -rw-r--r-- | dev-java/java-config/java-config-9999.ebuild | 7 | ||||
| -rw-r--r-- | dev-java/java-config/metadata.xml | 3 | ||||
| -rw-r--r-- | dev-java/jcommander/jcommander-1.64-r1.ebuild | 2 | ||||
| -rw-r--r-- | dev-java/testng/testng-6.11.ebuild | 2 |
6 files changed, 15 insertions, 4 deletions
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.ebuild b/dev-java/java-config/java-config-2.3.3-r1.ebuild index 1e9cd093225e..51366439cd17 100644 --- a/dev-java/java-config/java-config-2.3.3.ebuild +++ b/dev-java/java-config/java-config-2.3.3-r1.ebuild @@ -63,6 +63,9 @@ 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() { 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. </longdescription> + <use> + <flag name="compat">Install bin/java-config-2 symlink pointing to java-config</flag> + </use> <origin>gentoo-staging</origin> </pkgmetadata>
\ 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=" |