gentoo resync : 03.01.2018

3 files changed, 6 insertions, 72 deletions

diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index fbb104150865..243c81addc5f 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,7 +1,6 @@
 AUX plasma-nm-add_EAP-PWD.patch 10213 BLAKE2B e35cf580481f9ddc139fd77d7f3a652440bff749a1c34e26ef579ff1dc9ac741b97d7f6f8ea2165c959febaedd16396e29af3a4adf20bb74b3ec6b73fb77193d SHA512 0db8b7e4c9e7ea51acb6ee7c8f79b1cb1040899b45e02a80f83d268197844e5bcee3b963796e9a70d364677adeff2180d5b4520d529c7603e10d91a9a0f162f7
 DIST plasma-nm-5.10.5.tar.xz 706724 BLAKE2B baf83a37ba88e8b695b9dd46805c8652e5d7aa8e6033515812971da399baedb29761c6fcf1cff69bcdc7f2505e44d33529d9c4f731e0f955369e4c16cdaed3fc SHA512 f2502368e883b4be3dd416be6e294e87cef259ac8c1b7853b63fba291e19ac43c5175c186ee287fb843409251fc1ef97eac87de7929ef48695fc409a0de8e05b
-DIST plasma-nm-5.11.4.tar.xz 695232 BLAKE2B 4656cc59184f0ee119507190e8699c27c732a05889a6d6953627179ece9670a9b161b268b7480d96f228c5d5b23db034d8ab7fed5a9230bd3038043ae396211c SHA512 6ef1ab68434c14137fa1a5919dcccc9abb5086ce6d9f5e0ccbb0903adee450aec41aef90a031f060be61af7eb98fa2bf7d5474079148a51abf2518cd2eaed5a9
+DIST plasma-nm-5.11.5.tar.xz 718500 BLAKE2B bdd9520cfa3a305f7f2c271fdfc9678b43ed46e160ff7c7485a963889b32e60f56408bcc39b4fce81e570ce194410730a628bb2eb96afcfba8704b787d90c05a SHA512 6bc42e9b385fff03d994d66fb2088ce22b2766588c655466e4e26a0b57f1533c142ce7712c9182d9003368f30086333ea9670bac54b9b797e58a968f8bfc3512
 EBUILD plasma-nm-5.10.5.ebuild 1726 BLAKE2B 7f2569f9074ffef65e61772735af2b8bfa96c6785d3598940f17e95b3bd3b702d8017ed9d73b822501a17dece2754926b9c37b08d874283972db91ff28bc16c4 SHA512 097e049b04cbc7902a8eb7ec8eb4948e9f8d509fdbcf7463daefdf5d688404784ab0378a4c5cbb475bf1616f878d38ec2450d9df9991c10fdbd26c23392e0176
-EBUILD plasma-nm-5.11.4-r1.ebuild 1791 BLAKE2B c61659aaa7d32d0b2785bfbe0fd066e6288d2247b940c33b220ed6b71ad3bdd0e656b82e457c0c83bccb2db2f1953b5bc5db617b9aa7aaadbef2c451e8318089 SHA512 47c1487ee3de1bb9a74cb628dd9899acd3dca88f4df050d5b0692f7d109c9720da957ee7e84e3f9fa0f2cf924dd7b98577d342bb0cfd1edc8751cd73f8a841d8
-EBUILD plasma-nm-5.11.4.ebuild 1728 BLAKE2B 12bf22894f3fa4051454b6389f38249de670fbdbcebe3e4a251dd7370e57cd99ef4fca2a10a147c6c993bfaa9a2c27ff25d06c3c64162e094843176b63591a3c SHA512 3cc241647c14078b0009892477529ddf010eefa39c1a8ad56ccfd2530c54a878e4b500aa7d5d442a876fb61e7b361552692cf4fc93350e1718a3867ffcc74195
+EBUILD plasma-nm-5.11.5.ebuild 1791 BLAKE2B 4adbe1887b954e8350b7b2e718be3fd5eaa415852cc9af9534c7f97e4c5441210819f9a1202264193302d81d75676c21e7fded2642cd0165415939eb693994ce SHA512 c6a02b483669a3f3727b5b264b04ba447771a9cf44a03216763a561607be42c133479b9a85f4f4c3a513043f8fcac12e53698d555354b9e1366d9f5a637f5953
 MISC metadata.xml 479 BLAKE2B 501f2ff581390f3119e9474e1aeafb45f2e13f3cf25650482f39ab38c7fb0e70ac006f269693ef546ef324730f302c454d27d79f0346e43b6f37583ccad1ca93 SHA512 69a8ce09c5a437814562c315dc7ac3142ac6c71906f37a6ea98e7b76fdd332362cfa76e823d0ee1ec920e92c8f7dda2a557071c758e9937886d7df78943b5689
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.11.4.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.11.4.ebuild
deleted file mode 100644
index 5783a52a471f..000000000000
--- a/kde-plasma/plasma-nm/plasma-nm-5.11.4.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit kde5
-
-DESCRIPTION="KDE Plasma applet for NetworkManager"
-LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~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 kdelibs4support)
-	$(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-0.9.10.0[teamd=]
-	modemmanager? (
-		$(add_frameworks_dep modemmanager-qt)
-		$(add_qt_dep qtxml)
-		net-misc/mobile-broadband-provider-info
-	)
-	openconnect? (
-		$(add_qt_dep qtxml)
-		net-misc/networkmanager-openconnect
-		net-vpn/openconnect:=
-	)
-"
-RDEPEND="${DEPEND}
-	$(add_plasma_dep plasma-workspace)
-	!kde-plasma/plasma-nm:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package modemmanager ModemManager)
-		$(cmake-utils_use_find_package modemmanager KF5ModemManagerQt)
-		$(cmake-utils_use_find_package openconnect OpenConnect)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.11.4-r1.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.11.5.ebuild
index 74809f59464c..85c63f9efa3a 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.11.4-r1.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.11.5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -10,8 +10,6 @@ LICENSE="GPL-2 LGPL-2.1"
 KEYWORDS="~amd64 ~arm ~x86"
 IUSE="modemmanager openconnect teamd"
 
-PATCHES=( "${FILESDIR}"/${PN}-add_EAP-PWD.patch )
-
 DEPEND="
 	$(add_frameworks_dep kcompletion)
 	$(add_frameworks_dep kconfig)
@@ -30,7 +28,7 @@ DEPEND="
 	$(add_frameworks_dep kwidgetsaddons)
 	$(add_frameworks_dep kwindowsystem)
 	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep networkmanager-qt 'teamd=' '5.41.0-r1')
+	$(add_frameworks_dep networkmanager-qt 'teamd=' '5.40.0-r1')
 	$(add_frameworks_dep plasma)
 	$(add_frameworks_dep solid)
 	$(add_qt_dep qtdbus)
@@ -56,6 +54,8 @@ RDEPEND="${DEPEND}
 	!kde-plasma/plasma-nm:4
 "
 
+PATCHES=( "${FILESDIR}"/${PN}-add_EAP-PWD.patch )
+
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package modemmanager ModemManager)