commit: 26bd8e0e1ee016243117b57e43fdc4c3e1654f41 Author: Alfredo Tupone <tupone <AT> gentoo <DOT> org> AuthorDate: Sat Jun 27 15:02:45 2020 +0000 Commit: Alfredo Tupone <tupone <AT> gentoo <DOT> org> CommitDate: Sat Jun 27 15:02:45 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=26bd8e0e
net-print/cnijfilter2: build cmdtocanonij3 Closes: https://bugs.gentoo.org/729086 Package-Manager: Portage-2.3.99, Repoman-2.3.23 Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org> net-print/cnijfilter2/cnijfilter2-5.50.ebuild | 23 +++++++++++++++++----- .../files/cnijfilter2-5.50-gentoo.patch | 8 ++++++++ 2 files changed, 26 insertions(+), 5 deletions(-) diff --git a/net-print/cnijfilter2/cnijfilter2-5.50.ebuild b/net-print/cnijfilter2/cnijfilter2-5.50.ebuild index b8e27bb386d..99edb10a5be 100644 --- a/net-print/cnijfilter2/cnijfilter2-5.50.ebuild +++ b/net-print/cnijfilter2/cnijfilter2-5.50.ebuild @@ -1,7 +1,7 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=6 +EAPI=7 inherit autotools @@ -21,13 +21,25 @@ DEPEND="virtual/libusb:1 net-print/cups" RDEPEND="${DEPEND}" +QA_FLAGS_IGNORED=( + "/usr/lib.*/libcnbpnet30.so.1.0.0" + "/usr/lib.*/libcnbpcnclapicom2.so.5.0.0" + "/usr/lib.*/libcnnet2.so.1.2.4" + "/usr/lib.*/libcnbpnet20.so.1.0.0" + /usr/bin/cnijlgmon3 +) + S="${WORKDIR}"/${MY_P} -PATCHES=( "${FILESDIR}"/${PN}-5.20-gentoo.patch ) +PATCHES=( + "${FILESDIR}"/${PN}-5.20-gentoo.patch + "${FILESDIR}"/${P}-gentoo.patch + "${FILESDIR}"/${PN}-5.80-cflags.patch +) src_prepare() { default - DIRS="cmdtocanonij2 cnijbe2 lgmon3 rastertocanonij tocanonij tocnpwg" + DIRS="cmdtocanonij2 cmdtocanonij3 cnijbe2 lgmon3 rastertocanonij tocanonij tocnpwg" LIBDIR=com/libs_bin$(usex amd64 64 32) for d in ${DIRS}; do mv "${d}"/configure.{in,ac} || die @@ -40,6 +52,7 @@ src_prepare() { echo "SUBDIRS= ${DIRS}" >> Makefile.am sed -i \ -e "/^CFLAGS/d" \ + cnijbe2/src/Makefile.am \ */configure.ac || die eautoreconf cd ${LIBDIR} @@ -53,7 +66,7 @@ src_prepare() { } src_configure() { - LDFLAGS="-L"${S}"/${LIBDIR}" econf --enable-progpath="${EPREFIX}/usr/bin" + LDFLAGS="-L${S}/${LIBDIR} ${LDFLAGS}" econf --enable-progpath="${EPREFIX}/usr/bin" } src_install() { diff --git a/net-print/cnijfilter2/files/cnijfilter2-5.50-gentoo.patch b/net-print/cnijfilter2/files/cnijfilter2-5.50-gentoo.patch new file mode 100644 index 00000000000..a7322bbce86 --- /dev/null +++ b/net-print/cnijfilter2/files/cnijfilter2-5.50-gentoo.patch @@ -0,0 +1,8 @@ +--- a/cmdtocanonij3/filter/Makefile.am.old 2018-01-14 18:14:20.645473030 +0100 ++++ b/cmdtocanonij3/filter/Makefile.am 2018-01-14 18:14:36.078219959 +0100 +@@ -1,4 +1,4 @@ +-filterdir=$(libdir)/cups/filter ++filterdir=$(libexecdir)/cups/filter + + filter_PROGRAMS= cmdtocanonij3 +
