Marked 4.0.9-r2 and 4.1.1-r4 stable because of glibc-2.3.2-r9, see bug #38356

12 files changed, 13 insertions, 453 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index ac05ed56630e..a4eb07c28951 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-shells/zsh
 # Copyright 2002-2004 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.36 2004/01/18 17:51:04 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.37 2004/01/22 12:42:09 usata Exp $
+
+  22 Jan 2004; Mamoru KOMACHI <usata@gentoo.org> zsh-4.0.9-r1.ebuild,
+  zsh-4.0.9-r2.ebuild, zsh-4.0.9.ebuild, zsh-4.1.1-r2.ebuild,
+  zsh-4.1.1-r3.ebuild, zsh-4.1.1-r4.ebuild:
+  Marked 4.0.9-r2 and 4.1.1-r4 stable because of glibc-2.3.2-r9, see bug #38356
 
 *zsh-4.0.9-r2 (19 Jan 2004)
 
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index a3e4d60cc4ff..08164d8100fa 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,21 +1,13 @@
 MD5 226ad84ab10a74bbc8cf0dea1329941c zsh-4.0.7-r1.ebuild 2291
-MD5 23e900b112727caac5567ac36ddd60ea zsh-4.0.9.ebuild 2469
-MD5 a0a4947a1238749d1f49b03c4697055a zsh-4.1.1-r2.ebuild 3057
-MD5 dc79d2b364b80df4eb879e1531976950 ChangeLog 6844
+MD5 1bb931588ac834f8a9883ccdc0592106 ChangeLog 7101
 MD5 28ed8ea6cdccb353e2e8ad783eb51f5b metadata.xml 506
-MD5 0d12007c5eebbe15ac6052e8d7489f69 zsh-4.0.9-r1.ebuild 2591
-MD5 39d0fa380eb9e44e5d8771b357472017 zsh-4.1.1-r3.ebuild 3307
-MD5 a9a9386cc7a58ea21807a4edaacb9534 zsh-4.0.9-r2.ebuild 2630
-MD5 a36d8a2cb269b634a7e01a35d364371f zsh-4.1.1-r4.ebuild 3346
+MD5 0c1d77e92495ecb2290575dfa560bcd1 zsh-4.0.9-r2.ebuild 2628
+MD5 9ecfdb5ddadca7c2796e9e31e82bbb92 zsh-4.1.1-r4.ebuild 3340
 MD5 2aa47fce01c92a0cc7e070f04018ac93 files/_portage 7539
 MD5 69b64f833140e51ce26127a2336e7766 files/digest-zsh-4.0.7-r1 127
-MD5 de58f149f41740c394800ba8d2cdf361 files/digest-zsh-4.0.9-r1 199
-MD5 4823f16213517c590b1e624afe52271d files/digest-zsh-4.1.1-r2 132
 MD5 f83ccd2b6f1cd3e75c910c48159892f5 files/zsh-4.1.1-gentoo.diff 488
 MD5 64023b41a9987655e0e014d32562cfad files/zprofile 404
 MD5 de0db046f0f40cb1cc3cd3f6e6b2645a files/zshenv 318
 MD5 81e325aacd554d2c5f6d14efe45d1ffd files/zsh-strncmp.diff 354
-MD5 7daadfcc408d7d6d8766aea27dcecc21 files/digest-zsh-4.0.9 130
-MD5 1a527b6a4700642b4742d9cc8de90285 files/digest-zsh-4.1.1-r3 199
 MD5 de58f149f41740c394800ba8d2cdf361 files/digest-zsh-4.0.9-r2 199
 MD5 1a527b6a4700642b4742d9cc8de90285 files/digest-zsh-4.1.1-r4 199
diff --git a/app-shells/zsh/files/digest-zsh-4.0.9 b/app-shells/zsh/files/digest-zsh-4.0.9
deleted file mode 100644
index 3f2f647305f6..000000000000
--- a/app-shells/zsh/files/digest-zsh-4.0.9
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 26cc0f9051ba41063e950723246dfaa8 zsh-4.0.9.tar.bz2 1749802
-MD5 f7032dd0a992cba7bb903ab90a9ca667 zsh-4.0.9-doc.tar.bz2 1411985
diff --git a/app-shells/zsh/files/digest-zsh-4.0.9-r1 b/app-shells/zsh/files/digest-zsh-4.0.9-r1
deleted file mode 100644
index 19f27e152f5f..000000000000
--- a/app-shells/zsh/files/digest-zsh-4.0.9-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-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-r2 b/app-shells/zsh/files/digest-zsh-4.1.1-r2
deleted file mode 100644
index 8cce53db48a1..000000000000
--- a/app-shells/zsh/files/digest-zsh-4.1.1-r2
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 48958b1a3fc86261a26eea40a4f7d4af zsh-4.1.1.tar.bz2 1924514
-MD5 a4fb455591ee95e5264bf985af3473ea zsh-4.1.1-euc-0.2.patch.gz 2788
diff --git a/app-shells/zsh/files/digest-zsh-4.1.1-r3 b/app-shells/zsh/files/digest-zsh-4.1.1-r3
deleted file mode 100644
index f9bbd87c4098..000000000000
--- a/app-shells/zsh/files/digest-zsh-4.1.1-r3
+++ /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/zsh-4.0.9-r1.ebuild b/app-shells/zsh/zsh-4.0.9-r1.ebuild
deleted file mode 100644
index c8a750205f6f..000000000000
--- a/app-shells/zsh/zsh-4.0.9-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.0.9-r1.ebuild,v 1.1 2004/01/03 18:22:36 usata Exp $
-
-IUSE="maildir ncurses static doc cjk"
-
-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 )
-	cjk? ( http://www.ono.org/software/dist/${P}-euc-0.2.patch.gz )"
-
-SLOT="0"
-LICENSE="ZSH"
-KEYWORDS="~x86 ~alpha ~ppc ~sparc"
-
-DEPEND="virtual/glibc
-	sys-apps/groff
-	${RDEPEND}"
-RDEPEND="ncurses? ( >=sys-libs/ncurses-5.1 )"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	use cjk && epatch ../${P}-euc-0.2.patch
-	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 ncurses && myconf="--with-curses-terminfo"
-	use maildir && myconf="${myconf} --enable-maildir-support"
-	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}" \
-		${myconf} || die "configure failed"
-	# emake still b0rks
-	make || die "make failed"
-	#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/site-functions
-	doins ${FILESDIR}/_portage
-
-	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
-}
diff --git a/app-shells/zsh/zsh-4.0.9-r2.ebuild b/app-shells/zsh/zsh-4.0.9-r2.ebuild
index 095fecddec4c..5e04bd82c78e 100644
--- a/app-shells/zsh/zsh-4.0.9-r2.ebuild
+++ b/app-shells/zsh/zsh-4.0.9-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.0.9-r2.ebuild,v 1.1 2004/01/18 17:51:04 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.0.9-r2.ebuild,v 1.2 2004/01/22 12:42:09 usata Exp $
 
 IUSE="maildir ncurses static doc cjk"
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.zsh.org/pub/${P}.tar.bz2
 
 SLOT="0"
 LICENSE="ZSH"
-KEYWORDS="~x86 ~alpha ~ppc ~sparc"
+KEYWORDS="x86 alpha ~ppc ~sparc"
 
 DEPEND="virtual/glibc
 	sys-apps/groff
diff --git a/app-shells/zsh/zsh-4.0.9.ebuild b/app-shells/zsh/zsh-4.0.9.ebuild
deleted file mode 100644
index 0db7993d4c75..000000000000
--- a/app-shells/zsh/zsh-4.0.9.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.0.9.ebuild,v 1.2 2004/01/03 18:22:36 usata Exp $
-
-IUSE="maildir ncurses static doc"
-
-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 )"
-
-SLOT="0"
-LICENSE="ZSH"
-KEYWORDS="~x86 ~alpha ~ppc ~sparc"
-
-DEPEND="virtual/glibc
-	sys-apps/groff
-	${RDEPEND}"
-RDEPEND="ncurses? ( >=sys-libs/ncurses-5.1 )"
-
-src_unpack() {
-	unpack ${A}
-	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 ncurses && myconf="--with-curses-terminfo"
-	use maildir && myconf="${myconf} --enable-maildir-support"
-	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}" \
-		${myconf} || die "configure failed"
-	# emake still b0rks
-	make || die "make failed"
-	#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/site-functions
-	doins ${FILESDIR}/_portage
-
-	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
-}
diff --git a/app-shells/zsh/zsh-4.1.1-r2.ebuild b/app-shells/zsh/zsh-4.1.1-r2.ebuild
deleted file mode 100644
index d8687626c899..000000000000
--- a/app-shells/zsh/zsh-4.1.1-r2.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.1.1-r2.ebuild,v 1.7 2004/01/03 18:22:36 usata Exp $
-
-inherit eutils
-
-IUSE="cjk maildir ncurses static"
-
-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 )"
-
-SLOT="0"
-LICENSE="ZSH"
-KEYWORDS="x86 alpha ppc sparc amd64 hppa"
-
-DEPEND="sys-apps/groff
-	>=dev-libs/libpcre-3.9
-	>=sys-apps/sed-4
-	sys-libs/libcap
-	ncurses? ( >=sys-libs/ncurses-5.1 )"
-RDEPEND=">=dev-libs/libpcre-3.9
-	sys-libs/libcap
-	ncurses? ( >=sys-libs/ncurses-5.1 )"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.diff
-	use cjk && epatch ${DISTDIR}/${P}-euc-0.2.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 ncurses && myconf="--with-curses-terminfo"
-	use maildir && myconf="${myconf} --enable-maildir-support"
-	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}" \
-		${myconf} || die "configure failed"
-
-	if [ -n "`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
-	make || die "make failed"
-	#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
-
-	dodoc ChangeLog* META-FAQ README INSTALL LICENCE config.modules
-
-	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() {
-
-	# 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.1.1-r3.ebuild b/app-shells/zsh/zsh-4.1.1-r3.ebuild
deleted file mode 100644
index 31e48ba06a9d..000000000000
--- a/app-shells/zsh/zsh-4.1.1-r3.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2004 Gentoo Technologies, Inc.
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.1.1-r3.ebuild,v 1.2 2004/01/03 18:22:36 usata Exp $
-
-inherit eutils
-
-IUSE="cjk maildir ncurses static doc"
-
-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 )"
-
-SLOT="0"
-LICENSE="ZSH"
-KEYWORDS="~x86 ~alpha ~ppc ~sparc ~amd64 ~hppa"
-
-DEPEND="sys-apps/groff
-	>=sys-apps/sed-4
-	${RDEPEND}"
-RDEPEND=">=dev-libs/libpcre-3.9
-	sys-libs/libcap
-	ncurses? ( >=sys-libs/ncurses-5.1 )"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	use doc && unpack ${P}-doc.tar.bz2
-	cd ${S}
-	epatch ${FILESDIR}/${P}-gentoo.diff
-	use cjk && epatch ${DISTDIR}/${P}-euc-0.2.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 ncurses && myconf="--with-curses-terminfo"
-	use maildir && myconf="${myconf} --enable-maildir-support"
-	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}" \
-		${myconf} || die "configure failed"
-
-	if [ -n "`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
-	make || die "make failed"
-	#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/site-functions
-	doins ${FILESDIR}/_portage
-
-	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() {
-
-	# 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.1.1-r4.ebuild b/app-shells/zsh/zsh-4.1.1-r4.ebuild
index 54064eb8c014..eaa9d62335f3 100644
--- a/app-shells/zsh/zsh-4.1.1-r4.ebuild
+++ b/app-shells/zsh/zsh-4.1.1-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2004 Gentoo Technologies, Inc.
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.1.1-r4.ebuild,v 1.1 2004/01/18 17:51:04 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.1.1-r4.ebuild,v 1.2 2004/01/22 12:42:09 usata Exp $
 
 inherit eutils
 
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.zsh.org/pub/${P}.tar.bz2
 
 SLOT="0"
 LICENSE="ZSH"
-KEYWORDS="~x86 ~alpha ~ppc ~sparc ~amd64 ~hppa"
+KEYWORDS="x86 alpha ppc sparc amd64 hppa"
 
 DEPEND="sys-apps/groff
 	>=sys-apps/sed-4