Version bump (bug #405283).

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

3 files changed, 199 insertions, 6 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index baa7ea7bfef8..8fc3be34a3e6 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-shells/zsh
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.183 2012/02/13 22:18:09 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.184 2012/02/22 21:22:28 radhermit Exp $
+
+*zsh-4.3.16 (22 Feb 2012)
+
+  22 Feb 2012; Tim Harder <radhermit@gentoo.org> +zsh-4.3.16.ebuild:
+  Version bump (bug #405283).
 
   13 Feb 2012; Markus Meier <maekke@gentoo.org> zsh-4.3.15.ebuild:
   arm stable, bug #401931
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 103b74ee16d7..6d6d7cd2f473 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA512
 
 AUX 4.3.11-subst.patch 633 RMD160 d10c5d960580463b7f787686d221409dbba487ed SHA1 9766b7eb6456409c9e7c5b2e562cb9db0a1950b2 SHA256 69c35bbe84763d8ba75cfd1d9bf3916e0591c72c25d5c778bfd26605b13260d9
 AUX prompt_gentoo_setup-1 745 RMD160 7235736c59ee02ea2c6cdc3c31f2af788d3ed34d SHA1 f740b6c37c55affabe3a66f1ceb45b2a1484f28f SHA256 c04da5152712fcd2eb2b83a1967f892f31cc087e1245b28e4806ab5099ac16e7
@@ -11,16 +11,23 @@ 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.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-4.3.16-doc.tar.bz2 2717696 RMD160 4075d096a5059c856493dd83b6dc32ae7ff7d4b8 SHA1 25adb1468f0642deb3f301705b107c93580ac4a6 SHA256 af412955f4a18e10a58faeee87ceca15c0ec814c29e18c86606ac438bedd611f
+DIST zsh-4.3.16.tar.bz2 2976694 RMD160 aee925728405521caa3590471cbe7cd747175a4e SHA1 d6dc9360d2bde66ba03b38bf7b19754e3eb2b736 SHA256 ed31f2da98c4123f20ab05e834abe0deefb6c99434b62b3472e3a16099e7d369
 DIST zsh-lovers_0.8.3.tar.gz 875976 RMD160 f8482d61d700cc79530b4839de5a86aed6783e99 SHA1 f4905d8825c982371e72053a58cb9679329249a8 SHA256 c786724ac9526e2504142c6d607bc6f3703a35b3db804123f0ffe4214b399ea9
 EBUILD zsh-4.3.11-r1.ebuild 5860 RMD160 db33bde3fa29162dc541b2e200ec43b13ea4f96a SHA1 1830b7fece2948e77371bcdabf99cfa386cbe6fa SHA256 91cf28a38d7d76160d6d7b66f2836896c52803585aa15c6e6d2bc2f4a1015085
 EBUILD zsh-4.3.12.ebuild 4970 RMD160 7747bf1649e219f6fd12fda6d75b9032e77a4f48 SHA1 3a6cb71c5dd3b5a6b7dc0a948d05ea210038daa8 SHA256 083a3844e40eda605c4104fcaa5e35f98337275909acf8bae72854869e198098
 EBUILD zsh-4.3.15.ebuild 4937 RMD160 f593c7feaff19f93d8413b12e92a3485510d0a5e SHA1 72a2fe8d870dce50c9f0010a7fb10f7105285fc5 SHA256 c59544ac2626f4a8657c6ffaf16cf67cd9e373fb7639a96d0f1b8b611a289a62
-MISC ChangeLog 26660 RMD160 19bd9dedbca508dbab34999d5b077c9af1bb19ac SHA1 550ea168d71a6fb405e43ac81804880fe6b644ae SHA256 7833bc5e84d8e11f11603ba226eeb46030f81b19232842bb44a471e2368bf11f
+EBUILD zsh-4.3.16.ebuild 4944 RMD160 49d551c8d3bc11fb7ca903dd48431826961ee073 SHA1 0b82ca538ad0b89aab448615422cc3b82b2f49dd SHA256 9630e1afc1fa5fe2872837d92a7e14370e9b80036d4e61f1262b57eb88f0fca9
+MISC ChangeLog 26790 RMD160 2c600942c593bd95738c34e410a1a151d4b4ff13 SHA1 3fa55cc65703e9fa4780451fc7a464d8c8b8b783 SHA256 ca9db7421d5d58d3b93bef6d1e86a1fb5fb847738d8831a722c67d50ddc23bec
 MISC metadata.xml 666 RMD160 a8410488bcb4b25755002532fc21303a6d36e185 SHA1 1fd3a7035e75ef1617c0715ba0ca9334734df077 SHA256 d64774b35c140959fdff968f4fa294846a7c5a48bfe02247cf5d9fe31df5f11d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.18 (GNU/Linux)
 
-iEYEARECAAYFAk85jLoACgkQkKaRLQcq0GLRBwCgiqGcOpML/gpLLc7goWJV7YkX
-KLAAnRSt8Ih3coKoRDwV1f6njRQ9N67a
-=3Vht
+iQEcBAEBCgAGBQJPRVygAAoJEEqz6FtPBkyjBOEIAJPQi4cnNNqqHiYlzIBmQdrP
+hePRM/RPnCY0UilTg2itC8aOzxltv1KoxQG/8W20mqje996qTXka2htqAxrM2yzr
+fHOHu3OgPbO6hDBMu7K7t4m39XqtbNpp7/iwmFSgmM5TgmtuE4NZ3Tbgrn7IIPhu
+JRqdivTtH1FxociCDQTKq2Hn1WbJAY0pf1GujMkjxB9xXI2n4MaEc1fmcVsN+7Tr
+mdSTSA+/c47Di68y1XP+DLEO4e1e4hgwz8mBTcd6da4NlTOZ/OV8baALB2Hbb5+F
+hz7t5tGWJmaAgcIYuAwPI7otitXYQigIkzkhULgwXuZuAK2VSeXz87MdVaVmAnM=
+=ilo3
 -----END PGP SIGNATURE-----
diff --git a/app-shells/zsh/zsh-4.3.16.ebuild b/app-shells/zsh/zsh-4.3.16.ebuild
new file mode 100644
index 000000000000..8e7d7ee04d2b
--- /dev/null
+++ b/app-shells/zsh/zsh-4.3.16.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.16.ebuild,v 1.1 2012/02/22 21:22:28 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
+}