Fix for Prefix, add amd64 FreeBSD support (~x64-freebsd Prefix arch), transferred Prefix keywords

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

3 files changed, 60 insertions, 27 deletions

diff --git a/dev-java/diablo-jdk/ChangeLog b/dev-java/diablo-jdk/ChangeLog
index cbf625405c40..b19e4cee2c2f 100644
--- a/dev-java/diablo-jdk/ChangeLog
+++ b/dev-java/diablo-jdk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/diablo-jdk
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/ChangeLog,v 1.12 2011/05/21 04:29:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/ChangeLog,v 1.13 2011/12/15 21:30:13 grobian Exp $
+
+  15 Dec 2011; Fabian Groffen <grobian@gentoo.org>
+  diablo-jdk-1.6.0.07.02.ebuild:
+  Fix for Prefix, add amd64 FreeBSD support (~x64-freebsd Prefix arch),
+  transferred Prefix keywords
 
   21 May 2011; Samuli Suominen <ssuominen@gentoo.org>
   diablo-jdk-1.6.0.07.02.ebuild:
diff --git a/dev-java/diablo-jdk/Manifest b/dev-java/diablo-jdk/Manifest
index f6a78399dd6b..268cbe0337b3 100644
--- a/dev-java/diablo-jdk/Manifest
+++ b/dev-java/diablo-jdk/Manifest
@@ -1,15 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA1
 
 AUX diablo-jdk-1.6.env 936 RMD160 f629a52590863932c59d5f77618c41da4af69cbb SHA1 8344c550f1d704aed539e3a9b0862185d09cdc39 SHA256 fc220b5ee5ed61dc3eefb9c734987fec7ca4f5a41f46699f3a873f6b795d2aef
+DIST diablo-caffe-freebsd7-amd64-1.6.0_07-b02.tar.bz2 62778916 RMD160 4846f0cb7c6b78d70c30da78c9645322dc158373 SHA1 35a351c7f679192da88d4f28b0c8fdccff99bd78 SHA256 09f9fb014779f1e02456d51692c61902125800830b82078be9eac95190343109
 DIST diablo-caffe-freebsd7-i386-1.6.0_07-b02.tar.bz2 64093245 RMD160 6a4b354ba556fe00aa260da7e6f269de6d894010 SHA1 8046dc67cff191a0779b8d9a297bf30b902a89c8 SHA256 971a537f8e852166fa94a9666b14e2f0a8ee51dcf7a470ab7bcb5be0dba05409
-EBUILD diablo-jdk-1.6.0.07.02.ebuild 3928 RMD160 09aa7d955a7f75438721fe7d1b85f5918119b15e SHA1 0f551ed07513cbc9ce3d5aafd5377227788eba69 SHA256 b470bec99abf6482a696b794ea5dbe14061535df1210345d8e1b8c55b76fa8ab
-MISC ChangeLog 2062 RMD160 98a65e8a88e603650c693291df6eca071008ec10 SHA1 e3cf70589c9fcec3dc2412eb1b50a09cad7bbcf3 SHA256 af0da2ccf06cbba138df9d770ae9b3ebff2ad81220bcc4120ae641e4ae810635
+EBUILD diablo-jdk-1.6.0.07.02.ebuild 4795 RMD160 218c96931d75af4ce5d462b7c763bb5e0c480de9 SHA1 7e587438924b8f33dc550e576eb0b90b1a68d5cb SHA256 14d29dbf4561f9a4e7e11c199b8326f784a0d80b5cd2ff4cd4b806e857525ea6
+MISC ChangeLog 2247 RMD160 ef8d940312a2bae75c6534493a996cc9a1386009 SHA1 de5b2ee5dada3546198d5e9f4fed1371d0fea310 SHA256 bebce8b3120350b1f6859db096f014876337bd3e6579334c49d8a8d4808b6dcd
 MISC metadata.xml 291 RMD160 c570e537e8b928defbd6d022001303ce2ef84a7a SHA1 08a03decf6a506afc76730be9b41a6fbb5a989b6 SHA256 e70edd2620f9a7e711b53d0cbe677a7b78268f2e859d9d2567c9c11c13008ceb
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (Darwin)
 
-iF4EAREIAAYFAk3XP1EACgkQXkR9YqOcLPEpKgD9GsB1UQlfq6LfhngbwEr2rro2
-sWfC6sDlfLXGUCpoUEAA/AtKFYfLoTJ7XIaibPlxUiNlMzOGG4QLDVCwVLwPIm84
-=Z27u
+iEYEARECAAYFAk7qZuoACgkQX3X2B8XHTonooACeIH6Kj1pT3hUjr5mTEze4qW69
+UPwAn01MrABh253E5svHo2lgbRq8tNcJ
+=zqja
 -----END PGP SIGNATURE-----
diff --git a/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild b/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild
index 51bee6828a69..22dcae13baf4 100644
--- a/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild
+++ b/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild,v 1.3 2011/05/21 04:29:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/diablo-jdk/diablo-jdk-1.6.0.07.02.ebuild,v 1.4 2011/12/15 21:30:13 grobian Exp $
+
+EAPI="3"
 
 inherit java-vm-2 eutils versionator
 
@@ -9,13 +11,14 @@ HOMEPAGE="http://www.FreeBSDFoundation.org/downloads/java.shtml"
 MY_PV=$(replace_version_separator 3 '_')
 MY_PVL=$(get_version_component_range 1-3)
 
-javafile="diablo-caffe-freebsd7-i386-$(replace_version_separator 4 '-b' ${MY_PV}).tar.bz2"
+javafile32="diablo-caffe-freebsd7-i386-$(replace_version_separator 4 '-b' ${MY_PV}).tar.bz2"
+javafile64="diablo-caffe-freebsd7-amd64-$(replace_version_separator 4 '-b' ${MY_PV}).tar.bz2"
 
-SRC_URI="$javafile"
+SRC_URI="x86-fbsd? ( ${javafile32} ) amd64-fbsd? ( ${javafile64} )"
 
 LICENSE="sun-bcla-java-vm"
 SLOT="1.6"
-KEYWORDS="-* ~x86-fbsd"
+KEYWORDS="-* ~x86-fbsd ~x64-freebsd ~x86-freebsd"
 RESTRICT="fetch"
 IUSE="X examples nsplugin jce"
 
@@ -33,7 +36,7 @@ RDEPEND="X? ( x11-libs/libICE
 				x11-libs/libXt
 				x11-libs/libXtst
 			)
-		>=sys-freebsd/freebsd-lib-7
+		!prefix? ( >=sys-freebsd/freebsd-lib-7 )
 		${DEPEND}"
 
 JAVA_PROVIDE="jdbc-stdext jdbc-rowset"
@@ -51,7 +54,7 @@ src_install() {
 	dodir /opt/${P}
 
 	for i in $dirs ; do
-		cp -pPR $i "${D}"/opt/${P}/ || die "failed to build"
+		cp -pPR $i "${ED}"/opt/${P}/ || die "failed to build"
 	done
 
 	dodoc COPYRIGHT README.html
@@ -59,28 +62,31 @@ src_install() {
 
 	dodir /opt/${P}/share/
 
-	cp -pPR src.zip "${D}"/opt/${P}/share/
+	cp -pPR src.zip "${ED}"/opt/${P}/share/
 
 	if use examples; then
-		cp -pPR demo "${D}"/opt/${P}/share/
-		cp -pRR sample "${D}"/opt/${P}/share/
+		cp -pPR demo "${ED}"/opt/${P}/share/
+		cp -pRR sample "${ED}"/opt/${P}/share/
 	fi
 
 	if use jce ; then
-		cd "${D}"/opt/${P}/jre/lib/security
+		cd "${ED}"/opt/${P}/jre/lib/security
 		dodir /opt/${P}/jre/lib/security/strong-jce
-		mv "${D}"/opt/${P}/jre/lib/security/US_export_policy.jar "${D}"/opt/${P}/jre/lib/security/strong-jce
-		mv "${D}"/opt/${P}/jre/lib/security/local_policy.jar "${D}"/opt/${P}/jre/lib/security/strong-jce
+		mv "${ED}"/opt/${P}/jre/lib/security/US_export_policy.jar "${ED}"/opt/${P}/jre/lib/security/strong-jce
+		mv "${ED}"/opt/${P}/jre/lib/security/local_policy.jar "${ED}"/opt/${P}/jre/lib/security/strong-jce
 		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/US_export_policy.jar /opt/${P}/jre/lib/security/
 		dosym /opt/sun-jce-bin-1.6.0/jre/lib/security/unlimited-jce/local_policy.jar /opt/${P}/jre/lib/security/
 	fi
 
+	local arch=i386
+	use amd64-fbsd && arch=amd64
+
 	if use nsplugin; then
-		install_mozilla_plugin /opt/${P}/jre/plugin/i386/ns7/libjavaplugin_oji.so
+		install_mozilla_plugin /opt/${P}/jre/plugin/${arch}/ns7/libjavaplugin_oji.so
 	fi
 
 	# Change libz.so.4 to libz.so.1
-	scanelf -qR -N libz.so.4 -F "#N" "${D}"/opt/${P}/ | \
+	scanelf -qR -N libz.so.4 -F "#N" "${ED}"/opt/${P}/ | \
 		while read i; do
 		if [[ $(strings "$i" | fgrep -c libz.so.4) -ne 1 ]]; then
 			export SANITY_CHECK_LIBZ_FAILED=1
@@ -90,18 +96,39 @@ src_install() {
 	done
 	[[ "$SANITY_CHECK_LIBZ_FAILED" = "1" ]] && die "failed to change libz.so.4 to libz.so.1"
 
+	if [[ -n ${EPREFIX} ]] ; then
+		# create wrappers such that we can set LD_LIBRARY_PATH because all
+		# objects are created without RPATH we could tamper with :(
+		local d bin
+		for d in "${ED}"/opt/${P}/bin "${ED}"/opt/${P}/jre/bin ; do
+			cd "${d}" || die
+			mkdir real-bins || die
+			for bin in * ; do
+				[[ ${bin} == real-bins ]] && continue
+				mv ${bin} real-bins/ || die
+				cat > ${bin} <<- _EOD
+					#!${EPREFIX}/bin/sh
+
+					export LD_LIBRARY_PATH="\${LD_LIBRARY_PATH}\${LD_LIBRARY_PATH+:}${EPREFIX}/lib"
+					exec /${d#${D}}/real-bins/${bin} "\$@"
+				_EOD
+				chmod 755 ${bin}
+			done
+		done
+	fi
+
 	# create dir for system preferences
 	dodir /opt/${P}/jre/.systemPrefs
 	# Create files used as storage for system preferences.
-	touch "${D}"/opt/${P}/jre/.systemPrefs/.system.lock
-	chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.system.lock
-	touch "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
-	chmod 644 "${D}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
+	touch "${ED}"/opt/${P}/jre/.systemPrefs/.system.lock
+	chmod 644 "${ED}"/opt/${P}/jre/.systemPrefs/.system.lock
+	touch "${ED}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
+	chmod 644 "${ED}"/opt/${P}/jre/.systemPrefs/.systemRootModFile
 
 	# install control panel for Gnome/KDE
 	sed -e "s/INSTALL_DIR\/JRE_NAME_VERSION/\/opt\/${P}\/jre/" \
 		-e "s/\(Name=Java\)/\1 Control Panel ${SLOT}/" \
-		"${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
+		"${ED}"/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
 		"${T}"/sun_java-${SLOT}.desktop
 
 	domenu "${T}"/sun_java-${SLOT}.desktop