Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/mc/, app-misc/mc/files/
Date: Wed, 23 Dec 2015 08:33:42
Message-Id: 1450859614.972fa7adcc0d64db8b9c7a274c32fa1723961697.polynomial-c@gentoo
1 commit: 972fa7adcc0d64db8b9c7a274c32fa1723961697
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Dec 23 08:25:16 2015 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Dec 23 08:33:34 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=972fa7ad
7
8 app-misc/mc: Removed old.
9
10 Package-Manager: portage-2.2.26
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 app-misc/mc/Manifest | 3 -
14 .../mc/files/mc-4.8.11-ncurses_build_fix.patch | 38 -------
15 app-misc/mc/files/mc-4.8.13-3297-prealloc.patch | 120 ---------------------
16 app-misc/mc/mc-4.8.11.ebuild | 99 -----------------
17 app-misc/mc/mc-4.8.12.ebuild | 97 -----------------
18 app-misc/mc/mc-4.8.13-r1.ebuild | 102 ------------------
19 app-misc/mc/mc-4.8.13.ebuild | 100 -----------------
20 7 files changed, 559 deletions(-)
21
22 diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
23 index b942724..a60c2bd 100644
24 --- a/app-misc/mc/Manifest
25 +++ b/app-misc/mc/Manifest
26 @@ -1,5 +1,2 @@
27 -DIST mc-4.8.11.tar.xz 2211144 SHA256 1877ea844f9d71e133b9e03ca3bebcd7b10b9ba5b419b8d268e255816fe1993a SHA512 5afb9e0704b8c0e98cd4787f03baf40131a0ab40027103e42f44b2ebd5b6c33b8702d7f534ca8175f3b8efbb25a04f08f0f51a1eb3a1783a99e6117472344fbc WHIRLPOOL bbe6dbad549f45b9d4aab0985ce9a2c35e42017d2f2020972d27d8d43c66473c49fea8754fd6635195b72e6a531625a28327c0f2aa65f5e79cea0db0d54ea7e6
28 -DIST mc-4.8.12.tar.xz 2237892 SHA256 5f2fd570a798dc0cc06374adffef8ca403588c4e73dfdf908e9a4311718153fe SHA512 f482177fd2a457b75d96b953922f473ad669ae4d83910c0c3d5445dd459fff38c9abdc0b39e531b58692e00beb6cae2ca4858d79f55204105a62889784b1fbd3 WHIRLPOOL 79fa8fef9f1a076588093360a1f1b5f31ad6e88c2de285408c118492f9d1e9d37ab8d36d3d96b3dae29e3d547a5ecca601cf5ef0a49e7d3e6f5c81a8172536ba
29 -DIST mc-4.8.13.tar.xz 2231448 SHA256 36d6191a47ec5d89d3788e48846fb620c481816441ff25264add8898d277b657 SHA512 556047072cc1d22a911cfb3cc82b03d204881f2773e06a8fe2020ecfbd4ffa491e1c710ca2124b9f3b219cd73f2b732a4bfad1671f095c1768864704514b067f WHIRLPOOL 4224dea453e6d46aa0a783bcf1778dab5dc8eac090bae45a617145a8507e7c65b78dd7d7b0f50d2477a4002c62c75ce5304be59a20e84842042fe602318cccf4
30 DIST mc-4.8.14.tar.xz 2305788 SHA256 6b1f74efbdf394bfab084f4d2ea2e72173de5f12cd42be2533ca2c3b72edb8e6 SHA512 656a15d117db9a831dcd6f59965a643199cf533d744db3bb6dfaba59854eb07213fa54a3aeb1878abb179d836b434d84490ba505e05c7d829b4ae2ac46e5e724 WHIRLPOOL 6a59dbb517960e39c52c4eaa04b295e17af97cc121ffd2f93f35ad42940dc870f39c3a8c2c310051807ef5649b11fab05e46567b1a635b4e0e192924bd0ae0aa
31 DIST mc-4.8.15.tar.xz 2304812 SHA256 cf4e8f5dfe419830d56ca7e5f2495898e37ebcd05da1e47ff7041446c87fba16 SHA512 b8e05e1bcadcb766a43269a4724e36b77221b004d53783718fe455167693ff029e3e54cde47740d0c0ecd5adacfb3960a8ecce76eeaea234bbbcfd54db3b1760 WHIRLPOOL 6ddf2f5b88825584653a7027d515bfc84caba003408df31b4b8257a3f8c81a179e39a7bb7cc8571976537983f5dac7d6c06ddfbd6142ef0b31639a914f56c0f1
32
33 diff --git a/app-misc/mc/files/mc-4.8.11-ncurses_build_fix.patch b/app-misc/mc/files/mc-4.8.11-ncurses_build_fix.patch
34 deleted file mode 100644
35 index 0d986eb..0000000
36 --- a/app-misc/mc/files/mc-4.8.11-ncurses_build_fix.patch
37 +++ /dev/null
38 @@ -1,38 +0,0 @@
39 -Index: lib/tty/key.c
40 -===================================================================
41 ---- lib/tty/key.c (revision 0ed4a91d7df4e50512defd2e0734ecab7c9da07f)
42 -+++ lib/tty/key.c (revision 21bf5d2dde704fd9ae90d991ce1279ba925897c9)
43 -@@ -1947,4 +1947,5 @@
44 - {
45 - int c;
46 -+ static int flag = 0; /* Return value from select */
47 - #ifdef HAVE_LIBGPM
48 - static struct Gpm_Event ev; /* Mouse event */
49 -@@ -1979,5 +1980,4 @@
50 - {
51 - int nfd;
52 -- static int flag = 0; /* Return value from select */
53 - fd_set select_set;
54 -
55 -Index: lib/tty/tty-ncurses.c
56 -===================================================================
57 ---- lib/tty/tty-ncurses.c (revision bb65b467900ea9eb1f7867c059fd26fac86c747c)
58 -+++ lib/tty/tty-ncurses.c (revision 21bf5d2dde704fd9ae90d991ce1279ba925897c9)
59 -@@ -50,4 +50,5 @@
60 - #include "tty.h"
61 - #include "color-internal.h"
62 -+#include "key.h"
63 - #include "mouse.h"
64 - #include "win.h"
65 -@@ -531,4 +532,5 @@
66 - {
67 - int res;
68 -+ unsigned char str[UTF8_CHAR_LEN + 1];
69 -
70 - res = g_unichar_to_utf8 (c, (char *) str);
71 -@@ -541,5 +543,4 @@
72 - else
73 - {
74 -- unsigned char str[UTF8_CHAR_LEN + 1];
75 - const char *s;
76 -
77
78 diff --git a/app-misc/mc/files/mc-4.8.13-3297-prealloc.patch b/app-misc/mc/files/mc-4.8.13-3297-prealloc.patch
79 deleted file mode 100644
80 index d84c348..0000000
81 --- a/app-misc/mc/files/mc-4.8.13-3297-prealloc.patch
82 +++ /dev/null
83 @@ -1,120 +0,0 @@
84 -commit a3486faac37680e3bcf7d0b3905f745765a823fd
85 -Author: Andrew Borodin <aborodin@×××××.ru>
86 -Date: Mon Nov 10 10:32:34 2014 +0300
87 -
88 - Ticket #3297: don't lose file in case of preallocate space fail.
89 -
90 - Don't remove the destination file if it was retrieved incompletely
91 - but it was already exist and appended during copy/move operation.
92 -
93 - Signed-off-by: Andrew Borodin <aborodin@×××××.ru>
94 -
95 -diff --git a/src/filemanager/file.c b/src/filemanager/file.c
96 -index 9fbf081..3009ccf 100644
97 ---- a/src/filemanager/file.c
98 -+++ b/src/filemanager/file.c
99 -@@ -1497,7 +1497,6 @@ copy_file_file (file_op_total_context_t * tctx, file_op_context_t * ctx,
100 - int open_flags;
101 - gboolean is_first_time = TRUE;
102 - vfs_path_t *src_vpath = NULL, *dst_vpath = NULL;
103 -- gboolean write_errno_nospace = FALSE;
104 -
105 - /* FIXME: We should not be using global variables! */
106 - ctx->do_reget = 0;
107 -@@ -1739,28 +1738,39 @@ copy_file_file (file_op_total_context_t * tctx, file_op_context_t * ctx,
108 - goto ret;
109 - }
110 -
111 -- while (TRUE)
112 -+ /* try preallocate space; if fail, try copy anyway */
113 -+ while (vfs_preallocate (dest_desc, file_size, ctx->do_append != 0 ? sb.st_size : 0) != 0)
114 - {
115 -- errno = vfs_preallocate (dest_desc, file_size, (ctx->do_append != 0) ? sb.st_size : 0);
116 -- if (errno == 0)
117 -+ if (ctx->skip_all)
118 -+ {
119 -+ /* cannot allocate, start the file copying anyway */
120 -+ return_status = FILE_CONT;
121 - break;
122 -+ }
123 -
124 -- if (ctx->skip_all)
125 -- return_status = FILE_SKIPALL;
126 -- else
127 -+ return_status =
128 -+ file_error (_("Cannot preallocate space for target file \"%s\"\n%s"), dst_path);
129 -+
130 -+ if (return_status == FILE_SKIPALL)
131 -+ ctx->skip_all = TRUE;
132 -+
133 -+ if (ctx->skip_all || return_status == FILE_SKIP)
134 - {
135 -- return_status =
136 -- file_error (_("Cannot preallocate space for target file \"%s\"\n%s"), dst_path);
137 -- if (return_status == FILE_RETRY)
138 -- continue;
139 -- if (return_status == FILE_SKIPALL)
140 -- ctx->skip_all = TRUE;
141 -+ /* skip the space allocation error, start file copying */
142 -+ return_status = FILE_CONT;
143 -+ break;
144 - }
145 -- mc_close (dest_desc);
146 -- dest_desc = -1;
147 -- mc_unlink (dst_vpath);
148 -- dst_status = DEST_NONE;
149 -- goto ret;
150 -+
151 -+ if (return_status == FILE_ABORT)
152 -+ {
153 -+ mc_close (dest_desc);
154 -+ dest_desc = -1;
155 -+ mc_unlink (dst_vpath);
156 -+ dst_status = DEST_NONE;
157 -+ goto ret;
158 -+ }
159 -+
160 -+ /* return_status == FILE_RETRY -- try allocate space again */
161 - }
162 -
163 - ctx->eta_secs = 0.0;
164 -@@ -1822,6 +1832,8 @@ copy_file_file (file_op_total_context_t * tctx, file_op_context_t * ctx,
165 - /* dst_write */
166 - while ((n_written = mc_write (dest_desc, t, n_read)) < n_read)
167 - {
168 -+ gboolean write_errno_nospace;
169 -+
170 - if (n_written > 0)
171 - {
172 - n_read -= n_written;
173 -@@ -1851,10 +1863,6 @@ copy_file_file (file_op_total_context_t * tctx, file_op_context_t * ctx,
174 - }
175 - if (return_status != FILE_RETRY)
176 - goto ret;
177 --
178 -- /* User pressed "Retry". Will the next mc_write() call be successful?
179 -- * Reset error flag to be ready for that. */
180 -- write_errno_nospace = FALSE;
181 - }
182 - }
183 -
184 -@@ -1933,16 +1941,9 @@ copy_file_file (file_op_total_context_t * tctx, file_op_context_t * ctx,
185 -
186 - if (dst_status == DEST_SHORT)
187 - {
188 -- /* Remove short file */
189 -- int result = 0;
190 --
191 -- /* In case of copy/move to full partition, keep source file
192 -- * and remove incomplete destination one */
193 -- if (!write_errno_nospace)
194 -- result = query_dialog (Q_ ("DialogTitle|Copy"),
195 -- _("Incomplete file was retrieved. Keep it?"),
196 -- D_ERROR, 2, _("&Delete"), _("&Keep"));
197 -- if (result == 0)
198 -+ /* Query to remove short file */
199 -+ if (query_dialog (Q_ ("DialogTitle|Copy"), _("Incomplete file was retrieved. Keep it?"),
200 -+ D_ERROR, 2, _("&Delete"), _("&Keep")) == 0)
201 - mc_unlink (dst_vpath);
202 - }
203 - else if (dst_status == DEST_FULL)
204
205 diff --git a/app-misc/mc/mc-4.8.11.ebuild b/app-misc/mc/mc-4.8.11.ebuild
206 deleted file mode 100644
207 index 6b7bf3c..0000000
208 --- a/app-misc/mc/mc-4.8.11.ebuild
209 +++ /dev/null
210 @@ -1,99 +0,0 @@
211 -# Copyright 1999-2014 Gentoo Foundation
212 -# Distributed under the terms of the GNU General Public License v2
213 -# $Id$
214 -
215 -EAPI=5
216 -
217 -inherit eutils flag-o-matic
218 -
219 -MY_P=${P/_/-}
220 -
221 -DESCRIPTION="GNU Midnight Commander is a text based file manager"
222 -HOMEPAGE="http://www.midnight-commander.org"
223 -SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"
224 -
225 -LICENSE="GPL-3"
226 -SLOT="0"
227 -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
228 -IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
229 -
230 -REQUIRED_USE="spell? ( edit )"
231 -
232 -RDEPEND=">=dev-libs/glib-2.8:2
233 - gpm? ( sys-libs/gpm )
234 - kernel_linux? ( sys-fs/e2fsprogs )
235 - samba? ( net-fs/samba )
236 - sftp? ( net-libs/libssh2 )
237 - slang? ( >=sys-libs/slang-2 )
238 - !slang? ( sys-libs/ncurses )
239 - spell? ( app-text/aspell )
240 - X? ( x11-libs/libX11
241 - x11-libs/libICE
242 - x11-libs/libXau
243 - x11-libs/libXdmcp
244 - x11-libs/libSM )"
245 -DEPEND="${RDEPEND}
246 - app-arch/xz-utils
247 - virtual/pkgconfig
248 - nls? ( sys-devel/gettext )
249 - test? ( dev-libs/check )
250 - "
251 -
252 -[[ -n ${LIVE_EBUILD} ]] && DEPEND="${DEPEND} dev-vcs/cvs" # needed only for SCM source tree (autopoint uses cvs)
253 -
254 -src_prepare() {
255 - epatch "${FILESDIR}"/${P}-ncurses_build_fix.patch
256 -
257 - [[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
258 -}
259 -
260 -S=${WORKDIR}/${MY_P}
261 -
262 -src_configure() {
263 - local myscreen=ncurses
264 - use slang && myscreen=slang
265 - [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
266 -
267 - local homedir=".mc"
268 - use xdg && homedir="XDG"
269 -
270 - econf \
271 - --disable-silent-rules \
272 - --disable-dependency-tracking \
273 - $(use_enable nls) \
274 - --enable-vfs \
275 - $(use_enable kernel_linux vfs-undelfs) \
276 - --enable-charset \
277 - $(use_with X x) \
278 - $(use_enable samba vfs-smb) \
279 - $(use_enable sftp vfs-sftp) \
280 - $(use_enable spell aspell) \
281 - $(use_with gpm gpm-mouse) \
282 - --with-screen=${myscreen} \
283 - $(use_with edit internal-edit) \
284 - $(use_enable mclib) \
285 - $(use_enable test tests) \
286 - --with-homedir=${homedir}
287 -}
288 -
289 -src_install() {
290 - emake DESTDIR="${D}" install
291 - dodoc AUTHORS README NEWS
292 -
293 - # fix bug #334383
294 - if use kernel_linux && [[ ${EUID} == 0 ]] ; then
295 - fowners root:tty /usr/libexec/mc/cons.saver
296 - fperms g+s /usr/libexec/mc/cons.saver
297 - fi
298 -
299 - if ! use xdg ; then
300 - sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
301 - -i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
302 - fi
303 -}
304 -
305 -pkg_postinst() {
306 - elog "To enable exiting to latest working directory,"
307 - elog "put this into your ~/.bashrc:"
308 - elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
309 -}
310
311 diff --git a/app-misc/mc/mc-4.8.12.ebuild b/app-misc/mc/mc-4.8.12.ebuild
312 deleted file mode 100644
313 index 7074bfc..0000000
314 --- a/app-misc/mc/mc-4.8.12.ebuild
315 +++ /dev/null
316 @@ -1,97 +0,0 @@
317 -# Copyright 1999-2014 Gentoo Foundation
318 -# Distributed under the terms of the GNU General Public License v2
319 -# $Id$
320 -
321 -EAPI=5
322 -
323 -inherit eutils flag-o-matic
324 -
325 -MY_P=${P/_/-}
326 -
327 -DESCRIPTION="GNU Midnight Commander is a text based file manager"
328 -HOMEPAGE="http://www.midnight-commander.org"
329 -SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"
330 -
331 -LICENSE="GPL-3"
332 -SLOT="0"
333 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
334 -IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
335 -
336 -REQUIRED_USE="spell? ( edit )"
337 -
338 -RDEPEND=">=dev-libs/glib-2.8:2
339 - gpm? ( sys-libs/gpm )
340 - kernel_linux? ( sys-fs/e2fsprogs )
341 - samba? ( net-fs/samba )
342 - sftp? ( net-libs/libssh2 )
343 - slang? ( >=sys-libs/slang-2 )
344 - !slang? ( sys-libs/ncurses )
345 - spell? ( app-text/aspell )
346 - X? ( x11-libs/libX11
347 - x11-libs/libICE
348 - x11-libs/libXau
349 - x11-libs/libXdmcp
350 - x11-libs/libSM )"
351 -DEPEND="${RDEPEND}
352 - app-arch/xz-utils
353 - virtual/pkgconfig
354 - nls? ( sys-devel/gettext )
355 - test? ( dev-libs/check )
356 - "
357 -
358 -[[ -n ${LIVE_EBUILD} ]] && DEPEND="${DEPEND} dev-vcs/cvs" # needed only for SCM source tree (autopoint uses cvs)
359 -
360 -src_prepare() {
361 - [[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
362 -}
363 -
364 -S=${WORKDIR}/${MY_P}
365 -
366 -src_configure() {
367 - local myscreen=ncurses
368 - use slang && myscreen=slang
369 - [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
370 -
371 - local homedir=".mc"
372 - use xdg && homedir="XDG"
373 -
374 - econf \
375 - --disable-silent-rules \
376 - --disable-dependency-tracking \
377 - $(use_enable nls) \
378 - --enable-vfs \
379 - $(use_enable kernel_linux vfs-undelfs) \
380 - --enable-charset \
381 - $(use_with X x) \
382 - $(use_enable samba vfs-smb) \
383 - $(use_enable sftp vfs-sftp) \
384 - $(use_enable spell aspell) \
385 - $(use_with gpm gpm-mouse) \
386 - --with-screen=${myscreen} \
387 - $(use_with edit internal-edit) \
388 - $(use_enable mclib) \
389 - $(use_enable test tests) \
390 - --with-homedir=${homedir}
391 -}
392 -
393 -src_install() {
394 - emake DESTDIR="${D}" install
395 - dodoc AUTHORS README NEWS
396 -
397 - # fix bug #334383
398 - if use kernel_linux && [[ ${EUID} == 0 ]] ; then
399 - fowners root:tty /usr/libexec/mc/cons.saver
400 - fperms g+s /usr/libexec/mc/cons.saver
401 - fi
402 -
403 - if ! use xdg ; then
404 - sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
405 - -i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
406 - fi
407 -}
408 -
409 -pkg_postinst() {
410 - elog "To enable exiting to latest working directory,"
411 - elog "put this into your ~/.bashrc:"
412 - elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
413 -}
414
415 diff --git a/app-misc/mc/mc-4.8.13-r1.ebuild b/app-misc/mc/mc-4.8.13-r1.ebuild
416 deleted file mode 100644
417 index 5e32124..0000000
418 --- a/app-misc/mc/mc-4.8.13-r1.ebuild
419 +++ /dev/null
420 @@ -1,102 +0,0 @@
421 -# Copyright 1999-2014 Gentoo Foundation
422 -# Distributed under the terms of the GNU General Public License v2
423 -# $Id$
424 -
425 -EAPI=5
426 -
427 -inherit autotools eutils flag-o-matic
428 -
429 -MY_P=${P/_/-}
430 -
431 -DESCRIPTION="GNU Midnight Commander is a text based file manager"
432 -HOMEPAGE="http://www.midnight-commander.org"
433 -SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"
434 -
435 -LICENSE="GPL-3"
436 -SLOT="0"
437 -KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
438 -IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
439 -
440 -REQUIRED_USE="spell? ( edit )"
441 -
442 -RDEPEND=">=dev-libs/glib-2.8:2
443 - gpm? ( sys-libs/gpm )
444 - kernel_linux? ( sys-fs/e2fsprogs )
445 - samba? ( net-fs/samba )
446 - sftp? ( net-libs/libssh2 )
447 - slang? ( >=sys-libs/slang-2 )
448 - !slang? ( sys-libs/ncurses )
449 - spell? ( app-text/aspell )
450 - X? ( x11-libs/libX11
451 - x11-libs/libICE
452 - x11-libs/libXau
453 - x11-libs/libXdmcp
454 - x11-libs/libSM )"
455 -DEPEND="${RDEPEND}
456 - app-arch/xz-utils
457 - virtual/pkgconfig
458 - nls? ( sys-devel/gettext )
459 - test? ( dev-libs/check )
460 - "
461 -
462 -[[ -n ${LIVE_EBUILD} ]] && DEPEND="${DEPEND} dev-vcs/cvs" # needed only for SCM source tree (autopoint uses cvs)
463 -
464 -src_prepare() {
465 - [[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
466 -
467 - epatch "${FILESDIR}"/${P}-tinfo.patch
468 - epatch "${FILESDIR}"/${P}-3297-prealloc.patch
469 - epatch_user
470 - eautoreconf
471 -}
472 -
473 -S=${WORKDIR}/${MY_P}
474 -
475 -src_configure() {
476 - local myscreen=ncurses
477 - use slang && myscreen=slang
478 - [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
479 -
480 - local homedir=".mc"
481 - use xdg && homedir="XDG"
482 -
483 - econf \
484 - --disable-silent-rules \
485 - --disable-dependency-tracking \
486 - $(use_enable nls) \
487 - --enable-vfs \
488 - $(use_enable kernel_linux vfs-undelfs) \
489 - --enable-charset \
490 - $(use_with X x) \
491 - $(use_enable samba vfs-smb) \
492 - $(use_enable sftp vfs-sftp) \
493 - $(use_enable spell aspell) \
494 - $(use_with gpm gpm-mouse) \
495 - --with-screen=${myscreen} \
496 - $(use_with edit internal-edit) \
497 - $(use_enable mclib) \
498 - $(use_enable test tests) \
499 - --with-homedir=${homedir}
500 -}
501 -
502 -src_install() {
503 - emake DESTDIR="${D}" install
504 - dodoc AUTHORS README NEWS
505 -
506 - # fix bug #334383
507 - if use kernel_linux && [[ ${EUID} == 0 ]] ; then
508 - fowners root:tty /usr/libexec/mc/cons.saver
509 - fperms g+s /usr/libexec/mc/cons.saver
510 - fi
511 -
512 - if ! use xdg ; then
513 - sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
514 - -i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
515 - fi
516 -}
517 -
518 -pkg_postinst() {
519 - elog "To enable exiting to latest working directory,"
520 - elog "put this into your ~/.bashrc:"
521 - elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
522 -}
523
524 diff --git a/app-misc/mc/mc-4.8.13.ebuild b/app-misc/mc/mc-4.8.13.ebuild
525 deleted file mode 100644
526 index e5c3d02..0000000
527 --- a/app-misc/mc/mc-4.8.13.ebuild
528 +++ /dev/null
529 @@ -1,100 +0,0 @@
530 -# Copyright 1999-2015 Gentoo Foundation
531 -# Distributed under the terms of the GNU General Public License v2
532 -# $Id$
533 -
534 -EAPI=5
535 -
536 -inherit autotools eutils flag-o-matic
537 -
538 -MY_P=${P/_/-}
539 -
540 -DESCRIPTION="GNU Midnight Commander is a text based file manager"
541 -HOMEPAGE="http://www.midnight-commander.org"
542 -SRC_URI="http://www.midnight-commander.org/downloads/${MY_P}.tar.xz"
543 -
544 -LICENSE="GPL-3"
545 -SLOT="0"
546 -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
547 -IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
548 -
549 -REQUIRED_USE="spell? ( edit )"
550 -
551 -RDEPEND=">=dev-libs/glib-2.8:2
552 - gpm? ( sys-libs/gpm )
553 - kernel_linux? ( sys-fs/e2fsprogs )
554 - samba? ( net-fs/samba )
555 - sftp? ( net-libs/libssh2 )
556 - slang? ( >=sys-libs/slang-2 )
557 - !slang? ( sys-libs/ncurses )
558 - spell? ( app-text/aspell )
559 - X? ( x11-libs/libX11
560 - x11-libs/libICE
561 - x11-libs/libXau
562 - x11-libs/libXdmcp
563 - x11-libs/libSM )"
564 -DEPEND="${RDEPEND}
565 - app-arch/xz-utils
566 - virtual/pkgconfig
567 - nls? ( sys-devel/gettext )
568 - test? ( dev-libs/check )
569 - "
570 -
571 -[[ -n ${LIVE_EBUILD} ]] && DEPEND="${DEPEND} dev-vcs/cvs" # needed only for SCM source tree (autopoint uses cvs)
572 -
573 -src_prepare() {
574 - [[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
575 -
576 - epatch "${FILESDIR}"/${P}-tinfo.patch
577 - eautoreconf
578 -}
579 -
580 -S=${WORKDIR}/${MY_P}
581 -
582 -src_configure() {
583 - local myscreen=ncurses
584 - use slang && myscreen=slang
585 - [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
586 -
587 - local homedir=".mc"
588 - use xdg && homedir="XDG"
589 -
590 - econf \
591 - --disable-silent-rules \
592 - --disable-dependency-tracking \
593 - $(use_enable nls) \
594 - --enable-vfs \
595 - $(use_enable kernel_linux vfs-undelfs) \
596 - --enable-charset \
597 - $(use_with X x) \
598 - $(use_enable samba vfs-smb) \
599 - $(use_enable sftp vfs-sftp) \
600 - $(use_enable spell aspell) \
601 - $(use_with gpm gpm-mouse) \
602 - --with-screen=${myscreen} \
603 - $(use_with edit internal-edit) \
604 - $(use_enable mclib) \
605 - $(use_enable test tests) \
606 - --with-homedir=${homedir}
607 -}
608 -
609 -src_install() {
610 - emake DESTDIR="${D}" install
611 - dodoc AUTHORS README NEWS
612 -
613 - # fix bug #334383
614 - if use kernel_linux && [[ ${EUID} == 0 ]] ; then
615 - fowners root:tty /usr/libexec/mc/cons.saver
616 - fperms g+s /usr/libexec/mc/cons.saver
617 - fi
618 -
619 - if ! use xdg ; then
620 - sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
621 - -i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
622 - fi
623 -}
624 -
625 -pkg_postinst() {
626 - elog "To enable exiting to latest working directory,"
627 - elog "put this into your ~/.bashrc:"
628 - elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
629 -}