Resync with main tree

(Portage version: 2.1.10.3/git/Linux i686, unsigned Manifest commit)

3 files changed, 171 insertions, 21 deletions

diff --git a/sci-libs/linux-gpib/ChangeLog b/sci-libs/linux-gpib/ChangeLog
index f2c1a91..a37d24a 100644
--- a/sci-libs/linux-gpib/ChangeLog
+++ b/sci-libs/linux-gpib/ChangeLog
@@ -2,6 +2,11 @@
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*linux-gpib-3.2.16 (12 Aug 2011)
+
+  12 Aug 2011; <huettel@gentoo.org> +linux-gpib-3.2.16.ebuild:
+  Resync with main tree
+
   31 Jan 2011; Andreas K. Huettel <dilfridge@gentoo.org>
   linux-gpib-3.2.15.ebuild, metadata.xml:
   Resync with tree
diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest
index 9839efd..0c59046 100644
--- a/sci-libs/linux-gpib/Manifest
+++ b/sci-libs/linux-gpib/Manifest
@@ -1,27 +1,9 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX linux-gpib-3.2.15-build.patch 1681 RMD160 0d462f8d25790806c9699f6d5e480221f59e8978 SHA1 b421f3ef440426df3fa5e704c88495c1d8271664 SHA256 5845af9bf0660fc727c6a04ea41eb5e66f16915135d27c1a1aba69814d696704
 DIST gpib_firmware-2006-11-12.tar.gz 169357 RMD160 9784b026ef41ce75439c635610ec56f037e88499 SHA1 584f9ffeba8194ab5d44fdfd4c97ab919750596c SHA256 98380a8d12e6e34dccc0c1d82b48ed796c0c0f5571107d6a685524560aa8d701
 DIST linux-gpib-3.2.15.tar.gz 1150433 RMD160 010d88374c8c6b243f4cffa292c70983c59c989a SHA1 405deb45972fd4e9a0648fca1182260dc7caa84f SHA256 0489ef5ce337a8a5b0d6ca702aee8b0218c3d5c07dc92b50330e80d50e769682
+DIST linux-gpib-3.2.16.tar.gz 1189792 RMD160 943f6c09ec54b03c7179bace50d2a3b9e0e413a0 SHA1 1f6e501a4f84da39ffccf9f2fd45d390f5d96f75 SHA256 a1d158679a41ae48f826c5cbcb08d39839c65606dcdffb6a6f680554c6286c5e
 EBUILD linux-gpib-3.2.15.ebuild 5096 RMD160 bd7f937f4e6c0390cf22a006a635dd6b7cdcc9d1 SHA1 599fb05ca34775f7f09eb61e2f50c3e8e3042eee SHA256 b78eebd993cc358b8b0421ab7ea53fcb0fb2b36ffbd0cdacfe78d8f0e8e746bc
-MISC ChangeLog 1299 RMD160 56657194d4123c0a34d93d47104d76cc07f035c4 SHA1 61af9715b770e99580904f0ae6cf0c31bea3ea2d SHA256 9b5391d99208bbdac50df3119bb57ef3efca9fea4d976434c9d09981d822ef76
+EBUILD linux-gpib-3.2.16.ebuild 4983 RMD160 bb17a163e19ed8f9d8ca366b212aea16196c81d6 SHA1 5c3c85ed0167786bbdb8ffcabeea21a5679fbe45 SHA256 3b00b49f896832b934136a9553b0a060c0f47407491c520d2fc30a3b67cf8fb3
+MISC ChangeLog 1421 RMD160 77ac29db7bb6a8ca2c043dd53c4a3a6a6ce430c5 SHA1 9336c69da180d5478eaf4c14040d7ed8544a3ab3 SHA256 bf36e422bec47feb3217ceb2e12135d646b864cce77b09c31f505e8b60ee0545
 MISC metadata.xml 333 RMD160 53cc452da426b779f6231218f7700176efaa1418 SHA1 8041c003a5532b89964cd8b3deba4bf97a3a3b3f SHA256 94def6ae5ea540aab89b204a106ac9a1ffd7f6e07d537e445bb7373e3670d367
 MISC notes.txt 953 RMD160 841091fe3ca13eb445c491dd939002f93d68f2c1 SHA1 342345998d98760ec62cd865eb27a36d7f9acabc SHA256 ac285c8b8fc201521a1cc4e40e8fdd8530f0456a08cb0362bb22dccdd88ccc44
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
-
-iQIcBAEBAgAGBQJNRzlvAAoJENwGBM22xffe0noP/3S8IHu3kwBKpk+ppCjABfhE
-RpqqovAScpe3h0w7uFO5g3oijPkTXeoSKojJbqb7shiM+BMe4rMulQuNwbblkE+r
-PMs7If0YLsNhi88AIKHe+c4BbcV0Eg3SI4W0LkS2dj3XOD7mPVEex3M8cgbXLfqo
-fOq0ZnXFCR2dDhv8e2btX2zY9pERilfnTrPZ+CtGDjWlrK6cIFs0iebF/lOjoO89
-ZYt1+eiSS/WcgQIaSriF7z5bdidBEQYu4yMa1jRAsdaAKnrt0wuaRALRCdSIzwPh
-XFyvmn9iaxAL4OCuFK0+hZDDfGp6nHJjmuu17bgaXZQU9CP9IMwv0vCNL9OV5qy+
-OAvlGQ4orGXJPVp+2YJdgaIPIQiHDsc2rAkpkhilQvCniOTtywC7CXB+j8kpMfbx
-rOF8B2kDXxEg0tsvthVAlQZBNSix7a1R52gSPp6V6AblK5F582u3eXnWnRA2SCIx
-r7OdBTFzOmXyZBhxrRcUCuulZnA1+Eq/ToVWMqFIqBgb3Nd1FtOd57z8Ox7+sO+d
-Ktgz6dVGRjncbBrdcxX4s2PNbM7b9j1MBSWmZGik8ew0jq/EbEJGo7Inv5yi7xnz
-uE3ul9OJTa/O83aPs2x4SdUo3vof5+44esrbrvQl9Cy5xUkTH+VZ5fsN/xfbiufy
-Ggh+vlVcmKRCN/eCJwli
-=JGAU
------END PGP SIGNATURE-----
diff --git a/sci-libs/linux-gpib/linux-gpib-3.2.16.ebuild b/sci-libs/linux-gpib/linux-gpib-3.2.16.ebuild
new file mode 100644
index 0000000..ae89871
--- /dev/null
+++ b/sci-libs/linux-gpib/linux-gpib-3.2.16.ebuild
@@ -0,0 +1,163 @@
+# Copyright 1999-2011 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.ebuild,v 1.1 2011/05/14 17:05:08 dilfridge Exp $
+
+EAPI=4
+
+inherit base 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 )
+"
+
+PATCHES=( "${FILESDIR}/${PN}-3.2.15-build.patch" )
+
+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_FULL}'." ;;
+	esac
+
+	if [ ${KV_PATCH} -lt 8 ] ; then
+		die "Kernel versions older than 2.6.8 are not supported."
+	fi
+}
+
+src_prepare () {
+	base_src_prepare
+	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
+}
+
+src_install () {
+	set_arch_to_kernel
+
+	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
+
+		insinto "${FIRM_DIR}/agilent_8237a"
+		doins "${WORKDIR}"/gpib_firmware-2006-11-12/agilent_8237a/*
+
+		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"
+		doins "${WORKDIR}"/gpib_firmware-2006-11-12/hp_82341/*
+
+	fi
+}
+
+pkg_preinst () {
+	linux-mod_pkg_preinst
+	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
+
+}