diff options
| -rw-r--r-- | app-shells/zsh/ChangeLog | 9 | ||||
| -rw-r--r-- | app-shells/zsh/Manifest | 24 | ||||
| -rw-r--r-- | app-shells/zsh/files/digest-zsh-4.3.2-r2 | 9 | ||||
| -rw-r--r-- | app-shells/zsh/zsh-4.3.2-r1.ebuild | 4 | ||||
| -rw-r--r-- | app-shells/zsh/zsh-4.3.2-r2.ebuild | 170 |
5 files changed, 205 insertions, 11 deletions
diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog index 420be2f08803..c11ee02637fe 100644 --- a/app-shells/zsh/ChangeLog +++ b/app-shells/zsh/ChangeLog @@ -1,6 +1,13 @@ # ChangeLog for app-shells/zsh # Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.99 2006/11/02 19:49:32 usata Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.100 2006/11/04 19:23:29 usata Exp $ + +*zsh-4.3.2-r2 (04 Nov 2006) + + 04 Nov 2006; Mamoru KOMACHI <usata@gentoo.org> zsh-4.3.2-r1.ebuild, + +zsh-4.3.2-r2.ebuild: + Added examples USE flag. Thanks to Johannes Weiner <hnazfoo@gmail.com> + for the suggestion. This closes bug #146923. Fixed Doc files path. 02 Nov 2006; Mamoru KOMACHI <usata@gentoo.org> files/zprofile, -files/zsh-strncmp.diff, -zsh-4.0.9-r4.ebuild, -zsh-4.2.4.ebuild, diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest index fce900b28509..2e301b023754 100644 --- a/app-shells/zsh/Manifest +++ b/app-shells/zsh/Manifest @@ -25,6 +25,7 @@ DIST zsh-4.2.6-doc.tar.bz2 1770113 DIST zsh-4.2.6.tar.bz2 2098671 RMD160 e4400fc6311bf6996128ecf7899592d6d8cdb310 SHA1 e00c3eda3f52c9514bb625bb56e4480358170d39 SHA256 d5b9b93e8259d3059042e82d1738d623af6981c38c9f185b3949ea3dacbe6a61 DIST zsh-4.3.2-doc.tar.bz2 2207375 RMD160 2f9bffc5faac847fa53f16ecf3f6f34fed6462ff SHA1 1eee74b2f1f30428464b9a387b15d75e886e4b99 SHA256 f8d21d1afa4ad3e59d8ccf835eb378ca39b6c894400ad8cd67f4bce796d0c14f DIST zsh-4.3.2.tar.bz2 2263544 RMD160 2bb4431db21cffdb2da4751c0fdaeca5efd0b61e SHA1 a6dd50c7578812bdb30f4cb65c8ac280c86dbfc3 SHA256 ca0e27cc99115294be8323afa50027da56ad937fa2d99cabcd2a26039181dfd3 +DIST zsh-lovers_0.5.orig.tar.gz 499014 RMD160 505261d9e28554c838864421ec81b6665e55dfa1 SHA1 bc9b41dd5814f60b39d393ef68c4dc099da9016b SHA256 d945adab65fdf3ff322ed64c54739b2a1cec964544c5f438005ddad9c0c62bea EBUILD zsh-4.2.5.ebuild 4550 RMD160 667aa17690dc93919b68332c605857f1c00c3012 SHA1 7f1d24cccba229ac4ef4a05d8539ae712e4da18f SHA256 aef066c01d539c8cefb70210281af85576d990f1ba78ef411c588f3695235b86 MD5 ed4f462bf34c8e66ea0262db7dbfbaaf zsh-4.2.5.ebuild 4550 RMD160 667aa17690dc93919b68332c605857f1c00c3012 zsh-4.2.5.ebuild 4550 @@ -33,14 +34,18 @@ EBUILD zsh-4.2.6-r1.ebuild 4348 RMD160 9adbbef79025021d89df5edfd810d2949404eddd MD5 4d4a547443a3128972ee302ebefe94de zsh-4.2.6-r1.ebuild 4348 RMD160 9adbbef79025021d89df5edfd810d2949404eddd zsh-4.2.6-r1.ebuild 4348 SHA256 8779988e3e4c53531d16250281e5eb5e6ada816c282be528e0888d11ba51522c zsh-4.2.6-r1.ebuild 4348 -EBUILD zsh-4.3.2-r1.ebuild 4309 RMD160 525d63bc9b5b043097c6b845aeaf0f4bd92e9a4f SHA1 f34a35cdb59880d0cb72bcb9c055bd9d4f2c5105 SHA256 634cbc144462931ad6db60d28638202eefd3685c85a080ba2975d549ae65a64d -MD5 99f451837a4f59210bf7df1ad899cbb0 zsh-4.3.2-r1.ebuild 4309 -RMD160 525d63bc9b5b043097c6b845aeaf0f4bd92e9a4f zsh-4.3.2-r1.ebuild 4309 -SHA256 634cbc144462931ad6db60d28638202eefd3685c85a080ba2975d549ae65a64d zsh-4.3.2-r1.ebuild 4309 -MISC ChangeLog 15693 RMD160 62df3681c4e6e3fc44f1f8f843875cee7b4ae84b SHA1 308bb66e2495c012cc491ccfff80d2f0bf9acfec SHA256 8eabad97cdaf49d6d96974c27fe6e6433523b19a3e64dee02757042db0e88f0e -MD5 af18aabda0c25c61ffa6884fe6766222 ChangeLog 15693 -RMD160 62df3681c4e6e3fc44f1f8f843875cee7b4ae84b ChangeLog 15693 -SHA256 8eabad97cdaf49d6d96974c27fe6e6433523b19a3e64dee02757042db0e88f0e ChangeLog 15693 +EBUILD zsh-4.3.2-r1.ebuild 4299 RMD160 bade4336fe2d5b82c1c5b99ba0c02c93662eb585 SHA1 7819341b3d9cbf0499ae7aba8dd37892911bf4d1 SHA256 b5c37aab9fcfa1a83463aa0ef0d29355406750b6ba60a43d66fe8b75308dd868 +MD5 a9e0914fdc2d795a0686e1717c9c99fa zsh-4.3.2-r1.ebuild 4299 +RMD160 bade4336fe2d5b82c1c5b99ba0c02c93662eb585 zsh-4.3.2-r1.ebuild 4299 +SHA256 b5c37aab9fcfa1a83463aa0ef0d29355406750b6ba60a43d66fe8b75308dd868 zsh-4.3.2-r1.ebuild 4299 +EBUILD zsh-4.3.2-r2.ebuild 4760 RMD160 405c55619f1c05012f0891fa390e5d600db96bc3 SHA1 33a8abd338e18add1b7dc58776cbfe4b8019ffae SHA256 133a05e4b49fcf4482bfc147136d06fc08ccbfa5f6144c6e45d435b0689795f1 +MD5 cbffb8d7707abdba446d0fcb4a21d61b zsh-4.3.2-r2.ebuild 4760 +RMD160 405c55619f1c05012f0891fa390e5d600db96bc3 zsh-4.3.2-r2.ebuild 4760 +SHA256 133a05e4b49fcf4482bfc147136d06fc08ccbfa5f6144c6e45d435b0689795f1 zsh-4.3.2-r2.ebuild 4760 +MISC ChangeLog 15960 RMD160 5a19830bac9203ddfc5c1bf6ae592de1712e6bea SHA1 08d9307ef2fe66283778bc5668f3cdb194cdff64 SHA256 b29b39c40b9a637190fa15efdf00596ecf848b36b921ceae648faa92865bc29e +MD5 d49858842fd3ff5f68b5f2f7cdbfa8ea ChangeLog 15960 +RMD160 5a19830bac9203ddfc5c1bf6ae592de1712e6bea ChangeLog 15960 +SHA256 b29b39c40b9a637190fa15efdf00596ecf848b36b921ceae648faa92865bc29e ChangeLog 15960 MISC metadata.xml 506 RMD160 2bb66fd9797dfb0000540f70ba3ae0b0d7e7ebe0 SHA1 ffc2013388ceb5abe378ec9668e33b692d568c45 SHA256 32679041c8a9f3c0d25ecee624fa8642ab0d99e65e93e728caa856973ec18729 MD5 28ed8ea6cdccb353e2e8ad783eb51f5b metadata.xml 506 RMD160 2bb66fd9797dfb0000540f70ba3ae0b0d7e7ebe0 metadata.xml 506 @@ -54,3 +59,6 @@ SHA256 2c6ce96427dbff4fa161f30aa15793d52f6ddea6e1b41feaf6933ff4e33b2796 files/di MD5 c4330d1b151cc380d5b167c674678b99 files/digest-zsh-4.3.2-r1 482 RMD160 dfa3044b90f90d80a52adbbd41b3f76c8faeff83 files/digest-zsh-4.3.2-r1 482 SHA256 f5135fd5e1cd2562050f593eb0377d20e5a363c405953c0c39eec03a5b215ef3 files/digest-zsh-4.3.2-r1 482 +MD5 abd77212c6ad589c56d6ed1a88c0ae56 files/digest-zsh-4.3.2-r2 741 +RMD160 91777435ca73f1f3911802b190e7cf298c5861fe files/digest-zsh-4.3.2-r2 741 +SHA256 c5cf1890cb7526846f2b71a94bc35527b2939b315171cfa9a843c57b7ca04919 files/digest-zsh-4.3.2-r2 741 diff --git a/app-shells/zsh/files/digest-zsh-4.3.2-r2 b/app-shells/zsh/files/digest-zsh-4.3.2-r2 new file mode 100644 index 000000000000..c6f5085724b6 --- /dev/null +++ b/app-shells/zsh/files/digest-zsh-4.3.2-r2 @@ -0,0 +1,9 @@ +MD5 69d1ab9d179d7d16eb0251a0a60e0457 zsh-4.3.2-doc.tar.bz2 2207375 +RMD160 2f9bffc5faac847fa53f16ecf3f6f34fed6462ff zsh-4.3.2-doc.tar.bz2 2207375 +SHA256 f8d21d1afa4ad3e59d8ccf835eb378ca39b6c894400ad8cd67f4bce796d0c14f zsh-4.3.2-doc.tar.bz2 2207375 +MD5 e13fc4bb338fbb27ef7508a474310c8f zsh-4.3.2.tar.bz2 2263544 +RMD160 2bb4431db21cffdb2da4751c0fdaeca5efd0b61e zsh-4.3.2.tar.bz2 2263544 +SHA256 ca0e27cc99115294be8323afa50027da56ad937fa2d99cabcd2a26039181dfd3 zsh-4.3.2.tar.bz2 2263544 +MD5 6ac4b81c087db2197cdcd8ff02e51619 zsh-lovers_0.5.orig.tar.gz 499014 +RMD160 505261d9e28554c838864421ec81b6665e55dfa1 zsh-lovers_0.5.orig.tar.gz 499014 +SHA256 d945adab65fdf3ff322ed64c54739b2a1cec964544c5f438005ddad9c0c62bea zsh-lovers_0.5.orig.tar.gz 499014 diff --git a/app-shells/zsh/zsh-4.3.2-r1.ebuild b/app-shells/zsh/zsh-4.3.2-r1.ebuild index 00ab8c0eef14..85513fbaaf8e 100644 --- a/app-shells/zsh/zsh-4.3.2-r1.ebuild +++ b/app-shells/zsh/zsh-4.3.2-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2006 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.2-r1.ebuild,v 1.5 2006/09/18 17:43:08 steev Exp $ +# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.2-r1.ebuild,v 1.6 2006/11/04 19:23:29 usata Exp $ inherit eutils multilib @@ -116,7 +116,7 @@ src_install() { if use doc ; then dohtml Doc/* insinto /usr/share/doc/${PF} - doins Doc/zsh{.dvi,_us.ps,_a4.ps} + doins Doc/zsh.{dvi,pdf} fi docinto StartupFiles diff --git a/app-shells/zsh/zsh-4.3.2-r2.ebuild b/app-shells/zsh/zsh-4.3.2-r2.ebuild new file mode 100644 index 000000000000..4ec2ba5e9e60 --- /dev/null +++ b/app-shells/zsh/zsh-4.3.2-r2.ebuild @@ -0,0 +1,170 @@ +# Copyright 1999-2006 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.2-r2.ebuild,v 1.1 2006/11/04 19:23:29 usata Exp $ + +inherit eutils multilib + +LOVERS_PV=0.5 +LOVERS_P=zsh-lovers-${LOVERS_PV} + +DESCRIPTION="UNIX Shell similar to the Korn shell" +HOMEPAGE="http://www.zsh.org/" +SRC_URI="ftp://ftp.zsh.org/pub/${P}.tar.bz2 + examples? ( + http://www.grml.org/repos/zsh-lovers_${LOVERS_PV}.orig.tar.gz ) + doc? ( ftp://ftp.zsh.org/pub/${P}-doc.tar.bz2 )" + +LICENSE="ZSH" +SLOT="0" +KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc-macos ~s390 ~sh ~sparc ~x86 ~x86-fbsd" +IUSE="maildir ncurses static doc examples pcre caps unicode" + +RDEPEND="pcre? ( >=dev-libs/libpcre-3.9 ) + caps? ( sys-libs/libcap ) + ncurses? ( >=sys-libs/ncurses-5.1 )" +DEPEND="sys-apps/groff + >=sys-apps/sed-4 + ${RDEPEND}" + +src_unpack() { + unpack ${A} + cd ${S} + epatch ${FILESDIR}/${PN}-init.d-gentoo.diff + cd ${S}/Doc + ln -sf . man1 + # fix zshall problem with soelim + soelim zshall.1 > zshall.1.soelim + mv zshall.1.soelim zshall.1 +} + +src_compile() { + local myconf + + use static && myconf="${myconf} --disable-dynamic" \ + && LDFLAGS="${LDFLAGS} -static" + + if use ppc-macos; then + LDFLAGS="${LDFLAGS} -Wl,-x" + myconf="${myconf} --enable-libs=-liconv" + fi + + econf \ + --bindir=/bin \ + --libdir=/usr/$(get_libdir) \ + --enable-etcdir=/etc/zsh \ + --enable-zshenv=/etc/zsh/zshenv \ + --enable-zlogin=/etc/zsh/zlogin \ + --enable-zlogout=/etc/zsh/zlogout \ + --enable-zprofile=/etc/zsh/zprofile \ + --enable-zshrc=/etc/zsh/zshrc \ + --enable-fndir=/usr/share/zsh/${PV%_*}/functions \ + --enable-site-fndir=/usr/share/zsh/site-functions \ + --enable-function-subdirs \ + --enable-ldflags="${LDFLAGS}" \ + --with-tcsetpgrp \ + $(use_with ncurses curses-terminfo) \ + $(use_enable maildir maildir-support) \ + $(use_enable pcre) \ + $(use_enable caps) \ + $(use_enable unicode multibyte) \ + ${myconf} || die "configure failed" + + if use static ; then + # compile all modules statically, see Bug #27392 + sed -i -e "s/link=no/link=static/g" \ + -e "s/load=no/load=yes/g" \ + config.modules || die + else + # avoid linking to libs in /usr/lib, see Bug #27064 + sed -i -e "/LIBS/s%-lpcre%/usr/$(get_libdir)/libpcre.a%" \ + Makefile || die + fi + + # emake still b0rks + emake -j1 || die "make failed" +} + +src_test() { + for f in /dev/pt* ; do + addpredict $f + done + make check || die "make check failed" +} + +src_install() { + einstall \ + bindir=${D}/bin \ + libdir=${D}/usr/$(get_libdir) \ + fndir=${D}/usr/share/zsh/${PV%_*}/functions \ + sitefndir=${D}/usr/share/zsh/site-functions \ + scriptdir=${D}/usr/share/zsh/${PV%_*}/scripts \ + install.bin install.man install.modules \ + install.info install.fns || die "make install failed" + + insinto /etc/zsh + doins ${FILESDIR}/zprofile + + keepdir /usr/share/zsh/site-functions + insinto /usr/share/zsh/${PV%_*}/functions/Prompts + doins ${FILESDIR}/prompt_gentoo_setup || die + + # install miscellaneous scripts; bug #54520 + sed -i -e "s:/usr/local:/usr:g" {Util,Misc}/* || "sed failed" + insinto /usr/share/zsh/${PV%_*}/Util + doins Util/* || die "doins Util scripts failed" + insinto /usr/share/zsh/${PV%_*}/Misc + doins Misc/* || die "doins Misc scripts failed" + + dodoc ChangeLog* META-FAQ README INSTALL LICENCE config.modules + + if use doc ; then + dohtml Doc/* + insinto /usr/share/doc/${PF} + doins Doc/zsh.{dvi,pdf} + fi + + if use examples; then + cd ${WORKDIR}/${LOVERS_P} + 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 + insinto /usr/share/doc/${PF}/zsh-lovers + doins zsh-lovers.{ps,pdf} refcard.{dvi,ps,pdf} + doins -r zsh_people || die "doins zsh_people failed" + cd - + fi + + docinto StartupFiles + dodoc StartupFiles/z* +} + +pkg_preinst() { + # Our zprofile file does the job of the old zshenv file + # Move the old version into a zprofile script so the normal + # etc-update process will handle any changes. + if [ -f /etc/zsh/zshenv -a ! -f /etc/zsh/zprofile ]; then + mv /etc/zsh/zshenv /etc/zsh/zprofile + fi +} + +pkg_postinst() { + einfo + einfo "If you want to enable Portage completions and Gentoo prompt," + einfo "emerge app-shells/zsh-completion and add" + einfo " autoload -U compinit promptinit" + einfo " compinit" + einfo " promptinit; prompt gentoo" + einfo "to your ~/.zshrc" + einfo + einfo "Also, if you want to enable cache for the completions, add" + einfo " zstyle ':completion::complete:*' use-cache 1" + einfo "to your ~/.zshrc" + einfo + # see Bug 26776 + ewarn + ewarn "If you are upgrading from zsh-4.0.x you may need to" + ewarn "remove all your old ~/.zcompdump files in order to use" + ewarn "completion. For more info see zcompsys manpage." + ewarn +} |