commit: 7a7a2176c23f882e4ea0b14bd61f02e7065b9243
Author: Coacher <itumaykin+gentoo <AT> gmail <DOT> com>
AuthorDate: Wed Jul 20 15:18:27 2016 +0000
Commit: Michael Palimaka <kensington <AT> gentoo <DOT> org>
CommitDate: Wed Jul 20 15:18:45 2016 +0000
URL: https://gitweb.gentoo.org/proj/kde.git/commit/?id=7a7a2176
kde-apps/konqueror: avoid installing dolphin stuff with USE="-filemanager"
Gentoo-bug: 589126
Package-Manager: portage-2.3.0
kde-apps/konqueror/konqueror-16.08.49.9999.ebuild | 4 ++--
kde-apps/konqueror/konqueror-9999.ebuild | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/kde-apps/konqueror/konqueror-16.08.49.9999.ebuild
b/kde-apps/konqueror/konqueror-16.08.49.9999.ebuild
index 9771487..fde7e07 100644
--- a/kde-apps/konqueror/konqueror-16.08.49.9999.ebuild
+++ b/kde-apps/konqueror/konqueror-16.08.49.9999.ebuild
@@ -55,8 +55,6 @@ KMEXTRACTONLY="
src_prepare() {
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
- use filemanager || cmake_comment_add_subdirectory dolphin
-
# required for dolphin
sed -e "/konq_copytomenu.h/ s/# //" \
-e "/konq_copytomenu.h/ s/ - anyone needs it?//" \
@@ -65,6 +63,8 @@ src_prepare() {
kde4-meta_src_prepare
+ use filemanager || cmake_comment_add_subdirectory dolphin
+
# Do not install *.desktop files for kfmclient
sed -e "/kfmclient\.desktop/d" -i konqueror/CMakeLists.txt \
|| die "Failed to omit .desktop files"
diff --git a/kde-apps/konqueror/konqueror-9999.ebuild
b/kde-apps/konqueror/konqueror-9999.ebuild
index 9771487..fde7e07 100644
--- a/kde-apps/konqueror/konqueror-9999.ebuild
+++ b/kde-apps/konqueror/konqueror-9999.ebuild
@@ -55,8 +55,6 @@ KMEXTRACTONLY="
src_prepare() {
[[ ${CHOST} == *-solaris* ]] && append-ldflags -lmalloc
- use filemanager || cmake_comment_add_subdirectory dolphin
-
# required for dolphin
sed -e "/konq_copytomenu.h/ s/# //" \
-e "/konq_copytomenu.h/ s/ - anyone needs it?//" \
@@ -65,6 +63,8 @@ src_prepare() {
kde4-meta_src_prepare
+ use filemanager || cmake_comment_add_subdirectory dolphin
+
# Do not install *.desktop files for kfmclient
sed -e "/kfmclient\.desktop/d" -i konqueror/CMakeLists.txt \
|| die "Failed to omit .desktop files"
