From 45a491d4515f40c8218cc99c2284f09ed0108f61 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sat, 10 Feb 2018 13:07:45 -0600
Subject: main/nettle: modernise, add test suite

---
 main/ncurses/APKBUILD | 20 +++++++++++---------
 main/nettle/APKBUILD  | 19 ++++++++++---------
 2 files changed, 21 insertions(+), 18 deletions(-)

(limited to 'main')

diff --git a/main/ncurses/APKBUILD b/main/ncurses/APKBUILD
index 32e05af7ee..604bd39377 100644
--- a/main/ncurses/APKBUILD
+++ b/main/ncurses/APKBUILD
@@ -1,17 +1,18 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=ncurses
-pkgver=6.0_p20171125
+pkgver=6.0_p20180121
 _ver=${pkgver%_p*}-${pkgver#*_p}
 pkgrel=0
 pkgdesc="Console display library"
 url="https://www.gnu.org/software/ncurses/"
 arch="all"
-license=MIT
+options="!check"  # "tests" are actual demo programs, not a test suite.
+license="MIT"
 depends=
 makedepends_build="ncurses"
 source="http://invisible-mirror.net/archives/ncurses/current/ncurses-$_ver.tgz"
-subpackages="$pkgname-static $pkgname-dev $pkgname-doc
-	$pkgname-terminfo-base:base $pkgname-terminfo $pkgname-libs"
+subpackages="$pkgname-static $pkgname-dev $pkgname-doc $pkgname-libs
+	$pkgname-terminfo-base:base:noarch $pkgname-terminfo:terminfo:noarch"
 
 builddir="$srcdir"/ncurses-$_ver
 
@@ -29,6 +30,7 @@ build() {
 		--host=$CHOST \
 		--mandir=/usr/share/man \
 		--without-ada \
+		--without-tests \
 		--disable-termcap \
 		--disable-rpath-hack \
 		--with-pkg-config-libdir=/usr/lib/pkgconfig \
@@ -36,14 +38,13 @@ build() {
 		--with-terminfo-dirs="/etc/terminfo:/usr/share/terminfo" \
 		--enable-pc-files \
 		--with-shared \
-		--enable-widec \
-		|| return 1
-	make || return 1
+		--enable-widec
+	make
 }
 
 package() {
 	cd "$builddir"
-	make -j1 DESTDIR="$pkgdir" install || return 1
+	make -j1 DESTDIR="$pkgdir" install
 
 	# Install basic terms in /etc/terminfo
 	for i in ansi console dumb linux rxvt screen sun vt52 vt100 vt102 \
@@ -73,6 +74,7 @@ dev() {
 }
 
 terminfo() {
+	pkgdesc="$pkgdesc (other terminfo files)"
 	depends="$pkgname-terminfo-base"
 	rm -rf $subpkgdir
 	mkdir -p $subpkgdir/usr/share
@@ -100,4 +102,4 @@ static() {
 	mv "$pkgdir"/usr/lib/*.a "$subpkgdir"/usr/lib/
 }
 
-sha512sums="b06336a4696d5d5195177c0226f34aefebff05035247d43e1b958fb2098efb0fc2bf5a3c9d402c7c5e8fec65d03f5f290a84ef624f4a2f9348499551c5f4f09b  ncurses-6.0-20171125.tgz"
+sha512sums="f233a0630df01d96e01c5fabfb8a3d96860c9d8827c910019af410ee1b3190979a8f357ca292b083914c5ef41532f068d46685d4919b4c1d9258add5fb4dc343  ncurses-6.0-20180121.tgz"
diff --git a/main/nettle/APKBUILD b/main/nettle/APKBUILD
index 1b961171c1..3b9651c66e 100644
--- a/main/nettle/APKBUILD
+++ b/main/nettle/APKBUILD
@@ -27,16 +27,21 @@ build() {
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
 		--enable-shared \
-		--disable-openssl \
-		|| return 1
-	make || return 1
+		--disable-openssl
+	make
 	# strip comments in fields from .pc as it confuses pkgconf
-	sed -i -e 's/ \#.*//' *.pc || return 1
+	sed -i -e 's/ \#.*//' *.pc
+}
+
+check() {
+	cd "$builddir"
+	make -C examples  # required for rsa-encrypt
+	make check
 }
 
 package() {
 	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
 utils() {
@@ -45,9 +50,5 @@ utils() {
 	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
 }
 
-md5sums="10f969f78a463704ae73529978148dbe  nettle-3.3.tar.gz
-b3a89964557b9fca040a84e9217b4b01  nettle-2.4-makefile.patch"
-sha256sums="46942627d5d0ca11720fec18d81fc38f7ef837ea4197c1f630e71ce0d470b11e  nettle-3.3.tar.gz
-e903bc46375df777d3074e44f9ee9ee166058cc8bb103d748f7981195031b797  nettle-2.4-makefile.patch"
 sha512sums="271981d89766f151af3cdc4e5fc43c438222f0f6f44475bad114f4209955b5235fced6526c7abca001cca223e8cfcd2a6bf389b160b305a499e7acf52425ec70  nettle-3.3.tar.gz
 c7d9741a7a37d225f3f0db16d355e13b04cc0f1ac56882a6ff31ef15c1a1a0aee7a70cf1ec8bbf2c46b9b0dcec153da7a7aa6b8909a72d76dd4d669cbbaceaa4  nettle-2.4-makefile.patch"
-- 
cgit v1.2.3