drop cups useflag/dep making printing always enabled

(Portage version: 2.1.9.14/cvs/Linux x86_64)

3 files changed, 10 insertions, 10 deletions

diff --git a/www-client/firefox/ChangeLog b/www-client/firefox/ChangeLog
index 8293d2d43ebb..0c670af0d552 100644
--- a/www-client/firefox/ChangeLog
+++ b/www-client/firefox/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for www-client/firefox
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.16 2010/10/03 15:09:24 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/ChangeLog,v 1.17 2010/10/13 00:10:16 anarchy Exp $
+
+  13 Oct 2010; Jory A. Pratt <anarchy@gentoo.org> firefox-3.6.9.ebuild,
+  firefox-3.6.9-r1.ebuild:
+  drop cups useflag/dep making printing always enabled
 
   03 Oct 2010; Jory A. Pratt <anarchy@gentoo.org> firefox-3.6.9-r1.ebuild:
   Fix bug #339513, thanks William Throwe
diff --git a/www-client/firefox/firefox-3.6.9-r1.ebuild b/www-client/firefox/firefox-3.6.9-r1.ebuild
index d2be2abbcc21..6d045c203d48 100644
--- a/www-client/firefox/firefox-3.6.9-r1.ebuild
+++ b/www-client/firefox/firefox-3.6.9-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-3.6.9-r1.ebuild,v 1.2 2010/10/03 15:09:24 anarchy Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-3.6.9-r1.ebuild,v 1.3 2010/10/13 00:10:16 anarchy Exp $
 EAPI="3"
 WANT_AUTOCONF="2.1"
 
@@ -25,7 +25,7 @@ HOMEPAGE="http://www.mozilla.com/firefox"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+alsa bindist +cups +ipc java libnotify system-sqlite wifi"
+IUSE="+alsa bindist +ipc java libnotify system-sqlite wifi"
 
 REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
 SRC_URI="${REL_URI}/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2
@@ -58,8 +58,7 @@ RDEPEND="
 	x11-libs/pango[X]
 	wifi? ( net-wireless/wireless-tools )
 	libnotify? ( >=x11-libs/libnotify-0.4 )
-	cups? ( net-print/cups[gnutls] )
-	~net-libs/xulrunner-${XUL_PV}[ipc=,java=,wifi=,libnotify=,system-sqlite=,cups=]"
+	~net-libs/xulrunner-${XUL_PV}[ipc=,java=,wifi=,libnotify=,system-sqlite=]"
 
 DEPEND="${RDEPEND}
 	java? ( >=virtual/jdk-1.4 )
@@ -200,7 +199,6 @@ src_configure() {
 	mozconfig_use_enable alsa ogg
 	mozconfig_use_enable alsa wave
 	mozconfig_use_enable system-sqlite
-	mozconfig_use_enable cups printing
 	mozconfig_use_enable !bindist official-branding
 
 	# Other ff-specific settings
diff --git a/www-client/firefox/firefox-3.6.9.ebuild b/www-client/firefox/firefox-3.6.9.ebuild
index 31a1900d8241..015266821a32 100644
--- a/www-client/firefox/firefox-3.6.9.ebuild
+++ b/www-client/firefox/firefox-3.6.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-3.6.9.ebuild,v 1.8 2010/09/14 21:21:45 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/www-client/firefox/firefox-3.6.9.ebuild,v 1.9 2010/10/13 00:10:16 anarchy Exp $
 EAPI="3"
 WANT_AUTOCONF="2.1"
 
@@ -25,7 +25,7 @@ HOMEPAGE="http://www.mozilla.com/firefox"
 KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 ~sparc x86 ~amd64-linux ~ia64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 SLOT="0"
 LICENSE="|| ( MPL-1.1 GPL-2 LGPL-2.1 )"
-IUSE="+alsa bindist +cups +ipc java libnotify system-sqlite wifi"
+IUSE="+alsa bindist +ipc java libnotify system-sqlite wifi"
 
 REL_URI="http://releases.mozilla.org/pub/mozilla.org/firefox/releases"
 SRC_URI="${REL_URI}/${MY_PV}/source/firefox-${MY_PV}.source.tar.bz2
@@ -58,7 +58,6 @@ RDEPEND="
 	x11-libs/pango[X]
 	wifi? ( net-wireless/wireless-tools )
 	libnotify? ( >=x11-libs/libnotify-0.4 )
-	cups? ( net-print/cups[gnutls] )
 	~net-libs/xulrunner-${XUL_PV}[ipc=,java=,wifi=,libnotify=,system-sqlite=]"
 
 DEPEND="${RDEPEND}
@@ -198,7 +197,6 @@ src_configure() {
 	mozconfig_use_enable alsa ogg
 	mozconfig_use_enable alsa wave
 	mozconfig_use_enable system-sqlite
-	mozconfig_use_enable cups printing
 	mozconfig_use_enable !bindist official-branding
 
 	# Other ff-specific settings