iscan*: disable gimp2 plugin, fix nonstandard sscanf, restrict according to license

srcpkgs/iscan-plugin-gt-s650/INSTALL

@@ -1,6 +1,6 @@
 if [ "$UPDATE" = "no" -a "$ACTION" = "post" ]; then
 	for id in 0x013c 0x013d; do
-		iscan-registry --add interpreter usb 0x04b8 $id \
-					   usr/lib/iscan/libiscan-plugin-gt-s650 usr/share/iscan/esfw010c.bin
+		usr/bin/iscan-registry --add interpreter usb 0x04b8 $id \
+			/usr/lib/iscan/libiscan-plugin-gt-s650 /usr/share/iscan/esfw010c.bin
 	done
 fi

srcpkgs/iscan-plugin-gt-s650/REMOVE

@@ -3,7 +3,7 @@ if [ "$UPDATE" = "no" -a "$ACTION" = "pre" ]; then
 	# there's no point (and no success) in calling iscan-registry
 	command -v iscan-registry >/dev/null 2>&1 || exit 0
 	for id in 0x013c 0x013d; do
-		iscan-registry --remove interpreter usb 0x04b8 $id \
-					   usr/lib/iscan/libiscan-plugin-gt-s650 usr/share/iscan/esfw010c.bin
+		usr/bin/iscan-registry --remove interpreter usb 0x04b8 $id \
+			/usr/lib/iscan/libiscan-plugin-gt-s650 /usr/share/iscan/esfw010c.bin
 	done
 fi

srcpkgs/iscan-plugin-gt-s650/template

@@ -2,7 +2,7 @@
 pkgname=iscan-plugin-gt-s650
 reverts="1.1.0_4"
 version=1.0.0.3
-revision=2
+revision=3
 archs="i686 x86_64"
 _bundle_version=6.6.2.1
 depends="sane-epkowa"
@@ -25,6 +25,7 @@ esac
 distfiles="https://download2.ebz.epson.net/epsonscan2/common/deb/${_arch}/epsonscan2-bundle-${_bundle_version}.${_cpu}.deb.tar.gz"
 nopie=yes
 repository=nonfree
+restricted=yes
 
 do_install() {
 	ar x plugins/*.deb

srcpkgs/iscan/files/README.voidlinux

@@ -1,3 +1,3 @@
-Most scanners will require some nonfree plugins.
-Check the iscan-plugins-* packages to see if you need to install
-additional packages.
+Most scanners will require some nonfree plugins. These will need to
+be installed via xbps-src. Check the iscan-plugin-* packages in the
+void-packages repository.

srcpkgs/iscan/patches/sscanf-c99.patch

@@ -0,0 +1,20 @@
+--- a/backend/cfg-obj.c
++++ b/backend/cfg-obj.c
+@@ -1026,7 +1026,7 @@ _cfg_register_scsi_entry (const char *string)
+       char *vendor = NULL;
+       char *model  = NULL;
+
+-      sscanf (string, "%*s %as %as", &vendor, &model);
++      sscanf (string, "%*s %ms %ms", &vendor, &model);
+
+       if (list_append (_cfg->seen[CFG_KEY_SCSI], info))
+         {
+@@ -1108,7 +1108,7 @@ _cfg_register_interpreter_entry (const char *string)
+       char *library  = NULL;
+       char *firmware = NULL;
+
+-      sscanf (string, "%*s %*s %x %x %as %as",
++      sscanf (string, "%*s %*s %x %x %ms %ms",
+               &vendor, &product, &library, &firmware);
+
+       if (library && _cfg_have_interpreter (library, firmware)

srcpkgs/iscan/template

@@ -1,13 +1,14 @@
 # Template file for 'iscan'
 pkgname=iscan
 version=2.30.4
-revision=1
+revision=2
 _srcrev=2
 archs="i686 x86_64"
 build_style=gnu-configure
-configure_args="--enable-frontend --enable-jpeg --enable-tiff --enable-png --enable-gimp"
+configure_args="--enable-frontend --enable-jpeg --enable-tiff --enable-png"
 hostmakedepends="pkg-config"
-makedepends="gtk+-devel gimp-devel libxml2-devel libjpeg-turbo-devel tiff-devel libltdl-devel libpng-devel sane-devel libusb-devel"
+makedepends="gtk+-devel libxml2-devel libjpeg-turbo-devel tiff-devel libltdl-devel
+ libpng-devel sane-devel libusb-devel"
 depends="sane-epkowa"
 short_desc="EPSON Image Scan! front-end"
 maintainer="Orphaned <orphan@voidlinux.org>"
@@ -16,6 +17,7 @@ homepage="http://download.ebz.epson.net/dsc/search/01/search/?OSC=LX"
 distfiles="http://support.epson.net/linux/src/scanner/iscan/${pkgname}_${version}-${_srcrev}.tar.gz"
 checksum=597b9913de42d7a27f95bc82e533cbe778121ba13e3a03bc037f8d09a43447d5
 repository=nonfree
+restricted=yes
 LDFLAGS="-ldl -lpng16"
 
 post_configure() {
@@ -25,16 +27,14 @@ post_configure() {
 
 post_install() {
 	vlicense non-free/COPYING.EPSON.en.txt
-	vmkdir usr/lib/gimp/2.0/plug-ins
-	ln -s /usr/bin/iscan ${DESTDIR}/usr/lib/gimp/2.0/plug-ins
 	vinstall iscan.desktop 644 usr/share/applications
-	vdoc "${FILESDIR}/README.voidlinux"
 }
 
 sane-epkowa_package() {
 	short_desc="SANE backend for EPSON scanners"
 	license="GPL-2.0-or-later"
 	unset repository
+	unset restricted
 	depends="sane iscan-data"
 	conf_files="/etc/sane.d/epkowa.conf"
 	pkg_install() {
@@ -45,5 +45,6 @@ sane-epkowa_package() {
 		vmove usr/bin/iscan-registry
 		vmove usr/share/man/man8/iscan-registry.8
 		vinstall backend/epkowa.conf 644 etc/sane.d/
+		vdoc "${FILESDIR}/README.voidlinux"
 	}
 }