commit: d89e304ab79ba5080d76cfc2e5013f1f4534c315 Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Fri Oct 29 12:51:39 2021 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Oct 29 13:02:36 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d89e304a
app-editors/vim: add 8.2.3567 Bug: https://bugs.gentoo.org/820692 Bug: https://bugs.gentoo.org/819528 Bug: https://bugs.gentoo.org/818562 Signed-off-by: Sam James <sam <AT> gentoo.org> app-editors/vim/Manifest | 1 + .../vim/{vim-9999.ebuild => vim-8.2.3567.ebuild} | 32 ++++++++++++---------- app-editors/vim/vim-9999.ebuild | 32 ++++++++++++---------- 3 files changed, 35 insertions(+), 30 deletions(-) diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest index ba93bb167e0..ae2d02673ba 100644 --- a/app-editors/vim/Manifest +++ b/app-editors/vim/Manifest @@ -1,3 +1,4 @@ DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7bc254f11038bde275ae4e6f56513a14e0268fdc1032ae847d1d7f8539f8a657217011770ccb4685998f34722383ec7bfb1a15 SHA512 00bc8eb8b20a4a6f3bbd179bb90d42fa6727c8eaae5b625e95e52c33638d456ef36d06b51c542ecaffb237c0b4f7aa72dc3bae7fe00144d55ab0d2fa51950f3b DIST vim-8.2.0814.tar.gz 14953478 BLAKE2B fd4155ec749bd9a705e8114ff7f8cc321182c9286733ff2f665e265ec0af830f9e70c730b8d0215f6db1f73a8e2f878d22932a72c8dbfe921591be7adcdaab00 SHA512 4ddd9e2d30719f931cadd1a4de5700736f641f4b074378d9ea1462a90b81975ce8e8c3ca2e3a1e15ac0288824eef5b0f0a3e31482f7637c450c6d7e52c8f40d2 DIST vim-8.2.3428.tar.gz 15715383 BLAKE2B 865842bae0de25c34f255085f6edfe35b6905e220bdcb76372d7289ef1f6c2b2dee2f88e4a5f849d43fa560db4ade1e8e498d86f5651c5218d9153cde5ecddd3 SHA512 7cb473afa0ad6a9728dfc2f7d8ca19a21de329c4790141c7cb815b71c07e92a1ce04a5fcc2a0381c4beb304670d6c08629dc2ed2cb0842998cca2fd846c8cd6b +DIST vim-8.2.3567.tar.gz 15771981 BLAKE2B 5a10ce998769b73a9c3b30fccb84e90eef8242d04e52b1cf475af777233ac774a6e5ec8c2aa09cadfe2db747b485fcc26d1d953017df4bb459d8a427715a3048 SHA512 f1b5debc77d5392966d168974eab7faae99082509a8148ea212e8e06ae980d9a2652ac77547d77d10953119527f68c633440cf813bb6dec8e259b7628af93af6 diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-8.2.3567.ebuild similarity index 94% copy from app-editors/vim/vim-9999.ebuild copy to app-editors/vim/vim-8.2.3567.ebuild index 0da72544559..e95a8438fc8 100644 --- a/app-editors/vim/vim-9999.ebuild +++ b/app-editors/vim/vim-8.2.3567.ebuild @@ -2,6 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + +# Please bump with app-editors/vim-core and app-editors/gvim + VIM_VERSION="8.2" LUA_COMPAT=( lua5-1 luajit ) PYTHON_COMPAT=( python3_{7..10} ) @@ -22,8 +25,8 @@ fi DESCRIPTION="Vim, an improved vi-style text editor" HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"; -SLOT="0" LICENSE="vim" +SLOT="0" IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager" REQUIRED_USE=" lua? ( ${LUA_REQUIRED_USE} ) @@ -53,17 +56,16 @@ RDEPEND=" tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) " - -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND}" +# configure runs the Lua interpreter +BDEPEND=" sys-devel/autoconf + lua? ( ${LUA_DEPS} ) nls? ( sys-devel/gettext ) " -# configure runs the Lua interpreter -BDEPEND="lua? ( ${LUA_DEPS} )" pkg_setup() { - # people with broken alphabets run into trouble. bug 82186. + # people with broken alphabets run into trouble. bug #82186. unset LANG LC_ALL export LC_COLLATE="C" @@ -94,7 +96,7 @@ src_prepare() { # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. # Hopefully this pattern won't break for a while at least. - # This fixes bug 29398 (27 Sep 2003 agriffis) + # This fixes bug #29398 (27 Sep 2003 agriffis) sed -i -e \ 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ "${S}"/runtime/doc/syntax.txt \ @@ -105,7 +107,7 @@ src_prepare() { # Don't be fooled by /usr/include/libc.h. When found, vim thinks # this is NeXT, but it's actually just a file in dev-libs/9libs - # This fixes bug 43885 (20 Mar 2004 agriffis) + # This fixes bug #43885 (20 Mar 2004 agriffis) sed -i -e \ 's/ libc\.h / /' \ "${S}"/src/configure.ac || die 'sed failed' @@ -150,8 +152,8 @@ src_prepare() { src_configure() { local myconf=() - # Fix bug 37354: Disallow -funroll-all-loops on amd64 - # Bug 57859 suggests that we want to do this for all archs + # Fix bug #37354: Disallow -funroll-all-loops on amd64 + # Bug #57859 suggests that we want to do this for all archs filter-flags -funroll-all-loops # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for @@ -168,11 +170,11 @@ src_configure() { rm src/auto/configure || die "rm failed" emake -j1 -C src autoconf - # This should fix a sandbox violation (see bug 24447). The hvc - # things are for ppc64, see bug 86433. + # This should fix a sandbox violation (see bug #24447). The hvc + # things are for ppc64, see bug #86433. for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do if [[ -e "${file}" ]]; then - addwrite $file + addwrite ${file} fi done @@ -288,7 +290,7 @@ src_test() { } # Call eselect vi update with --if-unset -# to respect user's choice (bug 187449) +# to respect user's choice (bug #187449) eselect_vi_update() { einfo "Calling eselect vi update..." eselect vi update --if-unset diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild index 0da72544559..e95a8438fc8 100644 --- a/app-editors/vim/vim-9999.ebuild +++ b/app-editors/vim/vim-9999.ebuild @@ -2,6 +2,9 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 + +# Please bump with app-editors/vim-core and app-editors/gvim + VIM_VERSION="8.2" LUA_COMPAT=( lua5-1 luajit ) PYTHON_COMPAT=( python3_{7..10} ) @@ -22,8 +25,8 @@ fi DESCRIPTION="Vim, an improved vi-style text editor" HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"; -SLOT="0" LICENSE="vim" +SLOT="0" IUSE="X acl crypt cscope debug gpm lua minimal nls perl python racket ruby selinux sound tcl terminal vim-pager" REQUIRED_USE=" lua? ( ${LUA_REQUIRED_USE} ) @@ -53,17 +56,16 @@ RDEPEND=" tcl? ( dev-lang/tcl:0= ) X? ( x11-libs/libXt ) " - -DEPEND=" - ${RDEPEND} +DEPEND="${RDEPEND}" +# configure runs the Lua interpreter +BDEPEND=" sys-devel/autoconf + lua? ( ${LUA_DEPS} ) nls? ( sys-devel/gettext ) " -# configure runs the Lua interpreter -BDEPEND="lua? ( ${LUA_DEPS} )" pkg_setup() { - # people with broken alphabets run into trouble. bug 82186. + # people with broken alphabets run into trouble. bug #82186. unset LANG LC_ALL export LC_COLLATE="C" @@ -94,7 +96,7 @@ src_prepare() { # Use exuberant ctags which installs as /usr/bin/exuberant-ctags. # Hopefully this pattern won't break for a while at least. - # This fixes bug 29398 (27 Sep 2003 agriffis) + # This fixes bug #29398 (27 Sep 2003 agriffis) sed -i -e \ 's/\<ctags\("\| [-*.]\)/exuberant-&/g' \ "${S}"/runtime/doc/syntax.txt \ @@ -105,7 +107,7 @@ src_prepare() { # Don't be fooled by /usr/include/libc.h. When found, vim thinks # this is NeXT, but it's actually just a file in dev-libs/9libs - # This fixes bug 43885 (20 Mar 2004 agriffis) + # This fixes bug #43885 (20 Mar 2004 agriffis) sed -i -e \ 's/ libc\.h / /' \ "${S}"/src/configure.ac || die 'sed failed' @@ -150,8 +152,8 @@ src_prepare() { src_configure() { local myconf=() - # Fix bug 37354: Disallow -funroll-all-loops on amd64 - # Bug 57859 suggests that we want to do this for all archs + # Fix bug #37354: Disallow -funroll-all-loops on amd64 + # Bug #57859 suggests that we want to do this for all archs filter-flags -funroll-all-loops # Fix bug 76331: -O3 causes problems, use -O2 instead. We'll do this for @@ -168,11 +170,11 @@ src_configure() { rm src/auto/configure || die "rm failed" emake -j1 -C src autoconf - # This should fix a sandbox violation (see bug 24447). The hvc - # things are for ppc64, see bug 86433. + # This should fix a sandbox violation (see bug #24447). The hvc + # things are for ppc64, see bug #86433. for file in /dev/pty/s* /dev/console /dev/hvc/* /dev/hvc*; do if [[ -e "${file}" ]]; then - addwrite $file + addwrite ${file} fi done @@ -288,7 +290,7 @@ src_test() { } # Call eselect vi update with --if-unset -# to respect user's choice (bug 187449) +# to respect user's choice (bug #187449) eselect_vi_update() { einfo "Calling eselect vi update..." eselect vi update --if-unset
