commit: f9f7862adbb0b00e48cf05385ac665594820c04a Author: Sam James <sam <AT> gentoo <DOT> org> AuthorDate: Wed Jun 8 07:08:48 2022 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Wed Jun 8 07:09:34 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f9f7862a
app-editors/gvim: add 8.2.5066 Bug: https://bugs.gentoo.org/850550 Bug: https://bugs.gentoo.org/836432 Signed-off-by: Sam James <sam <AT> gentoo.org> app-editors/gvim/Manifest | 1 + app-editors/gvim/{gvim-9999.ebuild => gvim-8.2.5066.ebuild} | 12 +++++++----- app-editors/gvim/gvim-9999.ebuild | 12 +++++++----- 3 files changed, 15 insertions(+), 10 deletions(-) diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest index ed4d92456abb..beff7d959453 100644 --- a/app-editors/gvim/Manifest +++ b/app-editors/gvim/Manifest @@ -9,3 +9,4 @@ DIST vim-8.2.3950.tar.gz 15865929 BLAKE2B e713895f847194845c1a794fc796e97678b116 DIST vim-8.2.4285.tar.gz 15962343 BLAKE2B ba0971cbea3d3fe1761961f66a24281c06f0a509f1aac7c32e26f07b5d9d122b72da68646874b1f20879372d26e1b5a72f020913a31c1c0aa26f8e6bff074516 SHA512 760180b89c285b92f3ec40041c784e756a93d7c6d75386c1c737762b9041babfaa17fd0b9e47e3e4298b24b8f5c7300e6a1ab2addbbcda94e46c973a97d578ec DIST vim-8.2.4328.tar.gz 15983756 BLAKE2B 23d95d2ae6772fbd2a15a73dff5af75dcebf87af5a6a600d8a30284d32d1f83999111bfaa0e49c0295ae42a06f49075aeb00f8ae969eff251889b363b7445fda SHA512 f5e077891d22f468327e30808dba817efe74111c89948fbea5544be58333a8d3342290fa140939dd9c7d976575e63050e100daf947ba73373cc2268677020651 DIST vim-8.2.4586.tar.gz 16251186 BLAKE2B 26471b493397e58d3e3d6f2c0c5cc69a08c294dcd59367a12729d1762cf2043eab0987ec4c370bd1f4cbbc67d10576f8a6dcfcb748d224b2f35476dbade32597 SHA512 354464e51a3cc13e13f3194ef8a4d5ccec978da7eb385337a042a6b2e6b38a253c587815e7c972070c516f59c7d54c89bce6926ae7f7f9635cddfd1d0bd237b9 +DIST vim-8.2.5066.tar.gz 16497942 BLAKE2B 613f009f6a03e28305763e471bf55b626f37bb8b0f01324d5a676f6682811e3c4a5c11442af839d06b7d94b3938f5a30306bac576eec5d3c76f4a135a3443bb3 SHA512 27fdd1e86b0488b974a9fd60523b31ba23b581cab4c9bd15aee9ae459e2f2d028d6887adf621ee88244b74d26697fc953b08b587a3a80b316d31b65fc588ce9e diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-8.2.5066.ebuild similarity index 97% copy from app-editors/gvim/gvim-9999.ebuild copy to app-editors/gvim/gvim-8.2.5066.ebuild index a68b9011e15f..3a720588f160 100644 --- a/app-editors/gvim/gvim-9999.ebuild +++ b/app-editors/gvim/gvim-8.2.5066.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 # 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} ) +PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="threads(+)" -USE_RUBY="ruby24 ruby25 ruby26 ruby27" +USE_RUBY="ruby26 ruby27" inherit vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix lua-single python-single-r1 ruby-single @@ -20,7 +20,7 @@ if [[ ${PV} == 9999* ]]; then else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" fi S="${WORKDIR}"/vim-${PV} @@ -106,6 +106,8 @@ pkg_setup() { src_prepare() { if [[ ${PV} != 9999* ]]; then + rm "${WORKDIR}"/patches/006-vim-8.0.0617-crosscompile.patch || di + # Gentoo patches to fix runtime issues, cross-compile errors, etc eapply "${WORKDIR}"/patches/ fi diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild index a68b9011e15f..3a720588f160 100644 --- a/app-editors/gvim/gvim-9999.ebuild +++ b/app-editors/gvim/gvim-9999.ebuild @@ -1,15 +1,15 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 +EAPI=8 # 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} ) +PYTHON_COMPAT=( python3_{8..10} ) PYTHON_REQ_USE="threads(+)" -USE_RUBY="ruby24 ruby25 ruby26 ruby27" +USE_RUBY="ruby26 ruby27" inherit vim-doc flag-o-matic xdg-utils bash-completion-r1 prefix lua-single python-single-r1 ruby-single @@ -20,7 +20,7 @@ if [[ ${PV} == 9999* ]]; then else SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"; - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" + KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris" fi S="${WORKDIR}"/vim-${PV} @@ -106,6 +106,8 @@ pkg_setup() { src_prepare() { if [[ ${PV} != 9999* ]]; then + rm "${WORKDIR}"/patches/006-vim-8.0.0617-crosscompile.patch || di + # Gentoo patches to fix runtime issues, cross-compile errors, etc eapply "${WORKDIR}"/patches/ fi
