From e92b75ba5b96b9007ecd429aafa0cbea1af2404e Mon Sep 17 00:00:00 2001
From: Alessio Sergi <al3hex@gmail.com>
Date: Mon, 15 Oct 2018 18:43:30 +0200
Subject: [PATCH] python-argon2: build against system libargon2

---
 .../patches/disable-sse-for-cross.patch       | 23 -------------------
 srcpkgs/python-argon2/template                | 12 ++++------
 2 files changed, 4 insertions(+), 31 deletions(-)
 delete mode 100644 srcpkgs/python-argon2/patches/disable-sse-for-cross.patch

diff --git a/srcpkgs/python-argon2/patches/disable-sse-for-cross.patch b/srcpkgs/python-argon2/patches/disable-sse-for-cross.patch
deleted file mode 100644
index a5c00808b1a..00000000000
--- a/srcpkgs/python-argon2/patches/disable-sse-for-cross.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Source: Rasmus Thomsen <rasmus.thomsen@protonmail.com>
-Upstream: No
-Reason: We can't cross build SSE extensions to ARM* platforms
---- setup.py
-+++ setup.py
-@@ -19,9 +19,15 @@ from setuptools.command.install import install
- NAME = "argon2_cffi"
- PACKAGES = find_packages(where="src")
- 
-+CROSS_BUILD = os.environ.get("CROSS_BUILD", False)
-+
- # Optimized version requires SSE2 extensions.  They have been around since
- # 2001 so we try to compile it on every recent-ish x86.
--optimized = platform.machine() in ("i686", "x86", "x86_64", "AMD64")
-+# Do not build these during cross builts, as this detects the hosts's arch
-+optimized = False
-+
-+if not CROSS_BUILD:
-+       optimized = platform.machine() in ("i686", "x86", "x86_64", "AMD64")
- 
- CFFI_MODULES = ["src/argon2/_ffi_build.py:ffi"]
- lib_base = os.path.join("extras", "libargon2", "src")
-
diff --git a/srcpkgs/python-argon2/template b/srcpkgs/python-argon2/template
index 1ef2be85086..be3791e8f51 100644
--- a/srcpkgs/python-argon2/template
+++ b/srcpkgs/python-argon2/template
@@ -1,12 +1,12 @@
 # Template file for 'python-argon2'
 pkgname=python-argon2
 version=18.3.0
-revision=1
+revision=2
 wrksrc="argon2_cffi-${version}"
 build_style=python-module
 pycompile_module="argon2"
 hostmakedepends="python-setuptools python3-setuptools python-cffi python3-cffi"
-makedepends="libffi-devel python-cffi python3-cffi python-devel python3-devel"
+makedepends="libargon2-devel python-devel python3-devel"
 depends="python-cffi python-enum34 python-six"
 short_desc="CFFI-based Argon2 Bindings for Python2"
 maintainer="Rasmus Thomsen <rasmus.thomsen@protonmail.com>"
@@ -15,11 +15,7 @@ homepage="https://argon2-cffi.readthedocs.io/"
 distfiles="${PYPI_SITE}/a/argon2_cffi/argon2_cffi-${version}.tar.gz"
 checksum=003f588de43a817af6ecc1c06103fa0801de63849db3cb0f37576bb2da29043d
 
-pre_build() {
-	if [ "$CROSS_BUILD" ]; then
-		export CROSS_BUILD=True
-	fi
-}
+export ARGON2_CFFI_USE_SYSTEM=1
 
 post_install() {
 	vlicense LICENSE
@@ -28,7 +24,7 @@ post_install() {
 python3-argon2_package() {
 	depends="python3-cffi python3-six"
 	pycompile_module="argon2"
-	short_desc="${short_desc/python2/python3}"
+	short_desc="${short_desc/Python2/Python3}"
 	pkg_install() {
 		vmove usr/lib/python3*
 		vlicense LICENSE