From ad6182343997a405079870a2fe91c4e0c6b94595 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Wed, 25 Sep 2019 19:33:39 +0100
Subject: gentoo resync : 25.09.2019
---
app-shells/zsh/Manifest | 9 +-
app-shells/zsh/zsh-5.6.2.ebuild | 5 +-
app-shells/zsh/zsh-5.7-r1.ebuild | 220 ---------------------------------------
app-shells/zsh/zsh-5.7.1.ebuild | 3 +-
app-shells/zsh/zsh-9999.ebuild | 3 +-
5 files changed, 7 insertions(+), 233 deletions(-)
delete mode 100644 app-shells/zsh/zsh-5.7-r1.ebuild
(limited to 'app-shells/zsh')
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 17a0acc63ca1..8c06873dfa47 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -4,12 +4,9 @@ AUX zsh-5.3-init.d-gentoo.diff 1048 BLAKE2B 295e391679ef876a7bdaeaf6dc4b1b3a342c
AUX zsh-5.7-fix_infinite_recursion.patch 1102 BLAKE2B b5bcf1cec800e83726479be36525870329e6543220e58b72c9a9ed89d9c28f459fc5fedea2986a8e6b89bbeeb303e4d9a1e00e3ab2a3602e9c09389d745a9a16 SHA512 f72285f2ddedf1da44f419c13b54dca2a1845027ff36a4b00ea58aadf3e19986aed3568325afbc4ff7b7e92820875ac75263287dce73c2ba1d16409d5def0353
DIST zsh-5.6.2-doc.tar.xz 3198932 BLAKE2B 7e701bb12e0114b7d9847caad1146fa3d538f8f6d859a765037660fb18341f1c79002811a42ec795e41eb2bbe899e12d4bcd055ea5c66e7b73bd488bdf8bbb55 SHA512 5102314e2857b032c6e6b4b715c261970b2f0c28663aff99fb87f7bb6c3971f88f8e8892ed349793570beae3fb68ff7923c82e99a3c1bb485e4639f01caaad4a
DIST zsh-5.6.2.tar.xz 3077368 BLAKE2B 8c6ce22436f9f51eff809c779efad02f4a0730b4431630ab305abc9f1ef722698f7c565d0aa421b0d94c21f2c830f9d529709fd62a4205be1a20acf0f94a845a SHA512 f0a49e41b55eb478692ab5471d7c9828956b7e96bc82944202b0ef1c49a889b21a0e7682aa5f59fd0054ebfd866c2244c8a622e7aa46c13038af5c226c48a3a2
-DIST zsh-5.7-doc.tar.xz 3062428 BLAKE2B 1ee818fd3625c3c96add6fb8f0ccb42dd05eeb33b4f4513e4e436974f835465fdb9dd4092c652bcda24762bc39307946e14c4969e03038ae43f77c24871a5449 SHA512 4b5f256ed39c0594daf2fdb2f995c60944c70556438b986fcf6f4e40dbfdc58e70eb65691c841d5dbb973a20b30255abe55ed140482b7afd446e1911c4efd395
DIST zsh-5.7.1-doc.tar.xz 3062112 BLAKE2B cb67aada97d79b4b5b1116fb0737294785a2a510c2f4396cf77b671b62631e778ee9d57a32dcd257e079a9e4c35acaeeb68c0ec951b6ae8d8d8b647c05ef365c SHA512 e51bc8eb408bcb20bf8a4f0b8588f7803fdd433445efa282f598a3bec4575cba7feaad117cd2d5077f51150bf0ba41a673ffb925ade33c435db498f1d791cc8c
DIST zsh-5.7.1.tar.xz 3126308 BLAKE2B 4f1aa2d5aea0341ba7839cf05687020889b5ca6879654a376ce838986211af4bddb7ab521a8a35cc06701f730a75a9778c633726b447f31845f5c140ec1e8d80 SHA512 a6aa88e1955a80229a4784a128866e325f79a8b5f73c922ab480048411036f1835cbb31daa30ab38bd16ab2a50040eda8f4f1f64704b21b6acc3051b1dbf18d0
-DIST zsh-5.7.tar.xz 3124708 BLAKE2B 6b3822d3bb647aaf1072b9d499dbe9a65dc6cec0b83fb7fb09050e26bcc71fc0fb2846a1b754f9f206b602632add39e52465c1092f131f9000a149dbd2b469de SHA512 cfef5604d6ff30aeb081ed2a2660c861027c0a90169231cdb6b19093ffa6d63946be7b1fde527769e60e5b14bb6853b590bf4a207b63d6ec66fffd30d9a94958
-EBUILD zsh-5.6.2.ebuild 5849 BLAKE2B 4e665d07154f52a0cd12ed3eb5b3b7facf5dc802f2fbb8faeb77b33c897c9aaf05f843f3670b09b92ede76a1d34b0f4c30469b1e07a176cbb9cfafd9e8340bbc SHA512 0552a4a7dd72536eaf8371cbfc5a2c7e479c93e3632bede86803b7073cf31f293f77668e19b3101957cdb2ce91f10ac7b955b36c61b6ce77c4fabff3ead4f0d0
-EBUILD zsh-5.7-r1.ebuild 6009 BLAKE2B 5bf15af8a761a17510505bf53bef50ed23a115194db4e22e30440aad51a83841a08da5e00bc146efa56b92872f4f557821f3501a0a40e32bdcfc70d709e784f5 SHA512 1eec250682c62a4fad3fc52d1d5ac28281cbd7b284a52120d42f921ff62d4607b87f396a920bcb0014e867a03195366fb1fa792fc5441d8b781bd3b90ff7bc72
-EBUILD zsh-5.7.1.ebuild 5971 BLAKE2B 85afb37a3f4e9072107e5aa9091b40e93a4a88c84961451c56d75e95cd1911157b42e7f0d512c1b0b8cd0a1f5aa3234e2f992f3995aabb1d49fd8694096761c8 SHA512 ea209cd0b6da1311450c82dd49a86cc655b097fdac636af7d01555be69d4c4f619ebce0503b8f8d523e9a41b93c1f5f866774ae556477869ff68defb1149ec27
-EBUILD zsh-9999.ebuild 5947 BLAKE2B e3e0d42d2e80a8329ad215408a5c2e8a6b16451e030b4ec57255d1911ca4fd20bf91f80a922798947b8e3d1218195bda77dd104158af20fa821c08e55537f219 SHA512 041f7afc610f666384665fa3da6ad27de66d3a3353a6fd5b7192032a24ffe0e042c06903b3d12be157e2c0176857b5169cb4cf21b2aa2a302d9bbe2cb2e1baad
+EBUILD zsh-5.6.2.ebuild 5818 BLAKE2B 9c13880d309a3633d212bfa6558fd2e90449e69bf31b824ec281c082680a0e65e2a530dc834edc1cad3d3730dce91ce9ade93711fc99dd482fc7cb2ccf49972b SHA512 0190157e6f8c505b9ff00e1c40ad533fdfe82bd838c4ca1ffad52ec4fc2f90ba61b0ec5d16153d8bad33e63328e9e9c3aedf3039bba8a476e5785961c564dae7
+EBUILD zsh-5.7.1.ebuild 5940 BLAKE2B 3d7f046f35cf0482c7eb7c7953fb05e1d0ee69820de63f136a41729096f2053191941a8e22e457e2734d2cced098297b396c28b58a5dd8572ed8e1ccd99621e6 SHA512 ed8776a949260bbe6b5fa57ed4aad3c4afb9458e4ac725aa7cfe7d48bc01b75471ff9fdb1a3d525d46b28638f26ff14954e8e9161361396f35de1f6820f38e76
+EBUILD zsh-9999.ebuild 5916 BLAKE2B 8a5c637277b376af1b0cd2fa0e0e851081f482b329b3eae6367606a7601b95eeb7b6228f8703044d380dfd412bf21ea99936b6d4f06d6cf1b28c83bf1004aa28 SHA512 216628b3adc05829d3132593d36b45ccea3fc93cc40bb9e92fe6acfdcd8c1ca00ce7bf16eb23e34cc986235ed77c6e356abd6f059457bc653b7dfb3b5b9e9d9f
MISC metadata.xml 627 BLAKE2B 075ca50a779af22aa7664943a0ec270d99869d615d73aa65f5483d4ae30821ca535f18e8841c43f2359ae83650f32931a6f91e8b0eab63ceee7ec4754db55f3c SHA512 489307b83b15893965874824d59bf9d54a6f82aa13c62e1e7a12ada87d10b8e5d3ab63c6e1dc327b087f7403c871ce3cb766423e3513ed0c3b2304342775fbb1
diff --git a/app-shells/zsh/zsh-5.6.2.ebuild b/app-shells/zsh/zsh-5.6.2.ebuild
index dbbb337d6e96..09315ecb9b23 100644
--- a/app-shells/zsh/zsh-5.6.2.ebuild
+++ b/app-shells/zsh/zsh-5.6.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=7
@@ -171,10 +171,9 @@ src_install() {
if use doc ; then
pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
+ dodoc Doc/zsh.{dvi,pdf}
docinto html
dodoc Doc/*.html
- insinto /usr/share/doc/${PF}
- doins Doc/zsh.{dvi,pdf}
popd >/dev/null
fi
diff --git a/app-shells/zsh/zsh-5.7-r1.ebuild b/app-shells/zsh/zsh-5.7-r1.ebuild
deleted file mode 100644
index 113f397ad17a..000000000000
--- a/app-shells/zsh/zsh-5.7-r1.ebuild
+++ /dev/null
@@ -1,220 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic prefix
-
-if [[ ${PV} == 9999* ]] ; then
- inherit git-r3 autotools
- EGIT_REPO_URI="https://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.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
- )"
-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:= )
- !<sys-apps/baselayout-2.4.1
-"
-DEPEND="sys-apps/groff
- ${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=(
- "${FILESDIR}"/${P}-fix_infinite_recursion.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
-
- # add openrc specific options for init.d completion
- eapply "${FILESDIR}"/${PN}-5.3-init.d-gentoo.diff
- fi
-
- default
-
- 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 <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
- 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.7.1.ebuild b/app-shells/zsh/zsh-5.7.1.ebuild
index 103eb4abf6a4..03b1e1d45531 100644
--- a/app-shells/zsh/zsh-5.7.1.ebuild
+++ b/app-shells/zsh/zsh-5.7.1.ebuild
@@ -176,10 +176,9 @@ src_install() {
if use doc ; then
pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
+ dodoc Doc/zsh.{dvi,pdf}
docinto html
dodoc Doc/*.html
- insinto /usr/share/doc/${PF}
- doins Doc/zsh.{dvi,pdf}
popd >/dev/null
fi
diff --git a/app-shells/zsh/zsh-9999.ebuild b/app-shells/zsh/zsh-9999.ebuild
index 7455f1937729..2d05ce7a473d 100644
--- a/app-shells/zsh/zsh-9999.ebuild
+++ b/app-shells/zsh/zsh-9999.ebuild
@@ -175,10 +175,9 @@ src_install() {
if use doc ; then
pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
+ dodoc Doc/zsh.{dvi,pdf}
docinto html
dodoc Doc/*.html
- insinto /usr/share/doc/${PF}
- doins Doc/zsh.{dvi,pdf}
popd >/dev/null
fi
--
cgit v1.2.3