gentoo resync : 18.11.2018

5 files changed, 3 insertions, 325 deletions

diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index dfb61412208c..cc88172c6634 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,11 +1,8 @@
-AUX ck-unlock-session 6159 BLAKE2B e5ef1f55e5082b35a67778e055548a59e15f346cd0aaa8b6fe46f74384d72605121ea06a0317e117350ead99a17d6926e48f2c8672d7271824e6206961c8751a SHA512 61830c4a00cb119efd2b01188c11954521c4de45706249ffaff17b713ac4d90eef647edf2afc5ea7571c35dd50fd193426dd1310109afd316ff7a9faa0071ec1
 AUX kde-np.pam 217 BLAKE2B 47e599ef678a81bd12a3e2a04b662c284136f13d5e0aeab06961e9d57007c51a93af1132239f97421cc6f9c47e8622d698d0eb2235e99820efbb8523b227c2de SHA512 88cae39981916a1d4ad115bcac6f4c7db92fa2eef606217ce270cf7ffeb422c18dbabc9f3f4c4581fc1a99b814f51c34b4ccb1dbc8fe255e64a63a31f80c91cb
 AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f61f6683689d1facd3a4b248849bbfda0975603094988b809d01dcab501f69e1f4ef8825f SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776
 AUX kscreenlocker-consolekit-unlock.patch 792 BLAKE2B 65ada31a191a5ae478a8a5edf27d0555ab4e81a20dbfb128cff1de520386f914b9730f22bb709be97f0ab9a38c9aba1d0a4596039b2438325ad55ea3969f7fea SHA512 21f06f101a9a04a80393a040d29506de8b4de129f3c6433d5455245ec6a9dca9630a59338612396032bd66e345fb59fb78bcd1b486b5d46138be616da632ff18
-DIST kscreenlocker-5.12.7.tar.xz 119484 BLAKE2B d8f0e60ec3c3f294d9daf109fc327d895f32e0c9b26841787a1ed20b5b6d3ba8113b30858caec0e8782b56d717d91979f13187466c174f4c2153678e14e7d7f3 SHA512 76554e8ad6872705e903bda5f55f650d859b282b400ca739f346e392ce7961891057c8a8a43b5dcb85c83860e4744252500c338e5d99fd67a33df529a7e040c6
 DIST kscreenlocker-5.13.5.tar.xz 122112 BLAKE2B 4effbfd26b15ca9a0225031b11b892092351a95eddf2bad659b7a97e347db402d5f28415d6d8fb11eb3ad095faa7ad430e949d5f21abaf33da8cc8f47ba8e26e SHA512 c09f55da12893f162fcdc7559e55fa50d48bb642673de84809939e695ee93843e97a5224cfc79cb6bea6a1146ac757c45eab0bd1aa20e36206290c0155d8dfe2
-DIST kscreenlocker-5.14.2.tar.xz 121316 BLAKE2B ec43b818ab95b2c8112ac39f8d46587e325184914bf2f3591e6002e027109cf978dbf16ec5f970b4530c8660de4e4936ea5b0660a611da88d35c4d5f76443915 SHA512 a7b875827890958e4014f74071a03f3140f18063fb45483ad615b4c36232bf8a35862dc1e072f214d665d688bdad8dc2f38667e5141c67a7a57afdf5f95ca43c
-EBUILD kscreenlocker-5.12.7.ebuild 2252 BLAKE2B 86dcd3c39af729ebe9d12ab2b356a482c5d2613bde23bce1bf05dc7dce2b42f8b049f177c01bc2e126e5ad8536f7108ae04f276a65c8387a35d69d3400c89ef6 SHA512 101c95a11d8df57b0a244e708780cde854bc919668a85d3aaeee50dcee4cb14b5bb92a129aa629130a6b63dbf77378969f877bafc258efcd2e8c42e012376b91
+DIST kscreenlocker-5.14.3.tar.xz 122280 BLAKE2B 03182f4ffa11727606221e8c0c77f610c18ced1392ac0059e743074cb80cb80b35cc0a5e82f6cc3457df493599e0223b5bb2bef134c45e780ba7ecb649496772 SHA512 186f693a931936658624274c7de77e8cb06c433355932a17a6c600c6cf349f848b90642b613c786c0585f050599a545d0e596d81968a6ec0b7188eb34a6e2a71
 EBUILD kscreenlocker-5.13.5.ebuild 2122 BLAKE2B 13c6cfe20e6e742cdb837eddfdbfddb1f65190a8c471a537523c3464d54b034cf8b632baad6477e997c5bba2dcc78b2e7f686e4af78b0d563ad50642aefd66c1 SHA512 5bdef92448cc1d024248b3497df0d53bf798b59d6dcc5374399e4425ead6f4d6f20d0f39854253150ad6038abafed1f55ca8216a003e3531227b6385e2a7dec3
-EBUILD kscreenlocker-5.14.2.ebuild 2124 BLAKE2B bc2a3e99d04da5f9b8f29ff892e354d59ba43b985ad104005a3a92f350237c86ea3b5529f3fa4dc37282ac066d8c8a9357c235cf76d1552bfcb4b6b67750bbe3 SHA512 0a845b6ff77e2fd8045d186517344229690d8853dbb3ae75b00ef6aac3e2728059d19e551411006cf753f424fbea75bec1391aabc835793700b3c4664a773dde
-MISC metadata.xml 397 BLAKE2B 0fad03b144a175f0f5f9d8e0c0ba4f75e6cd4f211ba0207e73a7968b7d49bbe0977860324a51ebef324ea0f915eb92dc23978558e000085ff21bd8fdb1d53187 SHA512 1d3749f74eab5cd2e17f73bb44e9f8d7ce03060db8d422a835597f13dce6c39c232eface04d9e74ed3ef66e9a45bb7b4b64c4cd82f6b5aedc62627bd77801c76
+EBUILD kscreenlocker-5.14.3.ebuild 2124 BLAKE2B bc2a3e99d04da5f9b8f29ff892e354d59ba43b985ad104005a3a92f350237c86ea3b5529f3fa4dc37282ac066d8c8a9357c235cf76d1552bfcb4b6b67750bbe3 SHA512 0a845b6ff77e2fd8045d186517344229690d8853dbb3ae75b00ef6aac3e2728059d19e551411006cf753f424fbea75bec1391aabc835793700b3c4664a773dde
+MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-plasma/kscreenlocker/files/ck-unlock-session b/kde-plasma/kscreenlocker/files/ck-unlock-session
deleted file mode 100644
index 6ce6935b0671..000000000000
--- a/kde-plasma/kscreenlocker/files/ck-unlock-session
+++ /dev/null
@@ -1,220 +0,0 @@
-#!/bin/sh
-
-# This script is to make unlocking using OpenRC/Consolekit easier when the KDE Screenlocker breaks.
-#
-# Version: 0.2
-# Date written: February 2, 2018
-# Last modification: February 17, 2018
-#
-# Copyright (C) 2018 Daniel Frey
-# Copyright (C) 2018 Lars Wendler
-#
-# This script is free software; you can redistribute it and/or
-# modify it under the terms of the GNU General Public License
-# as published by the Free Software Foundation; either version 2
-# of the License, or (at your option) any later version.
-#
-# This script is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-#
-# Some notes:
-#   -The switch processing/argument handling is very basic.
-#   -This script assumes session names start with "Session" when listing
-#    sessions. This is settable via a variable.
-#
-# Possible actions:
-#   -h : Show help screen
-#   -l : List current consolekit sessions
-#   -u : Unlock specified session (one parameter required - the session name)
-#   -a : Attempt to unlock all sessions
-
-# Return code documentation
-#
-#  0: Script executed normally
-#  1: Root access is not present for script
-#  2: No arguments passed
-#  3: Multiple actions requested, can only do one at a time
-#  4: Argument passed was not recognized
-#  5: Multiple arguments passed for unlock single session, only one needed
-#  6: The argument required for unlocksession() is missing (internal error)
-
-SCRIPTNAME="$(basename $0)"
-
-# Return code constants
-readonly ERR_NORMAL_OPERATION=0
-readonly ERR_NO_ROOT=1
-readonly ERR_NO_ARGS=2
-readonly ERR_TOO_MANY_ACTIONS=3
-readonly ERR_INVALID_ARGUMENTS=4
-readonly ERR_TOO_MANY_ARGS=5
-readonly ERR_INTERNAL_ARG_MISSING=6
-
-# Action parameter constants
-readonly ACTION_NONE=0
-readonly ACTION_HELP=1
-readonly ACTION_LIST=2
-readonly ACTION_UNLOCKALL=3
-readonly ACTION_UNLOCK=4
-
-# This is what's used to look for a session via consolekit.
-# By default, assume it is prefixed with "Session".
-SESSION_SEARCH_PREFIX="Session"
-
-# Check to make sure script has root access, if not... abort now!
-if [ "$(id -u)" -ne 0 ]; then
-	echo "This script must be run as root."
-	exit ${ERR_NO_ROOT}
-fi
-
-showhelp() {
-	cat <<EOF
-${SCRIPTNAME}: a script that helps unlock consolekit sessions
-
-Usage: ${SCRIPTNAME} [action] [parameters]
-
-Actions:
-	-l : list current sessions available for unlocking 
-	-u : unlock session specified as a parameter
-	-a : attempt to unlock all current sessions
-	-h : this screen
-
-Parameters:
-	The -u parameter requires a session name to unlock, use -l to 
-	list sessions.
-
-Example:
-	To unlock a single session, use:
-	${SCRIPTNAME} -u Session1
-
-No arguments will show this screen.
-EOF
-}
-
-listsessions() {
-	# Get a list of all sessions, and remove the full colon from the session name
-	ALLSESSIONS=$(ck-list-sessions | grep "^${SESSION_SEARCH_PREFIX}" | awk -F : '{print $1}')
-
-	echo
-	echo "Sessions present on this machine, space-delineated:"
-	echo
-	echo ${ALLSESSIONS}
-	echo
-	echo
-	echo "Session detail (to help locate a specific session:"
-	ck-list-sessions | grep -A 2 "^${SESSION_SEARCH_PREFIX}"
-}
-
-unlocksession() {
-	# This function expects one parameter set (the session to unlock).
-	# Make sure the parameter exists before continuing.
-	if [ -z "${1}" ]; then 
-		showhelp
-		exit ${ERR_INTERNAL_ARG_MISSING}
-	fi
-
-	echo "Attempting to unlock session $1; messages from dbus are not suppressed."
-
-	# Finally, request the unlock.
-	dbus-send --system --print-reply --dest="org.freedesktop.ConsoleKit" /org/freedesktop/ConsoleKit/$1 org.freedesktop.ConsoleKit.Session.Unlock
-}
-
-unlockallsessions() {
-	# Get a list of all sessions, and remove the full colon from the session name
-	ALLSESSIONS=$(ck-list-sessions | grep "^${SESSION_SEARCH_PREFIX}" | awk -F : '{print $1}')
-
-	echo "Attempting to unlock all sessions. Messages from dbus are not suppressed."
-	echo
-	# Loop through results, attempt to unlock all sessions.
-	# Count them and report at the end.
-	COUNT=0
-	for i in ${ALLSESSIONS}; do
-		dbus-send --system --print-reply --dest="org.freedesktop.ConsoleKit" /org/freedesktop/ConsoleKit/$i org.freedesktop.ConsoleKit.Session.Unlock
-		let "COUNT+=1"
-	done
-
-	echo
-	echo "Attempted to unlock ${COUNT} session(s)."
-}
-
-check_actions() {
-	# Make sure multiple actions are not chosen.
-	if [ ${ACTION} -ne ${ACTION_NONE} ]; then
-		echo "You can only declare one action at a time!"
-		echo ""
-		showhelp
-		exit ${ERR_TOO_MANY_ACTIONS}
-	fi
-}
-
-# Start of "main" routine
-
-# Initialize variables:
-#     ACTION=default 0; used to make sure more than one action are not
-#          specified at the same time. If an invalid argument was passed
-#          (e.g. one without the hyphen prefix) it will be caught as well.
-ACTION="${ACTION_NONE}"
-
-# Show help if no arguments provided at all
-if  [ $# -eq 0 ]; then
-	showhelp
-	exit ${ERR_NO_ARGS}
-fi
-
-# Process arguments passed, setting environment appropriately.
-# During this check, ensure only one action was requested. This
-# script will not do multiple things at a time.
-while getopts “hlau:” OPTION; do
-	case ${OPTION} in
-		h)	# Help action
-			check_actions
-			ACTION=${ACTION_HELP}
-		;;
-                l)	# List action
-			check_actions
-			ACTION="${ACTION_LIST}"
-		;;
-		a)	# Enable all USB hubs/devices action
-			check_actions
-			ACTION="${ACTION_UNLOCKALL}"
-		;;
-		u)	# Enable specific hub/device via find command action
-			check_actions
-			ACTION="${ACTION_UNLOCK}"
-
-			# Save session name passed for later
-			UNLOCKSESSION="${OPTARG}"
-		;;
-		?)	# Unknown parameter
-			showhelp
-			exit ${ERR_INVALID_ARGUMENTS}
-		;;
-	esac
-done
-
-# If script reaches this point, only one action was specified, so it is safe
-# to continue processing.
-case ${ACTION} in
-	${ACTION_HELP})		# help action
-		showhelp
-	;;
-	${ACTION_LIST})		# list action
-		listsessions
-	;;
-	${ACTION_UNLOCKALL}) 	# unlock all sessions
-		unlockallsessions
-	;;
-	${ACTION_UNLOCK})	# unlock single session
-		unlocksession ${UNLOCKSESSION}
-	;;
-	*)
-		echo "Unrecognized action."
-		echo
-		showhelp
-		exit ${ERR_INVALID_ARGUMENTS}
-	;;
-esac
-
-exit ${ERR_NORMAL_OPERATION}
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.12.7.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.12.7.ebuild
deleted file mode 100644
index 0a3a29621480..000000000000
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.12.7.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-inherit kde5 pam
-
-DESCRIPTION="Library and components for secure lock screen architecture"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="consolekit +pam seccomp"
-
-REQUIRED_USE="seccomp? ( pam )"
-
-COMMON_DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kcrash)
-	$(add_frameworks_dep kdeclarative)
-	$(add_frameworks_dep kglobalaccel)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kidletime)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kpackage)
-	$(add_frameworks_dep ktextwidgets)
-	$(add_frameworks_dep kwayland)
-	$(add_frameworks_dep kwindowsystem)
-	$(add_frameworks_dep kxmlgui)
-	$(add_frameworks_dep solid)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative 'widgets')
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	dev-libs/wayland
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libxcb
-	x11-libs/xcb-util-keysyms
-	pam? ( virtual/pam )
-	seccomp? ( sys-libs/libseccomp )
-"
-DEPEND="${COMMON_DEPEND}
-	x11-base/xorg-proto
-"
-RDEPEND="${COMMON_DEPEND}
-	$(add_plasma_dep kde-cli-tools)
-	!<kde-plasma/kcheckpass-4.11.22-r1:4
-	!kde-plasma/kdebase-pam:0
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	kde5_src_prepare
-
-	use consolekit && eapply "${FILESDIR}"/${PN}-consolekit-unlock.patch
-
-	use test || sed -i \
-		-e "/add_subdirectory(autotests)/ s/^/#/" greeter/CMakeLists.txt || die
-}
-
-src_test() {
-	# requires running environment
-	local myctestargs=(
-		-E x11LockerTest
-	)
-	kde5_src_test
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DPAM_REQUIRED=$(usex pam)
-		$(cmake-utils_use_find_package pam PAM)
-		$(cmake-utils_use_find_package seccomp Seccomp)
-	)
-	kde5_src_configure
-}
-
-src_install() {
-	kde5_src_install
-
-	use pam && newpamd "${FILESDIR}/kde.pam" kde
-	use pam && newpamd "${FILESDIR}/kde-np.pam" kde-np
-
-	use consolekit && dobin "${FILESDIR}"/ck-unlock-session
-
-	if ! use pam; then
-		chown root "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
-		chmod +s "${ED}"usr/$(get_libdir)/libexec/kcheckpass || die
-	fi
-}
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.14.2.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.14.3.ebuild
index ab0f95ec9ebe..ab0f95ec9ebe 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.14.2.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.14.3.ebuild
diff --git a/kde-plasma/kscreenlocker/metadata.xml b/kde-plasma/kscreenlocker/metadata.xml
index 099a76f8dd86..2fdbf33d963d 100644
--- a/kde-plasma/kscreenlocker/metadata.xml
+++ b/kde-plasma/kscreenlocker/metadata.xml
@@ -5,7 +5,4 @@
 		<email>kde@gentoo.org</email>
 		<name>Gentoo KDE Project</name>
 	</maintainer>
-	<use>
-		<flag name="consolekit">Add support for killing the screenlocker when <pkg>sys-auth/consolekit</pkg> is the session tracker</flag>
-	</use>
 </pkgmetadata>