From cb3e8c6af7661fbcafdcacc7e0ecdfb610d098fa Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 9 Jun 2018 09:27:03 +0100 Subject: gentoo resync : 09.06.2018 --- app-shells/zsh/Manifest | 5 +- app-shells/zsh/files/zprofile-4 | 42 ++++++++ app-shells/zsh/zsh-5.5.1-r1.ebuild | 211 +++++++++++++++++++++++++++++++++++++ app-shells/zsh/zsh-5.5.1.ebuild | 211 ------------------------------------- app-shells/zsh/zsh-9999.ebuild | 11 +- 5 files changed, 258 insertions(+), 222 deletions(-) create mode 100644 app-shells/zsh/files/zprofile-4 create mode 100644 app-shells/zsh/zsh-5.5.1-r1.ebuild delete mode 100644 app-shells/zsh/zsh-5.5.1.ebuild (limited to 'app-shells/zsh') diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest index e27167392f53..ee50fbfaee94 100644 --- a/app-shells/zsh/Manifest +++ b/app-shells/zsh/Manifest @@ -2,6 +2,7 @@ AUX prompt_gentoo_setup-1 820 BLAKE2B 26fc3348f16459462dddfd3f6864a3ae58bbcbbce0 AUX zprofile-1 1663 BLAKE2B aef86216bd8436fc550e4b440cf23fb1367d1ebb158695cb0b9fdd39af89a920995750a65199e8ff327ccd9f7e2efedf8dc42c624c3030617a2f0fec6ee17003 SHA512 d0baf1d4ed78a1d2f4e2bfcf5f038fbf6fe39d61e4ae3bfda0f6c073bf43260143a9b674935e4cf1436006450f641e22823ce853cfef774cd89f1912691c853f AUX zprofile-2 1555 BLAKE2B bcbc98b7d40f3578ae9596b65dea00de029e310a1f85fcaf42ebd751e909cc3b794b992a1e60e995a5676c7df943dcaff9f9d76d4d2e6d02c1f99304ab47a7dd SHA512 cfc0a9a8b0c01a9c87d02216800b7245bfd98ea5f43cefdd30c902d4bd2318c9b6f7f1ad299672b693734e7014514fce0fb9c4b1321508305a6d0137ee02d966 AUX zprofile-3 1130 BLAKE2B cfd0f5bcc9409cb2bd133ad1511356602c110b8f1d106ac16cf3812ea57c818902a7eacb061dabd08fdc8040d6deed088c13304b2176c2488fb886c8d2a2c8bf SHA512 d1059e427450e03d3e638e96ff4f43548cee5a385c4d4f00701023570ef6490b15cd01d738bd97e0e8d003aa7e375c51a80a2b841066c22d0910966a54c2cc2f +AUX zprofile-4 1297 BLAKE2B 2e4252a7ecbfe8a193bc916f0a5a3337e2de33856fa974e78479a30df6cc29bc86d75d5dca67cb0970642348e32a70e38ffcc55222ea64061aa7bdd08194c61a SHA512 f610937e8fccc88d0ea09e8ffddd365ee3015f04b50f56c2e4f20648e77784e80e4efc2969768b5ed41640acf290ea319306cf57a52aabc3b6917543ff94fd5e AUX zsh-5.3-init.d-gentoo.diff 1048 BLAKE2B 295e391679ef876a7bdaeaf6dc4b1b3a342c40f092f8cbeba137ee5ea6d26e16f988fc92f105bfcec739bc2aeca62195839b80dee337de8bfdfb5ff00a34fa22 SHA512 9f059cf4b99b7006955ab0ac43d4a4b4d762d193da9a738f771c562f2c3af3a9125694da59c584a3ff829598443e5429c873319ecd8fae2feba7096b597798dd DIST zsh-5.3.1-doc.tar.xz 3161408 BLAKE2B dc14f7b6136b73d5cfe8462fe67e20b92ee04741ad8f8a0f8d40bd1f8658261569722b156a075d7b723f2d38d41fc725e227c995eefebde433ea172399b90210 SHA512 27f9d50094c21a77b36fe3309a9ab81a2ccf6570139b11038bbebe9fff2d0701f0bccf9163f5bf47d51ce7b978df621a4cb9089c33e9179a61636fcc94a9fb9c DIST zsh-5.3.1.tar.xz 2928832 BLAKE2B b561629f8641dac70a5b35e12333fb3b214c83ebd90d432c302e8b8e6fb1baa288ec4d32fdb7f917c2f1a845b96a6c676ab4e15a014a8b9474792cb77e2afea0 SHA512 25f723c76d2779c3cb53de2e0dbb1163ec289f76282bec49757880d0ce32bf64a001a6b40c54c290d342aa09f92319af5c597bff99de8dbd1fc895c11836f304 @@ -13,7 +14,7 @@ DIST zsh-5.5.1.tar.gz 4578700 BLAKE2B b58fc763bc64e8ed6de0db2e0fd454aef995fcc86b DIST zsh-5.5.tar.gz 4576506 BLAKE2B 4f5923d519b0c96475f4832cf0e5cabc1432e765d201c992903ead45b175d5bc76410ebe248c2bd01ad75a5b5939bc5bc58e9263bb4501f9b2c1f5b4d7755896 SHA512 aafa29e1bc29d35fb5822ad4ca5f4c64b1e4a4e3f9bff70e9e5976918fa9e7906467bd11f69291e694dfa77efa1e5433d7839fc668aa572228623f1c131c381f EBUILD zsh-5.3.1.ebuild 5981 BLAKE2B 7bb0e3b81104e115c0ffc9ac593440b9ab61cf89cc33842a3df467ace612573c1f069a9032a8cc1d58f92f47b64900ce042b23a4273a435ab96cf0cc3ad46c1d SHA512 b1173c76320d9c615793c65fa214320f6ef02cac834233e69d242e01834012ab1b32a886666955bc49720874557cdaf14ac5734bd29c04578bc74e87526e2afa EBUILD zsh-5.4.2-r1.ebuild 5819 BLAKE2B 1f45243236f22a943a2a2e3fd3d3b3080a96f62c20198a07c48260a5c777648678413258f4376af37697b5fdc2787d13fea1b0554722c5ec01c0053667121e09 SHA512 67330d6e88556b94bef686eff830e8cac169d472a2352ff5486d81f69b7ca3285f1502d5f38f1c8047b01d2ebfded7b166dcce3be318577e9578657f9d8c5a58 -EBUILD zsh-5.5.1.ebuild 5819 BLAKE2B 1f45243236f22a943a2a2e3fd3d3b3080a96f62c20198a07c48260a5c777648678413258f4376af37697b5fdc2787d13fea1b0554722c5ec01c0053667121e09 SHA512 67330d6e88556b94bef686eff830e8cac169d472a2352ff5486d81f69b7ca3285f1502d5f38f1c8047b01d2ebfded7b166dcce3be318577e9578657f9d8c5a58 +EBUILD zsh-5.5.1-r1.ebuild 5819 BLAKE2B ce90b05f67237ac99adce8927cc29985dad103c9fe1b781b134d144bc8dd46e19a08fdfe86655dde9acb289b7d7dbd3ff3b367fd69ceed0961b61125cce4381b SHA512 4e23162334c1a521adc76fbed5b185546c1dc539272ec215359a13fb8d146151098c6437b27d9eb49c24f9a2a487f874276150edf16ff42bc7067e62296ac13b EBUILD zsh-5.5.ebuild 5809 BLAKE2B bc7175e593de89a97c11d613881fe269417b5f2ef9a0cb131292dc3299c45041a87e03572620156723194bb24fbe77245b0fc64bedf6a9c9cea98dfbfb33a0e5 SHA512 5fe29eeafee8b5de30e8a606aa8b6b7950740cd0b1f6852955ff4f4cca30f9cf1be28a74adf760189f9a010334408ab3eddec1243a6faee335296efb39e08ed3 -EBUILD zsh-9999.ebuild 5998 BLAKE2B 265d73cf7284891a347f6ad353d6b1f71fd95b74e0b3234562dc713bbb759efb81862abc68b448338cac6ae76cb3bcfe1d9a2bf16392841f24fd63b617245204 SHA512 8476d8741eae45dd02cb03d6c633d5025aa05ebbf342d2650b21664d23447cf7ff18d15e3dca666553f0e885c33108718cc3859195e5a67bd22087a2e40b25f2 +EBUILD zsh-9999.ebuild 5819 BLAKE2B ce90b05f67237ac99adce8927cc29985dad103c9fe1b781b134d144bc8dd46e19a08fdfe86655dde9acb289b7d7dbd3ff3b367fd69ceed0961b61125cce4381b SHA512 4e23162334c1a521adc76fbed5b185546c1dc539272ec215359a13fb8d146151098c6437b27d9eb49c24f9a2a487f874276150edf16ff42bc7067e62296ac13b MISC metadata.xml 627 BLAKE2B 075ca50a779af22aa7664943a0ec270d99869d615d73aa65f5483d4ae30821ca535f18e8841c43f2359ae83650f32931a6f91e8b0eab63ceee7ec4754db55f3c SHA512 489307b83b15893965874824d59bf9d54a6f82aa13c62e1e7a12ada87d10b8e5d3ab63c6e1dc327b087f7403c871ce3cb766423e3513ed0c3b2304342775fbb1 diff --git a/app-shells/zsh/files/zprofile-4 b/app-shells/zsh/files/zprofile-4 new file mode 100644 index 000000000000..6402ca718d38 --- /dev/null +++ b/app-shells/zsh/files/zprofile-4 @@ -0,0 +1,42 @@ +# /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 + +# Set up PATH depending on whether we're root or a normal user. +# There's no real reason to exclude sbin paths from the normal user, +# but it can make tab-completion easier when they aren't in the +# user's PATH to pollute the executable namespace. +# +# It is intentional in the following line to use || instead of -o. +# This way the evaluation can be short-circuited and calling whoami is +# avoided. +if [ "$EUID" = "0" ] || [ "$USER" = "root" ] ; then + # Check to make sure ROOTPATH is sane before we use it. + # https://bugs.gentoo.org/656400 + if [[ :${ROOTPATH}: == *:@GENTOO_PORTAGE_EPREFIX@/usr/sbin:* ]]; then + PATH="${ROOTPATH}" + fi +fi +export PATH +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.5.1-r1.ebuild b/app-shells/zsh/zsh-5.5.1-r1.ebuild new file mode 100644 index 000000000000..9f6dc303d882 --- /dev/null +++ b/app-shells/zsh/zsh-5.5.1-r1.ebuild @@ -0,0 +1,211 @@ +# Copyright 1999-2018 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=6 + +inherit flag-o-matic prefix + +if [[ ${PV} == 9999* ]] ; then + inherit git-r3 autotools + EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code" +else + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" + SRC_URI="https://www.zsh.org/pub/${P}.tar.gz + doc? ( https://www.zsh.org/pub/${P}-doc.tar.xz )" +fi + +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 unicode" + +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:= ) + ! Doc/zshall.1 || die + + # add openrc specific options for init.d completion + eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff + fi + + eapply_user + + if [[ ${PV} == 9999* ]] ; then + sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die + eautoreconf + fi +} + +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 + $(use_enable maildir maildir-support) + $(use_enable pcre) + $(use_enable caps cap) + $(use_enable unicode multibyte) + $(use_enable gdbm ) + ) + + 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() { + 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-4)" 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 @' \ + -i "${i}" + doins "${i}" + done + + dodoc ChangeLog* META-FAQ NEWS README config.modules + + if use doc ; then + pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null + docinto html + dodoc Doc/*.html + insinto /usr/share/doc/${PF} + doins Doc/zsh.{dvi,pdf} + 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 +} diff --git a/app-shells/zsh/zsh-5.5.1.ebuild b/app-shells/zsh/zsh-5.5.1.ebuild deleted file mode 100644 index 4c17da09db4a..000000000000 --- a/app-shells/zsh/zsh-5.5.1.ebuild +++ /dev/null @@ -1,211 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -inherit flag-o-matic prefix - -if [[ ${PV} == 9999* ]] ; then - inherit git-r3 autotools - EGIT_REPO_URI="git://git.code.sf.net/p/zsh/code" -else - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" - SRC_URI="https://www.zsh.org/pub/${P}.tar.gz - doc? ( https://www.zsh.org/pub/${P}-doc.tar.xz )" -fi - -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 unicode" - -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:= ) - ! Doc/zshall.1 || die - - # add openrc specific options for init.d completion - eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff - fi - - eapply_user - - if [[ ${PV} == 9999* ]] ; then - sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die - eautoreconf - fi -} - -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 - $(use_enable maildir maildir-support) - $(use_enable pcre) - $(use_enable caps cap) - $(use_enable unicode multibyte) - $(use_enable gdbm ) - ) - - 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() { - 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-3)" 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 @' \ - -i "${i}" - doins "${i}" - done - - dodoc ChangeLog* META-FAQ NEWS README config.modules - - if use doc ; then - pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null - docinto html - dodoc Doc/*.html - insinto /usr/share/doc/${PF} - doins Doc/zsh.{dvi,pdf} - 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 -} diff --git a/app-shells/zsh/zsh-9999.ebuild b/app-shells/zsh/zsh-9999.ebuild index f53a6be7a4d6..9f6dc303d882 100644 --- a/app-shells/zsh/zsh-9999.ebuild +++ b/app-shells/zsh/zsh-9999.ebuild @@ -57,14 +57,6 @@ src_prepare() { eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff fi - cp "${FILESDIR}"/zprofile-2 "${T}"/zprofile || die - eprefixify "${T}"/zprofile || die - if use prefix ; then - sed -i -e 's|@ZSH_PREFIX@||' -e '/@ZSH_NOPREFIX@/d' "${T}"/zprofile || die - else - sed -i -e 's|@ZSH_NOPREFIX@||' -e '/@ZSH_PREFIX@/d' -e 's|""||' "${T}"/zprofile || die - fi - eapply_user if [[ ${PV} == 9999* ]] ; then @@ -146,7 +138,8 @@ src_install() { emake DESTDIR="${D}" install $(usex doc "install.info" "") insinto /etc/zsh - doins "${T}"/zprofile + export PREFIX_QUOTE_CHAR='"' PREFIX_EXTRA_REGEX="/EUID/s,0,${EUID}," + newins "$(prefixify_ro "${FILESDIR}"/zprofile-4)" zprofile keepdir /usr/share/zsh/site-functions insinto /usr/share/zsh/${PV%_*}/functions/Prompts -- cgit v1.2.3