1 |
tgurr 07/11/08 23:15:12 |
2 |
|
3 |
Modified: ChangeLog |
4 |
Added: cups-1.3.4-r1.ebuild |
5 |
Removed: cups-1.3.4.ebuild |
6 |
Log: |
7 |
New revision cups-1.3.4-r1, fixes bug #198267 and bug #198305. |
8 |
(Portage version: 2.1.3.19) |
9 |
|
10 |
Revision Changes Path |
11 |
1.264 net-print/cups/ChangeLog |
12 |
|
13 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/ChangeLog?rev=1.264&view=markup |
14 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/ChangeLog?rev=1.264&content-type=text/plain |
15 |
diff : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/ChangeLog?r1=1.263&r2=1.264 |
16 |
|
17 |
Index: ChangeLog |
18 |
=================================================================== |
19 |
RCS file: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v |
20 |
retrieving revision 1.263 |
21 |
retrieving revision 1.264 |
22 |
diff -u -r1.263 -r1.264 |
23 |
--- ChangeLog 6 Nov 2007 17:50:40 -0000 1.263 |
24 |
+++ ChangeLog 8 Nov 2007 23:15:12 -0000 1.264 |
25 |
@@ -1,6 +1,12 @@ |
26 |
# ChangeLog for net-print/cups |
27 |
# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2 |
28 |
-# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.263 2007/11/06 17:50:40 dertobi123 Exp $ |
29 |
+# $Header: /var/cvsroot/gentoo-x86/net-print/cups/ChangeLog,v 1.264 2007/11/08 23:15:12 tgurr Exp $ |
30 |
+ |
31 |
+*cups-1.3.4-r1 (08 Nov 2007) |
32 |
+ |
33 |
+ 08 Nov 2007; Timo Gurr <tgurr@g.o> +files/cupsd.init.d, |
34 |
+ -cups-1.3.4.ebuild, +cups-1.3.4-r1.ebuild: |
35 |
+ New revision cups-1.3.4-r1, fixes bug #198267 and bug #198305. |
36 |
|
37 |
06 Nov 2007; Tobias Scherbaum <dertobi123@g.o> |
38 |
cups-1.2.12-r2.ebuild: |
39 |
|
40 |
|
41 |
|
42 |
1.1 net-print/cups/cups-1.3.4-r1.ebuild |
43 |
|
44 |
file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/cups-1.3.4-r1.ebuild?rev=1.1&view=markup |
45 |
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/net-print/cups/cups-1.3.4-r1.ebuild?rev=1.1&content-type=text/plain |
46 |
|
47 |
Index: cups-1.3.4-r1.ebuild |
48 |
=================================================================== |
49 |
# Copyright 1999-2007 Gentoo Foundation |
50 |
# Distributed under the terms of the GNU General Public License v2 |
51 |
# $Header: /var/cvsroot/gentoo-x86/net-print/cups/cups-1.3.4-r1.ebuild,v 1.1 2007/11/08 23:15:12 tgurr Exp $ |
52 |
|
53 |
inherit autotools eutils flag-o-matic multilib pam |
54 |
|
55 |
MY_P=${P/_} |
56 |
|
57 |
DESCRIPTION="The Common Unix Printing System" |
58 |
HOMEPAGE="http://www.cups.org/" |
59 |
SRC_URI="mirror://sourceforge/cups/${MY_P}-source.tar.bz2" |
60 |
|
61 |
LICENSE="GPL-2" |
62 |
SLOT="0" |
63 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd" |
64 |
IUSE="acl avahi dbus java jpeg kerberos ldap nls pam perl php png ppds python samba slp ssl static tiff X zeroconf" |
65 |
|
66 |
COMMON_DEPEND="acl? ( kernel_linux? ( sys-apps/acl sys-apps/attr ) ) |
67 |
avahi? ( net-dns/avahi ) |
68 |
dbus? ( sys-apps/dbus ) |
69 |
java? ( >=virtual/jre-1.4 ) |
70 |
jpeg? ( >=media-libs/jpeg-6b ) |
71 |
kerberos? ( virtual/krb5 ) |
72 |
ldap? ( net-nds/openldap ) |
73 |
pam? ( virtual/pam ) |
74 |
perl? ( dev-lang/perl ) |
75 |
php? ( dev-lang/php ) |
76 |
png? ( >=media-libs/libpng-1.2.1 ) |
77 |
python? ( dev-lang/python ) |
78 |
slp? ( >=net-libs/openslp-1.0.4 ) |
79 |
ssl? ( net-libs/gnutls ) |
80 |
tiff? ( >=media-libs/tiff-3.5.5 ) |
81 |
zeroconf? ( !avahi? ( net-misc/mDNSResponder ) ) |
82 |
app-text/libpaper |
83 |
dev-libs/libgcrypt" |
84 |
|
85 |
DEPEND="${COMMON_DEPEND} |
86 |
!<net-print/foomatic-filters-ppds-20070501 |
87 |
!<net-print/hplip-1.7.4a-r1 |
88 |
nls? ( sys-devel/gettext )" |
89 |
|
90 |
RDEPEND="${COMMON_DEPEND} |
91 |
!virtual/lpr |
92 |
nls? ( virtual/libintl ) |
93 |
X? ( x11-misc/xdg-utils ) |
94 |
>=app-text/poppler-0.4.3-r1" |
95 |
|
96 |
PDEPEND=" |
97 |
ppds? ( || ( |
98 |
( |
99 |
net-print/foomatic-filters-ppds |
100 |
net-print/foomatic-db-ppds |
101 |
) |
102 |
net-print/foomatic-filters-ppds |
103 |
net-print/foomatic-db-ppds |
104 |
net-print/hplip |
105 |
media-gfx/gimp-print |
106 |
net-print/foo2zjs |
107 |
net-print/cups-pdf |
108 |
) ) |
109 |
samba? ( >=net-fs/samba-3.0.8 ) |
110 |
virtual/ghostscript" |
111 |
|
112 |
PROVIDE="virtual/lpr" |
113 |
|
114 |
# upstream includes an interactive test which is a nono for gentoo. |
115 |
# therefore, since the printing herd has bigger fish to fry, for now, |
116 |
# we just leave it out, even if FEATURES=test |
117 |
RESTRICT="test" |
118 |
|
119 |
S="${WORKDIR}/${MY_P}" |
120 |
|
121 |
LANGS="de en es et fr he it ja pl sv zh_TW" |
122 |
for X in ${LANGS} ; do |
123 |
IUSE="${IUSE} linguas_${X}" |
124 |
done |
125 |
|
126 |
pkg_setup() { |
127 |
if use avahi && ! built_with_use net-dns/avahi mdnsresponder-compat ; then |
128 |
echo |
129 |
eerror "In order to have cups working with avahi zeroconf support, you need" |
130 |
eerror "to have net-dns/avahi emerged with 'mdnsresponder-compat' in your USE" |
131 |
eerror "flag. Please add that flag, re-emerge avahi, and then emerge cups again." |
132 |
die "net-dns/avahi is missing the mdnsresponder-compat feature." |
133 |
fi |
134 |
|
135 |
enewgroup lp |
136 |
enewuser lp -1 -1 -1 lp |
137 |
|
138 |
enewgroup lpadmin 106 |
139 |
} |
140 |
|
141 |
src_unpack() { |
142 |
unpack ${A} |
143 |
cd "${S}" |
144 |
|
145 |
# upstream does not acknowledge bindnow as a solution |
146 |
epatch "${FILESDIR}/${PN}-1.3.0-bindnow.patch" |
147 |
|
148 |
# disable configure automagic for acl/attr |
149 |
epatch "${FILESDIR}/${PN}-1.3.0-configure.patch" |
150 |
|
151 |
# cups does not use autotools "the usual way" and ship a static config.h.in |
152 |
eaclocal |
153 |
eautoconf |
154 |
} |
155 |
|
156 |
src_compile() { |
157 |
|
158 |
# locale support |
159 |
strip-linguas ${LANGS} |
160 |
|
161 |
if [ -z "${LINGUAS}" ] ; then |
162 |
export LINGUAS=all |
163 |
fi |
164 |
|
165 |
export DSOFLAGS="${LDFLAGS}" |
166 |
cd "${S}" |
167 |
|
168 |
local myconf |
169 |
|
170 |
if use avahi || use zeroconf ; then |
171 |
myconf="${myconf} --enable-dnssd" |
172 |
else |
173 |
myconf="${myconf} --disable-dnssd" |
174 |
fi |
175 |
|
176 |
econf \ |
177 |
--libdir=/usr/$(get_libdir) \ |
178 |
--localstatedir=/var \ |
179 |
--with-bindnow=$(bindnow-flags) \ |
180 |
--with-cups-user=lp \ |
181 |
--with-cups-group=lp \ |
182 |
--with-docdir=/usr/share/cups/html \ |
183 |
--with-languages=${LINGUAS} \ |
184 |
--with-system-groups=lpadmin \ |
185 |
$(use_enable acl) \ |
186 |
$(use_enable dbus) \ |
187 |
$(use_enable jpeg) \ |
188 |
$(use_enable kerberos gssapi) \ |
189 |
$(use_enable ldap) \ |
190 |
$(use_enable nls) \ |
191 |
$(use_enable pam) \ |
192 |
$(use_enable png) \ |
193 |
$(use_enable slp) \ |
194 |
$(use_enable ssl) \ |
195 |
$(use_enable static) \ |
196 |
$(use_enable tiff) \ |
197 |
$(use_with java) \ |
198 |
$(use_with perl) \ |
199 |
$(use_with php) \ |
200 |
$(use_with python) \ |
201 |
--enable-gnutls \ |
202 |
--enable-libpaper \ |
203 |
--enable-threads \ |
204 |
--disable-pdftops \ |
205 |
${myconf} \ |
206 |
|| die "econf failed" |
207 |
|
208 |
# Install in /usr/libexec always, instead of using /usr/lib/cups, as that |
209 |
# makes more sense when facing multilib support. |
210 |
sed -i -e 's:SERVERBIN.*:SERVERBIN = "$(BUILDROOT)"/usr/libexec/cups:' Makedefs |
211 |
sed -i -e 's:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN "/usr/libexec/cups":' config.h |
212 |
sed -i -e 's:cups_serverbin=.*:cups_serverbin=/usr/libexec/cups:' cups-config |
213 |
|
214 |
emake || die "emake failed" |
215 |
} |
216 |
|
217 |
src_install() { |
218 |
emake BUILDROOT="${D}" install || die "emake install failed" |
219 |
dodoc {CHANGES{,-1.{0,1}},CREDITS,LICENSE,README}.txt || die "dodoc install failed" |
220 |
|
221 |
# clean out cups init scripts |
222 |
rm -rf "${D}"/etc/{init.d/cups,rc*,pam.d/cups} |
223 |
|
224 |
# install our init script |
225 |
local neededservices |
226 |
use avahi && neededservices="$neededservices avahi-daemon" |
227 |
use dbus && neededservices="$neededservices dbus" |
228 |
use zeroconf && ! use avahi && neededservices="$neededservices mDNSResponderPosix" |
229 |
[[ -n ${neededservices} ]] && sed -e "s/@neededservices@/need$neededservices/" "${FILESDIR}/cupsd.init.d" > "${T}/cupsd" |
230 |
doinitd "${T}/cupsd" |
231 |
|
232 |
# install our pam script |
233 |
pamd_mimic_system cups auth account |
234 |
|
235 |
# correct path |
236 |
sed -i -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" "${D}"/etc/xinetd.d/cups-lpd |
237 |
# it is safer to disable this by default, bug 137130 |
238 |
grep -w 'disable' "${D}"/etc/xinetd.d/cups-lpd || \ |
239 |
sed -i -e "s:}:\tdisable = yes\n}:" "${D}"/etc/xinetd.d/cups-lpd |
240 |
|
241 |
# install pdftops filter |
242 |
exeinto /usr/libexec/cups/filter/ |
243 |
newexe "${FILESDIR}"/pdftops.pl pdftops |
244 |
|
245 |
# only for gs-esp this is correct, see bug 163897 |
246 |
if has_version app-text/ghostscript-gpl || has_version app-text/ghostscript-gnu; then |
247 |
sed -i -e "s:#application/vnd.cups-postscript:application/vnd.cups-postscript:" "${D}"/etc/cups/mime.convs |
248 |
fi |
249 |
|
250 |
keepdir /usr/share/cups/profiles /usr/libexec/cups/driver /var/log/cups \ |
251 |
/var/run/cups/certs /var/cache/cups /var/spool/cups/tmp /etc/cups/ssl |
252 |
|
253 |
# .desktop handling. X useflag. xdg-open from freedesktop is preferred |
254 |
if use X; then |
255 |
sed -i -e "s:htmlview:xdg-open:" "${D}"/usr/share/applications/cups.desktop |
256 |
else |
257 |
rm -r "${D}"/usr/share/applications |
258 |
fi |
259 |
|
260 |
# Fix a symlink collision, see bug #172341 |
261 |
dodir /usr/share/ppd |
262 |
dosym /usr/share/ppd /usr/share/cups/model/foomatic-ppds |
263 |
} |
264 |
|
265 |
pkg_preinst() { |
266 |
# cleanups |
267 |
[ -n "${PN}" ] && rm -fR "${ROOT}"/usr/share/doc/"${PN}"-* |
268 |
} |
269 |
|
270 |
pkg_postinst() { |
271 |
echo |
272 |
elog "For information about installing a printer and general cups setup" |
273 |
elog "take a look at: http://www.gentoo.org/doc/en/printing-howto.xml" |
274 |
echo |
275 |
|
276 |
local good_gs=false |
277 |
for x in app-text/ghostscript-gpl app-text/ghostscript-gnu app-text/ghostscript-esp; do |
278 |
if has_version ${x} && built_with_use ${x} cups; then |
279 |
good_gs=true |
280 |
break |
281 |
fi |
282 |
done; |
283 |
if ! ${good_gs}; then |
284 |
echo |
285 |
ewarn "You need to emerge ghostscript with the \"cups\" USE flag turned on" |
286 |
echo |
287 |
fi |
288 |
|
289 |
if has_version =net-print/cups-1.1*; then |
290 |
echo |
291 |
ewarn "The configuration changed with cups-1.3, you may want to save the old" |
292 |
ewarn "one and start from scratch:" |
293 |
ewarn "# mv /etc/cups /etc/cups.orig; emerge -va1 cups" |
294 |
echo |
295 |
ewarn "You need to rebuild kdelibs for kdeprinter to work with cups-1.3" |
296 |
echo |
297 |
fi |
298 |
|
299 |
if [ -e "${ROOT}"/usr/lib/cups ]; then |
300 |
echo |
301 |
ewarn "/usr/lib/cups exists - You need to remerge every ebuild that" |
302 |
ewarn "installed into /usr/lib/cups and /etc/cups, qfile is in portage-utils:" |
303 |
ewarn "# FEATURES=-collision-protect emerge -va1 \$(qfile -qC /usr/lib/cups /etc/cups | sed \"s:net-print/cups$::\")" |
304 |
echo |
305 |
ewarn "FEATURES=-collision-protect is needed to overwrite the compatibility" |
306 |
ewarn "symlinks installed by this package, it won't be needed on later merges." |
307 |
ewarn "You should also run revdep-rebuild" |
308 |
echo |
309 |
|
310 |
# place symlinks to make the update smoothless |
311 |
for i in "${ROOT}"/usr/lib/cups/{backend,filter}/*; do |
312 |
if [ "${i/\*}" == "${i}" ] && ! [ -e ${i/lib/libexec} ]; then |
313 |
ln -s ${i} ${i/lib/libexec} |
314 |
fi |
315 |
done |
316 |
fi |
317 |
} |
318 |
|
319 |
|
320 |
|
321 |
-- |
322 |
gentoo-commits@g.o mailing list |