gentoo resync : 25.08.2020

7 files changed, 190 insertions, 248 deletions

diff --git a/sci-libs/libsigrok/Manifest b/sci-libs/libsigrok/Manifest
index edad3d3994f8..9c7fc1cf9096 100644
--- a/sci-libs/libsigrok/Manifest
+++ b/sci-libs/libsigrok/Manifest
@@ -1,12 +1,10 @@
 AUX libsigrok-0.3.0-configure-flags.patch 6291 BLAKE2B 24ca94ea005a1148fc3492c90aed9823a63620416e441d2a183573a1627a99a47fc76ca751b3903bc68664c5e117fb44bf693934794885db7fdd12370d9b934f SHA512 a7df284a3598dada9ddd63c7fe84b99fdec11a36724656c444a9deb80d0e29c633d85166d926279f3870d800b07816b50198c285a985304041134ad0c84f89c1
 AUX libsigrok-0.3.0-no-check-linkage.patch 980 BLAKE2B 44f84888190f6a683da93d8f9b2a1edb27d66713699765aa90955c4ef408fef8f8c06d9ca314acb40780c66992245e167f7c0a615e31d1b5ae76b455bbc9b180 SHA512 45d31733c9942cedd916819baa842ae9b68de7ac9f7fc5d440f93d5eb2ea13975c3a4ac7116d80d669c7f942f5342e616da208b83a98ea005fe6a62fab3db373
+AUX libsigrok-0.5.2-ruby-swig-docs.patch 3085 BLAKE2B 865f38a8230762f58620c06b91dda8bfda405057c6733ef8dc27dbc7094817709ce03a3db1904e4c4ce3ecbdc82da6d16c5719a3f93410a84f07cd4c4018a9ea SHA512 aa3fd492f736c0fe7af1c2ba4e41307731589cef78c480426113dcbae8abbf0ecc07bdc5e1b251103d5aa813f120c5ff7f76dd6d5e577ca8f2b9f29eac008025
+AUX libsigrok-0.5.2-swig-4.patch 1484 BLAKE2B 94c9bbde14f3175252677dedd50a7f3ff17bcc734382d93fbe3c65c71989dc72d0568535343bcb7764053075a2bac9c9f2d4e480d582a5371ac0d4a12bcab4a2 SHA512 34e568351624aeada4c3894be8a60cc0111be7c20ebe8e5395a1f81b2fc453a6a8228f575b95faad5140162a9d4fc5fc570546f42673f7275cb3910c73ffc8de
 DIST libsigrok-0.3.0.tar.gz 924503 BLAKE2B 132cc952b7314e11034100973f1086d17515fb7b1eb3792506569211fe05e9f35b113fceaff7c0468ad9be0bbcac0251ae63ae856f1393c51e743983e60886df SHA512 b94e8a8da1346f9ab267fd693975411243f2cb016e48ec05f4ad88a8a1dfe5ed6f5ad4ac4bf0e94dc551dc92cd70d2719983e21abaa4811693fb28a27bf74550
-DIST libsigrok-0.4.0.tar.gz 1387329 BLAKE2B 8d1578c1f84c84af54f0e6c97bcdcec6d183a80170d0b19aa44c4015dac3c418e1a1e304b42b12be3f905a3887f95d2ecc9644aeb2a81a961e09438e380ec70b SHA512 5963c1a44cf351a38d9434f89a15b20d36c7196a78464c302c65ab262bcdb2f26274c7fabf01174757e1f9a367497b9721578ebf802f75ef97ee71ff3dade1e0
-DIST libsigrok-0.5.1.tar.gz 1664813 BLAKE2B b5765e1057ee4411ef2f83fa73473429bc8f84653f1c7761af3c1280decc2fcb1d3c68d8f92f7e77b85f1fcda74cf6066e5bf56c0da2de4b28148b920b94e0da SHA512 48337fc4625dc0abc162ae54e04ce091047835aa1e49ba1ab84542805008d1ff5646b143fde57e317f3b34514c0e6d4dcb7b1c5944f3f16bdef1a7169edc3517
 DIST libsigrok-0.5.2.tar.gz 1779465 BLAKE2B fc6fdde1054e9ac50bc42249c34b3dbfff1e89d77f0db5a8762e52fcf2ea5ea69b2defcf1cde4ed7b1edd1e21770002ed661a470c8d666904daa48a84a2bbfc5 SHA512 cf673dad6280302d69050c29490621f66c6d6a73932d019a53ec3501316d3f2e23e7667a04f866dbe6ed73f86a63de73d2173e2b6cea563631d705e06f887092
 EBUILD libsigrok-0.3.0.ebuild 1732 BLAKE2B f3f00fd50eeedfdf542d4205c633433d70cd3a3638932505cc6576eef7216a27b5ba677aa2281d692f250df458f1b4b33a67cf7f0ca3355ac52f4269623be20e SHA512 aa54d6ef4f33da4498432d84fdfd390134b7ccc2715af7e74ae91a7307348eeec73b5787fe39dd20a35572fa8316a0d504bea9ea413e71821f9fb4d974d58b5e
-EBUILD libsigrok-0.4.0.ebuild 2223 BLAKE2B 8febecd45ce5095e6e59edf3d209d3378ea6d22046b6569ec68e74e74c619bcb9ee6f2fc4d99a01c3d747e33b5fc189d3945b56b6ffccb4309302ccd8f4b0e3c SHA512 3e657768771c04a3818d4acc301fc1a893822a1a1181126ef1021d199003b44b072d42e5e0df4f7e1dfe43bd96ea0bc814d260613be6c388b4642d396fca46e3
-EBUILD libsigrok-0.5.1.ebuild 2453 BLAKE2B 640406797fe99e1bdb574ce0cb5f22b32622efd733c48b39a7b6f3f459d5e3980f1489ec923e05d8c80912f1b566635e3496f018e5c109e764169d62e7e8c375 SHA512 a4ac2f0e3b65a388b22a8dbc3d7d5148e06fb4d598cae2b95ffd070ea57c33c6a89eba609fcf61724041fdfd8802b116779f462cd5e5c62839c7a32d62786a8d
-EBUILD libsigrok-0.5.2.ebuild 3643 BLAKE2B 5b1e373564026b2af6891ae8320214be69b8463198f7cb41f4627ecbdeac2c769828a97294e97fdaa59d0a66a46e3451fc170ab2430c6c09e7bb3c970cb4f6c0 SHA512 6d019edbe7c1311dd9bd1e84f0e389778effaa3617fc7b69709a0b44f9a4ce0042a9425c936b2b39ab5c3ffc3da64c3dd8022710de5ae7a7a196a9adec556a2c
-EBUILD libsigrok-9999.ebuild 3646 BLAKE2B d388ecfcc1a744e034c1596903cd3d0170bd5a88e10982cac29523d1a823fe0ddded89e5429d622a1c56bb067682d6a120a73d741e6ddc7382e8c681e14245f6 SHA512 36f779ef5d94debe39e528f40c182aca3ce24f720a41eae2df524531f84b9c39f9d7862364ce7e30a7ff883327985c3a954811f98a6331eafe868469c630e8c0
+EBUILD libsigrok-0.5.2.ebuild 3879 BLAKE2B d7fc2234bb89bad437a60d27e71d47dd17d0ee7ce7b6455391e3f982e103c8fba15ffd6beb682fb4e56d1ee082335dffbb443b70f010b189d1bb3ab489c7a916 SHA512 91ff1e2ac0eb21bfd2769cc7c2bfc3a793edd27fd4e225d66b8bedf2b0051845c05d344be603847284021a18b2c3306757375ec10e29976e277a95957f68faf3
+EBUILD libsigrok-9999.ebuild 3679 BLAKE2B 7c80f57e327ebac43dbda70a5f07147d49db55bc6640f7f22a82709bc0527cc76a8744ca314b79952ee6fc291462b988668d6ca7ad297246932a4f92c720c0dd SHA512 0182a0ba019d158e2c1c66889e8d97c0857f946357fa2704946b024bece3e43d4410b8d147cbd71c82506264f7b3d38f98a165558e3a515522724f1575ff41fb
 MISC metadata.xml 701 BLAKE2B 8ae40f35611af8244dd9a0849077c4e823c126ee5d5d20087c6e7b0170b06718da3d4152940b51508586f47493c7c0435a678da278e8570a2e7f0d77ad803fa1 SHA512 66db0a2f5de48ec701c30e5c95562ec8508703fecb30a781d05ab74fc5db1e7ea6ff828b43eb68dda16f56833744a55f3f7c7911d889866b098bdcafe5a62f1b
diff --git a/sci-libs/libsigrok/files/libsigrok-0.5.2-ruby-swig-docs.patch b/sci-libs/libsigrok/files/libsigrok-0.5.2-ruby-swig-docs.patch
new file mode 100644
index 000000000000..808227a2fffb
--- /dev/null
+++ b/sci-libs/libsigrok/files/libsigrok-0.5.2-ruby-swig-docs.patch
@@ -0,0 +1,63 @@
+From bae9308ec157378bd22ce4f4a0226f1e7ef23594 Mon Sep 17 00:00:00 2001
+From: Anatol Pomozov <anatol.pomozov@gmail.com>
+Date: Mon, 8 Jun 2020 20:46:44 -0700
+Subject: [PATCH] Fix ruby SWIG bindings generation
+
+bindings/swig/doc.py generates a swig interface file for ruby bindings
+that includes docstrings with comments braces ( /* and */ ) like this:
+
+  %feature("docstring") sigrok::Channel::type "/* Type of this channel. */\n";
+  %feature("docstring") sigrok::Channel::enabled "/* Enabled status of this channel. */\n";
+
+SWIG generates *.cxx and adds its own braces to the docstring:
+
+/*/* Document-class: Sigrok::Error
+Exception thrown when an error code is returned by any libsigrok call. */
+*/
+
+this causes compilation error for Ruby bindings.
+
+To fix the error we should not add extra braces to the docstring.
+With this patch libsigrok compiles fine with with ruby 2.7 and swig 4.0.2.
+
+Fixes bug #1526
+
+Signed-off-by: Anatol Pomozov <anatol.pomozov@gmail.com>
+---
+ bindings/swig/doc.py | 8 ++++----
+ 1 file changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/bindings/swig/doc.py b/bindings/swig/doc.py
+index e8767af8..182f5477 100644
+--- a/bindings/swig/doc.py
++++ b/bindings/swig/doc.py
+@@ -46,7 +46,7 @@ for compound in index.findall('compound'):
+         if language == 'python':
+             print('%%feature("docstring") %s "%s";' % (class_name, brief))
+         elif language == 'ruby':
+-            print('%%feature("docstring") %s "/* Document-class: %s\\n%s */\\n";' % (class_name, class_name.replace("sigrok", "Sigrok", 1), brief))
++            print('%%feature("docstring") %s "Document-class: %s\\n%s\\n";' % (class_name, class_name.replace("sigrok", "Sigrok", 1), brief))
+         elif language == 'java':
+             print('%%typemap(javaclassmodifiers) %s "/** %s */\npublic class"' % (
+             class_name, brief))
+@@ -77,10 +77,10 @@ for compound in index.findall('compound'):
+                             for name, desc in parameters.items()]) + '";')
+                 if language == 'ruby' and kind == 'public-func':
+                     print(str.join('\n', [
+-                        '%%feature("docstring") %s::%s "/* %s' % (
++                        '%%feature("docstring") %s::%s "%s' % (
+                             class_name, member_name, brief)] + [
+                         '@param %s %s' % (name, desc)
+-                            for name, desc in parameters.items()]) + ' */\\n";')
++                            for name, desc in parameters.items()]) + '\\n";')
+                 elif language == 'java' and kind == 'public-func':
+                         print(str.join('\n', [
+                             '%%javamethodmodifiers %s::%s "/** %s' % (
+@@ -111,4 +111,4 @@ for compound in index.findall('compound'):
+             print('%}')
+     elif language == 'ruby' and constants:
+         for member_name, brief in constants:
+-            print('%%feature("docstring") %s::%s "/* %s */\\n";' % (class_name, member_name, brief))
++            print('%%feature("docstring") %s::%s "%s\\n";' % (class_name, member_name, brief))
+-- 
+2.27.0
diff --git a/sci-libs/libsigrok/files/libsigrok-0.5.2-swig-4.patch b/sci-libs/libsigrok/files/libsigrok-0.5.2-swig-4.patch
new file mode 100644
index 000000000000..3c5dd85a5100
--- /dev/null
+++ b/sci-libs/libsigrok/files/libsigrok-0.5.2-swig-4.patch
@@ -0,0 +1,37 @@
+From e803574173bdac8a7f33085a648c29eaf248a394 Mon Sep 17 00:00:00 2001
+From: Uwe Hermann <uwe@hermann-uwe.de>
+Date: Sat, 4 Apr 2020 21:54:13 +0200
+Subject: [PATCH 1/1] bindings/java: Fix build issue with SWIG 4.x.
+
+Tested with SWIG 3.x and SWIG 4.x.
+
+This fixes bug #1527.
+---
+ bindings/java/org/sigrok/core/classes/classes.i | 8 ++++++++
+ 1 file changed, 8 insertions(+)
+
+diff --git a/bindings/java/org/sigrok/core/classes/classes.i b/bindings/java/org/sigrok/core/classes/classes.i
+index 75793b25..e953fe5d 100644
+--- a/bindings/java/org/sigrok/core/classes/classes.i
++++ b/bindings/java/org/sigrok/core/classes/classes.i
+@@ -94,10 +94,18 @@ VECTOR(std::shared_ptr<sigrok::HardwareDevice>, HardwareDevice)
+   "java.util.Map<JKey, JValue>"
+ 
+ %typemap(javain,
++/* SWIG 4.0.0 changed the std::map wrappers in an incompatible way. */
++#if SWIG_VERSION >= 0x040000
++    pre="  $javaclassname temp$javainput = new $javaclassname();
++    for (java.util.Map.Entry<JKey, JValue> entry : $javainput.entrySet())
++      temp$javainput.put(entry.getKey(), entry.getValue());",
++    pgcppname="temp$javainput")
++#else
+     pre="  $javaclassname temp$javainput = new $javaclassname();
+     for (java.util.Map.Entry<JKey, JValue> entry : $javainput.entrySet())
+       temp$javainput.set(entry.getKey(), entry.getValue());",
+     pgcppname="temp$javainput")
++#endif
+   std::map< CKey, CValue > "$javaclassname.getCPtr(temp$javainput)"
+ 
+ %typemap(javaout) std::map< CKey, CValue > {
+-- 
+2.24.0.rc2
diff --git a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild b/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
deleted file mode 100644
index df9318757a57..000000000000
--- a/sci-libs/libsigrok/libsigrok-0.4.0.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_6 )
-
-inherit eutils python-single-r1 java-pkg-opt-2 ltprune
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://sigrok.org/${PN}"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="basic hardware drivers for logic analyzers and input/output file format support"
-HOMEPAGE="https://sigrok.org/wiki/Libsigrok"
-
-LICENSE="GPL-3"
-SLOT="0/3"
-IUSE="cxx ftdi java parport python serial static-libs test usb"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} )"
-
-# We also support librevisa, but that isn't in the tree ...
-LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
-	>=dev-libs/libzip-0.8:=[static-libs(+)]
-	cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=dev-python/pygobject-3.0.0[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )
-	parport? ( sys-libs/libieee1284[static-libs(+)] )
-	serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
-	usb? ( virtual/libusb:1[static-libs(+)] )"
-RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	static-libs? ( ${LIB_DEPEND} )
-	java? ( >=virtual/jre-1.4 )"
-DEPEND="${LIB_DEPEND//\[static-libs(+)]}
-	test? ( >=dev-libs/check-0.9.4 )
-	cxx? ( app-doc/doxygen )
-	java? (
-		>=dev-lang/swig-3.0.6
-		>=virtual/jdk-1.4
-	)
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		')
-		>=dev-lang/swig-3.0.6
-	)
-	virtual/pkgconfig"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	[[ ${PV} == "9999" ]] && eautoreconf
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		$(use_with ftdi libftdi) \
-		$(use_with parport libieee1284) \
-		$(use_with serial libserialport) \
-		$(use_with usb libusb) \
-		$(use_enable cxx) \
-		$(use_enable java) \
-		$(use_enable python) \
-		--disable-ruby \
-		$(use_enable static-libs static)
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/sci-libs/libsigrok/libsigrok-0.5.1.ebuild b/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
deleted file mode 100644
index 078e9f5d9ab5..000000000000
--- a/sci-libs/libsigrok/libsigrok-0.5.1.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python3_{6,7} )
-
-inherit eutils gnome2-utils python-single-r1 java-pkg-opt-2 ltprune udev xdg-utils
-
-if [[ ${PV} == "9999" ]]; then
-	EGIT_REPO_URI="git://sigrok.org/${PN}"
-	inherit git-r3 autotools
-else
-	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="basic hardware drivers for logic analyzers and input/output file format support"
-HOMEPAGE="https://sigrok.org/wiki/Libsigrok"
-
-LICENSE="GPL-3"
-SLOT="0/4"
-IUSE="cxx ftdi java parport python serial static-libs test +udev usb"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} )"
-
-# We also support librevisa, but that isn't in the tree ...
-LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
-	>=dev-libs/libzip-0.8:=[static-libs(+)]
-	cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			>=dev-python/pygobject-3.0.0[${PYTHON_MULTI_USEDEP}]
-		')
-	)
-	ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )
-	parport? ( sys-libs/libieee1284[static-libs(+)] )
-	serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
-	usb? ( virtual/libusb:1[static-libs(+)] )"
-RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
-	static-libs? ( ${LIB_DEPEND} )
-	java? ( >=virtual/jre-1.4 )"
-DEPEND="${LIB_DEPEND//\[static-libs(+)]}
-	test? ( >=dev-libs/check-0.9.4 )
-	cxx? ( app-doc/doxygen )
-	java? (
-		>=dev-lang/swig-3.0.6
-		>=virtual/jdk-1.4
-	)
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/setuptools[${PYTHON_MULTI_USEDEP}]
-			dev-python/numpy[${PYTHON_MULTI_USEDEP}]
-		')
-		>=dev-lang/swig-3.0.6
-	)
-	virtual/pkgconfig"
-
-pkg_setup() {
-	use python && python-single-r1_pkg_setup
-	java-pkg-opt-2_pkg_setup
-}
-
-src_prepare() {
-	[[ ${PV} == "9999" ]] && eautoreconf
-	eapply_user
-}
-
-src_configure() {
-	econf \
-		$(use_with ftdi libftdi) \
-		$(use_with parport libieee1284) \
-		$(use_with serial libserialport) \
-		$(use_with usb libusb) \
-		$(use_enable cxx) \
-		$(use_enable java) \
-		$(use_enable python) \
-		--disable-ruby \
-		$(use_enable static-libs static)
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-	use udev && udev_dorules contrib/*.rules
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
index 49ca96068ac4..7ee8b26cb480 100644
--- a/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
+++ b/sci-libs/libsigrok/libsigrok-0.5.2.ebuild
@@ -3,70 +3,89 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{6,7} )
-USE_RUBY="ruby26 ruby25 ruby24"
+PYTHON_COMPAT=( python3_{6,7,8} )
+USE_RUBY="ruby26 ruby25"
 RUBY_OPTIONAL="yes"
 
-inherit eutils gnome2-utils python-r1 java-pkg-opt-2 ltprune ruby-ng udev xdg-utils
+inherit python-r1 java-pkg-opt-2 ruby-ng udev xdg-utils
 
-if [[ ${PV} == "9999" ]]; then
+if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="git://sigrok.org/${PN}"
 	inherit git-r3 autotools
 else
 	SRC_URI="https://sigrok.org/download/source/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 fi
 
-DESCRIPTION="basic hardware drivers for logic analyzers and input/output file format support"
+DESCRIPTION="Basic hardware drivers for logic analyzers and input/output file format support"
 HOMEPAGE="https://sigrok.org/wiki/Libsigrok"
 
 LICENSE="GPL-3"
 SLOT="0/4"
-IUSE="cxx ftdi java parport python ruby serial static-libs +udev test usb"
+IUSE="+cxx ftdi java parport python ruby serial static-libs test +udev usb"
+REQUIRED_USE="java? ( cxx )
+	python? ( cxx ${PYTHON_REQUIRED_USE} )
+	ruby? ( cxx || ( $(ruby_get_use_targets) ) )"
+
 RESTRICT="!test? ( test )"
-REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} ) ruby? ( cxx || ( $(ruby_get_use_targets) ) )"
 
 # We also support librevisa, but that isn't in the tree ...
-LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
+LIB_DEPEND="
+	>=dev-libs/glib-2.32.0[static-libs(+)]
 	>=dev-libs/libzip-0.8:=[static-libs(+)]
 	cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
-	python? ( ${PYTHON_DEPS} >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] )
-	ruby? ( $(ruby_implementations_depend) )
 	ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )
 	parport? ( sys-libs/libieee1284[static-libs(+)] )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}]
+	)
+	ruby? ( $(ruby_implementations_depend) )
 	serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
-	usb? ( virtual/libusb:1[static-libs(+)] )"
-RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	usb? ( virtual/libusb:1[static-libs(+)] )
+"
+RDEPEND="
+	java? ( >=virtual/jre-1.4 )
+	!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
 	static-libs? ( ${LIB_DEPEND} )
-	java? ( >=virtual/jre-1.4 )"
+"
 DEPEND="${LIB_DEPEND//\[static-libs(+)]}
-	test? ( >=dev-libs/check-0.9.4 )
 	cxx? ( app-doc/doxygen )
 	java? (
 		>=dev-lang/swig-3.0.6
 		>=virtual/jdk-1.4
 	)
 	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
 		>=dev-lang/swig-3.0.6
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
 	)
 	ruby? ( >=dev-lang/swig-3.0.8 )
-	virtual/pkgconfig"
+	test? ( >=dev-libs/check-0.9.4 )
+	virtual/pkgconfig
+"
 
 S="${WORKDIR}"/${P}
 
+PATCHES=(
+	# https://sigrok.org/bugzilla/show_bug.cgi?id=1527
+	"${FILESDIR}/${P}-swig-4.patch"
+	# https://sigrok.org/bugzilla/show_bug.cgi?id=1526
+	"${FILESDIR}/${P}-ruby-swig-docs.patch" # bug 705074
+)
+
 pkg_setup() {
+	use python && python_setup
 	use ruby && ruby-ng_pkg_setup
 	java-pkg-opt-2_pkg_setup
 }
 
 src_unpack() {
-	[[ ${PV} == "9999" ]] && git-r3_src_unpack || default
+	[[ ${PV} == *9999* ]] && git-r3_src_unpack || default
 }
 
 sigrok_src_prepare() {
-	[[ ${PV} == "9999" ]] && eautoreconf
+	[[ ${PV} == *9999* ]] && eautoreconf
 }
 
 each_ruby_prepare() {
@@ -74,9 +93,12 @@ each_ruby_prepare() {
 }
 
 src_prepare() {
-	use ruby && cp -rl "${S}" "${WORKDIR}"/all && ruby-ng_src_prepare
+	if use ruby; then
+		cp -rl "${S}" "${WORKDIR}"/all || die
+		ruby-ng_src_prepare
+	fi
+	default
 	sigrok_src_prepare
-	eapply_user
 	use python && python_copy_sources
 }
 
@@ -102,7 +124,6 @@ each_python_configure() {
 }
 
 src_configure() {
-	python_setup
 	sigrok_src_configure --disable-ruby --disable-python
 	use ruby && ruby-ng_src_configure
 	use python && python_foreach_impl each_python_configure
@@ -142,15 +163,15 @@ src_install() {
 	use python && python_foreach_impl each_python_install
 	use ruby && ruby-ng_src_install
 	use udev && udev_dorules contrib/*.rules
-	prune_libtool_files
+	find "${D}" -name '*.la' -type f -delete || die
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
 }
diff --git a/sci-libs/libsigrok/libsigrok-9999.ebuild b/sci-libs/libsigrok/libsigrok-9999.ebuild
index d4e9bf2291f2..1449357471e6 100644
--- a/sci-libs/libsigrok/libsigrok-9999.ebuild
+++ b/sci-libs/libsigrok/libsigrok-9999.ebuild
@@ -3,13 +3,13 @@
 
 EAPI="6"
 
-PYTHON_COMPAT=( python3_{6,7} )
-USE_RUBY="ruby26 ruby25 ruby24"
+PYTHON_COMPAT=( python3_{6,7,8} )
+USE_RUBY="ruby26 ruby25"
 RUBY_OPTIONAL="yes"
 
-inherit eutils gnome2-utils python-r1 java-pkg-opt-2 ltprune ruby-ng udev xdg-utils
+inherit python-r1 java-pkg-opt-2 ruby-ng udev xdg-utils
 
-if [[ ${PV} == "9999" ]]; then
+if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="git://sigrok.org/${PN}"
 	inherit git-r3 autotools
 else
@@ -17,56 +17,68 @@ else
 	KEYWORDS="~amd64 ~x86"
 fi
 
-DESCRIPTION="basic hardware drivers for logic analyzers and input/output file format support"
+DESCRIPTION="Basic hardware drivers for logic analyzers and input/output file format support"
 HOMEPAGE="https://sigrok.org/wiki/Libsigrok"
 
 LICENSE="GPL-3"
 SLOT="0/9999"
-IUSE="cxx ftdi java parport python ruby serial static-libs +udev test usb"
+IUSE="+cxx ftdi java parport python ruby serial static-libs test +udev usb"
+REQUIRED_USE="java? ( cxx )
+	python? ( cxx ${PYTHON_REQUIRED_USE} )
+	ruby? ( cxx || ( $(ruby_get_use_targets) ) )"
+
 RESTRICT="!test? ( test )"
-REQUIRED_USE="java? ( cxx ) python? ( cxx ${PYTHON_REQUIRED_USE} ) ruby? ( cxx || ( $(ruby_get_use_targets) ) )"
 
 # We also support librevisa, but that isn't in the tree ...
-LIB_DEPEND=">=dev-libs/glib-2.32.0[static-libs(+)]
+LIB_DEPEND="
+	>=dev-libs/glib-2.32.0[static-libs(+)]
 	>=dev-libs/libzip-0.8:=[static-libs(+)]
 	cxx? ( dev-cpp/glibmm:2[static-libs(+)] )
-	python? ( ${PYTHON_DEPS} >=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}] )
-	ruby? ( $(ruby_implementations_depend) )
 	ftdi? ( >=dev-embedded/libftdi-0.16:=[static-libs(+)] )
 	parport? ( sys-libs/libieee1284[static-libs(+)] )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-python/pygobject-3.0.0[${PYTHON_USEDEP}]
+	)
+	ruby? ( $(ruby_implementations_depend) )
 	serial? ( >=dev-libs/libserialport-0.1.1[static-libs(+)] )
-	usb? ( virtual/libusb:1[static-libs(+)] )"
-RDEPEND="!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
+	usb? ( virtual/libusb:1[static-libs(+)] )
+"
+RDEPEND="
+	java? ( >=virtual/jre-1.4 )
+	!static-libs? ( ${LIB_DEPEND//\[static-libs(+)]} )
 	static-libs? ( ${LIB_DEPEND} )
-	java? ( >=virtual/jre-1.4 )"
+"
 DEPEND="${LIB_DEPEND//\[static-libs(+)]}
-	test? ( >=dev-libs/check-0.9.4 )
 	cxx? ( app-doc/doxygen )
 	java? (
 		>=dev-lang/swig-3.0.6
 		>=virtual/jdk-1.4
 	)
 	python? (
-		dev-python/setuptools[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
 		>=dev-lang/swig-3.0.6
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/setuptools[${PYTHON_USEDEP}]
 	)
 	ruby? ( >=dev-lang/swig-3.0.8 )
-	virtual/pkgconfig"
+	test? ( >=dev-libs/check-0.9.4 )
+	virtual/pkgconfig
+"
 
 S="${WORKDIR}"/${P}
 
 pkg_setup() {
+	use python && python_setup
 	use ruby && ruby-ng_pkg_setup
 	java-pkg-opt-2_pkg_setup
 }
 
 src_unpack() {
-	[[ ${PV} == "9999" ]] && git-r3_src_unpack || default
+	[[ ${PV} == *9999* ]] && git-r3_src_unpack || default
 }
 
 sigrok_src_prepare() {
-	[[ ${PV} == "9999" ]] && eautoreconf
+	[[ ${PV} == *9999* ]] && eautoreconf
 }
 
 each_ruby_prepare() {
@@ -74,9 +86,12 @@ each_ruby_prepare() {
 }
 
 src_prepare() {
-	use ruby && cp -rl "${S}" "${WORKDIR}"/all && ruby-ng_src_prepare
+	if use ruby; then
+		cp -rl "${S}" "${WORKDIR}"/all || die
+		ruby-ng_src_prepare
+	fi
+	default
 	sigrok_src_prepare
-	eapply_user
 	use python && python_copy_sources
 }
 
@@ -102,7 +117,6 @@ each_python_configure() {
 }
 
 src_configure() {
-	python_setup
 	sigrok_src_configure --disable-ruby --disable-python
 	use ruby && ruby-ng_src_configure
 	use python && python_foreach_impl each_python_configure
@@ -142,15 +156,15 @@ src_install() {
 	use python && python_foreach_impl each_python_install
 	use ruby && ruby-ng_src_install
 	use udev && udev_dorules contrib/*.rules
-	prune_libtool_files
+	find "${D}" -name '*.la' -type f -delete || die
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_mimeinfo_database_update
 }