Add the kernel check so we really ensure nobody tries both libusb and usblp at once.

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

3 files changed, 50 insertions, 10 deletions

diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog
index 35fb31a7afb8..29e4332826ec 100644
--- a/net-print/cups/ChangeLog
+++ b/net-print/cups/ChangeLog
@@ -1,6 +1,10 @@
 # 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.409 2011/04/30 15:50:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.410 2011/04/30 16:28:53 scarabeus Exp $
+
+  30 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> cups-1.4.6-r1.ebuild:
+  Add the kernel check so we really ensure nobody tries both libusb and usblp
+  at once.
 
   30 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> cups-1.4.6-r1.ebuild:
   Add new shiny elog message about what usb useflag does on cups.
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index c588f7336562..b9a791054dea 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -23,13 +23,13 @@ AUX pdftops-1.20.gentoo 10412 RMD160 16e229662c47e03af1d1f4cb5764a76d17a66642 SH
 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 8157 RMD160 8a87f90b96c08a694643df5324e7daab651daed2 SHA1 f1f3d811c3bc989046cca5981a98d3a7e47e22fc SHA256 40fd91ccb98b69279919e10c46a286ae04b839ac77c0b074a8973f0313616d7b
-EBUILD cups-1.4.6-r1.ebuild 6802 RMD160 ec5dfd8528b29c8fd054550928b74d962b2f25f7 SHA1 f7b008e8502c6be5761903cbb3c049aab6f8832e SHA256 ba3456914c059c033b75759d6089778469c241f1c8a0414b12a4fecb4d61313a
-MISC ChangeLog 61357 RMD160 ebf48fcca9b4cc4f0141aee6c13fe2a64009bc9e SHA1 8f54912974d0f70f1669e928f9490c2bf5b560a1 SHA256 ddcb19e370ddc775c083000c39fb33bc54586d47f0bcd9849ba650b8d0bf6308
+EBUILD cups-1.4.6-r1.ebuild 8128 RMD160 ad3e75098e727362c5dfafde8fdfe886cc61c3a9 SHA1 db81dbe79b13d2b8c6a5f19a3a956f623c821ae6 SHA256 3b8c79b5425a9c17e503db86e1342bd4e57d933ccd4b2320c2fdd174c925a34f
+MISC ChangeLog 61524 RMD160 0a853f79a1421d8fddf060cd6377403f4ae4b55d SHA1 7aa09aca663842ee2640c4dbb709564cb3097c02 SHA256 ec752025ee7ea5bd0aa6daddfd639349a9e1fb999ab835c7cc6e8ed3897baa64
 MISC metadata.xml 161 RMD160 1e5b1e42553c8869b93c4a5448e9a2a2ed9fe525 SHA1 209c6a46e4cdd891980115e42ba419e3799f8088 SHA256 7c85e6739a71f5bb23e8de36c88677d772946e61f7285892f7554e37bd2bca76
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk28L8kACgkQHB6c3gNBRYch+QCfdlFs197MiF+UuM/HmF27TcNd
-YkIAoKax9q1x3CVN3r8W78i8Yp06sDAb
-=p42l
+iEYEARECAAYFAk28OKwACgkQHB6c3gNBRYeQ+gCeJn/ePlu65DO3zxu8iMCgj2D7
+fDgAnjTX1ipq/BH9A9Ry5p/4HWBtRl97
+=fdMq
 -----END PGP SIGNATURE-----
diff --git a/net-print/cups/cups-1.4.6-r1.ebuild b/net-print/cups/cups-1.4.6-r1.ebuild
index 3a01fecac953..0d25a56232cc 100644
--- a/net-print/cups/cups-1.4.6-r1.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-r1.ebuild,v 1.2 2011/04/30 15:50:53 scarabeus Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.6-r1.ebuild,v 1.3 2011/04/30 16:28:53 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-mod multilib pam perl-module python versionator java-pkg-opt-2
 
 MY_P=${P/_}
 
@@ -80,6 +80,41 @@ pkg_setup() {
 		python_set_active_version 2
 		python_pkg_setup
 	fi
+
+	linux-mod_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() {
@@ -240,12 +275,13 @@ pkg_postinst() {
 	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 that if you disable the usb useflag your device will"
-		elog "be still working using old kernel usblp interface instead of libusb."
+		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
 }