1 |
commit: 5863fac7671b3f01a3f712f7ba1bab069a01ff88 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Mon Jan 29 15:07:55 2018 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Mon Jan 29 15:07:55 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5863fac7 |
7 |
|
8 |
app-misc/mc: Synced live ebuild. |
9 |
|
10 |
Package-Manager: Portage-2.3.20, Repoman-2.3.6 |
11 |
|
12 |
app-misc/mc/mc-4.8.20-r2.ebuild | 2 +- |
13 |
app-misc/mc/mc-9999.ebuild | 57 ++++++++++++++++++++++------------------- |
14 |
2 files changed, 31 insertions(+), 28 deletions(-) |
15 |
|
16 |
diff --git a/app-misc/mc/mc-4.8.20-r2.ebuild b/app-misc/mc/mc-4.8.20-r2.ebuild |
17 |
index 26a9982ce6a..5b6a3787b52 100644 |
18 |
--- a/app-misc/mc/mc-4.8.20-r2.ebuild |
19 |
+++ b/app-misc/mc/mc-4.8.20-r2.ebuild |
20 |
@@ -14,7 +14,7 @@ SRC_URI="http://ftp.midnight-commander.org/${MY_P}.tar.xz" |
21 |
LICENSE="GPL-3" |
22 |
SLOT="0" |
23 |
KEYWORDS="~alpha ~amd64 ~arm ~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" |
24 |
-IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg unicode" |
25 |
+IUSE="+edit gpm mclib nls samba sftp +slang spell test unicode X +xdg" |
26 |
|
27 |
REQUIRED_USE="spell? ( edit )" |
28 |
|
29 |
|
30 |
diff --git a/app-misc/mc/mc-9999.ebuild b/app-misc/mc/mc-9999.ebuild |
31 |
index 1f19e217d3a..ef5501c8bc4 100644 |
32 |
--- a/app-misc/mc/mc-9999.ebuild |
33 |
+++ b/app-misc/mc/mc-9999.ebuild |
34 |
@@ -1,4 +1,4 @@ |
35 |
-# Copyright 1999-2017 Gentoo Foundation |
36 |
+# Copyright 1999-2018 Gentoo Foundation |
37 |
# Distributed under the terms of the GNU General Public License v2 |
38 |
|
39 |
EAPI=6 |
40 |
@@ -9,7 +9,7 @@ if [[ ${PV} = *9999* ]]; then |
41 |
LIVE_EBUILD=yes |
42 |
fi |
43 |
|
44 |
-inherit eutils flag-o-matic ${LIVE_ECLASSES} |
45 |
+inherit flag-o-matic ${LIVE_ECLASSES} |
46 |
|
47 |
MY_P=${P/_/-} |
48 |
|
49 |
@@ -23,7 +23,7 @@ HOMEPAGE="https://www.midnight-commander.org" |
50 |
|
51 |
LICENSE="GPL-3" |
52 |
SLOT="0" |
53 |
-IUSE="+edit gpm mclib nls samba sftp +slang spell test X +xdg" |
54 |
+IUSE="+edit gpm mclib nls samba sftp +slang spell test unicode X +xdg" |
55 |
|
56 |
REQUIRED_USE="spell? ( edit )" |
57 |
|
58 |
@@ -33,7 +33,7 @@ RDEPEND=">=dev-libs/glib-2.26.0:2 |
59 |
samba? ( net-fs/samba ) |
60 |
sftp? ( net-libs/libssh2 ) |
61 |
slang? ( >=sys-libs/slang-2 ) |
62 |
- !slang? ( sys-libs/ncurses:0= ) |
63 |
+ !slang? ( sys-libs/ncurses:0=[unicode?] ) |
64 |
spell? ( app-text/aspell ) |
65 |
X? ( x11-libs/libX11 |
66 |
x11-libs/libICE |
67 |
@@ -47,6 +47,12 @@ DEPEND="${RDEPEND} |
68 |
test? ( dev-libs/check ) |
69 |
" |
70 |
|
71 |
+pkg_pretend() { |
72 |
+ if use slang && use unicode ; then |
73 |
+ ewarn "\"unicode\" USE flag only takes effect when the \"slang\" USE flag is disabled." |
74 |
+ fi |
75 |
+} |
76 |
+ |
77 |
src_prepare() { |
78 |
default |
79 |
|
80 |
@@ -54,30 +60,27 @@ src_prepare() { |
81 |
} |
82 |
|
83 |
src_configure() { |
84 |
- local myscreen=ncurses |
85 |
- use slang && myscreen=slang |
86 |
[[ ${CHOST} == *-solaris* ]] && append-ldflags "-lnsl -lsocket" |
87 |
|
88 |
- local homedir=".mc" |
89 |
- use xdg && homedir="XDG" |
90 |
- |
91 |
- econf \ |
92 |
- --disable-silent-rules \ |
93 |
- --disable-dependency-tracking \ |
94 |
- $(use_enable nls) \ |
95 |
- --enable-vfs \ |
96 |
- $(use_enable kernel_linux vfs-undelfs) \ |
97 |
- --enable-charset \ |
98 |
- $(use_with X x) \ |
99 |
- $(use_enable samba vfs-smb) \ |
100 |
- $(use_enable sftp vfs-sftp) \ |
101 |
- $(use_enable spell aspell) \ |
102 |
- $(use_with gpm gpm-mouse) \ |
103 |
- --with-screen=${myscreen} \ |
104 |
- $(use_with edit internal-edit) \ |
105 |
- $(use_enable mclib) \ |
106 |
- $(use_enable test tests) \ |
107 |
- --with-homedir=${homedir} |
108 |
+ local myeconfargs=( |
109 |
+ --disable-dependency-tracking |
110 |
+ --disable-silent-rules |
111 |
+ --enable-charset |
112 |
+ --enable-vfs |
113 |
+ --with-homedir=$(usex xdg 'XDG' '.mc') |
114 |
+ --with-screen=$(usex slang 'slang' "ncurses$(usex unicode 'w')") |
115 |
+ $(use_enable kernel_linux vfs-undelfs) |
116 |
+ $(use_enable mclib) |
117 |
+ $(use_enable nls) |
118 |
+ $(use_enable samba vfs-smb) |
119 |
+ $(use_enable sftp vfs-sftp) |
120 |
+ $(use_enable spell aspell) |
121 |
+ $(use_enable test tests) |
122 |
+ $(use_with gpm gpm-mouse) |
123 |
+ $(use_with X x) |
124 |
+ $(use_with edit internal-edit) |
125 |
+ ) |
126 |
+ econf "${myeconfargs[@]}" |
127 |
} |
128 |
|
129 |
src_install() { |
130 |
@@ -92,7 +95,7 @@ src_install() { |
131 |
|
132 |
if ! use xdg ; then |
133 |
sed 's@MC_XDG_OPEN="xdg-open"@MC_XDG_OPEN="/bin/false"@' \ |
134 |
- -i "${ED}"/usr/libexec/mc/ext.d/*.sh || die |
135 |
+ -i "${ED%/}"/usr/libexec/mc/ext.d/*.sh || die |
136 |
fi |
137 |
} |