Revert "gentoo resync : 24.03.2019"

This reverts commit aa3411e241a201d53a2689766fe419f2756819f3.

3 files changed, 85 insertions, 2 deletions

diff --git a/kde-apps/kio-extras/Manifest b/kde-apps/kio-extras/Manifest
index 5d25f90fe56d..818e71a3fe2f 100644
--- a/kde-apps/kio-extras/Manifest
+++ b/kde-apps/kio-extras/Manifest
@@ -1,3 +1,6 @@
+DIST kio-extras-18.08.3-sftp-18.11.80.patch.tar.xz 31376 BLAKE2B d4b44ec4c76309737a417d6bc930c360a0078f743cca96b1b12f164916e0596e0d29bf5d379e1896ffbea94962f2eb61d2b02b8f21000d3bfd75efe0fd55faa2 SHA512 15b43c2b73189db72e7d5b84eee5727ead49482d3d454591d5338b5dee876c751fad16fa76f3697b8ec2070d2bc2f89eec05e6de1ee402272d65aafe4464990c
+DIST kio-extras-18.08.3.tar.xz 552044 BLAKE2B 22f6662a1c45ab80f217c9f2611f0ca33500897c31d8cb8d29949a00500301f1f72219baf17ab73011037e4e1c9cd85d5247692361dcf0ccbf5aed1d829ab922 SHA512 f79ab19abedd47baeffea4b1e99acc21611c9d435f0de14751594c97c373eaa493da07fd5d754b1f62f696e4f445b493861566845794d6d32e63e0354189d726
 DIST kio-extras-18.12.3.tar.xz 562196 BLAKE2B 539880e283251740d44b1f27947722dbb70ecdb133d6708b6a7746fdf65de1eca170ca6d92d22d21b4fa790562d4f71bd8783997bf6bb707e2d2883b1c0aae34 SHA512 a13c349a27b7ffd665b9a3812d70228ab40ac48c50ded7774ed954ce30a6454d1a9c5a27769ddae8f333db0c87943eab18380da413274b69802d9569f6e48d66
-EBUILD kio-extras-18.12.3.ebuild 2046 BLAKE2B f993bf45fdf157d44c595d77587493e86cbc600f9b722d0e6c063b657e879f1211446b9b809dcfb91606c3986ff9b283c5f8ae20a5292c5773a1df18eb4109b4 SHA512 e2613284e71ddb38f48eeb77392dd533ceb0476f2d7f421f9e92156eed1ba74b5cfbfd56e422a06b5ce9808c8db80803e05570ac28e7500205666704a9bcc786
+EBUILD kio-extras-18.08.3-r1.ebuild 2292 BLAKE2B ffedf40ae1af2c3d104cb2b442071f3827e0fb208527e49926c82ea96892c241df2d36ccea6e974729c3fe7ae6da621121bd4621dc9449beb6dfa9095a452893 SHA512 9bd5f965497615da163d39d09a7ceb11ee14f2a0079ef54abd6999db2e4ccca8b6ab6ba690b8c4dfb78fdbeb09cd38f86cdd1ff7556de6b8d39d6d135620d675
+EBUILD kio-extras-18.12.3.ebuild 2048 BLAKE2B 452e84d241bf0f6200e04e5856f8ea8d35e92b71b036c43e83db43730b2f5513193cc481c314705afad5e80719b906863457276f1c4830b8f9473393f1b27dd7 SHA512 701664ed0a1269b34440a383cf7ac8fa34ce817a23d4512f6eb9140fd665bef3af65950d4e33e7066d00c6cadab147eec4adac71d06383d4b00009df6c5d84de
 MISC metadata.xml 667 BLAKE2B 7f837cd50d37a8692d57859a3328770578e13052392bcee145c327e6a07d147f8194ae09ab0c6933fe15eb6964640e8b82495417b3776cac3fce0825fd1fd989 SHA512 3c14222010c942ec878bc049e2e92dc6180305de69804bc024bba1f159d08c97eb61b3e9ad68e14188515bde2b21a026c8068ab465ce8ca22e8e3e0190649154
diff --git a/kde-apps/kio-extras/kio-extras-18.08.3-r1.ebuild b/kde-apps/kio-extras/kio-extras-18.08.3-r1.ebuild
new file mode 100644
index 000000000000..1e3939ee2d83
--- /dev/null
+++ b/kde-apps/kio-extras/kio-extras-18.08.3-r1.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="optional"
+VIRTUALX_REQUIRED="test"
+inherit kde5
+
+DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
+HOMEPAGE="https://cgit.kde.org/kio-extras.git"
+SRC_URI+=" https://dev.gentoo.org/~asturm/distfiles/${P}-sftp-18.11.80.patch.tar.xz"
+KEYWORDS="amd64 ~arm ~arm64 x86"
+IUSE="activities +man mtp openexr phonon samba +sftp taglib"
+
+COMMON_DEPEND="
+	$(add_frameworks_dep karchive 'bzip2,lzma')
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdbusaddons)
+	$(add_frameworks_dep kdnssd)
+	$(add_frameworks_dep kguiaddons)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kpty)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
+	activities? (
+		$(add_frameworks_dep kactivities)
+		$(add_qt_dep qtsql)
+	)
+	man? ( $(add_frameworks_dep khtml) )
+	mtp? ( >=media-libs/libmtp-1.1.16:= )
+	openexr? ( media-libs/openexr:= )
+	phonon? ( media-libs/phonon[qt5(+)] )
+	samba? ( net-fs/samba[client] )
+	sftp? ( net-libs/libssh:=[sftp] )
+	taglib? ( >=media-libs/taglib-1.11.1 )
+"
+RDEPEND="${COMMON_DEPEND}
+	$(add_frameworks_dep kded)
+"
+DEPEND="${COMMON_DEPEND}
+	x11-misc/shared-mime-info
+	man? ( dev-util/gperf )
+"
+
+# requires running kde environment
+RESTRICT+=" test"
+
+PATCHES=( "${WORKDIR}/${P}-sftp-18.11.80.patch" )
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_DISABLE_FIND_PACKAGE_Qt5WebEngineWidgets=ON
+		$(cmake-utils_use_find_package activities KF5Activities)
+		$(cmake-utils_use_find_package man Gperf)
+		$(cmake-utils_use_find_package mtp Mtp)
+		$(cmake-utils_use_find_package openexr OpenEXR)
+		$(cmake-utils_use_find_package phonon Phonon4Qt5)
+		$(cmake-utils_use_find_package samba Samba)
+		$(cmake-utils_use_find_package sftp libssh)
+		$(cmake-utils_use_find_package taglib Taglib)
+	)
+
+	kde5_src_configure
+}
diff --git a/kde-apps/kio-extras/kio-extras-18.12.3.ebuild b/kde-apps/kio-extras/kio-extras-18.12.3.ebuild
index 9482d93a903f..2197fecc0292 100644
--- a/kde-apps/kio-extras/kio-extras-18.12.3.ebuild
+++ b/kde-apps/kio-extras/kio-extras-18.12.3.ebuild
@@ -10,7 +10,7 @@ inherit kde5
 
 DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
 HOMEPAGE="https://cgit.kde.org/kio-extras.git"
-KEYWORDS="amd64 ~arm ~arm64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="activities +man mtp openexr phonon samba +sftp taglib"
 
 BDEPEND="