Gentoo Archives: gentoo-commits

From: "Daniel Pielmeier (billie)" <billie@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in net-print/hplip: hplip-3.11.1.ebuild ChangeLog hplip-3.10.6.ebuild hplip-3.9.12-r1.ebuild hplip-3.10.9.ebuild
Date: Mon, 24 Jan 2011 20:52:10
Message-Id: 20110124205155.E90B320054@flycatcher.gentoo.org
1 billie 11/01/24 20:51:55
2
3 Modified: ChangeLog
4 Added: hplip-3.11.1.ebuild
5 Removed: hplip-3.10.6.ebuild hplip-3.9.12-r1.ebuild
6 hplip-3.10.9.ebuild
7 Log:
8 Version bump. Fixes bug #352449. Thanks to Ben Sagal for reporting. Remove potential vulnerable versions.
9
10 (Portage version: 2.1.9.25/cvs/Linux i686)
11
12 Revision Changes Path
13 1.178 net-print/hplip/ChangeLog
14
15 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/ChangeLog?rev=1.178&view=markup
16 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/ChangeLog?rev=1.178&content-type=text/plain
17 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/ChangeLog?r1=1.177&r2=1.178
18
19 Index: ChangeLog
20 ===================================================================
21 RCS file: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v
22 retrieving revision 1.177
23 retrieving revision 1.178
24 diff -u -r1.177 -r1.178
25 --- ChangeLog 21 Jan 2011 13:44:04 -0000 1.177
26 +++ ChangeLog 24 Jan 2011 20:51:55 -0000 1.178
27 @@ -1,6 +1,15 @@
28 # ChangeLog for net-print/hplip
29 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
30 -# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.177 2011/01/21 13:44:04 fauli Exp $
31 +# $Header: /var/cvsroot/gentoo-x86/net-print/hplip/ChangeLog,v 1.178 2011/01/24 20:51:55 billie Exp $
32 +
33 +*hplip-3.11.1 (24 Jan 2011)
34 +
35 + 24 Jan 2011; Daniel Pielmeier <billie@g.o> -hplip-3.9.12-r1.ebuild,
36 + -hplip-3.10.6.ebuild, -hplip-3.10.9.ebuild, +hplip-3.11.1.ebuild,
37 + +files/hplip-3.11.1-desktop.patch, +files/hplip-3.11.1-htmldir.patch,
38 + +files/hplip-3.11.1-udev-attrs.patch:
39 + Version bump. Fixes bug #352449. Thanks to Ben Sagal for reporting. Remove
40 + potential vulnerable versions.
41
42 21 Jan 2011; Christian Faulhammer <fauli@g.o>
43 hplip-3.10.9-r1.ebuild:
44
45
46
47 1.1 net-print/hplip/hplip-3.11.1.ebuild
48
49 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/hplip-3.11.1.ebuild?rev=1.1&view=markup
50 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-print/hplip/hplip-3.11.1.ebuild?rev=1.1&content-type=text/plain
51
52 Index: hplip-3.11.1.ebuild
53 ===================================================================
54 # Copyright 1999-2011 Gentoo Foundation
55 # Distributed under the terms of the GNU General Public License v2
56 # $Header: /var/cvsroot/gentoo-x86/net-print/hplip/hplip-3.11.1.ebuild,v 1.1 2011/01/24 20:51:55 billie Exp $
57
58 EAPI=2
59
60 PYTHON_DEPEND="!minimal? 2"
61 PYTHON_USE_WITH="threads xml"
62 PYTHON_USE_WITH_OPT="!minimal"
63
64 inherit fdo-mime linux-info python autotools
65
66 DESCRIPTION="HP Linux Imaging and Printing System. Includes printer, scanner, fax drivers and service tools."
67 HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
68 SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz"
69
70 LICENSE="GPL-2"
71 SLOT="0"
72 KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
73
74 # zeroconf does not work properly with >=cups-1.4. thus support for it is also disabled in hplip.
75 IUSE="doc fax +hpcups hpijs kde libnotify minimal parport policykit qt4 scanner snmp static-ppds -udev-acl X"
76
77 COMMON_DEPEND="
78 virtual/jpeg
79 hpijs? ( >=net-print/foomatic-filters-3.0.20080507[cups] )
80 udev-acl? ( >=sys-fs/udev-145[extras] )
81 snmp? (
82 net-analyzer/net-snmp
83 dev-libs/openssl
84 )
85 !minimal? (
86 net-print/cups
87 virtual/libusb:0
88 scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
89 fax? ( sys-apps/dbus )
90 )"
91
92 DEPEND="${COMMON_DEPEND}
93 dev-util/pkgconfig"
94
95 RDEPEND="${COMMON_DEPEND}
96 >=app-text/ghostscript-gpl-8.71-r3
97 !static-ppds? ( || ( >=net-print/cups-1.4.0 net-print/cupsddk ) )
98 !minimal? (
99 dev-python/pygobject
100 kernel_linux? ( >=sys-fs/udev-114 )
101 scanner? (
102 dev-python/imaging
103 X? ( || (
104 kde? ( kde-misc/skanlite )
105 media-gfx/xsane
106 media-gfx/sane-frontends
107 ) )
108 )
109 fax? (
110 dev-python/reportlab
111 dev-python/dbus-python
112 )
113 qt4? (
114 dev-python/PyQt4[dbus,X]
115 libnotify? (
116 dev-python/notify-python
117 )
118 policykit? (
119 sys-auth/polkit
120 )
121 )
122 )"
123
124 CONFIG_CHECK="~PARPORT ~PPDEV"
125 ERROR_PARPORT="Please make sure parallel port support is enabled in your kernel (PARPORT and PPDEV)."
126
127 pkg_setup() {
128 if ! use minimal; then
129 python_set_active_version 2
130 python_pkg_setup
131 fi
132
133 ! use qt4 && ewarn "You need USE=qt4 for the hplip GUI."
134
135 use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
136
137 if ! use hpcups && ! use hpijs ; then
138 ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
139 ewarn "which is probably not what you want."
140 ewarn "You will almost certainly not be able to print."
141 ewarn "Recommended USE flags: USE=\"hpcups -hpijs\")."
142 fi
143
144 if use minimal ; then
145 ewarn "Installing driver portions only, make sure you know what you are doing."
146 ewarn "Depending on the USE flags set for hpcups and/or hpijs the appropiate"
147 ewarn "drivers are installed."
148 else
149 use parport && linux-info_pkg_setup
150 fi
151 }
152
153 src_prepare() {
154 python_convert_shebangs -q -r 2 .
155
156 # Test for Gentoo bug #345725
157 #sed -i -e "s|/etc/udev/rules.d|/$(get_libdir)/udev/rules.d|" \
158 # $(find ./ -type f -exec grep -l '/etc/udev/rules.d' '{}' '+') \
159 # || die "sed udev rules"
160
161 # Do not install desktop files if there is no gui
162 # Upstream bug: https://bugs.launchpad.net/hplip/+bug/452113
163 epatch "${FILESDIR}"/${P}-desktop.patch
164
165 # Browser detection through xdg-open
166 # Upstream bug: https://bugs.launchpad.net/hplip/+bug/482674
167 epatch "${FILESDIR}"/${PN}-3.9.10-browser.patch
168
169 # Use cups-config when checking for cupsddk
170 # Upstream bug: https://bugs.launchpad.net/hplip/+bug/483136
171 epatch "${FILESDIR}"/${PN}-3.9.12-cupsddk.patch
172
173 # Htmldocs are not installed under docdir/html so enable htmldir configure switch
174 # Upstream bug: https://bugs.launchpad.net/hplip/+bug/483217
175 epatch "${FILESDIR}"/${P}-htmldir.patch
176
177 # Increase systray check timeout for slower machines
178 # Upstream bug: https://bugs.launchpad.net/hplip/+bug/335662
179 epatch "${FILESDIR}"/${PN}-3.9.12-systray.patch
180
181 # SYSFS deprecated but kept upstream for compatibility reasons
182 # Upstream bug: https://bugs.launchpad.net/hplip/+bug/346390
183 epatch "${FILESDIR}"/${P}-udev-attrs.patch
184
185 # CVE-2010-4267 SNMP Response Processing Buffer Overflow Vulnerability
186 # http://secunia.com/advisories/42956/
187 # https://bugzilla.redhat.com/show_bug.cgi?id=662740
188 epatch "${FILESDIR}"/${PN}-3.10.9-cve-2010-4267.patch
189
190 # Force recognition of Gentoo distro by hp-check
191 sed -i \
192 -e "s:file('/etc/issue', 'r').read():'Gentoo':" \
193 installer/core_install.py || die
194
195 # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
196 # The hpcups driver does not use foomatic-rip
197 local i
198 for i in ppd/hpijs/*.ppd.gz
199 do
200 rm -f ${i}.temp
201 gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | gzip > ${i}.temp || die
202 mv ${i}.temp ${i}
203 done
204
205 eautoreconf
206 }
207
208 src_configure() {
209 local gui_build myconf drv_build minimal_build
210
211 if use qt4 ; then
212 gui_build="--enable-gui-build --enable-qt4 --disable-qt3"
213 if use policykit ; then
214 myconf="--enable-policykit"
215 else
216 myconf="--disable-policykit"
217 fi
218 else
219 gui_build="--disable-gui-build --disable-qt3 --disable-qt4"
220 fi
221
222 if use fax || use qt4 ; then
223 myconf="${myconf} --enable-dbus-build"
224 else
225 myconf="${myconf} --disable-dbus-build"
226 fi
227
228 if use hpcups ; then
229 drv_build="$(use_enable hpcups hpcups-install)"
230 if use static-ppds ; then
231 drv_build="${drv_build} --enable-cups-ppd-install"
232 drv_build="${drv_build} --disable-cups-drv-install"
233 else
234 drv_build="${drv_build} --enable-cups-drv-install"
235 drv_build="${drv_build} --disable-cups-ppd-install"
236 fi
237 else
238 drv_build="--disable-hpcups-install --disable-cups-drv-install"
239 drv_build="${drv_build} --disable-cups-ppd-install"
240 fi
241
242 if use hpijs ; then
243 drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
244 if use static-ppds ; then
245 drv_build="${drv_build} --enable-foomatic-ppd-install"
246 drv_build="${drv_build} --disable-foomatic-drv-install"
247 else
248 drv_build="${drv_build} --enable-foomatic-drv-install"
249 drv_build="${drv_build} --disable-foomatic-ppd-install"
250 fi
251 else
252 drv_build="${drv_build} --disable-hpijs-install"
253 drv_build="${drv_build} --disable-foomatic-drv-install"
254 drv_build="${drv_build} --disable-foomatic-ppd-install"
255 fi
256
257 if use minimal ; then
258 if use hpijs ; then
259 minimal_build="--enable-hpijs-only-build"
260 else
261 minimal_build="--disable-hpijs-only-build"
262 fi
263 if use hpcups ; then
264 minimal_build="${minimal_build} --enable-hpcups-only-build"
265 else
266 minimal_build="${minimal_build} --disable-hpcups-only-build"
267 fi
268 fi
269
270 econf \
271 --disable-dependency-tracking \
272 --disable-cups11-build \
273 --disable-lite-build \
274 --disable-foomatic-rip-hplip-install \
275 --disable-shadow-build \
276 --with-cupsbackenddir=$(cups-config --serverbin)/backend \
277 --with-cupsfilterdir=$(cups-config --serverbin)/filter \
278 --with-docdir=/usr/share/doc/${PF} \
279 --with-htmldir=/usr/share/doc/${PF}/html \
280 ${gui_build} \
281 ${myconf} \
282 ${drv_build} \
283 ${minimal_build} \
284 $(use_enable doc doc-build) \
285 $(use_enable fax fax-build) \
286 $(use_enable parport pp-build) \
287 $(use_enable scanner scan-build) \
288 $(use_enable snmp network-build) \
289 $(use_enable udev-acl udev-acl-rules)
290 }
291
292 src_install() {
293 emake DESTDIR="${D}" install || die
294
295 # Installed by sane-backends
296 # Gentoo Bug: #201023
297 rm -f "${D}"/etc/sane.d/dll.conf || die
298 }
299
300 pkg_postinst() {
301 use !minimal && python_mod_optimize /usr/share/${PN}
302 fdo-mime_desktop_database_update
303
304 elog "You should run hp-setup as root if you are installing hplip for the first time,"
305 elog "and may also need to run it if you are upgrading from an earlier version."
306 elog
307 elog "If your device is connected using USB, users will need to be in the lp group to"
308 elog "access it."
309 elog
310 elog "Starting with versions of hplip >=3.9.8 mDNS is the default network search"
311 elog "mechanism. To make use of it you need to activate the zeroconf flag on cups."
312 elog "If you prefer the SLP method you have to choose this when configuring the"
313 elog "device."
314 elog "Note: For cups-1.4.x SLP is the only supported method as mDNS (zeroconf) is not"
315 elog "available here."
316
317 }
318
319 pkg_postrm() {
320 use !minimal && python_mod_cleanup /usr/share/${PN}
321 fdo-mime_desktop_database_update
322 }