Date: Sunday, April 24, 2022 @ 09:21:54 Author: pierre Revision: 443865
archrelease: copy trunk to extra-x86_64 Added: zsh/repos/extra-x86_64/PKGBUILD (from rev 443864, zsh/trunk/PKGBUILD) zsh/repos/extra-x86_64/zprofile (from rev 443864, zsh/trunk/zprofile) zsh/repos/extra-x86_64/zsh.install (from rev 443864, zsh/trunk/zsh.install) Deleted: zsh/repos/extra-x86_64/PKGBUILD zsh/repos/extra-x86_64/zprofile zsh/repos/extra-x86_64/zsh.install -------------+ PKGBUILD | 179 +++++++++++++++++++++++++++++----------------------------- zprofile | 2 zsh.install | 24 +++---- 3 files changed, 104 insertions(+), 101 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2022-04-24 09:21:38 UTC (rev 443864) +++ PKGBUILD 2022-04-24 09:21:54 UTC (rev 443865) @@ -1,88 +0,0 @@ -# Maintainer: Pierre Schmitz <pie...@archlinux.de> - -pkgbase=zsh -pkgname=('zsh' 'zsh-doc') -pkgver=5.8.1 -pkgrel=1 -arch=('x86_64') -url='https://www.zsh.org/' -license=('custom') -makedepends=('pcre' 'libcap' 'gdbm') -source=("https://www.zsh.org/pub/zsh-${pkgver}"{,-doc}".tar.xz"{,.asc} - 'zprofile') -sha512sums=('f54a5a47ed15d134902613f6169c985680afc45a67538505e11b66b348fcb367145e9b8ae2d9eac185e07ef5f97254b85df01ba97294002a8c036fd02ed5e76d' - 'SKIP' - '0d8ca4c54c10e8a471ba7d53f1371ee057f7df4b710fc01194833f29a61b5465133432b891b0b891b6cc5235a928a783bf99f39c67314e29e3d161ca5abf3219' - 'SKIP' - 'b287e00d8de4dc4cfb1c52bb2aef1d4b191de3512baad4c91dc81e78ddc3e5bb07297f43924b022ac44ff401a348d8a9fa366e19ddc8ea1ea72df311f5ed0034') -validpgpkeys=('F7B2754C7DE2830914661F0EA71D9A9D4BDB27B3' - 'E96646BE08C0AF0AA0F90788A5FEEE3AC7937444' - '7CA7ECAAF06216B90F894146ACF8146CAE8CBBC4') - -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 -} - -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" -} Copied: zsh/repos/extra-x86_64/PKGBUILD (from rev 443864, zsh/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2022-04-24 09:21:54 UTC (rev 443865) @@ -0,0 +1,91 @@ +# Maintainer: Pierre Schmitz <pie...@archlinux.de> + +pkgbase=zsh +pkgname=('zsh' 'zsh-doc') +pkgver=5.8.1 +pkgrel=2 +arch=('x86_64') +url='https://www.zsh.org/' +license=('custom') +makedepends=('pcre' 'libcap' 'gdbm' 'yodl') +source=("https://www.zsh.org/pub/zsh-${pkgver}"{,-doc}".tar.xz"{,.asc} + 'zprofile') +sha512sums=('f54a5a47ed15d134902613f6169c985680afc45a67538505e11b66b348fcb367145e9b8ae2d9eac185e07ef5f97254b85df01ba97294002a8c036fd02ed5e76d' + 'SKIP' + '0d8ca4c54c10e8a471ba7d53f1371ee057f7df4b710fc01194833f29a61b5465133432b891b0b891b6cc5235a928a783bf99f39c67314e29e3d161ca5abf3219' + 'SKIP' + 'b287e00d8de4dc4cfb1c52bb2aef1d4b191de3512baad4c91dc81e78ddc3e5bb07297f43924b022ac44ff401a348d8a9fa366e19ddc8ea1ea72df311f5ed0034') +validpgpkeys=('F7B2754C7DE2830914661F0EA71D9A9D4BDB27B3' + 'E96646BE08C0AF0AA0F90788A5FEEE3AC7937444' + '7CA7ECAAF06216B90F894146ACF8146CAE8CBBC4') + +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 + + # force generation of documentation with correct paths + rm Doc/version.yo +} + +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: zprofile =================================================================== --- zprofile 2022-04-24 09:21:38 UTC (rev 443864) +++ zprofile 2022-04-24 09:21:54 UTC (rev 443865) @@ -1 +0,0 @@ -emulate sh -c 'source /etc/profile' Copied: zsh/repos/extra-x86_64/zprofile (from rev 443864, zsh/trunk/zprofile) =================================================================== --- zprofile (rev 0) +++ zprofile 2022-04-24 09:21:54 UTC (rev 443865) @@ -0,0 +1 @@ +emulate sh -c 'source /etc/profile' Deleted: zsh.install =================================================================== --- zsh.install 2022-04-24 09:21:38 UTC (rev 443864) +++ zsh.install 2022-04-24 09:21:54 UTC (rev 443865) @@ -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 443864, zsh/trunk/zsh.install) =================================================================== --- zsh.install (rev 0) +++ zsh.install 2022-04-24 09:21:54 UTC (rev 443865) @@ -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 +}