summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMamoru Komachi <usata@gentoo.org>2003-08-27 19:12:01 +0000
committerMamoru Komachi <usata@gentoo.org>2003-08-27 19:12:01 +0000
commitcccc3783f7fc1219caa4e9b3dbfe7353a3391d76 (patch)
tree8d84cb11fc6483199c4f27ee69fd385bb7937f22 /app-shells/zsh
parentlink all modules statically when USE="static" (diff)
downloadgentoo-2-cccc3783f7fc1219caa4e9b3dbfe7353a3391d76.tar.gz
gentoo-2-cccc3783f7fc1219caa4e9b3dbfe7353a3391d76.tar.bz2
gentoo-2-cccc3783f7fc1219caa4e9b3dbfe7353a3391d76.zip
link all modules statically when USE="static"
Diffstat (limited to 'app-shells/zsh')
-rw-r--r--app-shells/zsh/ChangeLog9
-rw-r--r--app-shells/zsh/Manifest5
-rw-r--r--app-shells/zsh/files/digest-zsh-4.1.1-r12
-rw-r--r--app-shells/zsh/files/zsh-4.1.1-gentoo.diff12
-rw-r--r--app-shells/zsh/zsh-4.1.1-r1.ebuild110
5 files changed, 135 insertions, 3 deletions
diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index 5a86ca1abdca..99dcf550b8b2 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,13 @@
# 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.26 2003/08/20 10:21:40 usata Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.27 2003/08/27 19:11:53 usata Exp $
+
+*zsh-4.1.1-r1 (28 Aug 2003)
+
+ 28 Aug 2003; Mamoru KOMACHI <usata@gentoo.org> zsh-4.1.1-r1.ebuild,
+ files/zsh-4.1.1-gentoo.diff:
+ Compiles all zsh modules in when USE="static". Added libcap to DEPEND.
+ See Bug #27392 comment #4
*zsh-4.1.1 (24 Jul 2003)
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index 3b9ea84276af..75b6307a9ce7 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,11 +1,11 @@
-MD5 2537b99d496bcd076140921428398581 ChangeLog 5166
+MD5 4bc993604c525f7a6520c3335a50e718 ChangeLog 5399
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 b1b9d882c288cff8693fd7b11aaa3f9d zsh-4.1.0_pre7.ebuild 2019
MD5 3f7eb5c690643e7bd3d696f4379ffca6 zsh-4.0.7.ebuild 2325
MD5 c002d6fcc955fd7613d01424739323f7 zsh-4.1.1.ebuild 2777
-MD5 96776075138668930bada49db03f27d9 zsh-4.1.1-r1.ebuild 2955
+MD5 527f996fa0931da174b94985cb61e9f7 zsh-4.1.1-r1.ebuild 2993
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
@@ -15,3 +15,4 @@ MD5 64023b41a9987655e0e014d32562cfad files/zprofile 404
MD5 05078d5709e9fc4be1eb5bbedadb185d files/digest-zsh-4.0.7 125
MD5 4823f16213517c590b1e624afe52271d files/digest-zsh-4.1.1 132
MD5 4823f16213517c590b1e624afe52271d files/digest-zsh-4.1.1-r1 132
+MD5 f83ccd2b6f1cd3e75c910c48159892f5 files/zsh-4.1.1-gentoo.diff 488
diff --git a/app-shells/zsh/files/digest-zsh-4.1.1-r1 b/app-shells/zsh/files/digest-zsh-4.1.1-r1
new file mode 100644
index 000000000000..8cce53db48a1
--- /dev/null
+++ b/app-shells/zsh/files/digest-zsh-4.1.1-r1
@@ -0,0 +1,2 @@
+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/files/zsh-4.1.1-gentoo.diff b/app-shells/zsh/files/zsh-4.1.1-gentoo.diff
new file mode 100644
index 000000000000..c52e184c8bee
--- /dev/null
+++ b/app-shells/zsh/files/zsh-4.1.1-gentoo.diff
@@ -0,0 +1,12 @@
+diff -urN zsh-4.1.1.old/Src/mkbltnmlst.sh zsh-4.1.1/Src/mkbltnmlst.sh
+--- zsh-4.1.1.old/Src/mkbltnmlst.sh 2002-10-16 02:59:58.000000000 +0900
++++ zsh-4.1.1/Src/mkbltnmlst.sh 2003-08-27 22:45:49.000000000 +0900
+@@ -54,7 +54,7 @@
+ echo " add_autoparam(\"$param\", \"$x_mod\");"
+ done
+ for mfunc in $automathfuncs; do
+- echo " add_automath(\"$mfunc\", \"$x_mod\");"
++ echo " add_automathfunc(\"$mfunc\", \"$x_mod\");"
+ done
+ echo " }"
+ for dep in $moddeps; do
diff --git a/app-shells/zsh/zsh-4.1.1-r1.ebuild b/app-shells/zsh/zsh-4.1.1-r1.ebuild
new file mode 100644
index 000000000000..cb465aa1e05f
--- /dev/null
+++ b/app-shells/zsh/zsh-4.1.1-r1.ebuild
@@ -0,0 +1,110 @@
+# 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-r1.ebuild,v 1.1 2003/08/27 19:11:53 usata 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
+ >=sys-apps/sed-4
+ sys-libs/libcap
+ ncurses? ( >=sys-libs/ncurses-5.1 )"
+RDEPEND=">=dev-libs/libpcre-3.9
+ sys-libs/libcap
+ ncurses? ( >=sys-libs/ncurses-5.1 )"
+
+src_unpack() {
+ unpack ${P}.tar.bz2
+ cd ${S}
+ epatch ${FILESDIR}/${P}-gentoo.diff
+ 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"
+
+ if [ -n "`use static`" ] ; then
+ sed -i -e "s/link=no/link=static/g" \
+ -e "s/load=no/load=yes/g" config.modules
+ fi
+
+ # 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
+}