[gentoo-commits] repo/gentoo:master commit in: dev-java/gcj-jdk/, dev-java/gcj-jdk/files/

[James Le Cuirot]

commit:     5bdaba55c74006e658e44e396e31a1a62b440698
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Tue Jun 27 12:44:30 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Tue Jun 27 12:45:34 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bdaba55

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

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 dev-java/gcj-jdk/files/gcj-jdk.env.sh                              | 4 ++--
 dev-java/gcj-jdk/{gcj-jdk-5.4.0.ebuild => gcj-jdk-5.4.0-r1.ebuild} | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/dev-java/gcj-jdk/files/gcj-jdk.env.sh 
b/dev-java/gcj-jdk/files/gcj-jdk.env.sh
index 97ef10ed596..ff967fa2c1c 100644
--- 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 13821c4840e..c56dd496f7c 100644
--- 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/";