Prepare for gtk+-3.x (slotted dependencies). Remove old.

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

8 files changed, 22 insertions, 343 deletions

diff --git a/www-client/chromium-bin/Manifest b/www-client/chromium-bin/Manifest
index 8a5d701275c1..f1cfcd47bfa0 100644
--- a/www-client/chromium-bin/Manifest
+++ b/www-client/chromium-bin/Manifest
@@ -1,6 +1,6 @@
 AUX chromium.png 7266 RMD160 e9651563c5bb8021ef1c03a94f0a3da65eaac486 SHA1 8a83a66c09e282dd4b9428e653f7f41d5acf3184 SHA256 966fa6e9971b86ddec6a5dc9ff5f5ee08228c211ca76b2ed404b98a71b6612be
 DIST chromium-bin-amd64-9.0.597.84.tar.bz2 17515067 RMD160 438f99c8b41ae2b59d3d44662bb1436e81382bb0 SHA1 1f667562a8f83741168988ab085b38e8c13a8419 SHA256 fa33b93dd29948868629e30dd4ac2decb4468a68ab70187cc735de4722ef6acc
 DIST chromium-bin-x86-9.0.597.84.tar.bz2 16253465 RMD160 78b8626e03cd6be57aae3f7338e3f4a9927f572d SHA1 7ccdf5277bfbaec0940cb7268d56007e3fae9a25 SHA256 207ec711f714dd91796cbc0c8aced5fa650ddb42dee7309168c90a8379339999
-EBUILD chromium-bin-9.0.597.84.ebuild 2719 RMD160 4d3aaf8209ba8c923d1d1d2bdfcf63220954d5fd SHA1 6bb732f69e811d539049882d5666bc1632341d27 SHA256 2d175d8ed3b6fb2da0acf1e00574e3ae075c4c91e3136eae60fc6e4f626daaf2
-MISC ChangeLog 20184 RMD160 1ada6aed79c08dcea9f7946692e6dfac6bcc6dd1 SHA1 f6ac4fef5965e9468efbb4c48fed6b53eed62930 SHA256 b4a66942bb6cdfa937c4eeecdfed15f01e9175b24145789f3b372e9659796da3
+EBUILD chromium-bin-9.0.597.84.ebuild 2712 RMD160 d5e0c6118c555dc8d04248792fd059dc47e35df5 SHA1 f1e549dc6c3b76a8e7c61f8f8ab812b138031141 SHA256 5a599ddc98889ea08662ae56efbfb563e7d2d86554241332de527e2a1c0a1945
+MISC ChangeLog 20321 RMD160 8114c9c8f7aa4914b33de946017e9ebb080a74fb SHA1 fcf334b023729d10649f3e4e2468ee87ef60f099 SHA256 98d150dc1f1a6db71fdac5a6d15136cc314fb979bcbf31f1e9e3069676b02dbf
 MISC metadata.xml 268 RMD160 9ff00833163599f39e038e1c8eeeb8fb26075eb5 SHA1 c4dbfb9b12c89298993a09c1253a50a103cd34a6 SHA256 077e9bbbea232ae4b86f8b50510c40c3494c5e8e4f9ea1600dc349abeb489580
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index f13cf3265588..f71b1f3c5fe7 100644
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for www-client/chromium
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.291 2011/03/01 07:18:22 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.292 2011/03/01 07:23:50 phajdan.jr Exp $
+
+  01 Mar 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  chromium-9.0.597.107.ebuild, chromium-10.0.648.114.ebuild,
+  -chromium-11.0.672.2.ebuild, chromium-11.0.672.2-r2.ebuild,
+  chromium-9999.ebuild:
+  Prepare for gtk+-3.x (slotted dependencies). Remove old.
 
 *chromium-9.0.597.107 (01 Mar 2011)
 
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 13772903ce4a..b642cbe05e56 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -20,14 +20,13 @@ DIST chromium-11.0.672.2.tar.bz2 143663792 RMD160 963fe31fa7496dce30c523950fcaf2
 DIST chromium-9.0.597.107.tar.bz2 141198237 RMD160 7eec80b363fcc47b460e9a54c21940d309cc079d SHA1 4ebc93e202f87f724effb174459c3f5c2a10c9cd SHA256 1fde635017cd278e09242478de3469166dd89f93c95ce67acf8dfc67dddf8159
 DIST chromium-9.0.597.94.tar.bz2 140800844 RMD160 5816c28ddfaeb31c5b8aa882de2248c780f8cb0c SHA1 4a870da41ae25781e4806ec2c95703282fccc4d8 SHA256 7194d999a03bb54813cc49f978dd88f5b08cdd40cee4dcbe4ff5639c0ca3e8d5
 DIST chromium-9.0.597.98.tar.bz2 141115336 RMD160 5d0f3b83048363533919932a84a95fefd278cd42 SHA1 ea129fd68d78e84a573e25aef94a1f8697a22476 SHA256 48f7d849d3bfec40d6f7e5c76a964a36e9203127bafcb8068bcd63817c706d5f
-EBUILD chromium-10.0.648.114.ebuild 10038 RMD160 06b059657f5d9f69622d9e3d3406252c87ebd2ca SHA1 91bebb9a42c9f958d0080743075f3fbedc0ce81e SHA256 e38a033e0179b622f62ab6b37705c51f14ebd4bc46fe513ab76a5543e0883f4e
+EBUILD chromium-10.0.648.114.ebuild 10031 RMD160 b29572b822da7cec0dac5a73b8d32926816cd9f8 SHA1 38cfe7ee7e24901f2e19df70a302d156770358f3 SHA256 bd271c9215cf615c4753aad60a32abce3ebc1e6036d5d2a1638d7d30df44df23
 EBUILD chromium-10.0.648.82.ebuild 10037 RMD160 e88e2ee92669c5b8e0304eed35925f37bad781c1 SHA1 9d93878122e190a693dbf0d5c4ce62d95052a237 SHA256 5647ce435a464d3f876d4bacce3a8e7c7406ae18fa095f6b26b1440e365941c7
 EBUILD chromium-11.0.672.2-r1.ebuild 10539 RMD160 8cb2b99caa8a59f3a8411e49da0d14229f809321 SHA1 7ed8118282ba93aa5673adaab3455d59730c998e SHA256 d686c5233a0693c64799150507dd22eca36eb7ce7335c27da45f2f1e95764d1f
-EBUILD chromium-11.0.672.2-r2.ebuild 10653 RMD160 e0098dd7168936c117a88c42c4fd989790724e76 SHA1 c6e6d8ad6edd11f4f7c530506980b8695c904822 SHA256 f589cb3759b268bcd53e4b853d5ed3210eaed8dad9328b962b82cae70ec537fd
-EBUILD chromium-11.0.672.2.ebuild 10313 RMD160 99cb427b4aa0212b8844297dadab71902126f79f SHA1 b41bbfb6577841d7c044455137b95ca687fee050 SHA256 e342753b873a7407f786af30863158d32a00bfd47935203fb66eb8cd725319f7
-EBUILD chromium-9.0.597.107.ebuild 9109 RMD160 148ad0fa356ee23d7e624b76a243e83fd359a0cd SHA1 cd208ff6fd2bab866e0d3508114ffcc7b6dde478 SHA256 3c20b83dd6a404cf7f3c1ff42223b577c96d7eaee959643fb77880f40a5d6b43
+EBUILD chromium-11.0.672.2-r2.ebuild 10651 RMD160 0c0fa4be4ea93eddc0613c721d4c6f9a90041a63 SHA1 331452d5775fd0ff988c72aec45da31468b7b094 SHA256 9853e399adfe3bd0c66adf71ed25dcd5da2bb8491b9ce337e3a255982d87f85f
+EBUILD chromium-9.0.597.107.ebuild 9102 RMD160 af2775a7648123a9e66d21c3ac48523e5f2fe9c3 SHA1 1cfb9216eac4bcb70dfea92fbdcff4212522b2cf SHA256 aa0375d4dee9f9336c824019ef14e04430b0b625b509840539a1c2ea775b9c84
 EBUILD chromium-9.0.597.94.ebuild 9115 RMD160 2256e35af13b40686d634b586e091f60337942b5 SHA1 020d7ad4422ac6c6368a6bbda4046c774164007e SHA256 3d772bd92e13f79112a67196743dff420ad2bcaac1371c7dfcb448d2e87ba234
 EBUILD chromium-9.0.597.98.ebuild 9108 RMD160 6941b2d97130441aa454d4b75d281ef1b06eb843 SHA1 0881ab232a67e4645946acd4f75d31c3333f65c1 SHA256 dca284a5cd96af522542ce0eb493f23ab80097f28d0c0fc9292e5262c00478e5
-EBUILD chromium-9999.ebuild 12097 RMD160 234c5581371dde891acf951d9780c464f1d54b88 SHA1 c27b8889fdb09a5b9edcd17a6f687674b9a28d3a SHA256 45b4428e9934f419258f164a90d83e9410fbae54c0a48c5e401236978cc5667c
-MISC ChangeLog 64385 RMD160 cbb53f9e051c6b82f97001a86a01889172d6bb02 SHA1 66564780ee705e87a907c1c84365c0dcec72b09d SHA256 d7b001ac402c3628d86dcaf2da9aaa2897068173a0314b5b889d4d32e0b4a5a9
+EBUILD chromium-9999.ebuild 12095 RMD160 01d11e34ba93dcab1c84c6672417a6df4cd11816 SHA1 1a2d10f6b5b077efadc742406f13762dc954e010 SHA256 afd15f3ae6c48acb439ff6d7cb163641be4762286de746358d53aa6de0302028
+MISC ChangeLog 64647 RMD160 3cb776c6e83467a655eea422f25ab87b76436602 SHA1 b38a76f4f96f7f669906d9513adb5965b2744c17 SHA256 cf84d1afc0c663b0cf723ca3fdfb5535eb73a2f63fbceb645469e0badfbf7226
 MISC metadata.xml 483 RMD160 f460db8d828791caa3496ad57a3c059a89912cf8 SHA1 2de8750f401b4e1f427545b5310a98716d719638 SHA256 ebc3ca0074799466d0f7485e6afca1dcd0a0ecf5768b3c2f9aabe64a1ec52759
diff --git a/www-client/chromium/chromium-10.0.648.114.ebuild b/www-client/chromium/chromium-10.0.648.114.ebuild
index 40e802d6096d..6405e0d259b9 100644
--- a/www-client/chromium/chromium-10.0.648.114.ebuild
+++ b/www-client/chromium/chromium-10.0.648.114.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-10.0.648.114.ebuild,v 1.1 2011/02/24 10:34:33 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-10.0.648.114.ebuild,v 1.2 2011/03/01 07:23:50 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -37,7 +37,7 @@ RDEPEND="app-arch/bzip2
 	>=media-video/ffmpeg-0.6_p25767[threads]
 	cups? ( >=net-print/cups-1.3.11 )
 	sys-libs/zlib
-	>=x11-libs/gtk+-2.14.7
+	x11-libs/gtk+:2
 	x11-libs/libXScrnSaver
 	x11-libs/libXtst"
 DEPEND="${RDEPEND}
diff --git a/www-client/chromium/chromium-11.0.672.2-r2.ebuild b/www-client/chromium/chromium-11.0.672.2-r2.ebuild
index d74019950cea..06de8ccca442 100644
--- a/www-client/chromium/chromium-11.0.672.2-r2.ebuild
+++ b/www-client/chromium/chromium-11.0.672.2-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-11.0.672.2-r2.ebuild,v 1.1 2011/02/25 10:37:57 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-11.0.672.2-r2.ebuild,v 1.2 2011/03/01 07:23:50 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -37,7 +37,7 @@ RDEPEND="app-arch/bzip2
 	>=media-video/ffmpeg-0.6_p25767[threads]
 	cups? ( >=net-print/cups-1.3.11 )
 	sys-libs/zlib
-	>=x11-libs/gtk+-2.14.7
+	x11-libs/gtk+:2
 	x11-libs/libXScrnSaver
 	x11-libs/libXtst"
 DEPEND="${RDEPEND}
diff --git a/www-client/chromium/chromium-11.0.672.2.ebuild b/www-client/chromium/chromium-11.0.672.2.ebuild
deleted file mode 100644
index 1867ce1fb2a4..000000000000
--- a/www-client/chromium/chromium-11.0.672.2.ebuild
+++ /dev/null
@@ -1,326 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-11.0.672.2.ebuild,v 1.2 2011/02/22 18:24:22 phajdan.jr Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.6"
-V8_DEPEND="3.1.4"
-
-inherit eutils flag-o-matic multilib pax-utils portability python \
-	toolchain-funcs versionator virtualx
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="http://chromium.org/"
-SRC_URI="http://build.chromium.org/official/${P}.tar.bz2"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cups +gecko-mediaplayer gnome gnome-keyring"
-
-RDEPEND="app-arch/bzip2
-	>=dev-lang/v8-${V8_DEPEND}
-	dev-libs/dbus-glib
-	>=dev-libs/icu-4.4.1
-	>=dev-libs/libevent-1.4.13
-	dev-libs/libxml2[icu]
-	dev-libs/libxslt
-	>=dev-libs/nss-3.12.3
-	gnome? ( >=gnome-base/gconf-2.24.0 )
-	gnome-keyring? ( >=gnome-base/gnome-keyring-2.28.2 )
-	>=media-libs/alsa-lib-1.0.19
-	media-libs/flac
-	virtual/jpeg
-	media-libs/libpng
-	media-libs/libvpx
-	media-libs/speex
-	>=media-video/ffmpeg-0.6_p25767[threads]
-	cups? ( >=net-print/cups-1.3.11 )
-	sys-libs/zlib
-	>=x11-libs/gtk+-2.14.7
-	x11-libs/libXScrnSaver
-	x11-libs/libXtst"
-DEPEND="${RDEPEND}
-	dev-lang/perl
-	>=dev-util/chromium-tools-0.1.4
-	>=dev-util/gperf-3.0.3
-	>=dev-util/pkgconfig-0.23
-	sys-devel/flex
-	>=sys-devel/make-3.81-r2"
-RDEPEND+="
-	|| (
-		x11-themes/gnome-icon-theme
-		x11-themes/xfce4-icon-theme
-	)
-	x11-misc/xdg-utils
-	virtual/ttf-fonts
-	gecko-mediaplayer? ( !www-plugins/gecko-mediaplayer[gnome] )"
-
-egyp() {
-	set -- build/gyp_chromium --depth=. "${@}"
-	echo "${@}" >&2
-	"${@}"
-}
-
-pkg_setup() {
-	CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX RANLIB
-
-	# Make sure the build system will use the right python, bug #344367.
-	python_set_active_version 2
-	python_pkg_setup
-
-	# Prevent user problems like bug #299777.
-	if ! grep -q /dev/shm <<< $(get_mounts); then
-		ewarn "You don't have tmpfs mounted at /dev/shm."
-		ewarn "${PN} may fail to start in that configuration."
-		ewarn "Please uncomment the /dev/shm entry in /etc/fstab,"
-		ewarn "and run 'mount /dev/shm'."
-	fi
-	if [ `stat -c %a /dev/shm` -ne 1777 ]; then
-		ewarn "/dev/shm does not have correct permissions."
-		ewarn "${PN} may fail to start in that configuration."
-		ewarn "Please run 'chmod 1777 /dev/shm'."
-	fi
-
-	# Prevent user problems like bug #348235.
-	eshopts_push -s extglob
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		ewarn "You have enabled debug info (probably have -g or -ggdb in your \$C{,XX}FLAGS)."
-		ewarn "You may experience really long compilation times and/or increased memory usage."
-		ewarn "If compilation fails, please try removing -g{,gdb} before reporting a bug."
-	fi
-	eshopts_pop
-}
-
-src_prepare() {
-	# Enable optional support for gecko-mediaplayer.
-	epatch "${FILESDIR}"/${PN}-gecko-mediaplayer-r1.patch
-
-	# Make sure we don't use bundled libvpx headers.
-	epatch "${FILESDIR}"/${PN}-system-vpx-r2.patch
-
-	# Make sure we don't use bundled FLAC.
-	epatch "${FILESDIR}"/${PN}-system-flac-r0.patch
-
-	# Remove most bundled libraries. Some are still needed.
-	find third_party -type f \! -iname '*.gyp*' \
-		\! -path 'third_party/WebKit/*' \
-		\! -path 'third_party/angle/*' \
-		\! -path 'third_party/cacheinvalidation/*' \
-		\! -path 'third_party/cld/*' \
-		\! -path 'third_party/expat/*' \
-		\! -path 'third_party/ffmpeg/*' \
-		\! -path 'third_party/flac/flac.h' \
-		\! -path 'third_party/gpsd/*' \
-		\! -path 'third_party/harfbuzz/*' \
-		\! -path 'third_party/hunspell/*' \
-		\! -path 'third_party/iccjpeg/*' \
-		\! -path 'third_party/launchpad_translations/*' \
-		\! -path 'third_party/libjingle/*' \
-		\! -path 'third_party/libsrtp/*' \
-		\! -path 'third_party/libwebp/*' \
-		\! -path 'third_party/mesa/*' \
-		\! -path 'third_party/modp_b64/*' \
-		\! -path 'third_party/npapi/*' \
-		\! -path 'third_party/openmax/*' \
-		\! -path 'third_party/ots/*' \
-		\! -path 'third_party/protobuf/*' \
-		\! -path 'third_party/skia/*' \
-		\! -path 'third_party/speex/speex.h' \
-		\! -path 'third_party/sqlite/*' \
-		\! -path 'third_party/tcmalloc/*' \
-		\! -path 'third_party/undoview/*' \
-		\! -path 'third_party/zlib/contrib/minizip/*' \
-		-delete || die
-
-	# Provide our own gyp file to use system flac.
-	# TODO: move this upstream.
-	cp "${FILESDIR}/flac.gyp" "third_party/flac" || die
-
-	# Check for the maintainer to ensure that the dependencies
-	# are up-to-date.
-	local v8_bundled="$(v8-extract-version v8/src/version.cc)"
-	if [ "${V8_DEPEND}" != "${v8_bundled}" ]; then
-		die "update v8 dependency to ${v8_bundled}"
-	fi
-
-	# Remove bundled v8.
-	find v8 -type f \! -iname '*.gyp*' -delete || die
-
-	# Disable experimental extensions incompatible with system-provided V8,
-	# bug #354343.
-	cp "${FILESDIR}/experimental.gyp" "v8/src/extensions/experimental" || die
-	sed -e 's/ENABLE_JAVASCRIPT_I18N_API=1/ENABLE_JAVASCRIPT_I18N_API=0/g' \
-		-i build/features_override.gypi || die
-
-	# The implementation files include v8 headers with full path,
-	# like #include "v8/include/v8.h". Make sure the system headers
-	# will be used.
-	# TODO: find a solution that can be upstreamed.
-	rmdir v8/include || die
-	ln -s /usr/include v8/include || die
-
-	# Make sure the build system will use the right python, bug #344367.
-	# Only convert directories that need it, to save time.
-	python_convert_shebangs -q -r 2 build tools
-}
-
-src_configure() {
-	local myconf=""
-
-	# Never tell the build system to "enable" SSE2, it has a few unexpected
-	# additions, bug #336871.
-	myconf+=" -Ddisable_sse2=1"
-
-	# Use system-provided libraries.
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_ssl (http://crbug.com/58087).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-	myconf+="
-		-Duse_system_bzip2=1
-		-Duse_system_ffmpeg=1
-		-Duse_system_icu=1
-		-Duse_system_libevent=1
-		-Duse_system_libjpeg=1
-		-Duse_system_libpng=1
-		-Duse_system_libxml=1
-		-Duse_system_speex=1
-		-Duse_system_v8=1
-		-Duse_system_vpx=1
-		-Duse_system_xdg_utils=1
-		-Duse_system_zlib=1"
-
-	# The dependency on cups is optional, see bug #324105.
-	if use cups; then
-		myconf+=" -Duse_cups=1"
-	else
-		myconf+=" -Duse_cups=0"
-	fi
-
-	# Make GConf dependency optional, http://crbug.com/13322.
-	if use gnome; then
-		myconf+=" -Duse_gconf=1"
-	else
-		myconf+=" -Duse_gconf=0"
-	fi
-
-	if use "gnome-keyring"; then
-		myconf+=" -Duse_gnome_keyring=1 -Dlinux_link_gnome_keyring=1"
-	else
-		# TODO: we should also disable code trying to dlopen
-		# gnome-keyring in that case.
-		myconf+=" -Duse_gnome_keyring=0 -Dlinux_link_gnome_keyring=0"
-	fi
-
-	# Enable sandbox.
-	myconf+="
-		-Dlinux_sandbox_path=${CHROMIUM_HOME}/chrome_sandbox
-		-Dlinux_sandbox_chrome_path=${CHROMIUM_HOME}/chrome"
-
-	if use gecko-mediaplayer; then
-		# Disable hardcoded blacklist for gecko-mediaplayer.
-		# When www-plugins/gecko-mediaplayer is compiled with USE=gnome, it causes
-		# the browser to hang. We can handle the situation via dependencies,
-		# thus making it possible to use gecko-mediaplayer.
-		append-flags -DGENTOO_CHROMIUM_ENABLE_GECKO_MEDIAPLAYER
-	fi
-
-	# Our system ffmpeg should support more codecs than the bundled one
-	# for Chromium.
-	myconf+=" -Dproprietary_codecs=1"
-
-	# Use target arch detection logic from bug #296917.
-	local myarch="$ABI"
-	[[ $myarch = "" ]] && myarch="$ARCH"
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf+=" -Dtarget_arch=x64"
-	elif [[ $myarch = x86 ]] ; then
-		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+=" -Dtarget_arch=arm -Ddisable_nacl=1 -Dlinux_use_tcmalloc=0"
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	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+=" -Dwerror="
-
-	# Avoid a build error with -Os, bug #352457.
-	replace-flags "-Os" "-O2"
-
-	egyp ${myconf} || die
-}
-
-src_compile() {
-	emake chrome chrome_sandbox BUILDTYPE=Release V=1 || die
-	pax-mark m out/Release/chrome
-	if use test; then
-		emake base_unittests BUILDTYPE=Release V=1 || die
-		pax-mark m out/Release/base_unittests
-	fi
-}
-
-src_test() {
-	# For more info see bug #350349.
-	local mylocale='en_US.utf8'
-	if ! locale -a | grep -q "$mylocale"; then
-		eerror "${PN} requires ${mylocale} locale for tests"
-		eerror "Please read the following guides for more information:"
-		eerror "  http://www.gentoo.org/doc/en/guide-localization.xml"
-		eerror "  http://www.gentoo.org/doc/en/utf-8.xml"
-		die "locale ${mylocale} is not supported"
-	fi
-
-	# For more info see bug #350347.
-	LC_ALL="${mylocale}" maketype=out/Release/base_unittests virtualmake \
-		'--gtest_filter=-ICUStringConversionsTest.*' || die
-}
-
-src_install() {
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-	doexe out/Release/chrome_sandbox || die
-	fperms 4755 "${CHROMIUM_HOME}/chrome_sandbox"
-	doexe "${FILESDIR}"/chromium-launcher.sh || die
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/chrome.pak || die
-	doins out/Release/resources.pak || die
-
-	doins -r out/Release/locales || die
-	doins -r out/Release/resources || die
-
-	# chrome.1 is for chromium --help
-	newman out/Release/chrome.1 chrome.1 || die
-	newman out/Release/chrome.1 chromium.1 || die
-
-	# 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}" || die
-	dosym /usr/$(get_libdir)/libavformat.so.52 "${CHROMIUM_HOME}" || die
-	dosym /usr/$(get_libdir)/libavutil.so.50 "${CHROMIUM_HOME}" || die
-
-	# Install icon and desktop entry.
-	newicon chrome/app/theme/chromium/product_logo_48.png ${PN}-browser.png || die
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium || die
-	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
-
-	# Install GNOME default application entry (bug #303100).
-	if use gnome; then
-		dodir /usr/share/gnome-control-center/default-apps || die
-		insinto /usr/share/gnome-control-center/default-apps
-		doins "${FILESDIR}"/chromium.xml || die
-	fi
-}
diff --git a/www-client/chromium/chromium-9.0.597.107.ebuild b/www-client/chromium/chromium-9.0.597.107.ebuild
index 531286730b20..3220e7b6c2c2 100644
--- a/www-client/chromium/chromium-9.0.597.107.ebuild
+++ b/www-client/chromium/chromium-9.0.597.107.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9.0.597.107.ebuild,v 1.1 2011/03/01 07:18:22 phajdan.jr Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9.0.597.107.ebuild,v 1.2 2011/03/01 07:23:50 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -34,7 +34,7 @@ RDEPEND="app-arch/bzip2
 	>=media-video/ffmpeg-0.6_p25767[threads]
 	cups? ( >=net-print/cups-1.3.11 )
 	sys-libs/zlib
-	>=x11-libs/gtk+-2.14.7
+	x11-libs/gtk+:2
 	x11-libs/libXScrnSaver
 	x11-libs/libXtst"
 DEPEND="${RDEPEND}
diff --git a/www-client/chromium/chromium-9999.ebuild b/www-client/chromium/chromium-9999.ebuild
index 419f4796034f..17b5524d3286 100644
--- a/www-client/chromium/chromium-9999.ebuild
+++ b/www-client/chromium/chromium-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 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.136 2011/02/25 10:37:57 wired Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999.ebuild,v 1.137 2011/03/01 07:23:50 phajdan.jr Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2:2.6"
@@ -38,7 +38,7 @@ RDEPEND="app-arch/bzip2
 	>=media-video/ffmpeg-0.6_p25767[threads]
 	cups? ( >=net-print/cups-1.3.11 )
 	sys-libs/zlib
-	>=x11-libs/gtk+-2.14.7
+	x11-libs/gtk+:2
 	x11-libs/libXScrnSaver
 	x11-libs/libXtst"
 DEPEND="${RDEPEND}