[arch-commits] Commit in bash-completion/repos/extra-any (5 files)

Dave Reisner dreisner at archlinux.org
Sun Aug 7 14:27:00 UTC 2016


    Date: Sunday, August 7, 2016 @ 14:27:00
  Author: dreisner
Revision: 273444

archrelease: copy trunk to extra-any

Added:
  bash-completion/repos/extra-any/PKGBUILD
    (from rev 273443, bash-completion/trunk/PKGBUILD)
  bash-completion/repos/extra-any/mpv-dont-install-symlink.patch
    (from rev 273443, bash-completion/trunk/mpv-dont-install-symlink.patch)
Deleted:
  bash-completion/repos/extra-any/PKGBUILD
  bash-completion/repos/extra-any/bash-4.3.patch
  bash-completion/repos/extra-any/mpv-dont-install-symlink.patch

--------------------------------+
 PKGBUILD                       |   85 ++++++++++++++++++---------------------
 bash-4.3.patch                 |   27 ------------
 mpv-dont-install-symlink.patch |   46 ++++++++++-----------
 3 files changed, 64 insertions(+), 94 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2016-08-07 14:26:43 UTC (rev 273443)
+++ PKGBUILD	2016-08-07 14:27:00 UTC (rev 273444)
@@ -1,44 +0,0 @@
-# $Id$
-# Maintainer: Eric Bélanger <eric at archlinux.org>
-
-pkgname=bash-completion
-pkgver=2.3
-pkgrel=4
-pkgdesc="Programmable completion for the bash shell"
-arch=('any')
-url="https://github.com/scop/bash-completion"
-license=('GPL2')
-depends=('bash')
-options=('!emptydirs' '!makeflags')
-source=("https://github.com/scop/bash-completion/releases/download/2.3/bash-completion-2.3.tar.xz"
-        'bash-4.3.patch'
-        'mpv-dont-install-symlink.patch')
-sha1sums=('6b42d6747dab48bdc983627e8ce69283ff0e6b79'
-          'd2a01350990c1221bd53d55edf31210c74d02bca'
-          '6bee621dc456190d629df108350925982d432bb5')
-
-prepare() {
-  cd ${pkgname}-${pkgver}
-  patch -p1 -i ../bash-4.3.patch
-  patch -p1 -i ../mpv-dont-install-symlink.patch
-}
-
-build() {
-  cd ${pkgname}-${pkgver}
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-
-# bash-completion is sourced in /etc/bash.bashrc so that non-bash shell don't source it
-  rm "${pkgdir}/etc/profile.d/bash_completion.sh"
-
-# remove Slackware's makepkg completion
-  rm "${pkgdir}/usr/share/bash-completion/completions/makepkg"
-
-# remove completions which overlap with util-linux
-  rm "${pkgdir}/usr/share/bash-completion/completions"/{u,}mount
-}

Copied: bash-completion/repos/extra-any/PKGBUILD (from rev 273443, bash-completion/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2016-08-07 14:27:00 UTC (rev 273444)
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: Eric Bélanger <eric at archlinux.org>
+
+pkgname=bash-completion
+pkgver=2.3
+pkgrel=5
+pkgdesc="Programmable completion for the bash shell"
+arch=('any')
+url="https://github.com/scop/bash-completion"
+license=('GPL2')
+depends=('bash')
+options=('!emptydirs' '!makeflags')
+source=("https://github.com/scop/bash-completion/releases/download/2.3/bash-completion-2.3.tar.xz"
+        'mpv-dont-install-symlink.patch')
+sha1sums=('6b42d6747dab48bdc983627e8ce69283ff0e6b79'
+          '6bee621dc456190d629df108350925982d432bb5')
+
+prepare() {
+  cd ${pkgname}-${pkgver}
+  patch -p1 -i ../mpv-dont-install-symlink.patch
+}
+
+build() {
+  cd ${pkgname}-${pkgver}
+  ./configure --prefix=/usr --sysconfdir=/etc
+  make
+}
+
+package() {
+  cd ${pkgname}-${pkgver}
+  make DESTDIR="${pkgdir}" install
+
+# bash-completion is sourced in /etc/bash.bashrc so that non-bash shell don't source it
+  rm "${pkgdir}/etc/profile.d/bash_completion.sh"
+
+# remove Slackware's makepkg completion
+  rm "${pkgdir}/usr/share/bash-completion/completions/makepkg"
+
+# remove completions which overlap with util-linux
+  rm "${pkgdir}/usr/share/bash-completion/completions"/{u,}mount
+}

Deleted: bash-4.3.patch
===================================================================
--- bash-4.3.patch	2016-08-07 14:26:43 UTC (rev 273443)
+++ bash-4.3.patch	2016-08-07 14:27:00 UTC (rev 273444)
@@ -1,27 +0,0 @@
---- a/bash_completion	2014-03-09 17:38:14 +0000
-+++ b/bash_completion	2014-03-13 23:26:44 +0000
-@@ -536,13 +536,23 @@
- # @param $2  Name of variable to return result to
- _quote_readline_by_ref()
- {
--    if [[ $1 == \'* ]]; then
-+    if [ -z "$1" ]; then
-+        # avoid quoting if empty
-+        printf -v $2 %s "$1"
-+    elif [[ $1 == \'* ]]; then
-         # Leave out first character
-         printf -v $2 %s "${1:1}"
-+    elif [[ $1 == ~* ]]; then
-+        # avoid escaping first ~
-+        printf -v $2 ~%q "${1:1}"
-     else
-         printf -v $2 %q "$1"
-     fi
- 
-+    # Replace double escaping ( \\ ) by single ( \ )
-+    # This happens always when argument is already escaped at cmdline,
-+    # and passed to this function as e.g.: file\ with\ spaces
-+    [[ ${!2} == *\\* ]] && printf -v $2 %s "${1//\\\\/\\}"
-     # If result becomes quoted like this: $'string', re-evaluate in order to
-     # drop the additional quoting.  See also: http://www.mail-archive.com/
-     # bash-completion-devel at lists.alioth.debian.org/msg01942.html

Deleted: mpv-dont-install-symlink.patch
===================================================================
--- mpv-dont-install-symlink.patch	2016-08-07 14:26:43 UTC (rev 273443)
+++ mpv-dont-install-symlink.patch	2016-08-07 14:27:00 UTC (rev 273444)
@@ -1,23 +0,0 @@
-From 0382773bbfc21dc1fb5467c1c0426ea3c984b6ec Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta at iki.fi>
-Date: Sat, 9 Apr 2016 20:06:57 +0300
-Subject: [PATCH] mpv: Don't install symlink for it, fixes #24
-
-This was a leftover from 00abd48e5b1d5d79fff46b7f791b2b90d1d6953b
----
- completions/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/completions/Makefile.am b/completions/Makefile.am
-index 99c283c..5558d50 100644
---- a/completions/Makefile.am
-+++ b/completions/Makefile.am
-@@ -802,7 +802,7 @@ symlinks: $(targetdir) $(DATA)
- 		rm -f $(targetdir)/$$file && \
- 			$(LN_S) mcrypt $(targetdir)/$$file ; \
- 	done
--	for file in mplayer2 mencoder gmplayer kplayer mpv ; do \
-+	for file in mplayer2 mencoder gmplayer kplayer ; do \
- 		rm -f $(targetdir)/$$file && \
- 			$(LN_S) mplayer $(targetdir)/$$file ; \
- 	done

Copied: bash-completion/repos/extra-any/mpv-dont-install-symlink.patch (from rev 273443, bash-completion/trunk/mpv-dont-install-symlink.patch)
===================================================================
--- mpv-dont-install-symlink.patch	                        (rev 0)
+++ mpv-dont-install-symlink.patch	2016-08-07 14:27:00 UTC (rev 273444)
@@ -0,0 +1,23 @@
+From 0382773bbfc21dc1fb5467c1c0426ea3c984b6ec Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?Ville=20Skytt=C3=A4?= <ville.skytta at iki.fi>
+Date: Sat, 9 Apr 2016 20:06:57 +0300
+Subject: [PATCH] mpv: Don't install symlink for it, fixes #24
+
+This was a leftover from 00abd48e5b1d5d79fff46b7f791b2b90d1d6953b
+---
+ completions/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/completions/Makefile.am b/completions/Makefile.am
+index 99c283c..5558d50 100644
+--- a/completions/Makefile.am
++++ b/completions/Makefile.am
+@@ -802,7 +802,7 @@ symlinks: $(targetdir) $(DATA)
+ 		rm -f $(targetdir)/$$file && \
+ 			$(LN_S) mcrypt $(targetdir)/$$file ; \
+ 	done
+-	for file in mplayer2 mencoder gmplayer kplayer mpv ; do \
++	for file in mplayer2 mencoder gmplayer kplayer ; do \
+ 		rm -f $(targetdir)/$$file && \
+ 			$(LN_S) mplayer $(targetdir)/$$file ; \
+ 	done



More information about the arch-commits mailing list