community/namecoin: rebuild against protobuf 3.5.0; modernize

1 files changed, 19 insertions, 15 deletions

diff --git a/community/namecoin/APKBUILD b/community/namecoin/APKBUILD
index 243770286f4..8b957f3336d 100644
--- a/community/namecoin/APKBUILD
+++ b/community/namecoin/APKBUILD
@@ -33,55 +33,59 @@ build() {
 		--with-utils \
 		--disable-ccache \
 		--disable-static \
-		--enable-hardening \
-		|| return 1
-	make || return 1
+		--enable-hardening
+	make
+}
+
+check() {
+	cd "$builddir"
+	make check
 }
 
 package() {
 	cd "$builddir"
-	make install DESTDIR="$pkgdir" || return 1
-	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname || return 1
-	install -m600 -D "$srcdir"/$pkgname.conf "$pkgdir"/etc/$pkgname.conf || return 1
+	make install DESTDIR="$pkgdir"
+	install -m755 -D "$srcdir"/$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
+	install -m600 -D "$srcdir"/$pkgname.conf "$pkgdir"/etc/$pkgname.conf
 	rm -f "$pkgdir"/usr/lib/*.la
 }
 
 qt() {
 	pkgdesc="Namecoin with a Qt frontend & QR Code support"
 	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/$pkgname-qt "$subpkgdir"/usr/bin/ || return 1
+	mv "$pkgdir"/usr/bin/$pkgname-qt "$subpkgdir"/usr/bin/
 }
 
 cli() {
 	pkgdesc="Namecoin CLI"
 	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/$pkgname-cli "$subpkgdir"/usr/bin/ || return 1
+	mv "$pkgdir"/usr/bin/$pkgname-cli "$subpkgdir"/usr/bin/
 }
 
 tx() {
 	pkgdesc="Namecoin TX (Transaction Tool)"
 	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/$pkgname-tx "$subpkgdir"/usr/bin/ || return 1
+	mv "$pkgdir"/usr/bin/$pkgname-tx "$subpkgdir"/usr/bin/
 }
 
 tests() {
 	pkgdesc="Namecoin & Namecoin-QT Unit Tests)"
 	mkdir -p "$subpkgdir"/usr/bin
-	chrpath -d "$pkgdir"/usr/bin/test_namecoin || return 1
-	mv "$pkgdir"/usr/bin/test_$pkgname-qt "$subpkgdir"/usr/bin/ || return 1
-	mv "$pkgdir"/usr/bin/test_$pkgname "$subpkgdir"/usr/bin/ || return 1
+	chrpath -d "$pkgdir"/usr/bin/test_namecoin
+	mv "$pkgdir"/usr/bin/test_$pkgname-qt "$subpkgdir"/usr/bin/
+	mv "$pkgdir"/usr/bin/test_$pkgname "$subpkgdir"/usr/bin/
 }
 
 bench() {
 	pkgdesc="Namecoin Benchmarking Tools"
 	mkdir -p "$subpkgdir"/usr/bin
-	mv "$pkgdir"/usr/bin/bench_$pkgname "$subpkgdir"/usr/bin/ || return 1
+	mv "$pkgdir"/usr/bin/bench_$pkgname "$subpkgdir"/usr/bin/
 }
 
 dev() {
 	mkdir -p "$subpkgdir"/usr
-	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/ || return 1
-	mv "$pkgdir"/usr/include "$subpkgdir"/usr/ || return 1
+	mv "$pkgdir"/usr/lib "$subpkgdir"/usr/
+	mv "$pkgdir"/usr/include "$subpkgdir"/usr/
 }
 
 sha512sums="48f07e68872de69c522eaa76a5f519ba0a161bdaf3ce9979bd5af2a42dd67cd3bad7d6b695f55322c0cfdbad482ee5d279331f4e7c062fef8f09dc9001c1d368  namecoin-0.13.0rc1.tar.gz