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

2022-07-30 Thread David Seifert
commit: 396199690e681a0d439061d29ef06506400a4138
Author: Michael Mair-Keimberger  levelnine  at>
AuthorDate: Sat Jul 30 13:02:45 2022 +
Commit: David Seifert  gentoo  org>
CommitDate: Sat Jul 30 13:02:45 2022 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39619969

net-print/cndrvcups-common-lb: update HOMEPAGE

Portage 3.0.34 / pkgdev 0.2.1 / pkgcheck 0.10.11
Signed-off-by: Michael Mair-Keimberger  levelnine.at>
Signed-off-by: David Seifert  gentoo.org>

 net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild 
b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
index ed940b40c224..bfcbeceba005 100644
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ MY_PV="$(ver_rs 1- '')"
 SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken"
 
 DESCRIPTION="Common files for Canon drivers"
-HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/imagerunner-1730i.aspx;
+HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/imagerunner-1730i.html;
 SRC_URI="http://gdlp01.c-wss.com/gds/8/017658/08/${SOURCES_NAME}-05.tar.gz;
 S="${WORKDIR}/${SOURCES_NAME}/Sources/${P/-lb-${PV}/-4.10}"
 



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

2021-04-11 Thread Sam James
commit: 693d313cd4d48989e681f7ffc66100f728e4cb17
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 12 01:01:12 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 12 01:07:39 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=693d313c

net-print/cndrvcups-common-lb: inherit multilib for get_abi_LIBDIR

Signed-off-by: Sam James  gentoo.org>

 net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild 
b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
index 1f67e6eb580..ed940b40c22 100644
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools toolchain-funcs
+inherit autotools multilib toolchain-funcs
 
 MY_PV="$(ver_rs 1- '')"
 SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken"



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

2021-04-02 Thread Sam James
commit: 73b4cee2d6fa7541fe73ce79ae27eb53767e3500
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr  2 11:18:24 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr  2 14:00:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73b4cee2

net-print/cndrvcups-common-lb: fix DEPEND typo

Signed-off-by: Sam James  gentoo.org>

 net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild 
b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
index a838dd0d767..1f67e6eb580 100644
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
@@ -11,6 +11,7 @@ SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken"
 DESCRIPTION="Common files for Canon drivers"
 
HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/imagerunner-1730i.aspx;
 SRC_URI="http://gdlp01.c-wss.com/gds/8/017658/08/${SOURCES_NAME}-05.tar.gz;
+S="${WORKDIR}/${SOURCES_NAME}/Sources/${P/-lb-${PV}/-4.10}"
 
 # GPL-2 License inside LICENSE-EN.txt files
 LICENSE="Canon-UFR-II GPL-2 MIT"
@@ -22,9 +23,7 @@ RDEPEND="
>=gnome-base/libglade-2.4:2.0
>=net-print/cups-1.1.17
>=x11-libs/gtk+-2.4:2"
-DEPEND="${DEPEND}"
-
-S="${WORKDIR}/${SOURCES_NAME}/Sources/${P/-lb-${PV}/-4.10}"
+DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 



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

2021-03-16 Thread Sam James
commit: 3263b1b8970faeb4f5a0f8e11d14a6169a288300
Author: Sam James  gentoo  org>
AuthorDate: Tue Mar 16 19:36:58 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Tue Mar 16 19:56:04 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3263b1b8

net-print/cndrvcups-common-lb: drop 3.60-r1

Signed-off-by: Sam James  gentoo.org>

 net-print/cndrvcups-common-lb/Manifest |   1 -
 .../cndrvcups-common-lb-3.60-r1.ebuild | 116 -
 2 files changed, 117 deletions(-)

diff --git a/net-print/cndrvcups-common-lb/Manifest 
b/net-print/cndrvcups-common-lb/Manifest
index 225fe9561f2..b8b441732ad 100644
--- a/net-print/cndrvcups-common-lb/Manifest
+++ b/net-print/cndrvcups-common-lb/Manifest
@@ -1,2 +1 @@
-DIST linux-UFRII-drv-v360-uken.tar.gz 116695930 BLAKE2B 
75b0ed7a957fbc1677a834e67b92b7752cfa74536cb238b553f1c2c98b86399c29209240d093492ea212618c0092ad59a22f03f992462b8ef488f8ed58b51d21
 SHA512 
c8b2abb2d0e9ccf972241dda5154c0ddd1ba9cfe6c721c242c40c90cf29e8d0b2c6a559907318cd191232f699a42425cc4148aebcaab6aa111f1cb5439777ce7
 DIST linux-UFRII-drv-v370-uken-05.tar.gz 117334511 BLAKE2B 
295c7a710b0f1ee29e642b29c7b0576f68317dba93758825aa85d431129cebea174d5c2dfa67f7506fa3b18fe48d373f0dc9331ed9caabc2e3bc733946aefd97
 SHA512 
d83254b7f7f87c56caeaaf151d898de36f746c03ad88d427959bdeec905b9cd92a14a8ac534073473a6cefbb5e2b0be9e9faa79b500e252ecd0a0564d2312bbc

diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild 
b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild
deleted file mode 100644
index cbdab7f9b8c..000
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-MY_PV="$(ver_rs 1- '')"
-SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken"
-
-DESCRIPTION="Common files for Canon drivers"
-HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/imagerunner-1730i.aspx;
-SRC_URI="http://gdlp01.c-wss.com/gds/0/019240/02/${SOURCES_NAME}.tar.gz;
-
-# GPL-2 License inside LICENSE-EN.txt files
-LICENSE="Canon-UFR-II GPL-2 MIT"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-RDEPEND="
-   >=dev-libs/libxml2-2.6:2
-   >=gnome-base/libglade-2.4:2.0
-   >=net-print/cups-1.1.17
-   >=x11-libs/gtk+-2.4:2
-"
-DEPEND="${DEPEND}"
-
-S="${WORKDIR}/${SOURCES_NAME}/Sources/${P/-lb-${PV}/-4.00}"
-
-pkg_setup() {
-   # Don't raise a fuss over pre-built binaries
-   QA_PREBUILT="
-   /usr/libexec/cups/filter/c3pldrv
-   /usr/$(get_abi_LIBDIR x86)/libColorGear.so.0.0.0
-   /usr/$(get_abi_LIBDIR x86)/libColorGearC.so.1.0.0
-   /usr/$(get_abi_LIBDIR x86)/libc3pl.so.0.0.1
-   /usr/$(get_abi_LIBDIR x86)/libcaepcm.so.1.0
-   /usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
-   /usr/$(get_abi_LIBDIR x86)/libcaiowrap.so.1.0.0
-   /usr/$(get_abi_LIBDIR x86)/libcanon_slim.so.1.0.0
-   /usr/$(get_libdir)/libcanonc3pl.so.1.0.0
-   "
-   QA_SONAME="
-   /usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
-   "
-}
-
-src_unpack() {
-   unpack ${A}
-   cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die
-   unpack ./${P/-lb-${PV}/-4.00}-1.tar.gz
-}
-
-change_dir() {
-   for i in cngplp buftool backend; do
-   cd "${i}" || die
-   "${@}"
-   cd "${S}" || die
-   done
-}
-
-src_prepare() {
-   default
-   sed -i -e \
-   "s:backenddir = \$(libdir)/cups/backend:backenddir = 
`cups-config --serverbin`/backend:" \
-   backend/Makefile.am || die
-
-   export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"
-   change_dir eautoreconf
-}
-
-src_configure() {
-   change_dir econf
-}
-
-src_compile() {
-   change_dir emake
-
-   # Cannot be moved to 'change_dir' as it doesn't need eautoreconf
-   cd "${S}/c3plmod_ipc" || die
-   emake
-}
-
-src_install() {
-   MAKEOPTS+=" -j1" default
-
-   einstalldocs
-
-   cd "${S}/c3plmod_ipc" || die
-   dolib.so libcanonc3pl.so.1.0.0
-   dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so.1"
-   dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so"
-
-   cd "${S}/data" || die
-   insinto /usr/share/caepcm
-   doins *
-
-   ABI=x86
-   cd "${S}/libs" || die
-   exeinto $(cups-config --serverbin)/filter
-   doexe c3pldrv
-   dolib.so libcaepcm.so.1.0
-   dosym libcaepcm.so.1.0 "/usr/$(get_libdir)/libcaepcm.so.1"
-   dosym libcaepcm.so.1.0 "/usr/$(get_libdir)/libcaepcm.so"
-   for lib in *.so.?.?.?; do
-   dolib.so "${lib}"
-   dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?}"
-   dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?.?}"
-   

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

2021-01-07 Thread Sam James
commit: 96f07e63541e9d2e4fcb48fc055a1501f3b0a11f
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan  7 12:23:56 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan  7 12:24:28 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=96f07e63

net-print/cndrvcups-common-lb: Revert "cleanup old"

This reverts commit eb47eaebf7b3e9e51540f204839d6ad231c24ae6.
Need net-print/cndrvcups-lb in sync.

Signed-off-by: Sam James  gentoo.org>

 net-print/cndrvcups-common-lb/Manifest |   1 +
 .../cndrvcups-common-lb-3.60-r1.ebuild | 116 +
 2 files changed, 117 insertions(+)

diff --git a/net-print/cndrvcups-common-lb/Manifest 
b/net-print/cndrvcups-common-lb/Manifest
index b8b441732ad..225fe9561f2 100644
--- a/net-print/cndrvcups-common-lb/Manifest
+++ b/net-print/cndrvcups-common-lb/Manifest
@@ -1 +1,2 @@
+DIST linux-UFRII-drv-v360-uken.tar.gz 116695930 BLAKE2B 
75b0ed7a957fbc1677a834e67b92b7752cfa74536cb238b553f1c2c98b86399c29209240d093492ea212618c0092ad59a22f03f992462b8ef488f8ed58b51d21
 SHA512 
c8b2abb2d0e9ccf972241dda5154c0ddd1ba9cfe6c721c242c40c90cf29e8d0b2c6a559907318cd191232f699a42425cc4148aebcaab6aa111f1cb5439777ce7
 DIST linux-UFRII-drv-v370-uken-05.tar.gz 117334511 BLAKE2B 
295c7a710b0f1ee29e642b29c7b0576f68317dba93758825aa85d431129cebea174d5c2dfa67f7506fa3b18fe48d373f0dc9331ed9caabc2e3bc733946aefd97
 SHA512 
d83254b7f7f87c56caeaaf151d898de36f746c03ad88d427959bdeec905b9cd92a14a8ac534073473a6cefbb5e2b0be9e9faa79b500e252ecd0a0564d2312bbc

diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild 
b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild
new file mode 100644
index 000..cbdab7f9b8c
--- /dev/null
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+MY_PV="$(ver_rs 1- '')"
+SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken"
+
+DESCRIPTION="Common files for Canon drivers"
+HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/imagerunner-1730i.aspx;
+SRC_URI="http://gdlp01.c-wss.com/gds/0/019240/02/${SOURCES_NAME}.tar.gz;
+
+# GPL-2 License inside LICENSE-EN.txt files
+LICENSE="Canon-UFR-II GPL-2 MIT"
+SLOT="0"
+KEYWORDS="-* amd64 x86"
+IUSE=""
+
+RDEPEND="
+   >=dev-libs/libxml2-2.6:2
+   >=gnome-base/libglade-2.4:2.0
+   >=net-print/cups-1.1.17
+   >=x11-libs/gtk+-2.4:2
+"
+DEPEND="${DEPEND}"
+
+S="${WORKDIR}/${SOURCES_NAME}/Sources/${P/-lb-${PV}/-4.00}"
+
+pkg_setup() {
+   # Don't raise a fuss over pre-built binaries
+   QA_PREBUILT="
+   /usr/libexec/cups/filter/c3pldrv
+   /usr/$(get_abi_LIBDIR x86)/libColorGear.so.0.0.0
+   /usr/$(get_abi_LIBDIR x86)/libColorGearC.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libc3pl.so.0.0.1
+   /usr/$(get_abi_LIBDIR x86)/libcaepcm.so.1.0
+   /usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libcaiowrap.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libcanon_slim.so.1.0.0
+   /usr/$(get_libdir)/libcanonc3pl.so.1.0.0
+   "
+   QA_SONAME="
+   /usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
+   "
+}
+
+src_unpack() {
+   unpack ${A}
+   cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die
+   unpack ./${P/-lb-${PV}/-4.00}-1.tar.gz
+}
+
+change_dir() {
+   for i in cngplp buftool backend; do
+   cd "${i}" || die
+   "${@}"
+   cd "${S}" || die
+   done
+}
+
+src_prepare() {
+   default
+   sed -i -e \
+   "s:backenddir = \$(libdir)/cups/backend:backenddir = 
`cups-config --serverbin`/backend:" \
+   backend/Makefile.am || die
+
+   export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"
+   change_dir eautoreconf
+}
+
+src_configure() {
+   change_dir econf
+}
+
+src_compile() {
+   change_dir emake
+
+   # Cannot be moved to 'change_dir' as it doesn't need eautoreconf
+   cd "${S}/c3plmod_ipc" || die
+   emake
+}
+
+src_install() {
+   MAKEOPTS+=" -j1" default
+
+   einstalldocs
+
+   cd "${S}/c3plmod_ipc" || die
+   dolib.so libcanonc3pl.so.1.0.0
+   dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so.1"
+   dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so"
+
+   cd "${S}/data" || die
+   insinto /usr/share/caepcm
+   doins *
+
+   ABI=x86
+   cd "${S}/libs" || die
+   exeinto $(cups-config --serverbin)/filter
+   doexe c3pldrv
+   dolib.so libcaepcm.so.1.0
+   dosym libcaepcm.so.1.0 "/usr/$(get_libdir)/libcaepcm.so.1"
+   dosym libcaepcm.so.1.0 "/usr/$(get_libdir)/libcaepcm.so"
+   for lib in *.so.?.?.?; do
+   dolib.so "${lib}"
+   dosym "${lib}" 

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

2021-01-07 Thread Sam James
commit: eb47eaebf7b3e9e51540f204839d6ad231c24ae6
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan  7 11:29:45 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan  7 11:33:21 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb47eaeb

net-print/cndrvcups-common-lb: cleanup old

Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Sam James  gentoo.org>

 net-print/cndrvcups-common-lb/Manifest |   1 -
 .../cndrvcups-common-lb-3.60-r1.ebuild | 116 -
 2 files changed, 117 deletions(-)

diff --git a/net-print/cndrvcups-common-lb/Manifest 
b/net-print/cndrvcups-common-lb/Manifest
index 225fe9561f2..b8b441732ad 100644
--- a/net-print/cndrvcups-common-lb/Manifest
+++ b/net-print/cndrvcups-common-lb/Manifest
@@ -1,2 +1 @@
-DIST linux-UFRII-drv-v360-uken.tar.gz 116695930 BLAKE2B 
75b0ed7a957fbc1677a834e67b92b7752cfa74536cb238b553f1c2c98b86399c29209240d093492ea212618c0092ad59a22f03f992462b8ef488f8ed58b51d21
 SHA512 
c8b2abb2d0e9ccf972241dda5154c0ddd1ba9cfe6c721c242c40c90cf29e8d0b2c6a559907318cd191232f699a42425cc4148aebcaab6aa111f1cb5439777ce7
 DIST linux-UFRII-drv-v370-uken-05.tar.gz 117334511 BLAKE2B 
295c7a710b0f1ee29e642b29c7b0576f68317dba93758825aa85d431129cebea174d5c2dfa67f7506fa3b18fe48d373f0dc9331ed9caabc2e3bc733946aefd97
 SHA512 
d83254b7f7f87c56caeaaf151d898de36f746c03ad88d427959bdeec905b9cd92a14a8ac534073473a6cefbb5e2b0be9e9faa79b500e252ecd0a0564d2312bbc

diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild 
b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild
deleted file mode 100644
index cbdab7f9b8c..000
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit autotools
-
-MY_PV="$(ver_rs 1- '')"
-SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken"
-
-DESCRIPTION="Common files for Canon drivers"
-HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/imagerunner-1730i.aspx;
-SRC_URI="http://gdlp01.c-wss.com/gds/0/019240/02/${SOURCES_NAME}.tar.gz;
-
-# GPL-2 License inside LICENSE-EN.txt files
-LICENSE="Canon-UFR-II GPL-2 MIT"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-RDEPEND="
-   >=dev-libs/libxml2-2.6:2
-   >=gnome-base/libglade-2.4:2.0
-   >=net-print/cups-1.1.17
-   >=x11-libs/gtk+-2.4:2
-"
-DEPEND="${DEPEND}"
-
-S="${WORKDIR}/${SOURCES_NAME}/Sources/${P/-lb-${PV}/-4.00}"
-
-pkg_setup() {
-   # Don't raise a fuss over pre-built binaries
-   QA_PREBUILT="
-   /usr/libexec/cups/filter/c3pldrv
-   /usr/$(get_abi_LIBDIR x86)/libColorGear.so.0.0.0
-   /usr/$(get_abi_LIBDIR x86)/libColorGearC.so.1.0.0
-   /usr/$(get_abi_LIBDIR x86)/libc3pl.so.0.0.1
-   /usr/$(get_abi_LIBDIR x86)/libcaepcm.so.1.0
-   /usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
-   /usr/$(get_abi_LIBDIR x86)/libcaiowrap.so.1.0.0
-   /usr/$(get_abi_LIBDIR x86)/libcanon_slim.so.1.0.0
-   /usr/$(get_libdir)/libcanonc3pl.so.1.0.0
-   "
-   QA_SONAME="
-   /usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
-   "
-}
-
-src_unpack() {
-   unpack ${A}
-   cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die
-   unpack ./${P/-lb-${PV}/-4.00}-1.tar.gz
-}
-
-change_dir() {
-   for i in cngplp buftool backend; do
-   cd "${i}" || die
-   "${@}"
-   cd "${S}" || die
-   done
-}
-
-src_prepare() {
-   default
-   sed -i -e \
-   "s:backenddir = \$(libdir)/cups/backend:backenddir = 
`cups-config --serverbin`/backend:" \
-   backend/Makefile.am || die
-
-   export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"
-   change_dir eautoreconf
-}
-
-src_configure() {
-   change_dir econf
-}
-
-src_compile() {
-   change_dir emake
-
-   # Cannot be moved to 'change_dir' as it doesn't need eautoreconf
-   cd "${S}/c3plmod_ipc" || die
-   emake
-}
-
-src_install() {
-   MAKEOPTS+=" -j1" default
-
-   einstalldocs
-
-   cd "${S}/c3plmod_ipc" || die
-   dolib.so libcanonc3pl.so.1.0.0
-   dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so.1"
-   dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so"
-
-   cd "${S}/data" || die
-   insinto /usr/share/caepcm
-   doins *
-
-   ABI=x86
-   cd "${S}/libs" || die
-   exeinto $(cups-config --serverbin)/filter
-   doexe c3pldrv
-   dolib.so libcaepcm.so.1.0
-   dosym libcaepcm.so.1.0 "/usr/$(get_libdir)/libcaepcm.so.1"
-   dosym libcaepcm.so.1.0 "/usr/$(get_libdir)/libcaepcm.so"
-   for lib in *.so.?.?.?; do
-   dolib.so "${lib}"
-   dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?}"
-   dosym 

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

2020-12-30 Thread David Seifert
commit: e458d657f6e8c4b4e6570eb5fc145ec1494efce4
Author: Jakov Smolic  sartura  hr>
AuthorDate: Wed Dec 30 11:09:53 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Wed Dec 30 11:09:53 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e458d657

net-print/cndrvcups-common-lb: Respect CC

Closes: https://github.com/gentoo/gentoo/pull/18878
Closes: https://bugs.gentoo.org/762595
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild 
b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
index 03e2dcc952f..41880207f32 100644
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
@@ -64,6 +64,8 @@ src_prepare() {
"s:backenddir = \$(libdir)/cups/backend:backenddir = 
`cups-config --serverbin`/backend:" \
backend/Makefile.am || die
 
+   sed -i -e "s@CC=gcc@CC=$(tc-getCC)@" c3plmod_ipc/Makefile || die
+
export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"
change_dir mv configure.in configure.ac
change_dir sed -i -e 's/configure.in/configure.ac/' configure.ac



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

2020-12-29 Thread David Seifert
commit: 40b5831adadd55442b152c2080d8871cb7cfc6e9
Author: Jakov Smolic  sartura  hr>
AuthorDate: Tue Dec 29 16:40:04 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Tue Dec 29 16:40:04 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=40b5831a

net-print/cndrvcups-common-lb: Respect AR, prune static-libs

Closes: https://github.com/gentoo/gentoo/pull/18868
Closes: https://bugs.gentoo.org/762235
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild | 6 --
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild 
b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
index b6566cc425d..03e2dcc952f 100644
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools
+inherit autotools toolchain-funcs
 
 MY_PV="$(ver_rs 1- '')"
 SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken"
@@ -75,7 +75,7 @@ src_configure() {
 }
 
 src_compile() {
-   change_dir emake
+   change_dir emake AR="$(tc-getAR)"
 
# Cannot be moved to 'change_dir' as it doesn't need eautoreconf
cd "${S}/c3plmod_ipc" || die
@@ -114,4 +114,6 @@ src_install() {
if [[ "$(get_libdir)" != lib ]] && [[ ${SYMLINK_LIB} = yes ]]; then
dosym "../$(get_libdir)/libc3pl.so" /usr/lib/libc3pl.so
fi
+
+   find "${ED}" -name '*.la' -o -name '*.a' -delete || die
 }



[gentoo-commits] repo/gentoo:master commit in: net-print/cndrvcups-common-lb/, net-print/cndrvcups-common-lb/files/

2020-12-28 Thread David Seifert
commit: 8d23e5dce4da86e96c010ba02e1cdfa5dc5d5974
Author: Jakov Smolic  sartura  hr>
AuthorDate: Mon Dec 28 12:42:56 2020 +
Commit: David Seifert  gentoo  org>
CommitDate: Mon Dec 28 12:42:56 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d23e5dc

net-print/cndrvcups-common-lb: fix build with gcc-10

Closes: https://bugs.gentoo.org/706888
Package-Manager: Portage-3.0.9, Repoman-3.0.1
Signed-off-by: Jakov Smolic  sartura.hr>
Signed-off-by: David Seifert  gentoo.org>

 .../cndrvcups-common-lb-3.70.ebuild| 16 +++--
 .../cndrvcups-common-lb-3.70-fno-common.patch  | 68 ++
 2 files changed, 75 insertions(+), 9 deletions(-)

diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild 
b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
index 23e5c3724b5..b6566cc425d 100644
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools
 
 MY_PV="$(ver_rs 1- '')"
@@ -15,19 +16,18 @@ 
SRC_URI="http://gdlp01.c-wss.com/gds/8/017658/08/${SOURCES_NAME}-05.tar.gz;
 LICENSE="Canon-UFR-II GPL-2 MIT"
 SLOT="0"
 KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
 
 RDEPEND="
>=dev-libs/libxml2-2.6:2
>=gnome-base/libglade-2.4:2.0
>=net-print/cups-1.1.17
-   >=x11-libs/gtk+-2.4:2
-"
+   >=x11-libs/gtk+-2.4:2"
 DEPEND="${DEPEND}"
-BDEPEND=""
 
 S="${WORKDIR}/${SOURCES_NAME}/Sources/${P/-lb-${PV}/-4.10}"
 
+PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
+
 pkg_setup() {
# Don't raise a fuss over pre-built binaries
QA_PREBUILT="
@@ -39,11 +39,9 @@ pkg_setup() {
/usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
/usr/$(get_abi_LIBDIR x86)/libcaiowrap.so.1.0.0
/usr/$(get_abi_LIBDIR x86)/libcanon_slim.so.1.0.0
-   /usr/$(get_libdir)/libcanonc3pl.so.1.0.0
-   "
+   /usr/$(get_libdir)/libcanonc3pl.so.1.0.0"
QA_SONAME="
-   /usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
-   "
+   /usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0"
 }
 
 src_unpack() {

diff --git 
a/net-print/cndrvcups-common-lb/files/cndrvcups-common-lb-3.70-fno-common.patch 
b/net-print/cndrvcups-common-lb/files/cndrvcups-common-lb-3.70-fno-common.patch
new file mode 100644
index 000..fd17f6b72b1
--- /dev/null
+++ 
b/net-print/cndrvcups-common-lb/files/cndrvcups-common-lb-3.70-fno-common.patch
@@ -0,0 +1,68 @@
+--- a/cngplp/src/load.c
 b/cngplp/src/load.c
+@@ -29,6 +29,17 @@ GModule* g_module = NULL;
+ char pre_lib_name[MAX_PATH];
+ gboolean first_load = TRUE;
+ 
++void (*ShowPDLDialog)(const char* name, int print);
++gboolean (*InitPDLController)(GtkWidget* main_dlg, char *printer_name, const 
char* print_file, gboolean first_load);
++void (*UpdatePDLData)(int id, const char* value);
++void (*UpdatePDLDataInt)(int id, int value);
++void (*ClosePDLController)();
++void (*SavePDLPrinterData)();
++void (*PrintPDLFile)();
++char* (*GetPDLData)(int id);
++int (*GetPDLDataInt)(int id, int def);
++int (*ExecPDLJobMode)();
++
+ int LoadPDL(GladeXML* main_xml, const char* print_file)
+ {
+   GtkWidget* main_dlg = NULL;
+--- a/cngplp/src/load.h
 b/cngplp/src/load.h
+@@ -28,15 +28,15 @@
+ 
+ int LoadPDL(GladeXML* main_xml, const char* print_file);
+ void UnLoadPDL();
+-void (*ShowPDLDialog)(const char* name, int print);
+-gboolean (*InitPDLController)(GtkWidget* main_dlg, char *printer_name, const 
char* print_file, gboolean first_load);
+-void (*UpdatePDLData)(int id, const char* value);
+-void (*UpdatePDLDataInt)(int id, int value);
+-void (*ClosePDLController)();
+-void (*SavePDLPrinterData)();
+-void (*PrintPDLFile)();
+-char* (*GetPDLData)(int id);
+-int (*GetPDLDataInt)(int id, int def);
+-int (*ExecPDLJobMode)();
++extern void (*ShowPDLDialog)(const char* name, int print);
++extern gboolean (*InitPDLController)(GtkWidget* main_dlg, char *printer_name, 
const char* print_file, gboolean first_load);
++extern void (*UpdatePDLData)(int id, const char* value);
++extern void (*UpdatePDLDataInt)(int id, int value);
++extern void (*ClosePDLController)();
++extern void (*SavePDLPrinterData)();
++extern void (*PrintPDLFile)();
++extern char* (*GetPDLData)(int id);
++extern int (*GetPDLDataInt)(int id, int def);
++extern int (*ExecPDLJobMode)();
+ 
+ #endif
+--- a/cngplp/src/mainwnd.c
 b/cngplp/src/mainwnd.c
+@@ -82,6 +82,17 @@ static int g_stdout_fd;
+ static void SaveOptions();
+ static void LoadOptions();
+ 
++extern void (*ShowPDLDialog)(const char* name, int print);
++extern gboolean (*InitPDLController)(GtkWidget* main_dlg, char *printer_name, 
const char* print_file, gboolean first_load);
++extern void (*UpdatePDLData)(int id, const char* 

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

2019-10-20 Thread Pacho Ramos
commit: 159e30f2a9a23fcd6e7e2b27e4473aeeb3847cf8
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Oct 20 10:18:02 2019 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Oct 20 10:18:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=159e30f2

net-print/cndrvcups-common-lb: Move to maintainer-needed

Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Pacho Ramos  gentoo.org>

 net-print/cndrvcups-common-lb/metadata.xml | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/net-print/cndrvcups-common-lb/metadata.xml 
b/net-print/cndrvcups-common-lb/metadata.xml
index f6188168081..6f49eba8f49 100644
--- a/net-print/cndrvcups-common-lb/metadata.xml
+++ b/net-print/cndrvcups-common-lb/metadata.xml
@@ -1,8 +1,5 @@
 
 http://www.gentoo.org/dtd/metadata.dtd;>
 
-
-   pa...@gentoo.org
-   Pacho Ramos
-
+
 



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

2019-10-20 Thread Pacho Ramos
commit: 9e282c36ee36960c0364835fd509d0893de57ffb
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Oct 20 10:13:23 2019 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Oct 20 10:14:34 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e282c36

net-print/cndrvcups-common-lb: Version bump

Package-Manager: Portage-2.3.77, Repoman-2.3.17
Signed-off-by: Pacho Ramos  gentoo.org>

 net-print/cndrvcups-common-lb/Manifest |   1 +
 .../cndrvcups-common-lb-3.70.ebuild| 118 +
 2 files changed, 119 insertions(+)

diff --git a/net-print/cndrvcups-common-lb/Manifest 
b/net-print/cndrvcups-common-lb/Manifest
index a25da6d6333..225fe9561f2 100644
--- a/net-print/cndrvcups-common-lb/Manifest
+++ b/net-print/cndrvcups-common-lb/Manifest
@@ -1 +1,2 @@
 DIST linux-UFRII-drv-v360-uken.tar.gz 116695930 BLAKE2B 
75b0ed7a957fbc1677a834e67b92b7752cfa74536cb238b553f1c2c98b86399c29209240d093492ea212618c0092ad59a22f03f992462b8ef488f8ed58b51d21
 SHA512 
c8b2abb2d0e9ccf972241dda5154c0ddd1ba9cfe6c721c242c40c90cf29e8d0b2c6a559907318cd191232f699a42425cc4148aebcaab6aa111f1cb5439777ce7
+DIST linux-UFRII-drv-v370-uken-05.tar.gz 117334511 BLAKE2B 
295c7a710b0f1ee29e642b29c7b0576f68317dba93758825aa85d431129cebea174d5c2dfa67f7506fa3b18fe48d373f0dc9331ed9caabc2e3bc733946aefd97
 SHA512 
d83254b7f7f87c56caeaaf151d898de36f746c03ad88d427959bdeec905b9cd92a14a8ac534073473a6cefbb5e2b0be9e9faa79b500e252ecd0a0564d2312bbc

diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild 
b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
new file mode 100644
index 000..92dd9f05754
--- /dev/null
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
@@ -0,0 +1,118 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+MY_PV="$(ver_rs 1- '')"
+SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken"
+
+DESCRIPTION="Common files for Canon drivers"
+HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/imagerunner-1730i.aspx;
+SRC_URI="http://gdlp01.c-wss.com/gds/8/017658/08/${SOURCES_NAME}-05.tar.gz;
+
+# GPL-2 License inside LICENSE-EN.txt files
+LICENSE="Canon-UFR-II GPL-2 MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+   >=dev-libs/libxml2-2.6:2
+   >=gnome-base/libglade-2.4:2.0
+   >=net-print/cups-1.1.17
+   >=x11-libs/gtk+-2.4:2
+"
+DEPEND="${DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/${SOURCES_NAME}/Sources/${P/-lb-${PV}/-4.10}"
+
+pkg_setup() {
+   # Don't raise a fuss over pre-built binaries
+   QA_PREBUILT="
+   /usr/libexec/cups/filter/c3pldrv
+   /usr/$(get_abi_LIBDIR x86)/libColorGear.so.0.0.0
+   /usr/$(get_abi_LIBDIR x86)/libColorGearC.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libc3pl.so.0.0.1
+   /usr/$(get_abi_LIBDIR x86)/libcaepcm.so.1.0
+   /usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libcaiowrap.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libcanon_slim.so.1.0.0
+   /usr/$(get_libdir)/libcanonc3pl.so.1.0.0
+   "
+   QA_SONAME="
+   /usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
+   "
+}
+
+src_unpack() {
+   unpack ${A}
+   cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die
+   unpack ./${P/-lb-${PV}/-4.10}-1.tar.gz
+}
+
+change_dir() {
+   for i in cngplp buftool backend; do
+   cd "${i}" || die
+   "${@}" || die
+   cd "${S}" || die
+   done
+}
+
+src_prepare() {
+   default
+   sed -i -e \
+   "s:backenddir = \$(libdir)/cups/backend:backenddir = 
`cups-config --serverbin`/backend:" \
+   backend/Makefile.am || die
+
+   export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"
+   change_dir mv configure.in configure.ac
+   change_dir sed -i -e 's/configure.in/configure.ac/' configure.ac
+   change_dir eautoreconf
+}
+
+src_configure() {
+   change_dir econf
+}
+
+src_compile() {
+   change_dir emake
+
+   # Cannot be moved to 'change_dir' as it doesn't need eautoreconf
+   ( cd "${S}/c3plmod_ipc" && emake ) || die
+}
+
+src_install() {
+   MAKEOPTS+=" -j1" default
+
+   einstalldocs
+
+   cd "${S}/c3plmod_ipc" || die
+   dolib.so libcanonc3pl.so.1.0.0
+   dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so.1"
+   dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so"
+
+   cd "${S}/data" || die
+   insinto /usr/share/caepcm
+   doins *
+
+   ABI=x86
+   cd "${S}/libs" || die
+   exeinto $(cups-config --serverbin)/filter
+   doexe c3pldrv
+   dolib.so libcaepcm.so.1.0
+   dosym libcaepcm.so.1.0 "/usr/$(get_libdir)/libcaepcm.so.1"
+   dosym libcaepcm.so.1.0 "/usr/$(get_libdir)/libcaepcm.so"
+   for lib in 

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

2019-04-02 Thread Pacho Ramos
commit: e0a23484ded5ad3454cf3dd5ef88913583b58748
Author: Pacho Ramos  gentoo  org>
AuthorDate: Tue Apr  2 06:38:27 2019 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Tue Apr  2 06:39:20 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e0a23484

net-print/cndrvcups-common-lb: Drop old

Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Pacho Ramos  gentoo.org>

 net-print/cndrvcups-common-lb/Manifest |   1 -
 .../cndrvcups-common-lb-3.50-r1.ebuild | 115 -
 .../cndrvcups-common-lb-3.50.ebuild| 114 
 .../cndrvcups-common-lb-3.60.ebuild| 115 -
 4 files changed, 345 deletions(-)

diff --git a/net-print/cndrvcups-common-lb/Manifest 
b/net-print/cndrvcups-common-lb/Manifest
index 935aa7b6e66..a25da6d6333 100644
--- a/net-print/cndrvcups-common-lb/Manifest
+++ b/net-print/cndrvcups-common-lb/Manifest
@@ -1,2 +1 @@
-DIST linux-UFRII-drv-v350-uken.tar.gz 116120579 BLAKE2B 
fa5f521f4eec375fa0d9efb7b47ff6dd88f47c36fa5750818f7e367058b8ccafce99b9f8f9d9195e1e5e0e2f1b77a7c0cc1524786f111b065204d0472601202b
 SHA512 
2eeb1448cb76ac156e1e5f6df46141ee5605b0bed1c25f31b0f039fb9f579fe3d5732b132cae391e78276c550febc19366f958d1fb53c93f955303f1f5c37ab3
 DIST linux-UFRII-drv-v360-uken.tar.gz 116695930 BLAKE2B 
75b0ed7a957fbc1677a834e67b92b7752cfa74536cb238b553f1c2c98b86399c29209240d093492ea212618c0092ad59a22f03f992462b8ef488f8ed58b51d21
 SHA512 
c8b2abb2d0e9ccf972241dda5154c0ddd1ba9cfe6c721c242c40c90cf29e8d0b2c6a559907318cd191232f699a42425cc4148aebcaab6aa111f1cb5439777ce7

diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.50-r1.ebuild 
b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.50-r1.ebuild
deleted file mode 100644
index 251dd60eae8..000
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.50-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools versionator
-
-MY_PV="$(delete_all_version_separators)"
-SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken"
-
-DESCRIPTION="Common files for Canon drivers"
-HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/imagerunner-1133.aspx?type=drivers=EN=LINUX;
-SRC_URI="http://gdlp01.c-wss.com/gds/0/019240/01/${SOURCES_NAME}.tar.gz;
-
-# GPL-2 License inside LICENSE-EN.txt files
-LICENSE="Canon-UFR-II GPL-2 MIT"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-RDEPEND="
-   >=dev-libs/libxml2-2.6:2
-   >=gnome-base/libglade-2.4:2.0
-   >=net-print/cups-1.1.17
-   >=x11-libs/gtk+-2.4:2
-"
-DEPEND="${DEPEND}"
-
-S="${WORKDIR}/${SOURCES_NAME}/Sources/${P/-lb-${PV}/-3.90}"
-
-pkg_setup() {
-   # Don't raise a fuss over pre-built binaries
-   QA_PREBUILT="
-   /usr/libexec/cups/filter/c3pldrv
-   /usr/$(get_abi_LIBDIR x86)/libColorGear.so.0.0.0
-   /usr/$(get_abi_LIBDIR x86)/libColorGearC.so.1.0.0
-   /usr/$(get_abi_LIBDIR x86)/libc3pl.so.0.0.1
-   /usr/$(get_abi_LIBDIR x86)/libcaepcm.so.1.0
-   /usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
-   /usr/$(get_abi_LIBDIR x86)/libcaiowrap.so.1.0.0
-   /usr/$(get_abi_LIBDIR x86)/libcanon_slim.so.1.0.0
-   /usr/$(get_libdir)/libcanonc3pl.so.1.0.0
-   "
-   QA_SONAME="
-   /usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
-   "
-}
-
-src_unpack() {
-   unpack ${A}
-   cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die
-   unpack ./${P/-lb-${PV}/-3.90}-1.tar.gz
-}
-
-change_dir() {
-   for i in cngplp buftool backend; do
-   cd "${i}" || die
-   "${@}"
-   cd "${S}" || die
-   done
-}
-
-src_prepare() {
-   default
-   sed -i -e \
-   "s:backenddir = \$(libdir)/cups/backend:backenddir = 
`cups-config --serverbin`/backend:" \
-   backend/Makefile.am || die
-
-   export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"
-   change_dir eautoreconf
-}
-
-src_configure() {
-   change_dir econf
-}
-
-src_compile() {
-   change_dir emake
-
-   # Cannot be moved to 'change_dir' as it doesn't need eautoreconf
-   ( cd "${S}/c3plmod_ipc" && emake ) || die
-}
-
-src_install() {
-   MAKEOPTS+=" -j1" default
-
-   einstalldocs
-
-   cd "${S}/c3plmod_ipc" || die
-   dolib.so libcanonc3pl.so.1.0.0
-   dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so.1"
-   dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so"
-
-   cd "${S}/data" || die
-   insinto /usr/share/caepcm
-   doins *
-
-   ABI=x86
-   cd "${S}/libs" || die
-   exeinto $(cups-config --serverbin)/filter
-   doexe c3pldrv
-   dolib.so libcaepcm.so.1.0
-   dosym libcaepcm.so.1.0 "/usr/$(get_libdir)/libcaepcm.so.1"
-   dosym 

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

2019-03-28 Thread Mikle Kolyada
commit: 46c1846bc0a9ce78c92f5f3542e8b6b7998ae8a2
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu Mar 28 07:15:50 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu Mar 28 07:16:23 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=46c1846b

net-print/cndrvcups-common-lb: amd64 stable wrt bug #681614

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11
RepoMan-Options: --include-arches="amd64"

 net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild 
b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild
index 3eef7fc8afc..86a7a2eaf8f 100644
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="http://gdlp01.c-wss.com/gds/0/019240/02/${SOURCES_NAME}.tar.gz;
 # GPL-2 License inside LICENSE-EN.txt files
 LICENSE="Canon-UFR-II GPL-2 MIT"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 IUSE=""
 
 RDEPEND="



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

2019-02-24 Thread Pacho Ramos
commit: baf528a35f29ed085bf52f317c2379229d6fde7f
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Feb 24 09:10:02 2019 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Feb 24 09:10:02 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=baf528a3

net-print/cndrvcups-common-lb: Symlink is needed when SYMLINK_LIB=yes

Closes: https://bugs.gentoo.org/642138
Package-Manager: Portage-2.3.62, Repoman-2.3.12
Signed-off-by: Pacho Ramos  gentoo.org>

 .../cndrvcups-common-lb-3.60-r1.ebuild | 115 +
 1 file changed, 115 insertions(+)

diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild 
b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild
new file mode 100644
index 000..3eef7fc8afc
--- /dev/null
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+MY_PV="$(ver_rs 1- '')"
+SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken"
+
+DESCRIPTION="Common files for Canon drivers"
+HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/imagerunner-1730i.aspx;
+SRC_URI="http://gdlp01.c-wss.com/gds/0/019240/02/${SOURCES_NAME}.tar.gz;
+
+# GPL-2 License inside LICENSE-EN.txt files
+LICENSE="Canon-UFR-II GPL-2 MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+   >=dev-libs/libxml2-2.6:2
+   >=gnome-base/libglade-2.4:2.0
+   >=net-print/cups-1.1.17
+   >=x11-libs/gtk+-2.4:2
+"
+DEPEND="${DEPEND}"
+
+S="${WORKDIR}/${SOURCES_NAME}/Sources/${P/-lb-${PV}/-4.00}"
+
+pkg_setup() {
+   # Don't raise a fuss over pre-built binaries
+   QA_PREBUILT="
+   /usr/libexec/cups/filter/c3pldrv
+   /usr/$(get_abi_LIBDIR x86)/libColorGear.so.0.0.0
+   /usr/$(get_abi_LIBDIR x86)/libColorGearC.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libc3pl.so.0.0.1
+   /usr/$(get_abi_LIBDIR x86)/libcaepcm.so.1.0
+   /usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libcaiowrap.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libcanon_slim.so.1.0.0
+   /usr/$(get_libdir)/libcanonc3pl.so.1.0.0
+   "
+   QA_SONAME="
+   /usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
+   "
+}
+
+src_unpack() {
+   unpack ${A}
+   cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die
+   unpack ./${P/-lb-${PV}/-4.00}-1.tar.gz
+}
+
+change_dir() {
+   for i in cngplp buftool backend; do
+   cd "${i}" || die
+   "${@}"
+   cd "${S}" || die
+   done
+}
+
+src_prepare() {
+   default
+   sed -i -e \
+   "s:backenddir = \$(libdir)/cups/backend:backenddir = 
`cups-config --serverbin`/backend:" \
+   backend/Makefile.am || die
+
+   export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"
+   change_dir eautoreconf
+}
+
+src_configure() {
+   change_dir econf
+}
+
+src_compile() {
+   change_dir emake
+
+   # Cannot be moved to 'change_dir' as it doesn't need eautoreconf
+   ( cd "${S}/c3plmod_ipc" && emake ) || die
+}
+
+src_install() {
+   MAKEOPTS+=" -j1" default
+
+   einstalldocs
+
+   cd "${S}/c3plmod_ipc" || die
+   dolib.so libcanonc3pl.so.1.0.0
+   dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so.1"
+   dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so"
+
+   cd "${S}/data" || die
+   insinto /usr/share/caepcm
+   doins *
+
+   ABI=x86
+   cd "${S}/libs" || die
+   exeinto $(cups-config --serverbin)/filter
+   doexe c3pldrv
+   dolib.so libcaepcm.so.1.0
+   dosym libcaepcm.so.1.0 "/usr/$(get_libdir)/libcaepcm.so.1"
+   dosym libcaepcm.so.1.0 "/usr/$(get_libdir)/libcaepcm.so"
+   for lib in *.so.?.?.?; do
+   dolib.so "${lib}"
+   dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?}"
+   dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?.?}"
+   done
+
+   # c3pldrv dlopens the absolute path /usr/lib/libc3pl.so :(, bug #
+   # Only needed with SYMLINK_LIB=yes #642138
+   if [[ "$(get_libdir)" != lib ]] && [[ ${SYMLINK_LIB} = yes ]]; then
+   dosym "../$(get_libdir)/libc3pl.so" /usr/lib/libc3pl.so
+   fi
+}



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

2018-11-12 Thread Mikle Kolyada
commit: 1686a7a89b9cb1402e409db67df230077d854fb5
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Nov 12 18:54:33 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Nov 12 18:54:49 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1686a7a8

net-print/cndrvcups-common-lb: amd64 stable wrt bug #670914

Signed-off-by: Mikle Kolyada  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.50-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.50-r1.ebuild 
b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.50-r1.ebuild
index 66f3bb5eccc..251dd60eae8 100644
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.50-r1.ebuild
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.50-r1.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="http://gdlp01.c-wss.com/gds/0/019240/01/${SOURCES_NAME}.tar.gz;
 # GPL-2 License inside LICENSE-EN.txt files
 LICENSE="Canon-UFR-II GPL-2 MIT"
 SLOT="0"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 RDEPEND="



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

2018-11-11 Thread Thomas Deutschmann
commit: 3c3ce9a05f1affdfb3263fa4ccb36f159dda1dc4
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Nov 12 00:54:35 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Nov 12 01:13:01 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c3ce9a0

net-print/cndrvcups-common-lb: x86 stable (bug #670914)

Package-Manager: Portage-2.3.51, Repoman-2.3.12
Signed-off-by: Thomas Deutschmann  gentoo.org>

 net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.50-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.50-r1.ebuild 
b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.50-r1.ebuild
index 2a20a651679..66f3bb5eccc 100644
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.50-r1.ebuild
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.50-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -14,7 +14,7 @@ 
SRC_URI="http://gdlp01.c-wss.com/gds/0/019240/01/${SOURCES_NAME}.tar.gz;
 # GPL-2 License inside LICENSE-EN.txt files
 LICENSE="Canon-UFR-II GPL-2 MIT"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 x86"
 IUSE=""
 
 RDEPEND="



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

2018-11-11 Thread Pacho Ramos
commit: 45f50af5414f9cb9b9dfd79dc354ef402dd86869
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Nov 11 13:59:24 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Nov 11 13:59:39 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=45f50af5

net-print/cndrvcups-common-lb: Drop old

Signed-off-by: Pacho Ramos  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 net-print/cndrvcups-common-lb/Manifest |   1 -
 .../cndrvcups-common-lb-3.40.ebuild| 114 -
 2 files changed, 115 deletions(-)

diff --git a/net-print/cndrvcups-common-lb/Manifest 
b/net-print/cndrvcups-common-lb/Manifest
index cac7f3b07c9..935aa7b6e66 100644
--- a/net-print/cndrvcups-common-lb/Manifest
+++ b/net-print/cndrvcups-common-lb/Manifest
@@ -1,3 +1,2 @@
-DIST linux-UFRII-drv-v340-uken.tar.gz 117746329 BLAKE2B 
fafdddedd1b09f33742ae55dfb41994ad3ac6ef5a8c9dc7e7b2a87ec8f5596f1079aead966a89f366c7548cc730328dc594b04747e7946560f83d6df2716d73f
 SHA512 
05f12d2cac5ae9987fe389be1a15b11d280734f6d47b86f04fa2fcb61bf94175b7afdba4cc1cf5ecf2c1ef5a8e2c14eda5d72f7671618d7c94581c620fea4494
 DIST linux-UFRII-drv-v350-uken.tar.gz 116120579 BLAKE2B 
fa5f521f4eec375fa0d9efb7b47ff6dd88f47c36fa5750818f7e367058b8ccafce99b9f8f9d9195e1e5e0e2f1b77a7c0cc1524786f111b065204d0472601202b
 SHA512 
2eeb1448cb76ac156e1e5f6df46141ee5605b0bed1c25f31b0f039fb9f579fe3d5732b132cae391e78276c550febc19366f958d1fb53c93f955303f1f5c37ab3
 DIST linux-UFRII-drv-v360-uken.tar.gz 116695930 BLAKE2B 
75b0ed7a957fbc1677a834e67b92b7752cfa74536cb238b553f1c2c98b86399c29209240d093492ea212618c0092ad59a22f03f992462b8ef488f8ed58b51d21
 SHA512 
c8b2abb2d0e9ccf972241dda5154c0ddd1ba9cfe6c721c242c40c90cf29e8d0b2c6a559907318cd191232f699a42425cc4148aebcaab6aa111f1cb5439777ce7

diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.40.ebuild 
b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.40.ebuild
deleted file mode 100644
index f8318f3d2fe..000
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.40.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools versionator
-
-MY_PV="$(delete_all_version_separators)"
-SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken"
-
-DESCRIPTION="Common files for Canon drivers"
-HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/imagerunner-1133.aspx?type=drivers=EN=LINUX;
-SRC_URI="http://gdlp01.c-wss.com/gds/8/017658/04/${SOURCES_NAME}.tar.gz;
-
-# GPL-2 License inside LICENSE-EN.txt files
-LICENSE="Canon-UFR-II GPL-2 MIT"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-RDEPEND="
-   dev-libs/libxml2
-   gnome-base/libglade
-   net-print/cups
-   x11-libs/gtk+:2
-"
-DEPEND="${DEPEND}"
-
-S="${WORKDIR}/${SOURCES_NAME}/Sources/${P/-lb-${PV}/-3.80}"
-
-pkg_setup() {
-   # Don't raise a fuss over pre-built binaries
-   QA_PREBUILT="
-   /usr/libexec/cups/filter/c3pldrv
-   /usr/$(get_abi_LIBDIR x86)/libColorGear.so.0.0.0
-   /usr/$(get_abi_LIBDIR x86)/libColorGearC.so.1.0.0
-   /usr/$(get_abi_LIBDIR x86)/libc3pl.so.0.0.1
-   /usr/$(get_abi_LIBDIR x86)/libcaepcm.so.1.0
-   /usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
-   /usr/$(get_abi_LIBDIR x86)/libcaiowrap.so.1.0.0
-   /usr/$(get_abi_LIBDIR x86)/libcanon_slim.so.1.0.0
-   /usr/$(get_libdir)/libcanonc3pl.so.1.0.0
-   "
-   QA_SONAME="
-   /usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
-   "
-}
-
-src_unpack() {
-   unpack ${A}
-   cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die
-   unpack ./${P/-lb-${PV}/-3.80}-1.tar.gz
-}
-
-change_dir() {
-   for i in cngplp buftool backend; do
-   cd "${i}" || die
-   "${@}"
-   cd "${S}" || die
-   done
-}
-
-src_prepare() {
-   default
-   sed -i -e \
-   "s:backenddir = \$(libdir)/cups/backend:backenddir = 
`cups-config --serverbin`/backend:" \
-   backend/Makefile.am || die
-
-   export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"
-   change_dir eautoreconf
-}
-
-src_configure() {
-   change_dir econf
-}
-
-src_compile() {
-   change_dir emake
-
-   # Cannot be moved to 'change_dir' as it doesn't need eautoreconf
-   ( cd "${S}/c3plmod_ipc" && emake ) || die
-}
-
-src_install() {
-   MAKEOPTS+=" -j1" default
-
-   einstalldocs
-
-   cd "${S}/c3plmod_ipc" || die
-   dolib.so libcanonc3pl.so.1.0.0
-   dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so.1"
-   dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so"
-
-   cd "${S}/data" || die
-   insinto /usr/share/caepcm
-   doins *
-
-   ABI=x86
-   cd "${S}/libs" || die
-   exeinto $(cups-config --serverbin)/filter
-   

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

2018-11-11 Thread Pacho Ramos
commit: d057488fd6fca1a17eacb11897b9fc507399348d
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Nov 11 13:59:11 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Nov 11 13:59:38 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d057488f

net-print/cndrvcups-common-lb: Bump to 3.60

Thanks-to: Raul Castillo  bizcomtech.com>
Signed-off-by: Pacho Ramos  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 net-print/cndrvcups-common-lb/Manifest |   1 +
 .../cndrvcups-common-lb-3.60.ebuild| 115 +
 2 files changed, 116 insertions(+)

diff --git a/net-print/cndrvcups-common-lb/Manifest 
b/net-print/cndrvcups-common-lb/Manifest
index e1a0ef78f7b..cac7f3b07c9 100644
--- a/net-print/cndrvcups-common-lb/Manifest
+++ b/net-print/cndrvcups-common-lb/Manifest
@@ -1,2 +1,3 @@
 DIST linux-UFRII-drv-v340-uken.tar.gz 117746329 BLAKE2B 
fafdddedd1b09f33742ae55dfb41994ad3ac6ef5a8c9dc7e7b2a87ec8f5596f1079aead966a89f366c7548cc730328dc594b04747e7946560f83d6df2716d73f
 SHA512 
05f12d2cac5ae9987fe389be1a15b11d280734f6d47b86f04fa2fcb61bf94175b7afdba4cc1cf5ecf2c1ef5a8e2c14eda5d72f7671618d7c94581c620fea4494
 DIST linux-UFRII-drv-v350-uken.tar.gz 116120579 BLAKE2B 
fa5f521f4eec375fa0d9efb7b47ff6dd88f47c36fa5750818f7e367058b8ccafce99b9f8f9d9195e1e5e0e2f1b77a7c0cc1524786f111b065204d0472601202b
 SHA512 
2eeb1448cb76ac156e1e5f6df46141ee5605b0bed1c25f31b0f039fb9f579fe3d5732b132cae391e78276c550febc19366f958d1fb53c93f955303f1f5c37ab3
+DIST linux-UFRII-drv-v360-uken.tar.gz 116695930 BLAKE2B 
75b0ed7a957fbc1677a834e67b92b7752cfa74536cb238b553f1c2c98b86399c29209240d093492ea212618c0092ad59a22f03f992462b8ef488f8ed58b51d21
 SHA512 
c8b2abb2d0e9ccf972241dda5154c0ddd1ba9cfe6c721c242c40c90cf29e8d0b2c6a559907318cd191232f699a42425cc4148aebcaab6aa111f1cb5439777ce7

diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60.ebuild 
b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60.ebuild
new file mode 100644
index 000..ce75e664a60
--- /dev/null
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+MY_PV="$(ver_rs 1- '')"
+SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken"
+
+DESCRIPTION="Common files for Canon drivers"
+HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/imagerunner-1730i.aspx;
+SRC_URI="http://gdlp01.c-wss.com/gds/0/019240/02/${SOURCES_NAME}.tar.gz;
+
+# GPL-2 License inside LICENSE-EN.txt files
+LICENSE="Canon-UFR-II GPL-2 MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+   >=dev-libs/libxml2-2.6:2
+   >=gnome-base/libglade-2.4:2.0
+   >=net-print/cups-1.1.17
+   >=x11-libs/gtk+-2.4:2
+"
+DEPEND="${DEPEND}"
+
+S="${WORKDIR}/${SOURCES_NAME}/Sources/${P/-lb-${PV}/-4.00}"
+
+pkg_setup() {
+   # Don't raise a fuss over pre-built binaries
+   QA_PREBUILT="
+   /usr/libexec/cups/filter/c3pldrv
+   /usr/$(get_abi_LIBDIR x86)/libColorGear.so.0.0.0
+   /usr/$(get_abi_LIBDIR x86)/libColorGearC.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libc3pl.so.0.0.1
+   /usr/$(get_abi_LIBDIR x86)/libcaepcm.so.1.0
+   /usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libcaiowrap.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libcanon_slim.so.1.0.0
+   /usr/$(get_libdir)/libcanonc3pl.so.1.0.0
+   "
+   QA_SONAME="
+   /usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
+   "
+}
+
+src_unpack() {
+   unpack ${A}
+   cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die
+   unpack ./${P/-lb-${PV}/-4.00}-1.tar.gz
+}
+
+change_dir() {
+   for i in cngplp buftool backend; do
+   cd "${i}" || die
+   "${@}"
+   cd "${S}" || die
+   done
+}
+
+src_prepare() {
+   default
+   sed -i -e \
+   "s:backenddir = \$(libdir)/cups/backend:backenddir = 
`cups-config --serverbin`/backend:" \
+   backend/Makefile.am || die
+
+   export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"
+   change_dir eautoreconf
+}
+
+src_configure() {
+   change_dir econf
+}
+
+src_compile() {
+   change_dir emake
+
+   # Cannot be moved to 'change_dir' as it doesn't need eautoreconf
+   ( cd "${S}/c3plmod_ipc" && emake ) || die
+}
+
+src_install() {
+   MAKEOPTS+=" -j1" default
+
+   einstalldocs
+
+   cd "${S}/c3plmod_ipc" || die
+   dolib.so libcanonc3pl.so.1.0.0
+   dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so.1"
+   dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so"
+
+   cd "${S}/data" || die
+   insinto /usr/share/caepcm
+   doins *
+
+   ABI=x86
+   cd "${S}/libs" || die
+   exeinto $(cups-config 

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

2018-09-28 Thread Mikle Kolyada
commit: 65c6b356669d73cf07853d8dee38c50da9f6631e
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Sep 28 11:48:46 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Sep 28 11:48:46 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=65c6b356

net-print/cndrvcups-common-lb: amd64 stable wrt bug #666276

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.50.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.50.ebuild 
b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.50.ebuild
index 3940f90..ab5de5466e5 100644
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.50.ebuild
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.50.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="http://gdlp01.c-wss.com/gds/0/019240/01/${SOURCES_NAME}.tar.gz;
 # GPL-2 License inside LICENSE-EN.txt files
 LICENSE="Canon-UFR-II GPL-2 MIT"
 SLOT="0"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 RDEPEND="



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

2018-09-15 Thread Pacho Ramos
commit: 4490d4e9eca48b9b22d41f68e2268317063aeda4
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Sep 15 11:55:31 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Sep 15 11:58:21 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4490d4e9

net-print/cndrvcups-common-lb: Try to not create symlinks, bug #642138

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 .../cndrvcups-common-lb-3.50-r1.ebuild | 115 +
 1 file changed, 115 insertions(+)

diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.50-r1.ebuild 
b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.50-r1.ebuild
new file mode 100644
index 000..2a20a651679
--- /dev/null
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.50-r1.ebuild
@@ -0,0 +1,115 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools versionator
+
+MY_PV="$(delete_all_version_separators)"
+SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken"
+
+DESCRIPTION="Common files for Canon drivers"
+HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/imagerunner-1133.aspx?type=drivers=EN=LINUX;
+SRC_URI="http://gdlp01.c-wss.com/gds/0/019240/01/${SOURCES_NAME}.tar.gz;
+
+# GPL-2 License inside LICENSE-EN.txt files
+LICENSE="Canon-UFR-II GPL-2 MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+   >=dev-libs/libxml2-2.6:2
+   >=gnome-base/libglade-2.4:2.0
+   >=net-print/cups-1.1.17
+   >=x11-libs/gtk+-2.4:2
+"
+DEPEND="${DEPEND}"
+
+S="${WORKDIR}/${SOURCES_NAME}/Sources/${P/-lb-${PV}/-3.90}"
+
+pkg_setup() {
+   # Don't raise a fuss over pre-built binaries
+   QA_PREBUILT="
+   /usr/libexec/cups/filter/c3pldrv
+   /usr/$(get_abi_LIBDIR x86)/libColorGear.so.0.0.0
+   /usr/$(get_abi_LIBDIR x86)/libColorGearC.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libc3pl.so.0.0.1
+   /usr/$(get_abi_LIBDIR x86)/libcaepcm.so.1.0
+   /usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libcaiowrap.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libcanon_slim.so.1.0.0
+   /usr/$(get_libdir)/libcanonc3pl.so.1.0.0
+   "
+   QA_SONAME="
+   /usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
+   "
+}
+
+src_unpack() {
+   unpack ${A}
+   cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die
+   unpack ./${P/-lb-${PV}/-3.90}-1.tar.gz
+}
+
+change_dir() {
+   for i in cngplp buftool backend; do
+   cd "${i}" || die
+   "${@}"
+   cd "${S}" || die
+   done
+}
+
+src_prepare() {
+   default
+   sed -i -e \
+   "s:backenddir = \$(libdir)/cups/backend:backenddir = 
`cups-config --serverbin`/backend:" \
+   backend/Makefile.am || die
+
+   export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"
+   change_dir eautoreconf
+}
+
+src_configure() {
+   change_dir econf
+}
+
+src_compile() {
+   change_dir emake
+
+   # Cannot be moved to 'change_dir' as it doesn't need eautoreconf
+   ( cd "${S}/c3plmod_ipc" && emake ) || die
+}
+
+src_install() {
+   MAKEOPTS+=" -j1" default
+
+   einstalldocs
+
+   cd "${S}/c3plmod_ipc" || die
+   dolib.so libcanonc3pl.so.1.0.0
+   dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so.1"
+   dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so"
+
+   cd "${S}/data" || die
+   insinto /usr/share/caepcm
+   doins *
+
+   ABI=x86
+   cd "${S}/libs" || die
+   exeinto $(cups-config --serverbin)/filter
+   doexe c3pldrv
+   dolib.so libcaepcm.so.1.0
+   dosym libcaepcm.so.1.0 "/usr/$(get_libdir)/libcaepcm.so.1"
+   dosym libcaepcm.so.1.0 "/usr/$(get_libdir)/libcaepcm.so"
+   for lib in *.so.?.?.?; do
+   dolib.so "${lib}"
+   dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?}"
+   dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?.?}"
+   done
+
+   # c3pldrv dlopens the absolute path /usr/lib/libc3pl.so :(, bug #
+   # # Skipped for now due to bug #642138
+#  if [[ "$(get_libdir)" != lib ]]; then
+#  dosym "../$(get_libdir)/libc3pl.so" /usr/lib/libc3pl.so
+#  fi
+}



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

2018-02-27 Thread Pacho Ramos
commit: 21b57d458d61f4c2f591f8b0988b8b69a6f91941
Author: Pacho Ramos  gentoo  org>
AuthorDate: Tue Feb 27 19:25:26 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Tue Feb 27 19:29:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=21b57d45

net-print/cndrvcups-common-lb: Version bump, fixing compat with glibc-2.26 
(#637682)

Package-Manager: Portage-2.3.24, Repoman-2.3.6

 net-print/cndrvcups-common-lb/Manifest |   1 +
 .../cndrvcups-common-lb-3.50.ebuild| 114 +
 2 files changed, 115 insertions(+)

diff --git a/net-print/cndrvcups-common-lb/Manifest 
b/net-print/cndrvcups-common-lb/Manifest
index 897a01b4ad8..e1a0ef78f7b 100644
--- a/net-print/cndrvcups-common-lb/Manifest
+++ b/net-print/cndrvcups-common-lb/Manifest
@@ -1 +1,2 @@
 DIST linux-UFRII-drv-v340-uken.tar.gz 117746329 BLAKE2B 
fafdddedd1b09f33742ae55dfb41994ad3ac6ef5a8c9dc7e7b2a87ec8f5596f1079aead966a89f366c7548cc730328dc594b04747e7946560f83d6df2716d73f
 SHA512 
05f12d2cac5ae9987fe389be1a15b11d280734f6d47b86f04fa2fcb61bf94175b7afdba4cc1cf5ecf2c1ef5a8e2c14eda5d72f7671618d7c94581c620fea4494
+DIST linux-UFRII-drv-v350-uken.tar.gz 116120579 BLAKE2B 
fa5f521f4eec375fa0d9efb7b47ff6dd88f47c36fa5750818f7e367058b8ccafce99b9f8f9d9195e1e5e0e2f1b77a7c0cc1524786f111b065204d0472601202b
 SHA512 
2eeb1448cb76ac156e1e5f6df46141ee5605b0bed1c25f31b0f039fb9f579fe3d5732b132cae391e78276c550febc19366f958d1fb53c93f955303f1f5c37ab3

diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.50.ebuild 
b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.50.ebuild
new file mode 100644
index 000..3aac9be9708
--- /dev/null
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.50.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools versionator
+
+MY_PV="$(delete_all_version_separators)"
+SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken"
+
+DESCRIPTION="Common files for Canon drivers"
+HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/imagerunner-1133.aspx?type=drivers=EN=LINUX;
+SRC_URI="http://gdlp01.c-wss.com/gds/0/019240/01/${SOURCES_NAME}.tar.gz;
+
+# GPL-2 License inside LICENSE-EN.txt files
+LICENSE="Canon-UFR-II GPL-2 MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+   >=dev-libs/libxml2-2.6:2
+   >=gnome-base/libglade-2.4:2.0
+   >=net-print/cups-1.1.17
+   >=x11-libs/gtk+-2.4:2
+"
+DEPEND="${DEPEND}"
+
+S="${WORKDIR}/${SOURCES_NAME}/Sources/${P/-lb-${PV}/-3.90}"
+
+pkg_setup() {
+   # Don't raise a fuss over pre-built binaries
+   QA_PREBUILT="
+   /usr/libexec/cups/filter/c3pldrv
+   /usr/$(get_abi_LIBDIR x86)/libColorGear.so.0.0.0
+   /usr/$(get_abi_LIBDIR x86)/libColorGearC.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libc3pl.so.0.0.1
+   /usr/$(get_abi_LIBDIR x86)/libcaepcm.so.1.0
+   /usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libcaiowrap.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libcanon_slim.so.1.0.0
+   /usr/$(get_libdir)/libcanonc3pl.so.1.0.0
+   "
+   QA_SONAME="
+   /usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
+   "
+}
+
+src_unpack() {
+   unpack ${A}
+   cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die
+   unpack ./${P/-lb-${PV}/-3.90}-1.tar.gz
+}
+
+change_dir() {
+   for i in cngplp buftool backend; do
+   cd "${i}" || die
+   "${@}"
+   cd "${S}" || die
+   done
+}
+
+src_prepare() {
+   default
+   sed -i -e \
+   "s:backenddir = \$(libdir)/cups/backend:backenddir = 
`cups-config --serverbin`/backend:" \
+   backend/Makefile.am || die
+
+   export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"
+   change_dir eautoreconf
+}
+
+src_configure() {
+   change_dir econf
+}
+
+src_compile() {
+   change_dir emake
+
+   # Cannot be moved to 'change_dir' as it doesn't need eautoreconf
+   ( cd "${S}/c3plmod_ipc" && emake ) || die
+}
+
+src_install() {
+   MAKEOPTS+=" -j1" default
+
+   einstalldocs
+
+   cd "${S}/c3plmod_ipc" || die
+   dolib.so libcanonc3pl.so.1.0.0
+   dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so.1"
+   dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so"
+
+   cd "${S}/data" || die
+   insinto /usr/share/caepcm
+   doins *
+
+   ABI=x86
+   cd "${S}/libs" || die
+   exeinto $(cups-config --serverbin)/filter
+   doexe c3pldrv
+   dolib.so libcaepcm.so.1.0
+   dosym libcaepcm.so.1.0 "/usr/$(get_libdir)/libcaepcm.so.1"
+   dosym libcaepcm.so.1.0 "/usr/$(get_libdir)/libcaepcm.so"
+   for lib in *.so.?.?.?; do
+   dolib.so "${lib}"
+   dosym "${lib}" 

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

2017-09-05 Thread Pacho Ramos
commit: 3f335619f89298fcb01671a5c5049e365a9d300c
Author: Pacho Ramos  gentoo  org>
AuthorDate: Tue Sep  5 18:34:22 2017 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Tue Sep  5 18:36:24 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f335619

net-print/cndrvcups-common-lb: amd64/x86 stable, bug #624418

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.40.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.40.ebuild 
b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.40.ebuild
index 0a35d997b50..f8318f3d2fe 100644
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.40.ebuild
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.40.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="http://gdlp01.c-wss.com/gds/8/017658/04/${SOURCES_NAME}.tar.gz;
 # GPL-2 License inside LICENSE-EN.txt files
 LICENSE="Canon-UFR-II GPL-2 MIT"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 RDEPEND="



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

2017-09-05 Thread Pacho Ramos
commit: b604f2b4f43f63316f19cacadd78172b248ecb3c
Author: Pacho Ramos  gentoo  org>
AuthorDate: Tue Sep  5 18:35:07 2017 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Tue Sep  5 18:36:29 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b604f2b4

net-print/cndrvcups-common-lb: Drop old

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-print/cndrvcups-common-lb/Manifest |   2 -
 .../cndrvcups-common-lb-3.10.ebuild| 110 
 .../cndrvcups-common-lb-3.20.ebuild| 111 -
 3 files changed, 223 deletions(-)

diff --git a/net-print/cndrvcups-common-lb/Manifest 
b/net-print/cndrvcups-common-lb/Manifest
index 6c2ff20adfd..914bbc0e36b 100644
--- a/net-print/cndrvcups-common-lb/Manifest
+++ b/net-print/cndrvcups-common-lb/Manifest
@@ -1,3 +1 @@
-DIST Linux_UFRII_PrinterDriver_V320_uk_EN.tar.gz 109548632 SHA256 
b28bc2b460aeddcb7800983d2fad8c29ea6efcc95ad767a78fe6c25d0956f242 SHA512 
fc35670a07f067b6ccdebf5b96590eafac2ed984faaa8a90ce44dd44396d6de0964f6352cae0fdf8ce1f6127ebf3ea9f6610b56ba7dd9a7f382bd1c6d588a801
 WHIRLPOOL 
661f8d6863bd1694efcc168615d9a7107e4a7aa09f5934a33b0f201b6d327038320cf87201bf4220ec876e1cca550169c91925d9f58fa3dae8dd4ea99de1ad1e
 DIST linux-UFRII-drv-v340-uken.tar.gz 117746329 SHA256 
fb3701f564f987126a9a3d03a163951f3182d6f7d626530a6767cb1f996fa203 SHA512 
05f12d2cac5ae9987fe389be1a15b11d280734f6d47b86f04fa2fcb61bf94175b7afdba4cc1cf5ecf2c1ef5a8e2c14eda5d72f7671618d7c94581c620fea4494
 WHIRLPOOL 
d17dacb98b6ea39d62822a4dd379fb6f8abc900243476893869e0d3a3d1ce1504cb5866d16f775bc006e94a3aeb726912a4c58faa50bf9f390e270482f20512e
-DIST o1581en_linux_UFRII_v300.zip 94262679 SHA256 
1ec1b162411642dc1814608ec71a3b94d6e22ede234f6b750bbdfd3820d5ac46 SHA512 
e31415f2e9256c5dc98e27afe3bdc2f75b852d0a99721f8f2ac78225bac497e84c6ce94e8447f3aed6bb6c94975c7625f0dbb2647be44f90c144a46e9af89b81
 WHIRLPOOL 
f419d6130ce9cfd87caebc9678991bbd46e2db5f8bb5a39fb8202a7532de33e969f4f907f2f1404859f987c57f49f562defcec42380ea1b4f284b8d4c6cae3e6

diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.10.ebuild 
b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.10.ebuild
deleted file mode 100644
index 7e13ca2bb19..000
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.10.ebuild
+++ /dev/null
@@ -1,110 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit autotools multilib versionator
-
-DESCRIPTION="Common files for Canon drivers"
-HOMEPAGE="http://software.canon-europe.com/software/0046530.asp;
-SRC_URI="http://files.canon-europe.com/files/soft46530/software/o1581en_linux_UFRII_v300.zip;
-
-LICENSE="Canon-UFR-II GPL-2 MIT"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-# Needed because GPL2 stuff miss their sources in tarball
-RESTRICT="mirror"
-
-RDEPEND="
-   dev-libs/libxml2
-   gnome-base/libglade
-   net-print/cups
-   x11-libs/gtk+:2
-"
-DEPEND="${DEPEND}"
-
-S="${WORKDIR}/uk_eng/Sources/${P}"
-
-# Don't raise a fuss over pre-built binaries
-QA_PREBUILT="
-   /usr/libexec/cups/filter/c3pldrv
-   /usr/$(get_abi_LIBDIR x86)/libColorGear.so.0.0.0
-   /usr/$(get_abi_LIBDIR x86)/libColorGearC.so.0.0.0
-   /usr/$(get_abi_LIBDIR x86)/libc3pl.so.0.0.1
-   /usr/$(get_abi_LIBDIR x86)/libcaepcm.so.1.0
-   /usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
-   /usr/$(get_abi_LIBDIR x86)/libcaiowrap.so.1.0.0
-   /usr/$(get_abi_LIBDIR x86)/libcanon_slim.so.1.0.0
-   /usr/$(get_libdir)/libcanonc3pl.so.1.0.0
-"
-QA_SONAME="/usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0"
-
-S="${WORKDIR}/uk_eng/Sources/${P//-lb}"
-
-src_unpack() {
-   unpack ${A}
-   cd "${WORKDIR}/uk_eng/Sources/"
-   unpack ./${P//-lb}-1.tar.gz
-}
-
-change_dir() {
-   for i in cngplp buftool backend; do
-   cd "${i}"
-   "${@}"
-   cd "${S}"
-   done
-}
-
-src_prepare() {
-   sed -i -e \
-   "s:backenddir = \$(libdir)/cups/backend:backenddir = 
`cups-config --serverbin`/backend:" \
-   backend/Makefile.am || die
-
-   export "LIBS=-lgmodule-2.0"
-   change_dir eautoreconf
-}
-
-src_configure() {
-   change_dir econf
-}
-
-src_compile() {
-   change_dir emake
-
-   # Cannot be moved to 'change_dir' as it doesn't need eautoreconf
-   cd "${S}/c3plmod_ipc" && emake
-}
-
-src_install() {
-   MAKEOPTS+=" -j1" default
-
-   einstalldocs
-
-   cd "${S}/c3plmod_ipc"
-   dolib.so libcanonc3pl.so.1.0.0
-   dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so.1"
-   dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so"
-
-   cd "${S}/data"
-   insinto /usr/share/caepcm
-   doins *
-
-   ABI=x86
-   cd "${S}/libs"
-   exeinto $(cups-config --serverbin)/filter
-   doexe c3pldrv
-   dolib.so libcaepcm.so.1.0
-   dosym 

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

2017-07-27 Thread Pacho Ramos
commit: 8d63eec27cec9bf967acfc1ff01a4ace15a7ab91
Author: Pacho Ramos  gentoo  org>
AuthorDate: Thu Jul 27 08:34:37 2017 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Thu Jul 27 08:34:37 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d63eec2

net-print/cndrvcups-common-lb: Version bump

Package-Manager: Portage-2.3.6, Repoman-2.3.2

 net-print/cndrvcups-common-lb/Manifest |   1 +
 .../cndrvcups-common-lb-3.40.ebuild| 114 +
 2 files changed, 115 insertions(+)

diff --git a/net-print/cndrvcups-common-lb/Manifest 
b/net-print/cndrvcups-common-lb/Manifest
index 9834de0cb88..6c2ff20adfd 100644
--- a/net-print/cndrvcups-common-lb/Manifest
+++ b/net-print/cndrvcups-common-lb/Manifest
@@ -1,2 +1,3 @@
 DIST Linux_UFRII_PrinterDriver_V320_uk_EN.tar.gz 109548632 SHA256 
b28bc2b460aeddcb7800983d2fad8c29ea6efcc95ad767a78fe6c25d0956f242 SHA512 
fc35670a07f067b6ccdebf5b96590eafac2ed984faaa8a90ce44dd44396d6de0964f6352cae0fdf8ce1f6127ebf3ea9f6610b56ba7dd9a7f382bd1c6d588a801
 WHIRLPOOL 
661f8d6863bd1694efcc168615d9a7107e4a7aa09f5934a33b0f201b6d327038320cf87201bf4220ec876e1cca550169c91925d9f58fa3dae8dd4ea99de1ad1e
+DIST linux-UFRII-drv-v340-uken.tar.gz 117746329 SHA256 
fb3701f564f987126a9a3d03a163951f3182d6f7d626530a6767cb1f996fa203 SHA512 
05f12d2cac5ae9987fe389be1a15b11d280734f6d47b86f04fa2fcb61bf94175b7afdba4cc1cf5ecf2c1ef5a8e2c14eda5d72f7671618d7c94581c620fea4494
 WHIRLPOOL 
d17dacb98b6ea39d62822a4dd379fb6f8abc900243476893869e0d3a3d1ce1504cb5866d16f775bc006e94a3aeb726912a4c58faa50bf9f390e270482f20512e
 DIST o1581en_linux_UFRII_v300.zip 94262679 SHA256 
1ec1b162411642dc1814608ec71a3b94d6e22ede234f6b750bbdfd3820d5ac46 SHA512 
e31415f2e9256c5dc98e27afe3bdc2f75b852d0a99721f8f2ac78225bac497e84c6ce94e8447f3aed6bb6c94975c7625f0dbb2647be44f90c144a46e9af89b81
 WHIRLPOOL 
f419d6130ce9cfd87caebc9678991bbd46e2db5f8bb5a39fb8202a7532de33e969f4f907f2f1404859f987c57f49f562defcec42380ea1b4f284b8d4c6cae3e6

diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.40.ebuild 
b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.40.ebuild
new file mode 100644
index 000..0a35d997b50
--- /dev/null
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.40.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools versionator
+
+MY_PV="$(delete_all_version_separators)"
+SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken"
+
+DESCRIPTION="Common files for Canon drivers"
+HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/imagerunner-1133.aspx?type=drivers=EN=LINUX;
+SRC_URI="http://gdlp01.c-wss.com/gds/8/017658/04/${SOURCES_NAME}.tar.gz;
+
+# GPL-2 License inside LICENSE-EN.txt files
+LICENSE="Canon-UFR-II GPL-2 MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+   dev-libs/libxml2
+   gnome-base/libglade
+   net-print/cups
+   x11-libs/gtk+:2
+"
+DEPEND="${DEPEND}"
+
+S="${WORKDIR}/${SOURCES_NAME}/Sources/${P/-lb-${PV}/-3.80}"
+
+pkg_setup() {
+   # Don't raise a fuss over pre-built binaries
+   QA_PREBUILT="
+   /usr/libexec/cups/filter/c3pldrv
+   /usr/$(get_abi_LIBDIR x86)/libColorGear.so.0.0.0
+   /usr/$(get_abi_LIBDIR x86)/libColorGearC.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libc3pl.so.0.0.1
+   /usr/$(get_abi_LIBDIR x86)/libcaepcm.so.1.0
+   /usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libcaiowrap.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libcanon_slim.so.1.0.0
+   /usr/$(get_libdir)/libcanonc3pl.so.1.0.0
+   "
+   QA_SONAME="
+   /usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
+   "
+}
+
+src_unpack() {
+   unpack ${A}
+   cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die
+   unpack ./${P/-lb-${PV}/-3.80}-1.tar.gz
+}
+
+change_dir() {
+   for i in cngplp buftool backend; do
+   cd "${i}" || die
+   "${@}"
+   cd "${S}" || die
+   done
+}
+
+src_prepare() {
+   default
+   sed -i -e \
+   "s:backenddir = \$(libdir)/cups/backend:backenddir = 
`cups-config --serverbin`/backend:" \
+   backend/Makefile.am || die
+
+   export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"
+   change_dir eautoreconf
+}
+
+src_configure() {
+   change_dir econf
+}
+
+src_compile() {
+   change_dir emake
+
+   # Cannot be moved to 'change_dir' as it doesn't need eautoreconf
+   ( cd "${S}/c3plmod_ipc" && emake ) || die
+}
+
+src_install() {
+   MAKEOPTS+=" -j1" default
+
+   einstalldocs
+
+   cd "${S}/c3plmod_ipc" || die
+   dolib.so libcanonc3pl.so.1.0.0
+   dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so.1"
+   dosym libcanonc3pl.so.1.0.0 

[gentoo-commits] repo/gentoo:master commit in: net-print/cndrvcups-common-lb/, net-print/cndrvcups-lb/

2016-06-26 Thread Patrice Clement
commit: c5052773aa102138bfbbdedb756a50ee6e94e934
Author: Leho Kraav  kraav  com>
AuthorDate: Sat Jun 25 16:53:52 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sun Jun 26 09:39:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5052773

net-print/cndrvcups-lb: Version bump to 3.20.

This new version supports the MF620C series and a lot more new models.
Upstream driver file format reverted back to the one used in 2.90, which
is why it's the bump subject.

Closes: https://github.com/gentoo/gentoo/pull/1700

Signed-off-by: Patrice Clement  gentoo.org>

 net-print/cndrvcups-common-lb/Manifest   |  2 +-
 ...on-lb-2.90.ebuild => cndrvcups-common-lb-3.20.ebuild} | 16 
 net-print/cndrvcups-lb/Manifest  |  2 +-
 ...cndrvcups-lb-2.90.ebuild => cndrvcups-lb-3.20.ebuild} | 12 ++--
 4 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/net-print/cndrvcups-common-lb/Manifest 
b/net-print/cndrvcups-common-lb/Manifest
index 0714db8..a5ddc60 100644
--- a/net-print/cndrvcups-common-lb/Manifest
+++ b/net-print/cndrvcups-common-lb/Manifest
@@ -1,2 +1,2 @@
-DIST Linux_UFRII_PrinterDriver_V290_uk_EN.tar.gz 90901373 SHA256 
bcc9db26e261d239438aeb15f171b5b0e7fd305abd0729be0e806bb4c039654a SHA512 
23181155f5719fa0a9c216c058be749b5faaa8ee745d260eba2e5e284ef4ff161e344289a7c301a2d74cc919c5031763b0daf41cd07686cfdce188492a9b34b2
 WHIRLPOOL 
82bb966d823f8019d6275d421ebd2ff848556415e1767bd8fc2638d97479e15029a48818e5b45e9210781f4f37fd269dde46763404314b6c47ee0b4670e03600
+DIST Linux_UFRII_PrinterDriver_V320_uk_EN.tar.gz 90901373 SHA256 
bcc9db26e261d239438aeb15f171b5b0e7fd305abd0729be0e806bb4c039654a SHA512 
23181155f5719fa0a9c216c058be749b5faaa8ee745d260eba2e5e284ef4ff161e344289a7c301a2d74cc919c5031763b0daf41cd07686cfdce188492a9b34b2
 WHIRLPOOL 
82bb966d823f8019d6275d421ebd2ff848556415e1767bd8fc2638d97479e15029a48818e5b45e9210781f4f37fd269dde46763404314b6c47ee0b4670e03600
 DIST o1581en_linux_UFRII_v300.zip 94262679 SHA256 
1ec1b162411642dc1814608ec71a3b94d6e22ede234f6b750bbdfd3820d5ac46 SHA512 
e31415f2e9256c5dc98e27afe3bdc2f75b852d0a99721f8f2ac78225bac497e84c6ce94e8447f3aed6bb6c94975c7625f0dbb2647be44f90c144a46e9af89b81
 WHIRLPOOL 
f419d6130ce9cfd87caebc9678991bbd46e2db5f8bb5a39fb8202a7532de33e969f4f907f2f1404859f987c57f49f562defcec42380ea1b4f284b8d4c6cae3e6

diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-2.90.ebuild 
b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.20.ebuild
similarity index 91%
rename from net-print/cndrvcups-common-lb/cndrvcups-common-lb-2.90.ebuild
rename to net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.20.ebuild
index 22c2b5e..d982497 100644
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-2.90.ebuild
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.20.ebuild
@@ -14,7 +14,7 @@ 
SRC_URI="http://pdisp01.c-wss.com/gdl/WWUFORedirectTarget.do?id=MDEwMDAwMjcwODEx
 
 LICENSE="Canon-UFR-II GPL-2 MIT"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+KEYWORDS="-* ~amd64 ~x86"
 IUSE=""
 
 # Needed because GPL2 stuff miss their sources in tarball
@@ -46,15 +46,15 @@ QA_SONAME="/usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0"
 
 src_unpack() {
unpack ${A}
-   cd "${WORKDIR}/${SOURCES_NAME}/Sources/"
+   cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die
unpack ./${P/-lb/}-1.tar.gz
 }
 
 change_dir() {
for i in cngplp buftool backend; do
-   cd "${i}"
+   cd "${i}" || die
"${@}"
-   cd "${S}"
+   cd "${S}" || die
done
 }
 
@@ -75,7 +75,7 @@ src_compile() {
change_dir emake
 
# Cannot be moved to 'change_dir' as it doesn't need eautoreconf
-   cd "${S}/c3plmod_ipc" && emake
+   ( cd "${S}/c3plmod_ipc" || die ) && emake
 }
 
 src_install() {
@@ -83,17 +83,17 @@ src_install() {
 
einstalldocs
 
-   cd "${S}/c3plmod_ipc"
+   cd "${S}/c3plmod_ipc" || die
dolib.so libcanonc3pl.so.1.0.0
dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so.1"
dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so"
 
-   cd "${S}/data"
+   cd "${S}/data" || die
insinto /usr/share/caepcm
doins *
 
ABI=x86
-   cd "${S}/libs"
+   cd "${S}/libs" || die
exeinto $(cups-config --serverbin)/filter
doexe c3pldrv
dolib.so libcaepcm.so.1.0

diff --git a/net-print/cndrvcups-lb/Manifest b/net-print/cndrvcups-lb/Manifest
index 0714db8..a5ddc60 100644
--- a/net-print/cndrvcups-lb/Manifest
+++ b/net-print/cndrvcups-lb/Manifest
@@ -1,2 +1,2 @@
-DIST Linux_UFRII_PrinterDriver_V290_uk_EN.tar.gz 90901373 SHA256 
bcc9db26e261d239438aeb15f171b5b0e7fd305abd0729be0e806bb4c039654a SHA512 
23181155f5719fa0a9c216c058be749b5faaa8ee745d260eba2e5e284ef4ff161e344289a7c301a2d74cc919c5031763b0daf41cd07686cfdce188492a9b34b2
 WHIRLPOOL 

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

2015-12-31 Thread Pacho Ramos
commit: fb9d588866857f76fb9f6ff3c828bd2f2ab497cd
Author: Pacho Ramos  gentoo  org>
AuthorDate: Thu Dec 31 12:37:52 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Thu Dec 31 12:37:52 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fb9d5888

net-print/cndrvcups-common-lb: stabilize

Package-Manager: portage-2.2.26

 net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.10.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.10.ebuild 
b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.10.ebuild
index 0ed0e99..6df0226 100644
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.10.ebuild
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.10.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="http://files.canon-europe.com/files/soft46530/software/o1581en_linux_UF
 
 LICENSE="Canon-UFR-II GPL-2 MIT"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 # Needed because GPL2 stuff miss their sources in tarball



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

2015-11-21 Thread Pacho Ramos
commit: 3f28d5d1c1ac4562ec14213187f451ee09e7cf82
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Nov 21 11:25:59 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Nov 21 11:26:54 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3f28d5d1

net-print/cndrvcups-common-lb: Version bump (#565606 by Kalin KOZHUHAROV)

Package-Manager: portage-2.2.24

 net-print/cndrvcups-common-lb/Manifest |   1 +
 .../cndrvcups-common-lb-3.10.ebuild| 111 +
 2 files changed, 112 insertions(+)

diff --git a/net-print/cndrvcups-common-lb/Manifest 
b/net-print/cndrvcups-common-lb/Manifest
index 19c82e7..0714db8 100644
--- a/net-print/cndrvcups-common-lb/Manifest
+++ b/net-print/cndrvcups-common-lb/Manifest
@@ -1 +1,2 @@
 DIST Linux_UFRII_PrinterDriver_V290_uk_EN.tar.gz 90901373 SHA256 
bcc9db26e261d239438aeb15f171b5b0e7fd305abd0729be0e806bb4c039654a SHA512 
23181155f5719fa0a9c216c058be749b5faaa8ee745d260eba2e5e284ef4ff161e344289a7c301a2d74cc919c5031763b0daf41cd07686cfdce188492a9b34b2
 WHIRLPOOL 
82bb966d823f8019d6275d421ebd2ff848556415e1767bd8fc2638d97479e15029a48818e5b45e9210781f4f37fd269dde46763404314b6c47ee0b4670e03600
+DIST o1581en_linux_UFRII_v300.zip 94262679 SHA256 
1ec1b162411642dc1814608ec71a3b94d6e22ede234f6b750bbdfd3820d5ac46 SHA512 
e31415f2e9256c5dc98e27afe3bdc2f75b852d0a99721f8f2ac78225bac497e84c6ce94e8447f3aed6bb6c94975c7625f0dbb2647be44f90c144a46e9af89b81
 WHIRLPOOL 
f419d6130ce9cfd87caebc9678991bbd46e2db5f8bb5a39fb8202a7532de33e969f4f907f2f1404859f987c57f49f562defcec42380ea1b4f284b8d4c6cae3e6

diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.10.ebuild 
b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.10.ebuild
new file mode 100644
index 000..0ed0e99
--- /dev/null
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.10.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit autotools multilib versionator
+
+DESCRIPTION="Common files for Canon drivers"
+HOMEPAGE="http://software.canon-europe.com/software/0046530.asp;
+SRC_URI="http://files.canon-europe.com/files/soft46530/software/o1581en_linux_UFRII_v300.zip;
+
+LICENSE="Canon-UFR-II GPL-2 MIT"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+# Needed because GPL2 stuff miss their sources in tarball
+RESTRICT="mirror"
+
+RDEPEND="
+   dev-libs/libxml2
+   gnome-base/libglade
+   net-print/cups
+   x11-libs/gtk+:2
+"
+DEPEND="${DEPEND}"
+
+S="${WORKDIR}/uk_eng/Sources/${P}"
+
+# Don't raise a fuss over pre-built binaries
+QA_PREBUILT="
+   /usr/libexec/cups/filter/c3pldrv
+   /usr/$(get_abi_LIBDIR x86)/libColorGear.so.0.0.0
+   /usr/$(get_abi_LIBDIR x86)/libColorGearC.so.0.0.0
+   /usr/$(get_abi_LIBDIR x86)/libc3pl.so.0.0.1
+   /usr/$(get_abi_LIBDIR x86)/libcaepcm.so.1.0
+   /usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libcaiowrap.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libcanon_slim.so.1.0.0
+   /usr/$(get_libdir)/libcanonc3pl.so.1.0.0
+"
+QA_SONAME="/usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0"
+
+S="${WORKDIR}/uk_eng/Sources/${P//-lb}"
+
+src_unpack() {
+   unpack ${A}
+   cd "${WORKDIR}/uk_eng/Sources/"
+   unpack ./${P//-lb}-1.tar.gz
+}
+
+change_dir() {
+   for i in cngplp buftool backend; do
+   cd "${i}"
+   "${@}"
+   cd "${S}"
+   done
+}
+
+src_prepare() {
+   sed -i -e \
+   "s:backenddir = \$(libdir)/cups/backend:backenddir = 
`cups-config --serverbin`/backend:" \
+   backend/Makefile.am || die
+
+   export "LIBS=-lgmodule-2.0"
+   change_dir eautoreconf
+}
+
+src_configure() {
+   change_dir econf
+}
+
+src_compile() {
+   change_dir emake
+
+   # Cannot be moved to 'change_dir' as it doesn't need eautoreconf
+   cd "${S}/c3plmod_ipc" && emake
+}
+
+src_install() {
+   MAKEOPTS+=" -j1" default
+
+   einstalldocs
+
+   cd "${S}/c3plmod_ipc"
+   dolib.so libcanonc3pl.so.1.0.0
+   dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so.1"
+   dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so"
+
+   cd "${S}/data"
+   insinto /usr/share/caepcm
+   doins *
+
+   ABI=x86
+   cd "${S}/libs"
+   exeinto $(cups-config --serverbin)/filter
+   doexe c3pldrv
+   dolib.so libcaepcm.so.1.0
+   dosym libcaepcm.so.1.0 "/usr/$(get_libdir)/libcaepcm.so.1"
+   dosym libcaepcm.so.1.0 "/usr/$(get_libdir)/libcaepcm.so"
+   for lib in *.so.?.?.?; do
+   dolib.so "${lib}"
+   dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?}"
+   dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?.?}"
+   done
+
+   # c3pldrv dlopens the absolute path /usr/lib/libc3pl.so :(
+   if [[ "$(get_libdir)" != lib ]]; then
+   dosym