Version bump. Move the zsh-lovers examples to app-doc/zsh-lovers

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

3 files changed, 195 insertions, 8 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index cf0943bffc08..25ca3e0f07c2 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.168 2011/03/24 18:29:18 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.169 2011/06/01 18:11:30 tove Exp $
+
+*zsh-4.3.12 (01 Jun 2011)
+
+  01 Jun 2011; Torsten Veller <tove@gentoo.org> +zsh-4.3.12.ebuild:
+  Version bump. Move the zsh-lovers examples to app-doc/zsh-lovers
 
   24 Mar 2011; Kacper Kowalik <xarthisius@gentoo.org> zsh-4.3.11-r1.ebuild:
   ppc/ppc64 stable wrt #356545
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 7bf31ba48fed..b2bc339f62e8 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 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
@@ -10,18 +10,19 @@ DIST zsh-4.3.10-doc.tar.bz2 2690183 RMD160 b56fd30ac63e2d3f2479c7d390ced260cad60
 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.12-doc.tar.bz2 2698428 RMD160 502b6c39c1d58d92d6df485f9298b184a808fc3c SHA1 89d799454993e787aae75b54f6ecfde90b3fc530 SHA256 8d13cc1540d79afd9fc451b43a10046fed1f11d12bdc2bbd8158bc7084a5dfed
+DIST zsh-4.3.12.tar.bz2 2917959 RMD160 83f2a0f3e590722262e5725df97d924b1fd4ee84 SHA1 8fd7a6d841770c8b12cf3ae8229dd857ecdbad93 SHA256 4a9fd2dac76fc08fd1dc400deba854fcefa12ad76226d93fb6c01a801324f106
 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
-MISC ChangeLog 24898 RMD160 c644b3b50f3ec687b7842750d9d806179432dc92 SHA1 577c0a3f5f8c2bf9c0e05b5fca1da1d9cfbe2e48 SHA256 d0aa834a0d482139df1ba3cc12f69a2072bfad04f34108d4b0dfbedc01c4fb77
+EBUILD zsh-4.3.12.ebuild 4971 RMD160 f19532e624b9eedf43f893131863a955dbb2e8ae SHA1 fc06a5ed3fd7bbebebb140fd8357d3c71e859781 SHA256 283b4a1991b5d3877584944aa629fefe24d4295d1c55896d0cd57bc5f061e505
+MISC ChangeLog 25055 RMD160 2915a2d09d9bcb572e037b0f42593e9d8e21b7a8 SHA1 079523a9952c61cc6f5e4c3fa4f9741891eb1467 SHA256 e56176eb266058164442e89189c796d9b1495be7ee8e8b68f275be435e4eedcb
 MISC metadata.xml 687 RMD160 e94628d9ba29a25d88ddee955c07f9b3b2f5493c SHA1 70a129986b433b75b3058da59b80f2d6a6e24c1d SHA256 88e44fba71b8f1eef862b2fdda513ee28c1c3fbbce6e3ddc7e13408bbfcab3d7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iJwEAQECAAYFAk2LjYQACgkQIiMqcbOVdxQ2YgP/W2fyNxZDaso1ZjSFgQvRh8Zq
-/QalFUwYpIaKhsqx0zSf0USWlFdAvB4xWOHt5A7K+SmpAeXvoGB0DxNs3IN89Fer
-DUM4siQl33JBjbu5TM4FJyHve41UAKYM5tTuEWlPl8uVGsVsS808EUWOl3loVI13
-DO9DYNzKFhNUvu6FZoI=
-=9ESw
+iEYEAREIAAYFAk3mgNcACgkQV3J2n04EauyomACdEFo22fUt5YBF2HW3K3VKLXGM
+BnIAnRRnzbvnAzHJmDPHKBFQv404TahX
+=oIdc
 -----END PGP SIGNATURE-----
diff --git a/app-shells/zsh/zsh-4.3.12.ebuild b/app-shells/zsh/zsh-4.3.12.ebuild
new file mode 100644
index 000000000000..5c1c787b033e
--- /dev/null
+++ b/app-shells/zsh/zsh-4.3.12.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.12.ebuild,v 1.1 2011/06/01 18:11:30 tove 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] <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
+	${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
+}