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, 14 deletions

diff --git a/app-emulation/emul-linux-x86-java/ChangeLog b/app-emulation/emul-linux-x86-java/ChangeLog
index df39aefba5b7..9a37c8c21848 100644
--- a/app-emulation/emul-linux-x86-java/ChangeLog
+++ b/app-emulation/emul-linux-x86-java/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/emul-linux-x86-java
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.40 2007/10/04 13:20:34 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/ChangeLog,v 1.41 2007/10/12 00:22:07 wltjr Exp $
+
+  12 Oct 2007; William L. Thomson Jr. <wltjr@gentoo.org>
+  emul-linux-x86-java-1.4.2.03-r2.ebuild,
+  emul-linux-x86-java-1.5.0.13.ebuild, emul-linux-x86-java-1.6.0.03.ebuild:
+  amd64 stable, bug #194711. Added quotes, still missing from older soon to be
+  removed versions.
 
 *emul-linux-x86-java-1.6.0.03 (04 Oct 2007)
 *emul-linux-x86-java-1.5.0.13 (04 Oct 2007)
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r2.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r2.ebuild
index 6fd1f24e35dd..199249145028 100644
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r2.ebuild
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r2.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/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r2.ebuild,v 1.6 2007/08/17 10:18:50 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.4.2.03-r2.ebuild,v 1.7 2007/10/12 00:22:07 wltjr Exp $
 
 inherit multilib java-vm-2 versionator
 
@@ -95,7 +95,7 @@ src_install() {
 
 	dodir /opt/java32
 
-	cp -pPR ${S}/{bin,lib,man,plugin,javaws} ${JAVAHOME} || die "failed to copy"
+	cp -pPR "${S}"/{bin,lib,man,plugin,javaws} ${JAVAHOME} || die "failed to copy"
 
 	dodoc COPYRIGHT README
 	dohtml README.html
@@ -105,7 +105,7 @@ src_install() {
 		install_mozilla_plugin /opt/java32/plugin/i386/mozilla/libjavaplugin_oji.so
 	fi
 
-	sed -i "s/standard symbols l/symbol/g" ${D}/opt/java32/lib/font.properties
+	sed -i "s/standard symbols l/symbol/g" "${D}"/opt/java32/lib/font.properties
 
 	find ${JAVAHOME} -type f -name "*.so" -exec chmod +x \{\} \;
 
@@ -115,7 +115,7 @@ src_install() {
 	# to use the native 64bit jre and cause 2 minute startup...
 	dodir /usr/$(get_libdir)/openoffice/share/config
 	insinto /usr/$(get_libdir)/openoffice/share/config
-	doins ${FILESDIR}/javasettings_Linux_x86.xml
+	doins "${FILESDIR}"/javasettings_Linux_x86.xml
 
 	set_java_env
 }
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.13.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.13.ebuild
index 6c1fe38d90e7..c097bfe32a99 100644
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.13.ebuild
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-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/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.13.ebuild,v 1.1 2007/10/04 13:20:34 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.5.0.13.ebuild,v 1.2 2007/10/12 00:22:07 wltjr Exp $
 
 inherit pax-utils eutils java-vm-2
 
@@ -14,7 +14,7 @@ SRC_URI="http://download.java.net/dlj/binaries/${At}"
 
 SLOT="1.5"
 LICENSE="dlj-1.1"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 RESTRICT="strip"
 IUSE="X alsa nsplugin"
 
@@ -38,15 +38,15 @@ src_unpack() {
 	sh ${DISTDIR}/${At} --accept-license --unpack || die "Failed to unpack"
 
 	cd ..
-	bash ${FILESDIR}/construct.sh  bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
+	bash "${FILESDIR}"/construct.sh  bundled-jdk sun-jdk-${PV} ${P} || die "construct.sh failed"
 
-	${S}/bin/java -client -Xshare:dump
+	"${S}"/bin/java -client -Xshare:dump
 }
 
 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/*)
 
 	dodir /opt/${P}
 	cp -pPR bin lib man javaws plugin "${D}/opt/${P}/" || die "failed to copy"
diff --git a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.03.ebuild b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.03.ebuild
index b9f831affa44..678c09b5c20a 100644
--- a/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.03.ebuild
+++ b/app-emulation/emul-linux-x86-java/emul-linux-x86-java-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/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.03.ebuild,v 1.1 2007/10/04 13:20:34 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/emul-linux-x86-java/emul-linux-x86-java-1.6.0.03.ebuild,v 1.2 2007/10/12 00:22:07 wltjr Exp $
 
 inherit versionator pax-utils java-vm-2 eutils
 
@@ -16,7 +16,7 @@ SRC_URI="http://dlc.sun.com/dlj/binaries/${At}"
 
 SLOT="1.6"
 LICENSE="dlj-1.1"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 RESTRICT="strip"
 IUSE="X alsa nsplugin"
 
@@ -42,9 +42,9 @@ src_unpack() {
 	sh ${DISTDIR}/${At} --accept-license --unpack || die "Failed to unpack"
 
 	cd ..
-	bash ${FILESDIR}/construct-${SLOT}.sh  bundled-jdk sun-jdk-${PV} ${P} || die "construct-${SLOT}.sh failed"
+	bash "${FILESDIR}"/construct-${SLOT}.sh  bundled-jdk sun-jdk-${PV} ${P} || die "construct-${SLOT}.sh failed"
 
-	${S}/bin/java -client -Xshare:dump
+	"${S}"/bin/java -client -Xshare:dump
 }
 
 src_install() {