Gentoo Archives: gentoo-commits

From: Daniel Pielmeier <billie@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: net-print/hplip/
Date: Sat, 27 Aug 2016 09:07:53
Message-Id: 1472288859.be3139cfcdf75446eb59890dddbdd7f59c300d4f.billie@gentoo
1 commit: be3139cfcdf75446eb59890dddbdd7f59c300d4f
2 Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
3 AuthorDate: Sat Aug 27 09:07:39 2016 +0000
4 Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
5 CommitDate: Sat Aug 27 09:07:39 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be3139cf
7
8 net-print/hplip: Remove old.
9
10 Package-Manager: portage-2.2.28
11
12 net-print/hplip/Manifest | 1 -
13 net-print/hplip/hplip-3.16.5-r1.ebuild | 264 ---------------------------------
14 2 files changed, 265 deletions(-)
15
16 diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
17 index 965aba6..b7bdce9 100644
18 --- a/net-print/hplip/Manifest
19 +++ b/net-print/hplip/Manifest
20 @@ -3,5 +3,4 @@ DIST hplip-3.14.10.tar.gz 21773429 SHA256 11b3cd8311dea6b22a4c80be1e5d021e84d15a
21 DIST hplip-3.16.2-patches-1.tar.xz 8188 SHA256 8a9a78e0caac1731eae79f047a6054b411c237c579fdfd07bc59d435db708705 SHA512 7eb03c093cfb9ef6b9a980ef5520575310d080c45ed13191933a5facaf9bbb04b38c8381762a3ecd33884ad582830e61e17b6c17f2ed7cdf910670e05eed2510 WHIRLPOOL 6721eac17977485eae0cb22b1702d0479003e3639e806ecd3c5888f1b5015a0bf904512104ebefee4b3d5f64abebd0608090e00310ec8d5b48f210c7e4a95e4e
22 DIST hplip-3.16.3.tar.gz 22408596 SHA256 42d2302ee38bda41caa0f2f9524a91f531e3aa432814ffd45b3e5c396dc30194 SHA512 32d2f88c0983208e77592f73bf65cf2900cd6aa234d09220a18b45b5fc4bd0d10e9cfc8c7a10639e5a51ad5f5d0f8ed7bd477d08c86b89c633a1bbcd42682915 WHIRLPOOL b287ecf80c2e7b0da0de0afefcf60c507f9d42c74dbba1e745b4b43f253a5b0dedb6398a1f073e14d196296da47764e983138c0151e05bfc7a5dd416458662a0
23 DIST hplip-3.16.5-patches-1.tar.xz 8200 SHA256 98866e57a247e7a30d9cd584ed9411aa79a6185294a73b4cc5961efe9a5e5fa6 SHA512 36d33da5fc4105183cbc5137845ddccd8ab2b6abbff053a3a51f3da61c26c2d9d48dcb735345fb453abd67b6a0797aa337102c366cce037bc7006599b20b1646 WHIRLPOOL 8ac91bdefeb177c092b1d6de16474e8e1da57ad046dbc579f14fd40a27d1837d9bf142573137ef8d91c37dc7b03ca908fd5bfad23a9815af2015b521091c2700
24 -DIST hplip-3.16.5.tar.gz 22662561 SHA256 c609516003c9613c51e2ef24503e535f8d93693dd618cb6397a2d71f70315ed9 SHA512 5fdf7dc710158af2aff651f23df9da88dd8443668f738cc143be66bd53952189dd3c87f73741a5af7369d48d465d6dd3936e45eff59bfc4146243c4897a8434b WHIRLPOOL 003a663048210d9c4ce53ac8de009df48454c7d2a73cf8685d90c2cc6a8b8952363009fa565f68f517858c5e36ac3ffa74fa282a7f37cd0b229741fd4824d457
25 DIST hplip-3.16.7.tar.gz 22872438 SHA256 9dfe0642636f2b40cb7f1c178e7ab8a794f4d0be8f75be348d1b681793f3ffc2 SHA512 68fb6748bd04809c58f0739c31487b79042f8ae89a642aa3fdcb9ee4474a319ab880c3e95b318465a70ff2ee112b576a398ef98ae3a0de45e60fba3357af6abb WHIRLPOOL 9a7a5ea51214ffd4b1604e613ccbf726ebca9cdc3ef0fe2c221611d67da9b97dcdfa01079396339e7f2382d2040f3d4e7da7782cdc5372c08a25e0c66d83f9c3
26
27 diff --git a/net-print/hplip/hplip-3.16.5-r1.ebuild b/net-print/hplip/hplip-3.16.5-r1.ebuild
28 deleted file mode 100644
29 index 291f450..00000000
30 --- a/net-print/hplip/hplip-3.16.5-r1.ebuild
31 +++ /dev/null
32 @@ -1,264 +0,0 @@
33 -# Copyright 1999-2016 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -# $Id$
36 -
37 -EAPI=6
38 -
39 -PYTHON_COMPAT=( python{2_7,3_3,3_4} )
40 -PYTHON_REQ_USE="threads,xml"
41 -
42 -inherit eutils linux-info python-single-r1 readme.gentoo-r1 udev autotools
43 -
44 -DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools"
45 -HOMEPAGE="http://hplipopensource.com/hplip-web/index.html"
46 -SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
47 - https://dev.gentoo.org/~billie/distfiles/${PN}-3.16.5-patches-1.tar.xz"
48 -
49 -LICENSE="GPL-2"
50 -SLOT="0"
51 -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
52 -
53 -IUSE="doc fax +hpcups hpijs kde -libusb0 minimal parport policykit +qt4 qt5 scanner +snmp static-ppds X"
54 -
55 -# dependency on dev-python/notify-python dropped due to python 3 incompatibility
56 -# possible replacement notify2 (https://pypi.python.org/pypi/notify2/0.3) not in tree
57 -
58 -COMMON_DEPEND="
59 - virtual/jpeg:0
60 - hpijs? (
61 - || ( >=net-print/cups-filters-1.0.43-r1[foomatic] >=net-print/foomatic-filters-3.0.20080507[cups] )
62 - )
63 - >=net-print/cups-1.4.0
64 - !minimal? (
65 - ${PYTHON_DEPS}
66 - !libusb0? ( virtual/libusb:1 )
67 - libusb0? ( virtual/libusb:0 )
68 - scanner? ( >=media-gfx/sane-backends-1.0.19-r1 )
69 - fax? ( >=sys-apps/dbus-1.6.8-r1 )
70 - snmp? (
71 - net-analyzer/net-snmp
72 - dev-libs/openssl:0
73 - )
74 - )"
75 -
76 -DEPEND="${COMMON_DEPEND}
77 - virtual/pkgconfig"
78 -
79 -RDEPEND="${COMMON_DEPEND}
80 - >=app-text/ghostscript-gpl-8.71-r3
81 - policykit? ( sys-auth/polkit )
82 - !minimal? (
83 - >=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]
84 - dev-python/pygobject[${PYTHON_USEDEP}]
85 - kernel_linux? ( virtual/udev )
86 - scanner? (
87 - >=dev-python/reportlab-3.1.44-r2[${PYTHON_USEDEP}]
88 - >=dev-python/pillow-3.1.1[${PYTHON_USEDEP}]
89 - X? ( || (
90 - kde? ( kde-misc/skanlite )
91 - media-gfx/xsane
92 - media-gfx/sane-frontends
93 - ) )
94 - )
95 - fax? ( >=dev-python/reportlab-3.1.44-r2[${PYTHON_USEDEP}] )
96 - qt4? ( >=dev-python/PyQt4-4.11.1[dbus,X,${PYTHON_USEDEP}] )
97 - qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,${PYTHON_USEDEP}] )
98 - )"
99 -
100 -REQUIRED_USE="
101 - !minimal? ( ${PYTHON_REQUIRED_USE} )
102 - !minimal? ( qt4? ( !qt5 ) )
103 -"
104 -
105 -CONFIG_CHECK="~PARPORT ~PPDEV"
106 -ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
107 -
108 -#DISABLE_AUTOFORMATTING="yes"
109 -DOC_CONTENTS="
110 -For more information on setting up your printer please take
111 -a look at the hplip section of the gentoo printing guide:
112 -https://wiki.gentoo.org/wiki/Printing
113 -
114 -Any user who wants to print must be in the lp group.
115 -"
116 -
117 -pkg_setup() {
118 - use !minimal && python-single-r1_pkg_setup
119 -
120 - ! use qt4 && ! use qt5 && ewarn "You need USE=qt4 or USE=qt5 for the hplip GUI."
121 -
122 - use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
123 -
124 - if ! use hpcups && ! use hpijs ; then
125 - ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
126 - ewarn "which is probably not what you want."
127 - ewarn "You will almost certainly not be able to print."
128 - fi
129 -
130 - if use minimal ; then
131 - ewarn "Installing driver portions only, make sure you know what you are doing."
132 - ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
133 - ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
134 - else
135 - use parport && linux-info_pkg_setup
136 - fi
137 -}
138 -
139 -src_prepare() {
140 - eapply "${WORKDIR}/patches"
141 -
142 - default
143 -
144 - if use !minimal ; then
145 - python_export EPYTHON PYTHON
146 - python_fix_shebang .
147 - fi
148 -
149 - # Make desktop files follow the specification
150 - # Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
151 - # Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
152 - sed -i -e '/^Categories=/s/Application;//' \
153 - -e '/^Encoding=.*/d' hplip.desktop.in || die
154 - sed -i -e '/^Categories=/s/Application;//' \
155 - -e '/^Version=.*/d' \
156 - -e '/^Comment=.*/d' hplip-systray.desktop.in || die
157 -
158 - # Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
159 - # Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
160 - # https://bugs.launchpad.net/hplip/+bug/500086
161 - local udevdir=$(get_udevdir)
162 - sed -i -e "s|/etc/udev|${udevdir}|g" \
163 - $(find . -type f -exec grep -l /etc/udev {} +) || die
164 -
165 - # Force recognition of Gentoo distro by hp-check
166 - sed -i \
167 - -e "s:file('/etc/issue', 'r').read():'Gentoo':" \
168 - installer/core_install.py || die
169 -
170 - # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
171 - # The hpcups driver does not use foomatic-rip
172 - local i
173 - for i in ppd/hpijs/*.ppd.gz ; do
174 - rm -f ${i}.temp || die
175 - gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
176 - gzip > ${i}.temp || die
177 - mv ${i}.temp ${i} || die
178 - done
179 -
180 - eautoreconf
181 -}
182 -
183 -src_configure() {
184 - local myconf drv_build minimal_build
185 -
186 - if use qt4 || use qt5 ; then
187 - myconf="${myconf} --enable-gui-build"
188 - else
189 - myconf="${myconf} --disable-gui-build"
190 - fi
191 -
192 - if use fax || use qt4 || use qt5 ; then
193 - myconf="${myconf} --enable-dbus-build"
194 - else
195 - myconf="${myconf} --disable-dbus-build"
196 - fi
197 -
198 - if use libusb0 ; then
199 - myconf="${myconf} --enable-libusb01_build"
200 - else
201 - myconf="${myconf} --disable-libusb01_build"
202 - fi
203 -
204 - if use hpcups ; then
205 - drv_build="$(use_enable hpcups hpcups-install)"
206 - if use static-ppds ; then
207 - drv_build="${drv_build} --enable-cups-ppd-install"
208 - drv_build="${drv_build} --disable-cups-drv-install"
209 - else
210 - drv_build="${drv_build} --enable-cups-drv-install"
211 - drv_build="${drv_build} --disable-cups-ppd-install"
212 - fi
213 - else
214 - drv_build="--disable-hpcups-install"
215 - drv_build="${drv_build} --disable-cups-drv-install"
216 - drv_build="${drv_build} --disable-cups-ppd-install"
217 - fi
218 -
219 - if use hpijs ; then
220 - drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
221 - if use static-ppds ; then
222 - drv_build="${drv_build} --enable-foomatic-ppd-install"
223 - drv_build="${drv_build} --disable-foomatic-drv-install"
224 - else
225 - drv_build="${drv_build} --enable-foomatic-drv-install"
226 - drv_build="${drv_build} --disable-foomatic-ppd-install"
227 - fi
228 - else
229 - drv_build="${drv_build} --disable-hpijs-install"
230 - drv_build="${drv_build} --disable-foomatic-drv-install"
231 - drv_build="${drv_build} --disable-foomatic-ppd-install"
232 - fi
233 -
234 - if use minimal ; then
235 - if use hpijs ; then
236 - minimal_build="--enable-hpijs-only-build"
237 - else
238 - minimal_build="--disable-hpijs-only-build"
239 - fi
240 - if use hpcups ; then
241 - minimal_build="${minimal_build} --enable-hpcups-only-build"
242 - else
243 - minimal_build="${minimal_build} --disable-hpcups-only-build"
244 - fi
245 - fi
246 -
247 - econf \
248 - --disable-cups11-build \
249 - --disable-lite-build \
250 - --disable-foomatic-rip-hplip-install \
251 - --disable-shadow-build \
252 - --disable-qt3 \
253 - --disable-udev_sysfs_rules \
254 - --with-cupsbackenddir=$(cups-config --serverbin)/backend \
255 - --with-cupsfilterdir=$(cups-config --serverbin)/filter \
256 - --with-docdir=/usr/share/doc/${PF} \
257 - --with-htmldir=/usr/share/doc/${PF}/html \
258 - ${myconf} \
259 - ${drv_build} \
260 - ${minimal_build} \
261 - $(use_enable doc doc-build) \
262 - $(use_enable fax fax-build) \
263 - $(use_enable parport pp-build) \
264 - $(use_enable scanner scan-build) \
265 - $(use_enable snmp network-build) \
266 - $(use_enable qt4) \
267 - $(use_enable qt5) \
268 - $(use_enable policykit)
269 -}
270 -
271 -src_install() {
272 - default
273 -
274 - # Installed by sane-backends
275 - # Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
276 - rm -f "${D}"/etc/sane.d/dll.conf || die
277 -
278 - rm -f "${D}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
279 - rmdir --ignore-fail-on-non-empty "${D}"/usr/share/doc/${PF}/ || die
280 -
281 - # Remove hal fdi files
282 - rm -rf "${D}"/usr/share/hal || die
283 -
284 - prune_libtool_files --all
285 -
286 - if use !minimal ; then
287 - python_export EPYTHON PYTHON
288 - python_optimize "${D}"/usr/share/hplip
289 - fi
290 -
291 - readme.gentoo_create_doc
292 -}
293 -
294 -pkg_postinst() {
295 - readme.gentoo_print_elog
296 -}