1 |
commit: 22db82bdc2c2c3fe25d7f4ba2c8cccf0bc60e378 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Wed Mar 28 07:40:46 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Wed Mar 28 07:42:13 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22db82bd |
7 |
|
8 |
net-print/cups: Removed old. |
9 |
|
10 |
Package-Manager: Portage-2.3.24, Repoman-2.3.6 |
11 |
|
12 |
net-print/cups/Manifest | 1 - |
13 |
net-print/cups/cups-2.2.4.ebuild | 343 --------------------- |
14 |
.../cups/files/cups-2.2.4-fix-install-perms.patch | 18 -- |
15 |
3 files changed, 362 deletions(-) |
16 |
|
17 |
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest |
18 |
index d315b7bf4f3..f7af1802a7a 100644 |
19 |
--- a/net-print/cups/Manifest |
20 |
+++ b/net-print/cups/Manifest |
21 |
@@ -1,4 +1,3 @@ |
22 |
DIST cups-2.1.4.tar.gz 9572653 BLAKE2B d01242e8188f8b179e2beebc3730cc32588c4512e56e76be740f6a3e63411f277a6e9b241b27cfa12d3b26743ad9ef6e85f70f66e19d4f4c70593707b1bbaec1 SHA512 5f36d21e1e094323f1811229b452f096f3f0b264757b3c3b1742bbd7ea0059e34d3cd2fbf3b6856d25a04ae1779babafa6d598a8ba249448fce3bf7cafa59aae |
23 |
-DIST cups-2.2.4.tar.gz 9984903 BLAKE2B c605c4c9a6b7ae8be5b33392980f18c95bd22e83e2b6707de59accb4b7649c92ca7bc46c747253096e22d07dd8e54c970b787c35fa235bb89d7f5179aadf1474 SHA512 765fe49d1a7a491d7d5db051f73d039d183d0f7a560e9fd89f6732b8a699d3246080e1aaed4ddfed3a9fbdb876b09aa22939d6ee5da2280b1246e4ba933c55f0 |
24 |
DIST cups-2.2.6.tar.gz 10317889 BLAKE2B 5d9d8a09e73074a8638913c30e163cbed6bbadc4fa0c6b24dd185a2137f3af72aba553b3de62dbf053f9f92f7737efdb5d06e27bfb84225f39d855d830aea02e SHA512 ae880aa3f675e0c1ad269200d06be3c25675a45a697c7a8b44e6ec0c30f05f333acca35cd965e667ff066d753df5e59447c2eeaea240e72d2731690b3b9dcf76 |
25 |
DIST cups-2.2.7-source.tar.gz 10330296 BLAKE2B 015a64758ee8d2559f4259ff36bf702b93dc695a44e2170d4ecf71b80d5691b4d947decf0a84ff9433b43c6d47dc350a8769d1e230ceda276c13add67e5e8a20 SHA512 780a6a484f38967ff678456ec7b532aa8445a9562663e4e4f6f7a24aac6ec9e8eae36459ee3c025dff053d59ad1d9ecfb823e8a832bae9d384db3d1a10d8860e |
26 |
|
27 |
diff --git a/net-print/cups/cups-2.2.4.ebuild b/net-print/cups/cups-2.2.4.ebuild |
28 |
deleted file mode 100644 |
29 |
index 012595d890a..00000000000 |
30 |
--- a/net-print/cups/cups-2.2.4.ebuild |
31 |
+++ /dev/null |
32 |
@@ -1,343 +0,0 @@ |
33 |
-# Copyright 1999-2018 Gentoo Foundation |
34 |
-# Distributed under the terms of the GNU General Public License v2 |
35 |
- |
36 |
-EAPI=6 |
37 |
- |
38 |
-PYTHON_COMPAT=( python2_7 ) |
39 |
- |
40 |
-inherit autotools gnome2-utils flag-o-matic linux-info xdg-utils \ |
41 |
- multilib multilib-minimal pam python-single-r1 user versionator \ |
42 |
- java-pkg-opt-2 systemd toolchain-funcs |
43 |
- |
44 |
-MY_P=${P/_rc/rc} |
45 |
-MY_P=${MY_P/_beta/b} |
46 |
-MY_PV=${PV/_rc/rc} |
47 |
-MY_PV=${MY_PV/_beta/b} |
48 |
- |
49 |
-if [[ ${PV} == *9999 ]]; then |
50 |
- inherit git-r3 |
51 |
- EGIT_REPO_URI="https://github.com/apple/cups.git" |
52 |
- if [[ ${PV} != 9999 ]]; then |
53 |
- EGIT_BRANCH=branch-${PV/.9999} |
54 |
- fi |
55 |
-else |
56 |
- SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz" |
57 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~m68k-mint" |
58 |
-fi |
59 |
- |
60 |
-DESCRIPTION="The Common Unix Printing System" |
61 |
-HOMEPAGE="https://www.cups.org/" |
62 |
- |
63 |
-LICENSE="GPL-2" |
64 |
-SLOT="0" |
65 |
-IUSE="acl dbus debug java kerberos lprng-compat pam |
66 |
- python selinux +ssl static-libs systemd +threads usb X xinetd zeroconf" |
67 |
- |
68 |
-CDEPEND=" |
69 |
- app-text/libpaper |
70 |
- sys-libs/zlib |
71 |
- acl? ( |
72 |
- kernel_linux? ( |
73 |
- sys-apps/acl |
74 |
- sys-apps/attr |
75 |
- ) |
76 |
- ) |
77 |
- dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] ) |
78 |
- java? ( >=virtual/jre-1.6:* ) |
79 |
- kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] ) |
80 |
- !lprng-compat? ( !net-print/lprng ) |
81 |
- pam? ( virtual/pam ) |
82 |
- python? ( ${PYTHON_DEPS} ) |
83 |
- ssl? ( |
84 |
- >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] |
85 |
- ) |
86 |
- systemd? ( sys-apps/systemd ) |
87 |
- usb? ( virtual/libusb:1 ) |
88 |
- X? ( x11-misc/xdg-utils ) |
89 |
- xinetd? ( sys-apps/xinetd ) |
90 |
- zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] ) |
91 |
- abi_x86_32? ( |
92 |
- !<=app-emulation/emul-linux-x86-baselibs-20140508 |
93 |
- !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)] |
94 |
- ) |
95 |
-" |
96 |
- |
97 |
-DEPEND="${CDEPEND} |
98 |
- >=virtual/pkgconfig-0-r1[${MULTILIB_USEDEP}] |
99 |
-" |
100 |
- |
101 |
-RDEPEND="${CDEPEND} |
102 |
- selinux? ( sec-policy/selinux-cups ) |
103 |
-" |
104 |
- |
105 |
-PDEPEND=">=net-print/cups-filters-1.0.43" |
106 |
- |
107 |
-REQUIRED_USE=" |
108 |
- python? ( ${PYTHON_REQUIRED_USE} ) |
109 |
- usb? ( threads ) |
110 |
-" |
111 |
- |
112 |
-# upstream includes an interactive test which is a nono for gentoo |
113 |
-RESTRICT="test" |
114 |
- |
115 |
-# systemd-socket.patch from Fedora |
116 |
-PATCHES=( |
117 |
- "${FILESDIR}/${PN}-2.2.0-dont-compress-manpages.patch" |
118 |
- "${FILESDIR}/${PN}-2.2.4-fix-install-perms.patch" |
119 |
- "${FILESDIR}/${PN}-1.4.4-nostrip.patch" |
120 |
- "${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch" |
121 |
- "${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch" |
122 |
-) |
123 |
- |
124 |
-MULTILIB_CHOST_TOOLS=( |
125 |
- /usr/bin/cups-config |
126 |
-) |
127 |
- |
128 |
-pkg_setup() { |
129 |
- enewgroup lp |
130 |
- enewuser lp -1 -1 -1 lp |
131 |
- enewgroup lpadmin 106 |
132 |
- |
133 |
- use python && python-single-r1_pkg_setup |
134 |
- |
135 |
- if use kernel_linux; then |
136 |
- linux-info_pkg_setup |
137 |
- if ! linux_config_exists; then |
138 |
- ewarn "Can't check the linux kernel configuration." |
139 |
- ewarn "You might have some incompatible options enabled." |
140 |
- else |
141 |
- # recheck that we don't have usblp to collide with libusb; this should now work in most cases (bug 501122) |
142 |
- if use usb; then |
143 |
- if linux_chkconfig_present USB_PRINTER; then |
144 |
- elog "Your USB printers will be managed via libusb. In case you run into problems, " |
145 |
- elog "please try disabling USB_PRINTER support in your kernel or blacklisting the" |
146 |
- elog "usblp kernel module." |
147 |
- elog "Alternatively, just disable the usb useflag for cups (your printer will still work)." |
148 |
- fi |
149 |
- else |
150 |
- #here we should warn user that he should enable it so he can print |
151 |
- if ! linux_chkconfig_present USB_PRINTER; then |
152 |
- ewarn "If you plan to use USB printers you should enable the USB_PRINTER" |
153 |
- ewarn "support in your kernel." |
154 |
- ewarn "Please enable it:" |
155 |
- ewarn " CONFIG_USB_PRINTER=y" |
156 |
- ewarn "in /usr/src/linux/.config or" |
157 |
- ewarn " Device Drivers --->" |
158 |
- ewarn " USB support --->" |
159 |
- ewarn " [*] USB Printer support" |
160 |
- ewarn "Alternatively, enable the usb useflag for cups and use the libusb code." |
161 |
- fi |
162 |
- fi |
163 |
- fi |
164 |
- fi |
165 |
-} |
166 |
- |
167 |
-src_prepare() { |
168 |
- default |
169 |
- |
170 |
- # Remove ".SILENT" rule for verbose output (bug 524338). |
171 |
- sed 's#^.SILENT:##g' -i "${S}"/Makedefs.in || die "sed failed" |
172 |
- |
173 |
- # Fix install-sh, posix sh does not have 'function'. |
174 |
- sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh" |
175 |
- |
176 |
- AT_M4DIR=config-scripts eaclocal |
177 |
- eautoconf |
178 |
- |
179 |
- # custom Makefiles |
180 |
- multilib_copy_sources |
181 |
-} |
182 |
- |
183 |
-multilib_src_configure() { |
184 |
- export DSOFLAGS="${LDFLAGS}" |
185 |
- |
186 |
- einfo LINGUAS=\"${LINGUAS}\" |
187 |
- |
188 |
- local myeconfargs=() |
189 |
- |
190 |
- # explicitly specify compiler wrt bug 524340 |
191 |
- # |
192 |
- # need to override KRB5CONFIG for proper flags |
193 |
- # https://github.com/apple/cups/issues/4423 |
194 |
- myeconfargs+=( |
195 |
- CC="$(tc-getCC)" |
196 |
- CXX="$(tc-getCXX)" |
197 |
- KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config |
198 |
- --libdir="${EPREFIX}"/usr/$(get_libdir) |
199 |
- --localstatedir="${EPREFIX}"/var |
200 |
- --with-exe-file-perm=755 |
201 |
- --with-rundir="${EPREFIX}"/run/cups |
202 |
- --with-cups-user=lp |
203 |
- --with-cups-group=lp |
204 |
- --with-docdir="${EPREFIX}"/usr/share/cups/html |
205 |
- --with-languages="${LINGUAS}" |
206 |
- --with-system-groups=lpadmin |
207 |
- --with-xinetd="${EPREFIX}"/etc/xinetd.d |
208 |
- $(multilib_native_use_enable acl) |
209 |
- $(use_enable dbus) |
210 |
- $(use_enable debug) |
211 |
- $(use_enable debug debug-guards) |
212 |
- $(use_enable debug debug-printfs) |
213 |
- $(multilib_native_use_with java) |
214 |
- $(use_enable kerberos gssapi) |
215 |
- $(multilib_native_use_enable pam) |
216 |
- $(multilib_native_use_with python python "${PYTHON}") |
217 |
- $(use_enable static-libs static) |
218 |
- $(use_enable threads) |
219 |
- $(use_enable ssl gnutls) |
220 |
- $(use_enable systemd) |
221 |
- $(multilib_native_use_enable usb libusb) |
222 |
- $(use_enable zeroconf avahi) |
223 |
- --disable-dnssd |
224 |
- --without-perl |
225 |
- --without-php |
226 |
- $(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper) |
227 |
- ) |
228 |
- |
229 |
- if tc-is-static-only; then |
230 |
- myeconfargs+=( |
231 |
- --disable-shared |
232 |
- ) |
233 |
- fi |
234 |
- |
235 |
- econf "${myeconfargs[@]}" |
236 |
- |
237 |
- # install in /usr/libexec always, instead of using /usr/lib/cups, as that |
238 |
- # makes more sense when facing multilib support. |
239 |
- sed -i -e "s:SERVERBIN.*:SERVERBIN = \"\$\(BUILDROOT\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die |
240 |
- sed -i -e "s:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN \"${EPREFIX}/usr/libexec/cups\":" config.h || die |
241 |
- sed -i -e "s:cups_serverbin=.*:cups_serverbin=\"${EPREFIX}/usr/libexec/cups\":" cups-config || die |
242 |
- |
243 |
- # additional path corrections needed for prefix, see bug 597728 |
244 |
- sed -i -e "s:ICONDIR.*:ICONDIR = ${EPREFIX}/usr/share/icons:" Makedefs || die |
245 |
- sed -i -e "s:INITDIR.*:INITDIR = ${EPREFIX}/etc:" Makedefs || die |
246 |
- sed -i -e "s:DBUSDIR.*:DBUSDIR = ${EPREFIX}/etc/dbus-1:" Makedefs || die |
247 |
- sed -i -e "s:MENUDIR.*:MENUDIR = ${EPREFIX}/usr/share/applications:" Makedefs || die |
248 |
-} |
249 |
- |
250 |
-multilib_src_compile() { |
251 |
- if multilib_is_native_abi; then |
252 |
- default |
253 |
- else |
254 |
- emake libs |
255 |
- fi |
256 |
-} |
257 |
- |
258 |
-multilib_src_test() { |
259 |
- multilib_is_native_abi && default |
260 |
-} |
261 |
- |
262 |
-multilib_src_install() { |
263 |
- if multilib_is_native_abi; then |
264 |
- emake BUILDROOT="${D}" install |
265 |
- else |
266 |
- emake BUILDROOT="${D}" install-libs install-headers |
267 |
- dobin cups-config |
268 |
- fi |
269 |
-} |
270 |
- |
271 |
-multilib_src_install_all() { |
272 |
- dodoc {CHANGES,CREDITS,README}.md |
273 |
- |
274 |
- # move the default config file to docs |
275 |
- dodoc "${ED}"/etc/cups/cupsd.conf.default |
276 |
- rm -f "${ED}"/etc/cups/cupsd.conf.default |
277 |
- |
278 |
- # clean out cups init scripts |
279 |
- rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups} |
280 |
- |
281 |
- # install our init script |
282 |
- local neededservices |
283 |
- use zeroconf && neededservices+=" avahi-daemon" |
284 |
- use dbus && neededservices+=" dbus" |
285 |
- [[ -n ${neededservices} ]] && neededservices="need${neededservices}" |
286 |
- cp "${FILESDIR}"/cupsd.init.d-r3 "${T}"/cupsd || die |
287 |
- sed -i \ |
288 |
- -e "s/@neededservices@/$neededservices/" \ |
289 |
- "${T}"/cupsd || die |
290 |
- doinitd "${T}"/cupsd |
291 |
- |
292 |
- # install our pam script |
293 |
- pamd_mimic_system cups auth account |
294 |
- |
295 |
- if use xinetd ; then |
296 |
- # correct path |
297 |
- sed -i \ |
298 |
- -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \ |
299 |
- "${ED}"/etc/xinetd.d/cups-lpd || die |
300 |
- # it is safer to disable this by default, bug #137130 |
301 |
- grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \ |
302 |
- { sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; } |
303 |
- # write permission for file owner (root), bug #296221 |
304 |
- fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed" |
305 |
- else |
306 |
- # always configure with --with-xinetd= and clean up later, |
307 |
- # bug #525604 |
308 |
- rm -rf "${ED}"/etc/xinetd.d |
309 |
- fi |
310 |
- |
311 |
- keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \ |
312 |
- /var/log/cups /var/spool/cups/tmp |
313 |
- |
314 |
- keepdir /etc/cups/{interfaces,ppd,ssl} |
315 |
- |
316 |
- use X || rm -r "${ED}"/usr/share/applications |
317 |
- |
318 |
- # create /etc/cups/client.conf, bug #196967 and #266678 |
319 |
- echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf |
320 |
- |
321 |
- # the following file is now provided by cups-filters: |
322 |
- rm -r "${ED}"/usr/share/cups/banners || die |
323 |
- |
324 |
- # the following are created by the init script |
325 |
- rm -r "${ED}"/var/cache/cups || die |
326 |
- rm -r "${ED}"/run || die |
327 |
- |
328 |
- # for the special case of running lprng and cups together, bug 467226 |
329 |
- if use lprng-compat ; then |
330 |
- rm -fv "${ED}"/usr/bin/{lp*,cancel} |
331 |
- rm -fv "${ED}"/usr/sbin/lp* |
332 |
- rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*} |
333 |
- rm -fv "${ED}"/usr/share/man/man8/lp* |
334 |
- ewarn "Not installing lp... binaries, since the lprng-compat useflag is set." |
335 |
- ewarn "Unless you plan to install an exotic server setup, you most likely" |
336 |
- ewarn "do not want this. Disable the useflag then and all will be fine." |
337 |
- fi |
338 |
-} |
339 |
- |
340 |
-pkg_preinst() { |
341 |
- gnome2_icon_savelist |
342 |
-} |
343 |
- |
344 |
-pkg_postinst() { |
345 |
- # Update desktop file database and gtk icon cache (bug 370059) |
346 |
- gnome2_icon_cache_update |
347 |
- xdg_desktop_database_update |
348 |
- |
349 |
- local v |
350 |
- |
351 |
- for v in ${REPLACING_VERSIONS}; do |
352 |
- if ! version_is_at_least 2.2.2-r2 ${v}; then |
353 |
- echo |
354 |
- ewarn "The cupsd init script switched to using pidfiles. Shutting down" |
355 |
- ewarn "cupsd will fail the next time. To fix this, please run once as root" |
356 |
- ewarn " killall cupsd ; /etc/init.d/cupsd zap ; /etc/init.d/cupsd start" |
357 |
- echo |
358 |
- break |
359 |
- fi |
360 |
- done |
361 |
- |
362 |
- for v in ${REPLACING_VERSIONS}; do |
363 |
- echo |
364 |
- elog "For information about installing a printer and general cups setup" |
365 |
- elog "take a look at: https://wiki.gentoo.org/wiki/Printing" |
366 |
- echo |
367 |
- break |
368 |
- done |
369 |
-} |
370 |
- |
371 |
-pkg_postrm() { |
372 |
- # Update desktop file database and gtk icon cache (bug 370059) |
373 |
- gnome2_icon_cache_update |
374 |
- xdg_desktop_database_update |
375 |
-} |
376 |
|
377 |
diff --git a/net-print/cups/files/cups-2.2.4-fix-install-perms.patch b/net-print/cups/files/cups-2.2.4-fix-install-perms.patch |
378 |
deleted file mode 100644 |
379 |
index b9fda922d2c..00000000000 |
380 |
--- a/net-print/cups/files/cups-2.2.4-fix-install-perms.patch |
381 |
+++ /dev/null |
382 |
@@ -1,18 +0,0 @@ |
383 |
---- cups-2.2.4/Makedefs.in |
384 |
-+++ cups-2.2.4/Makedefs.in |
385 |
-@@ -39,12 +39,12 @@ |
386 |
- # |
387 |
- |
388 |
- INSTALL_BIN = $(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@ |
389 |
--INSTALL_COMPDATA = $(INSTALL) -c -m 444 @INSTALL_GZIP@ |
390 |
-+INSTALL_COMPDATA = $(INSTALL) -c -m 644 @INSTALL_GZIP@ |
391 |
- INSTALL_CONFIG = $(INSTALL) -c -m @CUPS_CONFIG_FILE_PERM@ |
392 |
--INSTALL_DATA = $(INSTALL) -c -m 444 |
393 |
-+INSTALL_DATA = $(INSTALL) -c -m 644 |
394 |
- INSTALL_DIR = $(INSTALL) -d |
395 |
- INSTALL_LIB = $(LIBTOOL) $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ @INSTALL_STRIP@ |
396 |
--INSTALL_MAN = $(INSTALL) -c -m 444 |
397 |
-+INSTALL_MAN = $(INSTALL) -c -m 644 |
398 |
- INSTALL_SCRIPT = $(INSTALL) -c -m @CUPS_EXE_FILE_PERM@ |
399 |
- |
400 |
- # |