From 4f170e8a77a7d77aff6708a3423d0c6a994ef6ba Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Tue, 10 Apr 2012 16:06:00 +0000 Subject: Beta channel bump. Package-Manager: portage-2.2.0_alpha100/cvs/Linux x86_64 --- www-client/google-chrome/ChangeLog | 9 +- www-client/google-chrome/Manifest | 14 +-- .../google-chrome-18.0.1025.151_beta130497.ebuild | 115 --------------------- .../google-chrome-19.0.1084.15_beta130829.ebuild | 115 +++++++++++++++++++++ 4 files changed, 130 insertions(+), 123 deletions(-) delete mode 100644 www-client/google-chrome/google-chrome-18.0.1025.151_beta130497.ebuild create mode 100644 www-client/google-chrome/google-chrome-19.0.1084.15_beta130829.ebuild (limited to 'www-client') diff --git a/www-client/google-chrome/ChangeLog b/www-client/google-chrome/ChangeLog index bbb76e36d3ea..56f09fd54480 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.113 2012/04/06 02:18:15 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v 1.114 2012/04/10 16:06:00 floppym Exp $ + +*google-chrome-19.0.1084.15_beta130829 (10 Apr 2012) + + 10 Apr 2012; Mike Gilbert + +google-chrome-19.0.1084.15_beta130829.ebuild, + -google-chrome-18.0.1025.151_beta130497.ebuild: + Beta channel bump. *google-chrome-19.0.1084.15_alpha130829 (06 Apr 2012) diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest index fc02e46c626b..e53478b3e3b4 100644 --- a/www-client/google-chrome/Manifest +++ b/www-client/google-chrome/Manifest @@ -1,21 +1,21 @@ -----BEGIN PGP SIGNED MESSAGE----- Hash: SHA256 -DIST google-chrome-beta_18.0.1025.151-r130497_amd64.deb 27174270 RMD160 90e2882879dbe8b4746aa6dcef43902bddc946f2 SHA1 5f96cd0347c8c93938b63b430f28605aeee29d46 SHA256 3501127e0c9a935366e9bca827ab846a4c5ead80e6ead2c97832ebdcc085cbca -DIST google-chrome-beta_18.0.1025.151-r130497_i386.deb 31277850 RMD160 cafdb05408354a894540765567814e4ade7eedbc SHA1 1207bd9d8f31f92d66020bf1301a0f408973dfdb SHA256 e68adbcb9a5641681985597141d0b61b8ab4185d5bdf4ff8484aa80b461b6045 +DIST google-chrome-beta_19.0.1084.15-r130829_amd64.deb 27644032 RMD160 fb16f1e92628889c9eed73a1e5bcb46820502875 SHA1 09678d16e2d749aeca1fdb39dc112089e9656fb8 SHA256 39634b4003342b655659d909e3d6158408fba2a295b4a83e1bcdaa0f758a6b87 +DIST google-chrome-beta_19.0.1084.15-r130829_i386.deb 31698300 RMD160 336efb100b4abaeefbed64a5df447ce81c35a5cb SHA1 b87050e0878ef115d12ddbcc846eee7d167f93fb SHA256 c0317c1f989d7d79ef0f6544a44d708e10b2b8642910559ffd281f2735588b4a DIST google-chrome-stable_18.0.1025.151-r130497_amd64.deb 27191404 RMD160 81aa0ec6e3fa56dc9a0ddcc8ef542ceb08e68fa2 SHA1 74ad26fcf212dfee0592264e1991ef962ca88180 SHA256 1c47feaf212dc4fb254bce3a44a47960c4ec3b8a27874d541f20cf79eb68e5e0 DIST google-chrome-stable_18.0.1025.151-r130497_i386.deb 31304812 RMD160 e20811b17087e44fbdecdea38d948bbdc5cd57e5 SHA1 77d52953928d60bd964600e5a69217d120839ba5 SHA256 2e904d40409f3ab508ebecddf18f711a98f77f12bb832bbbff347c8805d6afa1 DIST google-chrome-unstable_19.0.1084.15-r130829_amd64.deb 27679342 RMD160 2ab73dfa7231c15f19f56e4ed940521438e057b0 SHA1 1ac81a662270f4b7954b22946ecb38cdf8dc9128 SHA256 4cce3c6e60cb19dc6c298be025580b8497cb8dcb59a87781c21b9257193d1a61 DIST google-chrome-unstable_19.0.1084.15-r130829_i386.deb 31695994 RMD160 560367995926cd8d72acef9778d6b9a50bba6f1b SHA1 ee17a1fe251a1f552d27703ef88d1791c076e536 SHA256 7357a6eb3e738feef47f04e1a0cf93ff84838a1ff7328eb1a17ee928c03b992e -EBUILD google-chrome-18.0.1025.151_beta130497.ebuild 2693 RMD160 835c00089ca5cf60dac453f7fe06e6132671c5b6 SHA1 d6ac958af0ae265c020bb0d19ea26d3e97083489 SHA256 7b92b1e5ff50e07ffc5d8a149fee3939dd92186f63ef549c3bf41bc98d0ca3de EBUILD google-chrome-18.0.1025.151_p130497.ebuild 2690 RMD160 8baecac7f1846b922566df2abcdd9bc57276f08d SHA1 7da66f4fe556af2153f4c3ebec96c57a28411b97 SHA256 efdc96a8a8309b3e6927dd33ff78d3a9bb3f2aa9abe88fb9aed940c2de6f8f8f EBUILD google-chrome-19.0.1084.15_alpha130829.ebuild 2693 RMD160 19068c5c75581143bc5a6e8a114b60adf48491cc SHA1 242587edda96954b8bed20b492c54140026ca697 SHA256 b2cb9f85de871ac95f52462c85e1986248cdb8015c3a830eff4159c7d8bbadb2 -MISC ChangeLog 26432 RMD160 b1ab93f869c3945863fcc0cfae1750697155718d SHA1 62f345c2f31b6d1d4b01a10987df1d87460a0df1 SHA256 f93be3e6f8d1f6253ce5dccedee097e4c96abbb5f2d5be19d38b883968922ad3 +EBUILD google-chrome-19.0.1084.15_beta130829.ebuild 2692 RMD160 41e510c146fcf7b02da681bd086f03555192b162 SHA1 4a1ef71165bb604613a7332fe2d6eef8e63b974a SHA256 ab6d63b1d764a24fbd4f59003f4abfa8a81889639b2c74cacd6203a80286d205 +MISC ChangeLog 26656 RMD160 70e2926cb2152c49b94bc7b2f2a0aca096b9527e SHA1 3d9728dcc05e6ad11f5cd3248a3055dc7f12fca1 SHA256 2414d736e4b34afa242b84d8b04aae7f6369b549d8c23a344ade79e42a9820be MISC metadata.xml 510 RMD160 89172b66e00991d4e6ce045bcbb66d14145ac02a SHA1 f81450697c759948d8c8583aa1b6a095eb71bd05 SHA256 da7aab160a14cadf0b87a04ac7a92e4d90d86e51035ca3c3f96e1ffb3cbb1e83 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk9+Um0ACgkQC77qH+pIQ6SB0AD9F2mkVKtZKyGxKYravKGadfR3 -TygwdBTE9nISTPJcQwcA/2SYJyvVIeQij4mM/LrdU//GESWU9fmhsguguVc37wJP -=d3mt +iF4EAREIAAYFAk+EWm4ACgkQC77qH+pIQ6QnOAEAn+mkACEggXIkTFGt/sxBxCa6 +Sz7bUwsqLziZS1KrH5EA/RtFXNRG7Ftr5nRjTiD0Pe5SsssNeRfesE6pALqAx6VT +=MojM -----END PGP SIGNATURE----- diff --git a/www-client/google-chrome/google-chrome-18.0.1025.151_beta130497.ebuild b/www-client/google-chrome/google-chrome-18.0.1025.151_beta130497.ebuild deleted file mode 100644 index e0383ef8696c..000000000000 --- a/www-client/google-chrome/google-chrome-18.0.1025.151_beta130497.ebuild +++ /dev/null @@ -1,115 +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-18.0.1025.151_beta130497.ebuild,v 1.1 2012/04/05 20:08:52 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} - -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 -} diff --git a/www-client/google-chrome/google-chrome-19.0.1084.15_beta130829.ebuild b/www-client/google-chrome/google-chrome-19.0.1084.15_beta130829.ebuild new file mode 100644 index 000000000000..b793789b9a58 --- /dev/null +++ b/www-client/google-chrome/google-chrome-19.0.1084.15_beta130829.ebuild @@ -0,0 +1,115 @@ +# 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.15_beta130829.ebuild,v 1.1 2012/04/10 16:06:00 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} + +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 +} -- cgit v1.2.3-65-gdbad