Set nullglob to kill a warning when there are no scripts in /etc/profile.d. See bug #176994.

Package-Manager: portage-2.1.2.2

5 files changed, 24 insertions, 173 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index 2b8b23bbc253..986f3cc0ba2a 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,11 @@
 # 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.111 2007/05/01 11:32:31 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.112 2007/05/07 06:51:11 usata Exp $
+
+  07 May 2007; Mamoru KOMACHI <usata@gentoo.org> files/zprofile,
+  -zsh-4.3.2-r1.ebuild:
+  Set nullglob to kill a warning when there are no scripts in /etc/profile.d.
+  See bug #176994.
 
   01 May 2007; Markus Rothe <corsair@gentoo.org> ChangeLog:
   Stable on ppc64
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 6823aac84f76..957bfef65dd8 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -2,10 +2,14 @@ AUX prompt_gentoo_setup 1222 RMD160 883f6a906300a4d8300145f722769db57c90ece2 SHA
 MD5 ab8716ecc62780da37e48f910bd34ed0 files/prompt_gentoo_setup 1222
 RMD160 883f6a906300a4d8300145f722769db57c90ece2 files/prompt_gentoo_setup 1222
 SHA256 59689d972abbe60dcfa567193060ec11d076a60accadf1015fa9ae59ad864667 files/prompt_gentoo_setup 1222
-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 1285 RMD160 ad9c3f6bf96aef7ba800d92a7aa21088489e43a3 SHA1 35491e7bcd75b703a454491810ee8ec9db419d74 SHA256 5b714ac11847d220b9db5483a6597b145ba0fcf7897e2202aa6a14f8f77bc6c9
+MD5 37a09f34855354d61552cbde3af31757 files/zprofile 1285
+RMD160 ad9c3f6bf96aef7ba800d92a7aa21088489e43a3 files/zprofile 1285
+SHA256 5b714ac11847d220b9db5483a6597b145ba0fcf7897e2202aa6a14f8f77bc6c9 files/zprofile 1285
+AUX zprofile.bak 1278 RMD160 bb1d61a25aa7c12ec27845192478d057506e03be SHA1 56165b30059ff869137ff09ac1ca8e4c5f6193a5 SHA256 49b10402f9260ea823a867d25ef82a4dec70158a81ce2e3b71b2e93eed59fcd5
+MD5 1ba68105eb84ac32a943ecb0235cd8a9 files/zprofile.bak 1278
+RMD160 bb1d61a25aa7c12ec27845192478d057506e03be files/zprofile.bak 1278
+SHA256 49b10402f9260ea823a867d25ef82a4dec70158a81ce2e3b71b2e93eed59fcd5 files/zprofile.bak 1278
 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
@@ -36,10 +40,6 @@ EBUILD zsh-4.2.6-r1.ebuild 4224 RMD160 f76f5e00fb642f745a1a1787abc28e6d6d033e07
 MD5 7aebaab091bb6b76be4b469d5dd416ca zsh-4.2.6-r1.ebuild 4224
 RMD160 f76f5e00fb642f745a1a1787abc28e6d6d033e07 zsh-4.2.6-r1.ebuild 4224
 SHA256 cb0da4ee87340dd63a9c125cea46d06b8c4b61684f7473ebaccc3cef793552b2 zsh-4.2.6-r1.ebuild 4224
-EBUILD zsh-4.3.2-r1.ebuild 4176 RMD160 57644822d35b2bcfd04589ef9492e9a4802a7620 SHA1 d226695f3cfcce607dd5ee4cbb71578fe96b89b6 SHA256 2a7250ee5c7f1b9f00531a02285c41be1116353b277c1c8e414bd70d57eea143
-MD5 ce798865c4b0f0cad7d7846389142419 zsh-4.3.2-r1.ebuild 4176
-RMD160 57644822d35b2bcfd04589ef9492e9a4802a7620 zsh-4.3.2-r1.ebuild 4176
-SHA256 2a7250ee5c7f1b9f00531a02285c41be1116353b277c1c8e414bd70d57eea143 zsh-4.3.2-r1.ebuild 4176
 EBUILD zsh-4.3.2-r2.ebuild 4647 RMD160 03ea6b767a15792c37ccea6fddd17f5075a4b166 SHA1 89d131fa090f5c00101d3488de8d3a3f48205b33 SHA256 f422acd31bdb1df4a0e7df8159263b01ae46beacaad781eed61f9f305a0963cd
 MD5 e070eb228d4d10180e8ea46504919e63 zsh-4.3.2-r2.ebuild 4647
 RMD160 03ea6b767a15792c37ccea6fddd17f5075a4b166 zsh-4.3.2-r2.ebuild 4647
@@ -48,10 +48,10 @@ EBUILD zsh-4.3.4.ebuild 4653 RMD160 52704f77b998231e3c763a73a0446ae149cab50d SHA
 MD5 4c76adbe3fb96adc1b8d19577acb92dd zsh-4.3.4.ebuild 4653
 RMD160 52704f77b998231e3c763a73a0446ae149cab50d zsh-4.3.4.ebuild 4653
 SHA256 8a0956adc79243e0c42604df82e501e705733d0e0c73eb2f06aad79d22149ff7 zsh-4.3.4.ebuild 4653
-MISC ChangeLog 17364 RMD160 cde9e79b02ad31d1e664df41a4bc1e786502dd10 SHA1 219c77b0a567d8352ad102fbd8315a00ae5015bf SHA256 90e941cad6a4beb3bd2081e0f0d676881a569c27a803ab74a97575262fb4570e
-MD5 975ab00120058853ba1218b56cd29c2d ChangeLog 17364
-RMD160 cde9e79b02ad31d1e664df41a4bc1e786502dd10 ChangeLog 17364
-SHA256 90e941cad6a4beb3bd2081e0f0d676881a569c27a803ab74a97575262fb4570e ChangeLog 17364
+MISC ChangeLog 17549 RMD160 714d4c9f53508fefdda3c5754ab8829769b1bbe5 SHA1 31c041dc2a3e2b0e2b8e4c3d26af335d1ab631ee SHA256 fe275806ad11ab3a215539c31a69c6e0475059e273c6347e68efc415d50df09a
+MD5 1f530f0b105720cb8fc39818b35e1a27 ChangeLog 17549
+RMD160 714d4c9f53508fefdda3c5754ab8829769b1bbe5 ChangeLog 17549
+SHA256 fe275806ad11ab3a215539c31a69c6e0475059e273c6347e68efc415d50df09a ChangeLog 17549
 MISC metadata.xml 506 RMD160 2bb66fd9797dfb0000540f70ba3ae0b0d7e7ebe0 SHA1 ffc2013388ceb5abe378ec9668e33b692d568c45 SHA256 32679041c8a9f3c0d25ecee624fa8642ab0d99e65e93e728caa856973ec18729
 MD5 28ed8ea6cdccb353e2e8ad783eb51f5b metadata.xml 506
 RMD160 2bb66fd9797dfb0000540f70ba3ae0b0d7e7ebe0 metadata.xml 506
@@ -62,9 +62,6 @@ SHA256 2a7cd3167a28b9ec6e0ebbb16d39c400832e3e1bdf72cdcf9c5a1c7d651cdd8b files/di
 MD5 4481f5e8a35dc275c4d89a5c4ee0ad45 files/digest-zsh-4.2.6-r1 735
 RMD160 4406dcc8fc73a4f0b3defd8c3153aa1fa4f51846 files/digest-zsh-4.2.6-r1 735
 SHA256 4f32fb9bdd53a1e529c592afbfab6a4ab308dfa2081f9b9c7aac6c97e0e5f060 files/digest-zsh-4.2.6-r1 735
-MD5 c4330d1b151cc380d5b167c674678b99 files/digest-zsh-4.3.2-r1 482
-RMD160 dfa3044b90f90d80a52adbbd41b3f76c8faeff83 files/digest-zsh-4.3.2-r1 482
-SHA256 f5135fd5e1cd2562050f593eb0377d20e5a363c405953c0c39eec03a5b215ef3 files/digest-zsh-4.3.2-r1 482
 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
diff --git a/app-shells/zsh/files/digest-zsh-4.3.2-r1 b/app-shells/zsh/files/digest-zsh-4.3.2-r1
deleted file mode 100644
index 5acb23db53a4..000000000000
--- a/app-shells/zsh/files/digest-zsh-4.3.2-r1
+++ /dev/null
@@ -1,6 +0,0 @@
-MD5 69d1ab9d179d7d16eb0251a0a60e0457 zsh-4.3.2-doc.tar.bz2 2207375
-RMD160 2f9bffc5faac847fa53f16ecf3f6f34fed6462ff zsh-4.3.2-doc.tar.bz2 2207375
-SHA256 f8d21d1afa4ad3e59d8ccf835eb378ca39b6c894400ad8cd67f4bce796d0c14f zsh-4.3.2-doc.tar.bz2 2207375
-MD5 e13fc4bb338fbb27ef7508a474310c8f zsh-4.3.2.tar.bz2 2263544
-RMD160 2bb4431db21cffdb2da4751c0fdaeca5efd0b61e zsh-4.3.2.tar.bz2 2263544
-SHA256 ca0e27cc99115294be8323afa50027da56ad937fa2d99cabcd2a26039181dfd3 zsh-4.3.2.tar.bz2 2263544
diff --git a/app-shells/zsh/files/zprofile b/app-shells/zsh/files/zprofile
index 69cae0b39ff0..bec0e52fd3b4 100644
--- a/app-shells/zsh/files/zprofile
+++ b/app-shells/zsh/files/zprofile
@@ -1,5 +1,5 @@
 # /etc/zsh/zprofile
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/files/zprofile,v 1.3 2007/04/30 16:26:06 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/files/zprofile,v 1.4 2007/05/07 06:51:11 usata Exp $
 
 # Load environment settings from profile.env, which is created by
 # env-update from the files in /etc/env.d
@@ -31,9 +31,13 @@ unset ROOTPATH
 [ -z "$EDITOR" ] && EDITOR="/bin/nano"
 export EDITOR
 
+shopts=$-
+setopt nullglob
 for sh in /etc/profile.d/*.sh ; do
 	if [ -r "$sh" ] ; then
 		. "$sh"
 	fi
 done
-unset sh
+unsetopt nullglob
+set -$shopts
+unset sh shopts
diff --git a/app-shells/zsh/zsh-4.3.2-r1.ebuild b/app-shells/zsh/zsh-4.3.2-r1.ebuild
deleted file mode 100644
index d5a0ffafad80..000000000000
--- a/app-shells/zsh/zsh-4.3.2-r1.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# 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.2-r1.ebuild,v 1.8 2007/02/27 16:59:15 grobian Exp $
-
-inherit eutils multilib
-
-DESCRIPTION="UNIX Shell similar to the Korn shell"
-HOMEPAGE="http://www.zsh.org/"
-SRC_URI="ftp://ftp.zsh.org/pub/${P}.tar.bz2
-	doc? ( ftp://ftp.zsh.org/pub/${P}-doc.tar.bz2 )"
-
-LICENSE="ZSH"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="maildir ncurses static doc 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 ${P}.tar.bz2
-	use doc && unpack ${P}-doc.tar.bz2
-	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
-
-	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
-}