public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: www-client/google-chrome-beta/, www-client/google-chrome/, ...
@ 2016-09-01  2:50 Mike Gilbert
  0 siblings, 0 replies; 2+ messages in thread
From: Mike Gilbert @ 2016-09-01  2:50 UTC (permalink / raw
  To: gentoo-commits

commit:     e38694007a1f643d82cb6d7b672b55298c864274
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Thu Sep  1 02:50:05 2016 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Thu Sep  1 02:50:05 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3869400

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

 .../google-chrome-beta-53.0.2785.89.ebuild            | 19 +++++++++++--------
 .../google-chrome-unstable-54.0.2840.6.ebuild         | 19 +++++++++++--------
 .../google-chrome/google-chrome-53.0.2785.89.ebuild   | 19 +++++++++++--------
 3 files changed, 33 insertions(+), 24 deletions(-)

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 cb166c0..2452d42 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 cb166c0..2452d42 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 cb166c0..2452d42 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
 }


^ permalink raw reply related	[flat|nested] 2+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: www-client/google-chrome-beta/, www-client/google-chrome/, ...
@ 2020-10-28 14:18 Mike Gilbert
  0 siblings, 0 replies; 2+ messages in thread
From: Mike Gilbert @ 2020-10-28 14:18 UTC (permalink / raw
  To: gentoo-commits

commit:     db216a3e1718352847f0291dd83e0a10bcf64ff9
Author:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 28 14:17:50 2020 +0000
Commit:     Mike Gilbert <floppym <AT> gentoo <DOT> org>
CommitDate: Wed Oct 28 14:17:50 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=db216a3e

www-client/google-chrome: eliminate gnome2-utils

Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org>

 .../google-chrome-beta/google-chrome-beta-87.0.4280.27.ebuild  | 10 +++-------
 .../google-chrome-unstable-88.0.4300.0.ebuild                  | 10 +++-------
 www-client/google-chrome/google-chrome-86.0.4240.111.ebuild    | 10 +++-------
 3 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/www-client/google-chrome-beta/google-chrome-beta-87.0.4280.27.ebuild b/www-client/google-chrome-beta/google-chrome-beta-87.0.4280.27.ebuild
index 30f7b9c29e9..5a9c327ca88 100644
--- a/www-client/google-chrome-beta/google-chrome-beta-87.0.4280.27.ebuild
+++ b/www-client/google-chrome-beta/google-chrome-beta-87.0.4280.27.ebuild
@@ -7,7 +7,7 @@ CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
 	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
 	sv sw ta te th tr uk vi zh-CN zh-TW"
 
-inherit chromium-2 eutils gnome2-utils pax-utils unpacker xdg-utils
+inherit chromium-2 eutils pax-utils unpacker xdg-utils
 
 DESCRIPTION="The web browser from Google"
 HOMEPAGE="https://www.google.com/chrome"
@@ -123,16 +123,12 @@ src_install() {
 	pax-mark m "${CHROME_HOME}/chrome"
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }

diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-88.0.4300.0.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-88.0.4300.0.ebuild
index 30f7b9c29e9..5a9c327ca88 100644
--- a/www-client/google-chrome-unstable/google-chrome-unstable-88.0.4300.0.ebuild
+++ b/www-client/google-chrome-unstable/google-chrome-unstable-88.0.4300.0.ebuild
@@ -7,7 +7,7 @@ CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
 	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
 	sv sw ta te th tr uk vi zh-CN zh-TW"
 
-inherit chromium-2 eutils gnome2-utils pax-utils unpacker xdg-utils
+inherit chromium-2 eutils pax-utils unpacker xdg-utils
 
 DESCRIPTION="The web browser from Google"
 HOMEPAGE="https://www.google.com/chrome"
@@ -123,16 +123,12 @@ src_install() {
 	pax-mark m "${CHROME_HOME}/chrome"
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }

diff --git a/www-client/google-chrome/google-chrome-86.0.4240.111.ebuild b/www-client/google-chrome/google-chrome-86.0.4240.111.ebuild
index b5a38b97587..33358d2b47a 100644
--- a/www-client/google-chrome/google-chrome-86.0.4240.111.ebuild
+++ b/www-client/google-chrome/google-chrome-86.0.4240.111.ebuild
@@ -7,7 +7,7 @@ CHROMIUM_LANGS="am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
 	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
 	sv sw ta te th tr uk vi zh-CN zh-TW"
 
-inherit chromium-2 eutils gnome2-utils pax-utils unpacker xdg-utils
+inherit chromium-2 eutils pax-utils unpacker xdg-utils
 
 DESCRIPTION="The web browser from Google"
 HOMEPAGE="https://www.google.com/chrome"
@@ -118,16 +118,12 @@ src_install() {
 	pax-mark m "${CHROME_HOME}/chrome"
 }
 
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }


^ permalink raw reply related	[flat|nested] 2+ messages in thread

end of thread, other threads:[~2020-10-28 14:18 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-10-28 14:18 [gentoo-commits] repo/gentoo:master commit in: www-client/google-chrome-beta/, www-client/google-chrome/, Mike Gilbert
  -- strict thread matches above, loose matches on Subject: below --
2016-09-01  2:50 Mike Gilbert

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox