diff options
| author |   Mike Gilbert <floppym@gentoo.org> | 2018-05-24 15:27:50 -0400 |
|---|---|---|
| committer |   William Hubbs <williamh@gentoo.org> | 2018-06-05 15:35:33 -0500 |
| commit | d09566dc69f7806142d67955f8d05383d60d0622 (patch) | |
| tree | 3244f16f08a5995fa85a0dd0888f59fdfb4aea61 /app-shells/zsh/zsh-9999.ebuild | |
| parent | media-sound/quodlibet: drop old version (diff) | |
| download | gentoo-d09566dc69f7806142d67955f8d05383d60d0622.tar.gz gentoo-d09566dc69f7806142d67955f8d05383d60d0622.tar.bz2 gentoo-d09566dc69f7806142d67955f8d05383d60d0622.zip | |
app-shells/zsh: check for /usr/sbin in ROOTPATH before using it
The maintainer, radhermit@gentoo.org, authorized me to fix this bug
(williamh).
Closes: https://bugs.gentoo.org/656400
Closes: https://github.com/gentoo/gentoo/pull/8550
Closes: https://github.com/gentoo/gentoo/pull/8566
Diffstat (limited to 'app-shells/zsh/zsh-9999.ebuild')
| -rw-r--r-- | app-shells/zsh/zsh-9999.ebuild | 11 |
1 files changed, 2 insertions, 9 deletions
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 |