From 4ec0396f6f4ed42f6a6b5584db97a025079fff81 Mon Sep 17 00:00:00 2001
From: Andrea Brancaleoni <miwaxe@gmail.com>
Date: Thu, 4 Jun 2015 00:07:10 +0200
Subject: [PATCH] sane: removed systemd support

---
 srcpkgs/sane/files/saned.socket   |  9 ---------
 srcpkgs/sane/files/saned@.service |  8 --------
 srcpkgs/sane/template             | 12 +-----------
 3 files changed, 1 insertion(+), 28 deletions(-)
 delete mode 100644 srcpkgs/sane/files/saned.socket
 delete mode 100644 srcpkgs/sane/files/saned@.service

diff --git a/srcpkgs/sane/files/saned.socket b/srcpkgs/sane/files/saned.socket
deleted file mode 100644
index 66ef9c9c800..00000000000
--- a/srcpkgs/sane/files/saned.socket
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=saned incoming socket
-
-[Socket]
-ListenStream=6566
-Accept=yes
-
-[Install]
-WantedBy=sockets.target
diff --git a/srcpkgs/sane/files/saned@.service b/srcpkgs/sane/files/saned@.service
deleted file mode 100644
index 69e833e7eb0..00000000000
--- a/srcpkgs/sane/files/saned@.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Scanner Service
-
-[Service]
-Group=scanner
-ExecStart=/usr/sbin/saned
-StandardInput=socket
-StandardError=syslog
diff --git a/srcpkgs/sane/template b/srcpkgs/sane/template
index a2f09125949..7312206d3cd 100644
--- a/srcpkgs/sane/template
+++ b/srcpkgs/sane/template
@@ -1,7 +1,7 @@
 # Template build file for 'sane'.
 pkgname=sane
 version=1.0.24
-revision=12
+revision=13
 wrksrc="sane-backends-${version}"
 build_style=gnu-configure
 configure_args="--disable-locking --enable-avahi --disable-latex --enable-ipv6
@@ -92,11 +92,6 @@ license="GPL-2"
 distfiles="http://ftp.lfs-matrix.net/pub/blfs/conglomeration/sane-backends/sane-backends-${version}.tar.gz"
 checksum=27c7085a54f1505d8b551e6f1e69d30e1ee57328b18429bb2225dabf4c45462d
 
-build_options="systemd"
-if [ "$build_option_systemd" ]; then
-	systemd_services="saned.socket on"
-fi
-
 pre_configure() {
 	for f in $(find $wrksrc -type f -name *.[ch]); do
 		sed -e 's,u_char ,unsigned char ,g' -e 's,u_long,unsigned long ,g' -i $f
@@ -105,11 +100,6 @@ pre_configure() {
 post_install() {
 	# fix hp officejets
 	echo "#hpaio" >> ${DESTDIR}/etc/sane.d/dll.conf
-	# Install systemd service.
-	if [ "$build_option_systemd" ]; then
-		vinstall ${FILESDIR}/saned@.service 644 usr/lib/systemd/system
-		vinstall ${FILESDIR}/saned.socket 644 usr/lib/systemd/system
-	fi
 
 	vinstall ${FILESDIR}/saned.xinetd 644 etc/xinetd.d saned.conf
 	vinstall ${wrksrc}/tools/sane-backends.pc 644 usr/lib/pkgconfig