1 |
dilfridge 12/06/02 18:06:35 |
2 |
|
3 |
Modified: ChangeLog cups-9999.ebuild |
4 |
Added: cups-1.5.3.ebuild |
5 |
Log: |
6 |
Version bump |
7 |
|
8 |
(Portage version: 2.2.0_alpha108/cvs/Linux x86_64) |
9 |
|
10 |
Revision Changes Path |
11 |
1.487 net-print/cups/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.487&view=markup |
14 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.487&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?r1=1.486&r2=1.487 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v |
20 |
retrieving revision 1.486 |
21 |
retrieving revision 1.487 |
22 |
diff -u -r1.486 -r1.487 |
23 |
--- ChangeLog 2 Jun 2012 16:57:16 -0000 1.486 |
24 |
+++ ChangeLog 2 Jun 2012 18:06:35 -0000 1.487 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for net-print/cups |
27 |
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.486 2012/06/02 16:57:16 dilfridge Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.487 2012/06/02 18:06:35 dilfridge Exp $ |
30 |
+ |
31 |
+*cups-1.5.3 (02 Jun 2012) |
32 |
+ |
33 |
+ 02 Jun 2012; Andreas K. Huettel <dilfridge@g.o> +cups-1.5.3.ebuild, |
34 |
+ +files/cups-1.5.3-fix-install-perms.patch, cups-9999.ebuild: |
35 |
+ Version bump |
36 |
|
37 |
*cups-1.6_beta1 (02 Jun 2012) |
38 |
|
39 |
|
40 |
|
41 |
|
42 |
1.9 net-print/cups/cups-9999.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-9999.ebuild?rev=1.9&view=markup |
45 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-9999.ebuild?rev=1.9&content-type=text/plain |
46 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-9999.ebuild?r1=1.8&r2=1.9 |
47 |
|
48 |
Index: cups-9999.ebuild |
49 |
=================================================================== |
50 |
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v |
51 |
retrieving revision 1.8 |
52 |
retrieving revision 1.9 |
53 |
diff -u -r1.8 -r1.9 |
54 |
--- cups-9999.ebuild 2 Jun 2012 16:57:16 -0000 1.8 |
55 |
+++ cups-9999.ebuild 2 Jun 2012 18:06:35 -0000 1.9 |
56 |
@@ -1,6 +1,6 @@ |
57 |
# Copyright 1999-2012 Gentoo Foundation |
58 |
# Distributed under the terms of the GNU General Public License v2 |
59 |
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.8 2012/06/02 16:57:16 dilfridge Exp $ |
60 |
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-9999.ebuild,v 1.9 2012/06/02 18:06:35 dilfridge Exp $ |
61 |
|
62 |
EAPI=4 |
63 |
|
64 |
@@ -13,7 +13,7 @@ |
65 |
|
66 |
if [[ "${PV}" != "9999" ]]; then |
67 |
SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2" |
68 |
- KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~s390 ~sh ~sparc ~x86" |
69 |
+ KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd" |
70 |
else |
71 |
inherit subversion |
72 |
ESVN_REPO_URI="http://svn.easysw.com/public/cups/trunk" |
73 |
|
74 |
|
75 |
|
76 |
1.1 net-print/cups/cups-1.5.3.ebuild |
77 |
|
78 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.5.3.ebuild?rev=1.1&view=markup |
79 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.5.3.ebuild?rev=1.1&content-type=text/plain |
80 |
|
81 |
Index: cups-1.5.3.ebuild |
82 |
=================================================================== |
83 |
# Copyright 1999-2012 Gentoo Foundation |
84 |
# Distributed under the terms of the GNU General Public License v2 |
85 |
# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.5.3.ebuild,v 1.1 2012/06/02 18:06:35 dilfridge Exp $ |
86 |
|
87 |
EAPI=4 |
88 |
|
89 |
PYTHON_DEPEND="python? 2:2.5" |
90 |
|
91 |
inherit autotools base fdo-mime gnome2-utils flag-o-matic linux-info multilib pam perl-module python user versionator java-pkg-opt-2 systemd |
92 |
|
93 |
MY_P=${P/_} |
94 |
MY_PV=${PV/_} |
95 |
|
96 |
if [[ "${PV}" != "9999" ]]; then |
97 |
SRC_URI="mirror://easysw/${PN}/${MY_PV}/${MY_P}-source.tar.bz2 |
98 |
http://dev.gentoo.org/~dilfridge/distfiles/${P}-avahi.patch.bz2 |
99 |
" |
100 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd" |
101 |
else |
102 |
inherit subversion |
103 |
ESVN_REPO_URI="http://svn.easysw.com/public/cups/trunk" |
104 |
KEYWORDS="" |
105 |
fi |
106 |
|
107 |
DESCRIPTION="The Common Unix Printing System" |
108 |
HOMEPAGE="http://www.cups.org/" |
109 |
|
110 |
LICENSE="GPL-2" |
111 |
SLOT="0" |
112 |
IUSE="acl avahi dbus debug +filters gnutls java +jpeg kerberos ldap pam perl |
113 |
+png python slp +ssl static-libs systemd +threads +tiff usb X xinetd" |
114 |
|
115 |
LANGS="da de es eu fi fr hu id it ja ko nl no pl pt pt_BR ru sv zh zh_TW" |
116 |
for X in ${LANGS} ; do |
117 |
IUSE="${IUSE} linguas_${X}" |
118 |
done |
119 |
|
120 |
RDEPEND=" |
121 |
app-text/libpaper |
122 |
acl? ( |
123 |
kernel_linux? ( |
124 |
sys-apps/acl |
125 |
sys-apps/attr |
126 |
) |
127 |
) |
128 |
avahi? ( net-dns/avahi ) |
129 |
dbus? ( sys-apps/dbus ) |
130 |
java? ( >=virtual/jre-1.6 ) |
131 |
jpeg? ( virtual/jpeg:0 ) |
132 |
kerberos? ( virtual/krb5 ) |
133 |
ldap? ( net-nds/openldap[ssl?,gnutls?] ) |
134 |
pam? ( virtual/pam ) |
135 |
perl? ( dev-lang/perl ) |
136 |
png? ( >=media-libs/libpng-1.4.3:0 ) |
137 |
slp? ( >=net-libs/openslp-1.0.4 ) |
138 |
ssl? ( |
139 |
gnutls? ( |
140 |
dev-libs/libgcrypt |
141 |
net-libs/gnutls |
142 |
) |
143 |
!gnutls? ( >=dev-libs/openssl-0.9.8g ) |
144 |
) |
145 |
systemd? ( sys-apps/systemd ) |
146 |
tiff? ( >=media-libs/tiff-3.5.5:0 ) |
147 |
usb? ( virtual/libusb:0 ) |
148 |
X? ( x11-misc/xdg-utils ) |
149 |
xinetd? ( sys-apps/xinetd ) |
150 |
" |
151 |
|
152 |
DEPEND="${RDEPEND} |
153 |
virtual/pkgconfig |
154 |
" |
155 |
|
156 |
PDEPEND=" |
157 |
app-text/ghostscript-gpl[cups] |
158 |
>=app-text/poppler-0.12.3-r3[utils] |
159 |
filters? ( net-print/foomatic-filters ) |
160 |
" |
161 |
|
162 |
REQUIRED_USE="gnutls? ( ssl )" |
163 |
|
164 |
# upstream includes an interactive test which is a nono for gentoo |
165 |
RESTRICT="test" |
166 |
|
167 |
S="${WORKDIR}/${MY_P}" |
168 |
|
169 |
PATCHES=( |
170 |
"${FILESDIR}/${PN}-1.4.4-dont-compress-manpages.patch" |
171 |
"${FILESDIR}/${PN}-1.5.3-fix-install-perms.patch" |
172 |
"${FILESDIR}/${PN}-1.4.4-nostrip.patch" |
173 |
"${FILESDIR}/${PN}-1.4.4-php-destdir.patch" |
174 |
"${FILESDIR}/${PN}-1.4.4-perl-includes.patch" |
175 |
"${FILESDIR}/${PN}-1.5.2-linkperl.patch" |
176 |
"${FILESDIR}/${PN}-1.5.0-systemd-socket.patch" # systemd support |
177 |
"${WORKDIR}/${PN}-1.5.3-avahi.patch" # avahi support from debian |
178 |
"${FILESDIR}/${PN}-1.5.2-browsing.patch" # browsing off by default |
179 |
) |
180 |
|
181 |
pkg_setup() { |
182 |
enewgroup lp |
183 |
enewuser lp -1 -1 -1 lp |
184 |
enewgroup lpadmin 106 |
185 |
|
186 |
# python 3 is no-go |
187 |
if use python; then |
188 |
python_set_active_version 2 |
189 |
python_pkg_setup |
190 |
fi |
191 |
|
192 |
if use kernel_linux; then |
193 |
linux-info_pkg_setup |
194 |
if ! linux_config_exists; then |
195 |
ewarn "Can't check the linux kernel configuration." |
196 |
ewarn "You might have some incompatible options enabled." |
197 |
else |
198 |
# recheck that we don't have usblp to collide with libusb |
199 |
if use usb; then |
200 |
if linux_chkconfig_present USB_PRINTER; then |
201 |
eerror "Your usb printers will be managed via libusb. In this case, " |
202 |
eerror "${P} requires the USB_PRINTER support disabled." |
203 |
eerror "Please disable it:" |
204 |
eerror " CONFIG_USB_PRINTER=n" |
205 |
eerror "in /usr/src/linux/.config or" |
206 |
eerror " Device Drivers --->" |
207 |
eerror " USB support --->" |
208 |
eerror " [ ] USB Printer support" |
209 |
eerror "Alternatively, just disable the usb useflag for cups (your printer will still work)." |
210 |
fi |
211 |
else |
212 |
#here we should warn user that he should enable it so he can print |
213 |
if ! linux_chkconfig_present USB_PRINTER; then |
214 |
ewarn "If you plan to use USB printers you should enable the USB_PRINTER" |
215 |
ewarn "support in your kernel." |
216 |
ewarn "Please enable it:" |
217 |
ewarn " CONFIG_USB_PRINTER=y" |
218 |
ewarn "in /usr/src/linux/.config or" |
219 |
ewarn " Device Drivers --->" |
220 |
ewarn " USB support --->" |
221 |
ewarn " [*] USB Printer support" |
222 |
ewarn "Alternatively, enable the usb useflag for cups and use the libusb code." |
223 |
fi |
224 |
fi |
225 |
fi |
226 |
fi |
227 |
} |
228 |
|
229 |
src_prepare() { |
230 |
base_src_prepare |
231 |
AT_M4DIR=config-scripts eaclocal |
232 |
eautoconf |
233 |
} |
234 |
|
235 |
src_configure() { |
236 |
export DSOFLAGS="${LDFLAGS}" |
237 |
|
238 |
# locale support |
239 |
strip-linguas ${LANGS} |
240 |
if [ -z "${LINGUAS}" ] ; then |
241 |
export LINGUAS=none |
242 |
fi |
243 |
|
244 |
local myconf |
245 |
if use ssl ; then |
246 |
myconf+=" |
247 |
$(use_enable gnutls) |
248 |
$(use_enable !gnutls openssl) |
249 |
" |
250 |
else |
251 |
myconf+=" |
252 |
--disable-gnutls |
253 |
--disable-openssl |
254 |
" |
255 |
fi |
256 |
|
257 |
econf \ |
258 |
--libdir=/usr/$(get_libdir) \ |
259 |
--localstatedir=/var \ |
260 |
--with-cups-user=lp \ |
261 |
--with-cups-group=lp \ |
262 |
--with-docdir=/usr/share/cups/html \ |
263 |
--with-languages="${LINGUAS}" \ |
264 |
--with-pdftops=/usr/bin/pdftops \ |
265 |
--with-system-groups=lpadmin \ |
266 |
$(use_enable acl) \ |
267 |
$(use_enable avahi) \ |
268 |
$(use_enable dbus) \ |
269 |
$(use_enable debug) \ |
270 |
$(use_enable debug debug-guards) \ |
271 |
$(use_enable jpeg) \ |
272 |
$(use_enable kerberos gssapi) \ |
273 |
$(use_enable ldap) \ |
274 |
$(use_enable pam) \ |
275 |
$(use_enable png) \ |
276 |
$(use_enable slp) \ |
277 |
$(use_enable static-libs static) \ |
278 |
$(use_enable threads) \ |
279 |
$(use_enable tiff) \ |
280 |
$(use_enable usb libusb) \ |
281 |
$(use_with java) \ |
282 |
$(use_with perl) \ |
283 |
--without-php \ |
284 |
$(use_with python) \ |
285 |
$(use_with xinetd xinetd /etc/xinetd.d) \ |
286 |
--enable-libpaper \ |
287 |
--disable-dnssd \ |
288 |
$(use_with systemd systemdsystemunitdir "$(systemd_get_unitdir)") \ |
289 |
${myconf} |
290 |
|
291 |
# install in /usr/libexec always, instead of using /usr/lib/cups, as that |
292 |
# makes more sense when facing multilib support. |
293 |
sed -i -e 's:SERVERBIN.*:SERVERBIN = "$(BUILDROOT)"/usr/libexec/cups:' Makedefs || die |
294 |
sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h || die |
295 |
sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config || die |
296 |
} |
297 |
|
298 |
src_compile() { |
299 |
emake |
300 |
|
301 |
if use perl ; then |
302 |
cd "${S}"/scripting/perl |
303 |
perl-module_src_prep |
304 |
perl-module_src_compile |
305 |
fi |
306 |
} |
307 |
|
308 |
src_install() { |
309 |
emake BUILDROOT="${D}" install |
310 |
dodoc {CHANGES,CREDITS,README}.txt |
311 |
|
312 |
if use perl ; then |
313 |
pushd scripting/perl > /dev/null |
314 |
perl-module_src_install |
315 |
fixlocalpod |
316 |
popd > /dev/null |
317 |
fi |
318 |
|
319 |
# move the default config file to docs |
320 |
dodoc "${ED}"/etc/cups/cupsd.conf.default |
321 |
rm -f "${ED}"/etc/cups/cupsd.conf.default |
322 |
|
323 |
# clean out cups init scripts |
324 |
rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups} |
325 |
|
326 |
# install our init script |
327 |
local neededservices |
328 |
use avahi && neededservices+=" avahi-daemon" |
329 |
use dbus && neededservices+=" dbus" |
330 |
[[ -n ${neededservices} ]] && neededservices="need${neededservices}" |
331 |
cp "${FILESDIR}"/cupsd.init.d "${T}"/cupsd || die |
332 |
sed -i \ |
333 |
-e "s/@neededservices@/$neededservices/" \ |
334 |
"${T}"/cupsd || die |
335 |
doinitd "${T}"/cupsd |
336 |
|
337 |
# install our pam script |
338 |
pamd_mimic_system cups auth account |
339 |
|
340 |
if use xinetd ; then |
341 |
# correct path |
342 |
sed -i \ |
343 |
-e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \ |
344 |
"${ED}"/etc/xinetd.d/cups-lpd || die |
345 |
# it is safer to disable this by default, bug #137130 |
346 |
grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \ |
347 |
{ sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; } |
348 |
# write permission for file owner (root), bug #296221 |
349 |
fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed" |
350 |
else |
351 |
rm -rf "${ED}"/etc/xinetd.d |
352 |
fi |
353 |
|
354 |
keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \ |
355 |
/var/cache/cups /var/cache/cups/rss /var/log/cups \ |
356 |
/var/spool/cups/tmp |
357 |
|
358 |
keepdir /etc/cups/{interfaces,ppd,ssl} |
359 |
|
360 |
use X || rm -r "${ED}"/usr/share/applications |
361 |
|
362 |
# create /etc/cups/client.conf, bug #196967 and #266678 |
363 |
echo "ServerName /var/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf |
364 |
} |
365 |
|
366 |
pkg_preinst() { |
367 |
gnome2_icon_savelist |
368 |
} |
369 |
|
370 |
pkg_postinst() { |
371 |
# Update desktop file database and gtk icon cache (bug 370059) |
372 |
gnome2_icon_cache_update |
373 |
fdo-mime_desktop_database_update |
374 |
|
375 |
echo |
376 |
elog "For information about installing a printer and general cups setup" |
377 |
elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml" |
378 |
echo |
379 |
elog "Network browsing for printers is now switched off by default in the config file." |
380 |
elog "To (re-)enable it, edit /etc/cups/cupsd.conf and set \"Browsing On\", " |
381 |
elog "afterwards re-start or reload cups." |
382 |
echo |
383 |
} |
384 |
|
385 |
pkg_postrm() { |
386 |
# Update desktop file database and gtk icon cache (bug 370059) |
387 |
gnome2_icon_cache_update |
388 |
fdo-mime_desktop_database_update |
389 |
} |