summarylogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.SRCINFO25
-rw-r--r--PKGBUILD53
2 files changed, 27 insertions, 51 deletions
diff --git a/.SRCINFO b/.SRCINFO
index 8f91c8ca8ad3..0fa569d72e56 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,27 +1,20 @@
pkgbase = python-xeddsa-git
pkgdesc = A python implementation of the XEdDSA signature scheme
- pkgver = r37.d0f7eef
- pkgrel = 3
+ pkgver = r75.5b6b93b
+ pkgrel = 2
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 = glibc
+ depends = python-libnacl
depends = python-pynacl
- depends = python-xeddsa-ref10-git
provides = python-xeddsa
conflicts = python-xeddsa
+ source = python-xeddsa::git+https://github.com/Syndace/python-xeddsa.git
+ sha256sums = SKIP
-pkgname = python2-xeddsa-git
- depends = python2-pynacl
- depends = python-xeddsa-ref10-git
- provides = python2-xeddsa
- conflicts = python2-xeddsa
-
-pkgname = python-xeddsa-ref10-git
-
+pkgname = python-xeddsa-git
diff --git a/PKGBUILD b/PKGBUILD
index f63ea11fb343..1a7312efbc38 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,59 +1,42 @@
# 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=r37.d0f7eef
-pkgrel=3
+pkgname=${pkgbase}
+pkgver=r75.5b6b93b
+pkgrel=2
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' 'libsodium')
+makedepends=('git' 'python-setuptools' 'cmake' 'libsodium')
+depends=('glibc' 'python-libnacl' 'python-pynacl')
source=("${_pkgname}::git+https://github.com/Syndace/python-xeddsa.git")
sha256sums=('SKIP')
+conflicts=(${_pkgname})
+provides=(${_pkgname})
pkgver() {
cd ${_pkgname}
printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
}
-prepare() {
- cd "${_pkgname}/ref10"
- sed -i -e 's,usr/local/include,usr/include,' Makefile
-}
-
build() {
- cd "${_pkgname}/ref10"
- make
-}
-
-package_python-xeddsa-ref10-git() {
cd ${_pkgname}
- install -m755 -d "${pkgdir}/usr/lib"
- install -Dm 644 \
- ref10/bin/dynamic/libcrypto_scalarmult.so \
- ref10/bin/dynamic/libcrypto_sign.so \
- "${pkgdir}/usr/lib"
-}
+ python3 setup.py build
-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
+ cd ref10
+ mkdir -p build && cd build
+ cmake ..
}
-package_python2-xeddsa-git() {
- depends=('python2-pynacl' 'python-xeddsa-ref10-git')
- provides=("${_pkgname2}")
- conflicts=("${_pkgname2}")
-
+package() {
cd ${_pkgname}
+ python3 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
- python2 setup.py install --root="${pkgdir}" --optimize=1
+ install -m755 -d "${pkgdir}/usr/lib"
+ install -Dm 644 \
+ ref10/bin/libcrypto_scalarmult_dynamic.so \
+ ref10/bin/libcrypto_sign_dynamic.so \
+ "${pkgdir}/usr/lib"
}