Date: Monday, January 6, 2014 @ 12:03:56 Author: pierre Revision: 203238
archrelease: copy trunk to testing-i686, testing-x86_64 Added: zsh/repos/testing-i686/PKGBUILD (from rev 203237, zsh/trunk/PKGBUILD) zsh/repos/testing-i686/xattr-include.patch (from rev 203237, zsh/trunk/xattr-include.patch) zsh/repos/testing-i686/zprofile (from rev 203237, zsh/trunk/zprofile) zsh/repos/testing-i686/zsh-doc.install (from rev 203237, zsh/trunk/zsh-doc.install) zsh/repos/testing-i686/zsh.install (from rev 203237, zsh/trunk/zsh.install) zsh/repos/testing-x86_64/PKGBUILD (from rev 203237, zsh/trunk/PKGBUILD) zsh/repos/testing-x86_64/xattr-include.patch (from rev 203237, zsh/trunk/xattr-include.patch) zsh/repos/testing-x86_64/zprofile (from rev 203237, zsh/trunk/zprofile) zsh/repos/testing-x86_64/zsh-doc.install (from rev 203237, zsh/trunk/zsh-doc.install) zsh/repos/testing-x86_64/zsh.install (from rev 203237, zsh/trunk/zsh.install) Deleted: zsh/repos/testing-i686/PKGBUILD zsh/repos/testing-i686/zprofile zsh/repos/testing-i686/zsh-doc.install zsh/repos/testing-i686/zsh.install zsh/repos/testing-x86_64/PKGBUILD zsh/repos/testing-x86_64/zprofile zsh/repos/testing-x86_64/zsh-doc.install zsh/repos/testing-x86_64/zsh.install ------------------------------------+ /PKGBUILD | 176 +++++++++++++++++++++++++++++++++++ /zprofile | 2 /zsh-doc.install | 40 +++++++ /zsh.install | 24 ++++ testing-i686/PKGBUILD | 84 ---------------- testing-i686/xattr-include.patch | 16 +++ testing-i686/zprofile | 1 testing-i686/zsh-doc.install | 20 --- testing-i686/zsh.install | 12 -- testing-x86_64/PKGBUILD | 84 ---------------- testing-x86_64/xattr-include.patch | 16 +++ testing-x86_64/zprofile | 1 testing-x86_64/zsh-doc.install | 20 --- testing-x86_64/zsh.install | 12 -- 14 files changed, 274 insertions(+), 234 deletions(-) Deleted: testing-i686/PKGBUILD =================================================================== --- testing-i686/PKGBUILD 2014-01-06 11:03:39 UTC (rev 203237) +++ testing-i686/PKGBUILD 2014-01-06 11:03:56 UTC (rev 203238) @@ -1,84 +0,0 @@ -# $Id$ -# Maintainer: Pierre Schmitz <pie...@archlinux.de> - -pkgbase=zsh -pkgname=('zsh' 'zsh-doc') -pkgver=5.0.4 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://www.zsh.org/' -license=('custom') -makedepends=('pcre' 'libcap' 'gdbm') -source=("http://www.zsh.org/pub/zsh-${pkgver}.tar.bz2" - "http://www.zsh.org/pub/zsh-${pkgver}-doc.tar.bz2" - 'zprofile') -md5sums=('9829fe8932c25740173a272e8959cf8c' - '2505867639d58726cd09e6884cb7863c' - '24a9335edf77252a7b5f52e079f7aef7') - -prepare() { - cd "${srcdir}/${pkgbase}-${pkgver}" - - # Set correct keymap path - sed -i 's#/usr/share/keymaps#/usr/share/kbd/keymaps#g' Completion/Unix/Command/_loadkeys - - # Remove unneeded and conflicting completion scripts - for _fpath in AIX BSD Cygwin Darwin Debian Mandriva openSUSE Redhat Solaris; do - rm -rf Completion/$_fpath - sed "s#\s*Completion/$_fpath/\*/\*##g" -i Src/Zle/complete.mdd - done - rm -f Completion/Linux/Command/_{pkgtool,rpmbuild,yast} - rm -f Completion/Unix/Command/_{osc,systemd} -} - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - - ./configure --prefix=/usr \ - --docdir=/usr/share/doc/zsh \ - --htmldir=/usr/share/doc/zsh/html \ - --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}/${pkgbase}-${pkgver}" - HOME="${srcdir}" make check -} - -package_zsh() { - pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX' - depends=('pcre' 'libcap' 'gdbm') - backup=('etc/zsh/zprofile') - install=zsh.install - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}/" install - install -D -m644 "${srcdir}/zprofile" "${pkgdir}/etc/zsh/zprofile" - install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} - -package_zsh-doc() { - pkgdesc='Info, HTML and PDF format of the ZSH documentation' - install=zsh-doc.install - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}/" install.info install.html - install -D -m644 Doc/zsh.pdf "${pkgdir}/usr/share/doc/zsh/zsh.pdf" - install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} Copied: zsh/repos/testing-i686/PKGBUILD (from rev 203237, zsh/trunk/PKGBUILD) =================================================================== --- testing-i686/PKGBUILD (rev 0) +++ testing-i686/PKGBUILD 2014-01-06 11:03:56 UTC (rev 203238) @@ -0,0 +1,88 @@ +# $Id$ +# Maintainer: Pierre Schmitz <pie...@archlinux.de> + +pkgbase=zsh +pkgname=('zsh' 'zsh-doc') +pkgver=5.0.5 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.zsh.org/' +license=('custom') +makedepends=('pcre' 'libcap' 'gdbm') +source=("http://www.zsh.org/pub/zsh-${pkgver}.tar.bz2" + "http://www.zsh.org/pub/zsh-${pkgver}-doc.tar.bz2" + 'zprofile' 'xattr-include.patch') +md5sums=('6156dc2f19b0a067bdbc0fb7f81e2017' + '1eea70e7401a7a2116fa8de6ee5e8d32' + '24a9335edf77252a7b5f52e079f7aef7' + 'd9af40097fcf112beba34919e8a5934f') + +prepare() { + cd "${srcdir}/${pkgbase}-${pkgver}" + + # Set correct keymap path + sed -i 's#/usr/share/keymaps#/usr/share/kbd/keymaps#g' Completion/Unix/Command/_loadkeys + + # Remove unneeded and conflicting completion scripts + for _fpath in AIX BSD Cygwin Darwin Debian Mandriva openSUSE Redhat Solaris; do + rm -rf Completion/$_fpath + sed "s#\s*Completion/$_fpath/\*/\*##g" -i Src/Zle/complete.mdd + done + rm -f Completion/Linux/Command/_{pkgtool,rpmbuild,yast} + rm -f Completion/Unix/Command/_{osc,systemd} + + # Workaround for FS#38387 + patch -p0 -i "${srcdir}/xattr-include.patch" +} + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + + ./configure --prefix=/usr \ + --docdir=/usr/share/doc/zsh \ + --htmldir=/usr/share/doc/zsh/html \ + --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}/${pkgbase}-${pkgver}" + HOME="${srcdir}" make check +} + +package_zsh() { + pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX' + depends=('pcre' 'libcap' 'gdbm') + backup=('etc/zsh/zprofile') + install=zsh.install + + cd "${srcdir}/${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}/" install + install -D -m644 "${srcdir}/zprofile" "${pkgdir}/etc/zsh/zprofile" + install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + +package_zsh-doc() { + pkgdesc='Info, HTML and PDF format of the ZSH documentation' + install=zsh-doc.install + + cd "${srcdir}/${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}/" install.info install.html + install -D -m644 Doc/zsh.pdf "${pkgdir}/usr/share/doc/zsh/zsh.pdf" + install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} Copied: zsh/repos/testing-i686/xattr-include.patch (from rev 203237, zsh/trunk/xattr-include.patch) =================================================================== --- testing-i686/xattr-include.patch (rev 0) +++ testing-i686/xattr-include.patch 2014-01-06 11:03:56 UTC (rev 203238) @@ -0,0 +1,16 @@ +--- Src/Modules/attr.c 2013-11-27 20:00:20.000000000 +0100 ++++ Src/Modules/attr.c 2014-01-06 11:55:38.550079342 +0100 +@@ -27,11 +27,12 @@ + * + */ + ++#include <sys/xattr.h> ++ + #include "attr.mdh" + #include "attr.pro" + + #include <sys/types.h> +-#include <sys/xattr.h> + + static ssize_t + xgetxattr(const char *path, const char *name, void *value, size_t size, int symlink) Deleted: testing-i686/zprofile =================================================================== --- testing-i686/zprofile 2014-01-06 11:03:39 UTC (rev 203237) +++ testing-i686/zprofile 2014-01-06 11:03:56 UTC (rev 203238) @@ -1 +0,0 @@ -emulate sh -c 'source /etc/profile' Copied: zsh/repos/testing-i686/zprofile (from rev 203237, zsh/trunk/zprofile) =================================================================== --- testing-i686/zprofile (rev 0) +++ testing-i686/zprofile 2014-01-06 11:03:56 UTC (rev 203238) @@ -0,0 +1 @@ +emulate sh -c 'source /etc/profile' Deleted: testing-i686/zsh-doc.install =================================================================== --- testing-i686/zsh-doc.install 2014-01-06 11:03:39 UTC (rev 203237) +++ testing-i686/zsh-doc.install 2014-01-06 11:03:56 UTC (rev 203238) @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(zsh.info zsh.info-1 zsh.info-2 zsh.info-3 zsh.info-4 zsh.info-5 zsh.info-6) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} Copied: zsh/repos/testing-i686/zsh-doc.install (from rev 203237, zsh/trunk/zsh-doc.install) =================================================================== --- testing-i686/zsh-doc.install (rev 0) +++ testing-i686/zsh-doc.install 2014-01-06 11:03:56 UTC (rev 203238) @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(zsh.info zsh.info-1 zsh.info-2 zsh.info-3 zsh.info-4 zsh.info-5 zsh.info-6) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} Deleted: testing-i686/zsh.install =================================================================== --- testing-i686/zsh.install 2014-01-06 11:03:39 UTC (rev 203237) +++ testing-i686/zsh.install 2014-01-06 11:03:56 UTC (rev 203238) @@ -1,12 +0,0 @@ -post_install() { - grep -qe '^/bin/zsh$' etc/shells || echo '/bin/zsh' >> etc/shells - grep -qe '^/usr/bin/zsh$' etc/shells || echo '/usr/bin/zsh' >> etc/shells -} - -post_upgrade() { - post_install -} - -pre_remove() { - sed -i -r '/^(\/usr)?\/bin\/zsh$/d' etc/shells -} Copied: zsh/repos/testing-i686/zsh.install (from rev 203237, zsh/trunk/zsh.install) =================================================================== --- testing-i686/zsh.install (rev 0) +++ testing-i686/zsh.install 2014-01-06 11:03:56 UTC (rev 203238) @@ -0,0 +1,12 @@ +post_install() { + grep -qe '^/bin/zsh$' etc/shells || echo '/bin/zsh' >> etc/shells + grep -qe '^/usr/bin/zsh$' etc/shells || echo '/usr/bin/zsh' >> etc/shells +} + +post_upgrade() { + post_install +} + +pre_remove() { + sed -i -r '/^(\/usr)?\/bin\/zsh$/d' etc/shells +} Deleted: testing-x86_64/PKGBUILD =================================================================== --- testing-x86_64/PKGBUILD 2014-01-06 11:03:39 UTC (rev 203237) +++ testing-x86_64/PKGBUILD 2014-01-06 11:03:56 UTC (rev 203238) @@ -1,84 +0,0 @@ -# $Id$ -# Maintainer: Pierre Schmitz <pie...@archlinux.de> - -pkgbase=zsh -pkgname=('zsh' 'zsh-doc') -pkgver=5.0.4 -pkgrel=1 -arch=('i686' 'x86_64') -url='http://www.zsh.org/' -license=('custom') -makedepends=('pcre' 'libcap' 'gdbm') -source=("http://www.zsh.org/pub/zsh-${pkgver}.tar.bz2" - "http://www.zsh.org/pub/zsh-${pkgver}-doc.tar.bz2" - 'zprofile') -md5sums=('9829fe8932c25740173a272e8959cf8c' - '2505867639d58726cd09e6884cb7863c' - '24a9335edf77252a7b5f52e079f7aef7') - -prepare() { - cd "${srcdir}/${pkgbase}-${pkgver}" - - # Set correct keymap path - sed -i 's#/usr/share/keymaps#/usr/share/kbd/keymaps#g' Completion/Unix/Command/_loadkeys - - # Remove unneeded and conflicting completion scripts - for _fpath in AIX BSD Cygwin Darwin Debian Mandriva openSUSE Redhat Solaris; do - rm -rf Completion/$_fpath - sed "s#\s*Completion/$_fpath/\*/\*##g" -i Src/Zle/complete.mdd - done - rm -f Completion/Linux/Command/_{pkgtool,rpmbuild,yast} - rm -f Completion/Unix/Command/_{osc,systemd} -} - -build() { - cd "${srcdir}/${pkgbase}-${pkgver}" - - ./configure --prefix=/usr \ - --docdir=/usr/share/doc/zsh \ - --htmldir=/usr/share/doc/zsh/html \ - --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}/${pkgbase}-${pkgver}" - HOME="${srcdir}" make check -} - -package_zsh() { - pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX' - depends=('pcre' 'libcap' 'gdbm') - backup=('etc/zsh/zprofile') - install=zsh.install - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}/" install - install -D -m644 "${srcdir}/zprofile" "${pkgdir}/etc/zsh/zprofile" - install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} - -package_zsh-doc() { - pkgdesc='Info, HTML and PDF format of the ZSH documentation' - install=zsh-doc.install - - cd "${srcdir}/${pkgbase}-${pkgver}" - make DESTDIR="${pkgdir}/" install.info install.html - install -D -m644 Doc/zsh.pdf "${pkgdir}/usr/share/doc/zsh/zsh.pdf" - install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" -} Copied: zsh/repos/testing-x86_64/PKGBUILD (from rev 203237, zsh/trunk/PKGBUILD) =================================================================== --- testing-x86_64/PKGBUILD (rev 0) +++ testing-x86_64/PKGBUILD 2014-01-06 11:03:56 UTC (rev 203238) @@ -0,0 +1,88 @@ +# $Id$ +# Maintainer: Pierre Schmitz <pie...@archlinux.de> + +pkgbase=zsh +pkgname=('zsh' 'zsh-doc') +pkgver=5.0.5 +pkgrel=1 +arch=('i686' 'x86_64') +url='http://www.zsh.org/' +license=('custom') +makedepends=('pcre' 'libcap' 'gdbm') +source=("http://www.zsh.org/pub/zsh-${pkgver}.tar.bz2" + "http://www.zsh.org/pub/zsh-${pkgver}-doc.tar.bz2" + 'zprofile' 'xattr-include.patch') +md5sums=('6156dc2f19b0a067bdbc0fb7f81e2017' + '1eea70e7401a7a2116fa8de6ee5e8d32' + '24a9335edf77252a7b5f52e079f7aef7' + 'd9af40097fcf112beba34919e8a5934f') + +prepare() { + cd "${srcdir}/${pkgbase}-${pkgver}" + + # Set correct keymap path + sed -i 's#/usr/share/keymaps#/usr/share/kbd/keymaps#g' Completion/Unix/Command/_loadkeys + + # Remove unneeded and conflicting completion scripts + for _fpath in AIX BSD Cygwin Darwin Debian Mandriva openSUSE Redhat Solaris; do + rm -rf Completion/$_fpath + sed "s#\s*Completion/$_fpath/\*/\*##g" -i Src/Zle/complete.mdd + done + rm -f Completion/Linux/Command/_{pkgtool,rpmbuild,yast} + rm -f Completion/Unix/Command/_{osc,systemd} + + # Workaround for FS#38387 + patch -p0 -i "${srcdir}/xattr-include.patch" +} + +build() { + cd "${srcdir}/${pkgbase}-${pkgver}" + + ./configure --prefix=/usr \ + --docdir=/usr/share/doc/zsh \ + --htmldir=/usr/share/doc/zsh/html \ + --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}/${pkgbase}-${pkgver}" + HOME="${srcdir}" make check +} + +package_zsh() { + pkgdesc='A very advanced and programmable command interpreter (shell) for UNIX' + depends=('pcre' 'libcap' 'gdbm') + backup=('etc/zsh/zprofile') + install=zsh.install + + cd "${srcdir}/${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}/" install + install -D -m644 "${srcdir}/zprofile" "${pkgdir}/etc/zsh/zprofile" + install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} + +package_zsh-doc() { + pkgdesc='Info, HTML and PDF format of the ZSH documentation' + install=zsh-doc.install + + cd "${srcdir}/${pkgbase}-${pkgver}" + make DESTDIR="${pkgdir}/" install.info install.html + install -D -m644 Doc/zsh.pdf "${pkgdir}/usr/share/doc/zsh/zsh.pdf" + install -D -m644 LICENCE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE" +} Copied: zsh/repos/testing-x86_64/xattr-include.patch (from rev 203237, zsh/trunk/xattr-include.patch) =================================================================== --- testing-x86_64/xattr-include.patch (rev 0) +++ testing-x86_64/xattr-include.patch 2014-01-06 11:03:56 UTC (rev 203238) @@ -0,0 +1,16 @@ +--- Src/Modules/attr.c 2013-11-27 20:00:20.000000000 +0100 ++++ Src/Modules/attr.c 2014-01-06 11:55:38.550079342 +0100 +@@ -27,11 +27,12 @@ + * + */ + ++#include <sys/xattr.h> ++ + #include "attr.mdh" + #include "attr.pro" + + #include <sys/types.h> +-#include <sys/xattr.h> + + static ssize_t + xgetxattr(const char *path, const char *name, void *value, size_t size, int symlink) Deleted: testing-x86_64/zprofile =================================================================== --- testing-x86_64/zprofile 2014-01-06 11:03:39 UTC (rev 203237) +++ testing-x86_64/zprofile 2014-01-06 11:03:56 UTC (rev 203238) @@ -1 +0,0 @@ -emulate sh -c 'source /etc/profile' Copied: zsh/repos/testing-x86_64/zprofile (from rev 203237, zsh/trunk/zprofile) =================================================================== --- testing-x86_64/zprofile (rev 0) +++ testing-x86_64/zprofile 2014-01-06 11:03:56 UTC (rev 203238) @@ -0,0 +1 @@ +emulate sh -c 'source /etc/profile' Deleted: testing-x86_64/zsh-doc.install =================================================================== --- testing-x86_64/zsh-doc.install 2014-01-06 11:03:39 UTC (rev 203237) +++ testing-x86_64/zsh-doc.install 2014-01-06 11:03:56 UTC (rev 203238) @@ -1,20 +0,0 @@ -infodir=usr/share/info -filelist=(zsh.info zsh.info-1 zsh.info-2 zsh.info-3 zsh.info-4 zsh.info-5 zsh.info-6) - -post_install() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info $infodir/$file.gz $infodir/dir 2> /dev/null - done -} - -post_upgrade() { - post_install -} - -pre_remove() { - [ -x usr/bin/install-info ] || return 0 - for file in ${filelist[@]}; do - install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null - done -} Copied: zsh/repos/testing-x86_64/zsh-doc.install (from rev 203237, zsh/trunk/zsh-doc.install) =================================================================== --- testing-x86_64/zsh-doc.install (rev 0) +++ testing-x86_64/zsh-doc.install 2014-01-06 11:03:56 UTC (rev 203238) @@ -0,0 +1,20 @@ +infodir=usr/share/info +filelist=(zsh.info zsh.info-1 zsh.info-2 zsh.info-3 zsh.info-4 zsh.info-5 zsh.info-6) + +post_install() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info $infodir/$file.gz $infodir/dir 2> /dev/null + done +} + +post_upgrade() { + post_install +} + +pre_remove() { + [ -x usr/bin/install-info ] || return 0 + for file in ${filelist[@]}; do + install-info --delete $infodir/$file.gz $infodir/dir 2> /dev/null + done +} Deleted: testing-x86_64/zsh.install =================================================================== --- testing-x86_64/zsh.install 2014-01-06 11:03:39 UTC (rev 203237) +++ testing-x86_64/zsh.install 2014-01-06 11:03:56 UTC (rev 203238) @@ -1,12 +0,0 @@ -post_install() { - grep -qe '^/bin/zsh$' etc/shells || echo '/bin/zsh' >> etc/shells - grep -qe '^/usr/bin/zsh$' etc/shells || echo '/usr/bin/zsh' >> etc/shells -} - -post_upgrade() { - post_install -} - -pre_remove() { - sed -i -r '/^(\/usr)?\/bin\/zsh$/d' etc/shells -} Copied: zsh/repos/testing-x86_64/zsh.install (from rev 203237, zsh/trunk/zsh.install) =================================================================== --- testing-x86_64/zsh.install (rev 0) +++ testing-x86_64/zsh.install 2014-01-06 11:03:56 UTC (rev 203238) @@ -0,0 +1,12 @@ +post_install() { + grep -qe '^/bin/zsh$' etc/shells || echo '/bin/zsh' >> etc/shells + grep -qe '^/usr/bin/zsh$' etc/shells || echo '/usr/bin/zsh' >> etc/shells +} + +post_upgrade() { + post_install +} + +pre_remove() { + sed -i -r '/^(\/usr)?\/bin\/zsh$/d' etc/shells +}