Add the long-desired fix for CTRL-C breakage from upstream trunk
authorAndreas Hüttel <dilfridge@gentoo.org>
Tue, 7 Apr 2015 10:03:45 +0000 (10:03 +0000)
committerAndreas Hüttel <dilfridge@gentoo.org>
Tue, 7 Apr 2015 10:03:45 +0000 (10:03 +0000)
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x94BFDF4484AD142F

sci-libs/linux-gpib/ChangeLog
sci-libs/linux-gpib/Manifest
sci-libs/linux-gpib/linux-gpib-3.2.21-r1.ebuild [new file with mode: 0644]

index f2c160c8cc21351742d3efcedbd99d66dc4636a5..7305de791000dcbd895843ea20224f15df29fb44 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/linux-gpib
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/linux-gpib/ChangeLog,v 1.36 2015/04/07 09:41:26 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/linux-gpib/ChangeLog,v 1.37 2015/04/07 10:03:34 dilfridge Exp $
+
+*linux-gpib-3.2.21-r1 (07 Apr 2015)
+
+  07 Apr 2015; Andreas K. Huettel <dilfridge@gentoo.org>
+  +files/linux-gpib-3.2.21-ctrl-c.patch, +linux-gpib-3.2.21-r1.ebuild:
+  Add the long-desired fix for CTRL-C breakage from upstream trunk
 
   07 Apr 2015; Andreas K. Huettel <dilfridge@gentoo.org>
   linux-gpib-3.2.20-r1.ebuild, linux-gpib-3.2.21.ebuild:
index c4d596d7b9e65349928ac8357e7401e2d97d0652..63f42f4108c8fe3bf1fe163169b0a080e06d7e09 100644 (file)
@@ -7,27 +7,29 @@ AUX linux-gpib-3.2.16-reallydie.patch 617 SHA256 a7bd9847a2949000b8aa78aaf9011fe
 AUX linux-gpib-3.2.21-build.patch 1676 SHA256 f0f2aadc12a7180dc1237f1e991d4a7d0bdde9b1ceca9ecef3e6bad5a2498c25 SHA512 df4229ee1ef181a9b58bf888cc85575feddb881d5d5c1f9dd43c14a7dd903a8854d898bd7d16f5cf2874133a9b5993fd59546fa1024421f66e10be62a6206f89 WHIRLPOOL bef19a7c8fd86faca355403abe0f8be4755d9511b1c58f3ae68fe9d87dca347d6464f9904ba503468417e12a2fb518c2be570eb457d57337f9ddf0ab1dc4df53
 DIST gpib_firmware-2006-11-12.tar.gz 169357 SHA256 98380a8d12e6e34dccc0c1d82b48ed796c0c0f5571107d6a685524560aa8d701 SHA512 164d6fcfb3af43933f0a16645276f7d527a7aa24ef311f6ae3dcd7f45c41f92c855cf221bc946772f43fc2f9524057abc34bbd7d805c89b33ed7e111bc6870af WHIRLPOOL 44506c9d03e746f5bc88f9a2f20e07879a4c4c72f52a5dae97accb381f8ac7f5b5c0cf5c58d1045b18ed6cbda20549a1fdb7e5ab0151a1081da1ec798c683e67
 DIST linux-gpib-3.2.20.tar.gz 1254951 SHA256 cde3e77c3fd968e1ee5785abc2d6e09f0f66711fc2612abfc7b05c72c16c2e9a SHA512 679c3895ac5077b3246c43818c7c85ae53597d4a7e70ff2306978472337214952798c41eca9a4ae8be20aa3afa4bc78a7b796fccd6b63a8e1a879fcd144adea9 WHIRLPOOL 653ea123c81ccaf5d55055e70609152584adf36eb6cd0e421f10f5c86d24781e44ced125e9ac417901594c6ac83bed1f7123de27578ad3c841612bb9955eab85
+DIST linux-gpib-3.2.21-ctrl-c.patch.gz 10477 SHA256 697a460ea8515788765983afb5c27ad527e6ab1e75232133c572530643351916 SHA512 4b34ecbc5a3f3170337808397df19b9cf09d3fc8a53052fb560ae7b5336b946c6b1c76ba24b0ad66d4bb5a005902fe8599bb7e981c140a68046b9f14ed5268b3 WHIRLPOOL 5656ed7d4dafeff4b766f247c4f495444d271130cbad8bedaef9b761e14b57c09b46a7ccd5e3be5ff50934f48a88a987eb71f6997aafdcd4adc486c49b2c0c5d
 DIST linux-gpib-3.2.21.tar.gz 1274505 SHA256 31fd86f4897239ffc55e0d4d850586d24d74144b604d6d39fd33dc59d28f7019 SHA512 539f7444e6bcd07d66cabc3abae9d40cdea3a84365bd69a4621149bc11b7b0e9826650d91d2a048d9780fab7db30005b08a4b91c77e7a26e036ed6f5adb6850b WHIRLPOOL 72a9c929d7e3b79c5c954fb6e41c4d9eb450595c6dccc877a3b47851e467e741b191a708ec3c018e4fe576e5677ffec5986970f83c020707bbbd8e2968e43153
 EBUILD linux-gpib-3.2.20-r1.ebuild 5520 SHA256 e74d66b8b7fb18a3d970d58681aedd9b3a9ed58b9683977fac6b517953d9deb0 SHA512 16bb96b4450e37d8bd7c671beea77d85badd2c9978c7210a25792f46039aaf61f2770e60fa1c50f19b3bc55c322c4c6b5325903b95bbf6c23989ac164ada67a4 WHIRLPOOL 420d470f8cb9d75d59cd395d148856bf762ca77fbcf94fc1e0093e023e6eb0142c67163da321b3d8048307c1d55906036f27ffc3c4bdccd7620c7ec8e6e2d85a
+EBUILD linux-gpib-3.2.21-r1.ebuild 6017 SHA256 fe8ea3ee2497889d38f8a68e0f67a1644ede53f69b0bb798c32668ba08c0d89a SHA512 2fd8af85f096dc4d19fb118e3e3752120ad0e312f9d3ec0a0c4079b7c8abf4e60957558ebb409f7476772fb270df938faebb9be706c28e9275d3705da849224c WHIRLPOOL 4ff895b56214827a3789af7207161890b1dd5d87dd57b57c1633ade2920c3d88e6db2c6fee8017225dc1f0ee9ca68294b3981b19efb879b07ef9e31563dd41ec
 EBUILD linux-gpib-3.2.21.ebuild 5516 SHA256 0f678db9aa766f6e04158bffed1a4821286066cf473e6c35d346d8169e3bfa0b SHA512 d8f597ad101e95deb2aa4b713c14a94943fbae31a9f82dd5c25106527729a93bcafd716266aeb6290bd072c13e54eb4db05b5a5b359a02c2c28ebb57b2cf327f WHIRLPOOL ef11e8daa83b18bad1485da5ec6acf9caebad37d695ec8c53b84957e96ab51d48f1d16a6d3422e3d64762994d11eb611b1b29bc1c6385cee0670e98ed14d49c0
-MISC ChangeLog 6461 SHA256 8707d171867fb05ba0d6753b139b2a22e5210cb82df2234e4d26b6bfb659ba22 SHA512 853f1985aff40fb8a9dfa24d4a3d169f178cd45f8dfd50b6b690c6fb0322d5dd43af75bf2b992f49a0830527343104a0b79eeff67fe5a1740ccf035852f7b1e1 WHIRLPOOL 3e56f0aea8895f642bda7f2ae50c7ad5fc3eddcc835d4c7f5f1e1c7c16526b8639674711acf9b845f86cb20d2c5f719ec00afce7ab29257e9ccbe01eb63bc923
+MISC ChangeLog 6694 SHA256 350c2f12749730ee7991801ac4e79122926219b4eed95bf2231b315657207fb6 SHA512 2f5f46088a91da14f7a5846dab404e19316acc63be2343fb4a17821ea975165916f8310070b9ea0a740777d0aacc53257f27c9f3b91e09d8e26cb98b76b7df38 WHIRLPOOL a3ec325a8830ff21d153bb3efb58f209d5541130e0b545e6948b16dc91f0035259aef5aba6cd407398fa892dc062b0f3c712a9a7d7f300f127019418ecae976f
 MISC metadata.xml 485 SHA256 83d214a690f95c1d118e32b422570173a293c371ff9109138ea5df70f5e9eac1 SHA512 65d91e34211c5d952f77471b4947a97b68f23bb868349f17c3d7791f7a6f06bc970c71d0754be9e2d384e3a4b7f5b8afa853d08a51fe6347ef3b60d68bf951c7 WHIRLPOOL 4d4a50fada40f24655eb884888847ab7fb94dc7abea619e4c7d0544944be06b16f90b3b6bab5e45fcfa7737862fc79d3729a00c3a8f15b5fd7183b7263ef7bd0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJVI6WIXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJVI6q4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCMkRCMDNGRDg4MkUwQTczOTgwMkE3RUEx
-RjU1NzRDRUExQkE5Mjk1AAoJEB9VdM6hupKVbMoP/1T064OqD1A2n4h2Yl3dGA8S
-AoSJF0KOKIcrxbOzBFaie8RvJbWHQ79lBJOGEttakM0X3PhEcQkAsiOiGq41nyOx
-tcQzSbclXMt1ImGHt3fZKwtzhvWyM4EIpm3AjTVY7tCLq1EtCgDNIHaAObxRVmFu
-gYgU2YmSD7QO6bRX+JZ0oyaJ+13h8rvDGgGKh1623ybQpKnZ9bwvGEYATixe7L6N
-3xTeTkEI9W+zF0agNL0nPdbSTtarPanZWa5yKgVjNWj7pYNVEVDtj8PSjv6F9qMv
-3B7PvXbU4yHxD7+5rENo649ziHLxyFcRjjHWQQZTKCUCn2YNF+OspKysJMQKQdat
-j6e13ypxLkn2UqYtnuJsst1M/RRR7d4db3edfJ+JPtcbuF+k/I0dz5pmrloXMGn7
-XiDE3zFsDFQrLObuOBnEWpuS/OPPVjD5mxeZui9dXp77uRyEDq3PvLzuA7jrtRe+
-r9euC7kVgGIulxEzStGLuu5s6ZTxEa8oMrewgJrQmSsO2+di6CzNHPAU8gywvCtq
-y0d8RJYiFGk1ZvxykF1+2zEY4PCsM00cbWkw+liuOxoG3erLe97Z7lYOu/t4z0ae
-vkQkY+1gBZcnSIHk+PVGqIrWeBQY/+sFgc3qmjLGUPb78SiHTiSwfPwIRsGca26r
-EzhP3+T5gI037yMVuDXl
-=84lA
+RjU1NzRDRUExQkE5Mjk1AAoJEB9VdM6hupKVep8P/2pS0u2nVHKu7t8kwRdIUsTS
+NJx3t/Nj8GMwAU9WA+zZRS1DSCdyI9OK/XmlL3nHQ2QdjDOJDEZwnIUwuJz6HG1O
+cmEzSuOnjX45NKwq1r4HRfyhCXQKErD0nLsqF4joguWaEerM/xWTD4HhT4yrnnmw
+uBgc9fVkNK2bo/ER6gxlZmF3RsYhCGjyoBjhMDhZ3StWrw3bSA67NcIoO1AcYZvK
+3su3Bp2TnkLz+wXHQ+onwxDk/0S6C/Fo7D0s47Lf400sKwCxcd9EPCqVnOnRk5jc
+KXJBoavB4U8G8VI40VWD0tjSiUB3NHi7IQ5dpqZbV6HLDi/RZhabkzAhjrcwyX0h
+DW5+37h5N/k8faSa6bdY081Er8gyclI1haON+jjndablsX7iqp7Q9YmIw/HlF6w8
+s4yCnax8TXLO43tMbahHdI5ctEhgoA47Q6blAL7ibDiOim02yCd5rWV4Uhkyxk0u
+JT1pH6tAldtJ8JciKGZ9UksqnSdck4r7R8FkjBlLGs972qF9rkzBI95sl51BD+tS
+uA2edzJS06CZYcUYTlR8OJAKLao8joDJDdYpziuFM9p5RKzQv7GmDj4E0/s3aiKF
++R8zQS60x7Swr8ufTqS/G95u+BgaoGpvLBnVJe2KggHVU9i/lRW6+8G9j+whd610
+Qm1Aevn1d4QnRld9z/fU
+=4QU7
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/linux-gpib/linux-gpib-3.2.21-r1.ebuild b/sci-libs/linux-gpib/linux-gpib-3.2.21-r1.ebuild
new file mode 100644 (file)
index 0000000..a0c34fd
--- /dev/null
@@ -0,0 +1,192 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/linux-gpib/linux-gpib-3.2.21-r1.ebuild,v 1.1 2015/04/07 10:03:34 dilfridge Exp $
+
+EAPI=5
+
+PERL_EXPORT_PHASE_FUNCTIONS=no
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_COMPAT=( python{2_6,2_7} )
+
+inherit eutils linux-mod autotools perl-module python-single-r1 toolchain-funcs udev user
+
+DESCRIPTION="Kernel module and driver library for GPIB (IEEE 488.2) hardware"
+HOMEPAGE="http://linux-gpib.sourceforge.net/"
+SRC_URI="mirror://sourceforge/linux-gpib/${P}.tar.gz
+       firmware? ( http://linux-gpib.sourceforge.net/firmware/gpib_firmware-2006-11-12.tar.gz )
+       http://dev.gentoo.org/~dilfridge/distfiles/${PN}-3.2.21-ctrl-c.patch.gz
+"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="isa pcmcia static debug guile perl php python tcl doc firmware"
+
+COMMONDEPEND="
+       tcl? ( dev-lang/tcl:0= )
+       guile? ( dev-scheme/guile:12 )
+       perl? ( dev-lang/perl:= )
+       php? ( dev-lang/php:= )
+       python? ( ${PYTHON_DEPS} )
+       firmware? ( sys-apps/fxload )"
+RDEPEND="${COMMONDEPEND}"
+DEPEND="${COMMONDEPEND}
+       virtual/pkgconfig
+       doc? ( app-text/docbook-sgml-utils )
+       perl? ( virtual/perl-ExtUtils-MakeMaker )"
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+       "${FILESDIR}"/${PN}-3.2.21-build.patch
+       "${FILESDIR}"/${PN}-3.2.16-perl.patch
+       "${FILESDIR}"/${PN}-3.2.16-reallydie.patch
+       "${WORKDIR}"/${PN}-3.2.21-ctrl-c.patch
+)
+
+pkg_setup () {
+       use perl && perl_set_version
+       use python && python_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/tracker/?func=detail&aid=3285657&group_id=42378&atid=432940
+       if use pcmcia && kernel_is -ge 2 6 38; then
+               die "pcmcia support is broken on kernels newer 2.6.38"
+       fi
+}
+
+src_prepare () {
+       epatch ${PATCHES[@]}
+       epatch_user
+       eautoreconf
+}
+
+src_configure() {
+       set_arch_to_kernel
+       econf \
+               $(use_enable isa) \
+               $(use_enable pcmcia) \
+               $(use_enable static) \
+               $(use_enable debug driver-debug) \
+               $(use_enable guile guile-binding) \
+               $(use_enable perl perl-binding) \
+               $(use_enable php php-binding) \
+               $(use_enable python python-binding) \
+               $(use_enable tcl tcl-binding) \
+               $(use_enable doc documentation) \
+               --with-linux-srcdir=${KV_DIR}
+}
+
+src_compile() {
+       set_arch_to_kernel
+       FIRM_DIR=/usr/share/usb
+       emake \
+               DESTDIR="${D}" \
+               INSTALL_MOD_PATH="${D}" \
+               HOTPLUG_USB_CONF_DIR="${D}"/etc/hotplug/usb \
+               USB_FIRMWARE_DIR="${D}"${FIRM_DIR} \
+               docdir=/usr/share/doc/${PF}/html
+}
+
+src_install() {
+       set_arch_to_kernel
+       FIRM_DIR=/usr/share/usb
+       emake \
+               DESTDIR="${D}" \
+               INSTALL_MOD_PATH="${D}" \
+               HOTPLUG_USB_CONF_DIR="${D}"/etc/hotplug/usb \
+               USB_FIRMWARE_DIR="${D}"${FIRM_DIR} \
+               docdir=/usr/share/doc/${PF}/html install
+
+       if use perl; then
+               einfo "Installing perl module"
+               cd "${S}"/language/perl || die
+               DESTDIR=${D} perl-module_src_install
+               cd "${S}" || die
+       fi
+
+       echo "KERNEL==\"gpib[0-9]*\",   MODE=\"0660\", GROUP=\"gpib\"" >> 99-gpib.rules
+       udev_dorules 99-gpib.rules
+
+       dodoc doc/linux-gpib.pdf ChangeLog AUTHORS README* NEWS
+
+       insinto /etc
+       newins util/templates/gpib.conf gpib.conf
+       newins util/templates/gpib.conf gpib.conf.example
+
+       if use pcmcia; then
+               dodir /etc/pcmcia
+               insinto /etc/pcmcia
+               doins "${S}"/etc/pcmcia/*
+       fi
+
+       if use firmware; then
+               insinto "${FIRM_DIR}"/agilent_82357a
+               doins "${WORKDIR}"/gpib_firmware-2006-11-12/agilent_82357a/*
+
+               insinto "${FIRM_DIR}"/ni_gpib_usb_b
+               doins "${WORKDIR}"/gpib_firmware-2006-11-12/ni_gpib_usb_b/*
+
+               insinto /usr/share/linux-gpib/hp_82341
+               # do not install precompiled generate_firmware
+               doins "${WORKDIR}"/gpib_firmware-2006-11-12/hp_82341/{*.bin,README}
+       fi
+}
+
+pkg_preinst () {
+       linux-mod_pkg_preinst
+       use perl && perl_set_version
+       enewgroup gpib
+}
+
+pkg_postinst () {
+       linux-mod_pkg_postinst
+
+       einfo "You need to run the 'gpib_config' utility to setup the driver before"
+       einfo "you can use it. In order to do it automatically you can add to your"
+       einfo "start script something like this (supposing the appropriate driver"
+       einfo "is loaded on the startup):"
+       einfo "         gpib_config --minor 0"
+       einfo ""
+       einfo "To give a user access to the computer's gpib board you will have to add"
+       einfo "them to the group 'gpib' or, you could change the permissions on the device"
+       einfo "files /dev/gpib[0-15] to something you like better, using 'chmod'."
+       einfo ""
+       einfo "Edit /etc/gpib.conf to match your interface board, and any devices you wish"
+       einfo "to open via ibfind().  See the documentation in /usr/share/linux-gpib/html for"
+       einfo "more information."
+       einfo ""
+
+       if use pcmcia; then
+               einfo "For PCMCIA cards:"
+               einfo "All files needed for a PCMCIA board were copied to /etc/pcmcia."
+               einfo "You may wish to edit the options passed to the gpib_config call in the"
+               einfo "/etc/pcmcia/linux-gpib-pcmcia script."
+               einfo "You may need to send a SIGHUP signal to the cardmgr daemon to force it"
+               einfo "to reload the files in /etc/pcmcia (alternatively you could use your"
+               einfo "pcmcia init.d script to restart the cardmgr, or you could just reboot)."
+               einfo "The driver module will be loaded as needed by the cardmgr."
+               einfo ""
+       fi
+
+       if use firmware; then
+               einfo "For Agilent (HP) 82341C and 82341D cards:"
+               einfo "The firmware for these boards is uploaded by passing the appropriate"
+               einfo "firmware file from /usr/share/linux-gpib/hp_82341 directory to"
+               einfo "gpib_config using the -I or --init-data command line option. Example:"
+               einfo "gpib_config --minor 0 --init-data \\"
+               einfo "/usr/share/linux-gpib/hp_82341/hp_82341c_fw.bin"
+               einfo ""
+       fi
+
+       if [[ $REPLACING_VERSIONS < "3.2.21-r1" ]]; then
+               ewarn "sci-libs/linux-gpib-3.2.21-r1 introduces incompatible changes to the kernel"
+               ewarn "interface. You may need to reboot to make sure the newly built driver modules"
+               ewarn "are used (some of the driver modules cannot be unloaded)."
+               ewarn "If you do not do this, every gpib call will just result in an error message."
+       fi
+}