gentoo resync : 25.04.2020

7 files changed, 45 insertions, 147 deletions

diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest
index 9b1e39eba206..738a70440902 100644
--- a/sci-libs/linux-gpib/Manifest
+++ b/sci-libs/linux-gpib/Manifest
@@ -1,10 +1,8 @@
 AUX linux-gpib-3.2.16-perl.patch 471 BLAKE2B a4cd09e10bd539b1ccb06e0272df923f52a196853c37276242fbb7545bc53915c751e2df1da8d13611e014e8ec4faf6f94746509d1d08c3aca127ce5ba2ebc14 SHA512 0ad75078406a8eb6fc09470be108464dcb3e7601d7a3c0813f1c6ba1d9e8f3895dea4da37f5d4928e6ea398a3aeea315a63bb6009a5fa211bba592093a776d10
-AUX linux-gpib-3.2.21-build.patch 1676 BLAKE2B 150957cb30830a633a454e42f914642427ae7af325dae6363705d87f64d439d2d95dde7e6b1c34ed2b8f5e6f6a898ca118bc1d6b8eddfabd511ce68ba5063f89 SHA512 df4229ee1ef181a9b58bf888cc85575feddb881d5d5c1f9dd43c14a7dd903a8854d898bd7d16f5cf2874133a9b5993fd59546fa1024421f66e10be62a6206f89
-AUX linux-gpib-4.0.3-reallydie.patch 621 BLAKE2B 367ea6a50513b86591e5dfe60df11a4bf5c380181197fe623d929d76af8610ace2d9f19f7918b39ae2608833a2579053bbb1a03d8bc8a7f8086e4254eaaf2546 SHA512 919229d276d5fddaa28c4ae7f9c8871966839cfb37be50903e92f43a5781345acfe512e6f07e90a55197cbf3fffb866695b308546a3fae88f480df9cf2e994a6
-AUX linux-gpib-4.0.4_rc2-kernel-4.11.0.patch 387 BLAKE2B 38516ea8a9ca5dd3dc32cfd605bd68100726bbcc8d96fa457caabfb91cbc17ce37e61194ac32e573acc797d71c448454d03e6202ec331cb25c056f8ee7b78829 SHA512 6f6b25695ae81671a93e8b86978ea1ef9e71ba5a38d14ad95b9a6aa59704bb2d6a8064c1ac006b1e7c4740d059184d4d4cefef88a2fd0c2a09406f64f6597187
+AUX linux-gpib-4.3.0-perl.patch 546 BLAKE2B 9695c1a9f48a2a8bcb5f5998c40eb909e6b1b3624defe87a08bc4b91b34f53e8176531678dff3d4810b0b85b811eb477795c0dffe0275b864c0e4d4bac9b0ea9 SHA512 21bf64366d4b68dcfc2f4fa932480f8ff6af62bf792fe90c0dd0330606c3b95c073040dfa87bd1e277391a02ad324612d58b6d618d83c637b3df60c638289d06
 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
-EBUILD linux-gpib-4.1.0.ebuild 6103 BLAKE2B a6624f370aa722e84c410a3bb2fa497a9fb43d56b4c5eeda3fe76ad77fe1fa4aa2f5e3ea8c92dbee63bbc9a328123446f7cd014cd20afc3d3800bebb18a09b05 SHA512 e53e2a0b156e409aedb6a0d22b050a79b2374cf2f3546b39c30ae265511920e3f70697521e6dc2be57eb57cfcd2fd96f4134dc7b4dd101a893a634e3492d14d3
+DIST linux-gpib-4.3.0.tar.gz 1375852 BLAKE2B e2daa444ddf4c0c34084f264247051d4ce1c8103d8ae5d91b02d4742131c1f92ded02775eb0f8b0ea29820e2ae7b61c3132c74084a876e86fbb4efaf11688773 SHA512 8db4eb6d606c68ffacc67988479684fec815fc552756a6c93466ef0dfc93368771bb551944e3afc31db83e72e464ec1fb289fdcf80b4a6be1617e734fe3b9d65
 EBUILD linux-gpib-4.2.0.ebuild 4612 BLAKE2B 615e338921fc8e4ee0d8e1b05de672fda188304c2d7c32b5a69e61e8beca401fb41026f96c84b64c8342377f88377b63a23d63e3975cec5ba65a7f2a80a464f2 SHA512 ed9f110809fd08dfdac987d9dafc475207e4d58c4c72878c40dfe2b538fcfcb73bc51865a3cd4cd37f23900db24cdc3d0b699ed11b8774b21f241754219e6a30
-MISC metadata.xml 688 BLAKE2B 405c816eb10feec819da0e5994c2ebe1e73ae4882cecf9f619bf30674b9ff499ae044cca42bad687d97cf3aef2a70eb826d5b07695cbde0c164a00cbac576e0a SHA512 d5af868c802d6c01b8267038cc5bdffc61677403ecb88cdfaf97f31d6b80d1e9318bcd507199d6a850df221cda2baf2869a1de4d732cde75a4aea2ec54f944b8
+EBUILD linux-gpib-4.3.0.ebuild 4812 BLAKE2B 7935aa4744316215aa91f057cbb5b7efd49d12eec852d0ee1ed176b6c4dc4929c8c6c7b0d716d21706020d12bf00c9f46cd28894a272516266a07a8f3571f005 SHA512 13b3fa6233b0c85a96ea9280af8f1ecadadc7265587e7349b1da713ccab2f981baa44c685f9bf3a24549e6eb1b3417899f151fb72f0467c4a65d713bca36d463
+MISC metadata.xml 547 BLAKE2B 1d0da80dd999dc402dbcdc80628e1fe97ec648b806cbd17cf20f6cbc33279afad81f71728e944a600108f28f90a61111e6bd9c36c7908a557d6cca6e41cdc759 SHA512 a88766b0372a88d090c032b45a973cf087a2172b088396fd1706a7c3818d6bf220de26848cb844d2ed555e3067bda6a00ffff598e0a0a59009ce33b3230b68a1
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/files/linux-gpib-4.3.0-perl.patch b/sci-libs/linux-gpib/files/linux-gpib-4.3.0-perl.patch
new file mode 100644
index 000000000000..b969435cd9c1
--- /dev/null
+++ b/sci-libs/linux-gpib/files/linux-gpib-4.3.0-perl.patch
@@ -0,0 +1,9 @@
+diff -ruN linux-gpib-user-4.3.0.orig/language/Makefile.am linux-gpib-user-4.3.0/language/Makefile.am
+--- linux-gpib-user-4.3.0.orig/language/Makefile.am	2019-08-23 11:30:12.000000000 +0300
++++ linux-gpib-user-4.3.0/language/Makefile.am	2020-04-18 16:15:15.558426112 +0300
+@@ -73,4 +73,4 @@
+ 	$(do_subst) < $(srcdir)/perl/Makefile.PL.in >perl/Makefile.PL
+ 
+ perl/Makefile: perl/Makefile.PL
+-	-(cd perl && $(PERL) Makefile.PL)
++	-(cd perl && $(PERL) Makefile.PL PREFIX=$(EPREFIX)/usr INSTALLDIRS=vendor INSTALLMAN3DIR='none' DESTDIR="$(DESTDIR)" )
diff --git a/sci-libs/linux-gpib/linux-gpib-4.1.0.ebuild b/sci-libs/linux-gpib/linux-gpib-4.3.0.ebuild
index eb8b21c8f17b..7e91689d224e 100644
--- a/sci-libs/linux-gpib/linux-gpib-4.1.0.ebuild
+++ b/sci-libs/linux-gpib/linux-gpib-4.3.0.ebuild
@@ -3,22 +3,22 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
 
-inherit linux-info readme.gentoo-r1 versionator eutils linux-mod autotools perl-functions python-single-r1 toolchain-funcs udev user
+inherit readme.gentoo-r1 autotools perl-functions python-single-r1 toolchain-funcs udev
 
-MY_PV=${PV/_/}
-
-DESCRIPTION="Kernel module and driver library for GPIB (IEEE 488.2) hardware"
+DESCRIPTION="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
+SRC_URI="mirror://sourceforge/linux-gpib/${P}.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"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="pcmcia static guile perl php python tcl doc firmware"
+
+S="${WORKDIR}/${PN}-user-${PV}"
 
 COMMONDEPEND="
 	sys-libs/readline:=
@@ -28,7 +28,10 @@ COMMONDEPEND="
 	php? ( dev-lang/php:= )
 	python? ( ${PYTHON_DEPS} )
 	firmware? ( sys-apps/fxload )"
-RDEPEND="${COMMONDEPEND}"
+RDEPEND="${COMMONDEPEND}
+	acct-group/gpib
+	~sci-libs/linux-gpib-modules-${PV}
+"
 DEPEND="${COMMONDEPEND}
 	virtual/pkgconfig
 	doc? ( app-text/docbook-sgml-utils )
@@ -37,72 +40,54 @@ DEPEND="${COMMONDEPEND}
 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
+	"${FILESDIR}"/${PN}-4.3.0-perl.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_unpack() {
+	default
+	unpack "${WORKDIR}/${P}/${PN}-user-${PV}.tar.gz"
 }
 
 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}
+		$(use_enable doc documentation)
 }
 
 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} \
+		HOTPLUG_USB_CONF_DIR=/etc/hotplug/usb \
+		UDEV_RULES_DIR="$(get_udevdir)"/rules.d \
+		USB_FIRMWARE_DIR=${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} \
+		HOTPLUG_USB_CONF_DIR=/etc/hotplug/usb \
+		UDEV_RULES_DIR="$(get_udevdir)"/rules.d \
+		USB_FIRMWARE_DIR=${FIRM_DIR} \
 		docdir=/usr/share/doc/${PF}/html install
 
 	if use perl; then
@@ -124,23 +109,10 @@ src_install() {
 	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
@@ -149,6 +121,14 @@ src_install() {
 	done
 
 	DOC_CONTENTS="
+As the udev rules were changed and refactored in this release it is
+necessary to remove any manually installed pre-4.3.0 gpib udev rules files
+in /etc/udev/rules.d/. The files to remove are:
+\n
+	99-agilent_82357a.rules\n
+	99-gpib-generic.rules\n
+	99-ni_usb_gpib.rules\n
+\n
 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
@@ -193,24 +173,6 @@ gpib_config --minor 0 --init-data /usr/share/linux-gpib/hp_82341/hp_82341c_fw.bi
 	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>