sci-libs/linux-gpib-modules: Version bump

Bug: https://bugs.gentoo.org/704294
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas K. Hüttel <dilfridge@gentoo.org>

diff --git a/sci-libs/linux-gpib-modules/Manifest b/sci-libs/linux-gpib-modules/Manifest
index 994c29642113fc865880df6a8c7f7472ae29dfd5..aa8f8447c49bf8a3f918421b5802619761d4b39b 100644 (file)
--- a/sci-libs/linux-gpib-modules/Manifest
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -1 +1,2 @@
 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

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 (file)
index 0000000..e650ccb
--- /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 (file)
index 0000000..957aefc
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.0.ebuild
@@ -0,0 +1,79 @@
+# 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}
+       !<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 '
+}
+
+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
+}
+
+pkg_preinst() {
+       linux-mod_pkg_preinst
+       enewgroup gpib
+}
+
+pkg_postinst() {
+       linux-mod_pkg_postinst
+}