Added pcre local IUSE flag. Marked old ebuilds stable for x86 and alpha.

6 files changed, 139 insertions, 5 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index 322c110ce365..9989a022fcc1 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,12 @@
 # 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.39 2004/02/26 21:55:57 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.40 2004/03/03 18:41:45 usata Exp $
+
+*zsh-4.2.0_pre2 (04 Mar 2004)
+
+  04 Mar 2004; Mamoru KOMACHI <usata@gentoo.org> zsh-4.0.9-r3.ebuild,
+  zsh-4.1.1-r5.ebuild, zsh-4.2.0_pre2.ebuild:
+  Added pcre local IUSE flag. Marked old ebuilds stable for x86 and alpha.
 
 *zsh-4.2.0_pre1 (27 Feb 2004)
 
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 65e2fed0683d..91fb600bfd4b 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -3,6 +3,7 @@ MD5 d6c683c148853196ec43cabba95b667f zsh-4.1.1-r5.ebuild 3374
 MD5 644aa40e6a4b6c97dc351a3d3c16774e ChangeLog 7549
 MD5 28ed8ea6cdccb353e2e8ad783eb51f5b metadata.xml 506
 MD5 b52816ec4000cb3a01c4fb19884cb6e4 zsh-4.2.0_pre1.ebuild 3229
+MD5 b304bc1ced956042bbaa457b762d6047 zsh-4.2.0_pre2.ebuild 3300
 MD5 0c1d77e92495ecb2290575dfa560bcd1 zsh-4.0.9-r2.ebuild 2628
 MD5 219f19ba1e213dd846d6e778dbb10238 zsh-4.1.1-r4.ebuild 3324
 MD5 2aa47fce01c92a0cc7e070f04018ac93 files/_portage 7539
@@ -16,3 +17,4 @@ MD5 81e325aacd554d2c5f6d14efe45d1ffd files/zsh-strncmp.diff 354
 MD5 da168d6d058cf09e9d2c27a00fa301aa files/digest-zsh-4.2.0_pre1 211
 MD5 de58f149f41740c394800ba8d2cdf361 files/digest-zsh-4.0.9-r2 199
 MD5 1a527b6a4700642b4742d9cc8de90285 files/digest-zsh-4.1.1-r4 199
+MD5 f333fd72e7a43d88250418248ac78a9f files/digest-zsh-4.2.0_pre2 142
diff --git a/app-shells/zsh/files/digest-zsh-4.2.0_pre2 b/app-shells/zsh/files/digest-zsh-4.2.0_pre2
new file mode 100644
index 000000000000..f516de02cb56
--- /dev/null
+++ b/app-shells/zsh/files/digest-zsh-4.2.0_pre2
@@ -0,0 +1,2 @@
+MD5 4f68942f8be22793e819eac45315936f zsh-4.2.0-pre-2.tar.bz2 1985997
+MD5 cae6ed0be667c6fa2771d0085bdb4833 zsh-4.2.0-pre-2-doc.tar.bz2 1609914
diff --git a/app-shells/zsh/zsh-4.0.9-r3.ebuild b/app-shells/zsh/zsh-4.0.9-r3.ebuild
index 4dbe2135b15a..77072ede5e74 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.1 2004/02/04 15:32:45 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.0.9-r3.ebuild,v 1.2 2004/03/03 18:41:45 usata Exp $
 
 IUSE="maildir ncurses static doc cjk"
 
@@ -15,7 +15,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.1.1-r5.ebuild b/app-shells/zsh/zsh-4.1.1-r5.ebuild
index 579bb746e685..162774725373 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.1 2004/02/04 15:32:45 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.1.1-r5.ebuild,v 1.2 2004/03/03 18:41:45 usata Exp $
 
 IUSE="cjk maildir ncurses static doc"
 
@@ -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
diff --git a/app-shells/zsh/zsh-4.2.0_pre2.ebuild b/app-shells/zsh/zsh-4.2.0_pre2.ebuild
new file mode 100644
index 000000000000..4b60dfb2157a
--- /dev/null
+++ b/app-shells/zsh/zsh-4.2.0_pre2.ebuild
@@ -0,0 +1,124 @@
+# 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_pre2.ebuild,v 1.1 2004/03/03 18:41:45 usata Exp $
+
+IUSE="maildir ncurses static doc pcre"
+
+DESCRIPTION="UNIX Shell similar to the Korn shell"
+HOMEPAGE="http://www.zsh.org/"
+
+MYDATE="20040204"
+MY_P="${P/_pre/-pre-}"
+
+SRC_URI="ftp://ftp.zsh.org/pub/${MY_P}.tar.bz2
+	doc? ( ftp://ftp.zsh.org/pub/${MY_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="pcre? ( >=dev-libs/libpcre-3.9 )
+	sys-libs/libcap
+	ncurses? ( >=sys-libs/ncurses-5.1 )"
+
+S="${WORKDIR}/${MY_P}"
+
+src_unpack() {
+	unpack ${MY_P}.tar.bz2
+	use doc && unpack ${MY_P}-doc.tar.bz2
+	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="${myconf} --with-curses-terminfo"
+	use maildir && myconf="${myconf} --enable-maildir-support"
+	use static && myconf="${myconf} --disable-dynamic" \
+		&& LDFLAGS="${LDFLAGS} -static"
+	use pcre && myconf="${myconf} --enable-pcre"
+
+	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
+	emake -j1 || 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
+	newins ${FILESDIR}/_portage-${MYDATE} _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
+}