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

[Christian Hesse via arch-commits]

    Date: Tuesday, December 24, 2019 @ 21:39:24
  Author: eworm
Revision: 372224

upgpkg: git 2.24.1-3

python 2.x -> 3.x

Modified:
  git/trunk/PKGBUILD

----------+
 PKGBUILD |   17 +++--------------
 1 file changed, 3 insertions(+), 14 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD    2019-12-24 20:46:41 UTC (rev 372223)
+++ PKGBUILD    2019-12-24 21:39:24 UTC (rev 372224)
@@ -3,7 +3,7 @@
 
 pkgname=git
 pkgver=2.24.1
-pkgrel=2
+pkgrel=3
 pkgdesc='the fast distributed version control system'
 arch=(x86_64)
 url='https://git-scm.com/'
@@ -10,7 +10,7 @@
 license=('GPL2')
 depends=('curl' 'expat' 'perl' 'perl-error' 'perl-mailtools'
          'openssl' 'pcre2' 'grep' 'shadow')
-makedepends=('python2' 'libgnome-keyring' 'xmlto' 'asciidoc')
+makedepends=('python' 'libgnome-keyring' 'xmlto' 'asciidoc')
 optdepends=('tk: gitk and git gui'
             'perl-libwww: git svn'
             'perl-term-readkey: git svn and interactive.singlekey setting'
@@ -21,7 +21,7 @@
             'perl-datetime-format-iso8601: git mediawiki support'
             'perl-lwp-protocol-https: git mediawiki https support'
             'perl-cgi: gitweb (web interface) support'
-            'python2: various helper scripts'
+            'python: git svn'
             'subversion: git svn'
             'org.freedesktop.secrets: keyring credential helper'
             'libsecret: libsecret credential helper')
@@ -53,7 +53,6 @@
 )
 
 build() {
-  export PYTHON_PATH='/usr/bin/python2'
   cd "$srcdir/$pkgname-$pkgver"
 
   make \
@@ -69,7 +68,6 @@
 }
 
 check() {
-  export PYTHON_PATH='/usr/bin/python2'
   cd "$srcdir/$pkgname-$pkgver"
 
   local jobs
@@ -90,7 +88,6 @@
 }
 
 package() {
-  export PYTHON_PATH='/usr/bin/python2'
   cd "$srcdir/$pkgname-$pkgver"
   
   make \
@@ -122,14 +119,6 @@
   find contrib/ -name '.gitignore' -delete
   cp -a ./contrib/* "$pkgdir"/usr/share/git/
 
-  # scripts are for python 2.x
-  sed -i 's|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|' \
-    $(find "$pkgdir" -name '*.py') \
-    "$pkgdir"/usr/share/git/remote-helpers/git-remote-bzr \
-    "$pkgdir"/usr/share/git/remote-helpers/git-remote-hg
-  sed -i 's|#![ ]*/usr/bin/python$|#!/usr/bin/python2|' \
-    "$pkgdir"/usr/share/git/svn-fe/svnrdump_sim.py
-
   # git-daemon via systemd socket activation
   install -D -m 0644 "$srcdir"/git-daemon@.service 
"$pkgdir"/usr/lib/systemd/system/git-daemon@.service
   install -D -m 0644 "$srcdir"/git-daemon.socket 
"$pkgdir"/usr/lib/systemd/system/git-daemon.socket