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