gentoo auto-resync : 08:02:2024 - 21:59:09

3 files changed, 273 insertions, 0 deletions

diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index b07db53aa9b0..54321e2c7be1 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,5 +1,6 @@
 AUX prompt_gentoo_setup-1 817 BLAKE2B 37f6f7eae4602ca62b8bd8a01c442712903b5b1823959a58ef3bee41701e64d372dcf21fc2aa37421751349769605acedcca60e7b63328d662c96c42f7771485 SHA512 16298741c01755108234b7a6d4f5bca98a5033fa390c1796129368e11067f3f3884a3cb34629172d0cb3cf7eff35912149022de0ff6ea429e5327a71fc9a0aea
 AUX zprofile-4 1314 BLAKE2B 8373d9f68613d5d44121c46a02dd7a5c988f4a3d948aa6bf96a9b0c5f67967f4b787b7ab346e7fabcdd8805321a89b63e6919d5abef082d24e4c46157c68e4db SHA512 5f87b4f0e59bb338f9aa8ec811424d37042ab5ad889aa00f6f912003b7aaaf8b3ea59746590c639a45facace0743deab89779ae5cee8ff6a39beda99864c9cf7
+AUX zprofile-5 652 BLAKE2B 345661b262b365ac577b2537be87b61430f1fe21f3cfc4f7a86309172f1def2eb3ae46a6d100e8495aacaf55b407979666b6d0630c059b723b3344f6362b4bda SHA512 703742672b376c92881493cfe1c2e3dec318e2530cef4219c2211341bcdeb5690d09642e0490c59c4081e615bde181c937f04cadf4d8b7207916f9ed698de082
 AUX zsh-5.3-init.d-gentoo.diff 1048 BLAKE2B 295e391679ef876a7bdaeaf6dc4b1b3a342c40f092f8cbeba137ee5ea6d26e16f988fc92f105bfcec739bc2aeca62195839b80dee337de8bfdfb5ff00a34fa22 SHA512 9f059cf4b99b7006955ab0ac43d4a4b4d762d193da9a738f771c562f2c3af3a9125694da59c584a3ff829598443e5429c873319ecd8fae2feba7096b597798dd
 AUX zsh-5.9-c99.patch 2942 BLAKE2B 712e976811a955f79c935ef9f50bdac1233addcafa78b14ca721a5d60f42c9e175e2f529131d57d9e2eecbfe0a7ae79cece8277b45b680de43c77a37504317e1 SHA512 89a472cd0c08869cee82049a26a7b434fc2b67f45e6450e552dac2c17c9df17b406584fa64a4b2ca91ce8a0470c303bce8080e43a37f7c643064db713bfbbf98
 AUX zsh-5.9-clang-15-configure.patch 16672 BLAKE2B b139c130b4f25b2ff3a3d704f1c3e58fe3d8455fe7576c897796778e81236cd7d108a06a0e49b18cdbed9d0c87b20169ff06fd47c0bd4821e6a795931d3ab34e SHA512 40f6673022f3a82fc2779850b9d1c38b574a85abbad6c99562bf53235f394f71628d6029e0e4b3d0a9701d450e347743ae44529eb1de2160a57f5ad99d34e799
@@ -11,4 +12,5 @@ DIST zsh-5.9.tar.xz 3332400 BLAKE2B 3ecd6d080ff47b78d228d9bf5c1bafd3dfc602beb681
 EBUILD zsh-5.9-r3.ebuild 6435 BLAKE2B a8f7b2986af71f78382d2885a9166b63cfe67fe144f57407e215ef6eea23552038c81e23392599b96b95f62ab5726f1d2b6595f3045fed3a5acc13d646beb486 SHA512 4281936a4a39508e4293a9e5a5b8714e23aef1b733741e5fa93f101af647444f03b08bbb90a0c4e9420618717bb917b1a978c2bc2f1e2c41e8fc5d80856c7989
 EBUILD zsh-5.9-r4.ebuild 6639 BLAKE2B 9ddb9d9d50dc2c33a5b40a9520935a4be4b323cd5d4d1254509e9f7e1352da718b882cf77ccfb4817cec04c6f7b9249d424ebe41186897f616c9b98e73fb0fec SHA512 504a68c4256702f50f9da8df5e46cce2cfe02978e3ac42500f6c6372f6136fa3d0478e14b6f7bd48da894ecadad4bb8db6c4255d944f69ebe329177f8a396fb0
 EBUILD zsh-5.9-r5.ebuild 6734 BLAKE2B 56ad1485c0dc8f8648150318f3a8d2b964cffbc8ee30009bbf31f13e59080995de156c514452bf2b303ee14e5dc5885061b89817b12e192719b3afd6c25df074 SHA512 23c476a147196ee9379645544a3e6bbca458a49b30be05a6e972d368f4e46ed04d586a1c319c0ac990f64ef3614bdd1efbe820e03c82825fd4906777b354b464
+EBUILD zsh-5.9-r6.ebuild 6734 BLAKE2B c61ca70e583ec2b3847b123f53e743718ebaa314d819a2706872cbe63204b8347d0ab1ded2d5a3da2ee9f872e6536a8725bfa409a96ced0797ae3eac168a34bf SHA512 055d38a635efd55d23b289e28f1aa6b0fff7504e61915c483708aaa78c5c346a7531ed38a0b62217ff4ce8a353fd5aace1b7db414acb5dc9cb4132aa61399774
 MISC metadata.xml 685 BLAKE2B 4e9a3a03df89f28b2636ce9f08067f499054bfa1439eb76bca27654a823ef2e2af3d0e6fa46f6e64082b0b56661fccaac3a30db98a4d8a4060d5cb90871baa6a SHA512 cae2243e4d9748bd02315cce89d1df07d56f6d1f7d097e3cdf6d324c1fe656a87d03d248461bf17674a786c2acb4ee0b3e0e7cc602a53109de7c111f097f5a09
diff --git a/app-shells/zsh/files/zprofile-5 b/app-shells/zsh/files/zprofile-5
new file mode 100644
index 000000000000..a89fddea48af
--- /dev/null
+++ b/app-shells/zsh/files/zprofile-5
@@ -0,0 +1,26 @@
+# /etc/zsh/zprofile
+
+# Load environment settings from profile.env, which is created by
+# env-update from the files in /etc/env.d
+if [[ -e /etc/profile.env ]] ; then
+	. /etc/profile.env
+fi
+
+# You should override these in your ~/.zprofile (or equivalent) for per-user
+# settings.  For system defaults, you can add a new file in /etc/profile.d/.
+export EDITOR=${EDITOR:-/bin/nano}
+export PAGER=${PAGER:-/usr/bin/less}
+
+# 077 would be more secure, but 022 is generally quite realistic
+umask 022
+
+unset ROOTPATH
+
+shopts=$-
+setopt nullglob
+for sh in /etc/profile.d/*.sh ; do
+	[[ -r "${sh}" ]] && . "${sh}"
+done
+unsetopt nullglob
+set -$shopts
+unset sh shopts
diff --git a/app-shells/zsh/zsh-5.9-r6.ebuild b/app-shells/zsh/zsh-5.9-r6.ebuild
new file mode 100644
index 000000000000..d0239108837f
--- /dev/null
+++ b/app-shells/zsh/zsh-5.9-r6.ebuild
@@ -0,0 +1,245 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic prefix
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris"
+
+SRC_URI="https://www.zsh.org/pub/${P}.tar.xz
+	https://www.zsh.org/pub/old/${P}.tar.xz
+	mirror://sourceforge/${PN}/${P}.tar.xz
+	doc? (
+		https://www.zsh.org/pub/${P}-doc.tar.xz
+		mirror://sourceforge/${PN}/${P}-doc.tar.xz
+	)"
+
+DESCRIPTION="UNIX Shell similar to the Korn shell"
+HOMEPAGE="https://www.zsh.org/"
+
+LICENSE="ZSH gdbm? ( GPL-2 )"
+SLOT="0"
+IUSE="caps debug doc examples gdbm maildir pcre static valgrind"
+
+# Next release should use pcre2: https://github.com/zsh-users/zsh/commit/b62e911341c8ec7446378b477c47da4256053dc0
+RDEPEND="
+	>=sys-libs/ncurses-5.1:0=
+	static? ( >=sys-libs/ncurses-5.7-r4:0=[static-libs] )
+	caps? ( sys-libs/libcap )
+	pcre? (
+		>=dev-libs/libpcre-3.9
+		static? ( >=dev-libs/libpcre-3.9[static-libs] )
+	)
+	gdbm? (
+		sys-libs/gdbm:=
+		static? ( sys-libs/gdbm:=[static-libs] )
+	)
+"
+DEPEND="sys-apps/groff
+	valgrind? ( dev-debug/valgrind )
+	${RDEPEND}"
+PDEPEND="
+	examples? ( app-doc/zsh-lovers )
+"
+if [[ ${PV} == *9999 ]] ; then
+	DEPEND+=" app-text/yodl
+		doc? (
+			sys-apps/texinfo
+			app-text/texi2html
+			virtual/latex-base
+		)"
+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
+	"${FILESDIR}"/${PN}-5.9-do-not-use-egrep-in-tests.patch
+	# bug #919001
+	"${FILESDIR}"/${PN}-5.9-c99.patch
+	"${FILESDIR}"/${PN}-5.9-relro.patch
+)
+
+src_prepare() {
+	if [[ ${PV} != *9999 ]]; then
+		# fix zshall problem with soelim
+		ln -s Doc man1 || die
+		mv Doc/zshall.1 Doc/zshall.1.soelim || die
+		soelim Doc/zshall.1.soelim > Doc/zshall.1 || die
+	fi
+
+	default
+
+	hprefixify configure.ac
+	if [[ ${PV} == *9999 ]] ; then
+		sed -i "/^VERSION=/s@=.*@=${PV}@" Config/version.mk || die
+	fi
+	eautoreconf
+}
+
+src_configure() {
+	local myconf=(
+		--bindir="${EPREFIX}"/bin
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--enable-etcdir="${EPREFIX}"/etc/zsh
+		--enable-runhelpdir="${EPREFIX}"/usr/share/zsh/${PV%_*}/help
+		--enable-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions
+		--enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions
+		--enable-function-subdirs
+		--with-tcsetpgrp
+		--enable-multibyte
+		--with-term-lib='tinfow ncursesw'
+		$(use_enable maildir maildir-support)
+		$(use_enable pcre)
+		$(use_enable caps cap)
+		$(use_enable gdbm)
+		$(use_enable valgrind zsh-valgrind)
+	)
+
+	if use static ; then
+		myconf+=( --disable-dynamic )
+		append-ldflags -static
+	fi
+	if use debug ; then
+		myconf+=(
+			--enable-zsh-debug
+			--enable-zsh-mem-debug
+			--enable-zsh-mem-warning
+			--enable-zsh-secure-free
+			--enable-zsh-hash-debug
+		)
+	fi
+
+	if [[ ${CHOST} == *-darwin* ]]; then
+		myconf+=( --enable-libs=-liconv )
+		append-ldflags -Wl,-x
+	fi
+
+	econf "${myconf[@]}"
+
+	if use static ; then
+		# compile all modules statically, see Bug #27392
+		# removed cap and curses because linking failes
+		sed -e "s,link=no,link=static,g" \
+			-e "/^name=zsh\/cap/s,link=static,link=no," \
+			-e "/^name=zsh\/curses/s,link=static,link=no," \
+			-i "${S}"/config.modules || die
+		if ! use gdbm ; then
+			sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \
+				"${S}"/config.modules || die
+		fi
+	fi
+}
+
+src_compile() {
+	default
+
+	if [[ ${PV} == *9999 ]] && use doc ; then
+		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
+
+	# Breaks tests if inherited from environment.
+	unset TMPPREFIX
+
+	addpredict /dev/ptmx
+	local i
+	for i in C02cond.ztst V08zpty.ztst X02zlevi.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do
+		rm "${S}"/Test/${i} || die
+	done
+	emake check
+}
+
+src_install() {
+	emake DESTDIR="${D}" install $(usex doc "install.info" "")
+
+	insinto /etc/zsh
+	export PREFIX_QUOTE_CHAR='"' PREFIX_EXTRA_REGEX="/EUID/s,0,${EUID},"
+	newins "$(prefixify_ro "${FILESDIR}"/zprofile-5)" zprofile
+
+	keepdir /usr/share/zsh/site-functions
+	insinto /usr/share/zsh/${PV%_*}/functions/Prompts
+	newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup
+
+	local i
+
+	# install miscellaneous scripts (bug #54520)
+	sed -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \
+		-e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" \
+		-i {Util,Misc}/* || die
+	for i in Util Misc ; do
+		insinto /usr/share/zsh/${PV%_*}/${i}
+		doins ${i}/*
+	done
+
+	# install header files (bug #538684)
+	insinto /usr/include/zsh
+	doins config.h Src/*.epro
+	for i in Src/{zsh.mdh,*.h} ; do
+		sed -e 's@\.\./config\.h@config.h@' \
+			-e 's@#\(\s*\)include "\([^"]\+\)"@#\1include <zsh/\2>@' \
+			-i "${i}"
+		doins "${i}"
+	done
+
+	dodoc ChangeLog* META-FAQ NEWS README config.modules
+
+	if use doc ; then
+		pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
+		dodoc Doc/zsh.{dvi,pdf}
+		docinto html
+		dodoc Doc/*.html
+		popd >/dev/null
+	fi
+
+	docinto StartupFiles
+	dodoc StartupFiles/z*
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]] ; then
+		echo
+		elog "If you want to enable Portage completions and Gentoo prompt,"
+		elog "emerge app-shells/gentoo-zsh-completions and add"
+		elog "	autoload -U compinit promptinit"
+		elog "	compinit"
+		elog "	promptinit; prompt gentoo"
+		elog "to your ~/.zshrc"
+		echo
+		elog "Also, if you want to enable cache for the completions, add"
+		elog "	zstyle ':completion::complete:*' use-cache 1"
+		elog "to your ~/.zshrc"
+		echo
+		elog "Note that a system zprofile startup file is installed. This will override"
+		elog "PATH and possibly other variables that a user may set in ~/.zshenv."
+		elog "Custom PATH settings and similar overridden variables can be moved to ~/.zprofile"
+		elog "or other user startup files that are sourced after the system zprofile."
+		echo
+		elog "If PATH must be set in ~/.zshenv to affect things like non-login ssh shells,"
+		elog "one method is to use a separate path-setting file that is conditionally sourced"
+		elog "in ~/.zshenv and also sourced from ~/.zprofile. For more information, see the"
+		elog "zshenv example in ${EROOT}/usr/share/doc/${PF}/StartupFiles/."
+		echo
+		elog "See https://wiki.gentoo.org/wiki/Zsh/HOWTO for more introduction documentation."
+		echo
+	fi
+}