gentoo resync : 22.12.2021

5 files changed, 3 insertions, 147 deletions

diff --git a/kde-plasma/kdeplasma-addons/Manifest b/kde-plasma/kdeplasma-addons/Manifest
index 724d3752e449..9d4664082a70 100644
--- a/kde-plasma/kdeplasma-addons/Manifest
+++ b/kde-plasma/kdeplasma-addons/Manifest
@@ -1,6 +1,3 @@
-AUX kdeplasma-addons-5.19.3-kross-optional.patch 1956 BLAKE2B 922b8e73147439a706a37fcec29dcf7fb424e8ceaa8bfa1e4e54ca6c5851cf937318ee91654bf5cb352b80076aa90c9063ec07b02c7fbade8613f3d560178e86 SHA512 f9c87b27b0e8d020519259fda8df118266dd11b589873a3a8a5b4bcdf1e77e65fad29334aee80717cfe208c54021d39caee36533d144538bd80b5c1618cd36b4
-DIST kdeplasma-addons-5.22.5.tar.xz 633320 BLAKE2B 12cb41ebbbec6a6bbb65bbac55e856951cee7249acbc5e9228fddbf3d844066c6a674dfe45242d63b4e4b1321955c547c349ec735a966bc7c02ca38eb62c2f03 SHA512 7915d20808bcceea9451590723abd8f20fc2eb33c6b1346cf1b0971c69360eaf24ad72b141d15bc102090c1dc3f82f8c0e7398cfdd41b7452dbf57af2da87803
 DIST kdeplasma-addons-5.23.4.tar.xz 628708 BLAKE2B 687ee4f9b68e6521d2165d7b9d570facf786c4b8c9c9d9de98b20533d6b43d197e7b9682de645a09de80e6e28f87120f6b446a86b0408ea7c5ca865413311391 SHA512 03e2db5e8875832d2d430115ec34f5eb86467167f56e09795bcf1595742fc8dc45e61cb88663ab7b2ee65188d41ae81b08b692cd50291a336a0e9c297f028b80
-EBUILD kdeplasma-addons-5.22.5.ebuild 2084 BLAKE2B 29a9f5295f402b6c3220aa25e3fb249aa797bd509d31ab855082b1d0434619f6b9dfde61d06ed62ffc4d7402e0a6d6b8c9b6145929d3085dbfdba0f406a4dfe2 SHA512 7aa1e811550548f3d3a550bc1325c4c5ae2b9b7aaeee4b117c78701083380168faae27bc84fc4c83623ef59ad0d2bf8a9c4a0a225642268a31e5e669401fe2c7
-EBUILD kdeplasma-addons-5.23.4.ebuild 1912 BLAKE2B d8af3d1a19e434fdcaee6f10ac04d60ba612e7863f3fbc63817439ca8efc9715aca64e47041eaf580060150a42efb669763f21e40fa4716113acee4e7eef8f41 SHA512 d7c21dd3b6e8289a4ecea9503e587e0014b4b3e81cd43843a17cebe7b0451e0a3abf96c56fcd3156e3799af8a29eae1d6d512dc23a8404d560375d497aabfd74
-MISC metadata.xml 636 BLAKE2B c58a6f828b6e74e39343a6bb50c4563dac6615236d18ff1e81d6dc4de6a204e089886bd5ca8394242bb03860832edede323071721bdec55bd447247fe2c04f86 SHA512 af527fa0329ce0f9c61bd9f01d56389a455aa8ab72bcb32f8d8f6ef91dac27d91710d4347e92d2d8b414a91755c1015cf700849286f6ccbf8416ce00dcefea09
+EBUILD kdeplasma-addons-5.23.4.ebuild 1909 BLAKE2B 780aa46277a60db0798febe3bb046da0bcedf27d1474850f0f8f797326025f55b0a1c38a1b8898d3d33e33ab32eda01e5948169fdbeaa98c01821311892db40b SHA512 0f076e8953c32ac373fe9f69e06e71a865ea500cc27365c67dc0c2d85c54fe7e12853bf23ca9e090c1098714b021bb0a7142d0ef3732e0087e4cf40e2f4a90cd
+MISC metadata.xml 534 BLAKE2B 333ea162901ad4e28de1fd55b40d5080a4d3383fa9af09a46363835e312a8ead0fde01ab762b9ab6930263e61ffb56dad2d53ee6167568cf683da48eaf3ad0a2 SHA512 9eb20a5a87713c865d782c8a1e009098e6db4dddf2ac8cdafbce407da995ee258274645445901f1a5c883202faf46dfca0f1dde5edbe45bd89e7509b22bfa0f5
diff --git a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.19.3-kross-optional.patch b/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.19.3-kross-optional.patch
deleted file mode 100644
index 485acd542a83..000000000000
--- a/kde-plasma/kdeplasma-addons/files/kdeplasma-addons-5.19.3-kross-optional.patch
+++ /dev/null
@@ -1,65 +0,0 @@
-From bbaaa3e2eac712887780c0849f955889e64ff358 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Tue, 7 Jul 2020 22:22:13 +0200
-Subject: [PATCH] Make KF5Kross optional, it is only used for comic applet
-
----
- CMakeLists.txt             | 7 ++++++-
- applets/CMakeLists.txt     | 4 +++-
- dataengines/CMakeLists.txt | 4 +++-
- 3 files changed, 12 insertions(+), 3 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 9c4697a52..e5d14bc8c 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -48,7 +48,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
-     IconThemes
-     KIO
-     KCMUtils
--    Kross
-     Notifications
-     Plasma
-     Runner
-@@ -59,6 +58,12 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS
-     NewStuff
- )
- 
-+find_package(KF5Kross CONFIG QUIET)
-+set_package_properties(KF5Kross PROPERTIES
-+    PURPOSE "Needed for Comic applet"
-+    TYPE OPTIONAL
-+)
-+
- find_package(KF5Purpose CONFIG QUIET)
- set_package_properties(KF5Purpose PROPERTIES
-     DESCRIPTION "Framework for cross-application services and actions"
-diff --git a/applets/CMakeLists.txt b/applets/CMakeLists.txt
-index 93b637b1b..6af5ffc67 100644
---- a/applets/CMakeLists.txt
-+++ b/applets/CMakeLists.txt
-@@ -6,7 +6,9 @@ plasma_install_package(keyboardindicator org.kde.plasma.keyboardindicator)
- add_subdirectory(binary-clock)
- add_subdirectory(calculator)
- add_subdirectory(colorpicker)
--add_subdirectory(comic)
-+if(KF5Kross_FOUND)
-+    add_subdirectory(comic)
-+endif()
- add_subdirectory(dict)
- if(NOT WIN32)
-     # uses the command line tool 'quota', does not make sense on Windows
-diff --git a/dataengines/CMakeLists.txt b/dataengines/CMakeLists.txt
-index 8d91dd84f..38f715b11 100644
---- a/dataengines/CMakeLists.txt
-+++ b/dataengines/CMakeLists.txt
-@@ -1,3 +1,5 @@
-- add_subdirectory(comic)
-+if(KF5Kross_FOUND)
-+    add_subdirectory(comic)
-+endif()
- add_subdirectory(potd)
- add_subdirectory(konsoleprofiles)
--- 
-2.27.0
-
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.22.5.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.22.5.ebuild
deleted file mode 100644
index b5c194d2234d..000000000000
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.22.5.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_HANDBOOK="forceoptional"
-KFMIN=5.82.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.2
-VIRTUALX_REQUIRED="test"
-inherit ecm kde.org optfeature
-
-DESCRIPTION="Extra Plasma applets and engines"
-
-LICENSE="GPL-2 LGPL-2"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
-IUSE="comic share webengine"
-
-RESTRICT="test" # bug 727846
-
-DEPEND="
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/karchive-${KFMIN}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kholidays-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/knewstuff-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/krunner-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kunitconversion-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/sonnet-${KFMIN}:5
-	comic? ( >=kde-frameworks/kross-${KFMIN}:5 )
-	share? ( >=kde-frameworks/purpose-${KFMIN}:5 )
-	webengine? ( >=dev-qt/qtwebengine-${QTMIN}:5 )
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-plasma/plasma-workspace-${PVCUT}:5
-"
-
-PATCHES=( "${FILESDIR}/${PN}-5.19.3-kross-optional.patch" ) # downstream patch
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package comic KF5Kross)
-		$(cmake_use_find_package share KF5Purpose)
-		$(cmake_use_find_package webengine Qt5WebEngine)
-	)
-
-	ecm_src_configure
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		optfeature "Disk quota applet" sys-fs/quota
-	fi
-	ecm_pkg_postinst
-}
diff --git a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.4.ebuild b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.4.ebuild
index 87182ab6828a..28a9864b5456 100644
--- a/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.4.ebuild
+++ b/kde-plasma/kdeplasma-addons/kdeplasma-addons-5.23.4.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Extra Plasma applets and engines"
 
 LICENSE="GPL-2 LGPL-2"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 ~riscv x86"
 IUSE="share webengine"
 
 RESTRICT="test" # bug 727846
diff --git a/kde-plasma/kdeplasma-addons/metadata.xml b/kde-plasma/kdeplasma-addons/metadata.xml
index d16f4073e6dc..8aace809aa2b 100644
--- a/kde-plasma/kdeplasma-addons/metadata.xml
+++ b/kde-plasma/kdeplasma-addons/metadata.xml
@@ -9,7 +9,6 @@
 		<bugs-to>https://bugs.kde.org/</bugs-to>
 	</upstream>
 	<use>
-		<flag name="comic">Enable comic applet (requires deprecated <pkg>kde-frameworks/kross</pkg>)</flag>
 		<flag name="share">Enable applet for quickly sharing data to a variety of sources</flag>
 		<flag name="webengine">Enable dictionary and web browser applets using <pkg>dev-qt/qtwebengine</pkg></flag>
 	</use>