gentoo resync : 13.06.2020

7 files changed, 24 insertions, 6 deletions

diff --git a/kde-apps/Manifest.gz b/kde-apps/Manifest.gz
index f57869db0fb0..af96a0566b28 100644
--- a/kde-apps/Manifest.gz
+++ b/kde-apps/Manifest.gz
diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index 39561dda481c..69418c07eff6 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -2,6 +2,6 @@ AUX kio-extras-19.12.3-CVE-2020-12755.patch 973 BLAKE2B 3d82cb6c5ed37067f518fb56
 AUX kio-extras-19.12.3-kio_nfs.patch 6433 BLAKE2B 66358b2cd0953b8a46492a7f0f7c03b249a25de678c92a7450fdb23098d4c9e483a01690071e54ddf00dd4c982eb00429f3139cdf6624ea4f57b2491420b7a93 SHA512 9eb757d42412193c9ea96f608289a58505bfd385b641c2c0061316063587cda8ec7479e27e63fccac6d60bc2427b7a6cb55ac0e336e214d28d41c466c093431a
 DIST kio-extras-19.12.3.tar.xz 581020 BLAKE2B b4f9ca0812d535222c1a156ef2ce056df95dfab0786b108418fc98da860617c272ffaab044d0faf8559dee04d8bbc799da6eb004bea170c41a1b3bd30e91a40f SHA512 289d4336e563ee38be20f40c146172111ebeb3893edd15c76ad42435b8b1b0967864d8764519cd5c0aaa2580c56b76283076a3598917876b5e22acdf75ba9da7
 DIST kio-extras-20.04.1.tar.xz 617460 BLAKE2B 135414e66510471d57b5397655b4bcea765ce8265e5c02f4d2ddf833faeea2616aac61c936311e1867a34593ebde81c5465774302c050db25224b1a0dd824296 SHA512 1f057280046cff817c0fce57c6d25d7dbbf658da193f5a8f21c1f68157b686783bf41d8b5963fc3538f682c81fee928aae500517dc6fe26dc1a8a0d39efee00c
-EBUILD kio-extras-19.12.3-r1.ebuild 2527 BLAKE2B 84e8dc51fe8ba21d26beaabbb6185bcb1fcddc1dd069389f0f0b7a741ac22714cd5511a1c894cde7bc58ec7feecb1f75ee7fcd725c200303642fa41fbeb4a5ae SHA512 d779ea33910b5289f94de351b636ceb65ec7006f4b283bc7217b7c3a8354fcd367ccd4425c3a96b28a7e6f91f1ca8020b35fc13caad82c1f702fabbddbc6de34
-EBUILD kio-extras-20.04.1.ebuild 2644 BLAKE2B dd7278db6539d302a3297d7a54c5dd9a188dc0a90d58e891870748e7ebf7ec1f4a61e8436aaa695aeefb5dacc691a2dab8c0d77dacbee4b7e085082823486979 SHA512 31348859eb010251a39f5f977d7d6eb1cc53c1b524d11904f18d9d99439735bdc0f7acb62bd303638467ea63c9b60f341bd48c368dd125e8079f6951ee063d79
+EBUILD kio-extras-19.12.3-r2.ebuild 2533 BLAKE2B 4f308f8173433ae81f3c0c6668ce9af4d397d8ca6988be2b07fdafb11538eeebf509e41b5d157dc83b2f4f77683ed29b89466900cf75a5a85252677b430562e8 SHA512 be8c9a1e623fb1c5a97d7cc4706a9b68837396590a4dc58372a0b6c23f7d99ca10d35a3c7d32f9953a35edc8415be03156743f15c9e55ed45996e1d87c203a77
+EBUILD kio-extras-20.04.1-r1.ebuild 2650 BLAKE2B b91748840772da81b0ef923376a169005e16c2ec9c7b7c21b073c436ad0ca52deea729855393d4ab217b616f89663fad3feb8814294fbb626c7c24d309df5f2b SHA512 f30dce699fabb697f5a281da03af18deb17290e466a4ad5c1b697837b6769d82bc28bfa667644870eb010c811c8d0e356cd8eee61400556920b8f23dab5f2133
 MISC metadata.xml 747 BLAKE2B 8972b1b4e04ad771c76e465c066d261cf237c36b9a80ede31a70d7b6af2f91d8c99a108f18c13fafa6b6d5714d8fb2270f85f63706f355c1481a1fd84ecd1562 SHA512 3fd163a8b2861213b00eb84773aeaff95bb5abf40dd20228dc519ea78ef50cd6536c9d6c7d3ef607586765001e90925265e7cfbf763d13cb17c2becaf3a993e9
diff --git a/kde-apps/kio-extras/kio-extras-19.12.3-r1.ebuild b/kde-apps/kio-extras/kio-extras-19.12.3-r2.ebuild
index 0375f8fc9024..d217f1c9cabf 100644
--- a/kde-apps/kio-extras/kio-extras-19.12.3-r1.ebuild
+++ b/kde-apps/kio-extras/kio-extras-19.12.3-r2.ebuild
@@ -22,7 +22,7 @@ BDEPEND="
 	man? ( dev-util/gperf )
 "
 DEPEND="
-	>=kde-frameworks/karchive-${KFMIN}:5[bzip2,lzma]
+	>=kde-frameworks/karchive-${KFMIN}:5[bzip2(+),lzma(+)]
 	>=kde-frameworks/kbookmarks-${KFMIN}:5
 	>=kde-frameworks/kcodecs-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
diff --git a/kde-apps/kio-extras/kio-extras-20.04.1.ebuild b/kde-apps/kio-extras/kio-extras-20.04.1-r1.ebuild
index 7c632f4ca4b8..6035d930bb7e 100644
--- a/kde-apps/kio-extras/kio-extras-20.04.1.ebuild
+++ b/kde-apps/kio-extras/kio-extras-20.04.1-r1.ebuild
@@ -28,7 +28,7 @@ DEPEND="
 	>=dev-qt/qtsvg-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
 	>=dev-qt/qtxml-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5[bzip2,lzma]
+	>=kde-frameworks/karchive-${KFMIN}:5[bzip2(+),lzma(+)]
 	>=kde-frameworks/kbookmarks-${KFMIN}:5
 	>=kde-frameworks/kcodecs-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
diff --git a/kde-apps/konsole/Manifest b/kde-apps/konsole/Manifest
index 2cdaac1f2a33..037259c102f0 100644
--- a/kde-apps/konsole/Manifest
+++ b/kde-apps/konsole/Manifest
@@ -6,6 +6,6 @@ AUX konsole-20.04.1-qt-5.15-set-text-encoding-crash.patch 4206 BLAKE2B 13b762ff1
 AUX konsole-20.04.1-segfault-on-close.patch 1689 BLAKE2B 560624e969f422cc1fff715069d85f307578097aab2c1ad973466f360568ce4c3582a15a1ab55509521d88ca6609739ec1cb116d36faf491c7794e1aa964e356 SHA512 d205d7126897686803f8f8948c87e1889e21450ddc2e380fe0403e040f4aa21146a688d856d7a3e107ad074f3a8025a93b212d23c666c82c348294bf64c59166
 DIST konsole-19.12.3.tar.xz 1160780 BLAKE2B b4a6c794951081ff9354c68c1177836b8462c0e2ec19b39b08c6e90f8837b58109e5559ab93cd1f7520a6ffbbd651d0d92bcc3c359815e7264744fcfbde02cb0 SHA512 980a7eab4efb219acdda8873318980ba14cf7d3fc4f78ac171f8ed1e11400b3028150140aac192820771a0ac8e596fc0f6497c4a44d74bbd1c421f72a39da289
 DIST konsole-20.04.1.tar.xz 1165784 BLAKE2B 160dc2c0f4f5560e060e13ffc2eac0a02ed33060e66778e92eaea2c7c03060fbf2e8107d26f401ea7f96b33838f23de13737f48db11cce7b5b1eff4bae9ffc8e SHA512 608bc4e9652e1129b219867c01b40ea2aba4044b9827b6b39ef0d2fed436dfd091c3cd4f568673122761ceb3106e8304d490b0ad5b73210d1890a5ec9e516fa3
-EBUILD konsole-19.12.3-r1.ebuild 1897 BLAKE2B a11f6ccdfee28af3dcd7ed941ef9fce07cbc8792a167b7145abf2147d39bc470a7981fac8e2274204ce52859c07a9a9d48b25e94b9eebc566cdf59b3e675ec8f SHA512 c314087217a721d51d22d7c3360ef1c773086b20c38a0fd4ce6710aa1006a3cef07ca64d37debe3fdfdeef2d8c37b4780d13fbff600f67f315019d5a4958a177
-EBUILD konsole-20.04.1-r2.ebuild 1909 BLAKE2B c5aa5875a9b6c412d2bd518480ac82e5041f1bb59ec0383f04168f7d8f92245abb1b140f513f8f1269046c5cc07fefeb6cae1b114cd4d3d78a56b262bdfaf39c SHA512 70cee59aef93d07d2fe8f99ebd9bf4e909ba277eb53ced5e848783b63fb406c98b80e3f29318b39678436b85e912b0594ad4bd9dc4565d5e677ebf1c513377c2
+EBUILD konsole-19.12.3-r1.ebuild 2012 BLAKE2B f84052caaa7cc7339f0942402e08e0b856b5f15258789fd1f9d600751d3686e83534e20de534535d15e8ffa20fa40c4f22968ce5a753b3c7fcadd7d854f9ac80 SHA512 c4ade02ceabebda1f323ada448802f7495e09922722a9dab4beda8630068c5cb533a9cf148a6df4257afa55ce1231299265e0b0212187980a1ebc2be8dd14b81
+EBUILD konsole-20.04.1-r2.ebuild 2024 BLAKE2B d55d374de3a2c15bb66601679a60a13ef2f4ca4d2e2a747177a015649748bf20f9d733dfe9ffbeb8a6bff3fac602e6a168ca36b2bfb87ce0b95ab70d89edaca0 SHA512 f3f11acb99b7bd982ff1e865b77c099ffecc0a9ad6b1556725d5243b7308bb8453c7fb5afe4022898230290a46695bf675ac0313928b7cc1e9ec752e572040c4
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/konsole/konsole-19.12.3-r1.ebuild b/kde-apps/konsole/konsole-19.12.3-r1.ebuild
index 26ddf0f38920..6799320faf82 100644
--- a/kde-apps/konsole/konsole-19.12.3-r1.ebuild
+++ b/kde-apps/konsole/konsole-19.12.3-r1.ebuild
@@ -67,3 +67,12 @@ src_configure() {
 
 	ecm_src_configure
 }
+
+src_test() {
+	# drkonqi process interferes. bug 702690
+	local myctestargs=(
+		-E "(DBusTest)"
+	)
+
+	ecm_src_test
+}
diff --git a/kde-apps/konsole/konsole-20.04.1-r2.ebuild b/kde-apps/konsole/konsole-20.04.1-r2.ebuild
index 95fd7ffcee35..c532b9d1b71b 100644
--- a/kde-apps/konsole/konsole-20.04.1-r2.ebuild
+++ b/kde-apps/konsole/konsole-20.04.1-r2.ebuild
@@ -66,3 +66,12 @@ src_configure() {
 
 	ecm_src_configure
 }
+
+src_test() {
+	# drkonqi process interferes. bug 702690
+	local myctestargs=(
+		-E "(DBusTest)"
+	)
+
+	ecm_src_test
+}