Tweak src_install.

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

3 files changed, 22 insertions, 15 deletions

diff --git a/www-client/google-chrome/ChangeLog b/www-client/google-chrome/ChangeLog
index 89c59eb69fc6..a9b689acb841 100644
--- a/www-client/google-chrome/ChangeLog
+++ b/www-client/google-chrome/ChangeLog
@@ -1,6 +1,10 @@
 # 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.339 2013/11/12 23:10:28 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v 1.340 2013/11/13 00:25:49 floppym Exp $
+
+  13 Nov 2013; Mike Gilbert <floppym@gentoo.org>
+  google-chrome-33.0.1707.0_alpha1.ebuild:
+  Tweak src_install.
 
 *google-chrome-31.0.1650.48_p1 (12 Nov 2013)
 *google-chrome-33.0.1707.0_alpha1 (12 Nov 2013)
diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest
index 60f38cabe3bd..2aab6d5e41a7 100644
--- a/www-client/google-chrome/Manifest
+++ b/www-client/google-chrome/Manifest
@@ -9,13 +9,13 @@ DIST google-chrome-unstable_33.0.1707.0-1_amd64.deb 50375190 SHA256 778d5c54a38a
 DIST google-chrome-unstable_33.0.1707.0-1_i386.deb 47779384 SHA256 abde92d7eebac60dfe6d980c225ff8a67841db68e76c57baca72d5ac286e5076 SHA512 355c783fee19fca94beed7a12b43b2a1851aed5d1dabbc45072c0571bbe7c9a51d1fe43377225b558da15c67c779c32a850a9fd9d162de5a8509992d95397b75 WHIRLPOOL fc445c6dc965d4c27e548368424f762ad7309195d28fc121bc850765a3a3265d72fea9cd492fb052637264b62a006f8143ec5af81d55a6314a840d821adfa8a5
 EBUILD google-chrome-31.0.1650.48_p1.ebuild 4441 SHA256 88830e365549c96d5273425b49a1d1216e678633bd188dcd5a128d16cbeb65f4 SHA512 007f8d9d5a79bc26807fd31d100b4405dcc72c18444e516b7bfd8608a77c22a6863e0380a5e8e4922c4785e1e290ab29e72c8ef46ec16aa31c1843ebf53dc978 WHIRLPOOL 26becd2652b181c22dbf88fb0661d8f8d4d4614ed3aee425be9fab110347822283470c518c812f340f02416cdb8e4a0ffdbf6aa0a79bda1d59a84a2970000dce
 EBUILD google-chrome-32.0.1700.6_beta1.ebuild 4443 SHA256 14ddae920f78f5f798b9d14501db07d69a220a2a804ea594c0a0c47b7c4ad535 SHA512 dffbb7de2fce685e13e695599102b6a68d3022344bbdb5cb10da7b43580ada4c228ec49f6adef607b9158ec1173fbc42a399293c0990643af9f6d03bd944248b WHIRLPOOL b414172ce44d83457833750d36055ca4af96f787b7e868ef2168f93dc4e013502f6dd34652cdea16f160b3e9c3015df50765d5a79988fd5f0a8f8aba6b8cd4bb
-EBUILD google-chrome-33.0.1707.0_alpha1.ebuild 4369 SHA256 ff9d4b276b639bacdfee2aeebcaf8f79776c20a053e9fb43cd82aaeb365a36c4 SHA512 06f06b32217f199c0f05a2d2fc2b8aa7561eebdf30b45ae182970a5b4ac8f182c332f85bca8bd08f685a53bb3f73dbd557c5112cdf7f361312cf5f0cabad646b WHIRLPOOL eaa7b4c9031076807df794aa4895063c1b3745638c3725adc628dfedf1b45ed791e4c5f9113eedce03389477083adb5d22c68f86e4c632d264105f5ba7aa6ff0
-MISC ChangeLog 82943 SHA256 8ddc95f40f2d92b587a354f6f814e0b551e0c8dd78b4616a0c6983340afa589e SHA512 c58dfe687db1b98cfb5faa1da31c80d5accc33a0eae35d9c5a897b4e1fbbbfede6930e3fdcb8d23cf0440fc2183610619d5910522eaafb476430ce5fd8268483 WHIRLPOOL 6264297e8f5114de6557e4f05594f44ee97b16902eadda4c2ec04e065fb72e9b33a4ff34177d7033005b014dc54ffbce1ba4db391cf6a32418120949ed471f75
+EBUILD google-chrome-33.0.1707.0_alpha1.ebuild 4486 SHA256 c3553cf77e7638f7a94e47d6b1eb045ecdb93426b1797e40f96d83846b14a544 SHA512 6c395457bc9866255305f097e84a604957a3ed78f58961a7113be12db1898dde8d978a8a6554afc6bc7a0edc1ebdf4157c380622337e5f2b49889d49f38c09ce WHIRLPOOL 2c7fc562424c26dc7992497c4dab460d43ac1148eef9fed1671e1ff5a4e1f819668013b9fb2a393776b1f570fa48bec763a2dad2b2e97b55498eaeb4ebfab8b1
+MISC ChangeLog 83057 SHA256 caef513d3cc56a34a6ff0c67244e231f6dab521c13e6fe9dabe4adea37f9a072 SHA512 d8eedf95f8f46efc7c8cd4db97d002095e8ae721a635abc7e07799c060c1b9adadcdd8015965c283d42ed0a008457cfebed820ca441919ea8c8d1adba73b23ea WHIRLPOOL 335756942c52f1ecfa376228906253dce7a8a478865052bd635cf39ba8d0247c3ea086e5eb4bba8f049b054a5813e4e75f5cde216ae99b935a6ebd70f21928ea
 MISC metadata.xml 600 SHA256 e3dffcb8db012d64e4dbb7df2566b800b2a9476aaf0447b1d40a6e94d2733806 SHA512 350bb629bee41ac320d1a870d3d7f34ead23edb1b7cf6ac6379363b01435015c58e249ba1375e9ed3b3023107ef5f3f29f646143a9e2622769923aa5fb21d846 WHIRLPOOL 05772be4e662813e5a0231e46d272931f0ccce9a13f7244ddda8a40e43e8d141293d0a70d4aa8b640ace773d3f68d663bd8cd4558f3bc3c65e5126834bf05129
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlKCtWYACgkQC77qH+pIQ6ShfQD/a+Bvk1XQzd3kV5ydhccDjdGL
-Ff25YEb+aL6l6EPhYpEA/2ZFA8EruRRWXC3BZCmV59rRCnjPjmdvykSWbrU3QzrW
-=pID9
+iF4EAREIAAYFAlKCxw4ACgkQC77qH+pIQ6TrmQD/eyMIZ6SKkz3WcXJB8vsqIKnE
+u18mn17XwbpQv1PYlaYA/ibmsbzzqsVQJZDpTBxOUwW+JTfVoFaEe/YVe//O8O3S
+=avYs
 -----END PGP SIGNATURE-----
diff --git a/www-client/google-chrome/google-chrome-33.0.1707.0_alpha1.ebuild b/www-client/google-chrome/google-chrome-33.0.1707.0_alpha1.ebuild
index 66e75724701b..bb3fa72afbe5 100644
--- a/www-client/google-chrome/google-chrome-33.0.1707.0_alpha1.ebuild
+++ b/www-client/google-chrome/google-chrome-33.0.1707.0_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-33.0.1707.0_alpha1.ebuild,v 1.1 2013/11/12 23:10:28 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-33.0.1707.0_alpha1.ebuild,v 1.2 2013/11/13 00:25:49 floppym Exp $
 
 EAPI="4"
 
@@ -129,14 +129,9 @@ pkg_setup() {
 src_install() {
 	CHROME_HOME="opt/google/chrome"
 
-	mv opt usr "${D}" || die
-	cd "${D}" || 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/${PN} usr/share/doc/${PF} || die
-	dosym /usr/$(get_libdir)/libudev.so "${CHROME_HOME}/libudev.so.0"
+	rm -r usr/share/menu || die
+	rmdir usr/share/doc/${PN} || die
+	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
 
 	pushd "${CHROME_HOME}/locales" > /dev/null || die
 	chromium_remove_language_paks
@@ -154,6 +149,14 @@ src_install() {
 		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"
+	pax-mark m "${ED}${CHROME_HOME}/chrome"
+	dosym /usr/$(get_libdir)/libudev.so "${CHROME_HOME}/libudev.so.0"
+
 	readme.gentoo_create_doc
 }