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.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id EA96515808C for ; Fri, 18 Feb 2022 03:07:10 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 245862BC003; Fri, 18 Feb 2022 03:07:10 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id E72B72BC003 for ; Fri, 18 Feb 2022 03:07:09 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id EE402343310 for ; Fri, 18 Feb 2022 03:07:04 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 108482F0 for ; Fri, 18 Feb 2022 03:07:00 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1645152812.e4c6279825a758f660237211dfcdfd83399887f4.sam@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.2.0814.ebuild app-editors/vim-core/vim-core-8.2.3428.ebuild app-editors/vim-core/vim-core-8.2.3567.ebuild app-editors/vim-core/vim-core-8.2.3582.ebuild app-editors/vim-core/vim-core-8.2.3669.ebuild app-editors/vim-core/vim-core-8.2.3741.ebuild app-editors/vim-core/vim-core-8.2.3950.ebuild app-editors/vim-core/vim-core-9999.ebuild X-VCS-Directories: app-editors/vim-core/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: e4c6279825a758f660237211dfcdfd83399887f4 X-VCS-Branch: master Date: Fri, 18 Feb 2022 03:07: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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3831fb9e-3768-4ce7-b130-75d4b12b35c9 X-Archives-Hash: ec6c42ae68112251bb25f72d1c3c53f0 commit: e4c6279825a758f660237211dfcdfd83399887f4 Author: Dongsu Park linux microsoft com> AuthorDate: Thu Jan 27 16:28:09 2022 +0000 Commit: Sam James gentoo org> CommitDate: Fri Feb 18 02:53:32 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e4c62798 app-editors/vim-core: skip installing defaults.vim when installed Do not install defaults.vim when the file is already installed from vim. This is needed for avoiding installation conflicts between vim and vim-core. Closes: https://bugs.gentoo.org/830177 Signed-off-by: Dongsu Park linux.microsoft.com> Closes: https://github.com/gentoo/gentoo/pull/23986 Signed-off-by: Sam James gentoo.org> app-editors/vim-core/vim-core-8.2.0814.ebuild | 10 +++++++--- app-editors/vim-core/vim-core-8.2.3428.ebuild | 10 +++++++--- app-editors/vim-core/vim-core-8.2.3567.ebuild | 10 +++++++--- app-editors/vim-core/vim-core-8.2.3582.ebuild | 10 +++++++--- app-editors/vim-core/vim-core-8.2.3669.ebuild | 10 +++++++--- app-editors/vim-core/vim-core-8.2.3741.ebuild | 10 +++++++--- app-editors/vim-core/vim-core-8.2.3950.ebuild | 10 +++++++--- app-editors/vim-core/vim-core-9999.ebuild | 10 +++++++--- 8 files changed, 56 insertions(+), 24 deletions(-) diff --git a/app-editors/vim-core/vim-core-8.2.0814.ebuild b/app-editors/vim-core/vim-core-8.2.0814.ebuild index 5c1fb6f93cb3..7fd58e8567b7 100644 --- a/app-editors/vim-core/vim-core-8.2.0814.ebuild +++ b/app-editors/vim-core/vim-core-8.2.0814.ebuild @@ -191,9 +191,6 @@ src_install() { rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" - # Delete defaults.vim to avoid conflicts with one from vim[minimal] - rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" - local keep_colors="default" ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) @@ -208,6 +205,13 @@ src_install() { eshopts_pop fi + # Delete defaults.vim to avoid conflicts with one from vim. + # If defaults.vim already exists in files installed from vim, + # do not install defaults.vim. + if [[ -f "${vimfiles}/defaults.vim" ]]; then + rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" + fi + newbashcomp "${FILESDIR}"/xxd-completion xxd # install gvim icon since both vim/gvim desktop files reference it diff --git a/app-editors/vim-core/vim-core-8.2.3428.ebuild b/app-editors/vim-core/vim-core-8.2.3428.ebuild index 40e298a032ae..21bbbbce3423 100644 --- a/app-editors/vim-core/vim-core-8.2.3428.ebuild +++ b/app-editors/vim-core/vim-core-8.2.3428.ebuild @@ -193,9 +193,6 @@ src_install() { rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" - # Delete defaults.vim to avoid conflicts with one from vim[minimal] - rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" - local keep_colors="default" ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) @@ -210,6 +207,13 @@ src_install() { eshopts_pop fi + # Delete defaults.vim to avoid conflicts with one from vim. + # If defaults.vim already exists in files installed from vim, + # do not install defaults.vim. + if [[ -f "${vimfiles}/defaults.vim" ]]; then + rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" + fi + newbashcomp "${FILESDIR}"/xxd-completion xxd # install gvim icon since both vim/gvim desktop files reference it diff --git a/app-editors/vim-core/vim-core-8.2.3567.ebuild b/app-editors/vim-core/vim-core-8.2.3567.ebuild index a6ac59db33c3..7d7083d927f6 100644 --- a/app-editors/vim-core/vim-core-8.2.3567.ebuild +++ b/app-editors/vim-core/vim-core-8.2.3567.ebuild @@ -193,9 +193,6 @@ src_install() { rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" - # Delete defaults.vim to avoid conflicts with one from vim[minimal] - rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" - local keep_colors="default" ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) @@ -210,6 +207,13 @@ src_install() { eshopts_pop fi + # Delete defaults.vim to avoid conflicts with one from vim. + # If defaults.vim already exists in files installed from vim, + # do not install defaults.vim. + if [[ -f "${vimfiles}/defaults.vim" ]]; then + rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" + fi + newbashcomp "${FILESDIR}"/xxd-completion xxd # install gvim icon since both vim/gvim desktop files reference it diff --git a/app-editors/vim-core/vim-core-8.2.3582.ebuild b/app-editors/vim-core/vim-core-8.2.3582.ebuild index d04960a41e81..959733ef0bfe 100644 --- a/app-editors/vim-core/vim-core-8.2.3582.ebuild +++ b/app-editors/vim-core/vim-core-8.2.3582.ebuild @@ -193,9 +193,6 @@ src_install() { rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" - # Delete defaults.vim to avoid conflicts with one from vim[minimal] - rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" - local keep_colors="default" ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) @@ -210,6 +207,13 @@ src_install() { eshopts_pop fi + # Delete defaults.vim to avoid conflicts with one from vim. + # If defaults.vim already exists in files installed from vim, + # do not install defaults.vim. + if [[ -f "${vimfiles}/defaults.vim" ]]; then + rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" + fi + newbashcomp "${FILESDIR}"/xxd-completion xxd # install gvim icon since both vim/gvim desktop files reference it diff --git a/app-editors/vim-core/vim-core-8.2.3669.ebuild b/app-editors/vim-core/vim-core-8.2.3669.ebuild index a6ac59db33c3..7d7083d927f6 100644 --- a/app-editors/vim-core/vim-core-8.2.3669.ebuild +++ b/app-editors/vim-core/vim-core-8.2.3669.ebuild @@ -193,9 +193,6 @@ src_install() { rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" - # Delete defaults.vim to avoid conflicts with one from vim[minimal] - rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" - local keep_colors="default" ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) @@ -210,6 +207,13 @@ src_install() { eshopts_pop fi + # Delete defaults.vim to avoid conflicts with one from vim. + # If defaults.vim already exists in files installed from vim, + # do not install defaults.vim. + if [[ -f "${vimfiles}/defaults.vim" ]]; then + rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" + fi + newbashcomp "${FILESDIR}"/xxd-completion xxd # install gvim icon since both vim/gvim desktop files reference it diff --git a/app-editors/vim-core/vim-core-8.2.3741.ebuild b/app-editors/vim-core/vim-core-8.2.3741.ebuild index 9ce1dc4f86db..2396c7131d36 100644 --- a/app-editors/vim-core/vim-core-8.2.3741.ebuild +++ b/app-editors/vim-core/vim-core-8.2.3741.ebuild @@ -193,9 +193,6 @@ src_install() { rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" - # Delete defaults.vim to avoid conflicts with one from vim[minimal] - rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" - local keep_colors="default" ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) @@ -210,6 +207,13 @@ src_install() { eshopts_pop fi + # Delete defaults.vim to avoid conflicts with one from vim. + # If defaults.vim already exists in files installed from vim, + # do not install defaults.vim. + if [[ -f "${vimfiles}/defaults.vim" ]]; then + rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" + fi + newbashcomp "${FILESDIR}"/xxd-completion xxd # install gvim icon since both vim/gvim desktop files reference it diff --git a/app-editors/vim-core/vim-core-8.2.3950.ebuild b/app-editors/vim-core/vim-core-8.2.3950.ebuild index bfac57e4caa8..eda637ba36f0 100644 --- a/app-editors/vim-core/vim-core-8.2.3950.ebuild +++ b/app-editors/vim-core/vim-core-8.2.3950.ebuild @@ -193,9 +193,6 @@ src_install() { rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" - # Delete defaults.vim to avoid conflicts with one from vim[minimal] - rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" - local keep_colors="default" ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) @@ -210,6 +207,13 @@ src_install() { eshopts_pop fi + # Delete defaults.vim to avoid conflicts with one from vim. + # If defaults.vim already exists in files installed from vim, + # do not install defaults.vim. + if [[ -f "${vimfiles}/defaults.vim" ]]; then + rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" + fi + newbashcomp "${FILESDIR}"/xxd-completion xxd # install gvim icon since both vim/gvim desktop files reference it diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild index a6ac59db33c3..7d7083d927f6 100644 --- a/app-editors/vim-core/vim-core-9999.ebuild +++ b/app-editors/vim-core/vim-core-9999.ebuild @@ -193,9 +193,6 @@ src_install() { rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" - # Delete defaults.vim to avoid conflicts with one from vim[minimal] - rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" - local keep_colors="default" ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) @@ -210,6 +207,13 @@ src_install() { eshopts_pop fi + # Delete defaults.vim to avoid conflicts with one from vim. + # If defaults.vim already exists in files installed from vim, + # do not install defaults.vim. + if [[ -f "${vimfiles}/defaults.vim" ]]; then + rm -v "${ED}${vimfiles}"/defaults.vim || die "rm failed" + fi + newbashcomp "${FILESDIR}"/xxd-completion xxd # install gvim icon since both vim/gvim desktop files reference it