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: Thu, 02 Aug 2018 18:12:19
Message-Id: 1533233516.d27fb6ea5300f3d36b50bdd6a3bf52ee7e119f4f.billie@gentoo
1 commit: d27fb6ea5300f3d36b50bdd6a3bf52ee7e119f4f
2 Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
3 AuthorDate: Thu Aug 2 18:11:56 2018 +0000
4 Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
5 CommitDate: Thu Aug 2 18:11:56 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d27fb6ea
7
8 net-print/hplip: Remove old.
9
10 Package-Manager: Portage-2.3.40, Repoman-2.3.9
11
12 net-print/hplip/Manifest | 1 -
13 net-print/hplip/hplip-3.18.5.ebuild | 268 ------------------------------------
14 2 files changed, 269 deletions(-)
15
16 diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
17 index 1142a7a9e13..5e30d32c007 100644
18 --- a/net-print/hplip/Manifest
19 +++ b/net-print/hplip/Manifest
20 @@ -1,5 +1,4 @@
21 DIST hplip-3.17.10.tar.gz 23878364 BLAKE2B 0165bcb00159572a16277624db0de4b2ca8421d5cf42418bf406548dd68a7d5087142a74a0e6ca332936b006f6ffeaa4d9202c5332fd1f971923bb142adb244f SHA512 0c1c78730d269ec41f95bbde887a490aebb4c9c3dcb9784052a1c3b537c12093cbc426e1f79266c63dd5e7adecdda0735b9bf964ddc1307b2c6603f3fa0462a8
22 DIST hplip-3.17.9-patches-1.tar.xz 8484 BLAKE2B 3a1f25d0554af5597266eb5ed3ff9f594560671784a89ade6246e9287661bf17fa16c555391c3f685e59aec8c548560911065a9c4188906c2f00c755f503fe49 SHA512 125f9cfd1c3cad662ce33954b8ab9ab1898368b449c4ad78dfe99f29de8025183773272b9865cd22b976a30c502e38254ce0ac59d685299dff7f9314927d546a
23 DIST hplip-3.18.3-patches-2.tar.xz 8936 BLAKE2B 58c17f3b6332de1edd88a3b458f1e9f856bc917842f62eee0808469ec14ff5793cd33c7a2ba30593eba624e58c12a6d426fa43a7d375d6ac50b985b895a85b4c SHA512 cbafcd9616f9c86318007b703325d3429ed0698c3fc9d3eddd422e4cd7a16c77320ac168bfa01b5874213e1740cfaae1867d31c3cf96cd57573ad33651a674ed
24 -DIST hplip-3.18.5.tar.gz 22437406 BLAKE2B d32c38209b8a60c6ca7fe89512409d4d32bf095097cdc499a1afeb985c9add2da5e99b12b307f1cf0c4513071f2d4b62291d7624fe982579e8781ace5f533f6a SHA512 2c99bb446af604a2f011f9dd5ddf4bf5019b7cd36a0ecb1cbe6dce0c0358b8472a695ad85d09e52c3e63de8a69e2a3e7081c61ec36f44aae2770b5fef0f67516
25 DIST hplip-3.18.6.tar.gz 22590564 BLAKE2B edbc80120bb332de9848e528095839b8f3496404ae83482a17bb8bd196c30dd8d3fca4d3dbb60c048bfbeeddd4384b4d7844798dad993eaf52d5418a9391b4ad SHA512 deb4e6e1c7e9ea7452967f7d7d7fd93e92eb59406b4978bb9b874db93bc5022b25aab012a7420ac3e991259032bc7cb749cd924c93a164544e29a4152962184f
26
27 diff --git a/net-print/hplip/hplip-3.18.5.ebuild b/net-print/hplip/hplip-3.18.5.ebuild
28 deleted file mode 100644
29 index 00309e5ab47..00000000000
30 --- a/net-print/hplip/hplip-3.18.5.ebuild
31 +++ /dev/null
32 @@ -1,268 +0,0 @@
33 -# Copyright 1999-2018 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
37 -
38 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
39 -PYTHON_REQ_USE="threads,xml"
40 -
41 -# 14 and 15 spit out a lot of warnings about subdirs
42 -WANT_AUTOMAKE="1.13"
43 -
44 -inherit autotools linux-info python-single-r1 readme.gentoo-r1 udev
45 -
46 -DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools"
47 -HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing"
48 -SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
49 - https://dev.gentoo.org/~billie/distfiles/${PN}-3.18.3-patches-2.tar.xz"
50 -
51 -LICENSE="GPL-2"
52 -SLOT="0"
53 -KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
54 -
55 -IUSE="doc fax +hpcups hpijs kde libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
56 -
57 -# dependency on dev-python/notify-python dropped due to python 3 incompatibility
58 -# possible replacement notify2 (https://pypi.org/project/notify2/0.3) not in tree
59 -
60 -COMMON_DEPEND="
61 - net-print/cups
62 - virtual/jpeg:0
63 - hpijs? ( net-print/cups-filters[foomatic] )
64 - !minimal? (
65 - ${PYTHON_DEPS}
66 - sys-apps/dbus
67 - !libusb0? ( virtual/libusb:1 )
68 - libusb0? ( virtual/libusb:0 )
69 - scanner? ( media-gfx/sane-backends )
70 - snmp? (
71 - !libressl? ( dev-libs/openssl:0= )
72 - libressl? ( dev-libs/libressl:= )
73 - net-analyzer/net-snmp
74 - )
75 - )
76 -"
77 -DEPEND="${COMMON_DEPEND}
78 - virtual/pkgconfig
79 -"
80 -RDEPEND="${COMMON_DEPEND}
81 - app-text/ghostscript-gpl
82 - !minimal? (
83 - >=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]
84 - $(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_USEDEP}]' 'python2*')
85 - $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*')
86 - fax? ( dev-python/reportlab[${PYTHON_USEDEP}] )
87 - kernel_linux? ( virtual/udev )
88 - qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}] )
89 - scanner? (
90 - >=dev-python/reportlab-3.2[${PYTHON_USEDEP}]
91 - >=dev-python/pillow-3.1.1[${PYTHON_USEDEP}]
92 - X? ( || (
93 - kde? ( kde-misc/skanlite )
94 - media-gfx/xsane
95 - media-gfx/sane-frontends
96 - ) )
97 - )
98 - )
99 - policykit? ( sys-auth/polkit )
100 -"
101 -
102 -REQUIRED_USE="!minimal? ( ${PYTHON_REQUIRED_USE} )"
103 -
104 -PATCHES=(
105 - "${WORKDIR}/patches"
106 -)
107 -
108 -CONFIG_CHECK="~PARPORT ~PPDEV"
109 -ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
110 -
111 -#DISABLE_AUTOFORMATTING="yes"
112 -DOC_CONTENTS="
113 -For more information on setting up your printer please take
114 -a look at the hplip section of the gentoo printing guide:
115 -https://wiki.gentoo.org/wiki/Printing
116 -
117 -Any user who wants to print must be in the lp group.
118 -"
119 -
120 -pkg_setup() {
121 - use !minimal && python-single-r1_pkg_setup
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 - default
142 -
143 - if use !minimal ; then
144 - python_export EPYTHON PYTHON
145 - python_fix_shebang .
146 - fi
147 -
148 - # Make desktop files follow the specification
149 - # Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
150 - # Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
151 - sed -i -e '/^Categories=/s/Application;//' \
152 - -e '/^Encoding=.*/d' hplip.desktop.in || die
153 - sed -i -e '/^Categories=/s/Application;//' \
154 - -e '/^Version=.*/d' \
155 - -e '/^Comment=.*/d' hplip-systray.desktop.in || die
156 -
157 - # Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
158 - # Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
159 - # https://bugs.launchpad.net/hplip/+bug/500086
160 - local udevdir=$(get_udevdir)
161 - sed -i -e "s|/etc/udev|${udevdir}|g" \
162 - $(find . -type f -exec grep -l /etc/udev {} +) || die
163 -
164 - # Force recognition of Gentoo distro by hp-check
165 - sed -i \
166 - -e "s:file('/etc/issue', 'r').read():'Gentoo':" \
167 - installer/core_install.py || die
168 -
169 - eautoreconf
170 -}
171 -
172 -src_configure() {
173 - local myconf drv_build minimal_build
174 -
175 - if use libusb0 ; then
176 - myconf="${myconf} --enable-libusb01_build"
177 - else
178 - myconf="${myconf} --disable-libusb01_build"
179 - fi
180 -
181 - if use hpcups ; then
182 - drv_build="$(use_enable hpcups hpcups-install)"
183 - if use static-ppds ; then
184 - drv_build="${drv_build} --enable-cups-ppd-install"
185 - drv_build="${drv_build} --disable-cups-drv-install"
186 - else
187 - drv_build="${drv_build} --enable-cups-drv-install"
188 - drv_build="${drv_build} --disable-cups-ppd-install"
189 - fi
190 - else
191 - drv_build="--disable-hpcups-install"
192 - drv_build="${drv_build} --disable-cups-drv-install"
193 - drv_build="${drv_build} --disable-cups-ppd-install"
194 - fi
195 -
196 - if use hpijs ; then
197 - drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
198 - if use static-ppds ; then
199 - drv_build="${drv_build} --enable-foomatic-ppd-install"
200 - drv_build="${drv_build} --disable-foomatic-drv-install"
201 - else
202 - drv_build="${drv_build} --enable-foomatic-drv-install"
203 - drv_build="${drv_build} --disable-foomatic-ppd-install"
204 - fi
205 - else
206 - drv_build="${drv_build} --disable-hpijs-install"
207 - drv_build="${drv_build} --disable-foomatic-drv-install"
208 - drv_build="${drv_build} --disable-foomatic-ppd-install"
209 - fi
210 -
211 - if use minimal ; then
212 - if use hpijs ; then
213 - minimal_build="--enable-hpijs-only-build"
214 - else
215 - minimal_build="--disable-hpijs-only-build"
216 - fi
217 - if use hpcups ; then
218 - minimal_build="${minimal_build} --enable-hpcups-only-build"
219 - else
220 - minimal_build="${minimal_build} --disable-hpcups-only-build"
221 - fi
222 - fi
223 -
224 - # disable class driver for now
225 - econf \
226 - --disable-cups11-build \
227 - --disable-lite-build \
228 - --disable-foomatic-rip-hplip-install \
229 - --disable-shadow-build \
230 - --disable-qt3 \
231 - --disable-qt4 \
232 - --disable-udev_sysfs_rules \
233 - --with-cupsbackenddir=$(cups-config --serverbin)/backend \
234 - --with-cupsfilterdir=$(cups-config --serverbin)/filter \
235 - --with-docdir=/usr/share/doc/${PF} \
236 - --with-htmldir=/usr/share/doc/${PF}/html \
237 - ${myconf} \
238 - ${drv_build} \
239 - ${minimal_build} \
240 - --enable-hpps-install \
241 - --disable-class-driver \
242 - $(use_enable doc doc-build) \
243 - $(use_enable fax fax-build) \
244 - $(use_enable !minimal gui-build) \
245 - $(use_enable !minimal dbus-build) \
246 - $(use_enable parport pp-build) \
247 - $(use_enable policykit) \
248 - $(use_enable qt5) \
249 - $(use_enable scanner scan-build) \
250 - $(use_enable snmp network-build)
251 -
252 - # hpijs ppds are created at configure time but are not installed (3.17.11)
253 -
254 - # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
255 - # The hpcups driver does not use foomatic-rip
256 - #local i
257 - #for i in ppd/hpijs/*.ppd.gz ; do
258 - # rm -f ${i}.temp || die
259 - # gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
260 - # gzip > ${i}.temp || die
261 - # mv ${i}.temp ${i} || die
262 - #done
263 -}
264 -
265 -src_install() {
266 - # Disable parallel install
267 - # Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=578018
268 - emake -j1 DESTDIR="${D}" install
269 - einstalldocs
270 - # default
271 -
272 - # Installed by sane-backends
273 - # Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
274 - rm -f "${ED%/}"/etc/sane.d/dll.conf || die
275 -
276 - # Remove desktop and autostart files
277 - # Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=638770
278 - use qt5 || {
279 - rm -Rf "${ED}"/usr/share/applications "${ED}"/etc/xdg
280 - }
281 -
282 - rm -f "${ED%/}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
283 - rmdir --ignore-fail-on-non-empty "${ED%/}"/usr/share/doc/${PF}/ || die
284 -
285 - # Remove hal fdi files
286 - rm -rf "${ED%/}"/usr/share/hal || die
287 -
288 - find "${D}" -name '*.la' -delete || die
289 -
290 - if use !minimal ; then
291 - python_export EPYTHON PYTHON
292 - python_optimize "${ED%/}"/usr/share/hplip
293 - fi
294 -
295 - readme.gentoo_create_doc
296 -}
297 -
298 -pkg_postinst() {
299 - readme.gentoo_print_elog
300 -}