Merge branch 'sr.2019.08.07' into 'master'

Misc changes, 2019.08.07

See merge request adelie/packages!315

4 files changed, 38 insertions, 14 deletions

diff --git a/user/argp-standalone/APKBUILD b/user/argp-standalone/APKBUILD
index 846ed4c61..8bb36de5f 100644
--- a/user/argp-standalone/APKBUILD
+++ b/user/argp-standalone/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=argp-standalone
 pkgver=1.3
-pkgrel=4
+pkgrel=5
 pkgdesc="Hierarchial argument parsing library broken out from glibc"
 url="http://www.lysator.liu.se/~nisse/misc/"
 arch="all"
@@ -15,15 +15,13 @@ source="http://www.lysator.liu.se/~nisse/misc/$pkgname-$pkgver.tar.gz
 	gnu89-inline.patch
 	"
 
-builddir="$srcdir"/$pkgname-$pkgver
 prepare() {
 	default_prepare
-	cd "$builddir"
 	autoreconf -vif
 }
 
 build() {
-	cd "$builddir"
+	export CFLAGS="$CFLAGS -fPIC"
 	./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
@@ -39,7 +37,6 @@ check() {
 }
 
 package() {
-	cd "$builddir"
 	install -D -m644 argp.h "$pkgdir"/usr/include/argp.h
 	install -D -m755 libargp.a "$pkgdir"/usr/lib/libargp.a
 }
diff --git a/user/musl-obstack/APKBUILD b/user/musl-obstack/APKBUILD
index a7466fc96..47ca39a43 100644
--- a/user/musl-obstack/APKBUILD
+++ b/user/musl-obstack/APKBUILD
@@ -2,7 +2,7 @@
 # Maintainer: A. Wilcox <awilfox@adelielinux.org>
 pkgname=musl-obstack
 pkgver=1.1
-pkgrel=0
+pkgrel=1
 pkgdesc="Standalone library to implement obstack functionality"
 url=" "
 arch="all"
@@ -13,7 +13,7 @@ subpackages="$pkgname-dev"
 source="musl-obstack-$pkgver.tar.gz::https://github.com/pullmoll/musl-obstack/archive/v$pkgver.tar.gz"
 
 build() {
-	cd "$builddir"
+	export CFLAGS="$CFLAGS -fPIC"
 	./bootstrap.sh
 	./configure \
 		--build=$CBUILD \
@@ -26,12 +26,10 @@ build() {
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
 	make DESTDIR="$pkgdir" install
 }
 
diff --git a/user/py3-psycopg2/APKBUILD b/user/py3-psycopg2/APKBUILD
new file mode 100644
index 000000000..1d78e60b8
--- /dev/null
+++ b/user/py3-psycopg2/APKBUILD
@@ -0,0 +1,28 @@
+# Contributor: Fabian Affolter <fabian@affolter-engineering.ch>
+# Maintainer: 
+pkgname=py3-psycopg2
+_pkgname=psycopg2
+_p="${_pkgname#?}"
+_p="${_pkgname%"$_p"}"
+pkgver=2.8.3
+pkgrel=0
+pkgdesc="PostgreSQL adapter for python"
+url="http://initd.org/psycopg"  # No HTTPS
+arch="all"
+options="!check"  # Requires a running PostgreSQL server.
+# Certified net clean
+license="LGPL-3.0+ WITH OpenSSL-link-exception"
+depends="python3"
+makedepends="postgresql-dev python3-dev"
+source="https://files.pythonhosted.org/packages/source/$_p/$_pkgname/$_pkgname-$pkgver.tar.gz"
+builddir="$srcdir/$_pkgname-$pkgver"
+
+build() {
+	python3 setup.py build
+}
+
+package() {
+	python3 setup.py install --prefix=/usr --root="$pkgdir"
+}
+
+sha512sums="74268f6d05922c968d46ad62a49b4af54dc30463daa67cc0f32d5930c366596f9a1b2f368f2b38c8a9d45bfdcffb13be469a5cbf3911c62d163bea5c7a3ad928  psycopg2-2.8.3.tar.gz"
diff --git a/user/utf8proc/APKBUILD b/user/utf8proc/APKBUILD
index a878a0abd..4b8d6ac3a 100644
--- a/user/utf8proc/APKBUILD
+++ b/user/utf8proc/APKBUILD
@@ -4,13 +4,14 @@ pkgname=utf8proc
 pkgver=2.4.0
 pkgrel=0
 pkgdesc="C library for processing UTF-8 data"
-url=" "
+url="http://juliastrings.github.io/utf8proc"
 arch="all"
 license="MIT AND Unicode-DFS-2016"
 depends=""
 makedepends=""
 subpackages="$pkgname-dev"
-source="utf8proc-$pkgver.tar.gz::https://github.com/JuliaStrings/utf8proc/archive/v$pkgver.tar.gz"
+source="$pkgname-$pkgver.tar.gz::https://github.com/JuliaStrings/utf8proc/archive/v$pkgver.tar.gz
+	https://dev.sick.bike/dist/$pkgname-testdata-$pkgver.tar.gz"
 
 build() {
 	if [ "$CBUILD" != "$CHOST" ]; then
@@ -27,12 +28,12 @@ build() {
 }
 
 check() {
-	cd "$builddir"/build
-	CTEST_OUTPUT_ON_FAILURE=TRUE ctest
+	make check
 }
 
 package() {
 	make DESTDIR="$pkgdir" -C build install
 }
 
-sha512sums="2bbd056b488cd30faca26618389d8af84edc39ade9b705e147b676bf39eee65b40239d01c32c46dfc2a289d79e869ed1bb3c347365603dcaab2f69e34427441a  utf8proc-2.4.0.tar.gz"
+sha512sums="2bbd056b488cd30faca26618389d8af84edc39ade9b705e147b676bf39eee65b40239d01c32c46dfc2a289d79e869ed1bb3c347365603dcaab2f69e34427441a  utf8proc-2.4.0.tar.gz
+1d41e9138ef2f41a0bf79e0613695c516da87f79f53032476d585f91040f9c6231f4e67944b43ffa16d7d96cfd3841c15d7f09a7178f45ac6b6b3585e97050fc  utf8proc-testdata-2.4.0.tar.gz"