1 |
commit: 0fc730e0b10f80c1411b41005a0aaefee9bb8a7b |
2 |
Author: Tim Harder <radhermit <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Apr 12 05:54:46 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=0fc730e0 |
7 |
|
8 |
app-editors/vim: version bump to 8.1.1155 |
9 |
|
10 |
Force -minimal when vim-pager support is enabled. |
11 |
Closes: https://bugs.gentoo.org/682944 |
12 |
|
13 |
Drop ctags dep. |
14 |
Closes: https://bugs.gentoo.org/679682 |
15 |
|
16 |
Signed-off-by: Tim Harder <radhermit <AT> gentoo.org> |
17 |
|
18 |
app-editors/vim/Manifest | 1 + |
19 |
app-editors/vim/{vim-9999.ebuild => vim-8.1.1155.ebuild} | 11 +++++------ |
20 |
app-editors/vim/vim-9999.ebuild | 11 +++++------ |
21 |
3 files changed, 11 insertions(+), 12 deletions(-) |
22 |
|
23 |
diff --git a/app-editors/vim/Manifest b/app-editors/vim/Manifest |
24 |
index 03ef5c341e2..948bccea5da 100644 |
25 |
--- a/app-editors/vim/Manifest |
26 |
+++ b/app-editors/vim/Manifest |
27 |
@@ -4,3 +4,4 @@ DIST vim-8.0.1699.tar.gz 13546105 BLAKE2B cabf29d5a89c55e2fe3bc5e39eb499412f5907 |
28 |
DIST vim-8.1.0034.tar.gz 13652586 BLAKE2B 98dac6b37c04ea8c15f0b0e2e4145d6529138e0532e92751fd07be04a2180519135d386dfc19e7f12c8eb37b3e15ee81ba357680d453afab56d96299b69cb511 SHA512 b2b85035c6c60a09e903d8f6deb500e42ab8bfc2f9a5b959d0055a8e02dab3a91d5460fd5028e6634c5ef6ab034186b7155e341fa25e84b9851290708e892d19 |
29 |
DIST vim-8.1.0412.tar.gz 13857501 BLAKE2B 6925184359b8b36cb546c9fcba4bb01755455aa87171ea7328ece411a5a5ced45096b8bef8561059bbff9a3ade565e0648fd18dd091d6faad0eb8a67321337a5 SHA512 3f458c039a636d7d3e398f8aa9cba4b4ae650c00038618c4776959b6feb0a1e3ac56be2912c3d85cba8e8f301661a62d71acd34a4dd75dc4dc000a94bf1b237e |
30 |
DIST vim-8.1.0648.tar.gz 14061964 BLAKE2B 79bf52d8574167471c93942904dc2b4ad5648ec365561494bbad45c779154b75b0fff1d90229516e938371f1eaa5808659cb2181b150c4c13bf8501bd9987b38 SHA512 d41676a6bb6bc442f4946ca021b2835d7ea0e54fbefe1bfc728241e1bf203cc696b707fcca6f25c877660283a790cefa4259fbd14de88fd4db7390701189c454 |
31 |
+DIST vim-8.1.1155.tar.gz 14141750 BLAKE2B f15470768fbdc4e02552b8711626c3ad9647ec5b74ebaa3f82a4f32c050405ef0cf3f29d1e5bdbb4de008bf16262b8cdc81ff153e2694a184523cd913624e8e0 SHA512 0cdc42090958f4c91c13aeeefac0abc4feaa629d8b90c04bd01d5e23efefe21e6316e1b2c3b6015ecf9577573faea9a1b6660de8a2959642e65582dbe9c7f5c6 |
32 |
|
33 |
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-8.1.1155.ebuild |
34 |
similarity index 97% |
35 |
copy from app-editors/vim/vim-9999.ebuild |
36 |
copy to app-editors/vim/vim-8.1.1155.ebuild |
37 |
index 7f5fd67a23e..d5c9d74833a 100644 |
38 |
--- a/app-editors/vim/vim-9999.ebuild |
39 |
+++ b/app-editors/vim/vim-8.1.1155.ebuild |
40 |
@@ -3,9 +3,9 @@ |
41 |
|
42 |
EAPI=6 |
43 |
VIM_VERSION="8.1" |
44 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} ) |
45 |
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) |
46 |
PYTHON_REQ_USE="threads(+)" |
47 |
-USE_RUBY="ruby23 ruby24 ruby25" |
48 |
+USE_RUBY="ruby24 ruby25 ruby26" |
49 |
|
50 |
inherit vim-doc flag-o-matic bash-completion-r1 python-single-r1 ruby-single desktop xdg-utils |
51 |
|
52 |
@@ -27,6 +27,7 @@ IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby seli |
53 |
REQUIRED_USE=" |
54 |
luajit? ( lua ) |
55 |
python? ( ${PYTHON_REQUIRED_USE} ) |
56 |
+ vim-pager? ( !minimal ) |
57 |
" |
58 |
|
59 |
RDEPEND=" |
60 |
@@ -40,10 +41,8 @@ RDEPEND=" |
61 |
luajit? ( dev-lang/luajit:2= ) |
62 |
!luajit? ( dev-lang/lua:0[deprecated] ) |
63 |
) |
64 |
- !minimal? ( |
65 |
- ~app-editors/vim-core-${PV} |
66 |
- dev-util/ctags |
67 |
- ) |
68 |
+ !minimal? ( ~app-editors/vim-core-${PV} ) |
69 |
+ vim-pager? ( app-editors/vim-core[-minimal] ) |
70 |
perl? ( dev-lang/perl:= ) |
71 |
python? ( ${PYTHON_DEPS} ) |
72 |
racket? ( dev-scheme/racket ) |
73 |
|
74 |
diff --git a/app-editors/vim/vim-9999.ebuild b/app-editors/vim/vim-9999.ebuild |
75 |
index 7f5fd67a23e..d5c9d74833a 100644 |
76 |
--- a/app-editors/vim/vim-9999.ebuild |
77 |
+++ b/app-editors/vim/vim-9999.ebuild |
78 |
@@ -3,9 +3,9 @@ |
79 |
|
80 |
EAPI=6 |
81 |
VIM_VERSION="8.1" |
82 |
-PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6,3_7} ) |
83 |
+PYTHON_COMPAT=( python{2_7,3_5,3_6,3_7} ) |
84 |
PYTHON_REQ_USE="threads(+)" |
85 |
-USE_RUBY="ruby23 ruby24 ruby25" |
86 |
+USE_RUBY="ruby24 ruby25 ruby26" |
87 |
|
88 |
inherit vim-doc flag-o-matic bash-completion-r1 python-single-r1 ruby-single desktop xdg-utils |
89 |
|
90 |
@@ -27,6 +27,7 @@ IUSE="X acl cscope debug gpm lua luajit minimal nls perl python racket ruby seli |
91 |
REQUIRED_USE=" |
92 |
luajit? ( lua ) |
93 |
python? ( ${PYTHON_REQUIRED_USE} ) |
94 |
+ vim-pager? ( !minimal ) |
95 |
" |
96 |
|
97 |
RDEPEND=" |
98 |
@@ -40,10 +41,8 @@ RDEPEND=" |
99 |
luajit? ( dev-lang/luajit:2= ) |
100 |
!luajit? ( dev-lang/lua:0[deprecated] ) |
101 |
) |
102 |
- !minimal? ( |
103 |
- ~app-editors/vim-core-${PV} |
104 |
- dev-util/ctags |
105 |
- ) |
106 |
+ !minimal? ( ~app-editors/vim-core-${PV} ) |
107 |
+ vim-pager? ( app-editors/vim-core[-minimal] ) |
108 |
perl? ( dev-lang/perl:= ) |
109 |
python? ( ${PYTHON_DEPS} ) |
110 |
racket? ( dev-scheme/racket ) |