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