gentoo resync 31.01.2019

3 files changed, 2 insertions, 184 deletions

diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 67747fdeb5c8..ea4d73a6a78a 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -4,8 +4,6 @@ AUX plasma-workspace-5.10-startplasmacompositor-script.patch 1213 BLAKE2B 2558a4
 AUX plasma-workspace-5.12.80-tests-optional.patch 905 BLAKE2B 02350e6aa907b91c84d50f06efe5ab4acbddc39226747660b21f6b5209a85bb35b023e583a51b583e87f3d75d02c4c59621463992d29ba6150941d464a07ad8c SHA512 df01f4f246d093606a72c8ca018ce829b42073cf6db2db00f9be7b22d7532f3a6fab5218579c666ae8ed6408c0a67912643f2c37e1c13aada49b7ef0c4111044
 AUX plasma-workspace-5.14.2-split-libkworkspace.patch 1100 BLAKE2B 7583bed4a71867de37c9741416d9a9711e2e8a9a26f5f50e826ec74a1b8efc03d4a592b06ca24df525381d7f98870329082cbafd86e1b29797ca68e78c928d81 SHA512 07a80880960719106ddb65d3b55fba5af7a71829dcb91bd9ae6bc1531ad019aeece968e01f243625f7fea2b34081590d317528797833fd9485b95cb1fd3f001d
 AUX plasma-workspace-5.4-startkde-script.patch 1090 BLAKE2B bb2b0f20bbc2ed467994c98840ffeefc71d4f621713e413ff09a855689bde66b81a61e607457b3fa1ae51a67a3a3e47049193fec530448483c6f87e63f713981 SHA512 45149d5a3db48d77da7a74fd0a5faf14c8f99aaceddc725c9056cac315fd3bae78506e7cd74f6548045e4daf73bf2a605a712311018ff11a4a26c7d9f2afee84
-DIST plasma-workspace-5.14.3.tar.xz 4584420 BLAKE2B 50975eef224435e4359447fb0ea8f2ed447cd459860071bbdd32ac2239e0e8ab035fe2703474c856bc3ca173cfddd2d4166d281ca2fa2b6e2c355d19ee2f45ee SHA512 c79ffa14874f5ef1b476ebd5586f7175dcce1190601af3e75d8d0186aca8cb526c94b1445624d75b6a0dbc5bb780673d0c361aa49c5e5752a4639bba75af42a0
 DIST plasma-workspace-5.14.5.tar.xz 4578556 BLAKE2B 3c37bd9f880225f0e8b2496b90e5afc5ad591e8e356bd68ae135c3e9ccfe646adcb2418e2e80185f396c3b412f0df603ba0902e5a6d54a6d9a5abdff500a71f7 SHA512 247abdfe4ed4c7b6bb847c5352b3df11d110d59f8cc62b51dfd9de76c62549a0191efdd1e1f5a6ab82a87eccdc9fd28481a85c1252d05595e0f1a72174b3f8c6
-EBUILD plasma-workspace-5.14.3.ebuild 5000 BLAKE2B 68a4683d732fedc92e5713e12e2b5cb39deb4470fd75884242bd0b6af6f4ecd3b03937f9f7f6aee4f49f9e89515aec84ef747380f16883e0ce17babe8b9fd87f SHA512 c9d44afe6712f5fbe0042adbb339a8d8e6885c90cbbf5e2bb744c25454d291a1094b6125236fffc3bedf0c1d0347c670b916baa3cffc796664601fd103931c2f
-EBUILD plasma-workspace-5.14.5.ebuild 5002 BLAKE2B f3bd027c6221cfd4fb42d84a78d0f6ee37b1a6995094f238c59b5c1d685bb115669cd461759c8af4fc1e55631d11c47c134c85a947b24735e4f69058627c1fc4 SHA512 5fc11ec0cb20e6db09dcddf663b14fa11fe5193eccfda6f298990d2b112e441043a0b54ea75ee98810ec29651329385a7cff5c2a937db82ae81f5d2ef73f35d2
+EBUILD plasma-workspace-5.14.5.ebuild 5000 BLAKE2B 45c1260d94224ab0ea2c210a4bf8f3bb1bc8c32bea464f231265e42e3c59ae2d2a8f8625361c504e3f124c0f29238007cd130066a17eb0dce93d5ec81091c048 SHA512 0ce7569ed4b7bcd25f2e8890ee7bc64b38a476c216ae48601350c149022618784a7451d8a182fa718f12ef518a77f3c85956575993460ac6d129666d2a1dd1fc
 MISC metadata.xml 583 BLAKE2B f9b40b080569e6ec92f7a4f23bd6c7e7fb7711b44d3a00cef525478e9ad9a1b2eda3fe0a4686d625cf8530b6f7aa36b6f70eb71401a06ef2856ef3d0c068e11f SHA512 8b7b81edd1518c2b1ee18d609288c209d197d35f869d687e1019a10f29a2360bd071218ad3facf65217665287b3ceab84a78341e6cd799a7326fd3da2336958f
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.14.3.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.14.3.ebuild
deleted file mode 100644
index 6e6996c7c11a..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.14.3.ebuild
+++ /dev/null
@@ -1,180 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5 qmake-utils
-
-DESCRIPTION="KDE Plasma workspace"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-IUSE="appstream +calendar geolocation gps prison qalculate +semantic-desktop systemd"
-
-REQUIRED_USE="gps? ( geolocation )"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kactivities)
-	$(add_frameworks_dep kauth)
-	$(add_frameworks_dep kbookmarks)
-	$(add_frameworks_dep kcompletion)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kdelibs4support)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep kguiaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep kitemmodels)
-	$(add_frameworks_dep kitemviews)
-	$(add_frameworks_dep kjobwidgets)
-	$(add_frameworks_dep kjs)
-	$(add_frameworks_dep kjsembed)
-	$(add_frameworks_dep knewstuff)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep knotifyconfig)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep krunner)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep ktexteditor)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwallet)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep plasma)
-	$(add_frameworks_dep solid)
-	$(add_plasma_dep kscreenlocker)
-	$(add_plasma_dep kwin)
-	$(add_plasma_dep libksysguard)
-	$(add_plasma_dep libkworkspace)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui 'jpeg')
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtsql)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	$(add_qt_dep qtxml)
-	media-libs/phonon[qt5(+)]
-	sys-libs/zlib
-	x11-libs/libICE
-	x11-libs/libSM
-	x11-libs/libX11
-	x11-libs/libXau
-	x11-libs/libxcb
-	x11-libs/libXfixes
-	x11-libs/libXrender
-	x11-libs/libXtst
-	x11-libs/xcb-util
-	x11-libs/xcb-util-image
-	appstream? ( dev-libs/appstream[qt5] )
-	calendar? ( $(add_frameworks_dep kholidays) )
-	geolocation? ( $(add_frameworks_dep networkmanager-qt) )
-	gps? ( sci-geosciences/gpsd )
-	prison? ( $(add_frameworks_dep prison) )
-	qalculate? ( sci-libs/libqalculate:= )
-	semantic-desktop? ( $(add_frameworks_dep baloo) )
-"
-DEPEND="${COMMON_DEPEND}
-	$(add_qt_dep qtconcurrent)
-	x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_frameworks_dep kded)
-	$(add_frameworks_dep kdesu)
-	$(add_kdeapps_dep kio-extras)
-	$(add_plasma_dep ksysguard)
-	$(add_plasma_dep milou)
-	$(add_plasma_dep plasma-integration)
-	$(add_qt_dep qdbus)
-	$(add_qt_dep qtgraphicaleffects)
-	$(add_qt_dep qtpaths)
-	$(add_qt_dep qtquickcontrols 'widgets')
-	app-text/iso-codes
-	x11-apps/mkfontdir
-	x11-apps/xmessage
-	x11-apps/xprop
-	x11-apps/xrdb
-	x11-apps/xset
-	x11-apps/xsetroot
-	systemd? ( sys-apps/dbus[user-session] )
-	!systemd? ( sys-apps/dbus )
-	!kde-plasma/freespacenotifier:4
-	!kde-plasma/libtaskmanager:4
-	!kde-plasma/kcminit:4
-	!kde-plasma/kdebase-startkde:4
-	!kde-plasma/klipper:4
-	!kde-plasma/krunner:4
-	!kde-plasma/ksmserver:4
-	!kde-plasma/ksplash:4
-	!kde-plasma/plasma-workspace:4
-"
-PDEPEND="
-	$(add_plasma_dep kde-cli-tools)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.4-startkde-script.patch"
-	"${FILESDIR}/${PN}-5.10-startplasmacompositor-script.patch"
-	"${FILESDIR}/${PN}-5.12.80-tests-optional.patch"
-	"${FILESDIR}/${PN}-5.14.2-split-libkworkspace.patch"
-)
-
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-
-	sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
-		-i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
-
-	cmake_comment_add_subdirectory libkworkspace
-	# delete colliding libkworkspace translations
-	if [[ ${KDE_BUILD_TYPE} = release ]]; then
-		find po -type f -name "*po" -and -name "libkworkspace*" -delete || die
-	fi
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBUILD_xembed-sni-proxy=OFF
-		$(cmake-utils_use_find_package appstream AppStreamQt)
-		$(cmake-utils_use_find_package calendar KF5Holidays)
-		$(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
-		$(cmake-utils_use_find_package prison KF5Prison)
-		$(cmake-utils_use_find_package qalculate Qalculate)
-		$(cmake-utils_use_find_package semantic-desktop KF5Baloo)
-	)
-
-	use gps && mycmakeargs+=( $(cmake-utils_use_find_package gps libgps) )
-
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	# startup and shutdown scripts
-	insinto /etc/plasma/startup
-	doins "${FILESDIR}/10-agent-startup.sh"
-
-	insinto /etc/plasma/shutdown
-	doins "${FILESDIR}/10-agent-shutdown.sh"
-}
-
-pkg_postinst () {
-	kde5_pkg_postinst
-
-	elog "To enable gpg-agent and/or ssh-agent in Plasma sessions,"
-	elog "edit ${EPREFIX}/etc/plasma/startup/10-agent-startup.sh and"
-	elog "${EPREFIX}/etc/plasma/shutdown/10-agent-shutdown.sh"
-}
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.14.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.14.5.ebuild
index 6b8b720cd49c..8ca2acf99e11 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.14.5.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.14.5.ebuild
@@ -9,7 +9,7 @@ VIRTUALX_REQUIRED="test"
 inherit kde5 qmake-utils
 
 DESCRIPTION="KDE Plasma workspace"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 IUSE="appstream +calendar geolocation gps prison qalculate +semantic-desktop systemd"
 
 REQUIRED_USE="gps? ( geolocation )"