Don't set nullglob since that makes it difficult to pass wildcards in CHROMIUM_FLAGS. Bug 461864.

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

3 files changed, 10 insertions, 7 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 1d5530fa17b6..a857d201f289 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.846 2013/03/14 02:53:10 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.847 2013/03/17 17:53:48 floppym Exp $
+
+  17 Mar 2013; Mike Gilbert <floppym@gentoo.org> files/chromium-launcher-r3.sh:
+  Don't set nullglob since that makes it difficult to pass wildcards in
+  CHROMIUM_FLAGS. Bug 461864.
 
 *chromium-26.0.1410.33 (14 Mar 2013)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 0f954134f946..29f1dec54420 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -6,7 +6,7 @@ AUX chromium-gpsd-r0.patch 592 SHA256 9af056bd99e5176af6f5d8acb7d54241731b64fb3f
 AUX chromium-icu50-tests-r0.patch 1994 SHA256 b8ddf9dc432278f299b42c9abd683af00a1014ecd14f737a6b9c3b6cb948240a SHA512 d871c4bfaec01ab7507b3cb924683a51317083d6b5613cb32dd4f51d08973671f6665ec347a19df3d8dc5600e047452874e3e1231d037403b954678f33ef30fc WHIRLPOOL cdd512951f61ceb5880a7c40a79dcb13ea34f9334690f2043a1daf74d98f11943230696e7c87ec678adfa1efad5f5ba7b91e5b3b17ba8b205d0ca0f6fbffdfd3
 AUX chromium-jsoncpp-path-r0.patch 521 SHA256 eb26d8574f0980a16d2237a6d69503558b37105e80b032c18495e97a69859346 SHA512 836aafcf43b1a41b2b3586c4409f878a34c5784f5bec2557f6fa67523bf693ad6e7965b8e8b8f502bd895c34959b4c8dc15a1e90c779a5674f0217e3b50af949 WHIRLPOOL 6a332363ebfe7ec5f769696908bbfe1992efe2e26ceb78ece8282f5da3b08166f99fbb684c311e93831d682da0ce9bbbb5f20dcb544d50b1040edc55ca810576
 AUX chromium-launcher-r2.sh 940 SHA256 842e121bbfa33513ca964744f0ba8401401946e672cd6a0a95bc80a28212e87e SHA512 64ec5e0a4f524bd6164fe33a022419d6cf54822754b172e85ea003c47f9bfe6ed996353af707a4e16369a68d2f2e7d51f186397a48da42f13eb3dccb7e4ae4f8 WHIRLPOOL 4a2284957bb462ded600f14b1aaa7e29389181cda149b9090cb7b6fe8303dc5692519da6281769925b2122578ba2ea0ef8a1563077a62d7cdf7ca243c165805a
-AUX chromium-launcher-r3.sh 950 SHA256 2566d9c72bb6d6c42b3a4dd12423d59f469701ea69f9996cf61fd4ba5e466259 SHA512 8762d20d2f886f1b2cb011a6e18c82101ea7ac9cd0569ee585c753107042f2f43a16a2add8948a5f75e041f312b3c3446b98524b02a02ee3cb66abb393f5d88c WHIRLPOOL 1f3a7c6c339223986071f3a5f16f6c958bc15a67e63a81ad155d6c400c597681d5aa8c06876e9f1cbf971a63ed8be86da5d588ad9dd55b74e84f6c3ec95c2fd8
+AUX chromium-launcher-r3.sh 932 SHA256 2025eb484eb1a86da9aff3946847ffc47162080b7a7700102b1608235b87ba3e SHA512 92ce9e24e8862b4a437fb1eb97613cbb3f596650efd6bf4a46ded92d99d6c7549f4e184db48d1695ef4390145665a3acc4714427292ba19414d3d2e1f9ba0e34 WHIRLPOOL e0735b33e003dca28356a83194ca949f7799a513b24f44efbf60af877a67fd14d3ad7a860e5ba5b1f533a5a891001ac173465f664a4ee398b3c0b71e24f84370
 AUX chromium-mesa-r0.patch 14558 SHA256 e0313109aab59dde47af3aa4ee09791368b2efde358f4b3d8fdebda0cb93c69d SHA512 62588649049a17aceeeb2a797e68bcc25691ab0498b0d54816f9f4a46c8572d3821d7d6316f5e5de1fb4670cb009ef40c2be635e11cecb1f61180372612b818f WHIRLPOOL cb362bb491aa67a63adafa22789ecfda049c333c6619b56baf2bde87f09b8fe20e96d6d2f782edeb94449dc157a988893171a11c359f6beb9c46a00db065e4fa
 AUX chromium-mesa-r1.patch 14575 SHA256 a8ca2d2fd98b9f79683475c687394eb280dadaa1dacb935cd056e28765628133 SHA512 0766df5a6ef88c86933c14da7b45d388505b6950e04dc90dafd84f96f696850dd3cd383428239ccb32af72c56de69686f705b96f10e3da0dde1beb88f061d331 WHIRLPOOL d1b1de12549d42a4957cb262ff1551f3f31e9cb9857f779a9dd987ca6da603c1733eac8487c901f885ae8896e1a211c002d9bfabb6c630be67aba72ec3dba427
 AUX chromium-no-pnacl-r0.patch 859 SHA256 44061e1648ac4674ad0b9990c265c96c33de435679f6854e4b54a421d81cbe6c SHA512 cc82f20ca13a7bbf40248bf7bb6dd52987246def4d982143ea796e90b75b80c397302f8df52a2fcb5d42dd19b71f664fdcccc28f2835c32eba8f85b62b854db3 WHIRLPOOL 3dbc0b223224d517cda4afa19012e7fc5a4b0b85c08c8b2235d8847413704b4f3bf0ff69cab42916b32ba50da5272001a853a71cf0a40644a0d0613cf7fb243e
@@ -36,13 +36,13 @@ EBUILD chromium-26.0.1410.33.ebuild 16163 SHA256 6427c6dfe969219822fa3def2a3ca1e
 EBUILD chromium-27.0.1430.0.ebuild 16267 SHA256 b774b0f442b0e81b4963a707533b3692754b2583dd4b9137df1f228be3c52e4a SHA512 f47b1be1e98eeba4e4fdd177c3f918690f4d52120e4ae3a3cbcec5c70cb36650633d2a56525c3c21ddf916e4d7bc8e0e36130fcc78b6715e3ce327f7dc49c8cd WHIRLPOOL e728d72c9a5ec87c324a810885352696cee50285914e5f36fb0daebf0be12777130103e9fef62fdd3710a3a6675265594021b04b87f04369980510b00d792958
 EBUILD chromium-27.0.1438.7.ebuild 16301 SHA256 2368635f5b7d16437d97bb94c853368c52d4c82e95bdd5bc132b94b790771e39 SHA512 2e24310497e0dea18ca909fda8fcd83087d181295b110386bc3356b837a7af72f01844d5c97fb16c5cdf36d72201bf149a5029e475e04808a953cb0fee1a4ecd WHIRLPOOL 18e274f0773a4ee7b5a79db2e8624c5207c1d07e6a9adbdf3db69f51bb06177a82f1b065d6b54dddec0b8572b67951c9852052bd26887610d2a3912ae55451e0
 EBUILD chromium-9999-r1.ebuild 17991 SHA256 803f55e98e6501a990281668e64605e7d2f1925bfda13cdd83c1d129afec445d SHA512 bf1b2e2f68d7df62da71a1ff9a3169af9e0d951874e894d9bcc976ed4fb3454c852ad91b5f4daf7b23a57ba592f42eea2fbbe51e31d14706f520d49b053d5ee1 WHIRLPOOL 714b2374002b8e10eb927e07bcd97702260d260bf680001d787e64222a322af8e410865b94bda9f444090bbbb7d1c7f97f176fa0276b1d746cbf6bf735a1a128
-MISC ChangeLog 61722 SHA256 4d8a6d3b56c52b3670b813b9d3a40ff33afd86db6627158abfa94e928ac7f4aa SHA512 fb0e02759b5b7b6ec58a6ae4095fa05137e8f8468a6d97d6336f0916280e91a39d3522adb58ac6c9817af4e186cf341126e36b3d5cb21e32f7eb2534abfe4f97 WHIRLPOOL d5d4cc1f6c91cf40ecebc6cfc204e9f16752cb3d1890d5cd8bf735bf022c0be2b314628df0b2748583f43b01badb13832b20318ffef5b508a5709167f5c3d6f0
+MISC ChangeLog 61905 SHA256 c84a6b9b9fd4148d9d67eff171474dfd0165632a9e697fee5d637927b808c4fe SHA512 6add05a7ebb03603e73adeb432c7a3042f4930f3e505e63accffcc4bb1e5447a39bad808bd3e05bcc542819a13614de5311c5c8ba005cef94ff1fad5737221cd WHIRLPOOL a6f9dce51e6fbe828f5d4e49fc0ebf42162c0567f44187dd0c927ab5dfe46ecb55e04d40cf7311659a86e4330174f3682d3b77631ca14d4a75cd8f44ded01361
 MISC ChangeLog-2011 114031 SHA256 e2c2c75785c5eaf78b6efe01e357279cbb7be0c89d00b4053f475e963916fa54 SHA512 8e14759348333bdbd7c338080472789d7bbb1ece1ca5817bac6306bdcb33dda1e23bf3055cbb3b7bcee9362b6900bba1ace7ba73f353570a74d3ed761c9198cc WHIRLPOOL 810b6423c53f892a4b0964380b8190dec2a8783d560a9cb0baec93a77d879186201055382ca05975ae242e16728529ae85445db003fdd425355292d17817157b
 MISC metadata.xml 703 SHA256 ab48e17b94dc6a8e77b4ef786b60e1518ec079a6b79a733586ac4f39c316ea7e SHA512 4e96d1190cc6d3f1bba5dfcae6bd5699cf9710b8c4c75a1ce66974824cb4f86fe0917f81838c9fb254f0be064e07ce9060d4677938a3a819cff7d1b24e33df1f WHIRLPOOL 4705ddaaecaf5dfd1c611ceabb905991495105078afcacf71b6f389cd3a0649ce46f954ce600ab9e6f66f05d55b4727f856e6c469b0995c2457c8c3715eba8b8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlFBO5oACgkQC77qH+pIQ6QgdgEAgB1LeDcUyXEWV5bdnkMPw0q8
-68IfQxj7l2r72cjV3y8A/3cyCnClf/7wLvrSwF2BB91UT2l8DNlLdvjZQSu/artW
-=G4Ch
+iF4EAREIAAYFAlFGAy4ACgkQC77qH+pIQ6RHZgEAiM5KU8uXOz/cnx4yI/yT4DJb
+H/rBKIhIWj3Pg7yG5/cBAKepZooPoMzdnWTpNC/LCZeu1E9fEcpISnC77QwDx5+y
+=WpHV
 -----END PGP SIGNATURE-----
diff --git a/www-client/chromium/files/chromium-launcher-r3.sh b/www-client/chromium/files/chromium-launcher-r3.sh
index 6013ee5a79f4..f2bbedd22698 100644
--- a/www-client/chromium/files/chromium-launcher-r3.sh
+++ b/www-client/chromium/files/chromium-launcher-r3.sh
@@ -3,7 +3,6 @@
 # Allow the user to override command-line flags, bug #357629.
 # This is based on Debian's chromium-browser package, and is intended
 # to be consistent with Debian.
-shopt -s nullglob
 for f in /etc/chromium/*; do
     [[ -f ${f} ]] && source "${f}"
 done