[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib/, sci-libs/linux-gpib/files/

[Andreas Hüttel]

commit:     776a9dcc768dddedf0731f964eb64d7cded4cadd
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon May 29 14:28:44 2017 +0000
Commit:     Andreas Hüttel <dilfridge <AT> gentoo <DOT> org>
CommitDate: Mon May 29 14:28:58 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=776a9dcc

sci-libs/linux-gpib: Add patch for kernel 4.11 and check VMAP_STACK

https://sourceforge.net/p/linux-gpib/bugs/61/
https://sourceforge.net/p/linux-gpib/bugs/62/

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 .../linux-gpib/files/linux-gpib-4.0.4_rc2-kernel-4.11.0.patch | 10 ++++++++++
 sci-libs/linux-gpib/linux-gpib-4.0.3-r1.ebuild                | 11 +++++++++--
 2 files changed, 19 insertions(+), 2 deletions(-)

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
new file mode 100644
index 00000000000..c3a9764924c
--- /dev/null
+++ b/sci-libs/linux-gpib/files/linux-gpib-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/linux-gpib-4.0.3-r1.ebuild b/sci-libs/linux-gpib/linux-gpib-4.0.3-r1.ebuild
index d7b9bcef43f..8e7b27438b4 100644
--- a/sci-libs/linux-gpib/linux-gpib-4.0.3-r1.ebuild
+++ b/sci-libs/linux-gpib/linux-gpib-4.0.3-r1.ebuild
@@ -5,11 +5,13 @@ EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit readme.gentoo-r1 versionator eutils linux-mod autotools perl-functions python-single-r1 toolchain-funcs udev user
+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="http://linux-gpib.sourceforge.net/"
-SRC_URI="mirror://sourceforge/linux-gpib/${P}.tar.gz
+SRC_URI="mirror://sourceforge/linux-gpib/${PN}-${MY_PV}.tar.gz
 	firmware? ( http://linux-gpib.sourceforge.net/firmware/gpib_firmware-2006-11-12.tar.gz )
 "
 
@@ -39,9 +41,13 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-4.0.3-reallydie.patch
 )
 
+S=${WORKDIR}/${PN}-${MY_PV}
+
 pkg_setup () {
 	use perl && perl_set_version
 	use python && python_setup
+
+	CONFIG_CHECK="!VMAP_STACK"
 	linux-mod_pkg_setup
 
 	if kernel_is -lt 2 6 8; then
@@ -56,6 +62,7 @@ pkg_setup () {
 
 src_prepare () {
 	default
+	kernel_is ge 4 11 0 && eapply "${FILESDIR}"/${PN}-4.0.4_rc2-kernel-4.11.0.patch
 	eautoreconf
 }