7 files changed, 49 insertions, 40 deletions
diff --git a/kde-apps/dolphin/dolphin-5.9999.ebuild b/kde-apps/dolphin/dolphin-5.9999.ebuild
index 0e98a8571ce..a16ececdd12 100644
--- a/kde-apps/dolphin/dolphin-5.9999.ebuild
+++ b/kde-apps/dolphin/dolphin-5.9999.ebuild
@@ -44,9 +44,9 @@ DEPEND="
 	dev-qt/qtxml:5
 	media-libs/phonon[qt5]
 	semantic-desktop? (
-		$(add_kdebase_dep baloo)
-		$(add_kdebase_dep baloo-widgets)
-		$(add_kdebase_dep kfilemetadata)
+		$(add_kdeplasma_dep baloo)
+		$(add_kdeplasma_dep baloo-widgets)
+		$(add_kdeplasma_dep kfilemetadata)
 	)
 "
 RDEPEND="${DEPEND}
diff --git a/kde-apps/dolphin/dolphin-9999.ebuild b/kde-apps/dolphin/dolphin-9999.ebuild
index 5ff375a5419..a16ececdd12 100644
--- a/kde-apps/dolphin/dolphin-9999.ebuild
+++ b/kde-apps/dolphin/dolphin-9999.ebuild
@@ -4,54 +4,63 @@
 
 EAPI=5
 
-KDE_HANDBOOK="optional"
+EGIT_BRANCH="frameworks"
 KMNAME="kde-baseapps"
-inherit kde4-meta
+KDE_HANDBOOK=true
+inherit kde5
 
-DESCRIPTION="A KDE filemanager focusing on usability"
+DESCRIPTION="KDE filemanager focusing on usability"
 HOMEPAGE="http://dolphin.kde.org http://www.kde.org/applications/system/dolphin"
 KEYWORDS=""
-IUSE="debug semantic-desktop thumbnail"
+IUSE="semantic-desktop"
 
 DEPEND="
-	$(add_kdebase_dep kactivities '' 4.13)
+	$(add_frameworks_dep kbookmarks)
+	$(add_frameworks_dep kcmutils)
+	$(add_frameworks_dep kcodecs)
+	$(add_frameworks_dep kcompletion)
+	$(add_frameworks_dep kconfig)
+	$(add_frameworks_dep kconfigwidgets)
+	$(add_frameworks_dep kcoreaddons)
+	$(add_frameworks_dep kdelibs4support)
+	$(add_frameworks_dep ki18n)
+	$(add_frameworks_dep kiconthemes)
+	$(add_frameworks_dep kio)
+	$(add_frameworks_dep kitemviews)
+	$(add_frameworks_dep kjobwidgets)
+	$(add_frameworks_dep knewstuff)
+	$(add_frameworks_dep knotifications)
+	$(add_frameworks_dep kparts)
+	$(add_frameworks_dep kservice)
+	$(add_frameworks_dep ktextwidgets)
+	$(add_frameworks_dep kwidgetsaddons)
+	$(add_frameworks_dep kwindowsystem)
+	$(add_frameworks_dep kxmlgui)
+	$(add_frameworks_dep solid)
 	$(add_kdeapps_dep libkonq)
-	media-libs/phonon[qt4]
-	x11-libs/libXrender
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtwidgets:5
+	dev-qt/qtxml:5
+	media-libs/phonon[qt5]
 	semantic-desktop? (
-		$(add_kdebase_dep baloo)
-		$(add_kdebase_dep baloo-widgets)
-		$(add_kdebase_dep kfilemetadata)
+		$(add_kdeplasma_dep baloo)
+		$(add_kdeplasma_dep baloo-widgets)
+		$(add_kdeplasma_dep kfilemetadata)
 	)
 "
 RDEPEND="${DEPEND}
-	$(add_kdeapps_dep kfind)
-	thumbnail? (
-		$(add_kdeapps_dep thumbnailers)
-		|| (
-			$(add_kdeapps_dep ffmpegthumbs)
-			$(add_kdeapps_dep mplayerthumbs)
-		)
-	)
+	!kde-base/dolphin:4
 "
 
-RESTRICT="test"
-# bug 393129
+S=${S}/${PN}
 
 src_configure() {
 	local mycmakeargs=(
-		$(cmake-utils_use_with semantic-desktop Baloo)
-		$(cmake-utils_use_with semantic-desktop BalooWidgets)
-		$(cmake-utils_use_with semantic-desktop KFileMetaData)
+		$(cmake-utils_use_with semantic-desktop KF5Baloo)
+		$(cmake-utils_use_with semantic-desktop KF5BalooWidgets)
+		$(cmake-utils_use_with semantic-desktop KF5FileMetaData)
 	)
 
-	kde4-meta_src_configure
-}
-
-pkg_postinst() {
-	kde4-base_pkg_postinst
-
-	if ! has_version media-gfx/icoutils ; then
-		elog "For .exe file preview support, install media-gfx/icoutils."
-	fi
+	kde5_src_configure
 }
diff --git a/kde-apps/gwenview/gwenview-14.11.97.ebuild b/kde-apps/gwenview/gwenview-14.11.97.ebuild
index 922c5aec551..5c82f7b4b98 100644
--- a/kde-apps/gwenview/gwenview-14.11.97.ebuild
+++ b/kde-apps/gwenview/gwenview-14.11.97.ebuild
@@ -43,7 +43,7 @@ DEPEND="
 	media-libs/phonon[qt5]
 	virtual/jpeg:0
 	x11-libs/libX11
-	semantic-desktop? ( $(add_kdebase_dep baloo) )
+	semantic-desktop? ( $(add_kdeplasma_dep baloo) )
 "
 RDEPEND="${DEPEND}
 	!kde-base/gwenview:4
diff --git a/kde-apps/gwenview/gwenview-9999.ebuild b/kde-apps/gwenview/gwenview-9999.ebuild
index 521989e827c..fd4c3130836 100644
--- a/kde-apps/gwenview/gwenview-9999.ebuild
+++ b/kde-apps/gwenview/gwenview-9999.ebuild
@@ -43,7 +43,7 @@ DEPEND="
 	media-libs/phonon[qt5]
 	virtual/jpeg:0
 	x11-libs/libX11
-	semantic-desktop? ( $(add_kdebase_dep baloo) )
+	semantic-desktop? ( $(add_kdeplasma_dep baloo) )
 "
 RDEPEND="${DEPEND}
 	!kde-base/gwenview:4
diff --git a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-14.11.97.ebuild b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-14.11.97.ebuild
index d04e7c65906..f4849e9d485 100644
--- a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-14.11.97.ebuild
+++ b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-14.11.97.ebuild
@@ -44,7 +44,7 @@ RDEPEND="
 	$(add_kdeapps_dep solid-runtime)
 	crash-reporter? ( $(add_kdeapps_dep drkonqi ) )
 	handbook? ( || (
-		$(add_kdebase_dep khelpcenter)
+		$(add_kdeplasma_dep khelpcenter)
 		kde-base/khelpcenter:5[compat(+)]
 	) )
 	nepomuk? ( $(add_kdeapps_dep nepomuk) )
diff --git a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild
index 3fcf4a15483..63f301ead7c 100644
--- a/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild
+++ b/kde-apps/kdebase-runtime-meta/kdebase-runtime-meta-9999.ebuild
@@ -44,7 +44,7 @@ RDEPEND="
 	$(add_kdeapps_dep solid-runtime)
 	crash-reporter? ( $(add_kdeapps_dep drkonqi ) )
 	handbook? ( || (
-		$(add_kdebase_dep khelpcenter)
+		$(add_kdeplasma_dep khelpcenter)
 		kde-base/khelpcenter:5[compat(+)]
 	) )
 	nepomuk? ( $(add_kdeapps_dep nepomuk) )
diff --git a/kde-apps/okular/okular-5.9999.ebuild b/kde-apps/okular/okular-5.9999.ebuild
index 3d818c37006..064be10365d 100644
--- a/kde-apps/okular/okular-5.9999.ebuild
+++ b/kde-apps/okular/okular-5.9999.ebuild
@@ -46,7 +46,7 @@ DEPEND="
 	chm? ( dev-libs/chmlib )
 	crypt? ( app-crypt/qca:2[qt5] )
 	djvu? ( app-text/djvu )
-	dpi? ( $(add_kdebase_dep libkscreen) )
+	dpi? ( $(add_kdeplasma_dep libkscreen) )
 	ebook? ( app-text/ebook-tools )
 	jpeg? ( virtual/jpeg:0 )
 	pdf? ( app-text/poppler[qt5,-exceptions(-)] )