dev-java/gcj-jdk: Fix JAVA_HOME on systems with SYMLINK_LIB="no"

Package-Manager: Portage-2.3.6, Repoman-2.3.2

diff --git a/dev-java/gcj-jdk/files/gcj-jdk.env.sh b/dev-java/gcj-jdk/files/gcj-jdk.env.sh
index 97ef10ed596a1c515703a97f6defdcc6b66b3b2c..ff967fa2c1c7c5f75c2a2156972e7a9c9e9a328f 100644 (file)
--- a/dev-java/gcj-jdk/files/gcj-jdk.env.sh
+++ b/dev-java/gcj-jdk/files/gcj-jdk.env.sh
@@ -2,8 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 VERSION="GCJ ${PV}"
-JAVA_HOME="${EPREFIX}/usr/lib/${P}"
-JDK_HOME="${EPREFIX}/usr/lib/${P}"
+JAVA_HOME="${EPREFIX}/usr/$(get_libdir)/${P}"
+JDK_HOME="${EPREFIX}/usr/$(get_libdir)/${P}"
 JAVAC="\${JAVA_HOME}/bin/javac"
 PATH="\${JAVA_HOME}/bin"
 ROOTPATH="\${JAVA_HOME}/bin"

diff --git a/dev-java/gcj-jdk/gcj-jdk-5.4.0.ebuild b/dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild
similarity index 99%
rename from dev-java/gcj-jdk/gcj-jdk-5.4.0.ebuild
rename to dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild
index 13821c4840e61899ebaf80efe406e2df07fa5148..c56dd496f7c1070ae5c27428e272727cf4389ff5 100644 (file)
--- a/dev-java/gcj-jdk/gcj-jdk-5.4.0.ebuild
+++ b/dev-java/gcj-jdk/gcj-jdk-5.4.0-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit java-vm-2 multilib
+inherit java-vm-2
 
 DESCRIPTION="Java wrappers around GCJ"
 HOMEPAGE="https://www.gentoo.org/"