1 |
commit: a538610c31928e9fb3170fd032c9d924f0255562 |
2 |
Author: Leho Kraav <leho <AT> kraav <DOT> com> |
3 |
AuthorDate: Sat Jul 9 11:52:40 2016 +0000 |
4 |
Commit: Patrice Clement <monsieurp <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jul 9 13:09:36 2016 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a538610c |
7 |
|
8 |
net-print/cndrvcups-lb: correct 3.20 SRC_URI, fixup c505277. |
9 |
|
10 |
Props toralf.foerster! |
11 |
|
12 |
Gentoo-Bug: https://bugs.gentoo.org/587162 |
13 |
Closes: https://github.com/gentoo/gentoo/pull/1850 |
14 |
|
15 |
Signed-off-by: Patrice Clement <monsieurp <AT> gentoo.org> |
16 |
|
17 |
net-print/cndrvcups-common-lb/Manifest | 2 +- |
18 |
net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.20.ebuild | 8 ++++---- |
19 |
net-print/cndrvcups-lb/Manifest | 2 +- |
20 |
net-print/cndrvcups-lb/cndrvcups-lb-3.20.ebuild | 2 +- |
21 |
4 files changed, 7 insertions(+), 7 deletions(-) |
22 |
|
23 |
diff --git a/net-print/cndrvcups-common-lb/Manifest b/net-print/cndrvcups-common-lb/Manifest |
24 |
index a5ddc60..9834de0 100644 |
25 |
--- a/net-print/cndrvcups-common-lb/Manifest |
26 |
+++ b/net-print/cndrvcups-common-lb/Manifest |
27 |
@@ -1,2 +1,2 @@ |
28 |
-DIST Linux_UFRII_PrinterDriver_V320_uk_EN.tar.gz 90901373 SHA256 bcc9db26e261d239438aeb15f171b5b0e7fd305abd0729be0e806bb4c039654a SHA512 23181155f5719fa0a9c216c058be749b5faaa8ee745d260eba2e5e284ef4ff161e344289a7c301a2d74cc919c5031763b0daf41cd07686cfdce188492a9b34b2 WHIRLPOOL 82bb966d823f8019d6275d421ebd2ff848556415e1767bd8fc2638d97479e15029a48818e5b45e9210781f4f37fd269dde46763404314b6c47ee0b4670e03600 |
29 |
+DIST Linux_UFRII_PrinterDriver_V320_uk_EN.tar.gz 109548632 SHA256 b28bc2b460aeddcb7800983d2fad8c29ea6efcc95ad767a78fe6c25d0956f242 SHA512 fc35670a07f067b6ccdebf5b96590eafac2ed984faaa8a90ce44dd44396d6de0964f6352cae0fdf8ce1f6127ebf3ea9f6610b56ba7dd9a7f382bd1c6d588a801 WHIRLPOOL 661f8d6863bd1694efcc168615d9a7107e4a7aa09f5934a33b0f201b6d327038320cf87201bf4220ec876e1cca550169c91925d9f58fa3dae8dd4ea99de1ad1e |
30 |
DIST o1581en_linux_UFRII_v300.zip 94262679 SHA256 1ec1b162411642dc1814608ec71a3b94d6e22ede234f6b750bbdfd3820d5ac46 SHA512 e31415f2e9256c5dc98e27afe3bdc2f75b852d0a99721f8f2ac78225bac497e84c6ce94e8447f3aed6bb6c94975c7625f0dbb2647be44f90c144a46e9af89b81 WHIRLPOOL f419d6130ce9cfd87caebc9678991bbd46e2db5f8bb5a39fb8202a7532de33e969f4f907f2f1404859f987c57f49f562defcec42380ea1b4f284b8d4c6cae3e6 |
31 |
|
32 |
diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.20.ebuild b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.20.ebuild |
33 |
index d982497..762b098 100644 |
34 |
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.20.ebuild |
35 |
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.20.ebuild |
36 |
@@ -10,7 +10,7 @@ SOURCES_NAME="Linux_UFRII_PrinterDriver_V${MY_PV}_uk_EN" |
37 |
|
38 |
DESCRIPTION="Common files for Canon drivers" |
39 |
HOMEPAGE="http://support-au.canon.com.au/contents/AU/EN/0100270808.html" |
40 |
-SRC_URI="http://pdisp01.c-wss.com/gdl/WWUFORedirectTarget.do?id=MDEwMDAwMjcwODEx&cmp=ABS&lang=EN -> ${SOURCES_NAME}.tar.gz" |
41 |
+SRC_URI="http://pdisp01.c-wss.com/gdl/WWUFORedirectTarget.do?id=MDEwMDAwMjcwODE0&cmp=ABS&lang=EN -> ${SOURCES_NAME}.tar.gz" |
42 |
|
43 |
LICENSE="Canon-UFR-II GPL-2 MIT" |
44 |
SLOT="0" |
45 |
@@ -28,7 +28,7 @@ RDEPEND=" |
46 |
" |
47 |
DEPEND="${DEPEND}" |
48 |
|
49 |
-S="${WORKDIR}/${SOURCES_NAME}/Sources/${P/-lb/}" |
50 |
+S="${WORKDIR}/${SOURCES_NAME}/Sources/${P/-lb-${PV}/-3.60}" |
51 |
|
52 |
# Don't raise a fuss over pre-built binaries |
53 |
QA_PREBUILT=" |
54 |
@@ -47,7 +47,7 @@ QA_SONAME="/usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0" |
55 |
src_unpack() { |
56 |
unpack ${A} |
57 |
cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die |
58 |
- unpack ./${P/-lb/}-1.tar.gz |
59 |
+ unpack ./${P/-lb-${PV}/-3.60}-1.tar.gz |
60 |
} |
61 |
|
62 |
change_dir() { |
63 |
@@ -75,7 +75,7 @@ src_compile() { |
64 |
change_dir emake |
65 |
|
66 |
# Cannot be moved to 'change_dir' as it doesn't need eautoreconf |
67 |
- ( cd "${S}/c3plmod_ipc" || die ) && emake |
68 |
+ ( cd "${S}/c3plmod_ipc" && emake ) || die |
69 |
} |
70 |
|
71 |
src_install() { |
72 |
|
73 |
diff --git a/net-print/cndrvcups-lb/Manifest b/net-print/cndrvcups-lb/Manifest |
74 |
index a5ddc60..9834de0 100644 |
75 |
--- a/net-print/cndrvcups-lb/Manifest |
76 |
+++ b/net-print/cndrvcups-lb/Manifest |
77 |
@@ -1,2 +1,2 @@ |
78 |
-DIST Linux_UFRII_PrinterDriver_V320_uk_EN.tar.gz 90901373 SHA256 bcc9db26e261d239438aeb15f171b5b0e7fd305abd0729be0e806bb4c039654a SHA512 23181155f5719fa0a9c216c058be749b5faaa8ee745d260eba2e5e284ef4ff161e344289a7c301a2d74cc919c5031763b0daf41cd07686cfdce188492a9b34b2 WHIRLPOOL 82bb966d823f8019d6275d421ebd2ff848556415e1767bd8fc2638d97479e15029a48818e5b45e9210781f4f37fd269dde46763404314b6c47ee0b4670e03600 |
79 |
+DIST Linux_UFRII_PrinterDriver_V320_uk_EN.tar.gz 109548632 SHA256 b28bc2b460aeddcb7800983d2fad8c29ea6efcc95ad767a78fe6c25d0956f242 SHA512 fc35670a07f067b6ccdebf5b96590eafac2ed984faaa8a90ce44dd44396d6de0964f6352cae0fdf8ce1f6127ebf3ea9f6610b56ba7dd9a7f382bd1c6d588a801 WHIRLPOOL 661f8d6863bd1694efcc168615d9a7107e4a7aa09f5934a33b0f201b6d327038320cf87201bf4220ec876e1cca550169c91925d9f58fa3dae8dd4ea99de1ad1e |
80 |
DIST o1581en_linux_UFRII_v300.zip 94262679 SHA256 1ec1b162411642dc1814608ec71a3b94d6e22ede234f6b750bbdfd3820d5ac46 SHA512 e31415f2e9256c5dc98e27afe3bdc2f75b852d0a99721f8f2ac78225bac497e84c6ce94e8447f3aed6bb6c94975c7625f0dbb2647be44f90c144a46e9af89b81 WHIRLPOOL f419d6130ce9cfd87caebc9678991bbd46e2db5f8bb5a39fb8202a7532de33e969f4f907f2f1404859f987c57f49f562defcec42380ea1b4f284b8d4c6cae3e6 |
81 |
|
82 |
diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-3.20.ebuild b/net-print/cndrvcups-lb/cndrvcups-lb-3.20.ebuild |
83 |
index 73d40e1..35c6269 100644 |
84 |
--- a/net-print/cndrvcups-lb/cndrvcups-lb-3.20.ebuild |
85 |
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-3.20.ebuild |
86 |
@@ -10,7 +10,7 @@ SOURCES_NAME="Linux_UFRII_PrinterDriver_V${MY_PV}_uk_EN" |
87 |
|
88 |
DESCRIPTION="Canon UFR II / LIPSLX Printer Driver for Linux" |
89 |
HOMEPAGE="http://support-au.canon.com.au/contents/AU/EN/0100270808.html" |
90 |
-SRC_URI="http://pdisp01.c-wss.com/gdl/WWUFORedirectTarget.do?id=MDEwMDAwMjcwODEx&cmp=ABS&lang=EN -> ${SOURCES_NAME}.tar.gz" |
91 |
+SRC_URI="http://pdisp01.c-wss.com/gdl/WWUFORedirectTarget.do?id=MDEwMDAwMjcwODE0&cmp=ABS&lang=EN -> ${SOURCES_NAME}.tar.gz" |
92 |
|
93 |
LICENSE="Canon-UFR-II" |
94 |
SLOT="0" |