From d0e460d711ba47fcff5bf5cd57355d0853795dc5 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 12 Jul 2023 16:32:46 +0100 Subject: gentoo auto-resync : 12:07:2023 - 16:32:45 --- sci-libs/Manifest.gz | Bin 44819 -> 44812 bytes sci-libs/linux-gpib-modules/Manifest | 3 +- .../linux-gpib-modules-4.3.4-kernel-6.4.patch | 27 +++++++++ .../linux-gpib-modules-4.3.5-r2.ebuild | 60 -------------------- .../linux-gpib-modules-4.3.5-r3.ebuild | 62 +++++++++++++++++++++ 5 files changed, 91 insertions(+), 61 deletions(-) create mode 100644 sci-libs/linux-gpib-modules/files/linux-gpib-modules-4.3.4-kernel-6.4.patch delete mode 100644 sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r2.ebuild create mode 100644 sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r3.ebuild (limited to 'sci-libs') diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz index d405c492dcd3..b004cbc9883f 100644 Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ diff --git a/sci-libs/linux-gpib-modules/Manifest b/sci-libs/linux-gpib-modules/Manifest index de8f7f690abf..5bb116861655 100644 --- a/sci-libs/linux-gpib-modules/Manifest +++ b/sci-libs/linux-gpib-modules/Manifest @@ -1,5 +1,6 @@ AUX linux-gpib-modules-4.3.4-depmod.patch 744 BLAKE2B 6079d0523cafcd15e38a7e73e8a0d98e107220e6816bd7646c254044acaa1d39d19e983987dff70c249a67b7accbc74a836f8ddd9f39503cdd510edc2d6bdbc2 SHA512 417193e768b0b5bd41b053a86ebbab163a74662e7f2912c70ae76a873243fb218b24f0680699f9988d4e9097b8bbd8a23902d3f5652675f8a3dbb02915308f12 +AUX linux-gpib-modules-4.3.4-kernel-6.4.patch 957 BLAKE2B 0acd630a4ba05dd168813b6b8641d189eb4a4dae57a3a6b558ca0ee0de97c4287ddc7fc756c9f1b3c90e4d378ffec8afe4af16c33b0bb4394b10fc726518fa14 SHA512 62d3b8add27b43b2419de1b49fdb2e10b03bb50f179558fa2bda0d2dee13c3e44b871713f6c695224478c5dfd0f461b53e4bd70a2576e467e74cf37877d4d9b5 DIST linux-gpib-4.3.5.tar.gz 1462624 BLAKE2B fff30ed1a7abc18cd4317e8f8979ef4014a532baab8c014f9a2eaa3338a2e8e8b672214d3f2b3f44066be15f432861a3fe3d67652f6966e73e561d99ff1e1566 SHA512 018cc255922a6335f8d28418b0a0808c3a369506470d9c81432ac7183ae255217d938a419e10ba2b0c44205a9d901405ce00ad5bdd968db2721cedd83baa2f76 -EBUILD linux-gpib-modules-4.3.5-r2.ebuild 1246 BLAKE2B 87b7e4ed0f83b7bb3e7959b2357eb28faf67575d43a835321575869d68d953b63e0b02e098689a65765aafdb57bca2b0ca4680180393e8f9013bd7666b204da5 SHA512 52ca8a6db7127ef9425c58db4001a2ef4933dbe52cf8fb448669af9f2156791eee150919595fdb84d3072d7e258c26d4165e3e4cf9d74e312728dbc53dc65bc9 +EBUILD linux-gpib-modules-4.3.5-r3.ebuild 1341 BLAKE2B 5c1d9cb156453c096487d02680b9091084d18578ced47973c654fb88d273ce12e86b2a897a2df49c1628860d00c01d9fba81fe972fd128b627a275e603aa2e86 SHA512 dbe711ddcaa90013cf0438cddcf7fcf096cd20b16220cfd79bf871ab7e4be9fc9199e9d1dd73710f572ee122f9069e24934b8328e00731f6252811cad7dc962f EBUILD linux-gpib-modules-4.3.5.ebuild 1330 BLAKE2B f935eefab0bf6ce9c69eb71607552b90a3d164383c68f1474b2887f1f7548d710e4e243c079a8732bd3073bf42c3197dc312438bc0fe79b8f6a6a59105a23c12 SHA512 cfb97cf0bc1f573ae43183366aedfe3a182319b545b39b8534882036021c5d1291245df83c1b971aa9b47fd6906b3e1bd4bdae1c92e6174fb8a2a7aa2ba59249 MISC metadata.xml 481 BLAKE2B 5ee2924d1131f188c19c84bbfa8a3e2c6093387d15db5a0bc86ea14d4b0c0f36924df7525fb26f0b6660efe1a75f20e19afbd71270386795bd6af82bc5cd38f8 SHA512 dd41ed66cff7ad48e4a107f512e1121fb630f6487ef7872aeab219ff39d6cdb4b5dc14fa19c1b7931697c555702c2bd8bb8ec553b060c11581f02d8a46f76ef4 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 000000000000..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-r2.ebuild deleted file mode 100644 index 7be607ff4d47..000000000000 --- a/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r2.ebuild +++ /dev/null @@ -1,60 +0,0 @@ -# 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() { - 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 -} 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 new file mode 100644 index 000000000000..0736e0159f4d --- /dev/null +++ b/sci-libs/linux-gpib-modules/linux-gpib-modules-4.3.5-r3.ebuild @@ -0,0 +1,62 @@ +# 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" + # https://sourceforge.net/p/linux-gpib/code/2053/ + "${FILESDIR}/${PN}-4.3.4-kernel-6.4.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 +} -- cgit v1.2.3