summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO10
-rw-r--r--PKGBUILD41
2 files changed, 12 insertions, 39 deletions
diff --git a/.SRCINFO b/.SRCINFO
index b1005cf197b3..6d0bb6ff7903 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -7,17 +7,9 @@ pkgbase = python-x3dh
license = MIT
makedepends = git
makedepends = python-setuptools
- makedepends = python2-setuptools
+ depends = python-xeddsa
source = python-x3dh::git+https://github.com/Syndace/python-x3dh.git#tag=v0.5.9-beta
sha256sums = SKIP
pkgname = python-x3dh
- depends = python-xeddsa
- provides = python-x3dh
- conflicts = python-x3dh
-
-pkgname = python2-x3dh
- depends = python2-xeddsa
- provides = python2-x3dh
- conflicts = python2-x3dh
diff --git a/PKGBUILD b/PKGBUILD
index 740983665393..a475e962d0dd 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,49 +1,30 @@
# Maintainer: Maxime "pep" Buquet <archlinux@bouah.net>
-_pkgname=python-x3dh
-_pkgname2=python2-x3dh
_tag=v0.5.9-beta
-pkgbase=${_pkgname}
-pkgname=("${_pkgname}" "${_pkgname2}")
+pkgbase=${pkgname}
+pkgname=python-x3dh
pkgver=0.5.9.beta
pkgrel=2
pkgdesc="A python implementation of the Extended Triple Diffie-Hellman key agreement protocol"
-url="https://github.com/Syndace/${_pkgname}"
+url="https://github.com/Syndace/${pkgname}"
license=('MIT')
arch=('any')
-makedepends=('git' 'python-setuptools' 'python2-setuptools')
-source=("${_pkgname}::git+https://github.com/Syndace/${_pkgname}.git#tag=${_tag}")
+makedepends=('git' 'python-setuptools')
+source=("${pkgname}::git+https://github.com/Syndace/${pkgname}.git#tag=${_tag}")
sha256sums=('SKIP')
+depends=('python-xeddsa')
pkgver() {
- cd ${_pkgname}
+ cd ${pkgname}
printf "%s" "$(git describe --tags | sed -e 's/^v//;s/-/./')"
}
-build_python-x3dh() {
- cd ${_pkgname}
+build() {
+ cd ${pkgname}
python3 setup.py build
}
-build_python2-x3dh() {
- cd ${_pkgname}
- python2 setup.py build
-}
-
-package_python-x3dh() {
- depends=('python-xeddsa')
- provides=("${_pkgname}")
- conflicts=("${_pkgname}")
-
- cd ${_pkgname}
+package() {
+ cd ${pkgname}
python3 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
}
-
-package_python2-x3dh() {
- depends=('python2-xeddsa')
- provides=("${_pkgname2}")
- conflicts=("${_pkgname2}")
-
- cd ${_pkgname}
- python2 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
-}