From d5536b01f9264feb08dbef479d763c1ec01d63bc Mon Sep 17 00:00:00 2001 From: Tim Harder Date: Sun, 25 Mar 2012 07:01:47 +0000 Subject: Remove old. (Portage version: 2.2.0_alpha95/cvs/Linux x86_64) --- app-shells/zsh/ChangeLog | 6 +- app-shells/zsh/files/4.3.11-subst.patch | 24 ---- app-shells/zsh/zsh-4.3.11-r1.ebuild | 202 -------------------------------- app-shells/zsh/zsh-4.3.12.ebuild | 181 ---------------------------- 4 files changed, 5 insertions(+), 408 deletions(-) delete mode 100644 app-shells/zsh/files/4.3.11-subst.patch delete mode 100644 app-shells/zsh/zsh-4.3.11-r1.ebuild delete mode 100644 app-shells/zsh/zsh-4.3.12.ebuild (limited to 'app-shells') diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog index d79da98489a8..8fddc8df5b5c 100644 --- a/app-shells/zsh/ChangeLog +++ b/app-shells/zsh/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for app-shells/zsh # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.188 2012/03/18 19:17:38 armin76 Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.189 2012/03/25 07:01:47 radhermit Exp $ + + 25 Mar 2012; Tim Harder -files/4.3.11-subst.patch, + -zsh-4.3.11-r1.ebuild, -zsh-4.3.12.ebuild: + Remove old. 18 Mar 2012; Raúl Porcel zsh-4.3.15.ebuild: alpha/ia64/s390/sh/sparc stable wrt #401931 diff --git a/app-shells/zsh/files/4.3.11-subst.patch b/app-shells/zsh/files/4.3.11-subst.patch deleted file mode 100644 index d9544cc445bb..000000000000 --- a/app-shells/zsh/files/4.3.11-subst.patch +++ /dev/null @@ -1,24 +0,0 @@ -Bugs-Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=352056 ---- a/Src/subst.c -+++ b/Src/subst.c -@@ -2814,12 +2814,14 @@ - zerr("invalid length: %s", check_offset); - return NULL; - } -- length = mathevali(check_offset); -- if (errflag) -- return NULL; -- if (length < (zlong)0) { -- zerr("invalid length: %s", check_offset); -- return NULL; -+ if (check_offset) { -+ length = mathevali(check_offset); -+ if (errflag) -+ return NULL; -+ if (length < (zlong)0) { -+ zerr("invalid length: %s", check_offset); -+ return NULL; -+ } - } - } - if (horrible_offset_hack) { diff --git a/app-shells/zsh/zsh-4.3.11-r1.ebuild b/app-shells/zsh/zsh-4.3.11-r1.ebuild deleted file mode 100644 index 923c8b45803b..000000000000 --- a/app-shells/zsh/zsh-4.3.11-r1.ebuild +++ /dev/null @@ -1,202 +0,0 @@ -# Copyright 1999-2011 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.11-r1.ebuild,v 1.9 2011/03/24 18:29:18 xarthisius Exp $ - -EAPI=3 - -# doc package for -dev version exists? -doc_available=true - -inherit eutils flag-o-matic multilib prefix - -MY_PV=${PV/_p/-dev-} -S=${WORKDIR}/${PN}-${MY_PV} - -zsh_ftp="ftp://ftp.zsh.org/pub" - -if [[ ${PV} != "${MY_PV}" ]] ; then - ZSH_URI="${zsh_ftp}/development/${PN}-${MY_PV}.tar.bz2" - if ${doc_available} ; then - ZSH_DOC_URI="${zsh_ftp}/development/${PN}-${MY_PV}-doc.tar.bz2" - else - ZSH_DOC_URI="${zsh_ftp}/${PN}-${PV%_*}-doc.tar.bz2" - fi -else - ZSH_URI="mirror://sourceforge/${PN}/${P}.tar.bz2 - ${zsh_ftp}/${P}.tar.bz2" - ZSH_DOC_URI="${zsh_ftp}/${PN}-${PV%_*}-doc.tar.bz2" -fi - -LOVERS_PV=0.8.3 -LOVERS_P=zsh-lovers -LOVERS_URI="http://deb.grml.org/pool/main/z/zsh-lovers" - -DESCRIPTION="UNIX Shell similar to the Korn shell" -HOMEPAGE="http://www.zsh.org/" -SRC_URI="${ZSH_URI} - examples? ( ${LOVERS_URI}/${LOVERS_P}_${LOVERS_PV}.tar.gz ) - doc? ( ${ZSH_DOC_URI} )" - -LICENSE="ZSH gdbm? ( GPL-2 )" -SLOT="0" -KEYWORDS="alpha amd64 arm hppa ia64 ppc ppc64 s390 sh sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="caps debug doc examples gdbm maildir pcre static unicode" - -RDEPEND=">=sys-libs/ncurses-5.1 - static? ( || ( >=sys-libs/ncurses-5.7-r4[static-libs] =dev-libs/libpcre-3.9 - static? ( >=dev-libs/libpcre-3.9[static-libs] ) ) - gdbm? ( sys-libs/gdbm )" -DEPEND="sys-apps/groff - examples? ( app-text/asciidoc ) - ${RDEPEND}" - -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 \ - "${FILESDIR}"/4.3.11-subst.patch - - 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 -} - -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-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions \ - --enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions \ - --enable-function-subdirs \ - --with-term-lib="ncursesw ncurses" \ - --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 -i \ - -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," \ - "${S}"/config.modules || die - if ! use gdbm ; then - sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \ - "${S}"/config.modules || die - fi -# else -# sed -i -e "/LIBS/s%-lpcre%${EPREFIX}/usr/$(get_libdir)/libpcre.a%" Makefile - fi -} - -src_test() { - local i - addpredict /dev/ptmx - for i in C02cond.ztst Y01completion.ztst Y02compmatch.ztst Y03arguments.ztst ; do - rm "${S}"/Test/${i} || die - done - make check || die "make check failed" -} - -src_install() { - emake DESTDIR="${D}" install install.info || die - - insinto /etc/zsh - doins "${T}"/zprofile || die - - keepdir /usr/share/zsh/site-functions - insinto /usr/share/zsh/${PV%_*}/functions/Prompts - newins "${FILESDIR}"/prompt_gentoo_setup-1 prompt_gentoo_setup || die - - # install miscellaneous scripts; bug #54520 - local i - sed -i -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \ - -e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" "${S}"/{Util,Misc}/* || die - for i in Util Misc ; do - insinto /usr/share/zsh/${PV%_*}/${i} - doins ${i}/* || die - done - - dodoc ChangeLog* META-FAQ NEWS README config.modules - - if use doc ; then - pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null - dohtml -r Doc/* || die - insinto /usr/share/doc/${PF} - doins Doc/zsh.{dvi,pdf} || die - popd >/dev/null - fi - - if use examples ; then - pushd "${WORKDIR}/${LOVERS_P/.orig/}" >/dev/null - asciidoc zsh-lovers.1.txt - mv zsh-lovers.1.html zsh-lovers.html || die - a2x -f manpage zsh-lovers.1.txt || die - #a2x -f pdf zsh-lovers.1.txt || die - #mv zsh-lovers.1.pdf zsh-lovers.pdf || die - - doman zsh-lovers.1 || die "doman zsh-lovers failed" - dohtml zsh-lovers.html || die "dohtml zsh-lovers failed" - docinto zsh-lovers - dodoc zsh.vim README || die - insinto /usr/share/doc/${PF}/zsh-lovers - doins refcard.pdf || die -# doins zsh-lovers.{ps,pdf} refcard.{dvi,ps,pdf} || die - doins -r zsh_people || die "doins zsh_people failed" - popd >/dev/null - fi - - docinto StartupFiles - dodoc StartupFiles/z* -} - -pkg_postinst() { - # should link to http://www.gentoo.org/doc/en/zsh.xml - elog - elog "If you want to enable Portage completions and Gentoo prompt," - elog "emerge app-shells/zsh-completion and add" - elog " autoload -U compinit promptinit" - elog " compinit" - elog " promptinit; prompt gentoo" - elog "to your ~/.zshrc" - elog - elog "Also, if you want to enable cache for the completions, add" - elog " zstyle ':completion::complete:*' use-cache 1" - elog "to your ~/.zshrc" - elog -} diff --git a/app-shells/zsh/zsh-4.3.12.ebuild b/app-shells/zsh/zsh-4.3.12.ebuild deleted file mode 100644 index b58a61bb424a..000000000000 --- a/app-shells/zsh/zsh-4.3.12.ebuild +++ /dev/null @@ -1,181 +0,0 @@ -# Copyright 1999-2012 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.12.ebuild,v 1.7 2012/02/02 15:19:45 ssuominen Exp $ - -EAPI=4 - -# doc package for -dev version exists? -doc_available=true - -inherit eutils flag-o-matic multilib prefix - -MY_PV=${PV/_p/-dev-} -S=${WORKDIR}/${PN}-${MY_PV} - -zsh_ftp="ftp://ftp.zsh.org/pub" - -if [[ ${PV} != "${MY_PV}" ]] ; then - ZSH_URI="${zsh_ftp}/development/${PN}-${MY_PV}.tar.bz2" - if ${doc_available} ; then - ZSH_DOC_URI="${zsh_ftp}/development/${PN}-${MY_PV}-doc.tar.bz2" - else - ZSH_DOC_URI="${zsh_ftp}/${PN}-${PV%_*}-doc.tar.bz2" - fi -else - ZSH_URI="mirror://sourceforge/${PN}/${P}.tar.bz2 - ${zsh_ftp}/${P}.tar.bz2" - ZSH_DOC_URI="${zsh_ftp}/${PN}-${PV%_*}-doc.tar.bz2" -fi - -DESCRIPTION="UNIX Shell similar to the Korn shell" -HOMEPAGE="http://www.zsh.org/" -SRC_URI="${ZSH_URI} - doc? ( ${ZSH_DOC_URI} )" - -LICENSE="ZSH gdbm? ( GPL-2 )" -SLOT="0" -KEYWORDS="~alpha amd64 arm hppa ~ia64 ppc ppc64 ~s390 ~sh ~sparc x86 ~sparc-fbsd ~x86-fbsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris" -IUSE="caps debug doc examples gdbm maildir pcre static unicode" - -RDEPEND=" - >=sys-libs/ncurses-5.1 - static? ( || ( >=sys-libs/ncurses-5.7-r4[static-libs] =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 ) -" - -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 - - 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 -} - -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-fndir="${EPREFIX}"/usr/share/zsh/${PV%_*}/functions \ - --enable-site-fndir="${EPREFIX}"/usr/share/zsh/site-functions \ - --enable-function-subdirs \ - --with-term-lib="ncursesw ncurses" \ - --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 -i \ - -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," \ - "${S}"/config.modules || die - if ! use gdbm ; then - sed -i '/^name=zsh\/db\/gdbm/s,link=static,link=no,' \ - "${S}"/config.modules || die - fi -# else -# sed -i -e "/LIBS/s%-lpcre%${EPREFIX}/usr/$(get_libdir)/libpcre.a%" Makefile - fi -} - -src_test() { - local i - addpredict /dev/ptmx - for i in C02cond.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 - - # install miscellaneous scripts; bug #54520 - local i - sed -i -e "s:/usr/local/bin/perl:${EPREFIX}/usr/bin/perl:g" \ - -e "s:/usr/local/bin/zsh:${EPREFIX}/bin/zsh:g" "${S}"/{Util,Misc}/* || die - for i in Util Misc ; do - insinto /usr/share/zsh/${PV%_*}/${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() { - # should link to http://www.gentoo.org/doc/en/zsh.xml - elog - elog "If you want to enable Portage completions and Gentoo prompt," - elog "emerge app-shells/zsh-completion and add" - elog " autoload -U compinit promptinit" - elog " compinit" - elog " promptinit; prompt gentoo" - elog "to your ~/.zshrc" - elog - elog "Also, if you want to enable cache for the completions, add" - elog " zstyle ':completion::complete:*' use-cache 1" - elog "to your ~/.zshrc" - elog -} -- cgit v1.2.3-65-gdbad