Remove python2 support

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

2 files changed, 17 insertions, 49 deletions

diff --git a/.SRCINFO b/.SRCINFO
index fce19c31d481..11f5780c4ee9 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,17 +1,12 @@
 pkgbase = python-omemo-backend-signal
 	pkgdesc = A backend for python-omemo offering compatibility with libsignal.
 	pkgver = 0.2.4.beta
-	pkgrel = 3
+	pkgrel = 4
 	url = https://github.com/Syndace/python-omemo-backend-signal
 	arch = any
 	license = MIT
 	makedepends = git
 	makedepends = python-setuptools
-	makedepends = python2-setuptools
-	source = python-omemo-backend-signal::git+https://github.com/Syndace/python-omemo-backend-signal.git#tag=v0.2.4-beta
-	sha256sums = SKIP
-
-pkgname = python-omemo-backend-signal
 	depends = python-cryptography
 	depends = python-xeddsa
 	depends = python-doubleratchet
@@ -20,14 +15,8 @@ pkgname = python-omemo-backend-signal
 	depends = python-omemo-syndace
 	provides = python-omemo-backend-signal
 	conflicts = python-omemo-backend-signal
+	source = python-omemo-backend-signal::git+https://github.com/Syndace/python-omemo-backend-signal.git#tag=v0.2.4-beta
+	sha256sums = SKIP
 
-pkgname = python2-omemo-backend-signal
-	depends = python2-cryptography
-	depends = python2-xeddsa
-	depends = python2-doubleratchet
-	depends = python2-x3dh
-	depends = python2-protobuf
-	depends = python2-omemo-syndace
-	provides = python2-omemo-backend-signal
-	conflicts = python2-omemo-backend-signal
+pkgname = python-omemo-backend-signal
 
diff --git a/PKGBUILD b/PKGBUILD
index 0008d5fabdbd..592adefca440 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,58 +1,37 @@
 # Maintainer: Maxime "pep" Buquet <archlinux@bouah.net>
 
 _pkgname=python-omemo-backend-signal
-_pkgname2=python2-omemo-backend-signal
 _tag=v0.2.4-beta
-pkgname=("python-omemo-backend-signal" "python2-omemo-backend-signal")
+pkgname=${_pkgname}
 pkgver=0.2.4.beta
-pkgrel=3
+pkgrel=4
 pkgdesc="A backend for python-omemo offering compatibility with libsignal."
 url="https://github.com/Syndace/${_pkgname}"
 license=('MIT')
 arch=('any')
-makedepends=('git' 'python-setuptools' 'python2-setuptools')
+makedepends=('git' 'python-setuptools')
 source=("${_pkgname}::git+https://github.com/Syndace/${_pkgname}.git#tag=${_tag}")
 sha256sums=('SKIP')
+depends=('python-cryptography'
+         'python-xeddsa'
+         'python-doubleratchet'
+         'python-x3dh'
+         'python-protobuf'
+         'python-omemo-syndace')
+provides=("${_pkgname}")
+conflicts=("${_pkgname}")
 
 pkgver() {
     cd ${_pkgname}
     printf "%s" "$(git describe --tag | sed 's/^v//;s/-/./')"
 }
 
-build_python-omemo-backend-signal() {
+build() {
     cd ${_pkgname}
     python3 setup.py build
 }
 
-build_python2-omemo-backend-signal() {
-    cd ${_pkgname}
-    python2 setup.py build
-}
-
-package_python-omemo-backend-signal() {
-    depends=('python-cryptography'
-             'python-xeddsa'
-             'python-doubleratchet'
-             'python-x3dh'
-             'python-protobuf'
-             'python-omemo-syndace')
-    provides=("${_pkgname}")
-    conflicts=("${_pkgname}")
-
+package() {
     cd ${_pkgname}
     python3 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
 }
-
-package_python2-omemo-backend-signal() {
-    depends=('python2-cryptography'
-             'python2-xeddsa'
-             'python2-doubleratchet'
-             'python2-x3dh'
-             'python2-protobuf'
-             'python2-omemo-syndace')
-    provides=("${_pkgname2}")
-    conflicts=("${_pkgname2}")
-
-    cd ${_pkgname}
-    python2 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
-}