Version bump. Fixes zsh-lovers uri and bug #209146.

Package-Manager: portage-2.1.4.4

3 files changed, 189 insertions, 5 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index 261d7c329ab0..24892e38e8bb 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-shells/zsh
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.131 2008/03/26 13:49:07 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.132 2008/04/04 08:31:19 tove Exp $
+
+*zsh-4.3.6 (04 Apr 2008)
+
+  04 Apr 2008; Torsten Veller <tove@gentoo.org> +zsh-4.3.6.ebuild:
+  Version bump. Fixes zsh-lovers uri and bug #209146.
 
   26 Mar 2008; Torsten Veller <tove@gentoo.org> -files/zshenv,
   -zsh-4.3.2-r2.ebuild, -zsh-4.3.2-r3.ebuild, -zsh-4.3.4.ebuild:
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 7354d85442fa..c4cb2a6a5610 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -10,15 +10,18 @@ DIST zsh-4.3.4-zshcalsys.tar.bz2 9346 RMD160 d26b370853419494725a73524ba81c754d6
 DIST zsh-4.3.4.tar.bz2 2374851 RMD160 2fe0fcf6371d2072c3b7eeae0392c7ef3665457c SHA1 6bd905c4bf61bf3df5e5bb78f64be68366ad7517 SHA256 6fa0e22cb0da3a02c115425097002f2b4bb56e412db6c821ca111e088cbfdec6
 DIST zsh-4.3.5-doc.tar.bz2 2463496 RMD160 8b99214f1af6c0ab072b5f54c9e2148185a595d8 SHA1 8f762fd345e3447ea8a60f4869d7583facdc2820 SHA256 7dd2cd44d093a357a3b9fb5c1dba84345f3eaf4638cd968f9a8ea3bb622fc349
 DIST zsh-4.3.5.tar.bz2 2513384 RMD160 99d12deb6131e4ddc73811b146ebb5b05a4ec77b SHA1 9ab505ff4c029b4905d2c4b741f0f0d42e4375c9 SHA256 ebe74df173d5b713e4e839e691da279dc9b4d4d0d98b9886cc725217e9902105
+DIST zsh-4.3.6-doc.tar.bz2 2473544 RMD160 048e0a30fa860d20020932f5f030edb8661697e1 SHA1 0475edfbbe2d745f3247f3b70a23ed9f169ca7b7 SHA256 a82cf4e55d6bcf1ea40c23ef5f99002d504c441a8f6d14af0ed4d574c6ffbcc6
+DIST zsh-4.3.6.tar.bz2 2527972 RMD160 fedd72f427439e75b8488479a3d20e9d8d5be794 SHA1 7600f56d4304d1b84428b57a9b1d394de185c207 SHA256 5a253d107533ff60ab9edb74de9425f2ca93bc5a3ddb5c1b5bfd488a794dc873
 DIST zsh-lovers_0.5.orig.tar.gz 499014 RMD160 505261d9e28554c838864421ec81b6665e55dfa1 SHA1 bc9b41dd5814f60b39d393ef68c4dc099da9016b SHA256 d945adab65fdf3ff322ed64c54739b2a1cec964544c5f438005ddad9c0c62bea
 EBUILD zsh-4.3.4-r1.ebuild 4891 RMD160 a210a5d5f9df92737917d75f7dee6664a6de96b2 SHA1 b755c8e8875686f03f151c828edcc7c4bafd5955 SHA256 fe640efa4b227ad3cad36e06b21065465156cab6ea61836559e54f8edb571502
 EBUILD zsh-4.3.5.ebuild 3967 RMD160 80ff8f3d833bf79f92b574f984f46e1b0b911a05 SHA1 144f8ebd1a4f844aa3a5e807501f9f589181e10f SHA256 ba0cb5a089909a0178dbae67cf5975a822e1c0f039b2dc532f6787f2324b26a9
-MISC ChangeLog 20190 RMD160 794f563092062e6b78b14376a0c900710cf4a72d SHA1 0f2ed7c79ac81c0f1473be220d4e91c1b18c8ea7 SHA256 2f125f8ff3a4bb42561bdf0532cbdcef38b7b66357b91f4f2581c94648af5dfb
+EBUILD zsh-4.3.6.ebuild 4597 RMD160 60ec0dfa7339d56ab52da03c950acd6f4046a72d SHA1 b3662be5429293fb0af800de54e561ad0e83f334 SHA256 27c233d2f6e10fbfb45429b012e90ab3b3da2ea7811269c1e46a5117f335b2b8
+MISC ChangeLog 20338 RMD160 5d744274356de804b43b5a1ffc0966ab060e7739 SHA1 70a752a1f67098a53481db59080b455012826d7d SHA256 6aa85988bd782562b650fe04b554cd7312371741a9de05d171a74ef05d2a3ecd
 MISC metadata.xml 553 RMD160 b4d3d1ca445d0c50f0372fb8af1e9fa2e4c303fb SHA1 8652a4d38b0858eff280576ca143ddc9b5db83c1 SHA256 e4bdebdc75f06d8cc998456bd2a1ec7300b6a08ca5fb28590841ad7071366cf4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.7 (GNU/Linux)
 
-iD8DBQFH6lRZV3J2n04EauwRAlEpAKCCssA66SM3qCPnKdZwYwe+f2SQuACg1pXs
-LL/0IhJ36BtW6cQIKWfklt0=
-=dd1m
+iD8DBQFH9edkV3J2n04EauwRAj86AJ0QqnCkYmB2Y8UkETEpQAc+5qPZ1wCgucuk
+kYzcXx4F9ZhS9E4DadAan8Y=
+=vniJ
 -----END PGP SIGNATURE-----
diff --git a/app-shells/zsh/zsh-4.3.6.ebuild b/app-shells/zsh/zsh-4.3.6.ebuild
new file mode 100644
index 000000000000..22e5cec9d4c8
--- /dev/null
+++ b/app-shells/zsh/zsh-4.3.6.ebuild
@@ -0,0 +1,176 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.6.ebuild,v 1.1 2008/04/04 08:31:19 tove Exp $
+
+# doc package for -dev version exists?
+doc_available=true
+
+inherit flag-o-matic eutils multilib
+
+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.5.orig
+LOVERS_P=zsh-lovers-${LOVERS_PV}
+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}/zsh-lovers_${LOVERS_PV}.tar.gz )
+	doc? ( ${ZSH_DOC_URI} )"
+
+LICENSE="ZSH"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="maildir static doc examples pcre caps unicode"
+
+RDEPEND=">=sys-libs/ncurses-5.1
+	caps? ( sys-libs/libcap )
+	pcre? ( >=dev-libs/libpcre-3.9 )"
+DEPEND="sys-apps/groff
+	${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# 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.diff
+}
+
+src_compile() {
+	local myconf=
+
+	if use static ; then
+		myconf="${myconf} --disable-dynamic"
+		append-ldflags -static
+	fi
+
+	econf \
+		--bindir=/bin \
+		--libdir=/usr/$(get_libdir) \
+		--enable-etcdir=/etc/zsh \
+		--enable-fndir=/usr/share/zsh/${PV%_*}/functions \
+		--enable-site-fndir=/usr/share/zsh/site-functions \
+		--enable-function-subdirs \
+		--enable-ldflags="${LDFLAGS}" \
+		--with-term-lib="ncursesw ncurses" \
+		--with-tcsetpgrp \
+		$(use_enable maildir maildir-support) \
+		$(use_enable pcre) \
+		$(use_enable caps cap) \
+		$(use_enable unicode multibyte) \
+		${myconf} || die "configure failed"
+
+	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 's/cap.mdd link=static/cap.mdd link=no/' \
+			-e 's/curses.mdd link=static/curses.mdd link=no/' \
+			config.modules || die
+#	else
+#		sed -i -e "/LIBS/s%-lpcre%/usr/$(get_libdir)/libpcre.a%" Makefile
+	fi
+
+	emake || die "make failed"
+}
+
+src_test() {
+	local f=
+	for f in /dev/pt* ; do
+		addpredict "$f"
+	done
+	make check || ewarn "make check failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install.info || die
+
+	# Bug 207019
+	rm "${D}"/bin/${PN}-${MY_PV} || die
+
+	insinto /etc/zsh
+	doins "${FILESDIR}"/zprofile || die
+
+	keepdir /usr/share/zsh/site-functions
+	insinto /usr/share/zsh/${PV%_*}/functions/Prompts
+	doins "${FILESDIR}"/prompt_gentoo_setup || die
+
+	# install miscellaneous scripts; bug #54520
+	local i
+	sed -i -e "s:/usr/local:/usr: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
+		cd "${WORKDIR}/${PN}-${PV%_*}"
+		dohtml -r Doc/* || die
+		insinto /usr/share/doc/${PF}
+		doins Doc/zsh.{dvi,pdf} || die
+		cd -
+	fi
+
+	if use examples ; then
+		cd "${WORKDIR}/${LOVERS_P/.orig/}"
+#		asciidoc zsh-lovers.1.txt
+#		mv zsh-lovers.1.html zsh-lovers.html
+#		a2x -f manpage zsh-lovers.1.txt
+#		a2x -f pdf zsh-lovers.1.txt
+#		mv zsh-lovers.1.pdf zsh-lovers.pdf
+
+		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.pdf refcard.pdf || die
+		doins zsh-lovers.{ps,pdf} refcard.{dvi,ps,pdf} || die
+		doins -r zsh_people || die "doins zsh_people failed"
+		cd -
+	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
+}