commit: c50e2a9894174a216632f2aba67b07dc5dc55853 Author: Florian Schmaus <flow <AT> gentoo <DOT> org> AuthorDate: Fri Nov 17 08:24:30 2023 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Fri Nov 17 08:25:39 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c50e2a98
dev-java/java-config: update live, add USE=compat Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> dev-java/java-config/java-config-9999.ebuild | 8 +++++--- dev-java/java-config/metadata.xml | 3 +++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/dev-java/java-config/java-config-9999.ebuild b/dev-java/java-config/java-config-9999.ebuild index b63dbff8d490..1b124ce70a3a 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}" @@ -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/metadata.xml b/dev-java/java-config/metadata.xml index 97c51385f0c1..faeac11b5e48 100644 --- a/dev-java/java-config/metadata.xml +++ b/dev-java/java-config/metadata.xml @@ -11,6 +11,9 @@ per-user default JVMs, construct classpath env vars from installed java 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> <upstream> <remote-id type="gentoo">proj/java-config</remote-id> <remote-id type="github">gentoo/java-config</remote-id>
