Gentoo Archives: gentoo-commits

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