Version bump for beta channel release. Fix bug #334939 by Michal Gorny <gentoo@mgorny.alt.pl>. Remove old.

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

8 files changed, 28 insertions, 642 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 84f0de7bdfd0..9ff193507a53 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,16 @@
 # 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.167 2010/08/26 03:54:09 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.168 2010/08/28 18:10:20 phajdan.jr Exp $
+
+*chromium-6.0.472.51 (28 Aug 2010)
+
+  28 Aug 2010; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  -chromium-5.0.375.125.ebuild, -chromium-6.0.472.36.ebuild,
+  -chromium-6.0.472.41.ebuild, +chromium-6.0.472.51.ebuild,
+  -chromium-6.0.495.0.ebuild, chromium-7.0.503.1.ebuild,
+  chromium-9999.ebuild:
+  Version bump for beta channel release. Fix bug #334939 by Michal Gorny
+  <gentoo@mgorny.alt.pl>. Remove old.
 
 *chromium-7.0.503.1 (26 Aug 2010)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index bf27fc13c948..44ebe5bfda0e 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -10,18 +10,12 @@ AUX chromium-plugins-path-r0.patch 1043 RMD160 698a8562c866e046b1adf8553894ee08a
 AUX chromium-yuv-crash-r0.patch 2043 RMD160 df3fd74f22c412b60915634e8fbc5a68e87e0b34 SHA1 b6948f6fedba5b5ed1aad44d1186e1213b74a531 SHA256 75b32a8e4f287d417930f4856c21e1b08c53fdf501df5312c346bc70425c9e65
 AUX chromium-yuv-crash-r1.patch 2165 RMD160 913447ead01a2bbf07b3698ee2f776fb027c7ecc SHA1 ab3a4170e1b55be4c4b797d209b62e3b8165142a SHA256 d38b8956a428fe6e87b46400ea9fa39be87b1a1cd8f42cf63649ff806fd0afe6
 AUX chromium.xml 390 RMD160 6b2f901da76555a7112f71a6f9dae6e2e3307324 SHA1 81148a0b094bc697ff2c9d33efe976b1bffb72a3 SHA256 a81c6257346eaa4f6389fc9ea8834fd2dd3b006cf4e9e999028aca812d76fe9a
-DIST chromium-5.0.375.125.tar.bz2 163277364 RMD160 89a5e3656287ba89b2a24b6b9b9832a74530c8fe SHA1 7377d2acbef0b2823406c9c0a5b4e39e47aab5f3 SHA256 a3f957bfd4c7418782b0b15aca8b1ca46a2c84bb0d258965f4709fab7290fd94
 DIST chromium-5.0.375.127.tar.bz2 163270882 RMD160 c1ebb4c214299de291067e6afd430207da1ca5c7 SHA1 a680d73fa6812660403c8127461d138b4617e2ef SHA256 b74cb0671d3a930bcccb177f072b5c6e4e51be46166b52e99a692bdeaffbc494
-DIST chromium-6.0.472.36.tar.bz2 123693958 RMD160 6467b0ba8ef0d40c03639a693a3bbecabcc44e25 SHA1 b4bc745dd0ed754c8b949188fddcbd72ef6224de SHA256 4a98962b30804187609731906a894fc5de60b143345b07805ad831d5927722c5
-DIST chromium-6.0.472.41.tar.bz2 124032341 RMD160 e73639bd1e43aaadcd6d447c9b99e05557f4d831 SHA1 958b1f25aa1de91312d08e2b15edaf107829f69b SHA256 e7bbc551e96667853ec43f18e7cecb20bbbfaa5a949001343c086a7c12cbda79
-DIST chromium-6.0.495.0.tar.bz2 124158633 RMD160 6ca42d029c30120d11dd2212b3f4b5ffd62bb9d6 SHA1 8202ce04b15fe5403a1e733babce48e3fc086f29 SHA256 8c2a8944790310c9b806ce23ee65888092f536d77d40d36519e930e8ff699687
+DIST chromium-6.0.472.51.tar.bz2 123966975 RMD160 c463cc33125bd9f3f678eefe35d310a76dedacda SHA1 090e232ff65482dff9d8ead1fac2a4a236a8c338 SHA256 2cb87c2af2542793c677211d5ae529486303e1960a90f7e751564c27cfe2b882
 DIST chromium-7.0.503.1.tar.bz2 127233310 RMD160 4d99a7fb8a30e4c97b972f2685f759da5d23b1af SHA1 f7613b4a078ca0ed8924173d994700b6cbdb2210 SHA256 17acda2dd849d1dee5f575847880b4d2b1ff21dfe6f0ae5c3ec00d30e23afc09
-EBUILD chromium-5.0.375.125.ebuild 5387 RMD160 dd089fb5b4332c0503a45d260c3ae3f0a805acd7 SHA1 4f49d131c499100aa36264a20b668021a1e0eec9 SHA256 4f470d73f600a78f72221c9378b7b2fe22bb87a678f257539cc022f75436c4b0
 EBUILD chromium-5.0.375.127.ebuild 5388 RMD160 8fbd9d9c5fd250c34264b0d1df47dae7032f6d73 SHA1 da2b6074d41cb77cc3714f7347268d036bfc2aa3 SHA256 a0d5a008691c43c773825310bb52872cbefe57e76e5cc986055e290d1a0029cb
-EBUILD chromium-6.0.472.36.ebuild 6888 RMD160 347fd77b66fab3fa35357846fa5c2159520d62ba SHA1 2dc964de8cdcfab36e4d8ef7b04ad4a20f237e85 SHA256 5cfc664a5dfb931a603998d92b7606c4a23d4ad3ac146527842d9e77d0aeba44
-EBUILD chromium-6.0.472.41.ebuild 6888 RMD160 806baf6fd6466b0a4a3c1b01eee48d73851b3238 SHA1 77b6a488b4753e986a1a1860bf5860493c19135d SHA256 c1c422e36ef14c1332acc7685998bbba4a3e58047248885144c77099d807cdc4
-EBUILD chromium-6.0.495.0.ebuild 6715 RMD160 e980073c1d1c11fb076f680f6fbfb094950646cf SHA1 a1ee76e2c78cfd196ed6da8615193c904a9673ff SHA256 52403d829e262fcd917dae28b97f945535e1546b0af5ed5a6f6671a7cfc90068
-EBUILD chromium-7.0.503.1.ebuild 6710 RMD160 519cad9effca498267a5fe00a19d29b0958c2e51 SHA1 bd2347be9ad3708e7fb56213b201c32f1dc9426d SHA256 340cea0e0b7ef4fb9e33d91489279a163c0ff5b020d00787c1d521ebfaf5888f
-EBUILD chromium-9999.ebuild 8467 RMD160 f42559c2dee8166d55b479ee9df00d00e14195df SHA1 203abc0e4202a31b49c321b79894bc8d0cb90898 SHA256 f45c8d5093b6db4dc22be7449f3c972c5643cd637cf6092897d408404ffd91e4
-MISC ChangeLog 36633 RMD160 994f0fc03261834d803cd7d6ca061fbb21955d3d SHA1 3a4ff6251ffc3fee719afb811a11fff9f94f8ede SHA256 430f893950bac937da288d60ce2dd72d1213d1fd5da0e3a6773d1f024addde07
+EBUILD chromium-6.0.472.51.ebuild 6914 RMD160 cec3e2d815e2dd10ad17b930c2a200c117506f66 SHA1 280ce1049712ac680250e1ad94d04c620699140a SHA256 c1ba07eeb411d505d75fad447cde2c1d054057188d497896a8a4cada426d38e7
+EBUILD chromium-7.0.503.1.ebuild 6742 RMD160 1539fd985f9d27d903c414a8708fee2b09d83fcf SHA1 1bbeb817ad466c4f4a1959582733dcb7773228f9 SHA256 f774b02cdf14391e2ff4d0412ad346767ec24102f5b2ef81c01187abe633812e
+EBUILD chromium-9999.ebuild 8499 RMD160 8c2bf9261cceb7566192f6132a5f72ec583ab8cd SHA1 f4866343bf6bf8e533249eb8394eb9b28d475536 SHA256 64207a29a173c71798cc9729358ca96749f7bd8069d1d6fc6b74d1ce05519935
+MISC ChangeLog 37038 RMD160 a0608f6e9da8dddd2a9e384ba33a73d8a39d388a SHA1 1bf8089ce6dac0b42e4c1c6b26173f9bfc5531a2 SHA256 9eaff38ed00fb90790cdad3e1cb629faa1fd71fb1ee8a8c36c2b1e9959d321fa
 MISC metadata.xml 378 RMD160 3309b2d1fb60157d0da1e22070ba3c448bd46b74 SHA1 0a8d13bb94e9836a14255b724b738c5df1f8ed7e SHA256 7d02fdca1b3c68d1202c720f1987713c28e38b1f9f3e30cbc3138c000572f08e
diff --git a/www-client/chromium/chromium-5.0.375.125.ebuild b/www-client/chromium/chromium-5.0.375.125.ebuild
deleted file mode 100644
index 70d2c023ae91..000000000000
--- a/www-client/chromium/chromium-5.0.375.125.ebuild
+++ /dev/null
@@ -1,170 +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.375.125.ebuild,v 1.4 2010/07/31 15:59:41 truedfx Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic multilib pax-utils 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="+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[threads]
-	sys-libs/zlib
-	>=x11-libs/gtk+-2.14.7
-	x11-libs/libXScrnSaver"
-#	dev-db/sqlite:3
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	>=dev-util/gperf-3.0.3
-	>=dev-util/pkgconfig-0.23
-	sys-devel/flex"
-RDEPEND+="
-	|| (
-		x11-themes/gnome-icon-theme
-		x11-themes/oxygen-molecule
-		x11-themes/tango-icon-theme
-		x11-themes/xfce4-icon-theme
-	)
-	x11-apps/xmessage
-	x11-misc/xdg-utils
-	virtual/ttf-fonts"
-
-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.
-	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
-}
-
-src_configure() {
-	export CHROMIUM_HOME=/usr/$(get_libdir)/chromium-browser
-
-	# Workaround for bug #318969.
-	# TODO: remove when http://crbug.com/43778 is fixed.
-	append-flags -D__STDC_CONSTANT_MACROS
-
-	# Fails to build on arm if we don't do this
-	use arm && append-flags -fno-tree-sink
-
-	# 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"
-
-	# Disable the V8 snapshot. It breaks the build on hardened (bug #301880),
-	# and the performance gain isn't worth it.
-	myconf="${myconf} -Dv8_use_snapshot=0"
-
-	# Disable tcmalloc memory allocator. It causes problems,
-	# for example bug #320419.
-	myconf="${myconf} -Dlinux_use_tcmalloc=0"
-
-	# Disable gpu rendering, it is incompatible with nvidia-drivers,
-	# bug #319331.
-	myconf="${myconf} -Denable_gpu=0"
-
-	# Use target arch detection logic from bug #296917.
-	local myarch="$ABI"
-	[[ $myarch = "" ]] && myarch="$ARCH"
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf="${myconf} -Dtarget_arch=x64"
-	elif [[ $myarch = x86 ]] ; then
-		myconf="${myconf} -Dtarget_arch=ia32"
-	elif [[ $myarch = arm ]] ; then
-		myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then
-		myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44"
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf="${myconf} -Dwerror="
-
-	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}
-	pax-mark m out/Release/chrome
-	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-6.0.472.41.ebuild b/www-client/chromium/chromium-6.0.472.41.ebuild
deleted file mode 100644
index be75e9b1ec42..000000000000
--- a/www-client/chromium/chromium-6.0.472.41.ebuild
+++ /dev/null
@@ -1,226 +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-6.0.472.41.ebuild,v 1.1 2010/08/21 05:23:12 phajdan.jr Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic multilib pax-utils 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="cups gnome sse2"
-
-RDEPEND="app-arch/bzip2
-	>=dev-libs/libevent-1.4.13
-	>=dev-libs/nss-3.12.3
-	>=gnome-base/gconf-2.24.0
-	gnome? ( >=gnome-base/gnome-keyring-2.28.2 )
-	>=media-libs/alsa-lib-1.0.19
-	media-libs/jpeg:0
-	media-libs/libpng
-	cups? ( >=net-print/cups-1.4.4 )
-	sys-libs/zlib
-	>=x11-libs/gtk+-2.14.7
-	x11-libs/libXScrnSaver"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	>=dev-util/gperf-3.0.3
-	>=dev-util/pkgconfig-0.23
-	>=gnome-base/gnome-keyring-2.28.2
-	sys-devel/flex"
-RDEPEND+="
-	|| (
-		x11-themes/gnome-icon-theme
-		x11-themes/oxygen-molecule
-		x11-themes/tango-icon-theme
-		x11-themes/xfce4-icon-theme
-	)
-	x11-apps/xmessage
-	x11-misc/xdg-utils
-	virtual/ttf-fonts"
-
-get_chromium_home() {
-	echo "/usr/$(get_libdir)/chromium-browser"
-}
-
-remove_bundled_lib() {
-	einfo "Removing bundled library $1 ..."
-	local out
-	out="$(find $1 -mindepth 1 \! -iname '*.gyp' -print -delete)" \
-		|| die "failed to remove bundled library $1"
-	if [[ -z $out ]]; then
-		die "no files matched when removing bundled library $1"
-	fi
-}
-
-src_prepare() {
-	# Fix compilation, bug #332131.
-	epatch "${FILESDIR}"/${PN}-make-3.82-compatibility-r0.patch
-
-	# Add Gentoo plugin paths.
-	epatch "${FILESDIR}"/${PN}-plugins-path-r0.patch
-
-	remove_bundled_lib "third_party/bzip2"
-	remove_bundled_lib "third_party/codesighs"
-	remove_bundled_lib "third_party/cros"
-	remove_bundled_lib "third_party/jemalloc"
-	remove_bundled_lib "third_party/lcov"
-	remove_bundled_lib "third_party/libevent"
-	remove_bundled_lib "third_party/libjpeg"
-	remove_bundled_lib "third_party/libpng"
-	remove_bundled_lib "third_party/lzma_sdk"
-	remove_bundled_lib "third_party/molokocacao"
-	remove_bundled_lib "third_party/ocmock"
-	remove_bundled_lib "third_party/py"
-	remove_bundled_lib "third_party/pyftpdlib"
-	remove_bundled_lib "third_party/simplejson"
-	remove_bundled_lib "third_party/tlslite"
-	# TODO: also remove third_party/libxml and third_party/libxslt when
-	# http://crbug.com/29333 is fixed.
-	# TODO: also remove third_party/zlib. For now the compilation fails if we
-	# remove it (minizip-related).
-}
-
-src_configure() {
-	local myconf=""
-
-	# Make it possible to build chromium on non-sse2 systems.
-	if use sse2; then
-		myconf="${myconf} -Ddisable_sse2=0"
-	else
-		myconf="${myconf} -Ddisable_sse2=1"
-	fi
-
-	# Use system-provided libraries.
-	# TODO: use_system_ffmpeg (http://crbug.com/50678).
-	# TODO: use_system_libxml (http://crbug.com/29333).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-	# TODO: use_system_icu, use_system_hunspell (upstream changes needed).
-	# TODO: use_system_ssl when we have a recent enough system NSS.
-	myconf="${myconf}
-		-Duse_system_bzip2=1
-		-Duse_system_libevent=1
-		-Duse_system_libjpeg=1
-		-Duse_system_libpng=1
-		-Duse_system_zlib=1"
-
-	# The dependency on cups is optional, see bug #324105.
-	if use cups; then
-		myconf="${myconf} -Duse_cups=1"
-	else
-		myconf="${myconf} -Duse_cups=0"
-	fi
-
-	if use gnome; then
-		myconf="${myconf} -Dlinux_link_gnome_keyring=1"
-	else
-		# TODO: we should also disable code trying to dlopen
-		# gnome-keyring in that case.
-		myconf="${myconf} -Dlinux_link_gnome_keyring=0"
-	fi
-
-	# Enable sandbox.
-	myconf="${myconf}
-		-Dlinux_sandbox_path=$(get_chromium_home)/chrome_sandbox
-		-Dlinux_sandbox_chrome_path=$(get_chromium_home)/chrome"
-
-	# Disable the V8 snapshot. It breaks the build on hardened (bug #301880),
-	# and the performance gain isn't worth it.
-	myconf="${myconf} -Dv8_use_snapshot=0"
-
-	# Disable tcmalloc memory allocator. It causes problems,
-	# for example bug #320419.
-	myconf="${myconf} -Dlinux_use_tcmalloc=0"
-
-	# Disable gpu rendering, it is incompatible with nvidia-drivers,
-	# bug #319331.
-	myconf="${myconf} -Denable_gpu=0"
-
-	# Use target arch detection logic from bug #296917.
-	local myarch="$ABI"
-	[[ $myarch = "" ]] && myarch="$ARCH"
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf="${myconf} -Dtarget_arch=x64"
-	elif [[ $myarch = x86 ]] ; then
-		myconf="${myconf} -Dtarget_arch=ia32"
-	elif [[ $myarch = arm ]] ; then
-		# TODO: check this again after
-		# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39509 is fixed.
-		append-flags -fno-tree-sink
-
-		myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then
-		myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44"
-	fi
-
-	# Work around a likely GCC bug, see bug #331945.
-	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "45" ]]; then
-		append-flags -fno-ipa-cp
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf="${myconf} -Dwerror="
-
-	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() {
-	dodir "$(get_chromium_home)"
-
-	exeinto "$(get_chromium_home)"
-	pax-mark m out/Release/chrome
-	doexe out/Release/chrome
-	doexe out/Release/chrome_sandbox
-	fperms 4755 "$(get_chromium_home)/chrome_sandbox"
-	doexe out/Release/xdg-settings
-	doexe "${FILESDIR}"/chromium-launcher.sh
-
-	insinto "$(get_chromium_home)"
-	doins out/Release/chrome.pak || die "installing chrome.pak failed"
-	doins out/Release/resources.pak || die "installing resources.pak failed"
-
-	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
-
-	doexe out/Release/ffmpegsumo_nolink || die
-	doexe out/Release/libffmpegsumo.so || die
-
-	# Install icon and desktop entry.
-	newicon out/Release/product_logo_48.png ${PN}-browser.png
-	dosym "$(get_chromium_home)/chromium-launcher.sh" /usr/bin/chromium
-	make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser" \
-		"MimeType=text/html;text/xml;application/xhtml+xml;"
-	sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \
-		|| die "desktop file sed failed"
-
-	# Install GNOME default application entry (bug #303100).
-	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-6.0.472.36.ebuild b/www-client/chromium/chromium-6.0.472.51.ebuild
index 3b13a607c3da..0f31af748d51 100644
--- a/www-client/chromium/chromium-6.0.472.36.ebuild
+++ b/www-client/chromium/chromium-6.0.472.51.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-6.0.472.36.ebuild,v 1.1 2010/08/17 01:14:27 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-6.0.472.51.ebuild,v 1.1 2010/08/28 18:10:20 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -13,13 +13,13 @@ SRC_URI="http://build.chromium.org/buildbot/official/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cups gnome sse2"
+IUSE="cups gnome-keyring sse2"
 
 RDEPEND="app-arch/bzip2
 	>=dev-libs/libevent-1.4.13
 	>=dev-libs/nss-3.12.3
 	>=gnome-base/gconf-2.24.0
-	gnome? ( >=gnome-base/gnome-keyring-2.28.2 )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 )
 	>=media-libs/alsa-lib-1.0.19
 	media-libs/jpeg:0
 	media-libs/libpng
@@ -116,7 +116,7 @@ src_configure() {
 		myconf="${myconf} -Duse_cups=0"
 	fi
 
-	if use gnome; then
+	if use "gnome-keyring"; then
 		myconf="${myconf} -Dlinux_link_gnome_keyring=1"
 	else
 		# TODO: we should also disable code trying to dlopen
diff --git a/www-client/chromium/chromium-6.0.495.0.ebuild b/www-client/chromium/chromium-6.0.495.0.ebuild
deleted file mode 100644
index 00ac8344d51c..000000000000
--- a/www-client/chromium/chromium-6.0.495.0.ebuild
+++ /dev/null
@@ -1,222 +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-6.0.495.0.ebuild,v 1.2 2010/08/19 20:03:17 wired Exp $
-
-EAPI="2"
-
-inherit eutils flag-o-matic multilib pax-utils 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="cups gnome sse2"
-
-RDEPEND="app-arch/bzip2
-	>=dev-libs/libevent-1.4.13
-	>=dev-libs/nss-3.12.3
-	>=gnome-base/gconf-2.24.0
-	gnome? ( >=gnome-base/gnome-keyring-2.28.2 )
-	>=media-libs/alsa-lib-1.0.19
-	media-libs/jpeg:0
-	media-libs/libpng
-	cups? ( >=net-print/cups-1.4.4 )
-	sys-libs/zlib
-	>=x11-libs/gtk+-2.14.7
-	x11-libs/libXScrnSaver"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	>=dev-util/gperf-3.0.3
-	>=dev-util/pkgconfig-0.23
-	>=gnome-base/gnome-keyring-2.28.2
-	sys-devel/flex"
-RDEPEND+="
-	|| (
-		x11-themes/gnome-icon-theme
-		x11-themes/oxygen-molecule
-		x11-themes/tango-icon-theme
-		x11-themes/xfce4-icon-theme
-	)
-	x11-apps/xmessage
-	x11-misc/xdg-utils
-	virtual/ttf-fonts"
-
-get_chromium_home() {
-	echo "/usr/$(get_libdir)/chromium-browser"
-}
-
-remove_bundled_lib() {
-	einfo "Removing bundled library $1 ..."
-	local out
-	out="$(find $1 -mindepth 1 \! -iname '*.gyp' -print -delete)" \
-		|| die "failed to remove bundled library $1"
-	if [[ -z $out ]]; then
-		die "no files matched when removing bundled library $1"
-	fi
-}
-
-src_prepare() {
-	# Add Gentoo plugin paths.
-	epatch "${FILESDIR}"/${PN}-plugins-path-r0.patch
-
-	# gcc 4.5 patch - bug #333345
-	epatch "${FILESDIR}"/"${P}"-gcc-4.5.patch
-
-	remove_bundled_lib "third_party/bzip2"
-	remove_bundled_lib "third_party/codesighs"
-	remove_bundled_lib "third_party/cros"
-	remove_bundled_lib "third_party/jemalloc"
-	remove_bundled_lib "third_party/lcov"
-	remove_bundled_lib "third_party/libevent"
-	remove_bundled_lib "third_party/libjpeg"
-	remove_bundled_lib "third_party/libpng"
-	remove_bundled_lib "third_party/lzma_sdk"
-	remove_bundled_lib "third_party/molokocacao"
-	remove_bundled_lib "third_party/ocmock"
-	remove_bundled_lib "third_party/pyftpdlib"
-	remove_bundled_lib "third_party/simplejson"
-	remove_bundled_lib "third_party/tlslite"
-	# TODO: also remove third_party/libxml and third_party/libxslt when
-	# http://crbug.com/29333 is fixed.
-	# TODO: also remove third_party/zlib. For now the compilation fails if we
-	# remove it (minizip-related).
-}
-
-src_configure() {
-	local myconf=""
-
-	# Make it possible to build chromium on non-sse2 systems.
-	if use sse2; then
-		myconf="${myconf} -Ddisable_sse2=0"
-	else
-		myconf="${myconf} -Ddisable_sse2=1"
-	fi
-
-	# Use system-provided libraries.
-	# TODO: use_system_ffmpeg (http://crbug.com/50678).
-	# TODO: use_system_libxml (http://crbug.com/29333).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-	# TODO: use_system_icu, use_system_hunspell (upstream changes needed).
-	# TODO: use_system_ssl when we have a recent enough system NSS.
-	myconf="${myconf}
-		-Duse_system_bzip2=1
-		-Duse_system_libevent=1
-		-Duse_system_libjpeg=1
-		-Duse_system_libpng=1
-		-Duse_system_zlib=1"
-
-	# The dependency on cups is optional, see bug #324105.
-	if use cups; then
-		myconf="${myconf} -Duse_cups=1"
-	else
-		myconf="${myconf} -Duse_cups=0"
-	fi
-
-	if use gnome; then
-		myconf="${myconf} -Dlinux_link_gnome_keyring=1"
-	else
-		# TODO: we should also disable code trying to dlopen
-		# gnome-keyring in that case.
-		myconf="${myconf} -Dlinux_link_gnome_keyring=0"
-	fi
-
-	# Enable sandbox.
-	myconf="${myconf}
-		-Dlinux_sandbox_path=$(get_chromium_home)/chrome_sandbox
-		-Dlinux_sandbox_chrome_path=$(get_chromium_home)/chrome"
-
-	# Disable the V8 snapshot. It breaks the build on hardened (bug #301880),
-	# and the performance gain isn't worth it.
-	myconf="${myconf} -Dv8_use_snapshot=0"
-
-	# Disable tcmalloc memory allocator. It causes problems,
-	# for example bug #320419.
-	myconf="${myconf} -Dlinux_use_tcmalloc=0"
-
-	# Use target arch detection logic from bug #296917.
-	local myarch="$ABI"
-	[[ $myarch = "" ]] && myarch="$ARCH"
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf="${myconf} -Dtarget_arch=x64"
-	elif [[ $myarch = x86 ]] ; then
-		myconf="${myconf} -Dtarget_arch=ia32"
-	elif [[ $myarch = arm ]] ; then
-		# TODO: check this again after
-		# http://gcc.gnu.org/bugzilla/show_bug.cgi?id=39509 is fixed.
-		append-flags -fno-tree-sink
-
-		myconf="${myconf} -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "44" ]]; then
-		myconf="${myconf} -Dno_strict_aliasing=1 -Dgcc_version=44"
-	fi
-
-	# Work around a likely GCC bug, see bug #331945.
-	if [[ "$(gcc-major-version)$(gcc-minor-version)" == "45" ]]; then
-		append-flags -fno-ipa-cp
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf="${myconf} -Dwerror="
-
-	build/gyp_chromium -f make build/all.gyp ${myconf} --depth=. || die "gyp failed"
-}
-
-src_compile() {
-	emake -r V=1 chrome chrome_sandbox BUILDTYPE=Release \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		RANLIB="$(tc-getRANLIB)" \
-		|| die "compilation failed"
-}
-
-src_install() {
-	dodir "$(get_chromium_home)"
-
-	exeinto "$(get_chromium_home)"
-	pax-mark m out/Release/chrome
-	doexe out/Release/chrome
-	doexe out/Release/chrome_sandbox
-	fperms 4755 "$(get_chromium_home)/chrome_sandbox"
-	doexe out/Release/xdg-settings
-	doexe "${FILESDIR}"/chromium-launcher.sh
-
-	insinto "$(get_chromium_home)"
-	doins out/Release/chrome.pak || die "installing chrome.pak failed"
-	doins out/Release/resources.pak || die "installing resources.pak failed"
-
-	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
-
-	doexe out/Release/ffmpegsumo_nolink || die
-	doexe out/Release/libffmpegsumo.so || die
-
-	# Install icon and desktop entry.
-	newicon out/Release/product_logo_48.png ${PN}-browser.png
-	dosym "$(get_chromium_home)/chromium-launcher.sh" /usr/bin/chromium
-	make_desktop_entry chromium "Chromium" ${PN}-browser "Network;WebBrowser" \
-		"MimeType=text/html;text/xml;application/xhtml+xml;"
-	sed -e "/^Exec/s/$/ %U/" -i "${D}"/usr/share/applications/*.desktop \
-		|| die "desktop file sed failed"
-
-	# Install GNOME default application entry (bug #303100).
-	if use gnome; then
-		dodir /usr/share/gnome-control-center/default-apps
-		insinto /usr/share/gnome-control-center/default-apps
-		doins "${FILESDIR}"/chromium.xml
-	fi
-}
diff --git a/www-client/chromium/chromium-7.0.503.1.ebuild b/www-client/chromium/chromium-7.0.503.1.ebuild
index 191608402803..615c806e3a30 100644
--- a/www-client/chromium/chromium-7.0.503.1.ebuild
+++ b/www-client/chromium/chromium-7.0.503.1.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.503.1.ebuild,v 1.1 2010/08/26 03:54:09 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-7.0.503.1.ebuild,v 1.2 2010/08/28 18:10:20 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -13,14 +13,14 @@ SRC_URI="http://build.chromium.org/buildbot/official/${P}.tar.bz2"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="cups gnome sse2"
+IUSE="cups gnome gnome-keyring sse2"
 
 RDEPEND="app-arch/bzip2
 	>=dev-libs/icu-4.4.1
 	>=dev-libs/libevent-1.4.13
 	>=dev-libs/nss-3.12.3
 	>=gnome-base/gconf-2.24.0
-	gnome? ( >=gnome-base/gnome-keyring-2.28.2 )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 )
 	>=media-libs/alsa-lib-1.0.19
 	media-libs/jpeg:0
 	media-libs/libpng
@@ -115,7 +115,7 @@ src_configure() {
 		myconf="${myconf} -Duse_cups=0"
 	fi
 
-	if use gnome; then
+	if use "gnome-keyring"; then
 		myconf="${myconf} -Dlinux_link_gnome_keyring=1"
 	else
 		# TODO: we should also disable code trying to dlopen
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index 06088ca08c19..629abfaea9e4 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.79 2010/08/26 03:54:09 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.80 2010/08/28 18:10:20 phajdan.jr Exp $
 
 EAPI="2"
 
@@ -15,14 +15,14 @@ EGCLIENT_REPO_URI="http://src.chromium.org/svn/trunk/src/"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS=""
-IUSE="cups gnome sse2"
+IUSE="cups gnome gnome-keyring sse2"
 
 RDEPEND="app-arch/bzip2
 	>=dev-libs/icu-4.4.1
 	>=dev-libs/libevent-1.4.13
 	>=dev-libs/nss-3.12.3
 	>=gnome-base/gconf-2.24.0
-	gnome? ( >=gnome-base/gnome-keyring-2.28.2 )
+	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 )
 	>=media-libs/alsa-lib-1.0.19
 	media-libs/jpeg:0
 	media-libs/libpng
@@ -160,7 +160,7 @@ src_configure() {
 		myconf="${myconf} -Duse_cups=0"
 	fi
 
-	if use gnome; then
+	if use "gnome-keyring"; then
 		myconf="${myconf} -Dlinux_link_gnome_keyring=1"
 	else
 		# TODO: we should also disable code trying to dlopen