From: Mike Gilbert <floppym@gentoo.org>
Date: Wed, 21 Sep 2011 01:16:55 +0000 (+0000)
Subject: Dev channel version bump. Convert to new slotting system.
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=1e40ef6ccb55e7c340693345396a2ca8d9e008fe;p=gentoo.git

Dev channel version bump. Convert to new slotting system.

Package-Manager: portage-2.2.0_alpha59/cvs/Linux x86_64
---

diff --git a/www-client/google-chrome/ChangeLog b/www-client/google-chrome/ChangeLog
index 0a5c12faaa95..5fdd603b27f7 100644
--- a/www-client/google-chrome/ChangeLog
+++ b/www-client/google-chrome/ChangeLog
@@ -1,6 +1,17 @@
 # ChangeLog for www-client/google-chrome
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v 1.25 2011/09/20 21:16:26 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v 1.26 2011/09/21 01:16:55 floppym Exp $
+
+*google-chrome-15.0.874.21_alpha101896 (21 Sep 2011)
+
+  21 Sep 2011; Mike Gilbert <floppym@gentoo.org>
+  -google-chrome-14.0.835.163_beta101024.ebuild,
+  -google-chrome-14.0.835.163_p101024.ebuild,
+  google-chrome-14.0.835.186_beta101821.ebuild,
+  google-chrome-14.0.835.186_p101821.ebuild,
+  -google-chrome-15.0.874.15_alpha101261.ebuild,
+  +google-chrome-15.0.874.21_alpha101896.ebuild:
+  Dev channel version bump. Convert to new slotting system.
 
 *google-chrome-14.0.835.186_p101821 (20 Sep 2011)
 *google-chrome-14.0.835.186_beta101821 (20 Sep 2011)
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 461bb433d563..f9b8528357a3 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -1,27 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST google-chrome-beta_14.0.835.163-r101024_amd64.deb 24350018 RMD160 83f87db544d0642c3f525cfbcdacff655e6a986b SHA1 04661b625149cfb3574270051996e464d5615a5e SHA256 fc7ca15e46bf797216912947750d51ce31ce42edc483611f92673145687ed4a8
-DIST google-chrome-beta_14.0.835.163-r101024_i386.deb 27538938 RMD160 a9d0ea114b60d81f1f05b26bad5cccce08569607 SHA1 8adfe803d6edcc07b65887023715128df824a9c4 SHA256 ba04bcaad8502d268d7640945c1e7ac1f367ee804165238f25517853f8c24fdb
 DIST google-chrome-beta_14.0.835.186-r101821_amd64.deb 24367168 RMD160 06746964102a17916d4227cc2694c494109b20ed SHA1 3ab4c445f323e3166d6fb60a52e11061f614f878 SHA256 29a0a71292cbc63c353965b371ef8d79783e0a71028c2b549d72f5798afe9a0f
 DIST google-chrome-beta_14.0.835.186-r101821_i386.deb 27532478 RMD160 735eecea8aac6571eba980df5701e161e0966f82 SHA1 7b99714f92acb644119469cdc586aa68fda3f3d9 SHA256 87270b9f247ace64cb7bbfc29e0358f33ed32706ccb59488282f0349ec36a20b
-DIST google-chrome-stable_14.0.835.163-r101024_amd64.deb 24375974 RMD160 d84cd81b35b3270dc0adccfc3a543267b28b5ed9 SHA1 f63df87a34e95c492c46c15218921cedee66e853 SHA256 cdbd8ace0138f4ce04da3d8f3a4a9a233fd6f46209d1424d3a2425045628c7ca
-DIST google-chrome-stable_14.0.835.163-r101024_i386.deb 27514516 RMD160 f4172e94054aea3d02c1809de3196260b1dd33c4 SHA1 fc82ceb0eeeec171e3722edb1530d1a9aeef9a4e SHA256 959e7f923f1b2019ffce54546d72a70b6435d58d6d399a448ef0a306227e8052
 DIST google-chrome-stable_14.0.835.186-r101821_amd64.deb 24361580 RMD160 721985fa21555b1e7413e269a1a8ca32bbbeffb1 SHA1 7cf1fce4c0e0c4db0d735c8dc15befe99955c327 SHA256 323c4e213bacae6a2d98df89be173373a1c1162aa46f3469ffa01fb3a0868274
 DIST google-chrome-stable_14.0.835.186-r101821_i386.deb 27535062 RMD160 cd907ee001df5fad1b77dd1016d080cf973934c3 SHA1 4acef23064ced2986915caa947474c5cd2d04ae3 SHA256 9a0f29a14d56980e070c4bc708c7c4e76c462c030854e83a82a406618a60aea5
-DIST google-chrome-unstable_15.0.874.15-r101261_amd64.deb 24591986 RMD160 d3e50bfdf779e7d7d4d89b18a4c83bba21443bbf SHA1 78b5828fa8938cb816d795f9df8e89a766c88bfb SHA256 f3fb44619c5801ce27d9578ecbbfa7ddc28ef5da5ee3af02851c41d2b808ff11
-DIST google-chrome-unstable_15.0.874.15-r101261_i386.deb 28726812 RMD160 b5563794fc2e209fec136a7af638e37e9e7d0ef8 SHA1 ed1fb983e33899d6a1856d3c8b01fdd0f114ae42 SHA256 83db62b8711083ad6a6533a6a67f228bc7316439a8f0f2ae065e372e011f9c2d
-EBUILD google-chrome-14.0.835.163_beta101024.ebuild 3948 RMD160 3af322ea09e5dc6826e54c5cbe6d5adc7745adb4 SHA1 45adddc7bb7f4b3d359ff462dcb8804a26980ba2 SHA256 b00e85ef2c82d357a98450a47bac08a3e342608251d1374db7ad1624dfe21063
-EBUILD google-chrome-14.0.835.163_p101024.ebuild 3944 RMD160 41e2298f793fab331f15c54046e9e5163e58ece7 SHA1 0d67d8ee867f5f144d81ead1709f6b874f9e9969 SHA256 d5824816ed02e877a829bfeb36c4a62fc185047409cafde3ac5a8a433f26db35
-EBUILD google-chrome-14.0.835.186_beta101821.ebuild 3948 RMD160 14f0056789fc4a8f24fe1f7a301dfd4f4079c8bf SHA1 b67c3f3837dd4e091d3809eb1ff6cc2e2fb44bde SHA256 aaa60063413adf4b44968f0fd16c2941aa91180cefa7bc369f2693b5cdd9ead4
-EBUILD google-chrome-14.0.835.186_p101821.ebuild 3944 RMD160 9641f10338dfcb21b1ecc8490b4df1999b62f3a9 SHA1 c21d847ddb39f3ef6c707f2f28251391af9eb30c SHA256 42751edd3baedc4366e2255e5a1050bee455eae3b7ea81e7e81ffcec9497345c
-EBUILD google-chrome-15.0.874.15_alpha101261.ebuild 3953 RMD160 3186175bfe2b583d1f700b0b35c535e9116d9edf SHA1 cb76c878bf23c7c7d1bea967c5e07681d257a0de SHA256 75338653283cfe380559e294351dca724df42b393e121015849bbb25eea8b3ce
-MISC ChangeLog 5609 RMD160 cc45eb38cd2d5b8905fb7863dff90289999dee8c SHA1 e2e734897556187934b20c5c6644918dead48aee SHA256 dd7c42bb95e4ab6067dc4930b3beae2a745bb726a52c5b052e1335adfe9bc6ad
+DIST google-chrome-unstable_15.0.874.21-r101896_amd64.deb 24563188 RMD160 17cbc49dd6aa31cd120aa819fd9e5bd40d5841b3 SHA1 b1b954046ed5246570ee240c8a9ead4fadbc6664 SHA256 b73600631b75234f31b89f6d61f520e93cba62ed3f5701972969d9e45b78c4a8
+DIST google-chrome-unstable_15.0.874.21-r101896_i386.deb 27723950 RMD160 58fad55053e6208b69a35a5e446318a096bfd6d4 SHA1 b65828e13bb9cea043d9f06ea0db282bf9813dbf SHA256 9cf15871965c7098c7ff30b10e34b659f7c463120a281557cf8a6b8eed026262
+EBUILD google-chrome-14.0.835.186_beta101821.ebuild 4314 RMD160 aa399412a2c62bf73e0671bb9f0d78994cfb4ada SHA1 c5fb268ee5c636a46f8f2368caf906b6f8ad289b SHA256 989e7a261be96de4e4e3d7979b77b1644a2cde740ef01cfa7207fb3637d89d61
+EBUILD google-chrome-14.0.835.186_p101821.ebuild 4311 RMD160 f1d5dac8306b55ade2d34e17a4df42242ebe6317 SHA1 8f5f6ff58ec580e3613ef40492cb5e9a97741e8e SHA256 9387a6729aa532c9da6787235358db6878dffceac3906caf8c2ee0829de78053
+EBUILD google-chrome-15.0.874.21_alpha101896.ebuild 4314 RMD160 332ce159354ff0c2f56c55c57ebf6fff620edd7f SHA1 376b475b5cec8b36b0e7dced270ffc63a84f2b44 SHA256 c5fd726e949b8cbfe3c2df4f3696e6ee24a0831f6f72e8dc93eb5b800d4b11eb
+MISC ChangeLog 6059 RMD160 0d2cb3e13a670ba5fb5af906af11c25d17fb41d9 SHA1 a968573dc4f2cd19b6d9a7f8fb2697955662427b SHA256 3a14b26af0a8eac651fc0b8254332d65fe6ec2849217308a91bafd599308134d
 MISC metadata.xml 510 RMD160 89172b66e00991d4e6ce045bcbb66d14145ac02a SHA1 f81450697c759948d8c8583aa1b6a095eb71bd05 SHA256 da7aab160a14cadf0b87a04ac7a92e4d90d86e51035ca3c3f96e1ffb3cbb1e83
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk55ArMACgkQC77qH+pIQ6RZFAEArDY/NwZaJrTxG96a9C8PBC0p
-4O+wjB8ES9XCSThbGzMA/1eayVUNu8on2SxKg8F7haq9A2MMYEziGmTrPpkUjAEx
-=kGvt
+iF4EAREIAAYFAk55OxEACgkQC77qH+pIQ6RmxwEAmN/Y7wrCQWoGF5X0uwvqC9gf
+AYxT3l+cWLDsQAlyNFsA/1blayo6h3nvX8nVi37acsm98slNyBtz/tRHtA0eI6/X
+=9nQn
 -----END PGP SIGNATURE-----
diff --git a/www-client/google-chrome/google-chrome-14.0.835.163_p101024.ebuild b/www-client/google-chrome/google-chrome-14.0.835.163_p101024.ebuild
deleted file mode 100644
index 62f3c875c2a8..000000000000
--- a/www-client/google-chrome/google-chrome-14.0.835.163_p101024.ebuild
+++ /dev/null
@@ -1,170 +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/google-chrome/google-chrome-14.0.835.163_p101024.ebuild,v 1.4 2011/09/20 20:04:27 floppym Exp $
-
-EAPI="4"
-
-inherit eutils fdo-mime gnome2-utils multilib pax-utils
-
-MY_PN="${PN}-stable"
-MY_P="${MY_PN}_${PV/_p/-r}"
-
-DESCRIPTION="The web browser from Google"
-HOMEPAGE="http://www.google.com/chrome"
-SRC_BASE="http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_"
-SRC_URI="amd64? ( ${SRC_BASE}amd64.deb ) x86? ( ${SRC_BASE}i386.deb )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+plugins"
-RESTRICT="mirror"
-
-# en_US is ommitted on purpose from the list below. It must always be available.
-LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr
-hu id it ja kn ko lt lv ml mr nb nl pl pt_BR pt_PT ro ru sk sl sr sv sw ta te th
-tr uk vi zh_CN zh_TW"
-for lang in ${LANGS}; do
-	    IUSE+=" linguas_${lang}"
-done
-
-RDEPEND="app-arch/bzip2
-	app-misc/ca-certificates
-	media-libs/alsa-lib
-	dev-libs/atk
-	dev-libs/dbus-glib
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/libxslt
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/fontconfig
-	media-libs/freetype
-	net-print/cups
-	media-libs/libpng:1.2
-	sys-apps/dbus
-	>=sys-devel/gcc-4.4.0[-nocxx]
-	sys-libs/zlib
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/libXScrnSaver
-	x11-libs/libX11
-	x11-libs/libXrender
-	x11-libs/libXext
-	x11-libs/pango
-	x11-misc/xdg-utils"
-
-QA_PREBUILT="*"
-S="${WORKDIR}"
-
-# Chromium uses different names for some langs,
-# return Chromium name corresponding to a Gentoo lang.
-chromium_lang() {
-	if [[ "$1" == "es_LA" ]]; then
-		echo "es_419"
-	else
-		echo "$1"
-	fi
-}
-
-chrome_unpack() {
-	local x
-	for x in "${@}"; do
-		if [[ ${x} == *.deb ]]; then
-			# Avoid automagic usage of deb2targz.
-			echo ">>> Unpacking ${x} to ${PWD}"
-			ar x "${DISTDIR}/${x}" || die
-		else
-			unpack "${x}"
-		fi
-	done
-}
-
-src_unpack() {
-	chrome_unpack ${A}
-	unpack ./data.tar.lzma
-}
-
-src_prepare() {
-	CHROME_HOME="opt/google/chrome/"
-
-	pax-mark m ${CHROME_HOME}chrome || die
-	rm -rf usr/share/menu || die
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-
-	# Support LINGUAS, bug #332751.
-	cd "${CHROME_HOME}locales" || die
-	local pak
-	for pak in *.pak; do
-		local pakbasename="$(basename ${pak})"
-		local pakname="${pakbasename%.pak}"
-		local langname="${pakname//-/_}"
-
-		# Do not issue warning for en_US locale. This is the fallback
-		# locale so it should always be installed.
-		if [[ "${langname}" == "en_US" ]]; then
-			continue
-		fi
-
-		local found=false
-		local lang
-		for lang in ${LANGS}; do
-			local crlang="$(chromium_lang ${lang})"
-			if [[ "${langname}" == "${crlang}" ]]; then
-				found=true
-				break
-			fi
-		done
-		if ! $found; then
-			ewarn "LINGUAS warning: no ${langname} in LANGS"
-		fi
-	done
-	local lang
-	for lang in ${LANGS}; do
-		local crlang="$(chromium_lang ${lang})"
-		local pakfile="${crlang//_/-}.pak"
-		if [ ! -f "${pakfile}" ]; then
-			ewarn "LINGUAS warning: no .pak file for ${lang} (${pakfile} not found)"
-		fi
-		if ! use linguas_${lang}; then
-			rm "${pakfile}" || die
-		fi
-	done
-
-}
-
-src_install() {
-	mv opt usr "${D}" || die
-
-	fperms u+s "/${CHROME_HOME}chrome-sandbox" || die
-
-	if use plugins ; then
-		local args='"$@"'
-		local plugins="/usr/$(get_libdir)/nsbrowser/plugins"
-		sed -e "s:${args}:--extra-plugin-dir=\"${plugins}\" \\0:" \
-			-i "${D}${CHROME_HOME}google-chrome" || die
-	fi
-
-	domenu "${D}${CHROME_HOME}google-chrome.desktop" || die
-	local size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		insinto /usr/share/icons/hicolor/${size}x${size}/apps
-		newins "${D}${CHROME_HOME}product_logo_${size}.png" google-chrome.png
-	done
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/www-client/google-chrome/google-chrome-14.0.835.186_beta101821.ebuild b/www-client/google-chrome/google-chrome-14.0.835.186_beta101821.ebuild
index 7820a289f490..d34c5b0049b3 100644
--- a/www-client/google-chrome/google-chrome-14.0.835.186_beta101821.ebuild
+++ b/www-client/google-chrome/google-chrome-14.0.835.186_beta101821.ebuild
@@ -1,21 +1,39 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-14.0.835.186_beta101821.ebuild,v 1.1 2011/09/20 21:16:26 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-14.0.835.186_beta101821.ebuild,v 1.2 2011/09/21 01:16:55 floppym Exp $
 
 EAPI="4"
 
 inherit eutils fdo-mime gnome2-utils multilib pax-utils
 
-MY_PN="${PN}-beta"
-MY_P="${MY_PN}_${PV/_beta/-r}"
-
 DESCRIPTION="The web browser from Google"
 HOMEPAGE="http://www.google.com/chrome"
+
+case ${PV} in
+	*_alpha*)
+		SLOT="unstable"
+		MY_PV=${PV/_alpha/-r}
+		;;
+	*_beta*)
+		SLOT="beta"
+		MY_PV=${PV/_beta/-r}
+		;;
+	*_p*)
+		SLOT="stable"
+		MY_PV=${PV/_p/-r}
+		;;
+	*)
+		die "Invalid value for \${PV}: ${PV}"
+		;;
+esac
+
+MY_PN="${PN}-${SLOT}"
+MY_P="${MY_PN}_${MY_PV}"
+
 SRC_BASE="http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_"
 SRC_URI="amd64? ( ${SRC_BASE}amd64.deb ) x86? ( ${SRC_BASE}i386.deb )"
 
 LICENSE="google-chrome"
-SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+plugins"
 RESTRICT="mirror"
@@ -56,8 +74,15 @@ RDEPEND="app-arch/bzip2
 	x11-libs/pango
 	x11-misc/xdg-utils"
 
+# Add blockers for the other slots.
+for x in 0 beta stable unstable; do
+	if [[ ${SLOT} != ${x} ]]; then
+		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
+	fi
+done
+
 QA_PREBUILT="*"
-S="${WORKDIR}"
+S=${WORKDIR}
 
 # Chromium uses different names for some langs,
 # return Chromium name corresponding to a Gentoo lang.
diff --git a/www-client/google-chrome/google-chrome-14.0.835.186_p101821.ebuild b/www-client/google-chrome/google-chrome-14.0.835.186_p101821.ebuild
index 1034a0614112..efe2a6e6da93 100644
--- a/www-client/google-chrome/google-chrome-14.0.835.186_p101821.ebuild
+++ b/www-client/google-chrome/google-chrome-14.0.835.186_p101821.ebuild
@@ -1,21 +1,39 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-14.0.835.186_p101821.ebuild,v 1.1 2011/09/20 21:16:26 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-14.0.835.186_p101821.ebuild,v 1.2 2011/09/21 01:16:55 floppym Exp $
 
 EAPI="4"
 
 inherit eutils fdo-mime gnome2-utils multilib pax-utils
 
-MY_PN="${PN}-stable"
-MY_P="${MY_PN}_${PV/_p/-r}"
-
 DESCRIPTION="The web browser from Google"
 HOMEPAGE="http://www.google.com/chrome"
+
+case ${PV} in
+	*_alpha*)
+		SLOT="unstable"
+		MY_PV=${PV/_alpha/-r}
+		;;
+	*_beta*)
+		SLOT="beta"
+		MY_PV=${PV/_beta/-r}
+		;;
+	*_p*)
+		SLOT="stable"
+		MY_PV=${PV/_p/-r}
+		;;
+	*)
+		die "Invalid value for \${PV}: ${PV}"
+		;;
+esac
+
+MY_PN="${PN}-${SLOT}"
+MY_P="${MY_PN}_${MY_PV}"
+
 SRC_BASE="http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_"
 SRC_URI="amd64? ( ${SRC_BASE}amd64.deb ) x86? ( ${SRC_BASE}i386.deb )"
 
 LICENSE="google-chrome"
-SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+plugins"
 RESTRICT="mirror"
@@ -56,8 +74,15 @@ RDEPEND="app-arch/bzip2
 	x11-libs/pango
 	x11-misc/xdg-utils"
 
+# Add blockers for the other slots.
+for x in 0 beta stable unstable; do
+	if [[ ${SLOT} != ${x} ]]; then
+		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
+	fi
+done
+
 QA_PREBUILT="*"
-S="${WORKDIR}"
+S=${WORKDIR}
 
 # Chromium uses different names for some langs,
 # return Chromium name corresponding to a Gentoo lang.
diff --git a/www-client/google-chrome/google-chrome-15.0.874.15_alpha101261.ebuild b/www-client/google-chrome/google-chrome-15.0.874.15_alpha101261.ebuild
deleted file mode 100644
index a0b672ffbb7e..000000000000
--- a/www-client/google-chrome/google-chrome-15.0.874.15_alpha101261.ebuild
+++ /dev/null
@@ -1,170 +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/google-chrome/google-chrome-15.0.874.15_alpha101261.ebuild,v 1.1 2011/09/15 23:48:38 floppym Exp $
-
-EAPI="4"
-
-inherit eutils fdo-mime gnome2-utils multilib pax-utils
-
-MY_PN="${PN}-unstable"
-MY_P="${MY_PN}_${PV/_alpha/-r}"
-
-DESCRIPTION="The web browser from Google"
-HOMEPAGE="http://www.google.com/chrome"
-SRC_BASE="http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_"
-SRC_URI="amd64? ( ${SRC_BASE}amd64.deb ) x86? ( ${SRC_BASE}i386.deb )"
-
-LICENSE="google-chrome"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+plugins"
-RESTRICT="mirror"
-
-# en_US is ommitted on purpose from the list below. It must always be available.
-LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr
-hu id it ja kn ko lt lv ml mr nb nl pl pt_BR pt_PT ro ru sk sl sr sv sw ta te th
-tr uk vi zh_CN zh_TW"
-for lang in ${LANGS}; do
-	    IUSE+=" linguas_${lang}"
-done
-
-RDEPEND="app-arch/bzip2
-	app-misc/ca-certificates
-	media-libs/alsa-lib
-	dev-libs/atk
-	dev-libs/dbus-glib
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/libxslt
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/fontconfig
-	media-libs/freetype
-	net-print/cups
-	media-libs/libpng:1.2
-	sys-apps/dbus
-	>=sys-devel/gcc-4.4.0[-nocxx]
-	sys-libs/zlib
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/libXScrnSaver
-	x11-libs/libX11
-	x11-libs/libXrender
-	x11-libs/libXext
-	x11-libs/pango
-	x11-misc/xdg-utils"
-
-QA_PREBUILT="*"
-S="${WORKDIR}"
-
-# Chromium uses different names for some langs,
-# return Chromium name corresponding to a Gentoo lang.
-chromium_lang() {
-	if [[ "$1" == "es_LA" ]]; then
-		echo "es_419"
-	else
-		echo "$1"
-	fi
-}
-
-chrome_unpack() {
-	local x
-	for x in "${@}"; do
-		if [[ ${x} == *.deb ]]; then
-			# Avoid automagic usage of deb2targz.
-			echo ">>> Unpacking ${x} to ${PWD}"
-			ar x "${DISTDIR}/${x}" || die
-		else
-			unpack "${x}"
-		fi
-	done
-}
-
-src_unpack() {
-	chrome_unpack ${A}
-	unpack ./data.tar.lzma
-}
-
-src_prepare() {
-	CHROME_HOME="opt/google/chrome/"
-
-	pax-mark m ${CHROME_HOME}chrome || die
-	rm -rf usr/share/menu || die
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-
-	# Support LINGUAS, bug #332751.
-	cd "${CHROME_HOME}locales" || die
-	local pak
-	for pak in *.pak; do
-		local pakbasename="$(basename ${pak})"
-		local pakname="${pakbasename%.pak}"
-		local langname="${pakname//-/_}"
-
-		# Do not issue warning for en_US locale. This is the fallback
-		# locale so it should always be installed.
-		if [[ "${langname}" == "en_US" ]]; then
-			continue
-		fi
-
-		local found=false
-		local lang
-		for lang in ${LANGS}; do
-			local crlang="$(chromium_lang ${lang})"
-			if [[ "${langname}" == "${crlang}" ]]; then
-				found=true
-				break
-			fi
-		done
-		if ! $found; then
-			ewarn "LINGUAS warning: no ${langname} in LANGS"
-		fi
-	done
-	local lang
-	for lang in ${LANGS}; do
-		local crlang="$(chromium_lang ${lang})"
-		local pakfile="${crlang//_/-}.pak"
-		if [ ! -f "${pakfile}" ]; then
-			ewarn "LINGUAS warning: no .pak file for ${lang} (${pakfile} not found)"
-		fi
-		if ! use linguas_${lang}; then
-			rm "${pakfile}" || die
-		fi
-	done
-
-}
-
-src_install() {
-	mv opt usr "${D}" || die
-
-	fperms u+s "/${CHROME_HOME}chrome-sandbox" || die
-
-	if use plugins ; then
-		local args='"$@"'
-		local plugins="/usr/$(get_libdir)/nsbrowser/plugins"
-		sed -e "s:${args}:--extra-plugin-dir=\"${plugins}\" \\0:" \
-			-i "${D}${CHROME_HOME}google-chrome" || die
-	fi
-
-	domenu "${D}${CHROME_HOME}google-chrome.desktop" || die
-	local size
-	for size in 16 22 24 32 48 64 128 256 ; do
-		insinto /usr/share/icons/hicolor/${size}x${size}/apps
-		newins "${D}${CHROME_HOME}product_logo_${size}.png" google-chrome.png
-	done
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/www-client/google-chrome/google-chrome-14.0.835.163_beta101024.ebuild b/www-client/google-chrome/google-chrome-15.0.874.21_alpha101896.ebuild
similarity index 87%
rename from www-client/google-chrome/google-chrome-14.0.835.163_beta101024.ebuild
rename to www-client/google-chrome/google-chrome-15.0.874.21_alpha101896.ebuild
index 0445f1ad6934..fdc4421a3d9e 100644
--- a/www-client/google-chrome/google-chrome-14.0.835.163_beta101024.ebuild
+++ b/www-client/google-chrome/google-chrome-15.0.874.21_alpha101896.ebuild
@@ -1,21 +1,39 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-14.0.835.163_beta101024.ebuild,v 1.3 2011/09/15 23:05:25 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-15.0.874.21_alpha101896.ebuild,v 1.1 2011/09/21 01:16:55 floppym Exp $
 
 EAPI="4"
 
 inherit eutils fdo-mime gnome2-utils multilib pax-utils
 
-MY_PN="${PN}-beta"
-MY_P="${MY_PN}_${PV/_beta/-r}"
-
 DESCRIPTION="The web browser from Google"
 HOMEPAGE="http://www.google.com/chrome"
+
+case ${PV} in
+	*_alpha*)
+		SLOT="unstable"
+		MY_PV=${PV/_alpha/-r}
+		;;
+	*_beta*)
+		SLOT="beta"
+		MY_PV=${PV/_beta/-r}
+		;;
+	*_p*)
+		SLOT="stable"
+		MY_PV=${PV/_p/-r}
+		;;
+	*)
+		die "Invalid value for \${PV}: ${PV}"
+		;;
+esac
+
+MY_PN="${PN}-${SLOT}"
+MY_P="${MY_PN}_${MY_PV}"
+
 SRC_BASE="http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_"
 SRC_URI="amd64? ( ${SRC_BASE}amd64.deb ) x86? ( ${SRC_BASE}i386.deb )"
 
 LICENSE="google-chrome"
-SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
 IUSE="+plugins"
 RESTRICT="mirror"
@@ -56,8 +74,15 @@ RDEPEND="app-arch/bzip2
 	x11-libs/pango
 	x11-misc/xdg-utils"
 
+# Add blockers for the other slots.
+for x in 0 beta stable unstable; do
+	if [[ ${SLOT} != ${x} ]]; then
+		RDEPEND+=" !${CATEGORY}/${PN}:${x}"
+	fi
+done
+
 QA_PREBUILT="*"
-S="${WORKDIR}"
+S=${WORKDIR}
 
 # Chromium uses different names for some langs,
 # return Chromium name corresponding to a Gentoo lang.