Merge branch 'edge' into next

5 files changed, 198 insertions, 25 deletions

diff --git a/sci-libs/linux-gpib/Manifest b/sci-libs/linux-gpib/Manifest
index 738a70440902..618ea5d017e0 100644
--- a/sci-libs/linux-gpib/Manifest
+++ b/sci-libs/linux-gpib/Manifest
@@ -1,8 +1,9 @@
-AUX linux-gpib-3.2.16-perl.patch 471 BLAKE2B a4cd09e10bd539b1ccb06e0272df923f52a196853c37276242fbb7545bc53915c751e2df1da8d13611e014e8ec4faf6f94746509d1d08c3aca127ce5ba2ebc14 SHA512 0ad75078406a8eb6fc09470be108464dcb3e7601d7a3c0813f1c6ba1d9e8f3895dea4da37f5d4928e6ea398a3aeea315a63bb6009a5fa211bba592093a776d10
 AUX linux-gpib-4.3.0-perl.patch 546 BLAKE2B 9695c1a9f48a2a8bcb5f5998c40eb909e6b1b3624defe87a08bc4b91b34f53e8176531678dff3d4810b0b85b811eb477795c0dffe0275b864c0e4d4bac9b0ea9 SHA512 21bf64366d4b68dcfc2f4fa932480f8ff6af62bf792fe90c0dd0330606c3b95c073040dfa87bd1e277391a02ad324612d58b6d618d83c637b3df60c638289d06
 DIST gpib_firmware-2006-11-12.tar.gz 169357 BLAKE2B 05f1be78545e025d76e2b9819a5dcac5a6715dfbb6df5c6fbe8b78900adf8ca7b1c28db350674ff1dd9c77e24507e98b536ca1af8b558c9a46ef8c25034c9769 SHA512 164d6fcfb3af43933f0a16645276f7d527a7aa24ef311f6ae3dcd7f45c41f92c855cf221bc946772f43fc2f9524057abc34bbd7d805c89b33ed7e111bc6870af
-DIST linux-gpib-4.2.0.tar.gz 1431440 BLAKE2B 7b6adf562963e0785f960c072f3f3d67cb91df9090205d8fecb0dc3170d3a1ac3719732919bae112e06b47387499ffe49a0144e72caa27ba39c85c8b98e56786 SHA512 1505c2c04f16bf7e92b9dd474f09edd242520a96f9e4d8eea88ebd44d0a82d653055155c1bfcde69da5355d609d400e3cb682da8aae83f59f1e565307a3fc4a7
 DIST linux-gpib-4.3.0.tar.gz 1375852 BLAKE2B e2daa444ddf4c0c34084f264247051d4ce1c8103d8ae5d91b02d4742131c1f92ded02775eb0f8b0ea29820e2ae7b61c3132c74084a876e86fbb4efaf11688773 SHA512 8db4eb6d606c68ffacc67988479684fec815fc552756a6c93466ef0dfc93368771bb551944e3afc31db83e72e464ec1fb289fdcf80b4a6be1617e734fe3b9d65
-EBUILD linux-gpib-4.2.0.ebuild 4612 BLAKE2B 615e338921fc8e4ee0d8e1b05de672fda188304c2d7c32b5a69e61e8beca401fb41026f96c84b64c8342377f88377b63a23d63e3975cec5ba65a7f2a80a464f2 SHA512 ed9f110809fd08dfdac987d9dafc475207e4d58c4c72878c40dfe2b538fcfcb73bc51865a3cd4cd37f23900db24cdc3d0b699ed11b8774b21f241754219e6a30
-EBUILD linux-gpib-4.3.0.ebuild 4812 BLAKE2B 7935aa4744316215aa91f057cbb5b7efd49d12eec852d0ee1ed176b6c4dc4929c8c6c7b0d716d21706020d12bf00c9f46cd28894a272516266a07a8f3571f005 SHA512 13b3fa6233b0c85a96ea9280af8f1ecadadc7265587e7349b1da713ccab2f981baa44c685f9bf3a24549e6eb1b3417899f151fb72f0467c4a65d713bca36d463
+DIST linux-gpib-4.3.2.tar.gz 1377406 BLAKE2B 57ec8b3788606ffb42d204ad0e2476c432bc82f929b1854c6a1d48c73f48a149716d05b13906b4597a4bf03e4c10a0ffe2c66e6de8cf9a5891b86c3d459713fc SHA512 bf9963d885e0c974f41eed96359501bd41c7d4f051026f64d835e52f1031f39e6bba6ce976a27e660a8b36087e56b81205206066c68b42db9a1d578d351a8f8b
+DIST linux-gpib-4.3.3.tar.gz 1381420 BLAKE2B 0ee8c4d740272a55be03f07bd49c9a93d0ec4808465c9b0abc4ede2ee9ef4bcb8a48fb8c98617d007c8b7af970eae185de65094a8814b05cb81bfc983bf9df3e SHA512 91b2c345dc82778b757122dc41ae74138831223a73057ddf9f04d10b8f6a059760e17134378df46a1ecb13c42bec1383aced0f2446f803af425391193a77066e
+EBUILD linux-gpib-4.3.0.ebuild 4801 BLAKE2B 88f8ec7539c6122153a64ac9e98e8862b3d2305384d2078aa93ab527544b73a5b9b7f6cf0eea3066910df96851db2a28fdaefccdd5dc446381f21fd02432c0a6 SHA512 35c4aded7b76f99fd35284b82ef146b30e02eae6b048f3d3ed121107442a2a971fe24457821f33a6dc72bec95fa551cff5a3f306f9673c82bf6ed13e4a37da11
+EBUILD linux-gpib-4.3.2.ebuild 4802 BLAKE2B 3933dc6f69e8669db481d0a40aa45eb6dde87595c81ad0786a733c36a8d55c22cb1eeb22e42e34b827c439a848e269429f07880c64e1d62389f711b2531e51ec SHA512 6fcabb1a21a0e52fd09fa280303baea2efe31635e79689f827a46a243e00810ea0799860e42aac9d9eb7350487fe99896e65a8c489a8b2d4036fdb6b91b1e8cd
+EBUILD linux-gpib-4.3.3.ebuild 4802 BLAKE2B 3933dc6f69e8669db481d0a40aa45eb6dde87595c81ad0786a733c36a8d55c22cb1eeb22e42e34b827c439a848e269429f07880c64e1d62389f711b2531e51ec SHA512 6fcabb1a21a0e52fd09fa280303baea2efe31635e79689f827a46a243e00810ea0799860e42aac9d9eb7350487fe99896e65a8c489a8b2d4036fdb6b91b1e8cd
 MISC metadata.xml 547 BLAKE2B 1d0da80dd999dc402dbcdc80628e1fe97ec648b806cbd17cf20f6cbc33279afad81f71728e944a600108f28f90a61111e6bd9c36c7908a557d6cca6e41cdc759 SHA512 a88766b0372a88d090c032b45a973cf087a2172b088396fd1706a7c3818d6bf220de26848cb844d2ed555e3067bda6a00ffff598e0a0a59009ce33b3230b68a1
diff --git a/sci-libs/linux-gpib/files/linux-gpib-3.2.16-perl.patch b/sci-libs/linux-gpib/files/linux-gpib-3.2.16-perl.patch
deleted file mode 100644
index 16f2f15b0ad7..000000000000
--- a/sci-libs/linux-gpib/files/linux-gpib-3.2.16-perl.patch
+++ /dev/null
@@ -1,9 +0,0 @@
-diff -ruN linux-gpib-3.2.16.orig/language/Makefile.am linux-gpib-3.2.16/language/Makefile.am
---- linux-gpib-3.2.16.orig/language/Makefile.am	2009-09-16 19:26:53.000000000 +0200
-+++ linux-gpib-3.2.16/language/Makefile.am	2011-08-14 03:32:53.000000000 +0200
-@@ -67,4 +67,4 @@
- 	$(RM) perl/Makefile
- 
- perl/Makefile:
--	-(cd perl && $(PERL) Makefile.PL)
-+	-(cd perl && $(PERL) Makefile.PL PREFIX=$(EPREFIX)/usr INSTALLDIRS=vendor INSTALLMAN3DIR='none' DESTDIR="$(DESTDIR)" )
diff --git a/sci-libs/linux-gpib/linux-gpib-4.3.0.ebuild b/sci-libs/linux-gpib/linux-gpib-4.3.0.ebuild
index 7e91689d224e..ae944aeda719 100644
--- a/sci-libs/linux-gpib/linux-gpib-4.3.0.ebuild
+++ b/sci-libs/linux-gpib/linux-gpib-4.3.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
 inherit readme.gentoo-r1 autotools perl-functions python-single-r1 toolchain-funcs udev
 
@@ -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.ebuild b/sci-libs/linux-gpib/linux-gpib-4.3.2.ebuild
index df557833f062..91351386ba0b 100644
--- a/sci-libs/linux-gpib/linux-gpib-4.2.0.ebuild
+++ b/sci-libs/linux-gpib/linux-gpib-4.3.2.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=6
 
-PYTHON_COMPAT=( python2_7 python3_6 python3_7 )
+PYTHON_COMPAT=( python3_6 python3_7 )
 
-inherit readme.gentoo-r1 autotools perl-functions python-single-r1 toolchain-funcs udev user
+inherit readme.gentoo-r1 autotools perl-functions python-single-r1 toolchain-funcs udev
 
 DESCRIPTION="Driver library for GPIB (IEEE 488.2) hardware"
 HOMEPAGE="https://linux-gpib.sourceforge.io/"
@@ -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}"
@@ -29,6 +29,7 @@ COMMONDEPEND="
 	python? ( ${PYTHON_DEPS} )
 	firmware? ( sys-apps/fxload )"
 RDEPEND="${COMMONDEPEND}
+	acct-group/gpib
 	~sci-libs/linux-gpib-modules-${PV}
 "
 DEPEND="${COMMONDEPEND}
@@ -39,7 +40,7 @@ DEPEND="${COMMONDEPEND}
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-3.2.16-perl.patch
+	"${FILESDIR}"/${PN}-4.3.0-perl.patch
 )
 
 pkg_setup() {
@@ -108,7 +109,6 @@ src_install() {
 	newins util/templates/gpib.conf gpib.conf.example
 
 	if use pcmcia; then
-		dodir /etc/pcmcia
 		insinto /etc/pcmcia
 		doins "${S}"/etc/pcmcia/*
 	fi
@@ -121,6 +121,14 @@ src_install() {
 	done
 
 	DOC_CONTENTS="
+As the udev rules were changed and refactored in this release it is
+necessary to remove any manually installed pre-4.3.0 gpib udev rules files
+in /etc/udev/rules.d/. The files to remove are:
+\n
+	99-agilent_82357a.rules\n
+	99-gpib-generic.rules\n
+	99-ni_usb_gpib.rules\n
+\n
 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
@@ -165,11 +173,6 @@ gpib_config --minor 0 --init-data /usr/share/linux-gpib/hp_82341/hp_82341c_fw.bi
 	readme.gentoo_create_doc
 }
 
-pkg_preinst() {
-	use perl && perl_set_version
-	enewgroup gpib
-}
-
 pkg_postinst() {
 	readme.gentoo_print_elog
 }
diff --git a/sci-libs/linux-gpib/linux-gpib-4.3.3.ebuild b/sci-libs/linux-gpib/linux-gpib-4.3.3.ebuild
new file mode 100644
index 000000000000..91351386ba0b
--- /dev/null
+++ b/sci-libs/linux-gpib/linux-gpib-4.3.3.ebuild
@@ -0,0 +1,178 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python3_6 python3_7 )
+
+inherit readme.gentoo-r1 autotools perl-functions python-single-r1 toolchain-funcs udev
+
+DESCRIPTION="Driver library for GPIB (IEEE 488.2) hardware"
+HOMEPAGE="https://linux-gpib.sourceforge.io/"
+SRC_URI="mirror://sourceforge/linux-gpib/${P}.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}
+	acct-group/gpib
+	~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}-4.3.0-perl.patch
+)
+
+pkg_setup() {
+	use perl && perl_set_version
+	use python && python_setup
+}
+
+src_unpack() {
+	default
+	unpack "${WORKDIR}/${P}/${PN}-user-${PV}.tar.gz"
+}
+
+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
+		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="
+As the udev rules were changed and refactored in this release it is
+necessary to remove any manually installed pre-4.3.0 gpib udev rules files
+in /etc/udev/rules.d/. The files to remove are:
+\n
+	99-agilent_82357a.rules\n
+	99-gpib-generic.rules\n
+	99-ni_usb_gpib.rules\n
+\n
+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_postinst() {
+	readme.gentoo_print_elog
+}