Gentoo Archives: gentoo-commits

From: Andreas Sturmlechner <asturm@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/
Date: Tue, 18 Apr 2017 23:10:28
Message-Id: 1492557003.46a35772d660b729825d0d60d4a944bc40ba1b14.asturm@gentoo
1 commit: 46a35772d660b729825d0d60d4a944bc40ba1b14
2 Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
3 AuthorDate: Tue Apr 18 23:09:26 2017 +0000
4 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
5 CommitDate: Tue Apr 18 23:10:03 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46a35772
7
8 kde-apps/konqueror: Fix USE=-handbook
9
10 Reported-by: Coacher <itumaykin+gentoo <AT> gmail.com>
11 Gentoo-bug: 615960
12
13 Package-Manager: Portage-2.3.3, Repoman-2.3.1
14
15 kde-apps/konqueror/konqueror-16.08.3-r1.ebuild | 6 ++++--
16 1 file changed, 4 insertions(+), 2 deletions(-)
17
18 diff --git a/kde-apps/konqueror/konqueror-16.08.3-r1.ebuild b/kde-apps/konqueror/konqueror-16.08.3-r1.ebuild
19 index eb82291baf4..b2a1a5b7595 100644
20 --- a/kde-apps/konqueror/konqueror-16.08.3-r1.ebuild
21 +++ b/kde-apps/konqueror/konqueror-16.08.3-r1.ebuild
22 @@ -62,8 +62,10 @@ src_prepare() {
23
24 kde4-meta_src_prepare
25
26 - # Avoid doc file collisions
27 - sed -e "/man-kbookmarkmerger/d" -i doc/konqueror/CMakeLists.txt || die
28 + # Avoid doc file collisions with kde-apps/keditbookmarks:5
29 + if use handbook; then
30 + sed -e "/man-kbookmarkmerger/d" -i doc/konqueror/CMakeLists.txt || die
31 + fi
32
33 use filemanager || cmake_comment_add_subdirectory dolphin