Revert "gentoo resync : 02.06.2018"

This reverts commit 6c14fa2586d9e9c4427b5f727dc6c8ab77587cec.

5 files changed, 7 insertions, 95 deletions

diff --git a/kde-misc/Manifest.gz b/kde-misc/Manifest.gz
index 84a911dc88ac..df734c28489d 100644
--- a/kde-misc/Manifest.gz
+++ b/kde-misc/Manifest.gz
diff --git a/kde-misc/kdeconnect/Manifest b/kde-misc/kdeconnect/Manifest
index 501cab12a655..7a7591755d1f 100644
--- a/kde-misc/kdeconnect/Manifest
+++ b/kde-misc/kdeconnect/Manifest
@@ -1,8 +1,6 @@
 AUX kdeconnect-1.3.0-no-wayland.patch 523 BLAKE2B c29b58a3f1f97f09c67270f6b55f8122ccca834b979717bc1c5ad279675106acaa23da1d4a4a08dcc4194b6837cb5fce23ecfd12d5d8d1ed4adb8b4fdd077eae SHA512 68527f15ec3f0af14e33e857567c2fcc622f5dd5fc0652dc0af95e91dc5b96929df9db4961d9aa528be73b87e021877d7f6ee5894a2a195446a7235ca979b664
 DIST kdeconnect-kde-1.3.0.tar.xz 281972 BLAKE2B 62e8b59bc661be7a17ef4e160411dff2150ea8639f69388f32453d3b0066ebc7333987b7df31241eac7d95b994f91347432226ef7f5d7bb864b87108fb974544 SHA512 837f6129393fc1e6d68c1c0cc7eea244bc1702fa4beb9bfc764d001077a890ff7c9a954de738ccabb3369f1a9a08325300514eecdbced939ad8e8b360a4b2045
-DIST kdeconnect-kde-1.3.1.tar.xz 283636 BLAKE2B 8790ff2f411539db6759ddcad6a9401b2769c7c02f7a0465e0141f10eb6b5675fa56ac89bce94ae02326ce6eb13911f0b97684660df05195df596c1848d1f219 SHA512 52157dc7c7c3caec9871e9feb69c7aa8b82738fa5d4e60bb7492a9ded672351fbb6773ebf166281da9e585798583c1b23ac52bfd60927bb606472b19c5dc8538
 DIST kdeconnect-kde-v1.2.1.tar.xz 278612 BLAKE2B a0803f34232eca16baf2c00ea96ccc33be8c631b40041aa6cfffab933ba984ff95639ae3103bd6499583ac6ba0c8e70f50bd6db30ff3d50f93a5d9e232dec303 SHA512 d336350ce1698d1fc2aa2ee02a4fec9c7ce5eedbf346ec40d502f7b5c1c555a370f09a65d88d70ece09c4a7bcf240921df31f803215afce657c9b4cb113baa58
 EBUILD kdeconnect-1.2.1-r2.ebuild 2076 BLAKE2B 8f40f9ffb412de628ec3e5c5dc44d544cc671ee47d76b4c22161d3379b66cae93ed4512a76f94d79eaee9fb028f22541fd2bfa3cae0299094a96c2209846ea26 SHA512 ed0da87b29207690d11064329db26c70c28d2c168ae7d990574c582290ec3d533c3dc63ea83b10632370075c13bb7410ae3bbbdd0feac14a89fcb8c2e33211e8
-EBUILD kdeconnect-1.3.0.ebuild 2146 BLAKE2B e56911e541a3bbabb08a23fabced60d86974d8539a50c9f378e48f2a2a1618a0657b4b3e6ef213d7f711295e2b4d5aa0279b23c5e967e523cc15b4d3cf7f7221 SHA512 f5434ee734a0404c86ac660567acbd61c309ce840ac28c63f8950af7db135aefa07c9a59344cb7e96ff9f2fd55b823b2392391a196fc8c364896cb8d13c8360f
-EBUILD kdeconnect-1.3.1.ebuild 2207 BLAKE2B 3b75875fbe52ad33a627d412277c0be62312a1710dd8ddf9e8f3c308c8c77f40e96358ea9335bfdf635e9772710b46e552ba1e971e828b502faf3248be496150 SHA512 98ccf280b12b92177db192c7b1fac8eaeeeb634a7eb3158be777a7c551b350aba8127f575ad07e932baebba27830fb5874ffd58874d5a24bfb0ecc66b5317f6a
-MISC metadata.xml 542 BLAKE2B ca880a9dbf862f3b76d30b2fe8bdcf83487606179785fa7060dfc50342df4b73c55a45302b8eb0306559d5da907d958c71ccde0028f23ddf3353465b446a536a SHA512 76c1a4ccab6959be8982ffaab3830fbbe4e3c1c55ad5793bd07fa1c037b1632a2b568d2049bf83f71d437b72f01638d6fe54e17744df95cfe04b2d99828a08bf
+EBUILD kdeconnect-1.3.0.ebuild 2262 BLAKE2B c6c133440a6d494527081953ffef551056fc3e6397b81603a976ccddc5c7708824b459a632d3baf427121be9c6db4febb6b30e86d00494d872b5c944a16de202 SHA512 4221146811e1b3fd4437682f8990e7fa6d2171f0a49f5566582bad54e713f894d28dcdea03d379b8ff15f997eb10c4f2a3e23a86fc558b989d46392dbb213dc1
+MISC metadata.xml 529 BLAKE2B faa10c113f9c92d2746d1efe9d9919d12115470bc798166bf0e203e11a73c5681513a8c067ba60e60e7858cad73a75d54dbcb137fac49359830d0942325fedd0 SHA512 d3f183d3859863916240e7f240393e05fa55d33b5b569de67de7addcde620e43e754ae7a3279c387a093abba57eaf7c375ff6440175abfa301a2f348e2ff2d85
diff --git a/kde-misc/kdeconnect/kdeconnect-1.3.0.ebuild b/kde-misc/kdeconnect/kdeconnect-1.3.0.ebuild
index a4c3a879ba28..b826ef6e3ba1 100644
--- a/kde-misc/kdeconnect/kdeconnect-1.3.0.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-1.3.0.ebuild
@@ -18,7 +18,7 @@ fi
 DESCRIPTION="Adds communication between KDE Plasma and your smartphone"
 HOMEPAGE="https://www.kde.org/ https://community.kde.org/KDEConnect"
 LICENSE="GPL-2+"
-IUSE="app wayland"
+IUSE="app sms wayland"
 
 DEPEND="
 	$(add_frameworks_dep kcmutils)
@@ -43,10 +43,12 @@ DEPEND="
 	x11-libs/libX11
 	x11-libs/libXtst
 	app? ( $(add_frameworks_dep kdeclarative) )
+	sms? ( $(add_frameworks_dep kpeople) )
 	wayland? ( $(add_frameworks_dep kwayland) )
 "
 RDEPEND="${DEPEND}
 	app? ( $(add_frameworks_dep kirigami) )
+	sms? ( $(add_frameworks_dep kirigami) )
 	wayland? ( $(add_plasma_dep kwin) )
 	!kde-misc/kdeconnect:4
 "
@@ -66,6 +68,7 @@ src_prepare() {
 src_configure() {
 	local mycmakeargs=(
 		-DEXPERIMENTALAPP_ENABLED=$(usex app)
+		-DSMSAPP_ENABLED=$(usex sms)
 		$(cmake-utils_use_find_package wayland KF5Wayland)
 	)
 
diff --git a/kde-misc/kdeconnect/kdeconnect-1.3.1.ebuild b/kde-misc/kdeconnect/kdeconnect-1.3.1.ebuild
deleted file mode 100644
index e5896a909ecb..000000000000
--- a/kde-misc/kdeconnect/kdeconnect-1.3.1.ebuild
+++ /dev/null
@@ -1,89 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-KDE_HANDBOOK="forceoptional"
-KDE_TEST="true"
-KMNAME="${PN}-kde"
-KDE_SELINUX_MODULE="${PN}"
-inherit kde5
-
-if [[ ${KDE_BUILD_TYPE} = release ]]; then
-	SRC_URI="mirror://kde/stable/${PN}/${PV}/src/${KMNAME}-${PV}.tar.xz"
-	KEYWORDS="~amd64 ~x86"
-fi
-
-DESCRIPTION="Adds communication between KDE Plasma and your smartphone"
-HOMEPAGE="https://www.kde.org/ https://community.kde.org/KDEConnect"
-LICENSE="GPL-2+"
-IUSE="app mousepad 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]
-	app? ( $(add_frameworks_dep kdeclarative) )
-	mousepad? (
-		x11-libs/libfakekey
-		x11-libs/libX11
-		x11-libs/libXtst
-	)
-	wayland? ( $(add_frameworks_dep kwayland) )
-"
-RDEPEND="${DEPEND}
-	app? ( $(add_frameworks_dep kirigami) )
-	wayland? ( $(add_plasma_dep kwin) )
-	!kde-misc/kdeconnect:4
-"
-
-RESTRICT+=" test"
-
-PATCHES=( "${FILESDIR}/${PN}-1.3.0-no-wayland.patch" )
-
-src_prepare() {
-	kde5_src_prepare
-
-	sed \
-		-e 's#${LIBEXEC_INSTALL_DIR}#@KDE_INSTALL_FULL_LIBEXECDIR@#' \
-		-i daemon/kdeconnectd.desktop.cmake || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DEXPERIMENTALAPP_ENABLED=$(usex app)
-		$(cmake-utils_use_find_package mousepad LibFakeKey)
-		$(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/kdeconnect/metadata.xml b/kde-misc/kdeconnect/metadata.xml
index b2a2f800e42e..320dfa65998d 100644
--- a/kde-misc/kdeconnect/metadata.xml
+++ b/kde-misc/kdeconnect/metadata.xml
@@ -7,7 +7,7 @@
 	</maintainer>
 	<use>
 		<flag name="app">Enable experimental kcapp frontend</flag>
-		<flag name="mousepad">Enable remote mousepad plugin using <pkg>x11-libs/libfakekey</pkg></flag>
+		<flag name="sms">Enable SMS support using <pkg>kde-frameworks/kpeople</pkg></flag>
 		<flag name="wayland">Enable kwin_wayland support for mousepad plugin using <pkg>kde-frameworks/kwayland</pkg></flag>
 	</use>
 </pkgmetadata>