From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QJY19-0004YB-AR for garchives@archives.gentoo.org; Mon, 09 May 2011 21:29:28 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 67D0CE0230; Mon, 9 May 2011 21:29:18 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 10737E0230 for ; Mon, 9 May 2011 21:29:17 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7CCB81B406F for ; Mon, 9 May 2011 21:29:17 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id A33E580504 for ; Mon, 9 May 2011 21:29:16 +0000 (UTC) From: "Michael Weber" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Michael Weber" Message-ID: <79769423ae81d78c08d2a213db29149122bb5973.xmw@gentoo> Subject: [gentoo-commits] dev/xmw:master commit in: www-client/google-chrome/ X-VCS-Repository: dev/xmw X-VCS-Files: www-client/google-chrome/ChangeLog www-client/google-chrome/Manifest www-client/google-chrome/google-chrome-11.0.696.65-r84435.ebuild www-client/google-chrome/google-chrome-12.0.742.30-r84361.ebuild www-client/google-chrome/metadata.xml X-VCS-Directories: www-client/google-chrome/ X-VCS-Committer: xmw X-VCS-Committer-Name: Michael Weber X-VCS-Revision: 79769423ae81d78c08d2a213db29149122bb5973 Date: Mon, 9 May 2011 21:29:16 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: 5e738da35c6e5d664f21dd963fc1f33a commit: 79769423ae81d78c08d2a213db29149122bb5973 Author: Michael Weber gentoo org> AuthorDate: Mon May 9 21:29:01 2011 +0000 Commit: Michael Weber gentoo org> CommitDate: Mon May 9 21:29:01 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Ddev/xmw.git;a=3Dco= mmit;h=3D79769423 www-client/google-chrome: ebuild cleanup (Portage version: 2.1.9.42/git/Linux x86_64, signed Manifest commit with = key 62EEF090) --- www-client/google-chrome/ChangeLog | 5 ++ www-client/google-chrome/Manifest | 14 ++-- .../google-chrome-11.0.696.65-r84435.ebuild | 75 ++++++--------= ------ .../google-chrome-12.0.742.30-r84361.ebuild | 75 ++++++--------= ------ www-client/google-chrome/metadata.xml | 2 - 5 files changed, 58 insertions(+), 113 deletions(-) diff --git a/www-client/google-chrome/ChangeLog b/www-client/google-chrom= e/ChangeLog index b6284a8..d995960 100644 --- a/www-client/google-chrome/ChangeLog +++ b/www-client/google-chrome/ChangeLog @@ -2,6 +2,11 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ =20 + 09 May 2011; Michael Weber + google-chrome-11.0.696.65-r84435.ebuild, + google-chrome-12.0.742.30-r84361.ebuild: + Ebuild cleanup + *google-chrome-12.0.742.30-r84361 (08 May 2011) =20 08 May 2011; Michael Weber diff --git a/www-client/google-chrome/Manifest b/www-client/google-chrome= /Manifest index 09e301c..c715924 100644 --- a/www-client/google-chrome/Manifest +++ b/www-client/google-chrome/Manifest @@ -5,14 +5,14 @@ DIST google-chrome-stable_11.0.696.65-r84435_amd64.deb = 22098382 RMD160 124714069 DIST google-chrome-stable_11.0.696.65-r84435_i386.deb 24044500 RMD160 30= c761005935808170c9008b70bf7c23f3c25675 SHA1 1c418266678f24e24db59e9e4f5ab= ed3a29dc302 SHA256 5eb2039ef9810b8701862c44289cc6718a936a9670a6d6e73570aa= 10048bd137 DIST google-chrome-unstable_12.0.742.30-r84361_amd64.deb 22267878 RMD160= cca59cf53a29b2ee4c1308f79c040f980568e88d SHA1 4e17f688fcfa81b3b3b38342df= 279a4499a8c96b SHA256 073a8d79976a66f6102efd8ad09701298e9e4ba8269ceb03fe3= 137e194eeff73 DIST google-chrome-unstable_12.0.742.30-r84361_i386.deb 24534080 RMD160 = b4b02ec07c6ed4d0d0f6754a30712dd30902dcb9 SHA1 639a41fcbdb73f3e3132593e73b= 08b66ecad1551 SHA256 01c019b36703cd63650aee6561c8e47cae40fbee973f898c34ca= da9cdf0f56ac -EBUILD google-chrome-11.0.696.65-r84435.ebuild 3969 RMD160 ccabd8f10c0cb= 49a785c7f5c3ea25ab46f9e5d09 SHA1 6ad92669969e59d0feeba100d62a5817931a8b51= SHA256 4f53a34c331f26287ba491d6db9b13b4c161aad45f09158b871211acffc2e1bd -EBUILD google-chrome-12.0.742.30-r84361.ebuild 3971 RMD160 c393dac910ab1= 716ab8f87b47a5ce189823126e7 SHA1 8fc1011d8df1bd448af66ac8a1fb5ab472dd6c1b= SHA256 bcefc90212bbbf66df16c49ca834ca3020bbb84ef57b87c30dc7089f2795d1d3 -MISC ChangeLog 1227 RMD160 0c770a6804f6f86bec18f88bbe7e16eeba2e85b4 SHA1= 4e142cf197dce233a886c7985055cc5daf114d01 SHA256 79bfd907640382709d6de97d= cd5fa57e234a3af3485f30fbf5734c228a8f4851 -MISC metadata.xml 387 RMD160 b870f41ac98357b111248d1590451abae2338919 SH= A1 0d5ba4a953cd9432fa10bafbf633dc9e043b4455 SHA256 369912f6c33361210b8e41= 3da0c6fce05c9c511a5825ef71f68de86d46aa2bad +EBUILD google-chrome-11.0.696.65-r84435.ebuild 3281 RMD160 98aa4357e8fd4= 9f6b418e0a0081e2b6164034e1e SHA1 f6243f1d8a4b049e82270bc2d1c2cc01080b9639= SHA256 123378eef6783bdf7ad7f6488e1b21d5f8f479965115b36dd5a8e3011a2d1d89 +EBUILD google-chrome-12.0.742.30-r84361.ebuild 3283 RMD160 daaa037746d65= 074ada6473052f9e70d8b1b3a6a SHA1 0a12fdf3addb119a0d184cd2df8b0a140ef303b8= SHA256 414aecead97a21b34e9a7a51c4616a1423cb91ef7eea11859f7a586f20b55264 +MISC ChangeLog 1377 RMD160 834524e8952dd28ebee748cb9b7d48e70ea0e860 SHA1= aec2dbad4d3bce2530474755ff05343976bb8b40 SHA256 5f6dc760d9dd99635f7842c9= a60e2d118a97f4678e0030b5496c3b2ef8b0612d +MISC metadata.xml 297 RMD160 8966e5b4c3746ee7cf40fef81cad93dfa2703e53 SH= A1 7d096f4f0dd036f93e7daf012a1c628a657039c3 SHA256 e1c43be8d49551beb44bb1= 061702babfee89b6f057b52133172a702925c2c96f -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) =20 -iF4EAREIAAYFAk3GzsYACgkQknrdDGLu8JCGqgEAlBCqI0UFMo26omAXUvnz4Zd3 -CxkpueBjTV4FHcuTpaYBAIHu/B5aQ7g4aEu+hAS7/uHF+aTyeeswfJBHmxRO3jiN -=3DEoK9 +iF4EAREIAAYFAk3IXJ0ACgkQknrdDGLu8JAXPwD/W5hRJMnZ+9H1N9H62V8Fe/dL +373hRVQfR39PX5WSLEMA+wXPpLJzAW9ji1V+xbDt+jks2McXXS54mZhePFPIaVfv +=3D6tvn -----END PGP SIGNATURE----- diff --git a/www-client/google-chrome/google-chrome-11.0.696.65-r84435.eb= uild b/www-client/google-chrome/google-chrome-11.0.696.65-r84435.ebuild index 4ea5bec..dd9856f 100644 --- a/www-client/google-chrome/google-chrome-11.0.696.65-r84435.ebuild +++ b/www-client/google-chrome/google-chrome-11.0.696.65-r84435.ebuild @@ -2,40 +2,28 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ =20 -EAPI=3D"2" +EAPI=3D2 + inherit eutils toolchain-funcs versionator =20 # Latest revision can be found at # wget -qO- http://dl.google.com/linux/chrome/deb/dists/stable/main/bina= ry-amd64/Packages|grep Filename =20 -CHAN=3D"stable" -MY_P=3D"${PN}-${CHAN}_${PVR}" - -KEYWORDS=3D"~amd64 ~x86" - DESCRIPTION=3D"A browser that combines a minimal design with sophisticat= ed technology (binary only)" HOMEPAGE=3D"http://www.google.com/chrome" - +CHAN=3D"stable" +MY_P=3D"${PN}-${CHAN}_${PVR}" SRC_BASE=3D"http://dl.google.com/linux/chrome/deb/pool/main/${PN:0:1}/${= PN}-${CHAN}/" SRC_URI=3D"amd64? ( ${SRC_BASE}${MY_P}_amd64.deb ) x86? ( ${SRC_BASE}${MY_P}_i386.deb )" =20 LICENSE=3D"BSD" SLOT=3D"0" +KEYWORDS=3D"~amd64 ~x86" IUSE=3D"+suid +plugins-symlink" =20 -LANGS=3D"am ar bg bn ca cs da de el en_GB en_US es_419 es et fil fi fr g= u he hi hr - hu id it ja kn ko lt lv ml mr nb nl pl pt_BR pt_PT ro ru sk sl sr sv sw= ta te th - tr uk vi zh_CN zh_TW" - -for l in ${LANGS} ; do - IUSE=3D"${IUSE} linguas_${l}" -done - -DEPEND=3D"|| ( - app-arch/xz-utils - app-arch/lzma-utils - ) +DEPEND=3D"|| ( app-arch/xz-utils + app-arch/lzma-utils ) !~app-arch/deb2targz-1 !www-client/google-chrome-bin" RDEPEND=3D"app-misc/ca-certificates @@ -43,21 +31,18 @@ RDEPEND=3D"app-misc/ca-certificates dev-libs/dbus-glib dev-libs/expat dev-libs/glib:2 - >=3Ddev-libs/nspr-4.7 - >=3Ddev-libs/nss-3.12.3 + dev-libs/nspr + dev-libs/nss gnome-base/gconf:2 - || ( - media-fonts/liberation-fonts - media-fonts/corefonts - ) + || ( media-fonts/liberation-fonts + media-fonts/corefonts ) media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 - =3Dsys-devel/gcc-4.2[-nocxx] - >=3Dsys-libs/glibc-2.6 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 @@ -70,9 +55,7 @@ RDEPEND=3D"app-misc/ca-certificates =20 # Incompatible system plugins: # www-plugins/gecko-mediaplayer, bug #309231. -RDEPEND+=3D"plugins-symlink? ( - !www-plugins/gecko-mediaplayer[gnome] - )" +RDEPEND+=3D"plugins-symlink? ( !www-plugins/gecko-mediaplayer[gnome] )" =20 RESTRICT=3D"primaryuri strip" =20 @@ -81,7 +64,6 @@ QA_PRESTRIPPED=3D"opt/google/chrome/chrome opt/google/chrome/chrome-sandbox opt/google/chrome/libffmpegsumo.so opt/google/chrome/libgcflashplayer.so" - QA_TEXTRELS=3D"opt/google/chrome/libffmpegsumo.so" =20 src_unpack() { @@ -91,8 +73,6 @@ src_unpack() { =20 src_install() { local CHROME_HOME=3D"/opt/google/chrome" - local nss_subdir=3D$(has_version ">=3Ddev-libs/nss-3.12.5-r1" || echo n= ss/) - local nspr_subdir=3D$(has_version ">=3Ddev-libs/nspr-4.8.3-r3" || echo = nspr/) =20 mv "${WORKDIR}"/{opt,usr} "${D}" || die =20 @@ -102,8 +82,8 @@ src_install() { rm "${D}${CHROME_HOME}"/chrome-sandbox fi =20 - for i in ${nss_subdir}lib{nss{,util},smime,ssl}3.so.1d \ - ${nspr_subdir}lib{pl{ds,c},nspr}4.so.0d ; do + for i in lib{nss{,util},smime,ssl}3.so.1d \ + lib{pl{ds,c},nspr}4.so.0d ; do dosym /usr/$(get_libdir)/${i%.*} \ ${CHROME_HOME}/${i##*/} done @@ -115,27 +95,19 @@ src_install() { newicon "${D}${CHROME_HOME}/product_logo_256.png" "${PN}.png" || die "n= ewicon failed" =20 # Plugins symlink, optional wrt bug #301911 - if use plugins-symlink; then - dosym "/usr/$(get_libdir)/nsbrowser/plugins" "${CHROME_HOME}/plugins" - fi - - # Only remove unwanted locales if LINGUAS is set. - if ! [[ -z ${LINGUAS} ]] ; then - for l in ${LANGS} ; do - if ! use linguas_${l} ; then - rm "${D}"${CHROME_HOME}/locales/${l/_/-}.pak || die - fi - done + if use plugins-symlink ; then + dosym "/usr/$(get_libdir)/nsbrowser/plugins" \ + "${CHROME_HOME}/plugins" || die fi } =20 pkg_postinst() { - elog "This Chrome binary package is from the developer preview channel.= It is" - elog "not guaranteed to be stable or even usable." - elog "" + elog "This Chrome binary package is from the developer preview channel.= " + elog "It is not guaranteed to be stable or even usable." + einfo elog "Chrome's auto-update mechanism has been disabled." elog "It is only available for Debian and RPM based distributions." - elog "" + einfo elog "Please see" elog " http://dev.chromium.org/for-testers/bug-reporting-guidlines-for-= the-mac-linux-builds" elog "before filing any bugs." @@ -143,6 +115,5 @@ pkg_postinst() { einfo "" ewarn "This Chrome binary package depends on C++ libraries from >=3Dsy= s-devel/gcc-4.2," ewarn "which do not appear to be available. Google Chrome may not run= ." - ebeep fi } diff --git a/www-client/google-chrome/google-chrome-12.0.742.30-r84361.eb= uild b/www-client/google-chrome/google-chrome-12.0.742.30-r84361.ebuild index 1eb6f59..75124f0 100644 --- a/www-client/google-chrome/google-chrome-12.0.742.30-r84361.ebuild +++ b/www-client/google-chrome/google-chrome-12.0.742.30-r84361.ebuild @@ -2,40 +2,28 @@ # Distributed under the terms of the GNU General Public License v2 # $Header: $ =20 -EAPI=3D"2" +EAPI=3D2 + inherit eutils toolchain-funcs versionator =20 # Latest revision can be found at # wget -qO- http://dl.google.com/linux/chrome/deb/dists/stable/main/bina= ry-amd64/Packages|grep Filename =20 -CHAN=3D"unstable" -MY_P=3D"${PN}-${CHAN}_${PVR}" - -KEYWORDS=3D"~amd64 ~x86" - DESCRIPTION=3D"A browser that combines a minimal design with sophisticat= ed technology (binary only)" HOMEPAGE=3D"http://www.google.com/chrome" - +CHAN=3D"unstable" +MY_P=3D"${PN}-${CHAN}_${PVR}" SRC_BASE=3D"http://dl.google.com/linux/chrome/deb/pool/main/${PN:0:1}/${= PN}-${CHAN}/" SRC_URI=3D"amd64? ( ${SRC_BASE}${MY_P}_amd64.deb ) x86? ( ${SRC_BASE}${MY_P}_i386.deb )" =20 LICENSE=3D"BSD" SLOT=3D"0" +KEYWORDS=3D"~amd64 ~x86" IUSE=3D"+suid +plugins-symlink" =20 -LANGS=3D"am ar bg bn ca cs da de el en_GB en_US es_419 es et fil fi fr g= u he hi hr - hu id it ja kn ko lt lv ml mr nb nl pl pt_BR pt_PT ro ru sk sl sr sv sw= ta te th - tr uk vi zh_CN zh_TW" - -for l in ${LANGS} ; do - IUSE=3D"${IUSE} linguas_${l}" -done - -DEPEND=3D"|| ( - app-arch/xz-utils - app-arch/lzma-utils - ) +DEPEND=3D"|| ( app-arch/xz-utils + app-arch/lzma-utils ) !~app-arch/deb2targz-1 !www-client/google-chrome-bin" RDEPEND=3D"app-misc/ca-certificates @@ -43,21 +31,18 @@ RDEPEND=3D"app-misc/ca-certificates dev-libs/dbus-glib dev-libs/expat dev-libs/glib:2 - >=3Ddev-libs/nspr-4.7 - >=3Ddev-libs/nss-3.12.3 + dev-libs/nspr + dev-libs/nss gnome-base/gconf:2 - || ( - media-fonts/liberation-fonts - media-fonts/corefonts - ) + || ( media-fonts/liberation-fonts + media-fonts/corefonts ) media-libs/alsa-lib media-libs/fontconfig media-libs/freetype:2 - =3Dsys-devel/gcc-4.2[-nocxx] - >=3Dsys-libs/glibc-2.6 x11-libs/cairo x11-libs/gtk+:2 x11-libs/libX11 @@ -70,9 +55,7 @@ RDEPEND=3D"app-misc/ca-certificates =20 # Incompatible system plugins: # www-plugins/gecko-mediaplayer, bug #309231. -RDEPEND+=3D"plugins-symlink? ( - !www-plugins/gecko-mediaplayer[gnome] - )" +RDEPEND+=3D"plugins-symlink? ( !www-plugins/gecko-mediaplayer[gnome] )" =20 RESTRICT=3D"primaryuri strip" =20 @@ -81,7 +64,6 @@ QA_PRESTRIPPED=3D"opt/google/chrome/chrome opt/google/chrome/chrome-sandbox opt/google/chrome/libffmpegsumo.so opt/google/chrome/libgcflashplayer.so" - QA_TEXTRELS=3D"opt/google/chrome/libffmpegsumo.so" =20 src_unpack() { @@ -91,8 +73,6 @@ src_unpack() { =20 src_install() { local CHROME_HOME=3D"/opt/google/chrome" - local nss_subdir=3D$(has_version ">=3Ddev-libs/nss-3.12.5-r1" || echo n= ss/) - local nspr_subdir=3D$(has_version ">=3Ddev-libs/nspr-4.8.3-r3" || echo = nspr/) =20 mv "${WORKDIR}"/{opt,usr} "${D}" || die =20 @@ -102,8 +82,8 @@ src_install() { rm "${D}${CHROME_HOME}"/chrome-sandbox fi =20 - for i in ${nss_subdir}lib{nss{,util},smime,ssl}3.so.1d \ - ${nspr_subdir}lib{pl{ds,c},nspr}4.so.0d ; do + for i in lib{nss{,util},smime,ssl}3.so.1d \ + lib{pl{ds,c},nspr}4.so.0d ; do dosym /usr/$(get_libdir)/${i%.*} \ ${CHROME_HOME}/${i##*/} done @@ -115,27 +95,19 @@ src_install() { newicon "${D}${CHROME_HOME}/product_logo_256.png" "${PN}.png" || die "n= ewicon failed" =20 # Plugins symlink, optional wrt bug #301911 - if use plugins-symlink; then - dosym "/usr/$(get_libdir)/nsbrowser/plugins" "${CHROME_HOME}/plugins" - fi - - # Only remove unwanted locales if LINGUAS is set. - if ! [[ -z ${LINGUAS} ]] ; then - for l in ${LANGS} ; do - if ! use linguas_${l} ; then - rm "${D}"${CHROME_HOME}/locales/${l/_/-}.pak || die - fi - done + if use plugins-symlink ; then + dosym "/usr/$(get_libdir)/nsbrowser/plugins" \ + "${CHROME_HOME}/plugins" || die fi } =20 pkg_postinst() { - elog "This Chrome binary package is from the developer preview channel.= It is" - elog "not guaranteed to be stable or even usable." - elog "" + elog "This Chrome binary package is from the developer preview channel.= " + elog "It is not guaranteed to be stable or even usable." + einfo elog "Chrome's auto-update mechanism has been disabled." elog "It is only available for Debian and RPM based distributions." - elog "" + einfo elog "Please see" elog " http://dev.chromium.org/for-testers/bug-reporting-guidlines-for-= the-mac-linux-builds" elog "before filing any bugs." @@ -143,6 +115,5 @@ pkg_postinst() { einfo "" ewarn "This Chrome binary package depends on C++ libraries from >=3Dsy= s-devel/gcc-4.2," ewarn "which do not appear to be available. Google Chrome may not run= ." - ebeep fi } diff --git a/www-client/google-chrome/metadata.xml b/www-client/google-ch= rome/metadata.xml index ff21576..2c1f812 100644 --- a/www-client/google-chrome/metadata.xml +++ b/www-client/google-chrome/metadata.xml @@ -6,8 +6,6 @@ maintainer-wanted@gentoo.org -esperanto -language fil symlink plugins