Bump.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

3 files changed, 35 insertions, 32 deletions

diff --git a/www-client/google-chrome-beta/ChangeLog b/www-client/google-chrome-beta/ChangeLog
index 6c96b928f2e8..da7b64cc958b 100644
--- a/www-client/google-chrome-beta/ChangeLog
+++ b/www-client/google-chrome-beta/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for www-client/google-chrome-beta
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome-beta/ChangeLog,v 1.15 2014/04/02 23:43:36 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome-beta/ChangeLog,v 1.16 2014/04/12 03:10:55 floppym Exp $
+
+*google-chrome-beta-35.0.1916.27_p1 (12 Apr 2014)
+
+  12 Apr 2014; Mike Gilbert <floppym@gentoo.org>
+  +google-chrome-beta-35.0.1916.27_p1.ebuild,
+  -google-chrome-beta-34.0.1847.116_p1.ebuild:
+  Bump.
 
 *google-chrome-beta-34.0.1847.116_p1 (02 Apr 2014)
 
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index b7a955291e6f..2c519d620ecf 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1,15 +1,15 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST google-chrome-beta_34.0.1847.116-1_amd64.deb 48213924 SHA256 ed03fad6aa3b4a22cd1ba1001d962d290a22205da65bf856e741b05b239e9e5a SHA512 9f03ba7ef76228a45c1acb732f9fac36b51907e4a4399675ca420f8b59309c795d18d63cc8733ae5bba7e03d92466c577815ea7fb381b9d042de4baf22bad055 WHIRLPOOL a73f0e92c9dfc80bd7112395c43f44ba1f3f8112b71ea3959f97e470bfbc3e4f18ff87c3fd9c76df98a804d9626ebb7194edceaf1010b9690b38629074fc4e0a
-DIST google-chrome-beta_34.0.1847.116-1_i386.deb 48517848 SHA256 55b85abb2a9c0391fd0e673c231f45773b1ca42aaa2a98921f614d9bdc04439e SHA512 5bd3fe4598d35aa86c1f513472e58065240bba409240189364031bbbe31440d07bfffbf58ecdb1ef38f5feae9c9da4fb4f18ff778874407596247c3c06a5f2bd WHIRLPOOL aee01c84cbe320e17d9d2fe758ae8335e5cdddd2a29d71a70750fe053d4253a26b0890cf7951a74232969283881826718313583e43b8405a63a6620b77b07665
-EBUILD google-chrome-beta-34.0.1847.116_p1.ebuild 4522 SHA256 7bb8ea9ea9a9da5f164299700dea88a6d503a3fe6940ae99d85b6bb152aa6c14 SHA512 6583d4d93b278dbeec2202acc60569c7a6dc922f03c248394791ece6ee4eda0427a9f1cb46e876472e0b6f19e4844ee9309981ad9e8ca802ec3bf321640868b2 WHIRLPOOL 0f472d985f3a58a81bcdde6785cfa5587120567f2f71fcdeda441643b2c9be83109e31bd5bd767ebb33562f102c5136f68de8f953a64571d003ca1bf5cdc21de
-MISC ChangeLog 3319 SHA256 cebebc50ad923f2ef6049465dfb401c93f90f545f05e4e9980d6e2eb97cd9dbc SHA512 4ae57bd022c6ffe791e4bdffcfbfe616f97bfa7e86386af93f1ce4c32a27283c078be6a7de5751b820c5a004768a78665a2eeaa5cac96b768ee428ae64e0cb9f WHIRLPOOL 7a949156c418ec1e6381d3a5a8de671d71f5c5fb52447249ddac1c0b79eb32134240b7cfbde0a13405edb1bd33823de14257d11bb5bd9cb91930aeb456dd159a
+DIST google-chrome-beta_35.0.1916.27-1_amd64.deb 46450748 SHA256 b9556050caeba72ef3b69760ab3f71bec7d2666bc8a5b68015c846b39cd794cf SHA512 43d78be2a523781c1d271b3703eb9747347b9b52d64170d48f94018e9806e96f9296f50aa2b3e6aceab5478fe2f1ab59d438e7b3b9174543d8a3ced0895870c1 WHIRLPOOL 7cc87217ad0061606ea9fbfdacd6db9343df595d4eccd2f3d7f7ef98599035e25a7d3a8ba290daa22fdfa3cc387874d4cb353da849a876affb63531e56028b6c
+DIST google-chrome-beta_35.0.1916.27-1_i386.deb 46652926 SHA256 b2428255e1f1bb5773e89be8d90d0288d64f0b4ad444b19de24a1e0e5907f04f SHA512 fb9401d45a3ff2c324992d3de3ba5587bfe269524284bac0cf6f9b809cb40558015110d9507e757da72bc9e2f5b0cb29755e89bf93f32e5b11dd21023cac4f76 WHIRLPOOL 25b7a162c31013ee796e0e3e59ce8f9a601b13d9f81b2067b1baea510c5fd76920ce62f581291c6fdcf7f4aa06a8e80411fff5ec8436a5d8f8d2bddb31645c71
+EBUILD google-chrome-beta-35.0.1916.27_p1.ebuild 4470 SHA256 c58650062580f2aebacb4405ad484c5201af0b310f1ab8a5f72d725115d2f9dd SHA512 cbaa69af727241928e87be99fb62c945449f59961c6a766fd59b74e458ac742f3213512217ee54b437b6f009000a31ea67e6d25511ec6fedaeabaf7358fbeb93 WHIRLPOOL 52465f0edd97276d97d405efb16eeed247a9142ed2c1a2aac1f99dc5d1b89a1183e9bec888ad7e2edc64d1ed87e11c645485507985666e05262f49ff07c589fa
+MISC ChangeLog 3521 SHA256 ae6387d3ab2a33e69a90a76c00b6df94975b33b73cbd423baed3d7dc57fc30ca SHA512 b8236f9ce1e74c8b4e3314dba3338802d773b7d4e39878e64ac669da5b95c9cb1da259a1c98d4423fd475d11ece751823638d3f14c58a0c180179f4fbbf89779 WHIRLPOOL ec18a1de4de7bbc2c685aa82de3d5a88b7c5752729bb3f4b67b67c05dc578aff4255758c4d8f939085b47c00bdf66c44e055fc42d513de937f0d5ced7c32ddca
 MISC metadata.xml 600 SHA256 e3dffcb8db012d64e4dbb7df2566b800b2a9476aaf0447b1d40a6e94d2733806 SHA512 350bb629bee41ac320d1a870d3d7f34ead23edb1b7cf6ac6379363b01435015c58e249ba1375e9ed3b3023107ef5f3f29f646143a9e2622769923aa5fb21d846 WHIRLPOOL 05772be4e662813e5a0231e46d272931f0ccce9a13f7244ddda8a40e43e8d141293d0a70d4aa8b640ace773d3f68d663bd8cd4558f3bc3c65e5126834bf05129
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlM8oKkACgkQC77qH+pIQ6Q0XgD/SUDo2TY+JVZYONr83C/RXtmQ
-Iz6ry7jWtPBWXa/y5TMBAMMogz7aYDcoSZikFNlgHKaTsRBTgJFcJ1s+oEJbQ7nA
-=TFk0
+iF4EAREIAAYFAlNIrsQACgkQC77qH+pIQ6QmfgD8C0lRpAm4bK2MQMx3gsklRy6o
+5r2//Bzmy/zeXCtmeakA/A64uiOBMffYbnb9+dlUDeslKA/RulLPQQOxw3wKOXIl
+=Rfe9
 -----END PGP SIGNATURE-----
diff --git a/www-client/google-chrome-beta/google-chrome-beta-34.0.1847.116_p1.ebuild b/www-client/google-chrome-beta/google-chrome-beta-35.0.1916.27_p1.ebuild
index 8511970fc594..d00c43dfee5b 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-34.0.1847.116_p1.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-35.0.1916.27_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-beta/google-chrome-beta-34.0.1847.116_p1.ebuild,v 1.1 2014/04/02 23:43:36 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome-beta/google-chrome-beta-35.0.1916.27_p1.ebuild,v 1.1 2014/04/12 03:10:55 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"
+}