diff options
| -rw-r--r-- | sci-libs/linux-gpib/Manifest | 1 | ||||
| -rw-r--r-- | sci-libs/linux-gpib/files/linux-gpib-3.2.21-build.patch | 44 | ||||
| -rw-r--r-- | sci-libs/linux-gpib/files/linux-gpib-4.0.3-reallydie.patch | 16 | ||||
| -rw-r--r-- | sci-libs/linux-gpib/files/linux-gpib-4.0.4_rc2-kernel-4.11.0.patch | 10 | ||||
| -rw-r--r-- | sci-libs/linux-gpib/linux-gpib-4.1.0.ebuild | 216 | ||||
| -rw-r--r-- | sci-libs/linux-gpib/metadata.xml | 1 |
6 files changed, 0 insertions, 288 deletions
diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest index fa366720b807..c499d53193a8 100644 --- a/sci-libs/linux-gpib/Manifest +++ b/sci-libs/linux-gpib/Manifest @@ -1,4 +1,3 @@ DIST gpib_firmware-2006-11-12.tar.gz 169357 BLAKE2B 05f1be78545e025d76e2b9819a5dcac5a6715dfbb6df5c6fbe8b78900adf8ca7b1c28db350674ff1dd9c77e24507e98b536ca1af8b558c9a46ef8c25034c9769 SHA512 164d6fcfb3af43933f0a16645276f7d527a7aa24ef311f6ae3dcd7f45c41f92c855cf221bc946772f43fc2f9524057abc34bbd7d805c89b33ed7e111bc6870af -DIST linux-gpib-4.1.0.tar.gz 1529480 BLAKE2B b49df07f15d0f91b9d475052993421979d6776ef15aaa9b7e49632db9018f0cbd9ff38d12e2afa9e8027202e450dfc487ac9e2e6ab719086646d983cc41b3482 SHA512 037ed9e484a83caccb15d2d142eef6f1eec356ae972480ca7a676a318d3e9f844fc1911c1b30869b4bb14ef0b4cd10587a803426df9145966bafe22ca7316bd8 DIST linux-gpib-4.2.0.tar.gz 1431440 BLAKE2B 7b6adf562963e0785f960c072f3f3d67cb91df9090205d8fecb0dc3170d3a1ac3719732919bae112e06b47387499ffe49a0144e72caa27ba39c85c8b98e56786 SHA512 1505c2c04f16bf7e92b9dd474f09edd242520a96f9e4d8eea88ebd44d0a82d653055155c1bfcde69da5355d609d400e3cb682da8aae83f59f1e565307a3fc4a7 DIST linux-gpib-4.3.0.tar.gz 1375852 BLAKE2B e2daa444ddf4c0c34084f264247051d4ce1c8103d8ae5d91b02d4742131c1f92ded02775eb0f8b0ea29820e2ae7b61c3132c74084a876e86fbb4efaf11688773 SHA512 8db4eb6d606c68ffacc67988479684fec815fc552756a6c93466ef0dfc93368771bb551944e3afc31db83e72e464ec1fb289fdcf80b4a6be1617e734fe3b9d65 diff --git a/sci-libs/linux-gpib/files/linux-gpib-3.2.21-build.patch b/sci-libs/linux-gpib/files/linux-gpib-3.2.21-build.patch deleted file mode 100644 index 86ce197ba821..000000000000 --- a/sci-libs/linux-gpib/files/linux-gpib-3.2.21-build.patch +++ /dev/null @@ -1,44 +0,0 @@ -diff -ruN linux-gpib-3.2.21.orig/drivers/Makefile.am linux-gpib-3.2.21/drivers/Makefile.am ---- linux-gpib-3.2.21.orig/drivers/Makefile.am 2014-12-13 11:27:55.000000000 +0100 -+++ linux-gpib-3.2.21/drivers/Makefile.am 2014-12-17 17:51:47.152588400 +0100 -@@ -28,39 +28,13 @@ - CC="$(LINUX_CC) -I@abs_top_srcdir@ -I@abs_top_srcdir@/drivers/gpib/include -I@abs_top_srcdir@/include" \ - SUBDIRS="$(GPIB_ABS_MODULE_SUBDIR)" - --install-data-hook: device-file-check /etc/gpib.conf -+install-data-hook: /etc/gpib.conf - $(MAKE) -C $(LINUX_SRCDIR) V=1 modules_install\ - CC="$(LINUX_CC) -I@abs_top_srcdir@ -I@abs_top_srcdir@/driver/include -I@abs_top_srcdir@/include" \ - SUBDIRS="$(GPIB_ABS_MODULE_SUBDIR)" INSTALL_MOD_DIR="gpib" -- $(DEPMOD) -a -- --/dev/gpib0: -- groupadd gpib || echo "group gpib exists" -- for i in `seq 0 15`; \ -- do \ -- mknod -m u=rw,g=rw,o= /dev/gpib$${i} c $(IBMAJOR) $${i} || exit 1; \ -- chown root:gpib /dev/gpib$${i}; \ -- done -- --.PHONY : device-file-check --device-file-check: /dev/gpib0 -- @if [ ! -c /dev/gpib0 ]; then \ -- if [ -a /dev/gpib0 ]; then \ -- echo "A file or directory called /dev/gpib0 exists but it is not" \ -- "a character device. Delete or move it and try again."; \ -- exit 1; \ -- fi; \ -- fi -- @ls -l /dev/gpib0 | grep -q "$(IBMAJOR)"; \ -- if [ $$? != 0 ]; then \ -- echo "/dev/gpib0 has the wrong major number. " \ -- "Delete your /dev/gpibX files and try again."; \ -- exit 1; \ -- fi - - #should move this to util/templates Makefile.am when it exists - /etc/gpib.conf: -- $(INSTALL_DATA) -D $(top_srcdir)/util/templates/gpib.conf /etc/gpib.conf - - #make sure compiled files, etc don't make it into distribution tarballs - dist-hook: diff --git a/sci-libs/linux-gpib/files/linux-gpib-4.0.3-reallydie.patch b/sci-libs/linux-gpib/files/linux-gpib-4.0.3-reallydie.patch deleted file mode 100644 index e19f8d36755b..000000000000 --- a/sci-libs/linux-gpib/files/linux-gpib-4.0.3-reallydie.patch +++ /dev/null @@ -1,16 +0,0 @@ -Index: drivers/Makefile.am -=================================================================== ---- a/drivers/Makefile.am (revision 1602) -+++ b/drivers/Makefile.am (working copy) -@@ -15,10 +15,8 @@ - - -include $(top_srcdir)/util/linux_flags/flags - --#ignore errors from kernel's make modules in all-local, to avoid failure of make install --#on nfs filesystem with root_squash - all-local: -- -$(MAKE) -C $(LINUX_SRCDIR) V=1 modules\ -+ $(MAKE) -C $(LINUX_SRCDIR) V=1 modules\ - CC="$(LINUX_CC) -I@abs_top_srcdir@ -I@abs_top_srcdir@/drivers/gpib/include -I@abs_top_srcdir@/include" \ - SUBDIRS="$(GPIB_ABS_MODULE_SUBDIR)" - diff --git a/sci-libs/linux-gpib/files/linux-gpib-4.0.4_rc2-kernel-4.11.0.patch b/sci-libs/linux-gpib/files/linux-gpib-4.0.4_rc2-kernel-4.11.0.patch deleted file mode 100644 index c3a9764924c2..000000000000 --- a/sci-libs/linux-gpib/files/linux-gpib-4.0.4_rc2-kernel-4.11.0.patch +++ /dev/null @@ -1,10 +0,0 @@ ---- linux-gpib-4.0.4rc2.orig/drivers/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c 2016-06-22 09:48:47.000000000 +0100 -+++ linux-gpib-4.0.4rc2/drivers/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c 2017-05-02 00:59:04.509950834 +0100 -@@ -37,6 +37,7 @@ - #include <linux/file.h> - #include <linux/timer.h> - #include <linux/delay.h> -+#include <linux/sched/signal.h> - #include <asm/uaccess.h> - - #include "gpibP.h" diff --git a/sci-libs/linux-gpib/linux-gpib-4.1.0.ebuild b/sci-libs/linux-gpib/linux-gpib-4.1.0.ebuild deleted file mode 100644 index eb8b21c8f17b..000000000000 --- a/sci-libs/linux-gpib/linux-gpib-4.1.0.ebuild +++ /dev/null @@ -1,216 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -PYTHON_COMPAT=( python2_7 ) - -inherit linux-info readme.gentoo-r1 versionator eutils linux-mod autotools perl-functions python-single-r1 toolchain-funcs udev user - -MY_PV=${PV/_/} - -DESCRIPTION="Kernel module and driver library for GPIB (IEEE 488.2) hardware" -HOMEPAGE="https://linux-gpib.sourceforge.io/" -SRC_URI="mirror://sourceforge/linux-gpib/${PN}-${MY_PV}.tar.gz - firmware? ( https://linux-gpib.sourceforge.io/firmware/gpib_firmware-2006-11-12.tar.gz ) -" - -LICENSE="GPL-2" -SLOT="0" -KEYWORDS="amd64 ~arm ~x86" -IUSE="isa pcmcia static debug guile perl php python tcl doc firmware" - -COMMONDEPEND=" - sys-libs/readline:= - tcl? ( dev-lang/tcl:0= ) - guile? ( dev-scheme/guile:12 ) - perl? ( dev-lang/perl:= ) - php? ( dev-lang/php:= ) - python? ( ${PYTHON_DEPS} ) - firmware? ( sys-apps/fxload )" -RDEPEND="${COMMONDEPEND}" -DEPEND="${COMMONDEPEND} - virtual/pkgconfig - doc? ( app-text/docbook-sgml-utils ) - perl? ( virtual/perl-ExtUtils-MakeMaker )" - -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" - -PATCHES=( - "${FILESDIR}"/${PN}-3.2.21-build.patch - "${FILESDIR}"/${PN}-3.2.16-perl.patch - "${FILESDIR}"/${PN}-4.0.3-reallydie.patch -) - -S=${WORKDIR}/${PN}-${MY_PV} - -pkg_setup() { - use perl && perl_set_version - use python && python_setup - - linux-mod_pkg_setup - - if kernel_is -lt 2 6 8; then - die "Kernel versions older than 2.6.8 are not supported." - fi - - # https://sourceforge.net/p/linux-gpib/bugs/43/ - if use pcmcia && kernel_is -ge 2 6 38; then - die "pcmcia support is broken on kernels newer 2.6.38" - fi -} - -src_prepare() { - default - kernel_is ge 4 11 0 && eapply "${FILESDIR}"/${PN}-4.0.4_rc2-kernel-4.11.0.patch - eautoreconf -} - -src_configure() { - set_arch_to_kernel - econf \ - $(use_enable isa) \ - $(use_enable pcmcia) \ - $(use_enable static) \ - $(use_enable debug driver-debug) \ - $(use_enable guile guile-binding) \ - $(use_enable perl perl-binding) \ - $(use_enable php php-binding) \ - $(use_enable python python-binding) \ - $(use_enable tcl tcl-binding) \ - $(use_enable doc documentation) \ - --with-linux-srcdir=${KV_DIR} -} - -src_compile() { - set_arch_to_kernel - FIRM_DIR=/usr/share/usb - emake \ - DESTDIR="${D}" \ - INSTALL_MOD_PATH="${D}" \ - HOTPLUG_USB_CONF_DIR="${D}"/etc/hotplug/usb \ - UDEV_RULES_DIR="${D}$(get_udevdir)"/rules.d \ - USB_FIRMWARE_DIR="${D}"${FIRM_DIR} \ - docdir=/usr/share/doc/${PF}/html -} - -src_install() { - set_arch_to_kernel - FIRM_DIR=/usr/share/usb - emake \ - DESTDIR="${D}" \ - INSTALL_MOD_PATH="${D}" \ - HOTPLUG_USB_CONF_DIR="${D}"/etc/hotplug/usb \ - UDEV_RULES_DIR="${D}/$(get_udevdir)"/rules.d \ - USB_FIRMWARE_DIR="${D}"${FIRM_DIR} \ - docdir=/usr/share/doc/${PF}/html install - - if use perl; then - einfo "Installing perl module" - cd "${S}"/language/perl || die - DESTDIR=${D} emake install - perl_fix_packlist - perl_delete_emptybsdir - cd "${S}" || die - fi - - echo "KERNEL==\"gpib[0-9]*\", MODE=\"0660\", GROUP=\"gpib\"" >> 99-gpib.rules - udev_dorules 99-gpib.rules - - dodoc doc/linux-gpib.pdf ChangeLog AUTHORS README* NEWS - - insinto /etc - newins util/templates/gpib.conf gpib.conf - newins util/templates/gpib.conf gpib.conf.example - - if use pcmcia; then - dodir /etc/pcmcia - insinto /etc/pcmcia - doins "${S}"/etc/pcmcia/* - fi - - if use firmware; then - insinto "${FIRM_DIR}"/agilent_82357a - doins "${WORKDIR}"/gpib_firmware-2006-11-12/agilent_82357a/* - - insinto "${FIRM_DIR}"/ni_gpib_usb_b - doins "${WORKDIR}"/gpib_firmware-2006-11-12/ni_gpib_usb_b/* - - insinto /usr/share/linux-gpib/hp_82341 - # do not install precompiled generate_firmware - doins "${WORKDIR}"/gpib_firmware-2006-11-12/hp_82341/{*.bin,README} - fi - - # fix rules files - local f - find "${D}$(get_udevdir)"/rules.d -type f -print0 | while read -rd '' f ; do - grep -q "${D}" "${f}" && einfo "File ${f} contains a temporary path, fixing." - sed -i -e "s:${D}:/:g" "${f}" - done - - DOC_CONTENTS=" -You need to run the 'gpib_config' utility to setup the driver before -you can use it. In order to do it automatically you can add to your -start script something like this (supposing the appropriate driver -is loaded on the startup): -\n - gpib_config --minor 0 -\n -To give a user access to the computer's gpib board you will have to add -them to the group 'gpib' or, you could change the permissions on the device -files /dev/gpib[0-15] to something you like better, using 'chmod' -\n -Edit /etc/gpib.conf to match your interface board, and any devices you wish -to open via ibfind(). See the documentation in /usr/share/linux-gpib/html for -more information. -\n -" - - if use pcmcia; then - DOC_CONTENTS+=' -For PCMCIA cards:\n -All files needed for a PCMCIA board were copied to /etc/pcmcia. -You may wish to edit the options passed to the gpib_config call in the -/etc/pcmcia/linux-gpib-pcmcia script. -You may need to send a SIGHUP signal to the cardmgr daemon to force it -to reload the files in /etc/pcmcia \(alternatively you could use your -pcmcia init.d script to restart the cardmgr, or you could just reboot\). -The driver module will be loaded as needed by the cardmgr. - -' - fi - - if use firmware; then - DOC_CONTENTS+=' -For Agilent \(HP\) 82341C and 82341D cards: -The firmware for these boards is uploaded by passing the appropriate -firmware file from /usr/share/linux-gpib/hp_82341 directory to -gpib_config using the -I or --init-data command line option. Example:\n -gpib_config --minor 0 --init-data /usr/share/linux-gpib/hp_82341/hp_82341c_fw.bin -' - fi - - readme.gentoo_create_doc -} - -pkg_preinst() { - linux-mod_pkg_preinst - use perl && perl_set_version - enewgroup gpib -} - -pkg_postinst() { - linux-mod_pkg_postinst - readme.gentoo_print_elog - - local v - for v in ${REPLACING_VERSIONS}; do - if ! version_is_at_least 3.2.21-r1 ${v}; then - ewarn "sci-libs/linux-gpib-3.2.21-r1 introduces incompatible changes to the kernel" - ewarn "interface. You may need to reboot to make sure the newly built driver modules" - ewarn "are used (some of the driver modules cannot be unloaded)." - ewarn "If you do not do this, every gpib call will just result in an error message." - break - fi - done -} diff --git a/sci-libs/linux-gpib/metadata.xml b/sci-libs/linux-gpib/metadata.xml index 18c6ece75d7b..0943a596eef1 100644 --- a/sci-libs/linux-gpib/metadata.xml +++ b/sci-libs/linux-gpib/metadata.xml @@ -11,7 +11,6 @@ </maintainer> <use> <flag name="firmware">Install firmware</flag> - <flag name="isa">Build ISA kernel modules; from 3.12 on the setting is ignored and the decision based on the kernel configuration</flag> </use> <upstream> <remote-id type="sourceforge">linux-gpib</remote-id> |