community/libcouchbase: upgrade to 2.8.5

community/libcouchbase/APKBUILD

 # Contributor: Nathan Johnson <nathan@nathanjohnson.info>
 # Maintainer: Nathan Johnson <nathan@nathanjohnson.info>
 pkgname=libcouchbase
-pkgver=2.8.4
+pkgver=2.8.5
 pkgrel=0
 pkgdesc="C client library for Couchbase"
 url="https://developer.couchbase.com/community"
@@ -13,7 +13,6 @@ makedepends="$depends_dev cmake perl libtool libev-dev libevent-dev libuv-dev"
 subpackages="$pkgname-dev $pkgname-bin $pkgname-doc $pkgname-libevent $pkgname-libev $pkgname-libuv"
 source="$pkgname-$pkgver.tar.gz::https://github.com/couchbase/libcouchbase/archive/$pkgver.tar.gz
 	disable_git_version_check.patch
-	fix_snappy.patch
 	fix_socktest.patch"
 builddir="$srcdir/$pkgname-$pkgver"
 
@@ -22,8 +21,7 @@ build() {
 	cd "$builddir"/build
 	../cmake/configure \
 		--prefix=/usr \
-		--disable-couchbasemock \
-		|| return 1
+		--disable-couchbasemock
 	make
 }
 
@@ -33,13 +31,13 @@ check() {
 }
 
 package() {
-	make -C "$builddir"/build install DESTDIR="$pkgdir" || return 1
+	make -C "$builddir"/build install DESTDIR="$pkgdir"
 }
 
 dev() {
-	default_dev || return 1
+	default_dev
 	mv "$subpkgdir"/usr/bin/cbc-write-config \
-		"$pkgdir"/usr/bin || return 1
+		"$pkgdir"/usr/bin
 	rmdir "$subpkgdir"/usr/bin
 }
 
@@ -75,7 +73,6 @@ bin() {
 	mv "$pkgdir"/usr/bin "$subpkgdir"/usr/
 }
 
-sha512sums="cd7cbd85157ed96f6e6b84bc6d363c833644922a27e691abcd0b5bfd2e7fd31cbf26d4688990392bd4887ae510acf2c50a640737b058463a9cda3c11f77a073c  libcouchbase-2.8.4.tar.gz
+sha512sums="82f9c45ea1f79fc53b54badd7de2f9ca69e0a941d09664ce80547135b36d425197f2e37d88710cef2d92c31f91718ef752fa87223214e549075c4427ae2f7d24  libcouchbase-2.8.5.tar.gz
 987b76b9c8a38a1f144bcada3c24192b30b352c993c433f4a2a1e381b765ae6bb845ebc6393c794da1b4efbb68fd1d34b027104fecf5c9bcc29b0f58c7f6a474  disable_git_version_check.patch
-9023fe6c0d88577f40598f201be121012199167e9eef7e99da29664d23fd5e0c488fad2eda88ed3b30ea089b60e760c1b472bb46bb0804b5f7bb7091f0d8a2ed  fix_snappy.patch
 72319b86fdd91728723ccb091e72199788a84e2ec9ea12c0fcd1ed686eb155ec11e0addbff96735f83e7f31764a85650f0483b6e76d3a8bee16f71b2751fe4a9  fix_socktest.patch"

community/libcouchbase/fix_snappy.patch

---- a/cmake/configure
-+++ b/cmake/configure
-@@ -287,6 +287,9 @@
- }
- if ($NO_SNAPPY) {
-     push @CM_OPTIONS, "-DLCB_NO_SNAPPY=1";
-+} else {
-+    # the cmake options default NO_SNAPPY to ON, so this is necessary
-+    push @CM_OPTIONS, "-DLCB_NO_SNAPPY=0";
- }
- if ($ENABLE_SNAPPY) {
-     push @CM_OPTIONS, "-DLCB_NO_SNAPPY=0";