gentoo resync : 18.11.2019

3 files changed, 80 insertions, 76 deletions

diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index 5a63cd213390..e6ce54581506 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,6 +1,6 @@
 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.2.tar.xz 813408 BLAKE2B dd5f14157bfa8af3bf14b3852304c1e03c2240a9d14c808465b8a719c86b5cb3a311ea35afed6b41035e4af09f16492a49d70acae96a891a3f67a2b3a031c3aa SHA512 5d43a214629929f0971f7340aeea3133d89e2809a257f751a23128b7447364040faae997eda4c7667ea77ad024e47bcf323d761dd32714a2715bcf16e69af91b
+DIST plasma-nm-5.17.3.tar.xz 810888 BLAKE2B 05db4c88928d5dbf15d91d4c2d54770c2b1e05f71597e03e0480be8dceed08412d50b50b10d6ba9d01728bd01fc77a19964ab3245d679bcc97fcb627032a321d SHA512 fe539f319a71a5df5c9ff7b319c781a94e2a41cb3393924d97933a9a9c1909c95862a6f8a5654527a70946f6b2796897f6388dcf9eb9f272121e56efc0e2f17c
 EBUILD plasma-nm-5.16.5.ebuild 2036 BLAKE2B 91a06b9fb2c589b874924c27254c81087ccf599e4f262b9933cd8298b6343aff33f9bce75b2e7d80dc788b80d7ba407b24914f43b823f8e5fb225b1a787170ff SHA512 b28fe576a529df8e26a428bea146c176d1588f46df51d17d6c30f8bef0cd343cb00ec582c41526caa9e18ec60a86c095c193189e72456de80aca877dbafd9fe3
-EBUILD plasma-nm-5.17.2.ebuild 1995 BLAKE2B d3295ac1ae08573f123eee4dd0508b9ddcfb52ea658b5df363c9de6ddbed8768f7ef86a46ab5e3ecf87d568adb504889a947dae649b4dfb248d66f541c80d70d SHA512 59ee47b72cc902835ee291114c179ac4e5e3f582f0b93405ceace28682e0f92f9ecff65de0badf10c0decc9b3000f79aa654ee2b0ad20c9edd9e0e84980979e0
+EBUILD plasma-nm-5.17.3.ebuild 2222 BLAKE2B 7bef9e3a628465793349de91495f54e53cd9f51c2abe7c067af5908af8d297836a558a2a23fca3a52c76373ca13cb891fbddb70bec43b2ba6c6d4a8e4a4d23df SHA512 a7db9bda1098c004b85b2416256382413ce98bcac819e6a9b5895ea7076fec15e009e8e8c57c47785dfbf5f4fb345c6c4206cf709fa801b01b70a4baea0e58b3
 MISC metadata.xml 479 BLAKE2B 501f2ff581390f3119e9474e1aeafb45f2e13f3cf25650482f39ab38c7fb0e70ac006f269693ef546ef324730f302c454d27d79f0346e43b6f37583ccad1ca93 SHA512 69a8ce09c5a437814562c315dc7ac3142ac6c71906f37a6ea98e7b76fdd332362cfa76e823d0ee1ec920e92c8f7dda2a557071c758e9937886d7df78943b5689
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.17.2.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.17.2.ebuild
deleted file mode 100644
index 2833ce552fc0..000000000000
--- a/kde-plasma/plasma-nm/plasma-nm-5.17.2.ebuild
+++ /dev/null
@@ -1,74 +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 'widgets')
-	$(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)
-"
-
-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.3.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.17.3.ebuild
new file mode 100644
index 000000000000..615d0f983c01
--- /dev/null
+++ b/kde-plasma/plasma-nm/plasma-nm-5.17.3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2019 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="
+	>=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
+	>=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
+	>=app-crypt/qca-2.1.1:2[qt5(+)]
+	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}
+	>=kde-plasma/kde-cli-tools-${PVCUT}:5
+"
+
+src_configure() {
+	local mycmakeargs=(
+		-DDISABLE_MODEMMANAGER_SUPPORT=$(usex !modemmanager)
+		$(cmake-utils_use_find_package modemmanager KF5ModemManagerQt)
+		$(cmake-utils_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
+}