Gentoo Archives: gentoo-commits

From: Piotr Karbowski <slashbeast@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: app-shells/zsh/
Date: Sat, 26 Nov 2022 21:39:08
Message-Id: 1669498656.c1c6619fe78c334f9b45baeaa8b8300696656c46.slashbeast@gentoo
1 commit: c1c6619fe78c334f9b45baeaa8b8300696656c46
2 Author: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
3 AuthorDate: Sat Nov 26 21:37:36 2022 +0000
4 Commit: Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
5 CommitDate: Sat Nov 26 21:37:36 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1c6619f
7
8 app-shells/zsh: drop unicode USE flag.
9
10 THe unicode USE flag makes absolute no sense since the ncurses we really
11 depends on will support unicode regardless of this flag, on the top of
12 that without unicode support tests are failing. The unicode support is
13 now always enabled.
14
15 Closes: https://bugs.gentoo.org/653704
16 Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org>
17
18 .../zsh/{zsh-9999.ebuild => zsh-5.9-r2.ebuild} | 33 +++++++++++++++++-----
19 app-shells/zsh/zsh-9999.ebuild | 6 ++--
20 2 files changed, 29 insertions(+), 10 deletions(-)
21
22 diff --git a/app-shells/zsh/zsh-9999.ebuild b/app-shells/zsh/zsh-5.9-r2.ebuild
23 similarity index 87%
24 copy from app-shells/zsh/zsh-9999.ebuild
25 copy to app-shells/zsh/zsh-5.9-r2.ebuild
26 index 3493b711314b..6a06814f4b79 100644
27 --- a/app-shells/zsh/zsh-9999.ebuild
28 +++ b/app-shells/zsh/zsh-5.9-r2.ebuild
29 @@ -24,7 +24,7 @@ HOMEPAGE="https://www.zsh.org/"
30
31 LICENSE="ZSH gdbm? ( GPL-2 )"
32 SLOT="0"
33 -IUSE="caps debug doc examples gdbm maildir pcre static unicode"
34 +IUSE="caps debug doc examples gdbm maildir pcre static"
35
36 RDEPEND="
37 >=sys-libs/ncurses-5.1:0=
38 @@ -50,6 +50,15 @@ if [[ ${PV} == *9999 ]] ; then
39 )"
40 fi
41
42 +PATCHES=(
43 + # Add openrc specific options for init.d completion
44 + "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff
45 + # Please refer gentoo bug #833981
46 + "${FILESDIR}"/${PN}-5.9-musl-V09datetime-test-fix.patch
47 + # bug #869539
48 + "${FILESDIR}"/${PN}-5.9-clang-15-configure.patch
49 +)
50 +
51 src_prepare() {
52 if [[ ${PV} != *9999 ]]; then
53 # fix zshall problem with soelim
54 @@ -58,9 +67,6 @@ src_prepare() {
55 soelim Doc/zshall.1.soelim > Doc/zshall.1 || die
56 fi
57
58 - # add openrc specific options for init.d completion
59 - eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff
60 -
61 default
62
63 hprefixify configure.ac
64 @@ -80,11 +86,11 @@ src_configure() {
65 --enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions
66 --enable-function-subdirs
67 --with-tcsetpgrp
68 - --with-term-lib="$(usex unicode 'tinfow ncursesw' 'tinfo ncurses')"
69 + --enable-multibyte
70 + --with-term-lib='tinfow ncursesw'
71 $(use_enable maildir maildir-support)
72 $(use_enable pcre)
73 $(use_enable caps cap)
74 - $(use_enable unicode multibyte)
75 $(use_enable gdbm)
76 )
77
78 @@ -127,11 +133,24 @@ src_compile() {
79 default
80
81 if [[ ${PV} == *9999 ]] && use doc ; then
82 - emake -C Doc everything pdf dvi
83 + emake -C Doc everything
84 fi
85 }
86
87 src_test() {
88 + # Fixes tests A03quoting.ztst B03print.ztst on musl
89 + # Please refer:
90 + # https://www.zsh.org/mla/workers/2021/msg00805.html
91 + # Test E02xtrace fails on musl, so we are removing it.
92 + # Closes: https://bugs.gentoo.org/833981
93 + if use elibc_musl ; then
94 + unset LC_ALL
95 + unset LC_COLLATE
96 + unset LC_NUMERIC
97 + unset LC_MESSAGES
98 + unset LANG
99 + rm "${S}"/Test/E02xtrace.ztst || die
100 + fi
101 addpredict /dev/ptmx
102 local i
103 for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do
104
105 diff --git a/app-shells/zsh/zsh-9999.ebuild b/app-shells/zsh/zsh-9999.ebuild
106 index 3493b711314b..98399ff00b86 100644
107 --- a/app-shells/zsh/zsh-9999.ebuild
108 +++ b/app-shells/zsh/zsh-9999.ebuild
109 @@ -24,7 +24,7 @@ HOMEPAGE="https://www.zsh.org/"
110
111 LICENSE="ZSH gdbm? ( GPL-2 )"
112 SLOT="0"
113 -IUSE="caps debug doc examples gdbm maildir pcre static unicode"
114 +IUSE="caps debug doc examples gdbm maildir pcre static"
115
116 RDEPEND="
117 >=sys-libs/ncurses-5.1:0=
118 @@ -79,12 +79,12 @@ src_configure() {
119 --enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions
120 --enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions
121 --enable-function-subdirs
122 + --enable-multibyte
123 --with-tcsetpgrp
124 - --with-term-lib="$(usex unicode 'tinfow ncursesw' 'tinfo ncurses')"
125 + --with-term-lib='tinfow ncursesw'
126 $(use_enable maildir maildir-support)
127 $(use_enable pcre)
128 $(use_enable caps cap)
129 - $(use_enable unicode multibyte)
130 $(use_enable gdbm)
131 )