From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 9862B139694 for ; Thu, 16 Feb 2017 00:13:55 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id D84EDE0CAD; Thu, 16 Feb 2017 00:13:54 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A44CCE0CAD for ; Thu, 16 Feb 2017 00:13:54 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6C66B3415A2 for ; Thu, 16 Feb 2017 00:13:52 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 96058493B for ; Thu, 16 Feb 2017 00:13:50 +0000 (UTC) From: "Andreas Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Hüttel" Message-ID: <1487204023.564e540c8be63a473ca855fd48fd23e68f82e72f.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-print/cups/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-print/cups/cups-2.2.2-r1.ebuild net-print/cups/cups-2.2.2-r2.ebuild net-print/cups/cups-9999.ebuild X-VCS-Directories: net-print/cups/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas Hüttel X-VCS-Revision: 564e540c8be63a473ca855fd48fd23e68f82e72f X-VCS-Branch: master Date: Thu, 16 Feb 2017 00:13:50 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: f7ca86d1-c7a9-4132-8a7e-341cb5d0313d X-Archives-Hash: 1c26ddbccf136b9b4aecee37970d13ca commit: 564e540c8be63a473ca855fd48fd23e68f82e72f Author: Andreas K. Hüttel gentoo org> AuthorDate: Thu Feb 16 00:06:26 2017 +0000 Commit: Andreas Hüttel gentoo org> CommitDate: Thu Feb 16 00:13:43 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=564e540c net-print/cups: Tone down USB_PRINTER warning, bug 501122 Package-Manager: Portage-2.3.3, Repoman-2.3.1 net-print/cups/cups-2.2.2-r1.ebuild | 15 +++++---------- net-print/cups/cups-2.2.2-r2.ebuild | 15 +++++---------- net-print/cups/cups-9999.ebuild | 15 +++++---------- 3 files changed, 15 insertions(+), 30 deletions(-) diff --git a/net-print/cups/cups-2.2.2-r1.ebuild b/net-print/cups/cups-2.2.2-r1.ebuild index a4fe11d96b..59fd100b94 100644 --- a/net-print/cups/cups-2.2.2-r1.ebuild +++ b/net-print/cups/cups-2.2.2-r1.ebuild @@ -114,18 +114,13 @@ pkg_setup() { 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 + # recheck that we don't have usblp to collide with libusb; this should now work in most cases (bug 501122) if use usb; then if linux_chkconfig_present USB_PRINTER; then - eerror "Your usb printers will be managed via libusb. In this case, " - 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)." + elog "Your USB printers will be managed via libusb. In case you run into problems, " + elog "please try disabling USB_PRINTER support in your kernel or blacklisting the" + elog "usblp kernel module." + elog "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 diff --git a/net-print/cups/cups-2.2.2-r2.ebuild b/net-print/cups/cups-2.2.2-r2.ebuild index 765945a438..24b53a61b1 100644 --- a/net-print/cups/cups-2.2.2-r2.ebuild +++ b/net-print/cups/cups-2.2.2-r2.ebuild @@ -113,18 +113,13 @@ pkg_setup() { 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 + # recheck that we don't have usblp to collide with libusb; this should now work in most cases (bug 501122) if use usb; then if linux_chkconfig_present USB_PRINTER; then - eerror "Your usb printers will be managed via libusb. In this case, " - 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)." + elog "Your USB printers will be managed via libusb. In case you run into problems, " + elog "please try disabling USB_PRINTER support in your kernel or blacklisting the" + elog "usblp kernel module." + elog "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 diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild index 765945a438..24b53a61b1 100644 --- a/net-print/cups/cups-9999.ebuild +++ b/net-print/cups/cups-9999.ebuild @@ -113,18 +113,13 @@ pkg_setup() { 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 + # recheck that we don't have usblp to collide with libusb; this should now work in most cases (bug 501122) if use usb; then if linux_chkconfig_present USB_PRINTER; then - eerror "Your usb printers will be managed via libusb. In this case, " - 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)." + elog "Your USB printers will be managed via libusb. In case you run into problems, " + elog "please try disabling USB_PRINTER support in your kernel or blacklisting the" + elog "usblp kernel module." + elog "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