gentoo resync : 25.09.2019

5 files changed, 3 insertions, 196 deletions

diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index a850cded45ee..72e3caa221dd 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,13 +1,10 @@
 AUX 10-agent-shutdown.sh 398 BLAKE2B f6c06021040aee856421ba536b96b81f119153f099cb1c242bdc73637b5b0f017da2355f9e135d9f40a6f47cf05e1c7910d2ff93ddc932e771794378cbb30390 SHA512 25a6f1ac242e4cbae8ab63c033af5cc320fc0f02cdc95000d5604ddfc8e2a3352055a9bbc629e5490011df2744cd0de59354c137bcb3766f0b0755773f2eb190
 AUX 10-agent-startup.sh 2139 BLAKE2B 7ea9ee0e6d949eecbdfbc41bd0286919094b6d6837e4c7a6ba1a8d223e890ca2287f9c842019e04ead5015840d6d2f9b9d89320a7b0f6c20197b1d90d56506b4 SHA512 718feed12544deb1750730bebf1d618cbccdec9a4815a28b9f17278fdc9c21466b098778b9a20785625b99b5eb930049a84a67a0c033b684610ec8eb5b5ec678
 AUX plasma-workspace-5.10-startplasmacompositor-script.patch 1213 BLAKE2B 2558a43db9cc65706fe2c3382918e47552ad702e9ac6a5071ae3c620bc05097306046e0cd3f74de68985d787120013ce76697cbe107bc3b0c5ace5d5d03a05c1 SHA512 eb7126ec8a7991c59c1c056c81d9b8d6934cf9c702cc70534a97b585eaf1ea3e33499e5525e821ce4e8682573a09538ed1d59db561c58a7464a144e9a24c5275
-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.14.80-startkde-script.patch 1207 BLAKE2B ee59b775f3ffb3d876d1c4c27f8221c9854af155fc4c0dc0c6cb591fc944f07c3196d64438011db6c2833b4030d0ef76e6a49752dcd1267a94e7686af06e5bda SHA512 e8de504db8b4f23ef6c09aae9d9fe88f88ed3623b6b5766e5cf57ccf72d5d31778f8f8ba5483ca200ad6d6fbae1346655f73ca1ef880d3eb1a5775f258501938
 AUX plasma-workspace-5.16.3-x11sessionrename.patch 2435 BLAKE2B 3ec4c08af77f24dd264e547ed1f33e2dcd21a501fe83638c56c51e3ea17502b7622b1d6829927cd1396f01356957f686fb76a825de272541afc7e67436d20a46 SHA512 69eaa3393b3e0dd0251df4a577002e4bcef4604b4293f08e5ad9a5ef98367a5ce67d2238e3f84acb8845e4fdd80d570a651ff5f475e43439763ad3dbc994241e
 AUX plasma-workspace-5.16.4-no-share-dataengine.patch 904 BLAKE2B ea9c8b6505e3bfd9b35a0ef02f4e6fcb4ba5ad011872bf3803ac12dd07115bceed58fce5d9a7b8042c0bd7c26a592561dc120e8f4f908cd352c46ff6f9d86db3 SHA512 bc79f69a50119d11035c0644a6d05281ea23ae29e662808a0a3384f3ec63049121b73bc1bb8c06b58c5b3f42fec8d5d45c9139e50466c628aa1261edb45b877a
-DIST plasma-workspace-5.15.5.tar.xz 4713728 BLAKE2B 7ce14912bf0dc2556484b7b719b00e7296fb67d78faabb9e3c00fbfb56a41db04e27b5f94636142f07e88e24d51ff308025a50d719a940e1287943a35db93e79 SHA512 5d5429114a733d4328f7db6c8e3c7dfe5e04862f8083fcad40b21390efb309c58fd1b13cf63aa57f2842c38936b9fe1c60ad61fc601cf4f592b86285c2270bed
 DIST plasma-workspace-5.16.5.tar.xz 4905748 BLAKE2B 049a4ff618aade78ac130c1496f6add0ddc391db5b025045eaee91fbcac0a0b9e7b44a06757c94699c1038b18a96a06eb31d4ab6518bfda6d308e12b1269ca04 SHA512 e55e89b6a8e3dcf68bb7ad4f62f284cd819c7461eff1269f84df086a2516401c26363cc6c3c8e6cc8e27788222b3ed81098d765a25e5d96d9274e3b342816369
-EBUILD plasma-workspace-5.15.5.ebuild 4827 BLAKE2B c5650f76b65ed3307d8c523eb530d26275a7be8964ab86a24813b9ee449c866ecfc4231996594e6a41453d8b2496fa352c2c999d257aee83ff5af46b9cd0b748 SHA512 c83a13992946a5c4842bef073798616581e390b401ed69be32ca372240b442aa8a575c1fd1658876b4d8334c95aa51f69a13a0df3131239beb870e3283148f8a
-EBUILD plasma-workspace-5.16.5.ebuild 4699 BLAKE2B 85c1c7693cef26e646c52632f3caff10c30b6dff4a42f52ddf93cf75a6f6704a31a20f132406882d636ffab7a6f1d3a7543f0d5804dc06304196bd320a3aeb02 SHA512 24a7a337c7a03f3205ab80ca542e79e76b02cd359634d7e5e5eecc58451aaf8b159fb515c52a889341c8ee1c1d7e52995977516734bd0db510a030ccef85e4ca
-MISC metadata.xml 708 BLAKE2B f63263b1645f6fa916f39a52c20e88668cc97344aa5c35b9be7867522e19dd164486468ca236cd85df169a8d8936ec93efed6d2bda85378ded780b2880ef9e41 SHA512 f10a644861ab6f53bc23d77f95341b18561ef4dbebdee9682dfac62b06982d49f269ba7d35881e52d3cac6849abc643ea57cb60d986daa96b5b44e203563eda9
+EBUILD plasma-workspace-5.16.5.ebuild 4696 BLAKE2B 3701c3d0721a0ed497c7f5bf749be05c5b3071cb90b98df0bad2f0b2de0b7042b392ef7fb7ed4ffe60e4a2c08c206bee51e9f1fa49841110b78a655436acc93b SHA512 8a4ac267c2cb2207d1e44e970f88b7d33ee76282c94a2868584d836261021644b934be8ea592ec29aa5e4a0f144991b3545bfa0aebd7dc7cf3ba28bf4a20f663
+MISC metadata.xml 643 BLAKE2B 28c9374aff890daac8a279eee05792f453a1e15b81d4e8182c3ff1bfb352e00859ede5792580b171615bc0af866fd8f5060486fb2fc3013d408a36343f78c2ba SHA512 eb5d1e325403d3f22422642b6d32a250f4450b06bf0f1275bc88b5dcae004ccb0f12bab318d36a24991bf2bffc590fcf7d43419d58e3d2bf9a396ed7e3f8778c
diff --git a/kde-plasma/plasma-workspace/files/plasma-workspace-5.12.80-tests-optional.patch b/kde-plasma/plasma-workspace/files/plasma-workspace-5.12.80-tests-optional.patch
deleted file mode 100644
index e26b27e8c3be..000000000000
--- a/kde-plasma/plasma-workspace/files/plasma-workspace-5.12.80-tests-optional.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff --git a/dataengines/notifications/CMakeLists.txt b/dataengines/notifications/CMakeLists.txt
-index 8a90cb59..597b3f7e 100644
---- a/dataengines/notifications/CMakeLists.txt
-+++ b/dataengines/notifications/CMakeLists.txt
-@@ -46,7 +46,8 @@ ecm_qt_declare_logging_category(notifications_test_SRCS HEADER debug.h
-                                                IDENTIFIER NOTIFICATIONS
-                                                CATEGORY_NAME kde.dataengine.notifications`
-                                                DEFAULT_SEVERITY Info)
--
--add_executable(notification_test  ${notifications_test_SRCS})
--target_link_libraries(notification_test Qt5::Test Qt5::Core)
--ecm_mark_as_test(notification_test)
-+if(BUILD_TESTING)
-+	add_executable(notification_test  ${notifications_test_SRCS})
-+	target_link_libraries(notification_test Qt5::Test Qt5::Core)
-+	ecm_mark_as_test(notification_test)
-+endif()
diff --git a/kde-plasma/plasma-workspace/metadata.xml b/kde-plasma/plasma-workspace/metadata.xml
index cc387a9b356f..38d3c0357337 100644
--- a/kde-plasma/plasma-workspace/metadata.xml
+++ b/kde-plasma/plasma-workspace/metadata.xml
@@ -8,7 +8,6 @@
 	<use>
 		<flag name="appstream">Enable AppStream software metadata support</flag>
 		<flag name="geolocation">Enables dataengine providing location information</flag>
-		<flag name="prison">Enable support for barcodes/QRcodes</flag>
 		<flag name="qalculate">Enable Qalculate runner using <pkg>sci-libs/libqalculate</pkg></flag>
 		<flag name="qrcode">Enable support for creating QR codes from clipboard data using <pkg>kde-frameworks/prison</pkg></flag>
 	</use>
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.15.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.15.5.ebuild
deleted file mode 100644
index e2c969156c11..000000000000
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.15.5.ebuild
+++ /dev/null
@@ -1,172 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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 kded)
-	$(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 kdesu)
-	$(add_frameworks_dep kirigami)
-	$(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')
-	$(add_qt_dep qtquickcontrols2)
-	app-text/iso-codes
-	x11-apps/xmessage
-	x11-apps/xprop
-	x11-apps/xrdb
-	x11-apps/xsetroot
-	systemd? ( sys-apps/dbus[user-session] )
-	!systemd? ( sys-apps/dbus )
-	!<kde-plasma/plasma-desktop-5.14.80:5
-"
-PDEPEND="
-	$(add_plasma_dep kde-cli-tools)
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-5.14.80-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.16.5.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.16.5.ebuild
index cbfa3e41d201..ee469f3edd9b 100644
--- a/kde-plasma/plasma-workspace/plasma-workspace-5.16.5.ebuild
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.16.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 qalculate qrcode +semantic-desktop systemd"
 
 REQUIRED_USE="gps? ( geolocation )"