Escape $@ properly.

Package-Manager: portage-2.2.0_alpha114/cvs/Linux x86_64

5 files changed, 26 insertions, 17 deletions

diff --git a/www-client/google-chrome/ChangeLog b/www-client/google-chrome/ChangeLog
index 58745a1ec87f..67295bc97a19 100644
--- a/www-client/google-chrome/ChangeLog
+++ b/www-client/google-chrome/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/google-chrome
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v 1.154 2012/07/03 03:26:01 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v 1.155 2012/07/03 03:32:13 floppym Exp $
+
+  03 Jul 2012; Mike Gilbert <floppym@gentoo.org>
+  google-chrome-20.0.1132.47_beta144678.ebuild,
+  google-chrome-20.0.1132.47_p144678.ebuild,
+  google-chrome-21.0.1180.15_alpha144745.ebuild:
+  Escape $@ properly.
 
   03 Jul 2012; Mike Gilbert <floppym@gentoo.org>
   google-chrome-20.0.1132.47_beta144678.ebuild,
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 2dd1e2647037..f12ba70694f6 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -7,15 +7,15 @@ DIST google-chrome-stable_20.0.1132.47-r144678_amd64.deb 32929630 RMD160 17c33e7
 DIST google-chrome-stable_20.0.1132.47-r144678_i386.deb 31315784 RMD160 61b0406daf257b6552921e33ff58ae8821ee1dc0 SHA1 2cbc029b00d206cd4cfedbe7c0ecfc980786b2e0 SHA256 bbe5923dd00182053efcdffe01391ce353e2c7a58c168cab04757ab2b3877640
 DIST google-chrome-unstable_21.0.1180.15-r144745_amd64.deb 33899316 RMD160 ef22f8094241e3aac42dd29e5cd0dea223377d99 SHA1 29ad2c182557341967daffc50fd9a011af6bd7c4 SHA256 e100756ab70047307825775ee244a80c4b64bba9b85956553a03f7cd45c2ff9b
 DIST google-chrome-unstable_21.0.1180.15-r144745_i386.deb 32211882 RMD160 52d874075c85adc2ebc2e7021ca7234b09506c29 SHA1 7d2db0872a4f112e6774443be1fd5dadb98b2f2b SHA256 467b25ee865c6707b10cabbaf068e04f6459f6917ff06e1ddecfe9f53eb767dc
-EBUILD google-chrome-20.0.1132.47_beta144678.ebuild 3384 RMD160 7240993c091bbd3a34e532f7a4f596262971e3d8 SHA1 cbe1f017d64616cfcfd94ff5fb65b573120942de SHA256 ce983bf545b8c60137b36bd559b7e34b3953b0149ec59c984c0f526f1ed647d0
-EBUILD google-chrome-20.0.1132.47_p144678.ebuild 3381 RMD160 705b0bbe5012bb3a5f5b0dd7073afc588217fa65 SHA1 2be3ab6bdb77b157ca70981ed0ac97f9fdf42793 SHA256 1130e2bd7748a56a94c68950f96ad694a0219493815aa86bbe09cec362ee636c
-EBUILD google-chrome-21.0.1180.15_alpha144745.ebuild 3385 RMD160 42864d271ce83e56feda6ac96725b4e3c803071b SHA1 99ac44854f42eed7c493d960e715e06c61c56674 SHA256 8b89a0b4cfb178004a6df44b237b9632584a1f169d171d809f744793fa3907c8
-MISC ChangeLog 36151 RMD160 ea4ca5753c3c354ef7dd02fd5b054cf1ac57f11f SHA1 ee9d870ef38fbdbdee439293e157efa764b8f155 SHA256 b94824004d5d805e0e49bc314ef39a8cd61f09c1ec83ad03c58eb25c1cc1c7ea
+EBUILD google-chrome-20.0.1132.47_beta144678.ebuild 3419 RMD160 93b9cced57e85e1b4d60d15c2db0a0e26be0a770 SHA1 b5427206c993bddafd258ee9b4942e5974f5d877 SHA256 cbcd90d6cb42bab026a4dcd6d746eb28a9a19dc44a8daa14db183b026e0b88d7
+EBUILD google-chrome-20.0.1132.47_p144678.ebuild 3416 RMD160 d20a7130b7972107939b27e4a5a81655e185b93c SHA1 fa984f243c0bebddcbd1769a0adb1af6874a6bac SHA256 ca6606e6ce3e4459435ac3eb12207ddcb54b90ba17d20ed37a146f640e075a30
+EBUILD google-chrome-21.0.1180.15_alpha144745.ebuild 3420 RMD160 4bb879d0aa19aa0fae2c7faa6a23d0659cb5655a SHA1 67d6e2308aefe585ac9d1214d58c4897d4a58fb8 SHA256 da904d68c031f902ad26b25874ec2b25d5177222dc759ccf969dbf5f11d9b2a8
+MISC ChangeLog 36365 RMD160 7524ff12463f86055c10f640fd089f075ab94354 SHA1 d09d3594553c75f2e28adda1d74537e65c91d890 SHA256 29ba853ab360e4c235945e8ea60190ca7f91d427a4b024ef4c174fcd76881666
 MISC metadata.xml 600 RMD160 afb36c4cd7fd70ba7a36cbe1ea67680fa8a4523b SHA1 1eb54ca4bcb157cc0f08eb6074b96dfc8c52c7a4 SHA256 e3dffcb8db012d64e4dbb7df2566b800b2a9476aaf0447b1d40a6e94d2733806
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAk/yZk8ACgkQC77qH+pIQ6RPvgEAoFGyFO6ZgMNhJ4xXFeiJoUcx
-E5VXphvuZGcsXfF6ICIA/j3//D21g7esT7+ZjBvp+7htABN9LFcRUDcCe7UwIQx9
-=54Eo
+iF4EAREIAAYFAk/yZ8MACgkQC77qH+pIQ6SB/AD/cuyOXsTNaOkvpmtzHVpNciHw
+1nyafLWL9NDv13jh5ywBAK19M3dhCJikEdqCTnMpobFVYQd4mnyeFSkzeL+UjWJl
+=Ij8T
 -----END PGP SIGNATURE-----
diff --git a/www-client/google-chrome/google-chrome-20.0.1132.47_beta144678.ebuild b/www-client/google-chrome/google-chrome-20.0.1132.47_beta144678.ebuild
index 12f10e2bf585..9dd99773127f 100644
--- a/www-client/google-chrome/google-chrome-20.0.1132.47_beta144678.ebuild
+++ b/www-client/google-chrome/google-chrome-20.0.1132.47_beta144678.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-20.0.1132.47_beta144678.ebuild,v 1.3 2012/07/03 03:26:01 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-20.0.1132.47_beta144678.ebuild,v 1.4 2012/07/03 03:32:13 floppym Exp $
 
 EAPI="4"
 
@@ -103,7 +103,8 @@ src_install() {
 	fperms u+s "/${CHROME_HOME}chrome-sandbox" || die
 
 	if use plugins ; then
-		sed -e "/^exec/ i set -- --extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins \"$@\"" \
+		local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins"
+		sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \
 			-i "${D}${CHROME_HOME}google-chrome" || die
 	fi
 
@@ -127,7 +128,7 @@ pkg_preinst() {
 		ewarn "The bundled PepperFlash plugin requires a CPU that supports the"
 		ewarn "SSE2 instruction set, and at least one of your CPUs does not"
 		ewarn "support this feature. Disabling PepperFlash."
-		sed -e "/^exec/ i set -- --disable-bundled-ppapi-flash \"$@\"" \
+		sed -e "/^exec/ i set -- --disable-bundled-ppapi-flash \"\$@\"" \
 			-i "${D}${CHROME_HOME}google-chrome" || die
 	fi
 }
diff --git a/www-client/google-chrome/google-chrome-20.0.1132.47_p144678.ebuild b/www-client/google-chrome/google-chrome-20.0.1132.47_p144678.ebuild
index ff773e379cd4..e403ba7abb51 100644
--- a/www-client/google-chrome/google-chrome-20.0.1132.47_p144678.ebuild
+++ b/www-client/google-chrome/google-chrome-20.0.1132.47_p144678.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-20.0.1132.47_p144678.ebuild,v 1.3 2012/07/03 03:26:01 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-20.0.1132.47_p144678.ebuild,v 1.4 2012/07/03 03:32:13 floppym Exp $
 
 EAPI="4"
 
@@ -103,7 +103,8 @@ src_install() {
 	fperms u+s "/${CHROME_HOME}chrome-sandbox" || die
 
 	if use plugins ; then
-		sed -e "/^exec/ i set -- --extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins \"$@\"" \
+		local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins"
+		sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \
 			-i "${D}${CHROME_HOME}google-chrome" || die
 	fi
 
@@ -127,7 +128,7 @@ pkg_preinst() {
 		ewarn "The bundled PepperFlash plugin requires a CPU that supports the"
 		ewarn "SSE2 instruction set, and at least one of your CPUs does not"
 		ewarn "support this feature. Disabling PepperFlash."
-		sed -e "/^exec/ i set -- --disable-bundled-ppapi-flash \"$@\"" \
+		sed -e "/^exec/ i set -- --disable-bundled-ppapi-flash \"\$@\"" \
 			-i "${D}${CHROME_HOME}google-chrome" || die
 	fi
 }
diff --git a/www-client/google-chrome/google-chrome-21.0.1180.15_alpha144745.ebuild b/www-client/google-chrome/google-chrome-21.0.1180.15_alpha144745.ebuild
index 0fc711e7035d..0da5f5e869f8 100644
--- a/www-client/google-chrome/google-chrome-21.0.1180.15_alpha144745.ebuild
+++ b/www-client/google-chrome/google-chrome-21.0.1180.15_alpha144745.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-21.0.1180.15_alpha144745.ebuild,v 1.3 2012/07/03 03:26:01 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-21.0.1180.15_alpha144745.ebuild,v 1.4 2012/07/03 03:32:13 floppym Exp $
 
 EAPI="4"
 
@@ -103,7 +103,8 @@ src_install() {
 	fperms u+s "/${CHROME_HOME}chrome-sandbox" || die
 
 	if use plugins ; then
-		sed -e "/^exec/ i set -- --extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins \"$@\"" \
+		local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins"
+		sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \
 			-i "${D}${CHROME_HOME}google-chrome" || die
 	fi
 
@@ -127,7 +128,7 @@ pkg_preinst() {
 		ewarn "The bundled PepperFlash plugin requires a CPU that supports the"
 		ewarn "SSE2 instruction set, and at least one of your CPUs does not"
 		ewarn "support this feature. Disabling PepperFlash."
-		sed -e "/^exec/ i set -- --disable-bundled-ppapi-flash \"$@\"" \
+		sed -e "/^exec/ i set -- --disable-bundled-ppapi-flash \"\$@\"" \
 			-i "${D}${CHROME_HOME}google-chrome" || die
 	fi
 }