Subject: [alpine-aports] [PATCH 1/9] main/skalibs: upgrade to 2.5.0.0

From: Ivan Tham <[email-masked]>
Date: Tue, 28 Mar 2017 17:29:01 +0800

---
 main/skalibs/APKBUILD | 42 +++++++++++++-----------------------------
 1 file changed, 13 insertions(+), 29 deletions(-)

diff --git a/main/skalibs/APKBUILD b/main/skalibs/APKBUILD
index 5540382d78..cce22fa976 100644
--- a/main/skalibs/APKBUILD
+++ b/main/skalibs/APKBUILD
@@ -1,59 +1,43 @@
 # Maintainer: Laurent Bercot <[email-masked]>
 # Contributor: John Regan <[email-masked]>
 pkgname=skalibs
-pkgver=2.4.0.2
+pkgver=2.5.0.0
 pkgrel=0
 pkgdesc="A set of general-purpose C programming libraries for skarnet.org software."
 url="http://skarnet.org/software/skalibs/"
 arch="all"
 license="ISC"
-depends=""
-depends_dev=""
-makedepends=""
-install=""
+options="!check"
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
-
-_builddir="$srcdir/$pkgname-$pkgver"
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	./configure \
 		--enable-shared \
 		--enable-static \
 		--libdir=/usr/lib \
-                --enable-clock \
-		|| return 1
-	make || return 1
+                --enable-clock
+	make
 }
 
 package() {
-	cd "$_builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	cd "$builddir"
+	make DESTDIR="$pkgdir" install
 }
 
 dev() {
 	default_dev
-	cd "$subpkgdir"
-	mv -f "$pkgdir/usr/lib/$pkgname"/sysdeps/* "usr/lib/$pkgname/sysdeps/"
-	rm -rf "$pkgdir/usr"
+	mv "$pkgdir/usr/lib/$pkgname"/sysdeps/* \
+		"$subpkgdir/usr/lib/$pkgname"/sysdeps/
+	rm -rf "$pkgdir"/usr
 }
 
 doc() {
 	default_doc
 	mkdir -p "$subpkgdir/usr/share/doc"
-	cp -a "$_builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
+	cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
 }
 
-md5sums="edcd88590288cdd0fc8dbd417e0d49e9  skalibs-2.4.0.2.tar.gz"
-sha256sums="0708172bc2ec9825f8a4f312d35f8dcd94da5f291425a598c33c873b3de77df8  skalibs-2.4.0.2.tar.gz"
-sha512sums="1a60ff7bf2364cfe56dc5847321dad4eaa3942be90555a405c4c6c6fff287e197621796624cd52030f4373665ef53d4f7cd5832e8492ecf1d75c82544a4c8f2e  skalibs-2.4.0.2.tar.gz"
+sha512sums="fe96cb0a128dc5060c74dca1ac96df96bf1f9383229ef283b7b23b98c7910137f3ca25ecd7cf91446a7f6d1ce7bb6a36e346c45c6d5723f73eea008626a3792e  skalibs-2.5.0.0.tar.gz"
-- 
2.12.2.609.gf7d0c115f

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---

---

From: Ivan Tham <[email-masked]>
Date: Tue, 28 Mar 2017 17:29:07 +0800

---
 main/s6-linux-utils/APKBUILD | 36 +++++++++++-------------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/main/s6-linux-utils/APKBUILD b/main/s6-linux-utils/APKBUILD
index 14111c1609..7a9b0de889 100644
--- a/main/s6-linux-utils/APKBUILD
+++ b/main/s6-linux-utils/APKBUILD
@@ -1,52 +1,38 @@
 # Maintainer: Laurent Bercot <[email-masked]>
 # Contributor: Christian Kampka <[email-masked]>
 pkgname=s6-linux-utils
-pkgver=2.2.0.0
-pkgrel=1
+pkgver=2.3.0.0
+pkgrel=0
 pkgdesc="A set of tiny Linux-specific utilities optimized for simplicity and small size."
 url="http://skarnet.org/software/$pkgname/"
 arch="all"
 license="ISC"
-depends="skalibs"
+options="!check"
 makedepends="skalibs-dev linux-headers"
-install=""
 subpackages="$pkgname-doc"
 source="http://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
-
-_builddir="$srcdir/$pkgname-$pkgver"
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	./configure \
 		--enable-shared \
 		--enable-static \
 		--disable-allstatic \
 		--prefix=/usr \
-		--libdir=/usr/lib \
-		|| return 1
-	make || return 1
+		--libdir=/usr/lib
+	make
 }
 
 package() {
-	cd "$_builddir"
 
 doc() {
 	default_doc
 
-md5sums="70b09e0d1b498cf647eea491a1969033  s6-linux-utils-2.2.0.0.tar.gz"
-sha256sums="587745abfbf2cc631bb54dd2b3fd29f39b723e3c50e28165138a85c98fda35f9  s6-linux-utils-2.2.0.0.tar.gz"
-sha512sums="5d0fcd29f7a03146b5296d7164326f76af95a8632df4204021d9ae30b1f03590e7f25d410f07639cf741a455f9624f9410b2e7836ae6838916da50be1527ae7f  s6-linux-utils-2.2.0.0.tar.gz"
+sha512sums="09e5744f6ac35d33c9c61ffc0ae6c8697e5d1816e5bd83e2dd4385d54a8f6da9c43fe2b1cb1cacba6f30a53cd7d9487a12b44028b20b110c74d6c3016d0511a1  s6-linux-utils-2.3.0.0.tar.gz"
-- 
2.12.2.609.gf7d0c115f

---

---

From: Ivan Tham <[email-masked]>
Date: Tue, 28 Mar 2017 17:29:02 +0800

---
 main/execline/APKBUILD | 37 +++++++++++--------------------------
 1 file changed, 11 insertions(+), 26 deletions(-)

diff --git a/main/execline/APKBUILD b/main/execline/APKBUILD
index 02306b6c93..b913623fdb 100644
--- a/main/execline/APKBUILD
+++ b/main/execline/APKBUILD
@@ -1,53 +1,38 @@
 # Maintainer: Laurent Bercot <[email-masked]>
 # Contributor: John Regan <[email-masked]>
 pkgname=execline
-pkgver=2.2.0.0
-pkgrel=1
+pkgver=2.3.0.0
+pkgrel=0
 pkgdesc="A small scripting language, to be used in place of a shell in non-interactive scripts."
 url="http://skarnet.org/software/$pkgname/"
 arch="all"
 license="ISC"
-depends="skalibs"
-depends_dev="skalibs-dev"
+options="!check"
 makedepends="skalibs-dev"
-install=""
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
-
-_builddir="$srcdir/$pkgname-$pkgver"
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	./configure \
 		--enable-shared \
 		--enable-static \
 		--disable-allstatic \
 		--libdir=/usr/lib \
-		--with-dynlib=/lib \
-		|| return 1
-	make || return 1
+		--with-dynlib=/lib
+	make
 }
 
 package() {
-	cd "$_builddir"
 
 doc() {
 	default_doc
 
-md5sums="8dc0f40cdbbabd7915e9e7b95544d13e  execline-2.2.0.0.tar.gz"
-sha256sums="93bd744f2e3ad204cb89f147efdc6ca4e622f9c6bfc9895e0b2cb8b0480029de  execline-2.2.0.0.tar.gz"
-sha512sums="0174bd46c231684f78b7ea2f6f85776b9edf780d1ae928fcaf0eda3ade46fa60666c17af4480fd37179461b622a069221386f229c777fd214b5abe70e7f58a19  execline-2.2.0.0.tar.gz"
+sha512sums="d8bd3420366d2e81e8bcbd644f235fc50e32a83d8e25989cf12f4b4c03bf553e0c356311ef185f98e03887ad65fd75a12ec4746ac832e72aeb023016d91f36c1  execline-2.3.0.0.tar.gz"
-- 
2.12.2.609.gf7d0c115f

---

---

From: Ivan Tham <[email-masked]>
Date: Tue, 28 Mar 2017 17:29:03 +0800

---
 main/s6-linux-init/APKBUILD | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/main/s6-linux-init/APKBUILD b/main/s6-linux-init/APKBUILD
index 46c893f1f8..55250660d4 100644
--- a/main/s6-linux-init/APKBUILD
+++ b/main/s6-linux-init/APKBUILD
@@ -1,20 +1,17 @@
 # Maintainer: Laurent Bercot <[email-masked]>
 # Contributor: Laurent Bercot <[email-masked]>
 pkgname=s6-linux-init
-pkgver=0.2.0.0
+pkgver=0.3.0.0
 pkgrel=0
 pkgdesc="A set of tools to create and run an s6-based init system."
 url="http://skarnet.org/software/$pkgname/"
 arch="all"
 license="ISC"
-depends="skalibs"
-depends_dev="skalibs-dev"
-makedepends="$depends_dev"
-install=""
-subpackages="$pkgname-dev"
+makedepends="skalibs-dev"
+subpackages="$pkgname-dev $pkgname-doc"
 source="http://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
-
 builddir="$srcdir/$pkgname-$pkgver"
+
 build() {
 	cd "$builddir"
 	./configure \
@@ -22,9 +19,8 @@ build() {
 		--enable-static \
 		--disable-allstatic \
 		--prefix=/usr \
-		--libdir=/usr/lib \
-		|| return 1
-	make || return 1
+		--libdir=/usr/lib
+	make
 }
 
 package() {
@@ -32,6 +28,10 @@ package() {
 	make DESTDIR="$pkgdir" install || return 1
 }
 
-md5sums="24b9b232a5bcbb6be1c592ae1c23eb6d  s6-linux-init-0.2.0.0.tar.gz"
-sha256sums="131484e61eff0e671e112f0436b13e8e7d08752f810d8bec4924a68383eee2b9  s6-linux-init-0.2.0.0.tar.gz"
-sha512sums="16c8c97b65ad533b70ed9dd189827778797dc8d0a70af0880655b5f89a1524cd9d3675cb681b99f4704d43c810a4211c9926bfeb743247d7c29559ec2f77606e  s6-linux-init-0.2.0.0.tar.gz"
+doc() {
+	default_doc
+	mkdir -p "$subpkgdir"/usr/share/doc
+	cp -a "$builddir"/doc "$subpkgdir"/usr/share/doc/$pkgname
+}
+
+sha512sums="9aa775fb2bb86680ba438a4a03b543fda696434eaf7ddea5009ec3adaebb899a2ed039a4727eb7d5427088ed3ff08a9eeaa853769f089789a7327a538f798c67  s6-linux-init-0.3.0.0.tar.gz"
-- 
2.12.2.609.gf7d0c115f

---

---

From: Ivan Tham <[email-masked]>
Date: Tue, 28 Mar 2017 17:29:04 +0800

---
 main/s6/APKBUILD | 37 +++++++++++--------------------------
 1 file changed, 11 insertions(+), 26 deletions(-)

diff --git a/main/s6/APKBUILD b/main/s6/APKBUILD
index 0c087af832..c536b8193e 100644
--- a/main/s6/APKBUILD
+++ b/main/s6/APKBUILD
@@ -1,54 +1,39 @@
 # Maintainer: Laurent Bercot <[email-masked]>
 # Contributor: John Regan <[email-masked]>
 pkgname=s6
-pkgver=2.4.0.0
+pkgver=2.5.0.0
 pkgrel=0
 pkgdesc="skarnet.org's small & secure supervision software suite."
 url="http://skarnet.org/software/$pkgname/"
 arch="all"
 license="ISC"
-depends="skalibs execline"
-depends_dev="skalibs-dev execline-dev"
-makedepends="$depends_dev"
-install=""
+makedepends="skalibs-dev execline-dev"
+options="!check"
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
-
-_builddir="$srcdir/$pkgname-$pkgver"
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	./configure \
 		--enable-shared \
 		--enable-static \
 		--disable-allstatic \
 		--libdir=/usr/lib \
 		--libexecdir="/lib/$pkgname" \
-		--with-dynlib=/lib \
-		|| return 1
-	make || return 1
+		--with-dynlib=/lib
+	make
 }
 
 package() {
-	cd "$_builddir"
 
 doc() {
 	default_doc
 
-md5sums="d43d82d23ba2f4a00435648298bccc28  s6-2.4.0.0.tar.gz"
-sha256sums="5e788d5935dbcce76ac9a99cfcf6ee46a2ffb84220c84225df7589e9a3585560  s6-2.4.0.0.tar.gz"
-sha512sums="bd294fd6ec6bd5b696c52f8ef43de278a82d2b5ec4bcea3f32ab45f15b22b33633210f38709c1e736bab8ac4c560af6a307b2617709adfc8d5f9c0bce329dff2  s6-2.4.0.0.tar.gz"
+sha512sums="ffda119167fa334e2d87de1a453ddefafa541be0a71ced95f7eb2001dcc76a01db4a8bda04746c49d2cd26495453f0b39d3dbf57e2a76435c8537218b745da94  s6-2.5.0.0.tar.gz"
-- 
2.12.2.609.gf7d0c115f

---

---

From: Ivan Tham <[email-masked]>
Date: Tue, 28 Mar 2017 17:29:05 +0800

---
 main/s6-dns/APKBUILD        | 36 +++++++++++-------------------------
 main/s6-linux-init/APKBUILD |  1 +
 2 files changed, 12 insertions(+), 25 deletions(-)

diff --git a/main/s6-dns/APKBUILD b/main/s6-dns/APKBUILD
index 3a5b0b541d..bd4cdf62fd 100644
--- a/main/s6-dns/APKBUILD
+++ b/main/s6-dns/APKBUILD
@@ -1,54 +1,40 @@
 # Maintainer: Laurent Bercot <[email-masked]>
 # Contributor: John Regan <[email-masked]>
 pkgname=s6-dns
-pkgver=2.1.0.0
-pkgrel=1
+pkgver=2.2.0.0
+pkgrel=0
 pkgdesc="skarnet.org's DNS client libraries and command-line DNS client utilities"
 url="http://skarnet.org/software/$pkgname/"
 arch="all"
 license="ISC"
 depends="skalibs"
-depends_dev="skalibs-dev"
+options="!check"
 makedepends="skalibs-dev"
-install=""
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
-
-_builddir="$srcdir/$pkgname-$pkgver"
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir/"$pkgname-$pkgver
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	./configure \
 		--enable-shared \
 		--enable-static \
 		--disable-allstatic \
 		--prefix=/usr \
 		--libexecdir="/usr/lib/$package" \
-		--with-dynlib=/lib \
-		|| return 1
-	make || return 1
+		--with-dynlib=/lib
+	make
 }
 
 package() {
-	cd "$_builddir"
 
 doc() {
 	default_doc
 
-md5sums="400d1115f249bc64c9f0a0fb43d07906  s6-dns-2.1.0.0.tar.gz"
-sha256sums="8455f3b1edad8f01a1340cb1242c141755729bfd5d71059739eced5c006539ad  s6-dns-2.1.0.0.tar.gz"
-sha512sums="c75722b3ddd9d1646116654983558efde22d0d5d3ff1c296a8d5e2ba44abe0d5a86fc86804cf90bea2ee8c3e82028e182d28cdbf5155d46c6b3d8f4d1c3387fc  s6-dns-2.1.0.0.tar.gz"
+sha512sums="55cc0a4e677a28d5ebeeab1f995ee8d03c6aaa0c839ad420e006468c0712f45e638a3d32e082a34e09098d20c3bb08496afcefbec4c58f7674017e22732b1cda  s6-dns-2.2.0.0.tar.gz"
diff --git a/main/s6-linux-init/APKBUILD b/main/s6-linux-init/APKBUILD
index 55250660d4..ac4b926e10 100644
--- a/main/s6-linux-init/APKBUILD
+++ b/main/s6-linux-init/APKBUILD
@@ -7,6 +7,7 @@ pkgdesc="A set of tools to create and run an s6-based init system."
 url="http://skarnet.org/software/$pkgname/"
 arch="all"
 license="ISC"
+options="!check"
 makedepends="skalibs-dev"
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
-- 
2.12.2.609.gf7d0c115f

---

---

From: Ivan Tham <[email-masked]>
Date: Tue, 28 Mar 2017 17:29:06 +0800

---
 main/s6-rc/APKBUILD | 35 ++++++++++-------------------------
 1 file changed, 10 insertions(+), 25 deletions(-)

diff --git a/main/s6-rc/APKBUILD b/main/s6-rc/APKBUILD
index 084a02f36b..02399d31fb 100644
--- a/main/s6-rc/APKBUILD
+++ b/main/s6-rc/APKBUILD
@@ -1,54 +1,39 @@
 # Maintainer: Laurent Bercot <[email-masked]>
 # Contributor: Eivind Uggedal <[email-masked]>
 pkgname=s6-rc
-pkgver=0.1.0.0
+pkgver=0.2.0.0
 pkgrel=0
 pkgdesc="A service manager for s6-based systems."
 url="http://skarnet.org/software/$pkgname/"
 arch="all"
 license="ISC"
-depends="skalibs execline s6"
-depends_dev="skalibs-dev execline-dev s6-dev"
+options="!check"
 makedepends="skalibs-dev execline-dev s6-dev"
-install=""
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
-
-_builddir="$srcdir/$pkgname-$pkgver"
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	./configure \
 		--enable-shared \
 		--enable-static \
 		--disable-allstatic \
 		--libdir=/usr/lib \
 
 package() {
-	cd "$_builddir"
 
 doc() {
 	default_doc
 
-md5sums="4d17dea017a07d0d1b5fc0d0ba5ade41  s6-rc-0.1.0.0.tar.gz"
-sha256sums="d04a8a765740ed55e38a33da3639197f51f83b3e498bdef5bc1d1d322b1acff3  s6-rc-0.1.0.0.tar.gz"
-sha512sums="d58f52e4bc132eab6fddd1be3b406d0314cc4fdd61e476310a16348c117b032dafd3ef8701219dd7476247d5b9a6685621e94212705aa88934cb1eaee7b1e6fe  s6-rc-0.1.0.0.tar.gz"
+sha512sums="981d504382c9801ef53fb2a4a4f7410cf6165f1f49670cb5d42545c3e1bef6c0a50e6176b149fd61ec45ebe701411d12b5e7012cfb897d3472e52a1b8f76f636  s6-rc-0.2.0.0.tar.gz"
-- 
2.12.2.609.gf7d0c115f

---

---

From: Ivan Tham <[email-masked]>
Date: Tue, 28 Mar 2017 17:29:09 +0800

---
 main/s6-portable-utils/APKBUILD | 36 +++++++++++-------------------------
 1 file changed, 11 insertions(+), 25 deletions(-)

diff --git a/main/s6-portable-utils/APKBUILD b/main/s6-portable-utils/APKBUILD
index 00285dafbf..38a1ebb5f0 100644
--- a/main/s6-portable-utils/APKBUILD
+++ b/main/s6-portable-utils/APKBUILD
@@ -1,52 +1,38 @@
 # Maintainer: Laurent Bercot <[email-masked]>
 # Contributor: John Regan <[email-masked]>
 pkgname=s6-portable-utils
-pkgver=2.1.0.0
-pkgrel=1
+pkgver=2.2.0.0
+pkgrel=0
 pkgdesc="skarnet.org's tiny portable generic utilities"
 url="http://skarnet.org/software/$pkgname/"
 arch="all"
 license="ISC"
-depends="skalibs"
 makedepends="skalibs-dev"
-install=""
+options="!check"
 subpackages="$pkgname-doc"
 source="http://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
-
-_builddir="$srcdir/$pkgname-$pkgver"
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	./configure \
 		--enable-shared \
 		--enable-static \
 		--disable-allstatic \
 		--prefix=/usr \
-		--libdir=/usr/lib \
-		|| return 1
-	make || return 1
+		--libdir=/usr/lib
+	make
 }
 
 package() {
-	cd "$_builddir"
 
 doc() {
 	default_doc
 
-md5sums="b0289aa1c46ede3b036a9cfccf00fbd7  s6-portable-utils-2.1.0.0.tar.gz"
-sha256sums="cde145b7b9d1f1685f271c45c8aed635e74221689bb8ec21a11b3e5a252d1c4e  s6-portable-utils-2.1.0.0.tar.gz"
-sha512sums="0b18304c63180c3233a5f29e1fc24b20c9c99c8949b042244d4a5b69cf2f15049ccbeddb2c3ffc5e88ee636bcfe836568670cc1626d5517381771ee3baff10c5  s6-portable-utils-2.1.0.0.tar.gz"
+sha512sums="199f492dd5493ebd284a8cec278816c8d2586ce47d7be082e71926df32fcbcb2feeceb041ab75d20dd40c152cef7151748a75c8122312dc0d7681c8c9cf199ec  s6-portable-utils-2.2.0.0.tar.gz"
-- 
2.12.2.609.gf7d0c115f

---

---

From: Ivan Tham <[email-masked]>
Date: Tue, 28 Mar 2017 17:29:08 +0800

---
 main/s6-networking/APKBUILD | 37 +++++++++++--------------------------
 1 file changed, 11 insertions(+), 26 deletions(-)

diff --git a/main/s6-networking/APKBUILD b/main/s6-networking/APKBUILD
index 2c34eb9e76..7b969fec1f 100644
--- a/main/s6-networking/APKBUILD
+++ b/main/s6-networking/APKBUILD
@@ -1,54 +1,39 @@
 # Maintainer: Laurent Bercot <[email-masked]>
 # Contributor: John Regan <[email-masked]>
 pkgname=s6-networking
-pkgver=2.2.0.0
-pkgrel=1
+pkgver=2.3.0.0
+pkgrel=0
 pkgdesc="skarnet.org's UCSPI Unix and TCP tools, access control tools, and network time management utilities."
 url="http://skarnet.org/software/$pkgname/"
 arch="all"
 license="ISC"
-depends="skalibs execline s6 s6-dns"
-depends_dev="skalibs-dev execline-dev s6-dev s6-dns-dev"
+options="!check"
 makedepends="skalibs-dev execline-dev s6-dev s6-dns-dev"
-install=""
 subpackages="$pkgname-dev $pkgname-doc"
 source="http://skarnet.org/software/$pkgname/$pkgname-$pkgver.tar.gz"
-
-_builddir="$srcdir/$pkgname-$pkgver"
-prepare() {
-	local i
-	cd "$_builddir"
-	for i in $source; do
-		case $i in
-		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
-		esac
-	done
-}
+builddir="$srcdir/$pkgname-$pkgver"
 
 build() {
-	cd "$_builddir"
+	cd "$builddir"
 	./configure \
 		--enable-shared \
 		--enable-static \
 		--disable-allstatic \
 		--prefix=/usr \
 		--libexecdir="/usr/lib/$pkgname" \
-		--with-dynlib=/lib \
-		|| return 1
-	make || return 1
+		--with-dynlib=/lib
+	make
 }
 
 package() {
-	cd "$_builddir"
 
 doc() {
 	default_doc
 
-md5sums="5f45aa8839bd0486a2a55e41fa3cb1a3  s6-networking-2.2.0.0.tar.gz"
-sha256sums="457d956bb6463ee029af4ce74aa68a88cf238ecfe2123eef50ad5d11502a6e3d  s6-networking-2.2.0.0.tar.gz"
-sha512sums="34979d486404d43cdfdc5e7a496898c04449c00f735a1d7b052b6beb4b3cc5a005d5aea94b99a28d9e0feb02fd150994603883c5ba8c508598b3ffb6bd655efb  s6-networking-2.2.0.0.tar.gz"
+sha512sums="ca247f3926d790e388347c610ae10fdb3e7be48d8381b9178223c470258b264315997f627b6ddcc508f08ba83e9212f386041b92dbaa3ad576c4e37f205a0c91  s6-networking-2.3.0.0.tar.gz"
-- 
2.12.2.609.gf7d0c115f

---