1 |
scarabeus 11/04/30 15:39:45 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: cups-1.4.6-r1.ebuild |
5 |
Removed: cups-1.4.6.ebuild |
6 |
Log: |
7 |
Revision bump to fix few bugs reported on bugzilla. Wrong libgcrypt dependency and cgi hangup. |
8 |
|
9 |
(Portage version: 2.2.0_alpha30/cvs/Linux x86_64) |
10 |
|
11 |
Revision Changes Path |
12 |
1.408 net-print/cups/ChangeLog |
13 |
|
14 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.408&view=markup |
15 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?rev=1.408&content-type=text/plain |
16 |
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/ChangeLog?r1=1.407&r2=1.408 |
17 |
|
18 |
Index: ChangeLog |
19 |
=================================================================== |
20 |
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v |
21 |
retrieving revision 1.407 |
22 |
retrieving revision 1.408 |
23 |
diff -u -r1.407 -r1.408 |
24 |
--- ChangeLog 30 Apr 2011 15:10:52 -0000 1.407 |
25 |
+++ ChangeLog 30 Apr 2011 15:39:44 -0000 1.408 |
26 |
@@ -1,6 +1,13 @@ |
27 |
# ChangeLog for net-print/cups |
28 |
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 |
29 |
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.407 2011/04/30 15:10:52 scarabeus Exp $ |
30 |
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.408 2011/04/30 15:39:44 scarabeus Exp $ |
31 |
+ |
32 |
+*cups-1.4.6-r1 (30 Apr 2011) |
33 |
+ |
34 |
+ 30 Apr 2011; Tomáš Chvátal <scarabeus@g.o> -cups-1.4.6.ebuild, |
35 |
+ +cups-1.4.6-r1.ebuild, +files/cups-1.4.6-web-hang.patch: |
36 |
+ Revision bump to fix few bugs reported on bugzilla. Wrong libgcrypt |
37 |
+ dependency and cgi hangup. |
38 |
|
39 |
30 Apr 2011; Tomáš Chvátal <scarabeus@g.o> cups-1.3.11-r4.ebuild: |
40 |
Just enforce cups useflag to be enabled on ghostscript.cd |
41 |
|
42 |
|
43 |
|
44 |
1.1 net-print/cups/cups-1.4.6-r1.ebuild |
45 |
|
46 |
file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.4.6-r1.ebuild?rev=1.1&view=markup |
47 |
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/cups/cups-1.4.6-r1.ebuild?rev=1.1&content-type=text/plain |
48 |
|
49 |
Index: cups-1.4.6-r1.ebuild |
50 |
=================================================================== |
51 |
# Copyright 1999-2011 Gentoo Foundation |
52 |
# Distributed under the terms of the GNU General Public License v2 |
53 |
# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.4.6-r1.ebuild,v 1.1 2011/04/30 15:39:44 scarabeus Exp $ |
54 |
|
55 |
EAPI=3 |
56 |
|
57 |
PYTHON_DEPEND="python? 2:2.5" |
58 |
|
59 |
inherit autotools eutils flag-o-matic multilib pam perl-module python versionator java-pkg-opt-2 |
60 |
|
61 |
MY_P=${P/_} |
62 |
|
63 |
DESCRIPTION="The Common Unix Printing System" |
64 |
HOMEPAGE="http://www.cups.org/" |
65 |
SRC_URI="mirror://easysw/${PN}/${PV}/${MY_P}-source.tar.bz2" |
66 |
|
67 |
LICENSE="GPL-2" |
68 |
SLOT="0" |
69 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" |
70 |
IUSE="acl dbus debug gnutls java +jpeg kerberos ldap pam perl php +png python samba slp +ssl static-libs +threads +tiff +usb X xinetd" |
71 |
|
72 |
LANGS="da de es eu fi fr id it ja ko nl no pl pt pt_BR ru sv zh zh_TW" |
73 |
for X in ${LANGS} ; do |
74 |
IUSE="${IUSE} linguas_${X}" |
75 |
done |
76 |
|
77 |
RDEPEND=" |
78 |
app-text/libpaper |
79 |
acl? ( |
80 |
kernel_linux? ( |
81 |
sys-apps/acl |
82 |
sys-apps/attr |
83 |
) |
84 |
) |
85 |
dbus? ( sys-apps/dbus ) |
86 |
java? ( >=virtual/jre-1.6 ) |
87 |
jpeg? ( virtual/jpeg:0 ) |
88 |
kerberos? ( virtual/krb5 ) |
89 |
ldap? ( net-nds/openldap[ssl?,gnutls?] ) |
90 |
pam? ( virtual/pam ) |
91 |
perl? ( dev-lang/perl ) |
92 |
php? ( dev-lang/php ) |
93 |
png? ( >=media-libs/libpng-1.4.3 ) |
94 |
slp? ( >=net-libs/openslp-1.0.4 ) |
95 |
ssl? ( |
96 |
gnutls? ( |
97 |
dev-libs/libgcrypt |
98 |
net-libs/gnutls |
99 |
) |
100 |
!gnutls? ( >=dev-libs/openssl-0.9.8g ) |
101 |
) |
102 |
tiff? ( >=media-libs/tiff-3.5.5 ) |
103 |
usb? ( virtual/libusb:0 ) |
104 |
X? ( x11-misc/xdg-utils ) |
105 |
xinetd? ( sys-apps/xinetd ) |
106 |
!net-print/cupsddk |
107 |
" |
108 |
|
109 |
DEPEND="${RDEPEND} |
110 |
dev-util/pkgconfig |
111 |
" |
112 |
|
113 |
PDEPEND=" |
114 |
app-text/ghostscript-gpl[cups] |
115 |
>=app-text/poppler-0.12.3-r3[utils] |
116 |
" |
117 |
|
118 |
# upstream includes an interactive test which is a nono for gentoo. |
119 |
RESTRICT="test" |
120 |
|
121 |
S="${WORKDIR}/${MY_P}" |
122 |
|
123 |
pkg_setup() { |
124 |
enewgroup lp |
125 |
enewuser lp -1 -1 -1 lp |
126 |
enewgroup lpadmin 106 |
127 |
|
128 |
# python 3 is no-go |
129 |
if use python; then |
130 |
python_set_active_version 2 |
131 |
python_pkg_setup |
132 |
fi |
133 |
} |
134 |
|
135 |
src_prepare() { |
136 |
# create a missing symlink to allow https printing via IPP, bug #217293 |
137 |
epatch "${FILESDIR}/${PN}-1.4.0-backend-https.patch" |
138 |
# various build time fixes |
139 |
epatch "${FILESDIR}/${PN}-1.4.4-dont-compress-manpages.patch" |
140 |
epatch "${FILESDIR}/${PN}-1.4.4-fix-install-perms.patch" |
141 |
epatch "${FILESDIR}/${PN}-1.4.4-nostrip.patch" |
142 |
epatch "${FILESDIR}/${PN}-1.4.4-php-destdir.patch" |
143 |
epatch "${FILESDIR}/${PN}-1.4.4-perl-includes.patch" |
144 |
epatch "${FILESDIR}/${PN}-1.4.6-force-gnutls.patch" |
145 |
epatch "${FILESDIR}/${PN}-1.4.6-serialize-gnutls.patch" |
146 |
# interface hangs using some browsers, bug #325871 |
147 |
epatch "${FILESDIR}/${PN}-1.4.6-web-hang.patch" |
148 |
|
149 |
AT_M4DIR=config-scripts eaclocal |
150 |
eautoconf |
151 |
} |
152 |
|
153 |
src_configure() { |
154 |
export DSOFLAGS="${LDFLAGS}" |
155 |
|
156 |
# locale support |
157 |
strip-linguas ${LANGS} |
158 |
if [ -z "${LINGUAS}" ] ; then |
159 |
export LINGUAS=none |
160 |
fi |
161 |
|
162 |
local myconf |
163 |
if use ssl || use gnutls ; then |
164 |
myconf+=" |
165 |
$(use_enable gnutls) |
166 |
$(use_enable !gnutls openssl) |
167 |
" |
168 |
else |
169 |
myconf+=" |
170 |
--disable-gnutls |
171 |
--disable-openssl |
172 |
" |
173 |
fi |
174 |
|
175 |
econf \ |
176 |
--libdir=/usr/$(get_libdir) \ |
177 |
--localstatedir=/var \ |
178 |
--with-cups-user=lp \ |
179 |
--with-cups-group=lp \ |
180 |
--with-docdir=/usr/share/cups/html \ |
181 |
--with-languages="${LINGUAS}" \ |
182 |
--with-pdftops=/usr/bin/pdftops \ |
183 |
--with-system-groups=lpadmin \ |
184 |
$(use_enable acl) \ |
185 |
$(use_enable dbus) \ |
186 |
$(use_enable debug) \ |
187 |
$(use_enable debug debug-guards) \ |
188 |
$(use_enable jpeg) \ |
189 |
$(use_enable kerberos gssapi) \ |
190 |
$(use_enable ldap) \ |
191 |
$(use_enable pam) \ |
192 |
$(use_enable png) \ |
193 |
$(use_enable slp) \ |
194 |
$(use_enable static-libs static) \ |
195 |
$(use_enable threads) \ |
196 |
$(use_enable tiff) \ |
197 |
$(use_enable usb libusb) \ |
198 |
$(use_with java) \ |
199 |
$(use_with perl) \ |
200 |
$(use_with php) \ |
201 |
$(use_with python) \ |
202 |
$(use_with xinetd xinetd /etc/xinetd.d) \ |
203 |
--enable-libpaper \ |
204 |
--disable-dnssd \ |
205 |
${myconf} |
206 |
|
207 |
# install in /usr/libexec always, instead of using /usr/lib/cups, as that |
208 |
# makes more sense when facing multilib support. |
209 |
sed -i -e 's:SERVERBIN.*:SERVERBIN = "$(BUILDROOT)"/usr/libexec/cups:' Makedefs || die |
210 |
sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h || die |
211 |
sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config || die |
212 |
} |
213 |
|
214 |
src_compile() { |
215 |
emake || die "emake failed" |
216 |
|
217 |
if use perl ; then |
218 |
cd "${S}"/scripting/perl |
219 |
perl-module_src_prep |
220 |
perl-module_src_compile |
221 |
fi |
222 |
|
223 |
if use php ; then |
224 |
cd "${S}"/scripting/php |
225 |
emake || die "emake php failed" |
226 |
fi |
227 |
} |
228 |
|
229 |
src_install() { |
230 |
emake BUILDROOT="${D}" install || die "emake install failed" |
231 |
dodoc {CHANGES,CREDITS,README}.txt || die "dodoc install failed" |
232 |
|
233 |
if use perl ; then |
234 |
cd "${S}"/scripting/perl |
235 |
perl-module_src_install |
236 |
fixlocalpod |
237 |
fi |
238 |
|
239 |
if use php ; then |
240 |
cd "${S}"/scripting/php |
241 |
emake DESTDIR="${D}" install || die "emake install for php bindings failed" |
242 |
fi |
243 |
|
244 |
# clean out cups init scripts |
245 |
rm -rf "${D}"/etc/{init.d/cups,rc*,pam.d/cups} |
246 |
|
247 |
# install our init script |
248 |
local neededservices |
249 |
use dbus && neededservices+=" dbus" |
250 |
[[ -n ${neededservices} ]] && neededservices="need${neededservices}" |
251 |
cp "${FILESDIR}"/cupsd.init.d "${T}"/cupsd || die |
252 |
sed -i \ |
253 |
-e "s/@neededservices@/$neededservices/" \ |
254 |
"${T}"/cupsd || die |
255 |
doinitd "${T}"/cupsd || die "doinitd failed" |
256 |
|
257 |
# install our pam script |
258 |
pamd_mimic_system cups auth account |
259 |
|
260 |
if use xinetd ; then |
261 |
# correct path |
262 |
sed -i \ |
263 |
-e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \ |
264 |
"${D}"/etc/xinetd.d/cups-lpd || die |
265 |
# it is safer to disable this by default, bug #137130 |
266 |
grep -w 'disable' "${D}"/etc/xinetd.d/cups-lpd || \ |
267 |
{ sed -i -e "s:}:\tdisable = yes\n}:" "${D}"/etc/xinetd.d/cups-lpd || die ; } |
268 |
# write permission for file owner (root), bug #296221 |
269 |
fperms u+w /etc/xinetd.d/cups-lpd || die "fperms failed" |
270 |
else |
271 |
rm -rf "${D}"/etc/xinetd.d |
272 |
fi |
273 |
|
274 |
keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \ |
275 |
/var/cache/cups /var/cache/cups/rss /var/log/cups /var/run/cups/certs \ |
276 |
/var/spool/cups/tmp |
277 |
|
278 |
keepdir /etc/cups/{interfaces,ppd,ssl} |
279 |
|
280 |
use X || rm -r "${D}"/usr/share/applications |
281 |
|
282 |
# create /etc/cups/client.conf, bug #196967 and #266678 |
283 |
echo "ServerName /var/run/cups/cups.sock" >> "${D}"/etc/cups/client.conf |
284 |
} |
285 |
|
286 |
pkg_postinst() { |
287 |
echo |
288 |
elog "For information about installing a printer and general cups setup" |
289 |
elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml" |
290 |
echo |
291 |
} |