[gentoo-commits] proj/java:master commit in: dev-java/cacao/

["Andrew John Hughes" <gnu_andrew@member.fsf.org>]

commit:     f4c194fb8fdfe5f213ac701f4d3e24ff58031e63
Author:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
AuthorDate: Wed Jul  8 19:20:03 2015 +0000
Commit:     Andrew John Hughes <gnu_andrew <AT> member <DOT> fsf <DOT> org>
CommitDate: Wed Jul  8 19:20:03 2015 +0000
URL:        https://gitweb.gentoo.org/proj/java.git/commit/?id=f4c194fb

Add use of EPREFIX and get_libdir to CACAO ebuild.

Package-Manager: portage-2.2.17
Manifest-Sign-Key: 35964222

 dev-java/cacao/ChangeLog             |  4 ++++
 dev-java/cacao/Manifest              | 10 +++++-----
 dev-java/cacao/cacao-1.6.0-r2.ebuild | 19 ++++++++++---------
 3 files changed, 19 insertions(+), 14 deletions(-)

diff --git a/dev-java/cacao/ChangeLog b/dev-java/cacao/ChangeLog
index d62bca7..44d56b7 100644
--- a/dev-java/cacao/ChangeLog
+++ b/dev-java/cacao/ChangeLog
@@ -2,6 +2,10 @@
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
 # $Header: /var/cvsroot/gentoo-x86/dev-java/cacao/ChangeLog,v 1.22 2012/06/14 21:25:44 radhermit Exp $
 
+  08 Jul 2015; Andrew John Hughes <gnu_andrew@member.fsf.org>
+  cacao-1.6.0-r2.ebuild:
+  Add use of EPREFIX and get_libdir to CACAO ebuild.
+
 *cacao-1.6.0-r2 (08 Jul 2015)
 
   08 Jul 2015; Andrew John Hughes <gnu_andrew@member.fsf.org>

diff --git a/dev-java/cacao/Manifest b/dev-java/cacao/Manifest
index 63f243f..c1a7afc 100644
--- a/dev-java/cacao/Manifest
+++ b/dev-java/cacao/Manifest
@@ -6,13 +6,13 @@ AUX javac.in 1739 SHA256 3bb23cff0a6e5a7a820e19cce4b9b0f51a7b84ee9e0eeb048b463a5
 AUX support-7.patch 668 SHA256 fefe2435f0471bb097d99c932b80d4dc74bb2646dd3f3f74140f69fbc3e8043a SHA512 f170eab7242f0400a520ccdfee70a2dda7c5393613edeccf512fbc6a3064de71a030165eb51f0164d04a7964ca612ca0728eb8c59d9de8e11f5f93fa6289bb81 WHIRLPOOL f6d7d81139791e6a068fd634ae5017bd437f1c71309e79f8f5ccf2c432eae3533714fc3ad21cf173e5e815515b25156241d5c64bc8f1b8291a0f1cf53ba52983
 AUX system-boehm-gc.patch 847 SHA256 b3b04dbfbc31e83f46fdc3e80391730e54866bce010148b86ae4f4a97717aece SHA512 1329bb10a0297e2182b6628148437779bcd4fb079759e602fa6388154ff5b88a06623d1ee246156f75b7ecaea29c72a884a5cc3ea34c1d516f3a84ee1b6c1d59 WHIRLPOOL 28fa685b5624058529410bbce7cba7822f7c4c51a784dd284e2b0b2a02e52175122fe059a62d218aad96d1c8f2a355996df0c693e64c00e2bbb46c0f7423f270
 DIST cacao-1.6.0.tar.gz 4434778 SHA256 f68658f04d51c690cfc21f21998c22f738b84b7fd408666afe82e8087fbcc843 SHA512 a0b7c88254ee9a0160fdc5022714e339541c0631b1f9f15a4eba7c90aa5ea469ce19e1bc015c8abe0b1925337b767b5fa0480ad062fc3e3d3d3c3c580b05bd9b WHIRLPOOL 85fcb8124c02ef34b3ea696402e93a90ca86f9e33d003db705fe0fa279d7276452f08a78119148202df0e0c42c0f645ee831134c4b13869ee795bd7cab8e8b63
-EBUILD cacao-1.6.0-r2.ebuild 3441 SHA256 53f5ae4bb6b56d5e65a6c28e7374bdc78e04216f29c5f06759cc5712e036f65f SHA512 9fefde9d2f5ed6c4c8fda90c0d92f4d12120babdf7139becede2c8f778ac384221d60df016348a01d6b164d3b29d07b019ecf0b81b66118d26d13689ac34ca93 WHIRLPOOL 4123d9e8ed1483fa0d7d38faafec8aa576c90c820f1e39bbeb0b0ca0d4ce482f373e797bfdd738a20a7b188129f07fde264a09b5ee61f6215ced4e40f189d09a
-MISC ChangeLog 3749 SHA256 1e7c94d5438bdf6cea48cc25017ad8168513e11806987fb9cff24a191fd2b8c2 SHA512 667448008732ec2177244983e0ffcd1bda5d056cd94c60194ac3b8a1764dfe780727dd31978d9b73b879a5b3651ef1b9d20a8217daae83013bc9dace582db6fc WHIRLPOOL 593beae549430108a03d71ccf7540ce23fdfcea6164379b111510009e35f2c02000dde85e130473c7ce22631fb94901ba42963ca8332259347a130def90cb6d8
+EBUILD cacao-1.6.0-r2.ebuild 3543 SHA256 544a4f4d08389c2f166a0115d7abf56daff30b24f3ab8518206256992becb182 SHA512 f9b555cc8e32f7eb060c15ba7414b795ad2349b26b2c8fa656a22c856c36892c3da5b046cb6fd3824370300c339e5473d67176fdeed0012a4bc04e9a5b8a9465 WHIRLPOOL 9fe1a893b76a7eec05647d6f333da9d344400b6d70721a17a8f8291853a36b0f8a9f5a670220fbaca375a9d72e67000e508a558742e89fb534fcf6993539975b
+MISC ChangeLog 3890 SHA256 30f5aea8f8832ea917cb835e70addc0f87b6a3e762d736e0abca3124a8a08ffc SHA512 fa6d598f799e070f4a4e3444f8c9b703318a1c34e11b0d43967d67b2e2c7e866260552ea02f25d717e038541fdd3a8f48c3c0b936d4dbd5c4257643e22880901 WHIRLPOOL e123bf9a41fda3f16bbad3960834b83804855fb6e518b19e4dff702144ed0afbbce56640c71370587fab3d75daa17fadc9f0eed16b1392d4273f396b99afb5ff
 MISC metadata.xml 364 SHA256 4d63397a708380d2d8dbd5c15b9a246c4edb9d63cf630a06d16c3533ad17ab66 SHA512 d5ef277e6ceea9305e15e8ccacd2f99f678c961a4667bec15b7980d2d38d0d1dfa99e518937a821cda6cc60737286e121be77a090182e694cda4ff3ea5666757 WHIRLPOOL cf485290f09ec9369f66269a5e84ad28305cec43a02ffb52a75661fba4737ca929df96d8ef1ee3d373faffa76f1bcd297d9e109d9726e7459f9a4adaa47438bf
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EARYIAAYFAlWda88ACgkQz9oPmzWWQiKJ+gEAn/7DfcQ1ORS8Ei3QzL8i2fdM
-BRscYnVPZg0mejpf0QUBAO0mHbrnq+y+m+EM4tjJB35hiCp6HC9dvSGnnzocDisJ
-=Sadv
+iF4EARYIAAYFAlWdd+MACgkQz9oPmzWWQiKXSgD+LQ32aJkCUWBPAPYvjCCeY4M5
+QbL0ZBu5FcKxZP3u2AkBAIjt97rsWPcbKNtBsq5Tre0bZ66NCyWWwyrXVYElyCAL
+=BxWv
 -----END PGP SIGNATURE-----

diff --git a/dev-java/cacao/cacao-1.6.0-r2.ebuild b/dev-java/cacao/cacao-1.6.0-r2.ebuild
index 63dc516..91c60cc 100644
--- a/dev-java/cacao/cacao-1.6.0-r2.ebuild
+++ b/dev-java/cacao/cacao-1.6.0-r2.ebuild
@@ -43,12 +43,12 @@ src_configure() {
 	unset JAVAC
 	append-flags -fno-strict-aliasing
 	econf --bindir=/usr/libexec/${PN} \
-		--libdir=/usr/lib/${PN} \
-		--datarootdir=/usr/share/${PN} \
+		--libdir="${EPREFIX}"/usr/$(get_libdir)/${PN} \
+		--datarootdir="${EPREFIX}"/usr/share/${PN} \
 		--disable-dependency-tracking \
-		--with-java-runtime-library-prefix=/usr \
-		--with-jni_h=/usr/include/classpath \
-		--with-jni_md_h=/usr/include/classpath
+		--with-java-runtime-library-prefix="${EPREFIX}"/usr \
+		--with-jni_h="${EPREFIX}"/usr/include/classpath \
+		--with-jni_md_h="${EPREFIX}"/usr/include/classpath
 }
 
 src_compile() {
@@ -56,8 +56,9 @@ src_compile() {
 }
 
 src_install() {
+	local libdir=$(get_libdir)
 	local CLASSPATH_DIR=/usr/libexec/gnu-classpath
-	local JDK_DIR=/usr/$(get_libdir)/${PN}-jdk
+	local JDK_DIR=/usr/${libdir}/${PN}-jdk
 
 	emake DESTDIR="${D}" install || die "make install failed"
 	dodir /usr/bin
@@ -93,9 +94,9 @@ src_install() {
 	[ ${ARCH} == x86_64 ] && libarch="amd64"
 	dodir ${JDK_DIR}/jre/lib/${libarch}/client
 	dodir ${JDK_DIR}/jre/lib/${libarch}/server
-	dosym /usr/lib/${PN}/libjvm.so ${JDK_DIR}/jre/lib/${libarch}/client/libjvm.so
-	dosym /usr/lib/${PN}/libjvm.so ${JDK_DIR}/jre/lib/${libarch}/server/libjvm.so
-	dosym /usr/$(get_libdir)/classpath/libjawt.so ${JDK_DIR}/jre/lib/${libarch}/libjawt.so
+	dosym /usr/${libdir}/${PN}/libjvm.so ${JDK_DIR}/jre/lib/${libarch}/client/libjvm.so
+	dosym /usr/${libdir}/${PN}/libjvm.so ${JDK_DIR}/jre/lib/${libarch}/server/libjvm.so
+	dosym /usr/${libdir}/classpath/libjawt.so ${JDK_DIR}/jre/lib/${libarch}/libjawt.so
 	set_java_env
 
 	# Can't use java-vm_set-pax-markings as doesn't work with symbolic links