diff options
| author |   Martin Väth <martin@mvath.de> | 2017-08-10 21:31:03 +0200 |
|---|---|---|
| committer | Martin Väth <martin@mvath.de> | 2017-08-10 21:31:03 +0200 |
| commit | 9726a6879bf99870fa32674cfcc69fb4f77eded5 (patch) | |
| tree | 6af22a94382774bfb1ac158a003e025552b512e4 /app-shells/zsh | |
| parent | www-plugins/stylus: Version bump (diff) | |
| download | mv-9726a6879bf99870fa32674cfcc69fb4f77eded5.tar.gz mv-9726a6879bf99870fa32674cfcc69fb4f77eded5.tar.bz2 mv-9726a6879bf99870fa32674cfcc69fb4f77eded5.zip | |
app-shells/zsh: Version bump
Diffstat (limited to 'app-shells/zsh')
| -rw-r--r-- | app-shells/zsh/Manifest | 4 | ||||
| -rw-r--r-- | app-shells/zsh/files/zprofile-2 (renamed from app-shells/zsh/files/zprofile-1) | 5 | ||||
| -rw-r--r-- | app-shells/zsh/zsh-5.4.1.ebuild (renamed from app-shells/zsh/zsh-5.3.1.ebuild) | 3 | ||||
| -rw-r--r-- | app-shells/zsh/zsh-99999999.ebuild | 3 |
4 files changed, 8 insertions, 7 deletions
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest index 323a937f..0b31a011 100644 --- a/app-shells/zsh/Manifest +++ b/app-shells/zsh/Manifest @@ -1,2 +1,2 @@ -DIST zsh-5.3.1-doc.tar.xz 3161408 SHA256 d51762fcb5699c332da8a4e404cb9eb8d5de8fa4e0235a08bcf252c915bda6ed -DIST zsh-5.3.1.tar.xz 2928832 SHA256 fc886cb2ade032d006da8322c09a7e92b2309177811428b121192d44832920da +DIST zsh-5.4.1-doc.tar.xz 3197560 SHA256 b8b1a40aeec852806ad2b74b0a0c534320bf517e2fe2a087c0c9d39e75dc29f1 +DIST zsh-5.4.1.tar.xz 2972824 SHA256 94cbd57508287e8faa081424509738d496f5f41e32ed890e3a5498ce05d3633b diff --git a/app-shells/zsh/files/zprofile-1 b/app-shells/zsh/files/zprofile-2 index e78ec265..9c4313c4 100644 --- a/app-shells/zsh/files/zprofile-1 +++ b/app-shells/zsh/files/zprofile-2 @@ -23,10 +23,9 @@ umask 022 # This way the evaluation can be short-circuited and calling whoami is # avoided. if [ "$EUID" = "0" ] || [ "$USER" = "root" ] ; then - @ZSH_NOPREFIX@PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${ROOTPATH}" + @ZSH_NOPREFIX@PATH="${ROOTPATH}" @ZSH_PREFIX@PATH="@GENTOO_PORTAGE_EPREFIX@/usr/sbin:@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/sbin:@GENTOO_PORTAGE_EPREFIX@/bin:${ROOTPATH}:/usr/sbin:/usr/bin:/sbin:/bin" -else - @ZSH_NOPREFIX@PATH="/usr/local/bin:/usr/bin:/bin:${PATH}" +@ZSH_PREFIX@else @ZSH_PREFIX@PATH="@GENTOO_PORTAGE_EPREFIX@/usr/bin:@GENTOO_PORTAGE_EPREFIX@/bin:${PATH}:/usr/bin:/bin" fi export PATH diff --git a/app-shells/zsh/zsh-5.3.1.ebuild b/app-shells/zsh/zsh-5.4.1.ebuild index 4d13ee84..6e496f0f 100644 --- a/app-shells/zsh/zsh-5.3.1.ebuild +++ b/app-shells/zsh/zsh-5.4.1.ebuild @@ -69,6 +69,7 @@ RDEPEND=" static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm ) + !<sys-apps/baselayout-2.4.1 " DEPEND+=" sys-apps/groff @@ -120,7 +121,7 @@ src_prepare() { ${LIVE} || eapply "${FILESDIR}"/${PN}-init.d-gentoo-r1.diff - cp "${FILESDIR}"/zprofile-1 "${T}"/zprofile || die + 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 diff --git a/app-shells/zsh/zsh-99999999.ebuild b/app-shells/zsh/zsh-99999999.ebuild index 4d13ee84..6e496f0f 100644 --- a/app-shells/zsh/zsh-99999999.ebuild +++ b/app-shells/zsh/zsh-99999999.ebuild @@ -69,6 +69,7 @@ RDEPEND=" static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) gdbm? ( sys-libs/gdbm ) + !<sys-apps/baselayout-2.4.1 " DEPEND+=" sys-apps/groff @@ -120,7 +121,7 @@ src_prepare() { ${LIVE} || eapply "${FILESDIR}"/${PN}-init.d-gentoo-r1.diff - cp "${FILESDIR}"/zprofile-1 "${T}"/zprofile || die + 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 |