[arch-commits] Commit in git/trunk (PKGBUILD)

[Christian Hesse]

    Date: Thursday, June 21, 2018 @ 18:45:01
  Author: eworm
Revision: 327409

upgpkg: git 2.18.0-1

new upstream release

Modified:
  git/trunk/PKGBUILD

----------+
 PKGBUILD |   18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2018-06-21 17:53:07 UTC (rev 327408)
+++ PKGBUILD	2018-06-21 18:45:01 UTC (rev 327409)
@@ -3,15 +3,15 @@
 # Maintainer: Dan McGee <dan at archlinux.org>
 
 pkgname=git
-pkgver=2.17.1
+pkgver=2.18.0
 pkgrel=1
-pkgdesc="the fast distributed version control system"
+pkgdesc='the fast distributed version control system'
 arch=(x86_64)
-url="http://git-scm.com/"
+url='https://git-scm.com/'
 license=('GPL2')
 depends=('curl' 'expat>=2.0' 'perl>=5.14.0' 'perl-error' 'perl-mailtools'
          'openssl' 'pcre2' 'grep' 'shadow')
-makedepends=('python2' 'emacs' 'libgnome-keyring' 'xmlto' 'asciidoc')
+makedepends=('python2' 'libgnome-keyring' 'xmlto' 'asciidoc')
 optdepends=('tk: gitk and git gui'
             'perl-libwww: git svn'
             'perl-term-readkey: git svn'
@@ -28,13 +28,11 @@
 install=git.install
 validpgpkeys=('96E07AF25771955980DAD10020D04E5A713660A7') # Junio C Hamano
 source=("https://www.kernel.org/pub/software/scm/git/git-$pkgver.tar."{xz,sign}
-        '0001-perl-fix-installing-modules-from-contrib.patch'
         'git-daemon at .service'
         'git-daemon.socket'
         'git-sysusers.conf')
-sha256sums=('79136e7aa83abae4d8a25c8111f113d3c5a63aeb5fd93cc72c26d49c6d5ba65e'
+sha256sums=('8b40be383a603147ae29337136c00d1c634bdfdc169a30924a024596a7e30e92'
             'SKIP'
-            'c105015d2e5e4e671cb766edf4169e853021b07296e6d449b3209b4de7848afc'
             '14c0b67cfe116b430645c19d8c4759419657e6809dfa28f438c33a005245ad91'
             'ac4c90d62c44926e6d30d18d97767efc901076d4e0283ed812a349aece72f203'
             '7630e8245526ad80f703fac9900a1328588c503ce32b37b9f8811674fcda4a45')
@@ -58,15 +56,11 @@
   export PYTHON_PATH='/usr/bin/python2'
   cd "$srcdir/$pkgname-$pkgver"
 
-  # perl: fix installing modules from contrib
-  patch -Np1 < ../0001-perl-fix-installing-modules-from-contrib.patch
-
   make \
     "${make_paths[@]}" \
     "${make_options[@]}" \
     all doc
 
-  make -C contrib/emacs "${make_paths[@]}"
   make -C contrib/credential/gnome-keyring
   make -C contrib/credential/libsecret
   make -C contrib/subtree "${make_paths[@]}" all doc
@@ -111,8 +105,6 @@
   # fancy git prompt
   mkdir -p "$pkgdir"/usr/share/git/
   install -m 0644 ./contrib/completion/git-prompt.sh "$pkgdir"/usr/share/git/git-prompt.sh
-  # emacs
-  make -C contrib/emacs "${make_paths[@]}" DESTDIR="$pkgdir" install
   # gnome credentials helper
   install -m 0755 contrib/credential/gnome-keyring/git-credential-gnome-keyring \
       "$pkgdir"/usr/lib/git-core/git-credential-gnome-keyring