gentoo resync : 15.12.2017

3 files changed, 3 insertions, 88 deletions

diff --git a/kde-misc/kdeconnect/Manifest b/kde-misc/kdeconnect/Manifest
index 0ee15d21201c..5b72d140b86c 100644
--- a/kde-misc/kdeconnect/Manifest
+++ b/kde-misc/kdeconnect/Manifest
@@ -1,5 +1,3 @@
-DIST kdeconnect-kde-1.0.3.tar.xz 230464 SHA256 221f61b77284453e2c32865700c82deb50e3c0e11f4197c2c7ecf0a60420802c SHA512 b24acd75c05aab4638aa16ff7314dd68634fab4f9708124e8947960c92a6a4cfe66d47dd3575f89822771267319bfce124fcee752ea65951b49b55f8aa026937 WHIRLPOOL 2363a74535efb44dfc8f621c25d2cafd7daf9ab6714855d979b5bcd980a632c50e5faeef48f13a9642313480ae107f89295916fdb5098cb5d5098ab3d463fc66
-DIST kdeconnect-kde-1.2.tar.xz 263800 SHA256 5e8528a6758c64e884a787d661fc3ea38970e62e4540463238ad9a6c1b6d7970 SHA512 3cb65abaec6938905ccdb5ebab8ed831b2542dcd945516481e67d32eaa7ddb0f8aa9a1f58c3955989372bc5a57e7012bc20f30fd1b76768d6b6f2179dbabe4ef WHIRLPOOL bec2ef1d4cddd3c0819cd3b9b6cc616fd947745ee9bb3617aa1183f4e90e06d45bb1a8c6db0391dc83268f9e0e574d391caa8770439d7eb7220a8a6f8d3ac032
-EBUILD kdeconnect-1.0.3.ebuild 2042 BLAKE2B 1edd17342a70edc70f4e4825052431bda7e5673dc6f884fe7b0be6f09719fc38ab9ee5709d0c441b53f3932deee45fab8f294dc3c82a488b29f5e889a76a14b7 SHA512 41c3da42154660d433784dcce7ee5b6bbfbff13b8ba119238cd883e6c1e22880002517b1d279a26be5a41b665706edc0049e424e7f64f80bed7bf3540e444535
-EBUILD kdeconnect-1.2.ebuild 2050 BLAKE2B 89c0122da56a85d4179b76f8c6d4326a96973fdb052623b3b02feb9ff57a8618c7a1df865daef87486e1561305ac5dda82fdeb75fdc1d1e8cc530cc7614bc967 SHA512 74a3a703d1ab8874760064b35a5cebff27fe49fbd57b26fe012c9f07518528c37182196dc4795b65499eec510f608175d5e2ea09cf2c9b60706b5f24667a7f63
+DIST kdeconnect-kde-1.2.tar.xz 263800 BLAKE2B 032ac4642ec4d40ccc89e7f6736b93cb087076e9ad007fdb8871cb2086fbf4b82dbc99550dc4561814db0e7e9d48c80da26df14bf27d8311f317a48885f17a17 SHA512 3cb65abaec6938905ccdb5ebab8ed831b2542dcd945516481e67d32eaa7ddb0f8aa9a1f58c3955989372bc5a57e7012bc20f30fd1b76768d6b6f2179dbabe4ef
+EBUILD kdeconnect-1.2.ebuild 2048 BLAKE2B b47bde84f052f0d4715c11caa908d277aa207bc72d2f66d2c38dd685cb83e4bb509863fe4af893e94cc7f3d5e1e775385b5b66c162a4ed1cea03fb0d14c3e46e SHA512 f4faf35d75d2e96b1dad6e5fb8b0ec60b6740f31f719c145b111525f471ad70cb9a1275705977e6f1ff197cc0f512deceb260bdd09799a74c864cdd22aa56b66
 MISC metadata.xml 444 BLAKE2B 53366042b40ae2a0dca866ed2278b040bcc46e2350a06be8f379fa4356f3f1e5e7ea82708edded6c5b1135606bcc92c887fc4b267f5d01fac772dc3261302a6c SHA512 3a755e202ed5deea178c356c65b0138bdb5d1940fa20d0986adcab940016630a36c38d67babef5a0aee371629d4357cb5a0946b4694bdec6cfea7317707b5b1f
diff --git a/kde-misc/kdeconnect/kdeconnect-1.0.3.ebuild b/kde-misc/kdeconnect/kdeconnect-1.0.3.ebuild
deleted file mode 100644
index 5f55b191f621..000000000000
--- a/kde-misc/kdeconnect/kdeconnect-1.0.3.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}"
-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}
-	$(add_plasma_dep plasma-workspace)
-	app? ( kde-frameworks/kirigami:1 )
-	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/kdeconnect/kdeconnect-1.2.ebuild b/kde-misc/kdeconnect/kdeconnect-1.2.ebuild
index a0b91f18adde..51df02e7a5e6 100644
--- a/kde-misc/kdeconnect/kdeconnect-1.2.ebuild
+++ b/kde-misc/kdeconnect/kdeconnect-1.2.ebuild
@@ -15,7 +15,7 @@ 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"
+KEYWORDS="amd64 x86"
 IUSE="app wayland"
 
 DEPEND="