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

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

6 files changed, 24 insertions, 167 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 8a31a5675352..86a9afbd116b 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.51 2010/02/06 20:18:24 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.52 2010/02/08 11:28:31 phajdan.jr Exp $
+
+  08 Feb 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-4.0.295.0.ebuild, chromium-5.0.307.5.ebuild,
+  chromium-9999.ebuild, metadata.xml:
+  Make system web browser plugins symlink optional, wrt bug #301911 by
+  Robert Bradbury <robert.bradbury@gmail.com>. Also remove an old ebuild.
 
   06 Feb 2010; Bernard Cafarelli <voyageur@gentoo.org>
   chromium-4.0.249.43.ebuild, chromium-4.0.266.0-r1.ebuild,
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 44f9574e0b91..444c50299b83 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -5,14 +5,12 @@ AUX chromium-use_system_libevent-1.4.13.patch 6919 RMD160 1417a38ad95afb61bf90ff
 AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a0b094bc697ff2c9d33efe976b1bffb72a3 SHA256 a81c6257346eaa4f6389fc9ea8834fd2dd3b006cf4e9e999028aca812d76fe9a
 DIST chromium-4.0.249.43.tar.bz2 140438366 RMD160 3a95c9ed343008245000fb5e691091ac033c2e55 SHA1 d98cb7787433446946601ed4ff4577d0b1e5f46b SHA256 ea6da2353a2c2a8eae3b13b9b86e44308ea6ae1f62b9594c346846f69fec25d1
 DIST chromium-4.0.266.0.tar.bz2 133383431 RMD160 ac2d6c2bdb12cae603c644c63f1b63ed82251994 SHA1 65a8e7496f26b6c1bf663199d77fe238418f8250 SHA256 df0bce0541041c6d22ff177b4ea9cfbeee0c18d0805f1d371e6442688f42577f
-DIST chromium-4.0.295.0.tar.bz2 152197504 RMD160 6465221e9e34c700efabbccaa5757bacf2295a9e SHA1 457c79a72b90a1fe0037db6503b66a55c5c2a4e5 SHA256 d78a7cb0cdf6914fd9f87786a9fa792944a2446ce8b5a6124bedcddd2d3a4cb9
 DIST chromium-4.0.302.2.tar.bz2 153073484 RMD160 d275f05b7d628bb0948eb287a19eecde012b0127 SHA1 c9940df87f2f2941f28606fc57f764e165d36504 SHA256 5528e637e8521d01093d69f0e7e880dd898941616caa6d7a361d467031d0b62d
 DIST chromium-5.0.307.5.tar.bz2 145158968 RMD160 c77fa169b0273c8bde1241db5dcb4e6d94becfd6 SHA1 e42adc860bac1d620b99756c8abb76857e5b2219 SHA256 e45e6c9d07dd8f1455fcf3e3f15a16db1bde712ee91d4ea3deb398625ebac36c
 EBUILD chromium-4.0.249.43.ebuild 4296 RMD160 85d3ef33cec55dd6e91738f94e870e60f336f028 SHA1 7a940f73b4aac811b9f3d9318619e90b1d010af5 SHA256 218017a3e6406c168a7601745957dfa5e848f65e6f186f969bfa2aebaaf5f2e7
 EBUILD chromium-4.0.266.0-r1.ebuild 5000 RMD160 e39e1d08e778c25677157a27de3964ac65ba5374 SHA1 a15604ee7a60ad1c2fac099fd487288d58670673 SHA256 20f253777596af90b1b16facc9a0a6a7327d5196b34a496c0a573795eafcd06e
-EBUILD chromium-4.0.295.0.ebuild 4685 RMD160 ebc3af1dce9488019d1ab387caf4bb6d33f61205 SHA1 ccb98a3b800408dc6843a25549c30f9f138d4136 SHA256 f30979a9b00863cd9bac1a92cebc5083989d32b06eaf438951db6b1b745cf270
 EBUILD chromium-4.0.302.2.ebuild 4704 RMD160 f61bce1b858563d5afc859e960977fc2dd9553b8 SHA1 5d89c77f0136209721401680315ac2c3b6ad6d23 SHA256 02eba2a630686fa7cf5fc74a4dcc70cbb7c875a79efa50097d0a3468e05b822d
-EBUILD chromium-5.0.307.5.ebuild 4888 RMD160 a6de011e45b39bb8725ff2933d2c0fc5bea590ab SHA1 68d0aacf1644bfb9a9b755f5446de387b0be4eb5 SHA256 300bea517491870d4d81956bc6d375cde0cbc35de0627ea17288c5a8255a4312
-EBUILD chromium-9999.ebuild 6601 RMD160 c719639b40ff45c3797f76d13538e6312c749f29 SHA1 7afeb280a6ff9b4c4f53f7a79b2bc1436007840e SHA256 27a18bb43b20e540c3709a90626b92f46f39e8eb25d8708dcfcc8e487b7e3d97
-MISC ChangeLog 11783 RMD160 c7f28a598e41fe6819b4c861d1706ed13ca6b73e SHA1 8d78e40f5a6705e249258890831d3e1357bd2f08 SHA256 db7779ab935ff9a287c921cb6fd898bc6c289163709b63e0a4aae8788372ddda
-MISC metadata.xml 578 RMD160 a6e635fb90171f5698b32ef0ed36747f921f8aed SHA1 f72cfb81f43187583315e032db709083742aeb41 SHA256 9f3586e43f40a626d328c426b96966ac7e91d04095c71d16a1573bef60e46fa1
+EBUILD chromium-5.0.307.5.ebuild 4968 RMD160 5efcb3dc60a48bcf28ab3f441fcbd0eed7ad6f22 SHA1 a47ac58b1136e7e60fe274d09722606a2b85b26c SHA256 ffa0eff4849ae6c0fed375607cbd5a0c0a71b149d5b31b9104a5857062b1e869
+EBUILD chromium-9999.ebuild 6681 RMD160 2dc847b2e5b5683eed7ddc681e5eddd15392812f SHA1 e7bfa35ad6c1b1cd221daa95d4581cbcd835dcc9 SHA256 cbf0f0613b0b79ac1df053631d107302d30034529aa5c4627a25c0d36ea33b96
+MISC ChangeLog 12081 RMD160 c13c8ae7fab99b6c12c7284ade9a328c111e71a9 SHA1 bc9541ea8c851f6c9d9922f11d0a92f20dde383c SHA256 c1c7b132adbb37d7c265685097d800ede4bd4ce0d79757296feb7cd03e55911a
+MISC metadata.xml 674 RMD160 5904280e3a216e0d322f1649e14f52f68cd00a39 SHA1 c2310be724a3345e36f644b53b8cfa02d3abdbed SHA256 e05422220666ef456f98ada2f42078b37400b538a452c1e3cee2945d7769dc5c
diff --git a/www-client/chromium/chromium-4.0.295.0.ebuild b/www-client/chromium/chromium-4.0.295.0.ebuild
deleted file mode 100644
index 396bb72da858..000000000000
--- a/www-client/chromium/chromium-4.0.295.0.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# 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-4.0.295.0.ebuild,v 1.7 2010/02/06 20:18:24 voyageur Exp $
-
-EAPI="2"
-inherit eutils multilib toolchain-funcs
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-#SRC_URI="http://build.chromium.org/buildbot/archives/${P}.tar.bz2"
-SRC_URI="mirror://gentoo/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+ffmpeg"
-
-RDEPEND="app-arch/bzip2
-	>=dev-libs/libevent-1.4.13
-	dev-libs/libxml2
-	dev-libs/libxslt
-	>=dev-libs/nss-3.12.3
-	>=gnome-base/gconf-2.24.0
-	>=media-libs/alsa-lib-1.0.19
-	media-libs/jpeg:0
-	media-libs/libpng
-	ffmpeg? ( >=media-video/ffmpeg-0.5_p19787 )
-	sys-libs/zlib
-	>=x11-libs/gtk+-2.14.7
-	x11-misc/xdg-utils
-	|| (
-		x11-themes/gnome-icon-theme
-		x11-themes/tango-icon-theme
-		x11-themes/xfce4-icon-theme
-	)"
-#	dev-db/sqlite:3
-DEPEND="${RDEPEND}
-	>=dev-util/gperf-3.0.3
-	>=dev-util/pkgconfig-0.23
-	sys-devel/flex"
-
-src_prepare() {
-	# Gentoo uses .kde4, not .kde
-	# TODO: this does not work with kdeprefix, fixing http:/crbug.com/29927
-	# would be better
-	sed -e 's/\.kde/.kde4/' -i net/proxy/proxy_config_service_linux.cc \
-		|| die "kde proxy sed failed"
-	# Changing this in ~/include.gypi does not work
-	sed -i "s/'-Werror'/''/" build/common.gypi || die "Werror sed failed"
-	# Prevent automatic -march=pentium4 -msse2 enabling on x86, http://crbug.com/9007
-	epatch "${FILESDIR}"/${PN}-drop_sse2.patch
-	# Allow use of MP3/MPEG-4 audio/video tags with our system ffmpeg
-	epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch
-
-	# Disable prefixing to allow linking against system zlib
-	sed -e '/^#include "mozzconf.h"$/d' \
-		-i third_party/{,WebKit/WebCore/platform/image-decoders}/zlib/zconf.h \
-		|| die "zlib sed failed"
-}
-
-src_configure() {
-	export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
-
-	# CFLAGS/LDFLAGS
-	mkdir -p "${S}"/.gyp
-	cat << EOF > "${S}"/.gyp/include.gypi
-{
-	'target_defaults': {
-		'cflags': [ '${CFLAGS// /','}' ],
-		'ldflags': [ '${LDFLAGS// /','}' ],
-	},
-}
-EOF
-	export HOME="${S}"
-
-	# Configuration options (system libraries)
-	local myconf="-Duse_system_zlib=1 -Duse_system_bzip2=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=1 -Duse_system_ffmpeg=1"
-	# -Duse_system_sqlite=1 : http://crbug.com/22208
-	# Others still bundled: icu (not possible?), hunspell (changes required for sandbox support)
-
-	# Sandbox paths
-	myconf="${myconf} -Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox -Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
-
-	if use amd64 ; then
-		myconf="${myconf} -Dtarget_arch=x64"
-	fi
-
-	if use x86 ; then
-		myconf="${myconf} -Dtarget_arch=ia32"
-	fi
-
-	if use arm; then
-		myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dv8_use_snapshot=false -Dlinux_use_tcmalloc=0"
-	fi
-
-	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then
-		myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44"
-	fi
-
-	build/gyp_chromium -f make build/all.gyp ${myconf} --depth=. || die "gyp failed"
-}
-
-src_compile() {
-	emake -r V=1 chrome chrome_sandbox BUILDTYPE=Release \
-		rootdir="${S}" \
-		CC=$(tc-getCC) \
-		CXX=$(tc-getCXX) \
-		AR=$(tc-getAR) \
-		RANLIB=$(tc-getRANLIB) \
-		|| die "compilation failed"
-}
-
-src_install() {
-	# Chromium does not have "install" target in the build system.
-	export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
-
-	dodir ${CHROMIUM_HOME}
-
-	exeinto ${CHROMIUM_HOME}
-	doexe out/Release/chrome
-	doexe out/Release/chrome_sandbox
-	fperms 4755 ${CHROMIUM_HOME}/chrome_sandbox
-	doexe out/Release/xdg-settings
-	doexe "${FILESDIR}"/chromium-launcher.sh
-
-	insinto ${CHROMIUM_HOME}
-	doins out/Release/chrome.pak
-
-	doins -r out/Release/locales
-	doins -r out/Release/resources
-
-	# chrome.1 is for chromium --help
-	newman out/Release/chrome.1 chrome.1
-	newman out/Release/chrome.1 chromium.1
-
-	if use ffmpeg; then
-		# Chromium looks for these in its folder
-		# See media_posix.cc and base_paths_linux.cc
-		dosym /usr/$(get_libdir)/libavcodec.so.52 ${CHROMIUM_HOME}
-		dosym /usr/$(get_libdir)/libavformat.so.52 ${CHROMIUM_HOME}
-		dosym /usr/$(get_libdir)/libavutil.so.50 ${CHROMIUM_HOME}
-	fi
-
-	# Plugins symlink
-	dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins
-
-	newicon out/Release/product_logo_48.png ${PN}-browser.png
-	dosym ${CHROMIUM_HOME}/chromium-launcher.sh /usr/bin/chromium
-	make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser"
-	sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \
-		|| die "desktop file sed failed"
-}
diff --git a/www-client/chromium/chromium-5.0.307.5.ebuild b/www-client/chromium/chromium-5.0.307.5.ebuild
index 7046455de0e0..7a1134965b51 100644
--- a/www-client/chromium/chromium-5.0.307.5.ebuild
+++ b/www-client/chromium/chromium-5.0.307.5.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-5.0.307.5.ebuild,v 1.2 2010/02/06 20:18:24 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.307.5.ebuild,v 1.3 2010/02/08 11:28:31 phajdan.jr Exp $
 
 EAPI="2"
 inherit eutils multilib toolchain-funcs flag-o-matic
@@ -13,7 +13,7 @@ SRC_URI="mirror://gentoo/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="+ffmpeg"
+IUSE="+ffmpeg +plugins-symlink"
 
 RDEPEND="app-arch/bzip2
 	>=dev-libs/libevent-1.4.13
@@ -143,8 +143,10 @@ src_install() {
 		dosym /usr/$(get_libdir)/libavutil.so.50 ${CHROMIUM_HOME}
 	fi
 
-	# Plugins symlink
-	dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins
+	# Plugins symlink, optional wrt bug #301911
+	if use plugins-symlink; then
+		dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins
+	fi
 
 	# Icon and desktop entry
 	newicon out/Release/product_logo_48.png ${PN}-browser.png
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index 48627ff760be..1df31cb61573 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.25 2010/02/06 20:18:24 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.26 2010/02/08 11:28:31 phajdan.jr Exp $
 
 EAPI="2"
 inherit eutils multilib toolchain-funcs subversion flag-o-matic
@@ -14,7 +14,7 @@ EGCLIENT_REPO_URI="http://src.chromium.org/svn/trunk/src/"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE="+ffmpeg"
+IUSE="+ffmpeg +plugins-symlink"
 
 RDEPEND="app-arch/bzip2
 	>=dev-libs/libevent-1.4.13
@@ -187,8 +187,10 @@ src_install() {
 		dosym /usr/$(get_libdir)/libavutil.so.50 ${CHROMIUM_HOME}
 	fi
 
-	# Plugins symlink
-	dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins
+	# Plugins symlink, optional wrt bug #301911
+	if use plugins-symlink; then
+		dosym /usr/$(get_libdir)/nsbrowser/plugins ${CHROMIUM_HOME}/plugins
+	fi
 
 	# Icon and desktop entry
 	newicon out/Release/product_logo_48.png ${PN}-browser.png
diff --git a/www-client/chromium/metadata.xml b/www-client/chromium/metadata.xml
index 52e7cde2eeba..c8ec44bc8896 100644
--- a/www-client/chromium/metadata.xml
+++ b/www-client/chromium/metadata.xml
@@ -13,5 +13,6 @@
 	<longdescription>Chromium is the open-source web browser project behind Google Chrome</longdescription>
 	<use>
 		<flag name='ffmpeg'>Add support for HTML5 audio/video tags via <pkg>media-video/ffmpeg</pkg></flag>
+		<flag name='plugins-symlink'>Add support for system web browser plugins out of the box</flag>
 	</use>
 </pkgmetadata>