gentoo resync : 08.06.2019

3 files changed, 2 insertions, 57 deletions

diff --git a/kde-misc/kshutdown/Manifest b/kde-misc/kshutdown/Manifest
index adf7897bea22..44d251581fe0 100644
--- a/kde-misc/kshutdown/Manifest
+++ b/kde-misc/kshutdown/Manifest
@@ -1,5 +1,3 @@
-DIST kshutdown-source-4.2.zip 463140 BLAKE2B b398a004e91ebfa7651eed7bfffeccfc1cb332868ff3bbcea50ccd40088084ff1079d73ee2c922c8e882c0d39e1c6bc2741d0b416b5a2742eb5c6686b03f29a5 SHA512 00d4a5c1c8efdac0d86009bc0218a673435ca315f3b4fa949af414bf525ff65088f26edb0ed0d9fd2209ea81d58619efcffa5091d49bd2b841ddd4749b05a21f
 DIST kshutdown-source-5.0.zip 454848 BLAKE2B 481cafbf5bd3831088ec9168b6eb82e342106b9b570279b6b8ca1db1f2df8c5640b3942f76032559396b504903b18fe106eb940e81822472a63f235e1a004644 SHA512 7a3920315db142f150227e624fa4a765966ec8367a08686214cb072d94a62d24f3a22fbef8fc84411d385be935102cf85df1b001b2922399455cc320c1e0f0db
-EBUILD kshutdown-4.2.ebuild 1111 BLAKE2B 464b8451249ee35b987d175c5fca37b446084c789f1af1d6338d1988af70660f2660427838a35881f876b22cd893d5565f79da386828a2ca2771509be2b97c31 SHA512 b4e900b61414ead4f471c0a682bef779dd8fd061f296de3ed57180db777dd01bc772780eff45c34af74205ed02788c4cb91c276e6a4069a8ca337d746e50c328
-EBUILD kshutdown-5.0.ebuild 1058 BLAKE2B 9b7a7e3ed7bf3cb790d1e44bfc32eb4e469146c5b7ad20c65ac28b329539b167eddd7f106dc5d2e6db955e6650c1258f75cd6ddca5abde6fd61071e822d7a1af SHA512 be42bd278ae5241a3dd38828aa12814f507afae0087a5b2177978c7febbfdc0ef3f346924be6bed360ac82ddfe320861621050a5bbaa77fd96a81a5a6b80381a
+EBUILD kshutdown-5.0.ebuild 1056 BLAKE2B deef254027bd03410be3fac46d18f9dc303dfad049ad833cfdbd32f1588b18a7bd6a6c7603961b5f59d411f9b78db1fdee1fcf0c494781120f457e70f0bcf4ab SHA512 1a8b4ee855b6379b1ef1fa0fae9b3027cc4f87c79c9e35b213dffbc00cff7bac67a798baf3a1fed9152633562e8275a6162c33b52cdd952da932e8ee4f68602c
 MISC metadata.xml 328 BLAKE2B 7fca7d8d10232412fe198ba6c48e27ff6e1f45574255cd0b386f05264822a8bfe84a77f12b5104682d2188f51c230baf6cc6180b50249634cb5bc7bcc0cfa946 SHA512 b26f71d9d8119e82c3f395850e2309f97edc6c7fbb201387ff0bd03c7241b3262218dd5baea6a438b649ee3c13d4061531b0234471c3d8b4b8349e658d5bd775
diff --git a/kde-misc/kshutdown/kshutdown-4.2.ebuild b/kde-misc/kshutdown/kshutdown-4.2.ebuild
deleted file mode 100644
index 6cb0e984c179..000000000000
--- a/kde-misc/kshutdown/kshutdown-4.2.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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"
-
-COMMON_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/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
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	app-arch/unzip
-	kde? ( kde-frameworks/extra-cmake-modules:5 )
-	sys-devel/gettext
-"
-RDEPEND="${COMMON_DEPEND}
-	!kde-misc/kshutdown:4
-"
-
-src_configure() {
-	local mycmakeargs=(
-		-DKS_KF5=$(usex kde)
-		-DKS_PURE_QT=$(usex !kde)
-	)
-
-	kde5_src_configure
-}
diff --git a/kde-misc/kshutdown/kshutdown-5.0.ebuild b/kde-misc/kshutdown/kshutdown-5.0.ebuild
index 252085d32a67..c8a2047def2c 100644
--- a/kde-misc/kshutdown/kshutdown-5.0.ebuild
+++ b/kde-misc/kshutdown/kshutdown-5.0.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://kshutdown.sourceforge.io"
 SRC_URI="mirror://sourceforge/${PN}/${PN}-source-${PV}.zip"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+kde"
 
 BDEPEND="