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 71C6C138334 for ; Fri, 28 Dec 2018 22:25:38 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 526F2E07F0; Fri, 28 Dec 2018 22:25:37 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 179BFE07F0 for ; Fri, 28 Dec 2018 22:25:36 +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 05F50335C77 for ; Fri, 28 Dec 2018 22:25:35 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 5018A42F for ; Fri, 28 Dec 2018 22:25:32 +0000 (UTC) From: "Tim Harder" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Tim Harder" Message-ID: <1546035848.e248f9bbf5563be7d6185fd146db364df83a9988.radhermit@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/vim-core/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/vim-core/vim-core-8.1.0648.ebuild app-editors/vim-core/vim-core-9999.ebuild X-VCS-Directories: app-editors/vim-core/ X-VCS-Committer: radhermit X-VCS-Committer-Name: Tim Harder X-VCS-Revision: e248f9bbf5563be7d6185fd146db364df83a9988 X-VCS-Branch: master Date: Fri, 28 Dec 2018 22:25:32 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 2f6e55b5-eab2-41f3-91ee-b6ac99a6c161 X-Archives-Hash: 7b8da33d9090ad8df18492d4d764edde commit: e248f9bbf5563be7d6185fd146db364df83a9988 Author: Tim Harder gentoo org> AuthorDate: Fri Dec 28 22:14:22 2018 +0000 Commit: Tim Harder gentoo org> CommitDate: Fri Dec 28 22:24:08 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e248f9bb app-editors/vim-core: avoid icon file collision with gvim And update icon cache. Closes: https://bugs.gentoo.org/673926 Signed-off-by: Tim Harder gentoo.org> app-editors/vim-core/vim-core-8.1.0648.ebuild | 12 ++++++++++-- app-editors/vim-core/vim-core-9999.ebuild | 12 ++++++++++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/app-editors/vim-core/vim-core-8.1.0648.ebuild b/app-editors/vim-core/vim-core-8.1.0648.ebuild index 3c18feca903..1aeb3a66d54 100644 --- a/app-editors/vim-core/vim-core-8.1.0648.ebuild +++ b/app-editors/vim-core/vim-core-8.1.0648.ebuild @@ -3,7 +3,7 @@ EAPI=6 VIM_VERSION="8.1" -inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop +inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop gnome2-utils if [[ ${PV} == 9999* ]] ; then inherit git-r3 @@ -23,6 +23,8 @@ LICENSE="vim" IUSE="nls acl minimal" DEPEND="sys-devel/autoconf" +# avoid icon file collision bug #673880 +RDEPEND="!!