Gentoo Archives: gentoo-commits

From: "Andreas Hüttel" <dilfridge@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib/
Date: Fri, 20 Oct 2017 20:42:25
Message-Id: 1508530483.e5b791770c0d2cf7c278923f6ebc88515f568679.dilfridge@gentoo
1 commit: e5b791770c0d2cf7c278923f6ebc88515f568679
2 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 20 19:46:38 2017 +0000
4 Commit: Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 20 20:14:43 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5b79177
7
8 sci-libs/linux-gpib: Remove old
9
10 Package-Manager: Portage-2.3.11, Repoman-2.3.3
11
12 sci-libs/linux-gpib/Manifest | 2 -
13 sci-libs/linux-gpib/linux-gpib-4.0.3-r1.ebuild | 216 ------------------------
14 sci-libs/linux-gpib/linux-gpib-4.0.4_rc3.ebuild | 215 -----------------------
15 3 files changed, 433 deletions(-)
16
17 diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest
18 index 7e70088e0e4..5ca16ee8dd5 100644
19 --- a/sci-libs/linux-gpib/Manifest
20 +++ b/sci-libs/linux-gpib/Manifest
21 @@ -1,4 +1,2 @@
22 DIST gpib_firmware-2006-11-12.tar.gz 169357 SHA256 98380a8d12e6e34dccc0c1d82b48ed796c0c0f5571107d6a685524560aa8d701 SHA512 164d6fcfb3af43933f0a16645276f7d527a7aa24ef311f6ae3dcd7f45c41f92c855cf221bc946772f43fc2f9524057abc34bbd7d805c89b33ed7e111bc6870af WHIRLPOOL 44506c9d03e746f5bc88f9a2f20e07879a4c4c72f52a5dae97accb381f8ac7f5b5c0cf5c58d1045b18ed6cbda20549a1fdb7e5ab0151a1081da1ec798c683e67
23 -DIST linux-gpib-4.0.3.tar.gz 1311963 SHA256 6af5113978d179d2f281f5d779f235935371bdfbb15c6c7ca848bca5c3f17c4a SHA512 6eb65cae5220d3c7ca607eed5a641e8a68b422d0e76a787e767d3bffd0695672d5137d44a097483176e933ded5eb376ff57e3a61cddd62aceaa43192218c9cfe WHIRLPOOL f0df699fbdaa7d77abd114c8fef1b6ff3aacd67cc233a68f78b0db67b30baeab615beff89861ed47a70216e1fe0d73c518050f80c9d70d0c8199b2b159e068a1
24 -DIST linux-gpib-4.0.4rc3.tar.gz 1276866 SHA256 437c58fe9f1dc37a7dae7378821dcb7709b30de3701a92d3c67d63867f2ced3f SHA512 915db5c41b613706053b431aec5d0c3d1f309e8a949842f18ee011614fa126ee464c6d5d46744d10a4ae85a73bb7489280d25dddbf7724b0d5e32f65eae67829 WHIRLPOOL f492694b709aba1e06fc3d45c4c266e73230a4e494fb9ff64dec91ab25142b3a2c96546a4cc226718c236e57d4961cbdfa7ebb14d7867986de4ca05f91c6c9b3
25 DIST linux-gpib-4.1.0.tar.gz 1529480 SHA256 4cdd7f38e5b02aa6efe27745dae0e21084dbe3ff90b576fc0867be87a1791e26 SHA512 037ed9e484a83caccb15d2d142eef6f1eec356ae972480ca7a676a318d3e9f844fc1911c1b30869b4bb14ef0b4cd10587a803426df9145966bafe22ca7316bd8 WHIRLPOOL 598f66281577034c842d137015e03364a988f8e752901a0de87d26b3a9d50dc54cf73a4543880c846781e9613336794aeb0c28a7018b0046a45d358395fb94e9
26
27 diff --git a/sci-libs/linux-gpib/linux-gpib-4.0.3-r1.ebuild b/sci-libs/linux-gpib/linux-gpib-4.0.3-r1.ebuild
28 deleted file mode 100644
29 index 8e7b27438b4..00000000000
30 --- a/sci-libs/linux-gpib/linux-gpib-4.0.3-r1.ebuild
31 +++ /dev/null
32 @@ -1,216 +0,0 @@
33 -# Copyright 1999-2017 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI=6
37 -
38 -PYTHON_COMPAT=( python2_7 )
39 -
40 -inherit linux-info readme.gentoo-r1 versionator eutils linux-mod autotools perl-functions python-single-r1 toolchain-funcs udev user
41 -
42 -MY_PV=${PV/_/}
43 -
44 -DESCRIPTION="Kernel module and driver library for GPIB (IEEE 488.2) hardware"
45 -HOMEPAGE="http://linux-gpib.sourceforge.net/"
46 -SRC_URI="mirror://sourceforge/linux-gpib/${PN}-${MY_PV}.tar.gz
47 - firmware? ( http://linux-gpib.sourceforge.net/firmware/gpib_firmware-2006-11-12.tar.gz )
48 -"
49 -
50 -LICENSE="GPL-2"
51 -SLOT="0"
52 -KEYWORDS="amd64 ~arm ~x86"
53 -IUSE="isa pcmcia static debug guile perl php python tcl doc firmware"
54 -
55 -COMMONDEPEND="
56 - tcl? ( dev-lang/tcl:0= )
57 - guile? ( dev-scheme/guile:12 )
58 - perl? ( dev-lang/perl:= )
59 - php? ( dev-lang/php:= )
60 - python? ( ${PYTHON_DEPS} )
61 - firmware? ( sys-apps/fxload )"
62 -RDEPEND="${COMMONDEPEND}"
63 -DEPEND="${COMMONDEPEND}
64 - virtual/pkgconfig
65 - doc? ( app-text/docbook-sgml-utils )
66 - perl? ( virtual/perl-ExtUtils-MakeMaker )"
67 -
68 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
69 -
70 -PATCHES=(
71 - "${FILESDIR}"/${PN}-3.2.21-build.patch
72 - "${FILESDIR}"/${PN}-3.2.16-perl.patch
73 - "${FILESDIR}"/${PN}-4.0.3-reallydie.patch
74 -)
75 -
76 -S=${WORKDIR}/${PN}-${MY_PV}
77 -
78 -pkg_setup () {
79 - use perl && perl_set_version
80 - use python && python_setup
81 -
82 - CONFIG_CHECK="!VMAP_STACK"
83 - linux-mod_pkg_setup
84 -
85 - if kernel_is -lt 2 6 8; then
86 - die "Kernel versions older than 2.6.8 are not supported."
87 - fi
88 -
89 - # https://sourceforge.net/tracker/?func=detail&aid=3285657&group_id=42378&atid=432940
90 - if use pcmcia && kernel_is -ge 2 6 38; then
91 - die "pcmcia support is broken on kernels newer 2.6.38"
92 - fi
93 -}
94 -
95 -src_prepare () {
96 - default
97 - kernel_is ge 4 11 0 && eapply "${FILESDIR}"/${PN}-4.0.4_rc2-kernel-4.11.0.patch
98 - eautoreconf
99 -}
100 -
101 -src_configure() {
102 - set_arch_to_kernel
103 - econf \
104 - $(use_enable isa) \
105 - $(use_enable pcmcia) \
106 - $(use_enable static) \
107 - $(use_enable debug driver-debug) \
108 - $(use_enable guile guile-binding) \
109 - $(use_enable perl perl-binding) \
110 - $(use_enable php php-binding) \
111 - $(use_enable python python-binding) \
112 - $(use_enable tcl tcl-binding) \
113 - $(use_enable doc documentation) \
114 - --with-linux-srcdir=${KV_DIR}
115 -}
116 -
117 -src_compile() {
118 - set_arch_to_kernel
119 - FIRM_DIR=/usr/share/usb
120 - emake \
121 - DESTDIR="${D}" \
122 - INSTALL_MOD_PATH="${D}" \
123 - HOTPLUG_USB_CONF_DIR="${D}"/etc/hotplug/usb \
124 - UDEV_RULES_DIR="${D}$(get_udevdir)"/rules.d \
125 - USB_FIRMWARE_DIR="${D}"${FIRM_DIR} \
126 - docdir=/usr/share/doc/${PF}/html
127 -}
128 -
129 -src_install() {
130 - set_arch_to_kernel
131 - FIRM_DIR=/usr/share/usb
132 - emake \
133 - DESTDIR="${D}" \
134 - INSTALL_MOD_PATH="${D}" \
135 - HOTPLUG_USB_CONF_DIR="${D}"/etc/hotplug/usb \
136 - UDEV_RULES_DIR="${D}/$(get_udevdir)"/rules.d \
137 - USB_FIRMWARE_DIR="${D}"${FIRM_DIR} \
138 - docdir=/usr/share/doc/${PF}/html install
139 -
140 - if use perl; then
141 - einfo "Installing perl module"
142 - cd "${S}"/language/perl || die
143 - DESTDIR=${D} emake install
144 - perl_fix_packlist
145 - perl_delete_emptybsdir
146 - cd "${S}" || die
147 - fi
148 -
149 - echo "KERNEL==\"gpib[0-9]*\", MODE=\"0660\", GROUP=\"gpib\"" >> 99-gpib.rules
150 - udev_dorules 99-gpib.rules
151 -
152 - dodoc doc/linux-gpib.pdf ChangeLog AUTHORS README* NEWS
153 -
154 - insinto /etc
155 - newins util/templates/gpib.conf gpib.conf
156 - newins util/templates/gpib.conf gpib.conf.example
157 -
158 - if use pcmcia; then
159 - dodir /etc/pcmcia
160 - insinto /etc/pcmcia
161 - doins "${S}"/etc/pcmcia/*
162 - fi
163 -
164 - if use firmware; then
165 - insinto "${FIRM_DIR}"/agilent_82357a
166 - doins "${WORKDIR}"/gpib_firmware-2006-11-12/agilent_82357a/*
167 -
168 - insinto "${FIRM_DIR}"/ni_gpib_usb_b
169 - doins "${WORKDIR}"/gpib_firmware-2006-11-12/ni_gpib_usb_b/*
170 -
171 - insinto /usr/share/linux-gpib/hp_82341
172 - # do not install precompiled generate_firmware
173 - doins "${WORKDIR}"/gpib_firmware-2006-11-12/hp_82341/{*.bin,README}
174 - fi
175 -
176 - # fix rules files
177 - local f
178 - find "${D}$(get_udevdir)"/rules.d -type f -print0 | while read -rd '' f ; do
179 - grep -q "${D}" "${f}" && einfo "File ${f} contains a temporary path, fixing."
180 - sed -i -e "s:${D}:/:g" "${f}"
181 - done
182 -
183 - DOC_CONTENTS="
184 -You need to run the 'gpib_config' utility to setup the driver before
185 -you can use it. In order to do it automatically you can add to your
186 -start script something like this (supposing the appropriate driver
187 -is loaded on the startup):
188 -\n
189 - gpib_config --minor 0
190 -\n
191 -To give a user access to the computer's gpib board you will have to add
192 -them to the group 'gpib' or, you could change the permissions on the device
193 -files /dev/gpib[0-15] to something you like better, using 'chmod'
194 -\n
195 -Edit /etc/gpib.conf to match your interface board, and any devices you wish
196 -to open via ibfind(). See the documentation in /usr/share/linux-gpib/html for
197 -more information.
198 -\n
199 -"
200 -
201 - if use pcmcia; then
202 - DOC_CONTENTS+='
203 -For PCMCIA cards:\n
204 -All files needed for a PCMCIA board were copied to /etc/pcmcia.
205 -You may wish to edit the options passed to the gpib_config call in the
206 -/etc/pcmcia/linux-gpib-pcmcia script.
207 -You may need to send a SIGHUP signal to the cardmgr daemon to force it
208 -to reload the files in /etc/pcmcia \(alternatively you could use your
209 -pcmcia init.d script to restart the cardmgr, or you could just reboot\).
210 -The driver module will be loaded as needed by the cardmgr.
211 -
212 -'
213 - fi
214 -
215 - if use firmware; then
216 - DOC_CONTENTS+='
217 -For Agilent \(HP\) 82341C and 82341D cards:
218 -The firmware for these boards is uploaded by passing the appropriate
219 -firmware file from /usr/share/linux-gpib/hp_82341 directory to
220 -gpib_config using the -I or --init-data command line option. Example:\n
221 -gpib_config --minor 0 --init-data /usr/share/linux-gpib/hp_82341/hp_82341c_fw.bin
222 -'
223 - fi
224 -
225 - readme.gentoo_create_doc
226 -}
227 -
228 -pkg_preinst () {
229 - linux-mod_pkg_preinst
230 - use perl && perl_set_version
231 - enewgroup gpib
232 -}
233 -
234 -pkg_postinst () {
235 - linux-mod_pkg_postinst
236 - readme.gentoo_print_elog
237 -
238 - local v
239 - for v in ${REPLACING_VERSIONS}; do
240 - if ! version_is_at_least 3.2.21-r1 ${v}; then
241 - ewarn "sci-libs/linux-gpib-3.2.21-r1 introduces incompatible changes to the kernel"
242 - ewarn "interface. You may need to reboot to make sure the newly built driver modules"
243 - ewarn "are used (some of the driver modules cannot be unloaded)."
244 - ewarn "If you do not do this, every gpib call will just result in an error message."
245 - break
246 - fi
247 - done
248 -}
249
250 diff --git a/sci-libs/linux-gpib/linux-gpib-4.0.4_rc3.ebuild b/sci-libs/linux-gpib/linux-gpib-4.0.4_rc3.ebuild
251 deleted file mode 100644
252 index 16db1db6608..00000000000
253 --- a/sci-libs/linux-gpib/linux-gpib-4.0.4_rc3.ebuild
254 +++ /dev/null
255 @@ -1,215 +0,0 @@
256 -# Copyright 1999-2017 Gentoo Foundation
257 -# Distributed under the terms of the GNU General Public License v2
258 -
259 -EAPI=6
260 -
261 -PYTHON_COMPAT=( python2_7 )
262 -
263 -inherit linux-info readme.gentoo-r1 versionator eutils linux-mod autotools perl-functions python-single-r1 toolchain-funcs udev user
264 -
265 -MY_PV=${PV/_/}
266 -
267 -DESCRIPTION="Kernel module and driver library for GPIB (IEEE 488.2) hardware"
268 -HOMEPAGE="http://linux-gpib.sourceforge.net/"
269 -SRC_URI="mirror://sourceforge/linux-gpib/${PN}-${MY_PV}.tar.gz
270 - firmware? ( http://linux-gpib.sourceforge.net/firmware/gpib_firmware-2006-11-12.tar.gz )
271 -"
272 -
273 -LICENSE="GPL-2"
274 -SLOT="0"
275 -KEYWORDS="~amd64 ~arm ~x86"
276 -IUSE="isa pcmcia static debug guile perl php python tcl doc firmware"
277 -
278 -COMMONDEPEND="
279 - tcl? ( dev-lang/tcl:0= )
280 - guile? ( dev-scheme/guile:12 )
281 - perl? ( dev-lang/perl:= )
282 - php? ( dev-lang/php:= )
283 - python? ( ${PYTHON_DEPS} )
284 - firmware? ( sys-apps/fxload )"
285 -RDEPEND="${COMMONDEPEND}"
286 -DEPEND="${COMMONDEPEND}
287 - virtual/pkgconfig
288 - doc? ( app-text/docbook-sgml-utils )
289 - perl? ( virtual/perl-ExtUtils-MakeMaker )"
290 -
291 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
292 -
293 -PATCHES=(
294 - "${FILESDIR}"/${PN}-3.2.21-build.patch
295 - "${FILESDIR}"/${PN}-3.2.16-perl.patch
296 - "${FILESDIR}"/${PN}-4.0.3-reallydie.patch
297 -)
298 -
299 -S=${WORKDIR}/${PN}-${MY_PV}
300 -
301 -pkg_setup () {
302 - use perl && perl_set_version
303 - use python && python_setup
304 -
305 - linux-mod_pkg_setup
306 -
307 - if kernel_is -lt 2 6 8; then
308 - die "Kernel versions older than 2.6.8 are not supported."
309 - fi
310 -
311 - # https://sourceforge.net/tracker/?func=detail&aid=3285657&group_id=42378&atid=432940
312 - if use pcmcia && kernel_is -ge 2 6 38; then
313 - die "pcmcia support is broken on kernels newer 2.6.38"
314 - fi
315 -}
316 -
317 -src_prepare () {
318 - default
319 - kernel_is ge 4 11 0 && eapply "${FILESDIR}"/${PN}-4.0.4_rc2-kernel-4.11.0.patch
320 - eautoreconf
321 -}
322 -
323 -src_configure() {
324 - set_arch_to_kernel
325 - econf \
326 - $(use_enable isa) \
327 - $(use_enable pcmcia) \
328 - $(use_enable static) \
329 - $(use_enable debug driver-debug) \
330 - $(use_enable guile guile-binding) \
331 - $(use_enable perl perl-binding) \
332 - $(use_enable php php-binding) \
333 - $(use_enable python python-binding) \
334 - $(use_enable tcl tcl-binding) \
335 - $(use_enable doc documentation) \
336 - --with-linux-srcdir=${KV_DIR}
337 -}
338 -
339 -src_compile() {
340 - set_arch_to_kernel
341 - FIRM_DIR=/usr/share/usb
342 - emake \
343 - DESTDIR="${D}" \
344 - INSTALL_MOD_PATH="${D}" \
345 - HOTPLUG_USB_CONF_DIR="${D}"/etc/hotplug/usb \
346 - UDEV_RULES_DIR="${D}$(get_udevdir)"/rules.d \
347 - USB_FIRMWARE_DIR="${D}"${FIRM_DIR} \
348 - docdir=/usr/share/doc/${PF}/html
349 -}
350 -
351 -src_install() {
352 - set_arch_to_kernel
353 - FIRM_DIR=/usr/share/usb
354 - emake \
355 - DESTDIR="${D}" \
356 - INSTALL_MOD_PATH="${D}" \
357 - HOTPLUG_USB_CONF_DIR="${D}"/etc/hotplug/usb \
358 - UDEV_RULES_DIR="${D}/$(get_udevdir)"/rules.d \
359 - USB_FIRMWARE_DIR="${D}"${FIRM_DIR} \
360 - docdir=/usr/share/doc/${PF}/html install
361 -
362 - if use perl; then
363 - einfo "Installing perl module"
364 - cd "${S}"/language/perl || die
365 - DESTDIR=${D} emake install
366 - perl_fix_packlist
367 - perl_delete_emptybsdir
368 - cd "${S}" || die
369 - fi
370 -
371 - echo "KERNEL==\"gpib[0-9]*\", MODE=\"0660\", GROUP=\"gpib\"" >> 99-gpib.rules
372 - udev_dorules 99-gpib.rules
373 -
374 - dodoc doc/linux-gpib.pdf ChangeLog AUTHORS README* NEWS
375 -
376 - insinto /etc
377 - newins util/templates/gpib.conf gpib.conf
378 - newins util/templates/gpib.conf gpib.conf.example
379 -
380 - if use pcmcia; then
381 - dodir /etc/pcmcia
382 - insinto /etc/pcmcia
383 - doins "${S}"/etc/pcmcia/*
384 - fi
385 -
386 - if use firmware; then
387 - insinto "${FIRM_DIR}"/agilent_82357a
388 - doins "${WORKDIR}"/gpib_firmware-2006-11-12/agilent_82357a/*
389 -
390 - insinto "${FIRM_DIR}"/ni_gpib_usb_b
391 - doins "${WORKDIR}"/gpib_firmware-2006-11-12/ni_gpib_usb_b/*
392 -
393 - insinto /usr/share/linux-gpib/hp_82341
394 - # do not install precompiled generate_firmware
395 - doins "${WORKDIR}"/gpib_firmware-2006-11-12/hp_82341/{*.bin,README}
396 - fi
397 -
398 - # fix rules files
399 - local f
400 - find "${D}$(get_udevdir)"/rules.d -type f -print0 | while read -rd '' f ; do
401 - grep -q "${D}" "${f}" && einfo "File ${f} contains a temporary path, fixing."
402 - sed -i -e "s:${D}:/:g" "${f}"
403 - done
404 -
405 - DOC_CONTENTS="
406 -You need to run the 'gpib_config' utility to setup the driver before
407 -you can use it. In order to do it automatically you can add to your
408 -start script something like this (supposing the appropriate driver
409 -is loaded on the startup):
410 -\n
411 - gpib_config --minor 0
412 -\n
413 -To give a user access to the computer's gpib board you will have to add
414 -them to the group 'gpib' or, you could change the permissions on the device
415 -files /dev/gpib[0-15] to something you like better, using 'chmod'
416 -\n
417 -Edit /etc/gpib.conf to match your interface board, and any devices you wish
418 -to open via ibfind(). See the documentation in /usr/share/linux-gpib/html for
419 -more information.
420 -\n
421 -"
422 -
423 - if use pcmcia; then
424 - DOC_CONTENTS+='
425 -For PCMCIA cards:\n
426 -All files needed for a PCMCIA board were copied to /etc/pcmcia.
427 -You may wish to edit the options passed to the gpib_config call in the
428 -/etc/pcmcia/linux-gpib-pcmcia script.
429 -You may need to send a SIGHUP signal to the cardmgr daemon to force it
430 -to reload the files in /etc/pcmcia \(alternatively you could use your
431 -pcmcia init.d script to restart the cardmgr, or you could just reboot\).
432 -The driver module will be loaded as needed by the cardmgr.
433 -
434 -'
435 - fi
436 -
437 - if use firmware; then
438 - DOC_CONTENTS+='
439 -For Agilent \(HP\) 82341C and 82341D cards:
440 -The firmware for these boards is uploaded by passing the appropriate
441 -firmware file from /usr/share/linux-gpib/hp_82341 directory to
442 -gpib_config using the -I or --init-data command line option. Example:\n
443 -gpib_config --minor 0 --init-data /usr/share/linux-gpib/hp_82341/hp_82341c_fw.bin
444 -'
445 - fi
446 -
447 - readme.gentoo_create_doc
448 -}
449 -
450 -pkg_preinst () {
451 - linux-mod_pkg_preinst
452 - use perl && perl_set_version
453 - enewgroup gpib
454 -}
455 -
456 -pkg_postinst () {
457 - linux-mod_pkg_postinst
458 - readme.gentoo_print_elog
459 -
460 - local v
461 - for v in ${REPLACING_VERSIONS}; do
462 - if ! version_is_at_least 3.2.21-r1 ${v}; then
463 - ewarn "sci-libs/linux-gpib-3.2.21-r1 introduces incompatible changes to the kernel"
464 - ewarn "interface. You may need to reboot to make sure the newly built driver modules"
465 - ewarn "are used (some of the driver modules cannot be unloaded)."
466 - ewarn "If you do not do this, every gpib call will just result in an error message."
467 - break
468 - fi
469 - done
470 -}