summaryrefslogtreecommitdiff
path: root/sci-libs/linux-gpib-modules
diff options
context:
space:
mode:
Diffstat (limited to 'sci-libs/linux-gpib-modules')
-rw-r--r--sci-libs/linux-gpib-modules/Manifest12
-rw-r--r--sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.2.0_rc1-reallydie.patch15
-rw-r--r--sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.2-returntype.patch50
-rw-r--r--sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.0.ebuild2
-rw-r--r--sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.2.ebuild (renamed from sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0.ebuild)49
-rw-r--r--sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.3.ebuild69
-rw-r--r--sci-libs/linux-gpib-modules/metadata.xml3
7 files changed, 144 insertions, 56 deletions
diff --git a/sci-libs/linux-gpib-modules/Manifest b/sci-libs/linux-gpib-modules/Manifest
index 408cebcf2e8a..d2871875d654 100644
--- a/sci-libs/linux-gpib-modules/Manifest
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -1,7 +1,9 @@
-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
+AUX linux-gpib-modules-4.3.2-returntype.patch 2451 BLAKE2B bc366bf772147aab165273bf1a20c65a6664cef8ff1069c22069a14d1907486074a6b2602ac99c0d6b283c7a187051592e0cba1d04af06af88e6c4c0d88bc779 SHA512 24891ccfd5a73224702f9b5dd1469083999951689761d9bf5c6eb84445d54e73381b4f6b05703401df1908f5f23557f1cf62dcdce0c81272483f96ca39d722bf
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
+DIST linux-gpib-4.3.2.tar.gz 1377406 BLAKE2B 57ec8b3788606ffb42d204ad0e2476c432bc82f929b1854c6a1d48c73f48a149716d05b13906b4597a4bf03e4c10a0ffe2c66e6de8cf9a5891b86c3d459713fc SHA512 bf9963d885e0c974f41eed96359501bd41c7d4f051026f64d835e52f1031f39e6bba6ce976a27e660a8b36087e56b81205206066c68b42db9a1d578d351a8f8b
+DIST linux-gpib-4.3.3.tar.gz 1381420 BLAKE2B 0ee8c4d740272a55be03f07bd49c9a93d0ec4808465c9b0abc4ede2ee9ef4bcb8a48fb8c98617d007c8b7af970eae185de65094a8814b05cb81bfc983bf9df3e SHA512 91b2c345dc82778b757122dc41ae74138831223a73057ddf9f04d10b8f6a059760e17134378df46a1ecb13c42bec1383aced0f2446f803af425391193a77066e
+EBUILD linux-gpib-modules-4.3.0.ebuild 1400 BLAKE2B 99ec5d7cbb6ddd7e12808423d73783376c61c49e1be2e719667398095110a9ae8bd532a5429428f99b8c93e97e0b679bb83f4c249ae4328ded1805e5e17db5ef SHA512 f6f81aadcafad9758707dfc3cec89f94d289a9ae243d0fbf03e886749304444cbce26fd76c914395e23c1df7037e612ceb9684009321d6f6c45d38d945c2cd5d
+EBUILD linux-gpib-modules-4.3.2.ebuild 1396 BLAKE2B 638e0139519a31e5b49168be5da7dde18558bffa0fc44b35e3555e2d29bb65ca6b34c6d66e5eea11d59808ae51c90271904cfb352d6a60c6e2457e1636eeefe4 SHA512 d24837c4683527363011be674382c5471f759a46211068aa10fb21de6becf4cdece89858805a5d5aac64b7220cdd4f495f2ab832e5a140b108e44f67d5b12fa5
+EBUILD linux-gpib-modules-4.3.3.ebuild 1346 BLAKE2B 453e184d956a71b41db687f010b9725d38ca812986568f14bd98a944a7a9e41ffe458d68e38ff39b384286a0229d39b62cf36c1d2497e544085799d8d3274bcb SHA512 0f822dd05016faf6be35047abf0a9f4f3580e770679d245253ddaef6f32f148be1fe6f9060283680559f6714b5da904a12ef4ecaad957ff611858abcd6117d2d
+MISC metadata.xml 480 BLAKE2B 1a8b338e4e8ebe5e8f9a4457cee52af1997664818100f2f4a3d7d36c1381825e48b5def55047b0e3ca063eb396ee83a7b173980801f10b3d99535c2efb77486d SHA512 947365f6269816228b3e0bf5f6109a7ca58dfe25929a419449e5d8d7789b9b008ae289f1f74831a3de3cb26f7ce05983801e8722102c9609e80c2f6fbd2d8b7b
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
deleted file mode 100644
index cba29eece374..000000000000
--- a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.2.0_rc1-reallydie.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-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/files/linux-gpib-modules-4.3.2-returntype.patch b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.2-returntype.patch
new file mode 100644
index 000000000000..88aa18081574
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.2-returntype.patch
@@ -0,0 +1,50 @@
+https://sourceforge.net/p/linux-gpib/code/1901/
+
+Index: linux-gpib-kernel/drivers/gpib/eastwood/fluke_gpib.c
+===================================================================
+--- linux-gpib-kernel/drivers/gpib/eastwood/fluke_gpib.c (revision 1900)
++++ linux-gpib-kernel/drivers/gpib/eastwood/fluke_gpib.c (revision 1901)
+@@ -114,15 +114,15 @@
+ fluke_private_t *priv = board->private_data;
+ return nec7210_update_status( board, &priv->nec7210_priv, clear_mask );
+ }
+-void fluke_primary_address(gpib_board_t *board, unsigned int address)
++int fluke_primary_address(gpib_board_t *board, unsigned int address)
+ {
+ fluke_private_t *priv = board->private_data;
+- nec7210_primary_address(board, &priv->nec7210_priv, address);
++ return nec7210_primary_address(board, &priv->nec7210_priv, address);
+ }
+-void fluke_secondary_address(gpib_board_t *board, unsigned int address, int enable)
++int fluke_secondary_address(gpib_board_t *board, unsigned int address, int enable)
+ {
+ fluke_private_t *priv = board->private_data;
+- nec7210_secondary_address(board, &priv->nec7210_priv, address, enable);
++ return nec7210_secondary_address(board, &priv->nec7210_priv, address, enable);
+ }
+ int fluke_parallel_poll(gpib_board_t *board, uint8_t *result)
+ {
+Index: linux-gpib-kernel/drivers/gpib/fmh_gpib/fmh_gpib.c
+===================================================================
+--- linux-gpib-kernel/drivers/gpib/fmh_gpib/fmh_gpib.c (revision 1900)
++++ linux-gpib-kernel/drivers/gpib/fmh_gpib/fmh_gpib.c (revision 1901)
+@@ -100,15 +100,15 @@
+ fmh_gpib_private_t *priv = board->private_data;
+ return nec7210_update_status( board, &priv->nec7210_priv, clear_mask );
+ }
+-void fmh_gpib_primary_address(gpib_board_t *board, unsigned int address)
++int fmh_gpib_primary_address(gpib_board_t *board, unsigned int address)
+ {
+ fmh_gpib_private_t *priv = board->private_data;
+- nec7210_primary_address(board, &priv->nec7210_priv, address);
++ return nec7210_primary_address(board, &priv->nec7210_priv, address);
+ }
+-void fmh_gpib_secondary_address(gpib_board_t *board, unsigned int address, int enable)
++int fmh_gpib_secondary_address(gpib_board_t *board, unsigned int address, int enable)
+ {
+ fmh_gpib_private_t *priv = board->private_data;
+- nec7210_secondary_address(board, &priv->nec7210_priv, address, enable);
++ return nec7210_secondary_address(board, &priv->nec7210_priv, address, enable);
+ }
+ int fmh_gpib_parallel_poll(gpib_board_t *board, uint8_t *result)
+ {
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
index 0625c4d14816..388a9a97a8c8 100644
--- 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
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/linux-gpib/linux-gpib-${PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
IUSE="debug"
COMMONDEPEND=""
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.2.ebuild
index 6a02d3641937..031ea6766820 100644
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0.ebuild
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.2.ebuild
@@ -3,7 +3,7 @@
EAPI=6
-inherit linux-info linux-mod autotools toolchain-funcs
+inherit linux-info linux-mod toolchain-funcs
DESCRIPTION="Kernel modules for GPIB (IEEE 488.2) hardware"
HOMEPAGE="https://linux-gpib.sourceforge.io/"
@@ -11,33 +11,29 @@ SRC_URI="mirror://sourceforge/linux-gpib/linux-gpib-${PV}.tar.gz"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
-IUSE="isa pcmcia debug"
+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.2.0_rc1-reallydie.patch
+ "${FILESDIR}/${P}-returntype.patch"
)
-S=${WORKDIR}/linux-gpib-kernel-${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_unpack() {
@@ -45,18 +41,13 @@ src_unpack() {
unpack "${WORKDIR}/linux-gpib-${PV}/linux-gpib-kernel-${PV}.tar.gz"
}
-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}
+
+ my_gpib_makeopts=''
+ use debug && my_gpib_makeopts+='GPIB-DEBUG=1 '
+
+ my_gpib_makeopts+="LINUX_SRCDIR=${KERNEL_DIR} "
}
src_compile() {
@@ -64,7 +55,8 @@ src_compile() {
emake \
DESTDIR="${D}" \
INSTALL_MOD_PATH="${D}" \
- docdir=/usr/share/doc/${PF}/html
+ docdir=/usr/share/doc/${PF}/html \
+ ${my_gpib_makeopts}
}
src_install() {
@@ -73,16 +65,9 @@ src_install() {
DESTDIR="${D}" \
INSTALL_MOD_PATH="${D}" \
DEPMOD="/bin/true" \
- docdir=/usr/share/doc/${PF}/html install
+ 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
-}
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.3.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.3.ebuild
new file mode 100644
index 000000000000..5b209c4c2813
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.3.ebuild
@@ -0,0 +1,69 @@
+# 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}
+
+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
+}
diff --git a/sci-libs/linux-gpib-modules/metadata.xml b/sci-libs/linux-gpib-modules/metadata.xml
index b53300ac1ed5..0781b9a96b94 100644
--- a/sci-libs/linux-gpib-modules/metadata.xml
+++ b/sci-libs/linux-gpib-modules/metadata.xml
@@ -9,9 +9,6 @@
<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>
generated by cgit v1.2.3 (git 2.25.1) at 2025-01-24 19:13:26 +0000