1 |
commit: 5cf2b984b09cbe3351230224c3ac6d51537a3e96 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Feb 12 14:55:05 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Apr 20 12:58:45 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5cf2b984 |
7 |
|
8 |
net-print/cups: 2.3.3_p2 version bump |
9 |
|
10 |
Closes: https://bugs.gentoo.org/767778 |
11 |
Package-Manager: Portage-3.0.14, Repoman-3.0.2 |
12 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
13 |
|
14 |
net-print/cups/Manifest | 1 + |
15 |
.../{cups-9999.ebuild => cups-2.3.3_p2.ebuild} | 83 +++++++++------------- |
16 |
net-print/cups/cups-9999.ebuild | 80 +++++++++------------ |
17 |
3 files changed, 67 insertions(+), 97 deletions(-) |
18 |
|
19 |
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest |
20 |
index 9a7bb604d84..f26affcecc5 100644 |
21 |
--- a/net-print/cups/Manifest |
22 |
+++ b/net-print/cups/Manifest |
23 |
@@ -1 +1,2 @@ |
24 |
DIST cups-2.3.3-source.tar.gz 8140741 BLAKE2B 427e6ee3602aec33ac336d9b2c6c8eb270f2996371f0edd3d69e411b94b2e93fc58a0032ba9f6d048f2c58a1c6b48f742671b4011cd725b882adfcc06ed7fd8a SHA512 7d6f4a01794c5599cc71525778ea785fd17271c31ac146a56e8fc374a88f99e4035d018dae48e37e541455e9cc93b302e892b2e93ec558c1b4bfc46dad68c92d |
25 |
+DIST cups-2.3.3op2-source.tar.gz 7993205 BLAKE2B 8c115b91ec185a4820578561aaf681238280b22b5c68b68c484ffbd0fa3c4ec1beb4d426e3f0e33192e32bce78aa8b7f50ed6799732a467fa9e75c34787057ee SHA512 db27dd6fb616bd7ad895b2bdf4ea7b010501358a50dc8f2e7e29558d1cfc088a572b1b35ac512654d3ed410c84df87dc34ca636533a4499117253915d4763117 |
26 |
|
27 |
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-2.3.3_p2.ebuild |
28 |
similarity index 87% |
29 |
copy from net-print/cups/cups-9999.ebuild |
30 |
copy to net-print/cups/cups-2.3.3_p2.ebuild |
31 |
index 7fecb1e8f2e..67f0a9dd314 100644 |
32 |
--- a/net-print/cups/cups-9999.ebuild |
33 |
+++ b/net-print/cups/cups-2.3.3_p2.ebuild |
34 |
@@ -5,32 +5,41 @@ EAPI=7 |
35 |
|
36 |
inherit autotools flag-o-matic linux-info xdg multilib-minimal pam systemd toolchain-funcs |
37 |
|
38 |
-MY_PV="${PV/_rc/rc}" |
39 |
-MY_PV="${MY_PV/_beta/b}" |
40 |
+MY_PV="${PV/_beta/b}" |
41 |
+MY_PV="${MY_PV/_rc/rc}" |
42 |
+MY_PV="${MY_PV/_p/op}" |
43 |
MY_P="${PN}-${MY_PV}" |
44 |
|
45 |
if [[ ${PV} == *9999 ]]; then |
46 |
inherit git-r3 |
47 |
- EGIT_REPO_URI="https://github.com/apple/cups.git" |
48 |
- if [[ ${PV} != 9999 ]]; then |
49 |
- EGIT_BRANCH=branch-${PV/.9999} |
50 |
- fi |
51 |
+# EGIT_REPO_URI="https://github.com/apple/cups.git" |
52 |
+ EGIT_REPO_URI="https://github.com/OpenPrinting/cups.git" |
53 |
+ [[ ${PV} != 9999 ]] && EGIT_BRANCH=branch-${PV/.9999} |
54 |
else |
55 |
- #SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
56 |
- SRC_URI="https://github.com/apple/cups/releases/download/v${MY_PV}/${MY_P}-source.tar.gz" |
57 |
+# SRC_URI="https://github.com/apple/cups/releases/download/v${MY_PV}/${MY_P}-source.tar.gz" |
58 |
+ SRC_URI="https://github.com/OpenPrinting/cups/releases/download/v${MY_PV}/cups-${MY_PV}-source.tar.gz" |
59 |
if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *_rc* ]] ; then |
60 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" |
61 |
fi |
62 |
fi |
63 |
|
64 |
DESCRIPTION="The Common Unix Printing System" |
65 |
-HOMEPAGE="https://www.cups.org/" |
66 |
+HOMEPAGE="https://www.cups.org/ https://github.com/OpenPrinting/cups" |
67 |
|
68 |
LICENSE="Apache-2.0" |
69 |
SLOT="0" |
70 |
IUSE="acl dbus debug kerberos lprng-compat pam selinux +ssl static-libs systemd +threads usb X xinetd zeroconf" |
71 |
|
72 |
-CDEPEND=" |
73 |
+REQUIRED_USE="usb? ( threads )" |
74 |
+# upstream includes an interactive test which is a nono for gentoo |
75 |
+RESTRICT="test" |
76 |
+ |
77 |
+BDEPEND=" |
78 |
+ acct-group/lp |
79 |
+ acct-group/lpadmin |
80 |
+ virtual/pkgconfig |
81 |
+" |
82 |
+DEPEND=" |
83 |
app-text/libpaper |
84 |
sys-libs/zlib |
85 |
acl? ( |
86 |
@@ -50,35 +59,17 @@ CDEPEND=" |
87 |
xinetd? ( sys-apps/xinetd ) |
88 |
zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] ) |
89 |
" |
90 |
- |
91 |
-DEPEND="${CDEPEND}" |
92 |
-BDEPEND=" |
93 |
- acct-group/lp |
94 |
- acct-group/lpadmin |
95 |
- virtual/pkgconfig |
96 |
-" |
97 |
- |
98 |
-RDEPEND="${CDEPEND} |
99 |
+RDEPEND="${DEPEND} |
100 |
acct-group/lp |
101 |
acct-group/lpadmin |
102 |
selinux? ( sec-policy/selinux-cups ) |
103 |
" |
104 |
- |
105 |
PDEPEND=">=net-print/cups-filters-1.0.43" |
106 |
|
107 |
-REQUIRED_USE=" |
108 |
- usb? ( threads ) |
109 |
-" |
110 |
- |
111 |
-# upstream includes an interactive test which is a nono for gentoo |
112 |
-RESTRICT="test" |
113 |
- |
114 |
-# systemd-socket.patch from Fedora |
115 |
PATCHES=( |
116 |
"${FILESDIR}/${PN}-2.2.6-fix-install-perms.patch" |
117 |
"${FILESDIR}/${PN}-1.4.4-nostrip.patch" |
118 |
- "${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch" |
119 |
- "${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch" |
120 |
+ "${FILESDIR}/${PN}-2.3.3-user-AR.patch" |
121 |
) |
122 |
|
123 |
MULTILIB_CHOST_TOOLS=( |
124 |
@@ -129,10 +120,10 @@ src_prepare() { |
125 |
default |
126 |
|
127 |
# Remove ".SILENT" rule for verbose output (bug 524338). |
128 |
- sed 's#^.SILENT:##g' -i "${S}"/Makedefs.in || die "sed failed" |
129 |
+ sed 's#^.SILENT:##g' -i Makedefs.in || die |
130 |
|
131 |
# Fix install-sh, posix sh does not have 'function'. |
132 |
- sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh" |
133 |
+ sed 's#function gzipcp#gzipcp()#g' -i install-sh || die |
134 |
|
135 |
# Do not add -Werror even for live ebuilds |
136 |
sed '/WARNING_OPTIONS/s@-Werror@@' \ |
137 |
@@ -234,10 +225,10 @@ multilib_src_install_all() { |
138 |
|
139 |
# move the default config file to docs |
140 |
dodoc "${ED}"/etc/cups/cupsd.conf.default |
141 |
- rm -f "${ED}"/etc/cups/cupsd.conf.default |
142 |
+ rm "${ED}"/etc/cups/cupsd.conf.default || die |
143 |
|
144 |
# clean out cups init scripts |
145 |
- rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups} |
146 |
+ rm -r "${ED}"/etc/{init.d/cups,rc*,pam.d/cups} || die |
147 |
|
148 |
# install our init script |
149 |
local neededservices=( |
150 |
@@ -246,9 +237,7 @@ multilib_src_install_all() { |
151 |
) |
152 |
[[ -n ${neededservices[@]} ]] && neededservices="need ${neededservices[@]}" |
153 |
cp "${FILESDIR}"/cupsd.init.d-r3 "${T}"/cupsd || die |
154 |
- sed -i \ |
155 |
- -e "s/@neededservices@/${neededservices}/" \ |
156 |
- "${T}"/cupsd || die |
157 |
+ sed -i -e "s/@neededservices@/${neededservices}/" "${T}"/cupsd || die |
158 |
doinitd "${T}"/cupsd |
159 |
|
160 |
if use pam; then |
161 |
@@ -257,8 +246,7 @@ multilib_src_install_all() { |
162 |
|
163 |
if use xinetd ; then |
164 |
# correct path |
165 |
- sed -i \ |
166 |
- -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \ |
167 |
+ sed -i -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \ |
168 |
"${ED}"/etc/xinetd.d/cups-lpd || die |
169 |
# it is safer to disable this by default, bug #137130 |
170 |
grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \ |
171 |
@@ -268,11 +256,11 @@ multilib_src_install_all() { |
172 |
else |
173 |
# always configure with --with-xinetd= and clean up later, |
174 |
# bug #525604 |
175 |
- rm -rf "${ED}"/etc/xinetd.d |
176 |
+ rm -r "${ED}"/etc/xinetd.d || die |
177 |
fi |
178 |
|
179 |
keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \ |
180 |
- /var/log/cups /var/spool/cups/tmp |
181 |
+ /var/cache/cups /var/log/cups /var/spool/cups/tmp |
182 |
|
183 |
keepdir /etc/cups/{interfaces,ppd,ssl} |
184 |
|
185 |
@@ -292,10 +280,10 @@ multilib_src_install_all() { |
186 |
|
187 |
# for the special case of running lprng and cups together, bug 467226 |
188 |
if use lprng-compat ; then |
189 |
- rm -fv "${ED}"/usr/bin/{lp*,cancel} |
190 |
- rm -fv "${ED}"/usr/sbin/lp* |
191 |
- rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*} |
192 |
- rm -fv "${ED}"/usr/share/man/man8/lp* |
193 |
+ rm -v "${ED}"/usr/bin/{lp*,cancel} || die |
194 |
+ rm -v "${ED}"/usr/sbin/lp* || die |
195 |
+ rm -v "${ED}"/usr/share/man/man1/{lp*,cancel*} || die |
196 |
+ rm -v "${ED}"/usr/share/man/man8/lp* || die |
197 |
ewarn "Not installing lp... binaries, since the lprng-compat useflag is set." |
198 |
ewarn "Unless you plan to install an exotic server setup, you most likely" |
199 |
ewarn "do not want this. Disable the useflag then and all will be fine." |
200 |
@@ -314,20 +302,17 @@ pkg_postinst() { |
201 |
|
202 |
for v in ${REPLACING_VERSIONS}; do |
203 |
if ! ver_test ${v} -ge 2.2.2-r2 ; then |
204 |
- echo |
205 |
ewarn "The cupsd init script switched to using pidfiles. Shutting down" |
206 |
ewarn "cupsd will fail the next time. To fix this, please run once as root" |
207 |
ewarn " killall cupsd ; /etc/init.d/cupsd zap ; /etc/init.d/cupsd start" |
208 |
- echo |
209 |
break |
210 |
fi |
211 |
done |
212 |
|
213 |
for v in ${REPLACING_VERSIONS}; do |
214 |
- echo |
215 |
+ elog |
216 |
elog "For information about installing a printer and general cups setup" |
217 |
elog "take a look at: https://wiki.gentoo.org/wiki/Printing" |
218 |
- echo |
219 |
break |
220 |
done |
221 |
} |
222 |
|
223 |
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild |
224 |
index 7fecb1e8f2e..c221987cdd5 100644 |
225 |
--- a/net-print/cups/cups-9999.ebuild |
226 |
+++ b/net-print/cups/cups-9999.ebuild |
227 |
@@ -5,32 +5,41 @@ EAPI=7 |
228 |
|
229 |
inherit autotools flag-o-matic linux-info xdg multilib-minimal pam systemd toolchain-funcs |
230 |
|
231 |
-MY_PV="${PV/_rc/rc}" |
232 |
-MY_PV="${MY_PV/_beta/b}" |
233 |
+MY_PV="${PV/_beta/b}" |
234 |
+MY_PV="${MY_PV/_rc/rc}" |
235 |
+MY_PV="${MY_PV/_p/op}" |
236 |
MY_P="${PN}-${MY_PV}" |
237 |
|
238 |
if [[ ${PV} == *9999 ]]; then |
239 |
inherit git-r3 |
240 |
- EGIT_REPO_URI="https://github.com/apple/cups.git" |
241 |
- if [[ ${PV} != 9999 ]]; then |
242 |
- EGIT_BRANCH=branch-${PV/.9999} |
243 |
- fi |
244 |
+# EGIT_REPO_URI="https://github.com/apple/cups.git" |
245 |
+ EGIT_REPO_URI="https://github.com/OpenPrinting/cups.git" |
246 |
+ [[ ${PV} != 9999 ]] && EGIT_BRANCH=branch-${PV/.9999} |
247 |
else |
248 |
- #SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
249 |
- SRC_URI="https://github.com/apple/cups/releases/download/v${MY_PV}/${MY_P}-source.tar.gz" |
250 |
+# SRC_URI="https://github.com/apple/cups/releases/download/v${MY_PV}/${MY_P}-source.tar.gz" |
251 |
+ SRC_URI="https://github.com/OpenPrinting/cups/releases/download/v${MY_PV}/cups-${MY_PV}-source.tar.gz" |
252 |
if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *_rc* ]] ; then |
253 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86" |
254 |
fi |
255 |
fi |
256 |
|
257 |
DESCRIPTION="The Common Unix Printing System" |
258 |
-HOMEPAGE="https://www.cups.org/" |
259 |
+HOMEPAGE="https://www.cups.org/ https://github.com/OpenPrinting/cups" |
260 |
|
261 |
LICENSE="Apache-2.0" |
262 |
SLOT="0" |
263 |
IUSE="acl dbus debug kerberos lprng-compat pam selinux +ssl static-libs systemd +threads usb X xinetd zeroconf" |
264 |
|
265 |
-CDEPEND=" |
266 |
+REQUIRED_USE="usb? ( threads )" |
267 |
+# upstream includes an interactive test which is a nono for gentoo |
268 |
+RESTRICT="test" |
269 |
+ |
270 |
+BDEPEND=" |
271 |
+ acct-group/lp |
272 |
+ acct-group/lpadmin |
273 |
+ virtual/pkgconfig |
274 |
+" |
275 |
+DEPEND=" |
276 |
app-text/libpaper |
277 |
sys-libs/zlib |
278 |
acl? ( |
279 |
@@ -50,35 +59,16 @@ CDEPEND=" |
280 |
xinetd? ( sys-apps/xinetd ) |
281 |
zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] ) |
282 |
" |
283 |
- |
284 |
-DEPEND="${CDEPEND}" |
285 |
-BDEPEND=" |
286 |
- acct-group/lp |
287 |
- acct-group/lpadmin |
288 |
- virtual/pkgconfig |
289 |
-" |
290 |
- |
291 |
-RDEPEND="${CDEPEND} |
292 |
+RDEPEND="${DEPEND} |
293 |
acct-group/lp |
294 |
acct-group/lpadmin |
295 |
selinux? ( sec-policy/selinux-cups ) |
296 |
" |
297 |
- |
298 |
PDEPEND=">=net-print/cups-filters-1.0.43" |
299 |
|
300 |
-REQUIRED_USE=" |
301 |
- usb? ( threads ) |
302 |
-" |
303 |
- |
304 |
-# upstream includes an interactive test which is a nono for gentoo |
305 |
-RESTRICT="test" |
306 |
- |
307 |
-# systemd-socket.patch from Fedora |
308 |
PATCHES=( |
309 |
"${FILESDIR}/${PN}-2.2.6-fix-install-perms.patch" |
310 |
"${FILESDIR}/${PN}-1.4.4-nostrip.patch" |
311 |
- "${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch" |
312 |
- "${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch" |
313 |
) |
314 |
|
315 |
MULTILIB_CHOST_TOOLS=( |
316 |
@@ -129,10 +119,10 @@ src_prepare() { |
317 |
default |
318 |
|
319 |
# Remove ".SILENT" rule for verbose output (bug 524338). |
320 |
- sed 's#^.SILENT:##g' -i "${S}"/Makedefs.in || die "sed failed" |
321 |
+ sed 's#^.SILENT:##g' -i Makedefs.in || die |
322 |
|
323 |
# Fix install-sh, posix sh does not have 'function'. |
324 |
- sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh" |
325 |
+ sed 's#function gzipcp#gzipcp()#g' -i install-sh || die |
326 |
|
327 |
# Do not add -Werror even for live ebuilds |
328 |
sed '/WARNING_OPTIONS/s@-Werror@@' \ |
329 |
@@ -234,10 +224,10 @@ multilib_src_install_all() { |
330 |
|
331 |
# move the default config file to docs |
332 |
dodoc "${ED}"/etc/cups/cupsd.conf.default |
333 |
- rm -f "${ED}"/etc/cups/cupsd.conf.default |
334 |
+ rm "${ED}"/etc/cups/cupsd.conf.default || die |
335 |
|
336 |
# clean out cups init scripts |
337 |
- rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups} |
338 |
+ rm -r "${ED}"/etc/{init.d/cups,rc*,pam.d/cups} || die |
339 |
|
340 |
# install our init script |
341 |
local neededservices=( |
342 |
@@ -246,9 +236,7 @@ multilib_src_install_all() { |
343 |
) |
344 |
[[ -n ${neededservices[@]} ]] && neededservices="need ${neededservices[@]}" |
345 |
cp "${FILESDIR}"/cupsd.init.d-r3 "${T}"/cupsd || die |
346 |
- sed -i \ |
347 |
- -e "s/@neededservices@/${neededservices}/" \ |
348 |
- "${T}"/cupsd || die |
349 |
+ sed -i -e "s/@neededservices@/${neededservices}/" "${T}"/cupsd || die |
350 |
doinitd "${T}"/cupsd |
351 |
|
352 |
if use pam; then |
353 |
@@ -257,8 +245,7 @@ multilib_src_install_all() { |
354 |
|
355 |
if use xinetd ; then |
356 |
# correct path |
357 |
- sed -i \ |
358 |
- -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \ |
359 |
+ sed -i -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \ |
360 |
"${ED}"/etc/xinetd.d/cups-lpd || die |
361 |
# it is safer to disable this by default, bug #137130 |
362 |
grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \ |
363 |
@@ -268,7 +255,7 @@ multilib_src_install_all() { |
364 |
else |
365 |
# always configure with --with-xinetd= and clean up later, |
366 |
# bug #525604 |
367 |
- rm -rf "${ED}"/etc/xinetd.d |
368 |
+ rm -r "${ED}"/etc/xinetd.d || die |
369 |
fi |
370 |
|
371 |
keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \ |
372 |
@@ -292,10 +279,10 @@ multilib_src_install_all() { |
373 |
|
374 |
# for the special case of running lprng and cups together, bug 467226 |
375 |
if use lprng-compat ; then |
376 |
- rm -fv "${ED}"/usr/bin/{lp*,cancel} |
377 |
- rm -fv "${ED}"/usr/sbin/lp* |
378 |
- rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*} |
379 |
- rm -fv "${ED}"/usr/share/man/man8/lp* |
380 |
+ rm -v "${ED}"/usr/bin/{lp*,cancel} || die |
381 |
+ rm -v "${ED}"/usr/sbin/lp* || die |
382 |
+ rm -v "${ED}"/usr/share/man/man1/{lp*,cancel*} || die |
383 |
+ rm -v "${ED}"/usr/share/man/man8/lp* || die |
384 |
ewarn "Not installing lp... binaries, since the lprng-compat useflag is set." |
385 |
ewarn "Unless you plan to install an exotic server setup, you most likely" |
386 |
ewarn "do not want this. Disable the useflag then and all will be fine." |
387 |
@@ -314,20 +301,17 @@ pkg_postinst() { |
388 |
|
389 |
for v in ${REPLACING_VERSIONS}; do |
390 |
if ! ver_test ${v} -ge 2.2.2-r2 ; then |
391 |
- echo |
392 |
ewarn "The cupsd init script switched to using pidfiles. Shutting down" |
393 |
ewarn "cupsd will fail the next time. To fix this, please run once as root" |
394 |
ewarn " killall cupsd ; /etc/init.d/cupsd zap ; /etc/init.d/cupsd start" |
395 |
- echo |
396 |
break |
397 |
fi |
398 |
done |
399 |
|
400 |
for v in ${REPLACING_VERSIONS}; do |
401 |
- echo |
402 |
+ elog |
403 |
elog "For information about installing a printer and general cups setup" |
404 |
elog "take a look at: https://wiki.gentoo.org/wiki/Printing" |
405 |
- echo |
406 |
break |
407 |
done |
408 |
} |