[gentoo-commits] repo/gentoo:master commit in: net-print/cnijfilter2/, net-print/cnijfilter2/files/

public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed

* [gentoo-commits] repo/gentoo:master commit in: net-print/cnijfilter2/, net-print/cnijfilter2/files/
@ 2018-01-23 20:06 Alfredo Tupone
  0 siblings, 0 replies; 6+ messages in thread
From: Alfredo Tupone @ 2018-01-23 20:06 UTC (permalink / raw
  To: gentoo-commits

commit:     d81689303683a22cb0cf9998b3205eeea9260b71
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 23 20:04:58 2018 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Jan 23 20:04:58 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d8168930

net-print/cnijfilter2: Driver for Canon Printers

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-print/cnijfilter2/Manifest                     |  1 +
 net-print/cnijfilter2/cnijfilter2-5.20.ebuild      | 61 ++++++++++++++++++++++
 .../files/cnijfilter2-5.20-gentoo.patch            | 50 ++++++++++++++++++
 net-print/cnijfilter2/metadata.xml                 | 11 ++++
 4 files changed, 123 insertions(+)

diff --git a/net-print/cnijfilter2/Manifest b/net-print/cnijfilter2/Manifest
new file mode 100644
index 00000000000..1278bd3f5f0
--- /dev/null
+++ b/net-print/cnijfilter2/Manifest
@@ -0,0 +1 @@
+DIST cnijfilter2-source-5.20-1.tar.gz 466507 BLAKE2B 1ca96153350a157f56dfed691a04dcbe1e3ab5462b59c0cd919316a7c54a36bbeb34cf4205132f0aa3e5a23f89eb260c35c1a3ee14ea85bc36b9e3b67cd7e3f7 SHA512 60be49d34adf9a4d2cd8337cccb36eb8c078e9712bf8043c3552f1d83c3da307badfe34fc3683c99e3234da30f4ba82e0c4a0b48ea5f78f0d66db1408bd7d495

diff --git a/net-print/cnijfilter2/cnijfilter2-5.20.ebuild b/net-print/cnijfilter2/cnijfilter2-5.20.ebuild
new file mode 100644
index 00000000000..a5ceae2028a
--- /dev/null
+++ b/net-print/cnijfilter2/cnijfilter2-5.20.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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/0/0100006900/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}"
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.patch )
+
+src_prepare() {
+	default
+	DIRS="cmdtocanonij2 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 || die
+	eautoreconf
+	cd ${LIBDIR}
+	rm libcn*2.so || die
+	ln -sf libcnbpcnclapicom2.so.5.0.0 libcnbpcnclapicom2.so || die
+	ln -sf libcnnet2.so.1.2.3 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.20-gentoo.patch b/net-print/cnijfilter2/files/cnijfilter2-5.20-gentoo.patch
new file mode 100644
index 00000000000..80c7361cb1a
--- /dev/null
+++ b/net-print/cnijfilter2/files/cnijfilter2-5.20-gentoo.patch
@@ -0,0 +1,50 @@
+--- cnijfilter2-source-5.20-1/cmdtocanonij2/filter/Makefile.am.old	2018-01-14 18:14:20.645473030 +0100
++++ cnijfilter2-source-5.20-1/cmdtocanonij2/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= cmdtocanonij2
+ 
+--- cnijfilter2-source-5.20-1/cnijbe2/src/Makefile.am.old	2018-01-14 19:25:48.823470121 +0100
++++ cnijfilter2-source-5.20-1/cnijbe2/src/Makefile.am	2018-01-14 19:25:59.316275741 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-backend_bindir = /usr/lib/cups/backend
++backend_bindir = $(libexecdir)/cups/backend
+ backend_bin_PROGRAMS = cnijbe2
+ transform = 
+ 
+--- cnijfilter2-source-5.20-1/rastertocanonij/src/Makefile.am.old	2018-01-14 21:31:33.053307218 +0100
++++ cnijfilter2-source-5.20-1/rastertocanonij/src/Makefile.am	2018-01-14 21:31:41.106166479 +0100
+@@ -1,4 +1,4 @@
+-filterdir=$(libdir)/cups/filter
++filterdir=$(libexecdir)/cups/filter
+ 
+ filter_PROGRAMS= rastertocanonij
+ 
+--- cnijfilter2-source-5.20-1/tocanonij/src/Makefile.am.old	2018-01-15 22:38:14.236460663 +0100
++++ cnijfilter2-source-5.20-1/tocanonij/src/Makefile.am	2018-01-15 22:38:39.184018933 +0100
+@@ -1,7 +1,8 @@
+ INCLUDES = \
+ 	-I$(top_srcdir)/include/cncl
+ 
+-bin_PROGRAMS= tocanonij
++filterdir=$(libexecdir)/cups/filter
++filter_PROGRAMS= tocanonij
+ 
+ tocanonij_SOURCES= \
+ 	main.c
+--- cnijfilter2-source-5.20-1/tocnpwg/src/Makefile.am.old	2018-01-15 22:42:43.759703863 +0100
++++ cnijfilter2-source-5.20-1/tocnpwg/src/Makefile.am	2018-01-15 22:43:10.442232986 +0100
+@@ -2,7 +2,8 @@
+ INCLUDES = \
+ 	@XML_2_CFLAGS@
+ 
+-bin_PROGRAMS= tocnpwg
++filterdir=$(libexecdir)/cups/filter
++filter_PROGRAMS= tocnpwg
+ 
+ tocnpwg_SOURCES= \
+ 	main.c mkpset.c

diff --git a/net-print/cnijfilter2/metadata.xml b/net-print/cnijfilter2/metadata.xml
new file mode 100644
index 00000000000..869d1f15562
--- /dev/null
+++ b/net-print/cnijfilter2/metadata.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="person">
+		<email>tupone@gentoo.org</email>
+		<name>Tupone Alfredo</name>
+	</maintainer>
+	<longdescription lang="en">
+		Printer Support for Canon PIXMA Printers
+	</longdescription>
+</pkgmetadata>


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-print/cnijfilter2/, net-print/cnijfilter2/files/
@ 2018-01-27 18:02 Alfredo Tupone
  0 siblings, 0 replies; 6+ messages in thread
From: Alfredo Tupone @ 2018-01-27 18:02 UTC (permalink / raw
  To: gentoo-commits

commit:     e92fc00d950f5c8404218562fd6d60028427278a
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat Jan 27 18:02:18 2018 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat Jan 27 18:02:18 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e92fc00d

net-print/cnijfilter2: Bump to 5.40. Bug #645854

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 net-print/cnijfilter2/Manifest                     |  1 +
 net-print/cnijfilter2/cnijfilter2-5.40.ebuild      | 64 ++++++++++++++++++++++
 .../files/cnijfilter2-5.20-gentoo.patch            | 20 +++----
 3 files changed, 75 insertions(+), 10 deletions(-)

diff --git a/net-print/cnijfilter2/Manifest b/net-print/cnijfilter2/Manifest
index 1278bd3f5f0..5bfb823fd70 100644
--- a/net-print/cnijfilter2/Manifest
+++ b/net-print/cnijfilter2/Manifest
@@ -1 +1,2 @@
 DIST cnijfilter2-source-5.20-1.tar.gz 466507 BLAKE2B 1ca96153350a157f56dfed691a04dcbe1e3ab5462b59c0cd919316a7c54a36bbeb34cf4205132f0aa3e5a23f89eb260c35c1a3ee14ea85bc36b9e3b67cd7e3f7 SHA512 60be49d34adf9a4d2cd8337cccb36eb8c078e9712bf8043c3552f1d83c3da307badfe34fc3683c99e3234da30f4ba82e0c4a0b48ea5f78f0d66db1408bd7d495
+DIST cnijfilter2-source-5.40-1.tar.gz 817298 BLAKE2B 1088eb19c70ed9133c38b8a6da9fbc26c42d6f077fda01678fb4485c2db21a17567fab8ab5c9565ece7ea13e5fac3f7c5842e984116d6c595e7a1f19092d3461 SHA512 bb4ce18864037fae9735fcb1b2c3198fe39f8abe0caa754e457e3cb0d03767742d82ff4fddf81451215395b23eea8207a880e238558e0ea2ac5c359186ecd859

diff --git a/net-print/cnijfilter2/cnijfilter2-5.40.ebuild b/net-print/cnijfilter2/cnijfilter2-5.40.ebuild
new file mode 100644
index 00000000000..038cbf38f1b
--- /dev/null
+++ b/net-print/cnijfilter2/cnijfilter2-5.40.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+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/0100008393/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}"
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${PN}-5.20-gentoo.patch )
+
+src_prepare() {
+	default
+	DIRS="cmdtocanonij2 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 || 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.20-gentoo.patch b/net-print/cnijfilter2/files/cnijfilter2-5.20-gentoo.patch
index 80c7361cb1a..be941790b99 100644
--- a/net-print/cnijfilter2/files/cnijfilter2-5.20-gentoo.patch
+++ b/net-print/cnijfilter2/files/cnijfilter2-5.20-gentoo.patch
@@ -1,13 +1,13 @@
---- cnijfilter2-source-5.20-1/cmdtocanonij2/filter/Makefile.am.old	2018-01-14 18:14:20.645473030 +0100
-+++ cnijfilter2-source-5.20-1/cmdtocanonij2/filter/Makefile.am	2018-01-14 18:14:36.078219959 +0100
+--- a/cmdtocanonij2/filter/Makefile.am.old	2018-01-14 18:14:20.645473030 +0100
++++ b/cmdtocanonij2/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= cmdtocanonij2
  
---- cnijfilter2-source-5.20-1/cnijbe2/src/Makefile.am.old	2018-01-14 19:25:48.823470121 +0100
-+++ cnijfilter2-source-5.20-1/cnijbe2/src/Makefile.am	2018-01-14 19:25:59.316275741 +0100
+--- a/cnijbe2/src/Makefile.am.old	2018-01-14 19:25:48.823470121 +0100
++++ b/cnijbe2/src/Makefile.am	2018-01-14 19:25:59.316275741 +0100
 @@ -1,6 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  
@@ -16,16 +16,16 @@
  backend_bin_PROGRAMS = cnijbe2
  transform = 
  
---- cnijfilter2-source-5.20-1/rastertocanonij/src/Makefile.am.old	2018-01-14 21:31:33.053307218 +0100
-+++ cnijfilter2-source-5.20-1/rastertocanonij/src/Makefile.am	2018-01-14 21:31:41.106166479 +0100
+--- a/rastertocanonij/src/Makefile.am.old	2018-01-14 21:31:33.053307218 +0100
++++ b/rastertocanonij/src/Makefile.am	2018-01-14 21:31:41.106166479 +0100
 @@ -1,4 +1,4 @@
 -filterdir=$(libdir)/cups/filter
 +filterdir=$(libexecdir)/cups/filter
  
  filter_PROGRAMS= rastertocanonij
  
---- cnijfilter2-source-5.20-1/tocanonij/src/Makefile.am.old	2018-01-15 22:38:14.236460663 +0100
-+++ cnijfilter2-source-5.20-1/tocanonij/src/Makefile.am	2018-01-15 22:38:39.184018933 +0100
+--- a/tocanonij/src/Makefile.am.old	2018-01-15 22:38:14.236460663 +0100
++++ b/tocanonij/src/Makefile.am	2018-01-15 22:38:39.184018933 +0100
 @@ -1,7 +1,8 @@
  INCLUDES = \
  	-I$(top_srcdir)/include/cncl
@@ -36,8 +36,8 @@
  
  tocanonij_SOURCES= \
  	main.c
---- cnijfilter2-source-5.20-1/tocnpwg/src/Makefile.am.old	2018-01-15 22:42:43.759703863 +0100
-+++ cnijfilter2-source-5.20-1/tocnpwg/src/Makefile.am	2018-01-15 22:43:10.442232986 +0100
+--- a/tocnpwg/src/Makefile.am.old	2018-01-15 22:42:43.759703863 +0100
++++ b/tocnpwg/src/Makefile.am	2018-01-15 22:43:10.442232986 +0100
 @@ -2,7 +2,8 @@
  INCLUDES = \
  	@XML_2_CFLAGS@


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-print/cnijfilter2/, net-print/cnijfilter2/files/
@ 2019-08-27  6:42 Alfredo Tupone
  0 siblings, 0 replies; 6+ messages in thread
From: Alfredo Tupone @ 2019-08-27  6:42 UTC (permalink / raw
  To: gentoo-commits

commit:     5bcb0af746f30ce9bda642d0e4ef153328986206
Author:     Tupone Alfredo <tupone <AT> gentoo <DOT> org>
AuthorDate: Tue Aug 27 06:42:29 2019 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Tue Aug 27 06:42:29 2019 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5bcb0af7

net-print/cnijfilter2: version bump to 5.70 from Dag Bakke

Closes: https://bugs.gentoo.org/691562
Closes: https://bugs.gentoo.org/691250
Package-Manager: Portage-2.3.66, Repoman-2.3.16
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 net-print/cnijfilter2/Manifest                     |  1 +
 net-print/cnijfilter2/cnijfilter2-5.70.ebuild      | 64 ++++++++++++++++++++++
 .../files/cnijfilter2-5.70-gentoo.patch            | 58 ++++++++++++++++++++
 3 files changed, 123 insertions(+)

diff --git a/net-print/cnijfilter2/Manifest b/net-print/cnijfilter2/Manifest
index b6dcf783578..0b046e1c3d5 100644
--- a/net-print/cnijfilter2/Manifest
+++ b/net-print/cnijfilter2/Manifest
@@ -1,3 +1,4 @@
 DIST cnijfilter2-source-5.20-1.tar.gz 466507 BLAKE2B 1ca96153350a157f56dfed691a04dcbe1e3ab5462b59c0cd919316a7c54a36bbeb34cf4205132f0aa3e5a23f89eb260c35c1a3ee14ea85bc36b9e3b67cd7e3f7 SHA512 60be49d34adf9a4d2cd8337cccb36eb8c078e9712bf8043c3552f1d83c3da307badfe34fc3683c99e3234da30f4ba82e0c4a0b48ea5f78f0d66db1408bd7d495
 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

diff --git a/net-print/cnijfilter2/cnijfilter2-5.70.ebuild b/net-print/cnijfilter2/cnijfilter2-5.70.ebuild
new file mode 100644
index 00000000000..3b5058bc815
--- /dev/null
+++ b/net-print/cnijfilter2/cnijfilter2-5.70.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2019 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/0/0100009930/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}"
+
+S="${WORKDIR}"/${MY_P}
+
+PATCHES=( "${FILESDIR}"/${P}-gentoo.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 || 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.70-gentoo.patch b/net-print/cnijfilter2/files/cnijfilter2-5.70-gentoo.patch
new file mode 100644
index 00000000000..fcb2d62ad7b
--- /dev/null
+++ b/net-print/cnijfilter2/files/cnijfilter2-5.70-gentoo.patch
@@ -0,0 +1,58 @@
+--- a/cmdtocanonij2/filter/Makefile.am	2018-01-14 18:14:20.645473030 +0100
++++ b/cmdtocanonij2/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= cmdtocanonij2
+ 
+--- a/cmdtocanonij3/filter/Makefile.am	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
+
+--- a/cnijbe2/src/Makefile.am	2018-01-14 19:25:48.823470121 +0100
++++ b/cnijbe2/src/Makefile.am	2018-01-14 19:25:59.316275741 +0100
+@@ -1,6 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ 
+-backend_bindir = /usr/lib/cups/backend
++backend_bindir = $(libexecdir)/cups/backend
+ backend_bin_PROGRAMS = cnijbe2
+ transform = 
+ 
+--- a/rastertocanonij/src/Makefile.am	2018-01-14 21:31:33.053307218 +0100
++++ b/rastertocanonij/src/Makefile.am	2018-01-14 21:31:41.106166479 +0100
+@@ -1,4 +1,4 @@
+-filterdir=$(libdir)/cups/filter
++filterdir=$(libexecdir)/cups/filter
+ 
+ filter_PROGRAMS= rastertocanonij
+ 
+--- a/tocanonij/src/Makefile.am	2018-01-15 22:38:14.236460663 +0100
++++ b/tocanonij/src/Makefile.am	2018-01-15 22:38:39.184018933 +0100
+@@ -1,7 +1,8 @@
+ INCLUDES = \
+ 	-I$(top_srcdir)/include/cncl
+ 
+-bin_PROGRAMS= tocanonij
++filterdir=$(libexecdir)/cups/filter
++filter_PROGRAMS= tocanonij
+ 
+ tocanonij_SOURCES= \
+ 	main.c
+--- a/tocnpwg/src/Makefile.am	2018-01-15 22:42:43.759703863 +0100
++++ b/tocnpwg/src/Makefile.am	2018-01-15 22:43:10.442232986 +0100
+@@ -2,7 +2,8 @@
+ INCLUDES = \
+ 	@XML_2_CFLAGS@
+ 
+-bin_PROGRAMS= tocnpwg
++filterdir=$(libexecdir)/cups/filter
++filter_PROGRAMS= tocnpwg
+ 
+ tocnpwg_SOURCES= \
+ 	main.c mkpset.c


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-print/cnijfilter2/, net-print/cnijfilter2/files/
@ 2020-05-13 21:29 Alfredo Tupone
  0 siblings, 0 replies; 6+ messages in thread
From: Alfredo Tupone @ 2020-05-13 21:29 UTC (permalink / raw
  To: gentoo-commits

commit:     de0da4fde2a36e0830fa4e5d9286c36702a0305b
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Wed May 13 21:29:06 2020 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> 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 <tupone <AT> 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


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-print/cnijfilter2/, net-print/cnijfilter2/files/
@ 2020-05-16 17:35 Alfredo Tupone
  0 siblings, 0 replies; 6+ messages in thread
From: Alfredo Tupone @ 2020-05-16 17:35 UTC (permalink / raw
  To: gentoo-commits

commit:     24688d64544b43f2c14be54531ad8764419dde09
Author:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
AuthorDate: Sat May 16 17:34:42 2020 +0000
Commit:     Alfredo Tupone <tupone <AT> gentoo <DOT> org>
CommitDate: Sat May 16 17:34:42 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=24688d64

net-print/cnijfilter2: fix compiling with fno-common

Closes: https://bugs.gentoo.org/723186
Package-Manager: Portage-2.3.99, Repoman-2.3.22
Signed-off-by: Alfredo Tupone <tupone <AT> gentoo.org>

 net-print/cnijfilter2/cnijfilter2-5.80.ebuild                 |  1 +
 net-print/cnijfilter2/files/cnijfilter2-5.80-fno-common.patch | 11 +++++++++++
 2 files changed, 12 insertions(+)

diff --git a/net-print/cnijfilter2/cnijfilter2-5.80.ebuild b/net-print/cnijfilter2/cnijfilter2-5.80.ebuild
index 4efba8cd2e1..ec45c101ab1 100644
--- a/net-print/cnijfilter2/cnijfilter2-5.80.ebuild
+++ b/net-print/cnijfilter2/cnijfilter2-5.80.ebuild
@@ -34,6 +34,7 @@ S="${WORKDIR}"/${MY_P}
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.70-gentoo.patch
 	"${FILESDIR}"/${P}-cflags.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_prepare() {

diff --git a/net-print/cnijfilter2/files/cnijfilter2-5.80-fno-common.patch b/net-print/cnijfilter2/files/cnijfilter2-5.80-fno-common.patch
new file mode 100644
index 00000000000..7374aa92fba
--- /dev/null
+++ b/net-print/cnijfilter2/files/cnijfilter2-5.80-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/lgmon3/src/cnijlgmon3.c	2020-05-16 19:28:03.585781655 +0200
++++ b/lgmon3/src/cnijlgmon3.c	2020-05-16 19:28:13.488625335 +0200
+@@ -55,7 +55,7 @@
+ int (*GET_STATUS)(char *, int, int *, int * , char *);
+ int (*GET_STATUS2)(char *, int, char *, int *, int * , char *, char *);
+ int (*GET_STATUS2_MAINTENANCE)(char *, int, char *, int *, int * , char *, char *);
+-int (*GET_PROTOCOL)(char *, size_t);
++static int (*GET_PROTOCOL)(char *, size_t);
+ 
+ 
+  int main(int argc, char *argv[])


^ permalink raw reply related	[flat|nested] 6+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: net-print/cnijfilter2/, net-print/cnijfilter2/files/
@ 2020-06-27 15:03 Alfredo Tupone
  0 siblings, 0 replies; 6+ messages in thread
From: Alfredo Tupone @ 2020-06-27 15:03 UTC (permalink / raw
  To: gentoo-commits

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
+ 


^ permalink raw reply related	[flat|nested] 6+ messages in thread

end of thread, other threads:[~2020-06-27 15:03 UTC | newest]

Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2019-08-27  6:42 [gentoo-commits] repo/gentoo:master commit in: net-print/cnijfilter2/, net-print/cnijfilter2/files/ Alfredo Tupone
  -- strict thread matches above, loose matches on Subject: below --
2020-06-27 15:03 Alfredo Tupone
2020-05-16 17:35 Alfredo Tupone
2020-05-13 21:29 Alfredo Tupone
2018-01-27 18:02 Alfredo Tupone
2018-01-23 20:06 Alfredo Tupone

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox