gentoo resync : 18.03.2018

6 files changed, 57 insertions, 87 deletions

diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 1bc2c842932e..fa62d09711f7 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/kdeconnect/Manifest b/kde-misc/kdeconnect/Manifest
index 0145b22a1bf2..4627d1a67f3b 100644
--- a/kde-misc/kdeconnect/Manifest
+++ b/kde-misc/kdeconnect/Manifest
@@ -1,5 +1,3 @@
-DIST kdeconnect-kde-1.2.tar.xz 263800 BLAKE2B 032ac4642ec4d40ccc89e7f6736b93cb087076e9ad007fdb8871cb2086fbf4b82dbc99550dc4561814db0e7e9d48c80da26df14bf27d8311f317a48885f17a17 SHA512 3cb65abaec6938905ccdb5ebab8ed831b2542dcd945516481e67d32eaa7ddb0f8aa9a1f58c3955989372bc5a57e7012bc20f30fd1b76768d6b6f2179dbabe4ef
 DIST kdeconnect-kde-v1.2.1.tar.xz 278612 BLAKE2B a0803f34232eca16baf2c00ea96ccc33be8c631b40041aa6cfffab933ba984ff95639ae3103bd6499583ac6ba0c8e70f50bd6db30ff3d50f93a5d9e232dec303 SHA512 d336350ce1698d1fc2aa2ee02a4fec9c7ce5eedbf346ec40d502f7b5c1c555a370f09a65d88d70ece09c4a7bcf240921df31f803215afce657c9b4cb113baa58
-EBUILD kdeconnect-1.2.1-r1.ebuild 2075 BLAKE2B e3f6326c6b6bb5a727a56903c98708b2938ad754369940325575d36e22fe5719f5d6c095b1f3b1e1d138a12a3511b90301e72074bfb0b61841e813d150bb3aed SHA512 8112a0cc686f60d67dff5168e3974eea5e2ebe5f663ce9a9be8904c1414a6ded814f8dc1a800052b33ce1b2316273b57277063165e58128ba64ac7cfb4d38e84
-EBUILD kdeconnect-1.2.ebuild 2048 BLAKE2B b47bde84f052f0d4715c11caa908d277aa207bc72d2f66d2c38dd685cb83e4bb509863fe4af893e94cc7f3d5e1e775385b5b66c162a4ed1cea03fb0d14c3e46e SHA512 f4faf35d75d2e96b1dad6e5fb8b0ec60b6740f31f719c145b111525f471ad70cb9a1275705977e6f1ff197cc0f512deceb260bdd09799a74c864cdd22aa56b66
+EBUILD kdeconnect-1.2.1-r1.ebuild 2073 BLAKE2B b97692876ec7e85dda2f9cd8e4e88d05e2057d2a2f663889661b8857fb0bfe0715b109c739c21e17cedc29ea2dd27c53afba48a312e19caf43cb790ca83851a5 SHA512 487ef9ee4ba42576b84294a03270f2a98349a8fb862423b3c343ac34582af58f8bf001d4ca77f2c759adea1a3959d2764f9fd750b80dc3b842ba527501744628
 MISC metadata.xml 444 BLAKE2B 53366042b40ae2a0dca866ed2278b040bcc46e2350a06be8f379fa4356f3f1e5e7ea82708edded6c5b1135606bcc92c887fc4b267f5d01fac772dc3261302a6c SHA512 3a755e202ed5deea178c356c65b0138bdb5d1940fa20d0986adcab940016630a36c38d67babef5a0aee371629d4357cb5a0946b4694bdec6cfea7317707b5b1f
diff --git a/kde-misc/kdeconnect/kdeconnect-1.2.1-r1.ebuild b/kde-misc/kdeconnect/kdeconnect-1.2.1-r1.ebuild
index c3a0b78cf036..7ed3a7c82a95 100644
--- a/kde-misc/kdeconnect/kdeconnect-1.2.1-r1.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-1.2.1-r1.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://www.kde.org/ https://community.kde.org/KDEConnect"
 SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${KMNAME}-v${PV}.tar.xz"
 
 LICENSE="GPL-2+"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="app wayland"
 
 DEPEND="
diff --git a/kde-misc/kdeconnect/kdeconnect-1.2.ebuild b/kde-misc/kdeconnect/kdeconnect-1.2.ebuild
deleted file mode 100644
index 51df02e7a5e6..000000000000
--- a/kde-misc/kdeconnect/kdeconnect-1.2.ebuild
+++ /dev/null
@@ -1,83 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="optional"
-KDE_TEST="true"
-KMNAME="${PN}-kde"
-KDE_SELINUX_MODULE="${PN}"
-FRAMEWORKS_MINIMAL="5.38.0"
-inherit kde5
-
-DESCRIPTION="Adds communication between KDE Plasma and your smartphone"
-HOMEPAGE="https://www.kde.org/ https://community.kde.org/KDEConnect"
-SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${KMNAME}-${PV}.tar.xz"
-
-LICENSE="GPL-2+"
-KEYWORDS="amd64 x86"
-IUSE="app wayland"
-
-DEPEND="
-	$(add_frameworks_dep kcmutils)
-	$(add_frameworks_dep kconfig)
-	$(add_frameworks_dep kconfigwidgets)
-	$(add_frameworks_dep kcoreaddons)
-	$(add_frameworks_dep kdbusaddons)
-	$(add_frameworks_dep ki18n)
-	$(add_frameworks_dep kiconthemes)
-	$(add_frameworks_dep kio)
-	$(add_frameworks_dep knotifications)
-	$(add_frameworks_dep kservice)
-	$(add_frameworks_dep kwidgetsaddons)
-	$(add_qt_dep qtdbus)
-	$(add_qt_dep qtdeclarative)
-	$(add_qt_dep qtgui)
-	$(add_qt_dep qtnetwork)
-	$(add_qt_dep qtwidgets)
-	$(add_qt_dep qtx11extras)
-	>=app-crypt/qca-2.1.0:2[qt5,ssl]
-	x11-libs/libfakekey
-	x11-libs/libX11
-	x11-libs/libXtst
-	app? ( $(add_frameworks_dep kdeclarative) )
-	wayland? ( $(add_frameworks_dep kwayland) )
-"
-RDEPEND="${DEPEND}
-	app? ( $(add_frameworks_dep kirigami '' 2.2.0) )
-	wayland? ( $(add_plasma_dep kwin) )
-	!kde-misc/kdeconnect:4
-"
-
-RESTRICT+=" test"
-
-src_prepare() {
-	sed \
-		-e 's#${LIBEXEC_INSTALL_DIR}#@KDE_INSTALL_FULL_LIBEXECDIR@#' \
-		-i daemon/kdeconnectd.desktop.cmake || die
-
-	kde5_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DEXPERIMENTALAPP_ENABLED=$(usex app)
-		$(cmake-utils_use_find_package wayland KF5Wayland)
-	)
-
-	kde5_src_configure
-}
-
-pkg_postinst(){
-	kde5_pkg_postinst
-
-	elog
-	elog "Optional dependency:"
-	elog "net-fs/sshfs (for 'remote filesystem browser' plugin)"
-	elog
-	elog "The Android .apk file is available via"
-	elog "https://play.google.com/store/apps/details?id=org.kde.kdeconnect_tp"
-	elog "or via"
-	elog "https://f-droid.org/repository/browse/?fdid=org.kde.kdeconnect_tp"
-	elog
-}
diff --git a/kde-misc/kshutdown/Manifest b/kde-misc/kshutdown/Manifest
index c691183b23f1..8268b20271bb 100644
--- a/kde-misc/kshutdown/Manifest
+++ b/kde-misc/kshutdown/Manifest
@@ -1,5 +1,7 @@
 DIST kshutdown-source-4.0.zip 459493 BLAKE2B 88718dacc682fc44461880767cc874e822e69d25359a5f8f66cec9bd99de7c4bb81173905ca12670788b191593128b325c03935d26757f260fe8d47b9bab768a SHA512 720ca297760bf0442fca10f64e966b16db32a0bdb5a6b456408a7245fba071b9bdb465bee312878b5cf82df0aa1e27566b06fc6fe5026edc3a84d2d8295ea6ee
 DIST kshutdown-source-4.1.1beta.zip 465923 BLAKE2B d67d1a1e2b9434bf4c928495148b375619efe5ce4971424b577bced490fa5df29f48e374fa7f133ea8ec3017b60f391dc267a72307e38312c629a864350f629a SHA512 1d4d34e123e6a354b47771a9d79f00f8a5cd54e6886836b92a61925c1cc93090c51d5270c67e3ec53da21d8df9587cb0bc69ad329d17c833bb9dbd39e3138e56
+DIST kshutdown-source-4.2.zip 463140 BLAKE2B b398a004e91ebfa7651eed7bfffeccfc1cb332868ff3bbcea50ccd40088084ff1079d73ee2c922c8e882c0d39e1c6bc2741d0b416b5a2742eb5c6686b03f29a5 SHA512 00d4a5c1c8efdac0d86009bc0218a673435ca315f3b4fa949af414bf525ff65088f26edb0ed0d9fd2209ea81d58619efcffa5091d49bd2b841ddd4749b05a21f
 EBUILD kshutdown-4.0.ebuild 1084 BLAKE2B 2f40973077cf5c3b67c83af9c73c2dc41f06fdc6a9c3b0e4ef1606231e41852c4094db3e4d56b366ff2d1174fc64dbac94a95a69484452fa2ea1076fd35f2bf8 SHA512 1c8ba9a8239459440860f9566173b309137701a1ffeaf9e80a97c0037c5860fbfb904c9dc309ee481252bbb6ca5df7b0566ea6043dbc5015a68f1ff15bb928bc
 EBUILD kshutdown-4.1.1_beta.ebuild 1136 BLAKE2B 7c9b958572fd3f93c9904614b1a0aabdfec65b6a2f08d26ae38c2be18e9468d5ef47089aa960f8e25a639e448bc794f5295ace4a452e7e336b0b64d9a4d05a60 SHA512 390d3cbd0b6acedf4c0b942eac675829b87a4bea9d613a8ea94b5120f1d5292c38c9d2222b49045fecccabbb5a8f6754bb6f2efb9ce7aef013467164017bb0d1
+EBUILD kshutdown-4.2.ebuild 1113 BLAKE2B 6d7d44cd078892736e7110d93e4afa4ae7636c076b26f694509973093df9211a6b854d84bf5e7e471a8e358591cd311eb26bdefec22cd32bbb0c949cab302e6a SHA512 2e4791467424b6060c0d62a721a9a133968d13bc54bac67143e85cc492e2d1d5c120ff82efcf3b32cd8d652d2db8d20680230989c1afd5e452b373dfb3da1a57
 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
new file mode 100644
index 000000000000..9ca2c20bb781
--- /dev/null
+++ b/kde-misc/kshutdown/kshutdown-4.2.ebuild
@@ -0,0 +1,53 @@
+# 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
+}