| 1 |
commit: c5052773aa102138bfbbdedb756a50ee6e94e934 |
| 2 |
Author: Leho Kraav <leho <AT> kraav <DOT> com> |
| 3 |
AuthorDate: Sat Jun 25 16:53:52 2016 +0000 |
| 4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Jun 26 09:39:40 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5052773 |
| 7 |
|
| 8 |
net-print/cndrvcups-lb: Version bump to 3.20. |
| 9 |
|
| 10 |
This new version supports the MF620C series and a lot more new models. |
| 11 |
Upstream driver file format reverted back to the one used in 2.90, which |
| 12 |
is why it's the bump subject. |
| 13 |
|
| 14 |
Closes: https://github.com/gentoo/gentoo/pull/1700 |
| 15 |
|
| 16 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
| 17 |
|
| 18 |
net-print/cndrvcups-common-lb/Manifest | 2 +- |
| 19 |
...on-lb-2.90.ebuild => cndrvcups-common-lb-3.20.ebuild} | 16 ++++++++-------- |
| 20 |
net-print/cndrvcups-lb/Manifest | 2 +- |
| 21 |
...cndrvcups-lb-2.90.ebuild => cndrvcups-lb-3.20.ebuild} | 12 ++++++------ |
| 22 |
4 files changed, 16 insertions(+), 16 deletions(-) |
| 23 |
|
| 24 |
diff --git a/net-print/cndrvcups-common-lb/Manifest b/net-print/cndrvcups-common-lb/Manifest |
| 25 |
index 0714db8..a5ddc60 100644 |
| 26 |
--- a/net-print/cndrvcups-common-lb/Manifest |
| 27 |
+++ b/net-print/cndrvcups-common-lb/Manifest |
| 28 |
@@ -1,2 +1,2 @@ |
| 29 |
-DIST Linux_UFRII_PrinterDriver_V290_uk_EN.tar.gz 90901373 SHA256 bcc9db26e261d239438aeb15f171b5b0e7fd305abd0729be0e806bb4c039654a SHA512 23181155f5719fa0a9c216c058be749b5faaa8ee745d260eba2e5e284ef4ff161e344289a7c301a2d74cc919c5031763b0daf41cd07686cfdce188492a9b34b2 WHIRLPOOL 82bb966d823f8019d6275d421ebd2ff848556415e1767bd8fc2638d97479e15029a48818e5b45e9210781f4f37fd269dde46763404314b6c47ee0b4670e03600 |
| 30 |
+DIST Linux_UFRII_PrinterDriver_V320_uk_EN.tar.gz 90901373 SHA256 bcc9db26e261d239438aeb15f171b5b0e7fd305abd0729be0e806bb4c039654a SHA512 23181155f5719fa0a9c216c058be749b5faaa8ee745d260eba2e5e284ef4ff161e344289a7c301a2d74cc919c5031763b0daf41cd07686cfdce188492a9b34b2 WHIRLPOOL 82bb966d823f8019d6275d421ebd2ff848556415e1767bd8fc2638d97479e15029a48818e5b45e9210781f4f37fd269dde46763404314b6c47ee0b4670e03600 |
| 31 |
DIST o1581en_linux_UFRII_v300.zip 94262679 SHA256 1ec1b162411642dc1814608ec71a3b94d6e22ede234f6b750bbdfd3820d5ac46 SHA512 e31415f2e9256c5dc98e27afe3bdc2f75b852d0a99721f8f2ac78225bac497e84c6ce94e8447f3aed6bb6c94975c7625f0dbb2647be44f90c144a46e9af89b81 WHIRLPOOL f419d6130ce9cfd87caebc9678991bbd46e2db5f8bb5a39fb8202a7532de33e969f4f907f2f1404859f987c57f49f562defcec42380ea1b4f284b8d4c6cae3e6 |
| 32 |
|
| 33 |
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 |
| 34 |
similarity index 91% |
| 35 |
rename from net-print/cndrvcups-common-lb/cndrvcups-common-lb-2.90.ebuild |
| 36 |
rename to net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.20.ebuild |
| 37 |
index 22c2b5e..d982497 100644 |
| 38 |
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-2.90.ebuild |
| 39 |
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.20.ebuild |
| 40 |
@@ -14,7 +14,7 @@ SRC_URI="http://pdisp01.c-wss.com/gdl/WWUFORedirectTarget.do?id=MDEwMDAwMjcwODEx |
| 41 |
|
| 42 |
LICENSE="Canon-UFR-II GPL-2 MIT" |
| 43 |
SLOT="0" |
| 44 |
-KEYWORDS="-* amd64 x86" |
| 45 |
+KEYWORDS="-* ~amd64 ~x86" |
| 46 |
IUSE="" |
| 47 |
|
| 48 |
# Needed because GPL2 stuff miss their sources in tarball |
| 49 |
@@ -46,15 +46,15 @@ QA_SONAME="/usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0" |
| 50 |
|
| 51 |
src_unpack() { |
| 52 |
unpack ${A} |
| 53 |
- cd "${WORKDIR}/${SOURCES_NAME}/Sources/" |
| 54 |
+ cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die |
| 55 |
unpack ./${P/-lb/}-1.tar.gz |
| 56 |
} |
| 57 |
|
| 58 |
change_dir() { |
| 59 |
for i in cngplp buftool backend; do |
| 60 |
- cd "${i}" |
| 61 |
+ cd "${i}" || die |
| 62 |
"${@}" |
| 63 |
- cd "${S}" |
| 64 |
+ cd "${S}" || die |
| 65 |
done |
| 66 |
} |
| 67 |
|
| 68 |
@@ -75,7 +75,7 @@ src_compile() { |
| 69 |
change_dir emake |
| 70 |
|
| 71 |
# Cannot be moved to 'change_dir' as it doesn't need eautoreconf |
| 72 |
- cd "${S}/c3plmod_ipc" && emake |
| 73 |
+ ( cd "${S}/c3plmod_ipc" || die ) && emake |
| 74 |
} |
| 75 |
|
| 76 |
src_install() { |
| 77 |
@@ -83,17 +83,17 @@ src_install() { |
| 78 |
|
| 79 |
einstalldocs |
| 80 |
|
| 81 |
- cd "${S}/c3plmod_ipc" |
| 82 |
+ cd "${S}/c3plmod_ipc" || die |
| 83 |
dolib.so libcanonc3pl.so.1.0.0 |
| 84 |
dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so.1" |
| 85 |
dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so" |
| 86 |
|
| 87 |
- cd "${S}/data" |
| 88 |
+ cd "${S}/data" || die |
| 89 |
insinto /usr/share/caepcm |
| 90 |
doins * |
| 91 |
|
| 92 |
ABI=x86 |
| 93 |
- cd "${S}/libs" |
| 94 |
+ cd "${S}/libs" || die |
| 95 |
exeinto $(cups-config --serverbin)/filter |
| 96 |
doexe c3pldrv |
| 97 |
dolib.so libcaepcm.so.1.0 |
| 98 |
|
| 99 |
diff --git a/net-print/cndrvcups-lb/Manifest b/net-print/cndrvcups-lb/Manifest |
| 100 |
index 0714db8..a5ddc60 100644 |
| 101 |
--- a/net-print/cndrvcups-lb/Manifest |
| 102 |
+++ b/net-print/cndrvcups-lb/Manifest |
| 103 |
@@ -1,2 +1,2 @@ |
| 104 |
-DIST Linux_UFRII_PrinterDriver_V290_uk_EN.tar.gz 90901373 SHA256 bcc9db26e261d239438aeb15f171b5b0e7fd305abd0729be0e806bb4c039654a SHA512 23181155f5719fa0a9c216c058be749b5faaa8ee745d260eba2e5e284ef4ff161e344289a7c301a2d74cc919c5031763b0daf41cd07686cfdce188492a9b34b2 WHIRLPOOL 82bb966d823f8019d6275d421ebd2ff848556415e1767bd8fc2638d97479e15029a48818e5b45e9210781f4f37fd269dde46763404314b6c47ee0b4670e03600 |
| 105 |
+DIST Linux_UFRII_PrinterDriver_V320_uk_EN.tar.gz 90901373 SHA256 bcc9db26e261d239438aeb15f171b5b0e7fd305abd0729be0e806bb4c039654a SHA512 23181155f5719fa0a9c216c058be749b5faaa8ee745d260eba2e5e284ef4ff161e344289a7c301a2d74cc919c5031763b0daf41cd07686cfdce188492a9b34b2 WHIRLPOOL 82bb966d823f8019d6275d421ebd2ff848556415e1767bd8fc2638d97479e15029a48818e5b45e9210781f4f37fd269dde46763404314b6c47ee0b4670e03600 |
| 106 |
DIST o1581en_linux_UFRII_v300.zip 94262679 SHA256 1ec1b162411642dc1814608ec71a3b94d6e22ede234f6b750bbdfd3820d5ac46 SHA512 e31415f2e9256c5dc98e27afe3bdc2f75b852d0a99721f8f2ac78225bac497e84c6ce94e8447f3aed6bb6c94975c7625f0dbb2647be44f90c144a46e9af89b81 WHIRLPOOL f419d6130ce9cfd87caebc9678991bbd46e2db5f8bb5a39fb8202a7532de33e969f4f907f2f1404859f987c57f49f562defcec42380ea1b4f284b8d4c6cae3e6 |
| 107 |
|
| 108 |
diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-2.90.ebuild b/net-print/cndrvcups-lb/cndrvcups-lb-3.20.ebuild |
| 109 |
similarity index 93% |
| 110 |
rename from net-print/cndrvcups-lb/cndrvcups-lb-2.90.ebuild |
| 111 |
rename to net-print/cndrvcups-lb/cndrvcups-lb-3.20.ebuild |
| 112 |
index 4f6fe63..73d40e1 100644 |
| 113 |
--- a/net-print/cndrvcups-lb/cndrvcups-lb-2.90.ebuild |
| 114 |
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-3.20.ebuild |
| 115 |
@@ -14,7 +14,7 @@ SRC_URI="http://pdisp01.c-wss.com/gdl/WWUFORedirectTarget.do?id=MDEwMDAwMjcwODEx |
| 116 |
|
| 117 |
LICENSE="Canon-UFR-II" |
| 118 |
SLOT="0" |
| 119 |
-KEYWORDS="-* amd64 x86" |
| 120 |
+KEYWORDS="-* ~amd64 ~x86" |
| 121 |
IUSE="" |
| 122 |
|
| 123 |
# Needed because GPL2 stuff miss their sources in tarball |
| 124 |
@@ -48,15 +48,15 @@ QA_SONAME="/usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0" |
| 125 |
|
| 126 |
src_unpack() { |
| 127 |
unpack ${A} |
| 128 |
- cd "${WORKDIR}/${SOURCES_NAME}/Sources/" |
| 129 |
+ cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die |
| 130 |
unpack ./${P}-1.tar.gz |
| 131 |
} |
| 132 |
|
| 133 |
change_dir() { |
| 134 |
for i in ppd pstoufr2cpca cngplp cngplp/files cpca ; do |
| 135 |
- cd "${i}" |
| 136 |
+ cd "${i}" || die |
| 137 |
"${@}" |
| 138 |
- cd "${S}" |
| 139 |
+ cd "${S}" || die |
| 140 |
done |
| 141 |
} |
| 142 |
|
| 143 |
@@ -80,11 +80,11 @@ src_install() { |
| 144 |
|
| 145 |
prune_libtool_files |
| 146 |
|
| 147 |
- cd "${S}/data" |
| 148 |
+ cd "${S}/data" || die |
| 149 |
insinto /usr/share/caepcm |
| 150 |
doins * |
| 151 |
|
| 152 |
- cd "${S}/libs" |
| 153 |
+ cd "${S}/libs" || die |
| 154 |
insinto /usr/share/cnpkbidi |
| 155 |
doins cnpkbidi_info* |
Archives