[arch-commits] Commit in zsh/repos (6 files)

[Allan McRae]

    Date: Wednesday, February 8, 2012 @ 19:00:29
  Author: allan
Revision: 149694

db-move: moved zsh from [staging] to [testing] (i686)

Added:
  zsh/repos/testing-i686/
  zsh/repos/testing-i686/PKGBUILD
    (from rev 149641, zsh/repos/staging-i686/PKGBUILD)
  zsh/repos/testing-i686/svn-1.7.patch
    (from rev 149641, zsh/repos/staging-i686/svn-1.7.patch)
  zsh/repos/testing-i686/zprofile
    (from rev 149641, zsh/repos/staging-i686/zprofile)
  zsh/repos/testing-i686/zsh.install
    (from rev 149641, zsh/repos/staging-i686/zsh.install)
Deleted:
  zsh/repos/staging-i686/

---------------+
 PKGBUILD      |   61 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 svn-1.7.patch |   34 +++++++++++++++++++++++++++++++
 zprofile      |    1 
 zsh.install   |   11 ++++++++++
 4 files changed, 107 insertions(+)

Copied: zsh/repos/testing-i686/PKGBUILD (from rev 149641, zsh/repos/staging-i686/PKGBUILD)
===================================================================
--- testing-i686/PKGBUILD	                        (rev 0)
+++ testing-i686/PKGBUILD	2012-02-09 00:00:29 UTC (rev 149694)
@@ -0,0 +1,61 @@
+# $Id$
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+
+pkgname=zsh
+pkgver=4.3.15
+pkgrel=3
+pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX'
+arch=('i686' 'x86_64')
+url='http://www.zsh.org/'
+license=('custom')
+depends=('pcre' 'libcap' 'gdbm')
+install=zsh.install
+source=("ftp://ftp.zsh.org/pub/${pkgname}-${pkgver}.tar.bz2"
+        'zprofile' 'svn-1.7.patch')
+backup=('etc/zsh/zprofile')
+md5sums=('11766b0dd674a513810903cd33ffcac4'
+         '24a9335edf77252a7b5f52e079f7aef7'
+         '4fcbc119fdb624a8c483a278f3a82efd')
+
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	patch -p1 -i "${srcdir}/svn-1.7.patch"
+	# FS#16360
+	sed -i 's/init.d/rc.d/g' Doc/Zsh/compsys.yo \
+				 Doc/zsh.texi \
+				 Completion/Unix/Type/_services \
+				 Completion/Unix/Command/_init_d
+	./configure --prefix=/usr \
+		--bindir=/bin \
+		--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-maildir-support \
+		--with-term-lib='ncursesw' \
+		--enable-multibyte \
+		--enable-function-subdirs \
+		--enable-fndir=/usr/share/zsh/functions \
+		--enable-scriptdir=/usr/share/zsh/scripts \
+		--with-tcsetpgrp \
+		--enable-pcre \
+		--enable-cap \
+		--enable-zsh-secure-free
+	make
+}
+
+check() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	# This test wont work with the noatime mount option
+	rm Test/C02cond.ztst
+	HOME="${srcdir}" make check
+}
+
+package() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
+	make DESTDIR="${pkgdir}/" install
+	install -D -m644 "${srcdir}/zprofile" "${pkgdir}/etc/zsh/zprofile"
+	install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}

Copied: zsh/repos/testing-i686/svn-1.7.patch (from rev 149641, zsh/repos/staging-i686/svn-1.7.patch)
===================================================================
--- testing-i686/svn-1.7.patch	                        (rev 0)
+++ testing-i686/svn-1.7.patch	2012-02-09 00:00:29 UTC (rev 149694)
@@ -0,0 +1,34 @@
+diff --git a/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn b/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn
+index b1cb730..41cc3e7 100644
+--- a/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn
++++ b/Functions/VCS_Info/Backends/VCS_INFO_get_data_svn
+@@ -6,12 +6,28 @@
+ 
+ setopt localoptions noksharrays extendedglob NO_shwordsplit
+ local svnbase svnbranch a b rrn
++local -i rc
+ local -A svninfo parentinfo
+ local -xA hook_com
+ 
+ svnbase=".";
+ svninfo=()
+-${vcs_comm[cmd]} info --non-interactive | while IFS=: read a b; do svninfo[${a// /_}]="${b## #}"; done
++# Unfortunately, `$pipestatus' is broken currently. Until that problem is
++# resolved, here is a workaround that will get things done, without using it.
++# Clumsily, but that's life.
++local -a dat
++dat=( ${(f)"$(${vcs_comm[cmd]} info --non-interactive 2>&1)"} )
++rc=$?
++(( rc != 0 )) && return 1
++# The following line is the real code, the following is the workaround.
++#${vcs_comm[cmd]} info --non-interactive \
++print -l "${dat[@]}" \
++|& while IFS=: read a b; do
++    svninfo[${a// /_}]="${b## #}"
++done
++#rc=${pipestatus[1]}
++#(( rc != 0 )) && return 1
++
+ while [[ -d "${svnbase}/../.svn" ]]; do
+     parentinfo=()
+     ${vcs_comm[cmd]} info --non-interactive "${svnbase}/.." | while IFS=: read a b; do parentinfo[${a// /_}]="${b## #}"; done

Copied: zsh/repos/testing-i686/zprofile (from rev 149641, zsh/repos/staging-i686/zprofile)
===================================================================
--- testing-i686/zprofile	                        (rev 0)
+++ testing-i686/zprofile	2012-02-09 00:00:29 UTC (rev 149694)
@@ -0,0 +1 @@
+emulate sh -c 'source /etc/profile'

Copied: zsh/repos/testing-i686/zsh.install (from rev 149641, zsh/repos/staging-i686/zsh.install)
===================================================================
--- testing-i686/zsh.install	                        (rev 0)
+++ testing-i686/zsh.install	2012-02-09 00:00:29 UTC (rev 149694)
@@ -0,0 +1,11 @@
+post_install() {
+	grep -q '/bin/zsh' etc/shells || echo '/bin/zsh' >> etc/shells
+}
+
+post_upgrade() {
+	post_install
+}
+
+pre_remove() {
+	sed -i '/^\/bin\/zsh/d' etc/shells
+}