1 |
commit: 9c708259c59e0b607623bcde274183543a73472a |
2 |
Author: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu Jan 31 18:41:36 2019 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Feb 1 08:46:59 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c708259 |
7 |
|
8 |
app-misc/tmux: fix vim-syntax USE flag meaning. |
9 |
|
10 |
Install app-vim/tmux-vim, which contains tmux vim files, instead of |
11 |
plain app-editors/vim. |
12 |
|
13 |
Closes: https://bugs.gentoo.org/667550 |
14 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
15 |
Package-Manager: Portage-2.3.51, Repoman-2.3.11 |
16 |
|
17 |
app-misc/tmux/Manifest | 1 - |
18 |
.../tmux/{tmux-9999.ebuild => tmux-2.7-r1.ebuild} | 27 +++++++----------- |
19 |
.../tmux/{tmux-9999.ebuild => tmux-2.8-r1.ebuild} | 33 ++++++++-------------- |
20 |
app-misc/tmux/tmux-9999.ebuild | 12 ++------ |
21 |
4 files changed, 25 insertions(+), 48 deletions(-) |
22 |
|
23 |
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest |
24 |
index 9441c0d9fa5..576c077169f 100644 |
25 |
--- a/app-misc/tmux/Manifest |
26 |
+++ b/app-misc/tmux/Manifest |
27 |
@@ -1,4 +1,3 @@ |
28 |
DIST tmux-2.7.tar.gz 487585 BLAKE2B 9c56da03bd12b358fcbed82def9680c34e1e485f906cf9b90a501e53b109c43d1ee843972d26e677de2c34830e599edee022dc1c17e1e5c935ed232caacb2b01 SHA512 7839ef748ea55df8c02c727047f65bd235b5e3b8ab23157246071e1b9954fa269594da9fbd0fabf6a850e3b5dfda962a0a067c1507411c92a84d1db2666ecf37 |
29 |
DIST tmux-2.8.tar.gz 637609 BLAKE2B d95fbdbc79c2c512908f82778816aa8540bf2fe26509c91f46c8c64c8c13c9ea41487e3a816cc11274d4cc2868d16622c87efe978a65b08201c9a1c48e3c8c4b SHA512 d938854994e77f7941a31db79e25706150253feeba5e655a8fa853864e3073d2ee0ea218f972e7c7b9c814d8e8c63c2d9ef9b70ed1c6f8e993a900add4b995b5 |
30 |
DIST tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b 458 BLAKE2B 04143e6d1cfbbd467f1656f949363cb7a4a3e16e9b3cf56b8b0423babe56276abee2622964cb490005fc76d1cbe12201fb1a6446a6f860c2cc1ff3c9bd5fc496 SHA512 fe0aca7d03067af87e0788a2fa902c7ef5500ba72295cb63c5a1814534a008c224256d7f890ac1af6d17f3734b45148765e1632f075e284c453185df2927b979 |
31 |
-DIST tmux.vim-95f6126c187667cc7f9c573c45c3b356cf69f4ca 5626 BLAKE2B dd22713fee56e3dadd573c888ab17561879f756df369cdbe552e052842f527c5310c6cd46342ccd3e3e01835d0f616f4ecb202567674dc4809bc08253ad66bea SHA512 956b2c1ca08e3c92aa39c9df54fbe1c661d0e076c91628c4b88f81f97104241b6505412fa0e21a681adc231eb2e6e7feee850474d4277812d186548bbb05f6d1 |
32 |
|
33 |
diff --git a/app-misc/tmux/tmux-9999.ebuild b/app-misc/tmux/tmux-2.7-r1.ebuild |
34 |
similarity index 71% |
35 |
copy from app-misc/tmux/tmux-9999.ebuild |
36 |
copy to app-misc/tmux/tmux-2.7-r1.ebuild |
37 |
index 30b2bd54a86..22c5ad91fd7 100644 |
38 |
--- a/app-misc/tmux/tmux-9999.ebuild |
39 |
+++ b/app-misc/tmux/tmux-2.7-r1.ebuild |
40 |
@@ -1,19 +1,17 @@ |
41 |
-# Copyright 1999-2018 Gentoo Foundation |
42 |
+# Copyright 1999-2019 Gentoo Authors |
43 |
# Distributed under the terms of the GNU General Public License v2 |
44 |
|
45 |
EAPI=6 |
46 |
|
47 |
-inherit autotools git-r3 flag-o-matic versionator |
48 |
+inherit autotools flag-o-matic versionator |
49 |
|
50 |
DESCRIPTION="Terminal multiplexer" |
51 |
HOMEPAGE="https://tmux.github.io/" |
52 |
-SRC_URI="https://raw.githubusercontent.com/przepompownia/tmux-bash-completion/678a27616b70c649c6701cae9cd8c92b58cc051b/completions/tmux -> tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b |
53 |
-vim-syntax? ( https://raw.githubusercontent.com/keith/tmux.vim/95f6126c187667cc7f9c573c45c3b356cf69f4ca/syntax/tmux.vim -> tmux.vim-95f6126c187667cc7f9c573c45c3b356cf69f4ca )" |
54 |
-EGIT_REPO_URI="https://github.com/tmux/tmux.git" |
55 |
+SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV/_*}/${P/_/-}.tar.gz" |
56 |
|
57 |
LICENSE="ISC" |
58 |
SLOT="0" |
59 |
-KEYWORDS="" |
60 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
61 |
IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux" |
62 |
|
63 |
CDEPEND=" |
64 |
@@ -31,32 +29,28 @@ DEPEND=" |
65 |
RDEPEND=" |
66 |
${CDEPEND} |
67 |
selinux? ( sec-policy/selinux-screen ) |
68 |
- vim-syntax? ( |
69 |
- || ( |
70 |
- app-editors/vim |
71 |
- app-editors/gvim |
72 |
- ) |
73 |
- )" |
74 |
+ vim-syntax? ( app-vim/vim-tmux )" |
75 |
|
76 |
DOCS=( CHANGES README TODO ) |
77 |
|
78 |
+S="${WORKDIR}/${P/_/-}" |
79 |
+ |
80 |
PATCHES=( |
81 |
- "${FILESDIR}/${PN}-2.4-flags.patch" |
82 |
+ "${FILESDIR}"/${PN}-2.4-flags.patch |
83 |
|
84 |
# usptream fixes (can be removed with next version bump) |
85 |
) |
86 |
|
87 |
-S="${WORKDIR}/${P/_/-}" |
88 |
- |
89 |
src_prepare() { |
90 |
# bug 438558 |
91 |
# 1.7 segfaults when entering copy mode if compiled with -Os |
92 |
replace-flags -Os -O2 |
93 |
|
94 |
# regenerate aclocal.m4 to support earlier automake versions |
95 |
- rm -f aclocal.m4 || die |
96 |
+ rm aclocal.m4 || die |
97 |
|
98 |
default |
99 |
+ |
100 |
eautoreconf |
101 |
} |
102 |
|
103 |
@@ -66,7 +60,6 @@ src_configure() { |
104 |
$(use_enable debug) |
105 |
$(use_enable utempter) |
106 |
) |
107 |
- |
108 |
econf "${myeconfargs[@]}" |
109 |
} |
110 |
|
111 |
|
112 |
diff --git a/app-misc/tmux/tmux-9999.ebuild b/app-misc/tmux/tmux-2.8-r1.ebuild |
113 |
similarity index 66% |
114 |
copy from app-misc/tmux/tmux-9999.ebuild |
115 |
copy to app-misc/tmux/tmux-2.8-r1.ebuild |
116 |
index 30b2bd54a86..dda8486cd79 100644 |
117 |
--- a/app-misc/tmux/tmux-9999.ebuild |
118 |
+++ b/app-misc/tmux/tmux-2.8-r1.ebuild |
119 |
@@ -1,19 +1,18 @@ |
120 |
-# Copyright 1999-2018 Gentoo Foundation |
121 |
+# Copyright 1999-2019 Gentoo Authors |
122 |
# Distributed under the terms of the GNU General Public License v2 |
123 |
|
124 |
-EAPI=6 |
125 |
+EAPI=7 |
126 |
|
127 |
-inherit autotools git-r3 flag-o-matic versionator |
128 |
+inherit autotools flag-o-matic |
129 |
|
130 |
DESCRIPTION="Terminal multiplexer" |
131 |
HOMEPAGE="https://tmux.github.io/" |
132 |
-SRC_URI="https://raw.githubusercontent.com/przepompownia/tmux-bash-completion/678a27616b70c649c6701cae9cd8c92b58cc051b/completions/tmux -> tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b |
133 |
-vim-syntax? ( https://raw.githubusercontent.com/keith/tmux.vim/95f6126c187667cc7f9c573c45c3b356cf69f4ca/syntax/tmux.vim -> tmux.vim-95f6126c187667cc7f9c573c45c3b356cf69f4ca )" |
134 |
-EGIT_REPO_URI="https://github.com/tmux/tmux.git" |
135 |
+SRC_URI="https://github.com/tmux/tmux/releases/download/$(ver_cut 1-2)/${P}.tar.gz" |
136 |
+SRC_URI="https://github.com/tmux/tmux/archive/${PV}.tar.gz -> ${P}.tar.gz" |
137 |
|
138 |
LICENSE="ISC" |
139 |
SLOT="0" |
140 |
-KEYWORDS="" |
141 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos" |
142 |
IUSE="debug selinux utempter vim-syntax kernel_FreeBSD kernel_linux" |
143 |
|
144 |
CDEPEND=" |
145 |
@@ -31,32 +30,25 @@ DEPEND=" |
146 |
RDEPEND=" |
147 |
${CDEPEND} |
148 |
selinux? ( sec-policy/selinux-screen ) |
149 |
- vim-syntax? ( |
150 |
- || ( |
151 |
- app-editors/vim |
152 |
- app-editors/gvim |
153 |
- ) |
154 |
- )" |
155 |
+ vim-syntax? ( app-vim/vim-tmux )" |
156 |
|
157 |
DOCS=( CHANGES README TODO ) |
158 |
|
159 |
+S="${WORKDIR}/${P/_/-}" |
160 |
+ |
161 |
PATCHES=( |
162 |
- "${FILESDIR}/${PN}-2.4-flags.patch" |
163 |
+ "${FILESDIR}"/${PN}-2.4-flags.patch |
164 |
|
165 |
# usptream fixes (can be removed with next version bump) |
166 |
) |
167 |
|
168 |
-S="${WORKDIR}/${P/_/-}" |
169 |
- |
170 |
src_prepare() { |
171 |
# bug 438558 |
172 |
# 1.7 segfaults when entering copy mode if compiled with -Os |
173 |
replace-flags -Os -O2 |
174 |
|
175 |
- # regenerate aclocal.m4 to support earlier automake versions |
176 |
- rm -f aclocal.m4 || die |
177 |
- |
178 |
default |
179 |
+ |
180 |
eautoreconf |
181 |
} |
182 |
|
183 |
@@ -66,7 +58,6 @@ src_configure() { |
184 |
$(use_enable debug) |
185 |
$(use_enable utempter) |
186 |
) |
187 |
- |
188 |
econf "${myeconfargs[@]}" |
189 |
} |
190 |
|
191 |
@@ -80,7 +71,7 @@ src_install() { |
192 |
} |
193 |
|
194 |
pkg_postinst() { |
195 |
- if ! version_is_at_least 1.9a ${REPLACING_VERSIONS:-1.9a}; then |
196 |
+ if ! ver_test 1.9a -ge ${REPLACING_VERSIONS:-1.9a}; then |
197 |
echo |
198 |
ewarn "Some configuration options changed in this release." |
199 |
ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/" |
200 |
|
201 |
diff --git a/app-misc/tmux/tmux-9999.ebuild b/app-misc/tmux/tmux-9999.ebuild |
202 |
index 30b2bd54a86..103653e26eb 100644 |
203 |
--- a/app-misc/tmux/tmux-9999.ebuild |
204 |
+++ b/app-misc/tmux/tmux-9999.ebuild |
205 |
@@ -1,4 +1,4 @@ |
206 |
-# Copyright 1999-2018 Gentoo Foundation |
207 |
+# Copyright 1999-2019 Gentoo Authors |
208 |
# Distributed under the terms of the GNU General Public License v2 |
209 |
|
210 |
EAPI=6 |
211 |
@@ -7,8 +7,7 @@ inherit autotools git-r3 flag-o-matic versionator |
212 |
|
213 |
DESCRIPTION="Terminal multiplexer" |
214 |
HOMEPAGE="https://tmux.github.io/" |
215 |
-SRC_URI="https://raw.githubusercontent.com/przepompownia/tmux-bash-completion/678a27616b70c649c6701cae9cd8c92b58cc051b/completions/tmux -> tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b |
216 |
-vim-syntax? ( https://raw.githubusercontent.com/keith/tmux.vim/95f6126c187667cc7f9c573c45c3b356cf69f4ca/syntax/tmux.vim -> tmux.vim-95f6126c187667cc7f9c573c45c3b356cf69f4ca )" |
217 |
+SRC_URI="https://raw.githubusercontent.com/przepompownia/tmux-bash-completion/678a27616b70c649c6701cae9cd8c92b58cc051b/completions/tmux -> tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b" |
218 |
EGIT_REPO_URI="https://github.com/tmux/tmux.git" |
219 |
|
220 |
LICENSE="ISC" |
221 |
@@ -31,12 +30,7 @@ DEPEND=" |
222 |
RDEPEND=" |
223 |
${CDEPEND} |
224 |
selinux? ( sec-policy/selinux-screen ) |
225 |
- vim-syntax? ( |
226 |
- || ( |
227 |
- app-editors/vim |
228 |
- app-editors/gvim |
229 |
- ) |
230 |
- )" |
231 |
+ vim-syntax? ( app-vim/vim-tmux )" |
232 |
|
233 |
DOCS=( CHANGES README TODO ) |