gentoo resync : 03.03.2021

6 files changed, 3 insertions, 242 deletions

diff --git a/sci-libs/linux-gpib-modules/Manifest b/sci-libs/linux-gpib-modules/Manifest
index 0701d1dcf505..2a2ff1ed4002 100644
--- a/sci-libs/linux-gpib-modules/Manifest
+++ b/sci-libs/linux-gpib-modules/Manifest
@@ -1,11 +1,5 @@
-AUX linux-gpib-modules-4.3.0-kernel53.patch 1426 BLAKE2B 56d84daf8ca2f31db5e10a1f20b6d1fe5fed3efa98454e620ea7067378f408da2aa4db57ab062fdd139321b6e8bd738d22bfed1a61b2c5732fd4fbd10a39e299 SHA512 1cba793dc51957068a9613d9952937b1b58582d3833bd1e0c7e9ce6f3f2c54e827d67444bdaf413404c4b96aa3cfe4ce7faf7cb0f07ead7fdfe9eb3521dd3b27
-AUX linux-gpib-modules-4.3.2-returntype.patch 2451 BLAKE2B bc366bf772147aab165273bf1a20c65a6664cef8ff1069c22069a14d1907486074a6b2602ac99c0d6b283c7a187051592e0cba1d04af06af88e6c4c0d88bc779 SHA512 24891ccfd5a73224702f9b5dd1469083999951689761d9bf5c6eb84445d54e73381b4f6b05703401df1908f5f23557f1cf62dcdce0c81272483f96ca39d722bf
-DIST linux-gpib-4.3.0.tar.gz 1375852 BLAKE2B e2daa444ddf4c0c34084f264247051d4ce1c8103d8ae5d91b02d4742131c1f92ded02775eb0f8b0ea29820e2ae7b61c3132c74084a876e86fbb4efaf11688773 SHA512 8db4eb6d606c68ffacc67988479684fec815fc552756a6c93466ef0dfc93368771bb551944e3afc31db83e72e464ec1fb289fdcf80b4a6be1617e734fe3b9d65
-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
-EBUILD linux-gpib-modules-4.3.0-r1.ebuild 1400 BLAKE2B 99ec5d7cbb6ddd7e12808423d73783376c61c49e1be2e719667398095110a9ae8bd532a5429428f99b8c93e97e0b679bb83f4c249ae4328ded1805e5e17db5ef SHA512 f6f81aadcafad9758707dfc3cec89f94d289a9ae243d0fbf03e886749304444cbce26fd76c914395e23c1df7037e612ceb9684009321d6f6c45d38d945c2cd5d
-EBUILD linux-gpib-modules-4.3.2-r1.ebuild 1396 BLAKE2B 638e0139519a31e5b49168be5da7dde18558bffa0fc44b35e3555e2d29bb65ca6b34c6d66e5eea11d59808ae51c90271904cfb352d6a60c6e2457e1636eeefe4 SHA512 d24837c4683527363011be674382c5471f759a46211068aa10fb21de6becf4cdece89858805a5d5aac64b7220cdd4f495f2ab832e5a140b108e44f67d5b12fa5
-EBUILD linux-gpib-modules-4.3.3-r1.ebuild 1346 BLAKE2B 453e184d956a71b41db687f010b9725d38ca812986568f14bd98a944a7a9e41ffe458d68e38ff39b384286a0229d39b62cf36c1d2497e544085799d8d3274bcb SHA512 0f822dd05016faf6be35047abf0a9f4f3580e770679d245253ddaef6f32f148be1fe6f9060283680559f6714b5da904a12ef4ecaad957ff611858abcd6117d2d
+EBUILD linux-gpib-modules-4.3.3-r1.ebuild 1345 BLAKE2B 5c52c4e59e407c34a390783ffdd4c32bb3119f8d4fbf5fabe33cd724029a0549081feab3e0f194607bafe40556359b7025f61d6c3e74b3381907427887c0d72f SHA512 ed908311a79d77acb579a93536978f07a059de92a2d77dbb9c664f95c7429d74f4c84eefe33de5622c6925a668c9b23cdd36a526b36376f0aa205b7d9b6ddd0c
 EBUILD linux-gpib-modules-4.3.4.ebuild 1346 BLAKE2B 8b66209430fb62453785e8747c3ec988e20000137b034c1f28e3e85a306e0d68b2dfaffc8ff0d011f9f3c870004f10b32f25b75024063678f96b0b6ad7305380 SHA512 d57b9489fff12bbbc1838a628227e71e42d3dcc611885e02f2caf1e7b95666f29b01c7e602ef704c36fd48ce8740ed0a86b6927d1a501446092d028c641923a8
 MISC metadata.xml 480 BLAKE2B 1a8b338e4e8ebe5e8f9a4457cee52af1997664818100f2f4a3d7d36c1381825e48b5def55047b0e3ca063eb396ee83a7b173980801f10b3d99535c2efb77486d SHA512 947365f6269816228b3e0bf5f6109a7ca58dfe25929a419449e5d8d7789b9b008ae289f1f74831a3de3cb26f7ce05983801e8722102c9609e80c2f6fbd2d8b7b
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 e650ccb5ed15..000000000000
--- 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 88aa18081574..000000000000
--- 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 388a9a97a8c8..000000000000
--- 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 031ea6766820..000000000000
--- 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
-}
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 5b209c4c2813..a5c44ee72549 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=""