commit: c9b3c6c0a2c71bad5d9777630c5b8b97f75b8b2c Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Mon Nov 12 16:03:27 2018 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Mon Nov 12 21:18:16 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c9b3c6c0
www-client/google-chrome: unify stable/beta/unstable ebuilds Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> .../google-chrome-beta/google-chrome-beta-71.0.3578.44.ebuild | 10 +++++++--- .../google-chrome-unstable-72.0.3602.2.ebuild | 9 +++++++-- www-client/google-chrome/google-chrome-70.0.3538.102.ebuild | 10 +++++++--- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/www-client/google-chrome-beta/google-chrome-beta-71.0.3578.44.ebuild b/www-client/google-chrome-beta/google-chrome-beta-71.0.3578.44.ebuild index 3a03ee42c9b..88e80e216eb 100644 --- a/www-client/google-chrome-beta/google-chrome-beta-71.0.3578.44.ebuild +++ b/www-client/google-chrome-beta/google-chrome-beta-71.0.3578.44.ebuild @@ -13,8 +13,10 @@ DESCRIPTION="The web browser from Google" HOMEPAGE="https://www.google.com/chrome"; if [[ ${PN} == google-chrome ]]; then + KEYWORDS="-* amd64" MY_PN=${PN}-stable else + KEYWORDS="-* ~amd64" MY_PN=${PN} fi @@ -24,7 +26,6 @@ SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd LICENSE="google-chrome" SLOT="0" -KEYWORDS="-* ~amd64" IUSE="+plugins" RESTRICT="bindist mirror strip" @@ -38,7 +39,6 @@ RDEPEND=" dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 - gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 @@ -104,9 +104,13 @@ src_install() { -i "${CHROME_HOME}/${PN}" || die fi + local suffix= + [[ ${PN} == google-chrome-beta ]] && suffix=_beta + [[ ${PN} == google-chrome-unstable ]] && suffix=_dev + local size for size in 16 22 24 32 48 64 128 256 ; do - newicon -s ${size} "${CHROME_HOME}/product_logo_${size}_beta.png" ${PN}.png + newicon -s ${size} "${CHROME_HOME}/product_logo_${size}${suffix}.png" ${PN}.png done pax-mark m "${CHROME_HOME}/chrome" diff --git a/www-client/google-chrome-unstable/google-chrome-unstable-72.0.3602.2.ebuild b/www-client/google-chrome-unstable/google-chrome-unstable-72.0.3602.2.ebuild index 57fa25d49a6..88e80e216eb 100644 --- a/www-client/google-chrome-unstable/google-chrome-unstable-72.0.3602.2.ebuild +++ b/www-client/google-chrome-unstable/google-chrome-unstable-72.0.3602.2.ebuild @@ -13,8 +13,10 @@ DESCRIPTION="The web browser from Google" HOMEPAGE="https://www.google.com/chrome"; if [[ ${PN} == google-chrome ]]; then + KEYWORDS="-* amd64" MY_PN=${PN}-stable else + KEYWORDS="-* ~amd64" MY_PN=${PN} fi @@ -24,7 +26,6 @@ SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd LICENSE="google-chrome" SLOT="0" -KEYWORDS="-* ~amd64" IUSE="+plugins" RESTRICT="bindist mirror strip" @@ -103,9 +104,13 @@ src_install() { -i "${CHROME_HOME}/${PN}" || die fi + local suffix= + [[ ${PN} == google-chrome-beta ]] && suffix=_beta + [[ ${PN} == google-chrome-unstable ]] && suffix=_dev + local size for size in 16 22 24 32 48 64 128 256 ; do - newicon -s ${size} "${CHROME_HOME}/product_logo_${size}_dev.png" ${PN}.png + newicon -s ${size} "${CHROME_HOME}/product_logo_${size}${suffix}.png" ${PN}.png done pax-mark m "${CHROME_HOME}/chrome" diff --git a/www-client/google-chrome/google-chrome-70.0.3538.102.ebuild b/www-client/google-chrome/google-chrome-70.0.3538.102.ebuild index d7d8f612b2b..88e80e216eb 100644 --- a/www-client/google-chrome/google-chrome-70.0.3538.102.ebuild +++ b/www-client/google-chrome/google-chrome-70.0.3538.102.ebuild @@ -13,8 +13,10 @@ DESCRIPTION="The web browser from Google" HOMEPAGE="https://www.google.com/chrome"; if [[ ${PN} == google-chrome ]]; then + KEYWORDS="-* amd64" MY_PN=${PN}-stable else + KEYWORDS="-* ~amd64" MY_PN=${PN} fi @@ -24,7 +26,6 @@ SRC_URI="https://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_amd LICENSE="google-chrome" SLOT="0" -KEYWORDS="-* amd64" IUSE="+plugins" RESTRICT="bindist mirror strip" @@ -38,7 +39,6 @@ RDEPEND=" dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 - gnome-base/gconf:2 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 @@ -104,9 +104,13 @@ src_install() { -i "${CHROME_HOME}/${PN}" || die fi + local suffix= + [[ ${PN} == google-chrome-beta ]] && suffix=_beta + [[ ${PN} == google-chrome-unstable ]] && suffix=_dev + local size for size in 16 22 24 32 48 64 128 256 ; do - newicon -s ${size} "${CHROME_HOME}/product_logo_${size}.png" ${PN}.png + newicon -s ${size} "${CHROME_HOME}/product_logo_${size}${suffix}.png" ${PN}.png done pax-mark m "${CHROME_HOME}/chrome"
