MythTV 31

2 files changed, 13 insertions, 20 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 07a7b34fec3f..3c122b06761a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = mythtv-git
 	pkgdesc = A Homebrew PVR project
-	pkgver = 30+fixes.20200204.3e9e8353
+	pkgver = 31+fixes.20200328.c8c59f55
 	pkgrel = 1
 	url = https://www.mythtv.org/
 	arch = x86_64
@@ -16,7 +16,7 @@ pkgbase = mythtv-git
 	makedepends = perl-io-socket-inet6
 	makedepends = perl-libwww
 	makedepends = perl-dbd-mysql
-	makedepends = python2-lxml
+	makedepends = python-lxml
 	makedepends = perl-xml-simple
 	makedepends = perl-xml-xpath
 	depends = libass
@@ -49,16 +49,16 @@ pkgbase = mythtv-git
 	optdepends = libxml2: to read blu-ray metadata
 	optdepends = mariadb: Database-Backend for server deployment
 	optdepends = mariadb-clients: Database-Frontend for client deployment
-	optdepends = python2-future: for metadata-lookup / cover art
-	optdepends = python2-requests: for metadata-lookup / cover art
-	optdepends = python2-requests-cache: for metadata-lookup / cover art
+	optdepends = python-future: for metadata-lookup / cover art
+	optdepends = python-requests: for metadata-lookup / cover art
+	optdepends = python-requests-cache: for metadata-lookup / cover art
 	conflicts = myththemes
 	conflicts = mythplugins-mythvideo
 	conflicts = mythtv
 	replaces = myththemes
 	replaces = mythplugins-mythvideo
 	replaces = mythtv
-	source = git+https://github.com/MythTV/mythtv#branch=fixes/30
+	source = git+https://github.com/MythTV/mythtv#branch=fixes/31
 	source = mythbackend.service
 	source = 99-mythbackend.rules
 	source = sysusers.d
diff --git a/PKGBUILD b/PKGBUILD
index aaf8296e3d57..80ada7452336 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -7,7 +7,7 @@
 # Contributor: dorphell <dorphell@archlinux.org>
 
 pkgname=mythtv-git
-pkgver=30+fixes.20200204.3e9e8353
+pkgver=31+fixes.20200328.c8c59f55
 pkgrel=1
 pkgdesc="A Homebrew PVR project"
 arch=('x86_64')
@@ -19,18 +19,18 @@ depends=('libass' 'qt5-script' 'libavc1394' 'fftw' 'exiv2' 'taglib' 'libva'
          'mysql-python' 'libxnvctrl' 'libhdhomerun' 'libbluray')
 makedepends=('git' 'help2man' 'yasm' 'libmariadbclient' 'libxml2' 'libcec'
              'libcdio' 'lirc' 'perl-io-socket-inet6' 'perl-libwww' 'perl-dbd-mysql'
-             'python2-lxml' 'perl-xml-simple' 'perl-xml-xpath')
+             'python-lxml' 'perl-xml-simple' 'perl-xml-xpath')
 optdepends=('glew: for GPU commercial flagging'
             'libcec: for consumer electronics control capabilities'
             'libxml2: to read blu-ray metadata'
             'mariadb: Database-Backend for server deployment'
             'mariadb-clients: Database-Frontend for client deployment'
-            'python2-future: for metadata-lookup / cover art'
-            'python2-requests: for metadata-lookup / cover art'
-            'python2-requests-cache: for metadata-lookup / cover art')
+            'python-future: for metadata-lookup / cover art'
+            'python-requests: for metadata-lookup / cover art'
+            'python-requests-cache: for metadata-lookup / cover art')
 conflicts=('myththemes' 'mythplugins-mythvideo' 'mythtv')
 replaces=('myththemes' 'mythplugins-mythvideo' 'mythtv')
-source=("git+https://github.com/MythTV/mythtv#branch=fixes/30"
+source=("git+https://github.com/MythTV/mythtv#branch=fixes/31"
         'mythbackend.service'
         '99-mythbackend.rules'
         'sysusers.d')
@@ -41,13 +41,7 @@ sha256sums=('SKIP'
 
 pkgver() {
   cd "${srcdir}/mythtv/mythtv"
-  echo -n "30+fixes.$(git show -s --format=%cd --date=short | tr -d -).$(git rev-parse --short=8 HEAD)"
-}
-
-prepare() {
-  cd "${srcdir}/mythtv/mythtv"
-
-  find 'bindings/python' 'contrib' 'programs/scripts' -type f | xargs sed -i 's@^#!.*python$@#!/usr/bin/python2@'
+  echo -n "31+fixes.$(git show -s --format=%cd --date=short | tr -d -).$(git rev-parse --short=8 HEAD)"
 }
 
 build() {
@@ -65,7 +59,6 @@ build() {
               --enable-libx264 \
               --enable-libx265 \
               --enable-vaapi \
-              --python=python2 \
               --perl-config-opts=INSTALLDIRS=vendor
   make
 }