1 |
commit: 46db16b8927b8fc80ef20c917bd2322c312294c9 |
2 |
Author: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Jan 1 15:14:12 2019 +0000 |
4 |
Commit: Sergei Trofimovich <slyfox <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Jan 1 15:14:21 2019 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46db16b8 |
7 |
|
8 |
app-misc/mc: bump up to 4.8.22 |
9 |
|
10 |
Package-Manager: Portage-2.3.53, Repoman-2.3.12 |
11 |
Signed-off-by: Sergei Trofimovich <slyfox <AT> gentoo.org> |
12 |
|
13 |
app-misc/mc/Manifest | 1 + |
14 |
app-misc/mc/{mc-9999.ebuild => mc-4.8.22.ebuild} | 31 +++++++----------------- |
15 |
app-misc/mc/mc-9999.ebuild | 6 ++--- |
16 |
3 files changed, 13 insertions(+), 25 deletions(-) |
17 |
|
18 |
diff --git a/app-misc/mc/Manifest b/app-misc/mc/Manifest |
19 |
index 9967ef41480..1424ab6aa80 100644 |
20 |
--- a/app-misc/mc/Manifest |
21 |
+++ b/app-misc/mc/Manifest |
22 |
@@ -1,2 +1,3 @@ |
23 |
DIST mc-4.8.20.tar.xz 2529580 BLAKE2B 14e575b650d28e0dcaa8ef0dc0b8e9bbf3e840ddc3d34d20518d28a6b253a8769c041c29ef7136c5fb72bd6130b0fc6c367dab8e44e040ef6dfd5406c364b86c SHA512 c2460561ae94bed75b1ed12f5c8039c9f8ace4c06987c57d07b8399c4e01c5a6c57851fddb3e918a4541ade089c89e8526078572a09580ccd0ae95344e3c1138 |
24 |
DIST mc-4.8.21.tar.xz 2528292 BLAKE2B 0cbebcd2284f9ed9687022280aa1ba9e4a5960c6f1de27e5f4bab1b9bf205077dec2851e47b787aa6aec9cac28d467bf58ee2647a592e194ab3bfc63138b373f SHA512 db1a252744b47ebf5339ad204d8b69cb914f25ade7fe5aae2650c4abb57478715d3b7b3a24f4460adfb9fbdc928e8728b369b4f1709215e5e9af3d430fce6acf |
25 |
+DIST mc-4.8.22.tar.xz 2538524 BLAKE2B f7839177dfb02d5b56d6a4ae1f045f7bc501b70fc845efaa6d45ef8e432ec680e51e4530aa5aa25c33ad339171d1ff435f6a1c5dbc5ac150053c64101b7a5c30 SHA512 834d467a4561fe4361bbde61be2c9ded95ade2a89855d953f58b7bfeb21297a3d6ebf674e72ac665b1794e0cbc8da752bc14fb37b129ff870856b339091f6bed |
26 |
|
27 |
diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-4.8.22.ebuild |
28 |
similarity index 74% |
29 |
copy from app-misc/mc/mc-9999.ebuild |
30 |
copy to app-misc/mc/mc-4.8.22.ebuild |
31 |
index 3af128d35dc..d6f2ab5c567 100644 |
32 |
--- a/app-misc/mc/mc-9999.ebuild |
33 |
+++ b/app-misc/mc/mc-4.8.22.ebuild |
34 |
@@ -1,28 +1,19 @@ |
35 |
-# Copyright 1999-2018 Gentoo Foundation |
36 |
+# Copyright 1999-2019 Gentoo Authors |
37 |
# Distributed under the terms of the GNU General Public License v2 |
38 |
|
39 |
-EAPI=6 |
40 |
+EAPI=7 |
41 |
|
42 |
-if [[ ${PV} = *9999* ]]; then |
43 |
- EGIT_REPO_URI="https://github.com/MidnightCommander/mc.git" |
44 |
- LIVE_ECLASSES="git-r3 autotools" |
45 |
- LIVE_EBUILD=yes |
46 |
-fi |
47 |
- |
48 |
-inherit flag-o-matic ${LIVE_ECLASSES} |
49 |
+inherit flag-o-matic |
50 |
|
51 |
MY_P=${P/_/-} |
52 |
|
53 |
-if [[ -z ${LIVE_EBUILD} ]]; then |
54 |
- SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz" |
55 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris" |
56 |
-fi |
57 |
- |
58 |
DESCRIPTION="GNU Midnight Commander is a text based file manager" |
59 |
HOMEPAGE="https://www.midnight-commander.org" |
60 |
+SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz" |
61 |
|
62 |
LICENSE="GPL-3" |
63 |
SLOT="0" |
64 |
+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" |
65 |
IUSE="+edit gpm mclib nls samba sftp +slang spell test unicode X +xdg" |
66 |
|
67 |
REQUIRED_USE="spell? ( edit )" |
68 |
@@ -47,18 +38,14 @@ DEPEND="${RDEPEND} |
69 |
test? ( dev-libs/check ) |
70 |
" |
71 |
|
72 |
+S=${WORKDIR}/${MY_P} |
73 |
+ |
74 |
pkg_pretend() { |
75 |
if use slang && use unicode ; then |
76 |
ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled." |
77 |
fi |
78 |
} |
79 |
|
80 |
-src_prepare() { |
81 |
- default |
82 |
- |
83 |
- [[ -n ${LIVE_EBUILD} ]] && ./autogen.sh |
84 |
-} |
85 |
- |
86 |
src_configure() { |
87 |
[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket" |
88 |
|
89 |
@@ -68,7 +55,7 @@ src_configure() { |
90 |
--enable-charset |
91 |
--enable-vfs |
92 |
--with-homedir=$(usex xdg 'XDG' '.mc') |
93 |
- --with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w')") |
94 |
+ --with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')") |
95 |
$(use_enable kernel_linux vfs-undelfs) |
96 |
$(use_enable mclib) |
97 |
$(use_enable nls) |
98 |
@@ -85,7 +72,7 @@ src_configure() { |
99 |
|
100 |
src_install() { |
101 |
emake DESTDIR="${D}" install |
102 |
- dodoc AUTHORS doc/{FAQ,NEWS,README} |
103 |
+ dodoc AUTHORS README NEWS |
104 |
|
105 |
# fix bug #334383 |
106 |
if use kernel_linux && [[ ${EUID} == 0 ]] ; then |
107 |
|
108 |
diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-9999.ebuild |
109 |
index 3af128d35dc..722ae657e0d 100644 |
110 |
--- a/app-misc/mc/mc-9999.ebuild |
111 |
+++ b/app-misc/mc/mc-9999.ebuild |
112 |
@@ -1,7 +1,7 @@ |
113 |
-# Copyright 1999-2018 Gentoo Foundation |
114 |
+# Copyright 1999-2019 Gentoo Authors |
115 |
# Distributed under the terms of the GNU General Public License v2 |
116 |
|
117 |
-EAPI=6 |
118 |
+EAPI=7 |
119 |
|
120 |
if [[ ${PV} = *9999* ]]; then |
121 |
EGIT_REPO_URI="https://github.com/MidnightCommander/mc.git" |
122 |
@@ -68,7 +68,7 @@ src_configure() { |
123 |
--enable-charset |
124 |
--enable-vfs |
125 |
--with-homedir=$(usex xdg 'XDG' '.mc') |
126 |
- --with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w')") |
127 |
+ --with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w' '')") |
128 |
$(use_enable kernel_linux vfs-undelfs) |
129 |
$(use_enable mclib) |
130 |
$(use_enable nls) |