Dev channel bump.

Package-Manager: portage-2.2.0_alpha138/cvs/Linux x86_64
Manifest-Sign-Key: 0xEA4843A4

4 files changed, 18 insertions, 161 deletions

diff --git a/www-client/google-chrome/ChangeLog b/www-client/google-chrome/ChangeLog
index 2ac56feaa8a5..c2f19cca18fb 100644
--- a/www-client/google-chrome/ChangeLog
+++ b/www-client/google-chrome/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for www-client/google-chrome
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v 1.204 2012/10/10 20:44:27 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v 1.205 2012/10/17 03:04:17 floppym Exp $
+
+*google-chrome-24.0.1297.0_alpha162078 (17 Oct 2012)
+
+  17 Oct 2012; Mike Gilbert <floppym@gentoo.org>
+  +google-chrome-24.0.1297.0_alpha162078.ebuild,
+  -google-chrome-24.0.1284.2_alpha159713.ebuild,
+  -google-chrome-24.0.1290.1_alpha160787.ebuild:
+  Dev channel bump.
 
 *google-chrome-23.0.1271.26_beta160934 (10 Oct 2012)
 *google-chrome-22.0.1229.94_p161065 (10 Oct 2012)
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index d9afbe6d4708..0fa7abaf8b2c 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -5,20 +5,17 @@ DIST google-chrome-beta_23.0.1271.26-r160934_amd64.deb 35838328 SHA256 ac3282300
 DIST google-chrome-beta_23.0.1271.26-r160934_i386.deb 34255858 SHA256 dfd7023cdc1a9fd090ca30edd418aad9e215f0b4b05e06509568454822f39cf1 SHA512 d9768ea1e49915853ae4eae1b269b24db997ef649e9cab3de8f00f0f34fddaaa012d441aba38915228cda3d3cd419d91f6dfe9e06af91e6a68721d8eea9b4f70 WHIRLPOOL 4608d772d4e200153f71c2d6eda1f4f3723dc7be836bf4cf754b3c4e9d88d8f302931d7aa3641147fd3c44aeaa3a4fa385b2442cbc5a496b6a34962d3e853684
 DIST google-chrome-stable_22.0.1229.94-r161065_amd64.deb 34771272 SHA256 efb2403e67476f520d03fbf2396ff55c369ec49658dd89b9707290947d23edbd SHA512 e642185249622c5ba079f110c05db2ebd84ea6aa57df0cf26f58e6ccacadd797660e563e6f259cda65edfaa8b2fb248efec56f30ee8f0f72ff4146e9836493d5 WHIRLPOOL 3bd2e642b0b1af23a4fb9940d7ae7ac0569467c0d9a2cabe229c85acc3a48d71a9b6f1a8f7417c2e65b2623ad143e906efdc1b6d570288e04918b5ad2d4c706f
 DIST google-chrome-stable_22.0.1229.94-r161065_i386.deb 33008770 SHA256 eb4162befb9effa04c3a30489af46a0a5d8e83dabf0c34ca40594bce74448f70 SHA512 ca54a7f935627befd1a8f098b0a688a8e6c72db17277e3bbbd692e5f3718dcce8666bb1034bfef1c28231faa8c4cbc78c7f0841900bfe0443692f945c78471da WHIRLPOOL 2b893d78873820f47172bc495acdd2328b64020ce125f5f4b14aa460beba71a6f900dec14eeaacd986c35d5c376cdc25b5ed781bb46a371ecb6b560e153dfa1c
-DIST google-chrome-unstable_24.0.1284.2-r159713_amd64.deb 35885794 SHA256 ee55d77e771706cc564fad3db22a6441f14c72007959ccf70044fb155ce2f913 SHA512 3fc9b5928bb507903e2b2e847597fc79e82d395dc4ae21029234e89a68e8ee8fae2772747cc7a7dfeae7a81ba8345ac109a487a83851c56fbf137f4cebcbdddc WHIRLPOOL c7363ec2f30379b2122c244616001d0bfa00833172b64197c98c352578cc5746a139c7ea78907d8b3ec53766ec3c725055f859330940da85780b9614fc0dfbf9
-DIST google-chrome-unstable_24.0.1284.2-r159713_i386.deb 34329222 SHA256 7b43a242811b7399b2c0904df973fe53851e4c8e1dfbb22d45b0d61caf2457ba SHA512 01d9159773e9efd91a32db1f4e482bed88c5e190bc02d922b837d90f1dc8dd7809c4df11434ac4acc5ca8bf1b05ea682d1e2770affb1a2b28c43c5741fce5ffa WHIRLPOOL 14fdd5b39197a5da910fffb696f480c51864eaa20c0ea1ddadfd42df11672dd8b69247ac2adcfdd4d00a208dfcc396eda481d7bf48f7a7a7f02bca096fb72253
-DIST google-chrome-unstable_24.0.1290.1-r160787_amd64.deb 35930854 SHA256 a46146083ea23815265135d32328ab982df95543e184af304eb763147fb9369f SHA512 dd663a88febf70c44091c3563cf8f53577a9b96aa665da64218507845b5ff29ca9077e5a3b2fc352387ca103545ed34f6a2de7d6ac40b4ef43f4dc59edfde3cc WHIRLPOOL 441e73310211660bf1932de6746318bc279463b1509b7ef75ebfe239a4873605127856192872a036482d0d7ac4f704757667d3995ca475206781025329f8dd46
-DIST google-chrome-unstable_24.0.1290.1-r160787_i386.deb 34372302 SHA256 dde8f242d9f065416b25690b6a500396ef010f7558c6ca56683cafe08d19be35 SHA512 43a75bcef4c09448806f871106eb2e6ca8a4990290f88bdac843d3f0654737e39687078711cbf891d43251945d297228b5f9e34fb2481ea5c2bd4637d1237a58 WHIRLPOOL 254fa10c853ae3c858c754f59b4c45c1679064eb7262082404b1c60b873bcb71ae9c58084e3da836b11f9dab8ede27084f003bb5af61f6b718c615e313f6a0c9
+DIST google-chrome-unstable_24.0.1297.0-r162078_amd64.deb 36090486 SHA256 5c57a964c8f828d64098c2aa8fdee9cb477f408f9597496387066f7ed3c84d11 SHA512 b0ed725b5a563fdafea303bc4abe532cfc3bf6f0a39d3d386a9428cd5e990bfe7915a0804700239befd7f76c1485798483adc12c7cd1d204ef7ff521030509bf WHIRLPOOL 1a6beaae5125d5046926f698de11480b166360e6b4a97614862ab4e74497fac38c38365c483ac548b6b8af56e1af14019197df6322c9c45ede94b77a70e6968b
+DIST google-chrome-unstable_24.0.1297.0-r162078_i386.deb 34471178 SHA256 9d3d746b3890a04c500c112d4392f7230b6ca3f41ae2eb69c70f5dff6f1403ae SHA512 e986c1e338683646cfb2d548acfbe0e746c62c882df0544f1be4f9d36dd770a4473ce1b94a5cc69d0398891da46b60d95e3171c2310ebc1b2e733ad0162e27a3 WHIRLPOOL c253cb47754dfc6791cc7404d16734249db545f3a43709c27e50790a3ebeeacf896b99794e2acd0ec5006dfca4e3b7e051a80ec1aa2d7be02fcc9615f8b120a1
 EBUILD google-chrome-22.0.1229.94_p161065.ebuild 3741 SHA256 dede648234f34b8912d41083b8e9cf639cdc809ddd34e9e0fcb4e347fcb73972 SHA512 d2bea0d554d2d3a76994a766adc9131e13486fc841ada6e875aebdb657b79e715bf805cd1b81721b02e84712985a525ffa77107685af06096e7cd70d22430e59 WHIRLPOOL f263738275496ca6b23dde56dedfaee0ab64c3345481d0da3de14c866f9883550bff2f504bbacb8217d59604a0edb08f639eba272de2b4534959b3fefa2cef89
 EBUILD google-chrome-23.0.1271.26_beta160934.ebuild 3701 SHA256 640a8cf8f889aca135d416e08635c1e7deadcab438ec1d72ce6f092d066e502e SHA512 99d75244625063b4b3163de89ab8105e00897d560cde4a2cce713c9dc8705c76ebfa2f212ffe7f0b07cbcf41ae78125792db156e08361e058861db2a4483ca65 WHIRLPOOL ce12193d9bef668a4aa8196dfe91c8de34fd6be3c0179b6d1a64955913e9388dcbc2edbff3ac770c066ed5c45620adbd0ea7ad7e73567a63b6c69ebfd8c0f3ef
-EBUILD google-chrome-24.0.1284.2_alpha159713.ebuild 3701 SHA256 c56011efa9f9e61b677031626e458a8abdc3d3dea5daea72116e946de4c2cad7 SHA512 7dce7a957af5f37523eca9ef604685aa3d30fe3043cfcae7b7da531808c93800bc20447215f67d6fe79182aaeea579f8c92da87e04dfa7e3e5d95a5529184418 WHIRLPOOL e5f062ed86873fd4aa3f1f79f11458cec55f02b6582e451a8dfb01ba713751af5df6664b79171b7680e69242ee57b3970af390f3dbf131e6568cf256a26dc76d
-EBUILD google-chrome-24.0.1290.1_alpha160787.ebuild 3701 SHA256 caa073d28aa733bc7c64d3e5329093d7fec8454cb6a8f48d397e40717de06fbc SHA512 b6f13a2113d169459911eff4f594529b6b74e92ec94b13a1195473ee4074b9aab112c60f222cf8504df44860a2c35aa8eab94cdd9366a59597a93e2e15a8bef1 WHIRLPOOL cc23ad3ec0e72bab6e0346ab72acf90c45f44cd4000ade81825e1c67b52cab09ed528c8665fdf79fa17c4c92ce59dd61ca015ec9ac491b97d7507ac1308a45d1
-MISC ChangeLog 48562 SHA256 7ce451149543f86769a1838ee209fe7010313efc450e632e9f2dc2685c5a69fc SHA512 554444a292ace80da3debf6e1861dc4685ecbb26f31c9c41cf7935068cb32c8375762f9a27e322c895a6573c9bb454142d26e6e87abca334b55f5c7e1b6bb66e WHIRLPOOL 41b290c37d4946e38cd2186db7d109aa7a3c7cc19602a0ea9c72115bb42071feefaaf91a6f2008b4f1b97e1174bd5a81a8a521ebf99eae8576f311597227b0ba
+EBUILD google-chrome-24.0.1297.0_alpha162078.ebuild 3725 SHA256 c412806a03ba118e2ea8db5b7c06e9f3debe560e8d268f1b8eeaf8934090417d SHA512 48756afb5480a87c03e3d78b742967cca9cfe07cd7b6b3554fb6e64f5a4d2c4f8bcc1d62d72bbdf7b469dfca14e27f3b7d2c7e6d7ee567e7a166fd034bda85aa WHIRLPOOL 59ada197c8007130366d47ca1d0602144729bf19f472a17ad2c62fc995aa2f752f61271fc2d0953e2535523526486fb81571909509144cf4ee8a17faaa975f52
+MISC ChangeLog 48833 SHA256 e06218451292b9a7ae0337aabc6b489b84d7e8a1b17928eb2ebd355fb3f46e73 SHA512 1dd814c67cac36ed0efdb24acdf813bc050f696690bad6c821c41e7c9db96526a18be23546bb3ae37c9fac61a747309a1dc5e09a8377e033afcab7a99e50864f WHIRLPOOL fa5103be454258dfa0bba3f1b4f4648b7423988e005bbaef9215778e9f6655dea9b1996d5949d4917e0deae374f063ca4baf3e9f9ea207076c5f5c483f43f7e3
 MISC metadata.xml 600 SHA256 e3dffcb8db012d64e4dbb7df2566b800b2a9476aaf0447b1d40a6e94d2733806 SHA512 350bb629bee41ac320d1a870d3d7f34ead23edb1b7cf6ac6379363b01435015c58e249ba1375e9ed3b3023107ef5f3f29f646143a9e2622769923aa5fb21d846 WHIRLPOOL 05772be4e662813e5a0231e46d272931f0ccce9a13f7244ddda8a40e43e8d141293d0a70d4aa8b640ace773d3f68d663bd8cd4558f3bc3c65e5126834bf05129
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlB13jEACgkQC77qH+pIQ6SMSgD9ECvexwfd+sckIYQ8IkQbddJi
-uuxu4TYVoKKJAmyqb7QA/A6t6bmP+bp7ZhdgL3qwGBK4YpMLpLTdS08srAgV9SJL
-=SpPy
+iF4EAREIAAYFAlB+IDIACgkQC77qH+pIQ6QmhAEAxCVB9OB9rqG0QqRMB8w2tliB
+ll8Mdk0XpqK5aqyvT10A/0eFWJ/ZmXYiTFUJ2nDevQrgvx0kUTKwcYoWCc2ub4t+
+=HSRQ
 -----END PGP SIGNATURE-----
diff --git a/www-client/google-chrome/google-chrome-24.0.1290.1_alpha160787.ebuild b/www-client/google-chrome/google-chrome-24.0.1290.1_alpha160787.ebuild
deleted file mode 100644
index f06df028d375..000000000000
--- a/www-client/google-chrome/google-chrome-24.0.1290.1_alpha160787.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-24.0.1290.1_alpha160787.ebuild,v 1.1 2012/10/10 20:44:27 floppym Exp $
-
-EAPI="4"
-
-CHROMIUM_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 ms nb nl pl pt_BR pt_PT ro ru sk sl sr
-	sv sw ta te th tr uk vi zh_CN zh_TW"
-
-inherit chromium eutils multilib pax-utils unpacker
-
-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"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE="+plugins"
-RESTRICT="mirror strip"
-
-RDEPEND="
-	app-arch/bzip2
-	app-misc/ca-certificates
-	dev-libs/atk
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/libgcrypt
-	dev-libs/nspr
-	dev-libs/nss
-	gnome-base/gconf:2
-	media-libs/alsa-lib
-	media-libs/fontconfig
-	media-libs/freetype
-	net-print/cups
-	sys-apps/dbus
-	|| ( >=sys-devel/gcc-4.4.0[-nocxx] >=sys-devel/gcc-4.4.0[cxx] )
-	sys-fs/udev
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf
-	x11-libs/gtk+:2
-	x11-libs/libX11
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libXrandr
-	x11-libs/libXrender
-	x11-libs/libXScrnSaver
-	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}
-
-pkg_nofetch() {
-	eerror "Please do not report bugs for google-chrome fetch failures."
-	eerror "The problem will be resolved with the next version bump."
-	eerror "Sync your portage tree and try again."
-}
-
-pkg_setup() {
-	CHROME_HOME="opt/google/chrome/"
-	chromium_suid_sandbox_check_kernel_config
-}
-
-src_install() {
-	pax-mark m ${CHROME_HOME}chrome || die
-	rm -rf usr/share/menu || die
-	mv usr/share/doc/${PN} usr/share/doc/${PF} || die
-
-	pushd "${CHROME_HOME}locales" > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	mv opt usr "${D}" || die
-
-	fperms u+s "/${CHROME_HOME}chrome-sandbox" || die
-
-	if use plugins ; then
-		local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins"
-		sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \
-			-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
-
-	# Compatibility symlink for newer udev, bug 423415.
-	dosym "/usr/$(get_libdir)/libudev.so" "${CHROME_HOME}libudev.so.0"
-}
-
-any_cpu_missing_flag() {
-	local value=$1
-	grep '^flags' /proc/cpuinfo | grep -qv "$value"
-}
-
-pkg_preinst() {
-	chromium_pkg_preinst
-	if any_cpu_missing_flag sse2; then
-		ewarn "The bundled PepperFlash plugin requires a CPU that supports the"
-		ewarn "SSE2 instruction set, and at least one of your CPUs does not"
-		ewarn "support this feature. Disabling PepperFlash."
-		sed -e "/^exec/ i set -- --disable-bundled-ppapi-flash \"\$@\"" \
-			-i "${D}${CHROME_HOME}google-chrome" || die
-	fi
-}
-
-pkg_postinst() {
-	chromium_pkg_postinst
-
-	einfo
-	elog "Please notice the bundled flash player (PepperFlash)."
-	elog "You can (de)activate all flash plugins via chrome://plugins"
-	einfo
-}
diff --git a/www-client/google-chrome/google-chrome-24.0.1284.2_alpha159713.ebuild b/www-client/google-chrome/google-chrome-24.0.1297.0_alpha162078.ebuild
index ce70efcd4c76..90bd731a3fdd 100644
--- a/www-client/google-chrome/google-chrome-24.0.1284.2_alpha159713.ebuild
+++ b/www-client/google-chrome/google-chrome-24.0.1297.0_alpha162078.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-24.0.1284.2_alpha159713.ebuild,v 1.1 2012/10/03 03:37:40 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-24.0.1297.0_alpha162078.ebuild,v 1.1 2012/10/17 03:04:17 floppym Exp $
 
 EAPI="4"
 
@@ -91,6 +91,7 @@ pkg_nofetch() {
 pkg_setup() {
 	CHROME_HOME="opt/google/chrome/"
 	chromium_suid_sandbox_check_kernel_config
+	declare -f src_install
 }
 
 src_install() {