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

(Portage version: 2.1.10.11/cvs/Linux i686)

3 files changed, 34 insertions, 5 deletions

diff --git a/www-client/chromium/ChangeLog b/www-client/chromium/ChangeLog
index 6fb9a9555d63..01f2da555937 100644
--- 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/chromium-16.0.912.32.ebuild b/www-client/chromium/chromium-16.0.912.32.ebuild
index 822b27c67ec2..c4bcc946bf68 100644
--- 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
index 000000000000..7d534480a3c1
--- /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_)