gentoo resync : 25.08.2020

17 files changed, 391 insertions, 181 deletions

diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 286ca0f08fed..93e01a74f128 100644
--- a/sci-electronics/Manifest.gz
+++ b/sci-electronics/Manifest.gz
diff --git a/sci-electronics/drahnr-oregano/Manifest b/sci-electronics/drahnr-oregano/Manifest
index 3f8085bf2211..afea467e5d7b 100644
--- a/sci-electronics/drahnr-oregano/Manifest
+++ b/sci-electronics/drahnr-oregano/Manifest
@@ -1,3 +1,3 @@
 DIST drahnr-oregano-0.84.40.tar.gz 1879082 BLAKE2B 8b8e0ffc6af0205018bb1a415f1f0e067d30f8c86681f145b8000a71d414c540c32cfb99af48b9e7c4a1b1e71cebbe76b22c05ccd511797ba7db2efdc8de2079 SHA512 f4e38ccf09f148cbe609ccfebe3d3476e6b385f4d002cb951ed0d488d84f65557c0fcac986c6e7657684a07d7f7dac4dda663278ed85363de0dcf48f8d02f73e
-EBUILD drahnr-oregano-0.84.40.ebuild 1780 BLAKE2B 69527f3645ae0b79778438486b8a3bb9e9ea0b0eaed44d7d74138d1512827049efa330c1b37aaee95ad020707973757608e12d4447bebc38060e5c6c6d560914 SHA512 1b3be7181702d78bd43a52ee4720909f28c88d5ca4bc3f5bd11397198532a7d6dfc0921bf24a0eb3fbd1afd694de9e632eaf8012daaa5167949443ee7c1d8249
+EBUILD drahnr-oregano-0.84.40.ebuild 1777 BLAKE2B 110500eda094ba76fde70eaa832bd5f0819f8951060c7e2151af78c25bd96f5036269a297808487692924499ba534704d85fb98e9d09ba4965ad7e157f320c75 SHA512 7cfa42c616d9bf09bbd51db4abb96b73e390340a87a9c10bafdd641601f187c3f93eccbf7b5e54ccb7161c41dffead30c696a284d4b6ba0938f665d854ed993c
 MISC metadata.xml 697 BLAKE2B 33ffc4e10380de68a45856ab50a4b3dafdcbfa11c9695a039c6f0ce2cfa74b287f3c130f7273def9e02d27d011aad88e866be369b7e75cbc80281bdf40c64dd5 SHA512 d534f45e3427d45837bf59465e5aa4141a1c2a005c1815a50c081b14b2cb622e8eae8614d878e79489bd7d46b874dff235c53b0b4af507ef6c7722285b36267a
diff --git a/sci-electronics/drahnr-oregano/drahnr-oregano-0.84.40.ebuild b/sci-electronics/drahnr-oregano/drahnr-oregano-0.84.40.ebuild
index 13339f3334bc..442a63333ce1 100644
--- a/sci-electronics/drahnr-oregano/drahnr-oregano-0.84.40.ebuild
+++ b/sci-electronics/drahnr-oregano/drahnr-oregano-0.84.40.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/drahnr/oregano/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 
 S="${WORKDIR}/oregano-${PV}"
 
diff --git a/sci-electronics/gazebo/Manifest b/sci-electronics/gazebo/Manifest
index 5495a61611af..22a323e0edcd 100644
--- a/sci-electronics/gazebo/Manifest
+++ b/sci-electronics/gazebo/Manifest
@@ -1,10 +1,13 @@
 AUX boost173.patch 7177 BLAKE2B 45b8b5bda4274727bf9e55ab5a7d3eb1ccc403a91f1a6988fb2f6cc3c02a13c1d7cb921a483d793d2f6cb78a23724407a33dc40a6bcadd77c0b9e1b7f104bef9 SHA512 a7caa36a35087db455e06bf745d4b4e2ba20ddc4396a6e6998b609a6c9f0d0806630d1c38bae6da6ef264a9a4cfa8219d39e8f54fb88f6a1cb8d7d0927e649fb
+AUX boost174.patch 554 BLAKE2B 71b9e37079cde717a26d3ea36e4551adac3f3017c05e95fc488b9d51e0ef6cf79780dc5a622dad2f209ce862e4fa56ddf40ee198002184bb80add36370918576 SHA512 38854c65ca67924a10add9164659d28ca84bc1f8f5e50e6bfe98231103330d4d74596fd9de1b4d2cc23658fedaafd171acec87d552f48609c9a62265a8eb4912
 AUX cmake.patch 699 BLAKE2B 64edc9a3e51952ca5e15488a4fa148028d77bbb3a294937d9df263e8f0d78c59e6d2a40574534aa12911d79b8871901ff5fd16af236f32f0e580b7e86a3f8198 SHA512 95693482c14ddbc759af20c7ef30d1660e8630b21cf52d15ca14e8ef08d3631483c736e67423e2cabf1a8c8b834e8e25ece8a7bd15f71b38853b71d2fdcbce8f
 AUX oal.patch 653 BLAKE2B 22389b9ac60c471905140e5001f3a43bfeab878633d70e2476242112e55994bde8eea0fc58be39b331b5e9ebacf5f470cb0d1829cab49994bdbfcbf23daf79c3 SHA512 883f752c43b7bf05d23850184130a93667c1e4e98adbaa48da468abce4601cfc42f4c9d8f78a9ff6b1332c1bbdaf5655fa9fbfcc4586420f74097e7d6fd97016
 AUX qtmoc.patch 1176 BLAKE2B d1397e9cd3787c933b43f86d5638971a0806f24496063950fccaad268593eec213e81051cbc035993ac973f3a236941821b2b88e97d6d5d2f366abb3caf8c10d SHA512 35077f09d2e138cfaeec0805a0c6c88b0fb28b863af61283b88002930cf6b26b351d9911d48e9bff253f6e5fce4255fb0cf4426e8a7b459d530dd10c934e9772
 AUX qwt.patch 2136 BLAKE2B 3ab69581d1dac006ebd493c82bebee7df34fc00accf7957411a143ce1ba6fffebdffe3468ada7c1e51375cb55adca5d1b28c7a6d1708355d60508f85422e2494 SHA512 4a9edac8565bc7a77644d9b6adeec61187c34dcf72f309066eb6575de7baef5cb59668c70bf5b51fb22a8e5bad00da4d664d279b1d22aae5dbb8fe07f69ae91b
 DIST gazebo-10.1.0.tar.bz2 52723379 BLAKE2B c7902c1797efef80b3110e988e1c01d171f652803a2ac28b880d5a01e2f981655db2d9925263030948d351e95af39d435b8618bf703f56a29033db05f0b29e2f SHA512 8febea84240eeb2367d783b36e4c626145ccf13177837ccb73b6ed87f8b264a337c6f8dc53d8583ce5d903b6152eaa5234ec2015ee292a1681800af2800d9eb7
 DIST gazebo-11.0.0.tar.bz2 53806265 BLAKE2B 0658bdfd7d1f130767bd38cc2b33379f66f8cd92a9e6496581cd660638fb0307f87af19bcd5bd9ec2edb2be980e964297241ab4c1cec855751fdd7b394c717e9 SHA512 7c6cbb17c52829bb553f57a4bc2d515211aefa105d97cd5e71ff239244e49312562af1c901dac6c88b982986dd1318c0bb780c0a68f10ce78f25e12f031ba934
+DIST gazebo-11.1.0.tar.bz2 53856366 BLAKE2B 6e3df164e40c44265da68eae260012d873121631e56e9ae4ca3d8355e9c22ac80811549103e83d5f20d40f92c80f7a7a313c2395209b1c5177f518d0c0b2117c SHA512 39866991d8b996656a9f927a70e215175ecef671a1e317bfe9221df38bdc08be9825d36018da90cc6843480643a7716586ce8d61f36ffc8b4558ef7096ef6f76
 EBUILD gazebo-10.1.0.ebuild 1883 BLAKE2B 9b883c5acad6ddf919dc90e62033b5765c44ada1baf2895cd88eabe27fed50bfcf01215bd6864c90064cbe445eabd03f9b0f1872c8c39f7546e1c5a28d086de6 SHA512 7fb81bb5907891630607cc5f1132ad0ba57edaf3dd988cd0eadc42de79901f8dc780d8a8b27ba0c218272593988f66a690cf3f60d6b1843c8d635f346fc9bd17
 EBUILD gazebo-11.0.0.ebuild 1874 BLAKE2B 73dc639ada965f845ef175f1f0d4b47ba822656fafcb75ee74d9438b1a3fbe76fb629291e06f51ece553da22153aafb5f59d3a1ec8c8f71d5b2c111862635e4c SHA512 afaea2b8c4b95cd2d05cf2ae0723b2aee602fedcd554d98b0ca7cbf6bf7a23062f4345ef78fc244060b372dece3efc84bb14a430d1838f1cb12dd89fd3cf8663
+EBUILD gazebo-11.1.0.ebuild 1907 BLAKE2B 85f38933c5ba76311d881edc28b3890b0785e261e4301eecccfb951295942cab30ea0f2c6040175a35689539a5df05e34b3f1f16964f2ef5a32e69d2599a7f3a SHA512 03881672fa4ff9304ec43341e1958802c34d42f07a07447b7d919928f45f41ea91ada25974855d396c40fe37b2f25426d1317bc1f56046ec3049f9511ee1e0a8
 MISC metadata.xml 243 BLAKE2B 13c40383778472fec33f877963b2be8d44c354e5449e3ac38dfba06cb38e4cfb6a63d5d73c5acb1e02a1c8ee783131c46c8b56eb14de786de7f77635f15d18d7 SHA512 c9d5c1cdd2874fe293f21f7584c6e15ef9439bd82b0d2e862e3e34c9a9e0e3191370fee2727b9d4d8647fb85cf56a39fdd6c1e0003ada1554496aad311ef335c
diff --git a/sci-electronics/gazebo/files/boost174.patch b/sci-electronics/gazebo/files/boost174.patch
new file mode 100644
index 000000000000..82bbdf40f7a7
--- /dev/null
+++ b/sci-electronics/gazebo/files/boost174.patch
@@ -0,0 +1,20 @@
+Index: gazebo-11.1.0/plugins/SimpleTrackedVehiclePlugin.cc
+===================================================================
+--- gazebo-11.1.0.orig/plugins/SimpleTrackedVehiclePlugin.cc
++++ gazebo-11.1.0/plugins/SimpleTrackedVehiclePlugin.cc
+@@ -30,6 +30,7 @@
+ 
+ #include "plugins/SimpleTrackedVehiclePlugin.hh"
+ 
++#if BOOST_VERSION < 107400 || defined(BOOST_NO_CXX11_HDR_FUNCTIONAL)
+ namespace std {
+ template<class T>
+ class hash<boost::shared_ptr<T>> {
+@@ -38,6 +39,7 @@ class hash<boost::shared_ptr<T>> {
+   }
+ };
+ }
++#endif
+ 
+ namespace gazebo
+ {
diff --git a/sci-electronics/gazebo/gazebo-11.1.0.ebuild b/sci-electronics/gazebo/gazebo-11.1.0.ebuild
new file mode 100644
index 000000000000..ee7b5f268a7d
--- /dev/null
+++ b/sci-electronics/gazebo/gazebo-11.1.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-utils flag-o-matic
+
+DESCRIPTION="A 3D multiple robot simulator with dynamics"
+HOMEPAGE="http://gazebosim.org/"
+SRC_URI="https://osrf-distributions.s3.amazonaws.com/gazebo/releases/${P}.tar.bz2"
+
+LICENSE="Apache-2.0"
+# Subslot = major version = soname of libs
+SLOT="0/11"
+KEYWORDS="~amd64"
+IUSE="cpu_flags_x86_sse2 test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-libs/protobuf-2:=
+	virtual/opengl
+	media-libs/openal
+	net-misc/curl
+	dev-libs/tinyxml
+	>=dev-libs/tinyxml2-6:=
+	dev-libs/libtar
+	dev-cpp/tbb
+	>=dev-games/ogre-1.7.4:=[freeimage]
+	<dev-games/ogre-1.10
+	>=media-libs/freeimage-3.15.4[png]
+	sci-libs/libccd
+	>=media-video/ffmpeg-2.6:0=
+	sci-libs/gts
+	>=sci-physics/bullet-2.82
+	>=dev-libs/sdformat-9.1:=
+	dev-qt/qtwidgets:5
+	dev-qt/qtcore:5
+	dev-qt/qtopengl:5
+	dev-libs/boost:=[threads]
+	sci-libs/gdal:=
+	virtual/libusb:1
+	dev-libs/libspnav
+	media-libs/freeimage
+	sci-libs/hdf5:=[cxx]
+	sys-apps/util-linux
+	media-gfx/graphviz
+	net-libs/ignition-msgs:5=
+	sci-libs/ignition-math:6=
+	net-libs/ignition-transport:8=
+	sci-libs/ignition-common:3=
+	sci-libs/ignition-fuel-tools:4=
+	x11-libs/qwt:6=[qt5(+)]
+"
+DEPEND="${RDEPEND}
+	dev-qt/qttest:5
+	x11-apps/mesa-progs
+	test? ( dev-libs/libxslt )
+"
+BDEPEND="
+	app-text/ronn
+	app-arch/gzip
+	virtual/pkgconfig
+"
+CMAKE_BUILD_TYPE=RelWithDebInfo
+PATCHES=(
+	"${FILESDIR}/qwt.patch"
+	"${FILESDIR}/boost173.patch"
+	"${FILESDIR}/cmake.patch"
+	"${FILESDIR}/boost174.patch"
+)
+
+src_configure() {
+	# doesnt build with as-needed
+	#append-ldflags "-Wl,--no-as-needed"
+
+	local mycmakeargs=(
+		"-DUSE_UPSTREAM_CFLAGS=OFF"
+		"-DSSE2_FOUND=$(usex cpu_flags_x86_sse2 TRUE FALSE)"
+		"-DUSE_HOST_CFLAGS=FALSE"
+		"-DBUILD_TESTING=$(usex test TRUE FALSE)"
+		"-DENABLE_SCREEN_TESTS=FALSE"
+		"-DUSE_EXTERNAL_TINYXML2=TRUE"
+	)
+	cmake-utils_src_configure
+}
diff --git a/sci-electronics/pulseview/Manifest b/sci-electronics/pulseview/Manifest
index 60299ff1b4bc..aa474a11cf9e 100644
--- a/sci-electronics/pulseview/Manifest
+++ b/sci-electronics/pulseview/Manifest
@@ -1,4 +1,5 @@
-DIST pulseview-0.4.1.tar.gz 1342532 BLAKE2B 759779d4024df8f972fbed515764f17557014972abcb39d3942b411bfa78c6f97a89ee98b706adb51d240bdb738925546cec073f98ba829f1e325acaac892c01 SHA512 0bae4357be312bf6e997885270887a5bcc0a8dfb6914e63bb0d5abb35389b6681748e0e4667556ad432c5432c861185bcdd8da7815fb570fc8a2fbbf5eed3801
-EBUILD pulseview-0.4.1-r1.ebuild 1261 BLAKE2B 7e354b705e0c0ee70426273123888e2c7bd1a6c4d5d297d73221b7b0ea3014a4994f6f964b02029acc1f77e640332e010b7e0740b9fce594710717e0fa26f32e SHA512 0d380dbceb3563c6104f04b7f1039f70cd16ae46c20acdb8b6effdca6142e1f78791330b72d42c61c569d241aa69b40188884197d65093e17c2b6b2fa9473440
-EBUILD pulseview-9999.ebuild 1261 BLAKE2B 0bed74537ba8677c03935cc841e97523a56f2d041dcfa76fcc084381b4079c02c56f50df63b40ab9325b98e64d3e2dff28781b68f89dbbb05cd1ec50b7967a0a SHA512 3501cb8e38c660d238e0b6781e24d0442367738e45cc9fa7d417206541ff19bd1e5bc009215e8a0f23426d4ccbc6a63f795584a8cbf4efb787e6d217bd2b3ac3
+AUX pulseview-0.4.2-qt-5.15.patch 5193 BLAKE2B ea81ba54ca1a8b9d76d2e7751940d7b4e509adb75f903e5e85be49976106eefe1745908fe55d2aa206402494cd636879c71fe811e7dde874ebc40174ea8727cd SHA512 66c1e00f9470d4384bfa5dda2db7ada9d1e86cee2b2cd2a8517b44c1d6ee310d2f9a930033a7c93a30e006675c738b7cf75d6ee22ee09c7b8b52e831ca6571d0
+DIST pulseview-0.4.2.tar.gz 1399718 BLAKE2B ebbefefa55bb7ce9d1bbdfa8ea44d9536fa4f9ca9f6f13175a5bb6122dcb431ddad7c668e631128ca57fd2231021f8ce1c686fac9fa746ace24cf69ef3d71e71 SHA512 79f653c9faad021c03b59b4a519b594190d5558dfb9be60cabcc2a35e991e66b733b337fec58a9248699e7aef0df3be1472c81f93274b25cec1fc6b73f8f033b
+EBUILD pulseview-0.4.2.ebuild 1438 BLAKE2B b69e35f0d08be8c6c5e48b06040912c03622efa63ab096e6efe163c5ea5d3d438176635a7ee3843aa137cecaf61dcfa4cc9aaa205192bfa66e9ef6c92d5a6b03 SHA512 f4646adb593564b3c5334150dfe9b88f7247a8e614072ccb74b1cfda7c757811189cf57bc8c0af652bea3723a8b785bb113ebbb2c594343b0d0cf21b354d7967
+EBUILD pulseview-9999.ebuild 1392 BLAKE2B ea4369f14836df68488ad9bd3c4b9ee961bcfc20ea2e5cf7b1f666445945109dd54bac3f1ae0ce8e7eb923c49ba03cb8397a73bf0625321fc3a255f0298cf920 SHA512 cf0d8b405189b56f14a93436719052f2855c84e64db4800b52bb0bee3488c29a68d65e30d25a4b6affaa1dae203d91013461f96c0b03cb10b3a432937b5590e4
 MISC metadata.xml 333 BLAKE2B b4981e29ae436b82875daf955c31085e4bade0ce53b9de677c68f4fed6ef63cd8610ae995989eb659f1d205a072d3f87c8aac02b422b3e30a3baac9eda92dfa2 SHA512 f7f0484072e7c2486a176c29814d7a390d8e44d01593d75ed51231e5c67e7226e576da17410da01281b16ed31361c1724e60026d7df06b580e29901a3f89d2dd
diff --git a/sci-electronics/pulseview/files/pulseview-0.4.2-qt-5.15.patch b/sci-electronics/pulseview/files/pulseview-0.4.2-qt-5.15.patch
new file mode 100644
index 000000000000..df55954f3c8c
--- /dev/null
+++ b/sci-electronics/pulseview/files/pulseview-0.4.2-qt-5.15.patch
@@ -0,0 +1,142 @@
+From ae726b70a7ada9a4be5808e00f0c951318479684 Mon Sep 17 00:00:00 2001
+From: Valentin Ochs <a@0au.de>
+Date: Sat, 20 Jun 2020 16:01:27 +0200
+Subject: [PATCH] Replace obsolete/deprecated Qt methods
+
+---
+ pv/subwindows/decoder_selector/subwindow.cpp |  2 +-
+ pv/util.cpp                                  | 21 ++++++++++++++++++--
+ pv/util.hpp                                  | 10 ++++++++++
+ pv/views/trace/decodetrace.cpp               |  3 ++-
+ pv/views/trace/ruler.cpp                     |  2 +-
+ pv/widgets/timestampspinbox.cpp              |  2 +-
+ 6 files changed, 34 insertions(+), 6 deletions(-)
+
+diff --git a/pv/subwindows/decoder_selector/subwindow.cpp b/pv/subwindows/decoder_selector/subwindow.cpp
+index 94ed6f4b..2c65dcf2 100644
+--- a/pv/subwindows/decoder_selector/subwindow.cpp
++++ b/pv/subwindows/decoder_selector/subwindow.cpp
+@@ -185,7 +185,7 @@ QToolBar* SubWindow::create_toolbar(QWidget *parent) const
+ int SubWindow::minimum_width() const
+ {
+ 	QFontMetrics m(info_label_body_->font());
+-	const int label_width = m.width(QString(tr(initial_notice)));
++	const int label_width = util::text_width(m, tr(initial_notice));
+ 
+ 	return label_width + min_width_margin;
+ }
+diff --git a/pv/util.cpp b/pv/util.cpp
+index 897254e1..dfb8c72b 100644
+--- a/pv/util.cpp
++++ b/pv/util.cpp
+@@ -143,7 +143,7 @@ QString format_time_si(const Timestamp& v, SIPrefix prefix,
+ 	QString s;
+ 	QTextStream ts(&s);
+ 	if (sign && !v.is_zero())
+-		ts << forcesign;
++		ts.setNumberFlags(ts.numberFlags() | QTextStream::ForceSign);
+ 	ts << qSetRealNumberPrecision(precision) << (v * multiplier);
+ 	ts << ' ' << prefix << unit;
+ 
+@@ -169,7 +169,7 @@ QString format_value_si(double v, SIPrefix prefix, unsigned precision,
+ 	QString s;
+ 	QTextStream ts(&s);
+ 	if (sign && (v != 0))
+-		ts << forcesign;
++		ts.setNumberFlags(ts.numberFlags() | QTextStream::ForceSign);
+ 	ts.setRealNumberNotation(QTextStream::FixedNotation);
+ 	ts.setRealNumberPrecision(precision);
+ 	ts << (v * multiplier) << ' ' << prefix << unit;
+@@ -279,5 +279,22 @@ vector<string> split_string(string text, string separator)
+ 	return result;
+ }
+ 
++/**
++ * Return the width of a string in a given font.
++ *
++ * @param[in] metric metrics of the font
++ * @param[in] string the string whose width should be determined
++ *
++ * @return width of the string in pixels
++ */
++std::streamsize text_width(const QFontMetrics &metric, const QString &string)
++{
++#if QT_VERSION >= QT_VERSION_CHECK(5, 11, 0)
++	return metric.horizontalAdvance(string);
++#else
++	return metric.width(string);
++#endif
++}
++
+ } // namespace util
+ } // namespace pv
+diff --git a/pv/util.hpp b/pv/util.hpp
+index fab29a14..49ae04b2 100644
+--- a/pv/util.hpp
++++ b/pv/util.hpp
+@@ -30,6 +30,7 @@
+ 
+ #include <QMetaType>
+ #include <QString>
++#include <QFontMetrics>
+ 
+ using std::string;
+ using std::vector;
+@@ -143,6 +144,15 @@ QString format_time_minutes(const Timestamp& t, signed precision = 0,
+ 
+ vector<string> split_string(string text, string separator);
+ 
++/**
++ * Return the width of a string in a given font.
++ * @param[in] metric metrics of the font
++ * @param[in] string the string whose width should be determined
++ *
++ * @return width of the string in pixels
++ */
++std::streamsize text_width(const QFontMetrics &metric, const QString &string);
++
+ } // namespace util
+ } // namespace pv
+ 
+diff --git a/pv/views/trace/decodetrace.cpp b/pv/views/trace/decodetrace.cpp
+index 67c9b1c4..93c7c5a9 100644
+--- a/pv/views/trace/decodetrace.cpp
++++ b/pv/views/trace/decodetrace.cpp
+@@ -161,7 +161,8 @@ DecodeTrace::DecodeTrace(pv::Session &session,
+ 
+ 	// Determine shortest string we want to see displayed in full
+ 	QFontMetrics m(QApplication::font());
+-	min_useful_label_width_ = m.width("XX"); // e.g. two hex characters
++	// e.g. two hex characters
++	min_useful_label_width_ = util::text_width(m, "XX");
+ 
+ 	default_row_height_ = (ViewItemPaintParams::text_height() * 6) / 4;
+ 	annotation_height_ = (ViewItemPaintParams::text_height() * 5) / 4;
+diff --git a/pv/views/trace/ruler.cpp b/pv/views/trace/ruler.cpp
+index 555794fc..83ffed28 100644
+--- a/pv/views/trace/ruler.cpp
++++ b/pv/views/trace/ruler.cpp
+@@ -283,7 +283,7 @@ void Ruler::paintEvent(QPaintEvent*)
+ 		const int rightedge = width();
+ 		const int x_tick = tick.first;
+ 		if ((x_tick > leftedge) && (x_tick < rightedge)) {
+-			const int x_left_bound = QFontMetrics(font()).width(tick.second) / 2;
++			const int x_left_bound = util::text_width(QFontMetrics(font()), tick.second) / 2;
+ 			const int x_right_bound = rightedge - x_left_bound;
+ 			const int x_legend = min(max(x_tick, x_left_bound), x_right_bound);
+ 			p.drawText(x_legend, ValueMargin, 0, text_height,
+diff --git a/pv/widgets/timestampspinbox.cpp b/pv/widgets/timestampspinbox.cpp
+index fea8175e..01424a5b 100644
+--- a/pv/widgets/timestampspinbox.cpp
++++ b/pv/widgets/timestampspinbox.cpp
+@@ -76,7 +76,7 @@ QSize TimestampSpinBox::minimumSizeHint() const
+ {
+ 	const QFontMetrics fm(fontMetrics());
+ 	const int l = round(value_).str().size() + precision_ + 10;
+-	const int w = fm.width(QString(l, '0'));
++	const int w = util::text_width(fm, QString(l, '0'));
+ 	const int h = lineEdit()->minimumSizeHint().height();
+ 	return QSize(w, h);
+ }
+-- 
+2.24.0.rc2
diff --git a/sci-electronics/pulseview/pulseview-0.4.1-r1.ebuild b/sci-electronics/pulseview/pulseview-0.4.2.ebuild
index 909877319c9b..b4e924d82834 100644
--- a/sci-electronics/pulseview/pulseview-0.4.1-r1.ebuild
+++ b/sci-electronics/pulseview/pulseview-0.4.2.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
-inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
+inherit cmake python-single-r1 xdg-utils
 
-if [[ ${PV} == "9999" ]]; then
+if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="git://sigrok.org/${PN}"
 	inherit git-r3
 else
@@ -23,39 +23,54 @@ SLOT="0"
 IUSE="+decode static"
 REQUIRED_USE="decode? ( ${PYTHON_REQUIRED_USE} )"
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
 RDEPEND="
+	>=dev-cpp/glibmm-2.28.0:2
 	>=dev-libs/boost-1.55:=
 	>=dev-libs/glib-2.28.0:2
-	>=dev-cpp/glibmm-2.28.0:2
-	>=sci-libs/libsigrok-0.5.1:=[cxx]
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
 	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	>=sci-libs/libsigrok-0.5.1:=[cxx]
 	decode? (
-		>=sci-libs/libsigrokdecode-0.5.2:=[${PYTHON_SINGLE_USEDEP}]
 		${PYTHON_DEPS}
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+		>=sci-libs/libsigrokdecode-0.5.2:=[${PYTHON_SINGLE_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
 
 DOCS=( HACKING NEWS README )
 
+PATCHES=( "${FILESDIR}/${P}-qt-5.15.patch" )
+
+pkg_setup() {
+	use decode && python_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	cmake_comment_add_subdirectory manual
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DDISABLE_WERROR=TRUE
 		-DENABLE_DECODE=$(usex decode)
 		-DSTATIC_PKGDEPS_LIBS=$(usex static)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
diff --git a/sci-electronics/pulseview/pulseview-9999.ebuild b/sci-electronics/pulseview/pulseview-9999.ebuild
index 570474071f06..e67387d52ebe 100644
--- a/sci-electronics/pulseview/pulseview-9999.ebuild
+++ b/sci-electronics/pulseview/pulseview-9999.ebuild
@@ -1,13 +1,13 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="6"
+EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 
-inherit cmake-utils gnome2-utils python-single-r1 xdg-utils
+inherit cmake python-single-r1 xdg-utils
 
-if [[ ${PV} == "9999" ]]; then
+if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="git://sigrok.org/${PN}"
 	inherit git-r3
 else
@@ -23,39 +23,52 @@ SLOT="0"
 IUSE="+decode static"
 REQUIRED_USE="decode? ( ${PYTHON_REQUIRED_USE} )"
 
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig
+"
 RDEPEND="
+	>=dev-cpp/glibmm-2.28.0:2
 	>=dev-libs/boost-1.55:=
 	>=dev-libs/glib-2.28.0:2
-	>=dev-cpp/glibmm-2.28.0:2
-	>=sci-libs/libsigrok-0.6.0:=[cxx]
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
 	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	>=sci-libs/libsigrok-0.6.0:=[cxx]
 	decode? (
-		>=sci-libs/libsigrokdecode-0.6.0:=[${PYTHON_SINGLE_USEDEP}]
 		${PYTHON_DEPS}
-	)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+		>=sci-libs/libsigrokdecode-0.6.0:=[${PYTHON_SINGLE_USEDEP}]
+	)
+"
+DEPEND="${RDEPEND}"
 
 DOCS=( HACKING NEWS README )
 
+pkg_setup() {
+	use decode && python_setup
+}
+
+src_prepare() {
+	cmake_src_prepare
+	cmake_comment_add_subdirectory manual
+}
+
 src_configure() {
 	local mycmakeargs=(
 		-DDISABLE_WERROR=TRUE
 		-DENABLE_DECODE=$(usex decode)
 		-DSTATIC_PKGDEPS_LIBS=$(usex static)
 	)
-	cmake-utils_src_configure
+	cmake_src_configure
 }
 
 pkg_postinst() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
 
 pkg_postrm() {
-	gnome2_icon_cache_update
+	xdg_icon_cache_update
 	xdg_desktop_database_update
 }
diff --git a/sci-electronics/qelectrotech/Manifest b/sci-electronics/qelectrotech/Manifest
index e0a22db95db1..6fb3177c13b6 100644
--- a/sci-electronics/qelectrotech/Manifest
+++ b/sci-electronics/qelectrotech/Manifest
@@ -1,5 +1,7 @@
 AUX qelectrotech-0.3-fix-paths.patch 2304 BLAKE2B 113afe4cd025baecc3ddd4060179d3b81da32ac172eb452bb74215cc9a2e227bd7f31474452fb4055cc9d4cbda5cd0eea856929b191917a263a7e9ac20de9483 SHA512 3d57c172bf63faa3bd5ead082be1c3143330bae8ebdde580a5b5a860d5419371a05082f4b69e39054629e9f39f258b26ec65f773238b8b7b4b892176ad998c31
 DIST qelectrotech-0.61-src.tar.gz 9083192 BLAKE2B 25966e70f7f297ed55b539472970698f0947985c377cd90648d03fce8bf73c1bdede97e1104163147c5e60bb8ad05c55718f182528e6131adef6efeaf76f8e82 SHA512 b07d28520bef5773f5f93595c53a839a160c5927a7534ec30eba451fd33ab090909fc1971f28aea53538ff8e20ca45eff0b6597f3ab103b00b89eaa65067f918
+DIST qelectrotech-0.70.tar.gz 10870717 BLAKE2B 21af2000080526cc75e67d80d514286a294a805073beb97d142758449e1290db56e741b70eeb9c38adbdb770fc548eb0fba18429bceaa8cd88bcba5335c3fca9 SHA512 db5b74ce9ac64e55a463c821ee43a2cde8cc4dc4a7be79c8a39512e54dfb85653e20981b5879ecc6e5949c1c1196ad5b7cae9780bf16de0b4d7b2381731173bd
 EBUILD qelectrotech-0.61.ebuild 1155 BLAKE2B aa15c747e85a3419d77d576e2dbc9b060f3ac1970427dd743b969a216093eb5a550d6fbf9920eb1358e5330e1dfdab41ae7648f1deb04e5a8360593aaed2334f SHA512 620c5a75269d85fa56fb2bc573041853e722c65d709331b3642edd9683067bea30011eff09402b4045a2a5ba110527b48143a7c07f14bc899d1203b45f9c4daa
-EBUILD qelectrotech-9999.ebuild 1145 BLAKE2B 0edf8738be0e8c3ef882f2b41e6d837d26e650ee326e07d8be9e10e3b985f65d4e280986cfa2939babec73070bc4847722aca09cf4d769a0b55ec8be156401d0 SHA512 192b771c178173be45a4c59d2f39a00892fe68b3e83ee13605ea69015e001dbf9cbde20c159e93715ee8686f818a45f71fe70f386f3d773169d0a003fa447970
+EBUILD qelectrotech-0.70.ebuild 1150 BLAKE2B a702ebbe768db66eb7700db96a4518b70186db48ef669c78ab944ae2ce56b9c85b367dffb3ab33642c0147a15488aea02e1be8afb965142aaa809d47d25c624b SHA512 042f8ade40b93d9bfc68937bb1d89e0f8c2b90c3741c4d4e6ce0f78e88cfaa5e3dd4897a7ea89c5790a553ef8df764cd359c2a5b554ce10f910262e816e4618b
+EBUILD qelectrotech-9999.ebuild 1139 BLAKE2B 827b5184d0117228521a770808c2f00aafeec19e5bfc5623d7ba23bbee6ebb2f81b80be2b4c85ec5599613ba903725dd54f011c1e16de9a9d3b886dd2e6692a6 SHA512 0b8e91434bfec88cf0a0822fc8085a8d9eadc3277a955c06df2a59a37d395d43e6e6ed84ee0cdeba9191271d9569eda6012b01245fea1573fe4453bd8ea7b808
 MISC metadata.xml 247 BLAKE2B 1428e575bd9b69424c4711499480493ae371840c146149819dc41c38335cbd16d7ce50ce8f6b7be1b77db73092ed6900a9a2d8032cc790058a56e533b01f562d SHA512 b43c8e84c3c753b49b203921a5aca792639a36d6efdbe16c069ff9abfbce0585718bb3824c03abdd7bd19ada13fb0a98a378c85ed369ac5fdc53ad3b3d5465d2
diff --git a/sci-electronics/qelectrotech/qelectrotech-0.70.ebuild b/sci-electronics/qelectrotech/qelectrotech-0.70.ebuild
new file mode 100644
index 000000000000..85e3e238086e
--- /dev/null
+++ b/sci-electronics/qelectrotech/qelectrotech-0.70.ebuild
@@ -0,0 +1,60 @@
+# Copyright 2001-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit qmake-utils xdg
+
+DESCRIPTION="Qt5 application to design electric diagrams"
+HOMEPAGE="https://qelectrotech.org/"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit subversion
+	ESVN_REPO_URI="svn://svn.tuxfamily.org/svnroot/qet/qet/trunk"
+else
+	MY_P=qet-${PV/%0/.0}
+	SRC_URI="https://git.tuxfamily.org/qet/qet.git/snapshot/${MY_P}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}"/${MY_P}
+fi
+
+LICENSE="CC-BY-3.0 GPL-2+"
+SLOT="0"
+IUSE="doc"
+
+BDEPEND="
+	doc? ( app-doc/doxygen )
+"
+RDEPEND="
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtprintsupport:5
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtsvg:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	kde-frameworks/kcoreaddons:5
+	kde-frameworks/kwidgetsaddons:5
+"
+DEPEND="${RDEPEND}"
+
+DOCS=( CREDIT ChangeLog README )
+
+PATCHES=( "${FILESDIR}/${PN}-0.3-fix-paths.patch" )
+
+src_configure() {
+	eqmake5 ${PN}.pro
+}
+
+src_install() {
+	emake INSTALL_ROOT="${D}" install
+
+	if use doc; then
+		doxygen Doxyfile || die
+		local HTML_DOCS=( doc/html/. )
+	fi
+
+	einstalldocs
+}
diff --git a/sci-electronics/qelectrotech/qelectrotech-9999.ebuild b/sci-electronics/qelectrotech/qelectrotech-9999.ebuild
index 3f4b1b8d7a2d..bd14b719e6f5 100644
--- a/sci-electronics/qelectrotech/qelectrotech-9999.ebuild
+++ b/sci-electronics/qelectrotech/qelectrotech-9999.ebuild
@@ -3,16 +3,23 @@
 
 EAPI=7
 
-MY_P=${PN}-${PV%0}-src
-inherit qmake-utils subversion xdg-utils
+inherit qmake-utils xdg
 
 DESCRIPTION="Qt5 application to design electric diagrams"
 HOMEPAGE="https://qelectrotech.org/"
-ESVN_REPO_URI="svn://svn.tuxfamily.org/svnroot/qet/qet/trunk"
+
+if [[ ${PV} = *9999* ]]; then
+	inherit subversion
+	ESVN_REPO_URI="svn://svn.tuxfamily.org/svnroot/qet/qet/trunk"
+else
+	MY_P=${PN}-${PV%0}-src
+	SRC_URI="https://download.tuxfamily.org/qet/tags/20180823/${MY_P}.tar.gz"
+	KEYWORDS="~amd64 ~x86"
+	S="${WORKDIR}"/${MY_P}
+fi
 
 LICENSE="CC-BY-3.0 GPL-2+"
 SLOT="0"
-KEYWORDS=""
 IUSE="doc"
 
 BDEPEND="
@@ -28,11 +35,11 @@ RDEPEND="
 	dev-qt/qtsvg:5
 	dev-qt/qtwidgets:5
 	dev-qt/qtxml:5
+	kde-frameworks/kcoreaddons:5
+	kde-frameworks/kwidgetsaddons:5
 "
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${MY_P}
-
 DOCS=( CREDIT ChangeLog README )
 
 PATCHES=( "${FILESDIR}/${PN}-0.3-fix-paths.patch" )
@@ -51,15 +58,3 @@ src_install() {
 
 	einstalldocs
 }
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_mimeinfo_database_update
-	xdg_icon_cache_update
-}
diff --git a/sci-electronics/xcircuit/Manifest b/sci-electronics/xcircuit/Manifest
index 866d4e3013cc..a80a21e113bc 100644
--- a/sci-electronics/xcircuit/Manifest
+++ b/sci-electronics/xcircuit/Manifest
@@ -1,7 +1,3 @@
-DIST xcircuit-3.7.48.tgz 1648993 BLAKE2B 4c3693a75323634ec39a4bc1b76a5310c68e63346cf92209fdce7576038315e4a3488f18c9835dca5069e947daabf143c6b6ab328ae37c4adc2bb6255bacedc9 SHA512 686bd2139a6d2d5011b51ff500ea9ffb4007326734eafc0afeec250cb844d8107a344c4ef90d2ed747d8485e7dc8dca69c7e62fd785fc17d3f3460212a0dcb84
-DIST xcircuit-3.8.83.tgz 1533560 BLAKE2B 25e634effad9f5c81954982baacdcb6cf05423ed4c7b92abd85873af054f29b0886a6dddf9771862f839e8274067f990e684f20f3fd123b4298ddb1826637d53 SHA512 2fc798c7fd1e098e4cf1605cd46007ae980be27373cdc0089a129f4a98be475c6a7452e8498c39d28bc97e7b8d7dcd9ef35e029ca416fb49144f00bf83c4b36a
 DIST xcircuit-3.9.73.tgz 1620922 BLAKE2B ac3f8e6f9370efd720b57a9cd7c487621534f477d1af4fd267d311da3bd949886eccd1c8e8e59071689637272ca23f985dd1809594aab692fa60ea2ca8f8a456 SHA512 2dfeb130a48c99bf08bdff94250f7157acd283bc3f3d6b41f963346deb1241aca0d59a3e8d60dbd36a4aa60acd89e131b263ddbf489b2b44e7e1831714d7b703
-EBUILD xcircuit-3.7.48.ebuild 1176 BLAKE2B 9f680ff293077b8739ad45e0812f7059d2563d9726e02e44f90a0f8f12a70821aa591e06941d8218378c2d2db8acbfef6d85e40d2d3f225f6028baf23fde45d4 SHA512 8368457100c924c82bdaf1c9f9255224527c505b61441a64989a8e004861188791f43f83bb5297e17dd5d71c4462a1eab5558c89fe5fde87ef0b2b135c959b57
-EBUILD xcircuit-3.8.83.ebuild 1179 BLAKE2B 380633600125630fea6eb4d70465109284c4745842faf8e9338044ba37ef5fa892298e45ec677e58ce405dd2e0c16d2e9091c8981fdfa4c7a5131b08eaad789f SHA512 d692ebd16c16fb6acc46f635539ef7a9eee2a914c5be094ba9611d387b6ac1a9ca211ae0fa6c41d6669cf37eb8cd1966bef1d738d62939bb0a91acffcf4f8b54
-EBUILD xcircuit-3.9.73.ebuild 972 BLAKE2B bf6c5041bfb0ae3bc107560c8958a2c776f00beca2271b4f9625ef6152e5a2a926a4a762974ec5f28fc5410ea792a52d8e7fedc815fb255afa86d2b9b3bc1026 SHA512 b93f9289f6c6bfd0809d6a48f5a94f80f4600feface7a1a7c8c20b98db2ac28407184d6c106d79de4edcc4079e1544ae1e9b77ecd2dc1f5ff55f8601ee045a78
+EBUILD xcircuit-3.9.73.ebuild 966 BLAKE2B a24b4d8a4063fc367663d34ef3db205acc1e46d07ee4a76107eeb1ad72ec1d37bfbbdd8277985668b68c6130ff6c0d4fa2ada34f191bd6c566de0771fc8a2ff3 SHA512 6c737f430ed33985bf941499d3272fe2c78039565bd9b1832e6e9df0c80b443f96aee25cdd54f332fb0fe5a6ded48becf85ee9ef3dac27c1af3bd54e51198bd3
 MISC metadata.xml 1266 BLAKE2B cab37ad91d300f9a4b5d1dec7820284af0a4893df0a22642662105cc442fed2a51e4822ed005fe40fddeb3186161fe2212977fb829788dcab9a60793b3e1c633 SHA512 2cec9ece544f2c125f4413c3fe9d3f119b9f50a0c2da80e3f7b1164050986ed58a2f01299a5a844f951c490d56c169e196c8e1843e12504f3182d4893df11c3a
diff --git a/sci-electronics/xcircuit/xcircuit-3.7.48.ebuild b/sci-electronics/xcircuit/xcircuit-3.7.48.ebuild
deleted file mode 100644
index 6f439117d2dc..000000000000
--- a/sci-electronics/xcircuit/xcircuit-3.7.48.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils multilib
-
-DESCRIPTION="Circuit drawing and schematic capture program"
-SRC_URI="http://opencircuitdesign.com/xcircuit/archive/${P}.tgz"
-HOMEPAGE="http://opencircuitdesign.com/xcircuit"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="
-	app-text/ghostscript-gpl
-	dev-lang/tk:0
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXpm
-	x11-libs/libSM
-	x11-libs/libICE"
-RDEPEND=${DEPEND}
-
-RESTRICT="test" #131024
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_prepare() {
-	# automake-1.12
-	sed \
-		-e '/AM_C_PROTOTYPES/d' \
-		-i configure.in || die
-	# automake-1.13
-	mv configure.{in,ac} || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	export loader_run_path="/usr/$(get_libdir)"
-	local myeconfargs=(
-		--with-tcl
-		--with-ngspice
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile appdefaultsdir="/usr/share/X11/app-defaults"
-}
-
-src_install() {
-	autotools-utils_src_install \
-		appdefaultsdir="/usr/share/X11/app-defaults" \
-		appmandir="/usr/share/man/man1"
-}
diff --git a/sci-electronics/xcircuit/xcircuit-3.8.83.ebuild b/sci-electronics/xcircuit/xcircuit-3.8.83.ebuild
deleted file mode 100644
index 9e29aaa97f6f..000000000000
--- a/sci-electronics/xcircuit/xcircuit-3.8.83.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-AUTOTOOLS_AUTORECONF=yes
-
-inherit autotools-utils multilib
-
-DESCRIPTION="Circuit drawing and schematic capture program"
-SRC_URI="http://opencircuitdesign.com/xcircuit/archive/${P}.tgz"
-HOMEPAGE="http://opencircuitdesign.com/xcircuit"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
-IUSE=""
-
-DEPEND="
-	app-text/ghostscript-gpl
-	dev-lang/tk:0
-	sys-libs/zlib
-	x11-libs/libX11
-	x11-libs/libXt
-	x11-libs/libXpm
-	x11-libs/libSM
-	x11-libs/libICE"
-RDEPEND=${DEPEND}
-
-RESTRICT="test" #131024
-
-AUTOTOOLS_IN_SOURCE_BUILD=1
-
-src_prepare() {
-	# automake-1.12
-	sed \
-		-e '/AM_C_PROTOTYPES/d' \
-		-i configure.in || die
-	# automake-1.13
-	mv configure.{in,ac} || die
-	autotools-utils_src_prepare
-}
-
-src_configure() {
-	export loader_run_path="/usr/$(get_libdir)"
-	local myeconfargs=(
-		--with-tcl
-		--with-ngspice
-	)
-	autotools-utils_src_configure
-}
-
-src_compile() {
-	autotools-utils_src_compile appdefaultsdir="/usr/share/X11/app-defaults"
-}
-
-src_install() {
-	autotools-utils_src_install \
-		appdefaultsdir="/usr/share/X11/app-defaults" \
-		appmandir="/usr/share/man/man1"
-}
diff --git a/sci-electronics/xcircuit/xcircuit-3.9.73.ebuild b/sci-electronics/xcircuit/xcircuit-3.9.73.ebuild
index 48d29c176683..62140eb5a226 100644
--- a/sci-electronics/xcircuit/xcircuit-3.9.73.ebuild
+++ b/sci-electronics/xcircuit/xcircuit-3.9.73.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
@@ -11,7 +11,7 @@ HOMEPAGE="http://opencircuitdesign.com/xcircuit"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86"
+KEYWORDS="amd64 ppc x86"
 IUSE="tcl"
 
 DEPEND="