commit: 769e243b42ef3f778e7c0b3999040473bb3f45c6 Author: Mike Gilbert <floppym <AT> gentoo <DOT> org> AuthorDate: Sun Jun 15 02:17:53 2025 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Sun Jun 15 02:23:57 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=769e243b
app-shells/zsh: drop umask from zprofile Closes: https://bugs.gentoo.org/938572 Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> app-shells/zsh/files/zprofile-6 | 23 ++++++++ .../zsh/{zsh-9999.ebuild => zsh-5.9-r7.ebuild} | 64 +++++++++++++--------- app-shells/zsh/zsh-9999.ebuild | 4 +- 3 files changed, 62 insertions(+), 29 deletions(-) diff --git a/app-shells/zsh/files/zprofile-6 b/app-shells/zsh/files/zprofile-6 new file mode 100644 index 000000000000..11070d7f8d05 --- /dev/null +++ b/app-shells/zsh/files/zprofile-6 @@ -0,0 +1,23 @@ +# /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} + +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-9999.ebuild b/app-shells/zsh/zsh-5.9-r7.ebuild similarity index 79% copy from app-shells/zsh/zsh-9999.ebuild copy to app-shells/zsh/zsh-5.9-r7.ebuild index ddddb1099e91..85baee875b99 100644 --- a/app-shells/zsh/zsh-9999.ebuild +++ b/app-shells/zsh/zsh-5.9-r7.ebuild @@ -1,18 +1,19 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 inherit autotools flag-o-matic prefix -if [[ ${PV} == *9999 ]]; then - inherit git-r3 - EGIT_REPO_URI="https://git.code.sf.net/p/zsh/code"; -else - SRC_URI="https://www.zsh.org/pub/${P}.tar.xz - doc? ( https://www.zsh.org/pub/${P}-doc.tar.xz )" - KEYWORDS="~alpha amd64 arm arm64 hppa ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~arm64-macos ~ppc-macos ~x64-macos ~x64-solaris" -fi +KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~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 + https://downloads.sourceforge.net/${PN}/${P}.tar.xz + doc? ( + https://www.zsh.org/pub/${P}-doc.tar.xz + https://downloads.sourceforge.net/${PN}/${P}-doc.tar.xz + )" DESCRIPTION="UNIX Shell similar to the Korn shell" HOMEPAGE="https://www.zsh.org/"; @@ -21,38 +22,46 @@ 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/libpcre2 - static? ( dev-libs/libpcre2[static-libs] ) + >=dev-libs/libpcre-3.9 + static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm:= static? ( sys-libs/gdbm:=[static-libs] ) ) " -DEPEND="${RDEPEND} +DEPEND="sys-apps/groff valgrind? ( dev-debug/valgrind ) -" + ${RDEPEND}" PDEPEND=" examples? ( app-doc/zsh-lovers ) " -BDEPEND=" - sys-apps/groff -" if [[ ${PV} == *9999 ]] ; then - BDEPEND+=" - app-text/yodl - doc? ( virtual/texi2dvi ) - " + 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() { @@ -161,14 +170,11 @@ src_test() { } src_install() { - emake DESTDIR="${D}" install - if use doc; then - emake -C Doc DESTDIR="${D}" install.html install.html - fi + 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 + newins "$(prefixify_ro "${FILESDIR}"/zprofile-6)" zprofile keepdir /usr/share/zsh/site-functions insinto /usr/share/zsh/${PV%_*}/functions/Prompts @@ -197,8 +203,12 @@ src_install() { dodoc ChangeLog* META-FAQ NEWS README config.modules - if use doc; then - dodoc Doc/intro.{a4,us}.pdf Doc/zsh_{a4,us}.{dvi,pdf} + 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 diff --git a/app-shells/zsh/zsh-9999.ebuild b/app-shells/zsh/zsh-9999.ebuild index ddddb1099e91..6c8251815723 100644 --- a/app-shells/zsh/zsh-9999.ebuild +++ b/app-shells/zsh/zsh-9999.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2024 Gentoo Authors +# Copyright 1999-2025 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -168,7 +168,7 @@ src_install() { insinto /etc/zsh export PREFIX_QUOTE_CHAR='"' PREFIX_EXTRA_REGEX="/EUID/s,0,${EUID}," - newins "$(prefixify_ro "${FILESDIR}"/zprofile-5)" zprofile + newins "$(prefixify_ro "${FILESDIR}"/zprofile-6)" zprofile keepdir /usr/share/zsh/site-functions insinto /usr/share/zsh/${PV%_*}/functions/Prompts
