community/sane: move from testing

It's required for simple-scanner. Modernize the APKBUILD while I'm at it.

8 files changed, 12 insertions, 18 deletions

diff --git a/testing/sane/APKBUILD b/community/sane/APKBUILD
index 4a77e35ffe..25370810c0 100644
--- a/testing/sane/APKBUILD
+++ b/community/sane/APKBUILD
@@ -9,8 +9,6 @@ pkgdesc="Scanner Access Now Easy - universal scanner interface"
 url="http://www.sane-project.org/"
 arch="x86 x86_64 aarch64 armv7 armhf"
 license="GPL-2.0-or-later GPL-2.0-or-later-with-sane-exception Public-Domain"
-depends=""
-depends_dev=""
 makedepends="diffutils file libtool libusb-dev v4l-utils-dev net-snmp-dev avahi-dev libpng-dev
 	libjpeg-turbo-dev tiff-dev libgphoto2-dev linux-headers"
 install="$pkgname-saned.pre-install $pkgname.pre-install"
@@ -43,34 +41,30 @@ source="https://alioth-archive.debian.org/releases/$pkgname/$_pkgname/$pkgver/$_
 builddir="$srcdir"/$_pkgname-$pkgver
 
 build() {
-	cd "$builddir"
 	./configure \
-	--prefix=/usr \
-	--sysconfdir=/etc \
-	--with-docdir=/usr/share/doc/$pkgname \
-	--with-usb \
-	--enable-avahi \
-	--disable-rpath \
-	--disable-locking \
-	|| return 1
+		--prefix=/usr \
+		--sysconfdir=/etc \
+		--with-docdir=/usr/share/doc/$pkgname \
+		--with-usb \
+		--enable-avahi \
+		--disable-rpath \
+		--disable-locking
 	make
 }
 
 check() {
-	cd "$builddir"
 	make check
 }
 
 package() {
-	cd "$builddir"
-	make DESTDIR="$pkgdir" install || return 1
+	make DESTDIR="$pkgdir" install
 	echo -n "" > "$pkgdir"/etc/$pkgname.d/dll.conf
 	install -Dm644 backend/dll.aliases "$pkgdir"/etc/$pkgname.d/dll.aliases
 }
 
 doc() {
-	default_doc || return 1
-	mkdir -p "$subpkgdir"/usr/share/licenses/$_pkgname || return 1
+	default_doc
+	mkdir -p "$subpkgdir"/usr/share/licenses/$_pkgname
 	mv "$subpkgdir"/usr/share/doc/$_pkgname/LICENSE \
 		"$subpkgdir"/usr/share/licenses/$_pkgname
 }
@@ -95,7 +89,7 @@ udev() {
 	pkgdesc="$pkgdesc (udev rules)"
 	install_if="$pkgname=$pkgver-r$pkgrel udev"
 	install -Dm644 "$builddir"/tools/udev/lib$pkgname.rules \
-		"$subpkgdir"/usr/lib/udev/rules.d/49-$pkgname.rules || return 1
+		"$subpkgdir"/usr/lib/udev/rules.d/49-$pkgname.rules
 	sed -i 's|NAME="%k", ||g' "$subpkgdir"/usr/lib/udev/rules.d/49-$pkgname.rules
 }
 
@@ -123,7 +117,7 @@ _backend() {
 	mkdir -p "$subpkgdir"/usr/lib/$pkgname \
 		"$subpkgdir"/etc/$pkgname.d/dll.d
 	mv "$pkgdir"/usr/lib/$pkgname/lib$pkgname-$name.* \
-		"$subpkgdir"/usr/lib/$pkgname || return 1
+		"$subpkgdir"/usr/lib/$pkgname
 	echo "$name" > "$subpkgdir"/etc/$pkgname.d/dll.d/$name
 	if [ -f "$pkgdir"/etc/$pkgname.d/$name.conf ]; then
 		mv "$pkgdir"/etc/$pkgname.d/$name.conf \
diff --git a/testing/sane/check.patch b/community/sane/check.patch
index afbc7ef4ce..afbc7ef4ce 100644
--- a/testing/sane/check.patch
+++ b/community/sane/check.patch
diff --git a/testing/sane/include.patch b/community/sane/include.patch
index 518d3b4d5c..518d3b4d5c 100644
--- a/testing/sane/include.patch
+++ b/community/sane/include.patch
diff --git a/testing/sane/network.patch b/community/sane/network.patch
index 4e422e28d2..4e422e28d2 100644
--- a/testing/sane/network.patch
+++ b/community/sane/network.patch
diff --git a/testing/sane/pidfile.patch b/community/sane/pidfile.patch
index 457755bdb8..457755bdb8 100644
--- a/testing/sane/pidfile.patch
+++ b/community/sane/pidfile.patch
diff --git a/testing/sane/sane-saned.initd b/community/sane/sane-saned.initd
index 6482073ef4..6482073ef4 100644
--- a/testing/sane/sane-saned.initd
+++ b/community/sane/sane-saned.initd
diff --git a/testing/sane/sane-saned.pre-install b/community/sane/sane-saned.pre-install
index caad990d96..caad990d96 100644
--- a/testing/sane/sane-saned.pre-install
+++ b/community/sane/sane-saned.pre-install
diff --git a/testing/sane/sane.pre-install b/community/sane/sane.pre-install
index b75c867de9..b75c867de9 100644
--- a/testing/sane/sane.pre-install
+++ b/community/sane/sane.pre-install