Version bumped. Added cap IUSE flag. Included Gentoo prompt contributed by Tobias Minich <belgabor@gmx.de>. See bug #43753

6 files changed, 89 insertions, 18 deletions

diff --git a/app-shells/zsh/ChangeLog b/app-shells/zsh/ChangeLog
index 90b0d93988d9..793443af6025 100644
--- a/app-shells/zsh/ChangeLog
+++ b/app-shells/zsh/ChangeLog
@@ -1,6 +1,13 @@
 # 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.42 2004/03/05 23:59:35 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/ChangeLog,v 1.43 2004/03/12 20:26:48 usata Exp $
+
+*zsh-4.2.0_pre4 (13 Mar 2004)
+
+  13 Mar 2004; Mamoru KOMACHI <usata@gentoo.org> zsh-4.2.0_pre3.ebuild,
+  zsh-4.2.0_pre4.ebuild, files/prompt_gentoo_setup:
+  Version bumped. Added cap IUSE flag. Included Gentoo prompt
+  contributed by Tobias Minich <belgabor@gmx.de>. See bug #43753
 
 *zsh-4.2.0_pre3 (06 Mar 2004)
 
diff --git a/app-shells/zsh/Manifest b/app-shells/zsh/Manifest
index c75cdd170454..9aa2cdca2640 100644
--- a/app-shells/zsh/Manifest
+++ b/app-shells/zsh/Manifest
@@ -1,18 +1,19 @@
-MD5 7fc9fe127368b49989e3173c17f1fb0d zsh-4.2.0_pre3.ebuild 3302
-MD5 0c1d77e92495ecb2290575dfa560bcd1 zsh-4.0.9-r2.ebuild 2628
-MD5 72158f8fc839395bf4c6ef0c6cbe969a zsh-4.1.1-r5.ebuild 3374
-MD5 219f19ba1e213dd846d6e778dbb10238 zsh-4.1.1-r4.ebuild 3324
 MD5 dd83200a4e5fdc8a009d36aed577a2ce zsh-4.0.9-r3.ebuild 2667
+MD5 72158f8fc839395bf4c6ef0c6cbe969a zsh-4.1.1-r5.ebuild 3374
 MD5 dffc91dcca0a7bfaae0939f3cc69f8c5 ChangeLog 8069
 MD5 28ed8ea6cdccb353e2e8ad783eb51f5b metadata.xml 506
-MD5 81e325aacd554d2c5f6d14efe45d1ffd files/zsh-strncmp.diff 354
+MD5 318131ecb8e520de0024de9051a1f39a zsh-4.2.0_pre4.ebuild 3355
+MD5 0c1d77e92495ecb2290575dfa560bcd1 zsh-4.0.9-r2.ebuild 2628
+MD5 219f19ba1e213dd846d6e778dbb10238 zsh-4.1.1-r4.ebuild 3324
 MD5 2aa47fce01c92a0cc7e070f04018ac93 files/_portage 7539
-MD5 de58f149f41740c394800ba8d2cdf361 files/digest-zsh-4.0.9-r2 199
 MD5 de58f149f41740c394800ba8d2cdf361 files/digest-zsh-4.0.9-r3 199
-MD5 1a527b6a4700642b4742d9cc8de90285 files/digest-zsh-4.1.1-r4 199
+MD5 d401be6503fc2e34341d56e99ee25e94 files/_portage-20040204 10954
 MD5 1a527b6a4700642b4742d9cc8de90285 files/digest-zsh-4.1.1-r5 199
 MD5 f83ccd2b6f1cd3e75c910c48159892f5 files/zsh-4.1.1-gentoo.diff 488
 MD5 64023b41a9987655e0e014d32562cfad files/zprofile 404
-MD5 60e5f3263a8224ce242027f8aa2f40a5 files/digest-zsh-4.2.0_pre3 142
 MD5 de0db046f0f40cb1cc3cd3f6e6b2645a files/zshenv 318
-MD5 d401be6503fc2e34341d56e99ee25e94 files/_portage-20040204 10954
+MD5 81e325aacd554d2c5f6d14efe45d1ffd files/zsh-strncmp.diff 354
+MD5 dbe4a7b741370a40c472b6a6ada3ccd1 files/digest-zsh-4.2.0_pre4 142
+MD5 de58f149f41740c394800ba8d2cdf361 files/digest-zsh-4.0.9-r2 199
+MD5 1a527b6a4700642b4742d9cc8de90285 files/digest-zsh-4.1.1-r4 199
+MD5 60e5f3263a8224ce242027f8aa2f40a5 files/digest-zsh-4.2.0_pre3 142
diff --git a/app-shells/zsh/files/digest-zsh-4.2.0_pre3 b/app-shells/zsh/files/digest-zsh-4.2.0_pre3
deleted file mode 100644
index 0f314df622fa..000000000000
--- a/app-shells/zsh/files/digest-zsh-4.2.0_pre3
+++ /dev/null
@@ -1,2 +0,0 @@
-MD5 a5fac8f614d07134275d92270a036599 zsh-4.2.0-pre-3.tar.bz2 1987033
-MD5 fba926eeda8e362722fc169ea134ff46 zsh-4.2.0-pre-3-doc.tar.bz2 1610143
diff --git a/app-shells/zsh/files/digest-zsh-4.2.0_pre4 b/app-shells/zsh/files/digest-zsh-4.2.0_pre4
new file mode 100644
index 000000000000..c85cd8352c6d
--- /dev/null
+++ b/app-shells/zsh/files/digest-zsh-4.2.0_pre4
@@ -0,0 +1,2 @@
+MD5 8a7d84440a3516e8b47eb6af69cc7d61 zsh-4.2.0-pre-4.tar.bz2 1987963
+MD5 9654783291596a37d667bd55a51f6c65 zsh-4.2.0-pre-4-doc.tar.bz2 1694578
diff --git a/app-shells/zsh/files/prompt_gentoo_setup b/app-shells/zsh/files/prompt_gentoo_setup
new file mode 100644
index 000000000000..ba5a69e27145
--- /dev/null
+++ b/app-shells/zsh/files/prompt_gentoo_setup
@@ -0,0 +1,52 @@
+# gentoo prompt theme
+
+prompt_gentoo_help () {
+  cat <<'EOF'
+This prompt is color-scheme-able.  You can invoke it thus:
+
+  prompt gentoo [<promptcolor> [<usercolor> [<rootcolor>]]]
+
+EOF
+}
+
+prompt_gentoo_setup () {
+  prompt_gentoo_prompt=${1:-'blue'}
+  prompt_gentoo_user=${2:-'green'}
+  prompt_gentoo_root=${3:-'red'}
+
+  if [ `/usr/bin/whoami` = 'root' ]
+  then
+    base_prompt="%{$fg_bold[$prompt_gentoo_root]%}%m%{$reset_color%} "
+  else
+    base_prompt="%{$fg_bold[$prompt_gentoo_user]%}%n@%m%{$reset_color%} "
+  fi
+  post_prompt="%{$reset_color%}"
+
+  base_prompt_no_color=$(echo "$base_prompt" | perl -pe "s/%{.*?%}//g")
+  post_prompt_no_color=$(echo "$post_prompt" | perl -pe "s/%{.*?%}//g")
+
+  precmd  () { prompt_gentoo_precmd }
+  preexec () { }
+}
+
+prompt_gentoo_precmd () {
+  setopt noxtrace localoptions
+  local base_prompt_expanded_no_color base_prompt_etc
+  local prompt_length space_left
+
+  base_prompt_expanded_no_color=$(print -P "$base_prompt_no_color")
+  base_prompt_etc=$(print -P "$base_prompt%(4~|...|)%3~")
+  prompt_length=${#base_prompt_etc}
+#  if [[ $prompt_length -lt 40 ]]; then
+#    path_prompt="%{$fg_bold[$prompt_adam1_color2]%}%(4~|...|)%3~%{$fg_bold[white]%}"
+#  else
+#    space_left=$(( $COLUMNS - $#base_prompt_expanded_no_color - 2 ))
+#    path_prompt="%{$fg_bold[$prompt_adam1_color3]%}%${space_left}<...<%~$prompt_newline%{$fg_bold_white%}"
+#  fi
+  path_prompt="%{$fg_bold[$prompt_gentoo_prompt]%}%1/"
+  PS1="$base_prompt$path_prompt %(0#.#.$) $post_prompt"
+  PS2="$base_prompt$path_prompt %_> $post_prompt"
+  PS3="$base_prompt$path_prompt ?# $post_prompt"
+}
+
+prompt_gentoo_setup "$@"
diff --git a/app-shells/zsh/zsh-4.2.0_pre3.ebuild b/app-shells/zsh/zsh-4.2.0_pre4.ebuild
index e9be3667321f..b2b4cb72f760 100644
--- a/app-shells/zsh/zsh-4.2.0_pre3.ebuild
+++ b/app-shells/zsh/zsh-4.2.0_pre4.ebuild
@@ -1,8 +1,8 @@
 # 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_pre3.ebuild,v 1.1 2004/03/05 23:59:40 pyrania Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/zsh/zsh-4.2.0_pre4.ebuild,v 1.1 2004/03/12 20:26:49 usata Exp $
 
-IUSE="maildir ncurses static doc pcre"
+IUSE="maildir ncurses static doc pcre cap"
 
 DESCRIPTION="UNIX Shell similar to the Korn shell"
 HOMEPAGE="http://www.zsh.org/"
@@ -21,7 +21,7 @@ DEPEND="sys-apps/groff
 	>=sys-apps/sed-4
 	${RDEPEND}"
 RDEPEND="pcre? ( >=dev-libs/libpcre-3.9 )
-	sys-libs/libcap
+	cap? ( sys-libs/libcap )
 	ncurses? ( >=sys-libs/ncurses-5.1 )"
 
 S="${WORKDIR}/${MY_P}"
@@ -39,11 +39,8 @@ src_unpack() {
 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 \
@@ -58,6 +55,10 @@ src_compile() {
 		--enable-site-fndir=/usr/share/zsh/site-functions \
 		--enable-function-subdirs \
 		--enable-ldflags="${LDFLAGS}" \
+		`use_with ncurses curses-terminfo` \
+		`use_enable maildir maildir-support` \
+		`use_enable pcre` \
+		`use_enable cap` \
 		${myconf} || die "configure failed"
 
 	if [ -n "`use static`" ] ; then
@@ -91,6 +92,8 @@ src_install() {
 	keepdir /usr/share/zsh/site-functions
 	insinto /usr/share/zsh/site-functions
 	newins ${FILESDIR}/_portage-${MYDATE} _portage
+	insinto /usr/share/zsh/${PV}/functions/Prompts
+	doins ${FILESDIR}/prompt_gentoo_setup
 
 	dodoc ChangeLog* META-FAQ README INSTALL LICENCE config.modules
 
@@ -115,6 +118,14 @@ pkg_preinst() {
 
 pkg_postinst() {
 
+	einfo
+	einfo "If you want to enable Portage completion and Gentoo prompt,"
+	einfo "add"
+	einfo "	autoload -U compinit promptinit"
+	einfo "	compinit"
+	einfo "	promptinit; prompt gentoo"
+	einfo "to your ~/.zshrc"
+	einfo
 	# see Bug 26776
 	ewarn
 	ewarn "If you are upgrading from zsh-4.0.x you may need to"