Version bump

Package-Manager: portage-2.2_rc33/cvs/Linux i686

3 files changed, 204 insertions, 5 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index c5b5c4a67ed5..29aa9936587f 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-shells/zsh
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.144 2009/05/07 13:26:39 tove Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.145 2009/06/03 06:28:42 tove Exp $
+
+*zsh-4.3.10 (03 Jun 2009)
+
+  03 Jun 2009; Torsten Veller <tove@gentoo.org> +zsh-4.3.10.ebuild:
+  Version bump
 
   07 May 2009; Torsten Veller <tove@gentoo.org> zsh-4.3.9.ebuild:
   Don't build gdbm module if USE=-gdbm for a non-dynamic zsh (#268926)
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index d10571236605..2b5efb75c9aa 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -7,6 +7,8 @@ AUX zprofile 1343 RMD160 44038b7db235cbcc548ab6742c435f1c36868703 SHA1 8696a4afc
 AUX zsh-4.3.4-configure-changequote.patch 694 RMD160 9f56120b2f8cc7ca913518ed099167fba3bc0b7f SHA1 986a8b03bc49da157ced270321538a579a9b6ec0 SHA256 78047e66ce905a701464616d3e3cc2a3a9714ac88ad063b6330234c5ea61e9e6
 AUX zsh-4.3.4-mkmakemod.patch 489 RMD160 156f0e94594198d83861414d4f0618f9fccf99aa SHA1 528994f7bc6dcb6b5b85b46997d97472d7166bd5 SHA256 094540885617e97afd947fede7935b0d9c18e375ddd471b729f752c11a4d32d9
 AUX zsh-init.d-gentoo.diff 1389 RMD160 1c317d93058b05e1d89dd81b4ab746ef31b4c38a SHA1 eb91fb330c0df1e227ee541159c7ac2d2fe15e53 SHA256 a8dcd168ab909a2b80b2958e3fc3cc974bc6048c08499be16c7925c1723b212f
+DIST zsh-4.3.10-doc.tar.bz2 2690183 RMD160 b56fd30ac63e2d3f2479c7d390ced260cad604f7 SHA1 e67e10478aa69a9e9cc92986515d337efc30a2bf SHA256 f53d5c434fdb26fc79755279175514507eb1d11cf793ac57270d053ee61f37f9
+DIST zsh-4.3.10.tar.bz2 2735665 RMD160 fad1412b76d1388d825cb870681c21696fdfa273 SHA1 132f9ce411bf318abccbae9cdc2f8cc14f8be85b SHA256 63fdc0273eadbb42d164f38b0b79922c0b3df0e97084e746a318276d935a4f7c
 DIST zsh-4.3.4-doc.tar.bz2 2358063 RMD160 768ce8ca2860139428d27a0fedf5c0724967e444 SHA1 83d1a38112f305892393cb036058248ebbf6168e SHA256 e74289f99479328b8bcee9c47ae07038e54437e860fb5487da57cfc8d1836777
 DIST zsh-4.3.4-zshcalsys.tar.bz2 9346 RMD160 d26b370853419494725a73524ba81c754d63a201 SHA1 d93379f8dc81dcd63737519374e7d7d1ffb3cd87 SHA256 4225eb85ead732423405b567c879280780073a39fff3a05c6b6b13f29f0a382e
 DIST zsh-4.3.4.tar.bz2 2374851 RMD160 2fe0fcf6371d2072c3b7eeae0392c7ef3665457c SHA1 6bd905c4bf61bf3df5e5bb78f64be68366ad7517 SHA256 6fa0e22cb0da3a02c115425097002f2b4bb56e412db6c821ca111e088cbfdec6
@@ -17,16 +19,17 @@ DIST zsh-4.3.6.tar.bz2 2527972 RMD160 fedd72f427439e75b8488479a3d20e9d8d5be794 S
 DIST zsh-4.3.9-doc.tar.bz2 2570995 RMD160 c7080f41901bd4b6d0b8e9f9385fd57a9d73a383 SHA1 456a696de365066b32161d194de9c7643dbeb7a0 SHA256 15ae762a228c2b2d410cecdddca279e49dfa6cfff85aaf8fa55e74940b4e8165
 DIST zsh-4.3.9.tar.bz2 2659602 RMD160 2c88347fa357e3624f000721963749c6ccb4e129 SHA1 7c80e1ad6b311ee5877172a1a7e0161a9a60da70 SHA256 8fdd6d6c6dc3a061b0c9a1b26eb367d10c0d8094d4b8bd2613740fc40b4382ab
 DIST zsh-lovers_0.5.orig.tar.gz 499014 RMD160 505261d9e28554c838864421ec81b6665e55dfa1 SHA1 bc9b41dd5814f60b39d393ef68c4dc099da9016b SHA256 d945adab65fdf3ff322ed64c54739b2a1cec964544c5f438005ddad9c0c62bea
+EBUILD zsh-4.3.10.ebuild 5091 RMD160 9f9ef84ddd15dbe48d26d57cf1844e66ab8f2619 SHA1 89d308045a13fec72c98cf5c53acf62081a95e95 SHA256 f6928dcfe09f3e68645d7fc005e99c350fce9f22091954334b8b39ebe15051cb
 EBUILD zsh-4.3.4-r1.ebuild 4937 RMD160 eae72421392ddec85165875da2ae86ce9f47dc4d SHA1 93e289f637ace754e11b63a1c7d584a6014a7338 SHA256 86489b1dd6aefe9e84379f1e4f9b378cd2e4e8114c60a0cfbad66e93ab4d56e8
 EBUILD zsh-4.3.5.ebuild 3967 RMD160 80ff8f3d833bf79f92b574f984f46e1b0b911a05 SHA1 144f8ebd1a4f844aa3a5e807501f9f589181e10f SHA256 ba0cb5a089909a0178dbae67cf5975a822e1c0f039b2dc532f6787f2324b26a9
 EBUILD zsh-4.3.6.ebuild 4597 RMD160 60ec0dfa7339d56ab52da03c950acd6f4046a72d SHA1 b3662be5429293fb0af800de54e561ad0e83f334 SHA256 27c233d2f6e10fbfb45429b012e90ab3b3da2ea7811269c1e46a5117f335b2b8
 EBUILD zsh-4.3.9.ebuild 5080 RMD160 f13d87b246091cd154bd742fbb39e71b6862d698 SHA1 a0d105c1631eda3b2a6aa6cd77a4e244b4ca70d8 SHA256 ade1ddb234629a9b72e0719c354dc7f44ab4c5e18219f9aa75a8efa99cf18424
-MISC ChangeLog 21684 RMD160 da89f7b45dc624acb7855b2cf21ddd6663498df5 SHA1 c8f1ad13552d13ba8dc5eceb480ba3819be53f75 SHA256 f1fdd9219019cfc48b3e5e668a94e9bba7c4be1a3788946e74e69bad9f55d0ea
+MISC ChangeLog 21795 RMD160 c7151c3cef6f6ce3af6cec4e4bb479ddf4373d4d SHA1 d486bfd57b2f48e2f5f3a1d70f08f05a6cf2549e SHA256 a228c9d9008b0871555f4de9d19df2646ba5e6451f184fbd9ec11a7ef25f7f73
 MISC metadata.xml 553 RMD160 b4d3d1ca445d0c50f0372fb8af1e9fa2e4c303fb SHA1 8652a4d38b0858eff280576ca143ddc9b5db83c1 SHA256 e4bdebdc75f06d8cc998456bd2a1ec7300b6a08ca5fb28590841ad7071366cf4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoC4ZYACgkQV3J2n04Eauya3QCgvFkjM9NYe08X9NHzOczmdOgO
-58YAnR6F/r2bRe/irEUt3EdaEttK01gP
-=H7i4
+iEYEARECAAYFAkomGDsACgkQV3J2n04EauwbMwCggBhAJfMcNcKcR/43uC6pQein
+kuYAn1XlQsY/lKs77OJhGVOLl3V0kUFx
+=1mV3
 -----END PGP SIGNATURE-----
diff --git a/app-shells/zsh/zsh-4.3.10.ebuild b/app-shells/zsh/zsh-4.3.10.ebuild
new file mode 100644
index 000000000000..03bc55338d83
--- /dev/null
+++ b/app-shells/zsh/zsh-4.3.10.ebuild
@@ -0,0 +1,191 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.10.ebuild,v 1.1 2009/06/03 06:28:42 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 gdbm? ( GPL-2 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
+IUSE="caps debug doc examples gdbm maildir pcre static unicode"
+
+RDEPEND=">=sys-libs/ncurses-5.1
+	caps? ( sys-libs/libcap )
+	pcre? ( >=dev-libs/libpcre-3.9 )
+	gdbm? ( sys-libs/gdbm )"
+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
+	if use debug ; then
+		myconf="${myconf} \
+			--enable-zsh-debug \
+			--enable-zsh-mem-debug \
+			--enable-zsh-mem-warning \
+			--enable-zsh-secure-free \
+			--enable-zsh-hash-debug"
+	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) \
+		$(use_enable gdbm ) \
+		${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
+		if ! use gdbm ; then
+			sed -i 's/gdbm.mdd link=static/gdbm.mdd link=no/' \
+				config.modules || die
+		fi
+#	else
+#		sed -i -e "/LIBS/s%-lpcre%/usr/$(get_libdir)/libpcre.a%" Makefile
+	fi
+
+	emake || die "make failed"
+}
+
+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
+
+	# 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
+	newins "${FILESDIR}"/prompt_gentoo_setup-1 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   || die
+		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
+}