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: Sun, 10 Mar 2019 17:44:01
Message-Id: 1552239676.66a78b37d34c8038651981c09c225bf88854a04c.polynomial-c@gentoo
1 commit: 66a78b37d34c8038651981c09c225bf88854a04c
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Sun Mar 10 17:41:16 2019 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sun Mar 10 17:41:16 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=66a78b37
7
8 app-misc/mc: Removed old.
9
10 Package-Manager: Portage-2.3.62, Repoman-2.3.12
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 app-misc/mc/Manifest | 2 -
14 app-misc/mc/files/mc-4.8.13-tinfo.patch | 39 ---------
15 app-misc/mc/files/mc-4.8.19-selected-size.patch | 30 -------
16 app-misc/mc/mc-4.8.20-r1.ebuild | 102 -----------------------
17 app-misc/mc/mc-4.8.20-r2.ebuild | 105 ------------------------
18 app-misc/mc/mc-4.8.21.ebuild | 93 ---------------------
19 6 files changed, 371 deletions(-)
20
21 diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest
22 index 1424ab6aa80..d59e740a26a 100644
23 --- a/app-misc/mc/Manifest
24 +++ b/app-misc/mc/Manifest
25 @@ -1,3 +1 @@
26 -DIST mc-4.8.20.tar.xz 2529580 BLAKE2B 14e575b650d28e0dcaa8ef0dc0b8e9bbf3e840ddc3d34d20518d28a6b253a8769c041c29ef7136c5fb72bd6130b0fc6c367dab8e44e040ef6dfd5406c364b86c SHA512 c2460561ae94bed75b1ed12f5c8039c9f8ace4c06987c57d07b8399c4e01c5a6c57851fddb3e918a4541ade089c89e8526078572a09580ccd0ae95344e3c1138
27 -DIST mc-4.8.21.tar.xz 2528292 BLAKE2B 0cbebcd2284f9ed9687022280aa1ba9e4a5960c6f1de27e5f4bab1b9bf205077dec2851e47b787aa6aec9cac28d467bf58ee2647a592e194ab3bfc63138b373f SHA512 db1a252744b47ebf5339ad204d8b69cb914f25ade7fe5aae2650c4abb57478715d3b7b3a24f4460adfb9fbdc928e8728b369b4f1709215e5e9af3d430fce6acf
28 DIST mc-4.8.22.tar.xz 2538524 BLAKE2B f7839177dfb02d5b56d6a4ae1f045f7bc501b70fc845efaa6d45ef8e432ec680e51e4530aa5aa25c33ad339171d1ff435f6a1c5dbc5ac150053c64101b7a5c30 SHA512 834d467a4561fe4361bbde61be2c9ded95ade2a89855d953f58b7bfeb21297a3d6ebf674e72ac665b1794e0cbc8da752bc14fb37b129ff870856b339091f6bed
29
30 diff --git a/app-misc/mc/files/mc-4.8.13-tinfo.patch b/app-misc/mc/files/mc-4.8.13-tinfo.patch
31 deleted file mode 100644
32 index 761c103df65..00000000000
33 --- a/app-misc/mc/files/mc-4.8.13-tinfo.patch
34 +++ /dev/null
35 @@ -1,39 +0,0 @@
36 -Gentoo-bug: https://bugs.gentoo.org/527118
37 ---- a/m4.include/mc-with-screen-ncurses.m4
38 -+++ b/m4.include/mc-with-screen-ncurses.m4
39 -@@ -101,6 +101,9 @@
40 - LIBS=
41 - AC_SEARCH_LIBS([has_colors], [ncurses], [MCLIBS="$MCLIBS $LIBS"],
42 - [AC_MSG_ERROR([Cannot find ncurses library])])
43 -+ AC_SEARCH_LIBS([stdscr],[tinfo ncurses],[MCLIBS="$MCLIBS $LIBS"],
44 -+ [AC_MSG_ERROR([Cannot find a library providing stdscr])])
45 -+
46 -
47 - screen_type=ncurses
48 - screen_msg="Ncurses library"
49 -@@ -111,10 +114,15 @@
50 - AC_SEARCH_LIBS([addwstr], [ncursesw ncurses curses], [MCLIBS="$MCLIBS $LIBS";ncursesw_found=yes],
51 - [AC_MSG_WARN([Cannot find ncurses library, that support wide characters])])
52 -
53 -+ AC_SEARCH_LIBS([stdscr],[tinfo ncursesw ncurses curses],[MCLIBS="$MCLIBS $LIBS"],
54 -+ [AC_MSG_ERROR([Cannot find a library providing stdscr])])
55 -+
56 - if test x"$ncursesw_found" = "x"; then
57 - LIBS=
58 - AC_SEARCH_LIBS([has_colors], [ncurses curses], [MCLIBS="$MCLIBS $LIBS"],
59 - [AC_MSG_ERROR([Cannot find ncurses library])])
60 -+ AC_SEARCH_LIBS([stdscr],[tinfo ncurses curses],[MCLIBS="$MCLIBS $LIBS"],
61 -+ [AC_MSG_ERROR([Cannot find a library providing stdscr])])
62 - fi
63 -
64 - dnl Check the header
65 -@@ -166,6 +174,9 @@
66 - LIBS=
67 - AC_SEARCH_LIBS([has_colors], [ncursesw], [MCLIBS="$MCLIBS $LIBS"],
68 - [AC_MSG_ERROR([Cannot find ncursesw library])])
69 -+ AC_SEARCH_LIBS([stdscr],[tinfow ncursesw],[MCLIBS="$MCLIBS $LIBS"],
70 -+ [AC_MSG_ERROR([Cannot find a library providing stdscr])])
71 -+
72 -
73 - dnl Check the header
74 - ncurses_h_found=
75
76 diff --git a/app-misc/mc/files/mc-4.8.19-selected-size.patch b/app-misc/mc/files/mc-4.8.19-selected-size.patch
77 deleted file mode 100644
78 index 06d6f46ff32..00000000000
79 --- a/app-misc/mc/files/mc-4.8.19-selected-size.patch
80 +++ /dev/null
81 @@ -1,30 +0,0 @@
82 -From 069306eb2e7174f431bd3eecbc8f489f9652b782 Mon Sep 17 00:00:00 2001
83 -From: Andrew Borodin <aborodin@×××××.ru>
84 -Date: Sat, 2 Dec 2017 14:39:50 +0300
85 -Subject: [PATCH] Ticket #3883: size_trunc_sep() breaks on multibyte locales.
86 -
87 -The bug was introduced in b3867a6e154420833d6a1117f556b9ab2d64c6ab.
88 -
89 -Signed-off-by: Andrew Borodin <aborodin@×××××.ru>
90 ----
91 - lib/util.c | 4 +++-
92 - 1 file changed, 3 insertions(+), 1 deletion(-)
93 -
94 -diff --git a/lib/util.c b/lib/util.c
95 -index 0326f65e8..c23d91fba 100644
96 ---- a/lib/util.c
97 -+++ b/lib/util.c
98 -@@ -383,7 +383,9 @@ size_trunc_sep (uintmax_t size, gboolean use_si)
99 - p += strlen (p) - 1;
100 - d = x + sizeof (x) - 1;
101 - *d-- = '\0';
102 -- while (p >= y && (isalpha ((unsigned char) *p) || (unsigned char) *p == ' '))
103 -+ /* @size format is "size unit", i.e. "[digits][space][letters]".
104 -+ Copy all charactes after digits. */
105 -+ while (p >= y && !g_ascii_isdigit (*p))
106 - *d-- = *p--;
107 - for (count = 0; p >= y; count++)
108 - {
109 ---
110 -2.15.1
111 -
112
113 diff --git a/app-misc/mc/mc-4.8.20-r1.ebuild b/app-misc/mc/mc-4.8.20-r1.ebuild
114 deleted file mode 100644
115 index 9b71011a40e..00000000000
116 --- a/app-misc/mc/mc-4.8.20-r1.ebuild
117 +++ /dev/null
118 @@ -1,102 +0,0 @@
119 -# Copyright 1999-2018 Gentoo Foundation
120 -# Distributed under the terms of the GNU General Public License v2
121 -
122 -EAPI=6
123 -
124 -inherit autotools eutils flag-o-matic
125 -
126 -MY_P=${P/_/-}
127 -
128 -DESCRIPTION="GNU Midnight Commander is a text based file manager"
129 -HOMEPAGE="https://www.midnight-commander.org"
130 -SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
131 -
132 -LICENSE="GPL-3"
133 -SLOT="0"
134 -KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
135 -IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg"
136 -
137 -REQUIRED_USE="spell? ( edit )"
138 -
139 -RDEPEND=">=dev-libs/glib-2.26.0:2
140 - gpm? ( sys-libs/gpm )
141 - kernel_linux? ( sys-fs/e2fsprogs )
142 - samba? ( net-fs/samba )
143 - sftp? ( net-libs/libssh2 )
144 - slang? ( >=sys-libs/slang-2 )
145 - !slang? ( sys-libs/ncurses:0= )
146 - spell? ( app-text/aspell )
147 - X? ( x11-libs/libX11
148 - x11-libs/libICE
149 - x11-libs/libXau
150 - x11-libs/libXdmcp
151 - x11-libs/libSM )"
152 -DEPEND="${RDEPEND}
153 - app-arch/xz-utils
154 - virtual/pkgconfig
155 - nls? ( sys-devel/gettext )
156 - test? ( dev-libs/check )
157 - "
158 -
159 -PATCHES=(
160 - "${FILESDIR}"/${PN}-4.8.13-tinfo.patch
161 - "${FILESDIR}"/${PN}-4.8.19-selected-size.patch
162 -)
163 -
164 -S=${WORKDIR}/${MY_P}
165 -
166 -src_prepare() {
167 - [[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
168 -
169 - default
170 - eautoreconf
171 -}
172 -
173 -src_configure() {
174 - local myscreen=ncurses
175 - use slang && myscreen=slang
176 - [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
177 -
178 - local homedir=".mc"
179 - use xdg && homedir="XDG"
180 -
181 - econf \
182 - --disable-silent-rules \
183 - --disable-dependency-tracking \
184 - $(use_enable nls) \
185 - --enable-vfs \
186 - $(use_enable kernel_linux vfs-undelfs) \
187 - --enable-charset \
188 - $(use_with X x) \
189 - $(use_enable samba vfs-smb) \
190 - $(use_enable sftp vfs-sftp) \
191 - $(use_enable spell aspell) \
192 - $(use_with gpm gpm-mouse) \
193 - --with-screen=${myscreen} \
194 - $(use_with edit internal-edit) \
195 - $(use_enable mclib) \
196 - $(use_enable test tests) \
197 - --with-homedir=${homedir}
198 -}
199 -
200 -src_install() {
201 - emake DESTDIR="${D}" install
202 - dodoc AUTHORS README NEWS
203 -
204 - # fix bug #334383
205 - if use kernel_linux && [[ ${EUID} == 0 ]] ; then
206 - fowners root:tty /usr/libexec/mc/cons.saver
207 - fperms g+s /usr/libexec/mc/cons.saver
208 - fi
209 -
210 - if ! use xdg ; then
211 - sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
212 - -i "${ED}"/usr/libexec/mc/ext.d/*.sh || die
213 - fi
214 -}
215 -
216 -pkg_postinst() {
217 - elog "To enable exiting to latest working directory,"
218 - elog "put this into your ~/.bashrc:"
219 - elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
220 -}
221
222 diff --git a/app-misc/mc/mc-4.8.20-r2.ebuild b/app-misc/mc/mc-4.8.20-r2.ebuild
223 deleted file mode 100644
224 index 4a9db190f7b..00000000000
225 --- a/app-misc/mc/mc-4.8.20-r2.ebuild
226 +++ /dev/null
227 @@ -1,105 +0,0 @@
228 -# Copyright 1999-2018 Gentoo Foundation
229 -# Distributed under the terms of the GNU General Public License v2
230 -
231 -EAPI=6
232 -
233 -inherit autotools flag-o-matic
234 -
235 -MY_P=${P/_/-}
236 -
237 -DESCRIPTION="GNU Midnight Commander is a text based file manager"
238 -HOMEPAGE="https://www.midnight-commander.org"
239 -SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
240 -
241 -LICENSE="GPL-3"
242 -SLOT="0"
243 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
244 -IUSE="+edit gpm mclib nls samba sftp +slang spell test unicode X +xdg"
245 -
246 -REQUIRED_USE="spell? ( edit )"
247 -
248 -RDEPEND=">=dev-libs/glib-2.26.0:2
249 - gpm? ( sys-libs/gpm )
250 - kernel_linux? ( sys-fs/e2fsprogs )
251 - samba? ( net-fs/samba )
252 - sftp? ( net-libs/libssh2 )
253 - slang? ( >=sys-libs/slang-2 )
254 - !slang? ( sys-libs/ncurses:0=[unicode?] )
255 - spell? ( app-text/aspell )
256 - X? ( x11-libs/libX11
257 - x11-libs/libICE
258 - x11-libs/libXau
259 - x11-libs/libXdmcp
260 - x11-libs/libSM )"
261 -DEPEND="${RDEPEND}
262 - app-arch/xz-utils
263 - virtual/pkgconfig
264 - nls? ( sys-devel/gettext )
265 - test? ( dev-libs/check )
266 - "
267 -
268 -PATCHES=(
269 - "${FILESDIR}"/${PN}-4.8.13-tinfo.patch
270 - "${FILESDIR}"/${PN}-4.8.19-selected-size.patch
271 -)
272 -
273 -S=${WORKDIR}/${MY_P}
274 -
275 -pkg_pretend() {
276 - if use slang && use unicode ; then
277 - ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
278 - fi
279 -}
280 -
281 -src_prepare() {
282 - [[ -n ${LIVE_EBUILD} ]] && ./autogen.sh
283 -
284 - default
285 - eautoreconf
286 -}
287 -
288 -src_configure() {
289 - [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
290 -
291 - local myeconfargs=(
292 - --disable-dependency-tracking
293 - --disable-silent-rules
294 - --enable-charset
295 - --enable-vfs
296 - --with-homedir=$(usex xdg 'XDG' '.mc')
297 - --with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
298 - $(use_enable kernel_linux vfs-undelfs)
299 - $(use_enable mclib)
300 - $(use_enable nls)
301 - $(use_enable samba vfs-smb)
302 - $(use_enable sftp vfs-sftp)
303 - $(use_enable spell aspell)
304 - $(use_enable test tests)
305 - $(use_with gpm gpm-mouse)
306 - $(use_with X x)
307 - $(use_with edit internal-edit)
308 - )
309 - econf "${myeconfargs[@]}"
310 -}
311 -
312 -src_install() {
313 - emake DESTDIR="${D}" install
314 - dodoc AUTHORS README NEWS
315 -
316 - # fix bug #334383
317 - if use kernel_linux && [[ ${EUID} == 0 ]] ; then
318 - fowners root:tty /usr/libexec/mc/cons.saver
319 - fperms g+s /usr/libexec/mc/cons.saver
320 - fi
321 -
322 - if ! use xdg ; then
323 - sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
324 - -i "${ED%/}"/usr/libexec/mc/ext.d/*.sh || die
325 - fi
326 -}
327 -
328 -pkg_postinst() {
329 - elog "To enable exiting to latest working directory,"
330 - elog "put this into your ~/.bashrc:"
331 - elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
332 -}
333
334 diff --git a/app-misc/mc/mc-4.8.21.ebuild b/app-misc/mc/mc-4.8.21.ebuild
335 deleted file mode 100644
336 index e45e8f54e1b..00000000000
337 --- a/app-misc/mc/mc-4.8.21.ebuild
338 +++ /dev/null
339 @@ -1,93 +0,0 @@
340 -# Copyright 1999-2018 Gentoo Foundation
341 -# Distributed under the terms of the GNU General Public License v2
342 -
343 -EAPI=6
344 -
345 -inherit flag-o-matic
346 -
347 -MY_P=${P/_/-}
348 -
349 -DESCRIPTION="GNU Midnight Commander is a text based file manager"
350 -HOMEPAGE="https://www.midnight-commander.org"
351 -SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz"
352 -
353 -LICENSE="GPL-3"
354 -SLOT="0"
355 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
356 -IUSE="+edit gpm mclib nls samba sftp +slang spell test unicode X +xdg"
357 -
358 -REQUIRED_USE="spell? ( edit )"
359 -
360 -RDEPEND=">=dev-libs/glib-2.26.0:2
361 - gpm? ( sys-libs/gpm )
362 - kernel_linux? ( sys-fs/e2fsprogs )
363 - samba? ( net-fs/samba )
364 - sftp? ( net-libs/libssh2 )
365 - slang? ( >=sys-libs/slang-2 )
366 - !slang? ( sys-libs/ncurses:0=[unicode?] )
367 - spell? ( app-text/aspell )
368 - X? ( x11-libs/libX11
369 - x11-libs/libICE
370 - x11-libs/libXau
371 - x11-libs/libXdmcp
372 - x11-libs/libSM )"
373 -DEPEND="${RDEPEND}
374 - app-arch/xz-utils
375 - virtual/pkgconfig
376 - nls? ( sys-devel/gettext )
377 - test? ( dev-libs/check )
378 - "
379 -
380 -S=${WORKDIR}/${MY_P}
381 -
382 -pkg_pretend() {
383 - if use slang && use unicode ; then
384 - ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled."
385 - fi
386 -}
387 -
388 -src_configure() {
389 - [[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket"
390 -
391 - local myeconfargs=(
392 - --disable-dependency-tracking
393 - --disable-silent-rules
394 - --enable-charset
395 - --enable-vfs
396 - --with-homedir=$(usex xdg 'XDG' '.mc')
397 - --with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')")
398 - $(use_enable kernel_linux vfs-undelfs)
399 - $(use_enable mclib)
400 - $(use_enable nls)
401 - $(use_enable samba vfs-smb)
402 - $(use_enable sftp vfs-sftp)
403 - $(use_enable spell aspell)
404 - $(use_enable test tests)
405 - $(use_with gpm gpm-mouse)
406 - $(use_with X x)
407 - $(use_with edit internal-edit)
408 - )
409 - econf "${myeconfargs[@]}"
410 -}
411 -
412 -src_install() {
413 - emake DESTDIR="${D}" install
414 - dodoc AUTHORS README NEWS
415 -
416 - # fix bug #334383
417 - if use kernel_linux && [[ ${EUID} == 0 ]] ; then
418 - fowners root:tty /usr/libexec/mc/cons.saver
419 - fperms g+s /usr/libexec/mc/cons.saver
420 - fi
421 -
422 - if ! use xdg ; then
423 - sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \
424 - -i "${ED%/}"/usr/libexec/mc/ext.d/*.sh || die
425 - fi
426 -}
427 -
428 -pkg_postinst() {
429 - elog "To enable exiting to latest working directory,"
430 - elog "put this into your ~/.bashrc:"
431 - elog ". ${EPREFIX}/usr/libexec/mc/mc.sh"
432 -}