gentoo auto-resync : 09:05:2023 - 17:41:38

4 files changed, 10 insertions, 88 deletions

diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index 442c97c3af0c..f9efaea54d5d 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,7 +1,6 @@
-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
+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
-MISC metadata.xml 548 BLAKE2B 72ae60901cd45e2b312418553d64dbed59ed4b9d3fd8b71f0e6eaa1782dd997d08f28fd7fb2668303a6dfa290eee1cbde6397580091730b3c5f65c85c111435a SHA512 f4cd7aa6532a5816a111cc088db3a712462bce395aa792c0ba6869981d70bec7f56040038e3dce6a7b0496f423a5be8f0e0081ab45ee51451a384f3cd8c4ade5
+EBUILD plasma-nm-5.27.5.ebuild 2317 BLAKE2B 3dacf718cf81710e7104503d84b5c6fed0e6ab9ee41184317ca914f93ab37488c069e1ae5dd711177067c4892c7ec1e50293801844b5373fb8585c6b940ca018 SHA512 9b6e403feaf69cebe6cbae39e46a4564adfe98d4a0b75bb20bca9c1546f5c5ca5045bcbf587ed17bc3afe394d9c88fab0ad8ed2dc30edbfced5465ded870b71d
+MISC metadata.xml 469 BLAKE2B 4d7fd7a809aa0e7f0aa9126ba2aada1aa2326bffaa3cbdaad633c9cbfc7f59b3dde4f4e0b05af0300aae9660a27f983d8c0d4b75b0f09eb88d0c8896430feec7 SHA512 3c7e0687338f1be630bc620131da7b86b537ae47e7ba5d7571392efa51f02f849982a0414871247a9fb5e167f234e3a5ee90d3a2ce667225ea7fed9369ce8ea8
diff --git a/kde-plasma/plasma-nm/files/plasma-nm-5.26.0-unused-dep.patch b/kde-plasma/plasma-nm/files/plasma-nm-5.26.0-unused-dep.patch
deleted file mode 100644
index 400a3fcdfc59..000000000000
--- a/kde-plasma/plasma-nm/files/plasma-nm-5.26.0-unused-dep.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From 6f6958586e5a89ad5ff597550894a5770b5fb7cf Mon Sep 17 00:00:00 2001
-From: Volker Krause <vkrause@kde.org>
-Date: Wed, 5 Oct 2022 16:38:37 +0200
-Subject: [PATCH] Remove deprecated KDeclarative use
-
-The icon image engine seems not required here.
----
- CMakeLists.txt     | 1 -
- kcm/CMakeLists.txt | 1 -
- kcm/kcm.cpp        | 5 -----
- 3 files changed, 7 deletions(-)
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 6495c735..c245f60e 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -40,7 +40,6 @@ find_package(KF5 ${KF5_MIN_VERSION} REQUIRED
-     ConfigWidgets
-     Completion
-     CoreAddons
--    Declarative
-     DBusAddons
-     KIO
-     I18n
-diff --git a/kcm/CMakeLists.txt b/kcm/CMakeLists.txt
-index cbd7ad32..8f3e60d3 100755
---- a/kcm/CMakeLists.txt
-+++ b/kcm/CMakeLists.txt
-@@ -16,7 +16,6 @@ target_link_libraries(kcm_networkmanagement
-     plasmanm_internal
-     plasmanm_editor
-     KF5::ConfigWidgets
--    KF5::Declarative
-     KF5::I18n
-     KF5::Service
-     Qt::Quick
-diff --git a/kcm/kcm.cpp b/kcm/kcm.cpp
-index 11663fe9..e350be54 100644
---- a/kcm/kcm.cpp
-+++ b/kcm/kcm.cpp
-@@ -20,7 +20,6 @@
- #include <KPluginFactory>
- #include <KPluginMetaData>
- #include <KSharedConfig>
--#include <kdeclarative/kdeclarative.h>
- 
- #include <NetworkManagerQt/ActiveConnection>
- #include <NetworkManagerQt/Connection>
-@@ -58,10 +57,6 @@ KCMNetworkmanagement::KCMNetworkmanagement(QWidget *parent, const QVariantList &
-     auto mainWidget = new QWidget(this);
-     m_ui->setupUi(mainWidget);
- 
--    KDeclarative::KDeclarative kdeclarative;
--    kdeclarative.setDeclarativeEngine(m_ui->connectionView->engine());
--    kdeclarative.setupEngine(m_ui->connectionView->engine());
--
-     KLocalizedContext *l10nContext = new KLocalizedContext(m_ui->connectionView->engine());
-     l10nContext->setTranslationDomain(QStringLiteral(TRANSLATION_DOMAIN));
-     m_ui->connectionView->engine()->rootContext()->setContextObject(l10nContext);
--- 
-2.38.0
-
diff --git a/kde-plasma/plasma-nm/metadata.xml b/kde-plasma/plasma-nm/metadata.xml
index 4cc596c40725..357da291c490 100644
--- a/kde-plasma/plasma-nm/metadata.xml
+++ b/kde-plasma/plasma-nm/metadata.xml
@@ -9,7 +9,6 @@
 		<bugs-to>https://bugs.kde.org/</bugs-to>
 	</upstream>
 	<use>
-		<flag name="modemmanager">Enable support for mobile broadband devices</flag>
 		<flag name="openconnect">Build support for the OpenConnect VPN client</flag>
 		<flag name="teamd">Enable Teamd control support</flag>
 	</use>
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.26.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.27.5.ebuild
index 953f09375e80..5ceda4f33f7b 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.26.5.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.27.5.ebuild
@@ -4,17 +4,17 @@
 EAPI=8
 
 ECM_TEST="true"
-KFMIN=5.99.0
+KFMIN=5.102.0
 PVCUT=$(ver_cut 1-3)
-QTMIN=5.15.5
+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="modemmanager openconnect teamd"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+IUSE="openconnect teamd"
 
 DEPEND="
 	>=app-crypt/qca-2.3.0:2[qt5(+)]
@@ -23,6 +23,7 @@ DEPEND="
 	>=dev-qt/qtgui-${QTMIN}:5
 	>=dev-qt/qtnetwork-${QTMIN}:5
 	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
@@ -37,17 +38,13 @@ DEPEND="
 	>=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/mobile-broadband-provider-info
 	net-misc/networkmanager[teamd=]
-	modemmanager? (
-		>=dev-qt/qtxml-${QTMIN}:5
-		>=kde-frameworks/modemmanager-qt-${KFMIN}:5
-		net-misc/mobile-broadband-provider-info
-	)
 	openconnect? (
-		>=dev-qt/qtxml-${QTMIN}:5
 		net-vpn/networkmanager-openconnect
 		net-vpn/openconnect:=
 	)
@@ -65,8 +62,6 @@ BDEPEND="
 	virtual/pkgconfig
 "
 
-PATCHES=( "${FILESDIR}/${PN}-5.26.0-unused-dep.patch" )
-
 src_prepare() {
 	ecm_src_prepare
 
@@ -76,15 +71,6 @@ src_prepare() {
 	fi
 }
 
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)
-		$(cmake_use_find_package modemmanager KF5ModemManagerQt)
-	)
-
-	ecm_src_configure
-}
-
 pkg_postinst() {
 	ecm_pkg_postinst