From: Mike Gilbert <floppym@gentoo.org>
Date: Thu, 1 Sep 2016 02:50:05 +0000 (-0400)
Subject: www-client/google-chrome: do all the work in src_install
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=e38694007a1f643d82cb6d7b672b55298c864274;p=gentoo.git

www-client/google-chrome: do all the work in src_install
---

diff --git a/www-client/google-chrome-beta/google-chrome-beta-53.0.2785.89.ebuild b/www-client/google-chrome-beta/google-chrome-beta-53.0.2785.89.ebuild
index cb166c0b2f8d..2452d4295324 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-53.0.2785.89.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-53.0.2785.89.ebuild
@@ -107,8 +107,16 @@ pkg_setup() {
 	chromium_suid_sandbox_check_kernel_config
 }
 
+src_unpack() {
+	:
+}
+
 src_install() {
-	rm -r usr/share/menu || die
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	rm -r etc usr/share/menu || die
 	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
 
 	pushd "${CHROME_HOME}/locales" > /dev/null || die
@@ -126,14 +134,9 @@ src_install() {
 		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" ${PN}.png
 	done
 
-	insinto /
-	doins -r opt usr
-	dosym "/${CHROME_HOME}/${PN}" "/usr/bin/${MY_PN}"
+	dosym "/${CHROME_HOME}/${PN}" "usr/bin/${MY_PN}"
 
-	find "${ED}" -type d -empty -delete || die
-	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"
+	pax-mark m "${CHROME_HOME}/chrome"
 
 	readme.gentoo_create_doc
 }
diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-54.0.2840.6.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-54.0.2840.6.ebuild
index cb166c0b2f8d..2452d4295324 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-54.0.2840.6.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-54.0.2840.6.ebuild
@@ -107,8 +107,16 @@ pkg_setup() {
 	chromium_suid_sandbox_check_kernel_config
 }
 
+src_unpack() {
+	:
+}
+
 src_install() {
-	rm -r usr/share/menu || die
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	rm -r etc usr/share/menu || die
 	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
 
 	pushd "${CHROME_HOME}/locales" > /dev/null || die
@@ -126,14 +134,9 @@ src_install() {
 		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" ${PN}.png
 	done
 
-	insinto /
-	doins -r opt usr
-	dosym "/${CHROME_HOME}/${PN}" "/usr/bin/${MY_PN}"
+	dosym "/${CHROME_HOME}/${PN}" "usr/bin/${MY_PN}"
 
-	find "${ED}" -type d -empty -delete || die
-	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"
+	pax-mark m "${CHROME_HOME}/chrome"
 
 	readme.gentoo_create_doc
 }
diff --git a/www-client/google-chrome/google-chrome-53.0.2785.89.ebuild b/www-client/google-chrome/google-chrome-53.0.2785.89.ebuild
index cb166c0b2f8d..2452d4295324 100644
--- a/www-client/google-chrome/google-chrome-53.0.2785.89.ebuild
+++ b/www-client/google-chrome/google-chrome-53.0.2785.89.ebuild
@@ -107,8 +107,16 @@ pkg_setup() {
 	chromium_suid_sandbox_check_kernel_config
 }
 
+src_unpack() {
+	:
+}
+
 src_install() {
-	rm -r usr/share/menu || die
+	dodir /
+	cd "${ED}" || die
+	unpacker
+
+	rm -r etc usr/share/menu || die
 	mv usr/share/doc/${MY_PN} usr/share/doc/${PF} || die
 
 	pushd "${CHROME_HOME}/locales" > /dev/null || die
@@ -126,14 +134,9 @@ src_install() {
 		newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" ${PN}.png
 	done
 
-	insinto /
-	doins -r opt usr
-	dosym "/${CHROME_HOME}/${PN}" "/usr/bin/${MY_PN}"
+	dosym "/${CHROME_HOME}/${PN}" "usr/bin/${MY_PN}"
 
-	find "${ED}" -type d -empty -delete || die
-	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"
+	pax-mark m "${CHROME_HOME}/chrome"
 
 	readme.gentoo_create_doc
 }