Date: Sunday, November 20, 2016 @ 09:58:32 Author: pierre Revision: 281655
archrelease: copy trunk to extra-i686, extra-x86_64 Added: zsh/repos/extra-i686/PKGBUILD (from rev 281654, zsh/trunk/PKGBUILD) zsh/repos/extra-i686/zprofile (from rev 281654, zsh/trunk/zprofile) zsh/repos/extra-i686/zsh.install (from rev 281654, zsh/trunk/zsh.install) zsh/repos/extra-x86_64/PKGBUILD (from rev 281654, zsh/trunk/PKGBUILD) zsh/repos/extra-x86_64/zprofile (from rev 281654, zsh/trunk/zprofile) zsh/repos/extra-x86_64/zsh.install (from rev 281654, zsh/trunk/zsh.install) Deleted: zsh/repos/extra-i686/PKGBUILD zsh/repos/extra-i686/zprofile zsh/repos/extra-i686/zsh-doc.install zsh/repos/extra-i686/zsh.install zsh/repos/extra-x86_64/PKGBUILD zsh/repos/extra-x86_64/zprofile zsh/repos/extra-x86_64/zsh-doc.install zsh/repos/extra-x86_64/zsh.install ------------------------------+ /PKGBUILD | 174 +++++++++++++++++++++++++++++++++++++++++ /zprofile | 2 /zsh.install | 24 +++++ extra-i686/PKGBUILD | 86 -------------------- extra-i686/zprofile | 1 extra-i686/zsh-doc.install | 20 ---- extra-i686/zsh.install | 12 -- extra-x86_64/PKGBUILD | 86 -------------------- extra-x86_64/zprofile | 1 extra-x86_64/zsh-doc.install | 20 ---- extra-x86_64/zsh.install | 12 -- 11 files changed, 200 insertions(+), 238 deletions(-) Deleted: extra-i686/PKGBUILD =================================================================== --- extra-i686/PKGBUILD 2016-11-20 09:58:19 UTC (rev 281654) +++ extra-i686/PKGBUILD 2016-11-20 09:58:32 UTC (rev 281655) @@ -1,86 +0,0 @@ -# $Id$ -# Maintainer: Pierre Schmitz <pie...@archlinux.de> - -pkgbase=zsh -pkgname=('zsh' 'zsh-doc') -pkgver=5.2 -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.xz" - "http://www.zsh.org/pub/zsh-${pkgver}-doc.tar.xz" - 'zprofile') -md5sums=('afe96fde08b70e23c1cab1ca7a68fb34' - '873f1ade1fa5d0d15f9cba16d3ba5f98' - '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 - - # Fix usb.ids path - sed -i 's#/usr/share/misc/usb.ids#/usr/share/hwdata/usb.ids#g' Completion/Linux/Command/_lsusb - - # 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 Completion/Linux/Command/_{pkgtool,rpmbuild} -} - -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/extra-i686/PKGBUILD (from rev 281654, zsh/trunk/PKGBUILD) =================================================================== --- extra-i686/PKGBUILD (rev 0) +++ extra-i686/PKGBUILD 2016-11-20 09:58:32 UTC (rev 281655) @@ -0,0 +1,87 @@ +# $Id$ +# Maintainer: Pierre Schmitz <pie...@archlinux.de> + +pkgbase=zsh +pkgname=('zsh' 'zsh-doc') +pkgver=5.2 +pkgrel=2 +arch=('i686' 'x86_64') +url='http://www.zsh.org/' +license=('custom') +makedepends=('pcre' 'libcap' 'gdbm') +source=("https://www.zsh.org/pub/zsh-${pkgver}"{,-doc}".tar.xz"{,.asc} + 'zprofile') +md5sums=('afe96fde08b70e23c1cab1ca7a68fb34' + 'SKIP' + '873f1ade1fa5d0d15f9cba16d3ba5f98' + 'SKIP' + '24a9335edf77252a7b5f52e079f7aef7') +validpgpkeys=('F7B2754C7DE2830914661F0EA71D9A9D4BDB27B3') + +prepare() { + cd "${srcdir}/${pkgbase}-${pkgver}" + + # Set correct keymap path + sed -i 's#/usr/share/keymaps#/usr/share/kbd/keymaps#g' Completion/Unix/Command/_loadkeys + + # Fix usb.ids path + sed -i 's#/usr/share/misc/usb.ids#/usr/share/hwdata/usb.ids#g' Completion/Linux/Command/_lsusb + + # 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 Completion/Linux/Command/_{pkgtool,rpmbuild} +} + +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' + + 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" +} Deleted: extra-i686/zprofile =================================================================== --- extra-i686/zprofile 2016-11-20 09:58:19 UTC (rev 281654) +++ extra-i686/zprofile 2016-11-20 09:58:32 UTC (rev 281655) @@ -1 +0,0 @@ -emulate sh -c 'source /etc/profile' Copied: zsh/repos/extra-i686/zprofile (from rev 281654, zsh/trunk/zprofile) =================================================================== --- extra-i686/zprofile (rev 0) +++ extra-i686/zprofile 2016-11-20 09:58:32 UTC (rev 281655) @@ -0,0 +1 @@ +emulate sh -c 'source /etc/profile' Deleted: extra-i686/zsh-doc.install =================================================================== --- extra-i686/zsh-doc.install 2016-11-20 09:58:19 UTC (rev 281654) +++ extra-i686/zsh-doc.install 2016-11-20 09:58:32 UTC (rev 281655) @@ -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 -} Deleted: extra-i686/zsh.install =================================================================== --- extra-i686/zsh.install 2016-11-20 09:58:19 UTC (rev 281654) +++ extra-i686/zsh.install 2016-11-20 09:58:32 UTC (rev 281655) @@ -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/extra-i686/zsh.install (from rev 281654, zsh/trunk/zsh.install) =================================================================== --- extra-i686/zsh.install (rev 0) +++ extra-i686/zsh.install 2016-11-20 09:58:32 UTC (rev 281655) @@ -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: extra-x86_64/PKGBUILD =================================================================== --- extra-x86_64/PKGBUILD 2016-11-20 09:58:19 UTC (rev 281654) +++ extra-x86_64/PKGBUILD 2016-11-20 09:58:32 UTC (rev 281655) @@ -1,86 +0,0 @@ -# $Id$ -# Maintainer: Pierre Schmitz <pie...@archlinux.de> - -pkgbase=zsh -pkgname=('zsh' 'zsh-doc') -pkgver=5.2 -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.xz" - "http://www.zsh.org/pub/zsh-${pkgver}-doc.tar.xz" - 'zprofile') -md5sums=('afe96fde08b70e23c1cab1ca7a68fb34' - '873f1ade1fa5d0d15f9cba16d3ba5f98' - '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 - - # Fix usb.ids path - sed -i 's#/usr/share/misc/usb.ids#/usr/share/hwdata/usb.ids#g' Completion/Linux/Command/_lsusb - - # 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 Completion/Linux/Command/_{pkgtool,rpmbuild} -} - -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/extra-x86_64/PKGBUILD (from rev 281654, zsh/trunk/PKGBUILD) =================================================================== --- extra-x86_64/PKGBUILD (rev 0) +++ extra-x86_64/PKGBUILD 2016-11-20 09:58:32 UTC (rev 281655) @@ -0,0 +1,87 @@ +# $Id$ +# Maintainer: Pierre Schmitz <pie...@archlinux.de> + +pkgbase=zsh +pkgname=('zsh' 'zsh-doc') +pkgver=5.2 +pkgrel=2 +arch=('i686' 'x86_64') +url='http://www.zsh.org/' +license=('custom') +makedepends=('pcre' 'libcap' 'gdbm') +source=("https://www.zsh.org/pub/zsh-${pkgver}"{,-doc}".tar.xz"{,.asc} + 'zprofile') +md5sums=('afe96fde08b70e23c1cab1ca7a68fb34' + 'SKIP' + '873f1ade1fa5d0d15f9cba16d3ba5f98' + 'SKIP' + '24a9335edf77252a7b5f52e079f7aef7') +validpgpkeys=('F7B2754C7DE2830914661F0EA71D9A9D4BDB27B3') + +prepare() { + cd "${srcdir}/${pkgbase}-${pkgver}" + + # Set correct keymap path + sed -i 's#/usr/share/keymaps#/usr/share/kbd/keymaps#g' Completion/Unix/Command/_loadkeys + + # Fix usb.ids path + sed -i 's#/usr/share/misc/usb.ids#/usr/share/hwdata/usb.ids#g' Completion/Linux/Command/_lsusb + + # 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 Completion/Linux/Command/_{pkgtool,rpmbuild} +} + +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' + + 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" +} Deleted: extra-x86_64/zprofile =================================================================== --- extra-x86_64/zprofile 2016-11-20 09:58:19 UTC (rev 281654) +++ extra-x86_64/zprofile 2016-11-20 09:58:32 UTC (rev 281655) @@ -1 +0,0 @@ -emulate sh -c 'source /etc/profile' Copied: zsh/repos/extra-x86_64/zprofile (from rev 281654, zsh/trunk/zprofile) =================================================================== --- extra-x86_64/zprofile (rev 0) +++ extra-x86_64/zprofile 2016-11-20 09:58:32 UTC (rev 281655) @@ -0,0 +1 @@ +emulate sh -c 'source /etc/profile' Deleted: extra-x86_64/zsh-doc.install =================================================================== --- extra-x86_64/zsh-doc.install 2016-11-20 09:58:19 UTC (rev 281654) +++ extra-x86_64/zsh-doc.install 2016-11-20 09:58:32 UTC (rev 281655) @@ -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 -} Deleted: extra-x86_64/zsh.install =================================================================== --- extra-x86_64/zsh.install 2016-11-20 09:58:19 UTC (rev 281654) +++ extra-x86_64/zsh.install 2016-11-20 09:58:32 UTC (rev 281655) @@ -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/extra-x86_64/zsh.install (from rev 281654, zsh/trunk/zsh.install) =================================================================== --- extra-x86_64/zsh.install (rev 0) +++ extra-x86_64/zsh.install 2016-11-20 09:58:32 UTC (rev 281655) @@ -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 +}