gentoo resync : 15.06.2021

5 files changed, 37 insertions, 156 deletions

diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index dad2ab40ec5f..884183b0b3d4 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,9 +1,8 @@
-AUX plasma-desktop-5.20.5-compress-new-input-notifications.patch 3572 BLAKE2B 90872167841b752dd3803d176cddc5ff053e64a4f0dd95bdfda8565c683c0e837b8df7e34efbc16abcf95b75821b73a7ea114da7dfb4ccbec73d3921d8d131eb SHA512 2468be82790c7beb41d8b40aaae5b0490be04761b687188790bd80d0c66ed28a7b26468dba60338bf4ea45a15700e32c1ade1fe1530d693457a9470b7b10f883
-AUX plasma-desktop-5.20.5-kcm_keyboard-no-setxkbmap-on-camera.patch 995 BLAKE2B b4e00a862885bae9cad600c0a67dfb1578c2bda0bb96b9585d5690f3d4303de1cd6808c7abc3709c030dba25c98d9cb7d4e8d0aafe0d1b89ffe48a6b9d15101a SHA512 3ad5a021eef8a20564b06a4a67952484712733efb989274438330343d40c86164fcacfe41d39b36d8ffb8839de1be17b63b39ed0ac705b5dd660bb2bdf22a9b9
 AUX plasma-desktop-5.21.5-transparency.patch 8828 BLAKE2B d847a5daf3836ecbc1cbc0bacb8e6a507e5a060330d835cbb5500982d0d20148831be53e39b9613fb48d0cb5c3203b00dafa7a627ff4471d866ac6217691b729 SHA512 9b7b73d59e7d52a1acc4eb2db498c8baa31853561900653c86d6ba651093099c4bc98197a23914276ca18553c538a79b927f5829feefbbbc76592f36947fc8c7
-DIST plasma-desktop-5.20.5.tar.xz 15899532 BLAKE2B 1ed7d6c1bbc8b368ed98c4f35bcfd10f8436909a8f66fbfdf2e4e5eb8b8dcd36903600a934512dac7a07d54ef830ed2604e1ee39df6e40156ef7cec1e96dd041 SHA512 a1af8d04dbf16e94777e018ff0f289b69928ccefeb31e6dc73a2425d6170a0a5a3fdc324d192b41664cd118eea9b15cb6e7bd3f49ee03095ede16a3fa53a6f2b
 DIST plasma-desktop-5.21.5.tar.xz 15913496 BLAKE2B 6923a4c48d20f2611ab92ec34517a339a4fbc53875545beb5c33700933262f67b48b22ea311812d7b0cd4a169a4b19f497c0cd559c5b5f74e52410e30c187ec7 SHA512 40814910676a05d3d5a308a432c06ce9664b90724fe8c56c4f68f6eb939f35401f19dddb8c46006f44fa418e0f18b4a42b0ff78b5b07031f54e6b3c10c919e57
+DIST plasma-desktop-5.22.0.tar.xz 15736196 BLAKE2B 144336f1ab80d1b0c9f32925bc6f487583d454ac43c479fc4e4332eedfaeb9e29d43683fa007d74ce5d780a9e5d95eea4fc79cec16612d7e0af4c49d97ff60e2 SHA512 b2799e196079519e2e3da27d6d41f2b9f606a1e703d3edb1a6c16fb74fc5d2a7d9452872cb70a3f3e8f699fb7951a9f178370744fd9989e1624294401d83d3ba
 DIST plasma-desktop-override-include-dirs-0.tar.xz 7504 BLAKE2B 781a2f0f7ca5a45b966edfc79012e80c6826262a211d95b725590191a8828e0002fd924a49cc63c12090535077a24f3e719ca3277aac89aba3092e86f73d7f61 SHA512 d23dc203b8b645472c9c192a3d73ef9b46c66d9c64df1c90efa05c9968ec125e0a256bc9b654f05a1f22bce4b1d8aad436f581b42d579f4195a44f062fd444bb
-EBUILD plasma-desktop-5.20.5-r1.ebuild 4879 BLAKE2B a099ab12d2c22952694f9990180523bcd3d36c2f2166baa6d8fc78a6c81a9c69d48b3cbaecb1d96984ad629bffe16709ab193069fdb5f4f522691b993a8c14a8 SHA512 74bd8aa888856ca1ea599e5df140f4236db55a4e18f0e4a4a69119c549649822cb7ac28a40ea1a596d9b72427dba98852b17a5dabb7eced8e5472d537be3ebab
-EBUILD plasma-desktop-5.21.5.ebuild 5196 BLAKE2B 60c867601091f91d2f4fca44a30423d7701e9f41ec1527dbbee1a6ceac875699007ec370a05a6d051c9ad6f4f61cf1f4f55e5599dc50634d6876876ddecb853a SHA512 50a309c3ddd1c9ffb30e7f10caca7d68fbb373d0b102b2a9509c043e79070046113de086bedd92004ff22550dc1637ae38fe27afeeacaf404dd63cf864286349
+DIST plasma-desktop-override-include-dirs-1.tar.xz 7888 BLAKE2B f1e416fa0ed27cfe6e049cafc66d1603bb4f76f0cec16dc47339a238cbb485b202adf08ececbb8933a5e1a54954cbd21653d2c9dfec27baa49fdf583acf0d75f SHA512 aa26b4966a5d00c378128ee8ee56025d637f139fcd315bf0aabefa080caecadf8cd3176dee3df87d4f8bdc48446df535260cf64a65055857fb895fa8988e1a20
+EBUILD plasma-desktop-5.21.5.ebuild 5193 BLAKE2B 831ede60054ade3be55b1a7420a4196c4145227502b4f1f8952b7c075bd780f61fc15f06c5627f72e69e75c7a67779770647679f20ee9801157d4473beebbba6 SHA512 906bef59a4f879bf572801ba54b400223dd5c04503add170f42c6961c8332422a1719877acadf7f9d592f61102102c88335764774ef0fc803b9f22b153921438
+EBUILD plasma-desktop-5.22.0.ebuild 5302 BLAKE2B 3343cbf031abf8e4a13178ed10bd8ea5ed5d18b73391eb7881e331fe0bfd75fcb0959bab0904e1de5383eccd2563fa073cb1e4fbd7ab59fd6bf47c802e26f23a SHA512 10940cbb98555c54ccb0d8d6425d36bcb8cfb8ec8d812a28cc1584bc50f97f800e77a6ce1df8613ac3d2e998643c8ef5365e69867dc43cab60a5700b9152c7bf
 MISC metadata.xml 738 BLAKE2B a846c98d05f6e305354ee0fa36d26df2b60c3db3ee348edc64bbd5d5ab3c8f542b573d9ab395607edf0bc83fb95095147dd52a05beebe8790e21f86a45eb6890 SHA512 659770ee7aac2145f99a512049200f1049474fb97b553dd9b54663f104253939d80b3f35a6efc206db3de834862f074aa2cfaae22e2651198f6b9a298adfe6a1
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.20.5-compress-new-input-notifications.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.20.5-compress-new-input-notifications.patch
deleted file mode 100644
index 734ae0ef46cf..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.20.5-compress-new-input-notifications.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-From 199cad52f0599872e57a2fcb391a459e48146be0 Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Sun, 31 Jan 2021 20:59:41 +0100
-Subject: [PATCH] Compress notifications about new mouse/keyboard.
-
-When resuming from suspend, I get 5 "new pointer" and 5 "new keyboard"
-events (on a laptop with USB mouse/keyboard, but also stuff like
-"Thinkpad Extra Buttons" adds more notifications than one would expect)
-
-KGlobalAccelImpl::x11MappingNotify is still called 15 times, but
-that's better than 145 times...
-
-"new pointer" notifications end up calling `kcminit mouse`, better
-also compress that.
----
- kcms/keyboard/xinput_helper.cpp | 30 +++++++++++++++++++++++++-----
- kcms/keyboard/xinput_helper.h   |  5 ++++-
- 2 files changed, 29 insertions(+), 6 deletions(-)
-
-diff --git a/kcms/keyboard/xinput_helper.cpp b/kcms/keyboard/xinput_helper.cpp
-index 14974ada7..bade5ea33 100644
---- a/kcms/keyboard/xinput_helper.cpp
-+++ b/kcms/keyboard/xinput_helper.cpp
-@@ -23,6 +23,7 @@
- #include <QCoreApplication>
- #include <QX11Info>
- #include <QDebug>
-+#include <QTimer>
- 
- #include <X11/X.h>
- #include <X11/Xlib.h>
-@@ -56,9 +57,21 @@ static const int DEVICE_POINTER = 2;
- XInputEventNotifier::XInputEventNotifier(QWidget* parent):
- 	XEventNotifier(), //TODO: destruct properly?
- 	xinputEventType(-1),
--	udevNotifier(nullptr)
-+	udevNotifier(nullptr),
-+	keyboardNotificationTimer(new QTimer(this)),
-+	mouseNotificationTimer(new QTimer(this))
- {
--  Q_UNUSED(parent)
-+	Q_UNUSED(parent)
-+
-+	// emit signal only once, even after X11 re-enables N keyboards after resuming from suspend
-+	keyboardNotificationTimer->setSingleShot(true);
-+	keyboardNotificationTimer->setInterval(500);
-+	connect(keyboardNotificationTimer, &QTimer::timeout, this, &XInputEventNotifier::newKeyboardDevice);
-+
-+	// same for mouse
-+	mouseNotificationTimer->setSingleShot(true);
-+	mouseNotificationTimer->setInterval(500);
-+	connect(mouseNotificationTimer, &QTimer::timeout, this, &XInputEventNotifier::newPointerDevice);
- }
- 
- void XInputEventNotifier::start()
-@@ -83,11 +96,18 @@ bool XInputEventNotifier::processOtherEvents(xcb_generic_event_t* event)
- {
- 	int newDeviceType = getNewDeviceEventType(event);
- 	if( newDeviceType == DEVICE_KEYBOARD ) {
--		emit(newKeyboardDevice());
-+		if (!keyboardNotificationTimer->isActive()) {
-+			keyboardNotificationTimer->start();
-+		}
- 	}
- 	else if( newDeviceType == DEVICE_POINTER ) {
--		emit(newPointerDevice());
--		emit(newKeyboardDevice());	// arghhh, looks like X resets xkb map even when only pointer device is connected
-+		if (!mouseNotificationTimer->isActive()) {
-+			mouseNotificationTimer->start();
-+		}
-+		// arghhh, looks like X resets xkb map even when only pointer device is connected
-+		if (!keyboardNotificationTimer->isActive()) {
-+			keyboardNotificationTimer->start();
-+		}
- 	}
- 	return true;
- }
-diff --git a/kcms/keyboard/xinput_helper.h b/kcms/keyboard/xinput_helper.h
-index e29fdc22a..52b6a12b4 100644
---- a/kcms/keyboard/xinput_helper.h
-+++ b/kcms/keyboard/xinput_helper.h
-@@ -25,13 +25,14 @@
- #include <X11/Xlib.h>
- #include <fixx11h.h>
- 
-+class QTimer;
- class UdevDeviceNotifier;
- 
- class XInputEventNotifier: public XEventNotifier {
- 	Q_OBJECT
- 
- public:
--	XInputEventNotifier(QWidget* parent=nullptr);
-+	explicit XInputEventNotifier(QWidget* parent=nullptr);
- 
- 	void start() override;
- 	void stop() override;
-@@ -51,6 +52,8 @@ private:
- 	int xinputEventType;
- 	Display* display;
- 	UdevDeviceNotifier *udevNotifier;
-+	QTimer* keyboardNotificationTimer;
-+	QTimer* mouseNotificationTimer;
- };
- 
- #endif /* XINPUT_HELPER_H_ */
--- 
-GitLab
-
diff --git a/kde-plasma/plasma-desktop/files/plasma-desktop-5.20.5-kcm_keyboard-no-setxkbmap-on-camera.patch b/kde-plasma/plasma-desktop/files/plasma-desktop-5.20.5-kcm_keyboard-no-setxkbmap-on-camera.patch
deleted file mode 100644
index a2bee27e83d3..000000000000
--- a/kde-plasma/plasma-desktop/files/plasma-desktop-5.20.5-kcm_keyboard-no-setxkbmap-on-camera.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From cfdaf8636830df3760bf370d48bd4be890ada709 Mon Sep 17 00:00:00 2001
-From: David Faure <faure@kde.org>
-Date: Sun, 31 Jan 2021 12:04:19 +0100
-Subject: [PATCH] kcm_keyboard: Cameras are not keyboards, don't setxkbmap when
- plugging a camera
-
----
- kcms/keyboard/xinput_helper.cpp | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/kcms/keyboard/xinput_helper.cpp b/kcms/keyboard/xinput_helper.cpp
-index 9cae43369..14974ada7 100644
---- a/kcms/keyboard/xinput_helper.cpp
-+++ b/kcms/keyboard/xinput_helper.cpp
-@@ -102,7 +102,8 @@ static bool isRealKeyboard(const char* deviceName)
- 	return strstr(deviceName, "Video Bus") == nullptr
- 		&& strstr(deviceName, "Sleep Button") == nullptr
- 		&& strstr(deviceName, "Power Button") == nullptr
--		&& strstr(deviceName, "WMI hotkeys") == nullptr;
-+		&& strstr(deviceName, "WMI hotkeys") == nullptr
-+		&& strstr(deviceName, "Camera") == nullptr;
- }
- 
- int XInputEventNotifier::getNewDeviceEventType(xcb_generic_event_t* event)
--- 
-GitLab
-
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.21.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.21.5.ebuild
index 68705edda325..0e6950fd4a0f 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.21.5.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.21.5.ebuild
@@ -17,7 +17,7 @@ SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop"
 
 COMMON_DEPEND="
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.20.5-r1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.22.0.ebuild
index e4402b805d6d..25ff57464ff6 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.20.5-r1.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.22.0.ebuild
@@ -5,22 +5,21 @@ EAPI=7
 
 ECM_HANDBOOK="forceoptional"
 ECM_TEST="true"
-KFMIN=5.74.0
+KFMIN=5.82.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.1
+QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
-inherit ecm kde.org
+inherit ecm kde.org optfeature
 
 DESCRIPTION="KDE Plasma desktop"
-XORGHDRS="${PN}-override-include-dirs-0"
+XORGHDRS="${PN}-override-include-dirs-1"
 SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${XORGHDRS}.tar.xz"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
 IUSE="emoji ibus +kaccounts +policykit scim +semantic-desktop"
 
-BDEPEND="virtual/pkgconfig"
 COMMON_DEPEND="
 	>=dev-qt/qtconcurrent-${QTMIN}:5
 	>=dev-qt/qtdbus-${QTMIN}:5
@@ -45,6 +44,7 @@ COMMON_DEPEND="
 	>=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/kdeclarative-${KFMIN}:5
 	>=kde-frameworks/kded-${KFMIN}:5
@@ -95,6 +95,7 @@ COMMON_DEPEND="
 		kde-apps/kaccounts-integration:5
 		net-libs/accounts-qt
 	)
+	policykit? ( >=kde-frameworks/kwallet-${KFMIN}:5 )
 	scim? ( app-i18n/scim )
 	semantic-desktop? ( >=kde-frameworks/baloo-${KFMIN}:5 )
 "
@@ -103,7 +104,6 @@ DEPEND="${COMMON_DEPEND}
 	x11-base/xorg-proto
 "
 RDEPEND="${COMMON_DEPEND}
-	!<kde-plasma/kdeplasma-addons-5.15.80
 	!kde-plasma/user-manager
 	>=dev-qt/qtgraphicaleffects-${QTMIN}:5
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
@@ -113,40 +113,51 @@ RDEPEND="${COMMON_DEPEND}
 	>=kde-plasma/oxygen-${PVCUT}:5
 	sys-apps/util-linux
 	x11-apps/setxkbmap
+	x11-misc/xdg-user-dirs
 	kaccounts? ( net-libs/signon-oauth2 )
 	policykit? ( sys-apps/accountsservice )
 "
+BDEPEND="virtual/pkgconfig"
 
 PATCHES=(
 	"${WORKDIR}/${XORGHDRS}/override-include-dirs.patch" # downstream patch
-	"${FILESDIR}/${P}-kcm_keyboard-no-setxkbmap-on-camera.patch"
-	"${FILESDIR}/${P}-compress-new-input-notifications.patch"
 )
 
 src_prepare() {
 	ecm_src_prepare
 
-	use policykit || cmake_run_in kcms cmake_comment_add_subdirectory users
+	if ! use policykit; then
+		ecm_punt_bogus_dep KF5 Wallet
+		cmake_run_in kcms cmake_comment_add_subdirectory users
+	fi
 
 	if ! use ibus; then
 		sed -e "s/Qt5X11Extras_FOUND AND XCB_XCB_FOUND AND XCB_KEYSYMS_FOUND/false/" \
 			-i applets/kimpanel/backend/ibus/CMakeLists.txt || die
 	fi
+
+	use emoji || cmake_run_in applets/kimpanel/backend/ibus \
+		cmake_comment_add_subdirectory emojier
+
+	# TODO: try to get a build switch upstreamed
+	if ! use scim; then
+		sed -e "s/^pkg_check_modules.*SCIM/#&/" -i CMakeLists.txt || die
+	fi
 }
 
 src_configure() {
 	local mycmakeargs=(
-		-DEvdev_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+		-DCMAKE_DISABLE_FIND_PACKAGE_PackageKitQt5=ON # not packaged
+		-DEVDEV_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
 		-DXORGLIBINPUT_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
 		-DXORGSERVER_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
-		-DSynaptics_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
+		-DSYNAPTICS_INCLUDE_DIRS="${WORKDIR}/${XORGHDRS}"/include
 		$(cmake_use_find_package kaccounts AccountsQt5)
 		$(cmake_use_find_package kaccounts KAccounts)
-		$(cmake_use_find_package scim SCIM)
 		$(cmake_use_find_package semantic-desktop KF5Baloo)
 	)
 	if ! use emoji && ! use ibus; then
-		mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_IBus=ON )
+		mycmakeargs+=( -DCMAKE_DISABLE_FIND_PACKAGE_GLIB2=ON )
 	fi
 
 	ecm_src_configure
@@ -163,3 +174,10 @@ src_test() {
 
 	ecm_src_test
 }
+
+pkg_postinst() {
+	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+		optfeature "screen reader support" app-accessibility/orca
+	fi
+	ecm_pkg_postinst
+}