quote variables that need it

Package-Manager: portage-2.1.3.19

3 files changed, 32 insertions, 28 deletions

diff --git a/app-office/openoffice-bin/ChangeLog b/app-office/openoffice-bin/ChangeLog
index 3a4e9ff34bfb..032bcc3c1f63 100644
--- a/app-office/openoffice-bin/ChangeLog
+++ b/app-office/openoffice-bin/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-office/openoffice-bin
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.181 2007/12/06 07:49:12 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/ChangeLog,v 1.182 2007/12/06 08:13:35 opfer Exp $
+
+  06 Dec 2007; Christian Faulhammer <opfer@gentoo.org>
+  openoffice-bin-2.3.1.ebuild:
+  quote variables that need it
 
   06 Dec 2007; Christian Faulhammer <opfer@gentoo.org>
   openoffice-bin-2.3.1.ebuild:
diff --git a/app-office/openoffice-bin/Manifest b/app-office/openoffice-bin/Manifest
index 0b4b928d86a9..55c3bd45ccf6 100644
--- a/app-office/openoffice-bin/Manifest
+++ b/app-office/openoffice-bin/Manifest
@@ -152,14 +152,14 @@ EBUILD openoffice-bin-2.3.0.ebuild 5439 RMD160 e87ffd13a58bc1447b783e2083062ab12
 MD5 d68f05636c48d2c513b70bc9902bd137 openoffice-bin-2.3.0.ebuild 5439
 RMD160 e87ffd13a58bc1447b783e2083062ab12ed66b65 openoffice-bin-2.3.0.ebuild 5439
 SHA256 a736c395c7246f1f44b161627f81caff3507b742737892b756bf6e2e5836b6b7 openoffice-bin-2.3.0.ebuild 5439
-EBUILD openoffice-bin-2.3.1.ebuild 5444 RMD160 b0540a51c671574c8c2eaf3e9f8896c48ee8b2a6 SHA1 7bfc8bc002cb32dc1d3eeef15e761f8383ca9dfb SHA256 ecb789c293cf3bcdfe945b37b6b8c659d99ac8b91b5862c603c9635f385aefdd
-MD5 ebbd6035cd0069b72ed3070fa0c3afd0 openoffice-bin-2.3.1.ebuild 5444
-RMD160 b0540a51c671574c8c2eaf3e9f8896c48ee8b2a6 openoffice-bin-2.3.1.ebuild 5444
-SHA256 ecb789c293cf3bcdfe945b37b6b8c659d99ac8b91b5862c603c9635f385aefdd openoffice-bin-2.3.1.ebuild 5444
-MISC ChangeLog 33437 RMD160 b8efb4bd3a3f61532bbbfdedb6fb4da0e531fb3f SHA1 86299c2fcb9f259ef851093f49a827536b0704a4 SHA256 10105ffe674e3500ccdc5c593059b0df579b349d69da6f3822968212752036e4
-MD5 3c8f1bd45c03ec9f7127f876edb4455a ChangeLog 33437
-RMD160 b8efb4bd3a3f61532bbbfdedb6fb4da0e531fb3f ChangeLog 33437
-SHA256 10105ffe674e3500ccdc5c593059b0df579b349d69da6f3822968212752036e4 ChangeLog 33437
+EBUILD openoffice-bin-2.3.1.ebuild 5476 RMD160 48d08d905ed4726fa4b6ff6a59eb0ee2351258cf SHA1 7dccee5c1ff67ff9132c7575e0f3e785db6aee03 SHA256 0a138ac8311ca420ee9ef0d5bb17e942bd00e928f972df4219427ad4a18b5cea
+MD5 76e8e5fec187214da3daa327769e4695 openoffice-bin-2.3.1.ebuild 5476
+RMD160 48d08d905ed4726fa4b6ff6a59eb0ee2351258cf openoffice-bin-2.3.1.ebuild 5476
+SHA256 0a138ac8311ca420ee9ef0d5bb17e942bd00e928f972df4219427ad4a18b5cea openoffice-bin-2.3.1.ebuild 5476
+MISC ChangeLog 33555 RMD160 74e4f980b9b5f1b7fce96b1883a7d8625f2bc867 SHA1 b11b33356210e36acd60a1a2533748a8b3a085d7 SHA256 fb564d5ce72ba93af16d952cbbcfe0dbf8a7ceea34f8c3e02a8d9ff63256a786
+MD5 6772c11c32e7bf5ce12303a89831bfcc ChangeLog 33555
+RMD160 74e4f980b9b5f1b7fce96b1883a7d8625f2bc867 ChangeLog 33555
+SHA256 fb564d5ce72ba93af16d952cbbcfe0dbf8a7ceea34f8c3e02a8d9ff63256a786 ChangeLog 33555
 MISC metadata.xml 460 RMD160 acd4457511555ead7fbc5fe5297eff6a6e01bed7 SHA1 09559b952ad283bf009bb78cca9bc125c644a977 SHA256 9160d9de32e063130943805fe72d9bb196700524a54a54cf1769a740ecd9183d
 MD5 7134ec08f56019fc5db7f3e84acea4df metadata.xml 460
 RMD160 acd4457511555ead7fbc5fe5297eff6a6e01bed7 metadata.xml 460
@@ -173,7 +173,7 @@ SHA256 8ca6c901a7f14a6971708067a00d2017b73f38062962d93e0774dcc462b90d85 files/di
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.7 (GNU/Linux)
 
-iD8DBQFHV6oYNQqtfCuFneMRAtmOAJ4pxgEFTpHYFyuJvTUZDC2XBckmkgCgmT77
-7J/Key+jny5R/C6XLVXUEHc=
-=+8gN
+iD8DBQFHV7AfNQqtfCuFneMRAvPAAKCPcEoyoY4HO+y5nKQLSSDGjYLYyQCffFwn
+ti2AfV7KGuHKmYOB1d0oxmo=
+=sDDa
 -----END PGP SIGNATURE-----
diff --git a/app-office/openoffice-bin/openoffice-bin-2.3.1.ebuild b/app-office/openoffice-bin/openoffice-bin-2.3.1.ebuild
index 7e704e8adfb3..a8fc829c852e 100644
--- a/app-office/openoffice-bin/openoffice-bin-2.3.1.ebuild
+++ b/app-office/openoffice-bin/openoffice-bin-2.3.1.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-office/openoffice-bin/openoffice-bin-2.3.1.ebuild,v 1.2 2007/12/06 07:49:12 opfer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-office/openoffice-bin/openoffice-bin-2.3.1.ebuild,v 1.3 2007/12/06 08:13:35 opfer Exp $
 
 inherit eutils fdo-mime rpm multilib
 
@@ -60,14 +60,14 @@ src_unpack() {
 	unpack ${A}
 
 	for i in base calc core01 core02 core03 core03u core04 core04u core05 core05u core06 core07 core08 core09 core10 draw emailmerge graphicfilter headless impress math pyuno testtool writer xsltfilter ; do
-		rpm_unpack ${S}/openoffice.org-${i}-${MY_PV3}.i586.rpm
+		rpm_unpack "${S}/openoffice.org-${i}-${MY_PV3}.i586.rpm"
 	done
 
-	rpm_unpack ${S}/desktop-integration/openoffice.org-freedesktop-menus-2.3-9238.noarch.rpm
+	rpm_unpack "${S}/desktop-integration/openoffice.org-freedesktop-menus-2.3-9238.noarch.rpm"
 
-	use gnome && rpm_unpack ${S}/openoffice.org-gnome-integration-${MY_PV3}.i586.rpm
-	use kde && rpm_unpack ${S}/openoffice.org-kde-integration-${MY_PV3}.i586.rpm
-	use java && rpm_unpack ${S}/openoffice.org-javafilter-${MY_PV3}.i586.rpm
+	use gnome && rpm_unpack "${S}/openoffice.org-gnome-integration-${MY_PV3}.i586.rpm"
+	use kde && rpm_unpack "${S}/openoffice.org-kde-integration-${MY_PV3}.i586.rpm"
+	use java && rpm_unpack "${S}/openoffice.org-javafilter-${MY_PV3}.i586.rpm"
 
 	strip-linguas en ${LANGS}
 
@@ -91,10 +91,10 @@ src_install () {
 
 	einfo "Installing OpenOffice.org into build root..."
 	dodir ${INSTDIR}
-	mv ${WORKDIR}/opt/openoffice.org2.3/* ${D}${INSTDIR}
+	mv "${WORKDIR}"/opt/openoffice.org2.3/* "${D}${INSTDIR}"
 
 	#Menu entries, icons and mime-types
-	cd ${D}${INSTDIR}/share/xdg/
+	cd "${D}${INSTDIR}/share/xdg/"
 
 	for desk in base calc draw impress math printeradmin writer; do
 		mv ${desk}.desktop openoffice.org-2.3-${desk}.desktop
@@ -102,15 +102,15 @@ src_install () {
 		sed -i -e s/openofficeorg23-${desk}/ooo-${desk}/g openoffice.org-2.3-${desk}.desktop || die
 		domenu openoffice.org-2.3-${desk}.desktop
 		insinto /usr/share/pixmaps
-		newins ${WORKDIR}/usr/share/icons/gnome/48x48/apps/openofficeorg23-${desk}.png ooo-${desk}.png
+		newins "${WORKDIR}/usr/share/icons/gnome/48x48/apps/openofficeorg23-${desk}.png" ooo-${desk}.png
 	done
 
 	insinto /usr/share/mime/packages
-	doins ${WORKDIR}/usr/share/mime/packages/openoffice.org.xml
+	doins "${WORKDIR}/usr/share/mime/packages/openoffice.org.xml"
 
 	# Install wrapper script
-	newbin ${FILESDIR}/wrapper.in ooffice
-	sed -i -e s/LIBDIR/$(get_libdir)/g ${D}/usr/bin/ooffice || die
+	newbin "${FILESDIR}/wrapper.in" ooffice
+	sed -i -e s/LIBDIR/$(get_libdir)/g "${D}/usr/bin/ooffice" || die
 
 	# Component symlinks
 	for app in base calc draw impress math writer; do
@@ -121,16 +121,16 @@ src_install () {
 	dosym ${INSTDIR}/program/soffice /usr/bin/soffice
 
 	# Change user install dir
-	sed -i -e s/.openoffice.org2/.ooo-2.0/g ${D}${INSTDIR}/program/bootstraprc || die
+	sed -i -e s/.openoffice.org2/.ooo-2.0/g "${D}${INSTDIR}/program/bootstraprc" || die
 
 	# Non-java weirdness see bug #99366
-	use !java && rm -f ${D}${INSTDIR}/program/javaldx
+	use !java && rm -f "${D}${INSTDIR}/program/javaldx"
 
 	# Remove the provided dictionaries, we use our own instead
-	rm -f ${D}${INSTDIR}/share/dict/ooo/*
+	rm -f "${D}"${INSTDIR}/share/dict/ooo/*
 
 	# prevent revdep-rebuild from attempting to rebuild all the time
-	insinto /etc/revdep-rebuild && doins ${FILESDIR}/50-openoffice-bin
+	insinto /etc/revdep-rebuild && doins "${FILESDIR}/50-openoffice-bin"
 
 }