From 38423c67c8a23f6a1bc42038193182e2da3116eb Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Sat, 25 Apr 2020 11:37:10 +0100
Subject: gentoo resync : 25.04.2020

---
 sci-libs/linux-gpib-modules/Manifest               |  3 +
 .../files/linux-gpib-modules-4.3.0-kernel53.patch  | 37 +++++++++++
 .../linux-gpib-modules-4.3.0.ebuild                | 73 ++++++++++++++++++++++
 3 files changed, 113 insertions(+)
 create mode 100644 sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.0-kernel53.patch
 create mode 100644 sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.0.ebuild

(limited to 'sci-libs/linux-gpib-modules')

diff --git a/sci-libs/linux-gpib-modules/Manifest b/sci-libs/linux-gpib-modules/Manifest
index d6d75f96c220..408cebcf2e8a 100644
--- a/sci-libs/linux-gpib-modules/Manifest
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -1,4 +1,7 @@
 AUX linux-gpib-modules-4.2.0_rc1-reallydie.patch 737 BLAKE2B 198c078a168071e04efcfdad11bf93c2682ab2f2160d7f93fc9c49fdcd2cbbe9174be53502fa5a2c0eedf448e0f438130646cfe902673383925156244a80bf5d SHA512 96b7e459da514f4a4f84e746a3121baa0076c479ad435fd182a90714aeec21d32dcdbb6871deacab532c722e89970aa7cbccbcbea494195dfa86c7ebb95142d9
+AUX linux-gpib-modules-4.3.0-kernel53.patch 1426 BLAKE2B 56d84daf8ca2f31db5e10a1f20b6d1fe5fed3efa98454e620ea7067378f408da2aa4db57ab062fdd139321b6e8bd738d22bfed1a61b2c5732fd4fbd10a39e299 SHA512 1cba793dc51957068a9613d9952937b1b58582d3833bd1e0c7e9ce6f3f2c54e827d67444bdaf413404c4b96aa3cfe4ce7faf7cb0f07ead7fdfe9eb3521dd3b27
 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
 EBUILD linux-gpib-modules-4.2.0.ebuild 1661 BLAKE2B 436455065ff0dd8a122800474d2afe27b2cffa5929acce605d9534b3a7fbefdce7a824639d60b6f80b5dfbd7128180a68c3fec7154828d96770248b646b974d5 SHA512 decedb321adf082dfdfe1dc6bf2ac3607c3efee166f74c39faa62931906929be86fbe8241d07c17f16b29de0d9aa0d0546f5e4f38326a64e2bd8fa99dff35a4f
+EBUILD linux-gpib-modules-4.3.0.ebuild 1401 BLAKE2B 24089b6de2e97f47539476c2e578ad7723dc0cfa60cc74a2605df827e77f11a938086846b536d538e8ef8fee86b35896a770f81ef8a60236b81b7d332aefebf7 SHA512 aa38c6c37e35b673217b21743b6d5db12963aac6b5c1a801793308265210aad3190d4ed20edaf4c69e9a51d95e140147fe85a2e839c73fbcc6d034ae305ce94b
 MISC metadata.xml 638 BLAKE2B 6367f8fe90e75e2a3593d5d79ae09e6c75fa990ae037b58cba80ecdc4f7023a5b116ee2d6eadcdd6960133cd08a5103ebd1870906e2136af064a048603bb2562 SHA512 0bce2e72363ccdec78efa46158bade5135cae3d2d7b97de6836c4708f5823f2c1539f7441f0382061c4e0c4c7b5b1498bc5a4be6949b7dea015c873381010744
diff --git a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.0-kernel53.patch b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.0-kernel53.patch
new file mode 100644
index 000000000000..e650ccb5ed15
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.0-kernel53.patch
@@ -0,0 +1,37 @@
+Index: linux-gpib-kernel/compat/include/linux/device.h
+===================================================================
+--- linux-gpib-kernel/compat/include/linux/device.h	(revision 1867)
++++ linux-gpib-kernel/compat/include/linux/device.h	(revision 1868)
+@@ -144,4 +144,10 @@
+ 
+ #endif // LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+ 
++#if LINUX_VERSION_CODE < KERNEL_VERSION(5,3,0)
++#define DRIVER_FIND_DEVICE_DATA_TYPE void *
++#else
++#define DRIVER_FIND_DEVICE_DATA_TYPE const void *
++#endif
++
+ #endif // __COMPAT_LINUX_DEVICE_H_
+Index: linux-gpib-kernel/drivers/gpib/fmh_gpib/fmh_gpib.c
+===================================================================
+--- linux-gpib-kernel/drivers/gpib/fmh_gpib/fmh_gpib.c	(revision 1867)
++++ linux-gpib-kernel/drivers/gpib/fmh_gpib/fmh_gpib.c	(revision 1868)
+@@ -982,7 +982,7 @@
+ }
+ 
+ /* Match callback for driver_find_device */
+-static int fmh_gpib_device_match(struct device *dev, void *data)
++static int fmh_gpib_device_match(struct device *dev, DRIVER_FIND_DEVICE_DATA_TYPE data)
+ {
+ 	const gpib_board_config_t *config = data;
+ 	
+@@ -1014,7 +1014,7 @@
+ 	struct platform_device *pdev;
+ 	
+ 	board->dev = driver_find_device(&fmh_gpib_platform_driver.driver,
+-		NULL, (void*)config, &fmh_gpib_device_match);
++		NULL, (DRIVER_FIND_DEVICE_DATA_TYPE)config, &fmh_gpib_device_match);
+ 	if(board->dev == NULL)
+ 	{
+ 		printk("No matching fmh_gpib_core device was found, attach failed.");
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.0.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.0.ebuild
new file mode 100644
index 000000000000..0625c4d14816
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.0.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit linux-info linux-mod toolchain-funcs
+
+DESCRIPTION="Kernel modules for GPIB (IEEE 488.2) hardware"
+HOMEPAGE="https://linux-gpib.sourceforge.io/"
+SRC_URI="mirror://sourceforge/linux-gpib/linux-gpib-${PV}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
+
+COMMONDEPEND=""
+RDEPEND="${COMMONDEPEND}
+	acct-group/gpib
+	!<sci-libs/linux-gpib-4.2.0_rc1
+"
+DEPEND="${COMMONDEPEND}
+	virtual/pkgconfig"
+
+S=${WORKDIR}/linux-gpib-kernel-${PV}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.3.0-kernel53.patch"
+)
+
+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
+}
+
+src_unpack() {
+	default
+	unpack "${WORKDIR}/linux-gpib-${PV}/linux-gpib-kernel-${PV}.tar.gz"
+}
+
+src_configure() {
+	set_arch_to_kernel
+
+	my_gpib_makeopts=''
+	use debug && my_gpib_makeopts+='GPIB-DEBUG=1 '
+
+	my_gpib_makeopts+="LINUX_SRCDIR=${KERNEL_DIR} "
+}
+
+src_compile() {
+	set_arch_to_kernel
+	emake \
+		DESTDIR="${D}" \
+		INSTALL_MOD_PATH="${D}" \
+		docdir=/usr/share/doc/${PF}/html \
+		${my_gpib_makeopts}
+}
+
+src_install() {
+	set_arch_to_kernel
+	emake \
+		DESTDIR="${D}" \
+		INSTALL_MOD_PATH="${D}" \
+		DEPMOD="/bin/true" \
+		docdir=/usr/share/doc/${PF}/html \
+		${my_gpib_makeopts} \
+		install
+
+	dodoc ChangeLog AUTHORS README* NEWS
+}
-- 
cgit v1.2.3