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 CDB591382C5 for ; Sun, 6 Dec 2020 22:46:26 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id E1D89E0AC2; Sun, 6 Dec 2020 22:46:25 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 B7816E0AC2 for ; Sun, 6 Dec 2020 22:46:25 +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 68724340B66 for ; Sun, 6 Dec 2020 22:46:24 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D10903F6 for ; Sun, 6 Dec 2020 22:46:22 +0000 (UTC) From: "Patrice Clement" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Patrice Clement" Message-ID: <1607294757.3f89cb507efa8acfcfdec5b90ba17aca85bbdd44.monsieurp@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/vim/ X-VCS-Repository: repo/gentoo X-VCS-Files: app-editors/vim/vim-8.2.0360.ebuild app-editors/vim/vim-8.2.0508.ebuild app-editors/vim/vim-8.2.0638.ebuild app-editors/vim/vim-8.2.0814.ebuild app-editors/vim/vim-9999.ebuild X-VCS-Directories: app-editors/vim/ X-VCS-Committer: monsieurp X-VCS-Committer-Name: Patrice Clement X-VCS-Revision: 3f89cb507efa8acfcfdec5b90ba17aca85bbdd44 X-VCS-Branch: master Date: Sun, 6 Dec 2020 22:46: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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 812bd9ed-8f11-4bdc-818f-d41ee5ce50a8 X-Archives-Hash: e6f954967aad9259e629cd99a2d56c03 commit: 3f89cb507efa8acfcfdec5b90ba17aca85bbdd44 Author: Dongsu Park kinvolk io> AuthorDate: Fri Dec 4 09:30:37 2020 +0000 Commit: Patrice Clement gentoo org> CommitDate: Sun Dec 6 22:45:57 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f89cb50 app-editors/vim: do not create symlink vimdiff for minimal. A symlink `vimdiff` should not be created, if the USE flag `minimal` is enabled. Otherwise running `vimdiff` results in failure like that: $ vimdiff aaa bbb This Vim was not compiled with the diff feature. Signed-off-by: Dongsu Park kinvolk.io> Signed-off-by: Patrice Clement gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/18496 app-editors/vim/vim-8.2.0360.ebuild | 4 +++- app-editors/vim/vim-8.2.0508.ebuild | 4 +++- app-editors/vim/vim-8.2.0638.ebuild | 4 +++- app-editors/vim/vim-8.2.0814.ebuild | 4 +++- app-editors/vim/vim-9999.ebuild | 4 +++- 5 files changed, 15 insertions(+), 5 deletions(-) diff --git a/app-editors/vim/vim-8.2.0360.ebuild b/app-editors/vim/vim-8.2.0360.ebuild index d80d7777de3..8a757434c46 100644 --- a/app-editors/vim/vim-8.2.0360.ebuild +++ b/app-editors/vim/vim-8.2.0360.ebuild @@ -276,7 +276,9 @@ src_install() { # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are # managed by eselect-vi dobin src/vim - dosym vim /usr/bin/vimdiff + if ! use minimal ; then + dosym vim /usr/bin/vimdiff + fi dosym vim /usr/bin/rvim dosym vim /usr/bin/rview if use vim-pager ; then diff --git a/app-editors/vim/vim-8.2.0508.ebuild b/app-editors/vim/vim-8.2.0508.ebuild index 5bc04c0d2b0..37285363833 100644 --- a/app-editors/vim/vim-8.2.0508.ebuild +++ b/app-editors/vim/vim-8.2.0508.ebuild @@ -276,7 +276,9 @@ src_install() { # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are # managed by eselect-vi dobin src/vim - dosym vim /usr/bin/vimdiff + if ! use minimal ; then + dosym vim /usr/bin/vimdiff + fi dosym vim /usr/bin/rvim dosym vim /usr/bin/rview if use vim-pager ; then diff --git a/app-editors/vim/vim-8.2.0638.ebuild b/app-editors/vim/vim-8.2.0638.ebuild index 5bc04c0d2b0..37285363833 100644 --- a/app-editors/vim/vim-8.2.0638.ebuild +++ b/app-editors/vim/vim-8.2.0638.ebuild @@ -276,7 +276,9 @@ src_install() { # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are # managed by eselect-vi dobin src/vim - dosym vim /usr/bin/vimdiff + if ! use minimal ; then + dosym vim /usr/bin/vimdiff + fi dosym vim /usr/bin/rvim dosym vim /usr/bin/rview if use vim-pager ; then diff --git a/app-editors/vim/vim-8.2.0814.ebuild b/app-editors/vim/vim-8.2.0814.ebuild index 7becfb7071c..946d309a7f6 100644 --- a/app-editors/vim/vim-8.2.0814.ebuild +++ b/app-editors/vim/vim-8.2.0814.ebuild @@ -276,7 +276,9 @@ src_install() { # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are # managed by eselect-vi dobin src/vim - dosym vim /usr/bin/vimdiff + if ! use minimal ; then + dosym vim /usr/bin/vimdiff + fi dosym vim /usr/bin/rvim dosym vim /usr/bin/rview if use vim-pager ; then diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild index 5bc04c0d2b0..37285363833 100644 --- a/app-editors/vim/vim-9999.ebuild +++ b/app-editors/vim/vim-9999.ebuild @@ -276,7 +276,9 @@ src_install() { # Note: Do not install symlinks for 'vi', 'ex', or 'view', as these are # managed by eselect-vi dobin src/vim - dosym vim /usr/bin/vimdiff + if ! use minimal ; then + dosym vim /usr/bin/vimdiff + fi dosym vim /usr/bin/rvim dosym vim /usr/bin/rview if use vim-pager ; then