Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: Tim Harder <radhermit@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-editors/gvim/
Date: Fri, 12 Apr 2019 06:16:17
Message-Id: 1555049432.23da79bd9b80d2e092e0210cd3e22b1845470014.radhermit@gentoo
1 commit: 23da79bd9b80d2e092e0210cd3e22b1845470014
2 Author: Tim Harder <radhermit <AT> gentoo <DOT> org>
3 AuthorDate: Fri Apr 12 05:58:16 2019 +0000
4 Commit: Tim Harder <radhermit <AT> gentoo <DOT> org>
5 CommitDate: Fri Apr 12 06:10:32 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23da79bd
7
8 app-editors/gvim: version bump to 8.1.1155
9
10 Drop gnome USE flag, disable support, and rename gtk USE flags, now gtk
11 enables gtk3 support while gtk2 enables the older gtk2-based UI.
12
13 Closes: https://bugs.gentoo.org/647602
14
15 Restrict tests until various failures are skipped and/or resolved.
16
17 Signed-off-by: Tim Harder <radhermit <AT> gentoo.org>
18
19 app-editors/gvim/Manifest | 1 +
20 .../{gvim-9999.ebuild => gvim-8.1.1155.ebuild} | 48 +++++++++++-----------
21 app-editors/gvim/gvim-9999.ebuild | 45 ++++++++++----------
22 app-editors/gvim/metadata.xml | 1 +
23 4 files changed, 46 insertions(+), 49 deletions(-)
24
25 diff --git a/app-editors/gvim/Manifest b/app-editors/gvim/Manifest
26 index 03ef5c341e2..948bccea5da 100644
27 --- a/app-editors/gvim/Manifest
28 +++ b/app-editors/gvim/Manifest
29 @@ -4,3 +4,4 @@ DIST vim-8.0.1699.tar.gz 13546105 BLAKE2B cabf29d5a89c55e2fe3bc5e39eb499412f5907
30 DIST vim-8.1.0034.tar.gz 13652586 BLAKE2B 98dac6b37c04ea8c15f0b0e2e4145d6529138e0532e92751fd07be04a2180519135d386dfc19e7f12c8eb37b3e15ee81ba357680d453afab56d96299b69cb511 SHA512 b2b85035c6c60a09e903d8f6deb500e42ab8bfc2f9a5b959d0055a8e02dab3a91d5460fd5028e6634c5ef6ab034186b7155e341fa25e84b9851290708e892d19
31 DIST vim-8.1.0412.tar.gz 13857501 BLAKE2B 6925184359b8b36cb546c9fcba4bb01755455aa87171ea7328ece411a5a5ced45096b8bef8561059bbff9a3ade565e0648fd18dd091d6faad0eb8a67321337a5 SHA512 3f458c039a636d7d3e398f8aa9cba4b4ae650c00038618c4776959b6feb0a1e3ac56be2912c3d85cba8e8f301661a62d71acd34a4dd75dc4dc000a94bf1b237e
32 DIST vim-8.1.0648.tar.gz 14061964 BLAKE2B 79bf52d8574167471c93942904dc2b4ad5648ec365561494bbad45c779154b75b0fff1d90229516e938371f1eaa5808659cb2181b150c4c13bf8501bd9987b38 SHA512 d41676a6bb6bc442f4946ca021b2835d7ea0e54fbefe1bfc728241e1bf203cc696b707fcca6f25c877660283a790cefa4259fbd14de88fd4db7390701189c454
33 +DIST vim-8.1.1155.tar.gz 14141750 BLAKE2B f15470768fbdc4e02552b8711626c3ad9647ec5b74ebaa3f82a4f32c050405ef0cf3f29d1e5bdbb4de008bf16262b8cdc81ff153e2694a184523cd913624e8e0 SHA512 0cdc42090958f4c91c13aeeefac0abc4feaa629d8b90c04bd01d5e23efefe21e6316e1b2c3b6015ecf9577573faea9a1b6660de8a2959642e65582dbe9c7f5c6
34
35 diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-8.1.1155.ebuild
36 similarity index 92%
37 copy from app-editors/gvim/gvim-9999.ebuild
38 copy to app-editors/gvim/gvim-8.1.1155.ebuild
39 index 59218d3f5dc..35aedc92a30 100644
40 --- a/app-editors/gvim/gvim-9999.ebuild
41 +++ b/app-editors/gvim/gvim-8.1.1155.ebuild
42 @@ -3,9 +3,9 @@
43
44 EAPI=6
45 VIM_VERSION="8.1"
46 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
47 +PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
48 PYTHON_REQ_USE="threads(+)"
49 -USE_RUBY="ruby23 ruby24 ruby25"
50 +USE_RUBY="ruby24 ruby25 ruby26"
51
52 inherit vim-doc flag-o-matic xdg-utils gnome2-utils bash-completion-r1 prefix python-single-r1 ruby-single
53
54 @@ -24,14 +24,13 @@ HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
55
56 SLOT="0"
57 LICENSE="vim"
58 -IUSE="acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl"
59 +IUSE="acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl"
60 REQUIRED_USE="
61 luajit? ( lua )
62 python? ( ${PYTHON_REQUIRED_USE} )
63 "
64
65 RDEPEND="
66 - ~app-editors/vim-core-${PV}
67 >=app-eselect/eselect-vi-1.1
68 >=sys-libs/ncurses-5.2-r2:0=
69 x11-libs/libICE
70 @@ -40,16 +39,16 @@ RDEPEND="
71 x11-libs/libXt
72 acl? ( kernel_linux? ( sys-apps/acl ) )
73 !aqua? (
74 - gtk3? (
75 + gtk? (
76 x11-libs/gtk+:3
77 x11-libs/libXft
78 )
79 - !gtk3? (
80 - gtk? (
81 + !gtk? (
82 + gtk2? (
83 >=x11-libs/gtk+-2.6:2
84 x11-libs/libXft
85 )
86 - !gtk? (
87 + !gtk2? (
88 motif? ( >=x11-libs/motif-2.3:0 )
89 !motif? (
90 neXt? ( x11-libs/neXtaw )
91 @@ -73,11 +72,15 @@ RDEPEND="
92 tcl? ( dev-lang/tcl:0= )
93 "
94 DEPEND="${RDEPEND}
95 - dev-util/ctags
96 sys-devel/autoconf
97 virtual/pkgconfig
98 nls? ( sys-devel/gettext )
99 "
100 +# temporarily use PDEPEND to allow upgrades past icon file collision, bug #673880
101 +PDEPEND="~app-editors/vim-core-${PV}"
102 +
103 +# various failures (bugs #630042 and #682320)
104 +RESTRICT="test"
105
106 S=${WORKDIR}/vim-${PV}
107
108 @@ -189,6 +192,7 @@ src_configure() {
109 --with-features=huge
110 --disable-gpm
111 --enable-multibyte
112 + --with-gnome=no
113 $(use_enable acl)
114 $(use_enable cscope)
115 $(use_enable lua luainterp)
116 @@ -215,13 +219,12 @@ src_configure() {
117 fi
118
119 # gvim's GUI preference order is as follows:
120 - # aqua CARBON (not tested)
121 - # -aqua gtk3 GTK3
122 - # -aqua -gtk3 gnome GNOME2
123 - # -aqua -gtk3 -gnome gtk GTK2
124 - # -aqua -gtk -gtk3 motif MOTIF
125 - # -aqua -gtk -gtk3 -motif neXt NEXTAW
126 - # -aqua -gtk -gtk3 -motif -neXt ATHENA
127 + # aqua CARBON (not tested)
128 + # -aqua gtk GTK3
129 + # -aqua -gtk gtk2 GTK2
130 + # -aqua -gtk -gtk motif MOTIF
131 + # -aqua -gtk -gtk -motif neXt NEXTAW
132 + # -aqua -gtk -gtk -motif -neXt ATHENA
133 echo ; echo
134 if use aqua; then
135 einfo "Building gvim with the Carbon GUI"
136 @@ -229,19 +232,14 @@ src_configure() {
137 --enable-darwin
138 --enable-gui=carbon
139 )
140 - elif use gtk3; then
141 + elif use gtk; then
142 myconf+=( --enable-gtk3-check )
143 einfo "Building gvim with the gtk+-3 GUI"
144 myconf+=( --enable-gui=gtk3 )
145 - elif use gtk; then
146 + elif use gtk2; then
147 myconf+=( --enable-gtk2-check )
148 - if use gnome; then
149 - einfo "Building gvim with the Gnome 2 GUI"
150 - myconf+=( --enable-gui=gnome2 )
151 - else
152 - einfo "Building gvim with the gtk+-2 GUI"
153 - myconf+=( --enable-gui=gtk2 )
154 - fi
155 + einfo "Building gvim with the gtk+-2 GUI"
156 + myconf+=( --enable-gui=gtk2 )
157 elif use motif; then
158 einfo "Building gvim with the MOTIF GUI"
159 myconf+=( --enable-gui=motif )
160
161 diff --git a/app-editors/gvim/gvim-9999.ebuild b/app-editors/gvim/gvim-9999.ebuild
162 index 59218d3f5dc..ff138f4e695 100644
163 --- a/app-editors/gvim/gvim-9999.ebuild
164 +++ b/app-editors/gvim/gvim-9999.ebuild
165 @@ -3,9 +3,9 @@
166
167 EAPI=6
168 VIM_VERSION="8.1"
169 -PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} )
170 +PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} )
171 PYTHON_REQ_USE="threads(+)"
172 -USE_RUBY="ruby23 ruby24 ruby25"
173 +USE_RUBY="ruby24 ruby25 ruby26"
174
175 inherit vim-doc flag-o-matic xdg-utils gnome2-utils bash-completion-r1 prefix python-single-r1 ruby-single
176
177 @@ -24,7 +24,7 @@ HOMEPAGE="https://vim.sourceforge.io/ https://github.com/vim/vim"
178
179 SLOT="0"
180 LICENSE="vim"
181 -IUSE="acl aqua cscope debug gnome gtk gtk3 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl"
182 +IUSE="acl aqua cscope debug gtk gtk2 lua luajit motif neXt netbeans nls perl python racket ruby selinux session tcl"
183 REQUIRED_USE="
184 luajit? ( lua )
185 python? ( ${PYTHON_REQUIRED_USE} )
186 @@ -40,16 +40,16 @@ RDEPEND="
187 x11-libs/libXt
188 acl? ( kernel_linux? ( sys-apps/acl ) )
189 !aqua? (
190 - gtk3? (
191 + gtk? (
192 x11-libs/gtk+:3
193 x11-libs/libXft
194 )
195 - !gtk3? (
196 - gtk? (
197 + !gtk? (
198 + gtk2? (
199 >=x11-libs/gtk+-2.6:2
200 x11-libs/libXft
201 )
202 - !gtk? (
203 + !gtk2? (
204 motif? ( >=x11-libs/motif-2.3:0 )
205 !motif? (
206 neXt? ( x11-libs/neXtaw )
207 @@ -73,12 +73,14 @@ RDEPEND="
208 tcl? ( dev-lang/tcl:0= )
209 "
210 DEPEND="${RDEPEND}
211 - dev-util/ctags
212 sys-devel/autoconf
213 virtual/pkgconfig
214 nls? ( sys-devel/gettext )
215 "
216
217 +# various failures (bugs #630042 and #682320)
218 +RESTRICT="test"
219 +
220 S=${WORKDIR}/vim-${PV}
221
222 pkg_setup() {
223 @@ -189,6 +191,7 @@ src_configure() {
224 --with-features=huge
225 --disable-gpm
226 --enable-multibyte
227 + --with-gnome=no
228 $(use_enable acl)
229 $(use_enable cscope)
230 $(use_enable lua luainterp)
231 @@ -215,13 +218,12 @@ src_configure() {
232 fi
233
234 # gvim's GUI preference order is as follows:
235 - # aqua CARBON (not tested)
236 - # -aqua gtk3 GTK3
237 - # -aqua -gtk3 gnome GNOME2
238 - # -aqua -gtk3 -gnome gtk GTK2
239 - # -aqua -gtk -gtk3 motif MOTIF
240 - # -aqua -gtk -gtk3 -motif neXt NEXTAW
241 - # -aqua -gtk -gtk3 -motif -neXt ATHENA
242 + # aqua CARBON (not tested)
243 + # -aqua gtk GTK3
244 + # -aqua -gtk gtk2 GTK2
245 + # -aqua -gtk -gtk motif MOTIF
246 + # -aqua -gtk -gtk -motif neXt NEXTAW
247 + # -aqua -gtk -gtk -motif -neXt ATHENA
248 echo ; echo
249 if use aqua; then
250 einfo "Building gvim with the Carbon GUI"
251 @@ -229,19 +231,14 @@ src_configure() {
252 --enable-darwin
253 --enable-gui=carbon
254 )
255 - elif use gtk3; then
256 + elif use gtk; then
257 myconf+=( --enable-gtk3-check )
258 einfo "Building gvim with the gtk+-3 GUI"
259 myconf+=( --enable-gui=gtk3 )
260 - elif use gtk; then
261 + elif use gtk2; then
262 myconf+=( --enable-gtk2-check )
263 - if use gnome; then
264 - einfo "Building gvim with the Gnome 2 GUI"
265 - myconf+=( --enable-gui=gnome2 )
266 - else
267 - einfo "Building gvim with the gtk+-2 GUI"
268 - myconf+=( --enable-gui=gtk2 )
269 - fi
270 + einfo "Building gvim with the gtk+-2 GUI"
271 + myconf+=( --enable-gui=gtk2 )
272 elif use motif; then
273 einfo "Building gvim with the MOTIF GUI"
274 myconf+=( --enable-gui=motif )
275
276 diff --git a/app-editors/gvim/metadata.xml b/app-editors/gvim/metadata.xml
277 index e0d65e43e29..435a3f0120b 100644
278 --- a/app-editors/gvim/metadata.xml
279 +++ b/app-editors/gvim/metadata.xml
280 @@ -7,6 +7,7 @@
281 </maintainer>
282 <use>
283 <flag name="cscope">Enable cscope interface</flag>
284 + <flag name="gtk2">Enable GTK+2 interface</flag>
285 <flag name="gtk3">Enable GTK+3 interface</flag>
286 <flag name="netbeans">Include netbeans external editor integration support</flag>
287 <flag name="racket">Enable support for Scheme using <pkg>dev-scheme/racket</pkg></flag>
Report Message
Find on MARC Find on Google Groups