Development version bump, closing bug #23114

5 files changed, 106 insertions, 7 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index 9b217545273f..11f9e4eca449 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,12 @@
 # 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.20 2003/07/23 17:48:19 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.21 2003/07/23 20:21:36 usata Exp $
+
+*zsh-4.1.1 (24 Jul 2003)
+
+  24 Jul 2003; Mamoru KOMACHI <usata@gentoo.org> zsh-4.1.1.ebuild:
+  New development version. Added cjk support, based on the ebuild
+  submitted by Wayne Davison <gentoo@blorf.net> in bug #23114
 
 *zsh-4.0.7 (24 Jul 2003)
 
@@ -9,6 +15,8 @@
   New version. Added maildir flag to IUSE. Changed Zsh startup file
   from /etc/zsh/zshenv to /etc/zsh/zprofile suggested by James
   Michael Fults <jmf@gtcom.net> in bug #19924.
+  Added pkg_preinst() function to help migration of /etc/zsh/zshenv
+  to /etc/zsh/zprofile discussed in #23114
 
 *zsh-4.0.6-r4 (17 Apr 2003)
 
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 066d61abbcf0..596302b40652 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,10 +1,10 @@
-MD5 2a1f01d5e0f7c53fcba43eeaaf03ace8 ChangeLog 3885
+MD5 665c6e80651ff5a7fcaad07503d22b94 ChangeLog 4218
 MD5 20fe4a0c8938a7d63bef94149ee8f797 zsh-4.0.6-r1.ebuild 1361
 MD5 ffc94926659f33268966535c421a0cfa zsh-4.0.6-r3.ebuild 1509
 MD5 366f440161ef1f5755ebf7bdaa201b61 zsh-4.0.6-r4.ebuild 1800
 MD5 468e9d22071e69b977927a2ec680c14e zsh-4.1.0_pre7.ebuild 1782
-MD5 81dec0a6a05600fdaff9994bb4f1f06b zsh-4.0.7.ebuild 2223
-MD5 d39d9319d7353de03dc77d73bb7dc567 zsh-4.1.1.ebuild 2264
+MD5 cd9b16cddad57045f6b08e7d4f681759 zsh-4.0.7.ebuild 2226
+MD5 9ea555a6629b98b153cc9db2eed310b9 zsh-4.1.1.ebuild 2267
 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
diff --git a/app-shells/zsh/files/digest-zsh-4.1.1 b/app-shells/zsh/files/digest-zsh-4.1.1
new file mode 100644
index 000000000000..6e1d38cfb35c
--- /dev/null
+++ b/app-shells/zsh/files/digest-zsh-4.1.1
@@ -0,0 +1,3 @@
+MD5 48958b1a3fc86261a26eea40a4f7d4af zsh-4.1.1.tar.bz2 1924514
+MD5 74e0faa26ab947e3f5de6211cec62e37 zsh-4.1.1-zshall-gentoo.diff.bz2 180830
+MD5 a4fb455591ee95e5264bf985af3473ea zsh-4.1.1-euc-0.2.patch.gz 2788
diff --git a/app-shells/zsh/zsh-4.0.7.ebuild b/app-shells/zsh/zsh-4.0.7.ebuild
index 9f3bb362e9d8..b2fa455237a6 100644
--- a/app-shells/zsh/zsh-4.0.7.ebuild
+++ b/app-shells/zsh/zsh-4.0.7.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.7.ebuild,v 1.1 2003/07/23 17:48:19 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.0.7.ebuild,v 1.2 2003/07/23 20:21:36 usata Exp $
 
 IUSE="maildir ncurses"
 
@@ -26,7 +26,7 @@ src_unpack() {
 	epatch ${MYPATCH}
 	epatch ${ZSHALL}
 }
-	
+
 src_compile() {
 	local myconf
 
@@ -45,7 +45,7 @@ src_compile() {
 		--enable-fndir=/usr/share/zsh/${PV}/functions \
 		--enable-site-fndir=/usr/share/zsh/site-functions \
 		--enable-function-subdirs \
-		${myconf}
+		${myconf} || die "configure failed"
 	# emake still b0rks
 	make || die "make failed"
 	#make check || die "make check failed"
@@ -68,3 +68,12 @@ src_install() {
 	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.ebuild b/app-shells/zsh/zsh-4.1.1.ebuild
new file mode 100644
index 000000000000..456f77e61e76
--- /dev/null
+++ b/app-shells/zsh/zsh-4.1.1.ebuild
@@ -0,0 +1,79 @@
+# 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.1 2003/07/23 20:21:36 usata Exp $
+
+IUSE="maildir ncurses"
+
+DESCRIPTION="UNIX Shell similar to the Korn shell"
+HOMEPAGE="http://www.zsh.org/"
+
+# New zshall.1 generated with the following, run in Doc:
+# perl -nle'$_ = `cat $1` if /^\.so man1\/(.+\.1)/;print' zshall.1
+ZSHALL="${P}-zshall-gentoo.diff"
+SRC_URI="ftp://ftp.zsh.org/pub/${P}.tar.bz2
+	http://dev.gentoo.org/~usata/distfiles/${ZSHALL}.bz2
+	cjk? ( http://www.ono.org/software/dist/${P}-euc-0.2.patch.gz )"
+
+SLOT="0"
+LICENSE="ZSH"
+KEYWORDS="~x86 -alpha ~ppc ~sparc"
+
+DEPEND="ncurses? ( >=sys-libs/ncurses-5.1 )"
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	epatch ${DISTDIR}/${ZSHALL}.bz2
+	cd ${S}
+	use cjk && epatch ${DISTDIR}/${P}-euc-0.2.patch.gz
+}
+
+src_compile() {
+	local myconf
+
+	use ncurses && myconf="--with-curses-terminfo"
+	use maildir && myconf="${myconf} --enable-maildir-support"
+
+	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 \
+		${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
+}