Version bump; remove module-rebuild from dependencies

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xB6C5F7DE

4 files changed, 206 insertions, 10 deletions

diff --git a/sci-libs/linux-gpib/ChangeLog b/sci-libs/linux-gpib/ChangeLog
index 591df529f446..140095e78701 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-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/linux-gpib/ChangeLog,v 1.10 2012/12/11 17:56:53 axs Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/linux-gpib/ChangeLog,v 1.11 2013/01/26 22:22:04 dilfridge Exp $
+
+*linux-gpib-3.2.17 (26 Jan 2013)
+
+  26 Jan 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  linux-gpib-3.2.16-r3.ebuild, +linux-gpib-3.2.17.ebuild:
+  Version bump; remove module-rebuild from dependencies
 
   11 Dec 2012; Ian Stakenvicius <axs@gentoo.org> linux-gpib-3.2.16-r3.ebuild:
   install udev rules with udev.eclass to support virtual/udev
diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest
index abad77bee6d9..07b0238b22ac 100644
--- a/sci-libs/linux-gpib/Manifest
+++ b/sci-libs/linux-gpib/Manifest
@@ -6,13 +6,25 @@ AUX linux-gpib-3.2.16-kernel-3.4-asm-includes.patch 2016 SHA256 fb3601ddd1de04cc
 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-r3.ebuild 5618 SHA256 3c6a0ff39c9669f89fa79dd37e5d275408acec7c4e8e223053f986e6ef3a50e6 SHA512 80822f776eb1bb2069e6a8ed3cfd083043a940d998abe9a59ef1f6ef35585ec7e0ce88808e093020de9c1d95eaf24f148f63da9b390ed489390bacacd78f53fb WHIRLPOOL bed9381d4e7ed755e1769d94331653b44a4a269f5e8eb7188aaf30a9e446262c64a02cca5d0ae85cb7dc91d682fde5da507ce5122ee511ba27431dfdb75fbaef
-MISC ChangeLog 2406 SHA256 717c9004c54ce7c2819c01ab5ad6584b2c9e0e9b15a467bd92e812607cf1775c SHA512 02de6b3034ee3d1bc86f0b44761c4798f69c7b476ee01c9e0e63d7fb5229c3edec1a9d22980333cdef5fe458a957b0d4a477321d958ac10e9088591bdbd95ff2 WHIRLPOOL 78fbb2dcbf79039dadf8ff1e55f62a10303c469c748d6db2456654319f2c300c69cb5ec95f893f39aef266052cf0746568ddc1577784452cb23a3c9a4bf563db
+DIST linux-gpib-3.2.17.tar.gz 1232827 SHA256 28675a56cec8d0fd5eb300770dd5c9cdf56aeb9aa4f0393f72db43c6dce46dae SHA512 60872333b7ef3f1967218a3ff879a9ed0d4a97fc624e59dda66fb27adb7f61462943db4abc2c10ac8af0d24f02b77871c6c7a24019e730abc00991b4a6559150 WHIRLPOOL 62395f7d1ff007c9f561303480e43d29255a05873459d951485aa62c72d3071f88e84e2380bc9fc73c01767d49df4bc5d940c79e25e535f10b386afd1ea6fd49
+EBUILD linux-gpib-3.2.16-r3.ebuild 5597 SHA256 16a70ee79333760162a21aa3cc5269d3071b11d1838cdd33820309d4ebddacfa SHA512 173cab3ece45bcf612918d1ce6060b71be7eb7bbfa7798149907e8655743fa7416e212da38a31197e98b3baae506bcd2834f432218dbec59e6f6d98f5556acf2 WHIRLPOOL b32203de572ad0c74be2bbe127e421aec5bb490f204d97bf3416572829a24f2cb7ae894d2f76ec30e9713d0e1a177d860d87be1492573ea6b508b6dd57f80f4b
+EBUILD linux-gpib-3.2.17.ebuild 5415 SHA256 4c2a107c6303ddeea0e08cc657bec042fe4fbe32060f354b8dc74f37a37677c0 SHA512 09c983af0d212bb16c1baf7dd52c9a7745adeb3a224d7611326a319d5cedd9489f5a74ea71b555840f7d241e62b09fa5a71f1c9d1a70e04285c1fe923eb80ef3 WHIRLPOOL 59e90d0eaa650643631706fa273ca512dfc9a41e7f08db61ea9b1b8d67a292c1543c86b4814c25a2274b949c951b87856778a37d9694ae566254033a38c95347
+MISC ChangeLog 2618 SHA256 3fb44bab76bef51a26acfef9068b06c55299c663ef0c2831a77b5f7a9e94064a SHA512 8e8cca55b1dfedbb578ea084e9af8b0be9f7a75053fe66b49f1a7c7b318471288479c0d47405190b5e5a5ecc4ce5edfd0de4db118975e3ef943a4366a5cb683b WHIRLPOOL 00d75eb4c3d942dd71c107983eb2391bae40d04f86acc924f196a61861fc9bef097fbd81857050c00a6c119954e8d6aef0a2de16a1aeb6ba3c333cfc84626b1f
 MISC metadata.xml 333 SHA256 94def6ae5ea540aab89b204a106ac9a1ffd7f6e07d537e445bb7373e3670d367 SHA512 cbb7ec805e57e4724ec1845253b0af912484d931ca5b9841f653f9becaabe36b5442ca5a0a45aea75fe64aa68a4bc2f500a5fd030af9ced2cb21c22157ed0f8b WHIRLPOOL 7dcb1724a1b475cc1b219f70825bce373b4566a1d465b8e6e3acb1da030729e7f97d58996cd260cc857bac58dd9afaeae19d5a23d4008335523088ea1c5c2475
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlDHc/MACgkQ2ugaI38ACPAzFwD9EZ5UFgec7K8URAOicRBJ7wsh
-cEK7dzSzpYBq5nvVrksA/2VTsRPjj63cWXnN2akSESwRmXEFiUeLwS0RxiUSoZuS
-=eCdv
+iQIcBAEBCAAGBQJRBFcUAAoJENwGBM22xffe/LgQAJ4Vd+Ujz9qC0iA49OHigZgb
+HWlDXMBvE/WXAqNXvAH5XjRn6M9bRhnsOMUdZLcxSU6cuth9WodSZ6cADL0fIJ2n
+sknmdaKqVs96h8oemQp3Ro1YW1zuHM1zI73DEB7w4IxqcM9LkY5XnWU8XbwQ0ms3
+okjtY6TeLCrJCqyB3Zld2ITeow6hfzPgrmNr9spTkGi/gpIP8VCW1EStshVh/HDY
+aLSwt6VUtSm7bK24/aTaWGvnagTosTYaaZjGd4XREOHIwuOCSVMnme30jFmVEqv3
+I6lqY+cv2WLl2DK09oyuOA49IhyOe6bI44cBP8PH5LvhWvwSpsx5BsYwH3eMCwCW
+/2HtHaZlNdCo7AgUj3hS/kmJUKxjL3mfPkjwN00P0pecwy12ma4fNG/6ZUtbAH9t
+aZKA1AeF/1VYEc7Bhe2gqHun1NlvqkmwPFtaEbqJK8PCI5i4inm6l3XYk5XGGzKx
+M4I0h6COcMUUhdQpKl7GXx+MRLKxJXPbHxFkUNg/ejoa0WSS9DLRpUuxa932/xsf
+ccgAcGWPGUVzyCdl8fg6Vk8oS94h8M8BlOh61xg1mCjOVtyr2yp6XuhC84dpdQwZ
+9bbYFCiTBf/2DUD4BwxNN58Xqwtvo37d4GWWhJMmt5LJ19NyE/+x6Uh5bARPDAA0
+K+soSOGRGV/eLptgMUVR
+=Pz3i
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/linux-gpib/linux-gpib-3.2.16-r3.ebuild b/sci-libs/linux-gpib/linux-gpib-3.2.16-r3.ebuild
index 5a661e91f4eb..bb32598ac952 100644
--- a/sci-libs/linux-gpib/linux-gpib-3.2.16-r3.ebuild
+++ b/sci-libs/linux-gpib/linux-gpib-3.2.16-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 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-r3.ebuild,v 1.5 2012/12/11 17:56:53 axs Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/linux-gpib/linux-gpib-3.2.16-r3.ebuild,v 1.6 2013/01/26 22:22:04 dilfridge Exp $
 
 EAPI=4
 PERL_EXPORT_PHASE_FUNCTIONS=no
@@ -27,7 +27,6 @@ COMMONDEPEND="
 	firmware? ( sys-apps/fxload )"
 RDEPEND="${COMMONDEPEND}"
 DEPEND="${COMMONDEPEND}
-	sys-kernel/module-rebuild
 	virtual/pkgconfig
 	doc? ( app-text/docbook-sgml-utils )
 	perl? ( virtual/perl-ExtUtils-MakeMaker )"
diff --git a/sci-libs/linux-gpib/linux-gpib-3.2.17.ebuild b/sci-libs/linux-gpib/linux-gpib-3.2.17.ebuild
new file mode 100644
index 000000000000..b10bdde21310
--- /dev/null
+++ b/sci-libs/linux-gpib/linux-gpib-3.2.17.ebuild
@@ -0,0 +1,179 @@
+# Copyright 1999-2013 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.17.ebuild,v 1.1 2013/01/26 22:22:04 dilfridge Exp $
+
+EAPI=4
+PERL_EXPORT_PHASE_FUNCTIONS=no
+GENTOO_DEPEND_ON_PERL=no
+PYTHON_DEPEND="python? 2"
+
+inherit base linux-mod autotools perl-module python 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 ~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}
+	virtual/pkgconfig
+	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 () {
+	use perl && 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
+}
+
+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
+	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-module_pkg_preinst
+	enewgroup gpib
+}
+
+pkg_postinst () {
+	linux-mod_pkg_postinst
+	use perl && 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
+
+}