Bump.

(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

3 files changed, 29 insertions, 17 deletions

diff --git a/www-client/google-chrome/ChangeLog b/www-client/google-chrome/ChangeLog
index db3a5cc814ad..8572b2de745a 100644
--- a/www-client/google-chrome/ChangeLog
+++ b/www-client/google-chrome/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for www-client/google-chrome
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v 1.326 2013/10/01 22:35:36 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v 1.327 2013/10/04 03:14:54 floppym Exp $
+
+*google-chrome-31.0.1650.11_beta1 (04 Oct 2013)
+*google-chrome-31.0.1650.8_alpha1 (04 Oct 2013)
+
+  04 Oct 2013; Mike Gilbert <floppym@gentoo.org>
+  +google-chrome-31.0.1650.11_beta1.ebuild,
+  +google-chrome-31.0.1650.8_alpha1.ebuild,
+  -google-chrome-30.0.1599.66_beta1.ebuild,
+  -google-chrome-31.0.1650.4_alpha1.ebuild:
+  Bump.
 
 *google-chrome-30.0.1599.66_p1 (01 Oct 2013)
 
diff --git a/www-client/google-chrome/google-chrome-30.0.1599.66_beta1.ebuild b/www-client/google-chrome/google-chrome-31.0.1650.11_beta1.ebuild
index 30317545e8ca..a9abd8cc799d 100644
--- a/www-client/google-chrome/google-chrome-30.0.1599.66_beta1.ebuild
+++ b/www-client/google-chrome/google-chrome-31.0.1650.11_beta1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-30.0.1599.66_beta1.ebuild,v 1.1 2013/09/27 00:15:02 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-31.0.1650.11_beta1.ebuild,v 1.1 2013/10/04 03:14:54 floppym Exp $
 
 EAPI="4"
 
@@ -69,11 +69,14 @@ RDEPEND="
 	x11-libs/gtk+:2
 	>=x11-libs/libX11-1.5.0
 	x11-libs/libXcomposite
+	x11-libs/libXdamage
 	x11-libs/libXext
 	x11-libs/libXfixes
+	x11-libs/libXi
 	x11-libs/libXrandr
 	x11-libs/libXrender
 	x11-libs/libXScrnSaver
+	x11-libs/libXtst
 	x11-libs/pango
 	x11-misc/xdg-utils
 "
@@ -93,36 +96,35 @@ pkg_nofetch() {
 }
 
 pkg_setup() {
-	CHROME_HOME="opt/google/chrome/"
 	chromium_suid_sandbox_check_kernel_config
 }
 
 src_install() {
-	pax-mark m ${CHROME_HOME}chrome
-	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
+	CHROME_HOME="opt/google/chrome"
 
 	mv opt usr "${D}" || die
+	cd "${D}" || die
 
-	fperms u+s "/${CHROME_HOME}chrome-sandbox" || die
+	pax-mark m "${CHROME_HOME}/chrome"
+	chmod u+s "${CHROME_HOME}/chrome-sandbox" || die
+	rm -rf usr/share/menu || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
+	dosym /usr/$(get_libdir)/libudev.so "${CHROME_HOME}/libudev.so.0"
 
-	dosym /usr/$(get_libdir)/libudev.so ${CHROME_HOME}/libudev.so.0
+	pushd "${CHROME_HOME}/locales" > /dev/null || die
+	chromium_remove_language_paks
+	popd > /dev/null || 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
+			-i "${CHROME_HOME}/${PN}" || die
 	fi
 
-	domenu "${D}${CHROME_HOME}google-chrome.desktop" || die
+	domenu "${CHROME_HOME}/${PN}.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
+		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" ${PN}.png
 	done
 }
 
diff --git a/www-client/google-chrome/google-chrome-31.0.1650.4_alpha1.ebuild b/www-client/google-chrome/google-chrome-31.0.1650.8_alpha1.ebuild
index 1f1b135d9dc3..ea7f206f0fd4 100644
--- a/www-client/google-chrome/google-chrome-31.0.1650.4_alpha1.ebuild
+++ b/www-client/google-chrome/google-chrome-31.0.1650.8_alpha1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-31.0.1650.4_alpha1.ebuild,v 1.1 2013/09/26 20:43:15 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-31.0.1650.8_alpha1.ebuild,v 1.1 2013/10/04 03:14:54 floppym Exp $
 
 EAPI="4"