gentoo resync : 17.02.2020

4 files changed, 2 insertions, 92 deletions

diff --git a/kde-misc/kshutdown/Manifest b/kde-misc/kshutdown/Manifest
index 287f314b7213..1d5622e10b16 100644
--- a/kde-misc/kshutdown/Manifest
+++ b/kde-misc/kshutdown/Manifest
@@ -1,6 +1,3 @@
-AUX kshutdown-5.0-cmake-3.15.patch 996 BLAKE2B 9529d6fb2a82e6c3b3d5be901b9aa48c41df7f871733842b37986cfba3e87ca301672fe9cb1623b7e270a4bfb6bae62f4fbab9c2989bf4c430dba408e88c75b9 SHA512 415c53f8554971f448fa869b6e9a8dbbd0ada064cf6c5af45c445a1d2f42dfdc3305fc7a177d79fc9aecbe89b303f90168f5f6e9378c888129f6fd135d4edd09
-DIST kshutdown-source-5.0.zip 454848 BLAKE2B 481cafbf5bd3831088ec9168b6eb82e342106b9b570279b6b8ca1db1f2df8c5640b3942f76032559396b504903b18fe106eb940e81822472a63f235e1a004644 SHA512 7a3920315db142f150227e624fa4a765966ec8367a08686214cb072d94a62d24f3a22fbef8fc84411d385be935102cf85df1b001b2922399455cc320c1e0f0db
 DIST kshutdown-source-5.2.zip 445025 BLAKE2B 161a637ded6fa7ddc11daab5bfa20efe51bee0407339e178668c584cc690dd419bfb1e7e134cbc9ec3274a394d47496423f8b3b561cdd8083470daa4e8d24511 SHA512 ac46164da88815604007e637663c42430212b37231d6116fd31b947b24d2bd69aff0d79fcab570425960420d77168de184ccda99dd685bec96bb353cb578ee04
-EBUILD kshutdown-5.0.ebuild 1105 BLAKE2B 42e92eadbab70f27f41e76ec2ce0d4500976830eb0c333b76315c1dd473687d5e4af7764e5776cadbee74b491991e973f940f6599376aba5e855016dbe709758 SHA512 1c7776029fdbee8bf6775464747db33685c94a5fc964c26363428e0988c6c30b0ea995c15780688e5bd95868c3970b29f5367963e704517403074f74aea202da
-EBUILD kshutdown-5.2.ebuild 1154 BLAKE2B 50005d96f841c2f2f22020a3ba9c44517ef55b974e47ecec90ac4c421d762b63d1d0f69a994618c765793fa24f15b4a0d73b0f1a5476714333612015adbd44e6 SHA512 fd887d88eb021c655e634ebb608028d0fc7cc46d1fb48b007c6a1c7f237b43bba0480f94f47e86cfb51584607cc2134ea756aabbe3f4fb3ffdeb5050eb791d4d
+EBUILD kshutdown-5.2.ebuild 1153 BLAKE2B efc12ee64923eefa900a15a56fd1f7d6dfbdf8b57e1b1b0220ecd880381c622ec021f8cfd66334d0f6e65562ba88580b24ddeb2ed90901edc1a803830cee4551 SHA512 3dd376d6db58a9bdd8e0aea3a67bd3ea4500afb9b04a2cf6b16740c6c11ff2b2e51ac28c2cf17349231bb1ab01f41b497c2f07b0e8478def08443bf0abc7be3c
 MISC metadata.xml 328 BLAKE2B 7fca7d8d10232412fe198ba6c48e27ff6e1f45574255cd0b386f05264822a8bfe84a77f12b5104682d2188f51c230baf6cc6180b50249634cb5bc7bcc0cfa946 SHA512 b26f71d9d8119e82c3f395850e2309f97edc6c7fbb201387ff0bd03c7241b3262218dd5baea6a438b649ee3c13d4061531b0234471c3d8b4b8349e658d5bd775
diff --git a/kde-misc/kshutdown/files/kshutdown-5.0-cmake-3.15.patch b/kde-misc/kshutdown/files/kshutdown-5.0-cmake-3.15.patch
deleted file mode 100644
index 4911fc4daf05..000000000000
--- a/kde-misc/kshutdown/files/kshutdown-5.0-cmake-3.15.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/CMakeLists.txt	2019-05-04 16:33:55.000000000 +0200
-+++ b/CMakeLists.txt	2019-08-08 21:53:36.255257785 +0200
-@@ -1,6 +1,6 @@
- project(kshutdown)
- 
--cmake_minimum_required(VERSION 3.0.0)
-+cmake_minimum_required(VERSION 3.1)
- cmake_policy(SET CMP0063 NEW) # disables cmake warning
- 
- set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
-@@ -45,7 +45,9 @@
- 	add_subdirectory(po)
- endif()
- 
--include(FeatureSummary)
--feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
-+set (CMAKE_CXX_STANDARD 14)
- 
- add_subdirectory(src)
-+
-+include(FeatureSummary)
-+feature_summary(WHAT ALL FATAL_ON_MISSING_REQUIRED_PACKAGES)
---- a/src/CMakeLists.txt	2019-05-04 16:33:55.000000000 +0200
-+++ b/src/CMakeLists.txt	2019-08-08 21:53:48.791385858 +0200
-@@ -31,9 +31,6 @@
- 	add_executable(kshutdown ${kshutdown_SRC} ${kshutdown_MOC_SOURCES})
- endif()
- 
--# HACK: Add -std=gnu++14 option (cmake horror):
--target_compile_features(kshutdown PUBLIC cxx_std_14)
--
- if(KS_PURE_QT)
- 	target_link_libraries(kshutdown
- 		Qt5::DBus
diff --git a/kde-misc/kshutdown/kshutdown-5.0.ebuild b/kde-misc/kshutdown/kshutdown-5.0.ebuild
deleted file mode 100644
index adb5989ac72d..000000000000
--- a/kde-misc/kshutdown/kshutdown-5.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-KDE_TEST="false"
-KDE_AUTODEPS="false"
-inherit kde5
-
-DESCRIPTION="Shutdown manager for desktop environments like KDE Plasma"
-HOMEPAGE="https://kshutdown.sourceforge.io"
-SRC_URI="mirror://sourceforge/${PN}/${PN}-source-${PV}.zip"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-IUSE="+kde"
-
-BDEPEND="
-	app-arch/unzip
-	sys-devel/gettext
-	kde? ( kde-frameworks/extra-cmake-modules:5 )
-"
-DEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtwidgets:5
-	kde? (
-		kde-frameworks/kconfig:5
-		kde-frameworks/kconfigwidgets:5
-		kde-frameworks/kcoreaddons:5
-		kde-frameworks/kcrash:5
-		kde-frameworks/kdbusaddons:5
-		kde-frameworks/kglobalaccel:5
-		kde-frameworks/ki18n:5
-		kde-frameworks/kidletime:5
-		kde-frameworks/knotifications:5
-		kde-frameworks/knotifyconfig:5
-		kde-frameworks/kwidgetsaddons:5
-		kde-frameworks/kxmlgui:5
-	)
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}/${P}-cmake-3.15.patch" )
-
-src_configure() {
-	local mycmakeargs=(
-		-DKS_PURE_QT=$(usex !kde)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-misc/kshutdown/kshutdown-5.2.ebuild b/kde-misc/kshutdown/kshutdown-5.2.ebuild
index fbff8a261640..db7ee2652e87 100644
--- a/kde-misc/kshutdown/kshutdown-5.2.ebuild
+++ b/kde-misc/kshutdown/kshutdown-5.2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${PN}-source-${PV}.zip"
 
 LICENSE="GPL-2+"
 SLOT="5"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+kde"
 
 BDEPEND="