[gentoo-commits] repo/gentoo:master commit in: app-shells/zsh/

[Piotr Karbowski]

commit:     c1c6619fe78c334f9b45baeaa8b8300696656c46
Author:     Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
AuthorDate: Sat Nov 26 21:37:36 2022 +0000
Commit:     Piotr Karbowski <slashbeast <AT> gentoo <DOT> org>
CommitDate: Sat Nov 26 21:37:36 2022 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1c6619f

app-shells/zsh: drop unicode USE flag.

THe unicode USE flag makes absolute no sense since the ncurses we really
depends on will support unicode regardless of this flag, on the top of
that without unicode support tests are failing. The unicode support is
now always enabled.

Closes: https://bugs.gentoo.org/653704
Signed-off-by: Piotr Karbowski <slashbeast <AT> gentoo.org>

 .../zsh/{zsh-9999.ebuild => zsh-5.9-r2.ebuild}     | 33 +++++++++++++++++-----
 app-shells/zsh/zsh-9999.ebuild                     |  6 ++--
 2 files changed, 29 insertions(+), 10 deletions(-)

diff --git a/app-shells/zsh/zsh-9999.ebuild b/app-shells/zsh/zsh-5.9-r2.ebuild
similarity index 87%
copy from app-shells/zsh/zsh-9999.ebuild
copy to app-shells/zsh/zsh-5.9-r2.ebuild
index 3493b711314b..6a06814f4b79 100644
--- a/app-shells/zsh/zsh-9999.ebuild
+++ b/app-shells/zsh/zsh-5.9-r2.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="https://www.zsh.org/"
 
 LICENSE="ZSH gdbm? ( GPL-2 )"
 SLOT="0"
-IUSE="caps debug doc examples gdbm maildir pcre static unicode"
+IUSE="caps debug doc examples gdbm maildir pcre static"
 
 RDEPEND="
 	>=sys-libs/ncurses-5.1:0=
@@ -50,6 +50,15 @@ if [[ ${PV} == *9999 ]] ; then
 		)"
 fi
 
+PATCHES=(
+	# Add openrc specific options for init.d completion
+	"${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff
+	# Please refer gentoo bug #833981
+	"${FILESDIR}"/${PN}-5.9-musl-V09datetime-test-fix.patch
+	# bug #869539
+	"${FILESDIR}"/${PN}-5.9-clang-15-configure.patch
+)
+
 src_prepare() {
 	if [[ ${PV} != *9999 ]]; then
 		# fix zshall problem with soelim
@@ -58,9 +67,6 @@ src_prepare() {
 		soelim Doc/zshall.1.soelim > Doc/zshall.1 || die
 	fi
 
-	# add openrc specific options for init.d completion
-	eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff
-
 	default
 
 	hprefixify configure.ac
@@ -80,11 +86,11 @@ src_configure() {
 		--enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions
 		--enable-function-subdirs
 		--with-tcsetpgrp
-		--with-term-lib="$(usex unicode 'tinfow ncursesw' 'tinfo ncurses')"
+		--enable-multibyte
+		--with-term-lib='tinfow ncursesw'
 		$(use_enable maildir maildir-support)
 		$(use_enable pcre)
 		$(use_enable caps cap)
-		$(use_enable unicode multibyte)
 		$(use_enable gdbm)
 	)
 
@@ -127,11 +133,24 @@ src_compile() {
 	default
 
 	if [[ ${PV} == *9999 ]] && use doc ; then
-		emake -C Doc everything pdf dvi
+		emake -C Doc everything
 	fi
 }
 
 src_test() {
+	# Fixes tests A03quoting.ztst B03print.ztst on musl
+	# Please refer:
+	# https://www.zsh.org/mla/workers/2021/msg00805.html
+	# Test E02xtrace fails on musl, so we are removing it.
+	# Closes: https://bugs.gentoo.org/833981
+	if use elibc_musl ; then
+		unset LC_ALL
+		unset LC_COLLATE
+		unset LC_NUMERIC
+		unset LC_MESSAGES
+		unset LANG
+		rm "${S}"/Test/E02xtrace.ztst || die
+	fi
 	addpredict /dev/ptmx
 	local i
 	for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do

diff --git a/app-shells/zsh/zsh-9999.ebuild b/app-shells/zsh/zsh-9999.ebuild
index 3493b711314b..98399ff00b86 100644
--- a/app-shells/zsh/zsh-9999.ebuild
+++ b/app-shells/zsh/zsh-9999.ebuild
@@ -24,7 +24,7 @@ HOMEPAGE="https://www.zsh.org/"
 
 LICENSE="ZSH gdbm? ( GPL-2 )"
 SLOT="0"
-IUSE="caps debug doc examples gdbm maildir pcre static unicode"
+IUSE="caps debug doc examples gdbm maildir pcre static"
 
 RDEPEND="
 	>=sys-libs/ncurses-5.1:0=
@@ -79,12 +79,12 @@ src_configure() {
 		--enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions
 		--enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions
 		--enable-function-subdirs
+		--enable-multibyte
 		--with-tcsetpgrp
-		--with-term-lib="$(usex unicode 'tinfow ncursesw' 'tinfo ncurses')"
+		--with-term-lib='tinfow ncursesw'
 		$(use_enable maildir maildir-support)
 		$(use_enable pcre)
 		$(use_enable caps cap)
-		$(use_enable unicode multibyte)
 		$(use_enable gdbm)
 	)