gentoo resync : 22.10.2018

5 files changed, 133 insertions, 0 deletions

diff --git a/sci-libs/linux-gpib-modules/Manifest b/sci-libs/linux-gpib-modules/Manifest
new file mode 100644
index 000000000000..3877c6abcc6f
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -0,0 +1,5 @@
+AUX linux-gpib-modules-4.0.4_rc2-kernel-4.11.0.patch 387 BLAKE2B 38516ea8a9ca5dd3dc32cfd605bd68100726bbcc8d96fa457caabfb91cbc17ce37e61194ac32e573acc797d71c448454d03e6202ec331cb25c056f8ee7b78829 SHA512 6f6b25695ae81671a93e8b86978ea1ef9e71ba5a38d14ad95b9a6aa59704bb2d6a8064c1ac006b1e7c4740d059184d4d4cefef88a2fd0c2a09406f64f6597187
+AUX linux-gpib-modules-4.2.0_rc1-reallydie.patch 737 BLAKE2B 198c078a168071e04efcfdad11bf93c2682ab2f2160d7f93fc9c49fdcd2cbbe9174be53502fa5a2c0eedf448e0f438130646cfe902673383925156244a80bf5d SHA512 96b7e459da514f4a4f84e746a3121baa0076c479ad435fd182a90714aeec21d32dcdbb6871deacab532c722e89970aa7cbccbcbea494195dfa86c7ebb95142d9
+DIST linux-gpib-kernel-4.2.0_rc1.tar.gz 332525 BLAKE2B e84f9da9902d139474cf68e49922f7b402c6d11113eab8c009683c1b4304a505eb6aba86a60b019e4d3ad0ef1d003c743f14f60b61b3d7f31e8aeca99a4a16c1 SHA512 8bf1a2b04d6128c513c5d13549fb95e563e719e43ffb3b303fc5aa2376f57a69774c1afdb901281933f6b253068461ce59bd9564146a0c5a6483e1ccc47d259f
+EBUILD linux-gpib-modules-4.2.0_rc1.ebuild 1587 BLAKE2B 8e27c06ac44e9bbecf2925a9f93380fce2afcd110c37640ffb2ac8abf3c1471217ff601a0e0b831efce053de12ea10e03ef59dab561b0c2da56995f6b97d041f SHA512 d8d26687c404bada61b92a4935f3c7e0680488dc0f8cb8e3fdf1e71feebc95ec7279459009bc217080063e163b875d1e1a99570c6a9fd8db8fd2be6aba78eec6
+MISC metadata.xml 638 BLAKE2B 6367f8fe90e75e2a3593d5d79ae09e6c75fa990ae037b58cba80ecdc4f7023a5b116ee2d6eadcdd6960133cd08a5103ebd1870906e2136af064a048603bb2562 SHA512 0bce2e72363ccdec78efa46158bade5135cae3d2d7b97de6836c4708f5823f2c1539f7441f0382061c4e0c4c7b5b1498bc5a4be6949b7dea015c873381010744
diff --git a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.0.4_rc2-kernel-4.11.0.patch b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.0.4_rc2-kernel-4.11.0.patch
new file mode 100644
index 000000000000..c3a9764924c2
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.0.4_rc2-kernel-4.11.0.patch
@@ -0,0 +1,10 @@
+--- 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-modules/files/linux-gpib-modules-4.2.0_rc1-reallydie.patch b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.2.0_rc1-reallydie.patch
new file mode 100644
index 000000000000..cba29eece374
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.2.0_rc1-reallydie.patch
@@ -0,0 +1,15 @@
+diff -ruN linux-gpib-kernel-4.2.0_rc1.orig/drivers/Makefile.am linux-gpib-kernel-4.2.0_rc1/drivers/Makefile.am
+--- linux-gpib-kernel-4.2.0_rc1.orig/drivers/Makefile.am	2018-10-02 11:32:11.000000000 +0200
++++ linux-gpib-kernel-4.2.0_rc1/drivers/Makefile.am	2018-10-09 12:03:21.272433209 +0200
+@@ -14,10 +14,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@/compat/include" \
+ 		CONFIG_GPIB_ISA="$(ENABLE_ISA)" \
+ 		SUBDIRS="$(GPIB_ABS_MODULE_SUBDIR)"
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0_rc1.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0_rc1.ebuild
new file mode 100644
index 000000000000..b08d9a3d45a7
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0_rc1.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info linux-mod autotools toolchain-funcs
+
+MY_PN=${PN/modules/kernel}
+
+DESCRIPTION="Kernel modules for GPIB (IEEE 488.2) hardware"
+HOMEPAGE="https://linux-gpib.sourceforge.io/"
+SRC_URI="mirror://sourceforge/linux-gpib/${MY_PN}-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="isa pcmcia debug"
+
+COMMONDEPEND=""
+RDEPEND="${COMMONDEPEND}
+	!<sci-libs/linux-gpib-4.2.0_rc1
+"
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.2.0_rc1-reallydie.patch
+)
+
+S=${WORKDIR}/${MY_PN}-${PV}
+
+pkg_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
+	eautoreconf
+}
+
+src_configure() {
+	set_arch_to_kernel
+	econf \
+		$(use_enable isa) \
+		$(use_enable pcmcia) \
+		$(use_enable debug driver-debug) \
+		--with-linux-srcdir=${KV_DIR}
+}
+
+src_compile() {
+	set_arch_to_kernel
+	emake \
+		DESTDIR="${D}" \
+		INSTALL_MOD_PATH="${D}" \
+		docdir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+	set_arch_to_kernel
+	emake \
+		DESTDIR="${D}" \
+		INSTALL_MOD_PATH="${D}" \
+		DEPMOD="/bin/true" \
+		docdir=/usr/share/doc/${PF}/html install
+
+	dodoc ChangeLog AUTHORS README* NEWS
+}
+
+pkg_preinst () {
+	linux-mod_pkg_preinst
+	enewgroup gpib
+}
+
+pkg_postinst () {
+	linux-mod_pkg_postinst
+}
diff --git a/sci-libs/linux-gpib-modules/metadata.xml b/sci-libs/linux-gpib-modules/metadata.xml
new file mode 100644
index 000000000000..b53300ac1ed5
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/metadata.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>dilfridge@gentoo.org</email>
+    <name>Andreas K. Huettel</name>
+  </maintainer>
+  <maintainer type="project">
+    <email>sci-electronics@gentoo.org</email>
+    <name>Gentoo Electronics Project</name>
+  </maintainer>
+  <use>
+    <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>
+  </upstream>
+</pkgmetadata>