From 62893c4fce684c2218cf1053d875f2dbc6afa330 Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Mon, 26 Mar 2012 23:44:28 +0000 Subject: Beta channel bump. Package-Manager: portage-2.2.0_alpha95/cvs/Linux x86_64 --- www-client/google-chrome/ChangeLog | 9 +- www-client/google-chrome/Manifest | 14 +-- .../google-chrome-18.0.1025.113_beta127419.ebuild | 115 --------------------- .../google-chrome-18.0.1025.140_beta128625.ebuild | 115 +++++++++++++++++++++ 4 files changed, 130 insertions(+), 123 deletions(-) delete mode 100644 www-client/google-chrome/google-chrome-18.0.1025.113_beta127419.ebuild create mode 100644 www-client/google-chrome/google-chrome-18.0.1025.140_beta128625.ebuild (limited to 'www-client') diff --git a/www-client/google-chrome/ChangeLog b/www-client/google-chrome/ChangeLog index e3ca58aebd5f..fb0c222bd74d 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.107 2012/03/24 03:50:55 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/google-chrome/ChangeLog,v 1.108 2012/03/26 23:44:28 floppym Exp $ + +*google-chrome-18.0.1025.140_beta128625 (26 Mar 2012) + + 26 Mar 2012; Mike Gilbert + +google-chrome-18.0.1025.140_beta128625.ebuild, + -google-chrome-18.0.1025.113_beta127419.ebuild: + Beta channel bump. *google-chrome-19.0.1077.3_alpha128359 (24 Mar 2012) diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome/Manifest index f2b8fbfadcc2..5744a48f019a 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.113-r127419_amd64.deb 27095944 RMD160 111279f0417641646cc2bad30f632343ce7b0588 SHA1 3a9562b0a1cd1d9de1ff2cf973a991fa8d71be5c SHA256 671a7f6eb6b2e7ea40eb898c81588edfc82bf1f10f639350723635127ffb5257 -DIST google-chrome-beta_18.0.1025.113-r127419_i386.deb 31096984 RMD160 cb6402f6415e51cb1d1519afd595d2282f206118 SHA1 dab4523c6bf4bbd4359baabf8ac682d7aad78512 SHA256 8256cf6f933916b85401fe24afbdcaca4c2d2c72d96c786c4b88aa43e9c363cc +DIST google-chrome-beta_18.0.1025.140-r128625_amd64.deb 27186368 RMD160 b3f9a53d3ab4fd129f397c3ad15544ca190b1d98 SHA1 713001364fb2cdbbbfa2f5a28ec5634f1bd5c882 SHA256 d8d8e39b39775f7dadea5e741453ba9071afea1d70eeec959dd5d407501a7c3e +DIST google-chrome-beta_18.0.1025.140-r128625_i386.deb 31144108 RMD160 38e85a70bd3162f299c90716b84687b62ebae59e SHA1 65dae22c81f33665a3664a095aa07d7fdee45bf0 SHA256 ea9c2bc1de87c72b20efcbc4f5781de45f2fba606a392c9396160daf0aee76ec DIST google-chrome-stable_17.0.963.83-r127885_amd64.deb 26554974 RMD160 d33d97e2d50309a0fcb503ea0813c6b9533f7ccb SHA1 4eea8a63bee82a0eb449cea25a3adcecfdd04128 SHA256 e81db2ad3a7d05efdca2f694d158eacf2dc6f424637efa5f7d950d7ea189cfd2 DIST google-chrome-stable_17.0.963.83-r127885_i386.deb 30783940 RMD160 179e5ad1cf17b2c24f9b805c2f404bc8bfecf5b1 SHA1 3ea3520146e654b6f35d97633bb71f8215b5242b SHA256 fbbf356bd54afa96f8dba5663e59a1417f4f3f3853ecb55f9b5411a6a30ed499 DIST google-chrome-unstable_19.0.1077.3-r128359_amd64.deb 31545720 RMD160 02c27a1f0803679c3927ad37cba9ae11eec73f96 SHA1 6a9f8c593c20853acb83fc1b2538b7e456d27204 SHA256 02aab59a8f55e846c2262180d16e1f4b9956b6dbed7fa3648bab6c577dde901a DIST google-chrome-unstable_19.0.1077.3-r128359_i386.deb 30020992 RMD160 e0e9b52c56967f13306388e7386cfdd8363f44f1 SHA1 d9d797c793cbf4bbd93bd9084bcc75e50d780d33 SHA256 b256cbf9e0525f07526694032a650f4845f0f4a13881c9407db6ea091715605a EBUILD google-chrome-17.0.963.83_p127885.ebuild 4342 RMD160 9e4dc4defdd9b944a11fd387e60129cbb490b194 SHA1 5bd2f21882ce9f8f1a8c05283a41fa60bc5651f1 SHA256 5a76ebe4cd80737b4a1b11cb7c25cc72ba3dba2d413dd6e0cab4262fd8ebad52 -EBUILD google-chrome-18.0.1025.113_beta127419.ebuild 2693 RMD160 720a7ca46dc0a8acc71efe82548df5b20ff1a472 SHA1 ec5334bd5d74a0dd1114e25c339186cfd374f29b SHA256 7b92c459425d70dffbde29755ef28080dd5b17b123353c5f1a46be5a96784bed +EBUILD google-chrome-18.0.1025.140_beta128625.ebuild 2693 RMD160 6b995467346ba4a3853480dcf720e6799ddccf44 SHA1 74b27b603b81bd96a71d70d320d82fd3574dc10e SHA256 b05beace0834c3d983a4c87644eec93e012fcd922c1ab348ac507096fab724e5 EBUILD google-chrome-19.0.1077.3_alpha128359.ebuild 2692 RMD160 f57e832f49302a6b05430112999a415a4057fa7a SHA1 b0dc601b404bca4cb3c2f9ec63acce3fea4dd6fc SHA256 ade36f2d55d9158d81071241dd864f02b49f6bcb695968ba36519129d118311b -MISC ChangeLog 24644 RMD160 fc4b143f6a8d3ff6d55391973d35241cb43d72ff SHA1 f3f5adcb46a6cbc4c578fb64baf7ddea7fdf53a3 SHA256 fba00cc687cd696487af26b28f3faa94481b637c38775fed6859653e203ca231 +MISC ChangeLog 24870 RMD160 3629302e21a8fec80ec245a091cada0882baf28b SHA1 8bbb1bd0dfa30bb0972c601bbbf8388fc88d10fd SHA256 c1de8c51563cffe30ca1dd0df588c97fe39361795818e8617559dc597724025e MISC metadata.xml 510 RMD160 89172b66e00991d4e6ce045bcbb66d14145ac02a SHA1 f81450697c759948d8c8583aa1b6a095eb71bd05 SHA256 da7aab160a14cadf0b87a04ac7a92e4d90d86e51035ca3c3f96e1ffb3cbb1e83 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk9tRKUACgkQC77qH+pIQ6SW9QD8Dq+n0Kse5w6EHWYeLEyAI98y -3he6N2qRY1nSYkGsZgkA/1cXhLyVoL7t7LsKjFzeFtLTFM8e9qv01ChniC03M4YZ -=jR5e +iF4EAREIAAYFAk9w/2IACgkQC77qH+pIQ6RRFwD/azkugbj0OXD8t3GBUz5kPrhy +AKejPKk2CkkdgNvjSvAA/3zR72YgLfaSPYU+msvOCQVzyBQb1pwLBFH4LJmsVzC0 +=iTT+ -----END PGP SIGNATURE----- diff --git a/www-client/google-chrome/google-chrome-18.0.1025.113_beta127419.ebuild b/www-client/google-chrome/google-chrome-18.0.1025.113_beta127419.ebuild deleted file mode 100644 index 43bfce46924c..000000000000 --- a/www-client/google-chrome/google-chrome-18.0.1025.113_beta127419.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.113_beta127419.ebuild,v 1.1 2012/03/19 19:08:57 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-18.0.1025.140_beta128625.ebuild b/www-client/google-chrome/google-chrome-18.0.1025.140_beta128625.ebuild new file mode 100644 index 000000000000..b8eea9cb3fda --- /dev/null +++ b/www-client/google-chrome/google-chrome-18.0.1025.140_beta128625.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-18.0.1025.140_beta128625.ebuild,v 1.1 2012/03/26 23:44:28 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