Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/gvim/
Date: Fri, 29 Oct 2021 13:02:55
Message-Id: 1635512559.232132d46b2087addb8f44c79eaf2561cce1927d.sam@gentoo
1 commit: 232132d46b2087addb8f44c79eaf2561cce1927d
2 Author: Sam James <sam <AT> gentoo <DOT> org>
3 AuthorDate: Fri Oct 29 12:59:16 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Fri Oct 29 13:02:39 2021 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=232132d4
7
8 app-editors/gvim: add 8.2.3567
9
10 Bug: https://bugs.gentoo.org/820692
11 Bug: https://bugs.gentoo.org/819528
12 Bug: https://bugs.gentoo.org/818562
13 Signed-off-by: Sam James <sam <AT> gentoo.org>
14
15 app-editors/gvim/Manifest | 1 +
16 .../gvim/{gvim-9999.ebuild => gvim-8.2.3567.ebuild} | 17 ++++++++++-------
17 app-editors/gvim/gvim-9999.ebuild | 17 ++++++++++-------
18 3 files changed, 21 insertions(+), 14 deletions(-)
19
20 diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
21 index ba93bb167e0..ae2d02673ba 100644
22 --- a/app-editors/gvim/Manifest
23 +++ b/app-editors/gvim/Manifest
24 @@ -1,3 +1,4 @@
25 DIST vim-8.2.0360-gentoo-patches.tar.xz 2612 BLAKE2B a9273a686b31dd873b25bfc07f7bc254f11038bde275ae4e6f56513a14e0268fdc1032ae847d1d7f8539f8a657217011770ccb4685998f34722383ec7bfb1a15 SHA512 00bc8eb8b20a4a6f3bbd179bb90d42fa6727c8eaae5b625e95e52c33638d456ef36d06b51c542ecaffb237c0b4f7aa72dc3bae7fe00144d55ab0d2fa51950f3b
26 DIST vim-8.2.0814.tar.gz 14953478 BLAKE2B fd4155ec749bd9a705e8114ff7f8cc321182c9286733ff2f665e265ec0af830f9e70c730b8d0215f6db1f73a8e2f878d22932a72c8dbfe921591be7adcdaab00 SHA512 4ddd9e2d30719f931cadd1a4de5700736f641f4b074378d9ea1462a90b81975ce8e8c3ca2e3a1e15ac0288824eef5b0f0a3e31482f7637c450c6d7e52c8f40d2
27 DIST vim-8.2.3428.tar.gz 15715383 BLAKE2B 865842bae0de25c34f255085f6edfe35b6905e220bdcb76372d7289ef1f6c2b2dee2f88e4a5f849d43fa560db4ade1e8e498d86f5651c5218d9153cde5ecddd3 SHA512 7cb473afa0ad6a9728dfc2f7d8ca19a21de329c4790141c7cb815b71c07e92a1ce04a5fcc2a0381c4beb304670d6c08629dc2ed2cb0842998cca2fd846c8cd6b
28 +DIST vim-8.2.3567.tar.gz 15771981 BLAKE2B 5a10ce998769b73a9c3b30fccb84e90eef8242d04e52b1cf475af777233ac774a6e5ec8c2aa09cadfe2db747b485fcc26d1d953017df4bb459d8a427715a3048 SHA512 f1b5debc77d5392966d168974eab7faae99082509a8148ea212e8e06ae980d9a2652ac77547d77d10953119527f68c633440cf813bb6dec8e259b7628af93af6
29
30 diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-8.2.3567.ebuild
31 similarity index 97%
32 copy from app-editors/gvim/gvim-9999.ebuild
33 copy to app-editors/gvim/gvim-8.2.3567.ebuild
34 index 0a202597784..a68b9011e15 100644
35 --- a/app-editors/gvim/gvim-9999.ebuild
36 +++ b/app-editors/gvim/gvim-8.2.3567.ebuild
37 @@ -2,6 +2,9 @@
38 # Distributed under the terms of the GNU General Public License v2
39
40 EAPI=7
41 +
42 +# Please bump with app-editors/vim-core and app-editors/gvim
43 +
44 VIM_VERSION="8.2"
45 LUA_COMPAT=( lua5-1 luajit )
46 PYTHON_COMPAT=( python3_{7..10} )
47 @@ -17,14 +20,15 @@ if [[ ${PV} == 9999* ]]; then
48 else
49 SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
50 https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
51 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
52 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
53 fi
54 +S="${WORKDIR}"/vim-${PV}
55
56 DESCRIPTION="GUI version of the Vim text editor"
57 HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
58
59 -SLOT="0"
60 LICENSE="vim"
61 +SLOT="0"
62 IUSE="acl aqua crypt cscope debug gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
63 REQUIRED_USE="
64 lua? ( ${LUA_REQUIRED_USE} )
65 @@ -75,19 +79,18 @@ RDEPEND="
66 sound? ( media-libs/libcanberra )
67 tcl? ( dev-lang/tcl:0= )
68 "
69 -DEPEND="${RDEPEND}
70 +DEPEND="${RDEPEND}"
71 +# configure runs the Lua interpreter
72 +BDEPEND="
73 sys-devel/autoconf
74 virtual/pkgconfig
75 + lua? ( ${LUA_DEPS} )
76 nls? ( sys-devel/gettext )
77 "
78 -# configure runs the Lua interpreter
79 -BDEPEND="lua? ( ${LUA_DEPS} )"
80
81 # various failures (bugs #630042 and #682320)
82 RESTRICT="test"
83
84 -S=${WORKDIR}/vim-${PV}
85 -
86 pkg_setup() {
87 # people with broken alphabets run into trouble. bug 82186.
88 unset LANG LC_ALL
89
90 diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
91 index 0a202597784..a68b9011e15 100644
92 --- a/app-editors/gvim/gvim-9999.ebuild
93 +++ b/app-editors/gvim/gvim-9999.ebuild
94 @@ -2,6 +2,9 @@
95 # Distributed under the terms of the GNU General Public License v2
96
97 EAPI=7
98 +
99 +# Please bump with app-editors/vim-core and app-editors/gvim
100 +
101 VIM_VERSION="8.2"
102 LUA_COMPAT=( lua5-1 luajit )
103 PYTHON_COMPAT=( python3_{7..10} )
104 @@ -17,14 +20,15 @@ if [[ ${PV} == 9999* ]]; then
105 else
106 SRC_URI="https://github.com/vim/vim/archive/v${PV}.tar.gz -> vim-${PV}.tar.gz
107 https://dev.gentoo.org/~zlogene/distfiles/app-editors/vim/vim-8.2.0360-gentoo-patches.tar.xz"
108 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
109 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
110 fi
111 +S="${WORKDIR}"/vim-${PV}
112
113 DESCRIPTION="GUI version of the Vim text editor"
114 HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
115
116 -SLOT="0"
117 LICENSE="vim"
118 +SLOT="0"
119 IUSE="acl aqua crypt cscope debug gtk gtk2 lua motif neXt netbeans nls perl python racket ruby selinux session sound tcl"
120 REQUIRED_USE="
121 lua? ( ${LUA_REQUIRED_USE} )
122 @@ -75,19 +79,18 @@ RDEPEND="
123 sound? ( media-libs/libcanberra )
124 tcl? ( dev-lang/tcl:0= )
125 "
126 -DEPEND="${RDEPEND}
127 +DEPEND="${RDEPEND}"
128 +# configure runs the Lua interpreter
129 +BDEPEND="
130 sys-devel/autoconf
131 virtual/pkgconfig
132 + lua? ( ${LUA_DEPS} )
133 nls? ( sys-devel/gettext )
134 "
135 -# configure runs the Lua interpreter
136 -BDEPEND="lua? ( ${LUA_DEPS} )"
137
138 # various failures (bugs #630042 and #682320)
139 RESTRICT="test"
140
141 -S=${WORKDIR}/vim-${PV}
142 -
143 pkg_setup() {
144 # people with broken alphabets run into trouble. bug 82186.
145 unset LANG LC_ALL