Clean up

Package-Manager: portage-2.2.0_alpha186/cvs/Linux x86_64
Manifest-Sign-Key: 0xEBE6A336BE19039C!

3 files changed, 20 insertions, 196 deletions

diff --git a/sci-libs/linux-gpib/ChangeLog b/sci-libs/linux-gpib/ChangeLog
index 20c770a28e7b..501b2c7dff2b 100644
--- a/sci-libs/linux-gpib/ChangeLog
+++ b/sci-libs/linux-gpib/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sci-libs/linux-gpib
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sci-libs/linux-gpib/ChangeLog,v 1.15 2013/05/27 22:53:18 dilfridge Exp $
+# $Header: /var/cvsroot/gentoo-x86/sci-libs/linux-gpib/ChangeLog,v 1.16 2013/07/02 18:45:16 dilfridge Exp $
+
+  02 Jul 2013; Andreas K. Huettel <dilfridge@gentoo.org>
+  -linux-gpib-3.2.17.ebuild:
+  Clean up
 
   27 May 2013; Andreas K. Huettel <dilfridge@gentoo.org>
   linux-gpib-3.2.17-r1.ebuild:
diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest
index 84b6e2791694..9950d5e9353d 100644
--- a/sci-libs/linux-gpib/Manifest
+++ b/sci-libs/linux-gpib/Manifest
@@ -11,25 +11,24 @@ DIST linux-gpib-3.2.16.tar.gz 1189792 SHA256 a1d158679a41ae48f826c5cbcb08d39839c
 DIST linux-gpib-3.2.17.tar.gz 1232827 SHA256 28675a56cec8d0fd5eb300770dd5c9cdf56aeb9aa4f0393f72db43c6dce46dae SHA512 60872333b7ef3f1967218a3ff879a9ed0d4a97fc624e59dda66fb27adb7f61462943db4abc2c10ac8af0d24f02b77871c6c7a24019e730abc00991b4a6559150 WHIRLPOOL 62395f7d1ff007c9f561303480e43d29255a05873459d951485aa62c72d3071f88e84e2380bc9fc73c01767d49df4bc5d940c79e25e535f10b386afd1ea6fd49
 EBUILD linux-gpib-3.2.16-r4.ebuild 5639 SHA256 c3099c494a26e6bf4ba42b6c2d9353b24dc74002927f4c0989b4942ca235cd67 SHA512 48ee46a662c3c3ef47fd58bb36e0665084f612069c36591a73c3c325c2b764dae551561378ef69739d5ebd4b517bbe69dce9641e996cefc622e6c5a773fa9af1 WHIRLPOOL 813007a3e838b9c794d010054f517a335094f7f5228b84160ebf0e0ca1f4fd7e2de3a548418376ae8429b90481525870bdbb5368cef880d5aa977584eb344470
 EBUILD linux-gpib-3.2.17-r1.ebuild 5510 SHA256 c485a961fb245db49b85a757180627058bbdc5fbe1323942db6c98b56ccfe0da SHA512 2e0619d9d046c0656fdbc4f2550c3e24afbd5db54c828f73d87f5efc531cce7e41684b3eea510edfa99468b92a201b184a538492b8c831cb222c9a9b2f3362c0 WHIRLPOOL e1edd3fb0aaf697217fd26a810edf00e1b671050c13e286bfb089457bbceb3fb449089564d8debfc7d6f4e3d8cef2fd9d04253205dbab404b1f278298adc8f6f
-EBUILD linux-gpib-3.2.17.ebuild 5415 SHA256 4c2a107c6303ddeea0e08cc657bec042fe4fbe32060f354b8dc74f37a37677c0 SHA512 09c983af0d212bb16c1baf7dd52c9a7745adeb3a224d7611326a319d5cedd9489f5a74ea71b555840f7d241e62b09fa5a71f1c9d1a70e04285c1fe923eb80ef3 WHIRLPOOL 59e90d0eaa650643631706fa273ca512dfc9a41e7f08db61ea9b1b8d67a292c1543c86b4814c25a2274b949c951b87856778a37d9694ae566254033a38c95347
-MISC ChangeLog 3417 SHA256 4a17f5294b7b87474d4712d6afa5372a96ad27d8d4d22257016b8c8e06ac73da SHA512 6aa05fa13d92fe3112674c67411fbdfcd14f11cb32aebc53040c7863c0e5cb2e24181e5271bdd392b8e2504483ac0d611c3e7e16cdd29b2056c10be91d3f1e15 WHIRLPOOL 08ae7aaea8d203ac9977b467a3b177d5125258b431920a68148d61dc62298fceee33dc48486d9a29bc38b5797e277b49db0d7f539220103b4d92b362a51e9477
+MISC ChangeLog 3515 SHA256 1cddf13ef008390fd24c97093412805eaf75e2e115df5082cbd567a7b51a7c78 SHA512 6e50fa044a6b13d86367dc9c274c63d46b621d3a00a5ac6d9a166011f77249af5ae8feef9496f5cac9373820e5b0337281a021359f7335c17a3eea287b67fdb0 WHIRLPOOL 8613108fe1e666a19d2f7ba5e2a50fddaeaa23df6b084f286ec756064734bd37218680d660838b2fe7aebdcbfaf50dd2958f918d112514b15750b068231f6086
 MISC metadata.xml 333 SHA256 94def6ae5ea540aab89b204a106ac9a1ffd7f6e07d537e445bb7373e3670d367 SHA512 cbb7ec805e57e4724ec1845253b0af912484d931ca5b9841f653f9becaabe36b5442ca5a0a45aea75fe64aa68a4bc2f500a5fd030af9ced2cb21c22157ed0f8b WHIRLPOOL 7dcb1724a1b475cc1b219f70825bce373b4566a1d465b8e6e3acb1da030729e7f97d58996cd260cc857bac58dd9afaeae19d5a23d4008335523088ea1c5c2475
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQJ8BAEBCABmBQJRo+RKXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+iQJ8BAEBCABmBQJR0yA9XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
 ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQwNzlCRDk4QzA4RENBRkYzQUEwRjQzMDlF
-QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcooAP/Aij+A2deWbz9oJf2u1HZFXZ
-z3f+L7ebqT7wYoKwLliEUlzLN1mqmMTiAtSwMvBvgTYfsu2NoiuLX0PIoZpmgsCI
-P4RvFQcNpHDRP8ecj54WO9j/WQwEXIMLArBFvWoa5PTd6bfhUvPD1O2/Nna+HJN6
-XZmDmjoOVa9gApLiI1JCWZz9xLuMQfi8ulUTnqYP7FdeQmKozq/55MFa0gkAVbzs
-MbXBqPWlu3TSRMImF5w7J4UCGP7zC3FiYcSQOfX8DaLnxaQ5JShBW/nGvbt5vUS1
-eKDbkHRZ2+puEWNxPjo6qpuSgogmIYrLP14G/1rbtWVcSFgh/7XLYpTsX6X5BXb9
-rE+cmMZjop6H1RJyZZaYTLHipPFfl3Y8nBvX65DfK2IVV4bJbz6nu7eGrZN03JOA
-MWMYkDLeW5MP/0Que7z40WAE6FNn97b8hYeI3mFnuC0ynEB6QaufllhFI8ASQVH5
-kft2cwSjRfhEx8fs8QQ1UBSlJsY/bU5tC1gj746xQfuP6ySMwsR99Oni1tf6AC7G
-ASx7Xiz/Abdsg35HEStVR9Fld05gLrWAdjC9u8XB4rOUU61sFAVE3+OOgdZA8+Ns
-7vpR7W5y7P8Mrr9k9ddtqwkUtnjPcydE3AW1yF6inJ9BiaUEkbRnzmzgRpoqDE1x
-C7PW5f9ud5koF5SjQAtt
-=OsW1
+QkU2QTMzNkJFMTkwMzlDAAoJEOvmoza+GQOcoj0P/38WS2D6JdtaMSatIDWyaHB+
+Ax/8AMQbn+vI7UynYiAokUa6L7DMkvlAZsuNHx8cY7x1MEyDNLEssZJfNzc1mLSi
+ijciVnwM1ZgPcu02DBLQ5sPddMz5cbkPwbcUVyAfKu6Z5Mcx5eplIfSC4EPAbxza
+pB6MKwGIiMv57sBkcnKFd1UuAQE2l8VSxF99mWY5CyNzInqxwQYci8ewJukioQif
++nAlF9wCWQsazPKU9GC6YQryITA1bGYJlx6VoLMHBKMBlx5CEuLIYPG6Gc37ggHW
+lTdc6G9LpvjuuURe7nOlvpBPisKhNGrVZHIGVRfuoFKJvEhQ5Ulyw2KFkyX1wW76
+OswpN+2WjjOSNgzFTcnU4kez1n6RiAzpLPBzcYQT2aWCnITreSjZqgo322MH+xXm
+AN+T2UeHEoCX4/30/0qZByFewft2B9todGIq9mAYmPRhIqszYHX6KlwBX1b/1wmu
+a7t3Ru7SszMWLyyrpNzHZyJ3AS5Za6MBDvBnsPaE4a9dFlvu5qg9ZBaomckvK8LW
+8BhVpCnu16VZeUeyU1TxGomO4RzMi3G97dP4Ps6Zo4KHF/B8ICh79U/B4sYAqZLt
+1OFurpBolOR7THluZgrELNdDB5hkOK15RBxLoJ02Y93yl+YCxiqopWqlzSuoeBde
+7NyUd6cLSNzZ8uT1xfcv
+=glei
 -----END PGP SIGNATURE-----
diff --git a/sci-libs/linux-gpib/linux-gpib-3.2.17.ebuild b/sci-libs/linux-gpib/linux-gpib-3.2.17.ebuild
deleted file mode 100644
index b10bdde21310..000000000000
--- a/sci-libs/linux-gpib/linux-gpib-3.2.17.ebuild
+++ /dev/null
@@ -1,179 +0,0 @@
-# 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
-
-}