[gentoo-commits] repo/gentoo:master commit in: net-print/cnrdrvcups-lb/

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

* [gentoo-commits] repo/gentoo:master commit in: net-print/cnrdrvcups-lb/
@ 2020-01-05 10:10 Joonas Niilola
  0 siblings, 0 replies; 29+ messages in thread
From: Joonas Niilola @ 2020-01-05 10:10 UTC (permalink / raw
  To: gentoo-commits

commit:     59dbb110c6cff7f6bc437073b67d2621021706fe
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Jan  5 10:08:51 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Jan  5 10:09:45 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=59dbb110

net-print/cnrdrvcups-lb: new package for Canon laser printers

Anyone using cndrvcups-common-lb and cndrvcups-lb will have to
emerge --deselect these from world file before attempting to install.
You'll also have to reconfigure your printer/scanner after emerging
this driver package.

Closes: https://bugs.gentoo.org/695896
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-print/cnrdrvcups-lb/Manifest                  |   1 +
 net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.00.ebuild | 187 ++++++++++++++++++++++
 net-print/cnrdrvcups-lb/metadata.xml              |   8 +
 3 files changed, 196 insertions(+)

diff --git a/net-print/cnrdrvcups-lb/Manifest b/net-print/cnrdrvcups-lb/Manifest
new file mode 100644
index 00000000000..af89d8d83f6
--- /dev/null
+++ b/net-print/cnrdrvcups-lb/Manifest
@@ -0,0 +1 @@
+DIST linux-UFRII-drv-v500-uken-06.tar.gz 107038301 BLAKE2B f02a8c9ea1052c4bf60d375eec8d896a81ab07358f9b794ba24fe70c4d21d66dd6bdb814c1d5774d281bb2657d59bf7cbfdaff1887f548bf3213951f4c171f1c SHA512 56ef4f53de630651e3953c17525f473b51b804853425f987b05ef1ee797234be01efde594f25b0a89d80098e5f5a2987cffd9eabee836dde0e3916c30cd25cf3

diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.00.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.00.ebuild
new file mode 100644
index 00000000000..77be1aca207
--- /dev/null
+++ b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.00.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop flag-o-matic
+
+MY_DOWNLOAD_ID="8/0100007658/11"
+MY_PV="${PV//\./}"
+
+DESCRIPTION="Canon UFR II / LIPSLX Printer Driver for Linux "
+HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/"
+SRC_URI="http://gdlp01.c-wss.com/gds/${MY_DOWNLOAD_ID}/linux-UFRII-drv-v${MY_PV}-uken-06.tar.gz"
+
+LICENSE="Canon-UFR-II GPL-2 MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE=""
+
+DEPEND="dev-libs/libxml2:2
+	gnome-base/libglade:2.0
+	media-libs/jbigkit
+	net-print/cups
+	x11-libs/gtk+:2"
+RDEPEND="${DEPEND}
+	!net-print/cndrvcups-common-lb
+	!net-print/cndrvcups-lb"
+
+HTML_DOCS=(
+	"${WORKDIR}"/linux-UFRII-drv-v${MY_PV}-uken/Documents/README-ufr2-5.0xUK.html
+	"${WORKDIR}"/linux-UFRII-drv-v${MY_PV}-uken/Documents/UsersGuide-ufr2-UK.html
+)
+
+S="${WORKDIR}/linux-UFRII-drv-v${MY_PV}-uken/Sources"
+
+pkg_setup() {
+	QA_PREBUILT="/usr/bin/cnsetuputil2
+		/usr/bin/cnrsdrvufr2
+		/usr/bin/cnpkmoduleufr2r
+		/usr/bin/cnpkbidir
+		/usr/bin/cnpdfdrv
+		/usr/$(get_libdir)/libufr2filterr.so.1.0.0
+		/usr/$(get_libdir)/libColorGearCufr2.so.2.0.0
+		/usr/$(get_libdir)/libcnlbcmr.so.1.0
+		/usr/$(get_libdir)/libcanon_slimufr2.so.1.0.0
+		/usr/$(get_libdir)/libcanonufr2r.so.1.0.0
+		/usr/$(get_libdir)/libcaiowrapufr2.so.1.0.0
+		/usr/$(get_libdir)/libcaiocnpkbidir.so.1.0.0
+		/usr/$(get_libdir)/libcaepcmufr2.so.1.0"
+
+	QA_SONAME="/usr/$(get_libdir)/libcaiocnpkbidir.so.1.0.0"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${WORKDIR}/linux-UFRII-drv-v${MY_PV}-uken/Sources/" || die
+	unpack ./${P}-1.tar.gz
+}
+
+common_op() {
+	local i
+	for i in backend buftool cngplp cnjbig rasterfilter; do
+		cd "${S}/cnrdrvcups-common-${PV}/${i}" ||
+			die "failed to switch dir to ${i}"
+		"${@}"
+		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
+	done
+}
+
+driver_op() {
+	local i
+	for i in cngplp cngplp/files cpca pdftocpca; do
+		cd "${S}/cnrdrvcups-lb-${PV}/${i}" ||
+			die "failed to switch dir to ${i}"
+		"${@}"
+		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
+	done
+}
+
+src_prepare() {
+	default
+
+	common_op mv configure.in configure.ac || die "failed to move configure.in"
+	driver_op mv configure.in configure.ac || die "failed to move configure.in"
+
+	common_op sed -i -e 's/configure.in/configure.ac/' configure.ac || die
+	driver_op sed -i -e 's/configure.in/configure.ac/' configure.ac || die
+
+	# This should work with autoreconf
+	export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"
+
+	# Other components already depend on compiled product
+	append-ldflags -L"${S}/cnrdrvcups-common-${PV}/buftool"
+
+	common_op eautoreconf
+	driver_op eautoreconf
+
+	# Fix a QA issue with .desktop file,
+	sed -i 's/Application;Utility/Utility/g' "${S}"/cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop ||
+		die "Failed to modify cnsetuputil2.desktop file."
+}
+
+src_configure() {
+	common_op econf
+	driver_op econf
+}
+
+src_compile() {
+	common_op emake
+	driver_op emake
+}
+
+src_install() {
+	common_op emake DESTDIR="${D}" install COMMON_SUFFIX=2
+	driver_op emake DESTDIR="${D}" install COMMON_SUFFIX=2
+
+	insinto /usr/share/cups
+	doins "${S}"/cnrdrvcups-common-${PV}/Rule/canon-laser-printer_ufr2.usb-quirks
+
+	if use amd64; then
+		cd "${S}"/lib/libs64 || die "failed to switch into libs64"
+	elif use x86; then
+		cd "${S}"/lib/libs32 || die "failed to switch into libs32"
+	else
+		die "I don't know what directory to switch into!"
+	fi
+
+	dolib.so libcaepcmufr2.so.1.0 libcaiocnpkbidir.so.1.0.0 \
+		libcaiowrapufr2.so.1.0.0 libcanonufr2r.so.1.0.0 \
+		libcanon_slimufr2.so.1.0.0 libcnlbcmr.so.1.0 \
+		libColorGearCufr2.so.2.0.0 libufr2filterr.so.1.0.0
+
+	dosym libcaepcmufr2.so.1.0 /usr/$(get_libdir)/libcaepcmufr2.so
+	dosym libcaepcmufr2.so.1.0 /usr/$(get_libdir)/libcaepcmufr2.so.1
+
+	dosym libcaiocnpkbidir.so.1.0.0 /usr/$(get_libdir)/libcaiocnpkbidir.so
+	dosym libcaiocnpkbidir.so.1.0.0 /usr/$(get_libdir)/libcaiocnpkbidir.so.1
+
+	dosym libcaiowrapufr2.so.1.0.0 /usr/$(get_libdir)/libcaiowrapufr2.so
+	dosym libcaiowrapufr2.so.1.0.0 /usr/$(get_libdir)/libcaiowrapufr2.so.1
+
+	dosym libcanonufr2r.so.1.0.0 /usr/$(get_libdir)/libcanonufr2r.so
+	dosym libcanonufr2r.so.1.0.0 /usr/$(get_libdir)/libcanonufr2r.so.1
+
+	dosym libcanon_slimufr2.so.1.0.0 /usr/$(get_libdir)/libcanon_slimufr2.so
+	dosym libcanon_slimufr2.so.1.0.0 /usr/$(get_libdir)/libcanon_slimufr2.so.1
+
+	dosym libcnlbcmr.so.1.0 /usr/$(get_libdir)/libcnlbcmr.so
+	dosym libcnlbcmr.so.1.0 /usr/$(get_libdir)/libcnlbcmr.so.1
+
+	dosym libColorGearCufr2.so.2.0.0 /usr/$(get_libdir)/libColorGearCufr2.so
+	dosym libColorGearCufr2.so.2.0.0 /usr/$(get_libdir)/libColorGearCufr2.so.2
+
+	dosym libufr2filterr.so.1.0.0 /usr/$(get_libdir)/libufr2filterr.so
+	dosym libufr2filterr.so.1.0.0 /usr/$(get_libdir)/libufr2filterr.so.1
+
+	dobin cnpdfdrv cnpkbidir cnpkmoduleufr2r cnrsdrvufr2 cnsetuputil2
+
+	insinto /usr/share/caepcm/ufr2
+	doins ./cnpkbidir_info*
+
+	insinto /usr/share/ufr2filterr
+	doins ./ThLB*
+
+	cd "${S}" || die "Failed to switch back into ${S} during installation."
+
+	dosym ../../../$(get_libdir)/cups/backend/cnusb /usr/libexec/cups/backend/cnusb
+	dosym ../../../$(get_libdir)/cups/filter/pdftocpca /usr/libexec/cups/filter/pdftocpca
+	dosym ../../../$(get_libdir)/cups/filter/rastertoufr2 /usr/libexec/cups/filter/rastertoufr2
+
+	insinto /usr/share/caepcm/ufr2
+	doins -r "${S}"/lib/data/ufr2/
+
+	insinto /usr/share/cups/model
+	doins ${P}/ppd/*.ppd
+
+	domenu ./cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop
+	doicon ./cnrdrvcups-utility-${PV}/data/cnsetuputil.png
+
+	einstalldocs
+	newdoc "${S}"/cnrdrvcups-common-${PV}/README README.common
+	newdoc "${S}"/cnrdrvcups-common-${PV}/cngplp/README README.cngplp.common
+	newdoc "${S}"/cnrdrvcups-lb-${PV}/README README.lb
+	newdoc "${S}"/cnrdrvcups-lb-${PV}/cngplp/README README.cngplp.driver
+
+	find "${D}" -name '*.la' -type f -delete || die
+}

diff --git a/net-print/cnrdrvcups-lb/metadata.xml b/net-print/cnrdrvcups-lb/metadata.xml
new file mode 100644
index 00000000000..6b0a0fb3a72
--- /dev/null
+++ b/net-print/cnrdrvcups-lb/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+  <maintainer type="person">
+    <email>juippis@gentoo.org</email>
+    <name>Joonas Niilola</name>
+  </maintainer>
+</pkgmetadata>


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

* [gentoo-commits] repo/gentoo:master commit in: net-print/cnrdrvcups-lb/
@ 2020-01-06  9:36 Joonas Niilola
  0 siblings, 0 replies; 29+ messages in thread
From: Joonas Niilola @ 2020-01-06  9:36 UTC (permalink / raw
  To: gentoo-commits

commit:     cc0daeb3b3389e2e23adf97e45a8a0719f3efbc8
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Jan  6 09:19:42 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Jan  6 09:35:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cc0daeb3

net-print/cnrdrvcups-lb: keyword ~x86

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.00.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.00.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.00.ebuild
index 77be1aca207..d59b7d2cb2c 100644
--- a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.00.ebuild
+++ b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.00.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://gdlp01.c-wss.com/gds/${MY_DOWNLOAD_ID}/linux-UFRII-drv-v${MY_PV}
 
 LICENSE="Canon-UFR-II GPL-2 MIT"
 SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-libs/libxml2:2


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

* [gentoo-commits] repo/gentoo:master commit in: net-print/cnrdrvcups-lb/
@ 2020-02-23  7:41 Joonas Niilola
  0 siblings, 0 replies; 29+ messages in thread
From: Joonas Niilola @ 2020-02-23  7:41 UTC (permalink / raw
  To: gentoo-commits

commit:     11ca3eb805c31a55ff0f2cbe1b8fd2f1ebf42902
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Feb 23 07:40:55 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Feb 23 07:40:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=11ca3eb8

net-print/cnrdrvcups-lb: bump to 5.10

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-print/cnrdrvcups-lb/Manifest                  |   1 +
 net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10.ebuild | 187 ++++++++++++++++++++++
 2 files changed, 188 insertions(+)

diff --git a/net-print/cnrdrvcups-lb/Manifest b/net-print/cnrdrvcups-lb/Manifest
index af89d8d83f6..2e67aa1a434 100644
--- a/net-print/cnrdrvcups-lb/Manifest
+++ b/net-print/cnrdrvcups-lb/Manifest
@@ -1 +1,2 @@
 DIST linux-UFRII-drv-v500-uken-06.tar.gz 107038301 BLAKE2B f02a8c9ea1052c4bf60d375eec8d896a81ab07358f9b794ba24fe70c4d21d66dd6bdb814c1d5774d281bb2657d59bf7cbfdaff1887f548bf3213951f4c171f1c SHA512 56ef4f53de630651e3953c17525f473b51b804853425f987b05ef1ee797234be01efde594f25b0a89d80098e5f5a2987cffd9eabee836dde0e3916c30cd25cf3
+DIST linux-UFRII-drv-v510-uken-08.tar.gz 106569187 BLAKE2B 46017d4e82653314e1555b32c6e3a73ae8c9c7cef95e4f70d51d62e15f26831cf0ea8d1b180503cd63a880d637621427fe6c69971b40d9ee0119ecd493772515 SHA512 dbc8b8e600ec29e73afa4ba8a760fd643d58ee2017f6c3c35e63c7f2186cf0cb675adb0ea344b0bd04d0b4fa7f13763b5ce97e8264790356134e6ded3069bf54

diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10.ebuild
new file mode 100644
index 00000000000..20747dde650
--- /dev/null
+++ b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop flag-o-matic
+
+MY_DOWNLOAD_ID="8/0100007658/13"
+MY_PV="${PV//\./}"
+
+DESCRIPTION="Canon UFR II / LIPSLX Printer Driver for Linux "
+HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/"
+SRC_URI="http://gdlp01.c-wss.com/gds/${MY_DOWNLOAD_ID}/linux-UFRII-drv-v${MY_PV}-uken-08.tar.gz"
+
+LICENSE="Canon-UFR-II GPL-2 MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/libxml2:2
+	gnome-base/libglade:2.0
+	media-libs/jbigkit
+	net-print/cups
+	x11-libs/gtk+:2"
+RDEPEND="${DEPEND}
+	!net-print/cndrvcups-common-lb
+	!net-print/cndrvcups-lb"
+
+HTML_DOCS=(
+	"${WORKDIR}"/linux-UFRII-drv-v${MY_PV}-uken/Documents/README-ufr2-5.1xUK.html
+	"${WORKDIR}"/linux-UFRII-drv-v${MY_PV}-uken/Documents/UsersGuide-ufr2-UK.html
+)
+
+S="${WORKDIR}/linux-UFRII-drv-v${MY_PV}-uken/Sources"
+
+pkg_setup() {
+	QA_PREBUILT="/usr/bin/cnsetuputil2
+		/usr/bin/cnrsdrvufr2
+		/usr/bin/cnpkmoduleufr2r
+		/usr/bin/cnpkbidir
+		/usr/bin/cnpdfdrv
+		/usr/$(get_libdir)/libufr2filterr.so.1.0.0
+		/usr/$(get_libdir)/libColorGearCufr2.so.2.0.0
+		/usr/$(get_libdir)/libcnlbcmr.so.1.0
+		/usr/$(get_libdir)/libcanon_slimufr2.so.1.0.0
+		/usr/$(get_libdir)/libcanonufr2r.so.1.0.0
+		/usr/$(get_libdir)/libcaiowrapufr2.so.1.0.0
+		/usr/$(get_libdir)/libcaiocnpkbidir.so.1.0.0
+		/usr/$(get_libdir)/libcaepcmufr2.so.1.0"
+
+	QA_SONAME="/usr/$(get_libdir)/libcaiocnpkbidir.so.1.0.0"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${WORKDIR}/linux-UFRII-drv-v${MY_PV}-uken/Sources/" || die
+	unpack ./${P}-1.tar.gz
+}
+
+common_op() {
+	local i
+	for i in backend buftool cngplp cnjbig rasterfilter; do
+		cd "${S}/cnrdrvcups-common-${PV}/${i}" ||
+			die "failed to switch dir to ${i}"
+		"${@}"
+		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
+	done
+}
+
+driver_op() {
+	local i
+	for i in cngplp cngplp/files cpca pdftocpca; do
+		cd "${S}/cnrdrvcups-lb-${PV}/${i}" ||
+			die "failed to switch dir to ${i}"
+		"${@}"
+		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
+	done
+}
+
+src_prepare() {
+	default
+
+	common_op mv configure.in configure.ac || die "failed to move configure.in"
+	driver_op mv configure.in configure.ac || die "failed to move configure.in"
+
+	common_op sed -i -e 's/configure.in/configure.ac/' configure.ac || die
+	driver_op sed -i -e 's/configure.in/configure.ac/' configure.ac || die
+
+	# This should work with autoreconf
+	export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"
+
+	# Other components already depend on compiled product
+	append-ldflags -L"${S}/cnrdrvcups-common-${PV}/buftool"
+
+	common_op eautoreconf
+	driver_op eautoreconf
+
+	# Fix a QA issue with .desktop file,
+	sed -i 's/Application;Utility/Utility/g' "${S}"/cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop ||
+		die "Failed to modify cnsetuputil2.desktop file."
+}
+
+src_configure() {
+	common_op econf
+	driver_op econf
+}
+
+src_compile() {
+	common_op emake
+	driver_op emake
+}
+
+src_install() {
+	common_op emake DESTDIR="${D}" install COMMON_SUFFIX=2
+	driver_op emake DESTDIR="${D}" install COMMON_SUFFIX=2
+
+	insinto /usr/share/cups
+	doins "${S}"/cnrdrvcups-common-${PV}/Rule/canon-laser-printer_ufr2.usb-quirks
+
+	if use amd64; then
+		cd "${S}"/lib/libs64 || die "failed to switch into libs64"
+	elif use x86; then
+		cd "${S}"/lib/libs32 || die "failed to switch into libs32"
+	else
+		die "I don't know what directory to switch into!"
+	fi
+
+	dolib.so libcaepcmufr2.so.1.0 libcaiocnpkbidir.so.1.0.0 \
+		libcaiowrapufr2.so.1.0.0 libcanonufr2r.so.1.0.0 \
+		libcanon_slimufr2.so.1.0.0 libcnlbcmr.so.1.0 \
+		libColorGearCufr2.so.2.0.0 libufr2filterr.so.1.0.0
+
+	dosym libcaepcmufr2.so.1.0 /usr/$(get_libdir)/libcaepcmufr2.so
+	dosym libcaepcmufr2.so.1.0 /usr/$(get_libdir)/libcaepcmufr2.so.1
+
+	dosym libcaiocnpkbidir.so.1.0.0 /usr/$(get_libdir)/libcaiocnpkbidir.so
+	dosym libcaiocnpkbidir.so.1.0.0 /usr/$(get_libdir)/libcaiocnpkbidir.so.1
+
+	dosym libcaiowrapufr2.so.1.0.0 /usr/$(get_libdir)/libcaiowrapufr2.so
+	dosym libcaiowrapufr2.so.1.0.0 /usr/$(get_libdir)/libcaiowrapufr2.so.1
+
+	dosym libcanonufr2r.so.1.0.0 /usr/$(get_libdir)/libcanonufr2r.so
+	dosym libcanonufr2r.so.1.0.0 /usr/$(get_libdir)/libcanonufr2r.so.1
+
+	dosym libcanon_slimufr2.so.1.0.0 /usr/$(get_libdir)/libcanon_slimufr2.so
+	dosym libcanon_slimufr2.so.1.0.0 /usr/$(get_libdir)/libcanon_slimufr2.so.1
+
+	dosym libcnlbcmr.so.1.0 /usr/$(get_libdir)/libcnlbcmr.so
+	dosym libcnlbcmr.so.1.0 /usr/$(get_libdir)/libcnlbcmr.so.1
+
+	dosym libColorGearCufr2.so.2.0.0 /usr/$(get_libdir)/libColorGearCufr2.so
+	dosym libColorGearCufr2.so.2.0.0 /usr/$(get_libdir)/libColorGearCufr2.so.2
+
+	dosym libufr2filterr.so.1.0.0 /usr/$(get_libdir)/libufr2filterr.so
+	dosym libufr2filterr.so.1.0.0 /usr/$(get_libdir)/libufr2filterr.so.1
+
+	dobin cnpdfdrv cnpkbidir cnpkmoduleufr2r cnrsdrvufr2 cnsetuputil2
+
+	insinto /usr/share/caepcm/ufr2
+	doins ./cnpkbidir_info*
+
+	insinto /usr/share/ufr2filterr
+	doins ./ThLB*
+
+	cd "${S}" || die "Failed to switch back into ${S} during installation."
+
+	dosym ../../../$(get_libdir)/cups/backend/cnusb /usr/libexec/cups/backend/cnusb
+	dosym ../../../$(get_libdir)/cups/filter/pdftocpca /usr/libexec/cups/filter/pdftocpca
+	dosym ../../../$(get_libdir)/cups/filter/rastertoufr2 /usr/libexec/cups/filter/rastertoufr2
+
+	insinto /usr/share/caepcm/ufr2
+	doins -r "${S}"/lib/data/ufr2/
+
+	insinto /usr/share/cups/model
+	doins ${P}/ppd/*.ppd
+
+	domenu ./cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop
+	doicon ./cnrdrvcups-utility-${PV}/data/cnsetuputil.png
+
+	einstalldocs
+	newdoc "${S}"/cnrdrvcups-common-${PV}/README README.common
+	newdoc "${S}"/cnrdrvcups-common-${PV}/cngplp/README README.cngplp.common
+	newdoc "${S}"/cnrdrvcups-lb-${PV}/README README.lb
+	newdoc "${S}"/cnrdrvcups-lb-${PV}/cngplp/README README.cngplp.driver
+
+	find "${D}" -name '*.la' -type f -delete || die
+}


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

* [gentoo-commits] repo/gentoo:master commit in: net-print/cnrdrvcups-lb/
@ 2020-03-06  8:51 Joonas Niilola
  0 siblings, 0 replies; 29+ messages in thread
From: Joonas Niilola @ 2020-03-06  8:51 UTC (permalink / raw
  To: gentoo-commits

commit:     d9ffbcf4ff231d3aad23dcd65bf07fb42a7ab62e
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  6 08:43:43 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Mar  6 08:50:51 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9ffbcf4

net-print/cnrdrvcups-lb: stabilize 5.00 on x86

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.00.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.00.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.00.ebuild
index d59b7d2cb2c..0b899e78b61 100644
--- a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.00.ebuild
+++ b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.00.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://gdlp01.c-wss.com/gds/${MY_DOWNLOAD_ID}/linux-UFRII-drv-v${MY_PV}
 
 LICENSE="Canon-UFR-II GPL-2 MIT"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 x86"
 IUSE=""
 
 DEPEND="dev-libs/libxml2:2


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

* [gentoo-commits] repo/gentoo:master commit in: net-print/cnrdrvcups-lb/
@ 2020-03-06  8:51 Joonas Niilola
  0 siblings, 0 replies; 29+ messages in thread
From: Joonas Niilola @ 2020-03-06  8:51 UTC (permalink / raw
  To: gentoo-commits

commit:     e5dd9e01450607a778695e5ad5ffb4dc7e639ba8
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Mar  6 08:50:03 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Mar  6 08:50:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e5dd9e01

net-print/cnrdrvcups-lb: stabilize 5.00 on amd64

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.00.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.00.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.00.ebuild
index 0b899e78b61..5b5611a5d93 100644
--- a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.00.ebuild
+++ b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.00.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://gdlp01.c-wss.com/gds/${MY_DOWNLOAD_ID}/linux-UFRII-drv-v${MY_PV}
 
 LICENSE="Canon-UFR-II GPL-2 MIT"
 SLOT="0"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 DEPEND="dev-libs/libxml2:2


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

* [gentoo-commits] repo/gentoo:master commit in: net-print/cnrdrvcups-lb/
@ 2020-03-28 15:28 Joonas Niilola
  0 siblings, 0 replies; 29+ messages in thread
From: Joonas Niilola @ 2020-03-28 15:28 UTC (permalink / raw
  To: gentoo-commits

commit:     607699875b45f99bbc98eae28b064db4e499d7c6
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 28 14:42:31 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Mar 28 15:27:52 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=60769987

net-print/cnrdrvcups-lb: stabilize 5.10 on x86

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10.ebuild
index 20747dde650..8934e37f3e9 100644
--- a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10.ebuild
+++ b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://gdlp01.c-wss.com/gds/${MY_DOWNLOAD_ID}/linux-UFRII-drv-v${MY_PV}
 
 LICENSE="Canon-UFR-II GPL-2 MIT"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 x86"
 IUSE=""
 
 DEPEND="dev-libs/libxml2:2


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

* [gentoo-commits] repo/gentoo:master commit in: net-print/cnrdrvcups-lb/
@ 2020-03-28 15:28 Joonas Niilola
  0 siblings, 0 replies; 29+ messages in thread
From: Joonas Niilola @ 2020-03-28 15:28 UTC (permalink / raw
  To: gentoo-commits

commit:     54ec62df25cdc3707bf87c445d51b3cd6e3cd261
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 28 15:23:45 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Mar 28 15:27:55 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=54ec62df

net-print/cnrdrvcups-lb: remove old 5.00

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-print/cnrdrvcups-lb/Manifest                  |   1 -
 net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.00.ebuild | 187 ----------------------
 2 files changed, 188 deletions(-)

diff --git a/net-print/cnrdrvcups-lb/Manifest b/net-print/cnrdrvcups-lb/Manifest
index 2e67aa1a434..602bcbaf74a 100644
--- a/net-print/cnrdrvcups-lb/Manifest
+++ b/net-print/cnrdrvcups-lb/Manifest
@@ -1,2 +1 @@
-DIST linux-UFRII-drv-v500-uken-06.tar.gz 107038301 BLAKE2B f02a8c9ea1052c4bf60d375eec8d896a81ab07358f9b794ba24fe70c4d21d66dd6bdb814c1d5774d281bb2657d59bf7cbfdaff1887f548bf3213951f4c171f1c SHA512 56ef4f53de630651e3953c17525f473b51b804853425f987b05ef1ee797234be01efde594f25b0a89d80098e5f5a2987cffd9eabee836dde0e3916c30cd25cf3
 DIST linux-UFRII-drv-v510-uken-08.tar.gz 106569187 BLAKE2B 46017d4e82653314e1555b32c6e3a73ae8c9c7cef95e4f70d51d62e15f26831cf0ea8d1b180503cd63a880d637621427fe6c69971b40d9ee0119ecd493772515 SHA512 dbc8b8e600ec29e73afa4ba8a760fd643d58ee2017f6c3c35e63c7f2186cf0cb675adb0ea344b0bd04d0b4fa7f13763b5ce97e8264790356134e6ded3069bf54

diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.00.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.00.ebuild
deleted file mode 100644
index 5b5611a5d93..00000000000
--- a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.00.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop flag-o-matic
-
-MY_DOWNLOAD_ID="8/0100007658/11"
-MY_PV="${PV//\./}"
-
-DESCRIPTION="Canon UFR II / LIPSLX Printer Driver for Linux "
-HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/"
-SRC_URI="http://gdlp01.c-wss.com/gds/${MY_DOWNLOAD_ID}/linux-UFRII-drv-v${MY_PV}-uken-06.tar.gz"
-
-LICENSE="Canon-UFR-II GPL-2 MIT"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-DEPEND="dev-libs/libxml2:2
-	gnome-base/libglade:2.0
-	media-libs/jbigkit
-	net-print/cups
-	x11-libs/gtk+:2"
-RDEPEND="${DEPEND}
-	!net-print/cndrvcups-common-lb
-	!net-print/cndrvcups-lb"
-
-HTML_DOCS=(
-	"${WORKDIR}"/linux-UFRII-drv-v${MY_PV}-uken/Documents/README-ufr2-5.0xUK.html
-	"${WORKDIR}"/linux-UFRII-drv-v${MY_PV}-uken/Documents/UsersGuide-ufr2-UK.html
-)
-
-S="${WORKDIR}/linux-UFRII-drv-v${MY_PV}-uken/Sources"
-
-pkg_setup() {
-	QA_PREBUILT="/usr/bin/cnsetuputil2
-		/usr/bin/cnrsdrvufr2
-		/usr/bin/cnpkmoduleufr2r
-		/usr/bin/cnpkbidir
-		/usr/bin/cnpdfdrv
-		/usr/$(get_libdir)/libufr2filterr.so.1.0.0
-		/usr/$(get_libdir)/libColorGearCufr2.so.2.0.0
-		/usr/$(get_libdir)/libcnlbcmr.so.1.0
-		/usr/$(get_libdir)/libcanon_slimufr2.so.1.0.0
-		/usr/$(get_libdir)/libcanonufr2r.so.1.0.0
-		/usr/$(get_libdir)/libcaiowrapufr2.so.1.0.0
-		/usr/$(get_libdir)/libcaiocnpkbidir.so.1.0.0
-		/usr/$(get_libdir)/libcaepcmufr2.so.1.0"
-
-	QA_SONAME="/usr/$(get_libdir)/libcaiocnpkbidir.so.1.0.0"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}/linux-UFRII-drv-v${MY_PV}-uken/Sources/" || die
-	unpack ./${P}-1.tar.gz
-}
-
-common_op() {
-	local i
-	for i in backend buftool cngplp cnjbig rasterfilter; do
-		cd "${S}/cnrdrvcups-common-${PV}/${i}" ||
-			die "failed to switch dir to ${i}"
-		"${@}"
-		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
-	done
-}
-
-driver_op() {
-	local i
-	for i in cngplp cngplp/files cpca pdftocpca; do
-		cd "${S}/cnrdrvcups-lb-${PV}/${i}" ||
-			die "failed to switch dir to ${i}"
-		"${@}"
-		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
-	done
-}
-
-src_prepare() {
-	default
-
-	common_op mv configure.in configure.ac || die "failed to move configure.in"
-	driver_op mv configure.in configure.ac || die "failed to move configure.in"
-
-	common_op sed -i -e 's/configure.in/configure.ac/' configure.ac || die
-	driver_op sed -i -e 's/configure.in/configure.ac/' configure.ac || die
-
-	# This should work with autoreconf
-	export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"
-
-	# Other components already depend on compiled product
-	append-ldflags -L"${S}/cnrdrvcups-common-${PV}/buftool"
-
-	common_op eautoreconf
-	driver_op eautoreconf
-
-	# Fix a QA issue with .desktop file,
-	sed -i 's/Application;Utility/Utility/g' "${S}"/cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop ||
-		die "Failed to modify cnsetuputil2.desktop file."
-}
-
-src_configure() {
-	common_op econf
-	driver_op econf
-}
-
-src_compile() {
-	common_op emake
-	driver_op emake
-}
-
-src_install() {
-	common_op emake DESTDIR="${D}" install COMMON_SUFFIX=2
-	driver_op emake DESTDIR="${D}" install COMMON_SUFFIX=2
-
-	insinto /usr/share/cups
-	doins "${S}"/cnrdrvcups-common-${PV}/Rule/canon-laser-printer_ufr2.usb-quirks
-
-	if use amd64; then
-		cd "${S}"/lib/libs64 || die "failed to switch into libs64"
-	elif use x86; then
-		cd "${S}"/lib/libs32 || die "failed to switch into libs32"
-	else
-		die "I don't know what directory to switch into!"
-	fi
-
-	dolib.so libcaepcmufr2.so.1.0 libcaiocnpkbidir.so.1.0.0 \
-		libcaiowrapufr2.so.1.0.0 libcanonufr2r.so.1.0.0 \
-		libcanon_slimufr2.so.1.0.0 libcnlbcmr.so.1.0 \
-		libColorGearCufr2.so.2.0.0 libufr2filterr.so.1.0.0
-
-	dosym libcaepcmufr2.so.1.0 /usr/$(get_libdir)/libcaepcmufr2.so
-	dosym libcaepcmufr2.so.1.0 /usr/$(get_libdir)/libcaepcmufr2.so.1
-
-	dosym libcaiocnpkbidir.so.1.0.0 /usr/$(get_libdir)/libcaiocnpkbidir.so
-	dosym libcaiocnpkbidir.so.1.0.0 /usr/$(get_libdir)/libcaiocnpkbidir.so.1
-
-	dosym libcaiowrapufr2.so.1.0.0 /usr/$(get_libdir)/libcaiowrapufr2.so
-	dosym libcaiowrapufr2.so.1.0.0 /usr/$(get_libdir)/libcaiowrapufr2.so.1
-
-	dosym libcanonufr2r.so.1.0.0 /usr/$(get_libdir)/libcanonufr2r.so
-	dosym libcanonufr2r.so.1.0.0 /usr/$(get_libdir)/libcanonufr2r.so.1
-
-	dosym libcanon_slimufr2.so.1.0.0 /usr/$(get_libdir)/libcanon_slimufr2.so
-	dosym libcanon_slimufr2.so.1.0.0 /usr/$(get_libdir)/libcanon_slimufr2.so.1
-
-	dosym libcnlbcmr.so.1.0 /usr/$(get_libdir)/libcnlbcmr.so
-	dosym libcnlbcmr.so.1.0 /usr/$(get_libdir)/libcnlbcmr.so.1
-
-	dosym libColorGearCufr2.so.2.0.0 /usr/$(get_libdir)/libColorGearCufr2.so
-	dosym libColorGearCufr2.so.2.0.0 /usr/$(get_libdir)/libColorGearCufr2.so.2
-
-	dosym libufr2filterr.so.1.0.0 /usr/$(get_libdir)/libufr2filterr.so
-	dosym libufr2filterr.so.1.0.0 /usr/$(get_libdir)/libufr2filterr.so.1
-
-	dobin cnpdfdrv cnpkbidir cnpkmoduleufr2r cnrsdrvufr2 cnsetuputil2
-
-	insinto /usr/share/caepcm/ufr2
-	doins ./cnpkbidir_info*
-
-	insinto /usr/share/ufr2filterr
-	doins ./ThLB*
-
-	cd "${S}" || die "Failed to switch back into ${S} during installation."
-
-	dosym ../../../$(get_libdir)/cups/backend/cnusb /usr/libexec/cups/backend/cnusb
-	dosym ../../../$(get_libdir)/cups/filter/pdftocpca /usr/libexec/cups/filter/pdftocpca
-	dosym ../../../$(get_libdir)/cups/filter/rastertoufr2 /usr/libexec/cups/filter/rastertoufr2
-
-	insinto /usr/share/caepcm/ufr2
-	doins -r "${S}"/lib/data/ufr2/
-
-	insinto /usr/share/cups/model
-	doins ${P}/ppd/*.ppd
-
-	domenu ./cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop
-	doicon ./cnrdrvcups-utility-${PV}/data/cnsetuputil.png
-
-	einstalldocs
-	newdoc "${S}"/cnrdrvcups-common-${PV}/README README.common
-	newdoc "${S}"/cnrdrvcups-common-${PV}/cngplp/README README.cngplp.common
-	newdoc "${S}"/cnrdrvcups-lb-${PV}/README README.lb
-	newdoc "${S}"/cnrdrvcups-lb-${PV}/cngplp/README README.cngplp.driver
-
-	find "${D}" -name '*.la' -type f -delete || die
-}


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

* [gentoo-commits] repo/gentoo:master commit in: net-print/cnrdrvcups-lb/
@ 2020-03-28 15:28 Joonas Niilola
  0 siblings, 0 replies; 29+ messages in thread
From: Joonas Niilola @ 2020-03-28 15:28 UTC (permalink / raw
  To: gentoo-commits

commit:     c1f7b4d2d23aaf30530e67694086249c029529a3
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Mar 28 15:23:28 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Mar 28 15:27:54 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1f7b4d2

net-print/cnrdrvcups-lb: stabilize 5.10 on amd64

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10.ebuild
index 8934e37f3e9..78e55a87995 100644
--- a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10.ebuild
+++ b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://gdlp01.c-wss.com/gds/${MY_DOWNLOAD_ID}/linux-UFRII-drv-v${MY_PV}
 
 LICENSE="Canon-UFR-II GPL-2 MIT"
 SLOT="0"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 DEPEND="dev-libs/libxml2:2


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

* [gentoo-commits] repo/gentoo:master commit in: net-print/cnrdrvcups-lb/
@ 2020-05-04 16:25 Joonas Niilola
  0 siblings, 0 replies; 29+ messages in thread
From: Joonas Niilola @ 2020-05-04 16:25 UTC (permalink / raw
  To: gentoo-commits

commit:     d9685248dd759f84a5a993e5c7ecc6a50142c5db
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon May  4 16:12:16 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon May  4 16:24:47 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d9685248

net-print/cnrdrvcups-lb: -fno-common temporary fix

Closes: https://bugs.gentoo.org/706564
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10.ebuild
index 78e55a87995..aa8c33c7454 100644
--- a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10.ebuild
+++ b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10.ebuild
@@ -98,6 +98,8 @@ src_prepare() {
 	# Fix a QA issue with .desktop file,
 	sed -i 's/Application;Utility/Utility/g' "${S}"/cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop ||
 		die "Failed to modify cnsetuputil2.desktop file."
+
+	append-cflags -fcommon
 }
 
 src_configure() {


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

* [gentoo-commits] repo/gentoo:master commit in: net-print/cnrdrvcups-lb/
@ 2020-07-04  7:36 Joonas Niilola
  0 siblings, 0 replies; 29+ messages in thread
From: Joonas Niilola @ 2020-07-04  7:36 UTC (permalink / raw
  To: gentoo-commits

commit:     69f972b2799b857f2e68ac5101e572460f0611c3
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sat Jul  4 07:29:43 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sat Jul  4 07:35:56 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=69f972b2

net-print/cnrdrvcups-lb: fix printing on some models, #717260

Closes: https://bugs.gentoo.org/717260
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-print/cnrdrvcups-lb/Manifest                   |   1 +
 .../cnrdrvcups-lb/cnrdrvcups-lb-5.10-r1.ebuild     | 189 +++++++++++++++++++++
 2 files changed, 190 insertions(+)

diff --git a/net-print/cnrdrvcups-lb/Manifest b/net-print/cnrdrvcups-lb/Manifest
index 602bcbaf74a..e6561158d26 100644
--- a/net-print/cnrdrvcups-lb/Manifest
+++ b/net-print/cnrdrvcups-lb/Manifest
@@ -1 +1,2 @@
 DIST linux-UFRII-drv-v510-uken-08.tar.gz 106569187 BLAKE2B 46017d4e82653314e1555b32c6e3a73ae8c9c7cef95e4f70d51d62e15f26831cf0ea8d1b180503cd63a880d637621427fe6c69971b40d9ee0119ecd493772515 SHA512 dbc8b8e600ec29e73afa4ba8a760fd643d58ee2017f6c3c35e63c7f2186cf0cb675adb0ea344b0bd04d0b4fa7f13763b5ce97e8264790356134e6ded3069bf54
+DIST linux-UFRII-drv-v510-uken-19.tar.gz 106848526 BLAKE2B afc6b158db038c4b5bacbd4965e8576a7dc4c6e4dcb8362823b69630372d60f8ecb82e1a7e9123fb251bbf8e459fb5fc314447e46dd1ad95058b912ac610fe56 SHA512 64f6af6fbd437076ca786b5904bf00145f49a19c3eb559fcc85316360e82aa90ab90c5763ff4f4c83d34608c4941a3fae78f93debb01f9c63f93fcc7615ae044

diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10-r1.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10-r1.ebuild
new file mode 100644
index 00000000000..07e540c258f
--- /dev/null
+++ b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10-r1.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop flag-o-matic
+
+MY_DOWNLOAD_ID="8/0100007658/14"
+MY_PV="${PV//\./}"
+
+DESCRIPTION="Canon UFR II / LIPSLX Printer Driver for Linux "
+HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/"
+SRC_URI="http://gdlp01.c-wss.com/gds/${MY_DOWNLOAD_ID}/linux-UFRII-drv-v${MY_PV}-uken-19.tar.gz"
+
+LICENSE="Canon-UFR-II GPL-2 MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/libxml2:2
+	gnome-base/libglade:2.0
+	media-libs/jbigkit
+	net-print/cups
+	x11-libs/gtk+:2"
+RDEPEND="${DEPEND}
+	!net-print/cndrvcups-common-lb
+	!net-print/cndrvcups-lb"
+
+HTML_DOCS=(
+	"${WORKDIR}"/linux-UFRII-drv-v${MY_PV}-uken/Documents/README-ufr2-5.1xUK.html
+	"${WORKDIR}"/linux-UFRII-drv-v${MY_PV}-uken/Documents/UsersGuide-ufr2-UK.html
+)
+
+S="${WORKDIR}/linux-UFRII-drv-v${MY_PV}-uken/Sources"
+
+pkg_setup() {
+	QA_PREBUILT="/usr/bin/cnsetuputil2
+		/usr/bin/cnrsdrvufr2
+		/usr/bin/cnpkmoduleufr2r
+		/usr/bin/cnpkbidir
+		/usr/bin/cnpdfdrv
+		/usr/$(get_libdir)/libufr2filterr.so.1.0.0
+		/usr/$(get_libdir)/libColorGearCufr2.so.2.0.0
+		/usr/$(get_libdir)/libcnlbcmr.so.1.0
+		/usr/$(get_libdir)/libcanon_slimufr2.so.1.0.0
+		/usr/$(get_libdir)/libcanonufr2r.so.1.0.0
+		/usr/$(get_libdir)/libcaiowrapufr2.so.1.0.0
+		/usr/$(get_libdir)/libcaiocnpkbidir.so.1.0.0
+		/usr/$(get_libdir)/libcaepcmufr2.so.1.0"
+
+	QA_SONAME="/usr/$(get_libdir)/libcaiocnpkbidir.so.1.0.0"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${WORKDIR}/linux-UFRII-drv-v${MY_PV}-uken/Sources/" || die
+	unpack ./${P}-1.tar.gz
+}
+
+common_op() {
+	local i
+	for i in backend buftool cngplp cnjbig rasterfilter; do
+		cd "${S}/cnrdrvcups-common-${PV}/${i}" ||
+			die "failed to switch dir to ${i}"
+		"${@}"
+		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
+	done
+}
+
+driver_op() {
+	local i
+	for i in cngplp cngplp/files cpca pdftocpca; do
+		cd "${S}/cnrdrvcups-lb-${PV}/${i}" ||
+			die "failed to switch dir to ${i}"
+		"${@}"
+		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
+	done
+}
+
+src_prepare() {
+	default
+
+	common_op mv configure.in configure.ac || die "failed to move configure.in"
+	driver_op mv configure.in configure.ac || die "failed to move configure.in"
+
+	common_op sed -i -e 's/configure.in/configure.ac/' configure.ac || die
+	driver_op sed -i -e 's/configure.in/configure.ac/' configure.ac || die
+
+	# This should work with autoreconf
+	export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"
+
+	# Other components already depend on compiled product
+	append-ldflags -L"${S}/cnrdrvcups-common-${PV}/buftool"
+
+	common_op eautoreconf
+	driver_op eautoreconf
+
+	# Fix a QA issue with .desktop file,
+	sed -i 's/Application;Utility/Utility/g' "${S}"/cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop ||
+		die "Failed to modify cnsetuputil2.desktop file."
+
+	append-cflags -fcommon
+}
+
+src_configure() {
+	common_op econf
+	driver_op econf
+}
+
+src_compile() {
+	common_op emake
+	driver_op emake
+}
+
+src_install() {
+	common_op emake DESTDIR="${D}" install COMMON_SUFFIX=2
+	driver_op emake DESTDIR="${D}" install COMMON_SUFFIX=2
+
+	insinto /usr/share/cups
+	doins "${S}"/cnrdrvcups-common-${PV}/Rule/canon-laser-printer_ufr2.usb-quirks
+
+	if use amd64; then
+		cd "${S}"/lib/libs64 || die "failed to switch into libs64"
+	elif use x86; then
+		cd "${S}"/lib/libs32 || die "failed to switch into libs32"
+	else
+		die "I don't know what directory to switch into!"
+	fi
+
+	dolib.so libcaepcmufr2.so.1.0 libcaiocnpkbidir.so.1.0.0 \
+		libcaiowrapufr2.so.1.0.0 libcanonufr2r.so.1.0.0 \
+		libcanon_slimufr2.so.1.0.0 libcnlbcmr.so.1.0 \
+		libColorGearCufr2.so.2.0.0 libufr2filterr.so.1.0.0
+
+	dosym libcaepcmufr2.so.1.0 /usr/$(get_libdir)/libcaepcmufr2.so
+	dosym libcaepcmufr2.so.1.0 /usr/$(get_libdir)/libcaepcmufr2.so.1
+
+	dosym libcaiocnpkbidir.so.1.0.0 /usr/$(get_libdir)/libcaiocnpkbidir.so
+	dosym libcaiocnpkbidir.so.1.0.0 /usr/$(get_libdir)/libcaiocnpkbidir.so.1
+
+	dosym libcaiowrapufr2.so.1.0.0 /usr/$(get_libdir)/libcaiowrapufr2.so
+	dosym libcaiowrapufr2.so.1.0.0 /usr/$(get_libdir)/libcaiowrapufr2.so.1
+
+	dosym libcanonufr2r.so.1.0.0 /usr/$(get_libdir)/libcanonufr2r.so
+	dosym libcanonufr2r.so.1.0.0 /usr/$(get_libdir)/libcanonufr2r.so.1
+
+	dosym libcanon_slimufr2.so.1.0.0 /usr/$(get_libdir)/libcanon_slimufr2.so
+	dosym libcanon_slimufr2.so.1.0.0 /usr/$(get_libdir)/libcanon_slimufr2.so.1
+
+	dosym libcnlbcmr.so.1.0 /usr/$(get_libdir)/libcnlbcmr.so
+	dosym libcnlbcmr.so.1.0 /usr/$(get_libdir)/libcnlbcmr.so.1
+
+	dosym libColorGearCufr2.so.2.0.0 /usr/$(get_libdir)/libColorGearCufr2.so
+	dosym libColorGearCufr2.so.2.0.0 /usr/$(get_libdir)/libColorGearCufr2.so.2
+
+	dosym libufr2filterr.so.1.0.0 /usr/$(get_libdir)/libufr2filterr.so
+	dosym libufr2filterr.so.1.0.0 /usr/$(get_libdir)/libufr2filterr.so.1
+
+	dobin cnpdfdrv cnpkbidir cnpkmoduleufr2r cnrsdrvufr2 cnsetuputil2
+
+	insinto /usr/share/cnpkbidir
+	doins ./cnpkbidir_info*
+
+	insinto /usr/share/ufr2filterr
+	doins ./ThLB*
+
+	cd "${S}" || die "Failed to switch back into ${S} during installation."
+
+	dosym ../../../$(get_libdir)/cups/backend/cnusb /usr/libexec/cups/backend/cnusb
+	dosym ../../../$(get_libdir)/cups/filter/pdftocpca /usr/libexec/cups/filter/pdftocpca
+	dosym ../../../$(get_libdir)/cups/filter/rastertoufr2 /usr/libexec/cups/filter/rastertoufr2
+
+	insinto /usr/share/caepcm/ufr2
+	doins -r "${S}"/lib/data/ufr2/
+
+	insinto /usr/share/cups/model
+	doins ${P}/ppd/*.ppd
+
+	domenu ./cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop
+	doicon ./cnrdrvcups-utility-${PV}/data/cnsetuputil.png
+
+	einstalldocs
+	newdoc "${S}"/cnrdrvcups-common-${PV}/README README.common
+	newdoc "${S}"/cnrdrvcups-common-${PV}/cngplp/README README.cngplp.common
+	newdoc "${S}"/cnrdrvcups-lb-${PV}/README README.lb
+	newdoc "${S}"/cnrdrvcups-lb-${PV}/cngplp/README README.cngplp.driver
+
+	find "${D}" -name '*.la' -type f -delete || die
+}


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

* [gentoo-commits] repo/gentoo:master commit in: net-print/cnrdrvcups-lb/
@ 2020-08-04 16:50 Joonas Niilola
  0 siblings, 0 replies; 29+ messages in thread
From: Joonas Niilola @ 2020-08-04 16:50 UTC (permalink / raw
  To: gentoo-commits

commit:     997df5fd5d84710248803dbd13c095d79a139643
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  4 12:41:18 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Aug  4 16:50:36 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=997df5fd

net-print/cnrdrvcups-lb: stabilize 5.10-r1 on x86

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10-r1.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10-r1.ebuild
index 07e540c258f..85d00b90d21 100644
--- a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10-r1.ebuild
+++ b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://gdlp01.c-wss.com/gds/${MY_DOWNLOAD_ID}/linux-UFRII-drv-v${MY_PV}
 
 LICENSE="Canon-UFR-II GPL-2 MIT"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 x86"
 IUSE=""
 
 DEPEND="dev-libs/libxml2:2


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

* [gentoo-commits] repo/gentoo:master commit in: net-print/cnrdrvcups-lb/
@ 2020-08-04 16:50 Joonas Niilola
  0 siblings, 0 replies; 29+ messages in thread
From: Joonas Niilola @ 2020-08-04 16:50 UTC (permalink / raw
  To: gentoo-commits

commit:     9c6f8e6aaecfc4d711ba5163aed07650b70fdd3d
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  4 13:47:28 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Aug  4 16:50:37 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9c6f8e6a

net-print/cnrdrvcups-lb: stabilize 5.10-r1 on amd64

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10-r1.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10-r1.ebuild
index 85d00b90d21..89299160845 100644
--- a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10-r1.ebuild
+++ b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10-r1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://gdlp01.c-wss.com/gds/${MY_DOWNLOAD_ID}/linux-UFRII-drv-v${MY_PV}
 
 LICENSE="Canon-UFR-II GPL-2 MIT"
 SLOT="0"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 DEPEND="dev-libs/libxml2:2


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

* [gentoo-commits] repo/gentoo:master commit in: net-print/cnrdrvcups-lb/
@ 2020-08-04 16:50 Joonas Niilola
  0 siblings, 0 replies; 29+ messages in thread
From: Joonas Niilola @ 2020-08-04 16:50 UTC (permalink / raw
  To: gentoo-commits

commit:     dcac26f70e9223faaaf4ee0ae10bd064337dc5b9
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Aug  4 13:48:18 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Aug  4 16:50:38 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dcac26f7

net-print/cnrdrvcups-lb: remove old 5.10

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-print/cnrdrvcups-lb/Manifest                  |   1 -
 net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10.ebuild | 189 ----------------------
 2 files changed, 190 deletions(-)

diff --git a/net-print/cnrdrvcups-lb/Manifest b/net-print/cnrdrvcups-lb/Manifest
index e6561158d26..fe87bd6526e 100644
--- a/net-print/cnrdrvcups-lb/Manifest
+++ b/net-print/cnrdrvcups-lb/Manifest
@@ -1,2 +1 @@
-DIST linux-UFRII-drv-v510-uken-08.tar.gz 106569187 BLAKE2B 46017d4e82653314e1555b32c6e3a73ae8c9c7cef95e4f70d51d62e15f26831cf0ea8d1b180503cd63a880d637621427fe6c69971b40d9ee0119ecd493772515 SHA512 dbc8b8e600ec29e73afa4ba8a760fd643d58ee2017f6c3c35e63c7f2186cf0cb675adb0ea344b0bd04d0b4fa7f13763b5ce97e8264790356134e6ded3069bf54
 DIST linux-UFRII-drv-v510-uken-19.tar.gz 106848526 BLAKE2B afc6b158db038c4b5bacbd4965e8576a7dc4c6e4dcb8362823b69630372d60f8ecb82e1a7e9123fb251bbf8e459fb5fc314447e46dd1ad95058b912ac610fe56 SHA512 64f6af6fbd437076ca786b5904bf00145f49a19c3eb559fcc85316360e82aa90ab90c5763ff4f4c83d34608c4941a3fae78f93debb01f9c63f93fcc7615ae044

diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10.ebuild
deleted file mode 100644
index aa8c33c7454..00000000000
--- a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10.ebuild
+++ /dev/null
@@ -1,189 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop flag-o-matic
-
-MY_DOWNLOAD_ID="8/0100007658/13"
-MY_PV="${PV//\./}"
-
-DESCRIPTION="Canon UFR II / LIPSLX Printer Driver for Linux "
-HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/"
-SRC_URI="http://gdlp01.c-wss.com/gds/${MY_DOWNLOAD_ID}/linux-UFRII-drv-v${MY_PV}-uken-08.tar.gz"
-
-LICENSE="Canon-UFR-II GPL-2 MIT"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-DEPEND="dev-libs/libxml2:2
-	gnome-base/libglade:2.0
-	media-libs/jbigkit
-	net-print/cups
-	x11-libs/gtk+:2"
-RDEPEND="${DEPEND}
-	!net-print/cndrvcups-common-lb
-	!net-print/cndrvcups-lb"
-
-HTML_DOCS=(
-	"${WORKDIR}"/linux-UFRII-drv-v${MY_PV}-uken/Documents/README-ufr2-5.1xUK.html
-	"${WORKDIR}"/linux-UFRII-drv-v${MY_PV}-uken/Documents/UsersGuide-ufr2-UK.html
-)
-
-S="${WORKDIR}/linux-UFRII-drv-v${MY_PV}-uken/Sources"
-
-pkg_setup() {
-	QA_PREBUILT="/usr/bin/cnsetuputil2
-		/usr/bin/cnrsdrvufr2
-		/usr/bin/cnpkmoduleufr2r
-		/usr/bin/cnpkbidir
-		/usr/bin/cnpdfdrv
-		/usr/$(get_libdir)/libufr2filterr.so.1.0.0
-		/usr/$(get_libdir)/libColorGearCufr2.so.2.0.0
-		/usr/$(get_libdir)/libcnlbcmr.so.1.0
-		/usr/$(get_libdir)/libcanon_slimufr2.so.1.0.0
-		/usr/$(get_libdir)/libcanonufr2r.so.1.0.0
-		/usr/$(get_libdir)/libcaiowrapufr2.so.1.0.0
-		/usr/$(get_libdir)/libcaiocnpkbidir.so.1.0.0
-		/usr/$(get_libdir)/libcaepcmufr2.so.1.0"
-
-	QA_SONAME="/usr/$(get_libdir)/libcaiocnpkbidir.so.1.0.0"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}/linux-UFRII-drv-v${MY_PV}-uken/Sources/" || die
-	unpack ./${P}-1.tar.gz
-}
-
-common_op() {
-	local i
-	for i in backend buftool cngplp cnjbig rasterfilter; do
-		cd "${S}/cnrdrvcups-common-${PV}/${i}" ||
-			die "failed to switch dir to ${i}"
-		"${@}"
-		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
-	done
-}
-
-driver_op() {
-	local i
-	for i in cngplp cngplp/files cpca pdftocpca; do
-		cd "${S}/cnrdrvcups-lb-${PV}/${i}" ||
-			die "failed to switch dir to ${i}"
-		"${@}"
-		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
-	done
-}
-
-src_prepare() {
-	default
-
-	common_op mv configure.in configure.ac || die "failed to move configure.in"
-	driver_op mv configure.in configure.ac || die "failed to move configure.in"
-
-	common_op sed -i -e 's/configure.in/configure.ac/' configure.ac || die
-	driver_op sed -i -e 's/configure.in/configure.ac/' configure.ac || die
-
-	# This should work with autoreconf
-	export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"
-
-	# Other components already depend on compiled product
-	append-ldflags -L"${S}/cnrdrvcups-common-${PV}/buftool"
-
-	common_op eautoreconf
-	driver_op eautoreconf
-
-	# Fix a QA issue with .desktop file,
-	sed -i 's/Application;Utility/Utility/g' "${S}"/cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop ||
-		die "Failed to modify cnsetuputil2.desktop file."
-
-	append-cflags -fcommon
-}
-
-src_configure() {
-	common_op econf
-	driver_op econf
-}
-
-src_compile() {
-	common_op emake
-	driver_op emake
-}
-
-src_install() {
-	common_op emake DESTDIR="${D}" install COMMON_SUFFIX=2
-	driver_op emake DESTDIR="${D}" install COMMON_SUFFIX=2
-
-	insinto /usr/share/cups
-	doins "${S}"/cnrdrvcups-common-${PV}/Rule/canon-laser-printer_ufr2.usb-quirks
-
-	if use amd64; then
-		cd "${S}"/lib/libs64 || die "failed to switch into libs64"
-	elif use x86; then
-		cd "${S}"/lib/libs32 || die "failed to switch into libs32"
-	else
-		die "I don't know what directory to switch into!"
-	fi
-
-	dolib.so libcaepcmufr2.so.1.0 libcaiocnpkbidir.so.1.0.0 \
-		libcaiowrapufr2.so.1.0.0 libcanonufr2r.so.1.0.0 \
-		libcanon_slimufr2.so.1.0.0 libcnlbcmr.so.1.0 \
-		libColorGearCufr2.so.2.0.0 libufr2filterr.so.1.0.0
-
-	dosym libcaepcmufr2.so.1.0 /usr/$(get_libdir)/libcaepcmufr2.so
-	dosym libcaepcmufr2.so.1.0 /usr/$(get_libdir)/libcaepcmufr2.so.1
-
-	dosym libcaiocnpkbidir.so.1.0.0 /usr/$(get_libdir)/libcaiocnpkbidir.so
-	dosym libcaiocnpkbidir.so.1.0.0 /usr/$(get_libdir)/libcaiocnpkbidir.so.1
-
-	dosym libcaiowrapufr2.so.1.0.0 /usr/$(get_libdir)/libcaiowrapufr2.so
-	dosym libcaiowrapufr2.so.1.0.0 /usr/$(get_libdir)/libcaiowrapufr2.so.1
-
-	dosym libcanonufr2r.so.1.0.0 /usr/$(get_libdir)/libcanonufr2r.so
-	dosym libcanonufr2r.so.1.0.0 /usr/$(get_libdir)/libcanonufr2r.so.1
-
-	dosym libcanon_slimufr2.so.1.0.0 /usr/$(get_libdir)/libcanon_slimufr2.so
-	dosym libcanon_slimufr2.so.1.0.0 /usr/$(get_libdir)/libcanon_slimufr2.so.1
-
-	dosym libcnlbcmr.so.1.0 /usr/$(get_libdir)/libcnlbcmr.so
-	dosym libcnlbcmr.so.1.0 /usr/$(get_libdir)/libcnlbcmr.so.1
-
-	dosym libColorGearCufr2.so.2.0.0 /usr/$(get_libdir)/libColorGearCufr2.so
-	dosym libColorGearCufr2.so.2.0.0 /usr/$(get_libdir)/libColorGearCufr2.so.2
-
-	dosym libufr2filterr.so.1.0.0 /usr/$(get_libdir)/libufr2filterr.so
-	dosym libufr2filterr.so.1.0.0 /usr/$(get_libdir)/libufr2filterr.so.1
-
-	dobin cnpdfdrv cnpkbidir cnpkmoduleufr2r cnrsdrvufr2 cnsetuputil2
-
-	insinto /usr/share/caepcm/ufr2
-	doins ./cnpkbidir_info*
-
-	insinto /usr/share/ufr2filterr
-	doins ./ThLB*
-
-	cd "${S}" || die "Failed to switch back into ${S} during installation."
-
-	dosym ../../../$(get_libdir)/cups/backend/cnusb /usr/libexec/cups/backend/cnusb
-	dosym ../../../$(get_libdir)/cups/filter/pdftocpca /usr/libexec/cups/filter/pdftocpca
-	dosym ../../../$(get_libdir)/cups/filter/rastertoufr2 /usr/libexec/cups/filter/rastertoufr2
-
-	insinto /usr/share/caepcm/ufr2
-	doins -r "${S}"/lib/data/ufr2/
-
-	insinto /usr/share/cups/model
-	doins ${P}/ppd/*.ppd
-
-	domenu ./cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop
-	doicon ./cnrdrvcups-utility-${PV}/data/cnsetuputil.png
-
-	einstalldocs
-	newdoc "${S}"/cnrdrvcups-common-${PV}/README README.common
-	newdoc "${S}"/cnrdrvcups-common-${PV}/cngplp/README README.cngplp.common
-	newdoc "${S}"/cnrdrvcups-lb-${PV}/README README.lb
-	newdoc "${S}"/cnrdrvcups-lb-${PV}/cngplp/README README.cngplp.driver
-
-	find "${D}" -name '*.la' -type f -delete || die
-}


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

* [gentoo-commits] repo/gentoo:master commit in: net-print/cnrdrvcups-lb/
@ 2020-09-21 13:59 Joonas Niilola
  0 siblings, 0 replies; 29+ messages in thread
From: Joonas Niilola @ 2020-09-21 13:59 UTC (permalink / raw
  To: gentoo-commits

commit:     fd9fba0eeb3a25cf3d1d760872183ceb78c700bd
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 13:57:17 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 13:58:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd9fba0e

net-print/cnrdrvcups-lb: fix "calls ar directly" bug

Closes: https://bugs.gentoo.org/735966
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10-r1.ebuild | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10-r1.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10-r1.ebuild
index 89299160845..6d4bbe74b3f 100644
--- a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10-r1.ebuild
+++ b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools desktop flag-o-matic
+inherit autotools desktop flag-o-matic toolchain-funcs
 
 MY_DOWNLOAD_ID="8/0100007658/14"
 MY_PV="${PV//\./}"
@@ -100,6 +100,9 @@ src_prepare() {
 		die "Failed to modify cnsetuputil2.desktop file."
 
 	append-cflags -fcommon
+
+	# For some reason, @AR@ is defined everywhere else correctly, but not here.
+	sed -i -e "s/AR = ar/AR = $(tc-getAR)/g" ./cnrdrvcups-common-${PV}/buftool/Makefile.in || die
 }
 
 src_configure() {


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

* [gentoo-commits] repo/gentoo:master commit in: net-print/cnrdrvcups-lb/
@ 2020-09-21 13:59 Joonas Niilola
  0 siblings, 0 replies; 29+ messages in thread
From: Joonas Niilola @ 2020-09-21 13:59 UTC (permalink / raw
  To: gentoo-commits

commit:     3d316d066656864e49a4e6a44478f47a75815d33
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Sep 21 13:58:41 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Sep 21 13:58:59 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3d316d06

net-print/cnrdrvcups-lb: bump to 5.20

Bug: https://bugs.gentoo.org/735966
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-print/cnrdrvcups-lb/Manifest                  |   1 +
 net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.20.ebuild | 192 ++++++++++++++++++++++
 2 files changed, 193 insertions(+)

diff --git a/net-print/cnrdrvcups-lb/Manifest b/net-print/cnrdrvcups-lb/Manifest
index fe87bd6526e..e1336d9baf9 100644
--- a/net-print/cnrdrvcups-lb/Manifest
+++ b/net-print/cnrdrvcups-lb/Manifest
@@ -1 +1,2 @@
 DIST linux-UFRII-drv-v510-uken-19.tar.gz 106848526 BLAKE2B afc6b158db038c4b5bacbd4965e8576a7dc4c6e4dcb8362823b69630372d60f8ecb82e1a7e9123fb251bbf8e459fb5fc314447e46dd1ad95058b912ac610fe56 SHA512 64f6af6fbd437076ca786b5904bf00145f49a19c3eb559fcc85316360e82aa90ab90c5763ff4f4c83d34608c4941a3fae78f93debb01f9c63f93fcc7615ae044
+DIST linux-UFRII-drv-v520-uken-05.tar.gz 107101656 BLAKE2B 4ea92eaaab76babca7fc94771c39b12804b9016ae7baeeaafc18e1979a83ffdcb2090a9cc8a5390314be129ca273c3571f95c83c9e4a29254aca18325687acb2 SHA512 31652894e8ad07e81ae044c5172ced73569a1b78f06f48bcafcd9cabcb19406f0645bfdf741cf3a60746859e671c443d14e5c0c04bffd540ac10406df7266b45

diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.20.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.20.ebuild
new file mode 100644
index 00000000000..647cf5ade51
--- /dev/null
+++ b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.20.ebuild
@@ -0,0 +1,192 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop flag-o-matic toolchain-funcs
+
+CANON_REL="05"
+MY_PV="${PV//\./}"
+
+DESCRIPTION="Canon UFR II / LIPSLX Printer Driver for Linux "
+HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/"
+SRC_URI="https://dev.gentoo.org/~juippis/distfiles/linux-UFRII-drv-v${MY_PV}-uken-${CANON_REL}.tar.gz"
+
+LICENSE="Canon-UFR-II GPL-2 MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/libxml2:2
+	gnome-base/libglade:2.0
+	media-libs/jbigkit
+	net-print/cups
+	x11-libs/gtk+:2"
+RDEPEND="${DEPEND}
+	!net-print/cndrvcups-common-lb
+	!net-print/cndrvcups-lb"
+
+HTML_DOCS=(
+	"${WORKDIR}"/linux-UFRII-drv-v${MY_PV}-uken/Documents/README-ufr2-5.2xUK.html
+	"${WORKDIR}"/linux-UFRII-drv-v${MY_PV}-uken/Documents/UsersGuide-ufr2-UK.html
+)
+
+S="${WORKDIR}/linux-UFRII-drv-v${MY_PV}-uken/Sources"
+
+pkg_setup() {
+	QA_PREBUILT="/usr/bin/cnsetuputil2
+		/usr/bin/cnrsdrvufr2
+		/usr/bin/cnpkmoduleufr2r
+		/usr/bin/cnpkbidir
+		/usr/bin/cnpdfdrv
+		/usr/$(get_libdir)/libufr2filterr.so.1.0.0
+		/usr/$(get_libdir)/libColorGearCufr2.so.2.0.0
+		/usr/$(get_libdir)/libcnlbcmr.so.1.0
+		/usr/$(get_libdir)/libcanon_slimufr2.so.1.0.0
+		/usr/$(get_libdir)/libcanonufr2r.so.1.0.0
+		/usr/$(get_libdir)/libcaiowrapufr2.so.1.0.0
+		/usr/$(get_libdir)/libcaiocnpkbidir.so.1.0.0
+		/usr/$(get_libdir)/libcaepcmufr2.so.1.0"
+
+	QA_SONAME="/usr/$(get_libdir)/libcaiocnpkbidir.so.1.0.0"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${WORKDIR}/linux-UFRII-drv-v${MY_PV}-uken/Sources/" || die
+	unpack ./${P}-1.tar.gz
+}
+
+common_op() {
+	local i
+	for i in backend buftool cngplp cnjbig rasterfilter; do
+		cd "${S}/cnrdrvcups-common-${PV}/${i}" ||
+			die "failed to switch dir to ${i}"
+		"${@}"
+		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
+	done
+}
+
+driver_op() {
+	local i
+	for i in cngplp cngplp/files cpca pdftocpca; do
+		cd "${S}/cnrdrvcups-lb-${PV}/${i}" ||
+			die "failed to switch dir to ${i}"
+		"${@}"
+		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
+	done
+}
+
+src_prepare() {
+	default
+
+	common_op mv configure.in configure.ac || die "failed to move configure.in"
+	driver_op mv configure.in configure.ac || die "failed to move configure.in"
+
+	common_op sed -i -e 's/configure.in/configure.ac/' configure.ac || die
+	driver_op sed -i -e 's/configure.in/configure.ac/' configure.ac || die
+
+	# This should work with autoreconf
+	export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"
+
+	# Other components already depend on compiled product
+	append-ldflags -L"${S}/cnrdrvcups-common-${PV}/buftool"
+
+	common_op eautoreconf
+	driver_op eautoreconf
+
+	# Fix a QA issue with .desktop file,
+	sed -i 's/Application;Utility/Utility/g' "${S}"/cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop ||
+		die "Failed to modify cnsetuputil2.desktop file."
+
+	append-cflags -fcommon
+
+	# For some reason, @AR@ is defined everywhere else correctly, but not here.
+	sed -i -e "s/AR = ar/AR = $(tc-getAR)/g" ./cnrdrvcups-common-${PV}/buftool/Makefile.in || die
+}
+
+src_configure() {
+	common_op econf
+	driver_op econf
+}
+
+src_compile() {
+	common_op emake
+	driver_op emake
+}
+
+src_install() {
+	common_op emake DESTDIR="${D}" install COMMON_SUFFIX=2
+	driver_op emake DESTDIR="${D}" install COMMON_SUFFIX=2
+
+	insinto /usr/share/cups
+	doins "${S}"/cnrdrvcups-common-${PV}/Rule/canon-laser-printer_ufr2.usb-quirks
+
+	if use amd64; then
+		cd "${S}"/lib/libs64 || die "failed to switch into libs64"
+	elif use x86; then
+		cd "${S}"/lib/libs32 || die "failed to switch into libs32"
+	else
+		die "I don't know what directory to switch into!"
+	fi
+
+	dolib.so libcaepcmufr2.so.1.0 libcaiocnpkbidir.so.1.0.0 \
+		libcaiowrapufr2.so.1.0.0 libcanonufr2r.so.1.0.0 \
+		libcanon_slimufr2.so.1.0.0 libcnlbcmr.so.1.0 \
+		libColorGearCufr2.so.2.0.0 libufr2filterr.so.1.0.0
+
+	dosym libcaepcmufr2.so.1.0 /usr/$(get_libdir)/libcaepcmufr2.so
+	dosym libcaepcmufr2.so.1.0 /usr/$(get_libdir)/libcaepcmufr2.so.1
+
+	dosym libcaiocnpkbidir.so.1.0.0 /usr/$(get_libdir)/libcaiocnpkbidir.so
+	dosym libcaiocnpkbidir.so.1.0.0 /usr/$(get_libdir)/libcaiocnpkbidir.so.1
+
+	dosym libcaiowrapufr2.so.1.0.0 /usr/$(get_libdir)/libcaiowrapufr2.so
+	dosym libcaiowrapufr2.so.1.0.0 /usr/$(get_libdir)/libcaiowrapufr2.so.1
+
+	dosym libcanonufr2r.so.1.0.0 /usr/$(get_libdir)/libcanonufr2r.so
+	dosym libcanonufr2r.so.1.0.0 /usr/$(get_libdir)/libcanonufr2r.so.1
+
+	dosym libcanon_slimufr2.so.1.0.0 /usr/$(get_libdir)/libcanon_slimufr2.so
+	dosym libcanon_slimufr2.so.1.0.0 /usr/$(get_libdir)/libcanon_slimufr2.so.1
+
+	dosym libcnlbcmr.so.1.0 /usr/$(get_libdir)/libcnlbcmr.so
+	dosym libcnlbcmr.so.1.0 /usr/$(get_libdir)/libcnlbcmr.so.1
+
+	dosym libColorGearCufr2.so.2.0.0 /usr/$(get_libdir)/libColorGearCufr2.so
+	dosym libColorGearCufr2.so.2.0.0 /usr/$(get_libdir)/libColorGearCufr2.so.2
+
+	dosym libufr2filterr.so.1.0.0 /usr/$(get_libdir)/libufr2filterr.so
+	dosym libufr2filterr.so.1.0.0 /usr/$(get_libdir)/libufr2filterr.so.1
+
+	dobin cnpdfdrv cnpkbidir cnpkmoduleufr2r cnrsdrvufr2 cnsetuputil2
+
+	insinto /usr/share/cnpkbidir
+	doins ./cnpkbidir_info*
+
+	insinto /usr/share/ufr2filterr
+	doins ./ThLB*
+
+	cd "${S}" || die "Failed to switch back into ${S} during installation."
+
+	dosym ../../../$(get_libdir)/cups/backend/cnusb /usr/libexec/cups/backend/cnusb
+	dosym ../../../$(get_libdir)/cups/filter/pdftocpca /usr/libexec/cups/filter/pdftocpca
+	dosym ../../../$(get_libdir)/cups/filter/rastertoufr2 /usr/libexec/cups/filter/rastertoufr2
+
+	insinto /usr/share/caepcm/ufr2
+	doins -r "${S}"/lib/data/ufr2/
+
+	insinto /usr/share/cups/model
+	doins ${P}/ppd/*.ppd
+
+	domenu ./cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop
+	doicon ./cnrdrvcups-utility-${PV}/data/cnsetuputil.png
+
+	einstalldocs
+	newdoc "${S}"/cnrdrvcups-common-${PV}/README README.common
+	newdoc "${S}"/cnrdrvcups-common-${PV}/cngplp/README README.cngplp.common
+	newdoc "${S}"/cnrdrvcups-lb-${PV}/README README.lb
+	newdoc "${S}"/cnrdrvcups-lb-${PV}/cngplp/README README.cngplp.driver
+
+	find "${D}" -name '*.la' -type f -delete || die
+}


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

* [gentoo-commits] repo/gentoo:master commit in: net-print/cnrdrvcups-lb/
@ 2020-10-21  5:47 Joonas Niilola
  0 siblings, 0 replies; 29+ messages in thread
From: Joonas Niilola @ 2020-10-21  5:47 UTC (permalink / raw
  To: gentoo-commits

commit:     73e468106173afc1c77283b6ec3dc44c2fa6a24d
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 21 05:45:18 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Oct 21 05:47:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73e46810

net-print/cnrdrvcups-lb: stabilize 5.20 on x86

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.20.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.20.ebuild
index 647cf5ade51..14824926e0a 100644
--- a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.20.ebuild
+++ b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.20.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~juippis/distfiles/linux-UFRII-drv-v${MY_PV}-uke
 
 LICENSE="Canon-UFR-II GPL-2 MIT"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 x86"
 IUSE=""
 
 DEPEND="dev-libs/libxml2:2


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

* [gentoo-commits] repo/gentoo:master commit in: net-print/cnrdrvcups-lb/
@ 2020-10-21  5:47 Joonas Niilola
  0 siblings, 0 replies; 29+ messages in thread
From: Joonas Niilola @ 2020-10-21  5:47 UTC (permalink / raw
  To: gentoo-commits

commit:     2710856a1565cb3a7be028651dd3c9bc9dc1e7ef
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 21 05:45:43 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Oct 21 05:47:29 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2710856a

net-print/cnrdrvcups-lb: stabilize 5.20 on amd64

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.20.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.20.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.20.ebuild
index 14824926e0a..79a8cec887c 100644
--- a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.20.ebuild
+++ b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.20.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~juippis/distfiles/linux-UFRII-drv-v${MY_PV}-uke
 
 LICENSE="Canon-UFR-II GPL-2 MIT"
 SLOT="0"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 DEPEND="dev-libs/libxml2:2


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

* [gentoo-commits] repo/gentoo:master commit in: net-print/cnrdrvcups-lb/
@ 2020-10-21  5:47 Joonas Niilola
  0 siblings, 0 replies; 29+ messages in thread
From: Joonas Niilola @ 2020-10-21  5:47 UTC (permalink / raw
  To: gentoo-commits

commit:     fa0ac691e7f4d2ec2af0d987565e9f9cf71eb582
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 21 05:46:12 2020 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Oct 21 05:47:30 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa0ac691

net-print/cnrdrvcups-lb: remove old 5.10

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-print/cnrdrvcups-lb/Manifest                   |   1 -
 .../cnrdrvcups-lb/cnrdrvcups-lb-5.10-r1.ebuild     | 192 ---------------------
 2 files changed, 193 deletions(-)

diff --git a/net-print/cnrdrvcups-lb/Manifest b/net-print/cnrdrvcups-lb/Manifest
index e1336d9baf9..2f79dffa650 100644
--- a/net-print/cnrdrvcups-lb/Manifest
+++ b/net-print/cnrdrvcups-lb/Manifest
@@ -1,2 +1 @@
-DIST linux-UFRII-drv-v510-uken-19.tar.gz 106848526 BLAKE2B afc6b158db038c4b5bacbd4965e8576a7dc4c6e4dcb8362823b69630372d60f8ecb82e1a7e9123fb251bbf8e459fb5fc314447e46dd1ad95058b912ac610fe56 SHA512 64f6af6fbd437076ca786b5904bf00145f49a19c3eb559fcc85316360e82aa90ab90c5763ff4f4c83d34608c4941a3fae78f93debb01f9c63f93fcc7615ae044
 DIST linux-UFRII-drv-v520-uken-05.tar.gz 107101656 BLAKE2B 4ea92eaaab76babca7fc94771c39b12804b9016ae7baeeaafc18e1979a83ffdcb2090a9cc8a5390314be129ca273c3571f95c83c9e4a29254aca18325687acb2 SHA512 31652894e8ad07e81ae044c5172ced73569a1b78f06f48bcafcd9cabcb19406f0645bfdf741cf3a60746859e671c443d14e5c0c04bffd540ac10406df7266b45

diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10-r1.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10-r1.ebuild
deleted file mode 100644
index 6d4bbe74b3f..00000000000
--- a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10-r1.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop flag-o-matic toolchain-funcs
-
-MY_DOWNLOAD_ID="8/0100007658/14"
-MY_PV="${PV//\./}"
-
-DESCRIPTION="Canon UFR II / LIPSLX Printer Driver for Linux "
-HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/"
-SRC_URI="http://gdlp01.c-wss.com/gds/${MY_DOWNLOAD_ID}/linux-UFRII-drv-v${MY_PV}-uken-19.tar.gz"
-
-LICENSE="Canon-UFR-II GPL-2 MIT"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-DEPEND="dev-libs/libxml2:2
-	gnome-base/libglade:2.0
-	media-libs/jbigkit
-	net-print/cups
-	x11-libs/gtk+:2"
-RDEPEND="${DEPEND}
-	!net-print/cndrvcups-common-lb
-	!net-print/cndrvcups-lb"
-
-HTML_DOCS=(
-	"${WORKDIR}"/linux-UFRII-drv-v${MY_PV}-uken/Documents/README-ufr2-5.1xUK.html
-	"${WORKDIR}"/linux-UFRII-drv-v${MY_PV}-uken/Documents/UsersGuide-ufr2-UK.html
-)
-
-S="${WORKDIR}/linux-UFRII-drv-v${MY_PV}-uken/Sources"
-
-pkg_setup() {
-	QA_PREBUILT="/usr/bin/cnsetuputil2
-		/usr/bin/cnrsdrvufr2
-		/usr/bin/cnpkmoduleufr2r
-		/usr/bin/cnpkbidir
-		/usr/bin/cnpdfdrv
-		/usr/$(get_libdir)/libufr2filterr.so.1.0.0
-		/usr/$(get_libdir)/libColorGearCufr2.so.2.0.0
-		/usr/$(get_libdir)/libcnlbcmr.so.1.0
-		/usr/$(get_libdir)/libcanon_slimufr2.so.1.0.0
-		/usr/$(get_libdir)/libcanonufr2r.so.1.0.0
-		/usr/$(get_libdir)/libcaiowrapufr2.so.1.0.0
-		/usr/$(get_libdir)/libcaiocnpkbidir.so.1.0.0
-		/usr/$(get_libdir)/libcaepcmufr2.so.1.0"
-
-	QA_SONAME="/usr/$(get_libdir)/libcaiocnpkbidir.so.1.0.0"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}/linux-UFRII-drv-v${MY_PV}-uken/Sources/" || die
-	unpack ./${P}-1.tar.gz
-}
-
-common_op() {
-	local i
-	for i in backend buftool cngplp cnjbig rasterfilter; do
-		cd "${S}/cnrdrvcups-common-${PV}/${i}" ||
-			die "failed to switch dir to ${i}"
-		"${@}"
-		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
-	done
-}
-
-driver_op() {
-	local i
-	for i in cngplp cngplp/files cpca pdftocpca; do
-		cd "${S}/cnrdrvcups-lb-${PV}/${i}" ||
-			die "failed to switch dir to ${i}"
-		"${@}"
-		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
-	done
-}
-
-src_prepare() {
-	default
-
-	common_op mv configure.in configure.ac || die "failed to move configure.in"
-	driver_op mv configure.in configure.ac || die "failed to move configure.in"
-
-	common_op sed -i -e 's/configure.in/configure.ac/' configure.ac || die
-	driver_op sed -i -e 's/configure.in/configure.ac/' configure.ac || die
-
-	# This should work with autoreconf
-	export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"
-
-	# Other components already depend on compiled product
-	append-ldflags -L"${S}/cnrdrvcups-common-${PV}/buftool"
-
-	common_op eautoreconf
-	driver_op eautoreconf
-
-	# Fix a QA issue with .desktop file,
-	sed -i 's/Application;Utility/Utility/g' "${S}"/cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop ||
-		die "Failed to modify cnsetuputil2.desktop file."
-
-	append-cflags -fcommon
-
-	# For some reason, @AR@ is defined everywhere else correctly, but not here.
-	sed -i -e "s/AR = ar/AR = $(tc-getAR)/g" ./cnrdrvcups-common-${PV}/buftool/Makefile.in || die
-}
-
-src_configure() {
-	common_op econf
-	driver_op econf
-}
-
-src_compile() {
-	common_op emake
-	driver_op emake
-}
-
-src_install() {
-	common_op emake DESTDIR="${D}" install COMMON_SUFFIX=2
-	driver_op emake DESTDIR="${D}" install COMMON_SUFFIX=2
-
-	insinto /usr/share/cups
-	doins "${S}"/cnrdrvcups-common-${PV}/Rule/canon-laser-printer_ufr2.usb-quirks
-
-	if use amd64; then
-		cd "${S}"/lib/libs64 || die "failed to switch into libs64"
-	elif use x86; then
-		cd "${S}"/lib/libs32 || die "failed to switch into libs32"
-	else
-		die "I don't know what directory to switch into!"
-	fi
-
-	dolib.so libcaepcmufr2.so.1.0 libcaiocnpkbidir.so.1.0.0 \
-		libcaiowrapufr2.so.1.0.0 libcanonufr2r.so.1.0.0 \
-		libcanon_slimufr2.so.1.0.0 libcnlbcmr.so.1.0 \
-		libColorGearCufr2.so.2.0.0 libufr2filterr.so.1.0.0
-
-	dosym libcaepcmufr2.so.1.0 /usr/$(get_libdir)/libcaepcmufr2.so
-	dosym libcaepcmufr2.so.1.0 /usr/$(get_libdir)/libcaepcmufr2.so.1
-
-	dosym libcaiocnpkbidir.so.1.0.0 /usr/$(get_libdir)/libcaiocnpkbidir.so
-	dosym libcaiocnpkbidir.so.1.0.0 /usr/$(get_libdir)/libcaiocnpkbidir.so.1
-
-	dosym libcaiowrapufr2.so.1.0.0 /usr/$(get_libdir)/libcaiowrapufr2.so
-	dosym libcaiowrapufr2.so.1.0.0 /usr/$(get_libdir)/libcaiowrapufr2.so.1
-
-	dosym libcanonufr2r.so.1.0.0 /usr/$(get_libdir)/libcanonufr2r.so
-	dosym libcanonufr2r.so.1.0.0 /usr/$(get_libdir)/libcanonufr2r.so.1
-
-	dosym libcanon_slimufr2.so.1.0.0 /usr/$(get_libdir)/libcanon_slimufr2.so
-	dosym libcanon_slimufr2.so.1.0.0 /usr/$(get_libdir)/libcanon_slimufr2.so.1
-
-	dosym libcnlbcmr.so.1.0 /usr/$(get_libdir)/libcnlbcmr.so
-	dosym libcnlbcmr.so.1.0 /usr/$(get_libdir)/libcnlbcmr.so.1
-
-	dosym libColorGearCufr2.so.2.0.0 /usr/$(get_libdir)/libColorGearCufr2.so
-	dosym libColorGearCufr2.so.2.0.0 /usr/$(get_libdir)/libColorGearCufr2.so.2
-
-	dosym libufr2filterr.so.1.0.0 /usr/$(get_libdir)/libufr2filterr.so
-	dosym libufr2filterr.so.1.0.0 /usr/$(get_libdir)/libufr2filterr.so.1
-
-	dobin cnpdfdrv cnpkbidir cnpkmoduleufr2r cnrsdrvufr2 cnsetuputil2
-
-	insinto /usr/share/cnpkbidir
-	doins ./cnpkbidir_info*
-
-	insinto /usr/share/ufr2filterr
-	doins ./ThLB*
-
-	cd "${S}" || die "Failed to switch back into ${S} during installation."
-
-	dosym ../../../$(get_libdir)/cups/backend/cnusb /usr/libexec/cups/backend/cnusb
-	dosym ../../../$(get_libdir)/cups/filter/pdftocpca /usr/libexec/cups/filter/pdftocpca
-	dosym ../../../$(get_libdir)/cups/filter/rastertoufr2 /usr/libexec/cups/filter/rastertoufr2
-
-	insinto /usr/share/caepcm/ufr2
-	doins -r "${S}"/lib/data/ufr2/
-
-	insinto /usr/share/cups/model
-	doins ${P}/ppd/*.ppd
-
-	domenu ./cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop
-	doicon ./cnrdrvcups-utility-${PV}/data/cnsetuputil.png
-
-	einstalldocs
-	newdoc "${S}"/cnrdrvcups-common-${PV}/README README.common
-	newdoc "${S}"/cnrdrvcups-common-${PV}/cngplp/README README.cngplp.common
-	newdoc "${S}"/cnrdrvcups-lb-${PV}/README README.lb
-	newdoc "${S}"/cnrdrvcups-lb-${PV}/cngplp/README README.cngplp.driver
-
-	find "${D}" -name '*.la' -type f -delete || die
-}


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

* [gentoo-commits] repo/gentoo:master commit in: net-print/cnrdrvcups-lb/
@ 2021-03-05 16:18 Joonas Niilola
  0 siblings, 0 replies; 29+ messages in thread
From: Joonas Niilola @ 2021-03-05 16:18 UTC (permalink / raw
  To: gentoo-commits

commit:     7edf06e0b021703a4d80914b91c122c731224921
Author:     Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at>
AuthorDate: Fri Mar  5 12:49:02 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Mar  5 16:16:47 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7edf06e0

net-print/cnrdrvcups-lb: remove whitespace

Package-Manager: Portage-3.0.15, Repoman-3.0.2
Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at>
Closes: https://github.com/gentoo/gentoo/pull/19779
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.20.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.20.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.20.ebuild
index 79a8cec887c..0e7853a6e6c 100644
--- a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.20.ebuild
+++ b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.20.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -8,7 +8,7 @@ inherit autotools desktop flag-o-matic toolchain-funcs
 CANON_REL="05"
 MY_PV="${PV//\./}"
 
-DESCRIPTION="Canon UFR II / LIPSLX Printer Driver for Linux "
+DESCRIPTION="Canon UFR II / LIPSLX Printer Driver for Linux"
 HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/"
 SRC_URI="https://dev.gentoo.org/~juippis/distfiles/linux-UFRII-drv-v${MY_PV}-uken-${CANON_REL}.tar.gz"
 


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

* [gentoo-commits] repo/gentoo:master commit in: net-print/cnrdrvcups-lb/
@ 2021-03-15  8:51 Joonas Niilola
  0 siblings, 0 replies; 29+ messages in thread
From: Joonas Niilola @ 2021-03-15  8:51 UTC (permalink / raw
  To: gentoo-commits

commit:     f710fa7f79673b2e4d381827ef0ab82dd0274bc8
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 15 08:50:41 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Mon Mar 15 08:51:05 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f710fa7f

net-print/cnrdrvcups-lb: bump to 5.30

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-print/cnrdrvcups-lb/Manifest                  |   1 +
 net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.30.ebuild | 194 ++++++++++++++++++++++
 2 files changed, 195 insertions(+)

diff --git a/net-print/cnrdrvcups-lb/Manifest b/net-print/cnrdrvcups-lb/Manifest
index 2f79dffa650..a9e66408727 100644
--- a/net-print/cnrdrvcups-lb/Manifest
+++ b/net-print/cnrdrvcups-lb/Manifest
@@ -1 +1,2 @@
 DIST linux-UFRII-drv-v520-uken-05.tar.gz 107101656 BLAKE2B 4ea92eaaab76babca7fc94771c39b12804b9016ae7baeeaafc18e1979a83ffdcb2090a9cc8a5390314be129ca273c3571f95c83c9e4a29254aca18325687acb2 SHA512 31652894e8ad07e81ae044c5172ced73569a1b78f06f48bcafcd9cabcb19406f0645bfdf741cf3a60746859e671c443d14e5c0c04bffd540ac10406df7266b45
+DIST linux-UFRII-drv-v530-uken-12.tar.gz 188172378 BLAKE2B 9d069843bbd5fa693d584b1e1f9348ca2076656dff85fc6b34ca941c10221a48fc6119d7f2bf9c9bb8e4f512a0dabbd7d65f7fb86e16394f98ba80afc679998f SHA512 61f060a742c9e6cc7439f26fac63fbac33c96722ec80c604eca40716255920a65eab4cd6f592deee627a8c803776df2c0b8c3dbce9727e53862fa7551a172ebe

diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.30.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.30.ebuild
new file mode 100644
index 00000000000..d0658f1dbba
--- /dev/null
+++ b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.30.ebuild
@@ -0,0 +1,194 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools desktop flag-o-matic toolchain-funcs
+
+CANON_REL="12"
+DL_ID="8/0100007658/20"
+MY_PV="${PV//\./}"
+
+DESCRIPTION="Canon UFR II / LIPSLX Printer Driver for Linux"
+HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/"
+SRC_URI="https://gdlp01.c-wss.com/gds/${DL_ID}/linux-UFRII-drv-v${MY_PV}-uken-${CANON_REL}.tar.gz"
+
+LICENSE="Canon-UFR-II GPL-2 MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/libxml2:2
+	gnome-base/libglade:2.0
+	media-libs/jbigkit
+	media-libs/libjpeg-turbo
+	net-print/cups
+	x11-libs/gtk+:2"
+RDEPEND="${DEPEND}
+	!net-print/cndrvcups-common-lb
+	!net-print/cndrvcups-lb"
+
+HTML_DOCS=(
+	"${WORKDIR}"/linux-UFRII-drv-v${MY_PV}-uken/Documents/README-ufr2-5.3xUK.html
+	"${WORKDIR}"/linux-UFRII-drv-v${MY_PV}-uken/Documents/UsersGuide-ufr2-UK.html
+)
+
+S="${WORKDIR}/linux-UFRII-drv-v${MY_PV}-uken/Sources"
+
+pkg_setup() {
+	QA_PREBUILT="/usr/bin/cnsetuputil2
+		/usr/bin/cnrsdrvufr2
+		/usr/bin/cnpkmoduleufr2r
+		/usr/bin/cnpkbidir
+		/usr/bin/cnpdfdrv
+		/usr/$(get_libdir)/libufr2filterr.so.1.0.0
+		/usr/$(get_libdir)/libColorGearCufr2.so.2.0.0
+		/usr/$(get_libdir)/libcnlbcmr.so.1.0
+		/usr/$(get_libdir)/libcanon_slimufr2.so.1.0.0
+		/usr/$(get_libdir)/libcanonufr2r.so.1.0.0
+		/usr/$(get_libdir)/libcaiowrapufr2.so.1.0.0
+		/usr/$(get_libdir)/libcaiocnpkbidir.so.1.0.0
+		/usr/$(get_libdir)/libcaepcmufr2.so.1.0"
+
+	QA_SONAME="/usr/$(get_libdir)/libcaiocnpkbidir.so.1.0.0"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${WORKDIR}/linux-UFRII-drv-v${MY_PV}-uken/Sources/" || die
+	unpack ./${P}-1.tar.gz
+}
+
+common_op() {
+	local i
+	for i in backend buftool cngplp cnjbig rasterfilter; do
+		cd "${S}/cnrdrvcups-common-${PV}/${i}" ||
+			die "failed to switch dir to ${i}"
+		"${@}"
+		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
+	done
+}
+
+driver_op() {
+	local i
+	for i in cngplp cngplp/files cpca pdftocpca; do
+		cd "${S}/cnrdrvcups-lb-${PV}/${i}" ||
+			die "failed to switch dir to ${i}"
+		"${@}"
+		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
+	done
+}
+
+src_prepare() {
+	default
+
+	common_op mv configure.in configure.ac || die "failed to move configure.in"
+	driver_op mv configure.in configure.ac || die "failed to move configure.in"
+
+	common_op sed -i -e 's/configure.in/configure.ac/' configure.ac || die
+	driver_op sed -i -e 's/configure.in/configure.ac/' configure.ac || die
+
+	# This should work with autoreconf
+	export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"
+
+	# Other components already depend on compiled product
+	append-ldflags -L"${S}/cnrdrvcups-common-${PV}/buftool"
+
+	common_op eautoreconf
+	driver_op eautoreconf
+
+	# Fix a QA issue with .desktop file,
+	sed -i 's/Application;Utility/Utility/g' "${S}"/cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop ||
+		die "Failed to modify cnsetuputil2.desktop file."
+
+	append-cflags -fcommon
+
+	# For some reason, @AR@ is defined everywhere else correctly, but not here.
+	sed -i -e "s/AR = ar/AR = $(tc-getAR)/g" ./cnrdrvcups-common-${PV}/buftool/Makefile.in || die
+}
+
+src_configure() {
+	common_op econf
+	driver_op econf
+}
+
+src_compile() {
+	common_op emake
+	driver_op emake
+}
+
+src_install() {
+	common_op emake DESTDIR="${D}" install COMMON_SUFFIX=2
+	driver_op emake DESTDIR="${D}" install COMMON_SUFFIX=2
+
+	insinto /usr/share/cups
+	doins "${S}"/cnrdrvcups-common-${PV}/Rule/canon-laser-printer_ufr2.usb-quirks
+
+	if use amd64; then
+		cd "${S}"/lib/libs64/intel/ || die "failed to switch into libs64"
+	elif use x86; then
+		cd "${S}"/lib/libs32/intel/ || die "failed to switch into libs32"
+	else
+		die "I don't know what directory to switch into!"
+	fi
+
+	dolib.so libcaepcmufr2.so.1.0 libcaiocnpkbidir.so.1.0.0 \
+		libcaiowrapufr2.so.1.0.0 libcanonufr2r.so.1.0.0 \
+		libcanon_slimufr2.so.1.0.0 libcnlbcmr.so.1.0 \
+		libColorGearCufr2.so.2.0.0 libufr2filterr.so.1.0.0
+
+	dosym libcaepcmufr2.so.1.0 /usr/$(get_libdir)/libcaepcmufr2.so
+	dosym libcaepcmufr2.so.1.0 /usr/$(get_libdir)/libcaepcmufr2.so.1
+
+	dosym libcaiocnpkbidir.so.1.0.0 /usr/$(get_libdir)/libcaiocnpkbidir.so
+	dosym libcaiocnpkbidir.so.1.0.0 /usr/$(get_libdir)/libcaiocnpkbidir.so.1
+
+	dosym libcaiowrapufr2.so.1.0.0 /usr/$(get_libdir)/libcaiowrapufr2.so
+	dosym libcaiowrapufr2.so.1.0.0 /usr/$(get_libdir)/libcaiowrapufr2.so.1
+
+	dosym libcanonufr2r.so.1.0.0 /usr/$(get_libdir)/libcanonufr2r.so
+	dosym libcanonufr2r.so.1.0.0 /usr/$(get_libdir)/libcanonufr2r.so.1
+
+	dosym libcanon_slimufr2.so.1.0.0 /usr/$(get_libdir)/libcanon_slimufr2.so
+	dosym libcanon_slimufr2.so.1.0.0 /usr/$(get_libdir)/libcanon_slimufr2.so.1
+
+	dosym libcnlbcmr.so.1.0 /usr/$(get_libdir)/libcnlbcmr.so
+	dosym libcnlbcmr.so.1.0 /usr/$(get_libdir)/libcnlbcmr.so.1
+
+	dosym libColorGearCufr2.so.2.0.0 /usr/$(get_libdir)/libColorGearCufr2.so
+	dosym libColorGearCufr2.so.2.0.0 /usr/$(get_libdir)/libColorGearCufr2.so.2
+
+	dosym libufr2filterr.so.1.0.0 /usr/$(get_libdir)/libufr2filterr.so
+	dosym libufr2filterr.so.1.0.0 /usr/$(get_libdir)/libufr2filterr.so.1
+
+	dobin cnpdfdrv cnpkbidir cnpkmoduleufr2r cnrsdrvufr2 cnsetuputil2
+
+	insinto /usr/share/cnpkbidir
+	doins ./cnpkbidir_info*
+
+	insinto /usr/share/ufr2filterr
+	doins ./ThLB*
+
+	cd "${S}" || die "Failed to switch back into ${S} during installation."
+
+	dosym ../../../$(get_libdir)/cups/backend/cnusb /usr/libexec/cups/backend/cnusb
+	dosym ../../../$(get_libdir)/cups/filter/pdftocpca /usr/libexec/cups/filter/pdftocpca
+	dosym ../../../$(get_libdir)/cups/filter/rastertoufr2 /usr/libexec/cups/filter/rastertoufr2
+
+	insinto /usr/share/caepcm/ufr2
+	doins -r "${S}"/lib/data/ufr2/
+
+	insinto /usr/share/cups/model
+	doins ${P}/ppd/*.ppd
+
+	domenu ./cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop
+	doicon ./cnrdrvcups-utility-${PV}/data/cnsetuputil.png
+
+	einstalldocs
+	newdoc "${S}"/cnrdrvcups-common-${PV}/README README.common
+	newdoc "${S}"/cnrdrvcups-common-${PV}/cngplp/README README.cngplp.common
+	newdoc "${S}"/cnrdrvcups-lb-${PV}/README README.lb
+	newdoc "${S}"/cnrdrvcups-lb-${PV}/cngplp/README README.cngplp.driver
+
+	find "${D}" -name '*.la' -type f -delete || die
+}


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

* [gentoo-commits] repo/gentoo:master commit in: net-print/cnrdrvcups-lb/
@ 2021-04-16  6:26 Joonas Niilola
  0 siblings, 0 replies; 29+ messages in thread
From: Joonas Niilola @ 2021-04-16  6:26 UTC (permalink / raw
  To: gentoo-commits

commit:     1ddeda11e01b073bcd5e8e17e152c08418ad305a
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 16 06:18:03 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Apr 16 06:26:27 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1ddeda11

net-print/cnrdrvcups-lb: stabilize 5.30 on amd64

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.30.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.30.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.30.ebuild
index d0658f1dbba..1162e1c983a 100644
--- a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.30.ebuild
+++ b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.30.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://gdlp01.c-wss.com/gds/${DL_ID}/linux-UFRII-drv-v${MY_PV}-uken-${
 
 LICENSE="Canon-UFR-II GPL-2 MIT"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 IUSE=""
 
 DEPEND="dev-libs/libxml2:2


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

* [gentoo-commits] repo/gentoo:master commit in: net-print/cnrdrvcups-lb/
@ 2021-04-16  6:26 Joonas Niilola
  0 siblings, 0 replies; 29+ messages in thread
From: Joonas Niilola @ 2021-04-16  6:26 UTC (permalink / raw
  To: gentoo-commits

commit:     31848de186c3742552363b1aa52ecf9cdcdf690a
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Fri Apr 16 06:26:02 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Fri Apr 16 06:26:28 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=31848de1

net-print/cnrdrvcups-lb: stabilize 5.30 on x86

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.30.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.30.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.30.ebuild
index 1162e1c983a..df6c68146fc 100644
--- a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.30.ebuild
+++ b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.30.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://gdlp01.c-wss.com/gds/${DL_ID}/linux-UFRII-drv-v${MY_PV}-uken-${
 
 LICENSE="Canon-UFR-II GPL-2 MIT"
 SLOT="0"
-KEYWORDS="-* amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 DEPEND="dev-libs/libxml2:2


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

* [gentoo-commits] repo/gentoo:master commit in: net-print/cnrdrvcups-lb/
@ 2021-04-28  5:57 Joonas Niilola
  0 siblings, 0 replies; 29+ messages in thread
From: Joonas Niilola @ 2021-04-28  5:57 UTC (permalink / raw
  To: gentoo-commits

commit:     72e8bafec50e519a83f8b55c1b028f2449e37400
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Wed Apr 28 05:56:21 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Wed Apr 28 05:56:21 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=72e8bafe

net-print/cnrdrvcups-lb: drop 5.20

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-print/cnrdrvcups-lb/Manifest                  |   1 -
 net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.20.ebuild | 192 ----------------------
 2 files changed, 193 deletions(-)

diff --git a/net-print/cnrdrvcups-lb/Manifest b/net-print/cnrdrvcups-lb/Manifest
index a9e66408727..5b006fb3594 100644
--- a/net-print/cnrdrvcups-lb/Manifest
+++ b/net-print/cnrdrvcups-lb/Manifest
@@ -1,2 +1 @@
-DIST linux-UFRII-drv-v520-uken-05.tar.gz 107101656 BLAKE2B 4ea92eaaab76babca7fc94771c39b12804b9016ae7baeeaafc18e1979a83ffdcb2090a9cc8a5390314be129ca273c3571f95c83c9e4a29254aca18325687acb2 SHA512 31652894e8ad07e81ae044c5172ced73569a1b78f06f48bcafcd9cabcb19406f0645bfdf741cf3a60746859e671c443d14e5c0c04bffd540ac10406df7266b45
 DIST linux-UFRII-drv-v530-uken-12.tar.gz 188172378 BLAKE2B 9d069843bbd5fa693d584b1e1f9348ca2076656dff85fc6b34ca941c10221a48fc6119d7f2bf9c9bb8e4f512a0dabbd7d65f7fb86e16394f98ba80afc679998f SHA512 61f060a742c9e6cc7439f26fac63fbac33c96722ec80c604eca40716255920a65eab4cd6f592deee627a8c803776df2c0b8c3dbce9727e53862fa7551a172ebe

diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.20.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.20.ebuild
deleted file mode 100644
index 0e7853a6e6c..00000000000
--- a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.20.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop flag-o-matic toolchain-funcs
-
-CANON_REL="05"
-MY_PV="${PV//\./}"
-
-DESCRIPTION="Canon UFR II / LIPSLX Printer Driver for Linux"
-HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/"
-SRC_URI="https://dev.gentoo.org/~juippis/distfiles/linux-UFRII-drv-v${MY_PV}-uken-${CANON_REL}.tar.gz"
-
-LICENSE="Canon-UFR-II GPL-2 MIT"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-DEPEND="dev-libs/libxml2:2
-	gnome-base/libglade:2.0
-	media-libs/jbigkit
-	net-print/cups
-	x11-libs/gtk+:2"
-RDEPEND="${DEPEND}
-	!net-print/cndrvcups-common-lb
-	!net-print/cndrvcups-lb"
-
-HTML_DOCS=(
-	"${WORKDIR}"/linux-UFRII-drv-v${MY_PV}-uken/Documents/README-ufr2-5.2xUK.html
-	"${WORKDIR}"/linux-UFRII-drv-v${MY_PV}-uken/Documents/UsersGuide-ufr2-UK.html
-)
-
-S="${WORKDIR}/linux-UFRII-drv-v${MY_PV}-uken/Sources"
-
-pkg_setup() {
-	QA_PREBUILT="/usr/bin/cnsetuputil2
-		/usr/bin/cnrsdrvufr2
-		/usr/bin/cnpkmoduleufr2r
-		/usr/bin/cnpkbidir
-		/usr/bin/cnpdfdrv
-		/usr/$(get_libdir)/libufr2filterr.so.1.0.0
-		/usr/$(get_libdir)/libColorGearCufr2.so.2.0.0
-		/usr/$(get_libdir)/libcnlbcmr.so.1.0
-		/usr/$(get_libdir)/libcanon_slimufr2.so.1.0.0
-		/usr/$(get_libdir)/libcanonufr2r.so.1.0.0
-		/usr/$(get_libdir)/libcaiowrapufr2.so.1.0.0
-		/usr/$(get_libdir)/libcaiocnpkbidir.so.1.0.0
-		/usr/$(get_libdir)/libcaepcmufr2.so.1.0"
-
-	QA_SONAME="/usr/$(get_libdir)/libcaiocnpkbidir.so.1.0.0"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}/linux-UFRII-drv-v${MY_PV}-uken/Sources/" || die
-	unpack ./${P}-1.tar.gz
-}
-
-common_op() {
-	local i
-	for i in backend buftool cngplp cnjbig rasterfilter; do
-		cd "${S}/cnrdrvcups-common-${PV}/${i}" ||
-			die "failed to switch dir to ${i}"
-		"${@}"
-		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
-	done
-}
-
-driver_op() {
-	local i
-	for i in cngplp cngplp/files cpca pdftocpca; do
-		cd "${S}/cnrdrvcups-lb-${PV}/${i}" ||
-			die "failed to switch dir to ${i}"
-		"${@}"
-		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
-	done
-}
-
-src_prepare() {
-	default
-
-	common_op mv configure.in configure.ac || die "failed to move configure.in"
-	driver_op mv configure.in configure.ac || die "failed to move configure.in"
-
-	common_op sed -i -e 's/configure.in/configure.ac/' configure.ac || die
-	driver_op sed -i -e 's/configure.in/configure.ac/' configure.ac || die
-
-	# This should work with autoreconf
-	export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"
-
-	# Other components already depend on compiled product
-	append-ldflags -L"${S}/cnrdrvcups-common-${PV}/buftool"
-
-	common_op eautoreconf
-	driver_op eautoreconf
-
-	# Fix a QA issue with .desktop file,
-	sed -i 's/Application;Utility/Utility/g' "${S}"/cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop ||
-		die "Failed to modify cnsetuputil2.desktop file."
-
-	append-cflags -fcommon
-
-	# For some reason, @AR@ is defined everywhere else correctly, but not here.
-	sed -i -e "s/AR = ar/AR = $(tc-getAR)/g" ./cnrdrvcups-common-${PV}/buftool/Makefile.in || die
-}
-
-src_configure() {
-	common_op econf
-	driver_op econf
-}
-
-src_compile() {
-	common_op emake
-	driver_op emake
-}
-
-src_install() {
-	common_op emake DESTDIR="${D}" install COMMON_SUFFIX=2
-	driver_op emake DESTDIR="${D}" install COMMON_SUFFIX=2
-
-	insinto /usr/share/cups
-	doins "${S}"/cnrdrvcups-common-${PV}/Rule/canon-laser-printer_ufr2.usb-quirks
-
-	if use amd64; then
-		cd "${S}"/lib/libs64 || die "failed to switch into libs64"
-	elif use x86; then
-		cd "${S}"/lib/libs32 || die "failed to switch into libs32"
-	else
-		die "I don't know what directory to switch into!"
-	fi
-
-	dolib.so libcaepcmufr2.so.1.0 libcaiocnpkbidir.so.1.0.0 \
-		libcaiowrapufr2.so.1.0.0 libcanonufr2r.so.1.0.0 \
-		libcanon_slimufr2.so.1.0.0 libcnlbcmr.so.1.0 \
-		libColorGearCufr2.so.2.0.0 libufr2filterr.so.1.0.0
-
-	dosym libcaepcmufr2.so.1.0 /usr/$(get_libdir)/libcaepcmufr2.so
-	dosym libcaepcmufr2.so.1.0 /usr/$(get_libdir)/libcaepcmufr2.so.1
-
-	dosym libcaiocnpkbidir.so.1.0.0 /usr/$(get_libdir)/libcaiocnpkbidir.so
-	dosym libcaiocnpkbidir.so.1.0.0 /usr/$(get_libdir)/libcaiocnpkbidir.so.1
-
-	dosym libcaiowrapufr2.so.1.0.0 /usr/$(get_libdir)/libcaiowrapufr2.so
-	dosym libcaiowrapufr2.so.1.0.0 /usr/$(get_libdir)/libcaiowrapufr2.so.1
-
-	dosym libcanonufr2r.so.1.0.0 /usr/$(get_libdir)/libcanonufr2r.so
-	dosym libcanonufr2r.so.1.0.0 /usr/$(get_libdir)/libcanonufr2r.so.1
-
-	dosym libcanon_slimufr2.so.1.0.0 /usr/$(get_libdir)/libcanon_slimufr2.so
-	dosym libcanon_slimufr2.so.1.0.0 /usr/$(get_libdir)/libcanon_slimufr2.so.1
-
-	dosym libcnlbcmr.so.1.0 /usr/$(get_libdir)/libcnlbcmr.so
-	dosym libcnlbcmr.so.1.0 /usr/$(get_libdir)/libcnlbcmr.so.1
-
-	dosym libColorGearCufr2.so.2.0.0 /usr/$(get_libdir)/libColorGearCufr2.so
-	dosym libColorGearCufr2.so.2.0.0 /usr/$(get_libdir)/libColorGearCufr2.so.2
-
-	dosym libufr2filterr.so.1.0.0 /usr/$(get_libdir)/libufr2filterr.so
-	dosym libufr2filterr.so.1.0.0 /usr/$(get_libdir)/libufr2filterr.so.1
-
-	dobin cnpdfdrv cnpkbidir cnpkmoduleufr2r cnrsdrvufr2 cnsetuputil2
-
-	insinto /usr/share/cnpkbidir
-	doins ./cnpkbidir_info*
-
-	insinto /usr/share/ufr2filterr
-	doins ./ThLB*
-
-	cd "${S}" || die "Failed to switch back into ${S} during installation."
-
-	dosym ../../../$(get_libdir)/cups/backend/cnusb /usr/libexec/cups/backend/cnusb
-	dosym ../../../$(get_libdir)/cups/filter/pdftocpca /usr/libexec/cups/filter/pdftocpca
-	dosym ../../../$(get_libdir)/cups/filter/rastertoufr2 /usr/libexec/cups/filter/rastertoufr2
-
-	insinto /usr/share/caepcm/ufr2
-	doins -r "${S}"/lib/data/ufr2/
-
-	insinto /usr/share/cups/model
-	doins ${P}/ppd/*.ppd
-
-	domenu ./cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop
-	doicon ./cnrdrvcups-utility-${PV}/data/cnsetuputil.png
-
-	einstalldocs
-	newdoc "${S}"/cnrdrvcups-common-${PV}/README README.common
-	newdoc "${S}"/cnrdrvcups-common-${PV}/cngplp/README README.cngplp.common
-	newdoc "${S}"/cnrdrvcups-lb-${PV}/README README.lb
-	newdoc "${S}"/cnrdrvcups-lb-${PV}/cngplp/README README.cngplp.driver
-
-	find "${D}" -name '*.la' -type f -delete || die
-}


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

* [gentoo-commits] repo/gentoo:master commit in: net-print/cnrdrvcups-lb/
@ 2021-09-26  7:00 Joonas Niilola
  0 siblings, 0 replies; 29+ messages in thread
From: Joonas Niilola @ 2021-09-26  7:00 UTC (permalink / raw
  To: gentoo-commits

commit:     42c557e454bef02f986f5c11905e8582a8bfbf4a
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 26 06:48:43 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Sep 26 07:00:16 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42c557e4

net-print/cnrdrvcups-lb: add 5.40

 - transition to gtk+3 started, but not yet fully finalized it seems.

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-print/cnrdrvcups-lb/Manifest                  |   1 +
 net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.40.ebuild | 197 ++++++++++++++++++++++
 2 files changed, 198 insertions(+)

diff --git a/net-print/cnrdrvcups-lb/Manifest b/net-print/cnrdrvcups-lb/Manifest
index 5b006fb3594..2a0335c7a95 100644
--- a/net-print/cnrdrvcups-lb/Manifest
+++ b/net-print/cnrdrvcups-lb/Manifest
@@ -1 +1,2 @@
 DIST linux-UFRII-drv-v530-uken-12.tar.gz 188172378 BLAKE2B 9d069843bbd5fa693d584b1e1f9348ca2076656dff85fc6b34ca941c10221a48fc6119d7f2bf9c9bb8e4f512a0dabbd7d65f7fb86e16394f98ba80afc679998f SHA512 61f060a742c9e6cc7439f26fac63fbac33c96722ec80c604eca40716255920a65eab4cd6f592deee627a8c803776df2c0b8c3dbce9727e53862fa7551a172ebe
+DIST linux-UFRII-drv-v540-uken-08.tar.gz 188874055 BLAKE2B 150b917d20566de5658bfd46d06e2568924267a046e9083289878e0b51ab05744fefbcebd8e61694d937fd1dde769c0c8f06b6248eacebf3ac8d8706f7baa1f8 SHA512 c488fbaee081b3cd601282e737af0ce1d141a9ae940daa2335ef4da833cdb9fbdda3cc378f4e49b26700b36911dc7b142ef0665e1cacef505f91a666736e62dc

diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.40.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.40.ebuild
new file mode 100644
index 00000000000..8073c912dba
--- /dev/null
+++ b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.40.ebuild
@@ -0,0 +1,197 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop flag-o-matic toolchain-funcs
+
+CANON_REL="08"
+DL_ID="8/0100007658/25"
+MY_PV="${PV//\./}"
+
+DESCRIPTION="Canon UFR II / LIPSLX Printer Driver for Linux"
+HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/"
+SRC_URI="https://gdlp01.c-wss.com/gds/${DL_ID}/linux-UFRII-drv-v${MY_PV}-uken-${CANON_REL}.tar.gz"
+
+LICENSE="Canon-UFR-II GPL-2 MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/libxml2:2
+	net-print/cups
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/gtk+:3
+	x11-libs/pango"
+RDEPEND="${DEPEND}
+	!net-print/cndrvcups-common-lb
+	!net-print/cndrvcups-lb"
+
+HTML_DOCS=(
+	"${WORKDIR}"/linux-UFRII-drv-v${MY_PV}-uken/Documents/README-ufr2-${PV//0}xUK.html
+	"${WORKDIR}"/linux-UFRII-drv-v${MY_PV}-uken/Documents/UsersGuide-ufr2-UK.html
+)
+
+S="${WORKDIR}/linux-UFRII-drv-v${MY_PV}-uken/Sources"
+
+common_op() {
+	local i
+	for i in backend buftool cngplp cnjbig rasterfilter; do
+		cd "${S}/cnrdrvcups-common-${PV}/${i}" ||
+			die "failed to switch dir to ${i}"
+		"${@}"
+		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
+	done
+}
+
+driver_op() {
+	local i
+	for i in cngplp cngplp/files cpca pdftocpca; do
+		cd "${S}/cnrdrvcups-lb-${PV}/${i}" ||
+			die "failed to switch dir to ${i}"
+		"${@}"
+		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
+	done
+}
+
+pkg_setup() {
+	QA_PREBUILT="/usr/bin/cnsetuputil2
+		/usr/bin/cnrsdrvufr2
+		/usr/bin/cnpkmoduleufr2r
+		/usr/bin/cnpkbidir
+		/usr/bin/cnpdfdrv
+		/usr/$(get_libdir)/libufr2filterr.so.1.0.0
+		/usr/$(get_libdir)/libColorGearCufr2.so.2.0.0
+		/usr/$(get_libdir)/libcnlbcmr.so.1.0
+		/usr/$(get_libdir)/libcanon_slimufr2.so.1.0.0
+		/usr/$(get_libdir)/libcanonufr2r.so.1.0.0
+		/usr/$(get_libdir)/libcaiowrapufr2.so.1.0.0
+		/usr/$(get_libdir)/libcaiocnpkbidir.so.1.0.0
+		/usr/$(get_libdir)/libcaepcmufr2.so.1.0"
+
+	QA_SONAME="/usr/$(get_libdir)/libcaiocnpkbidir.so.1.0.0"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${WORKDIR}/linux-UFRII-drv-v${MY_PV}-uken/Sources/" || die
+	unpack ./${P}-1.tar.gz
+}
+
+src_prepare() {
+	default
+
+	common_op mv configure.in configure.ac || die "failed to move configure.in"
+	driver_op mv configure.in configure.ac || die "failed to move configure.in"
+
+	common_op sed -i -e 's/configure.in/configure.ac/' configure.ac || die
+	driver_op sed -i -e 's/configure.in/configure.ac/' configure.ac || die
+
+	# This should work with autoreconf
+	export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"
+
+	# Other components already depend on compiled product
+	append-ldflags -L"${S}/cnrdrvcups-common-${PV}/buftool"
+
+	common_op eautoreconf
+	driver_op eautoreconf
+
+	# Fix a QA issue with .desktop file,
+	sed -i 's/Application;Utility/Utility/g' "${S}"/cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop ||
+		die "Failed to modify cnsetuputil2.desktop file."
+
+	append-cflags -fcommon
+
+	# For some reason, @AR@ is defined everywhere else correctly, but not here.
+	sed -i -e "s/AR = ar/AR = $(tc-getAR)/g" ./cnrdrvcups-common-${PV}/buftool/Makefile.in || die
+}
+
+src_configure() {
+	common_op econf
+	driver_op econf
+}
+
+src_compile() {
+	common_op emake
+	driver_op emake
+}
+
+src_install() {
+	common_op emake DESTDIR="${D}" install COMMON_SUFFIX=2
+	driver_op emake DESTDIR="${D}" install COMMON_SUFFIX=2
+
+	insinto /usr/share/cups
+	doins "${S}"/cnrdrvcups-common-${PV}/Rule/canon-laser-printer_ufr2.usb-quirks
+
+	if use amd64; then
+		cd "${S}"/lib/libs64/intel/ || die "failed to switch into libs64"
+	elif use x86; then
+		cd "${S}"/lib/libs32/intel/ || die "failed to switch into libs32"
+	else
+		die "I don't know what directory to switch into!"
+	fi
+
+	dolib.so libcaepcmufr2.so.1.0 libcaiocnpkbidir.so.1.0.0 \
+		libcaiowrapufr2.so.1.0.0 libcanonufr2r.so.1.0.0 \
+		libcanon_slimufr2.so.1.0.0 libcnlbcmr.so.1.0 \
+		libColorGearCufr2.so.2.0.0 libufr2filterr.so.1.0.0
+
+	dosym libcaepcmufr2.so.1.0 /usr/$(get_libdir)/libcaepcmufr2.so
+	dosym libcaepcmufr2.so.1.0 /usr/$(get_libdir)/libcaepcmufr2.so.1
+
+	dosym libcaiocnpkbidir.so.1.0.0 /usr/$(get_libdir)/libcaiocnpkbidir.so
+	dosym libcaiocnpkbidir.so.1.0.0 /usr/$(get_libdir)/libcaiocnpkbidir.so.1
+
+	dosym libcaiowrapufr2.so.1.0.0 /usr/$(get_libdir)/libcaiowrapufr2.so
+	dosym libcaiowrapufr2.so.1.0.0 /usr/$(get_libdir)/libcaiowrapufr2.so.1
+
+	dosym libcanonufr2r.so.1.0.0 /usr/$(get_libdir)/libcanonufr2r.so
+	dosym libcanonufr2r.so.1.0.0 /usr/$(get_libdir)/libcanonufr2r.so.1
+
+	dosym libcanon_slimufr2.so.1.0.0 /usr/$(get_libdir)/libcanon_slimufr2.so
+	dosym libcanon_slimufr2.so.1.0.0 /usr/$(get_libdir)/libcanon_slimufr2.so.1
+
+	dosym libcnlbcmr.so.1.0 /usr/$(get_libdir)/libcnlbcmr.so
+	dosym libcnlbcmr.so.1.0 /usr/$(get_libdir)/libcnlbcmr.so.1
+
+	dosym libColorGearCufr2.so.2.0.0 /usr/$(get_libdir)/libColorGearCufr2.so
+	dosym libColorGearCufr2.so.2.0.0 /usr/$(get_libdir)/libColorGearCufr2.so.2
+
+	dosym libufr2filterr.so.1.0.0 /usr/$(get_libdir)/libufr2filterr.so
+	dosym libufr2filterr.so.1.0.0 /usr/$(get_libdir)/libufr2filterr.so.1
+
+	dobin cnpdfdrv cnpkbidir cnpkmoduleufr2r cnrsdrvufr2 cnsetuputil2
+
+	insinto /usr/share/cnpkbidir
+	doins ./cnpkbidir_info*
+
+	insinto /usr/share/ufr2filterr
+	doins ./ThLB*
+
+	cd "${S}" || die "Failed to switch back into ${S} during installation."
+
+	dosym ../../../$(get_libdir)/cups/backend/cnusb /usr/libexec/cups/backend/cnusb
+	dosym ../../../$(get_libdir)/cups/filter/pdftocpca /usr/libexec/cups/filter/pdftocpca
+	dosym ../../../$(get_libdir)/cups/filter/rastertoufr2 /usr/libexec/cups/filter/rastertoufr2
+
+	insinto /usr/share/caepcm/ufr2
+	doins -r "${S}"/lib/data/ufr2/
+
+	insinto /usr/share/cups/model
+	doins ${P}/ppd/*.ppd
+
+	domenu ./cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop
+	doicon ./cnrdrvcups-utility-${PV}/data/cnsetuputil.png
+
+	einstalldocs
+	newdoc "${S}"/cnrdrvcups-common-${PV}/README README.common
+	newdoc "${S}"/cnrdrvcups-common-${PV}/cngplp/README README.cngplp.common
+	newdoc "${S}"/cnrdrvcups-lb-${PV}/README README.lb
+	newdoc "${S}"/cnrdrvcups-lb-${PV}/cngplp/README README.cngplp.driver
+
+	find "${D}" -name '*.la' -type f -delete || die
+}


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

* [gentoo-commits] repo/gentoo:master commit in: net-print/cnrdrvcups-lb/
@ 2021-09-26  7:10 Joonas Niilola
  0 siblings, 0 replies; 29+ messages in thread
From: Joonas Niilola @ 2021-09-26  7:10 UTC (permalink / raw
  To: gentoo-commits

commit:     04a8c2facbe6f02169fb8b9df69a489bc2d3b84b
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Sep 26 07:10:00 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Sep 26 07:10:29 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=04a8c2fa

net-print/cnrdrvcups-lb: add missing header deps to 5.40

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.40.ebuild | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.40.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.40.ebuild
index 8073c912dba..b4f74e408ad 100644
--- a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.40.ebuild
+++ b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.40.ebuild
@@ -21,6 +21,9 @@ IUSE=""
 DEPEND="dev-libs/atk
 	dev-libs/glib:2
 	dev-libs/libxml2:2
+	gnome-base/libglade:2.0
+	media-libs/jbigkit
+	media-libs/libjpeg-turbo
 	net-print/cups
 	x11-libs/cairo
 	x11-libs/gdk-pixbuf:2


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

* [gentoo-commits] repo/gentoo:master commit in: net-print/cnrdrvcups-lb/
@ 2021-12-19 11:57 Joonas Niilola
  0 siblings, 0 replies; 29+ messages in thread
From: Joonas Niilola @ 2021-12-19 11:57 UTC (permalink / raw
  To: gentoo-commits

commit:     5b67cb8267e22524bda8b45864996c7dad526fb6
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 19 11:54:48 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Dec 19 11:57:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5b67cb82

net-print/cnrdrvcups-lb: stabilize 5.40 for amd64

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.40.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.40.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.40.ebuild
index 24f87887886b..80efaecd4524 100644
--- a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.40.ebuild
+++ b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.40.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://gdlp01.c-wss.com/gds/${DL_ID}/linux-UFRII-drv-v${MY_PV}-uken-${
 
 LICENSE="Canon-UFR-II GPL-2 MIT"
 SLOT="0"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 DEPEND="dev-libs/atk


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

* [gentoo-commits] repo/gentoo:master commit in: net-print/cnrdrvcups-lb/
@ 2021-12-19 11:57 Joonas Niilola
  0 siblings, 0 replies; 29+ messages in thread
From: Joonas Niilola @ 2021-12-19 11:57 UTC (permalink / raw
  To: gentoo-commits

commit:     ce604b8353df2734ea82bf9ae09c3d5046389fd1
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Sun Dec 19 11:42:27 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Sun Dec 19 11:57:00 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce604b83

net-print/cnrdrvcups-lb: stabilize 5.40 for x86

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.40.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.40.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.40.ebuild
index b4f74e408ad0..24f87887886b 100644
--- a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.40.ebuild
+++ b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.40.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://gdlp01.c-wss.com/gds/${DL_ID}/linux-UFRII-drv-v${MY_PV}-uken-${
 
 LICENSE="Canon-UFR-II GPL-2 MIT"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 x86"
 IUSE=""
 
 DEPEND="dev-libs/atk


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

* [gentoo-commits] repo/gentoo:master commit in: net-print/cnrdrvcups-lb/
@ 2021-12-21  6:24 Joonas Niilola
  0 siblings, 0 replies; 29+ messages in thread
From: Joonas Niilola @ 2021-12-21  6:24 UTC (permalink / raw
  To: gentoo-commits

commit:     cd42dd08409f78aec10e5b73d8eeeb70f3818d86
Author:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 21 06:18:02 2021 +0000
Commit:     Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Tue Dec 21 06:24:22 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cd42dd08

net-print/cnrdrvcups-lb: drop 5.30

Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>

 net-print/cnrdrvcups-lb/Manifest                  |   1 -
 net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.30.ebuild | 194 ----------------------
 2 files changed, 195 deletions(-)

diff --git a/net-print/cnrdrvcups-lb/Manifest b/net-print/cnrdrvcups-lb/Manifest
index 2a0335c7a957..865ff75b2c24 100644
--- a/net-print/cnrdrvcups-lb/Manifest
+++ b/net-print/cnrdrvcups-lb/Manifest
@@ -1,2 +1 @@
-DIST linux-UFRII-drv-v530-uken-12.tar.gz 188172378 BLAKE2B 9d069843bbd5fa693d584b1e1f9348ca2076656dff85fc6b34ca941c10221a48fc6119d7f2bf9c9bb8e4f512a0dabbd7d65f7fb86e16394f98ba80afc679998f SHA512 61f060a742c9e6cc7439f26fac63fbac33c96722ec80c604eca40716255920a65eab4cd6f592deee627a8c803776df2c0b8c3dbce9727e53862fa7551a172ebe
 DIST linux-UFRII-drv-v540-uken-08.tar.gz 188874055 BLAKE2B 150b917d20566de5658bfd46d06e2568924267a046e9083289878e0b51ab05744fefbcebd8e61694d937fd1dde769c0c8f06b6248eacebf3ac8d8706f7baa1f8 SHA512 c488fbaee081b3cd601282e737af0ce1d141a9ae940daa2335ef4da833cdb9fbdda3cc378f4e49b26700b36911dc7b142ef0665e1cacef505f91a666736e62dc

diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.30.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.30.ebuild
deleted file mode 100644
index df6c68146fc5..000000000000
--- a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.30.ebuild
+++ /dev/null
@@ -1,194 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop flag-o-matic toolchain-funcs
-
-CANON_REL="12"
-DL_ID="8/0100007658/20"
-MY_PV="${PV//\./}"
-
-DESCRIPTION="Canon UFR II / LIPSLX Printer Driver for Linux"
-HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/"
-SRC_URI="https://gdlp01.c-wss.com/gds/${DL_ID}/linux-UFRII-drv-v${MY_PV}-uken-${CANON_REL}.tar.gz"
-
-LICENSE="Canon-UFR-II GPL-2 MIT"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-DEPEND="dev-libs/libxml2:2
-	gnome-base/libglade:2.0
-	media-libs/jbigkit
-	media-libs/libjpeg-turbo
-	net-print/cups
-	x11-libs/gtk+:2"
-RDEPEND="${DEPEND}
-	!net-print/cndrvcups-common-lb
-	!net-print/cndrvcups-lb"
-
-HTML_DOCS=(
-	"${WORKDIR}"/linux-UFRII-drv-v${MY_PV}-uken/Documents/README-ufr2-5.3xUK.html
-	"${WORKDIR}"/linux-UFRII-drv-v${MY_PV}-uken/Documents/UsersGuide-ufr2-UK.html
-)
-
-S="${WORKDIR}/linux-UFRII-drv-v${MY_PV}-uken/Sources"
-
-pkg_setup() {
-	QA_PREBUILT="/usr/bin/cnsetuputil2
-		/usr/bin/cnrsdrvufr2
-		/usr/bin/cnpkmoduleufr2r
-		/usr/bin/cnpkbidir
-		/usr/bin/cnpdfdrv
-		/usr/$(get_libdir)/libufr2filterr.so.1.0.0
-		/usr/$(get_libdir)/libColorGearCufr2.so.2.0.0
-		/usr/$(get_libdir)/libcnlbcmr.so.1.0
-		/usr/$(get_libdir)/libcanon_slimufr2.so.1.0.0
-		/usr/$(get_libdir)/libcanonufr2r.so.1.0.0
-		/usr/$(get_libdir)/libcaiowrapufr2.so.1.0.0
-		/usr/$(get_libdir)/libcaiocnpkbidir.so.1.0.0
-		/usr/$(get_libdir)/libcaepcmufr2.so.1.0"
-
-	QA_SONAME="/usr/$(get_libdir)/libcaiocnpkbidir.so.1.0.0"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}/linux-UFRII-drv-v${MY_PV}-uken/Sources/" || die
-	unpack ./${P}-1.tar.gz
-}
-
-common_op() {
-	local i
-	for i in backend buftool cngplp cnjbig rasterfilter; do
-		cd "${S}/cnrdrvcups-common-${PV}/${i}" ||
-			die "failed to switch dir to ${i}"
-		"${@}"
-		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
-	done
-}
-
-driver_op() {
-	local i
-	for i in cngplp cngplp/files cpca pdftocpca; do
-		cd "${S}/cnrdrvcups-lb-${PV}/${i}" ||
-			die "failed to switch dir to ${i}"
-		"${@}"
-		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
-	done
-}
-
-src_prepare() {
-	default
-
-	common_op mv configure.in configure.ac || die "failed to move configure.in"
-	driver_op mv configure.in configure.ac || die "failed to move configure.in"
-
-	common_op sed -i -e 's/configure.in/configure.ac/' configure.ac || die
-	driver_op sed -i -e 's/configure.in/configure.ac/' configure.ac || die
-
-	# This should work with autoreconf
-	export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"
-
-	# Other components already depend on compiled product
-	append-ldflags -L"${S}/cnrdrvcups-common-${PV}/buftool"
-
-	common_op eautoreconf
-	driver_op eautoreconf
-
-	# Fix a QA issue with .desktop file,
-	sed -i 's/Application;Utility/Utility/g' "${S}"/cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop ||
-		die "Failed to modify cnsetuputil2.desktop file."
-
-	append-cflags -fcommon
-
-	# For some reason, @AR@ is defined everywhere else correctly, but not here.
-	sed -i -e "s/AR = ar/AR = $(tc-getAR)/g" ./cnrdrvcups-common-${PV}/buftool/Makefile.in || die
-}
-
-src_configure() {
-	common_op econf
-	driver_op econf
-}
-
-src_compile() {
-	common_op emake
-	driver_op emake
-}
-
-src_install() {
-	common_op emake DESTDIR="${D}" install COMMON_SUFFIX=2
-	driver_op emake DESTDIR="${D}" install COMMON_SUFFIX=2
-
-	insinto /usr/share/cups
-	doins "${S}"/cnrdrvcups-common-${PV}/Rule/canon-laser-printer_ufr2.usb-quirks
-
-	if use amd64; then
-		cd "${S}"/lib/libs64/intel/ || die "failed to switch into libs64"
-	elif use x86; then
-		cd "${S}"/lib/libs32/intel/ || die "failed to switch into libs32"
-	else
-		die "I don't know what directory to switch into!"
-	fi
-
-	dolib.so libcaepcmufr2.so.1.0 libcaiocnpkbidir.so.1.0.0 \
-		libcaiowrapufr2.so.1.0.0 libcanonufr2r.so.1.0.0 \
-		libcanon_slimufr2.so.1.0.0 libcnlbcmr.so.1.0 \
-		libColorGearCufr2.so.2.0.0 libufr2filterr.so.1.0.0
-
-	dosym libcaepcmufr2.so.1.0 /usr/$(get_libdir)/libcaepcmufr2.so
-	dosym libcaepcmufr2.so.1.0 /usr/$(get_libdir)/libcaepcmufr2.so.1
-
-	dosym libcaiocnpkbidir.so.1.0.0 /usr/$(get_libdir)/libcaiocnpkbidir.so
-	dosym libcaiocnpkbidir.so.1.0.0 /usr/$(get_libdir)/libcaiocnpkbidir.so.1
-
-	dosym libcaiowrapufr2.so.1.0.0 /usr/$(get_libdir)/libcaiowrapufr2.so
-	dosym libcaiowrapufr2.so.1.0.0 /usr/$(get_libdir)/libcaiowrapufr2.so.1
-
-	dosym libcanonufr2r.so.1.0.0 /usr/$(get_libdir)/libcanonufr2r.so
-	dosym libcanonufr2r.so.1.0.0 /usr/$(get_libdir)/libcanonufr2r.so.1
-
-	dosym libcanon_slimufr2.so.1.0.0 /usr/$(get_libdir)/libcanon_slimufr2.so
-	dosym libcanon_slimufr2.so.1.0.0 /usr/$(get_libdir)/libcanon_slimufr2.so.1
-
-	dosym libcnlbcmr.so.1.0 /usr/$(get_libdir)/libcnlbcmr.so
-	dosym libcnlbcmr.so.1.0 /usr/$(get_libdir)/libcnlbcmr.so.1
-
-	dosym libColorGearCufr2.so.2.0.0 /usr/$(get_libdir)/libColorGearCufr2.so
-	dosym libColorGearCufr2.so.2.0.0 /usr/$(get_libdir)/libColorGearCufr2.so.2
-
-	dosym libufr2filterr.so.1.0.0 /usr/$(get_libdir)/libufr2filterr.so
-	dosym libufr2filterr.so.1.0.0 /usr/$(get_libdir)/libufr2filterr.so.1
-
-	dobin cnpdfdrv cnpkbidir cnpkmoduleufr2r cnrsdrvufr2 cnsetuputil2
-
-	insinto /usr/share/cnpkbidir
-	doins ./cnpkbidir_info*
-
-	insinto /usr/share/ufr2filterr
-	doins ./ThLB*
-
-	cd "${S}" || die "Failed to switch back into ${S} during installation."
-
-	dosym ../../../$(get_libdir)/cups/backend/cnusb /usr/libexec/cups/backend/cnusb
-	dosym ../../../$(get_libdir)/cups/filter/pdftocpca /usr/libexec/cups/filter/pdftocpca
-	dosym ../../../$(get_libdir)/cups/filter/rastertoufr2 /usr/libexec/cups/filter/rastertoufr2
-
-	insinto /usr/share/caepcm/ufr2
-	doins -r "${S}"/lib/data/ufr2/
-
-	insinto /usr/share/cups/model
-	doins ${P}/ppd/*.ppd
-
-	domenu ./cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop
-	doicon ./cnrdrvcups-utility-${PV}/data/cnsetuputil.png
-
-	einstalldocs
-	newdoc "${S}"/cnrdrvcups-common-${PV}/README README.common
-	newdoc "${S}"/cnrdrvcups-common-${PV}/cngplp/README README.cngplp.common
-	newdoc "${S}"/cnrdrvcups-lb-${PV}/README README.lb
-	newdoc "${S}"/cnrdrvcups-lb-${PV}/cngplp/README README.cngplp.driver
-
-	find "${D}" -name '*.la' -type f -delete || die
-}


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

* [gentoo-commits] repo/gentoo:master commit in: net-print/cnrdrvcups-lb/
@ 2024-05-11 19:50 Stefan Strogin
  0 siblings, 0 replies; 29+ messages in thread
From: Stefan Strogin @ 2024-05-11 19:50 UTC (permalink / raw
  To: gentoo-commits

commit:     1a7377d349ea21f8ef3d137ee07fb52ae397aebd
Author:     Stefan Strogin <steils <AT> gentoo <DOT> org>
AuthorDate: Tue Mar 19 09:00:03 2024 +0000
Commit:     Stefan Strogin <steils <AT> gentoo <DOT> org>
CommitDate: Sat May 11 19:49:54 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a7377d3

net-print/cnrdrvcups-lb: add 5.80

Signed-off-by: Stefan Strogin <steils <AT> gentoo.org>

 net-print/cnrdrvcups-lb/Manifest                  |   1 +
 net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.80.ebuild | 200 ++++++++++++++++++++++
 2 files changed, 201 insertions(+)

diff --git a/net-print/cnrdrvcups-lb/Manifest b/net-print/cnrdrvcups-lb/Manifest
index 865ff75b2c24..38b30046937b 100644
--- a/net-print/cnrdrvcups-lb/Manifest
+++ b/net-print/cnrdrvcups-lb/Manifest
@@ -1 +1,2 @@
 DIST linux-UFRII-drv-v540-uken-08.tar.gz 188874055 BLAKE2B 150b917d20566de5658bfd46d06e2568924267a046e9083289878e0b51ab05744fefbcebd8e61694d937fd1dde769c0c8f06b6248eacebf3ac8d8706f7baa1f8 SHA512 c488fbaee081b3cd601282e737af0ce1d141a9ae940daa2335ef4da833cdb9fbdda3cc378f4e49b26700b36911dc7b142ef0665e1cacef505f91a666736e62dc
+DIST linux-UFRII-drv-v580-m17n-08.tar.gz 66915545 BLAKE2B 5b07c74079c2c5b4a8b360389d426d61026198b9f3c148098b7d32a900912a6d72951f5550896ae7b89418147637dc47fc4351bdc11775958d877c33359a9251 SHA512 650b5fce570dc464d2bd269f6671c276c064f0696170aabbace9811f28da86aeb8fe21badc0ec3d2814943911f35897aa59da26f44797943e97da36e5838409c

diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.80.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.80.ebuild
new file mode 100644
index 000000000000..8407facad5fc
--- /dev/null
+++ b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.80.ebuild
@@ -0,0 +1,200 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop flag-o-matic toolchain-funcs
+
+CANON_REL="08"
+DL_ID="8/0100007658/25"
+MY_PV="${PV//\./}"
+
+DESCRIPTION="Canon UFR II / LIPSLX Printer Driver for Linux"
+HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/"
+SRC_URI="https://pdisp01.c-wss.com/gdl/WWUFORedirectTarget.do?id=MDEwMDAwNzY1ODM5&cmp=ABX&lang=EN -> linux-UFRII-drv-v${MY_PV}-m17n-${CANON_REL}.tar.gz"
+
+LICENSE="Canon-UFR-II GPL-2 MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-libs/atk
+	dev-libs/glib:2
+	dev-libs/libxml2:2
+	gnome-base/libglade:2.0
+	media-libs/jbigkit
+	media-libs/libjpeg-turbo
+	net-print/cups
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/gtk+:2
+	x11-libs/gtk+:3
+	x11-libs/pango"
+RDEPEND="${DEPEND}
+	!net-print/cndrvcups-common-lb
+	!net-print/cndrvcups-lb"
+
+HTML_DOCS=(
+	"${WORKDIR}"/linux-UFRII-drv-v${MY_PV}-m17n/Documents/uk_eng/README-ufr2-${PV//0}xUK.html
+	"${WORKDIR}"/linux-UFRII-drv-v${MY_PV}-m17n/Documents/uk_eng/UsersGuide-ufr2-UK.html
+)
+
+S="${WORKDIR}/linux-UFRII-drv-v${MY_PV}-m17n/Sources"
+
+common_op() {
+	local i
+	for i in backend buftool cngplp cnjbig rasterfilter; do
+		cd "${S}/cnrdrvcups-common-${PV}/${i}" ||
+			die "failed to switch dir to ${i}"
+		"${@}"
+		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
+	done
+}
+
+driver_op() {
+	local i
+	for i in cngplp cngplp/files cpca pdftocpca; do
+		cd "${S}/cnrdrvcups-lb-${PV}/${i}" ||
+			die "failed to switch dir to ${i}"
+		"${@}"
+		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
+	done
+}
+
+pkg_setup() {
+	QA_PREBUILT="/usr/bin/cnsetuputil2
+		/usr/bin/cnrsdrvufr2
+		/usr/bin/cnpkmoduleufr2r
+		/usr/bin/cnpkbidir
+		/usr/bin/cnpdfdrv
+		/usr/$(get_libdir)/libufr2filterr.so.1.0.0
+		/usr/$(get_libdir)/libColorGearCufr2.so.2.0.0
+		/usr/$(get_libdir)/libcnlbcmr.so.1.0
+		/usr/$(get_libdir)/libcanon_slimufr2.so.1.0.0
+		/usr/$(get_libdir)/libcanonufr2r.so.1.0.0
+		/usr/$(get_libdir)/libcaiowrapufr2.so.1.0.0
+		/usr/$(get_libdir)/libcaiocnpkbidir.so.1.0.0
+		/usr/$(get_libdir)/libcaepcmufr2.so.1.0"
+
+	QA_SONAME="/usr/$(get_libdir)/libcaiocnpkbidir.so.1.0.0"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${WORKDIR}/linux-UFRII-drv-v${MY_PV}-m17n/Sources/" || die
+	unpack ./${P}-1.05.tar.xz
+}
+
+src_prepare() {
+	default
+
+	common_op mv configure.in configure.ac || die "failed to move configure.in"
+	driver_op mv configure.in configure.ac || die "failed to move configure.in"
+
+	common_op sed -i -e 's/configure.in/configure.ac/' configure.ac || die
+	driver_op sed -i -e 's/configure.in/configure.ac/' configure.ac || die
+
+	# This should work with autoreconf
+	export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"
+
+	# Other components already depend on compiled product
+	append-ldflags -L"${S}/cnrdrvcups-common-${PV}/buftool"
+
+	common_op eautoreconf
+	driver_op eautoreconf
+
+	# Fix a QA issue with .desktop file,
+	sed -i 's/Application;Utility/Utility/g' "${S}"/cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop ||
+		die "Failed to modify cnsetuputil2.desktop file."
+
+	append-cflags -fcommon
+
+	# For some reason, @AR@ is defined everywhere else correctly, but not here.
+	sed -i -e "s/AR = ar/AR = $(tc-getAR)/g" ./cnrdrvcups-common-${PV}/buftool/Makefile.in || die
+}
+
+src_configure() {
+	common_op econf
+	driver_op econf
+}
+
+src_compile() {
+	common_op emake
+	driver_op emake
+}
+
+src_install() {
+	common_op emake DESTDIR="${D}" install COMMON_SUFFIX=2
+	driver_op emake DESTDIR="${D}" install COMMON_SUFFIX=2
+
+	insinto /usr/share/cups
+	doins "${S}"/cnrdrvcups-common-${PV}/Rule/canon-laser-printer.usb-quirks
+
+	if use amd64; then
+		cd "${S}"/lib/libs64/intel/ || die "failed to switch into libs64"
+	elif use x86; then
+		cd "${S}"/lib/libs32/intel/ || die "failed to switch into libs32"
+	else
+		die "I don't know what directory to switch into!"
+	fi
+
+	dolib.so libcaepcmufr2.so.1.0 libcaiocnpkbidir.so.1.0.0 \
+		libcaiowrapufr2.so.1.0.0 libcanonufr2r.so.1.0.0 \
+		libcanon_slimufr2.so.1.0.0 libcnlbcmr.so.1.0 \
+		libColorGearCufr2.so.2.0.0 libufr2filterr.so.1.0.0
+
+	dosym libcaepcmufr2.so.1.0 /usr/$(get_libdir)/libcaepcmufr2.so
+	dosym libcaepcmufr2.so.1.0 /usr/$(get_libdir)/libcaepcmufr2.so.1
+
+	dosym libcaiocnpkbidir.so.1.0.0 /usr/$(get_libdir)/libcaiocnpkbidir.so
+	dosym libcaiocnpkbidir.so.1.0.0 /usr/$(get_libdir)/libcaiocnpkbidir.so.1
+
+	dosym libcaiowrapufr2.so.1.0.0 /usr/$(get_libdir)/libcaiowrapufr2.so
+	dosym libcaiowrapufr2.so.1.0.0 /usr/$(get_libdir)/libcaiowrapufr2.so.1
+
+	dosym libcanonufr2r.so.1.0.0 /usr/$(get_libdir)/libcanonufr2r.so
+	dosym libcanonufr2r.so.1.0.0 /usr/$(get_libdir)/libcanonufr2r.so.1
+
+	dosym libcanon_slimufr2.so.1.0.0 /usr/$(get_libdir)/libcanon_slimufr2.so
+	dosym libcanon_slimufr2.so.1.0.0 /usr/$(get_libdir)/libcanon_slimufr2.so.1
+
+	dosym libcnlbcmr.so.1.0 /usr/$(get_libdir)/libcnlbcmr.so
+	dosym libcnlbcmr.so.1.0 /usr/$(get_libdir)/libcnlbcmr.so.1
+
+	dosym libColorGearCufr2.so.2.0.0 /usr/$(get_libdir)/libColorGearCufr2.so
+	dosym libColorGearCufr2.so.2.0.0 /usr/$(get_libdir)/libColorGearCufr2.so.2
+
+	dosym libufr2filterr.so.1.0.0 /usr/$(get_libdir)/libufr2filterr.so
+	dosym libufr2filterr.so.1.0.0 /usr/$(get_libdir)/libufr2filterr.so.1
+
+	dobin cnpdfdrv cnpkbidir cnpkmoduleufr2r cnrsdrvufr2 cnsetuputil2
+
+	insinto /usr/share/cnpkbidir
+	doins ./cnpkbidir_info*
+
+	insinto /usr/share/ufr2filterr
+	doins ./ThLB*
+
+	cd "${S}" || die "Failed to switch back into ${S} during installation."
+
+	dosym ../../../$(get_libdir)/cups/backend/cnusb /usr/libexec/cups/backend/cnusb
+	dosym ../../../$(get_libdir)/cups/filter/pdftocpca /usr/libexec/cups/filter/pdftocpca
+	dosym ../../../$(get_libdir)/cups/filter/rastertoufr2 /usr/libexec/cups/filter/rastertoufr2
+
+	insinto /usr/share/caepcm/ufr2
+	doins -r "${S}"/lib/data/ufr2/
+
+	insinto /usr/share/cups/model
+	doins ${P}/ppd/*.ppd
+
+	domenu ./cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop
+	doicon ./cnrdrvcups-utility-${PV}/data/cnsetuputil.png
+
+	einstalldocs
+	newdoc "${S}"/cnrdrvcups-common-${PV}/README README.common
+	newdoc "${S}"/cnrdrvcups-common-${PV}/cngplp/README README.cngplp.common
+	newdoc "${S}"/cnrdrvcups-lb-${PV}/README README.lb
+	newdoc "${S}"/cnrdrvcups-lb-${PV}/cngplp/README README.cngplp.driver
+
+	find "${D}" -name '*.la' -type f -delete || die
+}


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

end of thread, other threads:[~2024-05-11 19:50 UTC | newest]

Thread overview: 29+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2020-08-04 16:50 [gentoo-commits] repo/gentoo:master commit in: net-print/cnrdrvcups-lb/ Joonas Niilola
  -- strict thread matches above, loose matches on Subject: below --
2024-05-11 19:50 Stefan Strogin
2021-12-21  6:24 Joonas Niilola
2021-12-19 11:57 Joonas Niilola
2021-12-19 11:57 Joonas Niilola
2021-09-26  7:10 Joonas Niilola
2021-09-26  7:00 Joonas Niilola
2021-04-28  5:57 Joonas Niilola
2021-04-16  6:26 Joonas Niilola
2021-04-16  6:26 Joonas Niilola
2021-03-15  8:51 Joonas Niilola
2021-03-05 16:18 Joonas Niilola
2020-10-21  5:47 Joonas Niilola
2020-10-21  5:47 Joonas Niilola
2020-10-21  5:47 Joonas Niilola
2020-09-21 13:59 Joonas Niilola
2020-09-21 13:59 Joonas Niilola
2020-08-04 16:50 Joonas Niilola
2020-08-04 16:50 Joonas Niilola
2020-07-04  7:36 Joonas Niilola
2020-05-04 16:25 Joonas Niilola
2020-03-28 15:28 Joonas Niilola
2020-03-28 15:28 Joonas Niilola
2020-03-28 15:28 Joonas Niilola
2020-03-06  8:51 Joonas Niilola
2020-03-06  8:51 Joonas Niilola
2020-02-23  7:41 Joonas Niilola
2020-01-06  9:36 Joonas Niilola
2020-01-05 10:10 Joonas Niilola

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