Version bump.

Package-Manager: portage-2.2.0_alpha79/cvs/Linux x86_64

3 files changed, 198 insertions, 9 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index 97a74a667835..bba138eccc92 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-shells/zsh
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.170 2011/12/02 06:16:39 radhermit Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.171 2011/12/07 16:20:53 radhermit Exp $
+
+*zsh-4.3.14 (07 Dec 2011)
+
+  07 Dec 2011; Tim Harder <radhermit@gentoo.org> +zsh-4.3.14.ebuild:
+  Version bump.
 
 *zsh-4.3.13 (02 Dec 2011)
 
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index aa47f1c9bb46..b86a346ce421 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -14,22 +14,25 @@ DIST zsh-4.3.12-doc.tar.bz2 2698428 RMD160 502b6c39c1d58d92d6df485f9298b184a808f
 DIST zsh-4.3.12.tar.bz2 2917959 RMD160 83f2a0f3e590722262e5725df97d924b1fd4ee84 SHA1 8fd7a6d841770c8b12cf3ae8229dd857ecdbad93 SHA256 4a9fd2dac76fc08fd1dc400deba854fcefa12ad76226d93fb6c01a801324f106
 DIST zsh-4.3.13-doc.tar.bz2 2709769 RMD160 5fea5f918e388f8d8ea2296eb0fe607b82f51624 SHA1 f10ab73ddb692e0fcd6915396a8d3aa934f0e863 SHA256 23a900d630b88997bf451620cb858666f36e632440264276aa14ea1173044c9a
 DIST zsh-4.3.13.tar.bz2 2964918 RMD160 6fc4c9667f52e77a7151038a652bb8ececee57f8 SHA1 c1f447090101359f20d7f725132827c2ca7060c1 SHA256 173bafa9f363050de40c50492eccbd8c55d85401a42b076b2178c2d9d5355d9c
+DIST zsh-4.3.14-doc.tar.bz2 2709354 RMD160 e052f60d4b2abb55bfa91fd8853b3f0f0ab207c1 SHA1 4a23aa1c86aeda43d04d5b613371986ef8037fca SHA256 45ace79194440afb7dbfebb20435ffa9c672cd8825210dd9784b7da94c042142
+DIST zsh-4.3.14.tar.bz2 2965367 RMD160 24ccf42c0a42fc5da9fd18cac3fa2301888d53e3 SHA1 9de3d1e96a26419e0a8863c9da31e068411d3257 SHA256 a85a31e243c10106b159923b164935b11bc282d1388bbabe1c77408c93f6b2b8
 DIST zsh-lovers_0.8.3.tar.gz 875976 RMD160 f8482d61d700cc79530b4839de5a86aed6783e99 SHA1 f4905d8825c982371e72053a58cb9679329249a8 SHA256 c786724ac9526e2504142c6d607bc6f3703a35b3db804123f0ffe4214b399ea9
 EBUILD zsh-4.3.10-r2.ebuild 5905 RMD160 df5410f570dc6d54b17acf5300b6119e14f5d7ea SHA1 933f1c70bdb88a98aa062231f5eb092e35824ad3 SHA256 94f70b6f56ad16b508bc3f3a7807ed5b033b3da5a628fc6ebef6d7bafecdbd72
 EBUILD zsh-4.3.11-r1.ebuild 5860 RMD160 db33bde3fa29162dc541b2e200ec43b13ea4f96a SHA1 1830b7fece2948e77371bcdabf99cfa386cbe6fa SHA256 91cf28a38d7d76160d6d7b66f2836896c52803585aa15c6e6d2bc2f4a1015085
 EBUILD zsh-4.3.11.ebuild 5858 RMD160 798f63c69ae09932601297c60c1a57c014297b8c SHA1 668daaa8ee2014a1204e9c56dcfb521079356b2f SHA256 8d8107a5f4d7864f4e1652b8d6700856c00baf719a5bc86289807836bae96133
 EBUILD zsh-4.3.12.ebuild 4971 RMD160 f19532e624b9eedf43f893131863a955dbb2e8ae SHA1 fc06a5ed3fd7bbebebb140fd8357d3c71e859781 SHA256 283b4a1991b5d3877584944aa629fefe24d4295d1c55896d0cd57bc5f061e505
 EBUILD zsh-4.3.13.ebuild 4944 RMD160 144639730f5c57424e1a3adeb95bd239315ecd76 SHA1 58bfcab7d310c722c479f65335388fc496136847 SHA256 5c777e57440495714288303f3cbefdead48bd60dc94c26033a0e9e2c9e21d493
-MISC ChangeLog 25173 RMD160 93f17a91490cfe905e3386995b75d980a47e0b0d SHA1 d1132f7ade27df5e548e8a7c2be1db59db275e3b SHA256 a63cbc76df0773d89fff9b12c70e5205c6e0c2ace112ff796bc3f2ed2a28d564
+EBUILD zsh-4.3.14.ebuild 4944 RMD160 a0457cfd284c2869e6c070d381fcd7a9f6b08999 SHA1 d04f74f08def3243b7d8d3ec80a263e6ba348f54 SHA256 3b9715777d594d39bb3eec207cd6f2c073b756328c30524877488c7fe27e65d8
+MISC ChangeLog 25286 RMD160 86c4e0c2348b30d89e8db6fe9ad45ca9d30724af SHA1 d5f512ca3f040d0c453b63cf36c81730e9d8a21a SHA256 d98ac3b017c8d2c5f41f099fea632960f99033a34c5490f6ac9a2657e5d5dde0
 MISC metadata.xml 666 RMD160 a8410488bcb4b25755002532fc21303a6d36e185 SHA1 1fd3a7035e75ef1617c0715ba0ca9334734df077 SHA256 d64774b35c140959fdff968f4fa294846a7c5a48bfe02247cf5d9fe31df5f11d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJO2G1RAAoJEEqz6FtPBkyjhKQH/iecIreqyE59ffso1nG3tIuI
-ehnYGIpSPJEBm1YA2VaVtRTtI9do6WwFZLdl85Hfep9f0oCZ9kOVaSLxyPJZBstA
-/Av0/R+cW7N/uu16fYezOUnrvSrUBxG5Y6DAJBt6MmOlP5dcdZvPycM5s3yZySms
-s6C5SXl+XmU5izafFuu8+OfqtPBvv2XedUQkIFOCPwdBA9c88HK1+CoqNRq9dm9o
-eSGRl7Q+M1ojmkd+b0sLcZVVjgZ2KMoRv3Qa98j/uXkDtxTIrArJcFG6nineOLSr
-RQ6bnNuG66rHH4FZcoCPHauzreyxdmWyheReb+csfzIPSWdaLdhJQH6rPfFHQGU=
-=vszp
+iQEcBAEBCgAGBQJO35JyAAoJEEqz6FtPBkyjslAH/17VWdcJVX/WfBvVK5Ir6Xi4
+SHmcD8J4e5wQPqJqH5pfriDbGMJsiZmtPoejjwxwa9kFZNjKkxVU8G801FO8AC3+
+bDb5id/bdHyhw+IJhbvTJZSyhVtiuTdn7SiOInctt3luz3Mi+YYszdEEZV2KICyH
+fpbXRZOhf6TQ647dtrjkfygqTuexqO9KNIhBphRqF70la2NfkpYZ0A+seGVtqng0
+5Dd8Tq8x4jhB2TcLtz475qgUFAqRtTcI8Qh1DWPM/6yKZSj33Czxt0pnOZNMPsni
+vK2uzbMCSySTUsYK/28bT+ZFI4Ij79/Wh23TX3bf7YGvT9iDTeqrnTH44qFvA3A=
+=mwwv
 -----END PGP SIGNATURE-----
diff --git a/app-shells/zsh/zsh-4.3.14.ebuild b/app-shells/zsh/zsh-4.3.14.ebuild
new file mode 100644
index 000000000000..f9bd0bc28dd6
--- /dev/null
+++ b/app-shells/zsh/zsh-4.3.14.ebuild
@@ -0,0 +1,181 @@
+# 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.14.ebuild,v 1.1 2011/12/07 16:20:53 radhermit 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] )
+	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 )
+"
+
+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
+}