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: Mon, 04 Sep 2017 15:55:20
Message-Id: 1504540509.54ded4c5ac8f9c2dd1b8a9647111e65d61e1f027.billie@gentoo
1 commit: 54ded4c5ac8f9c2dd1b8a9647111e65d61e1f027
2 Author: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
3 AuthorDate: Mon Sep 4 15:55:09 2017 +0000
4 Commit: Daniel Pielmeier <billie <AT> gentoo <DOT> org>
5 CommitDate: Mon Sep 4 15:55:09 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54ded4c5
7
8 net-print/hplip: Remove old.
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.1
11
12 net-print/hplip/Manifest | 1 -
13 net-print/hplip/hplip-3.17.4.ebuild | 254 ------------------------------------
14 2 files changed, 255 deletions(-)
15
16 diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
17 index b19ca4c6bbd..162a78e6227 100644
18 --- a/net-print/hplip/Manifest
19 +++ b/net-print/hplip/Manifest
20 @@ -1,6 +1,5 @@
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.17.4.tar.gz 23212715 SHA256 e6f6ef71f7da80a620983c940b636054153a287994a13dfec1d5c86b15afe6ef SHA512 ea295502df5b6c44839a7c03a725dc7475d256994eac2a7950058a68c805ca4942611df2688384c8acbc6551009841bb4623e7a3e7c8c0b16f44a2215a7316e6 WHIRLPOOL 92354dc97090e9a472e28df7f61f60b9af3c582584036b1be153ca74e2dc5f6a08beff4febbcc9f0e269a6d408a62686881e1295546cc5c1c0f091715d35a319
25 DIST hplip-3.17.6.tar.gz 23620156 SHA256 80287834aad7e3fa30f2e252ff281d351e3f2eb15267ac541531353dc7b5107e SHA512 370fa0e07f4f5b4dc4a6f52b02271102894da98bc902912ff1770a9e5029d486227f4170ff90a063c686d23e8bd075961073ecc59961419a226a850db9e71738 WHIRLPOOL d938d36cba1c9d34e02709e75209a9c4e0bc7db0f7fbbb875bab41e57009a9522f12cf5bcfc03530d5ad46c2b2bb3575e68898e8071116a03240cd7042e4b2b0
26 DIST hplip-3.17.7.tar.gz 23644395 SHA256 3577bd5afd40b73fd754664ad69f0187dde2e64879e7446309f2ed9fd7dc400d SHA512 f88c16d5b6e1986df5b7c1081802ed4832849de8d8b01961231965b115731eb9bd5c18fa52d5bf2eb412927b9de0057bf8025a1579b053c4d8441f0ad4e7ce3f WHIRLPOOL 2e0f0743ffce6d66970815d621a55618a00c360f2f4aa31a1742fcd17ad246a2717f5507b1b4910a93ea5fc06b5d7e87dfb2f08c50993c85bb6a654d13faf527
27
28 diff --git a/net-print/hplip/hplip-3.17.4.ebuild b/net-print/hplip/hplip-3.17.4.ebuild
29 deleted file mode 100644
30 index 2fb4096c454..00000000000
31 --- a/net-print/hplip/hplip-3.17.4.ebuild
32 +++ /dev/null
33 @@ -1,254 +0,0 @@
34 -# Copyright 1999-2017 Gentoo Foundation
35 -# Distributed under the terms of the GNU General Public License v2
36 -
37 -EAPI=6
38 -
39 -PYTHON_COMPAT=( python{2_7,3_4,3_5} )
40 -PYTHON_REQ_USE="threads,xml"
41 -
42 -inherit autotools linux-info python-single-r1 readme.gentoo-r1 udev
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 libressl -libusb0 minimal parport policykit 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 - net-print/cups
60 - virtual/jpeg:0
61 - hpijs? ( net-print/cups-filters[foomatic] )
62 - !minimal? (
63 - ${PYTHON_DEPS}
64 - sys-apps/dbus
65 - !libusb0? ( virtual/libusb:1 )
66 - libusb0? ( virtual/libusb:0 )
67 - scanner? ( media-gfx/sane-backends )
68 - snmp? (
69 - !libressl? ( dev-libs/openssl:0= )
70 - libressl? ( dev-libs/libressl:= )
71 - net-analyzer/net-snmp
72 - )
73 - )
74 -"
75 -DEPEND="${COMMON_DEPEND}
76 - virtual/pkgconfig
77 -"
78 -RDEPEND="${COMMON_DEPEND}
79 - app-text/ghostscript-gpl
80 - !minimal? (
81 - >=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]
82 - $(python_gen_cond_dep 'dev-python/pygobject:2[${PYTHON_USEDEP}]' 'python2*')
83 - $(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*')
84 - fax? ( dev-python/reportlab[${PYTHON_USEDEP}] )
85 - kernel_linux? ( virtual/udev )
86 - qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}] )
87 - scanner? (
88 - >=dev-python/reportlab-3.2[${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 - )
97 - policykit? ( sys-auth/polkit )
98 -"
99 -
100 -REQUIRED_USE="!minimal? ( ${PYTHON_REQUIRED_USE} )"
101 -
102 -PATCHES=(
103 - "${WORKDIR}/patches"
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 scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
122 -
123 - if ! use hpcups && ! use hpijs ; then
124 - ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
125 - ewarn "which is probably not what you want."
126 - ewarn "You will almost certainly not be able to print."
127 - fi
128 -
129 - if use minimal ; then
130 - ewarn "Installing driver portions only, make sure you know what you are doing."
131 - ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
132 - ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
133 - else
134 - use parport && linux-info_pkg_setup
135 - fi
136 -}
137 -
138 -src_prepare() {
139 - default
140 -
141 - if use !minimal ; then
142 - python_export EPYTHON PYTHON
143 - python_fix_shebang .
144 - fi
145 -
146 - # Make desktop files follow the specification
147 - # Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
148 - # Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
149 - sed -i -e '/^Categories=/s/Application;//' \
150 - -e '/^Encoding=.*/d' hplip.desktop.in || die
151 - sed -i -e '/^Categories=/s/Application;//' \
152 - -e '/^Version=.*/d' \
153 - -e '/^Comment=.*/d' hplip-systray.desktop.in || die
154 -
155 - # Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
156 - # Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
157 - # https://bugs.launchpad.net/hplip/+bug/500086
158 - local udevdir=$(get_udevdir)
159 - sed -i -e "s|/etc/udev|${udevdir}|g" \
160 - $(find . -type f -exec grep -l /etc/udev {} +) || die
161 -
162 - # Force recognition of Gentoo distro by hp-check
163 - sed -i \
164 - -e "s:file('/etc/issue', 'r').read():'Gentoo':" \
165 - installer/core_install.py || die
166 -
167 - # Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
168 - # The hpcups driver does not use foomatic-rip
169 - local i
170 - for i in ppd/hpijs/*.ppd.gz ; do
171 - rm -f ${i}.temp || die
172 - gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
173 - gzip > ${i}.temp || die
174 - mv ${i}.temp ${i} || die
175 - done
176 -
177 - eautoreconf
178 -}
179 -
180 -src_configure() {
181 - local myconf drv_build minimal_build
182 -
183 - if use libusb0 ; then
184 - myconf="${myconf} --enable-libusb01_build"
185 - else
186 - myconf="${myconf} --disable-libusb01_build"
187 - fi
188 -
189 - if use hpcups ; then
190 - drv_build="$(use_enable hpcups hpcups-install)"
191 - if use static-ppds ; then
192 - drv_build="${drv_build} --enable-cups-ppd-install"
193 - drv_build="${drv_build} --disable-cups-drv-install"
194 - else
195 - drv_build="${drv_build} --enable-cups-drv-install"
196 - drv_build="${drv_build} --disable-cups-ppd-install"
197 - fi
198 - else
199 - drv_build="--disable-hpcups-install"
200 - drv_build="${drv_build} --disable-cups-drv-install"
201 - drv_build="${drv_build} --disable-cups-ppd-install"
202 - fi
203 -
204 - if use hpijs ; then
205 - drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
206 - if use static-ppds ; then
207 - drv_build="${drv_build} --enable-foomatic-ppd-install"
208 - drv_build="${drv_build} --disable-foomatic-drv-install"
209 - else
210 - drv_build="${drv_build} --enable-foomatic-drv-install"
211 - drv_build="${drv_build} --disable-foomatic-ppd-install"
212 - fi
213 - else
214 - drv_build="${drv_build} --disable-hpijs-install"
215 - drv_build="${drv_build} --disable-foomatic-drv-install"
216 - drv_build="${drv_build} --disable-foomatic-ppd-install"
217 - fi
218 -
219 - if use minimal ; then
220 - if use hpijs ; then
221 - minimal_build="--enable-hpijs-only-build"
222 - else
223 - minimal_build="--disable-hpijs-only-build"
224 - fi
225 - if use hpcups ; then
226 - minimal_build="${minimal_build} --enable-hpcups-only-build"
227 - else
228 - minimal_build="${minimal_build} --disable-hpcups-only-build"
229 - fi
230 - fi
231 -
232 - econf \
233 - --disable-cups11-build \
234 - --disable-lite-build \
235 - --disable-foomatic-rip-hplip-install \
236 - --disable-shadow-build \
237 - --disable-qt3 \
238 - --disable-qt4 \
239 - --disable-udev_sysfs_rules \
240 - --with-cupsbackenddir=$(cups-config --serverbin)/backend \
241 - --with-cupsfilterdir=$(cups-config --serverbin)/filter \
242 - --with-docdir=/usr/share/doc/${PF} \
243 - --with-htmldir=/usr/share/doc/${PF}/html \
244 - ${myconf} \
245 - ${drv_build} \
246 - ${minimal_build} \
247 - $(use_enable doc doc-build) \
248 - $(use_enable fax fax-build) \
249 - $(use_enable !minimal gui-build) \
250 - $(use_enable !minimal dbus-build) \
251 - $(use_enable parport pp-build) \
252 - $(use_enable policykit) \
253 - $(use_enable qt5) \
254 - $(use_enable scanner scan-build) \
255 - $(use_enable snmp network-build)
256 -}
257 -
258 -src_install() {
259 - # disable parallel install
260 - # Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=578018
261 - emake -j1 DESTDIR="${D}" install
262 - einstalldocs
263 - # default
264 -
265 - # Installed by sane-backends
266 - # Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
267 - rm -f "${ED%/}"/etc/sane.d/dll.conf || die
268 -
269 - rm -f "${ED%/}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
270 - rmdir --ignore-fail-on-non-empty "${ED%/}"/usr/share/doc/${PF}/ || die
271 -
272 - # Remove hal fdi files
273 - rm -rf "${ED%/}"/usr/share/hal || die
274 -
275 - find "${D}" -name '*.la' -delete || die
276 -
277 - if use !minimal ; then
278 - python_export EPYTHON PYTHON
279 - python_optimize "${ED%/}"/usr/share/hplip
280 - fi
281 -
282 - readme.gentoo_create_doc
283 -}
284 -
285 -pkg_postinst() {
286 - readme.gentoo_print_elog
287 -}