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-shells/zsh/
Date: Tue, 29 Aug 2017 22:26:47
Message-Id: 1504045597.8c667305d11032d81b0b598cc31cdb6d0796204c.polynomial-c@gentoo
1 commit: 8c667305d11032d81b0b598cc31cdb6d0796204c
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Aug 29 22:25:17 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Aug 29 22:26:37 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c667305
7
8 app-shells/zsh: Sync live ebuild.
9
10 Package-Manager: Portage-2.3.8, Repoman-2.3.3
11
12 app-shells/zsh/zsh-9999.ebuild | 34 +++++++++++++++++-----------------
13 1 file changed, 17 insertions(+), 17 deletions(-)
14
15 diff --git a/app-shells/zsh/zsh-9999.ebuild b/app-shells/zsh/zsh-9999.ebuild
16 index 8919a5c5da5..dfbabed7e84 100644
17 --- a/app-shells/zsh/zsh-9999.ebuild
18 +++ b/app-shells/zsh/zsh-9999.ebuild
19 @@ -10,7 +10,7 @@ if [[ ${PV} == 9999* ]] ; then
20 EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code"
21 else
22 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
23 - SRC_URI="http://www.zsh.org/pub/${P}.tar.xz
24 + SRC_URI="http://www.zsh.org/pub/${P}.tar.gz
25 doc? ( http://www.zsh.org/pub/${P}-doc.tar.xz )"
26 fi
27
28 @@ -74,7 +74,21 @@ src_prepare() {
29 }
30
31 src_configure() {
32 - local myconf=()
33 + local myconf=(
34 + --bindir="${EPREFIX}"/bin
35 + --libdir="${EPREFIX}"/usr/$(get_libdir)
36 + --enable-etcdir="${EPREFIX}"/etc/zsh
37 + --enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PV%_*}/help
38 + --enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions
39 + --enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions
40 + --enable-function-subdirs
41 + --with-tcsetpgrp
42 + $(use_enable maildir maildir-support)
43 + $(use_enable pcre)
44 + $(use_enable caps cap)
45 + $(use_enable unicode multibyte)
46 + $(use_enable gdbm )
47 + )
48
49 if use static ; then
50 myconf+=( --disable-dynamic )
51 @@ -95,21 +109,7 @@ src_configure() {
52 append-ldflags -Wl,-x
53 fi
54
55 - econf \
56 - --bindir="${EPREFIX}"/bin \
57 - --libdir="${EPREFIX}"/usr/$(get_libdir) \
58 - --enable-etcdir="${EPREFIX}"/etc/zsh \
59 - --enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PV%_*}/help \
60 - --enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions \
61 - --enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions \
62 - --enable-function-subdirs \
63 - --with-tcsetpgrp \
64 - $(use_enable maildir maildir-support) \
65 - $(use_enable pcre) \
66 - $(use_enable caps cap) \
67 - $(use_enable unicode multibyte) \
68 - $(use_enable gdbm ) \
69 - "${myconf[@]}"
70 + econf "${myconf[@]}"
71
72 if use static ; then
73 # compile all modules statically, see Bug #27392