gentoo resync : 25.04.2020

4 files changed, 9 insertions, 70 deletions

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)" )