Fix python support, restrict USE pcmcia (broken on kernels newer 2.6.38), fix firmware installation (bug 379393, thanks Nicolas Boichat) and remove unwanted precompiled binary generate_firmware, fix asm/system.h inclusion on kernel 3.4.0.

Package-Manager: portage-2.1.11.9/cvs/Linux x86_64

4 files changed, 270 insertions, 25 deletions

diff --git a/sci-libs/linux-gpib/ChangeLog b/sci-libs/linux-gpib/ChangeLog
index 7a2baa929e06..5382bc41a6c5 100644
--- a/sci-libs/linux-gpib/ChangeLog
+++ b/sci-libs/linux-gpib/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sci-libs/linux-gpib
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/linux-gpib/ChangeLog,v 1.4 2011/11/30 01:18:46 dilfridge Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/linux-gpib/ChangeLog,v 1.5 2012/08/03 07:31:12 xmw Exp $
+
+*linux-gpib-3.2.16-r2 (03 Aug 2012)
+
+  03 Aug 2012; Michael Weber <xmw@gentoo.org>
+  +files/linux-gpib-3.2.16-kernel-3.4-asm-includes.patch,
+  +linux-gpib-3.2.16-r2.ebuild:
+  Fix python support, restrict USE pcmcia (broken on kernels newer 2.6.38), fix
+  firmware installation (bug 379393, thanks Nicolas Boichat) and remove unwanted
+  precompiled binary generate_firmware, fix asm/system.h inclusion on kernel
+  3.4.0.
 
   30 Nov 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   -linux-gpib-3.2.16.ebuild, linux-gpib-3.2.16-r1.ebuild:
@@ -29,4 +39,3 @@
   their work. Initially pmasked since the ebuild still needs a lot of QA
   cleanup (especially concerning the language bindings) and requires exotic
   hardware for testing.
-
diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest
index 1fb909909426..97744a9be974 100644
--- a/sci-libs/linux-gpib/Manifest
+++ b/sci-libs/linux-gpib/Manifest
@@ -1,27 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
-AUX linux-gpib-3.2.15-build.patch 1681 RMD160 0d462f8d25790806c9699f6d5e480221f59e8978 SHA1 b421f3ef440426df3fa5e704c88495c1d8271664 SHA256 5845af9bf0660fc727c6a04ea41eb5e66f16915135d27c1a1aba69814d696704
-AUX linux-gpib-3.2.16-perl.patch 471 RMD160 9702c06a8ff7390105d217733487d5a2ceaf1073 SHA1 0476bfbf1f581fdbec391e7469893a02ca764f27 SHA256 7393237d7df3bad191d6c6790b87ff6e0b1f5fd006b77c0afeb5e1dcacb744fc
-DIST gpib_firmware-2006-11-12.tar.gz 169357 RMD160 9784b026ef41ce75439c635610ec56f037e88499 SHA1 584f9ffeba8194ab5d44fdfd4c97ab919750596c SHA256 98380a8d12e6e34dccc0c1d82b48ed796c0c0f5571107d6a685524560aa8d701
-DIST linux-gpib-3.2.16.tar.gz 1189792 RMD160 943f6c09ec54b03c7179bace50d2a3b9e0e413a0 SHA1 1f6e501a4f84da39ffccf9f2fd45d390f5d96f75 SHA256 a1d158679a41ae48f826c5cbcb08d39839c65606dcdffb6a6f680554c6286c5e
-EBUILD linux-gpib-3.2.16-r1.ebuild 5014 RMD160 88665cc43630a7b05a3240ebc9a139d80df44b9c SHA1 fb1feb14ad340546c21c53b12cc14daa2fbd8907 SHA256 7c5e63bc7d601add060b51c7274b118f35f81701805234aad13138a575ad6398
-MISC ChangeLog 1231 RMD160 17df6eca48cb60a8bd8b799b6bd5fa8022577599 SHA1 5e7674b2702e827b8d5ae55dab16f95b9359fb0c SHA256 56e86bb11b317f4d63bbab1659c159f48f8583bfded9ff7ec34a6821482f6e5f
-MISC metadata.xml 333 RMD160 53cc452da426b779f6231218f7700176efaa1418 SHA1 8041c003a5532b89964cd8b3deba4bf97a3a3b3f SHA256 94def6ae5ea540aab89b204a106ac9a1ffd7f6e07d537e445bb7373e3670d367
+AUX linux-gpib-3.2.15-build.patch 1681 SHA256 5845af9bf0660fc727c6a04ea41eb5e66f16915135d27c1a1aba69814d696704 SHA512 26ac0d6e9d152ec8db4e0778c1dcd1077b00f20285285f88ee28f9ea63c5a2b3860b289ca64a74938cab78953257a06514c36ec5fa697e34aa47f642ccdb92e3 WHIRLPOOL a96cd642f71be9224e30e709540f4a9bac264d08bcc3dcb27fda9411bc3f438397264c54edd1a74de3dcfcb5f6d33096ffff66e3b058f3c52f9eba115d6c704d
+AUX linux-gpib-3.2.16-kernel-3.4-asm-includes.patch 2016 SHA256 fb3601ddd1de04cccd5d22de97871561e4f1f94b39d9d90a715930d4a9c485f2 SHA512 62c19fa98815bd1f65c9b7e8706e770cc37d5f214b7ede64c3166e565ed68fa5f1611ddbca68a539d9977c3747c0554c834f2aeb779d1383417bdc8a2d2ca0f6 WHIRLPOOL 4c650591d3a1ea90ff597e1b21ddee3ee294f822cbd821f82b34aee1007c5fd28e49d22575100740043b64f62a1589228c5e325383683cca44a358f2152f7da4
+AUX linux-gpib-3.2.16-perl.patch 471 SHA256 7393237d7df3bad191d6c6790b87ff6e0b1f5fd006b77c0afeb5e1dcacb744fc SHA512 0ad75078406a8eb6fc09470be108464dcb3e7601d7a3c0813f1c6ba1d9e8f3895dea4da37f5d4928e6ea398a3aeea315a63bb6009a5fa211bba592093a776d10 WHIRLPOOL cd3995233836621a1ce3440a38290ef5162816e9251a5ed6362b9b20ea084cf804d7ad9c246264cfe6246b6e90b7443daa80c7b27225374f2ca97e091456a3d7
+DIST gpib_firmware-2006-11-12.tar.gz 169357 SHA256 98380a8d12e6e34dccc0c1d82b48ed796c0c0f5571107d6a685524560aa8d701 SHA512 164d6fcfb3af43933f0a16645276f7d527a7aa24ef311f6ae3dcd7f45c41f92c855cf221bc946772f43fc2f9524057abc34bbd7d805c89b33ed7e111bc6870af WHIRLPOOL 44506c9d03e746f5bc88f9a2f20e07879a4c4c72f52a5dae97accb381f8ac7f5b5c0cf5c58d1045b18ed6cbda20549a1fdb7e5ab0151a1081da1ec798c683e67
+DIST linux-gpib-3.2.16.tar.gz 1189792 SHA256 a1d158679a41ae48f826c5cbcb08d39839c65606dcdffb6a6f680554c6286c5e SHA512 41bac9b774e2023e0a6dc3f95cc25f883bf1b40a5e03d870b4f57761f4485189f05412b2c572f3648275a62c7eaf53a5e789610e1a123bf257598d31cb43e393 WHIRLPOOL 415023f7a838d46624a78a9085370dd178f57ac694927f4c565fa7dbd188bae1158faf1944c3abc2c8bd5c51ca321f9bb6921d1f0a332c1ecef4247c45f10f92
+EBUILD linux-gpib-3.2.16-r1.ebuild 5014 SHA256 7c5e63bc7d601add060b51c7274b118f35f81701805234aad13138a575ad6398 SHA512 eb042df58b0f765c6af8b5926897a09f6b3e48c7723accc23de7614735bf3e12d288b64a2fddab6cc2ed223a000aeac794cb49ce2dd041f5b1644a08ced54134 WHIRLPOOL 38c7662645e11ff2996e82bfcab8596e5c50b14cc7f0765a0fcdcd6de0ca0b346965e7cd74ae8708d239eb8bc028368492f42d9af58c6a02f56841c92859743d
+EBUILD linux-gpib-3.2.16-r2.ebuild 5532 SHA256 041660ae2c99a22c25623b6368868f51e5f198c77cc6d82d0c889c7e2635c944 SHA512 0bb1159bee93c5d3ff2a46b1b87aae5cf2998a493eb9aa75e2131c3ca96a34f647c7344e7bf0068a51e8b0c86d18556865ed6c24d9de197e1ac4792ca537cc4c WHIRLPOOL f87f83bbd5294a9b8785f8714ed4c77d9a94a0934aed0b338b54394432ef96be5aa623925333ac4a992df5b5d2b01606709ac43e8e877f38bc624ef7e9e7231c
+MISC ChangeLog 1645 SHA256 c02e60eda736326d2b0861afe8fca410c1a5c5ea0dcd193d0d68746a4591f33f SHA512 2a101854a2784a7a3f91aca2d0b8ad75acc89cfff234ed5df159f2f10e6d4df18bd7ba723d3c29c40386ef8b6fa8f6963887f982c4979e8d3ae485ca0d49a147 WHIRLPOOL f0ae50519e5197ea03efefc213364a55f8e8ea5086029f9d92adfae9c04dd2411e5294e908449e11de2186145f0f6fee3f071d302ed3c27d29bec6bf9e7e30fd
+MISC metadata.xml 333 SHA256 94def6ae5ea540aab89b204a106ac9a1ffd7f6e07d537e445bb7373e3670d367 SHA512 cbb7ec805e57e4724ec1845253b0af912484d931ca5b9841f653f9becaabe36b5442ca5a0a45aea75fe64aa68a4bc2f500a5fd030af9ced2cb21c22157ed0f8b WHIRLPOOL 7dcb1724a1b475cc1b219f70825bce373b4566a1d465b8e6e3acb1da030729e7f97d58996cd260cc857bac58dd9afaeae19d5a23d4008335523088ea1c5c2475
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCgAGBQJO1YSGAAoJENwGBM22xffeM+UP/2iZvh5jxgxe/iY46oD5TGtn
-Id3AofZ+BdlQkUFIuLIZ/Nl4oosd7OOE8O9mzCU9YTfdJoD9hIebbV4g9tVkqDX/
-T4EppiNSivPL0VD2wRybLxXqO/TtXMO2Ykd+y9mTC50TDgU3cYvCh9QZ2pbUFE/J
-i0MNB5yEt4/u9s+ILSX3+CPORJp50gS1rEuCCkNKp4zxyW3RebL+xS6esn8BZY9L
-Ujj78wxLFIeuCx1F16Y6fhYFBVYFvuJYBOtxTUnAc0iFlyBf1yK1Va8qck/wPYkY
-j/LVXnFpHCNB5YE8EoREogrFj9Uo05ddHAa7ay6I//BYkuYKjm0nCdK3L4si5wAP
-3qm/e3rQp29Rx3YERRQkJgYl6v9l7W/Mie1BXuNjQqEZl7/LIGivp/NqxssQ0f6a
-jqR7H2qvM1QO5ViPmuPUu9iLWuqGuG8xjULXvdiB7NnK/mZg+hBYl0CUyIlPoHkU
-hqvTIGD9DzFwr74fVQHDdK0MtnIXviNO2IdN7+fcTd3kDB9D5bnhGQC6ytk+OA6W
-BmwM7w7UPCmJHxq44DOUuURv26MCG6FBACDR47vmxRNIK5uxh//9G5VLhcAE9FbI
-E+MpilG2iNPk+73lPK0rex6V2E4ZM27DxYi4yoqpKhCu/W0KyDj7z7RfSu2TqmMJ
-DkXElKIYuvdA2gQJfHDj
-=Daah
+iF4EAREIAAYFAlAbffQACgkQknrdDGLu8JD8HAD9FHzFWk5MvS1wtdBRBkyEyDw7
+ip6jLq3E8QmNFL5i+SMA/0fgbB868LZgj/bkM+ShMVnGST+X8JSV0qJAo9qm1NB5
+=IxkK
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/linux-gpib/files/linux-gpib-3.2.16-kernel-3.4-asm-includes.patch b/sci-libs/linux-gpib/files/linux-gpib-3.2.16-kernel-3.4-asm-includes.patch
new file mode 100644
index 000000000000..40024c2b338d
--- /dev/null
+++ b/sci-libs/linux-gpib/files/linux-gpib-3.2.16-kernel-3.4-asm-includes.patch
@@ -0,0 +1,59 @@
+diff -Pdpru a/drivers/gpib/cb7210/cb7210_cs.c b/drivers/gpib/cb7210/cb7210_cs.c
+--- a/drivers/gpib/cb7210/cb7210_cs.c	2011-04-08 23:01:38.000000000 +0200
++++ b/drivers/gpib/cb7210/cb7210_cs.c	2012-05-28 10:45:35.120662078 +0200
+@@ -34,7 +34,9 @@
+ #include <linux/version.h>
+ #include <linux/module.h>
+ #include <asm/io.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
+ #include <asm/system.h>
++#endif
+ 
+ #include <pcmcia/cs_types.h>
+ #include <pcmcia/cs.h>
+diff -Pdpru a/drivers/gpib/ines/ines_cs.c b/drivers/gpib/ines/ines_cs.c
+--- a/drivers/gpib/ines/ines_cs.c	2010-08-25 19:45:09.000000000 +0200
++++ b/drivers/gpib/ines/ines_cs.c	2012-05-28 10:45:56.823537008 +0200
+@@ -31,7 +31,9 @@
+ #include <linux/version.h>
+ #include <linux/module.h>
+ #include <asm/io.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
+ #include <asm/system.h>
++#endif
+ 
+ #include <pcmcia/cs_types.h>
+ #include <pcmcia/cs.h>
+diff -Pdpru a/drivers/gpib/sys/ibsys.h b/drivers/gpib/sys/ibsys.h
+--- a/drivers/gpib/sys/ibsys.h	2006-12-21 21:43:40.000000000 +0100
++++ b/drivers/gpib/sys/ibsys.h	2012-05-28 11:38:56.261736416 +0200
+@@ -10,13 +10,15 @@
+ #include <linux/slab.h>
+ #include <linux/mm.h>
+ #include <linux/timer.h>
++#include <linux/version.h>
+ 
+ #include <asm/io.h>
+-#include <asm/segment.h>
+ #include <asm/irq.h>
+ #include <asm/dma.h>
+ #include <asm/uaccess.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
+ #include <asm/system.h>
++#endif
+ 
+ extern int gpib_allocate_board( gpib_board_t *board );
+ extern void gpib_deallocate_board( gpib_board_t *board );
+diff -Pdpru a/drivers/gpib/tnt4882/tnt4882_cs.c b/drivers/gpib/tnt4882/tnt4882_cs.c
+--- a/drivers/gpib/tnt4882/tnt4882_cs.c	2010-08-25 19:47:55.000000000 +0200
++++ b/drivers/gpib/tnt4882/tnt4882_cs.c	2012-05-28 10:44:59.929243930 +0200
+@@ -34,7 +34,9 @@
+ #include <linux/version.h>
+ #include <linux/ioport.h>
+ #include <asm/io.h>
++#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 4, 0)
+ #include <asm/system.h>
++#endif
+ 
+ #include <pcmcia/cs_types.h>
+ #include <pcmcia/cs.h>
diff --git a/sci-libs/linux-gpib/linux-gpib-3.2.16-r2.ebuild b/sci-libs/linux-gpib/linux-gpib-3.2.16-r2.ebuild
new file mode 100644
index 000000000000..522c1717605a
--- /dev/null
+++ b/sci-libs/linux-gpib/linux-gpib-3.2.16-r2.ebuild
@@ -0,0 +1,185 @@
+# Copyright 1999-2012 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.16-r2.ebuild,v 1.1 2012/08/03 07:31:12 xmw Exp $
+
+EAPI=4
+PERL_EXPORT_PHASE_FUNCTIONS=no
+PYTHON_DEPEND="python? 2"
+
+inherit base linux-mod autotools perl-module python
+
+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"
+
+COMMONDEPEND="
+	tcl? ( dev-lang/tcl )
+	guile? ( dev-scheme/guile )
+	perl? ( dev-lang/perl )
+	php? ( dev-lang/php )
+	firmware? ( sys-apps/fxload )"
+RDEPEND="${COMMONDEPEND}"
+DEPEND="${COMMONDEPEND}
+	sys-kernel/module-rebuild
+	doc? ( app-text/docbook-sgml-utils )
+	perl? ( virtual/perl-ExtUtils-MakeMaker )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.2.15-build.patch"
+	"${FILESDIR}/${PN}-3.2.16-perl.patch"
+)
+
+pkg_setup () {
+	perl-module_pkg_setup
+	python_pkg_setup
+	python_set_active_version 2
+	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 () {
+	base_src_prepare
+	eautoreconf
+
+	# https://sourceforge.net/tracker/?func=detail&aid=3530207&group_id=42378&atid=432940
+	if kernel_is -ge 3 4 0 ; then
+		epatch "${FILESDIR}"/${P}-kernel-3.4-asm-includes.patch
+	fi
+}
+
+src_configure() {
+	set_arch_to_kernel
+	export PYTHON=$(PYTHON -2 -a)
+	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} \
+	
+}
+
+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
+	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
+		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
+	perl-module_pkg_preinst
+	enewgroup gpib
+}
+
+pkg_postinst () {
+	linux-mod_pkg_postinst
+	perl-module_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
+
+}