Version bump

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x94BFDF4484AD142F

4 files changed, 253 insertions, 17 deletions

diff --git a/sci-libs/linux-gpib/ChangeLog b/sci-libs/linux-gpib/ChangeLog
index 7691519ae94a..8a1658c8533e 100644
--- a/sci-libs/linux-gpib/ChangeLog
+++ b/sci-libs/linux-gpib/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sci-libs/linux-gpib
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/linux-gpib/ChangeLog,v 1.33 2014/11/28 22:21:31 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/linux-gpib/ChangeLog,v 1.34 2014/12/17 16:58:05 dilfridge Exp $
+
+*linux-gpib-3.2.21 (17 Dec 2014)
+
+  17 Dec 2014; Andreas K. Huettel <dilfridge@gentoo.org>
+  +files/linux-gpib-3.2.21-build.patch, +linux-gpib-3.2.21.ebuild:
+  Version bump
 
   28 Nov 2014; Andreas K. Huettel <dilfridge@gentoo.org>
   linux-gpib-3.2.20-r1.ebuild:
diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest
index 597cbdba5467..61866c17db9c 100644
--- a/sci-libs/linux-gpib/Manifest
+++ b/sci-libs/linux-gpib/Manifest
@@ -4,27 +4,30 @@ Hash: SHA256
 AUX linux-gpib-3.2.15-build.patch 1681 SHA256 5845af9bf0660fc727c6a04ea41eb5e66f16915135d27c1a1aba69814d696704 SHA512 26ac0d6e9d152ec8db4e0778c1dcd1077b00f20285285f88ee28f9ea63c5a2b3860b289ca64a74938cab78953257a06514c36ec5fa697e34aa47f642ccdb92e3 WHIRLPOOL a96cd642f71be9224e30e709540f4a9bac264d08bcc3dcb27fda9411bc3f438397264c54edd1a74de3dcfcb5f6d33096ffff66e3b058f3c52f9eba115d6c704d
 AUX linux-gpib-3.2.16-perl.patch 471 SHA256 7393237d7df3bad191d6c6790b87ff6e0b1f5fd006b77c0afeb5e1dcacb744fc SHA512 0ad75078406a8eb6fc09470be108464dcb3e7601d7a3c0813f1c6ba1d9e8f3895dea4da37f5d4928e6ea398a3aeea315a63bb6009a5fa211bba592093a776d10 WHIRLPOOL cd3995233836621a1ce3440a38290ef5162816e9251a5ed6362b9b20ea084cf804d7ad9c246264cfe6246b6e90b7443daa80c7b27225374f2ca97e091456a3d7
 AUX linux-gpib-3.2.16-reallydie.patch 617 SHA256 a7bd9847a2949000b8aa78aaf9011fee1cdd2163e6ae653dbf9bbee8947f543b SHA512 60cc173866c25de27ef6481439cb66d456c814a9cc603cc837012cb590134f3889074cc1a7c4d333494ffe8f68a067105fae6a5cf30eece794e0cb194969265d WHIRLPOOL efd896fc085d7063f371db3a374786beb41cf550333b96f4a44b74f0eac731a0adb3f9b6fc539c34c6bc2a7c61d20488f8d9c6fc258a40c238ecac05a031ad2a
+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.tar.gz 1274505 SHA256 31fd86f4897239ffc55e0d4d850586d24d74144b604d6d39fd33dc59d28f7019 SHA512 539f7444e6bcd07d66cabc3abae9d40cdea3a84365bd69a4621149bc11b7b0e9826650d91d2a048d9780fab7db30005b08a4b91c77e7a26e036ed6f5adb6850b WHIRLPOOL 72a9c929d7e3b79c5c954fb6e41c4d9eb450595c6dccc877a3b47851e467e741b191a708ec3c018e4fe576e5677ffec5986970f83c020707bbbd8e2968e43153
 EBUILD linux-gpib-3.2.20-r1.ebuild 5510 SHA256 5ddb3bc93504b5b8e9433ccc2df64db2e3085c1514cbc0c3ab2b53d2365b0796 SHA512 7f8d56668e44b08b36678bb0e6e5fb49c103a1b35ebe1fc06e909e1d8822838a62a30596e95f502e62e2520ac0bdcfb12502470f13a950beae694e53f1e6f3ed WHIRLPOOL f2d15259455933111162946c9ca9d61b8cd0600f4834730b3c0d5cb1801f7f10468597a5da21f0ef38b5743756315acad41ad91b731c50233f87ae78bb35f271
-MISC ChangeLog 5972 SHA256 6b6745d6dce8d4ef9219c292f6ec55a00440c10d2756a02308254283a2796d67 SHA512 6bbcea97383704a6181f0fb50d4bb6c37cf8026ce7ba36092f2c54870373e1fbdd0181c96eec07dbeb02db10e9873875e3e401a027b3fd9bfd317eacd7504d74 WHIRLPOOL ed8032b326b283795ecc5df20d147876a5c6b32086a23bae8e8708ce0925c3a53595a0e54d84818e842f81b592fd839d2436f2fac1b2fdb1e7c2bd9c16952ea4
+EBUILD linux-gpib-3.2.21.ebuild 5509 SHA256 c35be39a6ae4a0ad464acb910face22f31486f1615db09a0afa70bebf84d99c0 SHA512 be7cb118a2a733efb85958b407ecf84cbe0f41c9cf58b14aafa3ab98170baeefab1b8ed16df882850daeb7add8d52f63fb79d70702be785d4fd2347cde15448b WHIRLPOOL f46066d321b2a5e3bbf7a54b3ffe419a8f5d749d3251dc8e80c7e417d1b5c9fbd352363d1a1fbe6024752974ab10a65cb98aa979f2dddfca31f65d3a95ead3d0
+MISC ChangeLog 6146 SHA256 331c99dc05451e1d0e97a7e124612248bab0cb273293a8a18c940d267dd9d0f4 SHA512 536fe05be1dc24c6fafb00f7ea28a322569ad84ae587ffae1d0f08183da402492055bd48217a70d7dc3513502dda8f9284a61c41c793b028db28c2675c8ebd83 WHIRLPOOL e8b1da66e08c776bfffa75893198d75dba2481f2970d78ab3ddce5e6053e04b561185deeef2dbfe70ceaed1ad8bbbf9a6997ef5932b6cd3871826fc7fe9f455f
 MISC metadata.xml 485 SHA256 83d214a690f95c1d118e32b422570173a293c371ff9109138ea5df70f5e9eac1 SHA512 65d91e34211c5d952f77471b4947a97b68f23bb868349f17c3d7791f7a6f06bc970c71d0754be9e2d384e3a4b7f5b8afa853d08a51fe6347ef3b60d68bf951c7 WHIRLPOOL 4d4a50fada40f24655eb884888847ab7fb94dc7abea619e4c7d0544944be06b16f90b3b6bab5e45fcfa7737862fc79d3729a00c3a8f15b5fd7183b7263ef7bd0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJUePVsXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOclY0QAKrGZRopU3Vo7SwO9jTkQNPP
-MTLdj4gAoBJUS8mYsnbYIPOecOzs+KRiR2FS0pza3OERM6FiAsmQ5Dx3uE1uJEEM
-Xf4nFDfKV+KwFyLX/SlNcPhjLAE+LXnwfJtDsOs9xHvJ6hrzx/qMxfrZrpH6kgXe
-W+3lgrHnKnBGOxflp+fUTewPH4233PTLbbfjVE7LZrxqnSS+5ezgdlVFeu0dnJLD
-iZBsJlgpdHVm2smtOm45MrwUjR+z6VF6Qr2cfR7GRWp+Zk7Oz2oYMXOn8GPW07Lq
-P2WIuOk+zyFGAQyoddIvFEu71XwgdrUYmHFTw6xeC7kGyY0Sw8d5qB5yah0BukAu
-dSp8RVUoDzeNzD2wOQbbm0kYQ2FHHjgxeIvCwyInK+wqoFy3v2Po391Nj9Bmn4rS
-MEdOgFrWPR9YYLAlSW6mHMm0r2NoQJ3acW/J6Sw/r1zbus+kO9YVRvLlNZZtwndA
-DHJbc8Aqdr6EXW/0um1Pw/ZiTbla4Yd56D0OVr+9jBnb938MqQY3E2O0/dmZGIh+
-Lg4D7Si/k+GI2loVBJwPp08exNqmgEWa6Gf3UaGRdf/nOPV5CINZ4bg2XhMblgFZ
-VZEQ9Y+UuzHPASw48T44OtoWVCbAGrk7S1EUKpsJAQBcjAD2EahoNOjIHUY8YZTi
-K85B4Yu0fMWbScoyaOn1
-=3kc5
+iQJ8BAEBCABmBQJUkbVgXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNUIxN0RGNTc1MjU3N0NBMEM1NDFDRUI5
+NEJGREY0NDg0QUQxNDJGAAoJEJS/30SErRQvYu4P/2IDZoiDAuCTmdJnsQLmHcex
+HFVlWNVY6T+/X5AdyPhQMdUIVtOi67650UN0h0P4j6Q+ZMy3+2wj0jdBXHSYnLdn
+2Dj6eOrSAH/Vino3dwF54ih4GfycDUl4/1XWR6OXh9zk5l364l/Y099+761Mt8fo
+8vrvXTcytUjBASBhOMfd04koJZg4uB4MLN0h8qowrhSTcw6EeymoonfrA4IdYc2B
+DQCQ+FWcYeWYnlf5kjBpt2gar9zXJ9u4UEbm0YgXs+VCdf5JYp+g+qOU6JLirxoE
+Ohcgm6QooJ5AIZAUvIgxtizP7wTUzp6R7ywDq2KEsJVu4TT/BqghfWnDY2SH8I8P
+rtTY40RVWCJ2INeJ/7d+R7yUZGuC6YzEawh+mKuMpM1dQ5iJN7WW7RvmgvbO90wH
+48IjvzQ1yE6iDet7DQWY2xKSQl5DIQK9B/jyMB/YVCGjWUKXoDWUO4/1BfguYlfE
+TtUjjtE+M4wjMruEK6bBdPoUntapbf5aizPVmzATDaqft4Lsl7dN/GjxQPIjUPSW
+Rio7CnbxB05knX5cH75CkcAbvJ9NWgjKbO+V8AUA1Dn3L1eqUHYHgmPzjndTmvv2
+OfLrj2LP8lty3niAtxTRQBZOeKHAB0KjhPYBp/aZBUB8ChoHlCaTflhfdiek/Gbj
+ad6pDRwr5iWhikdkt/5R
+=7Htk
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/linux-gpib/files/linux-gpib-3.2.21-build.patch b/sci-libs/linux-gpib/files/linux-gpib-3.2.21-build.patch
new file mode 100644
index 000000000000..86ce197ba821
--- /dev/null
+++ b/sci-libs/linux-gpib/files/linux-gpib-3.2.21-build.patch
@@ -0,0 +1,44 @@
+diff -ruN linux-gpib-3.2.21.orig/drivers/Makefile.am linux-gpib-3.2.21/drivers/Makefile.am
+--- linux-gpib-3.2.21.orig/drivers/Makefile.am	2014-12-13 11:27:55.000000000 +0100
++++ linux-gpib-3.2.21/drivers/Makefile.am	2014-12-17 17:51:47.152588400 +0100
+@@ -28,39 +28,13 @@
+ 		CC="$(LINUX_CC) -I@abs_top_srcdir@ -I@abs_top_srcdir@/drivers/gpib/include -I@abs_top_srcdir@/include" \
+ 		SUBDIRS="$(GPIB_ABS_MODULE_SUBDIR)"
+ 
+-install-data-hook: device-file-check /etc/gpib.conf
++install-data-hook: /etc/gpib.conf
+ 	$(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) -a
+-
+-/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
+-	@if [ ! -c /dev/gpib0 ]; then \
+-		if [ -a /dev/gpib0 ]; then \
+-			echo "A file or directory called /dev/gpib0 exists but it is not" \
+-				"a character device.  Delete or move it and try again."; \
+-			exit 1; \
+-		fi; \
+-	fi
+-	@ls -l /dev/gpib0 | grep -q "$(IBMAJOR)"; \
+-	if [ $$? != 0 ]; then \
+-		echo "/dev/gpib0 has the wrong major number. " \
+-			"Delete your /dev/gpibX files and try again."; \
+-		exit 1; \
+-	fi
+ 
+ #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/linux-gpib-3.2.21.ebuild b/sci-libs/linux-gpib/linux-gpib-3.2.21.ebuild
new file mode 100644
index 000000000000..c28364e7e50c
--- /dev/null
+++ b/sci-libs/linux-gpib/linux-gpib-3.2.21.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2014 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.ebuild,v 1.1 2014/12/17 16:58:05 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 )"
+
+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 )
+	guile? ( dev-scheme/guile )
+	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
+)
+
+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
+
+}