net-print/cndrvcups-lb: Version bump to 3.20.

This new version supports the MF620C series and a lot more new models.
Upstream driver file format reverted back to the one used in 2.90, which
is why it's the bump subject.

Closes: https://github.com/gentoo/gentoo/pull/1700

Signed-off-by: Patrice Clement <monsieurp@gentoo.org>

diff --git a/net-print/cndrvcups-common-lb/Manifest b/net-print/cndrvcups-common-lb/Manifest
index 0714db88ca93a5a54f0cb6c16c224bb718231e57..a5ddc608c815ee742cce35ff434520fde315215b 100644 (file)
--- a/net-print/cndrvcups-common-lb/Manifest
+++ b/net-print/cndrvcups-common-lb/Manifest
@@ -1,2 +1,2 @@
-DIST Linux_UFRII_PrinterDriver_V290_uk_EN.tar.gz 90901373 SHA256 bcc9db26e261d239438aeb15f171b5b0e7fd305abd0729be0e806bb4c039654a SHA512 23181155f5719fa0a9c216c058be749b5faaa8ee745d260eba2e5e284ef4ff161e344289a7c301a2d74cc919c5031763b0daf41cd07686cfdce188492a9b34b2 WHIRLPOOL 82bb966d823f8019d6275d421ebd2ff848556415e1767bd8fc2638d97479e15029a48818e5b45e9210781f4f37fd269dde46763404314b6c47ee0b4670e03600
+DIST Linux_UFRII_PrinterDriver_V320_uk_EN.tar.gz 90901373 SHA256 bcc9db26e261d239438aeb15f171b5b0e7fd305abd0729be0e806bb4c039654a SHA512 23181155f5719fa0a9c216c058be749b5faaa8ee745d260eba2e5e284ef4ff161e344289a7c301a2d74cc919c5031763b0daf41cd07686cfdce188492a9b34b2 WHIRLPOOL 82bb966d823f8019d6275d421ebd2ff848556415e1767bd8fc2638d97479e15029a48818e5b45e9210781f4f37fd269dde46763404314b6c47ee0b4670e03600
 DIST o1581en_linux_UFRII_v300.zip 94262679 SHA256 1ec1b162411642dc1814608ec71a3b94d6e22ede234f6b750bbdfd3820d5ac46 SHA512 e31415f2e9256c5dc98e27afe3bdc2f75b852d0a99721f8f2ac78225bac497e84c6ce94e8447f3aed6bb6c94975c7625f0dbb2647be44f90c144a46e9af89b81 WHIRLPOOL f419d6130ce9cfd87caebc9678991bbd46e2db5f8bb5a39fb8202a7532de33e969f4f907f2f1404859f987c57f49f562defcec42380ea1b4f284b8d4c6cae3e6

diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-2.90.ebuild b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.20.ebuild
similarity index 91%
rename from net-print/cndrvcups-common-lb/cndrvcups-common-lb-2.90.ebuild
rename to net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.20.ebuild
index 22c2b5e4a23959da2fa969a5bbadcff5f437f151..d982497132b8762f8a4dfd3230dc58005b3184ea 100644 (file)
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-2.90.ebuild
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.20.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://pdisp01.c-wss.com/gdl/WWUFORedirectTarget.do?id=MDEwMDAwMjcwODEx
 
 LICENSE="Canon-UFR-II GPL-2 MIT"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 
 # Needed because GPL2 stuff miss their sources in tarball
@@ -46,15 +46,15 @@ QA_SONAME="/usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0"
 
 src_unpack() {
        unpack ${A}
-       cd "${WORKDIR}/${SOURCES_NAME}/Sources/"
+       cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die
        unpack ./${P/-lb/}-1.tar.gz
 }
 
 change_dir() {
        for i in cngplp buftool backend; do
-               cd "${i}"
+               cd "${i}" || die
                "${@}"
-               cd "${S}"
+               cd "${S}" || die
        done
 }
 
@@ -75,7 +75,7 @@ src_compile() {
        change_dir emake
 
        # Cannot be moved to 'change_dir' as it doesn't need eautoreconf
-       cd "${S}/c3plmod_ipc" && emake
+       ( cd "${S}/c3plmod_ipc" || die ) && emake
 }
 
 src_install() {
@@ -83,17 +83,17 @@ src_install() {
 
        einstalldocs
 
-       cd "${S}/c3plmod_ipc"
+       cd "${S}/c3plmod_ipc" || die
        dolib.so libcanonc3pl.so.1.0.0
        dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so.1"
        dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so"
 
-       cd "${S}/data"
+       cd "${S}/data" || die
        insinto /usr/share/caepcm
        doins *
 
        ABI=x86
-       cd "${S}/libs"
+       cd "${S}/libs" || die
        exeinto $(cups-config --serverbin)/filter
        doexe c3pldrv
        dolib.so libcaepcm.so.1.0

diff --git a/net-print/cndrvcups-lb/Manifest b/net-print/cndrvcups-lb/Manifest
index 0714db88ca93a5a54f0cb6c16c224bb718231e57..a5ddc608c815ee742cce35ff434520fde315215b 100644 (file)
--- a/net-print/cndrvcups-lb/Manifest
+++ b/net-print/cndrvcups-lb/Manifest
@@ -1,2 +1,2 @@
-DIST Linux_UFRII_PrinterDriver_V290_uk_EN.tar.gz 90901373 SHA256 bcc9db26e261d239438aeb15f171b5b0e7fd305abd0729be0e806bb4c039654a SHA512 23181155f5719fa0a9c216c058be749b5faaa8ee745d260eba2e5e284ef4ff161e344289a7c301a2d74cc919c5031763b0daf41cd07686cfdce188492a9b34b2 WHIRLPOOL 82bb966d823f8019d6275d421ebd2ff848556415e1767bd8fc2638d97479e15029a48818e5b45e9210781f4f37fd269dde46763404314b6c47ee0b4670e03600
+DIST Linux_UFRII_PrinterDriver_V320_uk_EN.tar.gz 90901373 SHA256 bcc9db26e261d239438aeb15f171b5b0e7fd305abd0729be0e806bb4c039654a SHA512 23181155f5719fa0a9c216c058be749b5faaa8ee745d260eba2e5e284ef4ff161e344289a7c301a2d74cc919c5031763b0daf41cd07686cfdce188492a9b34b2 WHIRLPOOL 82bb966d823f8019d6275d421ebd2ff848556415e1767bd8fc2638d97479e15029a48818e5b45e9210781f4f37fd269dde46763404314b6c47ee0b4670e03600
 DIST o1581en_linux_UFRII_v300.zip 94262679 SHA256 1ec1b162411642dc1814608ec71a3b94d6e22ede234f6b750bbdfd3820d5ac46 SHA512 e31415f2e9256c5dc98e27afe3bdc2f75b852d0a99721f8f2ac78225bac497e84c6ce94e8447f3aed6bb6c94975c7625f0dbb2647be44f90c144a46e9af89b81 WHIRLPOOL f419d6130ce9cfd87caebc9678991bbd46e2db5f8bb5a39fb8202a7532de33e969f4f907f2f1404859f987c57f49f562defcec42380ea1b4f284b8d4c6cae3e6

diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-2.90.ebuild b/net-print/cndrvcups-lb/cndrvcups-lb-3.20.ebuild
similarity index 93%
rename from net-print/cndrvcups-lb/cndrvcups-lb-2.90.ebuild
rename to net-print/cndrvcups-lb/cndrvcups-lb-3.20.ebuild
index 4f6fe633c1e38b33aa3ad728b110291bfba6249a..73d40e115f90eb8ea11fec6e4a5fc244c7c4bf66 100644 (file)
--- a/net-print/cndrvcups-lb/cndrvcups-lb-2.90.ebuild
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-3.20.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://pdisp01.c-wss.com/gdl/WWUFORedirectTarget.do?id=MDEwMDAwMjcwODEx
 
 LICENSE="Canon-UFR-II"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 
 # Needed because GPL2 stuff miss their sources in tarball
@@ -48,15 +48,15 @@ QA_SONAME="/usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0"
 
 src_unpack() {
        unpack ${A}
-       cd "${WORKDIR}/${SOURCES_NAME}/Sources/"
+       cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die
        unpack ./${P}-1.tar.gz
 }
 
 change_dir() {
        for i in ppd pstoufr2cpca cngplp cngplp/files cpca ; do
-               cd "${i}"
+               cd "${i}" || die
                "${@}"
-               cd "${S}"
+               cd "${S}" || die
        done
 }
 
@@ -80,11 +80,11 @@ src_install() {
 
        prune_libtool_files
 
-       cd "${S}/data"
+       cd "${S}/data" || die
        insinto /usr/share/caepcm
        doins *
 
-       cd "${S}/libs"
+       cd "${S}/libs" || die
        insinto /usr/share/cnpkbidi
        doins cnpkbidi_info*