3 files changed, 59 insertions, 51 deletions
diff --git a/packages/net-print/foo2zjs/files/foo2zjs-udev.patch b/packages/net-print/foo2zjs/files/foo2zjs-udev.patch
index 0703839..a5cf8d8 100644
--- a/packages/net-print/foo2zjs/files/foo2zjs-udev.patch
+++ b/packages/net-print/foo2zjs/files/foo2zjs-udev.patch
@@ -1,3 +1,7 @@
+Source: Gentoo distribution
+Reason: Do not fail on udev rules preparation (guessing)
+Upstream: unknown status
+
 diff -ruN foo2zjs/Makefile foo2zjs.orig/Makefile
 --- foo2zjs/Makefile	2012-01-18 21:53:45.834944820 +0100
 +++ foo2zjs.orig/Makefile	2012-01-18 21:51:18.872936603 +0100
diff --git a/packages/net-print/foo2zjs/files/foo2zjs-usbbackend.patch b/packages/net-print/foo2zjs/files/foo2zjs-usbbackend.patch
index b73c79b..a7a0b7b 100644
--- a/packages/net-print/foo2zjs/files/foo2zjs-usbbackend.patch
+++ b/packages/net-print/foo2zjs/files/foo2zjs-usbbackend.patch
@@ -1,3 +1,7 @@
+Source: Gentoo distribution
+Reason: use correct cups backends path
+Upstream: does not required ?
+
 diff -ruN foo2zjs.orig/hplj1000 foo2zjs/hplj1000
 --- foo2zjs.orig/hplj1000	2013-01-11 17:20:04.000000000 +0100
 +++ foo2zjs/hplj1000	2013-03-24 20:49:16.150065578 +0100
diff --git a/packages/net-print/foo2zjs/foo2zjs-scm.exheres-0 b/packages/net-print/foo2zjs/foo2zjs-scm.exheres-0
index 4bd1925..082f85c 100644
--- a/packages/net-print/foo2zjs/foo2zjs-scm.exheres-0
+++ b/packages/net-print/foo2zjs/foo2zjs-scm.exheres-0
@@ -1,5 +1,6 @@
-# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
+# Copyright 1999-2018 Gentoo Foundation
+# Copyright 2018 Gluzskiy Alexandr <sss@sss.chaoslab.ru>
 
 SUMMARY="Support for printing to ZjStream-based printers"
 HOMEPAGE="http://foo2zjs.rkkda.com/"
@@ -9,65 +10,64 @@ SLOT="0"
 PLATFORMS="~amd64 ~x86"
 
 DEPENDENCIES="
-	build:
-		app-arch/unzip
-		app-editors/vim
-		net-misc/wget
-		sys-apps/ed
-		sys-apps/bc
-	run:
-		net-print/cups
-		net-print/cups-filters
-		net-print/cups-filters
-	test:
-		sys-process/time
+    build:
+        app-arch/unzip
+        app-editors/vim
+        net-misc/wget
+        sys-apps/ed
+        sys-apps/bc
+    run:
+        net-print/cups
+        net-print/cups-filters
+        net-print/cups-filters
+    test:
+        sys-process/time
 "
 
-DEFAULT_SRC_COMPILE_PARAMS="-j1"
-DEFAULT_SRC_INSTALL_PARAMS="-j1"
+DEFAULT_SRC_COMPILE_PARAMS+=( -j1 )
+DEFAULT_SRC_INSTALL_PARAMS+=( -j1 )
+
+#WORK=${WORKBASE}/${PNV}
+
+
 
-WORK=${WORKBASE}/${PNV}
 src_unpack() {
-	edo mkdir "${WORK}"
-	edo wget "http://foo2zjs.rkkda.com/${PN}.tar.gz" -O "${WORK}/${PN}.tar.gz"
-	cd ${WORKBASE}/${PNV}
-	edo tar zxf "${WORK}/${PN}.tar.gz"
-	edo cd ${WORK}/${PN}
-	emake getweb
-	edo sed -e '/^WGETOPTS/s/-q//g' -i getweb
-	edo ./getweb all
+    edo mkdir "${WORK}"
+    edo wget "http://foo2zjs.rkkda.com/${PN}.tar.gz" -O "${WORK}/${PN}.tar.gz"
+    edo cd ${WORKBASE}/${PNV}
+    edo tar zxf "${WORK}/${PN}.tar.gz"
+    edo cd ${WORK}/${PN}
+    emake getweb
+    edo sed -e '/^WGETOPTS/s/-q//g' -i getweb
+    edo ./getweb all
 }
 
-src_prepare() {
-	WORK=${WORKBASE}/${PNV}/${PN}
-	cd ${WORK}
-	expatch "${FILES}/${PN}-udev.patch"
-	expatch "${FILES}/${PN}-usbbackend.patch"
-	# Prevent an access violation.
-#	sed -e "s~/etc~${D}/etc~g" -i Makefile || die
-#	sed -e "s~/etc~${D}/etc~g" -i hplj1000 || die
+DEFAULT_SRC_PREPARE_PATCHES=(
+    "${FILES}/${PN}-udev.patch"
+    "${FILES}/${PN}-usbbackend.patch"
+ )
 
-	# Prevent an access violation, do not create symlinks on live file system
-	# during installation.
-	edo sed -e 's/ install-filter / /g' -i Makefile
+src_prepare() {
+    WORK=${WORKBASE}/${PNV}/${PN}
+    edo cd ${WORK}
+    default
 
-	# Prevent an access violation, do not remove files from live filesystem
-	# during make install
-#	sed -e '/rm .*LIBUDEVDIR)\//d' -i Makefile || die
-#	sed -e '/rm .*lib\/udev\/rules.d\//d' -i hplj1000 || die
+    # Prevent an access violation, do not create symlinks on live file system
+    # during installation.
+    edo sed -e 's/ install-filter / /g' -i Makefile
 }
 
 src_install() {
-	dodir /usr/share/ppd
-	default
-	edo rmdir "${IMAGE}/usr/share/foo2hbpl/icm"
-	edo rmdir "${IMAGE}/usr/share/foo2hbpl"
-	edo rmdir "${IMAGE}/usr/share/foo2ddst/icm"
-	edo rmdir "${IMAGE}/usr/share/foo2ddst"
-	cd "${IMAGE}"
-	edo mkdir -p usr/$(exhost --target)/bin
-	edo mv usr/bin/*  usr/$(exhost --target)/bin/
-	edo mv bin/*  usr/$(exhost --target)/bin/
-	edo rmdir usr/bin
-	edo rmdir bin
+    dodir /usr/share/ppd
+    default
+    edo rmdir "${IMAGE}/usr/share/foo2hbpl/icm"
+    edo rmdir "${IMAGE}/usr/share/foo2hbpl"
+    edo rmdir "${IMAGE}/usr/share/foo2ddst/icm"
+    edo rmdir "${IMAGE}/usr/share/foo2ddst"
+    edo cd "${IMAGE}"
+    edo mkdir -p usr/$(exhost --target)/bin
+    edo mv usr/bin/*  usr/$(exhost --target)/bin/
+    edo mv bin/*  usr/$(exhost --target)/bin/
+    edo rmdir usr/bin
+    edo rmdir bin
 }