Pass the extra plugin dir in a command-line flag instead of patching the source. See bug #333575 by ferret <ferret@explodingferret.com>.

Package-Manager: portage-2.1.8.3/cvs/Linux i686

5 files changed, 14 insertions, 14 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index e6c065e727b7..b37516ecd0a8 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.193 2010/10/04 10:55:37 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.194 2010/10/05 09:47:22 phajdan.jr Exp $
+
+  05 Oct 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-7.0.536.2.ebuild, chromium-9999.ebuild,
+  files/chromium-launcher.sh:
+  Pass the extra plugin dir in a command-line flag instead of patching the
+  source. See bug #333575 by ferret <ferret@explodingferret.com>.
 
   04 Oct 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
   chromium-7.0.536.2.ebuild, chromium-9999.ebuild:
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 6f2e1b838785..8fe3ca6050fa 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,5 +1,5 @@
 AUX chromium-gnome-keyring-r0.patch 2842 RMD160 1ac9a6e2785954a7a4f7f60988c8d7c101ad6db8 SHA1 44ee90f3c6632bcad9843cce22865c9c39fd6c8a SHA256 237d85599270b7cc1f83e58e27712f3d65609c325318b0b28ac277d630574c96
-AUX chromium-launcher.sh 1097 RMD160 6a35819d6ae463d1614ecd5976fe8aeae1a3519e SHA1 93b8259fe9ddf6914faa9a4cdbaf451a97031228 SHA256 9d16e2afe508c33aa987001a0442696eaefd5cf91e7a6c9eeb900bc9824390c9
+AUX chromium-launcher.sh 1143 RMD160 3bc84b886104acdf993e27e1e05218b730bbead1 SHA1 505850d82b0aed48612c32ff36172c924d2debd0 SHA256 bdec73f460377a20c870cc2e8586cdc48183d2f2f6011b7a2573cb294dd08e28
 AUX chromium-make-3.82-compatibility-r0.patch 867 RMD160 d6fd01bcd32460678e1503ca9fbeb78ed16e8213 SHA1 9964cbe8063140312dd1217327f3648dfaf71284 SHA256 339f8022d0a2ff733d779ba8c4a3cf09a28633afccc0106d86289ef497f2f401
 AUX chromium-plugins-path-r0.patch 1043 RMD160 698a8562c866e046b1adf8553894ee08afb53a10 SHA1 0c41adad38478c4a12970af774e782ebb208a048 SHA256 3ba3bf1c3184fb2a0c7f493947d620fd1678efdd3661ac36be3d1cb00146d108
 AUX chromium-system-sqlite-r0.patch 1802 RMD160 7e796e63a2415b98b7192f466481ea00d86d5ddf SHA1 13bb913c620b813f5a5436864a002374b2da9b7b SHA256 c34e65648c1593d3c693db643d342c192056d2bf5c19b45129ac29ea2862ccf0
@@ -11,8 +11,8 @@ DIST chromium-7.0.536.2.tar.bz2 133853858 RMD160 4868dc4883eee054e2c7a088b418006
 EBUILD chromium-6.0.472.62.ebuild 6869 RMD160 4f789a1c899d639aed4f69a831dcd932ec690903 SHA1 07c983a01ba282fe0f9684c3a264de81e4623a16 SHA256 14d395f2840efe6d81b5f4225284af9084087c4ac429fcdbb0ddd05a3a0f9ffd
 EBUILD chromium-6.0.472.63.ebuild 6875 RMD160 868088280a7e82a3016c6feee15c61ea8e4b3237 SHA1 9f2a03a0592b51530595f35f24eea41b48a3a275 SHA256 54b9433c933f4faa90e1057baa29dd461e639931d2cacdb963996ed28f7e995c
 EBUILD chromium-7.0.517.24.ebuild 6611 RMD160 6a276a416a19c3a78a33112c25c87aed7bdd4a0b SHA1 508ad38752f50ce75efafea8e18fef052a8ba978 SHA256 7f941e6775455807469bf28cb1a3069a270e098c2f1ed248c084f47521d6a2c2
-EBUILD chromium-7.0.536.2.ebuild 6618 RMD160 97cbdc8dcc02fa0b913a28a1574aa92867310281 SHA1 8af432732ab964946145ac0926163340b2be7d34 SHA256 88cf6df287058b3b481dc3b0beae9d04aec771e60619ef77fca6ba64309923b1
-EBUILD chromium-9999.ebuild 8326 RMD160 0410613bd02648772334a1928f08a343ec062495 SHA1 b1d12ed7351a56a518b94d1eb8104269f6d6da27 SHA256 c13fc2bee8635905f0a4493c6bb69e408a3f0651b8b5fe0885fec4ea9a675b8b
-MISC ChangeLog 42459 RMD160 0325852ca9b1f53667d650177f8983eb7dd121d9 SHA1 ee87f529d90ea19e4ce014b165f0a9983ea9c5f6 SHA256 0e07c15c9f7d2836cc88516e73f85599661d1087afd50b883a7a0010ca7affe2
+EBUILD chromium-7.0.536.2.ebuild 6539 RMD160 7e6098952511d536ed2691893118fa4c5414d7ff SHA1 e8a628ab976c70b7bb2c40a95c1b5ad3ecd891dd SHA256 ee9e72075284cec38c4b14cb7e377b715b43ae4b8e7234b08838912e04ed3fb9
+EBUILD chromium-9999.ebuild 8247 RMD160 e70af5e3cea200c909eb76c6a86348e999a9040e SHA1 023528054843d120f062bac8318683c8070c1480 SHA256 0cba55d557a27d73a9302614e4567d84610bb517ac86334a88735a47daa8226b
+MISC ChangeLog 42737 RMD160 2a697b4061dc1c4b3ef552e859e7f023d3a79300 SHA1 475c52e0dde66d1de68d4d9ab4d37475ce0cc2dc SHA256 2a719933745d229495268e04b25b55e3387759a8c22972424c41369207bbb1d8
 MISC chromium-9999.ebuild.orig 8304 RMD160 6df667071aae9974fb976cdca740eafeed1d94c1 SHA1 306242aa316e67f1e160fe5cda624cc9789cac30 SHA256 b481c9b34b69ef0f56941bd51c907ea9db449762be03e5fcb60cddd098be1ddc
 MISC metadata.xml 406 RMD160 d09b00979942b334a50d93a97fc0c871d9c12533 SHA1 6109fea03404526e0b794b2d3ab7a86cd2db0798 SHA256 1b13e11f0612543177e8def6184c785553183b77b6724d249a7557c64b6ead2a
diff --git a/www-client/chromium/chromium-7.0.536.2.ebuild b/www-client/chromium/chromium-7.0.536.2.ebuild
index 84890087e53a..6a1ee9f0901b 100644
--- a/www-client/chromium/chromium-7.0.536.2.ebuild
+++ b/www-client/chromium/chromium-7.0.536.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-7.0.536.2.ebuild,v 1.2 2010/10/04 10:55:37 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-7.0.536.2.ebuild,v 1.3 2010/10/05 09:47:22 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -64,9 +64,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Add Gentoo plugin paths.
-	epatch "${FILESDIR}"/${PN}-plugins-path-r0.patch
-
 	# Small fixes to the system-provided sqlite support,
 	# to be upstreamed.
 	epatch "${FILESDIR}"/${PN}-system-sqlite-r0.patch
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index 30c48f738eef..2590020e89b9 100644
--- a/www-client/chromium/chromium-9999.ebuild
+++ b/www-client/chromium/chromium-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.88 2010/10/04 10:55:37 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.89 2010/10/05 09:47:22 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -109,9 +109,6 @@ pkg_setup() {
 }
 
 src_prepare() {
-	# Add Gentoo plugin paths.
-	epatch "${FILESDIR}"/${PN}-plugins-path-r0.patch
-
 	# Small fixes to the system-provided sqlite support,
 	# to be upstreamed.
 	epatch "${FILESDIR}"/${PN}-system-sqlite-r0.patch
diff --git a/www-client/chromium/files/chromium-launcher.sh b/www-client/chromium/files/chromium-launcher.sh
index dc14abd6fe35..a52268ef19e1 100644
--- a/www-client/chromium/files/chromium-launcher.sh
+++ b/www-client/chromium/files/chromium-launcher.sh
@@ -41,4 +41,4 @@ esac
 # Set the .desktop file name
 export CHROME_DESKTOP="chromium-chromium.desktop"
 
-exec "$PROGDIR/chrome" "$@"
+exec "$PROGDIR/chrome" --extra-plugin-dir=/usr/lib/nsbrowser/plugins "$@"