[gentoo-commits] proj/kde:master commit in: kde-apps/dolphin/

[Michael Palimaka]

commit:     011b3baf058d68dda5fbf7bd5da75e18ddd6cec6
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Feb 10 22:59:20 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Fri Feb 12 03:50:43 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=011b3baf

kde-apps/dolphin: Adjust DEPENDs for kfilemetadata

Package-Manager: portage-2.2.27

 kde-apps/dolphin/dolphin-15.12.49.9999.ebuild |  8 +++-----
 kde-apps/dolphin/dolphin-9999.ebuild          | 11 +++++------
 2 files changed, 8 insertions(+), 11 deletions(-)

diff --git a/kde-apps/dolphin/dolphin-15.12.49.9999.ebuild 
b/kde-apps/dolphin/dolphin-15.12.49.9999.ebuild
index 74b7859..5676bf2 100644
--- a/kde-apps/dolphin/dolphin-15.12.49.9999.ebuild
+++ b/kde-apps/dolphin/dolphin-15.12.49.9999.ebuild
@@ -2,9 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-FRAMEWORKS_MINIMAL="5.16.0"
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="true"
 VIRTUALX_REQUIRED="test"
@@ -78,10 +77,9 @@ src_configure() {
 pkg_postinst() {
        kde5_pkg_postinst
 
-       if ( ! has_version "kde-apps/ark:${SLOT}" || has_version 
"<kde-frameworks/kio-5.17.0" ); then
+       if ! has_version "kde-apps/ark:${SLOT}" ; then
                echo
-               elog "For compress/extract and other actions, please install"
-               elog "kde-apps/ark:${SLOT} and >=kde-frameworks/kio-5.17.0"
+               elog "For compress/extract and other actions, please install 
kde-apps/ark:${SLOT}"
                echo
        fi
 }

diff --git a/kde-apps/dolphin/dolphin-9999.ebuild 
b/kde-apps/dolphin/dolphin-9999.ebuild
index 74b7859..f8e3154 100644
--- a/kde-apps/dolphin/dolphin-9999.ebuild
+++ b/kde-apps/dolphin/dolphin-9999.ebuild
@@ -2,9 +2,9 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
-EAPI=5
+EAPI=6
 
-FRAMEWORKS_MINIMAL="5.16.0"
+FRAMEWORKS_MINIMAL="5.19.0"
 KDE_HANDBOOK="forceoptional"
 KDE_TEST="true"
 VIRTUALX_REQUIRED="test"
@@ -25,6 +25,7 @@ DEPEND="
        $(add_frameworks_dep kcoreaddons)
        $(add_frameworks_dep kcrash)
        $(add_frameworks_dep kdbusaddons)
+       $(add_frameworks_dep kfilemetadata)
        $(add_frameworks_dep ki18n)
        $(add_frameworks_dep kiconthemes)
        $(add_frameworks_dep kinit)
@@ -48,7 +49,6 @@ DEPEND="
        media-libs/phonon[qt5]
        semantic-desktop? (
                $(add_frameworks_dep baloo)
-               $(add_frameworks_dep kfilemetadata)
                $(add_kdeapps_dep baloo-widgets)
        )
        !semantic-desktop? (
@@ -78,10 +78,9 @@ src_configure() {
 pkg_postinst() {
        kde5_pkg_postinst
 
-       if ( ! has_version "kde-apps/ark:${SLOT}" || has_version 
"<kde-frameworks/kio-5.17.0" ); then
+       if ! has_version "kde-apps/ark:${SLOT}" ; then
                echo
-               elog "For compress/extract and other actions, please install"
-               elog "kde-apps/ark:${SLOT} and >=kde-frameworks/kio-5.17.0"
+               elog "For compress/extract and other actions, please install 
kde-apps/ark:${SLOT}"
                echo
        fi
 }