Update to r53303.7405d260471-1

2 files changed, 20 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 2755cff3936f..0a8a0f75f84a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -34,10 +34,10 @@ pkgbase = kodi-git
 	makedepends = lzo
 	makedepends = mesa
 	makedepends = nasm
-	makedepends = python2-pycryptodome
-	makedepends = python2-pillow
-	makedepends = python2-pybluez
-	makedepends = python2-simplejson
+	makedepends = python-pycryptodomex
+	makedepends = python-pillow
+	makedepends = python-pybluez
+	makedepends = python-simplejson
 	makedepends = shairplay
 	makedepends = smbclient
 	makedepends = taglib
@@ -86,15 +86,15 @@ pkgname = kodi-git
 	depends = desktop-file-utils
 	depends = hicolor-icon-theme
 	depends = mesa
-	depends = python2-pycryptodome
-	depends = python2-pillow
-	depends = python2-simplejson
+	depends = python-pycryptodomex
+	depends = python-pillow
+	depends = python-simplejson
 	depends = xorg-xdpyinfo
 	depends = shairplay
 	depends = kodi-git-bin
 	optdepends = afpfs-ng: Apple shares support
 	optdepends = bluez: Blutooth support
-	optdepends = python2-pybluez: Bluetooth support
+	optdepends = python-pybluez: Bluetooth support
 	optdepends = libplist: AirPlay support
 	optdepends = pulseaudio: PulseAudio support
 	optdepends = upower: Display battery level
@@ -119,7 +119,7 @@ pkgname = kodi-git-bin
 	depends = libxslt
 	depends = lirc
 	depends = mariadb-libs
-	depends = python2
+	depends = python
 	depends = smbclient
 	depends = taglib
 	depends = tinyxml
@@ -143,7 +143,7 @@ pkgname = kodi-git-wayland
 	depends = libxslt
 	depends = lirc
 	depends = mariadb-libs
-	depends = python2
+	depends = python
 	depends = smbclient
 	depends = taglib
 	depends = tinyxml
@@ -170,7 +170,7 @@ pkgname = kodi-git-gbm
 	depends = libxslt
 	depends = lirc
 	depends = mariadb-libs
-	depends = python2
+	depends = python
 	depends = smbclient
 	depends = taglib
 	depends = tinyxml
@@ -181,7 +181,7 @@ pkgname = kodi-git-gbm
 
 pkgname = kodi-git-eventclients
 	pkgdesc = Kodi Event Clients (master branch)
-	optdepends = python2: most eventclients are implemented in python2
+	optdepends = python: most eventclients are implemented in python
 	provides = kodi-eventclients=r53303.7405d260471
 	conflicts = kodi-eventclients
 
diff --git a/PKGBUILD b/PKGBUILD
index 5d003d1ffe92..6699ed9e44bc 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -32,7 +32,7 @@ makedepends=(
   'libbluray' 'libcdio' 'libcec' 'libgl' 'mariadb-libs' 'libmicrohttpd'
   'libmodplug' 'libmpeg2' 'libnfs' 'libplist' 'libpulse' 'libva'
   'libvdpau' 'libxrandr' 'libxslt' 'lirc' 'lzo' 'mesa' 'nasm'
-  'python2-pycryptodome' 'python2-pillow' 'python2-pybluez' 'python2-simplejson'
+  'python-pycryptodomex' 'python-pillow' 'python-pybluez' 'python-simplejson'
   'shairplay' 'smbclient' 'taglib' 'tinyxml' 'swig'
   'upower' 'giflib' 'rapidjson' 'ghostscript' 'git'
   # wayland
@@ -101,11 +101,6 @@ pkgver() {
 }
 
 prepare() {
-  # force python 'binary' as python2
-  [[ -d "$srcdir/path" ]] && rm -rf "$srcdir/path"
-  mkdir "$srcdir/path"
-  ln -s /usr/bin/python2 "$srcdir/path/python"
-
   [[ -d kodi-build-x11 ]] && rm -rf kodi-build-x11
   mkdir kodi-build-x11
   [[ -d kodi-build-wayland ]] && rm -rf kodi-build-wayland
@@ -208,14 +203,14 @@ build() {
 package_kodi-git() {
   pkgdesc="A software media player and entertainment hub for digital media (master branch)"
   depends=(
-    'desktop-file-utils' 'hicolor-icon-theme' 'mesa' 'python2-pycryptodome'
-    'python2-pillow' 'python2-simplejson' 'xorg-xdpyinfo' 'shairplay'
+    'desktop-file-utils' 'hicolor-icon-theme' 'mesa' 'python-pycryptodomex'
+    'python-pillow' 'python-simplejson' 'xorg-xdpyinfo' 'shairplay'
     "$pkgbase-bin"
   )
   optdepends=(
     'afpfs-ng: Apple shares support'
     'bluez: Blutooth support'
-    'python2-pybluez: Bluetooth support'
+    'python-pybluez: Bluetooth support'
     'libplist: AirPlay support'
     'pulseaudio: PulseAudio support'
     'upower: Display battery level'
@@ -238,11 +233,6 @@ package_kodi-git() {
      -P cmake_install.cmake
   done
 
-  # python2 is being used
-  cd "$pkgdir"
-  grep -lR '#!.*python' * | \
-    while read file; do sed -s 's/\(#!.*python\)/\12/g' -i "$file"; done
-
   # remove x11 binaries
   rm "$pkgdir/usr/lib/kodi/"{kodi-x11,kodi-xrandr}
 }
@@ -256,7 +246,7 @@ package_kodi-git-bin() {
   depends=(
     'bluez-libs' 'curl' 'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec'
     'libmicrohttpd' 'libnfs' 'libpulse' 'libva' 'libvdpau' 'libxrandr'
-    'libxslt' 'lirc' 'mariadb-libs' 'python2' 'smbclient' 'taglib'
+    'libxslt' 'lirc' 'mariadb-libs' 'python' 'smbclient' 'taglib'
     'tinyxml' "$pkgbase"
   )
 
@@ -275,7 +265,7 @@ package_kodi-git-wayland() {
   depends=(
     'bluez-libs' 'curl' 'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec'
     'libmicrohttpd' 'libnfs' 'libpulse' 'libva' 'libxkbcommon' 'libxslt'
-    'lirc' 'mariadb-libs' 'python2' 'smbclient' 'taglib' 'tinyxml'
+    'lirc' 'mariadb-libs' 'python' 'smbclient' 'taglib' 'tinyxml'
     'waylandpp' "$pkgbase"
   )
 
@@ -293,7 +283,7 @@ package_kodi-git-gbm() {
   depends=(
     'bluez-libs' 'curl' 'lcms2' 'libass' 'libbluray' 'libcdio' 'libcec'
     'libinput' 'libmicrohttpd' 'libnfs' 'libpulse' 'libva' 'libxkbcommon'
-    'libxslt' 'lirc' 'mariadb-libs' 'python2' 'smbclient' 'taglib'
+    'libxslt' 'lirc' 'mariadb-libs' 'python' 'smbclient' 'taglib'
     'tinyxml' "$pkgbase"
   )
 
@@ -308,7 +298,7 @@ package_kodi-git-eventclients() {
   pkgdesc="Kodi Event Clients (master branch)"
   provides=("kodi-eventclients=${pkgver}")
   conflicts=('kodi-eventclients')
-  optdepends=('python2: most eventclients are implemented in python2')
+  optdepends=('python: most eventclients are implemented in python')
 
   _components=(
     'kodi-eventclients-common'
@@ -325,11 +315,6 @@ package_kodi-git-eventclients() {
       -DCMAKE_INSTALL_COMPONENT="$_cmp" \
       -P cmake_install.cmake
   done
-
-  # python2 is being used
-  cd "$pkgdir"
-  grep -lR '#!.*python' * | \
-    while read file; do sed -s 's/\(#!.*python\)/\12/g' -i "$file"; done
 }
 
 # kodi-tools-texturepacker
@@ -386,9 +371,4 @@ package_kodi-git-dev() {
       -DCMAKE_INSTALL_COMPONENT="$_cmp" \
       -P cmake_install.cmake
   done
-
-  # python2 is being used
-  cd "$pkgdir"
-  grep -lR '#!.*python' * | \
-    while read file; do sed -s 's/\(#!.*python\)/\12/g' -i "$file"; done
 }