Version bumped. (bug #175302) Changed zprofile to source /etc/profile.d/*.sh. (bug #19924) Set EDITOR variable. (bug #165000)

Package-Manager: portage-2.1.2.2

5 files changed, 234 insertions, 24 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index 430729ec3db4..fb9622522944 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-shells/zsh
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.108 2007/03/01 00:54:14 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.109 2007/04/30 16:26:06 usata Exp $
+
+*zsh-4.3.4 (30 Apr 2007)
+
+  30 Apr 2007; Mamoru KOMACHI <usata@gentoo.org> files/zprofile,
+  +zsh-4.3.4.ebuild:
+  Version bumped. (bug #175302)
+  Changed zprofile to source /etc/profile.d/*.sh. (bug #19924)
+  Set $EDITOR variable. (bug #165000)
 
   01 Mar 2007; Jason Wever <weeve@gentoo.org> zsh-4.3.2-r2.ebuild:
   Stable on SPARC wrt bug #168320.
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 4d52832d1481..5a62073de5cf 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,14 +1,15 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX prompt_gentoo_setup 1222 RMD160 883f6a906300a4d8300145f722769db57c90ece2 SHA1 1441a7533c4197e1ddd467dc102a35be4659ff9c SHA256 59689d972abbe60dcfa567193060ec11d076a60accadf1015fa9ae59ad864667
 MD5 ab8716ecc62780da37e48f910bd34ed0 files/prompt_gentoo_setup 1222
 RMD160 883f6a906300a4d8300145f722769db57c90ece2 files/prompt_gentoo_setup 1222
 SHA256 59689d972abbe60dcfa567193060ec11d076a60accadf1015fa9ae59ad864667 files/prompt_gentoo_setup 1222
-AUX zprofile 449 RMD160 c2de38dbeac0f7fb0cdf07b4ddda57977a4d2c93 SHA1 2c49bc39493d459ceb66974805038298fcb3fe95 SHA256 f7334564399c128cd69fd08092eff9c3d50bca1d536cc9c6a60355c63a899590
-MD5 b12ee72532d1fe55bf9ca00a605b8609 files/zprofile 449
-RMD160 c2de38dbeac0f7fb0cdf07b4ddda57977a4d2c93 files/zprofile 449
-SHA256 f7334564399c128cd69fd08092eff9c3d50bca1d536cc9c6a60355c63a899590 files/zprofile 449
+AUX zprofile 1221 RMD160 87ba59b9bb61dae1a4b4625c326fa868acc6e1b0 SHA1 8ac33e136ee5e0d9df386a4048a221e7a2617a6e SHA256 450f283d40fef270cf2b34409d5c556dbe8b05d3ae226866227c345b983e3108
+MD5 6e006514095053a5955ab33ac24eb044 files/zprofile 1221
+RMD160 87ba59b9bb61dae1a4b4625c326fa868acc6e1b0 files/zprofile 1221
+SHA256 450f283d40fef270cf2b34409d5c556dbe8b05d3ae226866227c345b983e3108 files/zprofile 1221
+AUX zprofile.bak 449 RMD160 c2de38dbeac0f7fb0cdf07b4ddda57977a4d2c93 SHA1 2c49bc39493d459ceb66974805038298fcb3fe95 SHA256 f7334564399c128cd69fd08092eff9c3d50bca1d536cc9c6a60355c63a899590
+MD5 b12ee72532d1fe55bf9ca00a605b8609 files/zprofile.bak 449
+RMD160 c2de38dbeac0f7fb0cdf07b4ddda57977a4d2c93 files/zprofile.bak 449
+SHA256 f7334564399c128cd69fd08092eff9c3d50bca1d536cc9c6a60355c63a899590 files/zprofile.bak 449
 AUX zsh-4.2.1-gentoo.diff 735 RMD160 c14de49d5f13101c9b40a0d1f0f9eacf8ce2efd0 SHA1 e5ef5ef72fa5953a6394c92d9e0fce13b28e33f7 SHA256 a8a236864616138a376aa5a2d0f9795604f7bf369d99f2fb82abb513482318f2
 MD5 e6a9690e5c9b23757e887e14da621c9c files/zsh-4.2.1-gentoo.diff 735
 RMD160 c14de49d5f13101c9b40a0d1f0f9eacf8ce2efd0 files/zsh-4.2.1-gentoo.diff 735
@@ -28,6 +29,8 @@ DIST zsh-4.2.6-doc.tar.bz2 1770113 RMD160 b99e64cebccdf20d496454ec745a85812370c1
 DIST zsh-4.2.6.tar.bz2 2098671 RMD160 e4400fc6311bf6996128ecf7899592d6d8cdb310 SHA1 e00c3eda3f52c9514bb625bb56e4480358170d39 SHA256 d5b9b93e8259d3059042e82d1738d623af6981c38c9f185b3949ea3dacbe6a61
 DIST zsh-4.3.2-doc.tar.bz2 2207375 RMD160 2f9bffc5faac847fa53f16ecf3f6f34fed6462ff SHA1 1eee74b2f1f30428464b9a387b15d75e886e4b99 SHA256 f8d21d1afa4ad3e59d8ccf835eb378ca39b6c894400ad8cd67f4bce796d0c14f
 DIST zsh-4.3.2.tar.bz2 2263544 RMD160 2bb4431db21cffdb2da4751c0fdaeca5efd0b61e SHA1 a6dd50c7578812bdb30f4cb65c8ac280c86dbfc3 SHA256 ca0e27cc99115294be8323afa50027da56ad937fa2d99cabcd2a26039181dfd3
+DIST zsh-4.3.4-doc.tar.bz2 2358063 RMD160 768ce8ca2860139428d27a0fedf5c0724967e444 SHA1 83d1a38112f305892393cb036058248ebbf6168e SHA256 e74289f99479328b8bcee9c47ae07038e54437e860fb5487da57cfc8d1836777
+DIST zsh-4.3.4.tar.bz2 2374851 RMD160 2fe0fcf6371d2072c3b7eeae0392c7ef3665457c SHA1 6bd905c4bf61bf3df5e5bb78f64be68366ad7517 SHA256 6fa0e22cb0da3a02c115425097002f2b4bb56e412db6c821ca111e088cbfdec6
 DIST zsh-lovers_0.5.orig.tar.gz 499014 RMD160 505261d9e28554c838864421ec81b6665e55dfa1 SHA1 bc9b41dd5814f60b39d393ef68c4dc099da9016b SHA256 d945adab65fdf3ff322ed64c54739b2a1cec964544c5f438005ddad9c0c62bea
 EBUILD zsh-4.2.5.ebuild 4246 RMD160 5a45762bed5aa7ca3d73f37b42347bb5b8ecdbcd SHA1 61d50f4f0886b53b770fbf50796303643d96da5e SHA256 ca7f1ee5d06693fa8737a965402ecbf75ea681dda9b8341afb3c0fb6f2fbe0a8
 MD5 c591061b558750a8631403875831a31c zsh-4.2.5.ebuild 4246
@@ -45,10 +48,14 @@ EBUILD zsh-4.3.2-r2.ebuild 4640 RMD160 ea8d08a03590d2486fe83136fcbcd52dd69f4663
 MD5 40d10f16ede16798c3dbd3d6c6504b07 zsh-4.3.2-r2.ebuild 4640
 RMD160 ea8d08a03590d2486fe83136fcbcd52dd69f4663 zsh-4.3.2-r2.ebuild 4640
 SHA256 3f818cc7fe070eb409d83e29295caaff0df97615ea2b9eb9c1ef8050117efb60 zsh-4.3.2-r2.ebuild 4640
-MISC ChangeLog 16893 RMD160 5e02cfe15ccf7844e20cd2d94d192f501ac991b6 SHA1 5287639c5f97f5335ce084f72fee281f4585ba29 SHA256 ca86259a16f262045ab62cac7110b3589722ed64bfdadc0c2c5ac4ffd37d9f59
-MD5 f0f9944f6c7a506d842357475e1b44cb ChangeLog 16893
-RMD160 5e02cfe15ccf7844e20cd2d94d192f501ac991b6 ChangeLog 16893
-SHA256 ca86259a16f262045ab62cac7110b3589722ed64bfdadc0c2c5ac4ffd37d9f59 ChangeLog 16893
+EBUILD zsh-4.3.4.ebuild 4644 RMD160 d5e8469aaad1891ded1d13ae0040d58ff192d3e3 SHA1 6bd96e6d7444d9c6a0987b9c6780e3714a1ce89c SHA256 5d4d0f0ee33cd8f5177fdda69120c72b3f35f75b14f92643baa4797f0a878036
+MD5 d3e43d3b6b3370b83bcaaad31797d2ec zsh-4.3.4.ebuild 4644
+RMD160 d5e8469aaad1891ded1d13ae0040d58ff192d3e3 zsh-4.3.4.ebuild 4644
+SHA256 5d4d0f0ee33cd8f5177fdda69120c72b3f35f75b14f92643baa4797f0a878036 zsh-4.3.4.ebuild 4644
+MISC ChangeLog 17139 RMD160 f264f69f489f9aef4aa605a065090d62b4223810 SHA1 4b077e42b51b234512b759c9c84f9885e568dd1f SHA256 b6e1abecde051bdb4da5dd6d7a5f58630db10f80220423c6b5186904587af330
+MD5 7c55fcf60d668706ef47963894e3e87a ChangeLog 17139
+RMD160 f264f69f489f9aef4aa605a065090d62b4223810 ChangeLog 17139
+SHA256 b6e1abecde051bdb4da5dd6d7a5f58630db10f80220423c6b5186904587af330 ChangeLog 17139
 MISC metadata.xml 506 RMD160 2bb66fd9797dfb0000540f70ba3ae0b0d7e7ebe0 SHA1 ffc2013388ceb5abe378ec9668e33b692d568c45 SHA256 32679041c8a9f3c0d25ecee624fa8642ab0d99e65e93e728caa856973ec18729
 MD5 28ed8ea6cdccb353e2e8ad783eb51f5b metadata.xml 506
 RMD160 2bb66fd9797dfb0000540f70ba3ae0b0d7e7ebe0 metadata.xml 506
@@ -65,10 +72,6 @@ SHA256 f5135fd5e1cd2562050f593eb0377d20e5a363c405953c0c39eec03a5b215ef3 files/di
 MD5 abd77212c6ad589c56d6ed1a88c0ae56 files/digest-zsh-4.3.2-r2 741
 RMD160 91777435ca73f1f3911802b190e7cf298c5861fe files/digest-zsh-4.3.2-r2 741
 SHA256 c5cf1890cb7526846f2b71a94bc35527b2939b315171cfa9a843c57b7ca04919 files/digest-zsh-4.3.2-r2 741
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.3 (GNU/Linux)
-
-iD8DBQFF/FoV8bi6rjpTunYRAu8XAKCeEVKlNMFjfudRzBeVzFNnSghYIQCfYd7D
-WnU962eask388CIB62c3jDg=
-=0Ljp
------END PGP SIGNATURE-----
+MD5 dd9706ce92adcbe43306e8c853d11bf0 files/digest-zsh-4.3.4 741
+RMD160 d20de19421e69abff973eca7e0c90629559ef72e files/digest-zsh-4.3.4 741
+SHA256 cfad1793044f24086765954a603f93fd25355649926f23e9d79f09cf2f4490fb files/digest-zsh-4.3.4 741
diff --git a/app-shells/zsh/files/digest-zsh-4.3.4 b/app-shells/zsh/files/digest-zsh-4.3.4
new file mode 100644
index 000000000000..535aa4ba10dc
--- /dev/null
+++ b/app-shells/zsh/files/digest-zsh-4.3.4
@@ -0,0 +1,9 @@
+MD5 1a4ab09a9d75c5ae8585ad645406f27d zsh-4.3.4-doc.tar.bz2 2358063
+RMD160 768ce8ca2860139428d27a0fedf5c0724967e444 zsh-4.3.4-doc.tar.bz2 2358063
+SHA256 e74289f99479328b8bcee9c47ae07038e54437e860fb5487da57cfc8d1836777 zsh-4.3.4-doc.tar.bz2 2358063
+MD5 8410a30e4f5c6160790bc3afc096424f zsh-4.3.4.tar.bz2 2374851
+RMD160 2fe0fcf6371d2072c3b7eeae0392c7ef3665457c zsh-4.3.4.tar.bz2 2374851
+SHA256 6fa0e22cb0da3a02c115425097002f2b4bb56e412db6c821ca111e088cbfdec6 zsh-4.3.4.tar.bz2 2374851
+MD5 6ac4b81c087db2197cdcd8ff02e51619 zsh-lovers_0.5.orig.tar.gz 499014
+RMD160 505261d9e28554c838864421ec81b6665e55dfa1 zsh-lovers_0.5.orig.tar.gz 499014
+SHA256 d945adab65fdf3ff322ed64c54739b2a1cec964544c5f438005ddad9c0c62bea zsh-lovers_0.5.orig.tar.gz 499014
diff --git a/app-shells/zsh/files/zprofile b/app-shells/zsh/files/zprofile
index 089ab20f7e4f..69cae0b39ff0 100644
--- a/app-shells/zsh/files/zprofile
+++ b/app-shells/zsh/files/zprofile
@@ -1,14 +1,39 @@
 # /etc/zsh/zprofile
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/files/zprofile,v 1.2 2006/11/02 19:49:32 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/files/zprofile,v 1.3 2007/04/30 16:26:06 usata Exp $
 
-[[ -e "/etc/profile.env" ]] && source /etc/profile.env
+# Load environment settings from profile.env, which is created by
+# env-update from the files in /etc/env.d
+if [ -e /etc/profile.env ] ; then
+	. /etc/profile.env
+fi
 
 #077 would be more secure, but 022 is generally quite realistic
 umask 022
 
-if [[ "$USER" == root ]]; then
-	export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${ROOTPATH}"
+# Set up PATH depending on whether we're root or a normal user.
+# There's no real reason to exclude sbin paths from the normal user,
+# but it can make tab-completion easier when they aren't in the
+# user's PATH to pollute the executable namespace.
+#
+# It is intentional in the following line to use || instead of -o.
+# This way the evaluation can be short-circuited and calling whoami is
+# avoided.
+if [ "$EUID" = "0" ] || [ "$USER" = "root" ] ; then
+	PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:${ROOTPATH}"
 else
-	export PATH="/usr/local/bin:/usr/bin:/bin:${PATH}"
+	PATH="/usr/local/bin:/usr/bin:/bin:${PATH}"
 fi
+export PATH
 unset ROOTPATH
+
+# Extract the value of EDITOR
+[ -z "$EDITOR" ] && EDITOR="`. /etc/rc.conf 2>/dev/null; echo $EDITOR`"
+[ -z "$EDITOR" ] && EDITOR="/bin/nano"
+export EDITOR
+
+for sh in /etc/profile.d/*.sh ; do
+	if [ -r "$sh" ] ; then
+		. "$sh"
+	fi
+done
+unset sh
diff --git a/app-shells/zsh/zsh-4.3.4.ebuild b/app-shells/zsh/zsh-4.3.4.ebuild
new file mode 100644
index 000000000000..8f9385f43e07
--- /dev/null
+++ b/app-shells/zsh/zsh-4.3.4.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.3.4.ebuild,v 1.1 2007/04/30 16:26:06 usata 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 ~s390 ~sh ~sparc ~sparc-fbsd ~x86 ~x86-fbsd"
+IUSE="maildir ncurses static doc examples pcre caps unicode"
+
+RDEPEND="pcre? ( >=dev-libs/libpcre-3.9 )
+	caps? ( sys-libs/libcap )
+	ncurses? ( >=sys-libs/ncurses-5.1 )"
+DEPEND="sys-apps/groff
+	>=sys-apps/sed-4
+	${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${PN}-init.d-gentoo.diff
+	cd ${S}/Doc
+	ln -sf . man1
+	# fix zshall problem with soelim
+	soelim zshall.1 > zshall.1.soelim
+	mv zshall.1.soelim zshall.1
+}
+
+src_compile() {
+	local myconf
+
+	use static && myconf="${myconf} --disable-dynamic" \
+		&& LDFLAGS="${LDFLAGS} -static"
+
+	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-tcsetpgrp \
+		$(use_with ncurses curses-terminfo) \
+		$(use_enable maildir maildir-support) \
+		$(use_enable pcre) \
+		$(use_enable caps) \
+		$(use_enable unicode multibyte) \
+		${myconf} || die "configure failed"
+
+	if use static ; then
+		# compile all modules statically, see Bug #27392
+		sed -i -e "s/link=no/link=static/g" \
+			-e "s/load=no/load=yes/g" \
+			config.modules || die
+	else
+		# avoid linking to libs in /usr/lib, see Bug #27064
+		sed -i -e "/LIBS/s%-lpcre%/usr/$(get_libdir)/libpcre.a%" \
+			Makefile || die
+	fi
+
+	# emake still b0rks
+	emake -j1 || die "make failed"
+}
+
+src_test() {
+	for f in /dev/pt* ; do
+		addpredict $f
+	done
+	make check || die "make check failed"
+}
+
+src_install() {
+	einstall \
+		bindir=${D}/bin \
+		libdir=${D}/usr/$(get_libdir) \
+		fndir=${D}/usr/share/zsh/${PV%_*}/functions \
+		sitefndir=${D}/usr/share/zsh/site-functions \
+		scriptdir=${D}/usr/share/zsh/${PV%_*}/scripts \
+		install.bin install.man install.modules \
+		install.info install.fns || die "make install failed"
+
+	insinto /etc/zsh
+	doins ${FILESDIR}/zprofile
+
+	keepdir /usr/share/zsh/site-functions
+	insinto /usr/share/zsh/${PV%_*}/functions/Prompts
+	doins ${FILESDIR}/prompt_gentoo_setup || die
+
+	# install miscellaneous scripts; bug #54520
+	sed -i -e "s:/usr/local:/usr:g" {Util,Misc}/* || "sed failed"
+	insinto /usr/share/zsh/${PV%_*}/Util
+	doins Util/* || die "doins Util scripts failed"
+	insinto /usr/share/zsh/${PV%_*}/Misc
+	doins Misc/* || die "doins Misc scripts failed"
+
+	dodoc ChangeLog* META-FAQ README INSTALL LICENCE config.modules
+
+	if use doc ; then
+		dohtml Doc/*
+		insinto /usr/share/doc/${PF}
+		doins Doc/zsh.{dvi,pdf}
+	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}
+		doins -r zsh_people || die "doins zsh_people failed"
+		cd -
+	fi
+
+	docinto StartupFiles
+	dodoc StartupFiles/z*
+}
+
+pkg_preinst() {
+	# Our zprofile file does the job of the old zshenv file
+	# Move the old version into a zprofile script so the normal
+	# etc-update process will handle any changes.
+	if [ -f /etc/zsh/zshenv -a ! -f /etc/zsh/zprofile ]; then
+		mv /etc/zsh/zshenv /etc/zsh/zprofile
+	fi
+}
+
+pkg_postinst() {
+	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
+	# see Bug 26776
+	ewarn
+	ewarn "If you are upgrading from zsh-4.0.x you may need to"
+	ewarn "remove all your old ~/.zcompdump files in order to use"
+	ewarn "completion.  For more info see zcompsys manpage."
+	ewarn
+}