diff options
Diffstat (limited to 'dev-java/java-config')
| -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 |
3 files changed, 12 insertions, 1 deletions
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 |