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

[Johannes Huber]

commit:     9607b2621a82f994a5cc5ce09449155535438ffc
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Mon Jul 27 08:57:09 2015 +0000
Commit:     Johannes Huber <johu <AT> gentoo <DOT> org>
CommitDate: Mon Jul 27 17:50:14 2015 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=9607b262

[kde-apps/dolphin] Remove RDEPEND on unreleased libkonq

Fixes conflict w/ other kde4-based packages in 15.08

Package-Manager: portage-2.2.20

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

diff --git a/kde-apps/dolphin/dolphin-15.08.49.9999.ebuild 
b/kde-apps/dolphin/dolphin-15.08.49.9999.ebuild
index a2c584e..5d044ac 100644
--- a/kde-apps/dolphin/dolphin-15.08.49.9999.ebuild
+++ b/kde-apps/dolphin/dolphin-15.08.49.9999.ebuild
@@ -52,7 +52,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
        $(add_kdeapps_dep kio-extras)
-       $(add_kdeapps_dep libkonq '' 5.9999)
        thumbnail? (
                $(add_kdeapps_dep ffmpegthumbs '' 5.9999)
                $(add_kdeapps_dep thumbnailers '' 5.9999)
@@ -70,3 +69,13 @@ src_configure() {
 
        kde5_src_configure
 }
+
+pkg_postinst() {
+       kde5_pkg_postinst
+
+       if ( ! has_version kde-apps/ark:${SLOT} || ! has_version 
kde-apps/libkonq:${SLOT} ); then
+               echo
+               elog "For compress/extract actions, please install 
kde-apps/ark:${SLOT} and kde-apps/libkonq:${SLOT}"
+               echo
+       fi
+}

diff --git a/kde-apps/dolphin/dolphin-9999.ebuild 
b/kde-apps/dolphin/dolphin-9999.ebuild
index a2c584e..5d044ac 100644
--- a/kde-apps/dolphin/dolphin-9999.ebuild
+++ b/kde-apps/dolphin/dolphin-9999.ebuild
@@ -52,7 +52,6 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
        $(add_kdeapps_dep kio-extras)
-       $(add_kdeapps_dep libkonq '' 5.9999)
        thumbnail? (
                $(add_kdeapps_dep ffmpegthumbs '' 5.9999)
                $(add_kdeapps_dep thumbnailers '' 5.9999)
@@ -70,3 +69,13 @@ src_configure() {
 
        kde5_src_configure
 }
+
+pkg_postinst() {
+       kde5_pkg_postinst
+
+       if ( ! has_version kde-apps/ark:${SLOT} || ! has_version 
kde-apps/libkonq:${SLOT} ); then
+               echo
+               elog "For compress/extract actions, please install 
kde-apps/ark:${SLOT} and kde-apps/libkonq:${SLOT}"
+               echo
+       fi
+}