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