Fixed _init_d completion. Thanks to Andrew D. Keyser (aka Legoguy) <andrewdk@comcast.net>; bug #69997. Removed zsh completions.

12 files changed, 219 insertions, 87 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index f3a1a9c79448..80880819bb1d 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for app-shells/zsh
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.63 2004/10/16 14:25:16 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.64 2004/11/06 15:43:02 usata Exp $
+
+*zsh-4.2.1-r1 (07 Nov 2004)
+*zsh-4.0.9-r4 (07 Nov 2004)
+
+  07 Nov 2004; Mamoru KOMACHI <usata@gentoo.org>
+  -files/zsh-4.1.1-gentoo.diff, +files/zsh-init.d-gentoo.diff,
+  +zsh-4.0.9-r4.ebuild, -zsh-4.1.1-r5.ebuild, +zsh-4.2.1-r1.ebuild:
+  Fixed _init_d completion. Thanks to Andrew D. Keyser (aka Legoguy
+  <andrewdk@comcast.net>; bug #69997. Removed zsh completions.
 
   16 Oct 2004; Tom Martin <slarti@gentoo.org> zsh-4.2.1.ebuild:
   Stable on amd64.
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 54d5f8450eb9..9ed667a6d8e2 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,31 +1,23 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 a8d76905e8a9727607b10c1b3722dcc9 zsh-4.1.1-r5.ebuild 3389
-MD5 607a5475313774b3ee38918e633cfd6a zsh-4.2.0-r1.ebuild 3692
-MD5 708c996d82ee2e1638a48016d7f5d698 zsh-4.0.9-r3.ebuild 2701
 MD5 32b69eea853e0a1fbfd4346aa2f2caa2 ChangeLog 11234
 MD5 03a9c43a04cdb88be6a77cfec7415de0 zsh-4.2.1.ebuild 4278
+MD5 708c996d82ee2e1638a48016d7f5d698 zsh-4.0.9-r3.ebuild 2701
+MD5 9624d9829f9060a539e6e8946be2b22f zsh-4.0.9-r4.ebuild 2656
+MD5 1a92060d42d6b2c039c7c37db9c97397 zsh-4.2.1-r1.ebuild 4159
 MD5 28ed8ea6cdccb353e2e8ad783eb51f5b metadata.xml 506
+MD5 607a5475313774b3ee38918e633cfd6a zsh-4.2.0-r1.ebuild 3692
 MD5 006e6cf19d9020494968fb2babc9c5ab files/_gcc-config 1148
-MD5 81e325aacd554d2c5f6d14efe45d1ffd files/zsh-strncmp.diff 354
-MD5 46563792d80acf9492dd3afeaf4b19fd files/prompt_gentoo_setup 1612
 MD5 de58f149f41740c394800ba8d2cdf361 files/digest-zsh-4.0.9-r3 199
-MD5 1a527b6a4700642b4742d9cc8de90285 files/digest-zsh-4.1.1-r5 199
-MD5 9c5e675b40ea6a43fd461f262df24fb4 files/digest-zsh-4.2.0-r1 199
-MD5 6a03afc2cdef547eb2af4a6f5eb0dac6 files/_gentoolkit 7369
-MD5 f83ccd2b6f1cd3e75c910c48159892f5 files/zsh-4.1.1-gentoo.diff 488
-MD5 f03e0d125db81b28e575e0a61109cbfe files/_genlop 5838
-MD5 e6a9690e5c9b23757e887e14da621c9c files/zsh-4.2.1-gentoo.diff 735
-MD5 5f0bb4d1bbe63c42a104eb0cab8a28d3 files/zprofile 403
+MD5 557ebe931aae8efc7e1221e1a6985f2f files/digest-zsh-4.2.1 199
+MD5 de58f149f41740c394800ba8d2cdf361 files/digest-zsh-4.0.9-r4 199
+MD5 46563792d80acf9492dd3afeaf4b19fd files/prompt_gentoo_setup 1612
+MD5 64023b41a9987655e0e014d32562cfad files/zprofile 404
+MD5 557ebe931aae8efc7e1221e1a6985f2f files/digest-zsh-4.2.1-r1 199
 MD5 de0db046f0f40cb1cc3cd3f6e6b2645a files/zshenv 318
 MD5 d401be6503fc2e34341d56e99ee25e94 files/_portage-20040204 10954
+MD5 e6a9690e5c9b23757e887e14da621c9c files/zsh-4.2.1-gentoo.diff 735
+MD5 81e325aacd554d2c5f6d14efe45d1ffd files/zsh-strncmp.diff 354
+MD5 f03e0d125db81b28e575e0a61109cbfe files/_genlop 5838
+MD5 d1bc426392f2bb0994ce1ad428261474 files/zsh-init.d-gentoo.diff 564
+MD5 9c5e675b40ea6a43fd461f262df24fb4 files/digest-zsh-4.2.0-r1 199
+MD5 6a03afc2cdef547eb2af4a6f5eb0dac6 files/_gentoolkit 7369
 MD5 b862cd1ab51c87c0d1ec2b2c5c21c230 files/_portage-20040730 13907
-MD5 557ebe931aae8efc7e1221e1a6985f2f files/digest-zsh-4.2.1 199
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBcS/FCHk4+ZoBpvsRAptsAJ94ewlCzlSbP3SUnwSTNY39qsiP8gCfe2Yx
-WQufgezWMIqa+f41XBvLvko=
-=3VWN
------END PGP SIGNATURE-----
diff --git a/app-shells/zsh/files/digest-zsh-4.0.9-r4 b/app-shells/zsh/files/digest-zsh-4.0.9-r4
new file mode 100644
index 000000000000..19f27e152f5f
--- /dev/null
+++ b/app-shells/zsh/files/digest-zsh-4.0.9-r4
@@ -0,0 +1,3 @@
+MD5 26cc0f9051ba41063e950723246dfaa8 zsh-4.0.9.tar.bz2 1749802
+MD5 f7032dd0a992cba7bb903ab90a9ca667 zsh-4.0.9-doc.tar.bz2 1411985
+MD5 1e755a2ffa0bad11b0ebc7d5d7622674 zsh-4.0.9-euc-0.2.patch.gz 2869
diff --git a/app-shells/zsh/files/digest-zsh-4.1.1-r5 b/app-shells/zsh/files/digest-zsh-4.1.1-r5
deleted file mode 100644
index f9bbd87c4098..000000000000
--- a/app-shells/zsh/files/digest-zsh-4.1.1-r5
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 48958b1a3fc86261a26eea40a4f7d4af zsh-4.1.1.tar.bz2 1924514
-MD5 a4fb455591ee95e5264bf985af3473ea zsh-4.1.1-euc-0.2.patch.gz 2788
-MD5 3ec54fa702b9a5c5209b56c2c8ed6a88 zsh-4.1.1-doc.tar.bz2 1572953
diff --git a/app-shells/zsh/files/digest-zsh-4.2.1-r1 b/app-shells/zsh/files/digest-zsh-4.2.1-r1
new file mode 100644
index 000000000000..5a7134f4f087
--- /dev/null
+++ b/app-shells/zsh/files/digest-zsh-4.2.1-r1
@@ -0,0 +1,3 @@
+MD5 b59ef34b8de288d5fd16f842451125c8 zsh-4.2.1.tar.bz2 2039188
+MD5 44f829b59181749691b9725e48a9a5e8 zsh-4.2.1-euc-0.3.patch.gz 2919
+MD5 943bdc398c6138bdb2294a355f4d0959 zsh-4.2.1-doc.tar.bz2 1632937
diff --git a/app-shells/zsh/files/zsh-4.1.1-gentoo.diff b/app-shells/zsh/files/zsh-4.1.1-gentoo.diff
deleted file mode 100644
index c52e184c8bee..000000000000
--- a/app-shells/zsh/files/zsh-4.1.1-gentoo.diff
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN zsh-4.1.1.old/Src/mkbltnmlst.sh zsh-4.1.1/Src/mkbltnmlst.sh
---- zsh-4.1.1.old/Src/mkbltnmlst.sh	2002-10-16 02:59:58.000000000 +0900
-+++ zsh-4.1.1/Src/mkbltnmlst.sh	2003-08-27 22:45:49.000000000 +0900
-@@ -54,7 +54,7 @@
- 	echo "    add_autoparam(\"$param\", \"$x_mod\");"
-     done
-     for mfunc in $automathfuncs; do
--	echo "    add_automath(\"$mfunc\", \"$x_mod\");"
-+	echo "    add_automathfunc(\"$mfunc\", \"$x_mod\");"
-     done
-     echo "  }"
-     for dep in $moddeps; do
diff --git a/app-shells/zsh/files/zsh-init.d-gentoo.diff b/app-shells/zsh/files/zsh-init.d-gentoo.diff
new file mode 100644
index 000000000000..62612dc23d3b
--- /dev/null
+++ b/app-shells/zsh/files/zsh-init.d-gentoo.diff
@@ -0,0 +1,11 @@
+diff -urN zsh-4.2.1.ORIG/Completion/Unix/Command/_init_d zsh-4.2.1/Completion/Unix/Command/_init_d
+--- zsh-4.2.1.ORIG/Completion/Unix/Command/_init_d	2003-05-15 18:25:21.000000000 +0900
++++ zsh-4.2.1/Completion/Unix/Command/_init_d	2004-11-06 18:15:46.000000000 +0900
+@@ -23,6 +23,6 @@
+ #    cmds=( ${${(j:|:s:|:)${(M)${(f)"$(< $script)"}:#[[:blank:]]#(\'|)[a-z_|]##\'|)\)}}//[^a-z_]} )
+ 
+ (( $#cmds )) || zstyle -a ":completion:${curcontext}:commands" commands cmds ||
+-    cmds=(start stop)
++    cmds=(start stop restart pause zap status)
+ 
+ _sub_commands $cmds
diff --git a/app-shells/zsh/zsh-4.0.9-r3.ebuild b/app-shells/zsh/zsh-4.0.9-r3.ebuild
index cad67333ddfd..c8ee81e8ad4d 100644
--- a/app-shells/zsh/zsh-4.0.9-r3.ebuild
+++ b/app-shells/zsh/zsh-4.0.9-r3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.0.9-r3.ebuild,v 1.6 2004/06/29 04:00:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.0.9-r3.ebuild,v 1.7 2004/11/06 15:43:02 usata Exp $
 
 inherit flag-o-matic eutils
 
@@ -16,7 +16,8 @@ SLOT="0"
 KEYWORDS="x86 ppc ~sparc alpha"
 IUSE="maildir ncurses static doc cjk"
 
-RDEPEND="ncurses? ( >=sys-libs/ncurses-5.1 )"
+RDEPEND="ncurses? ( >=sys-libs/ncurses-5.1 )
+	!app-shells/zsh-completion"
 DEPEND="${RDEPEND}
 	virtual/libc
 	sys-apps/groff"
diff --git a/app-shells/zsh/zsh-4.1.1-r5.ebuild b/app-shells/zsh/zsh-4.0.9-r4.ebuild
index 6251aa0ffc55..6aac3c5871f3 100644
--- a/app-shells/zsh/zsh-4.1.1-r5.ebuild
+++ b/app-shells/zsh/zsh-4.0.9-r4.ebuild
@@ -1,35 +1,31 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.1.1-r5.ebuild,v 1.8 2004/06/29 04:00:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.0.9-r4.ebuild,v 1.1 2004/11/06 15:43:02 usata Exp $
 
 inherit flag-o-matic eutils
 
-MYDATE="20040204"
 DESCRIPTION="UNIX Shell similar to the Korn shell"
 HOMEPAGE="http://www.zsh.org/"
 SRC_URI="ftp://ftp.zsh.org/pub/${P}.tar.bz2
-	cjk? ( http://www.ono.org/software/dist/${P}-euc-0.2.patch.gz )
-	doc? ( ftp://ftp.zsh.org/pub/${P}-doc.tar.bz2 )"
+	doc? ( ftp://ftp.zsh.org/pub/${P}-doc.tar.bz2 )
+	cjk? ( http://www.ono.org/software/dist/${P}-euc-0.2.patch.gz )"
 
 LICENSE="ZSH"
 SLOT="0"
-KEYWORDS="x86 ppc sparc alpha hppa ~amd64"
-IUSE="cjk maildir ncurses static doc"
+KEYWORDS="x86 ppc ~sparc alpha"
+IUSE="maildir ncurses static doc cjk"
 
-RDEPEND=">=dev-libs/libpcre-3.9
-	sys-libs/libcap
-	ncurses? ( >=sys-libs/ncurses-5.1 )"
-DEPEND="sys-apps/groff
-	>=sys-apps/sed-4
-	${RDEPEND}"
+RDEPEND="ncurses? ( >=sys-libs/ncurses-5.1 )"
+DEPEND="${RDEPEND}
+	virtual/libc
+	sys-apps/groff"
 
 src_unpack() {
-	unpack ${P}.tar.bz2
-	use doc && unpack ${P}-doc.tar.bz2
+	unpack ${A}
 	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.diff
-	use cjk && epatch ${DISTDIR}/${P}-euc-0.2.patch.gz
+	use cjk && epatch ../${P}-euc-0.2.patch
 	epatch ${FILESDIR}/${PN}-strncmp.diff
+	epatch ${FILESDIR}/${PN}-init.d-gentoo.diff
 	cd ${S}/Doc
 	ln -sf . man1
 	# fix zshall problem with soelim
@@ -42,7 +38,8 @@ src_compile() {
 
 	use ncurses && myconf="--with-curses-terminfo"
 	use maildir && myconf="${myconf} --enable-maildir-support"
-	use static && myconf="${myconf} --disable-dynamic" \
+	use static \
+		&& myconf="${myconf} --disable-dynamic" \
 		&& append-ldflags -static
 
 	econf \
@@ -59,21 +56,12 @@ src_compile() {
 		--enable-function-subdirs \
 		--enable-ldflags="${LDFLAGS}" \
 		${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/lib/libpcre.a%" \
-			Makefile || die
-	fi
-
 	# emake still b0rks
-	emake -j1 || die "make failed"
-	#make check || die "make check failed"
+	make || die "make failed"
+}
+
+src_test() {
+	make check || die "make check failed"
 }
 
 src_install() {
@@ -89,8 +77,6 @@ src_install() {
 	doins ${FILESDIR}/zprofile
 
 	keepdir /usr/share/zsh/site-functions
-	insinto /usr/share/zsh/site-functions
-	newins ${FILESDIR}/_portage-${MYDATE} _portage
 
 	dodoc ChangeLog* META-FAQ README INSTALL LICENCE config.modules
 
@@ -112,12 +98,3 @@ pkg_preinst() {
 		mv ${ROOT}/etc/zsh/zshenv ${ROOT}/etc/zsh/zprofile
 	fi
 }
-
-pkg_postinst() {
-	# 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
-}
diff --git a/app-shells/zsh/zsh-4.2.0-r1.ebuild b/app-shells/zsh/zsh-4.2.0-r1.ebuild
index 87fd5fa08365..96dd53b4b1bc 100644
--- a/app-shells/zsh/zsh-4.2.0-r1.ebuild
+++ b/app-shells/zsh/zsh-4.2.0-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.2.0-r1.ebuild,v 1.7 2004/06/26 00:05:32 kugelfang Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.2.0-r1.ebuild,v 1.8 2004/11/06 15:43:02 usata Exp $
 
 inherit eutils
 
@@ -19,7 +19,8 @@ IUSE="maildir ncurses static doc pcre cap cjk"
 
 RDEPEND="pcre? ( >=dev-libs/libpcre-3.9 )
 	cap? ( sys-libs/libcap )
-	ncurses? ( >=sys-libs/ncurses-5.1 )"
+	ncurses? ( >=sys-libs/ncurses-5.1 )
+	!app-shells/zsh-completion"
 DEPEND="sys-apps/groff
 	>=sys-apps/sed-4
 	${RDEPEND}"
diff --git a/app-shells/zsh/zsh-4.2.1-r1.ebuild b/app-shells/zsh/zsh-4.2.1-r1.ebuild
new file mode 100644
index 000000000000..6837ec8756fc
--- /dev/null
+++ b/app-shells/zsh/zsh-4.2.1-r1.ebuild
@@ -0,0 +1,149 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.2.1-r1.ebuild,v 1.1 2004/11/06 15:43:02 usata Exp $
+
+inherit eutils
+
+DESCRIPTION="UNIX Shell similar to the Korn shell"
+HOMEPAGE="http://www.zsh.org/"
+SRC_URI="ftp://ftp.zsh.org/pub/${P}.tar.bz2
+	cjk? ( http://www.ono.org/software/dist/${P}-euc-0.3.patch.gz )
+	doc? ( ftp://ftp.zsh.org/pub/${P}-doc.tar.bz2 )"
+
+LICENSE="ZSH"
+SLOT="0"
+KEYWORDS="x86 ppc sparc alpha ~arm hppa amd64"
+IUSE="maildir ncurses static doc pcre cap cjk"
+
+RDEPEND="pcre? ( >=dev-libs/libpcre-3.9 )
+	cap? ( sys-libs/libcap )
+	ncurses? ( >=sys-libs/ncurses-5.1 )"
+DEPEND="sys-apps/groff
+	>=sys-apps/sed-4
+	${RDEPEND}"
+
+S="${WORKDIR}/${P}"
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	use doc && unpack ${P}-doc.tar.bz2
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gentoo.diff
+	epatch ${FILESDIR}/${PN}-init.d-gentoo.diff
+	use cjk && epatch ${DISTDIR}/${P}-euc-0.3.patch.gz
+	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/lib \
+		--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 cap) \
+		${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/lib/libpcre.a%" \
+			Makefile || die
+	fi
+
+	# emake still b0rks
+	emake -j1 || die "make failed"
+}
+
+src_test() {
+	make check || die "make check failed"
+}
+
+src_install() {
+	einstall \
+		bindir=${D}/bin \
+		libdir=${D}/usr/lib \
+		fndir=${D}/usr/share/zsh/${PV%_*}/functions \
+		sitefndir=${D}/usr/share/zsh/site-functions \
+		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,_us.ps,_a4.ps}
+	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() {
+	einfo
+	einfo "If you want to enable Portage completions and Gentoo prompt,"
+	einfo "emerge app-shells/zsh-completion and add"
+	einfo "	autoload -U compinit promptinit"
+	einfo "	compinit"
+	einfo "	promptinit; prompt gentoo"
+	einfo "to your ~/.zshrc"
+	einfo
+	einfo "Also, if you want to enable cache for the completions, add"
+	einfo "	zstyle ':completion::complete:*' use-cache 1"
+	einfo "to your ~/.zshrc"
+	einfo
+	# 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
+}
diff --git a/app-shells/zsh/zsh-4.2.1.ebuild b/app-shells/zsh/zsh-4.2.1.ebuild
index 2eb9f9aeadbf..4b26c853e00c 100644
--- a/app-shells/zsh/zsh-4.2.1.ebuild
+++ b/app-shells/zsh/zsh-4.2.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.2.1.ebuild,v 1.6 2004/10/16 14:25:16 slarti Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.2.1.ebuild,v 1.7 2004/11/06 15:43:02 usata Exp $
 
 inherit eutils
 
@@ -21,7 +21,8 @@ IUSE="maildir ncurses static doc pcre cap cjk"
 
 RDEPEND="pcre? ( >=dev-libs/libpcre-3.9 )
 	cap? ( sys-libs/libcap )
-	ncurses? ( >=sys-libs/ncurses-5.1 )"
+	ncurses? ( >=sys-libs/ncurses-5.1 )
+	!app-shells/zsh-completion"
 DEPEND="sys-apps/groff
 	>=sys-apps/sed-4
 	${RDEPEND}"