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

Robert Bradbury <robert.bradbury@gmail.com>.
(Portage version: 2.1.7.16/cvs/Linux i686)

4 files changed, 22 insertions, 9 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/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>