From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7D334139694 for ; Tue, 18 Apr 2017 23:10:28 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C490221C075; Tue, 18 Apr 2017 23:10:26 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 9D06121C075 for ; Tue, 18 Apr 2017 23:10:26 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 4232034167A for ; Tue, 18 Apr 2017 23:10:25 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id BF94C72DA for ; Tue, 18 Apr 2017 23:10:22 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1492557003.46a35772d660b729825d0d60d4a944bc40ba1b14.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/konqueror/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-apps/konqueror/konqueror-16.08.3-r1.ebuild X-VCS-Directories: kde-apps/konqueror/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: 46a35772d660b729825d0d60d4a944bc40ba1b14 X-VCS-Branch: master Date: Tue, 18 Apr 2017 23:10:22 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 5060d62c-4058-4b09-8193-07590f57e83f X-Archives-Hash: f0b5231599485ebdba1b53db6e77dff9 commit: 46a35772d660b729825d0d60d4a944bc40ba1b14 Author: Andreas Sturmlechner gentoo org> AuthorDate: Tue Apr 18 23:09:26 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Apr 18 23:10:03 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46a35772 kde-apps/konqueror: Fix USE=-handbook Reported-by: Coacher gmail.com> Gentoo-bug: 615960 Package-Manager: Portage-2.3.3, Repoman-2.3.1 kde-apps/konqueror/konqueror-16.08.3-r1.ebuild | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/kde-apps/konqueror/konqueror-16.08.3-r1.ebuild b/kde-apps/konqueror/konqueror-16.08.3-r1.ebuild index eb82291baf4..b2a1a5b7595 100644 --- a/kde-apps/konqueror/konqueror-16.08.3-r1.ebuild +++ b/kde-apps/konqueror/konqueror-16.08.3-r1.ebuild @@ -62,8 +62,10 @@ src_prepare() { kde4-meta_src_prepare - # Avoid doc file collisions - sed -e "/man-kbookmarkmerger/d" -i doc/konqueror/CMakeLists.txt || die + # Avoid doc file collisions with kde-apps/keditbookmarks:5 + if use handbook; then + sed -e "/man-kbookmarkmerger/d" -i doc/konqueror/CMakeLists.txt || die + fi use filemanager || cmake_comment_add_subdirectory dolphin