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-editors/nano/
Date: Fri, 21 Jul 2017 14:56:22
Message-Id: 1500648972.af8cf33b52495a4cb17b6b05de40278971ace38b.polynomial-c@gentoo
1 commit: af8cf33b52495a4cb17b6b05de40278971ace38b
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Fri Jul 21 14:55:27 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Fri Jul 21 14:56:12 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=af8cf33b
7
8 app-editors/nano: Sync live ebuild.
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.3
11
12 app-editors/nano/nano-9999.ebuild | 40 +++++++++++++++++++--------------------
13 1 file changed, 20 insertions(+), 20 deletions(-)
14
15 diff --git a/app-editors/nano/nano-9999.ebuild b/app-editors/nano/nano-9999.ebuild
16 index ce5e828a27c..4463df57a3e 100644
17 --- a/app-editors/nano/nano-9999.ebuild
18 +++ b/app-editors/nano/nano-9999.ebuild
19 @@ -40,26 +40,26 @@ src_prepare() {
20
21 src_configure() {
22 use static && append-ldflags -static
23 - local myconf=()
24 + local myconf=(
25 + --bindir="${EPREFIX}"/bin
26 + --htmldir=/trash
27 + $(use_enable !minimal color)
28 + $(use_enable !minimal multibuffer)
29 + $(use_enable !minimal nanorc)
30 + --disable-wrapping-as-root
31 + $(use_enable magic libmagic)
32 + $(use_enable spell speller)
33 + $(use_enable justify)
34 + $(use_enable debug)
35 + $(use_enable nls)
36 + $(use_enable unicode utf8)
37 + $(use_enable minimal tiny)
38 + $(usex ncurses --without-slang $(use_with slang))
39 + )
40 case ${CHOST} in
41 - *-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848
42 + *-gnu*|*-uclibc*) myconf+=( "--with-wordbounds" ) ;; #467848
43 esac
44 - econf \
45 - --bindir="${EPREFIX}"/bin \
46 - --htmldir=/trash \
47 - $(use_enable !minimal color) \
48 - $(use_enable !minimal multibuffer) \
49 - $(use_enable !minimal nanorc) \
50 - --disable-wrapping-as-root \
51 - $(use_enable magic libmagic) \
52 - $(use_enable spell speller) \
53 - $(use_enable justify) \
54 - $(use_enable debug) \
55 - $(use_enable nls) \
56 - $(use_enable unicode utf8) \
57 - $(use_enable minimal tiny) \
58 - $(usex ncurses --without-slang $(use_with slang)) \
59 - "${myconf[@]}"
60 + econf "${myconf[@]}"
61 }
62
63 src_install() {
64 @@ -75,9 +75,9 @@ src_install() {
65 # Enable colorization by default.
66 sed -i \
67 -e '/^# include /s:# *::' \
68 - "${ED}"/etc/nanorc || die
69 + "${ED%/}"/etc/nanorc || die
70 fi
71
72 dodir /usr/bin
73 - dosym /bin/nano /usr/bin/nano
74 + dosym ../../bin/nano /usr/bin/nano
75 }