Remove python2 support

Signed-off-by: Maxime “pep” Buquet <pep@bouah.net>

2 files changed, 12 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 4861de2f2133..e44e9c311243 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,16 @@
 pkgbase = python-xeddsa-git
 	pkgdesc = A python implementation of the XEdDSA signature scheme
-	pkgver = r55.6206921
+	pkgver = r66.444715a
 	pkgrel = 1
 	url = https://github.com/Syndace/python-xeddsa
 	arch = any
 	license = MIT
+	makedepends = git
 	makedepends = python-setuptools
-	makedepends = python2-setuptools
 	makedepends = cmake
 	makedepends = libsodium
 	source = python-xeddsa::git+https://github.com/Syndace/python-xeddsa.git
 	sha256sums = SKIP
 
 pkgname = python-xeddsa-git
-	depends = python-pynacl
-	depends = python-xeddsa-ref10-git
-	provides = python-xeddsa
-	conflicts = python-xeddsa
-
-pkgname = python2-xeddsa-git
-	depends = python2-pynacl
-	depends = python-xeddsa-ref10-git
-	provides = python2-xeddsa
-	conflicts = python2-xeddsa
-
-pkgname = python-xeddsa-ref10-git
 
diff --git a/PKGBUILD b/PKGBUILD
index 5ecba59c408f..0ee1d8a42559 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,16 +1,15 @@
 # Maintainer: Maxime "pep" Buquet <archlinux@bouah.net>
 
 _pkgname=python-xeddsa
-_pkgname2=python2-xeddsa
 pkgbase=${_pkgname}-git
-pkgname=("${_pkgname}-git" "${_pkgname2}-git" "${_pkgname}-ref10-git")
-pkgver=r55.6206921
+pkgname=${pkgbase}
+pkgver=r66.444715a
 pkgrel=1
 pkgdesc="A python implementation of the XEdDSA signature scheme"
 url='https://github.com/Syndace/python-xeddsa'
 license=('MIT')
 arch=('any')
-makedepends=('python-setuptools' 'python2-setuptools' 'cmake' 'libsodium')
+makedepends=('git' 'python-setuptools' 'cmake' 'libsodium')
 source=("${_pkgname}::git+https://github.com/Syndace/python-xeddsa.git")
 sha256sums=('SKIP')
 
@@ -20,36 +19,21 @@ pkgver() {
 }
 
 build() {
-    cd "${_pkgname}/ref10"
+    cd ${_pkgname}
+    python3 setup.py build
+
+    cd ref10
     mkdir -p build && cd build
     cmake ..
 }
 
-package_python-xeddsa-ref10-git() {
+package() {
     cd ${_pkgname}
+    python3 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
+
     install -m755 -d "${pkgdir}/usr/lib"
     install -Dm 644 \
       ref10/bin/libcrypto_scalarmult_dynamic.so \
       ref10/bin/libcrypto_sign_dynamic.so \
       "${pkgdir}/usr/lib"
 }
-
-package_python-xeddsa-git() {
-    depends=('python-pynacl' 'python-xeddsa-ref10-git')
-    provides=("${_pkgname}")
-    conflicts=("${_pkgname}")
-
-    cd ${_pkgname}
-
-    python3 setup.py install --root="${pkgdir}" --optimize=1
-}
-
-package_python2-xeddsa-git() {
-    depends=('python2-pynacl' 'python-xeddsa-ref10-git')
-    provides=("${_pkgname2}")
-    conflicts=("${_pkgname2}")
-
-    cd ${_pkgname}
-
-    python2 setup.py install --root="${pkgdir}" --optimize=1
-}