[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/
commit: bbfd95b7906873ab14b5a29c51dfc23c5920cfd7
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Apr 27 14:16:08 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Apr 27 14:16:08 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bbfd95b7
sci-libs/linux-gpib-modules: add 4.3.6
Signed-off-by: Andreas K. Hüttel gentoo.org>
sci-libs/linux-gpib-modules/Manifest | 1 +
.../linux-gpib-modules-4.3.6.ebuild| 60 ++
2 files changed, 61 insertions(+)
diff --git a/sci-libs/linux-gpib-modules/Manifest
b/sci-libs/linux-gpib-modules/Manifest
index 16bfdea8a5f6..a03e19c7378c 100644
--- a/sci-libs/linux-gpib-modules/Manifest
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -1 +1,2 @@
DIST linux-gpib-4.3.5.tar.gz 1462624 BLAKE2B
fff30ed1a7abc18cd4317e8f8979ef4014a532baab8c014f9a2eaa3338a2e8e8b672214d3f2b3f44066be15f432861a3fe3d67652f6966e73e561d99ff1e1566
SHA512
018cc255922a6335f8d28418b0a0808c3a369506470d9c81432ac7183ae255217d938a419e10ba2b0c44205a9d901405ce00ad5bdd968db2721cedd83baa2f76
+DIST linux-gpib-4.3.6.tar.gz 1433121 BLAKE2B
64e2b19106d0531df990b1338f82a71707e54f448d652f6379eb9cd71feb84637090ed8fdfb0264248aa6879d5b9a1dc50e75c21a2c22a31397120eea5903e98
SHA512
a8005c71bfddb854ecbe4df0a81530e44378150242508b10df58c61d039c6d329020407608e31f1ef360de0c83169e76b793c032256e732d229bfd2da4cbaa35
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.6.ebuild
b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.6.ebuild
new file mode 100644
index ..345e1659d919
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.6.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-mod-r1
+
+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"
+S="${WORKDIR}/linux-gpib-kernel-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
+
+COMMONDEPEND=""
+RDEPEND="${COMMONDEPEND}
+ acct-group/gpib
+"
+DEPEND="${COMMONDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ # don't fix debian bugs if they break gentoo
+ "${FILESDIR}/${PN}-4.3.4-depmod.patch"
+)
+
+MODULES_KERNEL_MIN=2.6.8
+
+src_unpack() {
+ default
+ unpack "${WORKDIR}/linux-gpib-${PV}/linux-gpib-kernel-${PV}.tar.gz"
+}
+
+src_configure() {
+ MODULES_MAKEARGS+=( LINUX_SRCDIR="${KV_OUT_DIR}" )
+ use debug && MODULES_MAKEARGS+=( 'GPIB-DEBUG=1' )
+}
+
+src_compile() {
+ # The individual modules don't have separate targets so we can't use
+ # modlist here.
+ emake "${MODULES_MAKEARGS[@]}"
+}
+
+src_install() {
+ emake \
+ "${MODULES_MAKEARGS[@]}" \
+ DESTDIR="${ED}" \
+ INSTALL_MOD_PATH="${ED}" \
+ docdir="${ED}/usr/share/doc/${PF}/html" \
+ install
+
+ modules_post_process
+
+ dodoc ChangeLog AUTHORS README* NEWS
+ einstalldocs
+}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/
commit: 52b2ef32496775297dd6dada5b7d7ab3f47faf5d
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Apr 27 14:16:39 2024 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Apr 27 14:16:39 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=52b2ef32
sci-libs/linux-gpib-modules: drop 4.3.5
Signed-off-by: Andreas K. Hüttel gentoo.org>
.../linux-gpib-modules-4.3.5.ebuild| 69 --
1 file changed, 69 deletions(-)
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5.ebuild
b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5.ebuild
deleted file mode 100644
index fb572031d1ee..
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info linux-mod
-
-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"
-S="${WORKDIR}/linux-gpib-kernel-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
-IUSE="debug"
-
-COMMONDEPEND=""
-RDEPEND="${COMMONDEPEND}
- acct-group/gpib
-"
-DEPEND="${COMMONDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- # don't fix debian bugs if they break gentoo
- "${FILESDIR}/${PN}-4.3.4-depmod.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 \
- ${my_gpib_makeopts}
-}
-
-src_install() {
- set_arch_to_kernel
- emake \
- DESTDIR="${ED}" \
- INSTALL_MOD_PATH="${ED}" \
- DEPMOD="/bin/true" \
- docdir="${ED}/usr/share/doc/${PF}/html" \
- ${my_gpib_makeopts} \
- install
-
- dodoc ChangeLog AUTHORS README* NEWS
-}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/
commit: 1a7258f02b1b9407c16b9ba5f1122a203d903862
Author: Matoro Mahri matoro tk>
AuthorDate: Wed Feb 7 01:22:38 2024 +
Commit: Ionen Wolkens gentoo org>
CommitDate: Wed Feb 7 04:44:41 2024 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a7258f0
sci-libs/linux-gpib-modules: Stabilize 4.3.5-r3 amd64, #920069
Signed-off-by: Matoro Mahri matoro.tk>
Signed-off-by: Ionen Wolkens gentoo.org>
sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r3.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r3.ebuild
b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r3.ebuild
index 0736e0159f4d..d60c35f56f5d 100644
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r3.ebuild
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=8
@@ -12,7 +12,7 @@ S="${WORKDIR}/linux-gpib-kernel-${PV}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
IUSE="debug"
COMMONDEPEND=""
[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/files/, sci-libs/linux-gpib-modules/
commit: cf2e4eb2cad25a7b4647faebe6509c1033b49ba8
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Wed Jul 12 12:02:13 2023 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Wed Jul 12 12:04:06 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cf2e4eb2
sci-libs/linux-gpib-modules: add small patch for kernel 6.4
Closes: https://bugs.gentoo.org/910230
Signed-off-by: Andrew Ammerlaan gentoo.org>
.../linux-gpib-modules-4.3.4-kernel-6.4.patch | 27 ++
...2.ebuild => linux-gpib-modules-4.3.5-r3.ebuild} | 2 ++
2 files changed, 29 insertions(+)
diff --git
a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-kernel-6.4.patch
b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-kernel-6.4.patch
new file mode 100644
index ..90112106584d
--- /dev/null
+++
b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-kernel-6.4.patch
@@ -0,0 +1,27 @@
+--- linux-gpib-kernel/compat/include/linux/device.h(revision 2052)
linux-gpib-kernel/compat/include/linux/device.h(revision 2053)
+@@ -47,6 +47,13 @@
+ * for kernel versions prior to 2.6.26, so the 'drvdata' parameter of
+ * CLASS_DEVICE_CREATE() is pretty useless.
+ */
++#if LINUX_VERSION_CODE < KERNEL_VERSION(6,4,0)
++#define CLASS_CREATE(owner, name) \
++ class_create(owner, name)
++#else
++#define CLASS_CREATE(owner, name) \
++ class_create(name)
++#endif
+
+ #if LINUX_VERSION_CODE < KERNEL_VERSION(2,5,0)
+ #include
+--- linux-gpib-kernel/drivers/gpib/sys/osinit.c(revision 2052)
linux-gpib-kernel/drivers/gpib/sys/osinit.c(revision 2053)
+@@ -207,7 +207,7 @@
+ printk( "gpib: can't get major %d\n", GPIB_CODE );
+ return -EIO;
+ }
+- gpib_class = class_create(THIS_MODULE, "gpib_common");
++ gpib_class = CLASS_CREATE(THIS_MODULE, "gpib_common");
+ if(IS_ERR(gpib_class))
+ {
+ printk("gpib: failed to create gpib class\n");
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r2.ebuild
b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r3.ebuild
similarity index 92%
rename from sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r2.ebuild
rename to sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r3.ebuild
index 7be607ff4d47..0736e0159f4d 100644
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r2.ebuild
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r3.ebuild
@@ -25,6 +25,8 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
# don't fix debian bugs if they break gentoo
"${FILESDIR}/${PN}-4.3.4-depmod.patch"
+ # https://sourceforge.net/p/linux-gpib/code/2053/
+ "${FILESDIR}/${PN}-4.3.4-kernel-6.4.patch"
)
MODULES_KERNEL_MIN=2.6.8
[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/
commit: b9561206bc6bb097cee0a0c0cc3ec0226204ea94
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Wed Jun 21 16:28:23 2023 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Wed Jun 21 16:28:23 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b9561206
sci-libs/linux-gpib-modules: also set KV_OUT_DIR module makearg
Signed-off-by: Andrew Ammerlaan gentoo.org>
sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r2.ebuild | 1 +
1 file changed, 1 insertion(+)
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r2.ebuild
b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r2.ebuild
index 618beb805bbb..7be607ff4d47 100644
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r2.ebuild
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r2.ebuild
@@ -35,6 +35,7 @@ src_unpack() {
}
src_configure() {
+ MODULES_MAKEARGS+=( LINUX_SRCDIR="${KV_OUT_DIR}" )
use debug && MODULES_MAKEARGS+=( 'GPIB-DEBUG=1' )
}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/
commit: 9d91f5befe76f9c31d1e009926954186276f623c
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Wed Jun 21 16:13:27 2023 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Wed Jun 21 16:14:54 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9d91f5be
sci-libs/linux-gpib-modules: use MODULES_MAKEARGS for emake
Signed-off-by: Andrew Ammerlaan gentoo.org>
3.5-r1.ebuild => linux-gpib-modules-4.3.5-r2.ebuild} | 16
1 file changed, 4 insertions(+), 12 deletions(-)
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r1.ebuild
b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r2.ebuild
similarity index 79%
rename from sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r1.ebuild
rename to sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r2.ebuild
index eae3c0404cb4..618beb805bbb 100644
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r1.ebuild
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r2.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/linux-gpib-kernel-${PV}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
IUSE="debug"
COMMONDEPEND=""
@@ -35,29 +35,21 @@ src_unpack() {
}
src_configure() {
- my_gpib_makeopts=''
- use debug && my_gpib_makeopts+='GPIB-DEBUG=1 '
-
- my_gpib_makeopts+="LINUX_SRCDIR=${KERNEL_DIR} "
+ use debug && MODULES_MAKEARGS+=( 'GPIB-DEBUG=1' )
}
src_compile() {
- set_arch_to_kernel
-
# The individual modules don't have separate targets so we can't use
# modlist here.
- emake \
- ${my_gpib_makeopts}
+ emake "${MODULES_MAKEARGS[@]}"
}
src_install() {
- set_arch_to_kernel
emake \
+ "${MODULES_MAKEARGS[@]}" \
DESTDIR="${ED}" \
INSTALL_MOD_PATH="${ED}" \
- DEPMOD="/bin/true" \
docdir="${ED}/usr/share/doc/${PF}/html" \
- ${my_gpib_makeopts} \
install
modules_post_process
[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/
commit: 0129e062287948921ea13e781b87dca9c3a0134a
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Wed Jun 21 09:31:43 2023 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Wed Jun 21 09:36:09 2023 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0129e062
sci-libs/linux-gpib-modules: migrate to linux-mod-r1.eclass
Upstream has one target for all modules, this doesn't really
work with linux-mod(-r1) src_compile so we keep the workaround
that was already in the ebuild.
Now using MODULES_KERNEL_MIN to check the kernel version, got
rid of the custom solution in the ebuild.
Call modules_post_process to strip, compress and sign the modules
Signed-off-by: Andrew Ammerlaan gentoo.org>
.../linux-gpib-modules-4.3.5-r1.ebuild | 67 ++
1 file changed, 67 insertions(+)
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r1.ebuild
b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r1.ebuild
new file mode 100644
index ..eae3c0404cb4
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-mod-r1
+
+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"
+S="${WORKDIR}/linux-gpib-kernel-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm ~x86"
+IUSE="debug"
+
+COMMONDEPEND=""
+RDEPEND="${COMMONDEPEND}
+ acct-group/gpib
+"
+DEPEND="${COMMONDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ # don't fix debian bugs if they break gentoo
+ "${FILESDIR}/${PN}-4.3.4-depmod.patch"
+)
+
+MODULES_KERNEL_MIN=2.6.8
+
+src_unpack() {
+ default
+ unpack "${WORKDIR}/linux-gpib-${PV}/linux-gpib-kernel-${PV}.tar.gz"
+}
+
+src_configure() {
+ my_gpib_makeopts=''
+ use debug && my_gpib_makeopts+='GPIB-DEBUG=1 '
+
+ my_gpib_makeopts+="LINUX_SRCDIR=${KERNEL_DIR} "
+}
+
+src_compile() {
+ set_arch_to_kernel
+
+ # The individual modules don't have separate targets so we can't use
+ # modlist here.
+ emake \
+ ${my_gpib_makeopts}
+}
+
+src_install() {
+ set_arch_to_kernel
+ emake \
+ DESTDIR="${ED}" \
+ INSTALL_MOD_PATH="${ED}" \
+ DEPMOD="/bin/true" \
+ docdir="${ED}/usr/share/doc/${PF}/html" \
+ ${my_gpib_makeopts} \
+ install
+
+ modules_post_process
+
+ dodoc ChangeLog AUTHORS README* NEWS
+ einstalldocs
+}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/files/
commit: b34513517d6c613580045bf191ac7fffb103f975
Author: Michael Mair-Keimberger levelnine at>
AuthorDate: Fri Nov 25 15:51:49 2022 +
Commit: Conrad Kostecki gentoo org>
CommitDate: Fri Nov 25 17:48:18 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3451351
sci-libs/linux-gpib-modules: remove unused patch
Signed-off-by: Michael Mair-Keimberger levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/28430
Signed-off-by: Conrad Kostecki gentoo.org>
.../linux-gpib-modules-4.3.4-kernel-5.17.patch | 24 --
1 file changed, 24 deletions(-)
diff --git
a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-kernel-5.17.patch
b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-kernel-5.17.patch
deleted file mode 100644
index 894c33466627..
---
a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-kernel-5.17.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/drivers/gpib/eastwood/fluke_gpib.c
b/drivers/gpib/eastwood/fluke_gpib.c
-index daebaaa..7edece1 100644
a/drivers/gpib/eastwood/fluke_gpib.c
-+++ b/drivers/gpib/eastwood/fluke_gpib.c
-@@ -910,7 +910,6 @@ static int fluke_config_dma(gpib_board_t *board, int
output)
- config.src_maxburst = 1;
- config.dst_maxburst = 1;
- config.device_fc = true;
-- config.slave_id = 0;
-
- if(output)
- {
-diff --git a/drivers/gpib/fmh_gpib/fmh_gpib.c
b/drivers/gpib/fmh_gpib/fmh_gpib.c
-index c4ef7d2..d245278 100644
a/drivers/gpib/fmh_gpib/fmh_gpib.c
-+++ b/drivers/gpib/fmh_gpib/fmh_gpib.c
-@@ -926,7 +926,6 @@ static int fmh_gpib_config_dma(gpib_board_t *board, int
output)
- fmh_gpib_private_t *e_priv = board->private_data;
- struct dma_slave_config config;
- config.device_fc = true;
-- config.slave_id = 0;
-
- if(e_priv->dma_burst_length < 1)
- {
[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/
commit: 9989588801da67a64ddd542479f9b18d17a88761
Author: Dr. Andreas K. Hüttel gentoo org>
AuthorDate: Thu Nov 24 14:58:46 2022 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Thu Nov 24 19:17:24 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=99895888
sci-libs/linux-gpib-modules: Stable 4.3.5 for amd64
Signed-off-by: Andreas K. Hüttel gentoo.org>
sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5.ebuild
b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5.ebuild
index b3f224d27e73..fb572031d1ee 100644
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5.ebuild
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/linux-gpib-kernel-${PV}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
IUSE="debug"
COMMONDEPEND=""
[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/
commit: 45bad3cbb128c70f010e45c3dc1ebaf730403736
Author: Dr. Andreas K. Hüttel gentoo org>
AuthorDate: Thu Nov 24 14:59:23 2022 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Thu Nov 24 19:17:36 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45bad3cb
sci-libs/linux-gpib-modules: Remove old
Signed-off-by: Andreas K. Hüttel gentoo.org>
sci-libs/linux-gpib-modules/Manifest | 1 -
.../linux-gpib-modules-4.3.4-r1.ebuild | 72 --
2 files changed, 73 deletions(-)
diff --git a/sci-libs/linux-gpib-modules/Manifest
b/sci-libs/linux-gpib-modules/Manifest
index 2a39735224a0..16bfdea8a5f6 100644
--- a/sci-libs/linux-gpib-modules/Manifest
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -1,2 +1 @@
-DIST linux-gpib-4.3.4.tar.gz 1395770 BLAKE2B
3c7182ac127851ebf0f5416ea639d7f858c160ba00f01aa7f7e423f6fb7b3be5b089424d3a473497562d040c194483ebc93d8a2a0f64582fb8907b42e2c4b832
SHA512
397ad86883bf562b004673ae47218108d392f2a15121c95926ea38764e7a76b382cb199fd48c35c9777f34c8eb99965e3d4ea2028e86ce02bcda4bd23127cbd5
DIST linux-gpib-4.3.5.tar.gz 1462624 BLAKE2B
fff30ed1a7abc18cd4317e8f8979ef4014a532baab8c014f9a2eaa3338a2e8e8b672214d3f2b3f44066be15f432861a3fe3d67652f6966e73e561d99ff1e1566
SHA512
018cc255922a6335f8d28418b0a0808c3a369506470d9c81432ac7183ae255217d938a419e10ba2b0c44205a9d901405ce00ad5bdd968db2721cedd83baa2f76
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4-r1.ebuild
b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4-r1.ebuild
deleted file mode 100644
index 40897bc634f4..
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4-r1.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit linux-info linux-mod
-
-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"
-S="${WORKDIR}/linux-gpib-kernel-${PV}"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
-IUSE="debug"
-
-COMMONDEPEND=""
-RDEPEND="${COMMONDEPEND}
- acct-group/gpib
-"
-DEPEND="${COMMONDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
- # https://sourceforge.net/p/linux-gpib/code/1998/
- "${FILESDIR}/${P}-kernel-5.17.patch"
-
- # don't fix debian bugs if they break gentoo
- "${FILESDIR}/${P}-depmod.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 \
- ${my_gpib_makeopts}
-}
-
-src_install() {
- set_arch_to_kernel
- emake \
- DESTDIR="${ED}" \
- INSTALL_MOD_PATH="${ED}" \
- DEPMOD="/bin/true" \
- docdir="${ED}/usr/share/doc/${PF}/html" \
- ${my_gpib_makeopts} \
- install
-
- dodoc ChangeLog AUTHORS README* NEWS
-}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/
commit: fe7e76f2e53fa60d515458210c8d9ea049075145
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sun Oct 2 15:39:12 2022 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sun Oct 2 15:43:31 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fe7e76f2
sci-libs/linux-gpib-modules: Version bump
Bug: https://bugs.gentoo.org/873382
Signed-off-by: Andreas K. Hüttel gentoo.org>
sci-libs/linux-gpib-modules/Manifest | 1 +
.../linux-gpib-modules-4.3.5.ebuild| 69 ++
2 files changed, 70 insertions(+)
diff --git a/sci-libs/linux-gpib-modules/Manifest
b/sci-libs/linux-gpib-modules/Manifest
index e3fc9cc376ab..2a39735224a0 100644
--- a/sci-libs/linux-gpib-modules/Manifest
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -1 +1,2 @@
DIST linux-gpib-4.3.4.tar.gz 1395770 BLAKE2B
3c7182ac127851ebf0f5416ea639d7f858c160ba00f01aa7f7e423f6fb7b3be5b089424d3a473497562d040c194483ebc93d8a2a0f64582fb8907b42e2c4b832
SHA512
397ad86883bf562b004673ae47218108d392f2a15121c95926ea38764e7a76b382cb199fd48c35c9777f34c8eb99965e3d4ea2028e86ce02bcda4bd23127cbd5
+DIST linux-gpib-4.3.5.tar.gz 1462624 BLAKE2B
fff30ed1a7abc18cd4317e8f8979ef4014a532baab8c014f9a2eaa3338a2e8e8b672214d3f2b3f44066be15f432861a3fe3d67652f6966e73e561d99ff1e1566
SHA512
018cc255922a6335f8d28418b0a0808c3a369506470d9c81432ac7183ae255217d938a419e10ba2b0c44205a9d901405ce00ad5bdd968db2721cedd83baa2f76
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5.ebuild
b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5.ebuild
new file mode 100644
index ..b3f224d27e73
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info linux-mod
+
+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"
+S="${WORKDIR}/linux-gpib-kernel-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
+
+COMMONDEPEND=""
+RDEPEND="${COMMONDEPEND}
+ acct-group/gpib
+"
+DEPEND="${COMMONDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ # don't fix debian bugs if they break gentoo
+ "${FILESDIR}/${PN}-4.3.4-depmod.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 \
+ ${my_gpib_makeopts}
+}
+
+src_install() {
+ set_arch_to_kernel
+ emake \
+ DESTDIR="${ED}" \
+ INSTALL_MOD_PATH="${ED}" \
+ DEPMOD="/bin/true" \
+ docdir="${ED}/usr/share/doc/${PF}/html" \
+ ${my_gpib_makeopts} \
+ install
+
+ dodoc ChangeLog AUTHORS README* NEWS
+}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/, sci-libs/linux-gpib-modules/files/
commit: ae706e6aa468e81c88198f805c9a441b42f3d838
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Tue Aug 2 10:25:22 2022 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Tue Aug 2 10:25:59 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ae706e6a
sci-libs/linux-gpib-modules: Fix build if modules dir does not exist yet
Signed-off-by: Andreas K. Hüttel gentoo.org>
.../files/linux-gpib-modules-4.3.4-depmod.patch | 21 +
.../linux-gpib-modules-4.3.4-r1.ebuild | 3 +++
2 files changed, 24 insertions(+)
diff --git
a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-depmod.patch
b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-depmod.patch
new file mode 100644
index ..e858b974324c
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-depmod.patch
@@ -0,0 +1,21 @@
+Depmod fails here since we're still in DESTDIR and the actual target path may
+not exist...
+
+
+diff -ruN linux-gpib-kernel-4.3.4.orig/Makefile
linux-gpib-kernel-4.3.4/Makefile
+--- linux-gpib-kernel-4.3.4.orig/Makefile 2020-12-29 10:42:34.0
+0100
linux-gpib-kernel-4.3.4/Makefile 2022-08-02 12:21:38.097344102 +0200
+@@ -20,13 +20,9 @@
+ M="$(GPIB_SRCDIR)/drivers/gpib" \
+ GPIB_TOP_DIR=$(GPIB_SRCDIR)
+
+-#We run depmod explicitly because the depmod.sh script run
+-#by modules_install fails on Debian due to it failing to find
+-#the System.map file.
+ install:
+ $(MAKE) -C $(LINUX_SRCDIR) V=$(VERBOSE) modules_install\
+ M="$(GPIB_SRCDIR)/drivers/gpib" \
+ GPIB_TOP_DIR=$(GPIB_SRCDIR) \
+ INSTALL_MOD_DIR=gpib
+- /sbin/depmod -A
+
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4-r1.ebuild
b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4-r1.ebuild
index deba2dcfbbd1..40897bc634f4 100644
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4-r1.ebuild
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4-r1.ebuild
@@ -25,6 +25,9 @@ BDEPEND="virtual/pkgconfig"
PATCHES=(
# https://sourceforge.net/p/linux-gpib/code/1998/
"${FILESDIR}/${P}-kernel-5.17.patch"
+
+ # don't fix debian bugs if they break gentoo
+ "${FILESDIR}/${P}-depmod.patch"
)
pkg_setup() {
[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/
commit: aeec1591b9bd27f1f4e224eed6a5d9ee00cc0f2f
Author: Sam James gentoo org>
AuthorDate: Fri Jul 15 12:14:40 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Jul 15 12:14:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=aeec1591
sci-libs/linux-gpib-modules: drop 4.3.4
Bug: https://bugs.gentoo.org/858170
Signed-off-by: Sam James gentoo.org>
.../linux-gpib-modules-4.3.4.ebuild| 69 --
1 file changed, 69 deletions(-)
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4.ebuild
b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4.ebuild
deleted file mode 100644
index a5c44ee72549..
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 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
- !
[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/
commit: eb3bd30d33abead000418023293c911e069f337c
Author: Sam James gentoo org>
AuthorDate: Fri Jul 15 12:13:53 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Jul 15 12:14:13 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb3bd30d
sci-libs/linux-gpib-modules: Stabilize 4.3.4-r1 amd64, #858170
Signed-off-by: Sam James gentoo.org>
sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4-r1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4-r1.ebuild
b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4-r1.ebuild
index 3c48db034bcd..deba2dcfbbd1 100644
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4-r1.ebuild
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4-r1.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}/linux-gpib-kernel-${PV}"
LICENSE="GPL-2"
SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
IUSE="debug"
COMMONDEPEND=""
[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/
commit: 5a9006b24c7af624bf9e20faa89b2e2911ee7115
Author: Sam James gentoo org>
AuthorDate: Fri Jul 15 08:58:21 2022 +
Commit: Sam James gentoo org>
CommitDate: Fri Jul 15 08:59:12 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5a9006b2
sci-libs/linux-gpib-modules: drop 4.3.3-r1
Signed-off-by: Sam James gentoo.org>
sci-libs/linux-gpib-modules/Manifest | 1 -
.../linux-gpib-modules-4.3.3-r1.ebuild | 69 --
2 files changed, 70 deletions(-)
diff --git a/sci-libs/linux-gpib-modules/Manifest
b/sci-libs/linux-gpib-modules/Manifest
index fe28a9e7253b..e3fc9cc376ab 100644
--- a/sci-libs/linux-gpib-modules/Manifest
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -1,2 +1 @@
-DIST linux-gpib-4.3.3.tar.gz 1381420 BLAKE2B
0ee8c4d740272a55be03f07bd49c9a93d0ec4808465c9b0abc4ede2ee9ef4bcb8a48fb8c98617d007c8b7af970eae185de65094a8814b05cb81bfc983bf9df3e
SHA512
91b2c345dc82778b757122dc41ae74138831223a73057ddf9f04d10b8f6a059760e17134378df46a1ecb13c42bec1383aced0f2446f803af425391193a77066e
DIST linux-gpib-4.3.4.tar.gz 1395770 BLAKE2B
3c7182ac127851ebf0f5416ea639d7f858c160ba00f01aa7f7e423f6fb7b3be5b089424d3a473497562d040c194483ebc93d8a2a0f64582fb8907b42e2c4b832
SHA512
397ad86883bf562b004673ae47218108d392f2a15121c95926ea38764e7a76b382cb199fd48c35c9777f34c8eb99965e3d4ea2028e86ce02bcda4bd23127cbd5
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.3-r1.ebuild
b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.3-r1.ebuild
deleted file mode 100644
index a5c44ee72549..
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.3-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2021 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
- !
[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/files/, sci-libs/linux-gpib-modules/
commit: 7afec29ff20bdae5831a4ea0ac264a323114c221
Author: Andrew Ammerlaan gentoo org>
AuthorDate: Sun Apr 24 15:41:34 2022 +
Commit: Andrew Ammerlaan gentoo org>
CommitDate: Sun Apr 24 15:41:40 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7afec29f
sci-libs/linux-gpib-modules: update EAPI 6 -> 8
and fix build with kernel 5.17.X
Bug: https://bugs.gentoo.org/836110
Signed-off-by: Andrew Ammerlaan gentoo.org>
.../linux-gpib-modules-4.3.4-kernel-5.17.patch | 24
.../linux-gpib-modules-4.3.4-r1.ebuild | 69 ++
2 files changed, 93 insertions(+)
diff --git
a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-kernel-5.17.patch
b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-kernel-5.17.patch
new file mode 100644
index ..894c33466627
--- /dev/null
+++
b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-kernel-5.17.patch
@@ -0,0 +1,24 @@
+diff --git a/drivers/gpib/eastwood/fluke_gpib.c
b/drivers/gpib/eastwood/fluke_gpib.c
+index daebaaa..7edece1 100644
+--- a/drivers/gpib/eastwood/fluke_gpib.c
b/drivers/gpib/eastwood/fluke_gpib.c
+@@ -910,7 +910,6 @@ static int fluke_config_dma(gpib_board_t *board, int
output)
+ config.src_maxburst = 1;
+ config.dst_maxburst = 1;
+ config.device_fc = true;
+- config.slave_id = 0;
+
+ if(output)
+ {
+diff --git a/drivers/gpib/fmh_gpib/fmh_gpib.c
b/drivers/gpib/fmh_gpib/fmh_gpib.c
+index c4ef7d2..d245278 100644
+--- a/drivers/gpib/fmh_gpib/fmh_gpib.c
b/drivers/gpib/fmh_gpib/fmh_gpib.c
+@@ -926,7 +926,6 @@ static int fmh_gpib_config_dma(gpib_board_t *board, int
output)
+ fmh_gpib_private_t *e_priv = board->private_data;
+ struct dma_slave_config config;
+ config.device_fc = true;
+- config.slave_id = 0;
+
+ if(e_priv->dma_burst_length < 1)
+ {
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4-r1.ebuild
b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4-r1.ebuild
new file mode 100644
index ..3c48db034bcd
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit linux-info linux-mod
+
+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"
+S="${WORKDIR}/linux-gpib-kernel-${PV}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="debug"
+
+COMMONDEPEND=""
+RDEPEND="${COMMONDEPEND}
+ acct-group/gpib
+"
+DEPEND="${COMMONDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+ # https://sourceforge.net/p/linux-gpib/code/1998/
+ "${FILESDIR}/${P}-kernel-5.17.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 \
+ ${my_gpib_makeopts}
+}
+
+src_install() {
+ set_arch_to_kernel
+ emake \
+ DESTDIR="${ED}" \
+ INSTALL_MOD_PATH="${ED}" \
+ DEPMOD="/bin/true" \
+ docdir="${ED}/usr/share/doc/${PF}/html" \
+ ${my_gpib_makeopts} \
+ install
+
+ dodoc ChangeLog AUTHORS README* NEWS
+}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/
commit: 11966f13eb8cbc1b6f3ccc0ecb402534aaeeaa15
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Apr 10 22:06:42 2021 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Apr 10 22:07:26 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11966f13
sci-libs/linux-gpib-modules: amd64 stable
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andreas K. Hüttel gentoo.org>
sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4.ebuild
b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4.ebuild
index 12044c6d1c2..a5c44ee7254 100644
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4.ebuild
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4.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=""
[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/files/, sci-libs/linux-gpib-modules/
commit: c7254ac90be24880f937be977c833a27b4f99bac
Author: Jakov Smolic sartura hr>
AuthorDate: Thu Feb 18 18:56:13 2021 +
Commit: David Seifert gentoo org>
CommitDate: Thu Feb 18 18:56:13 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7254ac9
sci-libs/linux-gpib-modules: Remove old
Signed-off-by: Jakov Smolic sartura.hr>
Signed-off-by: David Seifert gentoo.org>
sci-libs/linux-gpib-modules/Manifest | 2 -
.../files/linux-gpib-modules-4.3.0-kernel53.patch | 37 ---
.../linux-gpib-modules-4.3.2-returntype.patch | 50 ---
.../linux-gpib-modules-4.3.0-r1.ebuild | 73 --
.../linux-gpib-modules-4.3.2-r1.ebuild | 73 --
5 files changed, 235 deletions(-)
diff --git a/sci-libs/linux-gpib-modules/Manifest
b/sci-libs/linux-gpib-modules/Manifest
index 86d2b29a7d8..fe28a9e7253 100644
--- a/sci-libs/linux-gpib-modules/Manifest
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -1,4 +1,2 @@
-DIST linux-gpib-4.3.0.tar.gz 1375852 BLAKE2B
e2daa444ddf4c0c34084f264247051d4ce1c8103d8ae5d91b02d4742131c1f92ded02775eb0f8b0ea29820e2ae7b61c3132c74084a876e86fbb4efaf11688773
SHA512
8db4eb6d606c68ffacc67988479684fec815fc552756a6c93466ef0dfc93368771bb551944e3afc31db83e72e464ec1fb289fdcf80b4a6be1617e734fe3b9d65
-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
DIST linux-gpib-4.3.4.tar.gz 1395770 BLAKE2B
3c7182ac127851ebf0f5416ea639d7f858c160ba00f01aa7f7e423f6fb7b3be5b089424d3a473497562d040c194483ebc93d8a2a0f64582fb8907b42e2c4b832
SHA512
397ad86883bf562b004673ae47218108d392f2a15121c95926ea38764e7a76b382cb199fd48c35c9777f34c8eb99965e3d4ea2028e86ce02bcda4bd23127cbd5
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
deleted file mode 100644
index e650ccb5ed1..000
--- a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.0-kernel53.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-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(_gpib_platform_driver.driver,
-- NULL, (void*)config, _gpib_device_match);
-+ NULL, (DRIVER_FIND_DEVICE_DATA_TYPE)config,
_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/files/linux-gpib-modules-4.3.2-returntype.patch
b/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.2-returntype.patch
deleted file mode 100644
index 88aa1808157..000
---
a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.2-returntype.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-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, >nec7210_priv, clear_mask );
-
[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/
commit: 092fd1b228dd0f9eca22892a63c140bce025533a
Author: Sam James gentoo org>
AuthorDate: Thu Feb 18 08:38:48 2021 +
Commit: Sam James gentoo org>
CommitDate: Thu Feb 18 08:38:48 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=092fd1b2
sci-libs/linux-gpib-modules: Stabilize 4.3.3-r1 amd64, #765760
Signed-off-by: Sam James gentoo.org>
sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.3-r1.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.3-r1.ebuild
b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.3-r1.ebuild
index 5b209c4c281..a5c44ee7254 100644
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.3-r1.ebuild
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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=""
[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/
commit: 42aff459397e549d0641c997298930e138ef0130
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Mon Feb 8 18:59:54 2021 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Mon Feb 8 19:00:29 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42aff459
sci-libs/linux-gpib-modules: Version bump
Package-Manager: Portage-3.0.13, Repoman-3.0.2
Signed-off-by: Andreas K. Hüttel gentoo.org>
sci-libs/linux-gpib-modules/Manifest | 1 +
.../linux-gpib-modules-4.3.4.ebuild| 69 ++
2 files changed, 70 insertions(+)
diff --git a/sci-libs/linux-gpib-modules/Manifest
b/sci-libs/linux-gpib-modules/Manifest
index 670d6729a24..86d2b29a7d8 100644
--- a/sci-libs/linux-gpib-modules/Manifest
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -1,3 +1,4 @@
DIST linux-gpib-4.3.0.tar.gz 1375852 BLAKE2B
e2daa444ddf4c0c34084f264247051d4ce1c8103d8ae5d91b02d4742131c1f92ded02775eb0f8b0ea29820e2ae7b61c3132c74084a876e86fbb4efaf11688773
SHA512
8db4eb6d606c68ffacc67988479684fec815fc552756a6c93466ef0dfc93368771bb551944e3afc31db83e72e464ec1fb289fdcf80b4a6be1617e734fe3b9d65
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
+DIST linux-gpib-4.3.4.tar.gz 1395770 BLAKE2B
3c7182ac127851ebf0f5416ea639d7f858c160ba00f01aa7f7e423f6fb7b3be5b089424d3a473497562d040c194483ebc93d8a2a0f64582fb8907b42e2c4b832
SHA512
397ad86883bf562b004673ae47218108d392f2a15121c95926ea38764e7a76b382cb199fd48c35c9777f34c8eb99965e3d4ea2028e86ce02bcda4bd23127cbd5
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4.ebuild
b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4.ebuild
new file mode 100644
index 000..12044c6d1c2
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.4.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2021 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
+ !
[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/
commit: 6eda4dee21d7487d005f8aae38f466bc7c5b465c Author: Mikle Kolyada gentoo org> AuthorDate: Fri Aug 7 11:06:48 2020 + Commit: Mikle Kolyada gentoo org> CommitDate: Sat Aug 8 12:18:16 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6eda4dee sci-libs/linux-gpib-modules: migrate to sys-apps/kmod Package-Manager: Portage-2.3.103, Repoman-2.3.23 Signed-off-by: Mikle Kolyada gentoo.org> ...linux-gpib-modules-4.3.0.ebuild => linux-gpib-modules-4.3.0-r1.ebuild} | 0 ...linux-gpib-modules-4.3.2.ebuild => linux-gpib-modules-4.3.2-r1.ebuild} | 0 ...linux-gpib-modules-4.3.3.ebuild => linux-gpib-modules-4.3.3-r1.ebuild} | 0 3 files changed, 0 insertions(+), 0 deletions(-) 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-r1.ebuild similarity index 100% rename from sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.0.ebuild rename to sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.0-r1.ebuild diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.2.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.2-r1.ebuild similarity index 100% rename from sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.2.ebuild rename to sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.2-r1.ebuild 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-r1.ebuild similarity index 100% rename from sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.3.ebuild rename to sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.3-r1.ebuild
[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/
commit: df27de61c100c34bdbe2c8aa3f89ff5dda075a0a
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Tue May 12 20:18:08 2020 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Tue May 12 20:43:42 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=df27de61
sci-libs/linux-gpib-modules: Version bump
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas K. Hüttel gentoo.org>
sci-libs/linux-gpib-modules/Manifest | 1 +
.../linux-gpib-modules-4.3.3.ebuild| 69 ++
2 files changed, 70 insertions(+)
diff --git a/sci-libs/linux-gpib-modules/Manifest
b/sci-libs/linux-gpib-modules/Manifest
index 0d85cdfe9ee..670d6729a24 100644
--- a/sci-libs/linux-gpib-modules/Manifest
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -1,2 +1,3 @@
DIST linux-gpib-4.3.0.tar.gz 1375852 BLAKE2B
e2daa444ddf4c0c34084f264247051d4ce1c8103d8ae5d91b02d4742131c1f92ded02775eb0f8b0ea29820e2ae7b61c3132c74084a876e86fbb4efaf11688773
SHA512
8db4eb6d606c68ffacc67988479684fec815fc552756a6c93466ef0dfc93368771bb551944e3afc31db83e72e464ec1fb289fdcf80b4a6be1617e734fe3b9d65
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
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 000..5b209c4c281
--- /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
+ !
[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/, sci-libs/linux-gpib-modules/files/
commit: e08567fabca773b6aabda32093368d65a92f54c4
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat May 9 11:01:47 2020 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat May 9 11:02:38 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e08567fa
sci-libs/linux-gpib-modules: Remove old
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas K. Hüttel gentoo.org>
sci-libs/linux-gpib-modules/Manifest | 1 -
.../linux-gpib-modules-4.2.0_rc1-reallydie.patch | 15
.../linux-gpib-modules-4.2.0.ebuild| 88 --
sci-libs/linux-gpib-modules/metadata.xml | 3 -
4 files changed, 107 deletions(-)
diff --git a/sci-libs/linux-gpib-modules/Manifest
b/sci-libs/linux-gpib-modules/Manifest
index f0c93807e78..0d85cdfe9ee 100644
--- a/sci-libs/linux-gpib-modules/Manifest
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -1,3 +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
DIST linux-gpib-4.3.2.tar.gz 1377406 BLAKE2B
57ec8b3788606ffb42d204ad0e2476c432bc82f929b1854c6a1d48c73f48a149716d05b13906b4597a4bf03e4c10a0ffe2c66e6de8cf9a5891b86c3d459713fc
SHA512
bf9963d885e0c974f41eed96359501bd41c7d4f051026f64d835e52f1031f39e6bba6ce976a27e660a8b36087e56b81205206066c68b42db9a1d578d351a8f8b
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 cba29eece37..000
---
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.0 +0200
-+++ linux-gpib-kernel-4.2.0_rc1/drivers/Makefile.am2018-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.ebuild
b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0.ebuild
deleted file mode 100644
index 6a02d364193..000
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit linux-info linux-mod autotools 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="isa pcmcia debug"
-
-COMMONDEPEND=""
-RDEPEND="${COMMONDEPEND}
- !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() {
- default
- 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}
-}
-
-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
-}
-
[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/files/, sci-libs/linux-gpib-modules/
commit: 088ef797f93b95e5ea1690d7bdd8c38f8f033419
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat May 9 10:58:22 2020 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat May 9 11:02:28 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=088ef797
sci-libs/linux-gpib-modules: Version bump
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas K. Hüttel gentoo.org>
sci-libs/linux-gpib-modules/Manifest | 1 +
.../linux-gpib-modules-4.3.2-returntype.patch | 50 +++
.../linux-gpib-modules-4.3.2.ebuild| 73 ++
3 files changed, 124 insertions(+)
diff --git a/sci-libs/linux-gpib-modules/Manifest
b/sci-libs/linux-gpib-modules/Manifest
index aa8f8447c49..f0c93807e78 100644
--- a/sci-libs/linux-gpib-modules/Manifest
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -1,2 +1,3 @@
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
+DIST linux-gpib-4.3.2.tar.gz 1377406 BLAKE2B
57ec8b3788606ffb42d204ad0e2476c432bc82f929b1854c6a1d48c73f48a149716d05b13906b4597a4bf03e4c10a0ffe2c66e6de8cf9a5891b86c3d459713fc
SHA512
bf9963d885e0c974f41eed96359501bd41c7d4f051026f64d835e52f1031f39e6bba6ce976a27e660a8b36087e56b81205206066c68b42db9a1d578d351a8f8b
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 000..88aa1808157
--- /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, >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, >nec7210_priv, address);
++ return nec7210_primary_address(board, >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, >nec7210_priv, address, enable);
++ return nec7210_secondary_address(board, >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, >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, >nec7210_priv, address);
++ return nec7210_primary_address(board, >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, >nec7210_priv, address, enable);
++ return nec7210_secondary_address(board, >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.2.ebuild
b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.2.ebuild
new file mode 100644
index 000..031ea676682
--- /dev/null
+++
[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/
commit: eb54d95ad0ba8bd5b365e64de36868c4ca3e365e
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Wed May 6 20:37:33 2020 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Wed May 6 21:15:18 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb54d95a
sci-libs/linux-gpib-modules: Stable for amd64
Closes: https://bugs.gentoo.org/704294
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Andreas K. Hüttel gentoo.org>
sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.0.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 0625c4d1481..388a9a97a8c 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=""
[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/
commit: eea4d0308c2b732a720b8c40e8a6d9c8c0d08417
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Fri Apr 24 00:47:45 2020 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Fri Apr 24 00:48:31 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eea4d030
sci-libs/linux-gpib-modules: Build against eselected sources
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas K. Hüttel gentoo.org>
sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.0.ebuild | 2 ++
1 file changed, 2 insertions(+)
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 1e308f83dea..0625c4d1481 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
@@ -46,6 +46,8 @@ src_configure() {
my_gpib_makeopts=''
use debug && my_gpib_makeopts+='GPIB-DEBUG=1 '
+
+ my_gpib_makeopts+="LINUX_SRCDIR=${KERNEL_DIR} "
}
src_compile() {
[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/
commit: b5bb198600538677b27c12d9220273e5de4dbcd3
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Apr 18 21:02:13 2020 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Apr 18 21:03:09 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b5bb1986
sci-libs/linux-gpib-modules: GLEP 81 fixes
Package-Manager: Portage-2.3.89, Repoman-2.3.20
Signed-off-by: Andreas K. Hüttel gentoo.org>
sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.0.ebuild | 10 +-
1 file changed, 1 insertion(+), 9 deletions(-)
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 957aefc659a..1e308f83dea 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
@@ -16,6 +16,7 @@ IUSE="debug"
COMMONDEPEND=""
RDEPEND="${COMMONDEPEND}
+ acct-group/gpib
[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/files/, sci-libs/linux-gpib-modules/
commit: 93d5c4ae1b82360f01e2278c83728c1d2be7774e
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Apr 18 14:15:37 2020 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Sat Apr 18 14:42:23 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=93d5c4ae
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 gentoo.org>
sci-libs/linux-gpib-modules/Manifest | 1 +
.../files/linux-gpib-modules-4.3.0-kernel53.patch | 37 ++
.../linux-gpib-modules-4.3.0.ebuild| 79 ++
3 files changed, 117 insertions(+)
diff --git a/sci-libs/linux-gpib-modules/Manifest
b/sci-libs/linux-gpib-modules/Manifest
index 994c2964211..aa8f8447c49 100644
--- 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
index 000..e650ccb5ed1
--- /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(_gpib_platform_driver.driver,
+- NULL, (void*)config, _gpib_device_match);
++ NULL, (DRIVER_FIND_DEVICE_DATA_TYPE)config,
_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 000..957aefc659a
--- /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}
+ !
[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/
commit: 72d4cebf6b8769e1a27a11a47ef1b670b4cd3174
Author: Andreas K. Huettel gentoo org>
AuthorDate: Tue May 28 14:16:01 2019 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Tue May 28 14:16:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72d4cebf
sci-libs/linux-gpib-modules: amd64 stable
Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Andreas K. Hüttel gentoo.org>
sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0.ebuild | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
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.2.0.ebuild
index 4ac4407a9a8..884cc3f1c2d 100644
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0.ebuild
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
@@ -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="isa pcmcia debug"
COMMONDEPEND=""
[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/
commit: 63604d277064f49df5910b728cc342b13852727e
Author: Andreas K. Huettel gentoo org>
AuthorDate: Tue May 28 14:15:37 2019 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Tue May 28 14:15:37 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=63604d27
sci-libs/linux-gpib-modules: drop old
Package-Manager: Portage-2.3.67, Repoman-2.3.13
Signed-off-by: Andreas K. Hüttel gentoo.org>
sci-libs/linux-gpib-modules/Manifest | 1 -
.../linux-gpib-modules-4.2.0_rc1.ebuild| 85 --
2 files changed, 86 deletions(-)
diff --git a/sci-libs/linux-gpib-modules/Manifest
b/sci-libs/linux-gpib-modules/Manifest
index 83109bf752c..994c2964211 100644
--- a/sci-libs/linux-gpib-modules/Manifest
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -1,2 +1 @@
DIST linux-gpib-4.2.0.tar.gz 1431440 BLAKE2B
7b6adf562963e0785f960c072f3f3d67cb91df9090205d8fecb0dc3170d3a1ac3719732919bae112e06b47387499ffe49a0144e72caa27ba39c85c8b98e56786
SHA512
1505c2c04f16bf7e92b9dd474f09edd242520a96f9e4d8eea88ebd44d0a82d653055155c1bfcde69da5355d609d400e3cb682da8aae83f59f1e565307a3fc4a7
-DIST linux-gpib-kernel-4.2.0_rc1.tar.gz 332525 BLAKE2B
e84f9da9902d139474cf68e49922f7b402c6d3eab8c009683c1b4304a505eb6aba86a60b019e4d3ad0ef1d003c743f14f60b61b3d7f31e8aeca99a4a16c1
SHA512
8bf1a2b04d6128c513c5d13549fb95e563e719e43ffb3b303fc5aa2376f57a69774c1afdb901281933f6b253068461ce59bd9564146a0c5a6483e1ccc47d259f
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
deleted file mode 100644
index b08d9a3d45a..000
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0_rc1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# 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}
- !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
-}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/files/
commit: b838a63bc6263df2dd833d89803472d0e6ab49b6 Author: Michael Mair-Keimberger gmail com> AuthorDate: Sat Mar 2 12:03:28 2019 + Commit: Aaron Bauman gentoo org> CommitDate: Mon Mar 4 03:11:16 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b838a63b sci-libs/linux-gpib-modules: remove unused patch Signed-off-by: Michael Mair-Keimberger gmail.com> Closes: https://github.com/gentoo/gentoo/pull/11217 Signed-off-by: Aaron Bauman gentoo.org> .../files/linux-gpib-modules-4.0.4_rc2-kernel-4.11.0.patch | 10 -- 1 file changed, 10 deletions(-) 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 deleted file mode 100644 index c3a9764924c..000 --- a/sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.0.4_rc2-kernel-4.11.0.patch +++ /dev/null @@ -1,10 +0,0 @@ linux-gpib-4.0.4rc2.orig/drivers/gpib/lpvo_usb_gpib/lpvo_usb_gpib.c 2016-06-22 09:48:47.0 +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 - #include - #include -+#include - #include - - #include "gpibP.h"
[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/
commit: 42138d0217be8b23cd9f8964de852215ce3bc5f3
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Wed Nov 21 14:58:15 2018 +
Commit: Andreas K. Hüttel gentoo org>
CommitDate: Wed Nov 21 14:59:26 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42138d02
sci-libs/linux-gpib-modules: Version bump
Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Andreas K. Hüttel gentoo.org>
sci-libs/linux-gpib-modules/Manifest | 1 +
.../linux-gpib-modules-4.2.0.ebuild| 88 ++
2 files changed, 89 insertions(+)
diff --git a/sci-libs/linux-gpib-modules/Manifest
b/sci-libs/linux-gpib-modules/Manifest
index de0878b97c2..83109bf752c 100644
--- 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-kernel-4.2.0_rc1.tar.gz 332525 BLAKE2B
e84f9da9902d139474cf68e49922f7b402c6d3eab8c009683c1b4304a505eb6aba86a60b019e4d3ad0ef1d003c743f14f60b61b3d7f31e8aeca99a4a16c1
SHA512
8bf1a2b04d6128c513c5d13549fb95e563e719e43ffb3b303fc5aa2376f57a69774c1afdb901281933f6b253068461ce59bd9564146a0c5a6483e1ccc47d259f
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.2.0.ebuild
new file mode 100644
index 000..4ac4407a9a8
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0.ebuild
@@ -0,0 +1,88 @@
+# 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
+
+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="isa pcmcia debug"
+
+COMMONDEPEND=""
+RDEPEND="${COMMONDEPEND}
+ !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() {
+ default
+ 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}
+}
+
+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
+}
[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/
commit: 91a8b90d95ded209a693ca11d4248801e0301a0b
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Oct 20 15:37:11 2018 +
Commit: Andreas Hüttel gentoo org>
CommitDate: Sat Oct 20 15:37:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=91a8b90d
sci-libs/linux-gpib-modules: Add blocker for old unified tarballs
Signed-off-by: Andreas K. Hüttel gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0_rc1.ebuild | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
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
index a49b1fd3e22..b08d9a3d45a 100644
--- 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
@@ -17,7 +17,9 @@ KEYWORDS="~amd64 ~arm ~x86"
IUSE="isa pcmcia debug"
COMMONDEPEND=""
-RDEPEND="${COMMONDEPEND}"
+RDEPEND="${COMMONDEPEND}
+ !
[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/
commit: fa505a01c0653b42a35393435372b324ebb2fcca
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Oct 20 14:47:39 2018 +
Commit: Andreas Hüttel gentoo org>
CommitDate: Sat Oct 20 14:47:51 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa505a01
sci-libs/linux-gpib-modules: Do not run depmod, bug 668616
Also, the kernel 4.11 patch is no longer needed
Closes: https://bugs.gentoo.org/668616
Signed-off-by: Andreas K. Hüttel gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0_rc1.ebuild | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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
index 749c802706e..a49b1fd3e22 100644
--- 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
@@ -42,7 +42,6 @@ pkg_setup () {
src_prepare () {
default
- kernel_is ge 4 11 0 && eapply
"${FILESDIR}"/${PN}-4.0.4_rc2-kernel-4.11.0.patch
eautoreconf
}
@@ -68,6 +67,7 @@ src_install() {
emake \
DESTDIR="${D}" \
INSTALL_MOD_PATH="${D}" \
+ DEPMOD="/bin/true" \
docdir=/usr/share/doc/${PF}/html install
dodoc ChangeLog AUTHORS README* NEWS
[gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/files/, sci-libs/linux-gpib-modules/
commit: 9330c661a3112fde869c39145ae4793db74ccf28
Author: Andreas K. Hüttel gentoo org>
AuthorDate: Sat Oct 13 16:09:56 2018 +
Commit: Andreas Hüttel gentoo org>
CommitDate: Sat Oct 13 16:13:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9330c661
sci-libs/linux-gpib-modules: New package, split out of sci-libs/linux-gpib
Signed-off-by: Andreas K. Hüttel gentoo.org>
Package-Manager: Portage-2.3.50, Repoman-2.3.11
sci-libs/linux-gpib-modules/Manifest | 1 +
...inux-gpib-modules-4.0.4_rc2-kernel-4.11.0.patch | 10 +++
.../linux-gpib-modules-4.2.0_rc1-reallydie.patch | 15
.../linux-gpib-modules-4.2.0_rc1.ebuild| 83 ++
sci-libs/linux-gpib-modules/metadata.xml | 18 +
5 files changed, 127 insertions(+)
diff --git a/sci-libs/linux-gpib-modules/Manifest
b/sci-libs/linux-gpib-modules/Manifest
new file mode 100644
index 000..de0878b97c2
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -0,0 +1 @@
+DIST linux-gpib-kernel-4.2.0_rc1.tar.gz 332525 BLAKE2B
e84f9da9902d139474cf68e49922f7b402c6d3eab8c009683c1b4304a505eb6aba86a60b019e4d3ad0ef1d003c743f14f60b61b3d7f31e8aeca99a4a16c1
SHA512
8bf1a2b04d6128c513c5d13549fb95e563e719e43ffb3b303fc5aa2376f57a69774c1afdb901281933f6b253068461ce59bd9564146a0c5a6483e1ccc47d259f
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 000..c3a9764924c
--- /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.0 +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
+ #include
+ #include
++#include
+ #include
+
+ #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 000..cba29eece37
--- /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.0 +0200
linux-gpib-kernel-4.2.0_rc1/drivers/Makefile.am2018-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 000..749c802706e
--- /dev/null
+++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.2.0_rc1.ebuild
@@ -0,0 +1,83 @@
+# 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}"
+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
+ kernel_is ge 4 11 0 && eapply
"${FILESDIR}"/${PN}-4.0.4_rc2-kernel-4.11.0.patch
+ 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 \
+
