Version bump (#349291)

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

4 files changed, 247 insertions, 6 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index 57e368ee7c08..04d5f0c60faf 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-shells/zsh
-# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.157 2010/11/01 19:02:52 halcy0n Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.158 2011/01/03 09:31:37 tove Exp $
+
+*zsh-4.3.11 (03 Jan 2011)
+
+  03 Jan 2011; Torsten Veller <tove@gentoo.org> +zsh-4.3.11.ebuild,
+  +files/zsh-init.d-gentoo-r1.diff:
+  Version bump (#349291). Thanks to David Bitseff
 
   01 Nov 2010; Mark Loeser <halcy0n@gentoo.org> zsh-4.3.10-r2.ebuild:
   Stable on ppc64; bug #297117
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 5bc696df8221..1474cdad414e 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -7,9 +7,12 @@ AUX zprofile 1343 RMD160 44038b7db235cbcc548ab6742c435f1c36868703 SHA1 8696a4afc
 AUX zprofile-1 1767 RMD160 a4fa4c3dea9cdf6d6a875ab494552c7464fb3e83 SHA1 fb409dd1e2000b1eeb386f8dec2b0dbe09035d9f SHA256 947d4dc9357dac9a1a16ebc7404e686d1a3b31fb1dfed9c3e3eb806d93ccfff8
 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-r1.diff 987 RMD160 1b8c5227426d6332d30639749b000c213dbb0ed7 SHA1 839dbf7890d1ccdb16c1cdd692ea69866d178b3a SHA256 2fd1981c9a230c624250d6056aaeb65bc57df8d082abf42f4060260a1c8663f6
 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.11-doc.tar.bz2 2687527 RMD160 b6ef6fef121b49f7060163b5b1493987af6dfe3f SHA1 5f3a6a35f23596738e911b9f8847808da5c765ba SHA256 956100a251cf523978a2f81802636b6cdd28f2861d508eedb10477317cecec4c
+DIST zsh-4.3.11.tar.bz2 2868429 RMD160 e5e0d79231cdb95e6b6edac0e1b81db6c0018c37 SHA1 25cf0daadc4543d147f6241573d6730b60f16016 SHA256 30eb774120d89d98336c929c210a9df4f61fc1f0137732812a6c0d8b8d074f05
 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
@@ -24,16 +27,17 @@ DIST zsh-lovers_0.8.3.tar.gz 875976 RMD160 f8482d61d700cc79530b4839de5a86aed6783
 EBUILD zsh-4.3.10-r1.ebuild 5086 RMD160 a1f4472197f8f6d13f4363cec4f14cab031b7208 SHA1 d427338985d35efca9ca2bb170da390ea3eebbc1 SHA256 8feaa1b118d76c37e98916e2ad059bf664ee508fe06d3c1f1d2680303cb6c662
 EBUILD zsh-4.3.10-r2.ebuild 5905 RMD160 df5410f570dc6d54b17acf5300b6119e14f5d7ea SHA1 933f1c70bdb88a98aa062231f5eb092e35824ad3 SHA256 94f70b6f56ad16b508bc3f3a7807ed5b033b3da5a628fc6ebef6d7bafecdbd72
 EBUILD zsh-4.3.10.ebuild 5124 RMD160 a4143f9142d1f16a48f88c15931e99d7965fc4c3 SHA1 5d95030e05ed8a8fe61bc6d13aba290a748dee39 SHA256 45e3ec13bd86e2be2d1eca2919ebfdfe65ccae42d4713c0fd1f54f5f8ab57660
+EBUILD zsh-4.3.11.ebuild 5858 RMD160 798f63c69ae09932601297c60c1a57c014297b8c SHA1 668daaa8ee2014a1204e9c56dcfb521079356b2f SHA256 8d8107a5f4d7864f4e1652b8d6700856c00baf719a5bc86289807836bae96133
 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 23324 RMD160 d120c0c0c6ba91a2c9c92009eb2de72f8daab455 SHA1 355a5a7a72fb85b6f649a5ea009577ae68fcd5ac SHA256 9d23638d5e84d42801016fe9d44361166b6c5cfc7043ffaf375d57f037f87997
+MISC ChangeLog 23503 RMD160 349e25ca1bba92f621ead539994de55fd75169a3 SHA1 d3bcd271f1e3973d9cbe553f1957368693bc1c38 SHA256 ed70a88a8f544128c4883e8229fbacb2acdefaf0fefb702dcdea04c547f4f6e7
 MISC metadata.xml 687 RMD160 e94628d9ba29a25d88ddee955c07f9b3b2f5493c SHA1 70a129986b433b75b3058da59b80f2d6a6e24c1d SHA256 88e44fba71b8f1eef862b2fdda513ee28c1c3fbbce6e3ddc7e13408bbfcab3d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkzPDuEACgkQCRZPokWLroShZgCdHr8CjJ68KJoz6L2ijeYmFCc1
-Ix8AoNv8CP6PGSs5JELpKHdrSX6oNKqQ
-=RuxB
+iEUEARECAAYFAk0hl38ACgkQV3J2n04EauwkXwCXQAeqJgtyWgOmdQ5eehdbJyvo
+awCgxsu/HxOQSkfOMMqOZlDr4YYTpZU=
+=xftf
 -----END PGP SIGNATURE-----
diff --git a/app-shells/zsh/files/zsh-init.d-gentoo-r1.diff b/app-shells/zsh/files/zsh-init.d-gentoo-r1.diff
new file mode 100644
index 000000000000..9597a733c903
--- /dev/null
+++ b/app-shells/zsh/files/zsh-init.d-gentoo-r1.diff
@@ -0,0 +1,30 @@
+--- zsh-4.3.11/Completion/Unix/Command/_init_d
++++ zsh-4.3.11/Completion/Unix/Command/_init_d
+@@ -1,6 +1,6 @@
+ #compdef -p */(init|rc[0-9S]#).d/*
+ 
+-local cmds script
++local cmds script opts
+ 
+ _compskip=all
+ 
+@@ -83,10 +83,17 @@
+ 
+ script=$words[1]
+ [[ $script = */* ]] || script="$(_init_d_fullpath "$script")"
++[[ ! -f $script ]] &&
++    { _message "${words[1]:t} is not an init script" && return }
+ 
+ cmds=( $(_init_d_get_cmds) ) || return
+ 
+-(( $#cmds )) || zstyle -a ":completion:${curcontext}:commands" commands cmds ||
+-    cmds=(start stop)
++(( $#cmds )) || zstyle -a ":completion:${curcontext}:commands" commands cmds
++opts=(start stop restart pause zap status ineed iuse needsme usesme broken)
++
++# If we didn't get $cmds from a zstyle, then read init script for opts.
++# If script doesn't specify opts, then default to the standard opts.
++(( $#cmds )) || cmds=( ${(eQz)${(M)${(f)"$( <$script)"}:#[[:blank:]]#opts=*}#*=} )
++(( $#cmds )) || cmds=($opts)
+ 
+ _sub_commands $cmds
diff --git a/app-shells/zsh/zsh-4.3.11.ebuild b/app-shells/zsh/zsh-4.3.11.ebuild
new file mode 100644
index 000000000000..31974b8ae2d3
--- /dev/null
+++ b/app-shells/zsh/zsh-4.3.11.ebuild
@@ -0,0 +1,201 @@
+# 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.11.ebuild,v 1.1 2011/01/03 09:31:37 tove Exp $
+
+EAPI=3
+
+# 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
+
+LOVERS_PV=0.8.3
+LOVERS_P=zsh-lovers
+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}/${LOVERS_P}_${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 ~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] <sys-libs/ncurses-5.7-r4 ) )
+	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 app-doc/heirloom-doctools )
+	examples? ( app-text/asciidoc )
+	${RDEPEND}"
+
+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
+	make check || die "make check failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install.info || die
+
+	insinto /etc/zsh
+	doins "${T}"/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/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}/* || die
+	done
+
+	dodoc ChangeLog* META-FAQ NEWS README config.modules
+
+	if use doc ; then
+		pushd "${WORKDIR}/${PN}-${PV%_*}" >/dev/null
+		dohtml -r Doc/* || die
+		insinto /usr/share/doc/${PF}
+		doins Doc/zsh.{dvi,pdf} || die
+		popd >/dev/null
+	fi
+
+	if use examples ; then
+		pushd "${WORKDIR}/${LOVERS_P/.orig/}" >/dev/null
+		asciidoc zsh-lovers.1.txt
+		mv zsh-lovers.1.html zsh-lovers.html || die
+		a2x -f manpage zsh-lovers.1.txt || die
+		#a2x -f pdf zsh-lovers.1.txt || die
+		#mv zsh-lovers.1.pdf zsh-lovers.pdf || die
+
+		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 refcard.pdf || die
+#		doins zsh-lovers.{ps,pdf} refcard.{dvi,ps,pdf} || die
+		doins -r zsh_people || die "doins zsh_people failed"
+		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
+}