[arch-commits] Commit in zsh/repos/extra-x86_64 (7 files)

Pierre Schmitz pierre at archlinux.org
Mon Feb 4 15:39:40 UTC 2019


    Date: Monday, February 4, 2019 @ 15:39:39
  Author: pierre
Revision: 345250

archrelease: copy trunk to extra-x86_64

Added:
  zsh/repos/extra-x86_64/PKGBUILD
    (from rev 345249, zsh/trunk/PKGBUILD)
  zsh/repos/extra-x86_64/zprofile
    (from rev 345249, zsh/trunk/zprofile)
  zsh/repos/extra-x86_64/zsh.install
    (from rev 345249, zsh/trunk/zsh.install)
Deleted:
  zsh/repos/extra-x86_64/PKGBUILD
  zsh/repos/extra-x86_64/vcs_info.patch
  zsh/repos/extra-x86_64/zprofile
  zsh/repos/extra-x86_64/zsh.install

----------------+
 PKGBUILD       |  179 +++++++++++++++++++++++++++----------------------------
 vcs_info.patch |   35 ----------
 zprofile       |    2 
 zsh.install    |   24 +++----
 4 files changed, 101 insertions(+), 139 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2019-02-04 15:39:24 UTC (rev 345249)
+++ PKGBUILD	2019-02-04 15:39:39 UTC (rev 345250)
@@ -1,91 +0,0 @@
-# Maintainer: Pierre Schmitz <pierre at archlinux.de>
-
-pkgbase=zsh
-pkgname=('zsh' 'zsh-doc')
-pkgver=5.7
-pkgrel=2
-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' 'vcs_info.patch')
-sha512sums=('cfef5604d6ff30aeb081ed2a2660c861027c0a90169231cdb6b19093ffa6d63946be7b1fde527769e60e5b14bb6853b590bf4a207b63d6ec66fffd30d9a94958'
-            'SKIP'
-            '4b5f256ed39c0594daf2fdb2f995c60944c70556438b986fcf6f4e40dbfdc58e70eb65691c841d5dbb973a20b30255abe55ed140482b7afd446e1911c4efd395'
-            'SKIP'
-            'b287e00d8de4dc4cfb1c52bb2aef1d4b191de3512baad4c91dc81e78ddc3e5bb07297f43924b022ac44ff401a348d8a9fa366e19ddc8ea1ea72df311f5ed0034'
-            'f72285f2ddedf1da44f419c13b54dca2a1845027ff36a4b00ea58aadf3e19986aed3568325afbc4ff7b7e92820875ac75263287dce73c2ba1d16409d5def0353')
-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,rpmbuild}
-
-	patch -p1 -i "${srcdir}/vcs_info.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'
-
-	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 345249, zsh/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2019-02-04 15:39:39 UTC (rev 345250)
@@ -0,0 +1,88 @@
+# Maintainer: Pierre Schmitz <pierre at archlinux.de>
+
+pkgbase=zsh
+pkgname=('zsh' 'zsh-doc')
+pkgver=5.7.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=('a6aa88e1955a80229a4784a128866e325f79a8b5f73c922ab480048411036f1835cbb31daa30ab38bd16ab2a50040eda8f4f1f64704b21b6acc3051b1dbf18d0'
+            'SKIP'
+            'e51bc8eb408bcb20bf8a4f0b8588f7803fdd433445efa282f598a3bec4575cba7feaad117cd2d5077f51150bf0ba41a673ffb925ade33c435db498f1d791cc8c'
+            '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,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: vcs_info.patch
===================================================================
--- vcs_info.patch	2019-02-04 15:39:24 UTC (rev 345249)
+++ vcs_info.patch	2019-02-04 15:39:39 UTC (rev 345250)
@@ -1,35 +0,0 @@
-From b70919e0d9dadc93893e9d18bc3ef13b88756ecf Mon Sep 17 00:00:00 2001
-From: dana <dana at dana.is>
-Date: Sun, 27 Jan 2019 00:26:31 -0600
-Subject: [PATCH] 44020: VCS_INFO_detect_p4: Fix infinite recursion
-
----
- ChangeLog                                      | 5 +++++
- Functions/VCS_Info/Backends/VCS_INFO_detect_p4 | 1 -
- 2 files changed, 5 insertions(+), 1 deletion(-)
-
-diff --git a/ChangeLog b/ChangeLog
-index 81668ccc9..be243c1b8 100644
---- a/ChangeLog
-+++ b/ChangeLog
-@@ -1,3 +1,8 @@
-+2018-01-27  dana  <dana at dana.is>
-+
-+	* 44020: Functions/VCS_Info/Backends/VCS_INFO_detect_p4: Fix
-+	infinite recursion
-+
- 2018-01-24  dana  <dana at dana.is>
- 
- 	* unposted: Config/version.mk: Post-release version bump
-diff --git a/Functions/VCS_Info/Backends/VCS_INFO_detect_p4 b/Functions/VCS_Info/Backends/VCS_INFO_detect_p4
-index d171c68ee..5ec21da9f 100644
---- a/Functions/VCS_Info/Backends/VCS_INFO_detect_p4
-+++ b/Functions/VCS_Info/Backends/VCS_INFO_detect_p4
-@@ -44,7 +44,6 @@ VCS_INFO_p4_get_server() {
- }
- 
- 
--(( ${+functions[VCS_INFO_detect_p4]} )) ||
- VCS_INFO_detect_p4() {
-   local serverport p4where
- 

Deleted: zprofile
===================================================================
--- zprofile	2019-02-04 15:39:24 UTC (rev 345249)
+++ zprofile	2019-02-04 15:39:39 UTC (rev 345250)
@@ -1 +0,0 @@
-emulate sh -c 'source /etc/profile'

Copied: zsh/repos/extra-x86_64/zprofile (from rev 345249, zsh/trunk/zprofile)
===================================================================
--- zprofile	                        (rev 0)
+++ zprofile	2019-02-04 15:39:39 UTC (rev 345250)
@@ -0,0 +1 @@
+emulate sh -c 'source /etc/profile'

Deleted: zsh.install
===================================================================
--- zsh.install	2019-02-04 15:39:24 UTC (rev 345249)
+++ zsh.install	2019-02-04 15:39:39 UTC (rev 345250)
@@ -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 345249, zsh/trunk/zsh.install)
===================================================================
--- zsh.install	                        (rev 0)
+++ zsh.install	2019-02-04 15:39:39 UTC (rev 345250)
@@ -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
+}



More information about the arch-commits mailing list