gentoo resync : 10.02.2020

35 files changed, 92 insertions, 556 deletions

diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 2d8792335bd2..69e8a157de29 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/geda-xgsch2pcb/Manifest b/sci-electronics/geda-xgsch2pcb/Manifest
index a806cab2ae01..e8063b5b14d4 100644
--- a/sci-electronics/geda-xgsch2pcb/Manifest
+++ b/sci-electronics/geda-xgsch2pcb/Manifest
@@ -1,5 +1,5 @@
 AUX 0.1.3-python.patch 1036 BLAKE2B ff7391d533a42cc7cd0b684c5df9fcf28b9684124b8b297c3644172999d6c4143761651bd7a0a14c5377d83dc20c8b1c3faf593294ec7e703d45dfaed624aced SHA512 2d57c33949374776d468b797ac021f90e80066d5c6dc0b482274272bae203d8a3019e5d72c23fca25cd0e131d2eb95688ddb7963ac272ae5cff755a41a94cd6a
 DIST geda-xgsch2pcb-0.1.3.tar.gz 160225 BLAKE2B 15f4641647f8edcf7f7cfb0d69eff9a8eba44441dea5147c988114ee25f7473a9da58b81654f6dc713d0a8ae70864a780e6babf2c152c7e3232207d2ddbcc7db SHA512 24d8c798be49a0aa09c12c97eb6d33e1bd5ccf1a866a8889dd04e3dd2035afd6b8799638d696691216df9d5c645922b8cfb5aadc1373d15c6ee62eec0f72b965
-EBUILD geda-xgsch2pcb-0.1.3-r3.ebuild 1355 BLAKE2B 612515c7b462b5b8e2c905ce874c30c151dc94a482fcd407e7d4c88712ce783c1ad91ae54ceaffb0f4a92a2551fb3630e2ebc70af180481a0680f0da5d44ef83 SHA512 01f84e70313c875b08e044caaf9f81da582d62abbb40bfb4ec9cd53c85c20204911dbe75f30e890a6740bc48f4e0ab5621a785ff3d0295e68d3bd96438c809cd
-EBUILD geda-xgsch2pcb-0.1.3-r4.ebuild 1293 BLAKE2B c5afdda3b35b879d707fa8350597e0b875c44bc977d64ed5c114d46849f546bdcfb24cd10771af62f76102635bf07e38a8ab1ee8a458d6840d584ddd5a3464ed SHA512 b940e521b7077922afe5a54ca443803d98111ebbdf0c79abe947002c244df5161b6fde61bf4f0fe3bff2ba05ebda5c5c6c4c1e295e9c4d68202445bfc4e50614
+EBUILD geda-xgsch2pcb-0.1.3-r5.ebuild 1443 BLAKE2B 5707ba9a1c7fd54a423bc29fe9cb6f75b6b498064a6c90bc3fc8089bfa849d004d3a0ba55667eef9af0125b51e3a9527bbd1f09df37ca4b013311f002d4335af SHA512 ca4a23f0d7c8dd9510128202631bb6a10826edcd6ed14fcba73fc8b6ec441895311ea787b923a7be4de72b4f5b3b3bde3a96fd430a93dd435c9a3bdfcd453311
+EBUILD geda-xgsch2pcb-0.1.3-r6.ebuild 1340 BLAKE2B 58053db39d8a0f5c715d6bcc4baf22bdcd20eb22ca4a675b74318166402568e6f3bb315b7a7fbdff8868169710c9ddac0d98bc354d1f93ce5961e26541a3cf4c SHA512 f423a4341a5aec6300577e1f145d0f58767e66c0c8724bb6fb206d96e928329da5e59370757902b13b4ce37585874aa76ceb5a8615169df461ac69e9b7398e54
 MISC metadata.xml 671 BLAKE2B 77470480797cd6bd52006fb449dd79f1a9ced0746f7d9e66e93a90c618d7ad5689a2af1e498a4e3e02eff7a7fea94e901bc89ec1a1c0c2046acb518f422048c3 SHA512 bcf8fa9808b923a56d6a8ace86cf95b7ed92475995fe8fa500b168fc8f7aabb4eeb1419a1dcc9f3ef7f4b0b0fcf1e9b27fe204db074f347fc1d3cd272ff3b9a0
diff --git a/sci-electronics/geda-xgsch2pcb/geda-xgsch2pcb-0.1.3-r3.ebuild b/sci-electronics/geda-xgsch2pcb/geda-xgsch2pcb-0.1.3-r5.ebuild
index e7beae977e1c..f7db10a7e691 100644
--- a/sci-electronics/geda-xgsch2pcb/geda-xgsch2pcb-0.1.3-r3.ebuild
+++ b/sci-electronics/geda-xgsch2pcb/geda-xgsch2pcb-0.1.3-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,16 +19,22 @@ IUSE="gnome nls"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 CDEPEND="${PYTHON_DEPS}
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	sci-electronics/pcb[dbus]
 	sci-electronics/geda
 	nls? ( virtual/libintl )
 "
 RDEPEND="${CDEPEND}
 	sci-electronics/electronics-menu
-	gnome? ( dev-python/gnome-vfs-python[${PYTHON_USEDEP}] )
+	gnome? (
+		$(python_gen_cond_dep '
+			dev-python/gnome-vfs-python[${PYTHON_MULTI_USEDEP}]
+		')
+	)
 "
 DEPEND="${CDEPEND}
 	dev-util/intltool
diff --git a/sci-electronics/geda-xgsch2pcb/geda-xgsch2pcb-0.1.3-r4.ebuild b/sci-electronics/geda-xgsch2pcb/geda-xgsch2pcb-0.1.3-r6.ebuild
index 44789cb25430..b9b2d426a6ae 100644
--- a/sci-electronics/geda-xgsch2pcb/geda-xgsch2pcb-0.1.3-r4.ebuild
+++ b/sci-electronics/geda-xgsch2pcb/geda-xgsch2pcb-0.1.3-r6.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -19,9 +19,11 @@ IUSE="nls"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 CDEPEND="${PYTHON_DEPS}
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	dev-python/pygobject:2[${PYTHON_USEDEP}]
-	dev-python/dbus-python[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+		dev-python/pygobject:2[${PYTHON_MULTI_USEDEP}]
+		dev-python/dbus-python[${PYTHON_MULTI_USEDEP}]
+	')
 	sci-electronics/pcb[dbus]
 	sci-electronics/geda
 	nls? ( virtual/libintl )
diff --git a/sci-electronics/gerbv/Manifest b/sci-electronics/gerbv/Manifest
index 122d99a0c727..5de5fe7f2383 100644
--- a/sci-electronics/gerbv/Manifest
+++ b/sci-electronics/gerbv/Manifest
@@ -1,9 +1,4 @@
-AUX gerbv-2.6.1-ru.patch 341 BLAKE2B 87714542a7262bd61d3895a270df6cf54985a7708e4e1e2a7a6597f9e736b5f457d9d1b388b7dd8b26d167de125a41a0a3124ed518eb2aaf12a0ded81b84a59e SHA512 7cd39b1648f67bbf28a56afe03975ce0f57afeec8021f14f0a56e6ea015e5148c245ad960db7d544a2c5b8e2e33d682ee5ae5b00a6384d303494f3430933a3bb
 AUX gerbv-2.7.0-fno-common-gcc10.patch 526 BLAKE2B cceab2910ada8bde66987e403bdf765e98b62bda66cbd46ee50705c6be539e971eb7e0420b261b97ef3dbb6e0280fb351e425f2b4391bc1cd3af91ee0ba1251f SHA512 fba1f40ac844268f2d81ee63c04509a64cd9b016c0fe3dd8736c3a4faa3727e5ac9a9f6c0bba5a8d4f5362e701a33c1dbc93409dec630896ad06c80dcc5f13a3
-DIST gerbv-2.6.0.tar.gz 2346299 BLAKE2B 2b7a4293289e460f5b06f802d9ad779021a519d6ec702ea4b27df1e6a06d6779ae41fbd9aae6f0c83f9ea61fc9369dbc6aaa8d29326a9d5d139ab89a40f050f0 SHA512 a2d7601b44c8ed16a89d18713f451c0298bee65e2ea76b87e3d9d573af63d3b57758cb7cfcfb2177a22aecc7d9fdaaca3d369ea051446651af4dc542065a4377
-DIST gerbv-2.6.1.tar.gz 4432481 BLAKE2B 022214846077a4fea56848fbc63096857a8a782b3469c2293567e4927b904cf59a36d5d2b2adc0be7bc395a17c615af58a231f68a8f1dbedcb77cafc55ceb849 SHA512 cbf4ce4fd2b401d65ffc6bb5a7f9da0e6fa31cb3f754ea12092c86f197c72c833805eb395562b286f6d03c2eb38e363b649f8aa1040a6207baf975fa15e48b29
 DIST gerbv-2.7.0.tar.gz 5691407 BLAKE2B 458440dd69f20fee18ce09953c7403d783b2b7df1bf977e192b1ac877ebd9ed535ef7712417e112cff82d95e1c3752ae1dd4d88dfe14dea45df7c959337cb6ff SHA512 a940de027a9cdfdc513b0740cb402d312ae33bb7f002f80ee5f3e800aa5d01b86ff277538d8a19a309d852e248b2c8136645ede2d5d33456e5bfb49336c1256e
-EBUILD gerbv-2.6.0.ebuild 1066 BLAKE2B 2511dac6ffaa1802a9d5e2b68c3e62c0f5d51e06340f575dca4f78c6cddeef0f631306bd97325343f96e9292764f0dcca149ce07dc1efaf0b462bb3e8ecfe3ca SHA512 76a62c8201c33c26bcba495d7ab38f317e1f2f29d696b466a188d22a21a3973c758738540a18daa8a236ee0879bbaac086c4245d6e0dccfd14f9059e447a832f
-EBUILD gerbv-2.6.1.ebuild 1285 BLAKE2B 0db7241c736242863204876b0117d5f4ac7e02412b60cf960d3c4224f454c4d4b7b9e42c28dc3a3e4c2a1f4391ba8b32decd30a90c9ac231018f0944148a5169 SHA512 decefc9c39ed6f078f334bbeb9c66dfd947a7c7e1aa0da4301ffed24371be56c31c907174b61ed22e1c6109a36ca15360773cdb4caec8cd8a23c7dd3ac95eb56
-EBUILD gerbv-2.7.0.ebuild 1045 BLAKE2B 9e162ac3b85f2ac346498cf9685772919e2535973525d3cfd6068ce97c0bb63fec6490206e3eeaaf2330b46d90aeb17307ff34824affec3630b174947d391b12 SHA512 47a579ba19402e2fa8812501d0752aee56b7cb6edb13d52f5b203c596c354dbd5687855ba14ed5446e77b1cf262b8a9a5ddeb333520ec2fd94dd5631f9aee028
+EBUILD gerbv-2.7.0.ebuild 1043 BLAKE2B c45330111e1989ab50b8dfe903e917b9db13e3b944bf6263221c939e7c94207ed32711c9ef3087374aa64e3b81e5bd516f002bbdedb06c95e7293cbc3823666c SHA512 c3abe4b3018e9b857b6cbaf3654e090ed29fe1738957af83aedbdb760f3cd1d4165d36356f3fc76c4778d26940d63843b6f41d25ea8bdb86b214720f07796d1c
 MISC metadata.xml 802 BLAKE2B c6db09de31370176bf6d1717c38b955f03037e24e322e20cfaac08747e403d146fc036358e4faeb81135b3e2dc3945da6a7d029a1256d0e26d3cd69c2afa0afc SHA512 cd322dbcdba34e76f450b4368e2a3eb63885726c09f8b8baad3137cc8e5e8e8537776fd776b86112b2fb71ae5720490dda586ca805e0ba8662744703eed25982
diff --git a/sci-electronics/gerbv/files/gerbv-2.6.1-ru.patch b/sci-electronics/gerbv/files/gerbv-2.6.1-ru.patch
deleted file mode 100644
index a56f34333919..000000000000
--- a/sci-electronics/gerbv/files/gerbv-2.6.1-ru.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/man/Makefile.am
-+++ b/man/Makefile.am
-@@ -19,8 +19,7 @@
- ##  along with this program; if not, write to the Free Software
- ##  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111 USA
- 
--man_MANS = gerbv.1 gerbv.ru.1
--PO_FILES= gerbv.ru.1.in.po
-+man_MANS = gerbv.1
- 
- MOSTLYCLEANFILES = *~
- CLEANFILES = *~  *.pot $(man_MANS)
diff --git a/sci-electronics/gerbv/gerbv-2.6.0.ebuild b/sci-electronics/gerbv/gerbv-2.6.0.ebuild
deleted file mode 100644
index e2618cd1f896..000000000000
--- a/sci-electronics/gerbv/gerbv-2.6.0.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="4"
-
-inherit fdo-mime
-
-DESCRIPTION="A RS-274X (Gerber) and NC drill (Excellon) file viewer"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://gerbv.geda-project.org/"
-
-IUSE="doc examples static-libs unit-mm"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="amd64 ppc x86"
-RESTRICT="test"
-
-RDEPEND="
-	x11-libs/gtk+:2
-	x11-libs/cairo"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_configure() {
-	econf \
-		$(use_enable unit-mm) \
-		--disable-update-desktop-database \
-		$(use_enable static-libs static)
-}
-
-src_install () {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS BUGS ChangeLog CONTRIBUTORS HACKING NEWS README* TODO
-
-	rm doc/Doxyfile.nopreprocessing
-	if use doc; then
-		find doc -name "Makefile*" -exec rm -f '{}' \;
-		dodoc -r doc/*
-	fi
-
-	if use examples; then
-		find example -name "Makefile*" -exec rm -f '{}' \;
-		dodoc -r example/*
-	fi
-}
-
-pkg_postinst() {
-	fdo-mime_desktop_database_update
-}
-
-pkg_postrm() {
-	fdo-mime_desktop_database_update
-}
diff --git a/sci-electronics/gerbv/gerbv-2.6.1.ebuild b/sci-electronics/gerbv/gerbv-2.6.1.ebuild
deleted file mode 100644
index 87f4879d8345..000000000000
--- a/sci-electronics/gerbv/gerbv-2.6.1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-inherit autotools eutils gnome2-utils xdg-utils
-
-DESCRIPTION="A RS-274X (Gerber) and NC drill (Excellon) file viewer"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-HOMEPAGE="http://gerbv.geda-project.org/"
-
-IUSE="doc examples static-libs unit-mm"
-SLOT="0"
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~ppc ~x86"
-RESTRICT="test"
-
-RDEPEND="
-	x11-libs/gtk+:2
-	x11-libs/cairo"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-src_prepare() {
-	# No Russian translation shipped
-	echo > po/LINGUAS || die
-	eapply "${FILESDIR}"/${P}-ru.patch
-
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		$(use_enable unit-mm) \
-		--disable-update-desktop-database
-}
-
-src_install () {
-	default
-
-	dodoc AUTHORS BUGS ChangeLog CONTRIBUTORS HACKING NEWS README* TODO
-
-	rm doc/Doxyfile.nopreprocessing
-	if use doc; then
-		find doc -name "Makefile*" -exec rm -f '{}' \;
-		dodoc -r doc/*
-	fi
-
-	if use examples; then
-		find example -name "Makefile*" -exec rm -f '{}' \;
-		dodoc -r example/*
-	fi
-
-	prune_libtool_files
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	gnome2_icon_cache_update
-}
diff --git a/sci-electronics/gerbv/gerbv-2.7.0.ebuild b/sci-electronics/gerbv/gerbv-2.7.0.ebuild
index 48379be86259..82242e80810c 100644
--- a/sci-electronics/gerbv/gerbv-2.7.0.ebuild
+++ b/sci-electronics/gerbv/gerbv-2.7.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ~ppc x86"
 IUSE="doc examples unit-mm"
 RESTRICT="test"
 
diff --git a/sci-electronics/gresistor/Manifest b/sci-electronics/gresistor/Manifest
index 826eb654a445..1086b1fe9450 100644
--- a/sci-electronics/gresistor/Manifest
+++ b/sci-electronics/gresistor/Manifest
@@ -1,4 +1,4 @@
 AUX SimpleGladeApp.py 11794 BLAKE2B 5b6fb7dbd376031fd551eb7762d7f12a8b4451bbc710310f51c21f0ddca20d5c5b78d04329a70b65fdfdd2d8e4c2956273857c82a8091fb858699f40b0b162fe SHA512 d6eb78b2e138d5b0813b993177106bc3713172ca65a7561584eea314053bc49e27fa784465ca87fa678d65382252bffda733a4c3e846f6161bd4dffa01e83d36
 DIST gresistor-0.0.2.tar.gz 10240 BLAKE2B d3b624c7e7abdbbe40d978b507f0b66d464aa6836e96d1b1c78a37b8365dfda451cf5051192fd2f3fd15a75d092c4bfb81fe0e6c0f087dc4a175603da6df47a3 SHA512 263483f5712a48f2095bddf620520233e2843c64c1a03a7924cecb856de8fdcac601100cda4dc9f1943ff7753ffaaab04e25032416dd9438fe3f17d7d6681072
-EBUILD gresistor-0.0.2.ebuild 798 BLAKE2B 524612c627280f61fb90b86a4854a060ae5321b09eb40a2699e231509fb91ea2564e7da799e5ae006525053182393fe7c6b94a466ff7f30941f2c3bb2b504e70 SHA512 efddc7d7db534f820c5cf193c976652dd5ae01707877908d730356a0f0dceca690ad45263e946c37bc52e3d611529d203b03e5e47cf4954cca75a17a28d8e66c
+EBUILD gresistor-0.0.2-r1.ebuild 838 BLAKE2B 06fef921db4742b57f85f9576715b91ff50e052afcc38090b81e153bea3b028cd67873f0c3d48c68128f8fa2782003e7e5091d842a6e00632d96c0ab24c7b103 SHA512 9c73da2c7f861f054e2bf28d57929ff43acbc60ab6d7507cfd9c442dd1b8cd0490dc24a66b4e6fa631e66781237554ab10b51b42e4f5a741ad53d7c64e3604f1
 MISC metadata.xml 246 BLAKE2B d696d8b94de8a32ca51bbce05b1aad9b9fb3b14355f8b2a6560ee719e21bcaa9cd32e764911bf652224bd2a7009c1ac4a5ad948b88cc4e1e5c01d0889a668151 SHA512 b0fee99b0b02e57eca1c4f80ac656743e02b333842779dbc3ce8a988d2d0fea788a867aa55a9b7fc49f8724594848e5d164b7f41edc8bb2e9d178c3b52792667
diff --git a/sci-electronics/gresistor/gresistor-0.0.2.ebuild b/sci-electronics/gresistor/gresistor-0.0.2-r1.ebuild
index fa0b5112d491..1a626f02b108 100644
--- a/sci-electronics/gresistor/gresistor-0.0.2.ebuild
+++ b/sci-electronics/gresistor/gresistor-0.0.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -18,9 +18,11 @@ KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND="
-	dev-python/pygtk:2[${PYTHON_USEDEP}]
-	x11-libs/gtk+:2
-	gnome-base/libglade:2.0[${PYTHON_USEDEP}]"
+	$(python_gen_cond_dep '
+		dev-python/pygtk:2[${PYTHON_MULTI_USEDEP}]
+	')
+	gnome-base/libglade:2.0[${PYTHON_SINGLE_USEDEP}]
+	x11-libs/gtk+:2"
 RDEPEND="${DEPEND}"
 
 src_prepare() {
diff --git a/sci-electronics/kicad/Manifest b/sci-electronics/kicad/Manifest
index 72e81b6ce0a1..54e1c28740a1 100644
--- a/sci-electronics/kicad/Manifest
+++ b/sci-electronics/kicad/Manifest
@@ -17,10 +17,10 @@ DIST kicad-5.1.4.tar.xz 14198672 BLAKE2B 99d317df6f2446611614c8d4294b4f8ff81082d
 DIST kicad-5.1.5.tar.xz 14203632 BLAKE2B cda7bf95c8edbddd36489f299dca9393ee51658e828f7e9f37bfa56955924785186908b0d8c91ae3e895f15cdba50c7579cf7a450e525f4a2ba215a721df26dd SHA512 5ca19e219da07a906f13e236849eb4497c9f827726a5cd13aceffe1d8c7dee480823bf3e949527f59a805eb3b8176fad51576ae663dd07b10e2822f2b37866a5
 DIST kicad-footprints-4.0.7.tar.gz 4758012 BLAKE2B ca7ddcad3d1ca658d0d5b7c0a4a0e9a3906619bdbf14195b3bd14c528c01b6e9c1f185036ad495fc88a33a53040ae4d338230d8b2bbb598a69a1c07ddfec3cce SHA512 9ba08f528d4b3fa6f165a20333ad2e0f6bc4165b51da77bdb080ad2c8cc12c029927ddb2f6aa669b4dac5fac52b8bdbec803d1b7b3fc639e9481bb866b8e3d6f
 DIST kicad-library-4.0.7.tar.gz 475804416 BLAKE2B 0d6df1df7a72258e896552551996ff13e985976e03b6aafbe900dcc04c9b8eb6e5c1abc242ae5020c1bd20b51e9cc1e60f520b478954edcb6368db7f9ee46df0 SHA512 c5365e18e806102aace785895259deca708a61e0ce37262f5ee2482a8a1f86bc9ce1d37e0fb63cb0661bd5c71064ac36ca2260c9c02ed9790744eedd0a5b5360
-EBUILD kicad-4.0.7.ebuild 6660 BLAKE2B 01d74a7d0953864d95605db9646457ed92a68552bec80ef5d8ada67800dedf5b7c49c467d75897eee4b05ab5ea37cb13c5dbf88f9cc31195963c65ae9d22b9d5 SHA512 944610406b0f01930142fb8cdc7aa6a9e2aa0d733db9b2cc7a7e8a0eee3acbfc165a462c88efe2146c0e6192ef4a8a6560bc4786306da94d5731f06607ac3754
-EBUILD kicad-5.0.1.ebuild 3470 BLAKE2B ba72236bf9f3cc2b54d88bde68d529f9ee826f78aee2a8c2f5ad234d18bab2d36c76f7f51a6192dd63b2925081a614ba94d29155e280e91a9ecfb4063392a682 SHA512 5b8070be9d7fca9f95a138dc81b2ec5eabee8c970da129c5efcf61806310e235e2fc3339a0ecd8108e8b030af09aff5970894893c49a3414f76d5dd3784ffbe3
-EBUILD kicad-5.1.0-r1.ebuild 3547 BLAKE2B f8fe35fce1d7a6f27d807483e96eb2986dc79601313762fc5f340bb32e9841572f4fa27fb9152b41f77db72b724b815dd2c32775b734995e987b7eea7bba15af SHA512 6c7205cdbd66bf6f52aea0906ff9f22884154b3499c95aae28eb9fd3b004ec2b62584ead6a4c0a4c73ca6bc161551516b6af311a67640a339ec2b120319c36a0
-EBUILD kicad-5.1.2-r1.ebuild 3623 BLAKE2B 76621467d79af219a63784e9147fcb76ff474bafd79d958e22a80e747e9a48845844df626fd3f34acc46a25ac498a4f7884a5a513a10156e8975a532531868ec SHA512 67cc9e308c5535da54b6e765be5e77c8dd0fcf7501887a04fbf649bd46b07a3dcf5b8beef916ff1e9649475d7169d1c2cfa1e2c6db870215b3002071519d6acc
-EBUILD kicad-5.1.4.ebuild 3587 BLAKE2B 1acd2ae60530e70c734bcaf97a831d4ccf5d9270f7818974939a32f69c44e752a7d3b0a09bdf3210f4f3f6e5ef1c4d568500f7783fbe6e123d1a5772fd4bfafd SHA512 0c5be7637cc9383f61a080bf91de4c5babda0b11658cbd7e43d0fb936f8105b344346f95ab2fc4a190702aa34eec49a63e6435c8514b67d469c4a2c379934c95
-EBUILD kicad-5.1.5.ebuild 3558 BLAKE2B 7a8680f1cdf6ac6d740c8045e9d2ba5e149ba75a39bb2bc3d35e53b4d528da2aee6c1c3cf8caf38835b602f547eee766ea02472d7b958bee06534d6b03a1b089 SHA512 933e6571e81f07ba3c3bbe20bc1990e9b587f8f9ead8541fe0c40356ee7580a9b9f19f9537043d70accb5f4a627b8781865cb44f948bdf429953382e42b2be0e
+EBUILD kicad-4.0.7-r1.ebuild 6708 BLAKE2B 9c1b70aaa068b9d874ee8f84c8bd79b849a02a91577c43e5b27881b856579248d56de03299300a900e9583d0f2d639ca15e150382236671521f690769c1cce2b SHA512 f2f426f0936148dd8a1d46f81be89cdbbdacf4e363755848bc06f2742600f92e39ab8438a825c1180f2811d9689161fb203e1f49457d7b2a8630a042e604e1c4
+EBUILD kicad-5.0.1.ebuild 3518 BLAKE2B 15af18ad991caad4460be0cf829db0976a94e4fabce761f7b7818114af96043a75d1da0ec678a707a975a114a94d32140806543742a21f8f835633b5e13ccdff SHA512 81425f12c0d9af2539d7d1cff5315981a3bb35d8e542b8cd7ac0e1a1bd25f7ac8273d3c5057de8987ab3351f40cc8f894d66aad75aa6e709c9bbcd03d45f72ca
+EBUILD kicad-5.1.0-r1.ebuild 3595 BLAKE2B f984c162f1428611d095d59e50a0c8b59b4c8d45b7eb2e5b2db3c19839afbc641a4d2fe12679885a11ba3b9153187cde10e2f357d3a3152b4e29f241f8e297a2 SHA512 0789cdbeb5c9b9a15b64747da7b9ac5e35137e04575b8892d3f3cb0b703081f039c779d616d9ee9b865872fc4d94f42c4cf9e1c502a4a42c1441903e85ea1e2c
+EBUILD kicad-5.1.2-r1.ebuild 3671 BLAKE2B 6d616a76af85f50bcdcd4ba41309bb751d1f6473ab80a324d7ba1605dd03058a905d35b9c33191e3e8f0947a543c9d81d237f26283fda497c3be7ab76e220f47 SHA512 da8bac8636848543650a31bc5a9f5393c0777aefb34155e77b909027349d3a6847587611d8c217069e91a84c9738d3713df7a450b418293cf9da93dc7c366296
+EBUILD kicad-5.1.4.ebuild 3635 BLAKE2B 2490a6ff3792c72d40f46a068fa6af55f5621e0e5149856653a43737ea3fb9659b0d878a31bbd1baa5f682cbca2a508bbff09b610e8ced2d66e9d54e130e17d8 SHA512 fd2481a4b79a589bbec56ebae97a418aa21871e9b6398d4f902136e9048701170956e8da76b795b76176006236463a64a983faca816c77a2603c1d697767108d
+EBUILD kicad-5.1.5-r1.ebuild 3649 BLAKE2B da171ac440addee60f742f61adb8d0a980e7ac131489cd9dbe7f2a556e07ad5897fabb2c644a0999392ba0bd0ef79bbd62d7920075e0e10a47aa95d33684e56c SHA512 ad484976d8e9fba7345f1c0aa7324239225987ec800671a949654227fc4482387920cbf5dd1144ae8d40b4c019a9218b3e506650fa7b40d2a723b8469ab52b28
 MISC metadata.xml 1181 BLAKE2B dadb380f3a2c422a93f349ede59cd4a6bf03dac69306357df08ef88931f76329669e5713f741507ce37ec4bb10445351ed293ed13174ed38de6c284e2234e2f8 SHA512 60c76ec7d665f273fb538c10e4993ac6d30c567d9cb8c0c862175c63a59d45cc9fdeacbb2ba6a3cff12e722124ef6c7466828ea792ddd405c587bd0bac65472c
diff --git a/sci-electronics/kicad/kicad-4.0.7.ebuild b/sci-electronics/kicad/kicad-4.0.7-r1.ebuild
index 624172e8994a..a85b949bc42d 100644
--- a/sci-electronics/kicad/kicad-4.0.7.ebuild
+++ b/sci-electronics/kicad/kicad-4.0.7-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -33,11 +33,13 @@ REQUIRED_USE="
 	python? ( ${PYTHON_REQUIRED_USE} )"
 
 COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl]
-	python? (
-		dev-python/wxpython:${WX_GTK_VER}[opengl,${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	>=dev-libs/boost-1.61:=[context,nls,threads,python?,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep "
+		python? (
+			dev-python/wxpython:${WX_GTK_VER}[opengl,\${PYTHON_MULTI_USEDEP}]
+			${PYTHON_DEPS}
+		)
+		>=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}]
+	")
 	github? (
 		libressl? ( dev-libs/libressl:0= )
 		!libressl? ( dev-libs/openssl:0= )
diff --git a/sci-electronics/kicad/kicad-5.0.1.ebuild b/sci-electronics/kicad/kicad-5.0.1.ebuild
index a9f2e30229b2..cb1d50631ac0 100644
--- a/sci-electronics/kicad/kicad-5.0.1.ebuild
+++ b/sci-electronics/kicad/kicad-5.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -23,11 +23,13 @@ REQUIRED_USE="
 "
 
 COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl]
-	python? (
-		dev-python/wxpython:${WX_GTK_VER}[opengl,${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	>=dev-libs/boost-1.61:=[context,nls,threads,python?,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep "
+		python? (
+			dev-python/wxpython:${WX_GTK_VER}[opengl,\${PYTHON_MULTI_USEDEP}]
+			${PYTHON_DEPS}
+		)
+		>=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}]
+	")
 	github? ( net-misc/curl:=[ssl] )
 	media-libs/glew:0=
 	media-libs/glm
diff --git a/sci-electronics/kicad/kicad-5.1.0-r1.ebuild b/sci-electronics/kicad/kicad-5.1.0-r1.ebuild
index 6646e63fac8c..8c93a13852a0 100644
--- a/sci-electronics/kicad/kicad-5.1.0-r1.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Can switch to EAPI=7 when wxwidgets eclass also supports it
@@ -24,11 +24,13 @@ REQUIRED_USE="
 "
 
 COMMON_DEPEND=">=x11-libs/wxGTK-3.0.2:${WX_GTK_VER}[X,opengl]
-	python? (
-		dev-python/wxpython:${WX_GTK_VER}[opengl,${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	>=dev-libs/boost-1.61:=[context,nls,threads,python?,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep "
+		python? (
+			dev-python/wxpython:${WX_GTK_VER}[opengl,\${PYTHON_MULTI_USEDEP}]
+			${PYTHON_DEPS}
+		)
+		>=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}]
+	")
 	github? ( net-misc/curl:=[ssl] )
 	media-libs/glew:0=
 	media-libs/glm
diff --git a/sci-electronics/kicad/kicad-5.1.2-r1.ebuild b/sci-electronics/kicad/kicad-5.1.2-r1.ebuild
index eaf36e9596e6..377f42f962a0 100644
--- a/sci-electronics/kicad/kicad-5.1.2-r1.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.2-r1.ebuild
@@ -24,11 +24,13 @@ REQUIRED_USE="
 "
 
 COMMON_DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-	python? (
-		dev-python/wxpython:4.0[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	>=dev-libs/boost-1.61:=[context,nls,threads,python?,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep "
+		python? (
+			dev-python/wxpython:4.0[\${PYTHON_MULTI_USEDEP}]
+			${PYTHON_DEPS}
+		)
+		>=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}]
+	")
 	github? ( net-misc/curl:=[ssl] )
 	media-libs/glew:0=
 	media-libs/glm
diff --git a/sci-electronics/kicad/kicad-5.1.4.ebuild b/sci-electronics/kicad/kicad-5.1.4.ebuild
index b442e402be32..68c690312a8a 100644
--- a/sci-electronics/kicad/kicad-5.1.4.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.4.ebuild
@@ -24,11 +24,13 @@ REQUIRED_USE="
 "
 
 COMMON_DEPEND="x11-libs/wxGTK:${WX_GTK_VER}[X,opengl]
-	python? (
-		dev-python/wxpython:4.0[${PYTHON_USEDEP}]
-		${PYTHON_DEPS}
-	)
-	>=dev-libs/boost-1.61:=[context,nls,threads,python?,${PYTHON_USEDEP}]
+	$(python_gen_cond_dep "
+		python? (
+			dev-python/wxpython:4.0[\${PYTHON_MULTI_USEDEP}]
+			${PYTHON_DEPS}
+		)
+		>=dev-libs/boost-1.61:=[context,nls,threads,python?,\${PYTHON_MULTI_USEDEP}]
+	")
 	github? ( net-misc/curl:=[ssl] )
 	media-libs/glew:0=
 	>=media-libs/glm-0.9.9.1
diff --git a/sci-electronics/kicad/kicad-5.1.5.ebuild b/sci-electronics/kicad/kicad-5.1.5-r1.ebuild
index 46baaff613c7..af08ef9e488c 100644
--- a/sci-electronics/kicad/kicad-5.1.5.ebuild
+++ b/sci-electronics/kicad/kicad-5.1.5-r1.ebuild
@@ -24,7 +24,7 @@ REQUIRED_USE="
 "
 
 COMMON_DEPEND="
-	>=dev-libs/boost-1.61:=[context,nls,threads,python?,${PYTHON_USEDEP}]
+	>=dev-libs/boost-1.61:=[context,nls,threads]
 	media-libs/freeglut
 	media-libs/glew:0=
 	>=media-libs/glm-0.9.9.1
@@ -39,7 +39,10 @@ COMMON_DEPEND="
 	occ? ( >=sci-libs/opencascade-6.8.0:= )
 	oce? ( sci-libs/oce )
 	python? (
-		dev-python/wxpython:4.0[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			>=dev-libs/boost-1.61:=[context,nls,threads,python,${PYTHON_MULTI_USEDEP}]
+			dev-python/wxpython:4.0[${PYTHON_MULTI_USEDEP}]
+		')
 		${PYTHON_DEPS}
 	)
 "
diff --git a/sci-electronics/klayout/Manifest b/sci-electronics/klayout/Manifest
index 45e723b1e2fb..eca6f4ec1309 100644
--- a/sci-electronics/klayout/Manifest
+++ b/sci-electronics/klayout/Manifest
@@ -1,5 +1,5 @@
 AUX klayout-0.25.6-gcc8.patch 527 BLAKE2B bd9d1ebac1a4f4679f076a3bedb67b3a4fe040338e0d63a7e25e5fb523707b7525ab7a9088122c75aa0a16e34e6e262efe097f5f96ff6db72b1d5add8f7192c5 SHA512 3280052ef3d9caf78d716c8cfb6e33205bbd2c9543f52bfe28e5c23749b3bbf8ed59edf7bbc8b8a96753f0e90484dcaacaad39c4ccbc2bebe979520589589f46
 DIST klayout-0.25.6.tar.gz 21008915 BLAKE2B f5e06790b8eac682b61bf83dce167c4c9eb8767d6bfb040e203ed2ec43b39781e64203c8319bf58ed2f4b7b2349d958f24a7ad1957bc27befa583b00eeee650c SHA512 38d13bd6f0cef5685ef32ebf00edf07f588d445174e2a56320940a7036e65a3fbb11d1efab92af9f8abfce7e77c782df5f05460a7de4d98ade924c761396db5a
-EBUILD klayout-0.25.6.ebuild 1725 BLAKE2B 1cec2e021fb73d23cad5f9935ed9c974a34cbef95dce54b3e1b824bcbb6a1b45581750cda2322c2fa72fc8b13d06f8c230c7338637e96d92546a4c68a163e26e SHA512 3e52b517b3ff2b3180f158fe9b9e859386099a8915ab9122f669befa99c4516ebc05798cac85ece87c0d994c5391acecfc51d52d343bcae7f977ef1b8e1198f8
-EBUILD klayout-9999.ebuild 1682 BLAKE2B dbc9613fad0800095aaf1880150e6e25c54bbac686045be38be569c5ac507a9f69c54937a3baa8a03da3cd938590a702cc017e27fe8dca62f0cc0efbacb16e22 SHA512 a5034592c74e6116fd41b43195599c598cee0e5e423769da13b44af76182a34a11e39656c11487ef55fb2cdaf11b33be7f371170ae99ef1517f02657b0ce86a5
+EBUILD klayout-0.25.6.ebuild 1719 BLAKE2B 08c62d695cf828e0c224cc5c8076750d9bba96e21c43f6a130c3714ff4b36cc0a4980c5928aec7a278a1a3c6e226ad550854274db6905ab892fe05d7353cd92a SHA512 ea824d3b5a719542f9042173874e8992728996f9c92d1b3d715ea4d3ad669005f1f896c3d173fa306034eb3371e9dacd7a25eb485065c5a06f98ff058a2b387f
+EBUILD klayout-9999.ebuild 1676 BLAKE2B fbb977111607d11901982da7f3fadef7a5154ed2e97f8f25adbe89033030d04546ec1ed2820ca29c933ce6aaa25d513324c1737b20e5bd5e86664da8bd366f8f SHA512 47b1277066a06b60eeccc433953bc9b77e236693378af9600df11b65d36d0f5555b0ae25943ab7761a28ef8ddefc5669996869f81a1d4c5baaf35340099792cb
 MISC metadata.xml 380 BLAKE2B 3961dc3b4b0a6f3de5460e01e434f8ba1e4504247aac8cb40553d0752ece4f4be7e9d5fefee9d61e85681631eb200959b341c6aeda60b89c14119f95a40f4aa6 SHA512 92ee6b53a7dfed04d5a2aef510e0f2f0dcc70903258d5d4cb6ee497521cbb41214b7a45000693a0ecb66029767a48988c45b9b7fb78a09dc813710a9283d2f7d
diff --git a/sci-electronics/klayout/klayout-0.25.6.ebuild b/sci-electronics/klayout/klayout-0.25.6.ebuild
index b9f915b651d4..be589a0f90ec 100644
--- a/sci-electronics/klayout/klayout-0.25.6.ebuild
+++ b/sci-electronics/klayout/klayout-0.25.6.ebuild
@@ -7,7 +7,7 @@ RUBY_OPTIONAL=no
 USE_RUBY="ruby24"
 # note: define maximally ONE implementation here
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit toolchain-funcs python-single-r1 ruby-ng
 
diff --git a/sci-electronics/klayout/klayout-9999.ebuild b/sci-electronics/klayout/klayout-9999.ebuild
index 12de746331fe..3419a02b2be3 100644
--- a/sci-electronics/klayout/klayout-9999.ebuild
+++ b/sci-electronics/klayout/klayout-9999.ebuild
@@ -7,7 +7,7 @@ RUBY_OPTIONAL=no
 USE_RUBY="ruby24"
 # note: define maximally ONE implementation here
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 
 inherit toolchain-funcs python-single-r1 ruby-ng
 
diff --git a/sci-electronics/pcb/Manifest b/sci-electronics/pcb/Manifest
index 6b49ebd1d394..4f4ec9e4e744 100644
--- a/sci-electronics/pcb/Manifest
+++ b/sci-electronics/pcb/Manifest
@@ -1,11 +1,4 @@
-AUX pcb-20110918-fix-config.diff 466 BLAKE2B e9dfc32fee936846c1e91a52b4fb2ae07e16b0d592eef80756d49f72500f04e89fcc8d7b3163308c41385117f66d765fec4de2fcd13246842b11ca4909587c60 SHA512 9bfb0cd28e3c87eba91ee2a226a75128e4a0df37f79ebb10e4f34880d1f32d3cee17fc9f3ba6f553b6ed018a521efcecc583e75d82e8549d91cbab2a1280aa0c
-AUX pcb-4.0.2-doc.diff 368 BLAKE2B b45d661583ef68b3a40cc203fbfaf91f275a29a8374cce4bb7870e05addfa34bb5b5e3db9bb4b8ffaa6d1b107f9029782f3e44dbb2a9011876c49f5425ad1154 SHA512 8a6f68e8e4799244ed12a11ae4092aa3ce02786481adc02abf1622f08f5e5406cbc05a172da9ebbb646a20cf77a722536f31da7c1fe95579dc0cb0c19e7c496b
-AUX pcb-4.0.2-tests.diff 386 BLAKE2B 12f6d3e190d49549569e99f6e421c9492b0fe1a55c02f206388dd6eb4208e481a7b865fa46e67e25cecb8bcc51a2b3070e17cf28f9f0e25d2484a9c9285b0db3 SHA512 a589c1f01b55d48a1fa2af4a764103a8dbb146c4dcb409ba88298ce011ecc26160a5275fd69e58b29b3dbc2773c80ef9ed86570ac53cc649bc969cb6a0262f55
 AUX pcb-4.2.2-fix-autotools.patch 1182 BLAKE2B 627b48ae5ec4cf50a060c95ca13758000837e808aa1eb84ac9ab205d8b438cbe50f428b1c7100e6aad043eaefaa0a32e8797e08a05bfc9345d005199b05f3cf3 SHA512 9c3c1fc4d7e71920e0f06bdc4961ea3cecb7aa27f726f9851e2a69d1aea17a761eca71362a444815956df10338c7b985440d1f4c50a6531597687080ac8bd600
-DIST pcb-20140316.tar.gz 4210077 BLAKE2B a0a676bc0eaedd269644d7f7e6d6d443c4ca1a66aba4db18a0aea33edef2dbd84d7a027a25c310bce9d309c46b63ac4f1b807587f5064ce81aadaea2f675521b SHA512 5b9a2704b4d3c95f03afad0fe8fb5414b2aa9d680e40bf77ad9b46a9d4e14ba740858092794a9ff6788f31ac19063b126d8ceed6316c0d9eaaaa574e6678c071
-DIST pcb-4.0.2.tar.gz 4762521 BLAKE2B 3bae7983c84a79edc882b822b91e94adc00ec4e9b329719a0a15599bb12a6771318844ffbd6163b3c646be8410af1964d59b523fffaebd690af2cce9b4f0f98e SHA512 8bca9bdbdd640174e82e9cf1a457f9ef3f9b7c3f1d957a21c3bb07e50134b83504d85f312e429bed90bfc58f786b4319ffb69c5637ed4fd69a0312e11c6ad30b
 DIST pcb-4.2.2.tar.gz 5182807 BLAKE2B e2a9ab7fdeb402d9d07717fbc2ad4b31594aada95693c2a7046c73364a43591ee1a537f0cbda67bf46e39d53c61a454f146963fe14a4661fe2ffbc11c2eab99f SHA512 c76fc053fbb0a8a9b7aef494a37d3587efaa2023affd32c3cce895632a7e68fbb85f8862cff8349c7d281365379c07a5471c9467c5977a7aa053a83fc6499c55
-EBUILD pcb-0_p20140316.ebuild 4150 BLAKE2B 9bb721a281078b53a31ba4ac460092031f2aff7f010f62f02a2452ffb459ea6a83a0d3651dce7501a857c7be7fea55a68a55e3bd1d2a62eac703ab2915d8d755 SHA512 9f1fa2992155c46591f4ce31cff51ac1452c9420128fee0e3eaa0cae4dc48e5f03750b0a3388047cf595ed623d5925bb63983bf1d6d09b47e31fbfe28c762040
-EBUILD pcb-4.0.2.ebuild 3981 BLAKE2B 904c79d5cccec4d4e717ba1599d83750e3ec804e88472f4ceb67439ea5f95be8806539c2e0f5638b16338b11bf0c51e475ae9e2731e5d316ba3bb238aaef2b23 SHA512 8f4dca30a2931fcb080abb540c1da36c3f5e610f42730280eed6c5d02f2240ee9122b5a4663dfeaa0491bc33383b9a27a61f4f5db704b39fa53f05a0ed843a81
-EBUILD pcb-4.2.2.ebuild 2759 BLAKE2B c94577e9478005aa261d63fa44cf5e7f410d66d3216de7e061f28ce56907d70e269f6b0e64db76b858dc241b092bb3d9544c984a3a2143459fcb6c3f3ecaf21a SHA512 b7523f2fef8171c7194f827142e72edd1cba47227cd05617c71c6b534200b24eb04a1022639e88f572d8621259e3f55b77f3657f713758327796427c46a060e5
-MISC metadata.xml 1075 BLAKE2B 8ee38af92e19a45d50f13f9b4967816011fb7b97a5d1259d4f5bb0c8e6d5a7e0570e814b71802af65ecbf460de9f9ce553faa7c3cc3db9a54738f852d9032f73 SHA512 318bf4eaa10916d3a827595dd95da0abe9832f75e237e3be957a4c9019c525d7754bcc20d34f9b54c2692d53bb1cffbd02746f4d66c029cde1662181ae3d670c
+EBUILD pcb-4.2.2.ebuild 2757 BLAKE2B 80e1258671b8449ce32bb8cd58c08655eb35987783f677438f1da4a74881300383294f74e20e708aebc0756d59fe543c6e994e38afc196af60037145e9e489a1 SHA512 5bfeceda8a1306e64dccffc4a4ece48c297eb85c36b80311088e8007b24e18d26af7d6c1c015658ceea6f0d3d33b3dcca9e6448d1d42f3b8b8c329d6a7e623ba
+MISC metadata.xml 999 BLAKE2B 8bb8c575d1dabb137081bc12dff4e91c5bef1ff1e83e9aa11f241fc1ed7a1c44fdfcc7812f5476c8774ed5604033cddf05b948fa489384f483c80a84f134caca SHA512 162270942f0fd924729909a2e1f5e24d0433fbebfa1f9e08deff2b14a802e92a4fd839e3cc5bfb8c3175c23e874c43253166213b5397bf6e49f862aa481e83f4
diff --git a/sci-electronics/pcb/files/pcb-20110918-fix-config.diff b/sci-electronics/pcb/files/pcb-20110918-fix-config.diff
deleted file mode 100644
index 86ac7c3aad40..000000000000
--- a/sci-electronics/pcb/files/pcb-20110918-fix-config.diff
+++ /dev/null
@@ -1,14 +0,0 @@
---- configure.ac.old	2012-03-11 17:02:27.000000000 +0100
-+++ configure.ac	2012-03-11 17:02:37.000000000 +0100
-@@ -1252,11 +1252,6 @@
- if test -d $srcdir/doc; then
-    AC_CONFIG_FILES(doc/Makefile)
- fi
--if test -d $srcdir/doc/gs; then
--   AC_CONFIG_FILES(doc/gs/Makefile)
--   AC_CONFIG_FILES(doc/gs/gafrc)
--   AC_CONFIG_FILES(doc/gs/gschemrc)
--fi
- if test -d $srcdir/example; then
-    AC_CONFIG_FILES(example/Makefile)
-    AC_CONFIG_FILES(example/libraries/Makefile)
diff --git a/sci-electronics/pcb/files/pcb-4.0.2-doc.diff b/sci-electronics/pcb/files/pcb-4.0.2-doc.diff
deleted file mode 100644
index 78f0a05e35ed..000000000000
--- a/sci-electronics/pcb/files/pcb-4.0.2-doc.diff
+++ /dev/null
@@ -1,12 +0,0 @@
---- configure.ac.orig	2017-12-23 08:35:07.079096342 +0000
-+++ configure.ac	2017-12-23 08:35:36.903643912 +0000
-@@ -7,6 +7,9 @@
- AC_GNU_SOURCE
- AC_CONFIG_HEADERS([config.h])
- 
-+# avoid rebuilding documentation
-+AM_MAINTAINER_MODE
-+
- ##########################################################################
- #
- # Try to figure out if we are building from git sources.
diff --git a/sci-electronics/pcb/files/pcb-4.0.2-tests.diff b/sci-electronics/pcb/files/pcb-4.0.2-tests.diff
deleted file mode 100644
index 9c6052ee7d73..000000000000
--- a/sci-electronics/pcb/files/pcb-4.0.2-tests.diff
+++ /dev/null
@@ -1,14 +0,0 @@
-# Do not count skipped tests as failed (bug #642366)
---- tests/run_tests.sh.orig	2017-12-28 16:40:57.657366187 +0100
-+++ tests/run_tests.sh	2017-12-28 16:42:57.183392063 +0100
-@@ -842,8 +842,9 @@
- show_sep
- echo "Passed $pass, failed $fail, skipped $skip out of $tot tests."
- 
-+sum=`expr $skip + $pass`
- rc=0
--if test $pass -ne $tot ; then
-+if test $sum -ne $tot ; then
-     rc=1
- fi
- 
diff --git a/sci-electronics/pcb/metadata.xml b/sci-electronics/pcb/metadata.xml
index 2ab5e9e2afd5..edc93e050afe 100644
--- a/sci-electronics/pcb/metadata.xml
+++ b/sci-electronics/pcb/metadata.xml
@@ -17,7 +17,6 @@
 		<flag name="gcode">gcode file export</flag>
 		<flag name="gsvit">GSvit file export</flag>
 		<flag name="tk">Build tcl/tk graphical QFP footprint generator</flag>
-		<flag name="xrender">Translucent PCB display for Motif/Lesstif GUI</flag>
 		<flag name="m4lib-png">Enable creating png previews for the m4 library</flag>
 		<flag name="toporouter">Build toporouter</flag>
 	</use>
diff --git a/sci-electronics/pcb/pcb-0_p20140316.ebuild b/sci-electronics/pcb/pcb-0_p20140316.ebuild
deleted file mode 100644
index 24b400cffc4b..000000000000
--- a/sci-electronics/pcb/pcb-0_p20140316.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools eutils xdg-utils gnome2-utils toolchain-funcs
-
-DESCRIPTION="GPL Electronic Design Automation: Printed Circuit Board editor"
-HOMEPAGE="http://pcb.geda-project.org/"
-SRC_URI="mirror://sourceforge/pcb/pcb/${P/0_p/}/${P/0_p/}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86 ~x86-macos"
-IUSE="dbus debug doc gcode gif gtk jpeg m4lib-png motif nelma opengl png
-test tk toporouter xrender"
-# toporouter-output USE flag removed, there seems to be no result
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-libs/glib:2
-	gif? ( >=media-libs/gd-2.0.23 )
-	gtk? ( x11-libs/gtk+:2 x11-libs/pango
-		x11-libs/gtkglext
-		dbus? ( sys-apps/dbus ) )
-	jpeg? ( >=media-libs/gd-2.0.23[jpeg] )
-	motif? ( !gtk? (
-		>=x11-libs/motif-2.3:0
-		dbus? ( sys-apps/dbus )
-		xrender? ( >=x11-libs/libXrender-0.9 ) ) )
-	nelma? ( >=media-libs/gd-2.0.23[png] )
-	opengl? ( virtual/opengl )
-	gcode? ( >=media-libs/gd-2.0.23[png] )
-	virtual/libintl
-	png? ( >=media-libs/gd-2.0.23[png] )
-	m4lib-png? ( >=media-libs/gd-2.0.23[png] )
-	tk? ( >=dev-lang/tk-8:0 )"
-#toporouter-output? ( x11-libs/cairo )
-
-DEPEND="${CDEPEND}
-	test? (
-		sci-electronics/gerbv
-		virtual/imagemagick-tools
-	)
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-RDEPEND="${CDEPEND}
-	sci-electronics/electronics-menu"
-
-DOCS="AUTHORS README NEWS ChangeLog"
-
-S="${WORKDIR}/${P/0_p/}"
-
-pkg_setup() {
-	if use gtk && use motif; then
-		elog "Can only build for GTK+ or Motif/Lesstif GUI. GTK+ has priority."
-	fi
-	if !(use gtk || use motif); then
-		elog "Building without GUI, make sure you know what you are doing."
-	fi
-	if use dbus && !(use gtk || use motif); then
-		elog "dbus needs GTK or Motif/Lesstif GUI. Try USE=-dbus or USE=gtk or USE=motif."
-	fi
-	if use opengl && !(use gtk); then
-		elog "GL drawing needs GTK"
-	fi
-	if (use gtk || (! use gtk && ! use motif)) &&  (use xrender); then
-		elog "The XRender extension is only usable with the Motif/Lesstif GUI."
-	fi
-}
-
-src_prepare() {
-	if use test; then
-		# adapt the list of tests to run according to USE flag settings
-		if ! use png; then
-			sed -i '/^hid_png/d' tests/tests.list || die
-		fi
-		if ! use gcode; then
-			sed -i '/^hid_gcode/d' tests/tests.list || die
-		fi
-	fi
-	# Backport from upstream
-	# http://git.geda-project.org/pcb/commit/?id=a34b40add60310a51780f359cc90d9c5ee75752c
-	# (do not install static GTS library)
-	sed -i -e 's/lib_LIBRARIES/noinst_LIBRARIES/' -e 's/include_HEADERS/noinst_HEADERS/' gts/Makefile.am || die
-
-	# fix bad syntax in Makefile.am and configure.ac before running eautoreconf
-	sed -i -e 's/:=/=/' Makefile.am || die
-	epatch "${FILESDIR}"/${PN}-20110918-fix-config.diff
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use gtk ; then
-		myconf="--with-gui=gtk $(use_enable dbus) $(use_enable opengl gl) --disable-xrender"
-	elif use motif ; then
-		myconf="--with-gui=lesstif $(use_enable dbus) $(use_enable xrender)"
-	else
-		myconf="--with-gui=batch --disable-xrender --disable-dbus"
-	fi
-
-	local exporters="bom gerber ps"
-	if (use png || use jpeg || use gif) ; then
-		exporters="${exporters} png"
-	fi
-	use nelma && exporters="${exporters} nelma"
-	use gcode && exporters="${exporters} gcode"
-	use tk || export WISH="${EPREFIX}/bin/true"
-
-	econf \
-		${myconf} \
-		$(use_enable doc) \
-		$(use_enable gif) \
-		$(use_enable jpeg) \
-		$(use_enable png) \
-		$(use_enable m4lib-png) \
-		$(use_enable toporouter) \
-		$(use_enable debug) \
-		--enable-nls \
-		--disable-toporouter-output \
-		--with-exporters="${exporters}" \
-		--disable-dependency-tracking \
-		--disable-rpath \
-		--disable-update-mime-database \
-		--disable-update-desktop-database \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-}
-# toporouter-output USE flag removed, there seems to be no result
-#		$(use_enable toporouter-output) \
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/sci-electronics/pcb/pcb-4.0.2.ebuild b/sci-electronics/pcb/pcb-4.0.2.ebuild
deleted file mode 100644
index fbed2457df40..000000000000
--- a/sci-electronics/pcb/pcb-4.0.2.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit autotools eutils xdg-utils gnome2-utils toolchain-funcs
-
-DESCRIPTION="GPL Electronic Design Automation: Printed Circuit Board editor"
-HOMEPAGE="http://pcb.geda-project.org/"
-SRC_URI="mirror://sourceforge/pcb/pcb/${P}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-macos"
-IUSE="dbus debug doc gcode gif gtk jpeg m4lib-png motif nelma opengl png
-test tk toporouter xrender"
-# toporouter-output USE flag removed, there seems to be no result
-RESTRICT="!test? ( test )"
-
-CDEPEND="dev-libs/glib:2
-	gif? ( media-libs/gd )
-	gtk? ( x11-libs/gtk+:2
-		x11-libs/pango
-		x11-libs/gtkglext
-		dbus? ( sys-apps/dbus ) )
-	jpeg? ( media-libs/gd[jpeg] )
-	motif? ( !gtk? (
-		>=x11-libs/motif-2.3:0
-		dbus? ( sys-apps/dbus )
-		xrender? ( >=x11-libs/libXrender-0.9 ) ) )
-	nelma? ( media-libs/gd[png] )
-	opengl? ( virtual/opengl )
-	gcode? ( media-libs/gd[png] )
-	virtual/libintl
-	png? ( media-libs/gd[png] )
-	m4lib-png? ( media-libs/gd[png] )
-	tk? ( >=dev-lang/tk-8:0 )"
-#toporouter-output? ( x11-libs/cairo )
-
-DEPEND="${CDEPEND}
-	test? (
-		sci-electronics/gerbv
-		virtual/imagemagick-tools
-	)
-	>=dev-util/intltool-0.35
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-RDEPEND="${CDEPEND}
-	sci-electronics/electronics-menu"
-
-DOCS="AUTHORS README NEWS ChangeLog"
-
-pkg_setup() {
-	if use gtk && use motif; then
-		elog "Can only build for GTK+ or Motif/Lesstif GUI. GTK+ has priority."
-	fi
-	if !(use gtk || use motif); then
-		elog "Building without GUI, make sure you know what you are doing."
-	fi
-	if use dbus && !(use gtk || use motif); then
-		elog "dbus needs GTK or Motif/Lesstif GUI. Try USE=-dbus or USE=gtk or USE=motif."
-	fi
-	if use opengl && !(use gtk); then
-		elog "GL drawing needs GTK"
-	fi
-	if (use gtk || (! use gtk && ! use motif)) &&  (use xrender); then
-		elog "The XRender extension is only usable with the Motif/Lesstif GUI."
-	fi
-}
-
-src_prepare() {
-	if use test; then
-		# adapt the list of tests to run according to USE flag settings
-		if ! use png; then
-			sed -i '/^hid_png/d' tests/tests.list || die
-		fi
-		if ! use gcode; then
-			sed -i '/^hid_gcode/d' tests/tests.list || die
-		fi
-		# fix wrong accounting of skipped and passed tests
-		epatch "${FILESDIR}"/${P}-tests.diff
-	fi
-
-	# fix bad syntax in Makefile.am and configure.ac before running eautoreconf
-	sed -i -e 's/:=/=/' Makefile.am || die
-	epatch "${FILESDIR}"/${PN}-20110918-fix-config.diff
-	# avoid rebuilding documentation
-	epatch "${FILESDIR}"/${PN}-4.0.2-doc.diff
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	if use gtk ; then
-		myconf="--with-gui=gtk $(use_enable dbus) $(use_enable opengl gl) --disable-xrender"
-	elif use motif ; then
-		myconf="--with-gui=lesstif $(use_enable dbus) $(use_enable xrender)"
-	else
-		myconf="--with-gui=batch --disable-xrender --disable-dbus"
-	fi
-
-	local exporters="bom gerber ps ipcd356"
-	if (use png || use jpeg || use gif) ; then
-		exporters="${exporters} png"
-	fi
-	use nelma && exporters="${exporters} nelma"
-	use gcode && exporters="${exporters} gcode"
-	use tk || export WISH="${EPREFIX}/bin/true"
-
-	econf \
-		${myconf} \
-		$(use_enable doc) \
-		$(use_enable gif) \
-		$(use_enable jpeg) \
-		$(use_enable png) \
-		$(use_enable m4lib-png) \
-		$(use_enable toporouter) \
-		$(use_enable debug) \
-		--enable-nls \
-		--disable-toporouter-output \
-		--with-exporters="${exporters}" \
-		--disable-dependency-tracking \
-		--disable-rpath \
-		--disable-update-mime-database \
-		--disable-update-desktop-database \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-}
-# toporouter-output USE flag removed, there seems to be no result
-#		$(use_enable toporouter-output) \
-
-src_compile() {
-	emake AR="$(tc-getAR)"
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	gnome2_icon_cache_update
-}
diff --git a/sci-electronics/pcb/pcb-4.2.2.ebuild b/sci-electronics/pcb/pcb-4.2.2.ebuild
index d7c8ac609fe0..4e23178926a3 100644
--- a/sci-electronics/pcb/pcb-4.2.2.ebuild
+++ b/sci-electronics/pcb/pcb-4.2.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/pcb/pcb/${P}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~x86-macos"
+KEYWORDS="amd64 ~ppc x86 ~x86-macos"
 IUSE="dbus doc gcode gif gsvit gui jpeg m4lib-png nelma png test tk toporouter"
 # toporouter-output USE flag removed, there seems to be no result
 RESTRICT="!test? ( test )"
diff --git a/sci-electronics/pulseview/Manifest b/sci-electronics/pulseview/Manifest
index bec348e3af34..60299ff1b4bc 100644
--- a/sci-electronics/pulseview/Manifest
+++ b/sci-electronics/pulseview/Manifest
@@ -1,4 +1,4 @@
 DIST pulseview-0.4.1.tar.gz 1342532 BLAKE2B 759779d4024df8f972fbed515764f17557014972abcb39d3942b411bfa78c6f97a89ee98b706adb51d240bdb738925546cec073f98ba829f1e325acaac892c01 SHA512 0bae4357be312bf6e997885270887a5bcc0a8dfb6914e63bb0d5abb35389b6681748e0e4667556ad432c5432c861185bcdd8da7815fb570fc8a2fbbf5eed3801
-EBUILD pulseview-0.4.1.ebuild 1254 BLAKE2B f4e8730aefdd3bbe4dee42d73708c4f81e72ffe2cfeccaa14d18eabc851699799799ad498d451520c8beb43a898c09f48987937cf685cae4beaffa4284a64d12 SHA512 7936b1541d98d8ac3f2fa336f847f1bd5fcc5d4f517fc3fbb44aaf793b0aec7cc9631960c9a9f1b42dab7e22c49cb37f2147d1367e9b0f8161924184c00811e1
-EBUILD pulseview-9999.ebuild 1254 BLAKE2B 2cb7f677597429a186c7a39adaf1a227529ca1c8d534aaa50fb09eb225f0e46c75782af714f2c2f855467d5e5bcc8be1585a119ea1ac0ae05a45cbe5e33564cf SHA512 9e5ab09e263ada69aaf6934b4a757f00f30d4c65b956705385569e14e61c5f5e219954efd0b2a28a6b317f22cf82f14363b2b2d511326d24dbca0548bd139fa4
+EBUILD pulseview-0.4.1-r1.ebuild 1261 BLAKE2B 7e354b705e0c0ee70426273123888e2c7bd1a6c4d5d297d73221b7b0ea3014a4994f6f964b02029acc1f77e640332e010b7e0740b9fce594710717e0fa26f32e SHA512 0d380dbceb3563c6104f04b7f1039f70cd16ae46c20acdb8b6effdca6142e1f78791330b72d42c61c569d241aa69b40188884197d65093e17c2b6b2fa9473440
+EBUILD pulseview-9999.ebuild 1261 BLAKE2B 0bed74537ba8677c03935cc841e97523a56f2d041dcfa76fcc084381b4079c02c56f50df63b40ab9325b98e64d3e2dff28781b68f89dbbb05cd1ec50b7967a0a SHA512 3501cb8e38c660d238e0b6781e24d0442367738e45cc9fa7d417206541ff19bd1e5bc009215e8a0f23426d4ccbc6a63f795584a8cbf4efb787e6d217bd2b3ac3
 MISC metadata.xml 333 BLAKE2B b4981e29ae436b82875daf955c31085e4bade0ce53b9de677c68f4fed6ef63cd8610ae995989eb659f1d205a072d3f87c8aac02b422b3e30a3baac9eda92dfa2 SHA512 f7f0484072e7c2486a176c29814d7a390d8e44d01593d75ed51231e5c67e7226e576da17410da01281b16ed31361c1724e60026d7df06b580e29901a3f89d2dd
diff --git a/sci-electronics/pulseview/pulseview-0.4.1.ebuild b/sci-electronics/pulseview/pulseview-0.4.1-r1.ebuild
index 682870ec6d33..909877319c9b 100644
--- a/sci-electronics/pulseview/pulseview-0.4.1.ebuild
+++ b/sci-electronics/pulseview/pulseview-0.4.1-r1.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtsvg:5
 	decode? (
-		>=sci-libs/libsigrokdecode-0.5.2:=[${PYTHON_USEDEP}]
+		>=sci-libs/libsigrokdecode-0.5.2:=[${PYTHON_SINGLE_USEDEP}]
 		${PYTHON_DEPS}
 	)"
 DEPEND="${RDEPEND}
diff --git a/sci-electronics/pulseview/pulseview-9999.ebuild b/sci-electronics/pulseview/pulseview-9999.ebuild
index bac3c89d5ef2..570474071f06 100644
--- a/sci-electronics/pulseview/pulseview-9999.ebuild
+++ b/sci-electronics/pulseview/pulseview-9999.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	dev-qt/qtwidgets:5
 	dev-qt/qtsvg:5
 	decode? (
-		>=sci-libs/libsigrokdecode-0.6.0:=[${PYTHON_USEDEP}]
+		>=sci-libs/libsigrokdecode-0.6.0:=[${PYTHON_SINGLE_USEDEP}]
 		${PYTHON_DEPS}
 	)"
 DEPEND="${RDEPEND}
diff --git a/sci-electronics/sigrok-cli/Manifest b/sci-electronics/sigrok-cli/Manifest
index d2d9b9225fe4..d458162a6ba2 100644
--- a/sci-electronics/sigrok-cli/Manifest
+++ b/sci-electronics/sigrok-cli/Manifest
@@ -1,4 +1,4 @@
 DIST sigrok-cli-0.7.1.tar.gz 221754 BLAKE2B a2edd3ef990c484660dd3fa6f8b8f2ca3eb500a39ac66da1ce9b95c7dd6bfbc5f39b7e5a28872bc8b4c6b7e6282919bbb22f71796ad8e16f3549ef2e4674f02e SHA512 a56d9439efca74f8362ed225d8fa92adfaee053470b166629ad2d8f3ebf5bea05a37782750c9321aabd3b47e634734fa5e5b0cc5353bf49dd1629cdcdb98aef5
-EBUILD sigrok-cli-0.7.1.ebuild 1071 BLAKE2B 318d762d4c9111a24ee94245d69163027de17c8e49ca7f8227017e696406ef83d5b0e308a3a0c12e01dac8443c4c2df622acbcfcf23b47a7055a80b00b2baea6 SHA512 6ef767ff2e6ce0fa1890d3452651b43aae8577ebe9fc9a3c38d9fc99f22fc9bec990f07d41fd557e309ba1ee61c864dda9d0428f422514a236cf718063ea9273
-EBUILD sigrok-cli-9999.ebuild 1071 BLAKE2B 318d762d4c9111a24ee94245d69163027de17c8e49ca7f8227017e696406ef83d5b0e308a3a0c12e01dac8443c4c2df622acbcfcf23b47a7055a80b00b2baea6 SHA512 6ef767ff2e6ce0fa1890d3452651b43aae8577ebe9fc9a3c38d9fc99f22fc9bec990f07d41fd557e309ba1ee61c864dda9d0428f422514a236cf718063ea9273
+EBUILD sigrok-cli-0.7.1-r1.ebuild 1078 BLAKE2B 95a24aa3de667f5a7e897efc4c729e2067d9e35f1ccaafb0a39e7b6993bafa988c1a3e5457238fc38369a5f946eef4a9b6b68e1f303c2df6d7ee1c574032fcdb SHA512 c40237af30466d343742a2b2e3a0b8b8a655cc8ada443af0df36c1de8e5e9356b0c018662ac318357630622014cb93c237ff563e43766ad54e2c8dd4e255699f
+EBUILD sigrok-cli-9999.ebuild 1078 BLAKE2B 95a24aa3de667f5a7e897efc4c729e2067d9e35f1ccaafb0a39e7b6993bafa988c1a3e5457238fc38369a5f946eef4a9b6b68e1f303c2df6d7ee1c574032fcdb SHA512 c40237af30466d343742a2b2e3a0b8b8a655cc8ada443af0df36c1de8e5e9356b0c018662ac318357630622014cb93c237ff563e43766ad54e2c8dd4e255699f
 MISC metadata.xml 333 BLAKE2B b4981e29ae436b82875daf955c31085e4bade0ce53b9de677c68f4fed6ef63cd8610ae995989eb659f1d205a072d3f87c8aac02b422b3e30a3baac9eda92dfa2 SHA512 f7f0484072e7c2486a176c29814d7a390d8e44d01593d75ed51231e5c67e7226e576da17410da01281b16ed31361c1724e60026d7df06b580e29901a3f89d2dd
diff --git a/sci-electronics/sigrok-cli/sigrok-cli-0.7.1.ebuild b/sci-electronics/sigrok-cli/sigrok-cli-0.7.1-r1.ebuild
index c6cf38ddc33f..d13613f4a65a 100644
--- a/sci-electronics/sigrok-cli/sigrok-cli-0.7.1.ebuild
+++ b/sci-electronics/sigrok-cli/sigrok-cli-0.7.1-r1.ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="decode? ( ${PYTHON_REQUIRED_USE} )"
 RDEPEND=">=dev-libs/glib-2.32.0
 	>=sci-libs/libsigrok-0.5.0:=
 	decode? (
-		>=sci-libs/libsigrokdecode-0.5.0:=[${PYTHON_USEDEP}]
+		>=sci-libs/libsigrokdecode-0.5.0:=[${PYTHON_SINGLE_USEDEP}]
 		${PYTHON_DEPS}
 	)"
 DEPEND="${RDEPEND}
diff --git a/sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild b/sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild
index c6cf38ddc33f..d13613f4a65a 100644
--- a/sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild
+++ b/sci-electronics/sigrok-cli/sigrok-cli-9999.ebuild
@@ -26,7 +26,7 @@ REQUIRED_USE="decode? ( ${PYTHON_REQUIRED_USE} )"
 RDEPEND=">=dev-libs/glib-2.32.0
 	>=sci-libs/libsigrok-0.5.0:=
 	decode? (
-		>=sci-libs/libsigrokdecode-0.5.0:=[${PYTHON_USEDEP}]
+		>=sci-libs/libsigrokdecode-0.5.0:=[${PYTHON_SINGLE_USEDEP}]
 		${PYTHON_DEPS}
 	)"
 DEPEND="${RDEPEND}