8 files changed, 159 insertions, 7 deletions
diff --git a/kde-plasma/Manifest.gz b/kde-plasma/Manifest.gz
index b5bce317b48e..0160d23a0367 100644
--- a/kde-plasma/Manifest.gz
+++ b/kde-plasma/Manifest.gz
diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index 19d1bcf99aee..d538e53f82e8 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,6 +1,7 @@
 AUX plasma-nm-5.26.0-unused-dep.patch 1943 BLAKE2B 1f6fa231a18152c3720ee82be40c08a40e5344cb6b982fa8b62a72dfd0883d87f626d193557abdc851115ab31d99e33a72613126d5258614c75d26e67f9b59a1 SHA512 c7182240e8ae86d994e6e36ba73f42ecdea78c84077397a774a4501607b6906fdc2cd98e354bf92e9ee2cbfdfe2a23d3a30d9566b3c37a3d866b1c138114a618
+AUX plasma-nm-5.27.4-persist-imported-vpn-connections.patch 1028 BLAKE2B f93687c822cdc2ecd7252c9aea89e17b31ef709117b111007392a27470d69620e0a5291c4ca7e53bc75d7bffcbc6ddb013bb412b79101c050b119b780bdc4228 SHA512 5febc7c9200e4fb0ffdce349458abc12086d0334fa794059fb2523eaebe3afc05913ea0c28aacd434fcf4953f567b4d45fde32fd8bfeab36304f497ee5e3e6bd
 DIST plasma-nm-5.26.5.tar.xz 972940 BLAKE2B 4f10049a0a946b67fd0638913c365558a8e95b80d1d896323f4030738f8dd4d07cc77c4aaf212c52d8ba89635d932369d2f69e134722d24a5eed41841b15409a SHA512 bb17b06de15cc5b36d1eedd4fc8551eff240f8e61a4a036450b2365c99eb5885adc9541c29aa95b311d79d57b62ab95f41b746402cb6de7ecee6c6c4e87ac9a3
 DIST plasma-nm-5.27.4.tar.xz 1151372 BLAKE2B b6a2c30c17b7fe5e19bba032ad0d4822c5f4ff931530cc4718d17c976317f782a3a318c1c2204ef84c2d247bb828cf7638e26283ecbb5246515c4648ce6592d2 SHA512 4077c63af9da002a8c6fc18a6fa1ccbadd84c9786a7e922209756b4ce4fc8a6780a092b5a412d79caf38872831035a3659c84fb73857d58ab0088dc73fc64c36
 EBUILD plasma-nm-5.26.5.ebuild 2613 BLAKE2B e0156c2e1586881ad198bbe6e9c9126388430c005acaf786949cb3005bfa8f23d69aba584c9086682898c247a5f3276b9e6936cb4eec5c841ed5c3ac4d07e5d1 SHA512 db130b38559fabfb44c49412636e0760b1f35176313ac3924a14e2be3134ddf172cdbd191ae0dcef77fc2fb9071766059af68d71ef4601779a653c1d3a1d3c53
-EBUILD plasma-nm-5.27.4.ebuild 2345 BLAKE2B 5acb6668a1c855a1a30abdfe6800f315e5024f12ebb11858720f3f5cefcf75c5e0bfef1cea13c6c507330a4f1d2c11468e57a0154d95594398e4729d2b666bf1 SHA512 bbe344e595e5b2e34ff4add18c7eaafd301ea5100544159d8d1037a5988995a41893e0823086281c117bd2daa5b81d042092e43708f7edfaba628a5226bdadcc
+EBUILD plasma-nm-5.27.4-r1.ebuild 2433 BLAKE2B 1e4df26c406a759c18728aae1104da081b69972c9a67423242d1d4eb3fe19964f6e1f8f8592fb4d8e44a7e7a67cdbcdf1f37210f9e93cfead12f653d13982598 SHA512 3344a2fe0d43721177e6f14478ff3b4586294b446fe7f64c095dc2697860fb08cc37de184a589480bf9003a9017913473dec8188ce7a8f820365cb54eab4b962
 MISC metadata.xml 548 BLAKE2B 72ae60901cd45e2b312418553d64dbed59ed4b9d3fd8b71f0e6eaa1782dd997d08f28fd7fb2668303a6dfa290eee1cbde6397580091730b3c5f65c85c111435a SHA512 f4cd7aa6532a5816a111cc088db3a712462bce395aa792c0ba6869981d70bec7f56040038e3dce6a7b0496f423a5be8f0e0081ab45ee51451a384f3cd8c4ade5
diff --git a/kde-plasma/plasma-nm/files/plasma-nm-5.27.4-persist-imported-vpn-connections.patch b/kde-plasma/plasma-nm/files/plasma-nm-5.27.4-persist-imported-vpn-connections.patch
new file mode 100644
index 000000000000..8d7fc814c35f
--- /dev/null
+++ b/kde-plasma/plasma-nm/files/plasma-nm-5.27.4-persist-imported-vpn-connections.patch
@@ -0,0 +1,31 @@
+From d795e92bd12705d0ce506c4ac900b0ccb7bdc69b Mon Sep 17 00:00:00 2001
+From: Nicolas Fella <nicolas.fella@gmx.de>
+Date: Tue, 18 Apr 2023 23:54:02 +0200
+Subject: [PATCH] Persist imported VPN connections on disk
+
+Otherwise they disappear after a reboot
+
+BUG: 468666
+
+
+(cherry picked from commit 024035190982ac5957310ef78fbc34b9c51766c2)
+---
+ libs/handler.cpp | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/libs/handler.cpp b/libs/handler.cpp
+index 625cbabd7..57fb9f2e3 100644
+--- a/libs/handler.cpp
++++ b/libs/handler.cpp
+@@ -378,7 +378,7 @@ void Handler::addConnection(NMConnection *connection)
+ 
+     nm_client_add_connection2(client,
+                               nm_connection_to_dbus(connection, NM_CONNECTION_SERIALIZE_ALL),
+-                              NM_SETTINGS_ADD_CONNECTION2_FLAG_IN_MEMORY,
++                              NM_SETTINGS_ADD_CONNECTION2_FLAG_TO_DISK,
+                               nullptr,
+                               true,
+                               nullptr,
+-- 
+GitLab
+
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.27.4.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.27.4-r1.ebuild
index 420f8ce7353d..9a6797eed250 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.27.4.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.27.4-r1.ebuild
@@ -63,6 +63,8 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
+PATCHES=( "${FILESDIR}/${P}-persist-imported-vpn-connections.patch" ) # KDE-bug 468666
+
 src_prepare() {
 	ecm_src_prepare
 
diff --git a/kde-plasma/plasma-welcome/Manifest b/kde-plasma/plasma-welcome/Manifest
index b59494cc11d8..223f63cc3b54 100644
--- a/kde-plasma/plasma-welcome/Manifest
+++ b/kde-plasma/plasma-welcome/Manifest
@@ -1,3 +1,4 @@
+AUX plasma-welcome-5.27.4.1-kaccounts-optional.patch 3455 BLAKE2B 47f4294b6ac94ce005d0079981fa31d33991ac01ec73adb768b4feb12ef169a70a7a13519efce88b5bb3d79bc7faa24054ecc10a79272a758e7ab64e39fa5b59 SHA512 a7533802112b34eb8a3d547ee5925f6123ce12a61423433f9a2014f3f37ae5d02da48748e535b3bd2eb5ae6d61ff4458af7960bfab2065e06d78047d26123a60
 DIST plasma-welcome-5.27.4.1.tar.xz 822136 BLAKE2B 6d5f1eefe7e8dbbcfb121d3d063a78eca8af132a53765298cbf4a46c41524f2aa46192956884b7a12e47bccf48d292acbb1ca4e4173ad0c05c7a84e8a9d73dbd SHA512 c63bcaf66163e248bd5067c7b0cbd445353cd28a900dfac8fde6e27231ba1f24388a4013378d71673d523e1ce42065c87aa8cd23d8bdf8285c221cac4262e6ac
-EBUILD plasma-welcome-5.27.4.1.ebuild 1172 BLAKE2B f7c8188689ba4aa60522bd67a7ca3522062e52a8c495dc8552759ee838e2cf92e925ec5d68d9df6791f1e1922c53ae5207e9c48dbe09ab815a78030fd4746d2c SHA512 bf4929a635d833d7e637d212c2a40b90dadba446005fe30f36b9e32202d17f20d03d6073a407bc07d760a9350bd06370dce082c2ef5291b100a744f5a368faf3
-MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
+EBUILD plasma-welcome-5.27.4.1-r1.ebuild 1526 BLAKE2B 5ff4e2b0e06230351dff463b062fb8e01d87d56bd0e713f6be446f414e447bc0306257adfe803c6598102c395cb44d0b0c98f36c2e9ceeb3820eb1965965472c SHA512 e682d249dfd915397821cc265049ac754d2b49419d5c272699ee4a866a3e5a87d79e1023a28a49fcf92ddc9ac05b22a19e71d7be4967db020aea04ed18f3e1e9
+MISC metadata.xml 550 BLAKE2B 78839fba571ddb92926c13ff6e8747b2d14af746f5e0f29483996df70a51801838c016de81ed9125fa79f701ff0aefe22f9bc95e71d068f3cc95bd210164fe5d SHA512 8d79e582ddf141e9e97e5de8036e4878f7a4c2acbb06669491da9e0d1ae64316d49d6a330b8c7268c411a42170d37152f8d7c1580ef3ad75454097780e92b24f
diff --git a/kde-plasma/plasma-welcome/files/plasma-welcome-5.27.4.1-kaccounts-optional.patch b/kde-plasma/plasma-welcome/files/plasma-welcome-5.27.4.1-kaccounts-optional.patch
new file mode 100644
index 000000000000..fc4eaa684a63
--- /dev/null
+++ b/kde-plasma/plasma-welcome/files/plasma-welcome-5.27.4.1-kaccounts-optional.patch
@@ -0,0 +1,99 @@
+From 24092946ed95b4ddf7e7f4c0f5bd9000e45fecad Mon Sep 17 00:00:00 2001
+From: Andreas Sturmlechner <asturm@gentoo.org>
+Date: Wed, 19 Apr 2023 21:16:59 +0200
+Subject: [PATCH] Make KAccounts optional
+
+Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
+---
+ CMakeLists.txt                    | 2 +-
+ src/CMakeLists.txt                | 1 +
+ src/contents/ui/main.qml          | 4 +++-
+ src/controller.cpp                | 9 +++++++++
+ src/controller.h                  | 1 +
+ src/kuserfeedbacksettings.h.cmake | 1 +
+ 6 files changed, 16 insertions(+), 2 deletions(-)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 772d79e..86db439 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -41,7 +41,7 @@ ecm_setup_version(${PROJECT_VERSION}
+ find_package(Qt${QT_MAJOR_VERSION} ${REQUIRED_QT_VERSION} REQUIRED COMPONENTS Core Gui Network Qml QuickControls2 Svg)
+ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED COMPONENTS Kirigami2 CoreAddons ConfigWidgets DBusAddons Declarative I18n KIO NewStuff Notifications Plasma Service WindowSystem)
+ find_package(KUserFeedback)
+-find_package(KAccounts REQUIRED)
++find_package(KAccounts)
+ 
+ ecm_set_disabled_deprecation_versions(QT 5.15.2
+     KF 5.101
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 4eab33d..e0cc179 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -3,6 +3,7 @@
+ # SPDX-FileCopyrightText: 2022 Nate Graham <nate@kde.org>
+ 
+ set(HAVE_KUSERFEEDBACK ${KUserFeedback_FOUND})
++set(HAVE_KACCOUNTS ${KAccounts_FOUND})
+ configure_file(kuserfeedbacksettings.h.cmake ${CMAKE_CURRENT_BINARY_DIR}/kuserfeedbacksettings.h)
+ 
+ add_executable(plasma-welcome main.cpp controller.cpp resources.qrc module.cpp)
+diff --git a/src/contents/ui/main.qml b/src/contents/ui/main.qml
+index 380c074..86da39b 100644
+--- a/src/contents/ui/main.qml
++++ b/src/contents/ui/main.qml
+@@ -124,7 +124,9 @@ Kirigami.ApplicationWindow {
+                 pageStack.push(kcm_feedback);
+             }
+ 
+-            pageStack.push(kcm_kaccounts);
++            if (Controller.kAccountsAvailable()) {
++                pageStack.push(kcm_kaccounts);
++            }
+ 
+             // Append any distro-specific pages that were found
+             let distroPages = Controller.distroPages()
+diff --git a/src/controller.cpp b/src/controller.cpp
+index 7586c23..de8fa85 100644
+--- a/src/controller.cpp
++++ b/src/controller.cpp
+@@ -50,6 +50,15 @@ bool Controller::networkAlreadyConnected()
+     return false;
+ }
+ 
++bool Controller::kAccountsAvailable()
++{
++#if HAVE_KACCOUNTS
++    return true;
++#else
++    return false;
++#endif
++}
++
+ bool Controller::userFeedbackAvailable()
+ {
+ #if HAVE_KUSERFEEDBACK
+diff --git a/src/controller.h b/src/controller.h
+index 20ba44c..97a9d1c 100644
+--- a/src/controller.h
++++ b/src/controller.h
+@@ -15,6 +15,7 @@ public:
+     Q_INVOKABLE static void runCommand(const QString &command, const QString &desktopFilename);
+     Q_INVOKABLE bool networkAlreadyConnected();
+     Q_INVOKABLE bool userFeedbackAvailable();
++    Q_INVOKABLE bool kAccountsAvailable();
+     Q_INVOKABLE QStringList distroPages();
+ 
+     Q_PROPERTY(QString newPlasmaVersion MEMBER m_newPlasmaVersion NOTIFY newPlasmaVersionChanged)
+diff --git a/src/kuserfeedbacksettings.h.cmake b/src/kuserfeedbacksettings.h.cmake
+index f30924f..a76aedf 100644
+--- a/src/kuserfeedbacksettings.h.cmake
++++ b/src/kuserfeedbacksettings.h.cmake
+@@ -5,3 +5,4 @@
+  */
+ 
+ #cmakedefine01 HAVE_KUSERFEEDBACK
++#cmakedefine01 HAVE_KACCOUNTS
+-- 
+2.40.0
+
diff --git a/kde-plasma/plasma-welcome/metadata.xml b/kde-plasma/plasma-welcome/metadata.xml
index d925f2439758..7499be9e7e7d 100644
--- a/kde-plasma/plasma-welcome/metadata.xml
+++ b/kde-plasma/plasma-welcome/metadata.xml
@@ -8,4 +8,8 @@
 	<upstream>
 		<bugs-to>https://bugs.kde.org/</bugs-to>
 	</upstream>
+	<use>
+		<flag name="discover">Pull in resources management GUI; a centralised GHNS alternative and optional <pkg>sys-apps/fwupd</pkg> frontend</flag>
+		<flag name="kaccounts">Build the OpenDesktop integration plugin</flag>
+	</use>
 </pkgmetadata>
diff --git a/kde-plasma/plasma-welcome/plasma-welcome-5.27.4.1.ebuild b/kde-plasma/plasma-welcome/plasma-welcome-5.27.4.1-r1.ebuild
index 85c827c00945..1f431b9ad2da 100644
--- a/kde-plasma/plasma-welcome/plasma-welcome-5.27.4.1.ebuild
+++ b/kde-plasma/plasma-welcome/plasma-welcome-5.27.4.1-r1.ebuild
@@ -12,16 +12,15 @@ DESCRIPTION="A friendly onboarding wizard for Plasma"
 LICENSE="GPL-2+"
 SLOT="5"
 KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
-IUSE="telemetry"
+IUSE="discover +kaccounts telemetry"
 
-RDEPEND="
+DEPEND="
 	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtnetwork-${QTMIN}:5
 	>=dev-qt/qtquickcontrols2-${QTMIN}:5
 	>=dev-qt/qtsvg-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
-	kde-apps/kaccounts-integration:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
@@ -33,12 +32,27 @@ RDEPEND="
 	>=kde-frameworks/knotifications-${KFMIN}:5
 	>=kde-frameworks/kservice-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
+	kaccounts? ( kde-apps/kaccounts-integration:5 )
 	telemetry? ( dev-libs/kuserfeedback:5 )
 "
-DEPEND="${RDEPEND}"
+RDEPEND="${DEPEND}
+	discover? ( kde-plasma/discover:5 )
+"
+
+PATCHES=( "${FILESDIR}/${P}-kaccounts-optional.patch" )
+
+src_prepare() {
+	ecm_src_prepare
+
+	if ! use discover; then
+		sed -e "s:pageStack.push(discover);:// & disabled by IUSE=discover:" \
+			-i src/contents/ui/main.qml || die
+	fi
+}
 
 src_configure() {
 	local mycmakeargs=(
+		$(cmake_use_find_package kaccounts KAccounts)
 		$(cmake_use_find_package telemetry KUserFeedback)
 	)
 	ecm_src_configure