Version bump for beta channel relase. Fix bug #315667 by Joel

<Joel7987@gmail.com>, used suggestion by Constantine D. Kardaris
<ckardaris@gmail.com>. Fix bug #318511 by cyrillic
<cyrilmaley@hotmail.com>, used suggestion by truedfx. Fix bug #318573 by
flameeyes, also note useful comment there by Reimar Doeffinger
<Reimar.Doeffinger@gmx.de>.
Package-Manager: portage-2.1.8.3/cvs/Linux i686

9 files changed, 74 insertions, 367 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index e8960a184a83..6a4099843934 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,20 @@
 # 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.96 2010/05/07 08:37:53 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.97 2010/05/11 11:23:48 phajdan.jr Exp $
+
+*chromium-5.0.375.38 (11 May 2010)
+
+  11 May 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-5.0.342.9.ebuild, -chromium-5.0.375.23.ebuild,
+  +chromium-5.0.375.38.ebuild, chromium-5.0.396.0.ebuild,
+  chromium-9999.ebuild, -files/chromium-fix-make-build.patch,
+  -files/chromium-gcc45.patch, files/chromium-launcher.sh:
+  Version bump for beta channel relase. Fix bug #315667 by Joel
+  <Joel7987@gmail.com>, used suggestion by Constantine D. Kardaris
+  <ckardaris@gmail.com>. Fix bug #318511 by cyrillic
+  <cyrilmaley@hotmail.com>, used suggestion by truedfx. Fix bug #318573 by
+  flameeyes, also note useful comment there by Reimar Doeffinger
+  <Reimar.Doeffinger@gmx.de>. Remove old and clean up patches.
 
 *chromium-5.0.396.0 (07 May 2010)
 
@@ -218,7 +232,7 @@
   -chromium-5.0.307.5.ebuild, +chromium-5.0.335.0.ebuild:
   Version bump for dev channel release. Remove old.
 
-  23 Feb 2010; Raúl Porcel <armin76@gentoo.org> chromium-5.0.322.2.ebuild,
+  23 Feb 2010; Raúl Porcel <armin76@gentoo.org> chromium-5.0.322.2.ebuild,
   chromium-9999.ebuild:
   Add fix for arm build
 
@@ -289,7 +303,7 @@
   Dev channel release bump, also include gnome default-apps file from pacho
   in bug #303100
 
-  01 Feb 2010; Raúl Porcel <armin76@gentoo.org> chromium-4.0.302.2.ebuild,
+  01 Feb 2010; Raúl Porcel <armin76@gentoo.org> chromium-4.0.302.2.ebuild,
   chromium-9999.ebuild:
   Fix build on arm
 
@@ -338,11 +352,11 @@
   +chromium-4.0.302.2.ebuild:
   Version bump for dev channel release. Remove old.
 
-  22 Jan 2010; Raúl Porcel <armin76@gentoo.org>
+  22 Jan 2010; Raúl Porcel <armin76@gentoo.org>
   -files/chromium-drop_armel_m32.patch, chromium-9999.ebuild:
   Drop unneded arm patch
 
-  18 Jan 2010; Raúl Porcel <armin76@gentoo.org> chromium-4.0.266.0.ebuild,
+  18 Jan 2010; Raúl Porcel <armin76@gentoo.org> chromium-4.0.266.0.ebuild,
   chromium-4.0.288.1.ebuild, chromium-4.0.295.0.ebuild:
   Add ~arm
 
@@ -371,11 +385,11 @@
   +chromium-4.0.288.1.ebuild:
   Version bump for dev channel release.
 
-  07 Jan 2010; Raúl Porcel <armin76@gentoo.org>
+  07 Jan 2010; Raúl Porcel <armin76@gentoo.org>
   +files/chromium-drop_armel_m32.patch, chromium-9999.ebuild:
   Add patch to fix build on ARM, enable v8 build on ARM
 
-  25 Dec 2009; Raúl Porcel <armin76@gentoo.org> chromium-4.0.266.0.ebuild,
+  25 Dec 2009; Raúl Porcel <armin76@gentoo.org> chromium-4.0.266.0.ebuild,
   chromium-9999.ebuild:
   Add arm support, but don't keyword it as its still a big buggy
 
@@ -440,7 +454,7 @@
   Version bump, enables bookmarks sync (with --enable-sync), and fix menu
   location for adblock+ extension
 
-  15 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org> chromium-9999.ebuild:
+  15 Nov 2009; Tomáš Chvátal <scarabeus@gentoo.org> chromium-9999.ebuild:
   QA: Drop keywords on live ebuilds.
 
   09 Nov 2009; Bernard Cafarelli <voyageur@gentoo.org>
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index b87c6ad17c97..eebebc363032 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,20 +1,16 @@
 AUX chromium-20100122-ubuntu-html5-video-mimetypes.patch 1228 RMD160 69157e703e14138cc838ae26191ef42116f3f614 SHA1 f9bac7a6840c060c921119051cd724b7b53ff2fd SHA256 d6f8e5dabf8b55c3fb9ae58920807758e5d1aa76f536efc6f53949208a567566
 AUX chromium-drop_sse2-r0.patch 1387 RMD160 5be0a252d4e99064e2cc5ba3fce33a5f525ba785 SHA1 a356549db631a7b147bf0046be8ab09d88874f15 SHA256 f035f196eea72855cf37d269810f4f99a5f348b7b8d7aaf537e35a11d6e1f1df
 AUX chromium-drop_sse2.patch 1560 RMD160 285a13c5a0d73b8cdadf8012adfb182a85392af8 SHA1 1aa9701b329d970db00726ba883d7dd5448ba372 SHA256 2da9ffbbaff5d00045b49ae75658df3c9f536543d388caff7a18ff093a0b1cd6
-AUX chromium-fix-make-build.patch 677 RMD160 b0dd0057d6f28e5d79b0bd9fd45b8e7cb79cbfcf SHA1 c7a7bf5fe81349f077a15458d66d53e1aa523f33 SHA256 8de8636ceedcbf0dc4f8494f48fd78baf261ef9334efe359d7e99bc668193c9e
-AUX chromium-gcc45.patch 655 RMD160 6d5ac8895dda520c5d1cc364a60a80b7576b1fa7 SHA1 fff6afa5c013b5c5efdb43c10262a4a09f024518 SHA256 b66ee24f118ef760c5279837897e3d2af5230b779543248466bf7c4f77cc5357
-AUX chromium-launcher.sh 602 RMD160 e01a871fbe36224aa24b6c448cdad8eb3c3b3f22 SHA1 b35dae7032a2967a1be5814cb442a245a9a166e7 SHA256 a9aa84e924e592b85e58a3ce5b245f34637180000f52ef3b615dd4e9a56a602b
+AUX chromium-launcher.sh 1097 RMD160 6a35819d6ae463d1614ecd5976fe8aeae1a3519e SHA1 93b8259fe9ddf6914faa9a4cdbaf451a97031228 SHA256 9d16e2afe508c33aa987001a0442696eaefd5cf91e7a6c9eeb900bc9824390c9
 AUX chromium-libpng-1.4.patch 749 RMD160 1c024286ea635e393d12ed7a04c0412f8a47506b SHA1 e96283b523a14e8fb369838b35051c8ba0cc6f96 SHA256 b92ba935589f01b28a4ddeb5fd7fd42f8f643eaf1e24cafc2458d97fa1489d8e
 AUX chromium-supported-media-mime-types.patch 1016 RMD160 9b3fad22b90e4bea62e343c807349b1a7fce66f5 SHA1 5308bf7b3d0a0743031b089f4931c75c6696e46b SHA256 b396a3104d2dd3cfa8b9489072b565429d11634c0fce453861455b6b829c3ea3
 AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a0b094bc697ff2c9d33efe976b1bffb72a3 SHA256 a81c6257346eaa4f6389fc9ea8834fd2dd3b006cf4e9e999028aca812d76fe9a
-DIST chromium-5.0.342.9.tar.bz2 155586284 RMD160 5ab3df8b19383c21d6279a96aa2e0c20074d58a2 SHA1 1823e1932fd68414042a3b5fc4537107ed3998bc SHA256 89a8072fc738afb7d6c5136f91deeeaa39de3d5285f3f471014af95038681903
-DIST chromium-5.0.375.23.tar.bz2 161814334 RMD160 139573ba251c4e1a99b0649091b0d52b9553322e SHA1 78bdf22b065bc7da56534f1f0d5d1356694fb260 SHA256 145341c01f81bd64f6ff3e9f762c1aff46206f714d81b3fab7ef8bd178e00140
 DIST chromium-5.0.375.29.tar.bz2 161965067 RMD160 fcdc113d014f2a58e6ba40d7e352db0dce42bdf3 SHA1 1484a1295853e7a021278e897b11f845603e5e04 SHA256 26616b68fb69257216d8d229669246704c8401c97409e5e5b13394a50f4e3f1b
+DIST chromium-5.0.375.38.tar.bz2 163360507 RMD160 fcb75ca4aa61e81378c45005601bd292a6ae19c8 SHA1 557df642958846a25e92fe00e1fe46e7d78adc05 SHA256 26912fdf57e32b2d859af45631a6797bb83af42d62b4cc94c3625382712d8ac2
 DIST chromium-5.0.396.0.tar.bz2 168297098 RMD160 b941e1e94483ae35f61d71e6a15f50ac96a57002 SHA1 ec53faddff39b09dfc9609c7b61042cc91a5f405 SHA256 08b89b9ead59114b2c53a462e42032da53f9e2e024ae77318fbdfb1f7415fcff
-EBUILD chromium-5.0.342.9.ebuild 6548 RMD160 abb9d41541d252a60a61641ea76f6f7b1298bbcf SHA1 7f4e1c7f970b8f7a50247f27ca89bda3f064bb2a SHA256 6845b8905a1376ba8ec24ea09276d05b89d3b3c4da136d385260a4170b9e9d29
-EBUILD chromium-5.0.375.23.ebuild 6436 RMD160 d0d01d6761e605408d9d3bc07f66b33dc3f4407b SHA1 2eda56005b7f6b465497f62f548ab251d2a41f6b SHA256 504816c00293dab6da66b27740a7710fcb0328f6a0162176dd68757e0a773721
 EBUILD chromium-5.0.375.29.ebuild 6436 RMD160 189b59588b8be4b9cc73f17843f565f31533e071 SHA1 eda8acc93eae49d8748cac49fcbf8f55203c8243 SHA256 72220d7c31cd7c378e0e3113c379519d35ac7cd1ade061b61c284598755db65e
-EBUILD chromium-5.0.396.0.ebuild 6249 RMD160 f33e6fb2928e93eceeaa33a37e126937c1cf61fc SHA1 f08e46bdf95f23205993c365f94d66517ebdb323 SHA256 1ab516c2333b9b7be05621910c4f78b06b46976c31ae4746d9b338226f714e34
-EBUILD chromium-9999.ebuild 8000 RMD160 2dd685a3b089b0aa070db70a7cd27d50778b8375 SHA1 1e150dbc1c1961c12473f73201f956fcfc235571 SHA256 597d44c1dff5153a6c3c04f19d4a22f6d02a1465c5238214f413418e4415d877
-MISC ChangeLog 21886 RMD160 a3aed19cea2d5ea506715fb9fc369e846a7cd4b9 SHA1 75e91f2c7615f09d83ad7e36dca41779cba9dd56 SHA256 31756cc1e7d42fda4a73b55b8a972fa45c9fca1f2e00b6df5423d4bb1e177bf6
+EBUILD chromium-5.0.375.38.ebuild 5440 RMD160 f51212584075bf894458925729b9beaced45a941 SHA1 4ef358d10c68640cc13f52368cccc27f29f02659 SHA256 fa002da09aa98a98c6c27e7e1ba02d82fabe44fb7f0c811a35c6376224b7dd45
+EBUILD chromium-5.0.396.0.ebuild 5253 RMD160 a77c0ec95c5987fc48624a588eb4af956a52a126 SHA1 14576bcb0c9818777691dcfad63336ba6e280805 SHA256 b1613e582d974bb5ced25681e395d9da4e55787340a096618f337213d8345c96
+EBUILD chromium-9999.ebuild 7006 RMD160 8daf2b57042d039463fc8192bc4aa12fa9a81a4f SHA1 30453619741233cf1503892279c95de69f6eeafa SHA256 ee2fb89ab346e638851100bff6f3bd8494672db751cac1fd47ba36e29c47cfbf
+MISC ChangeLog 22621 RMD160 422ca2d60d7a76c4a380283cb4eec50cf2813f6f SHA1 82b8016f12881a377b396ceef13c8e60aa88eca4 SHA256 a21b157069f14de065101854e9aa61fffed4347f8d35bac74e1ea847a0142f0d
 MISC metadata.xml 572 RMD160 458a635f4040d8552b46256c8437099608041b99 SHA1 6ed49919f57f709065cf06c148f1df68119a3b3f SHA256 4a433c3dadf06af7e3dca492ffaa3f26a6c4419de61a044609e2d528891e09a5
diff --git a/www-client/chromium/chromium-5.0.342.9.ebuild b/www-client/chromium/chromium-5.0.342.9.ebuild
deleted file mode 100644
index 1e7723b4a934..000000000000
--- a/www-client/chromium/chromium-5.0.342.9.ebuild
+++ /dev/null
@@ -1,209 +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-5.0.342.9.ebuild,v 1.3 2010/04/26 11:43:49 voyageur Exp $
-
-EAPI="2"
-inherit eutils flag-o-matic multilib portability toolchain-funcs
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="http://build.chromium.org/buildbot/official/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bindist +plugins-symlink"
-
-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
-	>=media-video/ffmpeg-0.5_p21602[threads]
-	sys-libs/zlib
-	>=x11-libs/gtk+-2.14.7
-	x11-libs/libXScrnSaver"
-#	dev-db/sqlite:3
-DEPEND="${RDEPEND}
-	>=dev-util/gperf-3.0.3
-	>=dev-util/pkgconfig-0.23
-	sys-devel/flex"
-RDEPEND+="
-	|| (
-		x11-themes/gnome-icon-theme
-		x11-themes/tango-icon-theme
-		x11-themes/xfce4-icon-theme
-	)
-	x11-misc/xdg-utils
-	virtual/ttf-fonts"
-
-# Incompatible system plugins:
-# www-plugins/gecko-mediaplayer, bug #309231.
-RDEPEND+="
-	plugins-symlink? (
-		!www-plugins/gecko-mediaplayer[gnome]
-	)"
-
-pkg_setup() {
-	if [[ "${ROOT}" == "/" ]]; then
-		# Prevent user problems like bug 299777.
-		if ! grep -q /dev/shm <<< $(get_mounts); then
-			eerror "You don't have tmpfs mounted at /dev/shm."
-			eerror "${PN} isn't going to work in that configuration."
-			eerror "Please uncomment the /dev/shm entry in /etc/fstab,"
-			eerror "run 'mount /dev/shm' and try again."
-			die "/dev/shm is not mounted"
-		fi
-		if [ `stat -c %a /dev/shm` -ne 1777 ]; then
-			eerror "/dev/shm does not have correct permissions."
-			eerror "${PN} isn't going to work in that configuration."
-			eerror "Please run chmod 1777 /dev/shm and try again."
-			die "/dev/shm has incorrect permissions"
-		fi
-	fi
-
-	elog "${PN} might crash occasionally. To get more useful backtraces"
-	elog "and submit better bug reports, please read"
-	elog "http://www.gentoo.org/proj/en/qa/backtraces.xml"
-
-	if ! use bindist; then
-		einfo
-		elog "You may not redistribute this build to any users on your network"
-		elog "or the internet."
-		elog "You can disable it by emerging ${PN} _with_ the bindist USE-flag"
-	fi
-}
-
-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
-	if ! use bindist; then
-		# Allow use of MP3/MPEG-4 audio/video tags with our system ffmpeg
-		epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch
-	fi
-	# Fix build failure with libpng-1.4, bug 310959.
-	epatch "${FILESDIR}"/${PN}-libpng-1.4.patch
-	# GCC 4.5 support, bug #317155
-	epatch "${FILESDIR}"/${PN}-gcc45.patch
-
-	# Prevent the make build from filling entire disk space on some systems,
-	# bug 297273.
-	epatch "${FILESDIR}"/${PN}-fix-make-build.patch
-
-	# Disable prefixing to allow linking against system zlib
-	sed -e '/^#include "mozzconf.h"$/d' \
-		-i third_party/zlib/zconf.h \
-		|| die "zlib sed failed"
-}
-
-src_configure() {
-	export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
-
-	# Fails to build on arm if we don't do this
-	use arm && append-flags -fno-tree-sink
-
-	# 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_ffmpeg=1 -Duse_system_libevent=1 -Duse_system_libjpeg=1 -Duse_system_libpng=1 -Duse_system_libxml=1 -Duse_system_libxslt=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 -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
-
-	# 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}
-
-	# 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
-	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"
-	# Gnome default application entry
-	dodir /usr/share/gnome-control-center/default-apps
-	insinto /usr/share/gnome-control-center/default-apps
-	doins "${FILESDIR}"/chromium.xml
-}
diff --git a/www-client/chromium/chromium-5.0.375.23.ebuild b/www-client/chromium/chromium-5.0.375.38.ebuild
index 8f17598aa16e..bde3f7e8026f 100644
--- a/www-client/chromium/chromium-5.0.375.23.ebuild
+++ b/www-client/chromium/chromium-5.0.375.38.ebuild
@@ -1,9 +1,10 @@
 # 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.375.23.ebuild,v 1.2 2010/04/29 10:48:09 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.375.38.ebuild,v 1.1 2010/05/11 11:23:48 phajdan.jr Exp $
 
 EAPI="2"
-inherit eutils flag-o-matic multilib portability toolchain-funcs
+
+inherit eutils flag-o-matic multilib pax-utils toolchain-funcs
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="http://chromium.org/"
@@ -12,7 +13,7 @@ SRC_URI="http://build.chromium.org/buildbot/official/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="mp3 +plugins-symlink x264"
+IUSE="+plugins-symlink"
 
 RDEPEND="app-arch/bzip2
 	>=dev-libs/libevent-1.4.13
@@ -23,7 +24,7 @@ RDEPEND="app-arch/bzip2
 	>=media-libs/alsa-lib-1.0.19
 	media-libs/jpeg:0
 	media-libs/libpng
-	>=media-video/ffmpeg-0.5_p21602[mp3=,threads,x264=]
+	>=media-video/ffmpeg-0.5_p21602[threads]
 	sys-libs/zlib
 	>=x11-libs/gtk+-2.14.7
 	x11-libs/libXScrnSaver"
@@ -40,6 +41,7 @@ RDEPEND+="
 		x11-themes/tango-icon-theme
 		x11-themes/xfce4-icon-theme
 	)
+	x11-apps/xmessage
 	x11-misc/xdg-utils
 	virtual/ttf-fonts"
 
@@ -50,35 +52,12 @@ RDEPEND+="
 		!www-plugins/gecko-mediaplayer[gnome]
 	)"
 
-pkg_setup() {
-	if [[ "${ROOT}" == "/" ]]; then
-		# Prevent user problems like bug 299777.
-		if ! grep -q /dev/shm <<< $(get_mounts); then
-			eerror "You don't have tmpfs mounted at /dev/shm."
-			eerror "${PN} isn't going to work in that configuration."
-			eerror "Please uncomment the /dev/shm entry in /etc/fstab,"
-			eerror "run 'mount /dev/shm' and try again."
-			die "/dev/shm is not mounted"
-		fi
-		if [ `stat -c %a /dev/shm` -ne 1777 ]; then
-			eerror "/dev/shm does not have correct permissions."
-			eerror "${PN} isn't going to work in that configuration."
-			eerror "Please run chmod 1777 /dev/shm and try again."
-			die "/dev/shm has incorrect permissions"
-		fi
-	fi
-
-	elog "${PN} might crash occasionally. To get more useful backtraces"
-	elog "and submit better bug reports, please read"
-	elog "http://www.gentoo.org/proj/en/qa/backtraces.xml"
-}
-
 src_prepare() {
 	# Prevent automatic -march=pentium4 -msse2 enabling on x86, http://crbug.com/9007
 	epatch "${FILESDIR}"/${PN}-drop_sse2-r0.patch
 
-	# Allow supporting more media types provided system ffmpeg supports them.
-	epatch "${FILESDIR}"/${PN}-supported-media-mime-types.patch
+	# Allow supporting more media types.
+	epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch
 
 	# Fix build failure with libpng-1.4, bug 310959.
 	epatch "${FILESDIR}"/${PN}-libpng-1.4.patch
@@ -90,14 +69,6 @@ src_configure() {
 	# Fails to build on arm if we don't do this
 	use arm && append-flags -fno-tree-sink
 
-	if use mp3 ; then
-		append-cflags -DGENTOO_CHROMIUM_MP3_ENABLED
-	fi
-
-	if use x264 ; then
-		append-cflags -DGENTOO_CHROMIUM_H264_ENABLED
-	fi
-
 	# CFLAGS/LDFLAGS
 	mkdir -p "${S}"/.gyp || die "cflags mkdir failed"
 	cat << EOF > "${S}"/.gyp/include.gypi || die "cflags cat failed"
@@ -165,6 +136,7 @@ src_install() {
 	dodir ${CHROMIUM_HOME}
 
 	exeinto ${CHROMIUM_HOME}
+	pax-mark m out/Release/chrome
 	doexe out/Release/chrome
 	doexe out/Release/chrome_sandbox
 	fperms 4755 ${CHROMIUM_HOME}/chrome_sandbox
diff --git a/www-client/chromium/chromium-5.0.396.0.ebuild b/www-client/chromium/chromium-5.0.396.0.ebuild
index 94eb15b5ba7c..73089e3d0740 100644
--- a/www-client/chromium/chromium-5.0.396.0.ebuild
+++ b/www-client/chromium/chromium-5.0.396.0.ebuild
@@ -1,9 +1,10 @@
 # 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.396.0.ebuild,v 1.1 2010/05/07 08:37:53 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-5.0.396.0.ebuild,v 1.2 2010/05/11 11:23:48 phajdan.jr Exp $
 
 EAPI="2"
-inherit eutils flag-o-matic multilib portability toolchain-funcs
+
+inherit eutils flag-o-matic multilib pax-utils toolchain-funcs
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="http://chromium.org/"
@@ -12,7 +13,7 @@ SRC_URI="http://build.chromium.org/buildbot/official/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="mp3 +plugins-symlink x264"
+IUSE="+plugins-symlink"
 
 RDEPEND="app-arch/bzip2
 	>=dev-libs/libevent-1.4.13
@@ -23,7 +24,7 @@ RDEPEND="app-arch/bzip2
 	>=media-libs/alsa-lib-1.0.19
 	media-libs/jpeg:0
 	media-libs/libpng
-	>=media-video/ffmpeg-0.5_p21602[mp3=,threads,x264=]
+	>=media-video/ffmpeg-0.5_p21602[threads]
 	sys-libs/zlib
 	>=x11-libs/gtk+-2.14.7
 	x11-libs/libXScrnSaver"
@@ -40,6 +41,7 @@ RDEPEND+="
 		x11-themes/tango-icon-theme
 		x11-themes/xfce4-icon-theme
 	)
+	x11-apps/xmessage
 	x11-misc/xdg-utils
 	virtual/ttf-fonts"
 
@@ -50,32 +52,9 @@ RDEPEND+="
 		!www-plugins/gecko-mediaplayer[gnome]
 	)"
 
-pkg_setup() {
-	if [[ "${ROOT}" == "/" ]]; then
-		# Prevent user problems like bug 299777.
-		if ! grep -q /dev/shm <<< $(get_mounts); then
-			eerror "You don't have tmpfs mounted at /dev/shm."
-			eerror "${PN} isn't going to work in that configuration."
-			eerror "Please uncomment the /dev/shm entry in /etc/fstab,"
-			eerror "run 'mount /dev/shm' and try again."
-			die "/dev/shm is not mounted"
-		fi
-		if [ `stat -c %a /dev/shm` -ne 1777 ]; then
-			eerror "/dev/shm does not have correct permissions."
-			eerror "${PN} isn't going to work in that configuration."
-			eerror "Please run chmod 1777 /dev/shm and try again."
-			die "/dev/shm has incorrect permissions"
-		fi
-	fi
-
-	elog "${PN} might crash occasionally. To get more useful backtraces"
-	elog "and submit better bug reports, please read"
-	elog "http://www.gentoo.org/proj/en/qa/backtraces.xml"
-}
-
 src_prepare() {
-	# Allow supporting more media types provided system ffmpeg supports them.
-	epatch "${FILESDIR}"/${PN}-supported-media-mime-types.patch
+	# Allow supporting more media types.
+	epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch
 }
 
 src_configure() {
@@ -84,14 +63,6 @@ src_configure() {
 	# Fails to build on arm if we don't do this
 	use arm && append-flags -fno-tree-sink
 
-	if use mp3 ; then
-		append-cflags -DGENTOO_CHROMIUM_MP3_ENABLED
-	fi
-
-	if use x264 ; then
-		append-cflags -DGENTOO_CHROMIUM_H264_ENABLED
-	fi
-
 	# CFLAGS/LDFLAGS
 	mkdir -p "${S}"/.gyp || die "cflags mkdir failed"
 	cat << EOF > "${S}"/.gyp/include.gypi || die "cflags cat failed"
@@ -159,6 +130,7 @@ src_install() {
 	dodir ${CHROMIUM_HOME}
 
 	exeinto ${CHROMIUM_HOME}
+	pax-mark m out/Release/chrome
 	doexe out/Release/chrome
 	doexe out/Release/chrome_sandbox
 	fperms 4755 ${CHROMIUM_HOME}/chrome_sandbox
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index f451f8f8b376..afd570238988 100644
--- a/www-client/chromium/chromium-9999.ebuild
+++ b/www-client/chromium/chromium-9999.ebuild
@@ -1,9 +1,10 @@
 # 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.49 2010/05/05 12:33:26 voyageur Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.50 2010/05/11 11:23:48 phajdan.jr Exp $
 
 EAPI="2"
-inherit eutils flag-o-matic multilib portability subversion toolchain-funcs
+
+inherit eutils flag-o-matic multilib pax-utils subversion toolchain-funcs
 
 DESCRIPTION="Open-source version of Google Chrome web browser"
 HOMEPAGE="http://chromium.org/"
@@ -14,7 +15,7 @@ EGCLIENT_REPO_URI="http://src.chromium.org/svn/trunk/src/"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE="mp3 +plugins-symlink x264"
+IUSE="+plugins-symlink"
 
 RDEPEND="app-arch/bzip2
 	>=dev-libs/libevent-1.4.13
@@ -25,7 +26,7 @@ RDEPEND="app-arch/bzip2
 	>=media-libs/alsa-lib-1.0.19
 	media-libs/jpeg:0
 	media-libs/libpng
-	>=media-video/ffmpeg-0.5_p21602[mp3=,threads,x264=]
+	>=media-video/ffmpeg-0.5_p21602[threads]
 	sys-libs/zlib
 	>=x11-libs/gtk+-2.14.7
 	x11-libs/libXScrnSaver"
@@ -42,6 +43,7 @@ RDEPEND+="
 		x11-themes/tango-icon-theme
 		x11-themes/xfce4-icon-theme
 	)
+	x11-apps/xmessage
 	x11-misc/xdg-utils
 	virtual/ttf-fonts"
 
@@ -52,29 +54,6 @@ RDEPEND+="
 		!www-plugins/gecko-mediaplayer[gnome]
 	)"
 
-pkg_setup() {
-	if [[ "${ROOT}" == "/" ]]; then
-		# Prevent user problems like bug 299777.
-		if ! grep -q /dev/shm <<< $(get_mounts); then
-			eerror "You don't have tmpfs mounted at /dev/shm."
-			eerror "${PN} isn't going to work in that configuration."
-			eerror "Please uncomment the /dev/shm entry in /etc/fstab,"
-			eerror "run 'mount /dev/shm' and try again."
-			die "/dev/shm is not mounted"
-		fi
-		if [ `stat -c %a /dev/shm` -ne 1777 ]; then
-			eerror "/dev/shm does not have correct permissions."
-			eerror "${PN} isn't going to work in that configuration."
-			eerror "Please run chmod 1777 /dev/shm and try again."
-			die "/dev/shm has incorrect permissions"
-		fi
-	fi
-
-	elog "${PN} might crash occasionally. To get more useful backtraces"
-	elog "and submit better bug reports, please read"
-	elog "http://www.gentoo.org/proj/en/qa/backtraces.xml"
-}
-
 src_unpack() {
 	subversion_src_unpack
 	mv "${S}" "${WORKDIR}"/depot_tools
@@ -119,8 +98,8 @@ src_unpack() {
 }
 
 src_prepare() {
-	# Allow supporting more media types provided system ffmpeg supports them.
-	epatch "${FILESDIR}"/${PN}-supported-media-mime-types.patch
+	# Allow supporting more media types.
+	epatch "${FILESDIR}"/${PN}-20100122-ubuntu-html5-video-mimetypes.patch
 }
 
 src_configure() {
@@ -128,14 +107,6 @@ src_configure() {
 	# Fails to build on arm if we don't do this
 	use arm && append-flags -fno-tree-sink
 
-	if use mp3 ; then
-		append-cflags -DGENTOO_CHROMIUM_MP3_ENABLED
-	fi
-
-	if use x264 ; then
-		append-cflags -DGENTOO_CHROMIUM_H264_ENABLED
-	fi
-
 	# CFLAGS/LDFLAGS
 	mkdir -p "${S}"/.gyp || die "cflags mkdir failed"
 	cat << EOF > "${S}"/.gyp/include.gypi || die "cflags cat failed"
@@ -203,6 +174,7 @@ src_install() {
 	dodir ${CHROMIUM_HOME}
 
 	exeinto ${CHROMIUM_HOME}
+	pax-mark m out/Release/chrome
 	doexe out/Release/chrome
 	doexe out/Release/chrome_sandbox
 	fperms 4755 ${CHROMIUM_HOME}/chrome_sandbox
diff --git a/www-client/chromium/files/chromium-fix-make-build.patch b/www-client/chromium/files/chromium-fix-make-build.patch
deleted file mode 100644
index 675a158989ce..000000000000
--- a/www-client/chromium/files/chromium-fix-make-build.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff -ru ../chromium-5.0.322.2/tools/gyp/pylib/gyp/generator/make.py ./tools/gyp/pylib/gyp/generator/make.py
---- ../chromium-5.0.322.2/tools/gyp/pylib/gyp/generator/make.py	2010-01-25 23:04:11.000000000 +0100
-+++ ./tools/gyp/pylib/gyp/generator/make.py	2010-02-19 00:48:45.381303499 +0100
-@@ -148,9 +148,9 @@
- define fixup_dep
- sed -i -e "s|^$(notdir $@)|$@|" $(depfile).tmp
- sed -e "s|^[^:]*: *||" -e "s| *\\\\$$||" -e 's|^ *||' \
--    -e "/./s|$$|:|" $(depfile).tmp >> $(depfile).tmp
--cat $(depfile).tmp >> $(depfile)
--rm -f $(depfile).tmp
-+    -e "/./s|$$|:|" $(depfile).tmp > $(depfile).tmpXXX
-+cat $(depfile).tmpXXX >> $(depfile)
-+rm -f $(depfile).tmpXXX
- endef
- """
- """
diff --git a/www-client/chromium/files/chromium-gcc45.patch b/www-client/chromium/files/chromium-gcc45.patch
deleted file mode 100644
index 2438a1b515e1..000000000000
--- a/www-client/chromium/files/chromium-gcc45.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- chromium/sandbox/linux/seccomp/sandbox.cc
-+++ chromium/sandbox/linux/seccomp/sandbox.cc
-@@ -444,8 +444,8 @@
-   }
-   processFdPub_                  = pair[0];
-   cloneFdPub_                    = pair[2];
--  SecureMemArgs::Args* secureMem = createTrustedProcess(pair[0], pair[1],
--                                                        pair[2], pair[3]);
-+  SecureMemArgs* secureMem = createTrustedProcess(pair[0], pair[1],
-+                                                  pair[2], pair[3]);
- 
-   // We find all libraries that have system calls and redirect the system
-   // calls to the sandbox. If we miss any system calls, the application will be
diff --git a/www-client/chromium/files/chromium-launcher.sh b/www-client/chromium/files/chromium-launcher.sh
index 3c7f89c2d8c3..dc14abd6fe35 100644
--- a/www-client/chromium/files/chromium-launcher.sh
+++ b/www-client/chromium/files/chromium-launcher.sh
@@ -4,6 +4,25 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
+if ! grep -q /dev/shm /proc/mounts ; then
+	xmessage -file - <<EOF
+You don't have tmpfs mounted at /dev/shm.
+The browser isn't going to work in that configuration.
+Please uncomment the /dev/shm entry in /etc/fstab,
+run 'mount /dev/shm' and try again.
+EOF
+	exit 1
+fi
+
+if [ `stat -c %a /dev/shm` -ne 1777 ]; then
+	xmessage -file - <<EOF
+/dev/shm does not have correct permissions.
+The browser isn't going to work in that configuration.
+Please run chmod 1777 /dev/shm and try again.
+EOF
+	exit 1
+fi
+
 # Let the wrapped binary know that it has been run through the wrapper
 export CHROME_WRAPPER="`readlink -f "$0"`"