upgpkg: peda-git 71.1e62125-1

- switch to python3 like the gdb backend provides
- deduplicate python-six copy-paste

2 files changed, 19 insertions, 11 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6ff89dbd8ac5..35884610277d 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = peda-git
 	pkgdesc = PEDA - Python Exploit Development Assistance for GDB
-	pkgver = 68.69068b0
-	pkgrel = 2
+	pkgver = 71.1e62125
+	pkgrel = 1
 	url = https://github.com/longld/peda
 	install = peda.install
 	arch = any
@@ -10,7 +10,7 @@ pkgbase = peda-git
 	depends = gdb
 	depends = binutils
 	depends = nasm
-	depends = python2-six
+	depends = python-six
 	provides = peda
 	conflicts = peda
 	source = peda-git::git+https://github.com/longld/peda
diff --git a/PKGBUILD b/PKGBUILD
index 30d97e60fe74..c1392ed67bb9 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,18 +2,19 @@
 # Maintainer: Christian Rebischke <echo Q2hyaXMuUmViaXNjaGtlQGdtYWlsLmNvbQo= | base64 -d>
 
 pkgname=peda-git
-pkgver=68.69068b0
-pkgrel=2
+_gitname=peda
+pkgver=71.1e62125
+pkgrel=1
 pkgdesc="PEDA - Python Exploit Development Assistance for GDB"
 url='https://github.com/longld/peda'
 arch=('any')
 license=('custom:Creative Commons')
-depends=( 'gdb' 'binutils' 'nasm' 'python2-six')
+depends=( 'gdb' 'binutils' 'nasm' 'python-six')
 makedepends=('git')
 provides=('peda')
 conflicts=('peda')
 install='peda.install'
-source=(${pkgname}::git+https://github.com/longld/peda)
+source=(${pkgname}::git+https://github.com/longld/${_gitname})
 sha512sums=('SKIP')
 
 pkgver() {
@@ -21,16 +22,23 @@ pkgver() {
   printf "%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
+prepare() {
+  cd ${pkgname}
+  rm lib/six.py
+}
+
 build() {
   cd ${pkgname}
-  python2 -m compileall .
-  python2 -O -m compileall .
+  python -m compileall .
+  python -O -m compileall .
 }
 
 package() {
   cd ${pkgname}
-  install -Dm 644 peda.py* -t "${pkgdir}/usr/share/peda"
-  install -Dm 644 lib/* -t "${pkgdir}/usr/share/peda/lib"
+  install -Dm 644 *.py -t "${pkgdir}/usr/share/${_gitname}"
+  install -Dm 644 __pycache__/* -t "${pkgdir}/usr/share/${_gitname}/__pycache__"
+  install -Dm 644 lib/*.py -t "${pkgdir}/usr/share/${_gitname}/lib"
+  install -Dm 644 lib/__pycache__/* -t "${pkgdir}/usr/share/${_gitname}/lib/__pycache__"
   install -Dm 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
   install -Dm 644 README.md "${pkgdir}/usr/share/doc/${pkgname}/README.md"
 }