gentoo resync : 15.01.2020

5 files changed, 84 insertions, 143 deletions

diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index b87f7011c67a..0d9080cb8f3d 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,6 +1,5 @@
-AUX plasma-nm-5.16.5-missing-headers.patch 1515 BLAKE2B 96f424e990d6fb294693ddbf61c097ccfe6d94f96d59a1df2507b253b7a05547760bf83ea885fc101c1da484499e78a360758389fa897d5a2380bcef2a5e2281 SHA512 180cdc4eee90d2162bb651b5838fd212a33d8b9bb7d500647aa0fd0bc8f75f085939cc7eeadf1077a2bd43fd9cd44923b41c736b996ad440d8e3647b488ccb6d
-DIST plasma-nm-5.16.5.tar.xz 787892 BLAKE2B 030840885c35ad9a2d370fddb4cad6b593512b68a958d4f94677c42506ed5c6c184d8b391bd0a47a8bb9cc6ede246163035099abe0629e437b4906cbc5de08d1 SHA512 cc52ed0b1933d0c8c86bd3188ee77d155adc2392dadbc311daf222c4e0c4c4a484b6748e1f5d52b643cc7fc55db947aff0f0a4c5ef14742d4211969e65b85d3f
 DIST plasma-nm-5.17.4.tar.xz 813536 BLAKE2B 1bd376375d6a0632012f44fbe619bbcf768da82708c5447f818af7e45558d4c3adc0bb3455d4c41da68106ccfd7e5a99d24660cba2d6a1aec950baf09ff2710f SHA512 cc16ab698373885b67feef279b59c7760b7fa2dc099b2e0250344faf0aecae1e0514a0d92100f3eb28c37fd582a6fb69dac670eb988d2c1bafa4fa1fb92db06d
-EBUILD plasma-nm-5.16.5.ebuild 2036 BLAKE2B 91a06b9fb2c589b874924c27254c81087ccf599e4f262b9933cd8298b6343aff33f9bce75b2e7d80dc788b80d7ba407b24914f43b823f8e5fb225b1a787170ff SHA512 b28fe576a529df8e26a428bea146c176d1588f46df51d17d6c30f8bef0cd343cb00ec582c41526caa9e18ec60a86c095c193189e72456de80aca877dbafd9fe3
-EBUILD plasma-nm-5.17.4.ebuild 2285 BLAKE2B c2fc0d515fa0138f949ac5fe7a1138d742e501e7eeead6fdd15a1c812c467bfa5425559ef21ab8b1766063c0a0bbb3fcfa24a17a788082629fb22d871ae2a130 SHA512 94b2c74117a844a134e00f97aebbb3074e16e58bb47e05929a56fed5c99f53cfa094137893b6635219b094f806ba663a8a0e7bcde56383a67eb8c80efed481dd
+DIST plasma-nm-5.17.5.tar.xz 814376 BLAKE2B 757ac2a1ed3eb1263a0034f950d688194ad1a11e6b842208f12d8abbfabcc75461510312b3e63a166d691b538c276ed74c367eeb2122774d669915366e82695e SHA512 45792671afd3ae9b8cebcaed7588524f04234394c178055211a1896a8a3e5ffcf48229f65ec7815f1ef51076860bc4388d37de6b058c24e54f0772eb1c3111a3
+EBUILD plasma-nm-5.17.4.ebuild 2282 BLAKE2B 3d9270030fb25498ba13f6a6ff80011c4709c421fadc2a69b8465d59a705754f31467ee3d33bcf44a2b058d103108e94a5dbb62419e37813ba85e810d6961a5c SHA512 222321886d8d9f8e32b25c540d4d770c06dcfffa936501cbcb62cf0964e1794bfaeeed6d8678661ce667270330884c9adcaa290f468777c00482424130be6ad9
+EBUILD plasma-nm-5.17.5.ebuild 2285 BLAKE2B 6a4dc1f35e977f60e98c66a415694ce7c725a5cb03aa0c59d6ae5f1869e0547a2624e5e6accce98b8164ed0056a1cc6366515cc7574fa92c9ad8f969242d304d SHA512 68c0fdfdb0c3ae2237b38edfee1d8d747019a3b6d60f22b6f781b68d993864c87ec53fa8079bfe7cd6365f1b789face2f0da028cb0b063dd828eeaed87cd1d35
 MISC metadata.xml 479 BLAKE2B 501f2ff581390f3119e9474e1aeafb45f2e13f3cf25650482f39ab38c7fb0e70ac006f269693ef546ef324730f302c454d27d79f0346e43b6f37583ccad1ca93 SHA512 69a8ce09c5a437814562c315dc7ac3142ac6c71906f37a6ea98e7b76fdd332362cfa76e823d0ee1ec920e92c8f7dda2a557071c758e9937886d7df78943b5689
diff --git a/kde-plasma/plasma-nm/files/plasma-nm-5.16.5-missing-headers.patch b/kde-plasma/plasma-nm/files/plasma-nm-5.16.5-missing-headers.patch
deleted file mode 100644
index 676087e89ac6..000000000000
--- a/kde-plasma/plasma-nm/files/plasma-nm-5.16.5-missing-headers.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-From a7eb3cb599fbb1d66c6980d53550822cbbfd1520 Mon Sep 17 00:00:00 2001
-From: Andreas Sturmlechner <asturm@gentoo.org>
-Date: Wed, 14 Aug 2019 11:25:49 +0200
-Subject: Add missing headers with DISABLE_MODEMMANAGER_SUPPORT=ON
-
-Reviewers: jgrulich
-
-Reviewed By: jgrulich
-
-Subscribers: plasma-devel
-
-Tags: #plasma
-
-Differential Revision: https://phabricator.kde.org/D23148
----
- libs/declarative/networkstatus.cpp | 2 ++
- libs/handler.cpp                   | 1 +
- libs/handler.h                     | 1 +
- 3 files changed, 4 insertions(+)
-
-diff --git a/libs/declarative/networkstatus.cpp b/libs/declarative/networkstatus.cpp
-index b9db376..e94b7ea 100644
---- a/libs/declarative/networkstatus.cpp
-+++ b/libs/declarative/networkstatus.cpp
-@@ -20,7 +20,9 @@
- 
- #include "networkstatus.h"
- #include "uiutils.h"
-+
- #include <QDBusConnection>
-+#include <QDBusConnectionInterface>
- 
- #include <NetworkManagerQt/ActiveConnection>
- #include <NetworkManagerQt/Connection>
-diff --git a/libs/handler.cpp b/libs/handler.cpp
-index 40b4b43..0095aa7 100644
---- a/libs/handler.cpp
-+++ b/libs/handler.cpp
-@@ -46,6 +46,7 @@
- #endif
- 
- #include <QDBusError>
-+#include <QDBusMetaType>
- #include <QDBusPendingReply>
- #include <QIcon>
- 
-diff --git a/libs/handler.h b/libs/handler.h
-index f8b7941..4c72699 100644
---- a/libs/handler.h
-+++ b/libs/handler.h
-@@ -22,6 +22,7 @@
- #define PLASMA_NM_HANDLER_H
- 
- #include <QDBusInterface>
-+#include <QTimer>
- 
- #include <NetworkManagerQt/Connection>
- #include <NetworkManagerQt/Settings>
--- 
-cgit v1.1
-
-
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.16.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.16.5.ebuild
deleted file mode 100644
index 145f930727bc..000000000000
--- a/kde-plasma/plasma-nm/plasma-nm-5.16.5.ebuild
+++ /dev/null
@@ -1,76 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="true"
-inherit kde5
-
-DESCRIPTION="KDE Plasma applet for NetworkManager"
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="amd64 ~arm arm64 x86"
-IUSE="modemmanager openconnect teamd"
-
-DEPEND="
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep networkmanager-qt 'teamd=')
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	>=app-crypt/qca-2.1.1:2[qt5(+)]
-	net-misc/networkmanager[teamd=]
-	modemmanager? (
-		$(add_frameworks_dep modemmanager-qt)
-		$(add_qt_dep qtxml)
-		net-misc/mobile-broadband-provider-info
-	)
-	openconnect? (
-		$(add_qt_dep qtxml)
-		net-vpn/networkmanager-openconnect
-		net-vpn/openconnect:=
-	)
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-"
-
-PATCHES=( "${FILESDIR}/${P}-missing-headers.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)
-		$(cmake-utils_use_find_package modemmanager KF5ModemManagerQt)
-		$(cmake-utils_use_find_package openconnect OpenConnect)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst() {
-	kde5_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.17.4.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.17.4.ebuild
index 5c93da84cba4..77b94c3f843c 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.17.4.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.17.4.ebuild
@@ -12,7 +12,7 @@ inherit ecm kde.org
 DESCRIPTION="KDE Plasma applet for NetworkManager"
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm arm64 x86"
 IUSE="modemmanager openconnect teamd"
 
 DEPEND="
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.17.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.17.5.ebuild
new file mode 100644
index 000000000000..2e62fd1ab99d
--- /dev/null
+++ b/kde-plasma/plasma-nm/plasma-nm-5.17.5.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+ECM_TEST="true"
+KFMIN=5.64.0
+PVCUT=$(ver_cut 1-3)
+QTMIN=5.12.3
+inherit ecm kde.org
+
+DESCRIPTION="KDE Plasma applet for NetworkManager"
+LICENSE="GPL-2 LGPL-2.1"
+SLOT="5"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+IUSE="modemmanager openconnect teamd"
+
+DEPEND="
+	>=app-crypt/qca-2.1.1: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/kdeclarative-${KFMIN}:5
+	>=kde-frameworks/ki18n-${KFMIN}:5
+	>=kde-frameworks/kiconthemes-${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/networkmanager-qt-${KFMIN}:5[teamd=]
+	>=kde-frameworks/plasma-${KFMIN}:5
+	>=kde-frameworks/solid-${KFMIN}:5
+	net-misc/networkmanager[teamd=]
+	modemmanager? (
+		>=kde-frameworks/modemmanager-qt-${KFMIN}:5
+		>=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-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)
+		$(cmake_use_find_package modemmanager KF5ModemManagerQt)
+		$(cmake_use_find_package openconnect OpenConnect)
+	)
+
+	ecm_src_configure
+}
+
+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
+}