From d6967ed11910e93a11997b897044a0131fa848e5 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Tue, 26 Jun 2012 23:26:07 +0000 Subject: Stable channel bump. (Portage version: 2.2.0_alpha113/cvs/Linux x86_64) --- www-client/google-chrome/ChangeLog | 9 +- .../google-chrome-19.0.1084.56_p140965.ebuild | 128 --------------------- .../google-chrome-20.0.1132.43_p143823.ebuild | 128 +++++++++++++++++++++ 3 files changed, 136 insertions(+), 129 deletions(-) delete mode 100644 www-client/google-chrome/google-chrome-19.0.1084.56_p140965.ebuild create mode 100644 www-client/google-chrome/google-chrome-20.0.1132.43_p143823.ebuild (limited to 'www-client') diff --git a/www-client/google-chrome/ChangeLog b/www-client/google-chrome/ChangeLog index 7b0461300bde..733fb42591c0 100644 --- a/www-client/google-chrome/ChangeLog +++ b/www-client/google-chrome/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for www-client/google-chrome # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v 1.149 2012/06/26 02:24:40 jdhore Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v 1.150 2012/06/26 23:26:07 floppym Exp $ + +*google-chrome-20.0.1132.43_p143823 (26 Jun 2012) + + 26 Jun 2012; Mike Gilbert + +google-chrome-20.0.1132.43_p143823.ebuild, + -google-chrome-19.0.1084.56_p140965.ebuild: + Stable channel bump. *google-chrome-21.0.1180.11_alpha143993 (26 Jun 2012) diff --git a/www-client/google-chrome/google-chrome-19.0.1084.56_p140965.ebuild b/www-client/google-chrome/google-chrome-19.0.1084.56_p140965.ebuild deleted file mode 100644 index 9360a82e1811..000000000000 --- a/www-client/google-chrome/google-chrome-19.0.1084.56_p140965.ebuild +++ /dev/null @@ -1,128 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-19.0.1084.56_p140965.ebuild,v 1.1 2012/06/08 22:05:23 floppym Exp $ - -EAPI="4" - -CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA 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 eutils multilib pax-utils unpacker - -DESCRIPTION="The web browser from Google" -HOMEPAGE="http://www.google.com/chrome" - -case ${PV} in - *_alpha*) - SLOT="unstable" - MY_PV=${PV/_alpha/-r} - ;; - *_beta*) - SLOT="beta" - MY_PV=${PV/_beta/-r} - ;; - *_p*) - SLOT="stable" - MY_PV=${PV/_p/-r} - ;; - *) - die "Invalid value for \${PV}: ${PV}" - ;; -esac - -MY_PN="${PN}-${SLOT}" -MY_P="${MY_PN}_${MY_PV}" - -SRC_BASE="http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_" -SRC_URI="amd64? ( ${SRC_BASE}amd64.deb ) x86? ( ${SRC_BASE}i386.deb )" - -LICENSE="google-chrome" -KEYWORDS="-* ~amd64 ~x86" -IUSE="+plugins" -RESTRICT="mirror strip" - -RDEPEND=" - media-libs/alsa-lib - app-arch/bzip2 - x11-libs/cairo - net-print/cups - sys-apps/dbus - dev-libs/expat - media-libs/fontconfig - media-libs/freetype - app-misc/ca-certificates - gnome-base/gconf:2 - dev-libs/libgcrypt - x11-libs/gdk-pixbuf - x11-libs/gtk+:2 - dev-libs/glib:2 - dev-libs/nspr - dev-libs/nss - x11-libs/pango - media-libs/libpng:1.2 - || ( >=sys-devel/gcc-4.4.0[-nocxx] >=sys-devel/gcc-4.4.0[cxx] ) - sys-fs/udev - x11-libs/libX11 - x11-libs/libXext - x11-libs/libXfixes - x11-libs/libXrender - x11-libs/libXScrnSaver - sys-libs/zlib - x11-misc/xdg-utils - net-misc/curl - dev-libs/openssl:0.9.8 -" - -# Add blockers for the other slots. -for x in 0 beta stable unstable; do - if [[ ${SLOT} != ${x} ]]; then - RDEPEND+=" !${CATEGORY}/${PN}:${x}" - fi -done - -QA_PREBUILT="*" -S=${WORKDIR} - -pkg_setup() { - chromium_suid_sandbox_check_kernel_config -} - -src_install() { - CHROME_HOME="opt/google/chrome/" - - pax-mark m ${CHROME_HOME}chrome || die - rm -rf usr/share/menu || die - mv usr/share/doc/${PN} usr/share/doc/${PF} || die - - pushd "${CHROME_HOME}locales" > /dev/null || die - chromium_remove_language_paks - popd - - mv opt usr "${D}" || die - - fperms u+s "/${CHROME_HOME}chrome-sandbox" || die - - if use plugins ; then - local args='"$@"' - local plugins="/usr/$(get_libdir)/nsbrowser/plugins" - sed -e "s:${args}:--extra-plugin-dir=\"${plugins}\" \\0:" \ - -i "${D}${CHROME_HOME}google-chrome" || die - fi - - domenu "${D}${CHROME_HOME}google-chrome.desktop" || die - local size - for size in 16 22 24 32 48 64 128 256 ; do - insinto /usr/share/icons/hicolor/${size}x${size}/apps - newins "${D}${CHROME_HOME}product_logo_${size}.png" google-chrome.png - done -} - -pkg_postinst() { - chromium_pkg_postinst - - einfo - elog "Please notice the bundled flash player (PepperFlash)." - elog "You can (de)activate all flash plugins via chrome://plugins" - einfo -} diff --git a/www-client/google-chrome/google-chrome-20.0.1132.43_p143823.ebuild b/www-client/google-chrome/google-chrome-20.0.1132.43_p143823.ebuild new file mode 100644 index 000000000000..a4d5cce29512 --- /dev/null +++ b/www-client/google-chrome/google-chrome-20.0.1132.43_p143823.ebuild @@ -0,0 +1,128 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/google-chrome-20.0.1132.43_p143823.ebuild,v 1.1 2012/06/26 23:26:07 floppym Exp $ + +EAPI="4" + +CHROMIUM_LANGS="am ar bg bn ca cs da de el en_GB es es_LA 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 eutils multilib pax-utils unpacker + +DESCRIPTION="The web browser from Google" +HOMEPAGE="http://www.google.com/chrome" + +case ${PV} in + *_alpha*) + SLOT="unstable" + MY_PV=${PV/_alpha/-r} + ;; + *_beta*) + SLOT="beta" + MY_PV=${PV/_beta/-r} + ;; + *_p*) + SLOT="stable" + MY_PV=${PV/_p/-r} + ;; + *) + die "Invalid value for \${PV}: ${PV}" + ;; +esac + +MY_PN="${PN}-${SLOT}" +MY_P="${MY_PN}_${MY_PV}" + +SRC_BASE="http://dl.google.com/linux/chrome/deb/pool/main/g/${MY_PN}/${MY_P}_" +SRC_URI="amd64? ( ${SRC_BASE}amd64.deb ) x86? ( ${SRC_BASE}i386.deb )" + +LICENSE="google-chrome" +KEYWORDS="-* ~amd64 ~x86" +IUSE="+plugins" +RESTRICT="mirror strip" + +RDEPEND=" + media-libs/alsa-lib + app-arch/bzip2 + x11-libs/cairo + net-print/cups + sys-apps/dbus + dev-libs/expat + media-libs/fontconfig + media-libs/freetype + app-misc/ca-certificates + gnome-base/gconf:2 + dev-libs/libgcrypt + x11-libs/gdk-pixbuf + x11-libs/gtk+:2 + dev-libs/glib:2 + dev-libs/nspr + dev-libs/nss + x11-libs/pango + media-libs/libpng:1.2 + || ( >=sys-devel/gcc-4.4.0[-nocxx] >=sys-devel/gcc-4.4.0[cxx] ) + sys-fs/udev + x11-libs/libX11 + x11-libs/libXext + x11-libs/libXfixes + x11-libs/libXrender + x11-libs/libXScrnSaver + sys-libs/zlib + x11-misc/xdg-utils + net-misc/curl + dev-libs/openssl:0.9.8 +" + +# Add blockers for the other slots. +for x in 0 beta stable unstable; do + if [[ ${SLOT} != ${x} ]]; then + RDEPEND+=" !${CATEGORY}/${PN}:${x}" + fi +done + +QA_PREBUILT="*" +S=${WORKDIR} + +pkg_setup() { + chromium_suid_sandbox_check_kernel_config +} + +src_install() { + CHROME_HOME="opt/google/chrome/" + + pax-mark m ${CHROME_HOME}chrome || die + rm -rf usr/share/menu || die + mv usr/share/doc/${PN} usr/share/doc/${PF} || die + + pushd "${CHROME_HOME}locales" > /dev/null || die + chromium_remove_language_paks + popd + + mv opt usr "${D}" || die + + fperms u+s "/${CHROME_HOME}chrome-sandbox" || die + + if use plugins ; then + local args='"$@"' + local plugins="/usr/$(get_libdir)/nsbrowser/plugins" + sed -e "s:${args}:--extra-plugin-dir=\"${plugins}\" \\0:" \ + -i "${D}${CHROME_HOME}google-chrome" || die + fi + + domenu "${D}${CHROME_HOME}google-chrome.desktop" || die + local size + for size in 16 22 24 32 48 64 128 256 ; do + insinto /usr/share/icons/hicolor/${size}x${size}/apps + newins "${D}${CHROME_HOME}product_logo_${size}.png" google-chrome.png + done +} + +pkg_postinst() { + chromium_pkg_postinst + + einfo + elog "Please notice the bundled flash player (PepperFlash)." + elog "You can (de)activate all flash plugins via chrome://plugins" + einfo +} -- cgit v1.2.3-65-gdbad