Gentoo Archives: gentoo-commits

From: "Andreas HAttel (dilfridge)" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-print/cups: cups-9999.ebuild cups-1.6.1.ebuild ChangeLog
Date: Thu, 30 Aug 2012 21:38:06
Message-Id: 20120830213747.EA73020CD3@flycatcher.gentoo.org
1 dilfridge 12/08/30 21:37:47
2
3 Modified: cups-9999.ebuild cups-1.6.1.ebuild ChangeLog
4 Log:
5 Add warning about network browsing on update from 1.5 and earlier
6
7 (Portage version: 2.2.0_alpha123/cvs/Linux x86_64, RepoMan options: --force)
8
9 Revision Changes Path
10 1.17 net-print/cups/cups-9999.ebuild
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-9999.ebuild?rev=1.17&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-9999.ebuild?rev=1.17&content-type=text/plain
14 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-9999.ebuild?r1=1.16&r2=1.17
15
16 Index: cups-9999.ebuild
17 ===================================================================
18 RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v
19 retrieving revision 1.16
20 retrieving revision 1.17
21 diff -u -r1.16 -r1.17
22 --- cups-9999.ebuild 28 Jul 2012 15:34:31 -0000 1.16
23 +++ cups-9999.ebuild 30 Aug 2012 21:37:47 -0000 1.17
24 @@ -1,6 +1,6 @@
25 # Copyright 1999-2012 Gentoo Foundation
26 # Distributed under the terms of the GNU General Public License v2
27 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.16 2012/07/28 15:34:31 blueness Exp $
28 +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.17 2012/08/30 21:37:47 dilfridge Exp $
29
30 EAPI=4
31
32 @@ -273,6 +273,16 @@
33 elog "To (re-)enable it, edit /etc/cups/cupsd.conf and set \"Browsing On\", "
34 elog "afterwards re-start or reload cups."
35 echo
36 +
37 + # not slotted - at most one value
38 + if [[ "${REPLACING_VERSIONS}" ]] && [[ "${REPLACING_VERSIONS}" < "1.6" ]]; then
39 + echo
40 + elog "CUPS-1.6 no longer supports automatic remote printers or implicit classes"
41 + elog "via the CUPS, LDAP, or SLP protocols, i.e. \"network browsing\"."
42 + elog "You will have to find printers using zeroconf/avahi instead, or enter"
43 + elog "the location manually."
44 + echo
45 + fi
46 }
47
48 pkg_postrm() {
49
50
51
52 1.4 net-print/cups/cups-1.6.1.ebuild
53
54 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.6.1.ebuild?rev=1.4&view=markup
55 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.6.1.ebuild?rev=1.4&content-type=text/plain
56 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.6.1.ebuild?r1=1.3&r2=1.4
57
58 Index: cups-1.6.1.ebuild
59 ===================================================================
60 RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.1.ebuild,v
61 retrieving revision 1.3
62 retrieving revision 1.4
63 diff -u -r1.3 -r1.4
64 --- cups-1.6.1.ebuild 16 Aug 2012 17:07:16 -0000 1.3
65 +++ cups-1.6.1.ebuild 30 Aug 2012 21:37:47 -0000 1.4
66 @@ -1,6 +1,6 @@
67 # Copyright 1999-2012 Gentoo Foundation
68 # Distributed under the terms of the GNU General Public License v2
69 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.1.ebuild,v 1.3 2012/08/16 17:07:16 jer Exp $
70 +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.1.ebuild,v 1.4 2012/08/30 21:37:47 dilfridge Exp $
71
72 EAPI=4
73
74 @@ -273,6 +273,16 @@
75 elog "To (re-)enable it, edit /etc/cups/cupsd.conf and set \"Browsing On\", "
76 elog "afterwards re-start or reload cups."
77 echo
78 +
79 + # not slotted - at most one value
80 + if [[ "${REPLACING_VERSIONS}" ]] && [[ "${REPLACING_VERSIONS}" < "1.6" ]]; then
81 + echo
82 + elog "CUPS-1.6 no longer supports automatic remote printers or implicit classes"
83 + elog "via the CUPS, LDAP, or SLP protocols, i.e. \"network browsing\"."
84 + elog "You will have to find printers using zeroconf/avahi instead, or enter"
85 + elog "the location manually."
86 + echo
87 + fi
88 }
89
90 pkg_postrm() {
91
92
93
94 1.506 net-print/cups/ChangeLog
95
96 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.506&view=markup
97 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.506&content-type=text/plain
98 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?r1=1.505&r2=1.506
99
100 Index: ChangeLog
101 ===================================================================
102 RCS file: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v
103 retrieving revision 1.505
104 retrieving revision 1.506
105 diff -u -r1.505 -r1.506
106 --- ChangeLog 16 Aug 2012 17:07:16 -0000 1.505
107 +++ ChangeLog 30 Aug 2012 21:37:47 -0000 1.506
108 @@ -1,6 +1,10 @@
109 # ChangeLog for net-print/cups
110 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
111 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.505 2012/08/16 17:07:16 jer Exp $
112 +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.506 2012/08/30 21:37:47 dilfridge Exp $
113 +
114 + 30 Aug 2012; Andreas K. Huettel <dilfridge@g.o> cups-1.6.1.ebuild,
115 + cups-9999.ebuild:
116 + Add warning about network browsing on update from 1.5 and earlier
117
118 16 Aug 2012; Jeroen Roovers <jer@g.o> cups-1.6.1.ebuild:
119 Marked ~hppa (bug #428356).