diff --git a/community/aoetools/APKBUILD b/community/aoetools/APKBUILD
index a2d2327c1cb..a4b04923635 100644
--- a/community/aoetools/APKBUILD
+++ b/community/aoetools/APKBUILD
@@ -14,11 +14,11 @@ source="https://github.com/OpenAoE/$pkgname/archive/$pkgname-$pkgver.tar.gz"
 builddir="$srcdir/$pkgname-$pkgname-$pkgver"
 
 build() {
-	make || return 1
+	make
 }
 
 package() {
-	make PREFIX="$pkgdir" install || return 1
+	make PREFIX="$pkgdir" install
 }
 
 sha512sums="4ff8f48f20d5ce8fb795373eff959f827b2c829d71c5ac5e63bcc2102aa7205d20991b70766330eed83b13b9731486fb6db777df13ba682f65823f455421632e  aoetools-37.tar.gz"
diff --git a/community/cpufrequtils/APKBUILD b/community/cpufrequtils/APKBUILD
index 23e7ed2097d..c213ada416d 100644
--- a/community/cpufrequtils/APKBUILD
+++ b/community/cpufrequtils/APKBUILD
@@ -24,7 +24,7 @@ prepare() {
 	cd "$srcdir"/$pkgname-$pkgver
 	for i in ../*.patch; do
 		msg "Applying $i..."
-		patch -p1 < $i || return 1
+		patch -p1 < $i
 	done
 }
 
@@ -34,8 +34,7 @@ build() {
 	# we save 4k by disabling the 2.4 kernel support (PROC=false)
 	make -j1 LIBTOOL_OPT="--tag=CC --silent" \
 		NLS=false \
-		PROC=false \
-		|| return 1
+		PROC=false
 }
 
 package() {
@@ -44,7 +43,7 @@ package() {
 		NLS=false \
 		INSTALL=install \
 		DESTDIR="$pkgdir" \
-		install || return 1
+		install
 	install -D -m755 ../$pkgname.initd "$pkgdir"/etc/init.d/$pkgname
 	install -D -m644 ../$pkgname.confd "$pkgdir"/etc/conf.d/$pkgname
 }
diff --git a/community/dcadec/APKBUILD b/community/dcadec/APKBUILD
index 96188ce9a00..f2c38d41764 100644
--- a/community/dcadec/APKBUILD
+++ b/community/dcadec/APKBUILD
@@ -15,11 +15,11 @@ source="dcadec-$pkgver.tar.gz::https://github.com/foo86/dcadec/archive/v$pkgver.
 
 builddir="$srcdir"/dcadec-$pkgver
 build() {
-	make || return 1
+	make
 }
 
 package() {
-	make DESTDIR="$pkgdir" PREFIX=/usr install || return 1
+	make DESTDIR="$pkgdir" PREFIX=/usr install
 }
 
 sha512sums="94edcc0b4449882ebeb08f8b39fe44a5302731df2dad3a3e0b0f787fd7c2c3e3992fed95e6f594af516e982cec34b057aab30e6457c098df61f495a487125acb  dcadec-0.2.0.tar.gz"
diff --git a/community/dsfmt/APKBUILD b/community/dsfmt/APKBUILD
index 7ce68134cc0..54569b285e6 100644
--- a/community/dsfmt/APKBUILD
+++ b/community/dsfmt/APKBUILD
@@ -20,7 +20,7 @@ builddir="$srcdir/$_pkgname-src-$pkgver"
 _soname="lib$_pkgname.so"
 
 prepare() {
-	sed "s/@VERSION@/$pkgver/" "$srcdir"/$pkgname.pc > $pkgname.pc || return 1
+	sed "s/@VERSION@/$pkgver/" "$srcdir"/$pkgname.pc > $pkgname.pc
 	default_prepare
 }
 
@@ -39,8 +39,8 @@ build() {
 }
 
 package() {
-	install -D $_soname "$pkgdir"/usr/lib/$_soname || return 1
-	install -D dSFMT.h "$pkgdir"/usr/include/dSFMT.h || return 1
+	install -D $_soname "$pkgdir"/usr/lib/$_soname
+	install -D dSFMT.h "$pkgdir"/usr/include/dSFMT.h
 	install -D $pkgname.pc "$pkgdir"/usr/lib/pkgconfig/$pkgname.pc
 }
 
diff --git a/community/gnome-icon-theme-symbolic/APKBUILD b/community/gnome-icon-theme-symbolic/APKBUILD
index fb1842c3af0..9b062e5dec0 100644
--- a/community/gnome-icon-theme-symbolic/APKBUILD
+++ b/community/gnome-icon-theme-symbolic/APKBUILD
@@ -19,7 +19,7 @@ prepare() {
 	cd "$_builddir"
 	for i in $source; do
 		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i ;;
 		esac
 	done
 }
@@ -35,14 +35,13 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--localstatedir=/var \
-		|| return 1
-	make || return 1
+		--localstatedir=/var
+	make
 }
 
 package() {
 	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
 sha512sums="e2a662d38c5c1328f384d9bdd73ce54f4e1174a1d88763e4a5f772c2479081f11c81937ba2dc159ce250e433762f14de824516fc68209200d95dc47790471eda  gnome-icon-theme-symbolic-3.12.0.tar.xz"
diff --git a/community/homer-ui/APKBUILD b/community/homer-ui/APKBUILD
index 0a15cce0fbc..2c4d0fdb248 100644
--- a/community/homer-ui/APKBUILD
+++ b/community/homer-ui/APKBUILD
@@ -31,8 +31,8 @@ package() {
 	chown -R :www-data "$pkgdir"/usr/share/webapps/homer/store/dashboard
 	chmod 775 "$pkgdir"/usr/share/webapps/homer/store/dashboard
 	chmod 664 "$pkgdir"/usr/share/webapps/homer/store/dashboard/*
-	mv "$pkgdir"/usr/share/webapps/homer/store/dashboard "$pkgdir"/etc/homer/ || return 1
-	ln -s /etc/homer/dashboard "$pkgdir"/usr/share/webapps/homer/store/dashboard || return 1
+	mv "$pkgdir"/usr/share/webapps/homer/store/dashboard "$pkgdir"/etc/homer/
+	ln -s /etc/homer/dashboard "$pkgdir"/usr/share/webapps/homer/store/dashboard
 }
 
 sha512sums="14fe5b7064be94c01fdc1a498b635fca23df03310a5ec0fa28b7c395971286749f3b4b1abda56f1c3ebaf6d6fd9c99db317f00dead07efc999e8aa11645406ec  homer-ui-5.0.6.tar.gz
diff --git a/community/httpry/APKBUILD b/community/httpry/APKBUILD
index 31af8e7faa2..eeb27388252 100644
--- a/community/httpry/APKBUILD
+++ b/community/httpry/APKBUILD
@@ -14,14 +14,14 @@ source="https://github.com/jbittel/httpry/archive/httpry-0.1.8.tar.gz"
 builddir="$srcdir/$pkgname-$pkgname-$pkgver"
 
 build() {
-	make || return 1
+	make
 }
 
 package() {
 	install -m755 -D "$builddir"/$pkgname \
-		"$pkgdir"/usr/sbin/$pkgname  || return 1
+		"$pkgdir"/usr/sbin/$pkgname
 	install -m644 -D "$builddir"/$pkgname.1 \
-		"$pkgdir"/usr/share/man/man1/$pkgname.1  || return 1
+		"$pkgdir"/usr/share/man/man1/$pkgname.1
 }
 
 sha512sums="d242d5bd60296f1a5836c3c9449c732a77eeda69c103718e75debfeb97d528b87bf895312883f194f0a35c37c1d59e95086b1f7dd8f3ae8627428657d49cebed  httpry-0.1.8.tar.gz"
diff --git a/community/ircservices/APKBUILD b/community/ircservices/APKBUILD
index 95d731cd2c4..ef55b35c82a 100644
--- a/community/ircservices/APKBUILD
+++ b/community/ircservices/APKBUILD
@@ -32,8 +32,7 @@ build() {
 		-cc "$CC" \
 		-cflags "$CFLAGS" \
 		-bindest /usr/bin \
-		-datdest /var/lib/ircservices \
-		|| return 1
+		-datdest /var/lib/ircservices
 
 	# build targets one by one as paralell builds breaks
 	make config-check && \
@@ -48,7 +47,7 @@ package() {
 	make -j1 \
 		BINDEST="$pkgdir"/usr/bin \
 		DATDEST="$pkgdir"/var/lib/ircservices \
-		install || return 1
+		install
 
 	install -d "$pkgdir"/usr/share/man/man8
 	install docs/ircservices.8 "$pkgdir"/usr/share/man/man8/ircservices.8
diff --git a/community/java-jansi-native/APKBUILD b/community/java-jansi-native/APKBUILD
index ad35fcce1bb..5bfddc37f5b 100644
--- a/community/java-jansi-native/APKBUILD
+++ b/community/java-jansi-native/APKBUILD
@@ -24,12 +24,12 @@ package() {
 	cd "$builddir"/target
 
 	install -m644 -D $_pkgname-$pkgver.jar \
-		"$pkgdir"/usr/share/java/$_pkgname-$pkgver.jar || return 1
-	ln -sf $_pkgname-$pkgver.jar "$pkgdir"/usr/share/java/$_pkgname.jar || return 1
+		"$pkgdir"/usr/share/java/$_pkgname-$pkgver.jar
+	ln -sf $_pkgname-$pkgver.jar "$pkgdir"/usr/share/java/$_pkgname.jar
 
 	# Note: jansi expects file named libjansi.so or libjansi-x.y.so, not libjansi.so.x.y.
 	install -m755 -D native-build/target/lib/libjansi.so \
-		"$pkgdir"/usr/lib/libjansi-$pkgver.so || return 1
+		"$pkgdir"/usr/lib/libjansi-$pkgver.so
 	ln -sf libjansi-$pkgver.so "$pkgdir"/usr/lib/libjansi.so
 }
 
diff --git a/community/java-postgresql-jdbc/APKBUILD b/community/java-postgresql-jdbc/APKBUILD
index b839d171355..01177a1637f 100644
--- a/community/java-postgresql-jdbc/APKBUILD
+++ b/community/java-postgresql-jdbc/APKBUILD
@@ -23,7 +23,7 @@ build() {
 
 package() {
 	install -m 644 -D target/postgresql-$pkgver.jar \
-		"$pkgdir"/usr/share/java/$_pkgname-$pkgver.jar || return 1
+		"$pkgdir"/usr/share/java/$_pkgname-$pkgver.jar
 	ln -s $_pkgname-$pkgver.jar "$pkgdir"/usr/share/java/$_pkgname.jar
 }
 
diff --git a/community/libcmis/APKBUILD b/community/libcmis/APKBUILD
index 43116e3a922..1c8daad96a5 100644
--- a/community/libcmis/APKBUILD
+++ b/community/libcmis/APKBUILD
@@ -27,13 +27,12 @@ build() {
 		--infodir=/usr/share/info \
 		--localstatedir=/var \
 		--with-man \
-		--disable-werror \
-		|| return 1
-	make || return 1
+		--disable-werror
+	make
 }
 
 package() {
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
 client() {
diff --git a/community/libharu/APKBUILD b/community/libharu/APKBUILD
index 367162b74ff..ed86a6a05c3 100644
--- a/community/libharu/APKBUILD
+++ b/community/libharu/APKBUILD
@@ -25,7 +25,7 @@ prepare() {
 
 build() {
 	./configure --prefix=/usr
-	make || return 1
+	make
 }
 
 package() {
diff --git a/community/libquvi-scripts/APKBUILD b/community/libquvi-scripts/APKBUILD
index f17087025a1..82f66073f74 100644
--- a/community/libquvi-scripts/APKBUILD
+++ b/community/libquvi-scripts/APKBUILD
@@ -11,19 +11,18 @@ subpackages="$pkgname-dev $pkgname-doc"
 source="https://downloads.sourceforge.net/project/quvi/${pkgver%.*}/$pkgname/$pkgname-$pkgver.tar.xz"
 
 prepare() {
-	default_prepare || return 1
+	default_prepare
 	update_config_guess
 	update_config_sub
 }
 
 build() {
-	./configure --prefix=/usr \
-		|| return 1
-	make || return 1
+	./configure --prefix=/usr
+	make
 }
 
 package() {
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
 sha512sums="97de4cead30dc181da700cbf3a0ad66ee709fef17f449f75cd43e0376a4aa53c7b2174188130aaa34dcc7ddc578581111f3655cb10f4b0c92df2f75d32c72a02  libquvi-scripts-0.9.20131130.tar.xz"
diff --git a/community/lua-resty-dns/APKBUILD b/community/lua-resty-dns/APKBUILD
index 412d9d2fd62..b7169c2c818 100644
--- a/community/lua-resty-dns/APKBUILD
+++ b/community/lua-resty-dns/APKBUILD
@@ -25,8 +25,7 @@ package() {
 	local _i
 	for _i in $_luaversions; do
 		mkdir -p "$pkgdir"/usr/share/lua/$_i
-		make DESTDIR="$pkgdir" LUA_LIB_DIR="/usr/share/lua/$_i" install \
-			|| return 1
+		make DESTDIR="$pkgdir" LUA_LIB_DIR="/usr/share/lua/$_i" install
 	done
 }
 
@@ -38,7 +37,7 @@ _split() {
 	for d in usr/lib/lua usr/share/lua; do
 		if [ -d "$pkgdir"/$d/$_ver ]; then
 			mkdir -p "$subpkgdir"/$d
-			mv "$pkgdir"/$d/$_ver "$subpkgdir"/$d/ || return 1
+			mv "$pkgdir"/$d/$_ver "$subpkgdir"/$d/
 		fi
 	done
 }
diff --git a/community/lua-signal/APKBUILD b/community/lua-signal/APKBUILD
index 8a2003cf194..94f28bf384a 100644
--- a/community/lua-signal/APKBUILD
+++ b/community/lua-signal/APKBUILD
@@ -18,7 +18,7 @@ prepare() {
 	cd "$_builddir"
 	for i in $source; do
 		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i;;
 		esac
 	done
 }
diff --git a/community/lua-sleep/APKBUILD b/community/lua-sleep/APKBUILD
index f5b6315af27..e75a1ad3475 100644
--- a/community/lua-sleep/APKBUILD
+++ b/community/lua-sleep/APKBUILD
@@ -17,7 +17,7 @@ prepare() {
 	cd "$_builddir"
 	for i in $source; do
 		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
+		*.patch) msg $i; patch -p1 -i "$srcdir"/$i;;
 		esac
 	done
 }
diff --git a/community/lua-system/APKBUILD b/community/lua-system/APKBUILD
index 75de83b75ec..b05f757ea65 100644
--- a/community/lua-system/APKBUILD
+++ b/community/lua-system/APKBUILD
@@ -23,10 +23,10 @@ for _v in $_luaversions; do
 done
 
 prepare() {
-	default_prepare || return 1
+	default_prepare
 
 	local lver; for lver in $_luaversions; do
-		cp -r "$builddir" "$builddir-$lver" || return 1
+		cp -r "$builddir" "$builddir-$lver"
 	done
 }
 
@@ -35,7 +35,7 @@ build() {
 		msg "Building against Lua $lver..."
 		make -C "$builddir-$lver"/src \
 			LUA_VERSION=$lver \
-			MYCFLAGS="$CFLAGS" || return 1
+			MYCFLAGS="$CFLAGS"
 	done
 }
 
@@ -54,7 +54,7 @@ _subpackage() {
 	cd "$builddir-$lver"
 
 	make -C src LUA_VERSION=$lver DESTDIR="$subpkgdir" prefix=/usr \
-		install || return 1
+		install
 	install -m 644 -D system/init.lua "$subpkgdir"/$lmod_dir/system.lua
 
 	mkdir -p "$rockdir"
diff --git a/community/lua-term/APKBUILD b/community/lua-term/APKBUILD
index 893f780c274..985c0419211 100644
--- a/community/lua-term/APKBUILD
+++ b/community/lua-term/APKBUILD
@@ -20,17 +20,17 @@ for _v in $_luaversions; do
 done
 
 prepare() {
-	default_prepare || return 1
+	default_prepare
 
 	local lver; for lver in $_luaversions; do
-		cp -r "$builddir" "$builddir-$lver" || return 1
+		cp -r "$builddir" "$builddir-$lver"
 	done
 }
 
 build() {
 	local lver; for lver in $_luaversions; do
 		msg "Building for Lua $lver..."
-		make -C "$builddir-$lver" LUA_VER=$lver CFLAGS="$CFLAGS" || return 1
+		make -C "$builddir-$lver" LUA_VER=$lver CFLAGS="$CFLAGS"
 	done
 }
 
diff --git a/community/mysecureshell/APKBUILD b/community/mysecureshell/APKBUILD
index d70fbeb9640..d24816981a2 100644
--- a/community/mysecureshell/APKBUILD
+++ b/community/mysecureshell/APKBUILD
@@ -23,8 +23,7 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--localstatedir=/var \
-		--with-shutfile=/var/lib/misc/sftp.shut \
-		|| return 1
+		--with-shutfile=/var/lib/misc/sftp.shut
 	make all
 }
 
diff --git a/community/numix-themes/APKBUILD b/community/numix-themes/APKBUILD
index 29ef185b42e..317632bc1f1 100644
--- a/community/numix-themes/APKBUILD
+++ b/community/numix-themes/APKBUILD
@@ -37,7 +37,7 @@ _mv() {
 	for _i; do
 		msg "moving $_i"
 		mv "$pkgdir"/usr/share/themes/Numix/src/$_i  \
-			"$subpkgdir"/usr/share/themes/Numix || return 1
+			"$subpkgdir"/usr/share/themes/Numix
 	done
 	# index.theme remains in src despite being moved in package().
 	rm -f "$pkgdir"/usr/share/themes/Numix/src/index.theme 2>/dev/null || true
diff --git a/community/p8-platform/APKBUILD b/community/p8-platform/APKBUILD
index b890724b0e8..e0671af82a3 100644
--- a/community/p8-platform/APKBUILD
+++ b/community/p8-platform/APKBUILD
@@ -18,13 +18,13 @@ builddir="$srcdir"/platform-p8-platform-$pkgver
 build() {
 	mkdir "$builddir/build"
 	cd "$builddir/build"
-	cmake -DCMAKE_BUILD_TYPE=None -DBUILD_SHARED_LIBS=1 -DCMAKE_INSTALL_PREFIX=/usr .. || return 1
-	make || return 1
+	cmake -DCMAKE_BUILD_TYPE=None -DBUILD_SHARED_LIBS=1 -DCMAKE_INSTALL_PREFIX=/usr ..
+	make
 }
 
 package() {
 	cd "$builddir/build"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
 dev() {
diff --git a/community/perl-config-any/APKBUILD b/community/perl-config-any/APKBUILD
index a00375d56d9..e924e29238a 100644
--- a/community/perl-config-any/APKBUILD
+++ b/community/perl-config-any/APKBUILD
@@ -28,7 +28,7 @@ build() {
 }
 
 package() {
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
diff --git a/community/perl-digest-bubblebabble/APKBUILD b/community/perl-digest-bubblebabble/APKBUILD
index a69565179aa..0123bef6316 100644
--- a/community/perl-digest-bubblebabble/APKBUILD
+++ b/community/perl-digest-bubblebabble/APKBUILD
@@ -29,7 +29,7 @@ check() {
 }
 
 package() {
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
diff --git a/community/perl-http-lite/APKBUILD b/community/perl-http-lite/APKBUILD
index 1968a1f0dad..f91e4688c8b 100644
--- a/community/perl-http-lite/APKBUILD
+++ b/community/perl-http-lite/APKBUILD
@@ -15,7 +15,7 @@ source="https://cpan.metacpan.org/authors/id/N/NE/NEILB/$_pkgreal-$pkgver.tar.gz
 builddir="$srcdir/$_pkgreal-$pkgver"
 
 prepare() {
-	default_prepare || return 1
+	default_prepare
 
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
@@ -27,7 +27,7 @@ build() {
 }
 
 package() {
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
diff --git a/community/perl-lingua-translit/APKBUILD b/community/perl-lingua-translit/APKBUILD
index 011c911900c..43118e20427 100644
--- a/community/perl-lingua-translit/APKBUILD
+++ b/community/perl-lingua-translit/APKBUILD
@@ -19,7 +19,7 @@ check() {
 }
 
 prepare() {
-	default_prepare || return 1
+	default_prepare
 	export CFLAGS=$(perl -MConfig -E 'say $Config{ccflags}')
 	PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
 }
@@ -30,7 +30,7 @@ build() {
 }
 
 package() {
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
diff --git a/community/perl-log-dispatch-configurator-any/APKBUILD b/community/perl-log-dispatch-configurator-any/APKBUILD
index 6983477df40..2d3f7a286ea 100644
--- a/community/perl-log-dispatch-configurator-any/APKBUILD
+++ b/community/perl-log-dispatch-configurator-any/APKBUILD
@@ -30,7 +30,7 @@ build() {
 }
 
 package() {
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
diff --git a/community/perl-net-appliance-session/APKBUILD b/community/perl-net-appliance-session/APKBUILD
index f177e84929f..3afbbfe33c5 100644
--- a/community/perl-net-appliance-session/APKBUILD
+++ b/community/perl-net-appliance-session/APKBUILD
@@ -33,7 +33,7 @@ check() {
 }
 
 package() {
-	./Build install destdir="$pkgdir" || return 1
+	./Build install destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
diff --git a/community/perl-net-cli-interact/APKBUILD b/community/perl-net-cli-interact/APKBUILD
index 283ed338580..c4c4d4bd729 100644
--- a/community/perl-net-cli-interact/APKBUILD
+++ b/community/perl-net-cli-interact/APKBUILD
@@ -35,7 +35,7 @@ check() {
 }
 
 package() {
-	./Build install destdir="$pkgdir" || return 1
+	./Build install destdir="$pkgdir"
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
diff --git a/community/perl-proc-waitstat/APKBUILD b/community/perl-proc-waitstat/APKBUILD
index 218b2b83a0f..b56f5aac449 100644
--- a/community/perl-proc-waitstat/APKBUILD
+++ b/community/perl-proc-waitstat/APKBUILD
@@ -29,7 +29,7 @@ check() {
 }
 
 package() {
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 	mv "$pkgdir"/usr/share/perl5/vendor_perl/* "$pkgdir"/usr/lib/perl5/vendor_perl
 	rm -fr "$pkgdir"/usr/share/perl5
diff --git a/community/perl-spiffy/APKBUILD b/community/perl-spiffy/APKBUILD
index 185dd92373c..70a00c7f7cf 100644
--- a/community/perl-spiffy/APKBUILD
+++ b/community/perl-spiffy/APKBUILD
@@ -30,7 +30,7 @@ check() {
 }
 
 package() {
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
diff --git a/community/perl-task-weaken/APKBUILD b/community/perl-task-weaken/APKBUILD
index 34f7777132a..82faaec12f9 100644
--- a/community/perl-task-weaken/APKBUILD
+++ b/community/perl-task-weaken/APKBUILD
@@ -28,7 +28,7 @@ check() {
 }
 
 package() {
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
diff --git a/community/perl-test-differences/APKBUILD b/community/perl-test-differences/APKBUILD
index ce0b76f76e2..19e266cdc87 100644
--- a/community/perl-test-differences/APKBUILD
+++ b/community/perl-test-differences/APKBUILD
@@ -28,7 +28,7 @@ check() {
 }
 
 package() {
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
diff --git a/community/perl-test-easy/APKBUILD b/community/perl-test-easy/APKBUILD
index 7f34cb9db81..7d125c030c2 100644
--- a/community/perl-test-easy/APKBUILD
+++ b/community/perl-test-easy/APKBUILD
@@ -28,7 +28,7 @@ build() {
 
 package() {
 	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
diff --git a/community/perl-text-roman/APKBUILD b/community/perl-text-roman/APKBUILD
index f059d0723d5..116b3513b76 100644
--- a/community/perl-text-roman/APKBUILD
+++ b/community/perl-text-roman/APKBUILD
@@ -30,7 +30,7 @@ check() {
 }
 
 package() {
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	find "$pkgdir" \( -name perllocal.pod -o -name .packlist \) -delete
 }
 
diff --git a/community/py3-aiohttp1-cors/APKBUILD b/community/py3-aiohttp1-cors/APKBUILD
index 061400ab517..c5c6ad226eb 100644
--- a/community/py3-aiohttp1-cors/APKBUILD
+++ b/community/py3-aiohttp1-cors/APKBUILD
@@ -18,7 +18,7 @@ check() {
 }
 
 build() {
-	python3 setup.py build || return 1
+	python3 setup.py build
 }
 
 package() {
diff --git a/community/qpage/APKBUILD b/community/qpage/APKBUILD
index 1d74a8d6120..0838aef7499 100644
--- a/community/qpage/APKBUILD
+++ b/community/qpage/APKBUILD
@@ -18,11 +18,11 @@ source="$pkgname-$pkgver.tar.gz::http://archive.debian.org/debian/pool/non-free/
 builddir="$srcdir"/$pkgname-$pkgver
 
 build() {
-	cp -f "$srcdir"/config.input "$builddir" || return 1
+	cp -f "$srcdir"/config.input "$builddir"
 	./configure --prefix=/usr \
   	    --sysconfdir=/etc \
 		--localstatedir=/var
-	make || return 1
+	make
 }
 
 package() {
diff --git a/community/retawq/APKBUILD b/community/retawq/APKBUILD
index 65ec29da552..039e137194a 100644
--- a/community/retawq/APKBUILD
+++ b/community/retawq/APKBUILD
@@ -26,9 +26,8 @@ build() {
 		--enable-cookies \
 		--enable-local-cgi \
 		--set-tls=2 \
-		--enable-ipv6 \
-		|| return 1
-	make || return 1
+		--enable-ipv6
+	make
 }
 
 package() {
diff --git a/community/scanssh/APKBUILD b/community/scanssh/APKBUILD
index 8234ccab3b0..b4a08a8463b 100644
--- a/community/scanssh/APKBUILD
+++ b/community/scanssh/APKBUILD
@@ -12,7 +12,7 @@ subpackages="$pkgname-doc"
 source="$pkgname-$pkgver.tar.gz::https://github.com/ofalk/scanssh/archive/$pkgver.tar.gz"
 
 prepare() {
-	default_prepare || return 1
+	default_prepare
 
 	update_config_guess && update_config_sub
 }
@@ -20,13 +20,12 @@ prepare() {
 build() {
 	./configure \
 		--prefix=/usr \
-		--mandir=/usr/share/man \
-		|| return 1
-	make || return 1
+		--mandir=/usr/share/man
+	make
 }
 
 package() {
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
 sha512sums="af4e705c43156b907d6864b12f5832bb4e43d0ff284e34e96b32bbe7986299954d1175880ffe7588f91a939d140b45592fc72dc2bf397f140aed929dbe44a453  scanssh-2.1.2.tar.gz"
diff --git a/community/slock/APKBUILD b/community/slock/APKBUILD
index 3cb9019a939..5b348d2a73c 100644
--- a/community/slock/APKBUILD
+++ b/community/slock/APKBUILD
@@ -20,20 +20,20 @@ source="https://dl.suckless.org/tools/$pkgname-$pkgver.tar.gz"
 #     - CVE-2016-6866
 
 prepare() {
-	default_prepare || return 1
+	default_prepare
 	sed -i -e '/CFLAGS/{s/-Os//;s/=/+=/}' \
 		-e '/LDFLAGS/{s/-s//;s/=/+=/}' \
-		"$builddir"/config.mk || return 1
+		"$builddir"/config.mk
 }
 
 build() {
 	make X11INC=/usr/include/X11 X11LIB=/usr/lib/X11 \
-		-C "$builddir" || return 1
+		-C "$builddir"
 }
 
 package() {
 	make PREFIX=/usr DESTDIR="$pkgdir" \
-		-C "$builddir" install || return 1
+		-C "$builddir" install
 }
 
 sha512sums="ad285360dd3f16a225159abaf2f82fabf2c675bd74478cf717f68cbe5941a6c620e3c88544ce675ce3ff19af4bb0675c9405685e0f74ee4e84f7d34c61a0532f  slock-1.4.tar.gz"
diff --git a/community/socklog/APKBUILD b/community/socklog/APKBUILD
index 15417b44c5b..a1d89829fd9 100644
--- a/community/socklog/APKBUILD
+++ b/community/socklog/APKBUILD
@@ -23,16 +23,16 @@ build() {
 package() {
 	local i
 	for i in socklog socklog-conf; do
-		install -m755 -D "$i" "$pkgdir"/sbin/$i || return 1
+		install -m755 -D "$i" "$pkgdir"/sbin/$i
 	done
 	for i in socklog-check tryto uncat; do
-		install -m755 -D "$i" "$pkgdir"/usr/bin/$i || return 1
+		install -m755 -D "$i" "$pkgdir"/usr/bin/$i
 	done
 
 	install -d "$pkgdir"/usr/share/man/man8
 	cd .. && cp -rf man/* "$pkgdir"/usr/share/man/man8/
 
-	install -m754 "$srcdir"/socklog.setup "$pkgdir"/sbin/setup-socklog || return 1
+	install -m754 "$srcdir"/socklog.setup "$pkgdir"/sbin/setup-socklog
 }
 
 sha512sums="920ce5e661a6a3d970fa77ee3c228d48699ea03530be2b43b7517458b25e31a0a7f352ece2d076c715b6d34dbb26b424b48eb0f55b9bcd0355b74d3e34c77ac7  socklog-2.1.0.tar.gz
diff --git a/community/ssh-ldap-pubkey/APKBUILD b/community/ssh-ldap-pubkey/APKBUILD
index 35b8a86925c..fd02fc94e50 100644
--- a/community/ssh-ldap-pubkey/APKBUILD
+++ b/community/ssh-ldap-pubkey/APKBUILD
@@ -15,7 +15,7 @@ source="$pkgname-$pkgver.tar.gz::https://github.com/jirutka/$pkgname/archive/v$p
 	ldap.conf.patch"
 
 prepare() {
-	default_prepare || return 1
+	default_prepare
 
 	sed -i 's|/etc/ldap.conf|/etc/ssh-ldap-pubkey.conf|g' bin/ssh-ldap-pubkey
 }
@@ -25,10 +25,10 @@ build() {
 }
 
 package() {
-	python3 setup.py install --prefix=/usr --root="$pkgdir" || return 1
+	python3 setup.py install --prefix=/usr --root="$pkgdir"
 
 	install -m 644 -D etc/ldap.conf \
-		"$pkgdir"/etc/ssh-ldap-pubkey.conf || return 1
+		"$pkgdir"/etc/ssh-ldap-pubkey.conf
 
 	mkdir -p "$pkgdir"/usr/share/doc/$pkgname
 	cp README.md etc/openssh-lpk.schema "$pkgdir"/usr/share/doc/$pkgname/
diff --git a/community/tclx/APKBUILD b/community/tclx/APKBUILD
index f1a89638db4..482271dd828 100644
--- a/community/tclx/APKBUILD
+++ b/community/tclx/APKBUILD
@@ -31,13 +31,12 @@ build() {
 		--mandir=/usr/share/man \
 		--localstatedir=/var \
 		--with-tcl=/usr/lib \
-		$_64bit \
-		|| return 1
-	make || return 1
+		$_64bit
+	make
 }
 
 package() {
-	make -j1 DESTDIR="${pkgdir}" install || return 1
+	make -j1 DESTDIR="${pkgdir}" install
 }
 
 sha512sums="faad58f5d8e0e1e759da639800f354b583fb01418c94f2274924aa07beb0ee9559beb87b3386ed5ae3694700a71dfe5b8ac54ead0ec75c6963507e9d3ead7060  tclx8.4.1.tar.bz2
diff --git a/community/ttf2ufm/APKBUILD b/community/ttf2ufm/APKBUILD
index 2ce1c8cb897..ecf7bec78ec 100644
--- a/community/ttf2ufm/APKBUILD
+++ b/community/ttf2ufm/APKBUILD
@@ -18,13 +18,13 @@ _builddir="$srcdir/ufpdf/ttf2ufm-src"
 
 build() {
 	cd "$_builddir"
-	make ttf2pt1 || return 1
+	make ttf2pt1
 }
 
 package() {
 	cd "$_builddir"
 	install -Dm755 ttf2pt1 \
-		"$pkgdir"/usr/bin/$pkgname || return 1
+		"$pkgdir"/usr/bin/$pkgname
 }
 
 sha512sums="fd810c043e56ac611d923856d040cc667a40127104fa960016e967ec49afea629507426f24fd51baa78d98ecccc9f7d6924f758e67104977e1a94342e82a70de  ufpdf.zip"
diff --git a/community/ucl/APKBUILD b/community/ucl/APKBUILD
index c7b52c363c8..91ddbcd757d 100644
--- a/community/ucl/APKBUILD
+++ b/community/ucl/APKBUILD
@@ -12,18 +12,17 @@ source="http://www.oberhumer.com/opensource/$pkgname/download/$pkgname-$pkgver.t
 	0001-Static-assert.patch"
 
 prepare() {
-	default_prepare || return 1
-	update_config_sub || return 1
-	update_config_guess || return 1
+	default_prepare
+	update_config_sub
+	update_config_guess
 }
 
 build() {
 	./configure \
 		--prefix=/usr \
 		--enable-shared \
-		--enable-static \
-		|| return 1
-	make || return 1
+		--enable-static
+	make
 }
 
 check() {
@@ -31,7 +30,7 @@ check() {
 }
 
 package() {
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 
 sha512sums="7dd1824d01b4bb41ee03bbceddc634a9f7f910d235e5cca163d783680d6743f0f3cc309bbbcc1e094d897d549d3805a555f9093b4d77805443d896dd1862aa34  ucl-1.03.tar.gz
diff --git a/community/ucspi-tcp6/APKBUILD b/community/ucspi-tcp6/APKBUILD
index d1731d3539e..5ae7776dcd3 100644
--- a/community/ucspi-tcp6/APKBUILD
+++ b/community/ucspi-tcp6/APKBUILD
@@ -24,7 +24,7 @@ build() {
        echo "${CC:-"gcc"} $LDFLAGS" > conf-ld
        echo "/usr" > src/home
 
-       make -C src || return 1
+       make -C src
 }
 
 package() {
diff --git a/community/vigra/APKBUILD b/community/vigra/APKBUILD
index dc9037ff379..385c999878e 100644
--- a/community/vigra/APKBUILD
+++ b/community/vigra/APKBUILD
@@ -16,13 +16,12 @@ build() {
 	cmake . \
 		-DCMAKE_BUILD_TYPE=None \
 		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DDOCINSTALL=share/doc \
-		|| return 1
-	make || return 1
+		-DDOCINSTALL=share/doc
+	make
 }
 
 package() {
-	make install DESTDIR="$pkgdir" || return 1
+	make install DESTDIR="$pkgdir"
 
 	# relocate cmake include files
 	mkdir -p "$pkgdir"/usr/lib/cmake
diff --git a/community/xbindkeys/APKBUILD b/community/xbindkeys/APKBUILD
index b79e08a984d..263de120de7 100644
--- a/community/xbindkeys/APKBUILD
+++ b/community/xbindkeys/APKBUILD
@@ -16,8 +16,8 @@ build() {
 	./configure --prefix=/usr \
 		--disable-guile \
 		--mandir=/usr/share/man \
-		--infodir=/usr/share/info || return 1
-	make || return 1
+		--infodir=/usr/share/info
+	make
 }
 
 package() {
diff --git a/community/xf86-input-evdev/APKBUILD b/community/xf86-input-evdev/APKBUILD
index e063a87f2c4..8d2c599c9dc 100644
--- a/community/xf86-input-evdev/APKBUILD
+++ b/community/xf86-input-evdev/APKBUILD
@@ -21,13 +21,12 @@ build() {
 		--prefix=/usr \
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
-		--localstatedir=/var \
-		|| return 1
-	make || return 1
+		--localstatedir=/var
+	make
 }
 
 package() {
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	install -Dm644 COPYING "$pkgdir"/usr/share/licenses/$pkgname/COPYING
 }
 
diff --git a/community/xfce4-vala/APKBUILD b/community/xfce4-vala/APKBUILD
index 57b18e38125..2a19254e5aa 100644
--- a/community/xfce4-vala/APKBUILD
+++ b/community/xfce4-vala/APKBUILD
@@ -32,9 +32,8 @@ build() {
 		--sysconfdir=/etc \
 		--mandir=/usr/share/man \
 		--infodir=/usr/share/info \
-		--with-vala-api=$_apiver \
-		|| return 1
-	make || return 1
+		--with-vala-api=$_apiver
+	make
 }
 
 package() {
diff --git a/community/xfwm4-themes/APKBUILD b/community/xfwm4-themes/APKBUILD
index 970dda61600..a5179b2f6d4 100644
--- a/community/xfwm4-themes/APKBUILD
+++ b/community/xfwm4-themes/APKBUILD
@@ -20,13 +20,12 @@ build() {
 		--sysconfdir=/etc \
 		--libexecdir=/usr/lib \
 		--localstatedir=/var \
-		--disable-static \
-		|| return 1
-	make || return 1
+		--disable-static
+	make
 }
 
 package() {
 	cd "$srcdir"/$pkgname-$pkgver
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 }
 sha512sums="5c77e9f1b4b1051f86696605d2fcc8ba6abbc667fc2ae48c5eb1235d62fb99e5171a7c8b9b662147e86b1f508fd8d723f931bd211e41675ab390ec0d7a5e1305  xfwm4-themes-4.10.0.tar.bz2"