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

[Michael Palimaka]

commit:     95cd09d47a77be8667dbf1d535a86ffdc151ffdf
Author:     Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com>
AuthorDate: Wed Aug  3 17:55:12 2016 +0000
Commit:     Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Thu Aug  4 12:27:55 2016 +0000
URL:        https://gitweb.gentoo.org/proj/kde.git/commit/?id=95cd09d4

kde-apps/konqueror: Add block against kde-apps/kfmclient:4

Package-Manager: portage-2.2.28

 kde-apps/konqueror/konqueror-9999.ebuild | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/kde-apps/konqueror/konqueror-9999.ebuild 
b/kde-apps/konqueror/konqueror-9999.ebuild
index 2f11bde..cb3ab5c 100644
--- a/kde-apps/konqueror/konqueror-9999.ebuild
+++ b/kde-apps/konqueror/konqueror-9999.ebuild
@@ -51,6 +51,7 @@ DEPEND="
 "
 RDEPEND="${DEPEND}
        $(add_kdeapps_dep kfind)
+       !kde-apps/kfmclient:4
 "
 
 S="${S}/${PN}"
@@ -58,7 +59,7 @@ S="${S}/${PN}"
 src_prepare() {
        [[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
 
-       mv ../doc "${S}" || die
+       mv ../doc/${PN} "${S}"/doc || die
        echo "add_subdirectory( doc )" >> CMakeLists.txt || die
 
        kde5_src_prepare