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) server-digest SHA256) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 94EF2158094 for ; Wed, 27 Jul 2022 22:06:17 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id BA5D3E10C9; Wed, 27 Jul 2022 22:06:16 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 93EA2E10C9 for ; Wed, 27 Jul 2022 22:06:16 +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) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7D668340F0F for ; Wed, 27 Jul 2022 22:06:15 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id D04CE545 for ; Wed, 27 Jul 2022 22:06:13 +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: <1658959025.5e9a3926fd3e0e573f529fd6aefebba53e082f4a.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.4586.ebuild app-editors/vim-core/vim-core-8.2.5066-r2.ebuild app-editors/vim-core/vim-core-9.0.0049-r1.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: 5e9a3926fd3e0e573f529fd6aefebba53e082f4a X-VCS-Branch: master Date: Wed, 27 Jul 2022 22:06:13 +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: 42677706-eb3f-4eb2-81fa-7a1a4ae2df64 X-Archives-Hash: a1c3831ca9acc4f501509075974fa132 commit: 5e9a3926fd3e0e573f529fd6aefebba53e082f4a Author: Sam James gentoo org> AuthorDate: Wed Jul 27 21:48:31 2022 +0000 Commit: Sam James gentoo org> CommitDate: Wed Jul 27 21:57:05 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5e9a3926 app-editors/vim-core: fix incorrect conditional use of extglob bash-5.2 is stricter with this and upstream say this was never supposed to work (and indeed may have done odd things at runtime anyway). We're going to have to avoid any conditional use of extglob like this as the parser has no idea if we've enabled extglob or not at the point it runs. Fixes a sourcing error: ``` vim-core-9999.ebuild: line 195: syntax error near unexpected token `(' vim-core-9999.ebuild: line 195: ` ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim )' ``` Thanks-to: tirnanog (mangled his suggestion in this commit) Thanks-to: Ionen Wolkens gentoo.org> Signed-off-by: Sam James gentoo.org> app-editors/vim-core/vim-core-8.2.4586.ebuild | 34 +++++++++++------------ app-editors/vim-core/vim-core-8.2.5066-r2.ebuild | 35 +++++++++++------------- app-editors/vim-core/vim-core-9.0.0049-r1.ebuild | 35 +++++++++++------------- app-editors/vim-core/vim-core-9999.ebuild | 35 +++++++++++------------- 4 files changed, 65 insertions(+), 74 deletions(-) diff --git a/app-editors/vim-core/vim-core-8.2.4586.ebuild b/app-editors/vim-core/vim-core-8.2.4586.ebuild index 0d7a502efa63..ab6f035d555a 100644 --- a/app-editors/vim-core/vim-core-8.2.4586.ebuild +++ b/app-editors/vim-core/vim-core-8.2.4586.ebuild @@ -6,7 +6,7 @@ EAPI=7 # Please bump with app-editors/vim and app-editors/gvim VIM_VERSION="8.2" -inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils +inherit vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils if [[ ${PV} == 9999* ]] ; then inherit git-r3 @@ -188,24 +188,24 @@ src_install() { if use minimal; then # To save space, install only a subset of the files. # Helps minimalize the livecd, bug 65144. - eshopts_push -s extglob - - rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed" - rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" - rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" - - local keep_colors="default" - ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) - - local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig" - # tinkering with the next line might make bad things happen ... - keep_syntax="${keep_syntax}|syntax|nosyntax|synload" - ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) + rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die + rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die + rm -v "${ED}"/usr/bin/vimtutor || die + + for f in "${ED}${vimfiles}"/colors/*.vim; do + if [[ ${f} != */@(default).vim ]] ; then + printf '%s\0' "${f}" + fi + done | xargs -0 rm -f || die + + for f in "${ED}${vimfiles}"/syntax/*.vim; do + if [[ ${f} != */@(conf|crontab|fstab|inittab|resolv|sshdconfig|syntax|nosyntax|synload).vim ]] ; then + printf '%s\0' "${f}" + fi + done | xargs -0 rm -f || die # Delete skip_defaults_vim config not supported by vim[minimal] - sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed" - - eshopts_pop + sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die fi newbashcomp "${FILESDIR}"/xxd-completion xxd diff --git a/app-editors/vim-core/vim-core-8.2.5066-r2.ebuild b/app-editors/vim-core/vim-core-8.2.5066-r2.ebuild index a9c02a3dfc36..c11d467f2a5a 100644 --- a/app-editors/vim-core/vim-core-8.2.5066-r2.ebuild +++ b/app-editors/vim-core/vim-core-8.2.5066-r2.ebuild @@ -6,7 +6,7 @@ EAPI=8 # Please bump with app-editors/vim and app-editors/gvim VIM_VERSION="8.2" -inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils +inherit vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils if [[ ${PV} == 9999* ]] ; then inherit git-r3 @@ -189,24 +189,21 @@ src_install() { if use minimal; then # To save space, install only a subset of the files. # Helps minimalize the livecd, bug 65144. - eshopts_push -s extglob - - rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed" - rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" - rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" - - local keep_colors="default" - ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) - - local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig" - # tinkering with the next line might make bad things happen ... - keep_syntax="${keep_syntax}|syntax|nosyntax|synload" - ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) - - # Delete skip_defaults_vim config not supported by vim[minimal] - sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed" - - eshopts_pop + rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die + rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die + rm -v "${ED}"/usr/bin/vimtutor || die + + for f in "${ED}${vimfiles}"/colors/*.vim; do + if [[ ${f} != */@(default).vim ]] ; then + printf '%s\0' "${f}" + fi + done | xargs -0 rm -f || die + + for f in "${ED}${vimfiles}"/syntax/*.vim; do + if [[ ${f} != */@(conf|crontab|fstab|inittab|resolv|sshdconfig|syntax|nosyntax|synload).vim ]] ; then + printf '%s\0' "${f}" + fi + done | xargs -0 rm -f || die fi newbashcomp "${FILESDIR}"/xxd-completion xxd diff --git a/app-editors/vim-core/vim-core-9.0.0049-r1.ebuild b/app-editors/vim-core/vim-core-9.0.0049-r1.ebuild index e808fd2a2495..555b9e91b8db 100644 --- a/app-editors/vim-core/vim-core-9.0.0049-r1.ebuild +++ b/app-editors/vim-core/vim-core-9.0.0049-r1.ebuild @@ -6,7 +6,7 @@ EAPI=8 # Please bump with app-editors/vim and app-editors/gvim VIM_VERSION="9.0" -inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils +inherit vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils if [[ ${PV} == 9999* ]] ; then inherit git-r3 @@ -185,24 +185,21 @@ src_install() { if use minimal; then # To save space, install only a subset of the files. # Helps minimalize the livecd, bug 65144. - eshopts_push -s extglob - - rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed" - rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" - rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" - - local keep_colors="default" - ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) - - local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig" - # tinkering with the next line might make bad things happen ... - keep_syntax="${keep_syntax}|syntax|nosyntax|synload" - ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) - - # Delete skip_defaults_vim config not supported by vim[minimal] - sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed" - - eshopts_pop + rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die + rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die + rm -v "${ED}"/usr/bin/vimtutor || die + + for f in "${ED}${vimfiles}"/colors/*.vim; do + if [[ ${f} != */@(default).vim ]] ; then + printf '%s\0' "${f}" + fi + done | xargs -0 rm -f || die + + for f in "${ED}${vimfiles}"/syntax/*.vim; do + if [[ ${f} != */@(conf|crontab|fstab|inittab|resolv|sshdconfig|syntax|nosyntax|synload).vim ]] ; then + printf '%s\0' "${f}" + fi + done | xargs -0 rm -f || die fi newbashcomp "${FILESDIR}"/xxd-completion xxd diff --git a/app-editors/vim-core/vim-core-9999.ebuild b/app-editors/vim-core/vim-core-9999.ebuild index e808fd2a2495..555b9e91b8db 100644 --- a/app-editors/vim-core/vim-core-9999.ebuild +++ b/app-editors/vim-core/vim-core-9999.ebuild @@ -6,7 +6,7 @@ EAPI=8 # Please bump with app-editors/vim and app-editors/gvim VIM_VERSION="9.0" -inherit estack vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils +inherit vim-doc flag-o-matic bash-completion-r1 prefix desktop xdg-utils if [[ ${PV} == 9999* ]] ; then inherit git-r3 @@ -185,24 +185,21 @@ src_install() { if use minimal; then # To save space, install only a subset of the files. # Helps minimalize the livecd, bug 65144. - eshopts_push -s extglob - - rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die "rm failed" - rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die "rm failed" - rm -v "${ED}"/usr/bin/vimtutor || die "rm failed" - - local keep_colors="default" - ignore=$(rm -fr "${ED}${vimfiles}"/colors/!(${keep_colors}).vim ) - - local keep_syntax="conf|crontab|fstab|inittab|resolv|sshdconfig" - # tinkering with the next line might make bad things happen ... - keep_syntax="${keep_syntax}|syntax|nosyntax|synload" - ignore=$(rm -fr "${ED}${vimfiles}"/syntax/!(${keep_syntax}).vim ) - - # Delete skip_defaults_vim config not supported by vim[minimal] - sed -i '/skip_defaults_vim/d' "${ED}"/etc/vim/vimrc || die "sed failed" - - eshopts_pop + rm -rv "${ED}${vimfiles}"/{compiler,doc,ftplugin,indent} || die + rm -rv "${ED}${vimfiles}"/{macros,print,tools,tutor} || die + rm -v "${ED}"/usr/bin/vimtutor || die + + for f in "${ED}${vimfiles}"/colors/*.vim; do + if [[ ${f} != */@(default).vim ]] ; then + printf '%s\0' "${f}" + fi + done | xargs -0 rm -f || die + + for f in "${ED}${vimfiles}"/syntax/*.vim; do + if [[ ${f} != */@(conf|crontab|fstab|inittab|resolv|sshdconfig|syntax|nosyntax|synload).vim ]] ; then + printf '%s\0' "${f}" + fi + done | xargs -0 rm -f || die fi newbashcomp "${FILESDIR}"/xxd-completion xxd