commit: 3fed013aab0b8d449151b754424deccba41af677 Author: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> AuthorDate: Mon Oct 6 19:00:11 2025 +0000 Commit: Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org> CommitDate: Mon Oct 6 19:01:11 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fed013a
sci-libs/linux-gpib: add 4.3.7 Closes: https://bugs.gentoo.org/944714 Signed-off-by: Andreas K. Hüttel <dilfridge <AT> gentoo.org> sci-libs/linux-gpib/Manifest | 1 + ...ux-gpib-9999.ebuild => linux-gpib-4.3.7.ebuild} | 48 ++++------------------ sci-libs/linux-gpib/linux-gpib-9999.ebuild | 48 ++++------------------ 3 files changed, 17 insertions(+), 80 deletions(-) diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest index f8c76cc65197..ca4203a52594 100644 --- a/sci-libs/linux-gpib/Manifest +++ b/sci-libs/linux-gpib/Manifest @@ -1,2 +1,3 @@ DIST gpib_firmware-2008-08-10.tar.gz 173004 BLAKE2B 05fcde09de5246b86004c263c733d64316511bdb0b84dfbd9b94cb78e2909c0d191ff21ee0d77e7f0947e9231bd4cd62d6348e8f9beefd6d201b473732ff23d2 SHA512 f2a0ee3316b75ac36ed88568e45ca4c69935a6d10783c65582003ab39686f2a69d3002901866065f4f5efa9fdd4c779e038d1d7ce24bba266a619c164d5ac10d DIST linux-gpib-4.3.6.tar.gz 1433121 BLAKE2B 64e2b19106d0531df990b1338f82a71707e54f448d652f6379eb9cd71feb84637090ed8fdfb0264248aa6879d5b9a1dc50e75c21a2c22a31397120eea5903e98 SHA512 a8005c71bfddb854ecbe4df0a81530e44378150242508b10df58c61d039c6d329020407608e31f1ef360de0c83169e76b793c032256e732d229bfd2da4cbaa35 +DIST linux-gpib-4.3.7.tar.gz 1309937 BLAKE2B 22808daa8bc3bbb9c93dc94b0186327ec1f40d72842b00a4d8907d03e769ce378544de5a02b4b597f94a7928c265bcc21055134a14ff8855a0380a83eaa14258 SHA512 a0783cf54f37132b6f608f555d453be3c1da693e4bddff9e87b40c0ba034a44ac640c87f96d187cf6f98501177f09fec04e7380512bcbb7fc8d0d4652b3be7ad diff --git a/sci-libs/linux-gpib/linux-gpib-9999.ebuild b/sci-libs/linux-gpib/linux-gpib-4.3.7.ebuild similarity index 76% copy from sci-libs/linux-gpib/linux-gpib-9999.ebuild copy to sci-libs/linux-gpib/linux-gpib-4.3.7.ebuild index 323ee8b32be6..88ba73ef792c 100644 --- a/sci-libs/linux-gpib/linux-gpib-9999.ebuild +++ b/sci-libs/linux-gpib/linux-gpib-4.3.7.ebuild @@ -8,10 +8,8 @@ PYTHON_COMPAT=( python3_{10..13} ) DISTUTILS_EXT=1 DISTUTILS_OPTIONAL=1 DISTUTILS_USE_PEP517=setuptools -MODULES_OPTIONAL_IUSE=+modules -inherit autotools distutils-r1 guile-single linux-mod-r1 -inherit perl-functions readme.gentoo-r1 udev +inherit linux-info readme.gentoo-r1 autotools guile-single perl-functions python-single-r1 udev # Check for latest firmware version on bump FW_PV="2008-08-10" @@ -31,10 +29,13 @@ HOMEPAGE="https://linux-gpib.sourceforge.io/"; SRC_URI+=" firmware? ( https://linux-gpib.sourceforge.io/firmware/gpib_firmware-${FW_PV}.tar.gz ) " +S="${WORKDIR}/${PN}-user-${PV}" LICENSE="GPL-2" SLOT="0" -IUSE="guile pcmcia perl php python static tcl doc firmware" + +IUSE="pcmcia static guile perl php python tcl doc firmware +modules" + REQUIRED_USE=" guile? ( ${GUILE_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} ) @@ -46,12 +47,12 @@ COMMONDEPEND=" guile? ( ${GUILE_DEPS} ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:= ) + python? ( ${PYTHON_DEPS} ) firmware? ( sys-apps/fxload ) " RDEPEND="${COMMONDEPEND} acct-group/gpib - python? ( ${PYTHON_DEPS} ) - !sci-libs/linux-gpib-modules + modules? ( ~sci-libs/linux-gpib-modules-${PV} ) " DEPEND="${COMMONDEPEND}" BDEPEND=" @@ -66,7 +67,7 @@ PATCHES=( pkg_setup() { if use modules; then - linux-mod-r1_pkg_setup + linux-info_pkg_setup if kernel_is -ge 6 13 0; then eerror "The GPIB drivers have been merged upstream into kernel" eerror "version 6.13.0 and up. Please enable CONFIG_GPIB for" @@ -89,10 +90,6 @@ src_unpack() { else default unpack "${WORKDIR}/${P}/${PN}-user-${PV}.tar.gz" - if use modules; then - unpack "${WORKDIR}/${P}/${PN}-kernel-${PV}.tar.gz" - mv "${WORKDIR}/${PN}-kernel-${PV}" "${WORKDIR}/${PN}-kernel" || die - fi fi } @@ -135,11 +132,6 @@ src_configure() { distutils-r1_src_configure popd >/dev/null || die fi - - if use modules; then - MODULES_MAKEARGS+=( LINUX_SRCDIR="${KV_OUT_DIR}" ) - use debug && MODULES_MAKEARGS+=( 'GPIB-DEBUG=1' ) - fi } src_compile() { @@ -149,27 +141,6 @@ src_compile() { distutils-r1_src_compile popd >/dev/null || die fi - - if use modules; then - local modlist=( - "agilent_82350b=gpib:${S}/../${PN}-kernel:${S}/../${PN}-kernel/drivers/gpib/agilent_82350b" - "agilent_82357a=gpib:${S}/../${PN}-kernel:${S}/../${PN}-kernel/drivers/gpib/agilent_82357a" - "cb7210=gpib:${S}/../${PN}-kernel:${S}/../${PN}-kernel/drivers/gpib/cb7210" - "cec_gpib=gpib:${S}/../${PN}-kernel:${S}/../${PN}-kernel/drivers/gpib/cec" - "fmh_gpib=gpib:${S}/../${PN}-kernel:${S}/../${PN}-kernel/drivers/gpib/fmh_gpib" - "gpib_bitbang=gpib:${S}/../${PN}-kernel:${S}/../${PN}-kernel/drivers/gpib/gpio" - "hp82335=gpib:${S}/../${PN}-kernel:${S}/../${PN}-kernel/drivers/gpib/hp_82335" - "hp_82341=gpib:${S}/../${PN}-kernel:${S}/../${PN}-kernel/drivers/gpib/hp_82341" - "ines_gpib=gpib:${S}/../${PN}-kernel:${S}/../${PN}-kernel/drivers/gpib/ines" - "lpvo_usb_gpib=gpib:${S}/../${PN}-kernel:${S}/../${PN}-kernel/drivers/gpib/lpvo_usb_gpib" - "nec7210=gpib:${S}/../${PN}-kernel:${S}/../${PN}-kernel/drivers/gpib/nec7210" - "ni_usb_gpib=gpib:${S}/../${PN}-kernel:${S}/../${PN}-kernel/drivers/gpib/ni_usb" - "gpib_common=gpib:${S}/../${PN}-kernel:${S}/../${PN}-kernel/drivers/gpib/sys" - "tms9914=gpib:${S}/../${PN}-kernel:${S}/../${PN}-kernel/drivers/gpib/tms9914" - "tnt4882=gpib:${S}/../${PN}-kernel:${S}/../${PN}-kernel/drivers/gpib/tnt4882" - ) - linux-mod-r1_src_compile - fi } src_install() { @@ -185,8 +156,6 @@ src_install() { PYTHONDONTWRITEBYTECODE=0 \ docdir="/usr/share/doc/${PF}/html" install - use modules && linux-mod-r1_src_install - use guile && guile_unstrip_ccache if use perl; then @@ -280,7 +249,6 @@ gpib_config --minor 0 --init-data /usr/share/linux-gpib/hp_82341/hp_82341c_fw.bi } pkg_postinst() { - use modules && linux-mod-r1_pkg_postinst readme.gentoo_print_elog udev_reload } diff --git a/sci-libs/linux-gpib/linux-gpib-9999.ebuild b/sci-libs/linux-gpib/linux-gpib-9999.ebuild index 323ee8b32be6..88ba73ef792c 100644 --- a/sci-libs/linux-gpib/linux-gpib-9999.ebuild +++ b/sci-libs/linux-gpib/linux-gpib-9999.ebuild @@ -8,10 +8,8 @@ PYTHON_COMPAT=( python3_{10..13} ) DISTUTILS_EXT=1 DISTUTILS_OPTIONAL=1 DISTUTILS_USE_PEP517=setuptools -MODULES_OPTIONAL_IUSE=+modules -inherit autotools distutils-r1 guile-single linux-mod-r1 -inherit perl-functions readme.gentoo-r1 udev +inherit linux-info readme.gentoo-r1 autotools guile-single perl-functions python-single-r1 udev # Check for latest firmware version on bump FW_PV="2008-08-10" @@ -31,10 +29,13 @@ HOMEPAGE="https://linux-gpib.sourceforge.io/"; SRC_URI+=" firmware? ( https://linux-gpib.sourceforge.io/firmware/gpib_firmware-${FW_PV}.tar.gz ) " +S="${WORKDIR}/${PN}-user-${PV}" LICENSE="GPL-2" SLOT="0" -IUSE="guile pcmcia perl php python static tcl doc firmware" + +IUSE="pcmcia static guile perl php python tcl doc firmware +modules" + REQUIRED_USE=" guile? ( ${GUILE_REQUIRED_USE} ) python? ( ${PYTHON_REQUIRED_USE} ) @@ -46,12 +47,12 @@ COMMONDEPEND=" guile? ( ${GUILE_DEPS} ) perl? ( dev-lang/perl:= ) php? ( dev-lang/php:= ) + python? ( ${PYTHON_DEPS} ) firmware? ( sys-apps/fxload ) " RDEPEND="${COMMONDEPEND} acct-group/gpib - python? ( ${PYTHON_DEPS} ) - !sci-libs/linux-gpib-modules + modules? ( ~sci-libs/linux-gpib-modules-${PV} ) " DEPEND="${COMMONDEPEND}" BDEPEND=" @@ -66,7 +67,7 @@ PATCHES=( pkg_setup() { if use modules; then - linux-mod-r1_pkg_setup + linux-info_pkg_setup if kernel_is -ge 6 13 0; then eerror "The GPIB drivers have been merged upstream into kernel" eerror "version 6.13.0 and up. Please enable CONFIG_GPIB for" @@ -89,10 +90,6 @@ src_unpack() { else default unpack "${WORKDIR}/${P}/${PN}-user-${PV}.tar.gz" - if use modules; then - unpack "${WORKDIR}/${P}/${PN}-kernel-${PV}.tar.gz" - mv "${WORKDIR}/${PN}-kernel-${PV}" "${WORKDIR}/${PN}-kernel" || die - fi fi } @@ -135,11 +132,6 @@ src_configure() { distutils-r1_src_configure popd >/dev/null || die fi - - if use modules; then - MODULES_MAKEARGS+=( LINUX_SRCDIR="${KV_OUT_DIR}" ) - use debug && MODULES_MAKEARGS+=( 'GPIB-DEBUG=1' ) - fi } src_compile() { @@ -149,27 +141,6 @@ src_compile() { distutils-r1_src_compile popd >/dev/null || die fi - - if use modules; then - local modlist=( - "agilent_82350b=gpib:${S}/../${PN}-kernel:${S}/../${PN}-kernel/drivers/gpib/agilent_82350b" - "agilent_82357a=gpib:${S}/../${PN}-kernel:${S}/../${PN}-kernel/drivers/gpib/agilent_82357a" - "cb7210=gpib:${S}/../${PN}-kernel:${S}/../${PN}-kernel/drivers/gpib/cb7210" - "cec_gpib=gpib:${S}/../${PN}-kernel:${S}/../${PN}-kernel/drivers/gpib/cec" - "fmh_gpib=gpib:${S}/../${PN}-kernel:${S}/../${PN}-kernel/drivers/gpib/fmh_gpib" - "gpib_bitbang=gpib:${S}/../${PN}-kernel:${S}/../${PN}-kernel/drivers/gpib/gpio" - "hp82335=gpib:${S}/../${PN}-kernel:${S}/../${PN}-kernel/drivers/gpib/hp_82335" - "hp_82341=gpib:${S}/../${PN}-kernel:${S}/../${PN}-kernel/drivers/gpib/hp_82341" - "ines_gpib=gpib:${S}/../${PN}-kernel:${S}/../${PN}-kernel/drivers/gpib/ines" - "lpvo_usb_gpib=gpib:${S}/../${PN}-kernel:${S}/../${PN}-kernel/drivers/gpib/lpvo_usb_gpib" - "nec7210=gpib:${S}/../${PN}-kernel:${S}/../${PN}-kernel/drivers/gpib/nec7210" - "ni_usb_gpib=gpib:${S}/../${PN}-kernel:${S}/../${PN}-kernel/drivers/gpib/ni_usb" - "gpib_common=gpib:${S}/../${PN}-kernel:${S}/../${PN}-kernel/drivers/gpib/sys" - "tms9914=gpib:${S}/../${PN}-kernel:${S}/../${PN}-kernel/drivers/gpib/tms9914" - "tnt4882=gpib:${S}/../${PN}-kernel:${S}/../${PN}-kernel/drivers/gpib/tnt4882" - ) - linux-mod-r1_src_compile - fi } src_install() { @@ -185,8 +156,6 @@ src_install() { PYTHONDONTWRITEBYTECODE=0 \ docdir="/usr/share/doc/${PF}/html" install - use modules && linux-mod-r1_src_install - use guile && guile_unstrip_ccache if use perl; then @@ -280,7 +249,6 @@ gpib_config --minor 0 --init-data /usr/share/linux-gpib/hp_82341/hp_82341c_fw.bi } pkg_postinst() { - use modules && linux-mod-r1_pkg_postinst readme.gentoo_print_elog udev_reload }
