Restore cups USE flag, bug #388497 by rom.gentoo.

Package-Manager: portage-2.1.10.11/cvs/Linux i686

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 6fb9a9555d6301c06b5c7e2d2f622b89d4111d5d..01f2da555937f7e8e874e56fbf3675df55690ed0 100644 (file)
--- a/www-client/chromium/ChangeLog
+++ b/www-client/chromium/ChangeLog
@@ -1,6 +1,10 @@
 # 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.492 2011/11/09 18:56:01 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/ChangeLog,v 1.493 2011/11/10 07:53:44 phajdan.jr Exp $
+
+  10 Nov 2011; Pawel Hajdan jr <phajdan.jr@gentoo.org>
+  +files/chromium-cups-r0.patch, chromium-16.0.912.32.ebuild:
+  Restore cups USE flag, bug #388497 by rom.gentoo.
 
   09 Nov 2011; Mike Gilbert <floppym@gentoo.org> chromium-9999-r1.ebuild:
   Restore cups USE flag for live ebuild. Bug 388497.

diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index 0cac9251f055155edb9aad74124a8621c7f2a77c..fdc7f64f6877da87f66762d0f566202c82378736 100644 (file)
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,7 +1,8 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX chromium-browser.xml 407 RMD160 457374ff72561648d9777ffb3270ad10d864a6be SHA1 65543bfff7d0350d40ba258e61061b0c5579e1f2 SHA256 bc039012f8677468e9ce5df825f9d8096be6deb5813031c86a087c88105096ff
+AUX chromium-cups-r0.patch 726 RMD160 f3193ce9f987b6e5ad05a67d090ab4f9e1cb7b41 SHA1 8efd3479977e89429237d49fefbfcc63d250089e SHA256 800a669839ca7e033bb360b0cd9db92dde93505609c0b9184bf3901d2ec1535b
 AUX chromium-icu-compatibility-r0.patch 1659 RMD160 5d1fcc18d27b96f0c1b4f14b24dd8ab40ce917ca SHA1 517155769d0f421a4a81bffbcac39d17fa099956 SHA256 f70d99472d56e0aa7398b5638412d440d22943eb2c5962957f973e90992fdc99
 AUX chromium-kerberos-r0.patch 944 RMD160 25fccaa4406b1f964d72c94fd414a9955fc69ddd SHA1 b8b8f2cf6df1bade7af45d8f24b65acc602e781f SHA256 75b75f241675178dff914e0ddacc910a2583b2e2077e805f3ea1b2eed8513e21
 AUX chromium-launcher-r2.sh 940 RMD160 7a64e597998a8f95a7e3d1c26377842ff8106f89 SHA1 9630a36af707a810cbd646f3bac5deba984439f6 SHA256 842e121bbfa33513ca964744f0ba8401401946e672cd6a0a95bc80a28212e87e
@@ -19,16 +20,16 @@ DIST chromium-17.0.932.0.tar.bz2 156649015 RMD160 5ad608f601cec211343595b68f34cc
 EBUILD chromium-15.0.874.102.ebuild 14144 RMD160 9f257a04b01b597205249c2d92f56e7b7e8015e5 SHA1 e5d57b87eba007c47c94006035a0c9f71f108329 SHA256 1ec0d0831d223c130291c8936fd053ed7d8b4ff68fd473fdde5e36a81a99596f
 EBUILD chromium-15.0.874.106.ebuild 14143 RMD160 ef3a52d44e4777aee44e2b835b234189fd381f00 SHA1 c0b6f25b143c90bc59f6a150371bdd6f8ce2b095 SHA256 e3ad615781dfa2b208054a6627378df0fc16f919c594823dc9f44d4fbee10665
 EBUILD chromium-16.0.912.21.ebuild 16515 RMD160 d728f26b57f2dd94066e64a8d0f3d90abd0b1512 SHA1 713ae33ba1e0353bb629984d2a954daccd6eef85 SHA256 b4051a317e5743363c2730a27a645dc9892d8c37a8719cc9112f41ee9aee5aba
-EBUILD chromium-16.0.912.32.ebuild 16494 RMD160 bff276cf1ad0dd0a2a3b37c92bcb37dc25cb90c8 SHA1 91ca2d243de24c408b4cdfe7e4807995a9ecf5de SHA256 1aec387bb34f04d5c0fb4daced568b5dfe2e3e2233932396d541a73fbc946d6f
+EBUILD chromium-16.0.912.32.ebuild 16586 RMD160 e29d4dc7be00d58d41d94a255248150b5cfd06c3 SHA1 1bb5ab45a737b1e591ccc3d96ec31045f229a1eb SHA256 ce270592808902eea3aa9808f3f66c7c50f764d6df7ad47879dac4142f3b90ff
 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 18607 RMD160 3e3a22b0ab5e8e91291194f1f26a5daf0ef59133 SHA1 5936ee5264494754c5542489ee388c2dfcae133f SHA256 9a7e3e52a69732cd882d9369a6a18b02d31eb70cf7cacbe4d83eafe677d39a60
-MISC ChangeLog 108001 RMD160 dca6598b5e73364aac1dfe9de13f14cd7c7b1b3d SHA1 d8dbf21cc9b4e5ad397757c4f799eec1f4382b08 SHA256 0f4dd4d85feeaf6b8ac7b83959ca5f1f2ef3ca2ba383c417d65da634e784f7b6
+MISC ChangeLog 108174 RMD160 0b4bf33edb583ea192fc1701859a3bb44278faa6 SHA1 0d47c9ed464e090c326745c0c3ec00e67cb34e67 SHA256 fbf5b1d55b5066110d8ccbb73dd73ee7375876088c1d0342e77d75fcda670558
 MISC metadata.xml 267 RMD160 3a166415fec415d539c1b7c32ed40b188488b9fb SHA1 5c3d71a9cea27175cbe8c98369b42b79c8643c6c SHA256 4e6afae33f60d6752cacf2785f7f9a396b8711cce605b73d0d752a4af7d01fc8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk66zMsACgkQC77qH+pIQ6QunQD+MAETvThVvxKkSKs0fNDW/CXq
-d3HSeU1WY4JcFzZLZaoA/AvuIrUhYiWc2qdS4MaefAQ237jKK4le2lR6V6d0dV1y
-=NyaE
+iEYEAREKAAYFAk67gw4ACgkQuUQtlDBCeQJC5QCeNPtJhKhpRuZwfIRqyGjAGP5d
+dkQAn3KyphkqM3hCUj40hI2/PZ3DzKWu
+=Md0S
 -----END PGP SIGNATURE-----

diff --git a/www-client/chromium/chromium-16.0.912.32.ebuild b/www-client/chromium/chromium-16.0.912.32.ebuild
index 822b27c67ec2a2778af7eced81f655506321da92..c4bcc946bf6809bfbdaa0c59864cf0ab0544a9dc 100644 (file)
--- a/www-client/chromium/chromium-16.0.912.32.ebuild
+++ b/www-client/chromium/chromium-16.0.912.32.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-16.0.912.32.ebuild,v 1.1 2011/11/09 02:59:23 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/chromium/chromium-16.0.912.32.ebuild,v 1.2 2011/11/10 07:53:44 phajdan.jr Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2:2.6"
@@ -15,7 +15,7 @@ SRC_URI="http://commondatastorage.googleapis.com/chromium-browser-official/${P}.
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-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
@@ -26,12 +26,15 @@ for lang in ${LANGS}; do
 done
 
 RDEPEND="app-arch/bzip2
+       cups? (
+               dev-libs/libgcrypt
+               >=net-print/cups-1.3.11
+       )
        >=dev-lang/v8-3.6.5.1
        dev-libs/dbus-glib
        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,7 +46,6 @@ 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 )
        sys-libs/zlib
        x11-libs/gtk+:2
@@ -174,6 +176,8 @@ src_prepare() {
                third_party/zlib/contrib/minizip/{ioapi,{,un}zip}.c \
                chrome/common/zip.cc || die
 
+       epatch "${FILESDIR}/${PN}-cups-r0.patch"
+
        epatch_user
 
        # Remove most bundled libraries. Some are still needed.
@@ -269,6 +273,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)

diff --git a/www-client/chromium/files/chromium-cups-r0.patch b/www-client/chromium/files/chromium-cups-r0.patch
new file mode 100644 (file)
index 0000000..7d53448
--- /dev/null
+++ b/www-client/chromium/files/chromium-cups-r0.patch
@@ -0,0 +1,20 @@
+Index: chrome/browser/printing/print_dialog_gtk.cc
+===================================================================
+--- chrome/browser/printing/print_dialog_gtk.cc        (revision 108912)
++++ chrome/browser/printing/print_dialog_gtk.cc        (working copy)
+@@ -191,6 +191,7 @@
+     gtk_print_settings_set_n_copies(gtk_settings_, copies);
+     gtk_print_settings_set_collate(gtk_settings_, collate);
+ 
++#if defined(USE_CUPS)
+     std::string color_value;
+     std::string color_setting_name;
+     printing::GetColorModelForMode(color, &color_setting_name, &color_value);
+@@ -214,6 +215,7 @@
+           break;
+       }
+       gtk_print_settings_set(gtk_settings_, kCUPSDuplex, cups_duplex_mode);
+     }
++#endif
+   }
+   if (!page_setup_)