| 1 |
commit: 564e540c8be63a473ca855fd48fd23e68f82e72f |
| 2 |
Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Thu Feb 16 00:06:26 2017 +0000 |
| 4 |
Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Feb 16 00:13:43 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=564e540c |
| 7 |
|
| 8 |
net-print/cups: Tone down USB_PRINTER warning, bug 501122 |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.3, Repoman-2.3.1 |
| 11 |
|
| 12 |
net-print/cups/cups-2.2.2-r1.ebuild | 15 +++++---------- |
| 13 |
net-print/cups/cups-2.2.2-r2.ebuild | 15 +++++---------- |
| 14 |
net-print/cups/cups-9999.ebuild | 15 +++++---------- |
| 15 |
3 files changed, 15 insertions(+), 30 deletions(-) |
| 16 |
|
| 17 |
diff --git a/net-print/cups/cups-2.2.2-r1.ebuild b/net-print/cups/cups-2.2.2-r1.ebuild |
| 18 |
index a4fe11d96b..59fd100b94 100644 |
| 19 |
--- a/net-print/cups/cups-2.2.2-r1.ebuild |
| 20 |
+++ b/net-print/cups/cups-2.2.2-r1.ebuild |
| 21 |
@@ -114,18 +114,13 @@ pkg_setup() { |
| 22 |
ewarn "Can't check the linux kernel configuration." |
| 23 |
ewarn "You might have some incompatible options enabled." |
| 24 |
else |
| 25 |
- # recheck that we don't have usblp to collide with libusb |
| 26 |
+ # recheck that we don't have usblp to collide with libusb; this should now work in most cases (bug 501122) |
| 27 |
if use usb; then |
| 28 |
if linux_chkconfig_present USB_PRINTER; then |
| 29 |
- eerror "Your usb printers will be managed via libusb. In this case, " |
| 30 |
- eerror "${P} requires the USB_PRINTER support disabled." |
| 31 |
- eerror "Please disable it:" |
| 32 |
- eerror " CONFIG_USB_PRINTER=n" |
| 33 |
- eerror "in /usr/src/linux/.config or" |
| 34 |
- eerror " Device Drivers --->" |
| 35 |
- eerror " USB support --->" |
| 36 |
- eerror " [ ] USB Printer support" |
| 37 |
- eerror "Alternatively, just disable the usb useflag for cups (your printer will still work)." |
| 38 |
+ elog "Your USB printers will be managed via libusb. In case you run into problems, " |
| 39 |
+ elog "please try disabling USB_PRINTER support in your kernel or blacklisting the" |
| 40 |
+ elog "usblp kernel module." |
| 41 |
+ elog "Alternatively, just disable the usb useflag for cups (your printer will still work)." |
| 42 |
fi |
| 43 |
else |
| 44 |
#here we should warn user that he should enable it so he can print |
| 45 |
|
| 46 |
diff --git a/net-print/cups/cups-2.2.2-r2.ebuild b/net-print/cups/cups-2.2.2-r2.ebuild |
| 47 |
index 765945a438..24b53a61b1 100644 |
| 48 |
--- a/net-print/cups/cups-2.2.2-r2.ebuild |
| 49 |
+++ b/net-print/cups/cups-2.2.2-r2.ebuild |
| 50 |
@@ -113,18 +113,13 @@ pkg_setup() { |
| 51 |
ewarn "Can't check the linux kernel configuration." |
| 52 |
ewarn "You might have some incompatible options enabled." |
| 53 |
else |
| 54 |
- # recheck that we don't have usblp to collide with libusb |
| 55 |
+ # recheck that we don't have usblp to collide with libusb; this should now work in most cases (bug 501122) |
| 56 |
if use usb; then |
| 57 |
if linux_chkconfig_present USB_PRINTER; then |
| 58 |
- eerror "Your usb printers will be managed via libusb. In this case, " |
| 59 |
- eerror "${P} requires the USB_PRINTER support disabled." |
| 60 |
- eerror "Please disable it:" |
| 61 |
- eerror " CONFIG_USB_PRINTER=n" |
| 62 |
- eerror "in /usr/src/linux/.config or" |
| 63 |
- eerror " Device Drivers --->" |
| 64 |
- eerror " USB support --->" |
| 65 |
- eerror " [ ] USB Printer support" |
| 66 |
- eerror "Alternatively, just disable the usb useflag for cups (your printer will still work)." |
| 67 |
+ elog "Your USB printers will be managed via libusb. In case you run into problems, " |
| 68 |
+ elog "please try disabling USB_PRINTER support in your kernel or blacklisting the" |
| 69 |
+ elog "usblp kernel module." |
| 70 |
+ elog "Alternatively, just disable the usb useflag for cups (your printer will still work)." |
| 71 |
fi |
| 72 |
else |
| 73 |
#here we should warn user that he should enable it so he can print |
| 74 |
|
| 75 |
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild |
| 76 |
index 765945a438..24b53a61b1 100644 |
| 77 |
--- a/net-print/cups/cups-9999.ebuild |
| 78 |
+++ b/net-print/cups/cups-9999.ebuild |
| 79 |
@@ -113,18 +113,13 @@ pkg_setup() { |
| 80 |
ewarn "Can't check the linux kernel configuration." |
| 81 |
ewarn "You might have some incompatible options enabled." |
| 82 |
else |
| 83 |
- # recheck that we don't have usblp to collide with libusb |
| 84 |
+ # recheck that we don't have usblp to collide with libusb; this should now work in most cases (bug 501122) |
| 85 |
if use usb; then |
| 86 |
if linux_chkconfig_present USB_PRINTER; then |
| 87 |
- eerror "Your usb printers will be managed via libusb. In this case, " |
| 88 |
- eerror "${P} requires the USB_PRINTER support disabled." |
| 89 |
- eerror "Please disable it:" |
| 90 |
- eerror " CONFIG_USB_PRINTER=n" |
| 91 |
- eerror "in /usr/src/linux/.config or" |
| 92 |
- eerror " Device Drivers --->" |
| 93 |
- eerror " USB support --->" |
| 94 |
- eerror " [ ] USB Printer support" |
| 95 |
- eerror "Alternatively, just disable the usb useflag for cups (your printer will still work)." |
| 96 |
+ elog "Your USB printers will be managed via libusb. In case you run into problems, " |
| 97 |
+ elog "please try disabling USB_PRINTER support in your kernel or blacklisting the" |
| 98 |
+ elog "usblp kernel module." |
| 99 |
+ elog "Alternatively, just disable the usb useflag for cups (your printer will still work)." |
| 100 |
fi |
| 101 |
else |
| 102 |
#here we should warn user that he should enable it so he can print |
Archives