commit: 39ba239bd06a34be6ff5975204866f6b4d724fce Author: Florian Schmaus <flow <AT> gentoo <DOT> org> AuthorDate: Fri Nov 17 07:40:11 2023 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Fri Nov 17 07:42:12 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39ba239b
dev-java/java-config: add java-config→java-config-2 compatibility symlink Closes: https://bugs.gentoo.org/917458 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> .../{java-config-2.3.3.ebuild => java-config-2.3.3-r1.ebuild} | 3 +++ dev-java/java-config/java-config-9999.ebuild | 3 +++ profiles/package.mask | 5 ----- 3 files changed, 6 insertions(+), 5 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 similarity index 94% rename from dev-java/java-config/java-config-2.3.3.ebuild rename to dev-java/java-config/java-config-2.3.3-r1.ebuild index a4dc516e9ab8..b63dbff8d490 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 a4dc516e9ab8..b63dbff8d490 100644 --- a/dev-java/java-config/java-config-9999.ebuild +++ b/dev-java/java-config/java-config-9999.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/profiles/package.mask b/profiles/package.mask index 75869b8856b7..13795b317928 100644 --- a/profiles/package.mask +++ b/profiles/package.mask @@ -33,11 +33,6 @@ #--- END OF EXAMPLES --- -# Sam James <[email protected]> (2023-11-17) -# Missing 'java-config' symlink to 'java-config-2', breaking Java eclasses -# at least. See bug #917458. -=dev-java/java-config-2.3.3 - # Arthur Zamarin <[email protected]> (2023-11-10) # No reverse dependencies, no tests, no upstream activity. All ebuild # maintenance on this package was done randomly by @python project members,
