1 |
commit: e92fc00d950f5c8404218562fd6d60028427278a |
2 |
Author: Tupone Alfredo <tupone <AT> gentoo <DOT> org> |
3 |
AuthorDate: Sat Jan 27 18:02:18 2018 +0000 |
4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Jan 27 18:02:18 2018 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e92fc00d |
7 |
|
8 |
net-print/cnijfilter2: Bump to 5.40. Bug #645854 |
9 |
|
10 |
Package-Manager: Portage-2.3.19, Repoman-2.3.6 |
11 |
|
12 |
net-print/cnijfilter2/Manifest | 1 + |
13 |
net-print/cnijfilter2/cnijfilter2-5.40.ebuild | 64 ++++++++++++++++++++++ |
14 |
.../files/cnijfilter2-5.20-gentoo.patch | 20 +++---- |
15 |
3 files changed, 75 insertions(+), 10 deletions(-) |
16 |
|
17 |
diff --git a/net-print/cnijfilter2/Manifest b/net-print/cnijfilter2/Manifest |
18 |
index 1278bd3f5f0..5bfb823fd70 100644 |
19 |
--- a/net-print/cnijfilter2/Manifest |
20 |
+++ b/net-print/cnijfilter2/Manifest |
21 |
@@ -1 +1,2 @@ |
22 |
DIST cnijfilter2-source-5.20-1.tar.gz 466507 BLAKE2B 1ca96153350a157f56dfed691a04dcbe1e3ab5462b59c0cd919316a7c54a36bbeb34cf4205132f0aa3e5a23f89eb260c35c1a3ee14ea85bc36b9e3b67cd7e3f7 SHA512 60be49d34adf9a4d2cd8337cccb36eb8c078e9712bf8043c3552f1d83c3da307badfe34fc3683c99e3234da30f4ba82e0c4a0b48ea5f78f0d66db1408bd7d495 |
23 |
+DIST cnijfilter2-source-5.40-1.tar.gz 817298 BLAKE2B 1088eb19c70ed9133c38b8a6da9fbc26c42d6f077fda01678fb4485c2db21a17567fab8ab5c9565ece7ea13e5fac3f7c5842e984116d6c595e7a1f19092d3461 SHA512 bb4ce18864037fae9735fcb1b2c3198fe39f8abe0caa754e457e3cb0d03767742d82ff4fddf81451215395b23eea8207a880e238558e0ea2ac5c359186ecd859 |
24 |
|
25 |
diff --git a/net-print/cnijfilter2/cnijfilter2-5.40.ebuild b/net-print/cnijfilter2/cnijfilter2-5.40.ebuild |
26 |
new file mode 100644 |
27 |
index 00000000000..038cbf38f1b |
28 |
--- /dev/null |
29 |
+++ b/net-print/cnijfilter2/cnijfilter2-5.40.ebuild |
30 |
@@ -0,0 +1,64 @@ |
31 |
+# Copyright 1999-2018 Gentoo Foundation |
32 |
+# Distributed under the terms of the GNU General Public License v2 |
33 |
+ |
34 |
+EAPI=6 |
35 |
+ |
36 |
+inherit autotools |
37 |
+ |
38 |
+MY_P="${PN}-source-${PV}-1" |
39 |
+ |
40 |
+DESCRIPTION="IJ Printer Driver" |
41 |
+HOMEPAGE="https://www.canon.it/" |
42 |
+SRC_URI="http://gdlp01.c-wss.com/gds/3/0100008393/01/${MY_P}.tar.gz" |
43 |
+ |
44 |
+LICENSE="Canon-IJ" |
45 |
+SLOT="0" |
46 |
+KEYWORDS="~amd64 ~x86" |
47 |
+IUSE="" |
48 |
+ |
49 |
+DEPEND="virtual/libusb:1 |
50 |
+ dev-libs/libxml2 |
51 |
+ net-print/cups" |
52 |
+RDEPEND="${DEPEND}" |
53 |
+ |
54 |
+S="${WORKDIR}"/${MY_P} |
55 |
+ |
56 |
+PATCHES=( "${FILESDIR}"/${PN}-5.20-gentoo.patch ) |
57 |
+ |
58 |
+src_prepare() { |
59 |
+ default |
60 |
+ DIRS="cmdtocanonij2 cnijbe2 lgmon3 rastertocanonij tocanonij tocnpwg" |
61 |
+ LIBDIR=com/libs_bin$(usex amd64 64 32) |
62 |
+ for d in ${DIRS}; do |
63 |
+ mv "${d}"/configure.{in,ac} || die |
64 |
+ done |
65 |
+ echo "AC_INIT([${PN}], [${PV}])" >> configure.ac |
66 |
+ echo "AM_INIT_AUTOMAKE" >> configure.ac |
67 |
+ echo "AC_CONFIG_SUBDIRS([${DIRS}])" >> configure.ac |
68 |
+ echo "AC_CONFIG_FILES([Makefile])" >> configure.ac |
69 |
+ echo "AC_OUTPUT()" >> configure.ac |
70 |
+ echo "SUBDIRS= ${DIRS}" >> Makefile.am |
71 |
+ sed -i \ |
72 |
+ -e "/^CFLAGS/d" \ |
73 |
+ */configure.ac || die |
74 |
+ eautoreconf |
75 |
+ cd ${LIBDIR} |
76 |
+ rm libcn*.so || die |
77 |
+ ln -sf libcnbpcnclapicom2.so.5.0.0 libcnbpcnclapicom2.so || die |
78 |
+ ln -sf libcnbpnet20.so.1.0.0 libcnbpnet20.so || die |
79 |
+ ln -sf libcnbpnet30.so.1.0.0 libcnbpnet30.so || die |
80 |
+ ln -sf libcnnet2.so.1.2.4 libcnnet2.so || die |
81 |
+ |
82 |
+ cd - |
83 |
+} |
84 |
+ |
85 |
+src_configure() { |
86 |
+ LDFLAGS="-L"${S}"/${LIBDIR}" econf --enable-progpath="${EPREFIX}/usr/bin" |
87 |
+} |
88 |
+ |
89 |
+src_install() { |
90 |
+ default |
91 |
+ insinto /usr/share/ppd/cupsfilters |
92 |
+ doins ppd/*ppd |
93 |
+ dolib.so ${LIBDIR}/* |
94 |
+} |
95 |
|
96 |
diff --git a/net-print/cnijfilter2/files/cnijfilter2-5.20-gentoo.patch b/net-print/cnijfilter2/files/cnijfilter2-5.20-gentoo.patch |
97 |
index 80c7361cb1a..be941790b99 100644 |
98 |
--- a/net-print/cnijfilter2/files/cnijfilter2-5.20-gentoo.patch |
99 |
+++ b/net-print/cnijfilter2/files/cnijfilter2-5.20-gentoo.patch |
100 |
@@ -1,13 +1,13 @@ |
101 |
---- cnijfilter2-source-5.20-1/cmdtocanonij2/filter/Makefile.am.old 2018-01-14 18:14:20.645473030 +0100 |
102 |
-+++ cnijfilter2-source-5.20-1/cmdtocanonij2/filter/Makefile.am 2018-01-14 18:14:36.078219959 +0100 |
103 |
+--- a/cmdtocanonij2/filter/Makefile.am.old 2018-01-14 18:14:20.645473030 +0100 |
104 |
++++ b/cmdtocanonij2/filter/Makefile.am 2018-01-14 18:14:36.078219959 +0100 |
105 |
@@ -1,4 +1,4 @@ |
106 |
-filterdir=$(libdir)/cups/filter |
107 |
+filterdir=$(libexecdir)/cups/filter |
108 |
|
109 |
filter_PROGRAMS= cmdtocanonij2 |
110 |
|
111 |
---- cnijfilter2-source-5.20-1/cnijbe2/src/Makefile.am.old 2018-01-14 19:25:48.823470121 +0100 |
112 |
-+++ cnijfilter2-source-5.20-1/cnijbe2/src/Makefile.am 2018-01-14 19:25:59.316275741 +0100 |
113 |
+--- a/cnijbe2/src/Makefile.am.old 2018-01-14 19:25:48.823470121 +0100 |
114 |
++++ b/cnijbe2/src/Makefile.am 2018-01-14 19:25:59.316275741 +0100 |
115 |
@@ -1,6 +1,6 @@ |
116 |
## Process this file with automake to produce Makefile.in |
117 |
|
118 |
@@ -16,16 +16,16 @@ |
119 |
backend_bin_PROGRAMS = cnijbe2 |
120 |
transform = |
121 |
|
122 |
---- cnijfilter2-source-5.20-1/rastertocanonij/src/Makefile.am.old 2018-01-14 21:31:33.053307218 +0100 |
123 |
-+++ cnijfilter2-source-5.20-1/rastertocanonij/src/Makefile.am 2018-01-14 21:31:41.106166479 +0100 |
124 |
+--- a/rastertocanonij/src/Makefile.am.old 2018-01-14 21:31:33.053307218 +0100 |
125 |
++++ b/rastertocanonij/src/Makefile.am 2018-01-14 21:31:41.106166479 +0100 |
126 |
@@ -1,4 +1,4 @@ |
127 |
-filterdir=$(libdir)/cups/filter |
128 |
+filterdir=$(libexecdir)/cups/filter |
129 |
|
130 |
filter_PROGRAMS= rastertocanonij |
131 |
|
132 |
---- cnijfilter2-source-5.20-1/tocanonij/src/Makefile.am.old 2018-01-15 22:38:14.236460663 +0100 |
133 |
-+++ cnijfilter2-source-5.20-1/tocanonij/src/Makefile.am 2018-01-15 22:38:39.184018933 +0100 |
134 |
+--- a/tocanonij/src/Makefile.am.old 2018-01-15 22:38:14.236460663 +0100 |
135 |
++++ b/tocanonij/src/Makefile.am 2018-01-15 22:38:39.184018933 +0100 |
136 |
@@ -1,7 +1,8 @@ |
137 |
INCLUDES = \ |
138 |
-I$(top_srcdir)/include/cncl |
139 |
@@ -36,8 +36,8 @@ |
140 |
|
141 |
tocanonij_SOURCES= \ |
142 |
main.c |
143 |
---- cnijfilter2-source-5.20-1/tocnpwg/src/Makefile.am.old 2018-01-15 22:42:43.759703863 +0100 |
144 |
-+++ cnijfilter2-source-5.20-1/tocnpwg/src/Makefile.am 2018-01-15 22:43:10.442232986 +0100 |
145 |
+--- a/tocnpwg/src/Makefile.am.old 2018-01-15 22:42:43.759703863 +0100 |
146 |
++++ b/tocnpwg/src/Makefile.am 2018-01-15 22:43:10.442232986 +0100 |
147 |
@@ -2,7 +2,8 @@ |
148 |
INCLUDES = \ |
149 |
@XML_2_CFLAGS@ |