diff options
| author |   Andreas K. Hüttel <dilfridge@gentoo.org> | 2012-01-27 22:18:20 +0000 |
|---|---|---|
| committer | Andreas K. Hüttel <dilfridge@gentoo.org> | 2012-01-27 22:18:20 +0000 |
| commit | c50a054acf345ec613ea9d598514c3fd193d399a (patch) | |
| tree | bab430063416f03b97df1fd2b4f1aea9b831f058 /net-print/cups | |
| parent | Version bump. (diff) | |
| download | gentoo-2-c50a054acf345ec613ea9d598514c3fd193d399a.tar.gz gentoo-2-c50a054acf345ec613ea9d598514c3fd193d399a.tar.bz2 gentoo-2-c50a054acf345ec613ea9d598514c3fd193d399a.zip | |
Re-add usb useflag / kernel configuration checks, but only on linux, bug 382675
(Portage version: 2.1.10.44/cvs/Linux x86_64)
Diffstat (limited to 'net-print/cups')
| -rw-r--r-- | net-print/cups/ChangeLog | 6 | ||||
| -rw-r--r-- | net-print/cups/cups-1.5.0-r3.ebuild | 41 |
2 files changed, 43 insertions, 4 deletions
diff --git a/net-print/cups/ChangeLog b/net-print/cups/ChangeLog index d448023f2dec..e3b88e3015f8 100644 --- a/net-print/cups/ChangeLog +++ b/net-print/cups/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for net-print/cups # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.446 2012/01/27 21:30:49 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.447 2012/01/27 22:18:20 dilfridge Exp $ + + 27 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.5.0-r3.ebuild: + Re-add usb useflag / kernel configuration checks, but only on linux, bug + 382675 27 Jan 2012; Andreas K. Huettel <dilfridge@gentoo.org> cups-1.4.8-r1.ebuild, cups-1.4.8-r23.ebuild, cups-1.5.0-r3.ebuild: diff --git a/net-print/cups/cups-1.5.0-r3.ebuild b/net-print/cups/cups-1.5.0-r3.ebuild index 69918c48e557..5b46bef36249 100644 --- a/net-print/cups/cups-1.5.0-r3.ebuild +++ b/net-print/cups/cups-1.5.0-r3.ebuild @@ -1,12 +1,12 @@ # Copyright 1999-2012 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-r3.ebuild,v 1.7 2012/01/27 21:30:49 dilfridge Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.0-r3.ebuild,v 1.8 2012/01/27 22:18:20 dilfridge Exp $ EAPI=4 PYTHON_DEPEND="python? 2:2.5" -inherit autotools eutils fdo-mime gnome2-utils flag-o-matic multilib pam perl-module python versionator java-pkg-opt-2 +inherit autotools eutils fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2 MY_P=${P/_} MY_PV=${PV/_} @@ -54,7 +54,6 @@ RDEPEND=" usb? ( virtual/libusb:0 ) X? ( x11-misc/xdg-utils ) xinetd? ( sys-apps/xinetd ) - !net-print/cupsddk " DEPEND="${RDEPEND} @@ -82,6 +81,42 @@ pkg_setup() { python_set_active_version 2 python_pkg_setup fi + + if use kernel_linux; then + 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. 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)." + 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 libusb code." + fi + fi + fi + fi } src_prepare() { |