Stable channel bump.

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

2 files changed, 28 insertions, 25 deletions

diff --git a/www-client/google-chrome/ChangeLog b/www-client/google-chrome/ChangeLog
index 64afbe0a8c63..41bf97cabf1f 100644
--- a/www-client/google-chrome/ChangeLog
+++ b/www-client/google-chrome/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/google-chrome
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v 1.377 2014/05/19 19:47:16 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v 1.378 2014/05/21 02:14:46 floppym Exp $
+
+*google-chrome-35.0.1916.114_p1 (21 May 2014)
+
+  21 May 2014; Mike Gilbert <floppym@gentoo.org>
+  +google-chrome-35.0.1916.114_p1.ebuild,
+  -google-chrome-34.0.1847.137_p1.ebuild:
+  Stable channel bump.
 
   19 May 2014; Mike Gilbert <floppym@gentoo.org>
   google-chrome-34.0.1847.137_p1.ebuild:
diff --git a/www-client/google-chrome/google-chrome-34.0.1847.137_p1.ebuild b/www-client/google-chrome/google-chrome-35.0.1916.114_p1.ebuild
index 296f6c088038..41612f47b9f2 100644
--- a/www-client/google-chrome/google-chrome-34.0.1847.137_p1.ebuild
+++ b/www-client/google-chrome/google-chrome-35.0.1916.114_p1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-34.0.1847.137_p1.ebuild,v 1.2 2014/05/19 19:47:16 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-35.0.1916.114_p1.ebuild,v 1.1 2014/05/21 02:14:46 floppym Exp $
 
 EAPI="5"
 
@@ -70,23 +70,9 @@ RDEPEND="
 	x11-misc/xdg-utils
 "
 
-if [[ ${PN} == google-chrome ]]; then
-	RDEPEND+="
-		!www-client/google-chrome:beta
-		!www-client/google-chrome:stable
-		!www-client/google-chrome:unstable
-	"
-fi
-
-for x in google-chrome{,-beta,-unstable}; do
-	if [[ ${PN} != ${x} ]]; then
-		RDEPEND+=" !www-client/${x}"
-	fi
-done
-unset x
-
 QA_PREBUILT="*"
 S=${WORKDIR}
+CHROME_HOME="opt/google/chrome${PN#google-chrome}"
 
 DISABLE_AUTOFORMATTING="yes"
 DOC_CONTENTS="
@@ -124,10 +110,7 @@ pkg_setup() {
 }
 
 src_install() {
-	CHROME_HOME="opt/google/chrome${PN#google-chrome}"
-
 	rm -r usr/share/menu || die
-	rmdir usr/share/doc/google-chrome || die
 	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
 
 	pushd "${CHROME_HOME}/locales" > /dev/null || die
@@ -137,21 +120,20 @@ src_install() {
 	if use plugins ; then
 		local plugins="--extra-plugin-dir=/usr/$(get_libdir)/nsbrowser/plugins"
 		sed -e "/^exec/ i set -- \"${plugins}\" \"\$@\"" \
-			-i "${CHROME_HOME}/google-chrome" || die
+			-i "${CHROME_HOME}/${PN}" || die
 	fi
 
 	local size
 	for size in 16 22 24 32 48 64 128 256 ; do
-		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" google-chrome.png
+		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" ${PN}.png
 	done
 
 	insinto /
 	doins -r opt usr
 
-	fperms 755 "/${CHROME_HOME}"/{{,google-}chrome,nacl_helper{,_bootstrap},xdg-{mime,settings}}
-	fperms 4755 "/${CHROME_HOME}/chrome-sandbox"
+	chmod 755 "${ED}${CHROME_HOME}"/{chrome,${PN},nacl_helper{,_bootstrap},xdg-{mime,settings}} || die
+	chmod 4755 "${ED}${CHROME_HOME}/chrome-sandbox" || die
 	pax-mark m "${ED}${CHROME_HOME}/chrome"
-	dosym /usr/$(get_libdir)/libudev.so "${CHROME_HOME}/libudev.so.0"
 
 	readme.gentoo_create_doc
 }
@@ -173,7 +155,21 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
+	local lib libdir target
+	for libdir in {,usr/}$(get_libdir); do
+		lib=${EROOT}${libdir}/libudev.so.1
+		if [[ -e ${lib} ]]; then
+			target=$(realpath -ms --relative-to="${EROOT}${CHROME_HOME}" "${lib}")
+			ln -fs "${target}" "${EROOT}${CHROME_HOME}/libudev.so.0"
+			break
+		fi
+	done
+
 	fdo-mime_desktop_database_update
 	gnome2_icon_cache_update
 	readme.gentoo_print_elog
 }
+
+pkg_prerm() {
+	rm -f "${EROOT}${CHROME_HOME}/libudev.so.0"
+}