cups 1.5 should handle the usb printing properly without any kernel hackery.

Package-Manager: portage-2.2.0_alpha58/cvs/Linux x86_64

3 files changed, 22 insertions, 54 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 53ff508c3d92..b8c0a9be9c88 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-print/cups
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.435 2011/09/03 13:21:03 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.436 2011/09/18 08:11:49 scarabeus Exp $
+
+  18 Sep 2011; Tomáš Chvátal <scarabeus@gentoo.org> cups-1.5.0-r2.ebuild:
+  cups 1.5 should handle the usb printing properly without any kernel hackery.
 
   03 Sep 2011; Raúl Porcel <armin76@gentoo.org> cups-1.4.8-r1.ebuild:
   alpha/arm/ia64/m68k/s390/sh/sparc stable wrt #380771
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 6ccc85f57040..c44624070ae6 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -32,13 +32,23 @@ EBUILD cups-1.4.8-r1.ebuild 7191 RMD160 ac9289e53242ce86d203c8783fa3df1c257b4f13
 EBUILD cups-1.4.8-r21.ebuild 8443 RMD160 679ccbc84e633feff758cf3475d09c9d05472457 SHA1 f26fc96e87bd0fb849a948f3ca57fb50056c8e43 SHA256 e0abc4a87def1cbe0cd5ab086984cfd46356bfc5d9427312cac4323a6c5a7635
 EBUILD cups-1.4.8-r22.ebuild 8494 RMD160 35528619a66960590cfdb86d332e3af986fce93c SHA1 94f8bc27c699780992b8817a28ac57d2f0da679e SHA256 bc9bf411685d6edd9aed5abb058e153bb1e94127be1063abcd5c0bd5bc725230
 EBUILD cups-1.5.0-r1.ebuild 8299 RMD160 cd482176e3cf5f29b09d8b35fa47450beae289c6 SHA1 c9bd7e12e6feb3dcf215c5b5c6c085c0f0825c8d SHA256 f2ed0e6c468f22b36f9fb0774fb0b4c6ed377246356ebc4385afa6b791170bd7
-EBUILD cups-1.5.0-r2.ebuild 8350 RMD160 673447f224905f4c8c4ce0bd1814b61fd1cd19bd SHA1 4fd00939022570341fe9239b7cf6cc904b736625 SHA256 f43298d8b8f456d00945b1fa93dfdce4ebfb6021a51c351a763f4951317735fe
-MISC ChangeLog 65509 RMD160 869e3b5e6b75aa01c998e048be8585a4b02ae1f3 SHA1 1fe5114b420e2490f7f41fad793714163d696e62 SHA256 2eab474e127279a3826f2c4bc03e62be265caf64d3545496f3d0c257bf9526f0
+EBUILD cups-1.5.0-r2.ebuild 6502 RMD160 42604b23709bd1d806ccfdd6bea3d7ebf8861e5c SHA1 4aa595c496ba975b4ebddccd7dcce3acc26f20b9 SHA256 2556d81d4273679ebb1f3187335cf2a1b8f6d7ce2e2bc285a8779a88a2695bfe
+MISC ChangeLog 65668 RMD160 0264a666e0c5e8d448bb1ce79ccd74f517d6a5ea SHA1 c7210f1e25be7a2d3908a538abb953af67495c24 SHA256 f941acbdf73e923fefb9bd0e866fc444726e92e94e164c900febe906eefd75df
 MISC metadata.xml 586 RMD160 73a1f1c0096d5035dfa53207b00c125894f6822a SHA1 123501263490cab57af2b99f2336fb70c094d9b0 SHA256 3b729c497ee38452b1ca051b759f43b5f9e117f9c36c0f3b660e4bd8ab7c295b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk5iKcYACgkQuQc30/atMkBBrgCfS39VJSaV8iNua+K2cWFcItKa
-UioAmwdPPuJ0EogS7HNAKDkrypxftkWu
-=Yh/H
+iQIcBAEBAgAGBQJOdaerAAoJEOSiRoyO7jvo+eIQAI2p1JFbAw+vrYaAVsVZb0Uv
+MYzovfLYWuPjYOuP2XQ+uxMustKV9qVNhC7lIlKt5tFqe4QXgdK/+MIuuzvBj1h8
+zsQB97Jry/v1hGv3tkjimDa+7NqXb1qhuM4IGfQauLCUUqnxY+x3W8YEEd8k5B4p
+aVfKd64odEbV45zVkrnFdFWiHC7CMVXMKNp32M2v7kxVtUdYWGeA7N9ikY+klPOv
+wOQgdwb4ccJFfuua2vOnw7EbU3E524qZXla5UiVt/Dm4QKCwGAG8guz55sXf8PUb
+JG64xM23UMTSpzHh8q7HLDKe4h4dMjdO7fF/j62S1llVpDDQYXwu/p4cfT++RzkS
+lbhbDGDICOluO8LO4xo+D6DXX9XNTehMZaRwx/orjTNtC/EjUHZppUeLbO1Vd4it
+I0ZS/tW3GtVdgXwUNjzA3woYxjApiM+sINFayVFSzIlHkRlOQIinfncth1BIIGxB
+HFeVHsUB5CQiPVGtLzDaGfacPggdwKrNmv210II8WTm8r75gEdUEv7I6b1z7gWz+
+lfr84Z9y+H++C60U6MDS2iTeXAGTp9MEl+tW4rYBLvyWi0SKxLRM8ZDHcKvDFRpR
+if5akjr+KFTNEmoY0DuqHfzWxnkScIdUzgFDvykFg7kHrThV1jI5xJG1EsNNkPQ6
+JcvdD58TwBwQQk2Z8iAo
+=8uS1
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.5.0-r2.ebuild b/net-print/cups/cups-1.5.0-r2.ebuild
index 80965f60e242..992ee8c33956 100644
--- a/net-print/cups/cups-1.5.0-r2.ebuild
+++ b/net-print/cups/cups-1.5.0-r2.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.5.0-r2.ebuild,v 1.1 2011/08/28 23:20:47 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.0-r2.ebuild,v 1.2 2011/09/18 08:11:49 scarabeus Exp $
 
 #
 # See http://git.overlays.gentoo.org/gitweb/?p=dev/dilfridge.git;a=blob;f=net-print/cups/notes.txt;hb=HEAD
@@ -11,7 +11,7 @@ EAPI=3
 
 PYTHON_DEPEND="python? 2:2.5"
 
-inherit autotools eutils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2
+inherit autotools eutils flag-o-matic multilib pam perl-module python versionator java-pkg-opt-2
 
 MY_P=${P/_}
 MY_PV=${PV/_}
@@ -86,51 +86,6 @@ pkg_setup() {
 		python_set_active_version 2
 		python_pkg_setup
 	fi
-
-	if use usb; then
-		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."
-		echo
-	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 which collides with kernel module."
-				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"
-				eerror "Alternatively, just disable the usb useflag for cups (your printer will still work)."
-			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"
-				ewarn "Alternatively, enable the usb useflag for cups and use the new, less-tested libusb code."
-			fi
-		fi
-	fi
 }
 
 src_prepare() {