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

(Portage version: 2.1.3.12)

4 files changed, 20 insertions, 15 deletions

diff --git a/dev-java/sun-jdk/ChangeLog b/dev-java/sun-jdk/ChangeLog
index 0cdb67b502e5..a3dd09fe234a 100644
--- a/dev-java/sun-jdk/ChangeLog
+++ b/dev-java/sun-jdk/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for dev-java/sun-jdk
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.218 2007/10/05 10:42:44 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/ChangeLog,v 1.219 2007/10/12 00:34:38 wltjr Exp $
+
+  12 Oct 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  sun-jdk-1.4.2.16.ebuild, sun-jdk-1.5.0.13.ebuild, sun-jdk-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-jdk-1.4.2.16.ebuild:
diff --git a/dev-java/sun-jdk/sun-jdk-1.4.2.16.ebuild b/dev-java/sun-jdk/sun-jdk-1.4.2.16.ebuild
index f10046d1bf8b..7f90c36658d7 100644
--- a/dev-java/sun-jdk/sun-jdk-1.4.2.16.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-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-jdk/sun-jdk-1.4.2.16.ebuild,v 1.3 2007/10/05 10:42:44 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.4.2.16.ebuild,v 1.4 2007/10/12 00:34:38 wltjr Exp $
 
 JAVA_SUPPORTS_GENERATION_1="true"
 inherit pax-utils java-vm-2 eutils
@@ -91,7 +91,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-jdk/sun-jdk-1.5.0.13.ebuild b/dev-java/sun-jdk/sun-jdk-1.5.0.13.ebuild
index c31f925e3225..4264e27181a4 100644
--- a/dev-java/sun-jdk/sun-jdk-1.5.0.13.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-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-jdk/sun-jdk-1.5.0.13.ebuild,v 1.2 2007/10/04 18:32:37 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.5.0.13.ebuild,v 1.3 2007/10/12 00:34:38 wltjr Exp $
 
 inherit versionator java-vm-2 eutils pax-utils
 
@@ -15,7 +15,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 doc examples jce nsplugin"
 
@@ -55,7 +55,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}{,/jre}/bin/*)
+	pax-mark m $(list-paxables "${S}"{,/jre}/bin/*)
 
 	dodir /opt/${P}
 
@@ -109,11 +109,11 @@ src_install() {
 	if [[ -f ${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop ]]; then
 		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 > \
-			${T}/sun_java-${SLOT}.desktop \
+			"${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
+			"${T}"/sun_java-${SLOT}.desktop \
 			|| die "Failed to sed .desktop file"
 
-		domenu ${T}/sun_java-${SLOT}.desktop
+		domenu "${T}"/sun_java-${SLOT}.desktop
 	fi
 
 	# bug #56444
diff --git a/dev-java/sun-jdk/sun-jdk-1.6.0.03.ebuild b/dev-java/sun-jdk/sun-jdk-1.6.0.03.ebuild
index c55ed43752ae..6462cdf7f2e1 100644
--- a/dev-java/sun-jdk/sun-jdk-1.6.0.03.ebuild
+++ b/dev-java/sun-jdk/sun-jdk-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-jdk/sun-jdk-1.6.0.03.ebuild,v 1.2 2007/10/04 18:34:30 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-java/sun-jdk/sun-jdk-1.6.0.03.ebuild,v 1.3 2007/10/12 00:34:38 wltjr Exp $
 
 inherit versionator java-vm-2 eutils pax-utils
 
@@ -20,7 +20,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 doc examples jce nsplugin"
 
@@ -63,7 +63,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}{,/jre}/bin/*)
+	pax-mark m $(list-paxables "${S}"{,/jre}/bin/*)
 
 	dodir /opt/${P}
 
@@ -116,10 +116,10 @@ src_install() {
 		sed -e "s/\(Name=\)Java/\1 Java Control Panel for Sun JDK ${SLOT}/" \
 			-e "s#Exec=.*#Exec=/opt/${P}/jre/bin/ControlPanel#" \
 			-e "s#Icon=.*#Icon=/opt/${P}/jre/plugin/desktop/sun_java.png#" \
-			${D}/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
-			${T}/sun_jdk-${SLOT}.desktop
+			"${D}"/opt/${P}/jre/plugin/desktop/sun_java.desktop > \
+			"${T}"/sun_jdk-${SLOT}.desktop
 
-		domenu ${T}/sun_jdk-${SLOT}.desktop
+		domenu "${T}"/sun_jdk-${SLOT}.desktop
 	fi
 
 	# bug #56444