summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCoacher <itumaykin+gentoo@gmail.com>2016-07-21 01:18:27 +1000
committerMichael Palimaka <kensington@gentoo.org>2016-07-21 01:18:45 +1000
commit7a7a2176c23f882e4ea0b14bd61f02e7065b9243 (patch)
treefe247948ad8706bce8964101c0620cb6f184341c
parent8eafc636199c88864d8c254eb79c27b9ae944ff0 (diff)
downloadkde-7a7a2176c23f882e4ea0b14bd61f02e7065b9243.tar.gz
kde-7a7a2176c23f882e4ea0b14bd61f02e7065b9243.tar.bz2
kde-7a7a2176c23f882e4ea0b14bd61f02e7065b9243.zip
kde-apps/konqueror: avoid installing dolphin stuff with USE="-filemanager"
Gentoo-bug: 589126 Package-Manager: portage-2.3.0
-rw-r--r--kde-apps/konqueror/konqueror-16.08.49.9999.ebuild4
-rw-r--r--kde-apps/konqueror/konqueror-9999.ebuild4
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 9771487e61a..fde7e07dd8e 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 9771487e61a..fde7e07dd8e 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"