kde-plasma: Version bump KDE Plasma 5.7.0

Package-Manager: portage-2.3.0

4 files changed, 207 insertions, 13 deletions

diff --git a/kde-plasma/plasma-workspace/Manifest b/kde-plasma/plasma-workspace/Manifest
index 03f9fce0c8b5..690b70ee5163 100644
--- a/kde-plasma/plasma-workspace/Manifest
+++ b/kde-plasma/plasma-workspace/Manifest
@@ -1,2 +1,3 @@
 DIST plasma-workspace-5.5.5.tar.xz 7374560 SHA256 bed1e65d878b963dbbb85129c206dc70db71461de29c19e95b6053c9c4fe7b26 SHA512 0fdf19650bd8718b03a8004182caa29080cc02afb0f4808d40f9976c3d261b80afa0e86c8cb659276d49eb1e711d7e26f84ced989342f0f6dbccc23e56d16ff7 WHIRLPOOL 51e122d4c180537a9a4a6ac1b8cae60526c0b6167fb832244e813224c4977556693253b06035ca2d8319db0e0ade817cf09ef0ca44a9cc56128c541bd9be1da1
 DIST plasma-workspace-5.6.5.1.tar.xz 6941608 SHA256 459e7d361551437007620fd4d05cc7252cbc85e039fa824899832ebcb7ad1495 SHA512 86d2f9208d4c2c9de9d17acf2112a81dfcdedb061f2209ce6289f0c702c2687ed8720bb81d127916219c39f4e9e763f5bf8311ee6c36f62c1a9cca7103560780 WHIRLPOOL 1792b3df0ffaaf972d6c4988c52e64f6f2e9df3367e969f5b06e13ca4696379c81214a37767df9d0944247dbd8fc48b21a78e76ec02369caeddb7b0de83b6b09
+DIST plasma-workspace-5.7.0.tar.xz 6702696 SHA256 ca890502d6979348703a3a006e57dfb0c81255c77d7191caf5fe7d11f9c5f710 SHA512 05ee69d50402793501123a9f65fd51bb9deae606509b9500981703c119deccc21bb19d0d5d62e1eaa2ea3975d273ecedb679be0d155c9a4f6b51049059900f88 WHIRLPOOL fab0ecee49baf7c71b816df7fe5269677cf88baf8cabc735ffd5e5be1039ea2413e8c9573d9f3015ace69db0610c5253b1ef997582f31ff60c01e3c7f58bfd33
diff --git a/kde-plasma/plasma-workspace/files/10-agent-shutdown.sh b/kde-plasma/plasma-workspace/files/10-agent-shutdown.sh
index fff8056df2cf..4bafd2e61cf4 100644
--- a/kde-plasma/plasma-workspace/files/10-agent-shutdown.sh
+++ b/kde-plasma/plasma-workspace/files/10-agent-shutdown.sh
@@ -1,13 +1,17 @@
 #!/bin/sh
 #
-# This file is executed at plasma shutdown.
+# This file is executed at Plasma shutdown.
 # Uncomment the following lines to kill the agents
 # that were started at session startup.
 
+# gnupg 2.0.x
 #if [ -n "${GPG_AGENT_INFO}" ]; then
-#  kill $(echo ${GPG_AGENT_INFO} | cut -d':' -f 2) >/dev/null 2>&1
+#	kill $(echo ${GPG_AGENT_INFO} | cut -d':' -f 2) >/dev/null 2>&1
 #fi
 
+# gnupg 2.1.x
+#gpgconf --kill gpg-agent >/dev/null 2>&1
+
 #if [ -n "${SSH_AGENT_PID}" ]; then
-#  eval "$(ssh-agent -s -k)"
+#	eval "$(ssh-agent -s -k)"
 #fi
diff --git a/kde-plasma/plasma-workspace/files/10-agent-startup.sh b/kde-plasma/plasma-workspace/files/10-agent-startup.sh
index 03e017ac4e94..e2c50188365f 100644
--- a/kde-plasma/plasma-workspace/files/10-agent-startup.sh
+++ b/kde-plasma/plasma-workspace/files/10-agent-startup.sh
@@ -1,25 +1,50 @@
 # Agents startup file
 #
-# This file is sourced at plasma startup, so that
+# This file is sourced at Plasma startup, so that
 # the environment variables set here are available
 # throughout the session.
-
+#
 # Uncomment the following lines to start gpg-agent
-# and/or ssh-agent at plasma startup.
+# and/or ssh-agent at Plasma startup.
 # If you do so, do not forget to uncomment the respective
 # lines in PLASMADIR/shutdown/agent-shutdown.sh to
 # properly kill the agents when the session ends.
+#
+# If using gpg-agent for ssh instead of ssh-agent, a GUI pinentry program
+# must be selected either with eselect pinentry or adding an entry to
+# $HOME/.gnupg/gpg-agent.conf such as "pinentry-program /usr/bin/pinentry-qt4".
+#
+# pinentry-curses or pinentry-tty will not work because the agent started here
+# is in a different tty than where it is used, so the agent does not know where
+# to request the passphrase and fails.
 
-#if [ -x /usr/bin/gpg-agent ]; then
-#  eval "$(/usr/bin/gpg-agent --daemon)"
-#fi 
+#GPG_AGENT=true
+#SSH_AGENT=true
+#SSH_AGENT=gpg # use gpg-agent for ssh instead of ssh-agent
 
-#if [ -x /usr/bin/ssh-agent ]; then
-#  eval "$(/usr/bin/ssh-agent -s)"
-#fi
+if [ "${GPG_AGENT}" = true ]; then
+	if [ -x /usr/bin/gpgconf ]; then
+		gpgconf --launch gpg-agent >/dev/null 2>&1
+		if [ $? = 2 ]; then
+			eval "$(/usr/bin/gpg-agent --enable-ssh-support --daemon)"
+		fi
+	fi
+fi
+
+if [ "${SSH_AGENT}" = true ]; then
+	if [ -x /usr/bin/ssh-agent ]; then
+		eval "$(/usr/bin/ssh-agent -s)"
+	fi
+elif [ "${SSH_AGENT}" = gpg ] && [ "${GPG_AGENT}" = true ]; then
+	if [ -e /run/user/$(id -ru)/gnupg/S.gpg-agent.ssh ]; then
+		export SSH_AUTH_SOCK=/run/user/$(id -ru)/gnupg/S.gpg-agent.ssh
+	elif [ -e "${HOME}/.gnupg/S.gpg-agent.ssh" ]; then
+		export SSH_AUTH_SOCK=${HOME}/.gnupg/S.gpg-agent.ssh
+	fi
+fi
 
 # Uncomment the following lines to start rxvt-unicode which has the ability to
-# run multiple terminals in one single process, thus starting up faster and 
+# run multiple terminals in one single process, thus starting up faster and
 # saving resources.
 # The --opendisplay ensures that the daemon quits when the X server terminates,
 # therefore we don't need matching lines in agent-shutdown.sh.
diff --git a/kde-plasma/plasma-workspace/plasma-workspace-5.7.0.ebuild b/kde-plasma/plasma-workspace/plasma-workspace-5.7.0.ebuild
new file mode 100644
index 000000000000..093665283fcb
--- /dev/null
+++ b/kde-plasma/plasma-workspace/plasma-workspace-5.7.0.ebuild
@@ -0,0 +1,164 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="forceoptional"
+VIRTUALX_REQUIRED="test"
+inherit kde5 multilib qmake-utils
+
+DESCRIPTION="KDE Plasma workspace"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="+calendar +geolocation gps prison qalculate"
+
+# drop kde-frameworks/plasma subslot operator when FRAMEWORKS_MINIMAL >= 5.24.0
+COMMON_DEPEND="
+	$(add_frameworks_dep baloo)
+	$(add_frameworks_dep kactivities)
+	$(add_frameworks_dep kauth)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(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 kdesu)
+	$(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 kxmlrpcclient)
+	$(add_frameworks_dep plasma '' '' '5=')
+	$(add_frameworks_dep solid)
+	$(add_plasma_dep kscreenlocker)
+	$(add_plasma_dep kwin)
+	$(add_plasma_dep libksysguard)
+	$(add_qt_dep qtconcurrent)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtdeclarative 'widgets')
+	$(add_qt_dep qtgui 'jpeg')
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtscript)
+	$(add_qt_dep qtsql)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtx11extras)
+	$(add_qt_dep qtxml)
+	dev-libs/libdbusmenu-qt[qt5]
+	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/xcb-util
+	x11-libs/xcb-util-image
+	calendar? ( $(add_kdeapps_dep kholidays) )
+	geolocation? ( $(add_frameworks_dep networkmanager-qt) )
+	gps? ( sci-geosciences/gpsd )
+	prison? ( media-libs/prison:5 )
+	qalculate? ( sci-libs/libqalculate )
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kded)
+	$(add_kdeapps_dep kio-extras)
+	$(add_plasma_dep kde-cli-tools)
+	$(add_plasma_dep ksysguard)
+	$(add_plasma_dep milou)
+	$(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
+	!dev-libs/xembed-sni-proxy
+	!kde-base/freespacenotifier:4
+	!kde-base/libtaskmanager:4
+	!kde-base/kcminit:4
+	!kde-base/kdebase-startkde:4
+	!kde-base/klipper:4
+	!kde-base/krunner:4
+	!kde-base/ksmserver:4
+	!kde-base/ksplash:4
+	!kde-base/plasma-workspace:4
+"
+DEPEND="${COMMON_DEPEND}
+	x11-proto/xproto
+"
+
+PATCHES=( "${FILESDIR}/${PN}-5.4-startkde-script.patch" )
+
+RESTRICT="test"
+
+src_prepare() {
+	kde5_src_prepare
+
+	sed -e "s|\`qtpaths|\`$(qt5_get_bindir)/qtpaths|" \
+		-i startkde/startkde.cmake startkde/startplasmacompositor.cmake || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		$(cmake-utils_use_find_package calendar KF5Holidays)
+		$(cmake-utils_use_find_package geolocation KF5NetworkManagerQt)
+		$(cmake-utils_use_find_package gps libgps)
+		$(cmake-utils_use_find_package prison KF5Prison)
+		$(cmake-utils_use_find_package qalculate Qalculate)
+	)
+
+	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
+
+	echo
+	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"
+	echo
+}