3 files changed, 7 insertions, 36 deletions
diff --git a/abs/core/argon2/PKGBUILD b/abs/core/argon2/PKGBUILD
index 531ccfb..928c432 100644
--- a/abs/core/argon2/PKGBUILD
+++ b/abs/core/argon2/PKGBUILD
@@ -1,47 +1,35 @@
 # Maintainer: Baptiste Jonglez <baptiste--aur at jonglez dot org>
 
 pkgname=argon2
-pkgver=20171227
+pkgver=20190702
 pkgrel=3
 pkgdesc='A password-hashing function (reference C implementation)'
 arch=('x86_64')
 url='https://github.com/P-H-C/phc-winner-argon2'
 license=('Apache' 'custom:CC0')
 depends=('glibc')
-install=argon2.install
-source=("https://github.com/P-H-C/phc-winner-argon2/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz"
-        'libargon2.pc')
-sha256sums=('eaea0172c1f4ee4550d1b6c9ce01aab8d1ab66b4207776aa67991eb5872fdcd8'
-            '4189ce6c183319ceaf2c4ec96facd424deeaa9e2819efb7511893bcf3ef5c836')
-
-prepare() {
-  cd "$srcdir/phc-winner-$pkgname-$pkgver"
-
-  # Copy and prepare custom pkg-config file
-  cp "${srcdir}/libargon2.pc" libargon2.pc
-  sed -i -e "s/@UPSTREAM_VER@/${pkgver}/" libargon2.pc
-}
+provides=('libargon2.so')
+source=("https://github.com/P-H-C/phc-winner-argon2/archive/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+sha256sums=('daf972a89577f8772602bf2eb38b6a3dd3d922bf5724d45e7f9589b5e830442c')
 
 build() {
   cd "$srcdir/phc-winner-$pkgname-$pkgver"
 
-  make OPTTARGET=none
+  make OPTTARGET='none' LIBRARY_REL='lib'
 }
 
 check() {
   cd "$srcdir/phc-winner-$pkgname-$pkgver"
 
-  make OPTTARGET=none test
+  make OPTTARGET='none' LIBRARY_REL='lib' test
 }
 
 package() {
   cd "$srcdir/phc-winner-$pkgname-$pkgver"
 
-  make OPTTARGET=none DESTDIR="$pkgdir" install
+  make OPTTARGET='none' LIBRARY_REL='lib' DESTDIR="$pkgdir" install
 
   install -D -m0644 LICENSE "${pkgdir}/usr/share/licenses/argon2/LICENSE"
-
-  install -D -m0644 libargon2.pc "${pkgdir}/usr/lib/pkgconfig/libargon2.pc"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/abs/core/argon2/argon2.install b/abs/core/argon2/argon2.install
deleted file mode 100644
index 65b9e24..0000000
--- a/abs/core/argon2/argon2.install
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-
-post_upgrade() {
-  # clean up upstream soname mess
-  rm -f usr/lib/libargon2.so.0
-}
diff --git a/abs/core/argon2/libargon2.pc b/abs/core/argon2/libargon2.pc
deleted file mode 100644
index c41e1c0..0000000
--- a/abs/core/argon2/libargon2.pc
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=/usr
-exec_prefix=${prefix}
-libdir=${prefix}/lib
-includedir=${prefix}/include
-
-Name: libargon2
-Description: Development libraries for libargon2
-Version: @UPSTREAM_VER@
-Libs: -L${libdir} -largon2 -lrt -ldl
-Cflags:
-URL: https://github.com/P-H-C/phc-winner-argon2