| 1 |
scarabeus 11/04/30 16:28:54 |
| 2 |
|
| 3 |
Modified: ChangeLog cups-1.4.6-r1.ebuild |
| 4 |
Log: |
| 5 |
Add the kernel check so we really ensure nobody tries both libusb and usblp at once. |
| 6 |
|
| 7 |
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64) |
| 8 |
|
| 9 |
Revision Changes Path |
| 10 |
1.410 net-print/cups/ChangeLog |
| 11 |
|
| 12 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.410&view=markup |
| 13 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.410&content-type=text/plain |
| 14 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?r1=1.409&r2=1.410 |
| 15 |
|
| 16 |
Index: ChangeLog |
| 17 |
=================================================================== |
| 18 |
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v |
| 19 |
retrieving revision 1.409 |
| 20 |
retrieving revision 1.410 |
| 21 |
diff -u -r1.409 -r1.410 |
| 22 |
--- ChangeLog 30 Apr 2011 15:50:53 -0000 1.409 |
| 23 |
+++ ChangeLog 30 Apr 2011 16:28:53 -0000 1.410 |
| 24 |
@@ -1,6 +1,10 @@ |
| 25 |
# ChangeLog for net-print/cups |
| 26 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
| 27 |
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.409 2011/04/30 15:50:53 scarabeus Exp $ |
| 28 |
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.410 2011/04/30 16:28:53 scarabeus Exp $ |
| 29 |
+ |
| 30 |
+ 30 Apr 2011; Tomáš Chvátal <scarabeus@g.o> cups-1.4.6-r1.ebuild: |
| 31 |
+ Add the kernel check so we really ensure nobody tries both libusb and usblp |
| 32 |
+ at once. |
| 33 |
|
| 34 |
30 Apr 2011; Tomáš Chvátal <scarabeus@g.o> cups-1.4.6-r1.ebuild: |
| 35 |
Add new shiny elog message about what usb useflag does on cups. |
| 36 |
|
| 37 |
|
| 38 |
|
| 39 |
1.3 net-print/cups/cups-1.4.6-r1.ebuild |
| 40 |
|
| 41 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.4.6-r1.ebuild?rev=1.3&view=markup |
| 42 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.4.6-r1.ebuild?rev=1.3&content-type=text/plain |
| 43 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.4.6-r1.ebuild?r1=1.2&r2=1.3 |
| 44 |
|
| 45 |
Index: cups-1.4.6-r1.ebuild |
| 46 |
=================================================================== |
| 47 |
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.6-r1.ebuild,v |
| 48 |
retrieving revision 1.2 |
| 49 |
retrieving revision 1.3 |
| 50 |
diff -u -r1.2 -r1.3 |
| 51 |
--- cups-1.4.6-r1.ebuild 30 Apr 2011 15:50:53 -0000 1.2 |
| 52 |
+++ cups-1.4.6-r1.ebuild 30 Apr 2011 16:28:53 -0000 1.3 |
| 53 |
@@ -1,12 +1,12 @@ |
| 54 |
# Copyright 1999-2011 Gentoo Foundation |
| 55 |
# Distributed under the terms of the GNU General Public License v2 |
| 56 |
-# $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 $ |
| 57 |
+# $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 $ |
| 58 |
|
| 59 |
EAPI=3 |
| 60 |
|
| 61 |
PYTHON_DEPEND="python? 2:2.5" |
| 62 |
|
| 63 |
-inherit autotools eutils flag-o-matic multilib pam perl-module python versionator java-pkg-opt-2 |
| 64 |
+inherit autotools eutils flag-o-matic linux-mod multilib pam perl-module python versionator java-pkg-opt-2 |
| 65 |
|
| 66 |
MY_P=${P/_} |
| 67 |
|
| 68 |
@@ -80,6 +80,41 @@ |
| 69 |
python_set_active_version 2 |
| 70 |
python_pkg_setup |
| 71 |
fi |
| 72 |
+ |
| 73 |
+ linux-mod_pkg_setup |
| 74 |
+ if ! linux_config_exists; then |
| 75 |
+ ewarn "Can't check the linux kernel configuration." |
| 76 |
+ ewarn "You might have some incompatible options enabled." |
| 77 |
+ else |
| 78 |
+ # recheck that we don't have usblp to collide with libusb |
| 79 |
+ if use usb; then |
| 80 |
+ if linux_chkconfig_present USB_PRINTER; then |
| 81 |
+ eerror "Your usb printers will be managed via libusb." |
| 82 |
+ eerror "Note that this interface still has issues so alternatively" |
| 83 |
+ eerror "you should just disable usb useflag on ${P}." |
| 84 |
+ eerror "${P} requires the USB_PRINTER support disabled." |
| 85 |
+ eerror "Please disable it:" |
| 86 |
+ eerror " CONFIG_USB_PRINTER=n" |
| 87 |
+ eerror "in /usr/src/linux/.config or" |
| 88 |
+ eerror " Device Drivers --->" |
| 89 |
+ eerror " USB support --->" |
| 90 |
+ eerror " [ ] USB Printer support" |
| 91 |
+ die "USB_PRINTER module enabled" |
| 92 |
+ fi |
| 93 |
+ else |
| 94 |
+ #here we should warn user that he should enable it so he can print |
| 95 |
+ if ! linux_chkconfig_present USB_PRINTER; then |
| 96 |
+ ewarn "If you plan to use USB printers you should enable the USB_PRINTER" |
| 97 |
+ ewarn "support in your kernel." |
| 98 |
+ ewarn "Please enable it:" |
| 99 |
+ ewarn " CONFIG_USB_PRINTER=y" |
| 100 |
+ ewarn "in /usr/src/linux/.config or" |
| 101 |
+ ewarn " Device Drivers --->" |
| 102 |
+ ewarn " USB support --->" |
| 103 |
+ ewarn " [*] USB Printer support" |
| 104 |
+ fi |
| 105 |
+ fi |
| 106 |
+ fi |
| 107 |
} |
| 108 |
|
| 109 |
src_prepare() { |
| 110 |
@@ -240,12 +275,13 @@ |
| 111 |
echo |
| 112 |
|
| 113 |
if use usb; then |
| 114 |
+ elog |
| 115 |
elog "You are going to use new libusb backed to access your usb printer." |
| 116 |
elog "This interface has quite few known issues and does not report all" |
| 117 |
elog "issues and just refuses to print." |
| 118 |
elog "Please consider disabling usb useflag if you are having issues." |
| 119 |
elog |
| 120 |
- elog "Please note that that if you disable the usb useflag your device will" |
| 121 |
- elog "be still working using old kernel usblp interface instead of libusb." |
| 122 |
+ elog "Please note that if you disable the usb useflag your device will be" |
| 123 |
+ elog "still working using kernel usblp interface instead of libusb." |
| 124 |
fi |
| 125 |
} |
Archives