gentoo resync : 30.05.2020

3 files changed, 2 insertions, 103 deletions

diff --git a/kde-plasma/kscreenlocker/Manifest b/kde-plasma/kscreenlocker/Manifest
index cdc72ef0d558..be9e7a3f46d7 100644
--- a/kde-plasma/kscreenlocker/Manifest
+++ b/kde-plasma/kscreenlocker/Manifest
@@ -1,7 +1,5 @@
 AUX kde-np.pam 217 BLAKE2B 47e599ef678a81bd12a3e2a04b662c284136f13d5e0aeab06961e9d57007c51a93af1132239f97421cc6f9c47e8622d698d0eb2235e99820efbb8523b227c2de SHA512 88cae39981916a1d4ad115bcac6f4c7db92fa2eef606217ce270cf7ffeb422c18dbabc9f3f4c4581fc1a99b814f51c34b4ccb1dbc8fe255e64a63a31f80c91cb
 AUX kde.pam 226 BLAKE2B b281adb40b654aa616af66818613f6446b1bfd2025c0819130ae684f61f6683689d1facd3a4b248849bbfda0975603094988b809d01dcab501f69e1f4ef8825f SHA512 a44c3325ea4c56e1b3c8c2953a68e5c7eaea5e2f059c0eea4b4dfde2b2e056e5223574c967d991c6427117ce4db0c4fb00fb6a241f29bf2eaac37b1195496776
-DIST kscreenlocker-5.17.5.tar.xz 123744 BLAKE2B 2b2472d5cd99402930a3003e1a8daa07cd40b7501648e4007c947e55b9e130f8336d267409c5c60d2d4d2544ec4b8aa6e1acca287296407781d44c5c22ff8519 SHA512 152a310d8e3256da1b08b7b0d0a9e2be826a18d3c9ede61bfc764efed02e66e11f209edf953c9098a378e1566d3a7ee1013f733f205f66543174ec0994750248
 DIST kscreenlocker-5.18.5.tar.xz 125144 BLAKE2B a4d4a570edbb6994eb42390c42a1193ebc7776c28483b9edb7ab4935c18be3e042459a9919216547a275e5c02794ac468364e1a65cfd62beb17a2f09b34cb659 SHA512 27e2e30c247b4030a618631f50edc8cbdbb26b51adb875a608f93fc4c0f4dff310819042a74170ff024b030dedda89c6a3a14b23aacfc5938db026adde225e47
-EBUILD kscreenlocker-5.17.5.ebuild 2351 BLAKE2B a1a2dd24667f101f52b39cdd385a19a9e1cd879141a94f946e912f2612c8c6ba29eac8d0ecf1228c8491c199766fcebaba131342d84d25ea61e09269bc4aceaf SHA512 876a7306cab4587f4135d54a96c2156fd419a2ce70482e3fae7c95ee23ccb55f471c40412ac2f2c32c091f17a9a097de2c580fec7ca0890e83d37deb7f12ccd0
-EBUILD kscreenlocker-5.18.5.ebuild 2355 BLAKE2B 0f875d5ad5ae63bc41cf205be1ed5feac9b9a52bf3e7c1bb13e101cc9a9c491581570c9a3f63143183e7a8a4304c035fc64ef1335d31c08c4fb71692b0fdd757 SHA512 82c751688e8199ff2330845ecb97a440744d59bf6bec9314479b11bba7cd1ca1205a7b66f389013d1b6053642cd963300cd18a487c51486663182381a83c8442
+EBUILD kscreenlocker-5.18.5.ebuild 2352 BLAKE2B f28abd967b9d6fafb6a7c145d6cdcea966815165073f955c4fccfeaa70a134df0afe54da10a78b8dd8c0793bbe14d3fe6c94eebc18ac8d915ff635d5e7fc5b8c SHA512 e11ded96c0973a085cea50109e3206f8295633bd9b9710514d97499c2ca0b6e8497b73afcb5fcbc9d2eddbfae885ebee2ed0b12bdb69115c4b99b66e4cd7f94b
 MISC metadata.xml 393 BLAKE2B 92a1ec6717203a85b3a379c3d8646df9354f9b87171f4ecc73c0a8b3e442c5abe17b9dd58d0be0322b2fbf655b39ac7a052237ba6a61090240a2fd92f21e8ea8 SHA512 92a7a51e76d18a8dd2aceca5dc8c79fee369ddf9dc170f64f5c510c6554b46d3a912e358ac042bc25d9f115f49102d686d0df9496693043289cb8d2e628207a6
diff --git a/kde-plasma/kscreenlocker/kscreenlocker-5.17.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.17.5.ebuild
deleted file mode 100644
index 29d56bdcdf12..000000000000
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.17.5.ebuild
+++ /dev/null
@@ -1,99 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="forceoptional"
-VIRTUALX_REQUIRED="test"
-KFMIN=5.64.0
-PVCUT=$(ver_cut 1-3)
-QTMIN=5.12.3
-inherit ecm kde.org pam
-
-DESCRIPTION="Library and components for secure lock screen architecture"
-LICENSE="GPL-2" # TODO: CHECK
-SLOT="5"
-KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
-IUSE="consolekit +pam seccomp"
-
-REQUIRED_USE="seccomp? ( pam )"
-
-RDEPEND="
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kcrash-${KFMIN}:5
-	>=kde-frameworks/kdeclarative-${KFMIN}:5
-	>=kde-frameworks/kglobalaccel-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kidletime-${KFMIN}:5
-	>=kde-frameworks/knotifications-${KFMIN}:5
-	>=kde-frameworks/kpackage-${KFMIN}:5
-	>=kde-frameworks/ktextwidgets-${KFMIN}:5
-	>=kde-frameworks/kwayland-${KFMIN}:5
-	>=kde-frameworks/kwindowsystem-${KFMIN}:5
-	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-frameworks/solid-${KFMIN}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtdeclarative-${QTMIN}:5[widgets]
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtx11extras-${QTMIN}:5
-	dev-libs/wayland
-	x11-libs/libX11
-	x11-libs/libXi
-	x11-libs/libxcb
-	x11-libs/xcb-util-keysyms
-	consolekit? ( sys-auth/consolekit )
-	pam? ( sys-libs/pam )
-	seccomp? ( sys-libs/libseccomp )
-"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto
-"
-PDEPEND="
-	>=kde-plasma/kde-cli-tools-${PVCUT}:5
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	ecm_src_prepare
-
-	if ! use test; then
-		sed -e "/add_subdirectory(autotests)/ s/^/#/" \
-			-i greeter/CMakeLists.txt || die
-	fi
-}
-
-src_test() {
-	# requires running environment
-	local myctestargs=(
-		-E x11LockerTest
-	)
-	ecm_src_test
-}
-
-src_configure() {
-	local mycmakeargs=(
-		$(cmake_use_find_package consolekit loginctl)
-		-DPAM_REQUIRED=$(usex pam)
-		$(cmake_use_find_package pam PAM)
-		$(cmake_use_find_package seccomp Seccomp)
-	)
-	ecm_src_configure
-}
-
-src_install() {
-	ecm_src_install
-
-	use pam && newpamd "${FILESDIR}/kde.pam" kde
-	use pam && newpamd "${FILESDIR}/kde-np.pam" kde-np
-
-	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.18.5.ebuild b/kde-plasma/kscreenlocker/kscreenlocker-5.18.5.ebuild
index 5e66c8cd5e94..81e224ad8d76 100644
--- a/kde-plasma/kscreenlocker/kscreenlocker-5.18.5.ebuild
+++ b/kde-plasma/kscreenlocker/kscreenlocker-5.18.5.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Library and components for secure lock screen architecture"
 
 LICENSE="GPL-2" # TODO: CHECK
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ppc64 x86"
 IUSE="consolekit +pam seccomp"
 
 REQUIRED_USE="seccomp? ( pam )"