Version bump.

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

3 files changed, 199 insertions, 10 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index 078590dbabe3..b3ba15b281a2 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.173 2011/12/15 09:57:56 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.174 2011/12/18 07:09:16 radhermit Exp $
+
+*zsh-4.3.15 (18 Dec 2011)
+
+  18 Dec 2011; Tim Harder <radhermit@gentoo.org> +zsh-4.3.15.ebuild:
+  Version bump.
 
   15 Dec 2011; Agostino Sarubbo <ago@gentoo.org> zsh-4.3.12.ebuild:
   Stable for AMD64, wrt bug #394409
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 2547a8f87262..a9d4fe5055e9 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -16,6 +16,8 @@ DIST zsh-4.3.13-doc.tar.bz2 2709769 RMD160 5fea5f918e388f8d8ea2296eb0fe607b82f51
 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-4.3.15-doc.tar.bz2 2712215 RMD160 87e3f43982e9a2688a4a50441483d9893cddbfef SHA1 b100e76aa81c215cd04276b5888245d7b6954449 SHA256 73b7ee1a737fbaf9be77cf6b55b27cca96bac39bc5ef25efa9ceb427cd1b5ad4
+DIST zsh-4.3.15.tar.bz2 2969951 RMD160 cf10504b2ee1085a4ace9387c5751fb117a2a245 SHA1 ff78f98ec3bf96bf9507e34098b64f33e6d6b3a5 SHA256 8708f485823fb7e51aa696776d0dfac7d3558485182672cf9311c12a50a95486
 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
@@ -23,16 +25,17 @@ EBUILD zsh-4.3.11.ebuild 5858 RMD160 798f63c69ae09932601297c60c1a57c014297b8c SH
 EBUILD zsh-4.3.12.ebuild 4968 RMD160 fab9faa2c035a83635cdce6ea465c6f2afc93ed0 SHA1 d2685bac673d8eb0780ec440f7816845eafd2bae SHA256 2747d68de18e16ff5e5bf752e9840b38d5029d4dfdd3552bc3bcce18a03952bd
 EBUILD zsh-4.3.13.ebuild 4944 RMD160 144639730f5c57424e1a3adeb95bd239315ecd76 SHA1 58bfcab7d310c722c479f65335388fc496136847 SHA256 5c777e57440495714288303f3cbefdead48bd60dc94c26033a0e9e2c9e21d493
 EBUILD zsh-4.3.14.ebuild 4944 RMD160 a0457cfd284c2869e6c070d381fcd7a9f6b08999 SHA1 d04f74f08def3243b7d8d3ec80a263e6ba348f54 SHA256 3b9715777d594d39bb3eec207cd6f2c073b756328c30524877488c7fe27e65d8
-MISC ChangeLog 25485 RMD160 483316b45e8414f4bd32abf50114030559e16050 SHA1 ddfddb3b60f2d647b1b519e73e5be5e23ab1adbf SHA256 a04f3e4588d04f10b934bddee460f7f4d600c3f374538b462d04ac32cc1df750
+EBUILD zsh-4.3.15.ebuild 4944 RMD160 797ed21825bbb9f4f2e6d1815d7c5b1d2a7f873c SHA1 c4dcfc2fc32a3ec7fd04701c61de94f47b6101ef SHA256 76aaa2af4d6b38478943bca43c2ecc4f1f1585b1220e87d79eb2ca45189eb0f3
+MISC ChangeLog 25604 RMD160 6c5f4c31e59104145853f3072c118940949e379a SHA1 dc9fed886a3af33e63212ffe86d7cc1caa1a6daf SHA256 6b27e63e54722d7ee4622fbc478969b1d0012965648ad6607fe6d26263952125
 MISC metadata.xml 666 RMD160 a8410488bcb4b25755002532fc21303a6d36e185 SHA1 1fd3a7035e75ef1617c0715ba0ca9334734df077 SHA256 d64774b35c140959fdff968f4fa294846a7c5a48bfe02247cf5d9fe31df5f11d
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iQEcBAEBCgAGBQJO6cTBAAoJEOTDgjZ80txdcdIH/jX+LNMw135UR0F4l0GMvtem
-sihF5Q4EKNkGNUoBd0mtdvNmzbs8uTaz2AibTSEcofdMuvQRYe+rRIId+2ziVHPs
-HE1Ump/eweJeqJyccO6on5/c33jGIRF/+T58+5MLKdeQWt66HsagkgMFLflfeWzg
-5uf00XWscQH4Erz/md2rSRaKJ6/LIrEL2XjPrEgSMVcs0XJPgvuLV7Ou/Pa8ST3S
-aJS1D0jlGHNsXZfhaYiTW+KMthwbRNdZgDGjYtKBVdqw2A+INA0yKdviGv87nqp0
-4BUNQ1wu/7nhKkRWTNYJU7dI0Noc2HB8pBTWOcVcxE+LgFDmt8MyStLkycl7VEk=
-=o0YJ
+iQEcBAEBCgAGBQJO7ZGlAAoJEEqz6FtPBkyjY8UIAKKMZscUap7E+A1zSikCr4DP
+BCKmTv7xoVV5pQOQRwxBS71+3KB1Us7g4MTPu/aDvxuucb2eNCYSryQYNNBFak/A
+/cOdBaNK9UtEKMNZ7K6xZjTMyf2cWZ0P1mRsiukSZft0FasJPGv5AFpmYTnysFFK
+8in/vbJEGaEYejh/w63HDAhaozmZYpFoj1MESy+Pa5BrbiYc+eN7dp0Gc6EvLc+B
+mtkdoNpjCqQBjCowM1Gnz+g42DK3QrbNwTM+qgtL6riTACxj3cP/aGzvoi4b5D3I
+u7GWXrTCgQ2xOrqxqAz0xDIm8xAUc/KMtCn4rp/F/bxuLYr4q/ccdxQQQ3SkrHI=
+=zChU
 -----END PGP SIGNATURE-----
diff --git a/app-shells/zsh/zsh-4.3.15.ebuild b/app-shells/zsh/zsh-4.3.15.ebuild
new file mode 100644
index 000000000000..2ae6bb80b0f2
--- /dev/null
+++ b/app-shells/zsh/zsh-4.3.15.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.15.ebuild,v 1.1 2011/12/18 07:09:16 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
+}