From: "David Seifert" <soap@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/files/, sci-libs/linux-gpib-modules/
Date: Thu, 18 Feb 2021 18:57:01 +0000 (UTC) [thread overview]
Message-ID: <1613674573.c7254ac90be24880f937be977c833a27b4f99bac.soap@gentoo> (raw)
commit: c7254ac90be24880f937be977c833a27b4f99bac
Author: Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Thu Feb 18 18:56:13 2021 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Feb 18 18:56:13 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c7254ac9
sci-libs/linux-gpib-modules: Remove old
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: David Seifert <soap <AT> 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..00000000000
--- 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(&fmh_gpib_platform_driver.driver,
-- NULL, (void*)config, &fmh_gpib_device_match);
-+ NULL, (DRIVER_FIND_DEVICE_DATA_TYPE)config, &fmh_gpib_device_match);
- if(board->dev == NULL)
- {
- printk("No matching fmh_gpib_core device was found, attach failed.");
diff --git a/sci-libs/linux-gpib-modules/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..00000000000
--- 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, &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-r1.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.0-r1.ebuild
deleted file mode 100644
index 388a9a97a8c..00000000000
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.0-r1.ebuild
+++ /dev/null
@@ -1,73 +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 toolchain-funcs
-
-DESCRIPTION="Kernel modules for GPIB (IEEE 488.2) hardware"
-HOMEPAGE="https://linux-gpib.sourceforge.io/"
-SRC_URI="mirror://sourceforge/linux-gpib/linux-gpib-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~x86"
-IUSE="debug"
-
-COMMONDEPEND=""
-RDEPEND="${COMMONDEPEND}
- acct-group/gpib
- !<sci-libs/linux-gpib-4.2.0_rc1
-"
-DEPEND="${COMMONDEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/linux-gpib-kernel-${PV}
-
-PATCHES=(
- "${FILESDIR}/${PN}-4.3.0-kernel53.patch"
-)
-
-pkg_setup() {
- linux-mod_pkg_setup
-
- if kernel_is -lt 2 6 8; then
- die "Kernel versions older than 2.6.8 are not supported."
- fi
-}
-
-src_unpack() {
- default
- unpack "${WORKDIR}/linux-gpib-${PV}/linux-gpib-kernel-${PV}.tar.gz"
-}
-
-src_configure() {
- set_arch_to_kernel
-
- my_gpib_makeopts=''
- use debug && my_gpib_makeopts+='GPIB-DEBUG=1 '
-
- my_gpib_makeopts+="LINUX_SRCDIR=${KERNEL_DIR} "
-}
-
-src_compile() {
- set_arch_to_kernel
- emake \
- DESTDIR="${D}" \
- INSTALL_MOD_PATH="${D}" \
- docdir=/usr/share/doc/${PF}/html \
- ${my_gpib_makeopts}
-}
-
-src_install() {
- set_arch_to_kernel
- emake \
- DESTDIR="${D}" \
- INSTALL_MOD_PATH="${D}" \
- DEPMOD="/bin/true" \
- docdir=/usr/share/doc/${PF}/html \
- ${my_gpib_makeopts} \
- install
-
- dodoc ChangeLog AUTHORS README* NEWS
-}
diff --git a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.2-r1.ebuild b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.2-r1.ebuild
deleted file mode 100644
index 031ea676682..00000000000
--- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.2-r1.ebuild
+++ /dev/null
@@ -1,73 +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 toolchain-funcs
-
-DESCRIPTION="Kernel modules for GPIB (IEEE 488.2) hardware"
-HOMEPAGE="https://linux-gpib.sourceforge.io/"
-SRC_URI="mirror://sourceforge/linux-gpib/linux-gpib-${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="debug"
-
-COMMONDEPEND=""
-RDEPEND="${COMMONDEPEND}
- acct-group/gpib
- !<sci-libs/linux-gpib-4.2.0_rc1
-"
-DEPEND="${COMMONDEPEND}
- virtual/pkgconfig"
-
-S=${WORKDIR}/linux-gpib-kernel-${PV}
-
-PATCHES=(
- "${FILESDIR}/${P}-returntype.patch"
-)
-
-pkg_setup() {
- linux-mod_pkg_setup
-
- if kernel_is -lt 2 6 8; then
- die "Kernel versions older than 2.6.8 are not supported."
- fi
-}
-
-src_unpack() {
- default
- unpack "${WORKDIR}/linux-gpib-${PV}/linux-gpib-kernel-${PV}.tar.gz"
-}
-
-src_configure() {
- set_arch_to_kernel
-
- my_gpib_makeopts=''
- use debug && my_gpib_makeopts+='GPIB-DEBUG=1 '
-
- my_gpib_makeopts+="LINUX_SRCDIR=${KERNEL_DIR} "
-}
-
-src_compile() {
- set_arch_to_kernel
- emake \
- DESTDIR="${D}" \
- INSTALL_MOD_PATH="${D}" \
- docdir=/usr/share/doc/${PF}/html \
- ${my_gpib_makeopts}
-}
-
-src_install() {
- set_arch_to_kernel
- emake \
- DESTDIR="${D}" \
- INSTALL_MOD_PATH="${D}" \
- DEPMOD="/bin/true" \
- docdir=/usr/share/doc/${PF}/html \
- ${my_gpib_makeopts} \
- install
-
- dodoc ChangeLog AUTHORS README* NEWS
-}
next reply other threads:[~2021-02-18 18:57 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-02-18 18:57 David Seifert [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-07-12 12:04 [gentoo-commits] repo/gentoo:master commit in: sci-libs/linux-gpib-modules/files/, sci-libs/linux-gpib-modules/ Andrew Ammerlaan
2022-04-24 15:42 Andrew Ammerlaan
2020-05-09 11:02 Andreas K. Hüttel
2020-04-18 14:42 Andreas K. Hüttel
2018-10-13 16:14 Andreas Hüttel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1613674573.c7254ac90be24880f937be977c833a27b4f99bac.soap@gentoo \
--to=soap@gentoo.org \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox