Removed old versions. Corrected SRC_URI in 4.0.6-r4

9 files changed, 12 insertions, 250 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index b39d9fb4aded..a05ae911af93 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-shells/zsh
 # Copyright 2002-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.28 2003/08/31 22:34:54 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.29 2003/10/28 07:09:25 usata Exp $
+
+  28 Oct 2003; Mamoru KOMACHI <usata@gentoo.org> zsh-4.0.6-r3.ebuild,
+  zsh-4.0.6-r4.ebuild, zsh-4.1.0_pre7.ebuild, zsh-4.1.1.ebuild:
+  Cleaned out old versions. Corrected zshall distfile path in 4.0.6-r4
 
 *zsh-4.1.1-r2 (01 Sep 2003)
 
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 2bcb4b1ff56e..ec2c6f34084f 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,20 +1,14 @@
-MD5 5726af58b383f70fe8651cedd482ca05 ChangeLog 5569
+MD5 f3f0a84c9604f87334f58923681d2b5e ChangeLog 5775
 MD5 471b685d96479d8645a2e76a9926f0bb zsh-4.0.6-r1.ebuild 1359
-MD5 66712fdbecdb1a6efacaae78d7582553 zsh-4.0.6-r4.ebuild 1753
-MD5 d5f38de81246515c38fc3b09dd5bc544 zsh-4.0.6-r3.ebuild 1495
-MD5 be6ba01c106767ad43b86ceb859737f0 zsh-4.1.0_pre7.ebuild 2017
+MD5 7409ed3a95a015ecf56235326d8e3fe8 zsh-4.0.6-r4.ebuild 1754
 MD5 853d5de501d54c03e6d46803b4520406 zsh-4.0.7.ebuild 2310
-MD5 a0959f60f61bb6ab0b35269e1a3914c1 zsh-4.1.1.ebuild 2779
-MD5 a675ceb133d1a013a74e7e8f02048555 zsh-4.1.1-r1.ebuild 2994
 MD5 4250d7a35433552ee1cbc1c6db009f5f zsh-4.1.1-r2.ebuild 3187
-MD5 9363aaf4c5e5abc23ff6f07a80a52acc files/digest-zsh-4.1.0_pre7 136
-MD5 28e464ce201f3343debf24cced1bcfcb files/digest-zsh-4.0.6-r4 187
+MD5 a675ceb133d1a013a74e7e8f02048555 zsh-4.1.1-r1.ebuild 2994
 MD5 30a6361dbaeb57ce5449160c620c5daf files/digest-zsh-4.0.6-r1 62
-MD5 28e464ce201f3343debf24cced1bcfcb files/digest-zsh-4.0.6-r3 187
+MD5 28e464ce201f3343debf24cced1bcfcb files/digest-zsh-4.0.6-r4 187
 MD5 de0db046f0f40cb1cc3cd3f6e6b2645a files/zshenv 318
-MD5 05078d5709e9fc4be1eb5bbedadb185d files/digest-zsh-4.0.7 125
-MD5 4823f16213517c590b1e624afe52271d files/digest-zsh-4.1.1 132
 MD5 64023b41a9987655e0e014d32562cfad files/zprofile 404
+MD5 05078d5709e9fc4be1eb5bbedadb185d files/digest-zsh-4.0.7 125
 MD5 4823f16213517c590b1e624afe52271d files/digest-zsh-4.1.1-r1 132
 MD5 f83ccd2b6f1cd3e75c910c48159892f5 files/zsh-4.1.1-gentoo.diff 488
 MD5 4823f16213517c590b1e624afe52271d files/digest-zsh-4.1.1-r2 132
diff --git a/app-shells/zsh/files/digest-zsh-4.0.6-r3 b/app-shells/zsh/files/digest-zsh-4.0.6-r3
deleted file mode 100644
index 8db7e319f336..000000000000
--- a/app-shells/zsh/files/digest-zsh-4.0.6-r3
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 6a86da9120e97ebe03afd6a51f717c0f zsh-4.0.6.tar.gz 2146169
-MD5 c8faa44cae89a15cd3616c0dc803fb40 zsh_4.0.6-15.diff.gz 36360
-MD5 30ff6c9df852dbce5b9546aeba22f36b zshall-4.0.6.bz2 165851
diff --git a/app-shells/zsh/files/digest-zsh-4.1.0_pre7 b/app-shells/zsh/files/digest-zsh-4.1.0_pre7
deleted file mode 100644
index 6b5c3e3e8e58..000000000000
--- a/app-shells/zsh/files/digest-zsh-4.1.0_pre7
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 93899349186017aa8cff950fcb7c349f zsh-4.1.0-dev-7.tar.bz2 1844962
-MD5 64bf42ce1602831a0b6a32e6f6d2bdf1 zshall-4.1.0-dev-7.bz2 178869
diff --git a/app-shells/zsh/files/digest-zsh-4.1.1 b/app-shells/zsh/files/digest-zsh-4.1.1
deleted file mode 100644
index 8cce53db48a1..000000000000
--- a/app-shells/zsh/files/digest-zsh-4.1.1
+++ /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/zsh-4.0.6-r3.ebuild b/app-shells/zsh/zsh-4.0.6-r3.ebuild
deleted file mode 100644
index a564d31634f7..000000000000
--- a/app-shells/zsh/zsh-4.0.6-r3.ebuild
+++ /dev/null
@@ -1,57 +0,0 @@
-# Copyright 1999-2003 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.6-r3.ebuild,v 1.9 2003/09/21 13:00:36 aliz Exp $
-
-IUSE=""
-
-DESCRIPTION="UNIX Shell similar to the Korn shell"
-MYPATCH="zsh_4.0.6-15.diff"
-HOMEPAGE="http://www.zsh.org/"
-SRC_URI="ftp://ftp.zsh.org/pub/${P}.tar.gz
-	 mirror:///debian/pool/main/z/zsh/${P/-/_}-15.gz"
-
-SLOT="0"
-LICENSE="ZSH"
-KEYWORDS="x86 alpha ~ppc ~sparc"
-
-DEPEND=">=sys-libs/ncurses-5.1"
-
-src_unpack() {
-	unpack ${A}
-	epatch ${WORKDIR}/${P/-/_}-15
-}
-
-
-src_compile() {
-	econf \
-		--bindir=/bin \
-		--libdir=/usr/lib \
-		--enable-maildir-support \
-		--enable-etcdir=/etc/zsh \
-		--enable-zshenv=/etc/zsh/zshenv \
-		--enable-zshlogin=/etc/zsh/zshlogin \
-		--enable-zshrc=/etc/zsh/zshrc \
-		--enable-fndir=/usr/share/zsh/${PV}/functions \
-		--enable-site-fndir=/usr/share/zsh/site-functions \
-		--enable-function-subdirs || 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"
-
-	dodoc ChangeLog META-FAQ README INSTALL LICENCE config.modules
-	docinto StartupFiles
-	dodoc StartupFiles/z*
-
-	insinto /etc/zsh
-	doins ${FILESDIR}/zshenv
-}
diff --git a/app-shells/zsh/zsh-4.0.6-r4.ebuild b/app-shells/zsh/zsh-4.0.6-r4.ebuild
index 6882c756dc31..c38942d2ec4c 100644
--- a/app-shells/zsh/zsh-4.0.6-r4.ebuild
+++ b/app-shells/zsh/zsh-4.0.6-r4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2003 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.6-r4.ebuild,v 1.4 2003/09/21 13:00:37 aliz Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.0.6-r4.ebuild,v 1.5 2003/10/28 07:09:25 usata Exp $
 
 IUSE="ncurses"
 
@@ -8,7 +8,7 @@ DESCRIPTION="UNIX Shell similar to the Korn shell"
 HOMEPAGE="http://www.zsh.org/"
 SRC_URI="ftp://ftp.zsh.org/pub/${P}.tar.gz
 	 mirror://debian/pool/main/z/zsh/${P/-/_}-15.gz
-	 http://cvs.gentoo.org/~vladimir/distfiles/zshall-${PV}.bz2"
+	 http://dev.gentoo.org/~vladimir/distfiles/zshall-${PV}.bz2"
 
 SLOT="0"
 LICENSE="ZSH"
diff --git a/app-shells/zsh/zsh-4.1.0_pre7.ebuild b/app-shells/zsh/zsh-4.1.0_pre7.ebuild
deleted file mode 100644
index 071008c09f9d..000000000000
--- a/app-shells/zsh/zsh-4.1.0_pre7.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2003 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.0_pre7.ebuild,v 1.6 2003/09/11 01:03:59 msterret Exp $
-
-IUSE="ncurses"
-MY_PV=${PV%_*}-dev-${PV#*_pre}
-MY_PN=${PN}-${MY_PV}
-S=${WORKDIR}/${MY_PN}
-
-DESCRIPTION="UNIX Shell similar to the Korn shell"
-HOMEPAGE="http://www.zsh.org/"
-SRC_URI="ftp://ftp.zsh.org/pub/zsh/development/${MY_PN}.tar.bz2
-		http://cvs.gentoo.org/~vladimir/distfiles/zshall-${MY_PV}.bz2"
-
-SLOT="0"
-LICENSE="ZSH"
-KEYWORDS="~x86 ~alpha ~ppc ~sparc"
-
-DEPEND="ncurses? ( >=sys-libs/ncurses-5.1 )"
-
-src_compile() {
-
-	# New zshall.1 generated with the following, run in Doc:
-	# perl -nle'$_ = `cat $1` if /^\.so man1\/(.+\.1)/;print' zshall.1
-	mv ${WORKDIR}/zshall-${MY_PV} ${S}/Doc/zshall.1
-
-	use ncurses && MYCONF="--with-curses-terminfo"
-
-	econf \
-		--bindir=/bin \
-		--libdir=/usr/lib \
-		--with-curses-terminfo \
-		--enable-maildir-support \
-		--enable-etcdir=/etc/zsh \
-		--enable-zshenv=/etc/zsh/zshenv \
-		--enable-zshlogin=/etc/zsh/zshlogin \
-		--enable-zshrc=/etc/zsh/zshrc \
-		--enable-fndir=/usr/share/zsh/${PV}/functions \
-		--enable-site-fndir=/usr/share/zsh/site-functions \
-		--enable-function-subdirs \
-		${MYCONF}
-	# 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"
-
-	dodoc ChangeLog META-FAQ README INSTALL LICENCE config.modules
-	docinto StartupFiles
-	dodoc StartupFiles/z*
-
-	insinto /etc/zsh
-	doins ${FILESDIR}/zshenv
-}
-
-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.ebuild b/app-shells/zsh/zsh-4.1.1.ebuild
deleted file mode 100644
index 6f009d66a6e9..000000000000
--- a/app-shells/zsh/zsh-4.1.1.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 1999-2003 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.ebuild,v 1.6 2003/09/11 01:03:59 msterret 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"
-# 4.1.x branch is still a development release, though I think it is fairly
-# stable and we may unmask it in the not-so-distant future
-KEYWORDS="~x86 ~alpha ~ppc ~sparc"
-
-DEPEND="sys-apps/groff
-	>=dev-libs/libpcre-3.9
-	ncurses? ( >=sys-libs/ncurses-5.1 )"
-RDEPEND=">=dev-libs/libpcre-3.9
-	ncurses? ( >=sys-libs/ncurses-5.1 )"
-
-src_unpack() {
-	unpack ${P}.tar.bz2
-	cd ${S}
-	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"
-	# 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
-}