amd64 stable, bug #194711. Added quotes, still missing from older soon to be removed versions.

(Portage version: 2.1.3.12)

4 files changed, 17 insertions, 11 deletions

diff --git a/dev-java/sun-jre-bin/ChangeLog b/dev-java/sun-jre-bin/ChangeLog
index 4934dec54faf..0e5673a93eb2 100644
--- a/dev-java/sun-jre-bin/ChangeLog
+++ b/dev-java/sun-jre-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-java/sun-jre-bin
 # Copyright 2000-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.112 2007/10/05 10:35:53 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/ChangeLog,v 1.113 2007/10/12 00:14:43 wltjr Exp $
+
+  12 Oct 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  sun-jre-bin-1.4.2.16.ebuild, sun-jre-bin-1.5.0.13.ebuild,
+  sun-jre-bin-1.6.0.03.ebuild:
+  amd64 stable, bug #194711. Added quotes, still missing from older soon to be
+  removed versions.
 
   05 Oct 2007; Petteri Räty <betelgeuse@gentoo.org>
   sun-jre-bin-1.4.2.16.ebuild, sun-jre-bin-1.5.0.13.ebuild,
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.16.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.16.ebuild
index 3dd87621dc43..f371885c6f39 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.16.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.16.ebuild,v 1.3 2007/10/05 10:35:53 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.4.2.16.ebuild,v 1.4 2007/10/12 00:14:43 wltjr Exp $
 
 inherit eutils pax-utils java-vm-2
 
@@ -57,8 +57,8 @@ src_unpack() {
 	./install.sfx || die
 	rm install.sfx
 
-	if [ -f ${S}/lib/unpack ]; then
-		UNPACK_CMD=${S}/lib/unpack
+	if [ -f "${S}"/lib/unpack ]; then
+		UNPACK_CMD="${S}"/lib/unpack
 		chmod +x $UNPACK_CMD
 		sed -i 's#/tmp/unpack.log#/dev/null\x00\x00\x00\x00\x00\x00#g' $UNPACK_CMD
 		local PACKED_JARS="lib/rt.jar lib/jsse.jar lib/charsets.jar \
@@ -67,7 +67,7 @@ src_unpack() {
 			PACK_FILE=${S}/`dirname $i`/`basename $i .jar`.pack
 			if [ -f ${PACK_FILE} ]; then
 				echo "	unpacking: $i"
-				$UNPACK_CMD ${PACK_FILE} ${S}/$i
+				$UNPACK_CMD ${PACK_FILE} "${S}"/$i
 				rm -f ${PACK_FILE}
 			fi
 		done
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.13.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.13.ebuild
index 180ec947f560..a90d1080b44f 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.13.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.13.ebuild,v 1.3 2007/10/05 10:35:53 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.5.0.13.ebuild,v 1.4 2007/10/12 00:14:43 wltjr Exp $
 
 inherit pax-utils eutils java-vm-2
 
@@ -17,7 +17,7 @@ SRC_URI="x86? ( http://download.java.net/dlj/binaries/${X86_AT} )
 		amd64? ( http://download.java.net/dlj/binaries/${AMD64_AT} )"
 SLOT="1.5"
 LICENSE="dlj-1.1"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 RESTRICT="strip"
 IUSE="X alsa nsplugin"
 
@@ -56,7 +56,7 @@ src_unpack() {
 src_install() {
 	# Set PaX markings on all JDK/JRE executables to allow code-generation on
 	# the heap by the JIT compiler.
-	pax-mark m $(list-paxables ${S}/bin/*)
+	pax-mark m $(list-paxables "${S}"/bin/*)
 
 	local dirs="bin lib man"
 	# only X86 has the plugin and javaws
diff --git a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.03.ebuild b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.03.ebuild
index 54b89434609c..ead9820498e1 100644
--- a/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.03.ebuild
+++ b/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.03.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.03.ebuild,v 1.3 2007/10/05 10:35:53 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jre-bin/sun-jre-bin-1.6.0.03.ebuild,v 1.4 2007/10/12 00:14:43 wltjr Exp $
 
 inherit versionator pax-utils eutils java-vm-2
 
@@ -22,7 +22,7 @@ SRC_URI="x86? ( ${URL_BASE}/${X86_AT} )
 		amd64? ( ${URL_BASE}/${AMD64_AT} )"
 SLOT="1.6"
 LICENSE="dlj-1.1"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 RESTRICT="strip"
 IUSE="X alsa nsplugin"
 
@@ -65,7 +65,7 @@ src_install() {
 
 	# Set PaX markings on all JDK/JRE executables to allow code-generation on
 	# the heap by the JIT compiler.
-	pax-mark m $(list-paxables ${S}/bin/*)
+	pax-mark m $(list-paxables "${S}"/bin/*)
 
 	# only X86 has the plugin and javaws
 	use x86 && dirs="${dirs} javaws plugin"