diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2011-11-09 18:56:01 +0000 |
|---|---|---|
| committer | Mike Gilbert <floppym@gentoo.org> | 2011-11-09 18:56:01 +0000 |
| commit | 588c9957a24d76e63f14831424ce7830dc5eecdf (patch) | |
| tree | 61fa92c69cf903471d7b865cfade64fc75aa8fde /www-client | |
| parent | Update to EAPI=2, add editor-wrapper support, and USE=pcre support #389935. (diff) | |
| download | historical-588c9957a24d76e63f14831424ce7830dc5eecdf.tar.gz historical-588c9957a24d76e63f14831424ce7830dc5eecdf.tar.bz2 historical-588c9957a24d76e63f14831424ce7830dc5eecdf.zip | |
Restore cups USE flag for live ebuild. Bug 388497.
Package-Manager: portage-2.2.0_alpha72/cvs/Linux x86_64
Diffstat (limited to 'www-client')
| -rw-r--r-- | www-client/chromium/ChangeLog | 5 | ||||
| -rw-r--r-- | www-client/chromium/Manifest | 10 | ||||
| -rw-r--r-- | www-client/chromium/chromium-9999-r1.ebuild | 11 |
3 files changed, 16 insertions, 10 deletions
diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog index c99bbb474086..6fb9a9555d63 100644 --- a/www-client/chromium/ChangeLog +++ b/www-client/chromium/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for www-client/chromium # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.491 2011/11/09 02:59:23 floppym Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.492 2011/11/09 18:56:01 floppym Exp $ + + 09 Nov 2011; Mike Gilbert <floppym@gentoo.org> chromium-9999-r1.ebuild: + Restore cups USE flag for live ebuild. Bug 388497. *chromium-16.0.912.32 (09 Nov 2011) diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest index 081d4bc99594..0cac9251f055 100644 --- a/www-client/chromium/Manifest +++ b/www-client/chromium/Manifest @@ -22,13 +22,13 @@ EBUILD chromium-16.0.912.21.ebuild 16515 RMD160 d728f26b57f2dd94066e64a8d0f3d90a EBUILD chromium-16.0.912.32.ebuild 16494 RMD160 bff276cf1ad0dd0a2a3b37c92bcb37dc25cb90c8 SHA1 91ca2d243de24c408b4cdfe7e4807995a9ecf5de SHA256 1aec387bb34f04d5c0fb4daced568b5dfe2e3e2233932396d541a73fbc946d6f EBUILD chromium-17.0.928.0.ebuild 16551 RMD160 49104ce7304db68e7dca90f9610dd48ed3d8a5d4 SHA1 a002a02641d3b39054073f1dba7dbd64a989f4f2 SHA256 ebef48e9a561c86ed67ee9d36480e04baad3c50f76f85a1fbfb79334ac65cf92 EBUILD chromium-17.0.932.0.ebuild 16536 RMD160 1233fe43bbb7e29b77073be5016e27e79639c942 SHA1 633e9e0ebeb0087e93ccaef477c5cbe8bbdb2573 SHA256 edfad2a40f2945121e7c6a347994ffb9892484024d6dec5c70e1563210043da5 -EBUILD chromium-9999-r1.ebuild 18564 RMD160 6e4b002c6152d9941d95bfc16b893b474500679e SHA1 8cc134e42cba79b14bbf10b764d90ab47e8adc42 SHA256 38b803d9d70930b03779b7a3b381194f1b6768cf9f0d52bce15b6349c00060d8 -MISC ChangeLog 107873 RMD160 ffc6e10b64d5076800672a03df60560b8f6a37d8 SHA1 0e3fccfed9381d474aac0ddb09811fe87e352bc9 SHA256 066daeb18f0d777cf892223ada372e55416f6e6b80030a97e6e8e366e80bae4a +EBUILD chromium-9999-r1.ebuild 18607 RMD160 3e3a22b0ab5e8e91291194f1f26a5daf0ef59133 SHA1 5936ee5264494754c5542489ee388c2dfcae133f SHA256 9a7e3e52a69732cd882d9369a6a18b02d31eb70cf7cacbe4d83eafe677d39a60 +MISC ChangeLog 108001 RMD160 dca6598b5e73364aac1dfe9de13f14cd7c7b1b3d SHA1 d8dbf21cc9b4e5ad397757c4f799eec1f4382b08 SHA256 0f4dd4d85feeaf6b8ac7b83959ca5f1f2ef3ca2ba383c417d65da634e784f7b6 MISC metadata.xml 267 RMD160 3a166415fec415d539c1b7c32ed40b188488b9fb SHA1 5c3d71a9cea27175cbe8c98369b42b79c8643c6c SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.17 (GNU/Linux) -iF4EAREIAAYFAk657JMACgkQC77qH+pIQ6Rk6wD/aSIaBOwp5x3uyDtzRBByVJ/U -Uc+UwjTkC8By1A4syxwBAL+TaYEQvQVGln4HX0Ez9v0sjFMPiZNU1Zkd+z7BfvY9 -=9cQ9 +iF4EAREIAAYFAk66zMsACgkQC77qH+pIQ6QunQD+MAETvThVvxKkSKs0fNDW/CXq +d3HSeU1WY4JcFzZLZaoA/AvuIrUhYiWc2qdS4MaefAQ237jKK4le2lR6V6d0dV1y +=NyaE -----END PGP SIGNATURE----- diff --git a/www-client/chromium/chromium-9999-r1.ebuild b/www-client/chromium/chromium-9999-r1.ebuild index 8e6064248dea..ad69e19ea0fe 100644 --- a/www-client/chromium/chromium-9999-r1.ebuild +++ b/www-client/chromium/chromium-9999-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.72 2011/11/08 16:16:54 phajdan.jr Exp $ +# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-9999-r1.ebuild,v 1.73 2011/11/09 18:56:01 floppym Exp $ EAPI="4" PYTHON_DEPEND="2:2.6" @@ -15,7 +15,7 @@ ESVN_REPO_URI="http://src.chromium.org/svn/trunk/src" LICENSE="BSD" SLOT="live" KEYWORDS="" -IUSE="bindist gnome gnome-keyring kerberos pulseaudio" +IUSE="bindist cups gnome gnome-keyring kerberos pulseaudio" # en_US is ommitted on purpose from the list below. It must always be available. LANGS="am ar bg bn ca cs da de el en_GB es es_LA et fa fi fil fr gu he hi hr @@ -31,7 +31,6 @@ RDEPEND="app-arch/bzip2 dev-libs/elfutils >=dev-libs/icu-4.4.1 >=dev-libs/libevent-1.4.13 - dev-libs/libgcrypt dev-libs/libxml2[icu] dev-libs/libxslt >=dev-libs/nss-3.12.3 @@ -43,8 +42,11 @@ RDEPEND="app-arch/bzip2 media-libs/libpng >=media-libs/libwebp-0.1.2 media-libs/speex - >=net-print/cups-1.3.11 pulseaudio? ( media-sound/pulseaudio ) + cups? ( + dev-libs/libgcrypt + >=net-print/cups-1.3.11 + ) sys-libs/zlib x11-libs/gtk+:2 x11-libs/libXinerama @@ -324,6 +326,7 @@ src_configure() { # Optional dependencies. # TODO: linux_link_kerberos, bug #381289. myconf+=" + $(gyp_use cups use_cups) $(gyp_use gnome use_gconf) $(gyp_use gnome-keyring use_gnome_keyring) $(gyp_use gnome-keyring linux_link_gnome_keyring) |