1 |
dilfridge 13/10/01 21:10:50 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: cups-1.6.4.ebuild |
5 |
Log: |
6 |
Version bump |
7 |
|
8 |
(Portage version: 2.2.7/cvs/Linux x86_64, signed Manifest commit with key EBE6A336BE19039C!) |
9 |
|
10 |
Revision Changes Path |
11 |
1.564 net-print/cups/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.564&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.564&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?r1=1.563&r2=1.564 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v |
20 |
retrieving revision 1.563 |
21 |
retrieving revision 1.564 |
22 |
diff -u -r1.563 -r1.564 |
23 |
--- ChangeLog 30 Sep 2013 23:19:51 -0000 1.563 |
24 |
+++ ChangeLog 1 Oct 2013 21:10:50 -0000 1.564 |
25 |
@@ -1,6 +1,11 @@ |
26 |
# ChangeLog for net-print/cups |
27 |
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.563 2013/09/30 23:19:51 dilfridge Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.564 2013/10/01 21:10:50 dilfridge Exp $ |
30 |
+ |
31 |
+*cups-1.6.4 (01 Oct 2013) |
32 |
+ |
33 |
+ 01 Oct 2013; Andreas K. Huettel <dilfridge@g.o> +cups-1.6.4.ebuild: |
34 |
+ Version bump |
35 |
|
36 |
30 Sep 2013; Andreas K. Huettel <dilfridge@g.o> -cups-1.5.2-r4.ebuild, |
37 |
-files/cups-1.4.4-fix-install-perms.patch, -files/cups-1.5.2-threads.patch, |
38 |
|
39 |
|
40 |
|
41 |
1.1 net-print/cups/cups-1.6.4.ebuild |
42 |
|
43 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.6.4.ebuild?rev=1.1&view=markup |
44 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.6.4.ebuild?rev=1.1&content-type=text/plain |
45 |
|
46 |
Index: cups-1.6.4.ebuild |
47 |
=================================================================== |
48 |
# Copyright 1999-2013 Gentoo Foundation |
49 |
# Distributed under the terms of the GNU General Public License v2 |
50 |
# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.6.4.ebuild,v 1.1 2013/10/01 21:10:50 dilfridge Exp $ |
51 |
|
52 |
EAPI=5 |
53 |
|
54 |
PYTHON_COMPAT=( python{2_6,2_7} ) |
55 |
|
56 |
inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info \ |
57 |
multilib pam python-single-r1 user versionator java-pkg-opt-2 systemd |
58 |
|
59 |
MY_P=${P/_beta/b} |
60 |
MY_PV=${PV/_beta/b} |
61 |
|
62 |
if [[ ${PV} == *9999 ]]; then |
63 |
inherit git-2 |
64 |
EGIT_REPO_URI="http://www.cups.org/cups.git" |
65 |
if [[ ${PV} != 9999 ]]; then |
66 |
EGIT_BRANCH=branch-${PV/.9999} |
67 |
fi |
68 |
KEYWORDS="" |
69 |
else |
70 |
SRC_URI="http://www.cups.org/software/${MY_PV}/${MY_P}-source.tar.bz2" |
71 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd" |
72 |
fi |
73 |
|
74 |
DESCRIPTION="The Common Unix Printing System" |
75 |
HOMEPAGE="http://www.cups.org/" |
76 |
|
77 |
LICENSE="GPL-2" |
78 |
SLOT="0" |
79 |
IUSE="acl dbus debug +filters gnutls java kerberos lprng-compat pam |
80 |
python selinux +ssl static-libs +threads usb X xinetd zeroconf" |
81 |
|
82 |
LANGS="ca es fr ja ru" |
83 |
for X in ${LANGS} ; do |
84 |
IUSE="${IUSE} +linguas_${X}" |
85 |
done |
86 |
|
87 |
RDEPEND=" |
88 |
app-text/libpaper |
89 |
acl? ( |
90 |
kernel_linux? ( |
91 |
sys-apps/acl |
92 |
sys-apps/attr |
93 |
) |
94 |
) |
95 |
dbus? ( sys-apps/dbus ) |
96 |
java? ( >=virtual/jre-1.6 ) |
97 |
kerberos? ( virtual/krb5 ) |
98 |
!lprng-compat? ( !net-print/lprng ) |
99 |
pam? ( virtual/pam ) |
100 |
python? ( ${PYTHON_DEPS} ) |
101 |
selinux? ( sec-policy/selinux-cups ) |
102 |
ssl? ( |
103 |
gnutls? ( |
104 |
dev-libs/libgcrypt |
105 |
net-libs/gnutls |
106 |
) |
107 |
!gnutls? ( >=dev-libs/openssl-0.9.8g ) |
108 |
) |
109 |
usb? ( virtual/libusb:1 ) |
110 |
X? ( x11-misc/xdg-utils ) |
111 |
xinetd? ( sys-apps/xinetd ) |
112 |
zeroconf? ( net-dns/avahi ) |
113 |
" |
114 |
|
115 |
DEPEND="${RDEPEND} |
116 |
virtual/pkgconfig |
117 |
" |
118 |
|
119 |
PDEPEND=" |
120 |
app-text/ghostscript-gpl[cups] |
121 |
app-text/poppler[utils] |
122 |
>=net-print/cups-filters-1.0.30 |
123 |
filters? ( net-print/foomatic-filters ) |
124 |
" |
125 |
|
126 |
REQUIRED_USE="gnutls? ( ssl ) |
127 |
python? ( ${PYTHON_REQUIRED_USE} )" |
128 |
|
129 |
# upstream includes an interactive test which is a nono for gentoo |
130 |
RESTRICT="test" |
131 |
|
132 |
S="${WORKDIR}/${MY_P}" |
133 |
|
134 |
PATCHES=( |
135 |
"${FILESDIR}/${PN}-1.6.0-dont-compress-manpages.patch" |
136 |
"${FILESDIR}/${PN}-1.6.0-fix-install-perms.patch" |
137 |
"${FILESDIR}/${PN}-1.4.4-nostrip.patch" |
138 |
"${FILESDIR}/${PN}-1.5.0-systemd-socket-2.patch" # systemd support |
139 |
"${FILESDIR}/${PN}-1.6.2-statedir.patch" |
140 |
) |
141 |
|
142 |
pkg_setup() { |
143 |
enewgroup lp |
144 |
enewuser lp -1 -1 -1 lp |
145 |
enewgroup lpadmin 106 |
146 |
|
147 |
use python && python-single-r1_pkg_setup |
148 |
|
149 |
if use kernel_linux; then |
150 |
linux-info_pkg_setup |
151 |
if ! linux_config_exists; then |
152 |
ewarn "Can't check the linux kernel configuration." |
153 |
ewarn "You might have some incompatible options enabled." |
154 |
else |
155 |
# recheck that we don't have usblp to collide with libusb |
156 |
if use usb; then |
157 |
if linux_chkconfig_present USB_PRINTER; then |
158 |
eerror "Your usb printers will be managed via libusb. In this case, " |
159 |
eerror "${P} requires the USB_PRINTER support disabled." |
160 |
eerror "Please disable it:" |
161 |
eerror " CONFIG_USB_PRINTER=n" |
162 |
eerror "in /usr/src/linux/.config or" |
163 |
eerror " Device Drivers --->" |
164 |
eerror " USB support --->" |
165 |
eerror " [ ] USB Printer support" |
166 |
eerror "Alternatively, just disable the usb useflag for cups (your printer will still work)." |
167 |
fi |
168 |
else |
169 |
#here we should warn user that he should enable it so he can print |
170 |
if ! linux_chkconfig_present USB_PRINTER; then |
171 |
ewarn "If you plan to use USB printers you should enable the USB_PRINTER" |
172 |
ewarn "support in your kernel." |
173 |
ewarn "Please enable it:" |
174 |
ewarn " CONFIG_USB_PRINTER=y" |
175 |
ewarn "in /usr/src/linux/.config or" |
176 |
ewarn " Device Drivers --->" |
177 |
ewarn " USB support --->" |
178 |
ewarn " [*] USB Printer support" |
179 |
ewarn "Alternatively, enable the usb useflag for cups and use the libusb code." |
180 |
fi |
181 |
fi |
182 |
fi |
183 |
fi |
184 |
} |
185 |
|
186 |
src_prepare() { |
187 |
base_src_prepare |
188 |
AT_M4DIR=config-scripts eaclocal |
189 |
eautoconf |
190 |
} |
191 |
|
192 |
src_configure() { |
193 |
export DSOFLAGS="${LDFLAGS}" |
194 |
|
195 |
einfo LANGS=\"${LANGS}\" |
196 |
einfo LINGUAS=\"${LINGUAS}\" |
197 |
|
198 |
local myconf |
199 |
if use ssl ; then |
200 |
myconf+=" |
201 |
$(use_enable gnutls) |
202 |
$(use_enable !gnutls openssl) |
203 |
" |
204 |
else |
205 |
myconf+=" |
206 |
--disable-gnutls |
207 |
--disable-openssl |
208 |
" |
209 |
fi |
210 |
|
211 |
econf \ |
212 |
--libdir="${EPREFIX}"/usr/$(get_libdir) \ |
213 |
--localstatedir="${EPREFIX}"/var \ |
214 |
--with-cups-user=lp \ |
215 |
--with-cups-group=lp \ |
216 |
--with-docdir="${EPREFIX}"/usr/share/cups/html \ |
217 |
--with-languages="${LINGUAS}" \ |
218 |
--with-system-groups=lpadmin \ |
219 |
$(use_enable acl) \ |
220 |
$(use_enable zeroconf avahi) \ |
221 |
$(use_enable dbus) \ |
222 |
$(use_enable debug) \ |
223 |
$(use_enable debug debug-guards) \ |
224 |
$(use_enable kerberos gssapi) \ |
225 |
$(use_enable pam) \ |
226 |
$(use_enable static-libs static) \ |
227 |
$(use_enable threads) \ |
228 |
$(use_enable usb libusb) \ |
229 |
--disable-dnssd \ |
230 |
$(use_with java) \ |
231 |
--without-perl \ |
232 |
--without-php \ |
233 |
$(use_with python python "${PYTHON}") \ |
234 |
$(use_with xinetd xinetd /etc/xinetd.d) \ |
235 |
--enable-libpaper \ |
236 |
--with-systemdsystemunitdir="$(systemd_get_unitdir)" \ |
237 |
${myconf} |
238 |
|
239 |
# install in /usr/libexec always, instead of using /usr/lib/cups, as that |
240 |
# makes more sense when facing multilib support. |
241 |
sed -i -e "s:SERVERBIN.*:SERVERBIN = \"\$\(BUILDROOT\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die |
242 |
sed -i -e "s:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN \"${EPREFIX}/usr/libexec/cups\":" config.h || die |
243 |
sed -i -e "s:cups_serverbin=.*:cups_serverbin=\"${EPREFIX}/usr/libexec/cups\":" cups-config || die |
244 |
} |
245 |
|
246 |
src_install() { |
247 |
# Fix install-sh, posix sh does not have 'function'. |
248 |
sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh" |
249 |
|
250 |
emake BUILDROOT="${D}" install |
251 |
dodoc {CHANGES,CREDITS,README}.txt |
252 |
|
253 |
# move the default config file to docs |
254 |
dodoc "${ED}"/etc/cups/cupsd.conf.default |
255 |
rm -f "${ED}"/etc/cups/cupsd.conf.default |
256 |
|
257 |
# clean out cups init scripts |
258 |
rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups} |
259 |
|
260 |
# install our init script |
261 |
local neededservices |
262 |
use zeroconf && neededservices+=" avahi-daemon" |
263 |
use dbus && neededservices+=" dbus" |
264 |
[[ -n ${neededservices} ]] && neededservices="need${neededservices}" |
265 |
cp "${FILESDIR}"/cupsd.init.d-r1 "${T}"/cupsd || die |
266 |
sed -i \ |
267 |
-e "s/@neededservices@/$neededservices/" \ |
268 |
"${T}"/cupsd || die |
269 |
doinitd "${T}"/cupsd |
270 |
|
271 |
# install our pam script |
272 |
pamd_mimic_system cups auth account |
273 |
|
274 |
if use xinetd ; then |
275 |
# correct path |
276 |
sed -i \ |
277 |
-e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \ |
278 |
"${ED}"/etc/xinetd.d/cups-lpd || die |
279 |
# it is safer to disable this by default, bug #137130 |
280 |
grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \ |
281 |
{ sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; } |
282 |
# write permission for file owner (root), bug #296221 |
283 |
fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed" |
284 |
else |
285 |
rm -rf "${ED}"/etc/xinetd.d |
286 |
fi |
287 |
|
288 |
keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \ |
289 |
/var/cache/cups /var/cache/cups/rss /var/log/cups \ |
290 |
/var/spool/cups/tmp |
291 |
|
292 |
keepdir /etc/cups/{interfaces,ppd,ssl} |
293 |
|
294 |
use X || rm -r "${ED}"/usr/share/applications |
295 |
|
296 |
# create /etc/cups/client.conf, bug #196967 and #266678 |
297 |
echo "ServerName /run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf |
298 |
|
299 |
# the following files are now provided by cups-filters: |
300 |
rm -r "${ED}"/usr/share/cups/banners || die |
301 |
rm -r "${ED}"/usr/share/cups/data/testprint || die |
302 |
|
303 |
# for the special case of running lprng and cups together, bug 467226 |
304 |
if use lprng-compat ; then |
305 |
rm -fv "${ED}"/usr/bin/{lp*,cancel} |
306 |
rm -fv "${ED}"/usr/sbin/lp* |
307 |
rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*} |
308 |
rm -fv "${ED}"/usr/share/man/man8/lp* |
309 |
ewarn "Not installing lp... binaries, since the lprng-compat useflag is set." |
310 |
ewarn "Unless you plan to install an exotic server setup, you most likely" |
311 |
ewarn "do not want this. Disable the useflag then and all will be fine." |
312 |
fi |
313 |
} |
314 |
|
315 |
pkg_preinst() { |
316 |
gnome2_icon_savelist |
317 |
} |
318 |
|
319 |
pkg_postinst() { |
320 |
# Update desktop file database and gtk icon cache (bug 370059) |
321 |
gnome2_icon_cache_update |
322 |
fdo-mime_desktop_database_update |
323 |
|
324 |
# not slotted - at most one value |
325 |
if ! [[ "${REPLACING_VERSIONS}" ]]; then |
326 |
echo |
327 |
elog "For information about installing a printer and general cups setup" |
328 |
elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml" |
329 |
echo |
330 |
fi |
331 |
|
332 |
if [[ "${REPLACING_VERSIONS}" ]] && [[ "${REPLACING_VERSIONS}" < "1.6" ]]; then |
333 |
echo |
334 |
elog "CUPS-1.6 no longer supports automatic remote printers or implicit classes" |
335 |
elog "via the CUPS, LDAP, or SLP protocols, i.e. \"network browsing\"." |
336 |
elog "You will have to find printers using zeroconf/avahi instead, enter" |
337 |
elog "the location manually, or run cups-browsed from net-print/cups-filters" |
338 |
elog "which re-adds that functionality as a separate daemon." |
339 |
echo |
340 |
fi |
341 |
|
342 |
if [[ "${REPLACING_VERSIONS}" == "1.6.2-r4" ]]; then |
343 |
ewarn |
344 |
ewarn "You are upgrading from the broken version net-print/cups-1.6.2-r4." |
345 |
ewarn "Please rebuild net-print/cups-filters now to make sure everything is OK." |
346 |
ewarn |
347 |
fi |
348 |
} |
349 |
|
350 |
pkg_postrm() { |
351 |
# Update desktop file database and gtk icon cache (bug 370059) |
352 |
gnome2_icon_cache_update |
353 |
fdo-mime_desktop_database_update |
354 |
} |