Version bump. Removed pkg_preinst and parts of pkg_postinst. Fixed cap useflag. Tests and static linking need more testing.

Package-Manager: portage-2.1.4.1

3 files changed, 171 insertions, 2 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index 3e895d8b8b1b..45428539b093 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-shells/zsh
 # Copyright 2002-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.129 2008/01/08 14:59:50 jer Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.130 2008/02/02 22:22:54 tove Exp $
+
+*zsh-4.3.5 (02 Feb 2008)
+
+  02 Feb 2008; Torsten Veller <tove@gentoo.org> +zsh-4.3.5.ebuild:
+  Version bump. Removed pkg_preinst and parts of pkg_postinst.
+  Fixed cap useflag. Tests and static linking need more testing.
 
   08 Jan 2008; Jeroen Roovers <jer@gentoo.org> zsh-4.3.4-r1.ebuild:
   Stable for HPPA (bug #204259).
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 0740fdaa55cf..02d37d6562c3 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX prompt_gentoo_setup 1222 RMD160 883f6a906300a4d8300145f722769db57c90ece2 SHA1 1441a7533c4197e1ddd467dc102a35be4659ff9c SHA256 59689d972abbe60dcfa567193060ec11d076a60accadf1015fa9ae59ad864667
 AUX zprofile 1285 RMD160 ad9c3f6bf96aef7ba800d92a7aa21088489e43a3 SHA1 35491e7bcd75b703a454491810ee8ec9db419d74 SHA256 5b714ac11847d220b9db5483a6597b145ba0fcf7897e2202aa6a14f8f77bc6c9
 AUX zsh-4.3.4-configure-changequote.patch 694 RMD160 9f56120b2f8cc7ca913518ed099167fba3bc0b7f SHA1 986a8b03bc49da157ced270321538a579a9b6ec0 SHA256 78047e66ce905a701464616d3e3cc2a3a9714ac88ad063b6330234c5ea61e9e6
@@ -8,10 +11,20 @@ DIST zsh-4.3.2.tar.bz2 2263544 RMD160 2bb4431db21cffdb2da4751c0fdaeca5efd0b61e S
 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
+DIST zsh-4.3.5-doc.tar.bz2 2463496 RMD160 8b99214f1af6c0ab072b5f54c9e2148185a595d8 SHA1 8f762fd345e3447ea8a60f4869d7583facdc2820 SHA256 7dd2cd44d093a357a3b9fb5c1dba84345f3eaf4638cd968f9a8ea3bb622fc349
+DIST zsh-4.3.5.tar.bz2 2513384 RMD160 99d12deb6131e4ddc73811b146ebb5b05a4ec77b SHA1 9ab505ff4c029b4905d2c4b741f0f0d42e4375c9 SHA256 ebe74df173d5b713e4e839e691da279dc9b4d4d0d98b9886cc725217e9902105
 DIST zsh-lovers_0.5.orig.tar.gz 499014 RMD160 505261d9e28554c838864421ec81b6665e55dfa1 SHA1 bc9b41dd5814f60b39d393ef68c4dc099da9016b SHA256 d945adab65fdf3ff322ed64c54739b2a1cec964544c5f438005ddad9c0c62bea
 EBUILD zsh-4.3.2-r2.ebuild 4650 RMD160 e14a6f69231fa4bb4da2cc51159f077e1f4186ea SHA1 23031c63ffbe9519494331c1248d3fd16ba06acb SHA256 0e897be8d86d06d087cb792dea0e6babf65b9d446e372bf28c157224195dd2ca
 EBUILD zsh-4.3.2-r3.ebuild 4907 RMD160 67279f183b1c75769a68157c7badf44e170d7673 SHA1 c1a03d81e5c38ee7eaaaeabac9d917aa181fba6f SHA256 48f0ddaca7f0486563c12cca5a5365208cee0a6784d0c6562b2735cd67f5250a
 EBUILD zsh-4.3.4-r1.ebuild 4891 RMD160 a210a5d5f9df92737917d75f7dee6664a6de96b2 SHA1 b755c8e8875686f03f151c828edcc7c4bafd5955 SHA256 fe640efa4b227ad3cad36e06b21065465156cab6ea61836559e54f8edb571502
 EBUILD zsh-4.3.4.ebuild 4626 RMD160 2879df6fe586769857fbc24985d02e25256d170a SHA1 52e0ec63c20af022cec2993b69b6aedf177fdb6d SHA256 8e1978bbe5fa28a96b785b8a305ba481c9f1d9bd950351f2317918b45ec4f267
-MISC ChangeLog 19827 RMD160 783a060c451ad82e4c806235e938940d2414aff4 SHA1 0de38b0212db182d859e33cdc3415721ea72cabd SHA256 819d3f853df063a3ebbff2254e24a1078bf8b0ba0671d263bfdb82dd39b659a0
+EBUILD zsh-4.3.5.ebuild 3967 RMD160 80ff8f3d833bf79f92b574f984f46e1b0b911a05 SHA1 144f8ebd1a4f844aa3a5e807501f9f589181e10f SHA256 ba0cb5a089909a0178dbae67cf5975a822e1c0f039b2dc532f6787f2324b26a9
+MISC ChangeLog 20050 RMD160 f997deea8d72bc8209cd3b641ae5a842b45c2270 SHA1 7b8c6bfeb0606408d615fa1316189285ae1c402a SHA256 b2059801da42ca3ae5e63627a7d7795240c5b7134e7ab16813d53aebc1e1bbcd
 MISC metadata.xml 553 RMD160 b4d3d1ca445d0c50f0372fb8af1e9fa2e4c303fb SHA1 8652a4d38b0858eff280576ca143ddc9b5db83c1 SHA256 e4bdebdc75f06d8cc998456bd2a1ec7300b6a08ca5fb28590841ad7071366cf4
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFHpO1FV3J2n04EauwRAo55AKDZYvnaxuWoHKB2nkE13uA/XWFtnwCfUEGG
+tU6MkKeboNFYNHo0fQBCpbQ=
+=eQUT
+-----END PGP SIGNATURE-----
diff --git a/app-shells/zsh/zsh-4.3.5.ebuild b/app-shells/zsh/zsh-4.3.5.ebuild
new file mode 100644
index 000000000000..e92f2da547d2
--- /dev/null
+++ b/app-shells/zsh/zsh-4.3.5.ebuild
@@ -0,0 +1,150 @@
+# Copyright 1999-2008 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.5.ebuild,v 1.1 2008/02/02 22:22:54 tove Exp $
+
+inherit eutils multilib
+
+LOVERS_PV=0.5
+LOVERS_P=zsh-lovers-${LOVERS_PV}
+
+DESCRIPTION="UNIX Shell similar to the Korn shell"
+HOMEPAGE="http://www.zsh.org/"
+SRC_URI="ftp://ftp.zsh.org/pub/${P}.tar.bz2
+	examples? ( http://www.grml.org/repos/zsh-lovers_${LOVERS_PV}.orig.tar.gz )
+	doc? ( ftp://ftp.zsh.org/pub/${P}-doc.tar.bz2 )"
+
+LICENSE="ZSH"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="maildir static doc examples pcre caps unicode"
+
+RDEPEND=">=sys-libs/ncurses-5.1
+	caps? ( sys-libs/libcap )
+	pcre? ( >=dev-libs/libpcre-3.9 )"
+DEPEND="sys-apps/groff
+	${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# 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.diff
+}
+
+src_compile() {
+	local myconf=
+
+	if use static ; then
+		myconf="${myconf} --disable-dynamic"
+		LDFLAGS="${LDFLAGS} -static"
+	fi
+
+	econf \
+		--bindir=/bin \
+		--libdir=/usr/$(get_libdir) \
+		--enable-etcdir=/etc/zsh \
+		--enable-zshenv=/etc/zsh/zshenv \
+		--enable-zlogin=/etc/zsh/zlogin \
+		--enable-zlogout=/etc/zsh/zlogout \
+		--enable-zprofile=/etc/zsh/zprofile \
+		--enable-zshrc=/etc/zsh/zshrc \
+		--enable-fndir=/usr/share/zsh/${PV%_*}/functions \
+		--enable-site-fndir=/usr/share/zsh/site-functions \
+		--enable-function-subdirs \
+		--enable-ldflags="${LDFLAGS}" \
+		--with-curses-terminfo \
+		--with-tcsetpgrp \
+		$(use_enable maildir maildir-support) \
+		$(use_enable pcre) \
+		$(use_enable caps cap) \
+		$(use_enable unicode multibyte) \
+		${myconf} || die "configure failed"
+
+	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 's/cap.mdd link=static/cap.mdd link=no/' \
+			-e 's/curses.mdd link=static/curses.mdd link=no/' \
+			config.modules || die
+#	else
+#		sed -i -e "/LIBS/s%-lpcre%/usr/$(get_libdir)/libpcre.a%" Makefile
+	fi
+
+	emake || die "make failed"
+}
+
+src_test() {
+	local f=
+	for f in /dev/pt* ; do
+		addpredict "$f"
+	done
+	make check || ewarn "make check failed"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install install.info || die
+
+	# Bug 207019
+	rm "${D}"/bin/${P} || die
+
+	insinto /etc/zsh
+	doins "${FILESDIR}"/zprofile || die
+
+	keepdir /usr/share/zsh/site-functions
+	insinto /usr/share/zsh/${PV%_*}/functions/Prompts
+	doins "${FILESDIR}"/prompt_gentoo_setup || die
+
+	# install miscellaneous scripts; bug #54520
+	local i
+	sed -i -e "s:/usr/local:/usr: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
+		dohtml -r "${S}"/Doc/* || die
+		insinto /usr/share/doc/${PF}
+		doins Doc/zsh.{dvi,pdf} || die
+	fi
+
+	if use examples ; then
+		cd "${WORKDIR}/${LOVERS_P}"
+		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
+		insinto /usr/share/doc/${PF}/zsh-lovers
+		doins zsh-lovers.{ps,pdf} refcard.{dvi,ps,pdf} || die
+		doins -r zsh_people || die "doins zsh_people failed"
+		cd -
+	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
+}