diff options
| -rw-r--r-- | sci-libs/linux-gpib/ChangeLog | 7 | ||||
| -rw-r--r-- | sci-libs/linux-gpib/Manifest | 32 | ||||
| -rw-r--r-- | sci-libs/linux-gpib/files/linux-gpib-3.2.15-drivers-make.am.patch | 36 | ||||
| -rw-r--r-- | sci-libs/linux-gpib/files/linux-gpib-3.2.15-language-python-makefile.am.patch | 11 | ||||
| -rw-r--r-- | sci-libs/linux-gpib/linux-gpib-3.2.15.ebuild | 180 |
5 files changed, 252 insertions, 14 deletions
diff --git a/sci-libs/linux-gpib/ChangeLog b/sci-libs/linux-gpib/ChangeLog index 2def0fb..8b03b78 100644 --- a/sci-libs/linux-gpib/ChangeLog +++ b/sci-libs/linux-gpib/ChangeLog @@ -2,6 +2,13 @@ # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ +*linux-gpib-3.2.15 (24 Jan 2011) + + 24 Jan 2011; Andreas K. Huettel <dilfridge@gentoo.org> + +linux-gpib-3.2.15.ebuild, +files/linux-gpib-3.2.15-drivers-make.am.patch, + +files/linux-gpib-3.2.15-language-python-makefile.am.patch: + Blind version bump + 24 Jan 2011; Andreas K. Huettel <dilfridge@gentoo.org> linux-gpib-3.2.11.ebuild: Cleanup diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest index e328db5..954be36 100644 --- a/sci-libs/linux-gpib/Manifest +++ b/sci-libs/linux-gpib/Manifest @@ -5,25 +5,29 @@ AUX linux-gpib-3.2.11-drivers-make.am.patch 1190 RMD160 6d02fd57d226cb9b1a11eacf AUX linux-gpib-3.2.11-drivers-make.in.patch 1249 RMD160 cbde55da87270401ef0afd803fd1ed6e1d1e6661 SHA1 fc8292c11ef6e6d870b3820f398997b811ac03a7 SHA256 e4445a2e948de2482ec000c5fe8fb4877c484639f6f46d415c2d6f9bb6d1fe8f AUX linux-gpib-3.2.11-language-python-makefile.am.patch 388 RMD160 462a883180dd887e4ad43f559cfac7c93f511b72 SHA1 86ff81bc29755dad9363fdf5aa2b0dd7849fb622 SHA256 31c7750dc8097d3e58f8b9dc4a5bd79aa697cebd68695789cfe3af78dac96c31 AUX linux-gpib-3.2.11-language-python-makefile.in.patch 390 RMD160 cc8dcb257888e4c79336c66078e3b4fa1b6e0b55 SHA1 defdb7852ca8122effc7d5a75bda226baa8195b9 SHA256 2a0650439adf9e96e0d87cd426655d6bb28afe3b8113475f39011e22f05c7198 +AUX linux-gpib-3.2.15-drivers-make.am.patch 1190 RMD160 6d02fd57d226cb9b1a11eacffd68a565b848712f SHA1 cfd1f3a5590b2c677fc1d09cb3ccf16eac9aaa68 SHA256 394a490cd3094e8b42b622b4fc41996ffcdab3cf417760f3539e455cd3fde812 +AUX linux-gpib-3.2.15-language-python-makefile.am.patch 388 RMD160 462a883180dd887e4ad43f559cfac7c93f511b72 SHA1 86ff81bc29755dad9363fdf5aa2b0dd7849fb622 SHA256 31c7750dc8097d3e58f8b9dc4a5bd79aa697cebd68695789cfe3af78dac96c31 DIST gpib_firmware-2006-11-12.tar.gz 169357 RMD160 9784b026ef41ce75439c635610ec56f037e88499 SHA1 584f9ffeba8194ab5d44fdfd4c97ab919750596c SHA256 98380a8d12e6e34dccc0c1d82b48ed796c0c0f5571107d6a685524560aa8d701 DIST linux-gpib-3.2.11.tar.gz 1158853 RMD160 451c44b8f75559917183e1ce22a9dfa77b704aad SHA1 50198af07867d6f63ee3331af7543c1a1f2ba36e SHA256 1ca1887e7329652f838d2c14abb23ce9da0f41a662ccc5020b16a08a894bd50f +DIST linux-gpib-3.2.15.tar.gz 1150433 RMD160 010d88374c8c6b243f4cffa292c70983c59c989a SHA1 405deb45972fd4e9a0648fca1182260dc7caa84f SHA256 0489ef5ce337a8a5b0d6ca702aee8b0218c3d5c07dc92b50330e80d50e769682 EBUILD linux-gpib-3.2.11.ebuild 5454 RMD160 3de010be723b7ffb4f193782f485ab5dace20e04 SHA1 a11c9cda2ca8feaf2b5967fe6c104ad5aef0f7be SHA256 45707a2814d756e4731c0517ad50097d943729268d9809e6b839b706dcde6b08 -MISC ChangeLog 216 RMD160 e536e3e1fe8ddef42d4885cfabbdfa6f7cdc548d SHA1 627ab33bf3585f660af423325d570d99efb8a1d4 SHA256 b4024ce7949961bf6301872106e2fbd2cfd82c5e0e8f59ed3c51097fd2491198 +EBUILD linux-gpib-3.2.15.ebuild 5277 RMD160 b6ee5c44923e803850a7f1990cec7f57c6a942a2 SHA1 c52a743987594794fe954422b4321d0475ba21f6 SHA256 37ac324a5a3b7c733fdf91251b97008087643c89c6d6dc0c986152b4002e052f +MISC ChangeLog 468 RMD160 415d36cf26d397d72b35b74740be789ea8ea96a6 SHA1 f8d38969535bfa1c1aaeb8c4d94c4ac1fef56ca6 SHA256 6db8e7ea30760b929b4d05930d36661fd6035388a3c1cf7a424d267ae435a155 MISC metadata.xml 325 RMD160 412c8e9b04024848f85de42031464931e15c6901 SHA1 7949cbea7adc8eb9698cf898d9c5489443fc9b6a SHA256 6d922139dab3a2d52f76d577581985458c4acdf7c573f80e13a8ed32859932f4 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2.0.16 (GNU/Linux) -iQIcBAEBCgAGBQJNPbq/AAoJEEb+UGWnxTyHiAQP/14Iuk3JN5hATrHZ4tso8j1Z -z1alvFAhSeQeHhvLcbuJlqMmp9HIP4h1PwgPi3GQwjC+Yqa7WCrQj+KcUEACwHv8 -X6VmRSdNk36YOO3TmlHSd3FMImew91qNwvHuuSJ2qVAE7RX3uILHtJqkG6VE7+vi -LjE8tyVOE2uPEgqwxh9RuVRh/Fhlm8Qjo1KG/it7cj7i7j6mRjsjS+K6em+zaMg6 -0KOTaBQti2utOCv6VJHG7zCR4SmAT48/YcPSbQf0WyLwStcu/4RKvx0ckJ12WoHw -seae3+oWQNp+dVvWssJHN0wuA+3x9tDRHP5WbPNwKJWNGMqG9lQA38qKXv74In+l -nhFeu+T7egUuWG1LVpXpSny4IOZEUDEYoCj83EdG3djlTHBFze11musD/7Wkj5wz -5bsNWtxNFu12F2EFaut97KMjOl45qu4pEFaMErEvrOrusZKk8Xrx3/qjIz1U0p8I -VmJOyX1NSnuQF7Ot1iWaSoZmR1kRZnhjEeulvqDfCDwzez/0POzXo/JQEore99sA -qSZ6ZxFsX2gxrVtVjuQkyFXoNUkFqls7NWlAMf5N9q6yo0WbaOIUOgd5JtipJiQu -V/8ehACbv/paybxEyRu1sWEu3WDzNKZUVnvx1MvQIM37HNxzGhF545V4ocAkZdy8 -5yHVXMaDRBjnTkADwarD -=8kM+ +iQIcBAEBCgAGBQJNPbu0AAoJEEb+UGWnxTyHbcMP/1/pwQvSZQ0PFDoNDWto4i9w +f8XiaByPn3WPLTfTpEdLGXuVoU1xu0lULGd+64KwFzRatGgDS0tQp9xgmgdJZAn6 +9zBLueNlH04tZHCShX5sUnE+fUiqihdcL+a6xx+Zm3N+Q5A/3joSjvLnAE0GrMiy +KdVBj7ofPg5rOX55wzCf03++iOdtScZGYowsXvkAlc8NM+1mHJrawIdc/XjCZO25 +1om+0wsaY2rbgUKV/C5be1LyFnFKu3KNVRipKWGRC+kLNXEr3M6+aR9Tt6oF1uqn +o2SR7joitx7gsmCoUn5FxuFAIgxUOsCG8XFDTyql6TlMlErbVsn/OQ5YngJEG0Wq +MvwHG6F061rHXGLaUALoEeXVqJ2aVO5V41Ertl2NSnkOGnaQ+Lax7CHA2Z65+d51 +cFq3fAio3QkRzXP0C1J5GB+iLZXoOD6eq+Q5ZutA5oFv1eA01i7SSCTbE5rq/YfT +yPUE7x0udFAp+2jEJYn2xmDp1ksMHL6OGpAqFVgZjiOt61EgOU61qXILl7mPr/wg +HjiBP7E3KY6X7pXUjXeMTFkr7n9vtPgJD2vSmA8OLyPaeBpmWYKzc/gLDqZEBf3Z +7Ldbe7rxrpxzSnUvAniX3i4lzhPRXuZBNKTe4KfIdGWAZ2abqlf1SeO7TgAwK5LM +pV8yJ8BWJe2cFf49ZvbJ +=vG8+ -----END PGP SIGNATURE----- diff --git a/sci-libs/linux-gpib/files/linux-gpib-3.2.15-drivers-make.am.patch b/sci-libs/linux-gpib/files/linux-gpib-3.2.15-drivers-make.am.patch new file mode 100644 index 0000000..767a89a --- /dev/null +++ b/sci-libs/linux-gpib/files/linux-gpib-3.2.15-drivers-make.am.patch @@ -0,0 +1,36 @@ +--- drivers/Makefile.am.original 2007-04-20 00:21:04.000000000 +0900 ++++ drivers/Makefile.am 2008-02-18 16:32:20.000000000 +0900 +@@ -31,18 +31,16 @@ + $(MAKE) -C $(LINUX_SRCDIR) V=1 modules_install\ + CC="$(LINUX_CC) -I@abs_top_srcdir@ -I@abs_top_srcdir@/driver/include -I@abs_top_srcdir@/include" \ + SUBDIRS="$(GPIB_ABS_MODULE_SUBDIR)" INSTALL_MOD_DIR="gpib" +- $(DEPMOD) -ae + + /dev/gpib0: +- groupadd gpib || echo "group gpib exists" + for i in `seq 0 15`; \ + do \ + mknod -m u=rw,g=rw,o= /dev/gpib$${i} c $(IBMAJOR) $${i} || exit 1; \ + chown root:gpib /dev/gpib$${i}; \ + done + +-.PHONY : device-file-check +-device-file-check: /dev/gpib0 ++.PHONY : device-file-check-emerge ++device-file-check-emerge: /dev/gpib0 + @if [ ! -c /dev/gpib0 ]; then \ + if [ -a /dev/gpib0 ]; then \ + echo "A file or directory called /dev/gpib0 exists but it is not" \ +@@ -57,9 +55,11 @@ + exit 1; \ + fi + ++.PHONY : device-file-check ++device-file-check: ++ + #should move this to util/templates Makefile.am when it exists + /etc/gpib.conf: +- $(INSTALL_DATA) -D $(top_srcdir)/util/templates/gpib.conf /etc/gpib.conf + + #make sure compiled files, etc don't make it into distribution tarballs + dist-hook: diff --git a/sci-libs/linux-gpib/files/linux-gpib-3.2.15-language-python-makefile.am.patch b/sci-libs/linux-gpib/files/linux-gpib-3.2.15-language-python-makefile.am.patch new file mode 100644 index 0000000..779f863 --- /dev/null +++ b/sci-libs/linux-gpib/files/linux-gpib-3.2.15-language-python-makefile.am.patch @@ -0,0 +1,11 @@ +--- language/python/Makefile.am.original 2006-12-21 15:41:46.000000000 -0500 ++++ language/python/Makefile.am 2008-09-16 14:31:42.000000000 -0400 +@@ -15,7 +15,7 @@ + -{ $(PYTHON) setup.py build && touch build; } || { $(RM) -r build; exit 1; } + + install-data-local: +- -$(PYTHON) setup.py install ++ -$(PYTHON) setup.py install --prefix=$(DESTDIR)$(prefix) + + clean-local: + -$(RM) -r build diff --git a/sci-libs/linux-gpib/linux-gpib-3.2.15.ebuild b/sci-libs/linux-gpib/linux-gpib-3.2.15.ebuild new file mode 100644 index 0000000..a7473d0 --- /dev/null +++ b/sci-libs/linux-gpib/linux-gpib-3.2.15.ebuild @@ -0,0 +1,180 @@ +# Copyright 1999-2011 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI=3 + +inherit eutils linux-mod autotools + +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 )" + +LICENSE="GPL-2" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="pcmcia static debug guile perl php python tcl doc firmware" + +RDEPEND=" + tcl? ( dev-lang/tcl ) + guile? ( dev-scheme/guile ) + perl? ( dev-lang/perl ) + php? ( dev-lang/php ) + python? ( dev-lang/python ) + firmware? ( sys-apps/fxload ) +" + +DEPEND="${RDEPEND} + sys-kernel/module-rebuild + doc? ( app-text/docbook-sgml-utils ) +" + +pkg_setup () { + linux-mod_pkg_setup + + case ${KV_MINOR} in + 4) die "This version of Linux-GPIB requires a version 2.6.x of the Linux kernel. 2.4.x kernels are supported by Linux-GPIB versions 3.1.x." ;; + 6) ;; + *) die "Unsupported kernel version '${KV}'." ;; + esac + + if [ ${KV_PATCH} -lt 8 ] ; then + die "Kernels older than 2.6.8 are not supported." + fi +} + +src_prepare () { + # Needed to prevent sandbox violations + epatch "${FILESDIR}/${P}-drivers-make.am.patch" + + # Needed to install Gpib.py inside the sandbox + epatch "${FILESDIR}/${P}-language-python-makefile.am.patch" + + eautoreconf +} + +src_configure () { + set_arch_to_kernel + econf \ + $(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} \ + || die "configure failed" +} + +src_install () { + + FIRM_DIR=/usr/share/usb + + # Here I changed the sbindir in order to install the gpib_config to /sbin, + # not /usr/sbin. This is done to enable running gpib_config from + # the modprobe.conf file: if /usr is not in the root file system, + # but a mounted partition then gpib_congig cannot be found in the moment when + # modprobe is run. + make \ + 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 || die "install problem" + + echo "KERNEL==\"gpib[0-9]*\", MODE=\"0660\", GROUP=\"gpib\"" >> 99-gpib.rules + insinto /etc/udev/rules.d/ + doins 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 + + dodir "${FIRM_DIR}/agilent_8237a" + insinto "${FIRM_DIR}/agilent_8237a" + doins "${WORKDIR}"/gpib_firmware-2006-11-12/agilent_8237a/* + + dodir "${FIRM_DIR}/ni_gpib_usb_b" + insinto "${FIRM_DIR}/ni_gpib_usb_b" + doins "${WORKDIR}"/gpib_firmware-2006-11-12/ni_gpib_usb_b/* + + dodir "/usr/share/linux-gpib/hp_82341" + insinto "/usr/share/linux-gpib/hp_82341" + doins "${WORKDIR}"/gpib_firmware-2006-11-12/hp_82341/* + + fi +} + +pkg_preinst () { + enewgroup gpib +} + +pkg_postinst () { + + /sbin/depmod -ae + make -C "${S}"/drivers device-file-check-emerge + module-rebuild add ${CATEGORY}/${PF} + + 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" + echo + 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'." + echo + 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." + + if use pcmcia ; then + echo + einfo "" + 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 + echo + einfo "" + 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 + +} + +pkg_postrm() { + /sbin/depmod -ae + module-rebuild del ${CATEGORY}/${PF} +} |