1 |
commit: a2e8ab8c896168fb01dffa922f2da78bc10f94e3 |
2 |
Author: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 2 12:30:59 2017 +0000 |
4 |
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 2 12:31:45 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=a2e8ab8c |
7 |
|
8 |
app-misc/tmux: tree version works |
9 |
|
10 |
app-misc/tmux/Manifest | 6 --- |
11 |
app-misc/tmux/files/tmux-2.0-flags.patch | 18 ------- |
12 |
app-misc/tmux/files/tmux-2.1-cdefs.patch | 25 --------- |
13 |
app-misc/tmux/files/tmux.vim | 1 - |
14 |
app-misc/tmux/metadata.xml | 21 -------- |
15 |
app-misc/tmux/tmux-2.1-r99.ebuild | 91 -------------------------------- |
16 |
6 files changed, 162 deletions(-) |
17 |
|
18 |
diff --git a/app-misc/tmux/Manifest b/app-misc/tmux/Manifest |
19 |
deleted file mode 100644 |
20 |
index 96da615..0000000 |
21 |
--- a/app-misc/tmux/Manifest |
22 |
+++ /dev/null |
23 |
@@ -1,6 +0,0 @@ |
24 |
-AUX tmux-2.0-flags.patch 584 SHA256 17dba9f233ca99e31d0619a47ca1cfd1f78bc429bfc9564e3fbc0174b39b61e7 SHA512 029a29182f5998c19883f24eab980d16f2e89c72f4150354e0a1101f9092491e836952fb9442e511508f47fd701c8cc8171f29c6ff097248894b6696d108f6dd WHIRLPOOL 026220084ff52382a168053b67bc5133b6d0d455059108ff85f58bb98eaab1656d1d76cd2c7814b9a7fde75e30cf79dfdf65c6c4429aa51852dfb9e6afef13e4 |
25 |
-AUX tmux-2.1-cdefs.patch 702 SHA256 cdb3a27b4349df196855ee23c7de47e43297d9a810efa537d85de731df2f023f SHA512 3457ca53d26142eec7c4d10a93bbc9308c532e0d66062fd9bf9a90fb05da074b25fc104a4fae2e9e2a5f2e10c04a3a4559469e6167fb3527acec292b8f9a5de0 WHIRLPOOL 13b5011af216f41aaded74e7f886ab1b2182330f0239cefa6fa5c2d992833d110e77c361ffeb1e02f2eaccc55644fe21af71a714db2c615af7f9a17451e9a319 |
26 |
-AUX tmux.vim 55 SHA256 ab10a475aa32e2aacba7b47e9ca38057ee2e447a953497a0349f1640167be6b7 SHA512 5307bf7d27209ce143d7a57856440ba0462783f5b047b00ec5a5046f1b72110e62ef8bca47b67807cb9e9ffcede06c512f6136d825260f735cc32a63706c9e5e WHIRLPOOL fa0019bcfcbe46aa9d383f8778ea4b7d8ec94f7b58f9c38b07c9b6649ea17363f2436e684d83c0c262711e30b62f90fe7f65d87e3a2c9dc5b391633f75a5d7ca |
27 |
-DIST tmux-2.1.tar.gz 462965 SHA256 31564e7bf4bcef2defb3cb34b9e596bd43a3937cad9e5438701a81a5a9af6176 SHA512 0faa0a60a84b777ca3cf572cf741d0e4f82a9f32d27dfeddfda41bad57830823a6d5f2323f27ba794b86e194d9f7db7028c94dc6a15bb4ac5a18508f890bdaa4 WHIRLPOOL 983024886bdb868bb69ccedc18e9fd62cc5a8f147d647ea43b6f20e297b9b3c45a061e542bcb590ab50cf5d3db43d22015c3a8f18bee33d9c76552bfe13424ed |
28 |
-EBUILD tmux-2.1-r99.ebuild 2215 SHA256 1d02c2144c03b3ebc6e4a4e21072c2a1bb1026d69a96461a8b7a003e14c57dd7 SHA512 558b3983bfbed44113fe0813f43566c6d108559b3af7462bec859064a910b6a00ac4822701a137463bb8fa7c6cff5ff4630e2db2ed14a79918c63e571e59b93a WHIRLPOOL a7201acf0e1b5abe9f1fa3d187033124e1b0c3827c95d77ce1d133a0417f1b6cf13db20c80907173f28917a2164fe3ab81dff228f0102f6af2ae551726089703 |
29 |
-MISC metadata.xml 758 SHA256 d8b1acdbe0283795479436be5437f76037fb54e0c6f32ec6cbe4142964bc1889 SHA512 560576353d246b8b63fb5287e3ead7054e8f7307c0d78e02dee378537a6ffb03edc3b444f1c54809a4807cb4ce1f22e7967ae5825692d3804b89cd1b4655e2c7 WHIRLPOOL 048f7302af5a1ed297d4664880e973304627e12565ceffd394a2564b7cf6efba94d0f6ac14d032262970d4b30b09db4ea83a7294f4ce7cdca5512510939f0d36 |
30 |
|
31 |
diff --git a/app-misc/tmux/files/tmux-2.0-flags.patch b/app-misc/tmux/files/tmux-2.0-flags.patch |
32 |
deleted file mode 100644 |
33 |
index d2c40e0..0000000 |
34 |
--- a/app-misc/tmux/files/tmux-2.0-flags.patch |
35 |
+++ /dev/null |
36 |
@@ -1,18 +0,0 @@ |
37 |
- Makefile.am | 3 +-- |
38 |
- 1 file changed, 1 insertion(+), 2 deletions(-) |
39 |
- |
40 |
-diff --git a/Makefile.am b/Makefile.am |
41 |
-index 63e20b1..a2fec1e 100644 |
42 |
---- a/Makefile.am |
43 |
-+++ b/Makefile.am |
44 |
-@@ -25,9 +25,8 @@ endif |
45 |
- # Set flags for gcc. gcc4 whines abouts silly stuff so it needs slightly |
46 |
- # different flags. |
47 |
- if IS_GCC |
48 |
--CFLAGS += -std=gnu99 -O2 |
49 |
-+CFLAGS += -std=gnu99 |
50 |
- if IS_DEBUG |
51 |
--CFLAGS += -g |
52 |
- CFLAGS += -Wno-long-long -Wall -W -Wnested-externs -Wformat=2 |
53 |
- CFLAGS += -Wmissing-prototypes -Wstrict-prototypes -Wmissing-declarations |
54 |
- CFLAGS += -Wwrite-strings -Wshadow -Wpointer-arith -Wsign-compare |
55 |
|
56 |
diff --git a/app-misc/tmux/files/tmux-2.1-cdefs.patch b/app-misc/tmux/files/tmux-2.1-cdefs.patch |
57 |
deleted file mode 100644 |
58 |
index f26a761..0000000 |
59 |
--- a/app-misc/tmux/files/tmux-2.1-cdefs.patch |
60 |
+++ /dev/null |
61 |
@@ -1,25 +0,0 @@ |
62 |
-Remove the dependency on sys/cdefs.h. |
63 |
- |
64 |
-Note that upstream has already done similar changes so it would be unnecessary |
65 |
-with newer versions. |
66 |
- |
67 |
-diff -ru tmux-2.1.orig/compat/vis.h tmux-2.1/compat/vis.h |
68 |
---- tmux-2.1.orig/compat/vis.h 2016-03-31 11:16:36.113228256 +0900 |
69 |
-+++ tmux-2.1/compat/vis.h 2016-03-31 11:17:04.263228615 +0900 |
70 |
-@@ -73,9 +73,6 @@ |
71 |
- */ |
72 |
- #define UNVIS_END 1 /* no more characters */ |
73 |
- |
74 |
--#include <sys/cdefs.h> |
75 |
-- |
76 |
--__BEGIN_DECLS |
77 |
- char *vis(char *, int, int, int); |
78 |
- int strvis(char *, const char *, int); |
79 |
- int stravis(char **, const char *, int); |
80 |
-@@ -85,6 +82,4 @@ |
81 |
- int unvis(char *, char, int *, int); |
82 |
- ssize_t strnunvis(char *, const char *, size_t); |
83 |
- |
84 |
--__END_DECLS |
85 |
-- |
86 |
- #endif /* !_VIS_H_ */ |
87 |
|
88 |
diff --git a/app-misc/tmux/files/tmux.vim b/app-misc/tmux/files/tmux.vim |
89 |
deleted file mode 100644 |
90 |
index baac50a..0000000 |
91 |
--- a/app-misc/tmux/files/tmux.vim |
92 |
+++ /dev/null |
93 |
@@ -1 +0,0 @@ |
94 |
-au BufNewFile,BufRead .tmux.conf*,tmux.conf* setf tmux |
95 |
|
96 |
diff --git a/app-misc/tmux/metadata.xml b/app-misc/tmux/metadata.xml |
97 |
deleted file mode 100644 |
98 |
index c2ae9d3..0000000 |
99 |
--- a/app-misc/tmux/metadata.xml |
100 |
+++ /dev/null |
101 |
@@ -1,21 +0,0 @@ |
102 |
-<?xml version="1.0" encoding="UTF-8"?> |
103 |
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> |
104 |
-<pkgmetadata> |
105 |
- <maintainer type="person"> |
106 |
- <email>wired@g.o</email> |
107 |
- <name>Alex Alexander</name> |
108 |
- </maintainer> |
109 |
- <maintainer type="project"> |
110 |
- <email>shell-tools@g.o</email> |
111 |
- <name>Gentoo Shell Tools Project</name> |
112 |
- </maintainer> |
113 |
- <longdescription> |
114 |
- tmux is a "terminal multiplexer", it enables a number of terminals |
115 |
- (or windows) to be accessed and controlled from a single terminal. |
116 |
- tmux is intended to be a simple, modern, BSD-licensed alternative to |
117 |
- programs such as <pkg>app-misc/screen</pkg>. |
118 |
- </longdescription> |
119 |
- <upstream> |
120 |
- <remote-id type="github">tmux/tmux</remote-id> |
121 |
- </upstream> |
122 |
-</pkgmetadata> |
123 |
|
124 |
diff --git a/app-misc/tmux/tmux-2.1-r99.ebuild b/app-misc/tmux/tmux-2.1-r99.ebuild |
125 |
deleted file mode 100644 |
126 |
index b33713b..0000000 |
127 |
--- a/app-misc/tmux/tmux-2.1-r99.ebuild |
128 |
+++ /dev/null |
129 |
@@ -1,91 +0,0 @@ |
130 |
-# Copyright 1999-2016 Gentoo Foundation |
131 |
-# Distributed under the terms of the GNU General Public License v2 |
132 |
-# $Id$ |
133 |
- |
134 |
-EAPI=5 |
135 |
- |
136 |
-AUTOTOOLS_AUTORECONF=true |
137 |
- |
138 |
-inherit autotools-utils bash-completion-r1 flag-o-matic versionator |
139 |
- |
140 |
-DESCRIPTION="Terminal multiplexer" |
141 |
-HOMEPAGE="http://tmux.github.io/" |
142 |
-SRC_URI="https://github.com/${PN}/${PN}/releases/download/${PV}/${P}.tar.gz" |
143 |
- |
144 |
-LICENSE="ISC" |
145 |
-SLOT="0" |
146 |
-KEYWORDS="amd64 arm ~mips ppc x86" |
147 |
-IUSE="debug selinux vim-syntax kernel_FreeBSD kernel_linux" |
148 |
- |
149 |
-CDEPEND=" |
150 |
- || ( |
151 |
- =dev-libs/libevent-2.0* |
152 |
- >=dev-libs/libevent-2.1.5-r4 |
153 |
- ) |
154 |
- kernel_linux? ( sys-libs/libutempter ) |
155 |
- kernel_FreeBSD? ( || ( >=sys-freebsd/freebsd-lib-9.0 sys-libs/libutempter ) ) |
156 |
- sys-libs/ncurses:0=" |
157 |
-DEPEND="${CDEPEND} |
158 |
- virtual/pkgconfig" |
159 |
-RDEPEND="${CDEPEND} |
160 |
- selinux? ( sec-policy/selinux-screen ) |
161 |
- vim-syntax? ( |
162 |
- || ( |
163 |
- app-editors/vim |
164 |
- app-editors/gvim |
165 |
- ) |
166 |
- )" |
167 |
- |
168 |
-DOCS=( CHANGES FAQ README TODO ) |
169 |
- |
170 |
-PATCHES=( "${FILESDIR}"/${PN}-2.0-flags.patch "${FILESDIR}"/${PN}-2.1-cdefs.patch ) |
171 |
- |
172 |
-src_prepare() { |
173 |
- # bug 438558 |
174 |
- # 1.7 segfaults when entering copy mode if compiled with -Os |
175 |
- replace-flags -Os -O2 |
176 |
- |
177 |
- # regenerate aclocal.m4 to support earlier automake versions |
178 |
- rm aclocal.m4 || die |
179 |
- |
180 |
- autotools-utils_src_prepare |
181 |
-} |
182 |
- |
183 |
-src_configure() { |
184 |
- local myeconfargs=( |
185 |
- --sysconfdir="${EPREFIX}"/etc |
186 |
- $(use_enable debug) |
187 |
- ) |
188 |
- autotools-utils_src_configure |
189 |
-} |
190 |
- |
191 |
-src_install() { |
192 |
- autotools-utils_src_install |
193 |
- |
194 |
- newbashcomp examples/bash_completion_tmux.sh ${PN} |
195 |
- |
196 |
- docinto examples |
197 |
- dodoc examples/*.conf |
198 |
- |
199 |
- if use vim-syntax; then |
200 |
- insinto /usr/share/vim/vimfiles/syntax |
201 |
- doins examples/tmux.vim |
202 |
- |
203 |
- insinto /usr/share/vim/vimfiles/ftdetect |
204 |
- doins "${FILESDIR}"/tmux.vim |
205 |
- fi |
206 |
-} |
207 |
- |
208 |
-pkg_postinst() { |
209 |
- if ! version_is_at_least 1.9a ${REPLACING_VERSIONS:-1.9a}; then |
210 |
- echo |
211 |
- ewarn "Some configuration options changed in this release." |
212 |
- ewarn "Please read the CHANGES file in /usr/share/doc/${PF}/" |
213 |
- ewarn |
214 |
- ewarn "WARNING: After updating to ${P} you will _not_ be able to connect to any" |
215 |
- ewarn "older, running tmux server instances. You'll have to use an existing client to" |
216 |
- ewarn "end your old sessions or kill the old server instances. Otherwise you'll have" |
217 |
- ewarn "to temporarily downgrade to access them." |
218 |
- echo |
219 |
- fi |
220 |
-} |