gentoo resync : 02.06.2019

3 files changed, 3 insertions, 175 deletions

diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest
index bf044cb5b20c..a8218f1ece38 100644
--- a/sci-libs/linux-gpib/Manifest
+++ b/sci-libs/linux-gpib/Manifest
@@ -5,8 +5,6 @@ AUX linux-gpib-4.0.4_rc2-kernel-4.11.0.patch 387 BLAKE2B 38516ea8a9ca5dd3dc32cfd
 DIST gpib_firmware-2006-11-12.tar.gz 169357 BLAKE2B 05f1be78545e025d76e2b9819a5dcac5a6715dfbb6df5c6fbe8b78900adf8ca7b1c28db350674ff1dd9c77e24507e98b536ca1af8b558c9a46ef8c25034c9769 SHA512 164d6fcfb3af43933f0a16645276f7d527a7aa24ef311f6ae3dcd7f45c41f92c855cf221bc946772f43fc2f9524057abc34bbd7d805c89b33ed7e111bc6870af
 DIST linux-gpib-4.1.0.tar.gz 1529480 BLAKE2B b49df07f15d0f91b9d475052993421979d6776ef15aaa9b7e49632db9018f0cbd9ff38d12e2afa9e8027202e450dfc487ac9e2e6ab719086646d983cc41b3482 SHA512 037ed9e484a83caccb15d2d142eef6f1eec356ae972480ca7a676a318d3e9f844fc1911c1b30869b4bb14ef0b4cd10587a803426df9145966bafe22ca7316bd8
 DIST linux-gpib-4.2.0.tar.gz 1431440 BLAKE2B 7b6adf562963e0785f960c072f3f3d67cb91df9090205d8fecb0dc3170d3a1ac3719732919bae112e06b47387499ffe49a0144e72caa27ba39c85c8b98e56786 SHA512 1505c2c04f16bf7e92b9dd474f09edd242520a96f9e4d8eea88ebd44d0a82d653055155c1bfcde69da5355d609d400e3cb682da8aae83f59f1e565307a3fc4a7
-DIST linux-gpib-user-4.2.0_rc1.tar.gz 1098181 BLAKE2B 3f35eacfcffe04598322af6faed921b20b49959433b6e3c3a4bb2c0b9e3f71a2c00a13d7dec6b4e0bc415f1f8635945419805d5c9dec4ddcddb18fc7e8c5e7b4 SHA512 69d8b3059eab8d1d09006b4da13dbf3479c9a9d45e464767a13a2b1d6d32705e91e2800ca79015d302ea05e4fcbddb433dd817d208d751b6af8ac3867b7cee78
 EBUILD linux-gpib-4.1.0.ebuild 6110 BLAKE2B 354731c55d29f49b1aaca808c45128f7826b322555d5340fa9fd11481a9ec171bfa8cd365c5329f033e46f49d677c1a2a9f56cb8bc02e911224025de51505563 SHA512 29592c5c05b72e8a4263781636aa9a68b3d4e38743f5c7228a9ed449ab1e877141c5f238789e2942dbaa8c883439086c87321e55a7f8be653b91056b9f677656
-EBUILD linux-gpib-4.2.0.ebuild 4617 BLAKE2B 8f7c2747e256e44a89beba79442ac822021da0c0692fae0fb9fb64110e1e68ddeb900748e8ddf1691c6d0c79e7b79c12edd51d63f0a02d32061707f49224ca23 SHA512 44b084f2058d1cc4577853c20b103c3f69d25a77067e47282602571dbdcac0f95ac99c1f61932283d49aa430076901ef72cf7fa2d1625a3561f74a954990a47d
-EBUILD linux-gpib-4.2.0_rc1.ebuild 4552 BLAKE2B 5093b74f8d80489aa357b994d23bd4dae39fc1f979674db0e6e5bca9a5e40899f066347d244581550153e9189bbca504ae806114014534cefe5c2bb841bad871 SHA512 7a48a2016ebafad6e9d5e45e95673ae536d814348447b0fb691e72bbf117940d388d7f8e5c33d736ee30c0bdea20d9f6dbee22e60ac5819b460a048567ba8e5a
+EBUILD linux-gpib-4.2.0.ebuild 4616 BLAKE2B 5eb80245fe59166876d5fbb1d0b99b8c50f7101d54d203528cbfd5fc2599125ff517de3f09a4a9da122e145a947dd9609ed21d75bacdeb71973a484f47f2fdbb SHA512 6f32cafe55805918f05c3549379258cbdab2053d30edde7c2588bf1ab3a7e0fad2f2c563731f8808629b8d10895ae08404d7dd48c5bb9154ce1e6aa57a78dfe2
 MISC metadata.xml 688 BLAKE2B 405c816eb10feec819da0e5994c2ebe1e73ae4882cecf9f619bf30674b9ff499ae044cca42bad687d97cf3aef2a70eb826d5b07695cbde0c164a00cbac576e0a SHA512 d5af868c802d6c01b8267038cc5bdffc61677403ecb88cdfaf97f31d6b80d1e9318bcd507199d6a850df221cda2baf2869a1de4d732cde75a4aea2ec54f944b8
diff --git a/sci-libs/linux-gpib/linux-gpib-4.2.0.ebuild b/sci-libs/linux-gpib/linux-gpib-4.2.0.ebuild
index 7ac1727146f2..d6c4f27cf8e6 100644
--- a/sci-libs/linux-gpib/linux-gpib-4.2.0.ebuild
+++ b/sci-libs/linux-gpib/linux-gpib-4.2.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/linux-gpib/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
+KEYWORDS="amd64 ~arm ~x86"
 IUSE="pcmcia static guile perl php python tcl doc firmware"
 
 S="${WORKDIR}/${PN}-user-${PV}"
diff --git a/sci-libs/linux-gpib/linux-gpib-4.2.0_rc1.ebuild b/sci-libs/linux-gpib/linux-gpib-4.2.0_rc1.ebuild
deleted file mode 100644
index daf645239b60..000000000000
--- a/sci-libs/linux-gpib/linux-gpib-4.2.0_rc1.ebuild
+++ /dev/null
@@ -1,170 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
-
-inherit readme.gentoo-r1 autotools perl-functions python-single-r1 toolchain-funcs udev user
-
-DESCRIPTION="Driver library for GPIB (IEEE 488.2) hardware"
-HOMEPAGE="https://linux-gpib.sourceforge.io/"
-SRC_URI="mirror://sourceforge/linux-gpib/${PN}-user-${PV}.tar.gz
-	firmware? ( https://linux-gpib.sourceforge.io/firmware/gpib_firmware-2006-11-12.tar.gz )
-"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="pcmcia static guile perl php python tcl doc firmware"
-
-S="${WORKDIR}/${PN}-user-${PV}"
-
-COMMONDEPEND="
-	sys-libs/readline:=
-	tcl? ( dev-lang/tcl:0= )
-	guile? ( dev-scheme/guile:12 )
-	perl? ( dev-lang/perl:= )
-	php? ( dev-lang/php:= )
-	python? ( ${PYTHON_DEPS} )
-	firmware? ( sys-apps/fxload )"
-RDEPEND="${COMMONDEPEND}
-	~sci-libs/linux-gpib-modules-${PV}
-"
-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.16-perl.patch
-)
-
-pkg_setup () {
-	use perl && perl_set_version
-	use python && python_setup
-}
-
-src_prepare () {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static) \
-		$(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)
-}
-
-src_compile() {
-	FIRM_DIR=/usr/share/usb
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_MOD_PATH="${D}" \
-		HOTPLUG_USB_CONF_DIR=/etc/hotplug/usb \
-		UDEV_RULES_DIR="$(get_udevdir)"/rules.d \
-		USB_FIRMWARE_DIR=${FIRM_DIR} \
-		docdir=/usr/share/doc/${PF}/html
-}
-
-src_install() {
-	FIRM_DIR=/usr/share/usb
-	emake \
-		DESTDIR="${D}" \
-		INSTALL_MOD_PATH="${D}" \
-		HOTPLUG_USB_CONF_DIR=/etc/hotplug/usb \
-		UDEV_RULES_DIR="$(get_udevdir)"/rules.d \
-		USB_FIRMWARE_DIR=${FIRM_DIR} \
-		docdir=/usr/share/doc/${PF}/html install
-
-	if use perl; then
-		einfo "Installing perl module"
-		cd "${S}"/language/perl || die
-		DESTDIR=${D} emake install
-		perl_fix_packlist
-		perl_delete_emptybsdir
-		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
-
-	# fix rules files
-	local f
-	find "${D}$(get_udevdir)"/rules.d -type f -print0 | while read -rd '' f ; do
-		grep -q "${D}" "${f}" && einfo "File ${f} contains a temporary path, fixing."
-		sed -i -e "s:${D}:/:g" "${f}"
-	done
-
-	DOC_CONTENTS="
-You need to run the 'gpib_config' utility to setup the driver before
-you can use it. In order to do it automatically you can add to your
-start script something like this (supposing the appropriate driver
-is loaded on the startup):
-\n
-		gpib_config --minor 0
-\n
-To give a user access to the computer's gpib board you will have to add
-them to the group 'gpib' or, you could change the permissions on the device
-files /dev/gpib[0-15] to something you like better, using 'chmod'
-\n
-Edit /etc/gpib.conf to match your interface board, and any devices you wish
-to open via ibfind().  See the documentation in /usr/share/linux-gpib/html for
-more information.
-\n
-"
-
-	if use pcmcia; then
-		DOC_CONTENTS+='
-For PCMCIA cards:\n
-All files needed for a PCMCIA board were copied to /etc/pcmcia.
-You may wish to edit the options passed to the gpib_config call in the
-/etc/pcmcia/linux-gpib-pcmcia script.
-You may need to send a SIGHUP signal to the cardmgr daemon to force it
-to reload the files in /etc/pcmcia \(alternatively you could use your
-pcmcia init.d script to restart the cardmgr, or you could just reboot\).
-The driver module will be loaded as needed by the cardmgr.
-
-'
-	fi
-
-	if use firmware; then
-		DOC_CONTENTS+='
-For Agilent \(HP\) 82341C and 82341D cards:
-The firmware for these boards is uploaded by passing the appropriate
-firmware file from /usr/share/linux-gpib/hp_82341 directory to
-gpib_config using the -I or --init-data command line option. Example:\n
-gpib_config --minor 0 --init-data /usr/share/linux-gpib/hp_82341/hp_82341c_fw.bin
-'
-	fi
-
-	readme.gentoo_create_doc
-}
-
-pkg_preinst () {
-	use perl && perl_set_version
-	enewgroup gpib
-}
-
-pkg_postinst () {
-	readme.gentoo_print_elog
-}