Fixed unsynced IUSE. Marked stable on ppc.

8 files changed, 26 insertions, 124 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index 0b0e3de8e840..cc71f0329e07 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.50 2004/06/02 14:55:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.51 2004/06/21 17:43:23 usata Exp $
+
+  22 Jun 2004; Mamoru KOMACHI <usata@gentoo.org> -zsh-4.0.9-r2.ebuild,
+  zsh-4.0.9-r3.ebuild, zsh-4.1.1-r5.ebuild, zsh-4.2.0-r1.ebuild,
+  zsh-4.2.0.ebuild:
+  Fixed unsynced IUSE. Marked stable on ppc.
 
   02 Jun 2004; Aron Griffis <agriffis@gentoo.org> zsh-4.2.0.ebuild:
   Fix use invocation
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 69269ddc1946..945aa10e48b9 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,21 +1,19 @@
-MD5 81544902e5298e4a7063c3a3f319e4c2 zsh-4.0.9-r2.ebuild 2673
-MD5 b65e01e30fc5b4b5ecc3b68c4261597b zsh-4.2.0.ebuild 3552
-MD5 6d6e3efee77367af484d41f2fc06085f zsh-4.1.1-r5.ebuild 3398
-MD5 11ede9c3b4293ebdd6e63b575841540c zsh-4.2.0-r1.ebuild 3699
-MD5 f96e9bfcef1d65a14a5e3199a173d4fb zsh-4.1.1-r4.ebuild 3353
-MD5 5f0fa7c598ce5fa40119088c42906e7b zsh-4.0.9-r3.ebuild 2711
-MD5 a570c2ef9fbf2ff2b14223db88493f32 ChangeLog 9090
+MD5 be0683dc77a0b286a40e123c2df0edd9 zsh-4.0.9-r3.ebuild 2709
+MD5 74dfdc78e673e4ea739b665db38a2218 zsh-4.1.1-r5.ebuild 3396
+MD5 96b22f310739ba5573237ab9a699e055 zsh-4.2.0.ebuild 3548
+MD5 8eb6ce141ba787ab2f191aaf8af4948f ChangeLog 9289
 MD5 28ed8ea6cdccb353e2e8ad783eb51f5b metadata.xml 506
-MD5 81e325aacd554d2c5f6d14efe45d1ffd files/zsh-strncmp.diff 354
-MD5 46563792d80acf9492dd3afeaf4b19fd files/prompt_gentoo_setup 1612
+MD5 284d6b319413f24209b92ab160e6e43b zsh-4.1.1-r4.ebuild 3354
+MD5 4e1dc6d32bf0c3291eb9e243f766b793 zsh-4.2.0-r1.ebuild 3699
 MD5 2aa47fce01c92a0cc7e070f04018ac93 files/_portage 7539
-MD5 de58f149f41740c394800ba8d2cdf361 files/digest-zsh-4.0.9-r2 199
 MD5 de58f149f41740c394800ba8d2cdf361 files/digest-zsh-4.0.9-r3 199
-MD5 1a527b6a4700642b4742d9cc8de90285 files/digest-zsh-4.1.1-r4 199
+MD5 d401be6503fc2e34341d56e99ee25e94 files/_portage-20040204 10954
 MD5 1a527b6a4700642b4742d9cc8de90285 files/digest-zsh-4.1.1-r5 199
-MD5 9c5e675b40ea6a43fd461f262df24fb4 files/digest-zsh-4.2.0-r1 199
 MD5 f83ccd2b6f1cd3e75c910c48159892f5 files/zsh-4.1.1-gentoo.diff 488
 MD5 64023b41a9987655e0e014d32562cfad files/zprofile 404
 MD5 de0db046f0f40cb1cc3cd3f6e6b2645a files/zshenv 318
-MD5 d401be6503fc2e34341d56e99ee25e94 files/_portage-20040204 10954
+MD5 81e325aacd554d2c5f6d14efe45d1ffd files/zsh-strncmp.diff 354
+MD5 1a527b6a4700642b4742d9cc8de90285 files/digest-zsh-4.1.1-r4 199
 MD5 476cf7906a080d52beee81d76fd2a82a files/digest-zsh-4.2.0 130
+MD5 46563792d80acf9492dd3afeaf4b19fd files/prompt_gentoo_setup 1612
+MD5 9c5e675b40ea6a43fd461f262df24fb4 files/digest-zsh-4.2.0-r1 199
diff --git a/app-shells/zsh/files/digest-zsh-4.0.9-r2 b/app-shells/zsh/files/digest-zsh-4.0.9-r2
deleted file mode 100644
index 19f27e152f5f..000000000000
--- a/app-shells/zsh/files/digest-zsh-4.0.9-r2
+++ /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/zsh-4.0.9-r2.ebuild b/app-shells/zsh/zsh-4.0.9-r2.ebuild
deleted file mode 100644
index 5a4108797586..000000000000
--- a/app-shells/zsh/zsh-4.0.9-r2.ebuild
+++ /dev/null
@@ -1,98 +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-r2.ebuild,v 1.3 2004/04/07 20:06:56 vapier Exp $
-
-inherit flag-o-matic eutils
-
-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 )"
-
-LICENSE="ZSH"
-SLOT="0"
-KEYWORDS="x86 alpha ~ppc ~sparc"
-IUSE="maildir ncurses static doc cjk"
-
-RDEPEND="ncurses? ( >=sys-libs/ncurses-5.1 )"
-DEPEND="${RDEPEND}
-	virtual/glibc
-	sys-apps/groff"
-
-src_unpack() {
-	unpack ${A}
-	cd ${S}
-	use cjk && epatch ../${P}-euc-0.2.patch
-	epatch ${FILESDIR}/${PN}-strncmp.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 ncurses && myconf="--with-curses-terminfo"
-	use maildir && myconf="${myconf} --enable-maildir-support"
-	use static \
-		&& myconf="${myconf} --disable-dynamic" \
-		&& append-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 ${ROOT}/etc/zsh/zshenv -a ! -f ${ROOT}/etc/zsh/zprofile ]; then
-		mv ${ROOT}/etc/zsh/zshenv ${ROOT}/etc/zsh/zprofile
-	fi
-}
diff --git a/app-shells/zsh/zsh-4.0.9-r3.ebuild b/app-shells/zsh/zsh-4.0.9-r3.ebuild
index adb267295a85..a0a74b8f0e4e 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 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-r3.ebuild,v 1.3 2004/04/07 20:08:32 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.0.9-r3.ebuild,v 1.4 2004/06/21 17:43:23 usata Exp $
 
 inherit flag-o-matic eutils
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.zsh.org/pub/${P}.tar.bz2
 
 LICENSE="ZSH"
 SLOT="0"
-KEYWORDS="x86 alpha ~ppc ~sparc"
+KEYWORDS="x86 alpha ppc ~sparc"
 IUSE="maildir ncurses static doc cjk"
 
 RDEPEND="ncurses? ( >=sys-libs/ncurses-5.1 )"
diff --git a/app-shells/zsh/zsh-4.1.1-r5.ebuild b/app-shells/zsh/zsh-4.1.1-r5.ebuild
index f72bb3fc7e63..cf5e89f18350 100644
--- a/app-shells/zsh/zsh-4.1.1-r5.ebuild
+++ b/app-shells/zsh/zsh-4.1.1-r5.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-r5.ebuild,v 1.5 2004/04/07 20:31:59 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.1.1-r5.ebuild,v 1.6 2004/06/21 17:43:23 usata Exp $
 
 inherit flag-o-matic eutils
 
@@ -13,7 +13,7 @@ SRC_URI="ftp://ftp.zsh.org/pub/${P}.tar.bz2
 
 LICENSE="ZSH"
 SLOT="0"
-KEYWORDS="x86 alpha ~ppc sparc ~amd64 hppa"
+KEYWORDS="x86 alpha ppc sparc ~amd64 hppa"
 IUSE="cjk maildir ncurses static doc"
 
 RDEPEND=">=dev-libs/libpcre-3.9
diff --git a/app-shells/zsh/zsh-4.2.0-r1.ebuild b/app-shells/zsh/zsh-4.2.0-r1.ebuild
index 98266a698e40..c66fb2141c54 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 Technologies, Inc.
 # 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.2 2004/05/31 17:20:43 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.2.0-r1.ebuild,v 1.3 2004/06/21 17:43:23 usata Exp $
 
 inherit eutils
 
@@ -14,8 +14,8 @@ SRC_URI="ftp://ftp.zsh.org/pub/${MY_P}.tar.bz2
 
 LICENSE="ZSH"
 SLOT="0"
-KEYWORDS="~x86 ~ppc ~sparc ~alpha arm ~hppa ~amd64"
-IUSE="maildir ncurses static doc pcre cap"
+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 )
diff --git a/app-shells/zsh/zsh-4.2.0.ebuild b/app-shells/zsh/zsh-4.2.0.ebuild
index 18274278a3ec..eff17f01b9f0 100644
--- a/app-shells/zsh/zsh-4.2.0.ebuild
+++ b/app-shells/zsh/zsh-4.2.0.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.2.0.ebuild,v 1.5 2004/06/02 14:55:43 agriffis Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.2.0.ebuild,v 1.6 2004/06/21 17:43:23 usata Exp $
 
 IUSE="maildir ncurses static doc pcre cap"
 
@@ -15,7 +15,7 @@ SRC_URI="ftp://ftp.zsh.org/pub/${MY_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