Gentoo Archives: gentoo-commits

From: "Tomas Chvatal (scarabeus)" <scarabeus@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-print/cups: ChangeLog cups-1.4.6-r1.ebuild
Date: Tue, 03 May 2011 10:16:19
Message-Id: 20110503101608.A65C720054@flycatcher.gentoo.org
1 scarabeus 11/05/03 10:16:08
2
3 Modified: ChangeLog cups-1.4.6-r1.ebuild
4 Log:
5 Try to reorder the warnings for the usb useflag to be more self-explanatory.
6
7 (Portage version: 2.2.0_alpha30/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.412 net-print/cups/ChangeLog
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.412&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.412&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?r1=1.411&r2=1.412
15
16 Index: ChangeLog
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v
19 retrieving revision 1.411
20 retrieving revision 1.412
21 diff -u -r1.411 -r1.412
22 --- ChangeLog 1 May 2011 15:15:04 -0000 1.411
23 +++ ChangeLog 3 May 2011 10:16:08 -0000 1.412
24 @@ -1,6 +1,9 @@
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.411 2011/05/01 15:15:04 scarabeus Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.412 2011/05/03 10:16:08 scarabeus Exp $
29 +
30 + 03 May 2011; Tomáš Chvátal <scarabeus@g.o> cups-1.4.6-r1.ebuild:
31 + Try to reorder the warnings for the usb useflag to be more self-explanatory.
32
33 01 May 2011; Tomáš Chvátal <scarabeus@g.o> cups-1.4.6-r1.ebuild:
34 use linux-info rather than linux-mod eclass. Per bug #365491.
35
36
37
38 1.5 net-print/cups/cups-1.4.6-r1.ebuild
39
40 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.4.6-r1.ebuild?rev=1.5&view=markup
41 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.4.6-r1.ebuild?rev=1.5&content-type=text/plain
42 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.4.6-r1.ebuild?r1=1.4&r2=1.5
43
44 Index: cups-1.4.6-r1.ebuild
45 ===================================================================
46 RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.6-r1.ebuild,v
47 retrieving revision 1.4
48 retrieving revision 1.5
49 diff -u -r1.4 -r1.5
50 --- cups-1.4.6-r1.ebuild 1 May 2011 15:15:04 -0000 1.4
51 +++ cups-1.4.6-r1.ebuild 3 May 2011 10:16:08 -0000 1.5
52 @@ -1,6 +1,6 @@
53 # Copyright 1999-2011 Gentoo Foundation
54 # Distributed under the terms of the GNU General Public License v2
55 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.6-r1.ebuild,v 1.4 2011/05/01 15:15:04 scarabeus Exp $
56 +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.6-r1.ebuild,v 1.5 2011/05/03 10:16:08 scarabeus Exp $
57
58 EAPI=3
59
60 @@ -81,6 +81,17 @@
61 python_pkg_setup
62 fi
63
64 + if use usb; then
65 + elog "You are going to use new libusb backed to access your usb printer."
66 + elog "This interface has quite few known issues and does not report all"
67 + elog "issues and just refuses to print."
68 + elog "Please consider disabling usb useflag if you are having issues."
69 + elog
70 + elog "Please note that if you disable the usb useflag your device will be"
71 + elog "still working using kernel usblp interface instead of libusb."
72 + echo
73 + fi
74 +
75 linux-info_pkg_setup
76 if ! linux_config_exists; then
77 ewarn "Can't check the linux kernel configuration."
78 @@ -89,9 +100,7 @@
79 # recheck that we don't have usblp to collide with libusb
80 if use usb; then
81 if linux_chkconfig_present USB_PRINTER; then
82 - eerror "Your usb printers will be managed via libusb."
83 - eerror "Note that this interface still has issues so alternatively"
84 - eerror "you should just disable usb useflag on ${P}."
85 + eerror "Your usb printers will be managed via libusb which collides with kernel module."
86 eerror "${P} requires the USB_PRINTER support disabled."
87 eerror "Please disable it:"
88 eerror " CONFIG_USB_PRINTER=n"
89 @@ -273,15 +282,4 @@
90 elog "For information about installing a printer and general cups setup"
91 elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml"
92 echo
93 -
94 - if use usb; then
95 - elog
96 - elog "You are going to use new libusb backed to access your usb printer."
97 - elog "This interface has quite few known issues and does not report all"
98 - elog "issues and just refuses to print."
99 - elog "Please consider disabling usb useflag if you are having issues."
100 - elog
101 - elog "Please note that if you disable the usb useflag your device will be"
102 - elog "still working using kernel usblp interface instead of libusb."
103 - fi
104 }