From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id DF3711382C5 for ; Wed, 13 May 2020 21:29:49 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 26FF7E0943; Wed, 13 May 2020 21:29:49 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id EFE7CE0943 for ; Wed, 13 May 2020 21:29:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A8F3F35090B for ; Wed, 13 May 2020 21:29:46 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CB71F1D6 for ; Wed, 13 May 2020 21:29:44 +0000 (UTC) From: "Alfredo Tupone" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Alfredo Tupone" Message-ID: <1589405372.de0da4fde2a36e0830fa4e5d9286c36702a0305b.tupone@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-print/cnijfilter2/, net-print/cnijfilter2/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-print/cnijfilter2/Manifest net-print/cnijfilter2/cnijfilter2-5.80.ebuild net-print/cnijfilter2/files/cnijfilter2-5.80-cflags.patch X-VCS-Directories: net-print/cnijfilter2/files/ net-print/cnijfilter2/ X-VCS-Committer: tupone X-VCS-Committer-Name: Alfredo Tupone X-VCS-Revision: de0da4fde2a36e0830fa4e5d9286c36702a0305b X-VCS-Branch: master Date: Wed, 13 May 2020 21:29:44 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 5b7c04d4-8bba-48aa-9364-e199138c3b9f X-Archives-Hash: 93d3f3ac4cc11cf725634df6c75ea54a commit: de0da4fde2a36e0830fa4e5d9286c36702a0305b Author: Alfredo Tupone gentoo org> AuthorDate: Wed May 13 21:29:06 2020 +0000 Commit: Alfredo Tupone gentoo org> CommitDate: Wed May 13 21:29:32 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=de0da4fd net-print/cnijfilter2: version bump to 5.80 Closes: https://github.com/gentoo/gentoo/pull/15776 Package-Manager: Portage-2.3.99, Repoman-2.3.22 Signed-off-by: Alfredo Tupone gentoo.org> net-print/cnijfilter2/Manifest | 1 + net-print/cnijfilter2/cnijfilter2-5.80.ebuild | 76 ++++++++++++++++++++++ .../files/cnijfilter2-5.80-cflags.patch | 10 +++ 3 files changed, 87 insertions(+) diff --git a/net-print/cnijfilter2/Manifest b/net-print/cnijfilter2/Manifest index 0b046e1c3d5..d49ce0fa6cb 100644 --- a/net-print/cnijfilter2/Manifest +++ b/net-print/cnijfilter2/Manifest @@ -2,3 +2,4 @@ DIST cnijfilter2-source-5.20-1.tar.gz 466507 BLAKE2B 1ca96153350a157f56dfed691a0 DIST cnijfilter2-source-5.40-1.tar.gz 817298 BLAKE2B 1088eb19c70ed9133c38b8a6da9fbc26c42d6f077fda01678fb4485c2db21a17567fab8ab5c9565ece7ea13e5fac3f7c5842e984116d6c595e7a1f19092d3461 SHA512 bb4ce18864037fae9735fcb1b2c3198fe39f8abe0caa754e457e3cb0d03767742d82ff4fddf81451215395b23eea8207a880e238558e0ea2ac5c359186ecd859 DIST cnijfilter2-source-5.50-1.tar.gz 1129057 BLAKE2B 20208b1fa679a4303b5f47ae733224fa1346277d539e62688ecbfaa6a1a9f7b01cb4742c299ec188d59787e4175896dfe8d812f8aa936977f8168d823216b239 SHA512 9a99d0230fb9498d2b17648e58009efa5812fe5c076c11fdc6c2afeec453e355c1e3406053330e965e46be23651df6b887d0edb20eebd564554a7bf31b155186 DIST cnijfilter2-source-5.70-1.tar.gz 1366033 BLAKE2B 0d03c4c4f4bc00ea91cc46db6554252997242dcc98ee65fe856528848843cdd6d2195e3839d8dad71f1fc722cfbb2e65730020665d9095d0a93900840659477d SHA512 3d9afe4ca6b042015898f4fc08d991a4af2c55010c9d98807a12dade01d2655f74b7e4896abeb933c93faeca954bcfdadfd6e359ee8efe5952623fc635500729 +DIST cnijfilter2-source-5.80-1.tar.gz 1422542 BLAKE2B 046fa72752c5645f307dbee3f2d5f01cd24484859a2d9002135cbcaa9dba0adb3b8d961c7adede8aedd816d4932c526474e7cd252c13e1cef56a427b3b58740d SHA512 060af4834472d21f50f3a431ff6a1bfb36e14348b58eaa777ae471d44062d76b7fd3f247da1818f893285a94ac0335f656e3d026fc613d338dc2ce4d8e242d21 diff --git a/net-print/cnijfilter2/cnijfilter2-5.80.ebuild b/net-print/cnijfilter2/cnijfilter2-5.80.ebuild new file mode 100644 index 00000000000..4efba8cd2e1 --- /dev/null +++ b/net-print/cnijfilter2/cnijfilter2-5.80.ebuild @@ -0,0 +1,76 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit autotools + +MY_P="${PN}-source-${PV}-1" + +DESCRIPTION="IJ Printer Driver" +HOMEPAGE="https://www.canon.it/" +SRC_URI="http://gdlp01.c-wss.com/gds/3/0100010273/01/${MY_P}.tar.gz" + +LICENSE="Canon-IJ" +SLOT="0" +KEYWORDS="~amd64 ~x86" +IUSE="" + +DEPEND="virtual/libusb:1 + dev-libs/libxml2 + net-print/cups" +RDEPEND="${DEPEND}" + +QA_FLAGS_IGNORED=( + /usr/lib64/libcnbpnet30.so.1.0.0 + /usr/lib64/libcnbpcnclapicom2.so.5.0.0 + /usr/lib64/libcnnet2.so.1.2.4 + /usr/lib64/libcnbpnet20.so.1.0.0 + /usr/bin/cnijlgmon3 +) + +S="${WORKDIR}"/${MY_P} + +PATCHES=( + "${FILESDIR}"/${PN}-5.70-gentoo.patch + "${FILESDIR}"/${P}-cflags.patch +) + +src_prepare() { + default + 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 + done + echo "AC_INIT([${PN}], [${PV}])" >> configure.ac + echo "AM_INIT_AUTOMAKE" >> configure.ac + echo "AC_CONFIG_SUBDIRS([${DIRS}])" >> configure.ac + echo "AC_CONFIG_FILES([Makefile])" >> configure.ac + echo "AC_OUTPUT()" >> configure.ac + echo "SUBDIRS= ${DIRS}" >> Makefile.am + sed -i \ + -e "/^CFLAGS/d" \ + */configure.ac \ + cnijbe2/src/Makefile.am || die + eautoreconf + cd ${LIBDIR} + rm libcn*.so || die + ln -sf libcnbpcnclapicom2.so.5.0.0 libcnbpcnclapicom2.so || die + ln -sf libcnbpnet20.so.1.0.0 libcnbpnet20.so || die + ln -sf libcnbpnet30.so.1.0.0 libcnbpnet30.so || die + ln -sf libcnnet2.so.1.2.4 libcnnet2.so || die + + cd - +} + +src_configure() { + LDFLAGS="-L"${S}"/${LIBDIR}" econf --enable-progpath="${EPREFIX}/usr/bin" +} + +src_install() { + default + insinto /usr/share/ppd/cupsfilters + doins ppd/*ppd + dolib.so ${LIBDIR}/* +} diff --git a/net-print/cnijfilter2/files/cnijfilter2-5.80-cflags.patch b/net-print/cnijfilter2/files/cnijfilter2-5.80-cflags.patch new file mode 100644 index 00000000000..e76176e003b --- /dev/null +++ b/net-print/cnijfilter2/files/cnijfilter2-5.80-cflags.patch @@ -0,0 +1,10 @@ +--- a/lgmon3/src/Makefile.am 2020-05-13 23:18:47.936735159 +0200 ++++ b/lgmon3/src/Makefile.am 2020-05-13 23:19:12.239525072 +0200 +@@ -6,6 +6,6 @@ + + cnijlgmon3_SOURCES = cnijcomif.c cnijifusb.c cnijlgmon3.c cnijifnet.c keytext.c cnijifnet2.c cnijutil.c + +-CFLAGS = -O2 -Wall -I/usr/include/libusb-1.0 -I./common @XML2_CFLAGS@ ++AM_CPPFLAGS = -I/usr/include/libusb-1.0 -I./common @XML2_CFLAGS@ + + cnijlgmon3_LDADD = -ldl -lusb-1.0 -lcnnet2 -lxml2 -lcnbpcnclapicom2 -lcnbpnet30