Introduced static USE flag, removed zshall.1 patch and added libpcre dependency (closing #23978)

6 files changed, 41 insertions, 23 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index 11f9e4eca449..30e603ecc2ba 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,12 +1,15 @@
 # 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.21 2003/07/23 20:21:36 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.22 2003/07/24 13:06:10 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
+  Added libpcre dependency, thanks to Sean E Russell <ser@germane-software.com>
+  in bug #23978
+  Added static USE flag and removed zshall.1 patch
 
 *zsh-4.0.7 (24 Jul 2003)
 
@@ -17,6 +20,7 @@
   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
+  Added static USE flag and removed zshall.1 patch
 
 *zsh-4.0.6-r4 (17 Apr 2003)
 
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index c48593f304ba..4404137def0f 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,10 +1,10 @@
-MD5 65ffe3a4d25c6a40e6665ba8753cfc3e ChangeLog 4416
+MD5 e9b3e18be30f690e0d02cdf7fccc4e53 ChangeLog 4416
 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 81973e6e6c7365f3a65ac14a5f19685a zsh-4.0.7.ebuild 2329
-MD5 dbf57894d1f18b843a2ea7db53d42cff zsh-4.1.1.ebuild 2408
+MD5 c1ca631bc62e5752554f36dd6ba19072 zsh-4.0.7.ebuild 2329
+MD5 38ed7875ca67d302d61f2d2e267f82c0 zsh-4.1.1.ebuild 2408
 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.0.7 b/app-shells/zsh/files/digest-zsh-4.0.7
index c076f179c533..a1375aa35815 100644
--- a/app-shells/zsh/files/digest-zsh-4.0.7
+++ b/app-shells/zsh/files/digest-zsh-4.0.7
@@ -1,3 +1,2 @@
 MD5 85915f723384062480f1890b6625b6d5 zsh-4.0.7.tar.gz 2179033
 MD5 633926a0afe584878d1c3068346e9d69 zsh_4.0.7-5.diff.gz 69299
-MD5 7b9bc01fa3082c92bfab555b83548f5e zsh-4.0.7-zshall-gentoo.diff.bz2 162578
diff --git a/app-shells/zsh/files/digest-zsh-4.1.1 b/app-shells/zsh/files/digest-zsh-4.1.1
index 6e1d38cfb35c..8cce53db48a1 100644
--- a/app-shells/zsh/files/digest-zsh-4.1.1
+++ b/app-shells/zsh/files/digest-zsh-4.1.1
@@ -1,3 +1,2 @@
 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 b2fa455237a6..90b861909b47 100644
--- a/app-shells/zsh/zsh-4.0.7.ebuild
+++ b/app-shells/zsh/zsh-4.0.7.ebuild
@@ -1,30 +1,34 @@
 # 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.2 2003/07/23 20:21:36 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.0.7.ebuild,v 1.3 2003/07/24 13:06:10 usata Exp $
 
-IUSE="maildir ncurses"
+inherit eutils
+
+IUSE="maildir ncurses static"
 
 DESCRIPTION="UNIX Shell similar to the Korn shell"
 HOMEPAGE="http://www.zsh.org/"
 
 MYPATCH="${P/-/_}-5.diff"
-# 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.gz
-	 http://ftp.debian.org/debian/pool/main/z/${PN}/${MYPATCH}.gz
-	 http://dev.gentoo.org/~usata/distfiles/${ZSHALL}.bz2"
+	 http://ftp.debian.org/debian/pool/main/z/${PN}/${MYPATCH}.gz"
 
 SLOT="0"
 LICENSE="ZSH"
 KEYWORDS="~x86 ~alpha ~ppc ~sparc"
 
-DEPEND="ncurses? ( >=sys-libs/ncurses-5.1 )"
+DEPEND="sys-apps/groff
+	ncurses? ( >=sys-libs/ncurses-5.1 )"
+RDEPEND="ncurses? ( >=sys-libs/ncurses-5.1 )"
 
 src_unpack() {
 	unpack ${A}
 	epatch ${MYPATCH}
-	epatch ${ZSHALL}
+	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() {
@@ -32,6 +36,8 @@ src_compile() {
 
 	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 \
@@ -45,6 +51,7 @@ src_compile() {
 		--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"
diff --git a/app-shells/zsh/zsh-4.1.1.ebuild b/app-shells/zsh/zsh-4.1.1.ebuild
index 456f77e61e76..43b76ec326ee 100644
--- a/app-shells/zsh/zsh-4.1.1.ebuild
+++ b/app-shells/zsh/zsh-4.1.1.ebuild
@@ -1,30 +1,36 @@
 # 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 $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.1.1.ebuild,v 1.2 2003/07/24 13:06:10 usata Exp $
 
-IUSE="maildir ncurses"
+inherit eutils
+
+IUSE="cjk maildir ncurses static"
 
 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 )"
+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
-	epatch ${DISTDIR}/${ZSHALL}.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() {
@@ -32,6 +38,8 @@ src_compile() {
 
 	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 \
@@ -45,6 +53,7 @@ src_compile() {
 		--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"