| 1 |
commit: 26bd8e0e1ee016243117b57e43fdc4c3e1654f41 |
| 2 |
Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Sat Jun 27 15:02:45 2020 +0000 |
| 4 |
Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sat Jun 27 15:02:45 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26bd8e0e |
| 7 |
|
| 8 |
net-print/cnijfilter2: build cmdtocanonij3 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/729086 |
| 11 |
Package-Manager: Portage-2.3.99, Repoman-2.3.23 |
| 12 |
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> |
| 13 |
|
| 14 |
net-print/cnijfilter2/cnijfilter2-5.50.ebuild | 23 +++++++++++++++++----- |
| 15 |
.../files/cnijfilter2-5.50-gentoo.patch | 8 ++++++++ |
| 16 |
2 files changed, 26 insertions(+), 5 deletions(-) |
| 17 |
|
| 18 |
diff --git a/net-print/cnijfilter2/cnijfilter2-5.50.ebuild b/net-print/cnijfilter2/cnijfilter2-5.50.ebuild |
| 19 |
index b8e27bb386d..99edb10a5be 100644 |
| 20 |
--- a/net-print/cnijfilter2/cnijfilter2-5.50.ebuild |
| 21 |
+++ b/net-print/cnijfilter2/cnijfilter2-5.50.ebuild |
| 22 |
@@ -1,7 +1,7 @@ |
| 23 |
-# Copyright 1999-2018 Gentoo Authors |
| 24 |
+# Copyright 1999-2020 Gentoo Authors |
| 25 |
# Distributed under the terms of the GNU General Public License v2 |
| 26 |
|
| 27 |
-EAPI=6 |
| 28 |
+EAPI=7 |
| 29 |
|
| 30 |
inherit autotools |
| 31 |
|
| 32 |
@@ -21,13 +21,25 @@ DEPEND="virtual/libusb:1 |
| 33 |
net-print/cups" |
| 34 |
RDEPEND="${DEPEND}" |
| 35 |
|
| 36 |
+QA_FLAGS_IGNORED=( |
| 37 |
+ "/usr/lib.*/libcnbpnet30.so.1.0.0" |
| 38 |
+ "/usr/lib.*/libcnbpcnclapicom2.so.5.0.0" |
| 39 |
+ "/usr/lib.*/libcnnet2.so.1.2.4" |
| 40 |
+ "/usr/lib.*/libcnbpnet20.so.1.0.0" |
| 41 |
+ /usr/bin/cnijlgmon3 |
| 42 |
+) |
| 43 |
+ |
| 44 |
S="${WORKDIR}"/${MY_P} |
| 45 |
|
| 46 |
-PATCHES=( "${FILESDIR}"/${PN}-5.20-gentoo.patch ) |
| 47 |
+PATCHES=( |
| 48 |
+ "${FILESDIR}"/${PN}-5.20-gentoo.patch |
| 49 |
+ "${FILESDIR}"/${P}-gentoo.patch |
| 50 |
+ "${FILESDIR}"/${PN}-5.80-cflags.patch |
| 51 |
+) |
| 52 |
|
| 53 |
src_prepare() { |
| 54 |
default |
| 55 |
- DIRS="cmdtocanonij2 cnijbe2 lgmon3 rastertocanonij tocanonij tocnpwg" |
| 56 |
+ DIRS="cmdtocanonij2 cmdtocanonij3 cnijbe2 lgmon3 rastertocanonij tocanonij tocnpwg" |
| 57 |
LIBDIR=com/libs_bin$(usex amd64 64 32) |
| 58 |
for d in ${DIRS}; do |
| 59 |
mv "${d}"/configure.{in,ac} || die |
| 60 |
@@ -40,6 +52,7 @@ src_prepare() { |
| 61 |
echo "SUBDIRS= ${DIRS}" >> Makefile.am |
| 62 |
sed -i \ |
| 63 |
-e "/^CFLAGS/d" \ |
| 64 |
+ cnijbe2/src/Makefile.am \ |
| 65 |
*/configure.ac || die |
| 66 |
eautoreconf |
| 67 |
cd ${LIBDIR} |
| 68 |
@@ -53,7 +66,7 @@ src_prepare() { |
| 69 |
} |
| 70 |
|
| 71 |
src_configure() { |
| 72 |
- LDFLAGS="-L"${S}"/${LIBDIR}" econf --enable-progpath="${EPREFIX}/usr/bin" |
| 73 |
+ LDFLAGS="-L${S}/${LIBDIR} ${LDFLAGS}" econf --enable-progpath="${EPREFIX}/usr/bin" |
| 74 |
} |
| 75 |
|
| 76 |
src_install() { |
| 77 |
|
| 78 |
diff --git a/net-print/cnijfilter2/files/cnijfilter2-5.50-gentoo.patch b/net-print/cnijfilter2/files/cnijfilter2-5.50-gentoo.patch |
| 79 |
new file mode 100644 |
| 80 |
index 00000000000..a7322bbce86 |
| 81 |
--- /dev/null |
| 82 |
+++ b/net-print/cnijfilter2/files/cnijfilter2-5.50-gentoo.patch |
| 83 |
@@ -0,0 +1,8 @@ |
| 84 |
+--- a/cmdtocanonij3/filter/Makefile.am.old 2018-01-14 18:14:20.645473030 +0100 |
| 85 |
++++ b/cmdtocanonij3/filter/Makefile.am 2018-01-14 18:14:36.078219959 +0100 |
| 86 |
+@@ -1,4 +1,4 @@ |
| 87 |
+-filterdir=$(libdir)/cups/filter |
| 88 |
++filterdir=$(libexecdir)/cups/filter |
| 89 |
+ |
| 90 |
+ filter_PROGRAMS= cmdtocanonij3 |
| 91 |
+ |
Archives