commit: a797d71cba48ec4805d53dac130bfb249fb70023 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Mon Nov 17 07:49:28 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Mon Nov 17 07:49:28 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a797d71c
dev-vcs/git: revbump 2.51.2 to add zsh completions; drop changes from others Revbump 2.51.2 to propagate the changes (especially as, in theory, they may be "controversial" if users are relying on the completions from app-shells/zsh-completions) and do so in ~arch only. Drop the changes from other ebuilds rather than revbump those. Bug: https://bugs.gentoo.org/961079 Signed-off-by: Sam James <sam <AT> gentoo.org> dev-vcs/git/git-2.49.1.ebuild | 11 +---------- dev-vcs/git/git-2.50.1.ebuild | 11 +---------- dev-vcs/git/git-2.51.0.ebuild | 11 +---------- dev-vcs/git/git-2.51.1.ebuild | 11 +---------- dev-vcs/git/git-2.51.2-r1.ebuild | 11 +---------- dev-vcs/git/{git-2.51.2-r1.ebuild => git-2.51.2-r2.ebuild} | 0 6 files changed, 5 insertions(+), 50 deletions(-) diff --git a/dev-vcs/git/git-2.49.1.ebuild b/dev-vcs/git/git-2.49.1.ebuild index 616fe9887412..30d30860bda5 100644 --- a/dev-vcs/git/git-2.49.1.ebuild +++ b/dev-vcs/git/git-2.49.1.ebuild @@ -8,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware PYTHON_COMPAT=( python3_{11..14} ) -inherit toolchain-funcs perl-module shell-completion optfeature plocale python-single-r1 systemd meson +inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd meson PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" @@ -372,7 +372,6 @@ src_install() { newbashcomp contrib/completion/git-completion.bash ${PN} bashcomp_alias git gitk - newzshcomp contrib/completion/git-completion.zsh _${PN} # Not really a bash-completion file (bug #477920) # but still needed uncompressed (bug #507480) insinto /usr/share/${PN} @@ -501,14 +500,6 @@ pkg_postinst() { elog "Note that the prompt bash code is now in that separate script" fi - if has_version app-shells/zsh ; then - elog 'There are two competing zsh completions available for Git.' - elog 'One is from app-shells/zsh, the other from dev-vcs/git.' - elog 'To choose between them, order the entries of $fpath so that your' - elog 'desired completion is earlier in the list or symlink the relevant' - elog 'script into a personal override directory early on fpath.' - fi - optfeature_header "Some scripts require additional dependencies:" optfeature git-quiltimport dev-util/quilt optfeature git-instaweb www-servers/lighttpd www-servers/apache www-servers/nginx diff --git a/dev-vcs/git/git-2.50.1.ebuild b/dev-vcs/git/git-2.50.1.ebuild index 7d4a8a9f9b64..59eec62eb112 100644 --- a/dev-vcs/git/git-2.50.1.ebuild +++ b/dev-vcs/git/git-2.50.1.ebuild @@ -8,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware PYTHON_COMPAT=( python3_{11..14} ) -inherit toolchain-funcs perl-module shell-completion optfeature plocale python-single-r1 systemd meson +inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd meson PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" @@ -364,7 +364,6 @@ src_install() { newbashcomp contrib/completion/git-completion.bash ${PN} bashcomp_alias git gitk - newzshcomp contrib/completion/git-completion.zsh _${PN} # Not really a bash-completion file (bug #477920) # but still needed uncompressed (bug #507480) insinto /usr/share/${PN} @@ -494,14 +493,6 @@ pkg_postinst() { elog "Note that the prompt bash code is now in that separate script" fi - if has_version app-shells/zsh ; then - elog 'There are two competing zsh completions available for Git.' - elog 'One is from app-shells/zsh, the other from dev-vcs/git.' - elog 'To choose between them, order the entries of $fpath so that your' - elog 'desired completion is earlier in the list or symlink the relevant' - elog 'script into a personal override directory early on fpath.' - fi - optfeature_header "Some scripts require additional dependencies:" optfeature git-quiltimport dev-util/quilt optfeature git-instaweb www-servers/lighttpd www-servers/apache www-servers/nginx diff --git a/dev-vcs/git/git-2.51.0.ebuild b/dev-vcs/git/git-2.51.0.ebuild index b77049620ded..9a2e92d89e96 100644 --- a/dev-vcs/git/git-2.51.0.ebuild +++ b/dev-vcs/git/git-2.51.0.ebuild @@ -8,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware PYTHON_COMPAT=( python3_{11..14} ) -inherit toolchain-funcs perl-module shell-completion optfeature plocale python-single-r1 systemd meson +inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd meson PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" @@ -354,7 +354,6 @@ src_install() { newbashcomp contrib/completion/git-completion.bash ${PN} bashcomp_alias git gitk - newzshcomp contrib/completion/git-completion.zsh _${PN} # Not really a bash-completion file (bug #477920) # but still needed uncompressed (bug #507480) insinto /usr/share/${PN} @@ -471,14 +470,6 @@ pkg_postinst() { elog "Note that the prompt bash code is now in that separate script" fi - if has_version app-shells/zsh ; then - elog 'There are two competing zsh completions available for Git.' - elog 'One is from app-shells/zsh, the other from dev-vcs/git.' - elog 'To choose between them, order the entries of $fpath so that your' - elog 'desired completion is earlier in the list or symlink the relevant' - elog 'script into a personal override directory early on fpath.' - fi - optfeature_header "Some scripts require additional dependencies:" optfeature git-quiltimport dev-util/quilt optfeature git-instaweb www-servers/lighttpd www-servers/apache www-servers/nginx diff --git a/dev-vcs/git/git-2.51.1.ebuild b/dev-vcs/git/git-2.51.1.ebuild index 45129ae90863..c4c40fbed1a6 100644 --- a/dev-vcs/git/git-2.51.1.ebuild +++ b/dev-vcs/git/git-2.51.1.ebuild @@ -8,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware PYTHON_COMPAT=( python3_{11..14} ) -inherit toolchain-funcs perl-module shell-completion optfeature plocale python-single-r1 systemd meson +inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd meson PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" @@ -356,7 +356,6 @@ src_install() { newbashcomp contrib/completion/git-completion.bash ${PN} bashcomp_alias git gitk - newzshcomp contrib/completion/git-completion.zsh _${PN} # Not really a bash-completion file (bug #477920) # but still needed uncompressed (bug #507480) insinto /usr/share/${PN} @@ -473,14 +472,6 @@ pkg_postinst() { elog "Note that the prompt bash code is now in that separate script" fi - if has_version app-shells/zsh ; then - elog 'There are two competing zsh completions available for Git.' - elog 'One is from app-shells/zsh, the other from dev-vcs/git.' - elog 'To choose between them, order the entries of $fpath so that your' - elog 'desired completion is earlier in the list or symlink the relevant' - elog 'script into a personal override directory early on fpath.' - fi - optfeature_header "Some scripts require additional dependencies:" optfeature git-quiltimport dev-util/quilt optfeature git-instaweb www-servers/lighttpd www-servers/apache www-servers/nginx diff --git a/dev-vcs/git/git-2.51.2-r1.ebuild b/dev-vcs/git/git-2.51.2-r1.ebuild index a063ebf119e5..3de51238c45f 100644 --- a/dev-vcs/git/git-2.51.2-r1.ebuild +++ b/dev-vcs/git/git-2.51.2-r1.ebuild @@ -8,7 +8,7 @@ GENTOO_DEPEND_ON_PERL=no # bug #329479: git-remote-testgit is not multiple-version aware PYTHON_COMPAT=( python3_{11..14} ) -inherit toolchain-funcs perl-module shell-completion optfeature plocale python-single-r1 systemd meson +inherit toolchain-funcs perl-module bash-completion-r1 optfeature plocale python-single-r1 systemd meson PLOCALES="bg ca de es fr is it ko pt_PT ru sv vi zh_CN" @@ -354,7 +354,6 @@ src_install() { newbashcomp contrib/completion/git-completion.bash ${PN} bashcomp_alias git gitk - newzshcomp contrib/completion/git-completion.zsh _${PN} # Not really a bash-completion file (bug #477920) # but still needed uncompressed (bug #507480) insinto /usr/share/${PN} @@ -471,14 +470,6 @@ pkg_postinst() { elog "Note that the prompt bash code is now in that separate script" fi - if has_version app-shells/zsh ; then - elog 'There are two competing zsh completions available for Git.' - elog 'One is from app-shells/zsh, the other from dev-vcs/git.' - elog 'To choose between them, order the entries of $fpath so that your' - elog 'desired completion is earlier in the list or symlink the relevant' - elog 'script into a personal override directory early on fpath.' - fi - optfeature_header "Some scripts require additional dependencies:" optfeature git-quiltimport dev-util/quilt optfeature git-instaweb www-servers/lighttpd www-servers/apache www-servers/nginx diff --git a/dev-vcs/git/git-2.51.2-r1.ebuild b/dev-vcs/git/git-2.51.2-r2.ebuild similarity index 100% copy from dev-vcs/git/git-2.51.2-r1.ebuild copy to dev-vcs/git/git-2.51.2-r2.ebuild
