| 1 |
commit: 95cd09d47a77be8667dbf1d535a86ffdc151ffdf |
| 2 |
Author: Andreas Sturmlechner <andreas.sturmlechner <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Wed Aug 3 17:55:12 2016 +0000 |
| 4 |
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Thu Aug 4 12:27:55 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=95cd09d4 |
| 7 |
|
| 8 |
kde-apps/konqueror: Add block against kde-apps/kfmclient:4 |
| 9 |
|
| 10 |
Package-Manager: portage-2.2.28 |
| 11 |
|
| 12 |
kde-apps/konqueror/konqueror-9999.ebuild | 3 ++- |
| 13 |
1 file changed, 2 insertions(+), 1 deletion(-) |
| 14 |
|
| 15 |
diff --git a/kde-apps/konqueror/konqueror-9999.ebuild b/kde-apps/konqueror/konqueror-9999.ebuild |
| 16 |
index 2f11bde..cb3ab5c 100644 |
| 17 |
--- a/kde-apps/konqueror/konqueror-9999.ebuild |
| 18 |
+++ b/kde-apps/konqueror/konqueror-9999.ebuild |
| 19 |
@@ -51,6 +51,7 @@ DEPEND=" |
| 20 |
" |
| 21 |
RDEPEND="${DEPEND} |
| 22 |
$(add_kdeapps_dep kfind) |
| 23 |
+ !kde-apps/kfmclient:4 |
| 24 |
" |
| 25 |
|
| 26 |
S="${S}/${PN}" |
| 27 |
@@ -58,7 +59,7 @@ S="${S}/${PN}" |
| 28 |
src_prepare() { |
| 29 |
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc |
| 30 |
|
| 31 |
- mv ../doc "${S}" || die |
| 32 |
+ mv ../doc/${PN} "${S}"/doc || die |
| 33 |
echo "add_subdirectory( doc )" >> CMakeLists.txt || die |
| 34 |
|
| 35 |
kde5_src_prepare |
Archives