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 384EB139694 for ; Mon, 17 Apr 2017 11:53:05 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 8248FE0CF3; Mon, 17 Apr 2017 11:53:03 +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 5AC50E0CE9 for ; Mon, 17 Apr 2017 11:53:03 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 267B9340AC7 for ; Mon, 17 Apr 2017 11:53:02 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 8A69D7419 for ; Mon, 17 Apr 2017 11:53:00 +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: <1492429964.c1cc5f76f0bbb3721a82b249165af594d079de62.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 kde-apps/konqueror/konqueror-16.08.3.ebuild X-VCS-Directories: kde-apps/konqueror/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: c1cc5f76f0bbb3721a82b249165af594d079de62 X-VCS-Branch: master Date: Mon, 17 Apr 2017 11:53:00 +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: 7f9cc07c-4c8a-4f77-918c-bab7886f337f X-Archives-Hash: c2714fdf6afff957c1a73d8e7cead3eb commit: c1cc5f76f0bbb3721a82b249165af594d079de62 Author: Andreas Sturmlechner gentoo org> AuthorDate: Mon Apr 17 11:30:47 2017 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Mon Apr 17 11:52:44 2017 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1cc5f76 kde-apps/konqueror: Allow all slots of kde-apps/k{editbookmarks,find} Fix file collision with kde-apps/keditbookmarks:5 Package-Manager: Portage-2.3.3, Repoman-2.3.1 Closes: https://github.com/gentoo/gentoo/pull/4435 .../{konqueror-16.08.3.ebuild => konqueror-16.08.3-r1.ebuild} | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/kde-apps/konqueror/konqueror-16.08.3.ebuild b/kde-apps/konqueror/konqueror-16.08.3-r1.ebuild similarity index 90% rename from kde-apps/konqueror/konqueror-16.08.3.ebuild rename to kde-apps/konqueror/konqueror-16.08.3-r1.ebuild index a554744e689..eb82291baf4 100644 --- a/kde-apps/konqueror/konqueror-16.08.3.ebuild +++ b/kde-apps/konqueror/konqueror-16.08.3-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2016 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -27,13 +27,12 @@ DEPEND=" # bug #544630: evince[nsplugin] crashes konqueror RDEPEND="${DEPEND} - $(add_kdeapps_dep kfind) + kde-apps/kfind:* $(add_kdeapps_dep kfmclient) $(add_kdeapps_dep kurifilter-plugins) - bookmarks? ( $(add_kdeapps_dep keditbookmarks) ) + bookmarks? ( kde-apps/keditbookmarks:* ) filemanager? ( $(add_kdeapps_dep kdebase-kioslaves) - $(add_kdeapps_dep kfind) $(add_kdeapps_dep konsolepart) !kde-apps/dolphin:4 ) @@ -63,6 +62,9 @@ src_prepare() { kde4-meta_src_prepare + # Avoid doc file collisions + sed -e "/man-kbookmarkmerger/d" -i doc/konqueror/CMakeLists.txt || die + use filemanager || cmake_comment_add_subdirectory dolphin # Do not install *.desktop files for kfmclient