From 686aed9f5b7188a5e315ebb92379ebd21a3502a2 Mon Sep 17 00:00:00 2001
From: "Andrew J. Hesford" <ajh@sideband.org>
Date: Thu, 30 Jul 2020 08:06:07 -0400
Subject: [PATCH] hplip: preserve SANE configuration

---
 srcpkgs/hplip/template | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/srcpkgs/hplip/template b/srcpkgs/hplip/template
index 0ec65e7993a..962ca887837 100644
--- a/srcpkgs/hplip/template
+++ b/srcpkgs/hplip/template
@@ -1,7 +1,7 @@
 # Template file for 'hplip'
 pkgname=hplip
 version=3.20.6
-revision=1
+revision=2
 build_style=gnu-configure
 pycompile_dirs="usr/share/hplip"
 configure_args="
@@ -47,8 +47,11 @@ do_install() {
 	sed -i Makefile -e "s;ppd/hpcups/\\*.ppd.gz;;g"
 	make locatedriverdir=/usr/libexec/hplip dat2drvdir=/usr/libexec/hplip \
 		rulesdir=/usr/lib/udev/rules.d DESTDIR=${DESTDIR} install
-	# remove config provided by sane and autostart of hp-daemon
-	rm -rf ${DESTDIR}/etc/{sane.d,xdg}
+	# Move sane config to dll.d to avoid conflicts
+	vmkdir etc/sane.d/dll.d
+	mv ${DESTDIR}/etc/sane.d/dll.conf ${DESTDIR}/etc/sane.d/dll.d/hplip
+	# remove autostart of hp-daemon
+	rm -rf ${DESTDIR}/etc/xdg
 	# remove unwanted files
 	rm -f ${DESTDIR}/usr/share/doc/hplip-${version}/{copyright,README_LIBJPG,COPYING}
 	# remove HAL .fdi file because HAL is no longer used