gentoo auto-resync : 22:05:2023 - 14:56:50

4 files changed, 2 insertions, 121 deletions

diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index 208b5532914f..c592a5588e06 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,6 +1,3 @@
-AUX plasma-nm-5.27.4-persist-imported-vpn-connections.patch 1028 BLAKE2B f93687c822cdc2ecd7252c9aea89e17b31ef709117b111007392a27470d69620e0a5291c4ca7e53bc75d7bffcbc6ddb013bb412b79101c050b119b780bdc4228 SHA512 5febc7c9200e4fb0ffdce349458abc12086d0334fa794059fb2523eaebe3afc05913ea0c28aacd434fcf4953f567b4d45fde32fd8bfeab36304f497ee5e3e6bd
-DIST plasma-nm-5.27.4.tar.xz 1151372 BLAKE2B b6a2c30c17b7fe5e19bba032ad0d4822c5f4ff931530cc4718d17c976317f782a3a318c1c2204ef84c2d247bb828cf7638e26283ecbb5246515c4648ce6592d2 SHA512 4077c63af9da002a8c6fc18a6fa1ccbadd84c9786a7e922209756b4ce4fc8a6780a092b5a412d79caf38872831035a3659c84fb73857d58ab0088dc73fc64c36
 DIST plasma-nm-5.27.5.tar.xz 1155948 BLAKE2B e74da009a035b6bd46823c94fd5f798c7dfc794cf5e80af2e2a655ee9939269dd6fa222412e1c4fa1d249f657010206b1871c9ae0f6998ecf7d9f46ed549e7d4 SHA512 a7b66bb44cecf489a83c62aee29ebd5fa697ebccabd0c384adbbf0e5facc209b6d202b85ce0a490be26f0830d4b936c3442d6077200d4f08a1faeef42d7266bc
-EBUILD plasma-nm-5.27.4-r1.ebuild 2430 BLAKE2B 0910da770620ef06f5d6846a5857bfffe141b0a6920e1e7eddf9e05a65e8455c313a72346107386ea95fdf47a9dbcb114b7f288724dd83f3b5016a26eddbdb33 SHA512 03685311cac8a839762ca9e6ff7dd8ba00bfc8eba3b8dfad91e1e2ae279b4f7893e58c623b5143da0c39404a97970ed942fa28d9cb3c8e2453d35d4acbd05564
-EBUILD plasma-nm-5.27.5.ebuild 2315 BLAKE2B d83bb00f593182a257efc996609664009f82fca47137eb2babb0ad60362f56e9600affcdb748d13f6780185731c6fc7880bbb3b50b70f0fbf445a9f1ff6d1759 SHA512 2a3a9351921a9e9ffe991836bf4f4ac4cf6659ca37415c5bfae36067d7a01c47d40d8b4747632dc70852a840773c20485974e48ee424c2e2db5d3dd7aaa9571f
+EBUILD plasma-nm-5.27.5.ebuild 2314 BLAKE2B 8c1fccd67199b81e6c950135ed85b977f82122d3ede074c90259808929e771ba4e9f5716595d34a3581c2d89b068c30aff81fe8c4cc6a771d781f8c5d37f84ba SHA512 480512a93716a48ae9f452c3a98d4c53411b17a33a3dc97f13dc447c0bc6de1c0d4a86e1f8696d0f08ab7a575b1b44320271ebe8ee521d9e51ef61f90ffd9ac3
 MISC metadata.xml 469 BLAKE2B 4d7fd7a809aa0e7f0aa9126ba2aada1aa2326bffaa3cbdaad633c9cbfc7f59b3dde4f4e0b05af0300aae9660a27f983d8c0d4b75b0f09eb88d0c8896430feec7 SHA512 3c7e0687338f1be630bc620131da7b86b537ae47e7ba5d7571392efa51f02f849982a0414871247a9fb5e167f234e3a5ee90d3a2ce667225ea7fed9369ce8ea8
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
deleted file mode 100644
index 8d7fc814c35f..000000000000
--- a/kde-plasma/plasma-nm/files/plasma-nm-5.27.4-persist-imported-vpn-connections.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-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-r1.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.27.4-r1.ebuild
deleted file mode 100644
index b022eb8f0551..000000000000
--- a/kde-plasma/plasma-nm/plasma-nm-5.27.4-r1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-ECM_TEST="true"
-KFMIN=5.102.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.7
-inherit ecm plasma.kde.org
-
-DESCRIPTION="KDE Plasma applet for NetworkManager"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="openconnect teamd"
-
-DEPEND="
-	>=app-crypt/qca-2.3.0:2[qt5(+)]
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kitemviews-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kservice-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/modemmanager-qt-${KFMIN}:5
-	>=kde-frameworks/networkmanager-qt-${KFMIN}:5[teamd=]
-	>=kde-frameworks/plasma-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	net-misc/networkmanager[teamd=]
-	>=dev-qt/qtxml-${QTMIN}:5
-	net-misc/mobile-broadband-provider-info
-	openconnect? (
-		>=dev-qt/qtxml-${QTMIN}:5
-		net-vpn/networkmanager-openconnect
-		net-vpn/openconnect:=
-	)
-"
-RDEPEND="${DEPEND}
-	>=dev-qt/qtquickcontrols-${QTMIN}:5
-	>=dev-qt/qtquickcontrols2-${QTMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kirigami-${KFMIN}:5
-	>=kde-frameworks/kquickcharts-${KFMIN}:5
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-BDEPEND="
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	virtual/pkgconfig
-"
-
-PATCHES=( "${FILESDIR}/${P}-persist-imported-vpn-connections.patch" ) # KDE-bug 468666
-
-src_prepare() {
-	ecm_src_prepare
-
-	# TODO: try to get a build switch upstreamed
-	if ! use openconnect; then
-		sed -e "s/^pkg_check_modules.*openconnect/#&/" -i CMakeLists.txt || die
-	fi
-}
-
-pkg_postinst() {
-	ecm_pkg_postinst
-
-	if ! has_version "kde-plasma/plasma-workspace:5"; then
-		elog "${PN} is not terribly useful without kde-plasma/plasma-workspace:5."
-		elog "However, the networkmanagement KCM can be called from either systemsettings"
-		elog "or manually: $ kcmshell5 kcm_networkmanagement"
-	fi
-}
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.27.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.27.5.ebuild
index 4213ac25b8b4..276d2a2710fa 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.27.5.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.27.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="KDE Plasma applet for NetworkManager"
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="openconnect teamd"
 
 DEPEND="