gentoo resync : 21.05.2019

3 files changed, 2 insertions, 148 deletions

diff --git a/kde-plasma/plasma-desktop/Manifest b/kde-plasma/plasma-desktop/Manifest
index 5eb2fd4814de..8b96e3eb43d7 100644
--- a/kde-plasma/plasma-desktop/Manifest
+++ b/kde-plasma/plasma-desktop/Manifest
@@ -1,5 +1,3 @@
-DIST plasma-desktop-5.14.5.1.tar.xz 9649428 BLAKE2B d385cb266d5db1a53d481813f8f24c53acc048f2eb64fb386df81b8bf9be08bdc34ebf22d30078a5fcea20cebc32ff3584e69d689ac5239d09eaee2cbd116dba SHA512 cf54e22f41ee917509405d7a42e27fabd9928a1ced54ea9981b6a964deca373f6dcb17447f0331b94883f66070f276fbc4d13d010b7a6ce1a8efd82f4c865765
 DIST plasma-desktop-5.15.5.tar.xz 9285792 BLAKE2B 27e44bf35b6c317e8e7d3074c089d1cf5106066e52d5be5fbec36096e1df86d5004fc84bc9693d8d396711f7a94ce5d709ee8c9a5b867ccdfaa5dd016ad14964 SHA512 ed7578d92a908bebc3bc42cd7900704253a7066f667deeed35d5efb291711a364a7026bf9d12510a8113f9d52d6e9297f500c5b04bd8f9522f071da0f240432c
-EBUILD plasma-desktop-5.14.5.1.ebuild 3855 BLAKE2B 49ef9c5621f098a17721e4844358762e0aa1cee1188a15a4d24bd040a99cb0e09f37a24bc569b6a00755774567365318f8bd3b9013578027f8d9c24d8dd0fa72 SHA512 8f402697eb2585f463249823087eba4b6c4cd82f213f29ea9a9a1092bb5c7194d59b3d3cbddac80b36c0cac497ff2e5a55c6879cf4ca004e85b6ff2116af1daf
-EBUILD plasma-desktop-5.15.5.ebuild 3779 BLAKE2B f9b7c0de2fb8fb06ff41bcf608672cc00042b7ec20930f3f0d010bccb04a7fefeffef2b7b2c6611b606321e85ee6f1721c5a6f3ef1b087383e44aa956a022cd3 SHA512 b1696e9fe0680bcabb7d7a5f30f951b07d4792baace7533353d0b2100330e5275757ff09a5ca634c69a13cbdbdbcb69d0ec20508763b2e641a09507f3e1553b0
+EBUILD plasma-desktop-5.15.5.ebuild 3777 BLAKE2B 3f6f83bdc400fb5e4cc924fdb733ee7c8af709f9aa951f32103e9722d541118fce3232fa3a29b2b38f1911a42ed1ce525b61aa8749e463e74c4d755f4b522eac SHA512 aed5ed9054beb9266b81c7c1617308357e7d038767c29f9c85aa96ccecc7961e8f9f33ce0bf82a9c36fd76645b29082a319958510164b7c78b52ced97f63639e
 MISC metadata.xml 589 BLAKE2B 1638c90163cf31addbeb1f6f58ed68cf7e97da259bc22d4df7123a704bd66b3e628d9cbf1c2b20d67d44539f4d27588d348724510aeb3310e5baea63db79be8d SHA512 e6aece50e632897b8fca637028419eadb6d6fea24388314b5be7f3e915d0ee3c46d7ac09c354ffcc04a50b31d4998033fe21919d19a40368e26ec43987f4d18f
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.14.5.1.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.14.5.1.ebuild
deleted file mode 100644
index f30755ed499c..000000000000
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.14.5.1.ebuild
+++ /dev/null
@@ -1,144 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-VIRTUALX_REQUIRED="test"
-inherit kde5
-
-DESCRIPTION="KDE Plasma desktop"
-KEYWORDS="amd64 ~arm x86"
-IUSE="appstream +fontconfig ibus +mouse scim +semantic-desktop touchpad"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep attica)
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kactivities-stats)
-	$(add_frameworks_dep karchive)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kcodecs)
-	$(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 kded)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kemoticons)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kparts)
-	$(add_frameworks_dep kpeople)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_frameworks_dep sonnet)
-	$(add_plasma_dep kwin)
-	$(add_plasma_dep plasma-workspace)
-	$(add_qt_dep qtconcurrent)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtprintsupport)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtsvg)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-	x11-libs/libX11
-	x11-libs/libXcursor
-	x11-libs/libXfixes
-	x11-libs/libXi
-	x11-libs/libxcb
-	x11-libs/libxkbfile
-	appstream? ( >=dev-libs/appstream-0.12.2[qt5] )
-	fontconfig? (
-		media-libs/fontconfig
-		media-libs/freetype
-		x11-libs/libXft
-		x11-libs/xcb-util-image
-	)
-	ibus? (
-		$(add_qt_dep qtx11extras)
-		app-i18n/ibus
-		dev-libs/glib:2
-		x11-libs/libxcb
-		x11-libs/xcb-util-keysyms
-	)
-	scim? ( app-i18n/scim )
-	semantic-desktop? ( $(add_frameworks_dep baloo) )
-	touchpad? ( x11-drivers/xf86-input-synaptics )
-"
-DEPEND="${COMMON_DEPEND}
-	dev-libs/boost
-	x11-base/xorg-proto
-	fontconfig? ( x11-libs/libXrender )
-	mouse? (
-		x11-drivers/xf86-input-evdev
-		x11-drivers/xf86-input-libinput
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep qqc2-desktop-style)
-	$(add_plasma_dep breeze)
-	$(add_plasma_dep kde-cli-tools)
-	$(add_plasma_dep oxygen)
-	$(add_qt_dep qtgraphicaleffects)
-	sys-apps/util-linux
-	x11-apps/setxkbmap
-	!kde-apps/kcontrol
-	!<kde-apps/kde4-l10n-17.08.1-r1
-	!kde-apps/knetattach[handbook]
-	!kde-misc/kcm-touchpad
-	!kde-plasma/plasma-desktop:4
-	!kde-plasma/plasma-workspace:4
-	!kde-plasma/solid-actions-kcm:4
-	!kde-plasma/systemsettings:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake-utils_use_find_package appstream AppStreamQt)
-		$(cmake-utils_use_find_package fontconfig Fontconfig)
-		$(cmake-utils_use_find_package ibus IBus)
-		$(cmake-utils_use_find_package mouse Evdev)
-		$(cmake-utils_use_find_package mouse XorgLibinput)
-		$(cmake-utils_use_find_package scim SCIM)
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-		$(cmake-utils_use_find_package touchpad Synaptics)
-	)
-
-	kde5_src_configure
-}
-
-src_test() {
-	# parallel tests fail, foldermodeltest,positionertest hang, bug #646890
-	# needs D-Bus, bug #634166
-	local myctestargs=(
-		-j1
-		-E "(foldermodeltest|positionertest|test_kio_fonts)"
-	)
-
-	kde5_src_test
-}
diff --git a/kde-plasma/plasma-desktop/plasma-desktop-5.15.5.ebuild b/kde-plasma/plasma-desktop/plasma-desktop-5.15.5.ebuild
index 2a43bf48fc0c..aa2e5373285f 100644
--- a/kde-plasma/plasma-desktop/plasma-desktop-5.15.5.ebuild
+++ b/kde-plasma/plasma-desktop/plasma-desktop-5.15.5.ebuild
@@ -9,7 +9,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5
 
 DESCRIPTION="KDE Plasma desktop"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="appstream +fontconfig ibus +mouse scim +semantic-desktop touchpad"
 
 COMMON_DEPEND="