community/mumble: rebuild against protobuf 3.5.0; modernize

1 files changed, 24 insertions, 26 deletions

diff --git a/community/mumble/APKBUILD b/community/mumble/APKBUILD
index 1c7d7f2f58c..554de58d654 100644
--- a/community/mumble/APKBUILD
+++ b/community/mumble/APKBUILD
@@ -3,11 +3,12 @@
 # Maintainer: Johannes Matheis <jomat+alpinebuild@jmt.gr>
 pkgname=mumble
 pkgver=1.2.19
-pkgrel=4
+pkgrel=5
 pkgdesc="A low-latency, high quality voice chat software"
 url="http://wiki.mumble.info"
 arch="all"
 license="BSD"
+options="!check"
 depends="qt-sqlite"
 depends_dev=""
 makedepends="qt-dev libsndfile-dev boost-dev avahi-dev protobuf-dev
@@ -18,14 +19,13 @@ pkggroups="murmur"
 subpackages="$pkgname-doc murmur murmur-doc:murmur_doc:noarch"
 source="https://github.com/mumble-voip/$pkgname/releases/download/$pkgver/$pkgname-$pkgver.tar.gz
 	murmur.initd"
-
 builddir="$srcdir"/$pkgname-$pkgver
+
 build() {
 	cd "$builddir"
 	qmake -recursive main.pro \
-		CONFIG+="no-speechd no-g15 no-update no-ice bundled-celt no-embed-qt-translations no-bundled-speex" \
-		|| return 1
-	make release || return 1
+		CONFIG+="no-speechd no-g15 no-update no-ice bundled-celt no-embed-qt-translations no-bundled-speex"
+	make release
 }
 
 package() {
@@ -33,36 +33,35 @@ package() {
 
 	# Binaries.
 	install -Dm755 ./release/mumble \
-		"$pkgdir"/usr/bin/mumble || return 1
+		"$pkgdir"/usr/bin/mumble
 	install -Dm755 ./scripts/mumble-overlay \
-		"$pkgdir"/usr/bin/mumble-overlay || return 1
+		"$pkgdir"/usr/bin/mumble-overlay
 
 	# Libraries.
 	install -Dm755 ./release/libmumble.so.$pkgver \
-		"$pkgdir"/usr/lib/mumble/libmumble.so.$pkgver || retrn 1
+		"$pkgdir"/usr/lib/mumble/libmumble.so.$pkgver
 	for lib in libmumble.so libmumble.so.1 libmumble.so.1.2; do
 		ln -s libmumble.so.$pkgver \
-			"$pkgdir"/usr/lib/mumble/$lib || return 1
+			"$pkgdir"/usr/lib/mumble/$lib
 	done
 	install -Dm755 ./release/plugins/liblink.so \
-		"$pkgdir"/usr/lib/mumble/liblink.so || return1
+		"$pkgdir"/usr/lib/mumble/liblink.so
 	install -Dm755 ./release/plugins/libmanual.so \
-		"$pkgdir"/usr/lib/mumble/libmanual.so || return 1
+		"$pkgdir"/usr/lib/mumble/libmanual.so
 	install -Dm755 ./release/libcelt* \
-		"$pkgdir"/usr/lib/mumble/ || return 1
+		"$pkgdir"/usr/lib/mumble/
 
 	# Misc.
 	install -Dm644 ./LICENSE \
-		"$pkgdir"/usr/share/licenses/$pkgname/LICENSE || return 1
+		"$pkgdir"/usr/share/licenses/$pkgname/LICENSE
 	install -Dm644 ./scripts/mumble.desktop \
-		"$pkgdir"/usr/share/applications/mumble.desktop || return 1
+		"$pkgdir"/usr/share/applications/mumble.desktop
 	install -Dm644 ./icons/mumble.svg \
-		"$pkgdir"/usr/share/icons/hicolor/scalable/apps/mumble.svg \
-		|| return 1
+		"$pkgdir"/usr/share/icons/hicolor/scalable/apps/mumble.svg
 
 	# Man pages.
 	mkdir -p "$pkgdir"/usr/share/man/man1/
-	install -m644 ./man/mum* "$pkgdir"/usr/share/man/man1/ || return 1
+	install -m644 ./man/mum* "$pkgdir"/usr/share/man/man1/
 }
 
 murmur() {
@@ -70,22 +69,22 @@ murmur() {
 	cd "$builddir"
 
 	install -o murmur -g murmur -dm755 \
-		"$subpkgdir"/var/lib/murmur || return 1
+		"$subpkgdir"/var/lib/murmur
 	install -Dm755 ./release/murmurd \
-		"$subpkgdir"/usr/bin/murmurd || return 1
+		"$subpkgdir"/usr/bin/murmurd
 	install -Dm644 ./scripts/murmur.ini \
-		"$subpkgdir"/etc/murmur.ini || return 1
+		"$subpkgdir"/etc/murmur.ini
 
 	sed 's/^database=$/database=\/var\/lib\/murmur\/murmur.sqlite/;\
 		s/^#uname=$/uname=murmur/;\
 		s/^#logfile=murmur.log$/logfile=\/var\/log\/murmur.log/;\
 		s/^#pidfile=$/pidfile=\/var\/run\/murmur\/murmur.pid/' \
-		-i "$subpkgdir"/etc/murmur.ini || return 1
+		-i "$subpkgdir"/etc/murmur.ini
 
 	install -Dm644 ./scripts/murmur.conf \
-		"$subpkgdir"/etc/dbus-1/system.d/murmurd.conf || return 1
+		"$subpkgdir"/etc/dbus-1/system.d/murmurd.conf
 	sed "s/mumble-server/murmur/" \
-		-i "$subpkgdir"/etc/dbus-1/system.d/murmurd.conf || return 1
+		-i "$subpkgdir"/etc/dbus-1/system.d/murmurd.conf
 
 	install -Dm755 "$srcdir"/murmur.initd \
 		"$subpkgdir"/etc/init.d/murmur
@@ -96,10 +95,9 @@ murmur_doc() {
 
 	cd "$builddir"
 	install -Dm644 ./man/murmurd.1 \
-		"$subpkgdir"/usr/share/man/man1/murmurd.1 || return 1
+		"$subpkgdir"/usr/share/man/man1/murmurd.1
 	install -Dm644 ./LICENSE \
-		"$subpkgdir"/usr/share/licenses/murmur/LICENSE \
-		|| return 1
+		"$subpkgdir"/usr/share/licenses/murmur/LICENSE
 	default_doc
 }