Make system web browser plugins symlink optional, wrt bug #301911 by

Robert Bradbury <robert.bradbury@gmail.com>.
Package-Manager: portage-2.1.7.16/cvs/Linux i686

5 files changed, 26 insertions, 13 deletions

diff --git a/www-client/chromium-bin/ChangeLog b/www-client/chromium-bin/ChangeLog
index 49c78095ef26..c128657301a1 100644
--- a/www-client/chromium-bin/ChangeLog
+++ b/www-client/chromium-bin/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/chromium-bin
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/ChangeLog,v 1.55 2010/01/29 10:03:20 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/ChangeLog,v 1.56 2010/02/08 11:35:33 phajdan.jr Exp $
+
+  08 Feb 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-bin-5.0.308.0_p37385.ebuild, chromium-bin-9999.ebuild,
+  metadata.xml:
+  Make system web browser plugins symlink optional, wrt bug #301911 by
+  Robert Bradbury <robert.bradbury@gmail.com>.
 
 *chromium-bin-5.0.308.0_p37385 (29 Jan 2010)
 
diff --git a/www-client/chromium-bin/Manifest b/www-client/chromium-bin/Manifest
index c274628480ea..3c45e686a171 100644
--- a/www-client/chromium-bin/Manifest
+++ b/www-client/chromium-bin/Manifest
@@ -7,7 +7,7 @@ DIST chromium-bin-x86-35884.zip 22214326 RMD160 baf50cac0b74f4afff1940c3bb75b418
 DIST chromium-bin-x86-37385.zip 22934874 RMD160 007189f02689f76924db4043c74f0241c90b7f78 SHA1 038f8771a3fb5d7b220ad243f1a0d1b6b8c003c9 SHA256 2b2e99ec12656670dce8e43ca9156cd978a7701c556a5e64dba190eea35c704b
 EBUILD chromium-bin-4.0.266.0_p33995.ebuild 3474 RMD160 35342088004f67653062195c6c1f32a2ff6dcf1c SHA1 29e46e24269cd6bbac059f763d95fe7889579129 SHA256 abf7920e117a47c796801f9aaca8d5b0462d758429c0f403da4007401351ade2
 EBUILD chromium-bin-4.0.295.0_p35884.ebuild 3552 RMD160 4837302e4b25b9692c9dc27fef2b318e683ffb3d SHA1 ab3458e3d73b1e36af30a40ec073e046c5ec6e8c SHA256 5a9c1f51d257955e2d0d5ad907d7223e32006e11245ca1c9b135fdd1520e78c2
-EBUILD chromium-bin-5.0.308.0_p37385.ebuild 3574 RMD160 ea177d3832a62f0954db0151d32f0f4d2a16adff SHA1 f7b9f0b54e815bdfccfa8e2241697dc30cea496e SHA256 b6c7193287b6c65690d4a90bbf93df61017d36431c1ba1e6c23f2f005ebe4280
-EBUILD chromium-bin-9999.ebuild 3610 RMD160 c23c782b28a44cce92ea4a2edbcb825c76573d5f SHA1 4315a43ada57f98d028b9bf6a80bf68d74671036 SHA256 d30b9256bef399ceb4d7fb1459eb8ee6747dbe95254e2ac25c7a5a79ff760fed
-MISC ChangeLog 12808 RMD160 cb66884b427fa1a564bd3199a353707c35834381 SHA1 dcf1af32fbe1be11e74f958064a3b0dbdb12cb86 SHA256 b720fb46d375d7f89d8738f9c379253d72a2532adefc901522040a84d777337b
-MISC metadata.xml 519 RMD160 42bd3972a7aba699a17d2a63385fbc099075408e SHA1 aaf5297b611e7f38aed521d9d8344c5707d16bc5 SHA256 9be91f833f199427885b357aa837ee2f00113471ffd04c352e9fa2c1d767ccf6
+EBUILD chromium-bin-5.0.308.0_p37385.ebuild 3653 RMD160 c74b803815a72aea01c1860e36897dcc767ae1de SHA1 3fff5b619fc832fab48811e9ab26c8990160611b SHA256 68123e2c66e027a4577d8eb5cc58794f5ed66a6620c7670b327cee2448340cb4
+EBUILD chromium-bin-9999.ebuild 3689 RMD160 4af72840121f330964a5a6793c7fe7512bf414ed SHA1 0b91ad7fd0da6d2c6c445aa832a8ea08ee64fc2b SHA256 c4c7eaaca773091c915f2f46240c73a14b91653662613729399c3ffb800c4c5e
+MISC ChangeLog 13066 RMD160 cf17941f995942b54b62ef1648e594b2a85772aa SHA1 ba947ec8520e8a90c1e43ab5c71137d3f0323130 SHA256 86f2b8d0de610ec1e0ae0067152cb0ba93dd243c7b7889433d6dfa6fa63b2beb
+MISC metadata.xml 630 RMD160 e9abef5d7ffcbd062f0f93013cc6a9676abc0329 SHA1 c56feb0fd92457e49720a25e50df732078b1dfc8 SHA256 0b723daf2cdb3658db7de722c8901abcfab9b0124d108e7770ff7c33606c66c8
diff --git a/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild b/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild
index 1930b0b36f29..aa87338b0772 100644
--- a/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild
+++ b/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.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-bin/chromium-bin-5.0.308.0_p37385.ebuild,v 1.1 2010/01/29 10:03:20 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-5.0.308.0_p37385.ebuild,v 1.2 2010/02/08 11:35:33 phajdan.jr Exp $
 
 EAPI="2"
 inherit eutils multilib
@@ -16,7 +16,7 @@ SRC_URI="x86? ( http://build.chromium.org/buildbot/snapshots/chromium-rel-linux/
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
+IUSE="+plugins-symlink"
 
 DEPEND="app-arch/unzip"
 RDEPEND="app-arch/bzip2
@@ -62,8 +62,10 @@ src_install() {
 	newman chrome-linux/chrome.1 chromium-bin.1
 	rm "${D}"${CHROMIUM_HOME}/chrome-linux/chrome.1
 
-	# Plugins symlink
-	dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/chrome-linux/plugins
+	# Plugins symlink, optional wrt bug #301911
+	if use plugins-symlink; then
+		dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/chrome-linux/plugins
+	fi
 
 	# Create symlinks for needed libraries
 	dodir ${CHROMIUM_HOME}/nss-nspr
diff --git a/www-client/chromium-bin/chromium-bin-9999.ebuild b/www-client/chromium-bin/chromium-bin-9999.ebuild
index f65bc8e1e523..afbe798ef126 100644
--- a/www-client/chromium-bin/chromium-bin-9999.ebuild
+++ b/www-client/chromium-bin/chromium-bin-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-bin/chromium-bin-9999.ebuild,v 1.31 2010/01/29 10:03:20 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium-bin/chromium-bin-9999.ebuild,v 1.32 2010/02/08 11:35:33 phajdan.jr Exp $
 
 EAPI="2"
 inherit eutils multilib
@@ -10,7 +10,7 @@ HOMEPAGE="http://code.google.com/chromium/"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS=""
-IUSE=""
+IUSE="+plugins-symlink"
 
 DEPEND="app-arch/unzip"
 RDEPEND="app-arch/bzip2
@@ -67,8 +67,10 @@ src_install() {
 	newman chrome-linux/chrome.1 chromium-bin.1
 	rm "${D}"${CHROMIUM_HOME}/chrome-linux/chrome.1
 
-	# Plugins symlink
-	dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/chrome-linux/plugins
+	# Plugins symlink, optional wrt bug #301911
+	if use plugins-symlink; then
+		dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/chrome-linux/plugins
+	fi
 
 	# Create symlinks for needed libraries
 	dodir ${CHROMIUM_HOME}/nss-nspr
diff --git a/www-client/chromium-bin/metadata.xml b/www-client/chromium-bin/metadata.xml
index 446d05e70809..525ffffc4595 100644
--- a/www-client/chromium-bin/metadata.xml
+++ b/www-client/chromium-bin/metadata.xml
@@ -11,4 +11,7 @@
 		<name>Pawel Hajdan</name>
 	</maintainer>
 	<longdescription>Chromium is the open-source web browser project behind Google Chrome. This is a binary version, grabbed from chromium buildbot</longdescription>
+	<use>
+		<flag name='plugins-symlink'>Add support for system web browser plugins out of the box</flag>
+	</use>
 </pkgmetadata>