Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/asciijump/PKGBUILD
	community/cairo-compmgr/PKGBUILD
	community/cwiid/PKGBUILD
	community/darcs/PKGBUILD
	community/gadmin-samba/PKGBUILD
	community/gstm/PKGBUILD
	community/haskell-dbus/PKGBUILD
	community/haskell-mmap/PKGBUILD
	community/lastfm-client/PKGBUILD
	community/libtar/PKGBUILD
	community/mget/PKGBUILD
	community/nexuiz/PKGBUILD
	community/pstreams/PKGBUILD
	community/pyglet/PKGBUILD
	community/python-html5lib/PKGBUILD
	community/python-pychm/PKGBUILD
	community/qoauth/PKGBUILD
	community/quilt/PKGBUILD
	community/stormbaancoureur/PKGBUILD
	community/winegame/PKGBUILD
	community/winestuff/PKGBUILD
	community/xdg-user-dirs/PKGBUILD
	core/libfetch/PKGBUILD
	extra/acpi/PKGBUILD
	extra/alex/PKGBUILD
	extra/allegro/PKGBUILD
	extra/capi4k-utils/PKGBUILD
	extra/erlang/PKGBUILD
	extra/ettercap/PKGBUILD
	extra/gftp/PKGBUILD
	extra/gimp-refocus/PKGBUILD
	extra/happy/PKGBUILD
	extra/haskell-cgi/PKGBUILD
	extra/haskell-deepseq/PKGBUILD
	extra/haskell-fgl/PKGBUILD
	extra/haskell-glut/PKGBUILD
	extra/haskell-haskell-src/PKGBUILD
	extra/haskell-html/PKGBUILD
	extra/haskell-hunit/PKGBUILD
	extra/haskell-opengl/PKGBUILD
	extra/haskell-parallel/PKGBUILD
	extra/haskell-platform/PKGBUILD
	extra/haskell-quickcheck/PKGBUILD
	extra/haskell-regex-base/PKGBUILD
	extra/haskell-regex-compat/PKGBUILD
	extra/haskell-regex-posix/PKGBUILD
	extra/haskell-stm/PKGBUILD
	extra/haskell-syb/PKGBUILD
	extra/haskell-xhtml/PKGBUILD
	extra/libnet/PKGBUILD
	extra/linux_logo/PKGBUILD
	extra/mailman/PKGBUILD
	extra/midori/PKGBUILD
	extra/ntrack/PKGBUILD
	extra/pwgen/PKGBUILD
	extra/qtcurve-gtk2/PKGBUILD
	extra/qtcurve-kde4/PKGBUILD
	extra/ristretto/PKGBUILD
	extra/rxvt-unicode/PKGBUILD
	extra/telepathy-sofiasip/PKGBUILD
	extra/tightvnc/PKGBUILD
	extra/vsftpd/PKGBUILD
	extra/windowmaker-crm-git/PKGBUILD
	libre/aufs2-libre/PKGBUILD
	libre/calibre-libre/PKGBUILD
	libre/calibre-libre/calibre-mount-helper
	libre/calibre-libre/calibre.install
	libre/calibre-libre/desktop_integration.patch
	libre/ffmpeg-libre/PKGBUILD
	mozilla-testing/iceweasel-libre/PKGBUILD
	mozilla-testing/iceweasel-libre/libre.patch
	mozilla-testing/iceweasel-libre/mozconfig
	~lukeshu/openni-unstable/PKGBUILD

1 files changed, 0 insertions, 34 deletions

diff --git a/extra/zsh/svn-1.7.patch b/extra/zsh/svn-1.7.patch
deleted file mode 100644
index 5ef314cc9..000000000
--- a/extra/zsh/svn-1.7.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-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