gentoo resync : 04.05.2021

8 files changed, 82 insertions, 6 deletions

diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 1027beeeee59..1d7663affcae 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/kdiff3/Manifest b/kde-misc/kdiff3/Manifest
index 3738093a279a..5e13dc6ae16b 100644
--- a/kde-misc/kdiff3/Manifest
+++ b/kde-misc/kdiff3/Manifest
@@ -1,4 +1,6 @@
 AUX kdiff3-1.8.3-hidpi.patch 5069 BLAKE2B 3b62e3e06a5704e1bf2b49472ffa5b4bdcc985733cf0ea3ca77e62ffd90bb9a9c17a0997a81b91c376bcd9a967ffc3458a26951f4381e8d16d0330fa62bf3ff6 SHA512 207767a8375b3ccffdfb0c222992e2556e8fd1449b2bca8f6ec771d6c83bea296973b0c76085ec4b8333527c7c9f4ddb50f6dbb016206a3bf139232d21784389
 DIST kdiff3-1.8.5.tar.xz 1045812 BLAKE2B 347403c12c313cbfe124de3d67cd34387eb1dc2e9cba837a53354cbc6c1aa915d5aed3f67e7f0cc3f7268815c605c30a25bed2a0cad42c223d005aa7553e0415 SHA512 5ae736b290a6a1a34dd3e19028fb43b398ad1341982e7717d3de4326938c2dabc11e7e172e5628d2deeddd942b67d6e3af02d074c9b2a1c902c7e1ea8d7f1af4
+DIST kdiff3-1.9.0.tar.xz 1052284 BLAKE2B 50362fe1949162dafa50ec5261d793bfb7eb836030459f575a114c127a84bcd6876f0292cea0d4173efbb1f4aa933dcfc08bb6b0147eb3db82c90ecf7b1f1f52 SHA512 5bf086816d0ab83cfacf71179996a7b934c799e356007e2f72b62bd69af3eacea748a2bcf48f98f30fade6c6d8cd1fca1d0c37e1ed1bed97150c64800d787df4
 EBUILD kdiff3-1.8.5.ebuild 1060 BLAKE2B 90af39a2d93a2b80970e8375688b367bcfe4f1e7b9f01c8f1dd7fcc2c65f8d45a874d87bf8d5149536c2f59d50b74a123736ee47173b18d8d9e7bd01b86be3bf SHA512 c4e4f500c6016a456e89a3b2656267d56b6839ace4e4804d68af26cce6ca3a01ef88775ed1f23c7805e9fdd70414ef0afe9c7777376ac220122e757181af5c84
+EBUILD kdiff3-1.9.0.ebuild 1063 BLAKE2B 06b51d99b9a028858517f01ca45a1134221dc47d86a08ba1160d2fb7dd45fc124512046dba2203944d090735cbc222ff70565f99e4479b641d3cb577bd37723a SHA512 43db2ebce0e13521f5a54bbeea342addfd025ce37986e6e03f8a816edbe2d69a9c2c04e00af60032ab99ee0589892f8e84bc80378fc8ee2f63ccaba25e7fc3bf
 MISC metadata.xml 362 BLAKE2B 45686f239bfb936fe11982d8bd2b51380cdfef94c11e5a6fb224c030154bda8b27190052b1705e010fd22305dd2830b8f8b385b47fc647f7c80b2ec01a1f579a SHA512 1fb8f10c3632c0007e65be57dbeb2492ad0e90a79f0403ce4a350a6ea0e1764dd1ee5038b0381049a6715bab2d7c38fc83c0b8f338ea7958bb34df499f355100
diff --git a/kde-misc/kdiff3/kdiff3-1.9.0.ebuild b/kde-misc/kdiff3/kdiff3-1.9.0.ebuild
new file mode 100644
index 000000000000..b9bac1df1bdd
--- /dev/null
+++ b/kde-misc/kdiff3/kdiff3-1.9.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_HANDBOOK="optional"
+KFMIN=5.74.0
+QTMIN=5.15.2
+inherit ecm kde.org
+
+DESCRIPTION="Frontend to diff3 based on KDE Frameworks"
+HOMEPAGE="https://apps.kde.org/en/kdiff3 https://userbase.kde.org/KDiff3"
+SRC_URI="mirror://kde/stable/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="5"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+IUSE=""
+
+COMMON_DEPEND="
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtprintsupport-${QTMIN}:5
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=kde-frameworks/kconfig-${KFMIN}:5
+	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
+	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kcrash-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${KFMIN}:5
+	>=kde-frameworks/kio-${KFMIN}:5
+	>=kde-frameworks/kparts-${KFMIN}:5
+	>=kde-frameworks/ktextwidgets-${KFMIN}:5
+	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
+	>=kde-frameworks/kxmlgui-${KFMIN}:5
+"
+DEPEND="${COMMON_DEPEND}
+	dev-libs/boost
+"
+RDEPEND="${COMMON_DEPEND}
+	sys-apps/diffutils
+"
diff --git a/kde-misc/kimtoy/Manifest b/kde-misc/kimtoy/Manifest
index 6d6c31a625d4..c691deb3f028 100644
--- a/kde-misc/kimtoy/Manifest
+++ b/kde-misc/kimtoy/Manifest
@@ -1,3 +1,3 @@
 DIST kimtoy-1.92_pre20190225.tar.gz 435142 BLAKE2B 86f40774cc5c01a49996f80a4257c3ad18787a9e269a0cddb489530ac1d0a7b84dc5f6eace35374975f24fc15738c02d03da6637e6e6edcba48b27e235ca030e SHA512 9b6b6c316e683d3ae80226e91e17a367970a9380ee6f100798be48f1e29c14b39b9ca679a36b26cfe6a09aae4deaee2f7db4b2a1a7b587e3d7b26983ae6eaffb
-EBUILD kimtoy-1.92_pre20190225.ebuild 1882 BLAKE2B a54202fdb0b88690eb2c699dd9fd93a2e23f21bae0fd69388a683db64fedce687f70b3ab349c1e3c3e59275c16dabf7a9ef5b5fe6e4a055f1756ec6edc140801 SHA512 8007f396b186438d4a68d3366902281ee43aec3014483960e730c1ad7dcd12691254f27c0d3ae31b41f8944a213effb9790baa5abaf60269fa836da0423155e6
+EBUILD kimtoy-1.92_pre20190225.ebuild 1823 BLAKE2B b15d824b6d6e67eaec80cf0f31c705642de88fb30e39c9c80f975dcc37b292bac39de26c6fdefe4bbdef4ded4fe63d7aa5f1f170142bf5dbcefbfc007877962a SHA512 047b6647b7b05a402bad5e05fef8c732d75c96001de1bf887ef39c12d0969a653623d326ae2787269694ba2bab30b228b8930b774c463a029f4b2b54c5d4b758
 MISC metadata.xml 332 BLAKE2B 76b0c29f1f9f6a1ae4c576ebfeaaa4faeb0b8ad04b1bf354a23c358c2c7fc73fadc27e19d68e1bf8b7436fdae5ed896c98018f43d76abfd303cc3868678bc080 SHA512 ef7ec3391d65f9fb9bf6d7efe6ca50137f7668dbc855694e14a8999eb48a7277bf64d0480e4a91d3ce2d74e144d4424576522f4e15ed6bb57a0b9f24c16cb285
diff --git a/kde-misc/kimtoy/kimtoy-1.92_pre20190225.ebuild b/kde-misc/kimtoy/kimtoy-1.92_pre20190225.ebuild
index 9c204ca7344b..44721fcb2ac9 100644
--- a/kde-misc/kimtoy/kimtoy-1.92_pre20190225.ebuild
+++ b/kde-misc/kimtoy/kimtoy-1.92_pre20190225.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,7 +18,7 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="5"
-IUSE="libressl scim semantic-desktop"
+IUSE="scim semantic-desktop"
 
 DEPEND="
 	app-i18n/ibus
@@ -43,8 +43,7 @@ DEPEND="
 	>=kde-frameworks/plasma-${KFMIN}:5
 	media-libs/libpng:0=[apng]
 	x11-libs/libX11
-	!libressl? ( dev-libs/openssl:0= )
-	libressl? ( dev-libs/libressl:= )
+	dev-libs/openssl:0=
 	scim? (
 		>=app-i18n/scim-1.4.9
 		dev-libs/dbus-c++
diff --git a/kde-misc/plasma-pass/Manifest b/kde-misc/plasma-pass/Manifest
index 3f21dcfa5110..6c9cf05e8816 100644
--- a/kde-misc/plasma-pass/Manifest
+++ b/kde-misc/plasma-pass/Manifest
@@ -1,3 +1,4 @@
+AUX plasma-pass-1.2.0-no-werror.patch 1002 BLAKE2B fa3e277368aca8eb55d26aa1cc05fdd4929e856a7c29188570ade8e07e56b5086aacea3eaf031049560c8971a4840ab7f7f5f3d267dcd26ecbe47055e21d3889 SHA512 aa9bb752b20068fa8c56a650181d78bd718e2ef9b8e9fd04409335e1cfc06db14df7587246e2b47e0b701dd98729fc14b0134a2aa7f75e1dd4b2a800cc9e7550
 DIST plasma-pass-1.2.0.tar.xz 34324 BLAKE2B a6fce04ca5b29066f026e01bb62a2ba4f312795bc4e0676fad82e7a7612ac29386b34047b74cda68ee1cef1fe08cb28ccda6c214565f18573594c281a3dd8658 SHA512 4ac72af97a8026022459c46eb3d8dec1489dedf0ea47ab8c71a5ab92a9c5e2faca92ef2ed512e5cd0cc181a6aa7b6ab802ae98ce525e97818704e0bf58e4603a
-EBUILD plasma-pass-1.2.0.ebuild 921 BLAKE2B c4e5d2d6dbecf1f0edcf8f70b4740b45ad46371a03ec4ac32ce5d967eedf4008d29870a393ed0b8290f3211c6c9895b07e200a4fc16354edf1e5810521314bcc SHA512 fb11b82056277f41da3a1edbe9f847b10fec657b77aae06f25529d567b363573f08d3337ec9078cd6607ddddabab1472824d96c4034c23c11b411a2cb535827b
+EBUILD plasma-pass-1.2.0.ebuild 982 BLAKE2B 533c7f957898cf62f17bc75edd10e47cec6f411ccfe3ea069ec37eb22d68c20f213280d3f584fe0e21fb6439b31f2af7dcb9107504e37808f162e5e2faf1fa1f SHA512 20cb7e6bb9ea0d336fd30a87dbee1fbef578d259226d722ee767d7520d9cb73cb350c21d45670e10bfeb14f735010b3f5d1b1affef9f5bf1efb8934f1796d810
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-misc/plasma-pass/files/plasma-pass-1.2.0-no-werror.patch b/kde-misc/plasma-pass/files/plasma-pass-1.2.0-no-werror.patch
new file mode 100644
index 000000000000..42c40bfe923a
--- /dev/null
+++ b/kde-misc/plasma-pass/files/plasma-pass-1.2.0-no-werror.patch
@@ -0,0 +1,31 @@
+From 468db75d4a4f2620921c00ebd91fd7d12e7a2bce Mon Sep 17 00:00:00 2001
+From: David Faure <faure@kde.org>
+Date: Sat, 1 May 2021 21:58:56 +0200
+Subject: [PATCH] Remove -Werror, one can't predict what future compilers will
+ do
+
+I assume this was supposed to be set only temporarily.
+
+CCMAIL: dvratil@kde.org
+---
+ CMakeLists.txt | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 8131494..26cea6e 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -46,8 +46,8 @@ find_package(Qt5 ${QT_MIN_VERSION} CONFIG REQUIRED COMPONENTS
+ add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x050d00)
+ add_definitions(-DQT_NO_FOREACH)
+ 
+-set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -pedantic")
+-set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Werror -pedantic")
++set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic")
++set(CMAKE_C_FLAGS "${CMAKE_CXX_FLAGS} -Wall -pedantic")
+ 
+ # plasmoid
+ plasma_install_package(package org.kde.plasma.pass)
+-- 
+GitLab
+
diff --git a/kde-misc/plasma-pass/plasma-pass-1.2.0.ebuild b/kde-misc/plasma-pass/plasma-pass-1.2.0.ebuild
index d713294e830f..b62a307e42dd 100644
--- a/kde-misc/plasma-pass/plasma-pass-1.2.0.ebuild
+++ b/kde-misc/plasma-pass/plasma-pass-1.2.0.ebuild
@@ -35,3 +35,5 @@ RDEPEND="${DEPEND}
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 	>=kde-frameworks/kirigami-${KFMIN}:5
 "
+
+PATCHES=( "${FILESDIR}"/${P}-no-werror.patch ) # bug 785832