gentoo resync : 21.05.2019

3 files changed, 2 insertions, 78 deletions

diff --git a/kde-plasma/plasma-nm/Manifest b/kde-plasma/plasma-nm/Manifest
index 5d6b9d1e23e5..797542b31ef4 100644
--- a/kde-plasma/plasma-nm/Manifest
+++ b/kde-plasma/plasma-nm/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-nm-5.14.5.tar.xz 721144 BLAKE2B f9537e742be74b50ffeecee007ef91d93d108b566cf081cb4d25bc4d62c98847a74e7e69ec01b2f10e4e75eac4bc75cef90a3a47ad5ad199cec9f20c31bdaf20 SHA512 54667ff01db16bfadc1663dcf51668aed4eabcb70c3903538044bb478aeb4625d27777df13867cdf03048b6575a540de5c7baaef9e2dc2c41f458d2800daba96
 DIST plasma-nm-5.15.5.tar.xz 777140 BLAKE2B d75ad6c04587f5bc115268f2bef50e0f6dd2b8b86957ab1f43e284988039fb7d9530cb03d86f5c49bdf6747bbb6ad123c7bc527643fe7461ed91efc93c63e563 SHA512 f3f78f40b754de5afbd63c5713e684fe3d37ae25af5a9e6ba808647e0d7d4f23456ed4b94aa8138e1fab99e7f7d7e0dffb697e0e46c99bd312bad5e2a7b9833f
-EBUILD plasma-nm-5.14.5.ebuild 1985 BLAKE2B b6a4dd2c14b0cdaa0c4857a4190571311afd3d64600392eab0f6e84be7c54b221b5a8831e18ff4b99561d2c682547ef5caf90eb196c1248dc74d41ce8ed71cb7 SHA512 eb712fb858a303ea1dea4201cea8789e7da168e91f617d2e0bf188d02efe258b9e0817b2043bbda63f64e1718dd5634b986acb96298f338efe30a7d112343474
-EBUILD plasma-nm-5.15.5.ebuild 1985 BLAKE2B 37662da4de5f18e91d296b4bb22beb634405104a6dc2b6f092a9ee7fffcc362d8d1005e10028b4e428077078e83fd8d86cfc0fccd4f00c8172a789e7429ac394 SHA512 c79a67b74db0314be108d5e1eefdc8e8fcac66f6dc3d9b396b3d717ace8d1a30e79fb72365eae5c0b42d906106f5e70c6795bf842d56b35a4f8172bbe1302210
+EBUILD plasma-nm-5.15.5.ebuild 1983 BLAKE2B e9a373137927a41f87c4cd00fe1710ddc0ea3cceaacec0584890eb22a52b2a86f62a708aadeb7db1d89708e631f3a8f151782369338d8dc40c0b8d645d9c5b86 SHA512 9d3e8f59a63502837e1c7af2d682a22aa4d9b5635b40f324e601e19407db54bfdd70ef701e9654fc9fb28ed2449b304f1aa07d53d5a825f5bcc7c62667543564
 MISC metadata.xml 479 BLAKE2B 501f2ff581390f3119e9474e1aeafb45f2e13f3cf25650482f39ab38c7fb0e70ac006f269693ef546ef324730f302c454d27d79f0346e43b6f37583ccad1ca93 SHA512 69a8ce09c5a437814562c315dc7ac3142ac6c71906f37a6ea98e7b76fdd332362cfa76e823d0ee1ec920e92c8f7dda2a557071c758e9937886d7df78943b5689
diff --git a/kde-plasma/plasma-nm/plasma-nm-5.14.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.14.5.ebuild
deleted file mode 100644
index 8d5189301481..000000000000
--- a/kde-plasma/plasma-nm/plasma-nm-5.14.5.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# 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 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)
-	!kde-plasma/plasma-nm:4
-"
-
-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.15.5.ebuild b/kde-plasma/plasma-nm/plasma-nm-5.15.5.ebuild
index 995f4b6b6b89..7c89b755908d 100644
--- a/kde-plasma/plasma-nm/plasma-nm-5.15.5.ebuild
+++ b/kde-plasma/plasma-nm/plasma-nm-5.15.5.ebuild
@@ -8,7 +8,7 @@ inherit kde5
 
 DESCRIPTION="KDE Plasma applet for NetworkManager"
 LICENSE="GPL-2 LGPL-2.1"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="modemmanager openconnect teamd"
 
 DEPEND="