From c5283d322accc6097afec74eab24550829788bab Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 23 Mar 2018 04:19:44 +0000 Subject: gentoo resync : 23.03.2018 --- app-shells/zsh/Manifest | 5 - app-shells/zsh/files/zsh-5.1.0-gcc-5.patch | 16 -- app-shells/zsh/files/zsh-init.d-gentoo-r1.diff | 30 ---- app-shells/zsh/zsh-5.2.ebuild | 212 ------------------------- 4 files changed, 263 deletions(-) delete mode 100644 app-shells/zsh/files/zsh-5.1.0-gcc-5.patch delete mode 100644 app-shells/zsh/files/zsh-init.d-gentoo-r1.diff delete mode 100644 app-shells/zsh/zsh-5.2.ebuild (limited to 'app-shells/zsh') diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest index 76dd81f49c06..141e5f2f692b 100644 --- a/app-shells/zsh/Manifest +++ b/app-shells/zsh/Manifest @@ -2,16 +2,11 @@ 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 zsh-5.1.0-gcc-5.patch 436 BLAKE2B 4dfaab4e4e9c3d2819709198b18c1d63d8b945cb25e6cce3d6b47b6cb5a19dabbe1678c0e66188b2bf7d735f85318ac6fb3ee77ff6929e29a319e3077f48e7c1 SHA512 3c9ad106baa9ba5c7db389c4291767f61ee3c4f84e20cd4e3d8e73264a2d5e7c42b1e1b268e207bdccbcab02f79037de110630b2f2b855a1871b4f1e6f2ae558 AUX zsh-5.3-init.d-gentoo.diff 1048 BLAKE2B 295e391679ef876a7bdaeaf6dc4b1b3a342c40f092f8cbeba137ee5ea6d26e16f988fc92f105bfcec739bc2aeca62195839b80dee337de8bfdfb5ff00a34fa22 SHA512 9f059cf4b99b7006955ab0ac43d4a4b4d762d193da9a738f771c562f2c3af3a9125694da59c584a3ff829598443e5429c873319ecd8fae2feba7096b597798dd -AUX zsh-init.d-gentoo-r1.diff 987 BLAKE2B 2ebc21cf3789fa2878973bc962d1fb560f8e1bbe6a393f15a2f693d16197f6f1de4d5ad82a74511754c6e836da78b16cc39273770a46b5db3bc2df36b61ca0db SHA512 56ed616177c0167d1819d9749539c035907f4524a3e145b152ca7ac6236c96f0110eb23479794f35fbf86c9ea72286ab832f1a9e3e658b676353bc78e1b06a38 -DIST zsh-5.2-doc.tar.xz 3108600 BLAKE2B ee8bf9d27f51093adc89fe2a14a93ba2d88b34a81d6214fca2d072ced954bf4b3d334fb17e132a9a5eac8ec18ca0251caa37f0370a7f6a3d4ef463b37e36f69e SHA512 a2e6b95c293546011e1697e0a2f66a3740092ef61904fa3b469f33e8af0ced6028fac77cd51ebe9ee4cb168403d9af7c72fd071a15ba3dc273243bd71fa714a0 -DIST zsh-5.2.tar.xz 2820108 BLAKE2B 53a1c7c1954abc0c533d650805d024e63fefae47163d64442cdc59b7867f994ea2e020d91bb1bf594ffa75af8f8437937f396a9d8f9e1b7de9cac1437b97f3b4 SHA512 9938af95e09203a0a313f441e0c23279136806f6f087475ca9a66c678c57ecffc87f73ece8133a36700af8de7cb5d1bec8559eabdec2b66102062e64026c2e72 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 DIST zsh-5.4.2-doc.tar.xz 3198880 BLAKE2B 9ef3c6690251025b669a1cb46d3903d26a7407bc9fc0463c6d3678db57180b690f11302b202346a67afde16f6177fc8a597edca53bf55aaa835a5208e205b75e SHA512 5dcf561380ec46358754a0a03224152cb0db197d8a1558c6457342a6fd0ec6ea43bc3c1c1a79390a2a6034e09e0e668466962462ab14e90807170436a36f82b7 DIST zsh-5.4.2.tar.gz 4482413 BLAKE2B c3b9eb2b1458d88d8849898fa468a5e8575ac06f7859c809e741410b672a61c877027d4d5057b8c2295e6f15ce1f2fed9c0ca3eacf4024b8478b9e1d287c0378 SHA512 5eaa2ff3dc8052dfb50d2be19bfeed1856b00f7c2dc698129c95c2373a516ee61dba5b42ded390ac20b171abe352b1875f177a4dda8fdc15a4f2a05bb7a024e2 -EBUILD zsh-5.2.ebuild 5892 BLAKE2B 9cfe389e3ecca130ac0787f1c826b4ac6b1ea4a3779822d1dc07dc5781ab2478094c5b74f945085cde4b12a011dcee9497f5c548c8fa922124ec6f779d26d89a SHA512 e204af3f7db27c6340b29240a5c99af9d955fee68045344152898ffa5925a44e9dbc72fa18e3d1002033fcddb79b3c274383f75cbcb71f4545f2a2f7e31241df 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-9999.ebuild 5998 BLAKE2B 265d73cf7284891a347f6ad353d6b1f71fd95b74e0b3234562dc713bbb759efb81862abc68b448338cac6ae76cb3bcfe1d9a2bf16392841f24fd63b617245204 SHA512 8476d8741eae45dd02cb03d6c633d5025aa05ebbf342d2650b21664d23447cf7ff18d15e3dca666553f0e885c33108718cc3859195e5a67bd22087a2e40b25f2 diff --git a/app-shells/zsh/files/zsh-5.1.0-gcc-5.patch b/app-shells/zsh/files/zsh-5.1.0-gcc-5.patch deleted file mode 100644 index 74756d2946c4..000000000000 --- a/app-shells/zsh/files/zsh-5.1.0-gcc-5.patch +++ /dev/null @@ -1,16 +0,0 @@ -https://bugs.gentoo.org/547950 -http://www.zsh.org/mla/workers/2015/msg02660.html - -fix building w/gcc-5 - ---- a/Src/Modules/system.mdd -+++ b/Src/Modules/system.mdd -@@ -15,7 +15,7 @@ - touch errtmp.out; \ - else \ - $(AWK) -f $(sdir)/errnames1.awk @ERRNO_H@ >errtmp.c; \ -- $(CPP) errtmp.c >errtmp.out; \ -+ $(CPP) -P errtmp.c >errtmp.out; \ - fi - $(AWK) -f $(sdir)/errnames2.awk errtmp.out > $@ - rm -f errtmp.c errtmp.out diff --git a/app-shells/zsh/files/zsh-init.d-gentoo-r1.diff b/app-shells/zsh/files/zsh-init.d-gentoo-r1.diff deleted file mode 100644 index 9597a733c903..000000000000 --- a/app-shells/zsh/files/zsh-init.d-gentoo-r1.diff +++ /dev/null @@ -1,30 +0,0 @@ ---- zsh-4.3.11/Completion/Unix/Command/_init_d -+++ zsh-4.3.11/Completion/Unix/Command/_init_d -@@ -1,6 +1,6 @@ - #compdef -p */(init|rc[0-9S]#).d/* - --local cmds script -+local cmds script opts - - _compskip=all - -@@ -83,10 +83,17 @@ - - script=$words[1] - [[ $script = */* ]] || script="$(_init_d_fullpath "$script")" -+[[ ! -f $script ]] && -+ { _message "${words[1]:t} is not an init script" && return } - - cmds=( $(_init_d_get_cmds) ) || return - --(( $#cmds )) || zstyle -a ":completion:${curcontext}:commands" commands cmds || -- cmds=(start stop) -+(( $#cmds )) || zstyle -a ":completion:${curcontext}:commands" commands cmds -+opts=(start stop restart pause zap status ineed iuse needsme usesme broken) -+ -+# If we didn't get $cmds from a zstyle, then read init script for opts. -+# If script doesn't specify opts, then default to the standard opts. -+(( $#cmds )) || cmds=( ${(eQz)${(M)${(f)"$( <$script)"}:#[[:blank:]]#opts=*}#*=} ) -+(( $#cmds )) || cmds=($opts) - - _sub_commands $cmds diff --git a/app-shells/zsh/zsh-5.2.ebuild b/app-shells/zsh/zsh-5.2.ebuild deleted file mode 100644 index 4f604601c84c..000000000000 --- a/app-shells/zsh/zsh-5.2.ebuild +++ /dev/null @@ -1,212 +0,0 @@ -# Copyright 1999-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -inherit eutils flag-o-matic multilib 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="http://www.zsh.org/pub/${P}.tar.xz - doc? ( http://www.zsh.org/pub/${P}-doc.tar.xz )" -fi - -DESCRIPTION="UNIX Shell similar to the Korn shell" -HOMEPAGE="http://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:= ) -" -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 - -src_prepare() { - # fix zshall problem with soelim - ln -s Doc man1 - mv Doc/zshall.1 Doc/zshall.1.soelim - soelim Doc/zshall.1.soelim > Doc/zshall.1 - - epatch "${FILESDIR}"/${PN}-init.d-gentoo-r1.diff - epatch "${FILESDIR}"/${PN}-5.1.0-gcc-5.patch #547950 - - cp "${FILESDIR}"/zprofile-1 "${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 - - if [[ ${PV} == 9999* ]] ; then - sed -i "/^VERSION=/s/=.*/=${PV}/" Config/version.mk || die - eautoreconf - fi -} - -src_configure() { - local myconf=() - - 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 \ - --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 ) \ - "${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 install.info - - insinto /etc/zsh - doins "${T}"/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 - dohtml -r Doc/* - 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 -} -- cgit v1.2.3