Fix thinkos that triggered invalid install_names when installing on x64-macos

Package-Manager: portage-2.2.01.21143-prefix/cvs/Darwin i386

3 files changed, 16 insertions, 10 deletions

diff --git a/dev-java/soylatte-jdk-bin/ChangeLog b/dev-java/soylatte-jdk-bin/ChangeLog
index ff6365643cda..61750726eabf 100644
--- a/dev-java/soylatte-jdk-bin/ChangeLog
+++ b/dev-java/soylatte-jdk-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for dev-java/soylatte-jdk-bin
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/soylatte-jdk-bin/ChangeLog,v 1.1 2012/09/29 11:08:58 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/soylatte-jdk-bin/ChangeLog,v 1.2 2012/09/29 17:01:47 grobian Exp $
+
+  29 Sep 2012; Fabian Groffen <grobian@gentoo.org>
+  soylatte-jdk-bin-1.0.3.ebuild:
+  Fix thinkos that triggered invalid install_names when installing on x64-macos
 
 *soylatte-jdk-bin-1.0.3 (29 Sep 2012)
 
diff --git a/dev-java/soylatte-jdk-bin/Manifest b/dev-java/soylatte-jdk-bin/Manifest
index f4e4dbbb6e54..b7409c901adb 100644
--- a/dev-java/soylatte-jdk-bin/Manifest
+++ b/dev-java/soylatte-jdk-bin/Manifest
@@ -4,13 +4,13 @@ Hash: SHA256
 AUX soylatte-jdk-bin-1.6.env 1028 SHA256 43f75010ba68a2bd678c6140f8da99cf902bd20a4f8ab881139ed5b241dc05fc SHA512 f5d63a94d538f83a0235b3223fa1ccc1d32dd7d5ad51754d7557eeb9260a633521ff1da53ccea148e4b8a552692aa788bae5c6ccf67a191e6e573154187f5228 WHIRLPOOL 95c161470ad1333cfc158ba035f2e778c7882bc39284e1a7505d806ba020910584540167d97bb0a2ec35d33e79569fd3393b956807436a6e973535b53e5211e6
 DIST soylatte16-amd64-1.0.3.tar.bz2 53888225 SHA256 749762d742450a8711acd7ba981969c0056e9373b453d3e97c58af07f5f92c60 SHA512 51e3499eb56c3177c3cef9416e265769757fc8e5b8075a5eb1cbde74fd7b64edb0ab64ba2c2e9751fc21f5fae035e6224a60ffff2ab8808e7f9a4d106ac1d071 WHIRLPOOL ec3e01cab1c1ddcb126e34b31a1552b65fbc96282e505f672e1e175e14aa22be348f4d3077b93ae711352eee3cbd37271950c4ab246dad58e775210e79f42f90
 DIST soylatte16-i386-1.0.3.tar.bz2 55567606 SHA256 8f389eb9c19336ce18d864ad600edd692c6994259889646d68c2e66494d67ffc SHA512 e19f9755ffea0de8d397c537264334d473ae5678034bed0a04254dc82d9322ab8ae6ddc158d85713fe19c4e51542c46a06cfc7fe86ce17d278673dbd47be3abc WHIRLPOOL d8b9ae1ca8674135f6dd10aa511ee9606f255fdfa8d72b75e50d30daec39b4645137a6d02b5142020029a6a0ac0f5a766673d7833acb41e59ed29339e55f13aa
-EBUILD soylatte-jdk-bin-1.0.3.ebuild 2882 SHA256 3105217227cdd9c2d14fbc805c64487f940f5f9c889dba80b6f0ce198ea8698e SHA512 878d0463fd48e7386cf55b2454f97d88a789440e4de29df9715c7aca1a9edf205da0929eb7a8569daa2a2ae2b01e306835b8e65d257b3761c1c7aa878a6e689c WHIRLPOOL 82d8225027a7775dae46da18f475d1efe7d0b4b55c31acc42378fb005daf83d75dab7271d3a554d09d6e5b5c17ddef4e6de7555b780d762169f896c3e962fc37
-MISC ChangeLog 470 SHA256 f16250b4ef3a59a8992cd3866fb082a18200a2382c6b7e39689048e0c411fd83 SHA512 b46ab6d8da60d0bbc2f9965d441acff0ff34533bbdd87d1d765aebff6cf39685204919c49fded553df13240b5bff73c33b4b19301fe3b75a5ed8e36f8d1ede13 WHIRLPOOL 83db2f4506d5b6b11e4965d197f58a2aef3d8639f62a0c3b00f5d54edeab3a62d9c101706698d382d3406ae11fc8fa9706eb3f75bb059fef2df9bb67bce933fc
+EBUILD soylatte-jdk-bin-1.0.3.ebuild 2971 SHA256 3e3c885e80cbb5957857b2c697aa995854aa675eadc8abaf7dc491f0fe456d1b SHA512 242cd8a6bcc7677a6dd35d877e260ee170bfc306241238a6468553aca26b14e41225a820b907bc81396d772ed75786f2d41b36649ccc071c826099bfcf8cffca WHIRLPOOL 5c4d18aac75eece5ef28e8c8e2c3eb016339b20909b279e67043c588def1ac109ce36b298f29741b1ad3a6654acdd17f1acf6f88e82671c3c163ff3e8dd8cfc7
+MISC ChangeLog 635 SHA256 edef6ad09c822ebcac131235d6d17998df5a72fe7b3f878caf08403c76a70674 SHA512 2e4ef6e925a736cb266eff21a7c1b1ec3d8b8adb49f9074f98bd950bde9dc61a530394d8817304248892a6240236a2497558035a9aee9c2507b9d65dc6f3b0de WHIRLPOOL 5a3d3cb629b59d262e87fde15af24db75a3eaa7755e4bb9dc6d1ccec09298296019a08479ac06003ba1ab4bb217b7258d19194721e114ed73802780026feaaf1
 MISC metadata.xml 251 SHA256 75bc071e89d08c4dbe941bdd7cb6e3a3b389adc1c3223983322d76d5055c139e SHA512 e854119ec5a06286acdfce8f4967ad1a1759255c446e9540ef0d8c44ce7e1da1336f26f8b45a511fe2f0508a40199f26091f39c707bb40beae2d7e030c78e6af WHIRLPOOL b4b3a391b2152add30f88c3e2e095fe7b741a132955429ac813ea5e35e936ffae4ce265e4eadfc483176b090455e0b99879b7d29fa230b0736f914fca6e66e15
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (Darwin)
 
-iEYEAREIAAYFAlBm1s8ACgkQX3X2B8XHTonZqwCgoZgQeshX31ziJufEjNjKpWlU
-iIIAoJ0ApGXcx87ar6jQSKTaqRlQA5S6
-=4RwM
+iEYEAREIAAYFAlBnKYEACgkQX3X2B8XHTon8+ACfXbuYbDB1A0y+4xyfMc1Y4XwX
+L9gAnA5sCw89d7XnZEFoz6E4DdccTmrD
+=HzC/
 -----END PGP SIGNATURE-----
diff --git a/dev-java/soylatte-jdk-bin/soylatte-jdk-bin-1.0.3.ebuild b/dev-java/soylatte-jdk-bin/soylatte-jdk-bin-1.0.3.ebuild
index d109e8a74afc..2d42ff02c774 100644
--- a/dev-java/soylatte-jdk-bin/soylatte-jdk-bin-1.0.3.ebuild
+++ b/dev-java/soylatte-jdk-bin/soylatte-jdk-bin-1.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/soylatte-jdk-bin/soylatte-jdk-bin-1.0.3.ebuild,v 1.1 2012/09/29 11:08:58 grobian Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/soylatte-jdk-bin/soylatte-jdk-bin-1.0.3.ebuild,v 1.2 2012/09/29 17:01:47 grobian Exp $
 
 EAPI="3"
 
@@ -30,7 +30,9 @@ S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	# fix install_names
-	local original_root=/data/Users/landonf/Documents/Code/Java/javasrc_1_6_jrl_darwin_stable/control/build/bsd-i586
+	local arch=i586
+	use x64-macos && arch=amd64
+	local original_root=/data/Users/landonf/Documents/Code/Java/javasrc_1_6_jrl_darwin_stable/control/build/bsd-${arch}
 	local original_demo=${original_root}/demo
 	local original_lib=${original_root}/lib
 	for dir in demo jre ; do
@@ -53,10 +55,10 @@ src_prepare() {
 							${dynamic_lib}
 					;;
 					libjvm.dylib)
-						# default to client JVM
+						# 64-bits binary has no client, so default to server JVM
 						install_name_tool -change \
 							${linked_against} \
-							"${EPREFIX}"/opt/${P}/jre/lib/$(use x86-macos && echo i386 || echo amd64)/client/libjvm.dylib \
+							"${EPREFIX}"/opt/${P}/jre/lib/$(use x86-macos && echo i386/client || echo amd64/server)/libjvm.dylib \
 							${dynamic_lib}
 					;;
 					*/libodbc*.dylib)