gentoo resync : 18.12.2020

11 files changed, 115 insertions, 8 deletions

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index 8c61ca097582..866c5683fb17 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/ffmpegthumbs/Manifest b/kde-apps/ffmpegthumbs/Manifest
index 5e9ee754eca7..8872c0eb4a0f 100644
--- a/kde-apps/ffmpegthumbs/Manifest
+++ b/kde-apps/ffmpegthumbs/Manifest
@@ -1,5 +1,5 @@
 DIST ffmpegthumbs-20.08.3.tar.xz 32164 BLAKE2B edb1a898709d8a6bb5591ed055b5f28c5424321558a541130e3b61b516c2fecab8a7498bdc53a33949efdbe365c6fe49fb59fc9d3bef28dabfcf2bd2fcfe8c2b SHA512 03dbd65bf2d2151bfd6f20bafeba24df78c8be97188878e79e3566e1a5d11bac0d4959507ae997b45026533b985f60acbbcc68faca730663f8dba888a8b93b5f
 DIST ffmpegthumbs-20.12.0.tar.xz 33936 BLAKE2B d12f352a1fb108db24dafc1ea2ce226e2e7314047177a2afde96aa1a39dd123ae9b36f87e16dbdac40b5e6207b946e103466e6ca4bb87bb9bd7f2ba419fbcb83 SHA512 41cf587e1a3369542e16d8819d97e1f229c52ba2bbdaab39a8f6a856e96e00613bf22cc0abfb0aee2ce81e79fcb2daea876f3ea1ee3d55910c03699a804089f8
 EBUILD ffmpegthumbs-20.08.3.ebuild 541 BLAKE2B ef9330dbda1ad092fb8931e528787cb81017fbd8b2071e4cfdb60d506a01efbc1fa0070ec001f2a7e97034a1247bbbe727eb3473e45fd99da0c225c25dea097d SHA512 e0a1230f6216b2cd6ec6b6d5e340a9288844bdb454dd6a28d2dd34878e1ce6b564bc233b483a8be14c615d3b8a8dda521c592037930753dcd9859b4187588771
-EBUILD ffmpegthumbs-20.12.0.ebuild 544 BLAKE2B 82b4c019342c1e960cd933ba4b59b8c229bd6346753df6eac32c08d1edfea2c12616f758778cc63e3c23d7509724df726c2755cc24468fa2b216769ba42d85cf SHA512 4801b9837ccfdbbe1c8753112522737cefd3fd7ba140e67d03f7f40bc2d92fa4a2bf403d9ebfb9e3babb80d427c4e3b2e6dc0d775da38de4d2e7426fc206b603
+EBUILD ffmpegthumbs-20.12.0-r1.ebuild 563 BLAKE2B 649dfacb55630380f07949c4927641394670640949762053e9b14e559248d0d528888027e7612d862fbd11ae966fd91b8f5ae9706bdc7f8baf7cafcafd7cc82b SHA512 b4bebcfc6827524ebb57fd050bd601c98509c01d97058c476a90b0bb743bce078c5b6c33541ab4eaf17b31ecb66a274ab5cf49882e5ac7436d7f5f2290c44de5
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/ffmpegthumbs/ffmpegthumbs-20.12.0.ebuild b/kde-apps/ffmpegthumbs/ffmpegthumbs-20.12.0-r1.ebuild
index 9b0d864bda9e..f4d833b787ae 100644
--- a/kde-apps/ffmpegthumbs/ffmpegthumbs-20.12.0.ebuild
+++ b/kde-apps/ffmpegthumbs/ffmpegthumbs-20.12.0-r1.ebuild
@@ -23,6 +23,7 @@ DEPEND="
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
+	media-libs/taglib
 	media-video/ffmpeg:0=
 "
 RDEPEND="${DEPEND}"
diff --git a/kde-apps/k3b/Manifest b/kde-apps/k3b/Manifest
index f5244a24e864..abf10e4caea2 100644
--- a/kde-apps/k3b/Manifest
+++ b/kde-apps/k3b/Manifest
@@ -1,5 +1,5 @@
 DIST k3b-20.08.3.tar.xz 10684548 BLAKE2B bfb9a06fd5b9c023fe7a9c1c93fd2f473941906870f8face596617cf5bc2e26e258cc6adbe9fb7a99da0ed5bd9f09273168408133c8d6142bd42dc4779e2fa32 SHA512 0d068f10d8dd287a33ca672e780673b7f6a92c2071ea9ec22176ea4a9a210e205eb1b605ee23edca4d2e7eaefbe2dead04ef8b8ee29b690f38185e3caae14ba8
 DIST k3b-20.12.0.tar.xz 10684460 BLAKE2B 865b36f8c14c372967851da484155dbb472cfb990e4e6f215d180682eaa9390caf05c222660bcb54b41d3f90b8dbf16b18a896145d517553bad719691c6a096e SHA512 fb1cae4cc10dffeab522d4cf28c03520fec8bdf2baad3b37637521be614f0a9174672579f3ab5fee3fd759ddc3625b46cec889e7123dfdba870d3fbde615ac98
-EBUILD k3b-20.08.3.ebuild 3438 BLAKE2B a3dadf1a955dc72e7c50d3f7b203bd4da5dda48a0acd7f8a5d214a63157df00dba5e8a530c35f0547c4695a1f920db669acfeb4f51756080acc9d45286f51f22 SHA512 1e17cf400baeba16e7a5350fae39ce5ff9d137062f6a08ae151a8d3452c907a8feb772820dd0196d9391c2713081866cd48db56c5fca2ae5ef9d0947523007db
-EBUILD k3b-20.12.0.ebuild 3441 BLAKE2B cc4dc70ea124b1261d382f5dd81838f56acaf79944ff5590f190681888fce8cb65297514b343cdc5a11240e57cd149a77a7a48aead404398ef85a2b757eb33e5 SHA512 23f93a952bf9c8c8bde2bd5a1e72eb470f67862cdca2ba643cddf4821844ab5906eb314ba3d0f3fccc6cead47eabd032becec92fa5ab95a84e334c4927430785
+EBUILD k3b-20.08.3.ebuild 3438 BLAKE2B 5fb85afbf32ec5f1ec912b2e9058ec0b455f7dbc4ee594b78d9265c4ef39172ed492f25bb7b2bcffc2f10ecf10fee19af9658c73723610148fa569ea40c031eb SHA512 ce21464e436c493918e7440f01d6c16746ad4e73ad4a21f848212fbb99cd8d6a62e6b42852bc27486d81273fd51879be8ff5bd921e481b941e2f1b914ecab3e6
+EBUILD k3b-20.12.0.ebuild 3441 BLAKE2B 8c4d9b97de0e86d8b293092b0e56a7c1f324cd195be08c91a948a67aa14609ee1a172ce179400d7b085454ab4d6c113704c40dfdb5698eefb9fa0217ec50973c SHA512 e4cd9dddbe592d3603d4fc12198df4895307be8c6ac42b9e0858569ce7dc3e812fde58cf05ea6694b205c13666b89b2ea7f937ed79f73ee1e4e2410f8cb4f238
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/k3b/k3b-20.08.3.ebuild b/kde-apps/k3b/k3b-20.08.3.ebuild
index 7187e896a880..cfe5805e1339 100644
--- a/kde-apps/k3b/k3b-20.08.3.ebuild
+++ b/kde-apps/k3b/k3b-20.08.3.ebuild
@@ -66,9 +66,9 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	app-cdr/cdrdao
+	app-cdr/cdrtools
 	dev-libs/libburn
 	media-sound/cdparanoia
-	virtual/cdrtools
 	dvd? (
 		>=app-cdr/dvd+rw-tools-7
 		encode? ( media-video/transcode[dvd] )
diff --git a/kde-apps/k3b/k3b-20.12.0.ebuild b/kde-apps/k3b/k3b-20.12.0.ebuild
index 2b788559cf74..dac793b68014 100644
--- a/kde-apps/k3b/k3b-20.12.0.ebuild
+++ b/kde-apps/k3b/k3b-20.12.0.ebuild
@@ -66,9 +66,9 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
 	app-cdr/cdrdao
+	app-cdr/cdrtools
 	dev-libs/libburn
 	media-sound/cdparanoia
-	virtual/cdrtools
 	dvd? (
 		>=app-cdr/dvd+rw-tools-7
 		encode? ( media-video/transcode[dvd] )
diff --git a/kde-apps/khelpcenter/Manifest b/kde-apps/khelpcenter/Manifest
index dbe73a698e3e..c6f42079f34b 100644
--- a/kde-apps/khelpcenter/Manifest
+++ b/kde-apps/khelpcenter/Manifest
@@ -1,5 +1,5 @@
 DIST khelpcenter-20.08.3.tar.xz 4250844 BLAKE2B 62e8b4f952603ae9bfebbdc28ccb80d3ee92c6b16ae4cc3f305a5cc54f7e55fb7d48ecfacc28e1cb99e5355adcb62d85772ffca1055b60541ba3ccfb732f288c SHA512 cfc4118ff2dc1adb2f477f5520c37373c20f08e5ce28387f8135aa00f9d464cf97e72b4fa9c51dba3867930f5e42e839313e4ee2fc85b12dbf4d9b2d734e8934
 DIST khelpcenter-20.12.0.tar.xz 4250636 BLAKE2B 8b10d9c02edbe5894517a03e453cadbabfa09410dfcc7a13b97822f684f64621dae677943f9923de1c867c64ae98371d8caa097c189a60364c927ab129218fa8 SHA512 165f6768ec5c38f5e344a6d3a4696e2ad537dad884edb5be7d8f6047f56c300953ea8fb64ac8de9877f72781a45e0ba3068bdd4b6f8d4f0b31a10247843baec4
 EBUILD khelpcenter-20.08.3.ebuild 1488 BLAKE2B d922f987383c9f74afc02695126ee2e82e0f6d6f21f93c964969eb3e4dd30a8eb1b7937744b2fd04c8b92885b0c0e54950bfb5d12b0f196c9f2716153ed30cd0 SHA512 3a3387e95891634d300df6048b565e19e8d7b420d14f4964a2a7d8fd8ab5ca3325c1996671dcbe66d83d6f9e76406e0408ec00c7adecc42ba582665528f86448
-EBUILD khelpcenter-20.12.0.ebuild 1517 BLAKE2B 4cbdbf9fc7f45ce161dea0146d1b5a373d32166a42d70980a5961337c9d1c0baa6360a159c5367c98779b4662a71dccec84512f83fd04ffbcdb52b3fe4b47c1a SHA512 c2a156ba75eb4490f892bce1b2be075605746177be5c35a234da71ddcde8939e1c82259f3cb366d83ca13af07e49e06dcf1f872a1dafe33fdb8dbb955b1dadd7
+EBUILD khelpcenter-20.12.0.ebuild 1491 BLAKE2B c9a904d54d72b3b35040493c7117c6aac547ea6a00afb31bcf2330e6cc03f59196fd3f207863c176966c97e20a0355e9302420bee6715006c713b7925f8b39e2 SHA512 4efaa70c29d3a6a0aa43ec7861a397c415699c14c22276620e62f0f9dd68da83ab31a14422cf6cc7e166e4e843ad9fceea02f0c3022c06af35671e8d2664c29f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/khelpcenter/khelpcenter-20.12.0.ebuild b/kde-apps/khelpcenter/khelpcenter-20.12.0.ebuild
index b159d3b04fc6..cccc7988486e 100644
--- a/kde-apps/khelpcenter/khelpcenter-20.12.0.ebuild
+++ b/kde-apps/khelpcenter/khelpcenter-20.12.0.ebuild
@@ -16,10 +16,9 @@ SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE=""
 
-BDEPEND="virtual/pkgconfig"
 DEPEND="
 	dev-libs/grantlee:5
-	dev-libs/gumbo
+	dev-libs/libxml2
 	dev-libs/xapian:=
 	>=dev-qt/qtdbus-${QTMIN}:5
 	>=dev-qt/qtgui-${QTMIN}:5
diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index 746694fd6103..673e5803eebc 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -1,5 +1,7 @@
+AUX konsole-20.12.0-revert-bold-breakage.patch 990 BLAKE2B 9b3d7660e6ee66ed88f5c9e29f92aec0b886e372068fcb6fa05822e1016e4290fa992912d9f70f6dc3b3b20c336a54dc36c13c46f1fdd1309817058fc0405b0d SHA512 9f21b725186654fea9131ffc2cbe3e89f9ff23f0c3cc9c45803bfc8303f7e47ad686268ad9acf3a3558210f3b338d19c08d05c486ae79822d549b8686d8afaf7
 DIST konsole-20.08.3.tar.xz 1212868 BLAKE2B cd3382e8df7f71639e11464a0cf28c087f28f8720c8631aac1970b827f6c377b5c86a9c38e93a5566bf9bdf7b4d36efe4691408e18657dc9566d899bdbc62205 SHA512 8025548b02523c58d4f98ea8950b1001a0223bb8c53d506928707f97d96a3ca4621c6fa6fbf14eb9ffdbe1cd171b4aa9ed2f8c8808eafa166d0f6764f590a5cf
 DIST konsole-20.12.0.tar.xz 1236116 BLAKE2B b03a6a15869fcf720d77ce0c559b9a9942537d6560a0e8d4805ba4138d43ec0908fd23b596159b911d946a9eb4c019c1b523c0ec1a1fceceb8d3cf8032e41e71 SHA512 a77127618167d451ec1ab6d6879a4949d5bd268cfdc827dd31f8bea0b69f71aec1c3e5ccb6d34767b5fd13cb9f9a6157acead23311c796adb9b72f6265e2b95e
 EBUILD konsole-20.08.3.ebuild 1768 BLAKE2B c7a75d4410444e4d8b6d1f676ee178005a2ba06acdf62d94b8fce4eaedddeab6d86bb91d0f915b10a93a066b4417a982ca1d53319f830122fdee4b368e853be1 SHA512 7fbd1923dfd5ad5422a89a65f4679d4d86b9643853fa2325fbfd4677ae10f3ef24b250387eec47ad68e869ab54e2dcc583d23addf35402b6aecbea161f28139d
+EBUILD konsole-20.12.0-r1.ebuild 1830 BLAKE2B 388ddc7ed5d9701cfe52a1f82eb7e2e546c8bf41d48845d67d070df47e0444cce28ef68c1ba89103053afe98d9e0c138b0525593d2080c1cb660a632eccc597f SHA512 3d7decf6788a1128aaea467b49986a881bcf9338aa676e7983f3c2284249063b59c786ca0194aa012ebe02c07f4cd16e108306e1b23738cc8983aee8a7f6ddec
 EBUILD konsole-20.12.0.ebuild 1771 BLAKE2B 7c13724e7da5694e5b7284a5f68a9b3eb445ef0823b646d046fc2045d0815eb1fb1b81188838877c66dbd5e7fb472d855e7a3cb59a4cc6999a33afbb373e9260 SHA512 b5fd22304f5a97d8737d4800e2fcf68676d6ea85d6df619944ac4544a819b83d06e0498f2088c41505db67cfbd390c1453464550296afcfff96f8656c4bb518b
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsole/files/konsole-20.12.0-revert-bold-breakage.patch b/kde-apps/konsole/files/konsole-20.12.0-revert-bold-breakage.patch
new file mode 100644
index 000000000000..8e79793601e7
--- /dev/null
+++ b/kde-apps/konsole/files/konsole-20.12.0-revert-bold-breakage.patch
@@ -0,0 +1,33 @@
+From 08a51bbdd70c0c850f44a660a7efbe4c394b8ee3 Mon Sep 17 00:00:00 2001
+From: "Jason A. Donenfeld" <Jason@zx2c4.com>
+Date: Thu, 17 Dec 2020 17:21:44 +0100
+Subject: [PATCH] Revert "Fix bold character color paint"
+
+This reverts commit 270d6ea3247bb41a51535129e4b1c8eef51cf316.
+---
+ src/Screen.cpp | 8 +++++++-
+ 1 file changed, 7 insertions(+), 1 deletion(-)
+
+diff --git a/src/Screen.cpp b/src/Screen.cpp
+index 8e7eee51..c8f477ce 100644
+--- a/src/Screen.cpp
++++ b/src/Screen.cpp
+@@ -474,8 +474,14 @@ void Screen::updateEffectiveRendition()
+         _effectiveBackground = _currentBackground;
+     }
+ 
+-    if ((_currentRendition & RE_BOLD) == 0 && (_currentRendition & RE_FAINT) != 0) {
++    if ((_currentRendition & RE_BOLD) != 0) {
++        if ((_currentRendition & RE_FAINT) == 0) {
++            _effectiveForeground.setIntensive();
++        }
++    } else {
++        if ((_currentRendition & RE_FAINT) != 0) {
+             _effectiveForeground.setFaint();
++        }
+     }
+ }
+ 
+-- 
+2.29.2
+
diff --git a/kde-apps/konsole/konsole-20.12.0-r1.ebuild b/kde-apps/konsole/konsole-20.12.0-r1.ebuild
new file mode 100644
index 000000000000..ddcce96264fd
--- /dev/null
+++ b/kde-apps/konsole/konsole-20.12.0-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+ECM_TEST="true"
+KFMIN=5.75.0
+QTMIN=5.15.1
+VIRTUALX_REQUIRED="test"
+inherit ecm kde.org
+
+DESCRIPTION="KDE's terminal emulator"
+HOMEPAGE="https://apps.kde.org/en/konsole https://konsole.kde.org"
+
+LICENSE="GPL-2" # TODO: CHECK
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE="X"
+
+DEPEND="
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-frameworks/kbookmarks-${KFMIN}:5
+	>=kde-frameworks/kcompletion-${KFMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/kdbusaddons-${KFMIN}:5
+	>=kde-frameworks/kguiaddons-${KFMIN}:5
+	>=kde-frameworks/kjobwidgets-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kinit-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/knewstuff-${KFMIN}:5
+	>=kde-frameworks/knotifications-${KFMIN}:5
+	>=kde-frameworks/knotifyconfig-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/kpty-${KFMIN}:5
+	>=kde-frameworks/kservice-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+	X? ( x11-libs/libX11 )
+"
+RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}"-revert-bold-breakage.patch )
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake_use_find_package X X11)
+	)
+
+	ecm_src_configure
+}
+
+src_test() {
+	# drkonqi process interferes. bug 702690
+	local myctestargs=(
+		-E "(DBusTest)"
+	)
+
+	ecm_src_test
+}