Subject: [alpine-aports] [PATCH] testing/sane: upgrade to 1.0.27

From: Valery Kartel <[email-masked]>
Date: Tue, 23 May 2017 13:00:38 +0300

add 'sane-backends' metapackage
---
 testing/sane/APKBUILD      | 32 +++++++++++++-------------------
 testing/sane/include.patch | 11 -----------
 2 files changed, 13 insertions(+), 30 deletions(-)
 delete mode 100644 testing/sane/include.patch

diff --git a/testing/sane/APKBUILD b/testing/sane/APKBUILD
index 6f8ed21d6e..d123853ffe 100644
--- a/testing/sane/APKBUILD
+++ b/testing/sane/APKBUILD
@@ -2,7 +2,7 @@
 # Contributor: Valery Kartel <[email-masked]>
 # Maintainer: Valery Kartel <[email-masked]>
 pkgname=sane
-pkgver=1.0.25
+pkgver=1.0.27
 pkgrel=0
 pkgdesc="Scanner Access Now Easy - an universal scanner interface"
 url="http://www.sane-project.org/"
@@ -29,23 +29,22 @@ _pkgdesc_dell1600n_net="SANE backend for Dell 1600n that supports colour and mon
 for _backend in $_backends; do
 	subpackages="$subpackages $pkgname-backend-$_backend:_backend"
 done
-subpackages="$pkgname-doc $pkgname-dev $subpackages $pkgname-utils $pkgname-saned"
-source="https://alioth.debian.org/frs/download.php/file/4146/$pkgname-backends-$pkgver.tar.gz
+_backends=${subpackages//:_backend/}
+subpackages="$pkgname-doc $pkgname-dev $subpackages $pkgname-utils $pkgname-saned $pkgname-backends::noarch"
+source="https://alioth.debian.org/frs/download.php/file/4224/$pkgname-backends-$pkgver.tar.gz
 	$pkgname-saned.initd
-	include.patch
 	network.patch
 	pidfile.patch
 	"
-builddir="$srcdir"/$pkgname-backends-$pkgver
+builddir="$srcdir/$pkgname-backends-$pkgver"
 
 build() {
 	cd "$builddir"
 	./configure \
 	--prefix=/usr \
 	--sysconfdir=/etc \
-	--with-docdir=/usr/share/doc/$pkgname \
+	--docdir=/usr/share/doc/$pkgname \
 	--enable-avahi \
-	--enable-libusb_1_0 \
 	--disable-rpath \
 	--disable-locking \
 	|| return 1
@@ -78,6 +77,12 @@ utils() {
 	rm -fr "$pkgdir"/usr/share
 }
 
+backends() {
+	pkgdesc="$pkgdesc (full package)"
+	depends="$pkgname $pkgname-utils $pkgname-saned $_backends"
+	mkdir -p "$subpkgdir"
+}
+
 _backend() {
 	local name=${subpkgname#$pkgname-backend-}
 	depends="$pkgname"
@@ -103,18 +108,7 @@ _backend() {
 	fi
 }
 
-md5sums="f9ed5405b3c12f07c6ca51ee60225fe7  sane-backends-1.0.25.tar.gz
-042bb035974918365e83568fd3a285df  sane-saned.initd
-bc249a3ab2f9cdd12443831b5a999469  include.patch
-9084841146b6d10b957c60594f707937  network.patch
-f266a1ec6db5461e39531acf509738a4  pidfile.patch"
-sha256sums="a4d7ba8d62b2dea702ce76be85699940992daf3f44823ddc128812da33dc6e2c  sane-backends-1.0.25.tar.gz
-a3885af89b86b827d491ac67a78321e8bb9d9a05cb652c1a046986217b1e28b0  sane-saned.initd
-4112c9d6a9d7b9a3ac836e02c4617a71c0519451faf1138ee1038db8cc3422df  include.patch
-8400ed2fb2109447eb9d4e343e2964ece964ba5999b2eb6553762e9c984092c3  network.patch
-8d81005e5b350b109e186c8fa267f9938a8c35b8bbf353534e99aadd4261da8f  pidfile.patch"
-sha512sums="b9548646fff13558a4da4a4e9e8bad730f05121bcc65b72d24ded3bfddc6fe574e08c39c8651544b8fbfeab036fffd76cc14d76ef5d5d47e7513a2ce3afcc9df  sane-backends-1.0.25.tar.gz
+sha512sums="c6552768bfc10216730fc11011c82f74ca0952182019ded3916072147ec09be5c975ce1d37dc3ccea050c488dbdf983c2ca17dcd702644060ba796ae2591f9c5  sane-backends-1.0.27.tar.gz
 0a06eaa28b345202f2bdf8361e06f843bb7a010b7d8f80132f742672c94249c43f64031cefa161e415e2e2ab3a53b23070fb63854283f9e040f5ff79394ac7d1  sane-saned.initd
-1779ff8beb1ba5f9238c25d819a7f0045f7e257c19b511315feb85650e445ca86450a9e1d7ff8650499d3dae808589a6c2e358d5f3f39a3f40ce4999179b86d6  include.patch
 9cb595841f59b5105ecc85e4c0ad8781c52caa2354fb823c920ec467e88afbe47f2b3f4a7a3980bef5dbf22983c5786f051a9d10aea97b4bf7c4a05378592029  network.patch
 09505943f9441854a6c333f19e2535b4a646a8cc060fe82c6261e7d29c72773ebe98d43a91acc951f4336a3c8b4c84ab7c7b0763426136b4b59d9546bc2fa8c0  pidfile.patch"
diff --git a/testing/sane/include.patch b/testing/sane/include.patch
deleted file mode 100644
index 518d3b4d5c..0000000000
--- a/testing/sane/include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/include/sane/sane.h
-+++ b/include/sane/sane.h
-@@ -16,6 +16,8 @@
- #ifndef sane_h
- #define sane_h
- 
-+#include <sys/types.h>
-+
- #ifdef __cplusplus
- extern "C" {
- #endif
-- 
2.13.0

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