Gentoo Archives: gentoo-commits

From: "Zac Medico (zmedico)" <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-print/cups: cups-1.4.8-r1.ebuild cups-1.5.2-r4.ebuild cups-1.4.8-r23.ebuild cups-9999.ebuild cups-1.5.2-r21.ebuild ChangeLog
Date: Fri, 01 Jun 2012 04:20:07
Message-Id: 20120601041952.0D79B2004B@flycatcher.gentoo.org
1 zmedico 12/06/01 04:19:52
2
3 Modified: cups-1.4.8-r1.ebuild cups-1.5.2-r4.ebuild
4 cups-1.4.8-r23.ebuild cups-9999.ebuild
5 cups-1.5.2-r21.ebuild ChangeLog
6 Log:
7 inherit user for enewgroup and enewuser, and eliminate duplication in inherit lines
8
9 (Portage version: 2.2.0_alpha108_p12/cvs/Linux i686)
10
11 Revision Changes Path
12 1.13 net-print/cups/cups-1.4.8-r1.ebuild
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.4.8-r1.ebuild?rev=1.13&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.4.8-r1.ebuild?rev=1.13&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.4.8-r1.ebuild?r1=1.12&r2=1.13
17
18 Index: cups-1.4.8-r1.ebuild
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.8-r1.ebuild,v
21 retrieving revision 1.12
22 retrieving revision 1.13
23 diff -u -r1.12 -r1.13
24 --- cups-1.4.8-r1.ebuild 3 May 2012 07:22:30 -0000 1.12
25 +++ cups-1.4.8-r1.ebuild 1 Jun 2012 04:19:51 -0000 1.13
26 @@ -1,12 +1,12 @@
27 # Copyright 1999-2012 Gentoo Foundation
28 # Distributed under the terms of the GNU General Public License v2
29 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.8-r1.ebuild,v 1.12 2012/05/03 07:22:30 jdhore Exp $
30 +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.8-r1.ebuild,v 1.13 2012/06/01 04:19:51 zmedico Exp $
31
32 EAPI=3
33
34 PYTHON_DEPEND="python? 2:2.5"
35
36 -inherit autotools eutils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2
37 +inherit autotools eutils flag-o-matic linux-info multilib pam perl-module python versionator user java-pkg-opt-2
38
39 MY_P=${P/_}
40
41
42
43
44 1.13 net-print/cups/cups-1.5.2-r4.ebuild
45
46 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.5.2-r4.ebuild?rev=1.13&view=markup
47 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.5.2-r4.ebuild?rev=1.13&content-type=text/plain
48 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.5.2-r4.ebuild?r1=1.12&r2=1.13
49
50 Index: cups-1.5.2-r4.ebuild
51 ===================================================================
52 RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r4.ebuild,v
53 retrieving revision 1.12
54 retrieving revision 1.13
55 diff -u -r1.12 -r1.13
56 --- cups-1.5.2-r4.ebuild 24 May 2012 21:37:03 -0000 1.12
57 +++ cups-1.5.2-r4.ebuild 1 Jun 2012 04:19:51 -0000 1.13
58 @@ -1,12 +1,12 @@
59 # Copyright 1999-2012 Gentoo Foundation
60 # Distributed under the terms of the GNU General Public License v2
61 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r4.ebuild,v 1.12 2012/05/24 21:37:03 johu Exp $
62 +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r4.ebuild,v 1.13 2012/06/01 04:19:51 zmedico Exp $
63
64 EAPI=4
65
66 PYTHON_DEPEND="python? 2:2.5"
67
68 -inherit autotools eutils fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2
69 +inherit autotools eutils fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python user versionator java-pkg-opt-2
70
71 MY_P=${P/_}
72 MY_PV=${PV/_}
73
74
75
76 1.7 net-print/cups/cups-1.4.8-r23.ebuild
77
78 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.4.8-r23.ebuild?rev=1.7&view=markup
79 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.4.8-r23.ebuild?rev=1.7&content-type=text/plain
80 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.4.8-r23.ebuild?r1=1.6&r2=1.7
81
82 Index: cups-1.4.8-r23.ebuild
83 ===================================================================
84 RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.8-r23.ebuild,v
85 retrieving revision 1.6
86 retrieving revision 1.7
87 diff -u -r1.6 -r1.7
88 --- cups-1.4.8-r23.ebuild 3 May 2012 07:22:30 -0000 1.6
89 +++ cups-1.4.8-r23.ebuild 1 Jun 2012 04:19:51 -0000 1.7
90 @@ -1,12 +1,12 @@
91 # Copyright 1999-2012 Gentoo Foundation
92 # Distributed under the terms of the GNU General Public License v2
93 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.8-r23.ebuild,v 1.6 2012/05/03 07:22:30 jdhore Exp $
94 +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.8-r23.ebuild,v 1.7 2012/06/01 04:19:51 zmedico Exp $
95
96 EAPI=3
97
98 PYTHON_DEPEND="python? 2:2.5"
99
100 -inherit autotools eutils fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2
101 +inherit autotools eutils fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python user versionator java-pkg-opt-2
102
103 MY_P=${P/_}
104
105
106
107
108 1.7 net-print/cups/cups-9999.ebuild
109
110 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-9999.ebuild?rev=1.7&view=markup
111 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-9999.ebuild?rev=1.7&content-type=text/plain
112 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-9999.ebuild?r1=1.6&r2=1.7
113
114 Index: cups-9999.ebuild
115 ===================================================================
116 RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v
117 retrieving revision 1.6
118 retrieving revision 1.7
119 diff -u -r1.6 -r1.7
120 --- cups-9999.ebuild 21 May 2012 22:25:01 -0000 1.6
121 +++ cups-9999.ebuild 1 Jun 2012 04:19:51 -0000 1.7
122 @@ -1,20 +1,21 @@
123 # Copyright 1999-2012 Gentoo Foundation
124 # Distributed under the terms of the GNU General Public License v2
125 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.6 2012/05/21 22:25:01 dilfridge Exp $
126 +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.7 2012/06/01 04:19:51 zmedico Exp $
127
128 EAPI=4
129
130 PYTHON_DEPEND="python? 2:2.5"
131
132 +inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam python user versionator java-pkg-opt-2 systemd
133 +
134 MY_P=${P/_}
135 MY_PV=${PV/_}
136
137 if [[ "${PV}" != "9999" ]]; then
138 - inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam python versionator java-pkg-opt-2 systemd
139 SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2"
140 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86"
141 else
142 - inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam python versionator java-pkg-opt-2 systemd subversion
143 + inherit subversion
144 ESVN_REPO_URI="http://svn.easysw.com/public/cups/trunk"
145 KEYWORDS=""
146 fi
147
148
149
150 1.5 net-print/cups/cups-1.5.2-r21.ebuild
151
152 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.5.2-r21.ebuild?rev=1.5&view=markup
153 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.5.2-r21.ebuild?rev=1.5&content-type=text/plain
154 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.5.2-r21.ebuild?r1=1.4&r2=1.5
155
156 Index: cups-1.5.2-r21.ebuild
157 ===================================================================
158 RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r21.ebuild,v
159 retrieving revision 1.4
160 retrieving revision 1.5
161 diff -u -r1.4 -r1.5
162 --- cups-1.5.2-r21.ebuild 21 May 2012 22:25:01 -0000 1.4
163 +++ cups-1.5.2-r21.ebuild 1 Jun 2012 04:19:51 -0000 1.5
164 @@ -1,16 +1,17 @@
165 # Copyright 1999-2012 Gentoo Foundation
166 # Distributed under the terms of the GNU General Public License v2
167 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r21.ebuild,v 1.4 2012/05/21 22:25:01 dilfridge Exp $
168 +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.2-r21.ebuild,v 1.5 2012/06/01 04:19:51 zmedico Exp $
169
170 EAPI=4
171
172 PYTHON_DEPEND="python? 2:2.5"
173
174 +inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python user versionator java-pkg-opt-2 systemd
175 +
176 MY_P=${P/_}
177 MY_PV=${PV/_}
178
179 if [[ "${PV}" != "9999" ]]; then
180 - inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2 systemd
181 SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2
182 http://dev.gentoo.org/~dilfridge/distfiles/${P}-ipp-r8950.patch.bz2
183 http://dev.gentoo.org/~dilfridge/distfiles/${P}-avahi.patch.bz2
184 @@ -18,7 +19,7 @@
185 "
186 KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86 ~amd64-fbsd"
187 else
188 - inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python versionator java-pkg-opt-2 systemd subversion
189 + inherit subversion
190 ESVN_REPO_URI="http://svn.easysw.com/public/cups/trunk"
191 KEYWORDS=""
192 fi
193
194
195
196 1.485 net-print/cups/ChangeLog
197
198 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.485&view=markup
199 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.485&content-type=text/plain
200 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?r1=1.484&r2=1.485
201
202 Index: ChangeLog
203 ===================================================================
204 RCS file: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v
205 retrieving revision 1.484
206 retrieving revision 1.485
207 diff -u -r1.484 -r1.485
208 --- ChangeLog 24 May 2012 21:37:03 -0000 1.484
209 +++ ChangeLog 1 Jun 2012 04:19:51 -0000 1.485
210 @@ -1,6 +1,12 @@
211 # ChangeLog for net-print/cups
212 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
213 -# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.484 2012/05/24 21:37:03 johu Exp $
214 +# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.485 2012/06/01 04:19:51 zmedico Exp $
215 +
216 + 01 Jun 2012; Zac Medico <zmedico@g.o> cups-1.4.8-r1.ebuild,
217 + cups-1.4.8-r23.ebuild, cups-1.5.2-r21.ebuild, cups-1.5.2-r4.ebuild,
218 + cups-9999.ebuild:
219 + inherit user for enewgroup and enewuser, and eliminate duplication in inherit
220 + lines
221
222 24 May 2012; Johannes Huber <johu@g.o> cups-1.5.2-r4.ebuild:
223 Stable for x86, wrt bug #411887