Sync up with main tree

5 files changed, 124 insertions, 31 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index db27f90..dc492c2 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*cups-1.4.6-r1 (02 May 2011)
+
+  02 May 2011; Daniel Solano Gómez <gentoo@sattvik.com> cups-1.3.11-r4.ebuild,
+  -cups-1.4.6.ebuild, +cups-1.4.6-r1.ebuild, +files/cups-1.4.6-web-hang.patch:
+  Sync up with portage
+
 *cups-1.4.6 (16 Jan 2011)
 
   16 Jan 2011; Daniel Solano Gómez <gentoo@sattvik.com> -cups-1.4.4-r2.ebuild,
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 4157efd..9a7de2d 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -16,11 +16,12 @@ AUX cups-1.4.4-perl-includes.patch 637 RMD160 88d4f170ed5c9392860462f140adf9f860
 AUX cups-1.4.4-php-destdir.patch 679 RMD160 1b15d42373a952a608a01cb8c97efbbd3c78ac77 SHA1 e312bbae57224dead45284f9c62942b1a25282fc SHA256 d5126c5e917d8c41c7a4da1477800edd4aa752aaa4c6a67a73adbe1e3b050110
 AUX cups-1.4.6-force-gnutls.patch 3319 RMD160 c6cc024a702305eb81661d5cdadd9857e9a6778e SHA1 5ac62ed3ca20bc7a4541c990c676c433299b2177 SHA256 beb4014eac5218d9f424b81946ac1e209625026bf20a7f4820758e5ee1fe5b66
 AUX cups-1.4.6-serialize-gnutls.patch 3625 RMD160 873b2806cfec732c4a4f3f2981f666a958dd5b0e SHA1 aae046121d0139fbba1cb9147c8742f73b2f1fa0 SHA256 6bc9e16fc6865b2f3e0ee2d1947bdde691e41f90fce32b9839b3661dcea4a827
+AUX cups-1.4.6-web-hang.patch 1749 RMD160 ff8d4cfa10a5de5a911c8672313904f50b13fd0f SHA1 f37a3fb7d71a6d56bbb3e5e7a8cf74ca8cb19276 SHA256 f49cef2ce1f2eecdd8ee07d85f306a19375f6d48510763aa51e96a0c54ad27c5
 AUX cupsd.init.d 293 RMD160 19fbef21cee7e472e7028f3101b680baa0089c54 SHA1 e6b27b2638fec258fe2f55c926c2530e909ca3d2 SHA256 b4268a6bae95e96b6af21c3716ecc905073736ce7dc33be1489d574a447f3c48
 AUX pdftops-1.20.gentoo 10412 RMD160 16e229662c47e03af1d1f4cb5764a76d17a66642 SHA1 6afb8a655b6ff013a2c8c8cbfb615ba1e561503b SHA256 ac5fa01ca776d75bd7cef62eef9f6b0c3945ee87e8950b40ca9f9f3ff46a16c1
 DIST cups-1.3.11-source.tar.bz2 3799393 RMD160 a0646f2ba29fbd39d211ea5c3fdbd24a00f66a78 SHA1 df5cfb64fb608fc128acadde670dc30af49bdb18 SHA256 5e310fd324a15fae1e1c9721879f5c948d788e04735a5263a40c6146fff607b8
 DIST cups-1.4.6-source.tar.bz2 4517061 RMD160 94c9921e03f5ec52d9c16947435622365f53aef6 SHA1 42fb1ca00ee7291561564d3072716eb2045f05d1 SHA256 f08711702a77b52c7150f96fe1f45482f6151cb95ef601268c528607fe6ad514
-EBUILD cups-1.3.11-r4.ebuild 8570 RMD160 f4cb3829a78854fa2ddd436ba3820a94e990a758 SHA1 28332d7519726f953f895f27a38d422d01e2073c SHA256 ac80899f70d916ce97a5886787f599e8979124e421b314eb5d4a9768965c44b4
-EBUILD cups-1.4.6.ebuild 6300 RMD160 3771740b2ef247d3fd7b195e5616c02080f4fa4c SHA1 b85985992309b32ac558afe23317cdd06231b486 SHA256 6269ce09c4dd03c2fd4585792f4151a0709a2e7b4cfaf9c04da9c46dda267cf6
-MISC ChangeLog 2142 RMD160 a8c3c50538678e1407e1b90fdb51a978a773459b SHA1 ca0917fbe799003a999da12598abc497d5fb0268 SHA256 20b0e3b1252a11abb86cdf89f95167274b7db482124c5c669c51a085d676ced9
+EBUILD cups-1.3.11-r4.ebuild 8230 RMD160 06cae988bc72fd05846e74c736798294c948ea1d SHA1 4a88b7dd7c62690e4e3ebdd3c8da1087ba5f94d9 SHA256 b7643b9e72c90fa66078ab8d4af8af463d1bfdf837e465e9fc078276e418493d
+EBUILD cups-1.4.6-r1.ebuild 8099 RMD160 2a044965b270e4b2a48413a7381c9f02f6c63b23 SHA1 e313bd3a8b091f197c7c10bda59bc30fd0d882ce SHA256 14d6eacf78e0f82de19616abfda1946a8377daca585c70eee958bfa90cb705ea
+MISC ChangeLog 2355 RMD160 c482e4cc7b35d71a58c24f2c6ff1321f527e6a1d SHA1 fdbf7dee70844746fdcad76d50bcb4cb26f716fe SHA256 6767cca086602520a58b196007eb4c5429ef96db7559fd901fc491621c2fd976
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
diff --git a/net-print/cups/cups-1.3.11-r4.ebuild b/net-print/cups/cups-1.3.11-r4.ebuild
index 3a70f20..b8e8f85 100644
--- a/net-print/cups/cups-1.3.11-r4.ebuild
+++ b/net-print/cups/cups-1.3.11-r4.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/net-print/cups/cups-1.3.11-r4.ebuild,v 1.1 2010/12/01 13:03:55 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.11-r4.ebuild,v 1.5 2011/04/30 15:10:52 scarabeus Exp $
 
 EAPI=2
 inherit autotools eutils flag-o-matic multilib pam
@@ -29,7 +29,7 @@ COMMON_DEPEND="
 	dbus? ( sys-apps/dbus )
 	gnutls? ( net-libs/gnutls )
 	java? ( >=virtual/jre-1.4 )
-	jpeg? ( >=media-libs/jpeg-6b )
+	jpeg? ( virtual/jpeg )
 	kerberos? ( virtual/krb5 )
 	ldap? ( net-nds/openldap )
 	pam? ( virtual/pam )
@@ -51,11 +51,10 @@ DEPEND="${COMMON_DEPEND}"
 RDEPEND="${COMMON_DEPEND}
 	!<net-print/foomatic-filters-ppds-20070501
 	!<net-print/hplip-1.7.4a-r1
-	!virtual/lpr
 	X? ( x11-misc/xdg-utils )
 "
 PDEPEND="
-	app-text/ghostscript-gpl
+	app-text/ghostscript-gpl[cups]
 	>=app-text/poppler-0.12.3-r3[utils]
 	ppds? (
 		|| (
@@ -74,8 +73,6 @@ PDEPEND="
 	samba? ( >=net-fs/samba-3.0.8 )
 "
 
-PROVIDE="virtual/lpr"
-
 # upstream includes an interactive test which is a nono for gentoo.
 # therefore, since the printing herd has bigger fish to fry, for now,
 # we just leave it out, even if FEATURES=test
@@ -261,19 +258,6 @@ pkg_postinst() {
 	elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml"
 	echo
 
-	local good_gs=false
-	for x in app-text/ghostscript-gpl app-text/ghostscript-gnu ; do
-		if has_version ${x} && built_with_use ${x} cups ; then
-			good_gs=true
-			break
-		fi
-	done
-	if ! ${good_gs} ; then
-		echo
-		ewarn "You need to emerge ghostscript with the \"cups\" USE flag turned on."
-		echo
-	fi
-
 	if [[ $upgrade_from_1_2 = 0 ]] ; then
 		echo
 		ewarn "You have upgraded from an older cups version. Please make sure"
diff --git a/net-print/cups/cups-1.4.6.ebuild b/net-print/cups/cups-1.4.6-r1.ebuild
index 3b95697..3fd3f06 100644
--- a/net-print/cups/cups-1.4.6.ebuild
+++ b/net-print/cups/cups-1.4.6-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.6.ebuild,v 1.1 2011/01/13 01:59:49 tgurr Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.6-r1.ebuild,v 1.4 2011/05/01 15:15:04 scarabeus Exp $
 
 EAPI=3
 
 PYTHON_DEPEND="python? 2:2.5"
 
-inherit autotools eutils flag-o-matic multilib pam perl-module python versionator java-pkg-opt-2
+inherit autotools eutils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2
 
 MY_P=${P/_}
 
@@ -17,7 +17,7 @@ SRC_URI="mirror://easysw/${PN}/${PV}/${MY_P}-source.tar.bz2"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
-IUSE="acl dbus debug gnutls java +jpeg kerberos ldap pam perl php +png python samba slp +ssl static-libs +threads +tiff +usb X xinetd"
+IUSE="acl dbus debug gnutls java +jpeg kerberos ldap pam perl php +png python samba slp +ssl static-libs +threads +tiff usb X xinetd"
 
 LANGS="da de es eu fi fr id it ja ko nl no pl pt pt_BR ru sv zh zh_TW"
 for X in ${LANGS} ; do
@@ -26,7 +26,6 @@ done
 
 RDEPEND="
 	app-text/libpaper
-	dev-libs/libgcrypt
 	acl? (
 		kernel_linux? (
 			sys-apps/acl
@@ -44,7 +43,10 @@ RDEPEND="
 	png? ( >=media-libs/libpng-1.4.3 )
 	slp? ( >=net-libs/openslp-1.0.4 )
 	ssl? (
-		gnutls? ( net-libs/gnutls )
+		gnutls? (
+			dev-libs/libgcrypt
+			net-libs/gnutls
+		)
 		!gnutls? ( >=dev-libs/openssl-0.9.8g )
 	)
 	tiff? ( >=media-libs/tiff-3.5.5 )
@@ -63,8 +65,6 @@ PDEPEND="
 	>=app-text/poppler-0.12.3-r3[utils]
 "
 
-PROVIDE="virtual/lpr"
-
 # upstream includes an interactive test which is a nono for gentoo.
 RESTRICT="test"
 
@@ -76,8 +76,45 @@ pkg_setup() {
 	enewgroup lpadmin 106
 
 	# python 3 is no-go
-	python_set_active_version 2
-	python_pkg_setup
+	if use python; then
+		python_set_active_version 2
+		python_pkg_setup
+	fi
+
+	linux-info_pkg_setup
+	if  ! linux_config_exists; then
+		ewarn "Can't check the linux kernel configuration."
+		ewarn "You might have some incompatible options enabled."
+	else
+		# recheck that we don't have usblp to collide with libusb
+		if use usb; then
+			if linux_chkconfig_present USB_PRINTER; then
+				eerror "Your usb printers will be managed via libusb."
+				eerror "Note that this interface still has issues so alternatively"
+				eerror "you should just disable usb useflag on ${P}."
+				eerror "${P} requires the USB_PRINTER support disabled."
+				eerror "Please disable it:"
+				eerror "    CONFIG_USB_PRINTER=n"
+				eerror "in /usr/src/linux/.config or"
+				eerror "    Device Drivers --->"
+				eerror "        USB support  --->"
+				eerror "            [ ] USB Printer support"
+				die "USB_PRINTER module enabled"
+			fi
+		else
+			#here we should warn user that he should enable it so he can print
+			if ! linux_chkconfig_present USB_PRINTER; then
+				ewarn "If you plan to use USB printers you should enable the USB_PRINTER"
+				ewarn "support in your kernel."
+				ewarn "Please enable it:"
+				ewarn "    CONFIG_USB_PRINTER=y"
+				ewarn "in /usr/src/linux/.config or"
+				ewarn "    Device Drivers --->"
+				ewarn "        USB support  --->"
+				ewarn "            [*] USB Printer support"
+			fi
+		fi
+	fi
 }
 
 src_prepare() {
@@ -237,4 +274,15 @@ pkg_postinst() {
 	elog "For information about installing a printer and general cups setup"
 	elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml"
 	echo
+
+	if use usb; then
+		elog
+		elog "You are going to use new libusb backed to access your usb printer."
+		elog "This interface has quite few known issues and does not report all"
+		elog "issues and just refuses to print."
+		elog "Please consider disabling usb useflag if you are having issues."
+		elog
+		elog "Please note that if you disable the usb useflag your device will be"
+		elog "still working using kernel usblp interface instead of libusb."
+	fi
 }
diff --git a/net-print/cups/files/cups-1.4.6-web-hang.patch b/net-print/cups/files/cups-1.4.6-web-hang.patch
new file mode 100644
index 0000000..6ccf05a
--- /dev/null
+++ b/net-print/cups/files/cups-1.4.6-web-hang.patch
@@ -0,0 +1,54 @@
+Index: cgi-bin/html.c
+===================================================================
+--- cgi-bin/html.c	(revision 9428)
++++ cgi-bin/html.c	(working copy)
+@@ -1,9 +1,9 @@
+ /*
+  * "$Id: cups-1.4.6-web-hang.patch,v 1.1 2011/04/30 15:39:45 scarabeus Exp $"
+  *
+- *   HTML support functions for the Common UNIX Printing System (CUPS).
++ *   HTML support functions for CUPS.
+  *
+- *   Copyright 2007-2009 by Apple Inc.
++ *   Copyright 2007-2011 by Apple Inc.
+  *   Copyright 1997-2006 by Easy Software Products.
+  *
+  *   These coded instructions, statements, and computer programs are the
+@@ -208,31 +208,13 @@
+ int					/* O - 1 if multi-part supported, 0 otherwise */
+ cgiSupportsMultipart(void)
+ {
+-  const char	*user_agent;		/* User-Agent string */
+-  static int	supports_multipart = -1;/* Cached value */
++ /*
++  * Too many bug reports for browsers that don't support it, and too much pain
++  * to whitelist known-good browsers, so for now we just punt on multi-part
++  * support... :(
++  */
+ 
+-
+-  if (supports_multipart < 0)
+-  {
+-   /*
+-    * CUPS STR #3049: Apparently some browsers don't support multi-part
+-    * documents, which makes them useless for many web sites.  Rather than
+-    * abandoning those users, we'll offer a degraded single-part mode...
+-    *
+-    * Currently we know that anything based on Gecko, MSIE, and Safari all
+-    * work.  We'll add more as they are reported/tested.
+-    */
+-
+-    if ((user_agent = getenv("HTTP_USER_AGENT")) != NULL &&
+-        (strstr(user_agent, " Gecko/") != NULL ||
+-	 strstr(user_agent, " MSIE ") != NULL ||
+-	 strstr(user_agent, " Safari/") != NULL))
+-      supports_multipart = 1;
+-    else
+-      supports_multipart = 0;
+-  }
+-
+-  return (supports_multipart);
++  return (0);
+ }
+ 
+