From d5093a0c2a2671a4e45f57d6e0fdcf089ac770c6 Mon Sep 17 00:00:00 2001
From: Laszlo Valko <valko@linux.karinthy.hu>
Date: Wed, 30 May 2018 14:05:36 +0200
Subject: [PATCH] Fixed Canon driver.

---
 net-print/cndrvcups-sfp/Manifest              |  2 +-
 .../cndrvcups-sfp/cndrvcups-sfp-1.40.ebuild   | 48 +++++++++++--------
 2 files changed, 29 insertions(+), 21 deletions(-)

diff --git a/net-print/cndrvcups-sfp/Manifest b/net-print/cndrvcups-sfp/Manifest
index 61d99cf..afed507 100644
--- a/net-print/cndrvcups-sfp/Manifest
+++ b/net-print/cndrvcups-sfp/Manifest
@@ -1,3 +1,3 @@
 DIST linux-UFRIILT-drv-v140_uken.tar.gz 106958045 BLAKE2B 605663beea4737a3d7503340d66106a959167fc60ee8f0bfea514ee320c73ce5488290b2a105d72d0f8257d131656c5cd92f7f025297cb2526a2cf28e1066d3f SHA512 3d25db05dd17a85c299bb1fdab776225be5370e6f1f634496a8b4f7dfd59b7a545bccfeb436656387343238e96d624556448047659968fe8094148937ba04e84
-EBUILD cndrvcups-sfp-1.40.ebuild 2647 BLAKE2B 1a7117904dae86c0cffa196ed0e9a9970a4b574fa50918ab2e7755f6845d9d96761e8328b0c4c35a805ca0fda3c37061b2d2345c0bf5f719701be81dea26d1e4 SHA512 744777d1e42650b252e792d967ff997470341d6652ca107b7ab4c54ea4b96eaaa9664759045b5b5e97a648b0cf69785b92f4e956eb53662605e786a8324261e8
+EBUILD cndrvcups-sfp-1.40.ebuild 3214 BLAKE2B eca724e5398a14c819e7fd189a15f578170ec8fba6f547d37cd30357e74004820e09b111bfc680a2f3b652c14f8215b20247c8caa9de2b447a29bd93e68a30c1 SHA512 d13429d24d3ffe0a73d722c6af992f451fdaafa0ef51a29c912a250a1a17998b85ac2ad22d024f3a2dc0b864b9259a7981e71214f04e02d6db76b90793fae96a
 MISC metadata.xml 239 BLAKE2B 33a4b7a2007252ef09e319431769f16c7010fc511e2e2ff02853ce5bf064f90b3e3ff088d97510fa0cfdd2dffaf82872f836aff8385efcee22a62d611cc41a21 SHA512 e2741d7308653b7fb13bf9b4af86c5525cea22e23e31925db40ef76a3f228ac5fe520bbf6a0c5b83565e2257e588acaa9a33cc55480138932446642cbbf15623
diff --git a/net-print/cndrvcups-sfp/cndrvcups-sfp-1.40.ebuild b/net-print/cndrvcups-sfp/cndrvcups-sfp-1.40.ebuild
index 7c46490..cf86f3a 100644
--- a/net-print/cndrvcups-sfp/cndrvcups-sfp-1.40.ebuild
+++ b/net-print/cndrvcups-sfp/cndrvcups-sfp-1.40.ebuild
@@ -32,16 +32,28 @@ MAKEOPTS+=" -j1"
 pkg_setup() {
 	# Don't raise a fuss over pre-built binaries
 	QA_PREBUILT="
-		/usr/bin/cnpkbidi
-		/usr/bin/cnpkmoduleufr2
+		/usr/bin/pksmncap
+		/usr/bin/commandfilefilter
+		/usr/bin/cnpkmodulencap
 		/usr/$(get_abi_LIBDIR x86)/libEnoJPEG.so.1.0.0
 		/usr/$(get_abi_LIBDIR x86)/libEnoJBIG.so.1.0.0
-		/usr/$(get_abi_LIBDIR x86)/libufr2filter.so.1.0.0
-		/usr/$(get_abi_LIBDIR x86)/libcnlbcm.so.1.0
-		/usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0
-		/usr/$(get_abi_LIBDIR x86)/libcanonufr2.so.1.0.0
+		/usr/$(get_abi_LIBDIR x86)/libncapfilter.so.1.0.0
+		/usr/$(get_abi_LIBDIR x86)/libcnncapcm.so.1.0
+		/usr/$(get_abi_LIBDIR x86)/libcaio_usb_cdc.so.1.0.0
+		/usr/$(get_abi_LIBDIR x86)/libccpd_util.so.1.0.0
+		/usr/$(get_abi_LIBDIR x86)/libcanon_common.so.1.0.0
+		/usr/$(get_abi_LIBDIR x86)/libcanonncap.so.1.0.0
+		/usr/$(get_abi_LIBDIR x86)/libCUPS_Communicator.so.1.0.0
+		/usr/$(get_abi_LIBDIR x86)/libCommIsolation.so.1.0.0
+		/usr/$(get_abi_LIBDIR x86)/libcomm_ncapcaio.so.1.0.0
+		/usr/$(get_abi_LIBDIR x86)/libcomm_stdout.so.1.0.0
+		/usr/$(get_abi_LIBDIR x86)/libcomm_usbmlport.so.1.0.0
+		/usr/$(get_abi_LIBDIR x86)/libcomm_usbsock.so.1.0.0
+		/usr/$(get_abi_LIBDIR x86)/libcomm_websrv.so.1.0.0
+		/usr/$(get_abi_LIBDIR x86)/libinfo.so.1.0.0
+		/usr/$(get_abi_LIBDIR x86)/libinfo_analyze.so.1.0.0
 	"
-	QA_SONAME="/usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0"
+	QA_SONAME="/usr/$(get_abi_LIBDIR x86)/libcaio_usb_cdc.so.1.0.0"
 }
 
 src_unpack() {
@@ -51,7 +63,7 @@ src_unpack() {
 }
 
 change_dir() {
-	for i in ppd pstoufr2cpca cngplp cngplp/files cpca ; do
+	for i in ppd pstoncapcpca cngplp cngplp/files cpca StatusMonitor ; do
 		cd "${i}" || die
 		"${@}"
 		cd "${S}" || die
@@ -62,7 +74,7 @@ src_prepare() {
 	default
 	sed -i -e \
 		"s:filterdir = \$(libdir)/cups/filter:filterdir = `cups-config --serverbin`/filter:" \
-		pstoufr2cpca/filter/Makefile.am || die
+		pstoncapcpca/filter/Makefile.am || die
 
 	export "LIBS=-lgmodule-2.0"
 	change_dir eautoreconf
@@ -82,26 +94,22 @@ src_install() {
 	insinto /usr/share/caepcm
 	doins *
 
-	cd "${S}/libs" || die
-	insinto /usr/share/cnpkbidi
-	doins cnpkbidi_info*
-
-	insinto /usr/share/ufr2filter
+	insinto /usr/share/ncapfilter
 	doins ThLB*
 
 	ABI=x86
-	dobin cnpkbidi cnpkmoduleufr2
-	dolib.so libcnlbcm.so.1.0
-	dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.so.1"
-	dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.so"
+	dobin cnpkmodulencap
+	dolib.so libcnncapcm.so.1.0
+	dosym libcnncapcm.so.1.0 "/usr/$(get_libdir)/libcnncapcm.so.1"
+	dosym libcnncapcm.so.1.0 "/usr/$(get_libdir)/libcnncapcm.so"
 	for lib in *.so.?.?.?; do
 		dolib.so "${lib}"
 		dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?}"
 		dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?.?}"
 	done
 
-	# c3pldrv dlopens the absolute path /usr/lib/libcnlbcm.so :(
+	# c3pldrv dlopens the absolute path /usr/lib/libcnncapcm.so :(
 	if [[ "$(get_libdir)" != lib ]]; then
-		dosym "../$(get_libdir)/libcnlbcm.so" /usr/lib/libcnlbcm.so
+		dosym "../$(get_libdir)/libcnncapcm.so" /usr/lib/libcnncapcm.so
 	fi
 }