[gentoo-commits] repo/gentoo:master commit in: kde-apps/kio-extras/

[Johannes Huber]

commit:     e856dcb660aed7632f1d9ba79340e2841df8b83b
Author:     Johannes Huber <johu <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 28 18:47:58 2016 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Mar 28 18:47:58 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e856dcb6

kde-apps/kio-extras: Backport improvements

Package-Manager: portage-2.2.28

 kde-apps/kio-extras/kio-extras-15.08.3.ebuild | 42 +++++++++++----------------
 1 file changed, 17 insertions(+), 25 deletions(-)

diff --git a/kde-apps/kio-extras/kio-extras-15.08.3.ebuild b/kde-apps/kio-extras/kio-extras-15.08.3.ebuild
index d4c0d21..a8c71a1 100644
--- a/kde-apps/kio-extras/kio-extras-15.08.3.ebuild
+++ b/kde-apps/kio-extras/kio-extras-15.08.3.ebuild
@@ -2,17 +2,17 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-KDE_HANDBOOK="true"
-KDE_TEST="true"
+KDE_HANDBOOK="forceoptional"
+KDE_TEST="optional"
 VIRTUALX_REQUIRED="test"
-inherit fdo-mime kde5
+inherit kde5
 
 DESCRIPTION="KIO plugins present a filesystem-like view of arbitrary data"
 HOMEPAGE="https://projects.kde.org/projects/kde/workspace/kio-extras"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="exif mtp phonon samba +sftp slp"
+KEYWORDS=" ~amd64 ~arm ~x86"
+IUSE="exif mtp openexr phonon samba +sftp slp"
 
 COMMON_DEPEND="
 	$(add_frameworks_dep karchive 'bzip2,lzma')
@@ -34,15 +34,16 @@ COMMON_DEPEND="
 	$(add_frameworks_dep kservice)
 	$(add_frameworks_dep kxmlgui)
 	$(add_frameworks_dep solid)
-	dev-qt/qtdbus:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtsvg:5
-	dev-qt/qtwidgets:5
-	dev-qt/qtxml:5
+	$(add_qt_dep qtdbus)
+	$(add_qt_dep qtgui)
+	$(add_qt_dep qtnetwork)
+	$(add_qt_dep qtsvg)
+	$(add_qt_dep qtwidgets)
+	$(add_qt_dep qtxml)
 	virtual/jpeg:0
 	exif? ( media-gfx/exiv2:= )
 	mtp? ( media-libs/libmtp:= )
+	openexr? ( media-libs/openexr )
 	phonon? ( media-libs/phonon[qt5] )
 	samba? ( || ( <net-fs/samba-4.0.0_alpha1[smbclient] >=net-fs/samba-4.0.0_alpha1[client] ) )
 	sftp? ( >=net-libs/libssh-0.6.0:=[sftp] )
@@ -62,22 +63,13 @@ RESTRICT="test"
 src_configure() {
 	local mycmakeargs=(
 		$(cmake-utils_use_find_package exif Exiv2)
-		$(cmake-utils_use_find_package mtp)
+		$(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)
+		$(cmake-utils_use_find_package samba Samba)
 		$(cmake-utils_use_find_package sftp LibSSH)
-		$(cmake-utils_use_find_package slp)
+		$(cmake-utils_use_find_package slp SLP)
 	)
 
 	kde5_src_configure
 }
-
-pkg_postinst() {
-	kde5_pkg_postinst
-	fdo-mime_mime_database_update
-}
-
-pkg_postrm() {
-	kde5_pkg_postinst
-	fdo-mime_mime_database_update
-}