Version bumped. Added doc IUSE flag and completion function for emerge. Special thanks to baptux <bapt@ifrance.com>, see bug #33130

6 files changed, 384 insertions, 4 deletions

diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index a214a33a5974..2f40bfffa205 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,12 +1,12 @@
 MD5 1d5c1b96cb88592470a3e8ca75c5023c zsh-4.0.7-r1.ebuild 2319
-MD5 ec77acc0da6897a1572d481fc41581ad zsh-4.0.9.ebuild 2474
+MD5 b2711777ec7c828dd5b221713b736bea zsh-4.0.9.ebuild 2469
 MD5 5cf00f1ef79600ac8d511a3869496a5b zsh-4.1.1-r2.ebuild 3058
-MD5 9296f34949e19b532e2d66b145138a08 ChangeLog 6506
+MD5 eb1bca67b072920030c99ca7c1e933a5 ChangeLog 6544
 MD5 28ed8ea6cdccb353e2e8ad783eb51f5b metadata.xml 506
 MD5 853d5de501d54c03e6d46803b4520406 zsh-4.0.7.ebuild 2310
 MD5 06b4af9bb148700999041e5305299e4b zsh-4.1.1-r1.ebuild 2853
-MD5 279862df196a003bba25ad811423a98d zsh-4.1.1-r3.ebuild 3310
-MD5 3e7e5e7c5e5ad87fe0f2bd71534adbe8 files/_portage 6933
+MD5 1035e31205100fdde7da00acb820ecdd zsh-4.1.1-r3.ebuild 3307
+MD5 ac432d44650484450793159dce1bdce6 files/_portage 6923
 MD5 69b64f833140e51ce26127a2336e7766 files/digest-zsh-4.0.7-r1 127
 MD5 4823f16213517c590b1e624afe52271d files/digest-zsh-4.1.1-r1 132
 MD5 4823f16213517c590b1e624afe52271d files/digest-zsh-4.1.1-r2 132
diff --git a/app-shells/zsh/files/_portage b/app-shells/zsh/files/_portage
new file mode 100644
index 000000000000..688abda0ca12
--- /dev/null
+++ b/app-shells/zsh/files/_portage
@@ -0,0 +1,158 @@
+#compdef emerge
+
+# $Id: _portage,v 1.1 2003/12/28 19:51:46 usata Exp $
+
+# ZSH completion function for emerge
+# Author: baptux <bapt@ifrance.com>
+# Author: Mamoru KOMACHI <usata@gentoo.org>
+
+_emerge () {
+    local state
+    if (( CURRENT == 2 ));then
+        _arguments -s \
+            '*:*:->actions' \
+            "$common_args[@]" "$install_args[@]" && return 0
+    elif (( CURRENT > 2 ));then
+        case "$words[2]" in
+	    unmerge|-C)
+		_arguments -s \
+		    '*:installed pkg:_portage_unmerge' "$common_args[@]" && return 0
+		;;
+	    --usepkgonly|-K)
+		_arguments -s \
+		    '*:use package only:_portage_tbz2list' "$common_args[@]" && return 0
+		;;
+	    clean|depclean|-c|help|-h|info|regen|sync|rsync|--searchdesc|-S|search|-s|inject|-j|prune|-P)
+		;;
+	    *)
+		_arguments -s \
+		    '*:*:->install_portage' \
+		    "$common_args[@]" \
+		    "$install_args[@]" && return 0
+		;;
+        esac
+    fi
+    while [[ -n "$state" ]]; do
+        lstate=$state
+        state=''
+        case "$lstate" in
+	    actions)
+		_alternative \
+		    ':emerge actions:_actions' \
+		    '*:portage:_portage_pkglist'
+		;;
+	    install_portage)
+		_alternative \
+		    '*:portage:_portage_pkglist'
+		;;
+        esac
+    done
+}
+
+#Function to show only installed packages "cat/name"
+_portage_unmerge(){
+    installed_portage=(/var/db/pkg/*-*/*)
+    installed_dir=/var/db/pkg/
+    installed_pkg=${installed_portage//$installed_dir/}
+    _tags -s installed_pkg && { compadd "$@" -k installed_pkg || compadd "$@" ${(kv)=installed_pkg} }
+}
+
+#Function to show tbz2 files available
+_portage_tbz2list() {
+    # this doesn't take care of ${PORTAGE_BINHOST}. If Gentoo official
+    # binary mirror will be available we should rewrite it accordingly.
+    _path_files -g \*.tbz2 -W "${pkgdir}/All"
+}
+
+#Function to show all available portage names
+_portage_pkglist(){
+    portage_classlist="world system"
+    portage_pkglist="$portage_pkglist ${portage_classlist}"
+    _tags -s portage_pkglist && { compadd "$@" -k portage_pkglist || compadd "$@" ${(kv)=portage_pkglist} }
+    _path_files -/ -W "${portdir}"
+    # XXX: If I add ${portdir_overlay} category completion won't work properly
+    #[[ -n "${portdir_overlay}" ]] && _path_files -/ -W "${portdir_overlay}"
+    _path_files -g \*.ebuild
+}
+
+common_args=(
+    {'(-p)--pretend','(--pretend)-p'}'[simply  display  what would be done]'
+    {'(-d)--debug','(--debug)-d'}'[Tells emerge to run the emerge command in debug mode]'
+)
+install_args=(
+    {'(--upgradeonly -U --update -u --quiet -q --onlydeps -o --oneshot --nospinner --noreplace -n --nodeps -O --noconfmem -D --deep --changelog --buildpkg -B -b --buildpkgonly --emptytree -e -f --fetchonly)-l','(--upgradeonly -U --update -u --quiet -q --onlydeps -o --nospinner --noreplace -n --nodeps -O --noconfmem -D --deep --emptytree -e -f --fetchonly -l --buildpkg -b -B --buildpkgonly )--changelog'}'[This will show the ChangeLog]'
+    {'(-b --buildpkgonly -B --changelog -l)--buildpkg','(--changelog -l --buildpkg --buildpkgonly -B)-b'}'[Tells emerge to build binary packages]'
+    {'(-B -b --buildpkg --changelog -l)--buildpkgonly','(--changelog -l --buildpkgonly --buildpkg -b)-B'}'[Tells emerge to only build binary packages]'
+    {'(-D --changelog -l)--deep','(-l --changelog --deep)-D'}'[Consider the entire dependency tree of packages]'
+    {'(-e -l --changelog)--emptytree','(--emptytree -l --changelog)-e'}'[Only consider glibc as installed packages]'
+    {'(-f -l --changelog)--fetchonly','(-l --changelog --fetchonly)-f'}'[Just perform fetches for all packages]'
+    '(-l --changelog)--noconfmem[Causes portage to disregard merge records]'
+    {'(--changelog -l -O)--nodeps','(--nodeps --changelog -l)-O'}'[Merges specified packages without merging dependencies]'
+    {'(-l --changelog -n)--noreplace','(-l --changelog --noreplace)-n'}'[Skip packages already installed]'
+    '(-l --changelog)--nospiner[Disables the spinner for the session]'
+    '(-l --changelog)--oneshot[Do not add package to the world profile]'
+    {'(--onlydeps --changelog -l)-o','(--changelog -o -l)--onlydeps'}'[Only merge (or pretend to merge) the dependencies]'
+    {'(--quiet --changelog -l)-q','(-q --changelog -l)--quiet'}'[General outcome is a reduced or condensed output]'
+    {'(--update --changelog -l)-u','(-u --changelog -l)--update'}'[Updates packages to the most recent version available]'
+    {'(--upgradeonly --changelog -l)-U','(-U --changelog -l)--upgradeonly'}'[Do not update packages to a lower version]'
+    {'(--usepkg --changelog -l)-k','(-k --changelog -l)--usepkg'}'[Tells emerge to use binary packages if available]'
+    {'(--usepkgonly --changelog -l)-K','(-K --changelog -l)--usepkgonly'}'[Tells emerge to use binary packages only]'
+    {'(--verbose)-v','(-v)--verbose'}'[Tell emerge to run in verbose mode]'
+    '(-p --pretend)--columns[Displays versions in aligned format]'
+    '--resume[Resumes the last merge operation]'
+    '--skipfirst[Removes the first package in the resume list]'
+)
+
+_options() {
+    _arguments -s \
+	"$unmerge_args[@]" "$common_args[@]" "$install_args[@]"
+}
+
+_actions() {
+    _values "emerge actions" \
+	'sync[Initiates a portage tree update]' \
+	'rsync[Initiates a portage tree update]' \
+	'unmerge[Removes all matching packages]' \
+	'search[Searches for matches]' \
+	'regen[Causes portage to check and update the dependency cache]' \
+	'prune[Removes all but the latest versions of matching packages]' \
+	'inject[Portage thinks that this package is installed]' \
+	'info[This is a list of information to include in bug reports]' \
+	'help[Displays help]' \
+	'depclean[Clean all packages that have no reason for being installed]'\
+	'clean[Cleans the system by removing packages]' \
+	'-c[Cleans the system by removing packages]' \
+	'-h[Displays help]' \
+	'-i[Portage thinks that this package is installed]' \
+	'-P[Removes all but the latest versions of matching packages]' \
+	'-s[Searches for matches]' \
+	'-S[Matches the search string against the description field]' \
+	'--searchdesc[Matches the search string against the description field]' \
+	'-C[Removes all matching packages]' \
+	'world[Represent all packages in the world profiles]' \
+	'system[Represent all the system packages]' 
+}
+
+#Reading informations from make.conf
+[[ -n "${PORTDIR}" ]] && portdir="${PORTDIR}"
+[[ -n "${PKGDIR}" ]] && pkgdir="${PKGDIR}"
+if [[ -n "${PORTDIR_OVERLAY}" ]] ; then
+    for overlay in ${=PORTDIR_OVERLAY} ; do
+	portdir_overlay=(${overlay} ${portdir_overlay})
+    done
+fi
+[[ -r /etc/make.globals ]] && source /etc/make.globals
+[[ -r /etc/make.conf ]] && source /etc/make.conf
+
+[[ -z "${portdir}" ]] && portdir="${PORTDIR}"
+[[ -z "${pkgdir}" ]] && pkgdir="${PKGDIR}"
+if [[ -z "${portdir_overlay}" ]] ; then
+    for overlay in ${=PORTDIR_OVERLAY} ; do
+	portdir_overlay=(${overlay} ${portdir_overlay})
+    done
+fi
+
+portage_pkglist=(${portdir}/*-*/* ${portdir_overlay}/*-*/*)
+portage_pkglist=(${portage_pkglist##*/})
+
+_emerge "$@"
diff --git a/app-shells/zsh/files/digest-zsh-4.0.9 b/app-shells/zsh/files/digest-zsh-4.0.9
new file mode 100644
index 000000000000..3f2f647305f6
--- /dev/null
+++ b/app-shells/zsh/files/digest-zsh-4.0.9
@@ -0,0 +1,2 @@
+MD5 26cc0f9051ba41063e950723246dfaa8 zsh-4.0.9.tar.bz2 1749802
+MD5 f7032dd0a992cba7bb903ab90a9ca667 zsh-4.0.9-doc.tar.bz2 1411985
diff --git a/app-shells/zsh/files/digest-zsh-4.1.1-r3 b/app-shells/zsh/files/digest-zsh-4.1.1-r3
new file mode 100644
index 000000000000..f9bbd87c4098
--- /dev/null
+++ b/app-shells/zsh/files/digest-zsh-4.1.1-r3
@@ -0,0 +1,3 @@
+MD5 48958b1a3fc86261a26eea40a4f7d4af zsh-4.1.1.tar.bz2 1924514
+MD5 a4fb455591ee95e5264bf985af3473ea zsh-4.1.1-euc-0.2.patch.gz 2788
+MD5 3ec54fa702b9a5c5209b56c2c8ed6a88 zsh-4.1.1-doc.tar.bz2 1572953
diff --git a/app-shells/zsh/zsh-4.0.9.ebuild b/app-shells/zsh/zsh-4.0.9.ebuild
new file mode 100644
index 000000000000..d3e3ad24cbed
--- /dev/null
+++ b/app-shells/zsh/zsh-4.0.9.ebuild
@@ -0,0 +1,93 @@
+# 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.9.ebuild,v 1.1 2003/12/28 19:51:46 usata Exp $
+
+IUSE="maildir ncurses static doc"
+
+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 )"
+
+SLOT="0"
+LICENSE="ZSH"
+KEYWORDS="~x86 ~alpha ~ppc ~sparc"
+
+DEPEND="virtual/glibc
+	sys-apps/groff
+	${RDEPEND}"
+RDEPEND="ncurses? ( >=sys-libs/ncurses-5.1 )"
+
+src_unpack() {
+	unpack ${A}
+	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"
+	# 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 /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-r3.ebuild b/app-shells/zsh/zsh-4.1.1-r3.ebuild
new file mode 100644
index 000000000000..c6f2d62dba27
--- /dev/null
+++ b/app-shells/zsh/zsh-4.1.1-r3.ebuild
@@ -0,0 +1,124 @@
+# 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-r3.ebuild,v 1.1 2003/12/28 19:51:46 usata Exp $
+
+inherit eutils
+
+IUSE="cjk maildir ncurses static doc"
+
+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 )
+	doc? ( ftp://ftp.zsh.org/pub/${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=">=dev-libs/libpcre-3.9
+	sys-libs/libcap
+	ncurses? ( >=sys-libs/ncurses-5.1 )"
+
+src_unpack() {
+	unpack ${P}.tar.bz2
+	use doc && unpack ${P}-doc.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
+		# 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
+	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 /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
+}