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

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

net-print/cndrvcups-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-lb/cndrvcups-lb-3.70.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-3.70.ebuild 
b/net-print/cndrvcups-lb/cndrvcups-lb-3.70.ebuild
index 565d211983c3..213654649d2b 100644
--- a/net-print/cndrvcups-lb/cndrvcups-lb-3.70.ebuild
+++ b/net-print/cndrvcups-lb/cndrvcups-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="Canon UFR II / LIPSLX Printer Driver for Linux"
-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}"
 



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

2021-04-11 Thread Sam James
commit: 4e2bf558f3a0761257d0c9776bfd112015855f64
Author: Sam James  gentoo  org>
AuthorDate: Mon Apr 12 00:50:25 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Mon Apr 12 01:07:38 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4e2bf558

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

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

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

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



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

2021-04-02 Thread Sam James
commit: 9e675c9e17f6a7fe31408b60411b5b9b92a69018
Author: Sam James  gentoo  org>
AuthorDate: Fri Apr  2 11:17:44 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Fri Apr  2 14:00:02 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e675c9e

net-print/cndrvcups-lb: fix DEPEND typo

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

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

diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-3.70.ebuild 
b/net-print/cndrvcups-lb/cndrvcups-lb-3.70.ebuild
index 79bcf17c840..6c1206f26eb 100644
--- a/net-print/cndrvcups-lb/cndrvcups-lb-3.70.ebuild
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-3.70.ebuild
@@ -2,6 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit autotools
 
 MY_PV="$(ver_rs 1- '')"
@@ -10,6 +11,7 @@ SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken"
 DESCRIPTION="Canon UFR II / LIPSLX Printer Driver for Linux"
 
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}"
 
 LICENSE="Canon-UFR-II"
 SLOT="0"
@@ -23,10 +25,7 @@ RDEPEND="
~net-print/cndrvcups-common-lb-${PV}
>=x11-libs/gtk+-2.4:2
 "
-DEPEND="${DEPEND}"
-BDEPEND=""
-
-S="${WORKDIR}/${SOURCES_NAME}/Sources/${P}"
+DEPEND="${RDEPEND}"
 
 MAKEOPTS+=" -j1"
 
@@ -79,7 +78,7 @@ src_install() {
default
einstalldocs
 
-   find "${D}" -name '*.la' -type f -delete || die
+   find "${ED}" -name '*.la' -type f -delete || die
 
insinto /usr/share/cups/model
doins ppd/*.ppd



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

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

net-print/cndrvcups-lb: drop 3.60-r2

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

 net-print/cndrvcups-lb/Manifest|   1 -
 net-print/cndrvcups-lb/cndrvcups-lb-3.60-r2.ebuild | 111 -
 2 files changed, 112 deletions(-)

diff --git a/net-print/cndrvcups-lb/Manifest b/net-print/cndrvcups-lb/Manifest
index 225fe9561f2..b8b441732ad 100644
--- a/net-print/cndrvcups-lb/Manifest
+++ b/net-print/cndrvcups-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-lb/cndrvcups-lb-3.60-r2.ebuild 
b/net-print/cndrvcups-lb/cndrvcups-lb-3.60-r2.ebuild
deleted file mode 100644
index ec74c2e7a0e..000
--- a/net-print/cndrvcups-lb/cndrvcups-lb-3.60-r2.ebuild
+++ /dev/null
@@ -1,111 +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="Canon UFR II / LIPSLX Printer Driver for Linux"
-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";
-
-LICENSE="Canon-UFR-II"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-RDEPEND="
-   >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
-   >=gnome-base/libglade-2.4:2.0
-   >=net-print/cups-1.1.17
-   ~net-print/cndrvcups-common-lb-${PV}
-   >=x11-libs/gtk+-2.4:2
-"
-DEPEND="${DEPEND}"
-
-S="${WORKDIR}/${SOURCES_NAME}/Sources/${P}"
-
-MAKEOPTS+=" -j1"
-
-pkg_setup() {
-   # Don't raise a fuss over pre-built binaries
-   QA_PREBUILT="
-   /usr/bin/cnpkbidi
-   /usr/bin/cnpkmoduleufr2
-   /usr/$(get_abi_LIBDIR x86)/libEnoJPEG.so.1.0.0
-   /usr/$(get_abi_LIBDIR x86)/libEnoJBIG.so.1.0.0
-   /usr/$(get_abi_LIBDIR x86)/libufr2filter.so.1.0.0
-   /usr/$(get_abi_LIBDIR x86)/libcnlbcm.so.1.0
-   /usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0
-   /usr/$(get_abi_LIBDIR x86)/libcanonufr2.so.1.0.0
-   "
-   QA_SONAME="/usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0"
-}
-
-src_unpack() {
-   unpack ${A}
-   cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die
-   unpack ./${P}-1.tar.gz
-}
-
-change_dir() {
-   for i in pstoufr2cpca cngplp cngplp/files cpca ; do
-   cd "${i}" || die
-   "${@}"
-   cd "${S}" || die
-   done
-}
-
-src_prepare() {
-   default
-   sed -i -e \
-   "s:filterdir = \$(libdir)/cups/filter:filterdir = `cups-config 
--serverbin`/filter:" \
-   pstoufr2cpca/filter/Makefile.am || die
-
-   export "LIBS=-lgmodule-2.0"
-   change_dir eautoreconf
-}
-
-src_configure() {
-   change_dir econf
-}
-
-src_install() {
-   default
-   einstalldocs
-
-   find "${D}" -name '*.la' -delete || die
-
-   insinto /usr/share/cups/model
-   doins ppd/*.ppd
-
-   cd "${S}/data" || die
-   insinto /usr/share/caepcm
-   doins *
-
-   cd "${S}/libs" || die
-   insinto /usr/share/cnpkbidi
-   doins cnpkbidi_info*
-
-   insinto /usr/share/ufr2filter
-   doins ThLB*
-
-   ABI=x86
-   dobin cnpkbidi cnpkmoduleufr2
-   dolib.so libcnlbcm.so.1.0
-   dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.so.1"
-   dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.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/libcnlbcm.so :(, bug #
-   # Only needed with SYMLINK_LIB=yes #642138
-   if [[ "$(get_libdir)" != lib ]] && [[ ${SYMLINK_LIB} = yes ]]; then
-   dosym "../$(get_libdir)/libcnlbcm.so" /usr/lib/libcnlbcm.so
-   fi
-}



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

2021-01-07 Thread Sam James
commit: ad2e1d931bcf33453d21833d2099dc638a04acd1
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan  7 18:56:34 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan  7 18:56:34 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ad2e1d93

net-print/cndrvcups-lb: Stabilize 3.70 amd64, #764293

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

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

diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-3.70.ebuild 
b/net-print/cndrvcups-lb/cndrvcups-lb-3.70.ebuild
index a9b04930f32..79bcf17c840 100644
--- a/net-print/cndrvcups-lb/cndrvcups-lb-3.70.ebuild
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-3.70.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="http://gdlp01.c-wss.com/gds/8/017658/08/${SOURCES_NAME}-05.tar.gz";
 
 LICENSE="Canon-UFR-II"
 SLOT="0"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 RDEPEND="



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

2021-01-07 Thread Sam James
commit: 0f4907c6276280eb87a68cbba34a6b663765f0a8
Author: Sam James  gentoo  org>
AuthorDate: Thu Jan  7 17:34:30 2021 +
Commit: Sam James  gentoo  org>
CommitDate: Thu Jan  7 17:34:30 2021 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0f4907c6

net-print/cndrvcups-lb: Stabilize 3.70 x86, #764293

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

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

diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-3.70.ebuild 
b/net-print/cndrvcups-lb/cndrvcups-lb-3.70.ebuild
index b7afeb8bf4c..a9b04930f32 100644
--- a/net-print/cndrvcups-lb/cndrvcups-lb-3.70.ebuild
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-3.70.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ 
SRC_URI="http://gdlp01.c-wss.com/gds/8/017658/08/${SOURCES_NAME}-05.tar.gz";
 
 LICENSE="Canon-UFR-II"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 x86"
 IUSE=""
 
 RDEPEND="



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

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

net-print/cndrvcups-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-lb/metadata.xml | 5 +
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/net-print/cndrvcups-lb/metadata.xml 
b/net-print/cndrvcups-lb/metadata.xml
index f6188168081..6f49eba8f49 100644
--- a/net-print/cndrvcups-lb/metadata.xml
+++ b/net-print/cndrvcups-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-lb/

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

net-print/cndrvcups-lb: Version bump

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

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

diff --git a/net-print/cndrvcups-lb/Manifest b/net-print/cndrvcups-lb/Manifest
index a25da6d6333..225fe9561f2 100644
--- a/net-print/cndrvcups-lb/Manifest
+++ b/net-print/cndrvcups-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-lb/cndrvcups-lb-3.70.ebuild 
b/net-print/cndrvcups-lb/cndrvcups-lb-3.70.ebuild
new file mode 100644
index 000..b7afeb8bf4c
--- /dev/null
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-3.70.ebuild
@@ -0,0 +1,114 @@
+# 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="Canon UFR II / LIPSLX Printer Driver for Linux"
+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";
+
+LICENSE="Canon-UFR-II"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+   >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+   >=gnome-base/libglade-2.4:2.0
+   >=net-print/cups-1.1.17
+   ~net-print/cndrvcups-common-lb-${PV}
+   >=x11-libs/gtk+-2.4:2
+"
+DEPEND="${DEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/${SOURCES_NAME}/Sources/${P}"
+
+MAKEOPTS+=" -j1"
+
+pkg_setup() {
+   # Don't raise a fuss over pre-built binaries
+   QA_PREBUILT="
+   /usr/bin/cnpkbidi
+   /usr/bin/cnpkmoduleufr2
+   /usr/$(get_abi_LIBDIR x86)/libEnoJPEG.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libEnoJBIG.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libufr2filter.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libcnlbcm.so.1.0
+   /usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libcanonufr2.so.1.0.0
+   "
+   QA_SONAME="/usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0"
+}
+
+src_unpack() {
+   unpack ${A}
+   cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die
+   unpack ./${P}-1.tar.gz
+}
+
+change_dir() {
+   for i in buftool pstoufr2cpca cngplp cngplp/files cpca ; do
+   cd "${i}" || die
+   "${@}" || die
+   cd "${S}" || die
+   done
+}
+
+src_prepare() {
+   default
+   sed -i -e \
+   "s:filterdir = \$(libdir)/cups/filter:filterdir = `cups-config 
--serverbin`/filter:" \
+   pstoufr2cpca/filter/Makefile.am || die
+
+   export "LIBS=-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_install() {
+   default
+   einstalldocs
+
+   find "${D}" -name '*.la' -type f -delete || die
+
+   insinto /usr/share/cups/model
+   doins ppd/*.ppd
+
+   cd "${S}/data" || die
+   insinto /usr/share/caepcm
+   doins *
+
+   cd "${S}/libs" || die
+   insinto /usr/share/cnpkbidi
+   doins cnpkbidi_info*
+
+   insinto /usr/share/ufr2filter
+   doins ThLB*
+
+   ABI=x86
+   dobin cnpkbidi cnpkmoduleufr2
+   dolib.so libcnlbcm.so.1.0
+   dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.so.1"
+   dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.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/libcnlbcm.so :(, bug #
+   # Only needed with SYMLINK_LIB=yes #642138
+   if [[ "$(get_libdir)" != lib ]] && [[ ${SYMLINK_LIB} = y

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

2019-05-26 Thread David Seifert
commit: 547c162663ae1899e6c180adb5a6b105bc30c4ff
Author: David Seifert  gentoo  org>
AuthorDate: Sun May 26 20:43:47 2019 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun May 26 20:43:47 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=547c1626

net-print/cndrvcups-lb: [QA] Remove unused virtual/jpeg dependency

Package-Manager: Portage-2.3.66, Repoman-2.3.12
Signed-off-by: David Seifert  gentoo.org>

 net-print/cndrvcups-lb/cndrvcups-lb-3.60-r2.ebuild | 1 -
 1 file changed, 1 deletion(-)

diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-3.60-r2.ebuild 
b/net-print/cndrvcups-lb/cndrvcups-lb-3.60-r2.ebuild
index b345ec6eedd..ec74c2e7a0e 100644
--- a/net-print/cndrvcups-lb/cndrvcups-lb-3.60-r2.ebuild
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-3.60-r2.ebuild
@@ -22,7 +22,6 @@ RDEPEND="
>=net-print/cups-1.1.17
~net-print/cndrvcups-common-lb-${PV}
>=x11-libs/gtk+-2.4:2
-   virtual/jpeg:62[abi_x86_32(-)]
 "
 DEPEND="${DEPEND}"
 



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

2019-04-01 Thread Pacho Ramos
commit: 43135df8e270a2c862408834dee811ee53b82f64
Author: Pacho Ramos  gentoo  org>
AuthorDate: Tue Apr  2 06:39:54 2019 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Tue Apr  2 06:39:54 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=43135df8

net-print/cndrvcups-lb: Drop old

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

 net-print/cndrvcups-lb/Manifest|   1 -
 net-print/cndrvcups-lb/cndrvcups-lb-3.50-r1.ebuild | 109 
 net-print/cndrvcups-lb/cndrvcups-lb-3.50.ebuild| 108 
 net-print/cndrvcups-lb/cndrvcups-lb-3.60-r1.ebuild | 112 -
 4 files changed, 330 deletions(-)

diff --git a/net-print/cndrvcups-lb/Manifest b/net-print/cndrvcups-lb/Manifest
index 935aa7b6e66..a25da6d6333 100644
--- a/net-print/cndrvcups-lb/Manifest
+++ b/net-print/cndrvcups-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-lb/cndrvcups-lb-3.50-r1.ebuild 
b/net-print/cndrvcups-lb/cndrvcups-lb-3.50-r1.ebuild
deleted file mode 100644
index b0fc31e973c..000
--- a/net-print/cndrvcups-lb/cndrvcups-lb-3.50-r1.ebuild
+++ /dev/null
@@ -1,109 +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="Canon UFR II / LIPSLX Printer Driver for Linux"
-HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/imagerunner-1133.aspx?type=drivers&language=EN&os=LINUX";
-SRC_URI="http://gdlp01.c-wss.com/gds/0/019240/01/${SOURCES_NAME}.tar.gz";
-
-LICENSE="Canon-UFR-II"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-RDEPEND="
-   >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
-   >=gnome-base/libglade-2.4:2.0
-   >=net-print/cups-1.1.17
-   ~net-print/cndrvcups-common-lb-${PV}
-   >=x11-libs/gtk+-2.4:2
-   virtual/jpeg:62[abi_x86_32(-)]
-"
-DEPEND="${DEPEND}"
-
-S="${WORKDIR}/${SOURCES_NAME}/Sources/${P}"
-
-MAKEOPTS+=" -j1"
-
-pkg_setup() {
-   # Don't raise a fuss over pre-built binaries
-   QA_PREBUILT="
-   /usr/bin/cnpkbidi
-   /usr/bin/cnpkmoduleufr2
-   /usr/$(get_abi_LIBDIR x86)/libEnoJPEG.so.1.0.0
-   /usr/$(get_abi_LIBDIR x86)/libEnoJBIG.so.1.0.0
-   /usr/$(get_abi_LIBDIR x86)/libufr2filter.so.1.0.0
-   /usr/$(get_abi_LIBDIR x86)/libcnlbcm.so.1.0
-   /usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0
-   /usr/$(get_abi_LIBDIR x86)/libcanonufr2.so.1.0.0
-   "
-   QA_SONAME="/usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0"
-}
-
-src_unpack() {
-   unpack ${A}
-   cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die
-   unpack ./${P}-1.tar.gz
-}
-
-change_dir() {
-   for i in ppd pstoufr2cpca cngplp cngplp/files cpca ; do
-   cd "${i}" || die
-   "${@}"
-   cd "${S}" || die
-   done
-}
-
-src_prepare() {
-   default
-   sed -i -e \
-   "s:filterdir = \$(libdir)/cups/filter:filterdir = `cups-config 
--serverbin`/filter:" \
-   pstoufr2cpca/filter/Makefile.am || die
-
-   export "LIBS=-lgmodule-2.0"
-   change_dir eautoreconf
-}
-
-src_configure() {
-   change_dir econf
-}
-
-src_install() {
-   default
-   einstalldocs
-
-   find "${D}" -name '*.la' -delete || die
-
-   cd "${S}/data" || die
-   insinto /usr/share/caepcm
-   doins *
-
-   cd "${S}/libs" || die
-   insinto /usr/share/cnpkbidi
-   doins cnpkbidi_info*
-
-   insinto /usr/share/ufr2filter
-   doins ThLB*
-
-   ABI=x86
-   dobin cnpkbidi cnpkmoduleufr2
-   dolib.so libcnlbcm.so.1.0
-   dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.so.1"
-   dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.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/libcnlbcm.so :(, bug #
-   # Skipped for now due to bug #642138
-#  if [[ "$(get_lib

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

2019-03-28 Thread Mikle Kolyada
commit: c5048b3370467ef36689728d042a583816766cab
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Thu Mar 28 07:15:59 2019 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Thu Mar 28 07:16:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c5048b33

net-print/cndrvcups-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-lb/cndrvcups-lb-3.60-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-3.60-r2.ebuild 
b/net-print/cndrvcups-lb/cndrvcups-lb-3.60-r2.ebuild
index cfc16e198df..f6b4bf5b4e4 100644
--- a/net-print/cndrvcups-lb/cndrvcups-lb-3.60-r2.ebuild
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-3.60-r2.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="http://gdlp01.c-wss.com/gds/0/019240/02/${SOURCES_NAME}.tar.gz";
 
 LICENSE="Canon-UFR-II"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 ~x86"
 IUSE=""
 
 RDEPEND="



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

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

net-print/cndrvcups-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>

 net-print/cndrvcups-lb/cndrvcups-lb-3.60-r2.ebuild | 112 +
 1 file changed, 112 insertions(+)

diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-3.60-r2.ebuild 
b/net-print/cndrvcups-lb/cndrvcups-lb-3.60-r2.ebuild
new file mode 100644
index 000..cfc16e198df
--- /dev/null
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-3.60-r2.ebuild
@@ -0,0 +1,112 @@
+# 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="Canon UFR II / LIPSLX Printer Driver for Linux"
+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";
+
+LICENSE="Canon-UFR-II"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+   >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+   >=gnome-base/libglade-2.4:2.0
+   >=net-print/cups-1.1.17
+   ~net-print/cndrvcups-common-lb-${PV}
+   >=x11-libs/gtk+-2.4:2
+   virtual/jpeg:62[abi_x86_32(-)]
+"
+DEPEND="${DEPEND}"
+
+S="${WORKDIR}/${SOURCES_NAME}/Sources/${P}"
+
+MAKEOPTS+=" -j1"
+
+pkg_setup() {
+   # Don't raise a fuss over pre-built binaries
+   QA_PREBUILT="
+   /usr/bin/cnpkbidi
+   /usr/bin/cnpkmoduleufr2
+   /usr/$(get_abi_LIBDIR x86)/libEnoJPEG.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libEnoJBIG.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libufr2filter.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libcnlbcm.so.1.0
+   /usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libcanonufr2.so.1.0.0
+   "
+   QA_SONAME="/usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0"
+}
+
+src_unpack() {
+   unpack ${A}
+   cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die
+   unpack ./${P}-1.tar.gz
+}
+
+change_dir() {
+   for i in pstoufr2cpca cngplp cngplp/files cpca ; do
+   cd "${i}" || die
+   "${@}"
+   cd "${S}" || die
+   done
+}
+
+src_prepare() {
+   default
+   sed -i -e \
+   "s:filterdir = \$(libdir)/cups/filter:filterdir = `cups-config 
--serverbin`/filter:" \
+   pstoufr2cpca/filter/Makefile.am || die
+
+   export "LIBS=-lgmodule-2.0"
+   change_dir eautoreconf
+}
+
+src_configure() {
+   change_dir econf
+}
+
+src_install() {
+   default
+   einstalldocs
+
+   find "${D}" -name '*.la' -delete || die
+
+   insinto /usr/share/cups/model
+   doins ppd/*.ppd
+
+   cd "${S}/data" || die
+   insinto /usr/share/caepcm
+   doins *
+
+   cd "${S}/libs" || die
+   insinto /usr/share/cnpkbidi
+   doins cnpkbidi_info*
+
+   insinto /usr/share/ufr2filter
+   doins ThLB*
+
+   ABI=x86
+   dobin cnpkbidi cnpkmoduleufr2
+   dolib.so libcnlbcm.so.1.0
+   dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.so.1"
+   dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.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/libcnlbcm.so :(, bug #
+   # Only needed with SYMLINK_LIB=yes #642138
+   if [[ "$(get_libdir)" != lib ]] && [[ ${SYMLINK_LIB} = yes ]]; then
+   dosym "../$(get_libdir)/libcnlbcm.so" /usr/lib/libcnlbcm.so
+   fi
+}



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

2018-11-18 Thread Pacho Ramos
commit: 4594688df9bdf06ca3aa84b82a860439b3f0a2e3
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Nov 18 09:51:02 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Nov 18 10:52:48 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4594688d

net-print/cndrvcups-lb: Ensure ppd files are installed

Thanks-to: Andrew Ammerlaan
Closes: https://bugs.gentoo.org/671342
Signed-off-by: Pacho Ramos  gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11

 net-print/cndrvcups-lb/cndrvcups-lb-3.60-r1.ebuild | 112 +
 1 file changed, 112 insertions(+)

diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-3.60-r1.ebuild 
b/net-print/cndrvcups-lb/cndrvcups-lb-3.60-r1.ebuild
new file mode 100644
index 000..8a3ad4427ce
--- /dev/null
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-3.60-r1.ebuild
@@ -0,0 +1,112 @@
+# 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="Canon UFR II / LIPSLX Printer Driver for Linux"
+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";
+
+LICENSE="Canon-UFR-II"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+   >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+   >=gnome-base/libglade-2.4:2.0
+   >=net-print/cups-1.1.17
+   ~net-print/cndrvcups-common-lb-${PV}
+   >=x11-libs/gtk+-2.4:2
+   virtual/jpeg:62[abi_x86_32(-)]
+"
+DEPEND="${DEPEND}"
+
+S="${WORKDIR}/${SOURCES_NAME}/Sources/${P}"
+
+MAKEOPTS+=" -j1"
+
+pkg_setup() {
+   # Don't raise a fuss over pre-built binaries
+   QA_PREBUILT="
+   /usr/bin/cnpkbidi
+   /usr/bin/cnpkmoduleufr2
+   /usr/$(get_abi_LIBDIR x86)/libEnoJPEG.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libEnoJBIG.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libufr2filter.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libcnlbcm.so.1.0
+   /usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libcanonufr2.so.1.0.0
+   "
+   QA_SONAME="/usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0"
+}
+
+src_unpack() {
+   unpack ${A}
+   cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die
+   unpack ./${P}-1.tar.gz
+}
+
+change_dir() {
+   for i in pstoufr2cpca cngplp cngplp/files cpca ; do
+   cd "${i}" || die
+   "${@}"
+   cd "${S}" || die
+   done
+}
+
+src_prepare() {
+   default
+   sed -i -e \
+   "s:filterdir = \$(libdir)/cups/filter:filterdir = `cups-config 
--serverbin`/filter:" \
+   pstoufr2cpca/filter/Makefile.am || die
+
+   export "LIBS=-lgmodule-2.0"
+   change_dir eautoreconf
+}
+
+src_configure() {
+   change_dir econf
+}
+
+src_install() {
+   default
+   einstalldocs
+
+   find "${D}" -name '*.la' -delete || die
+
+   insinto /usr/share/cups/model
+   doins ppd/*.ppd
+
+   cd "${S}/data" || die
+   insinto /usr/share/caepcm
+   doins *
+
+   cd "${S}/libs" || die
+   insinto /usr/share/cnpkbidi
+   doins cnpkbidi_info*
+
+   insinto /usr/share/ufr2filter
+   doins ThLB*
+
+   ABI=x86
+   dobin cnpkbidi cnpkmoduleufr2
+   dolib.so libcnlbcm.so.1.0
+   dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.so.1"
+   dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.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/libcnlbcm.so :(, bug #
+   # Skipped for now due to bug #642138
+#  if [[ "$(get_libdir)" != lib ]]; then
+#  dosym "../$(get_libdir)/libcnlbcm.so" /usr/lib/libcnlbcm.so
+#  fi
+}



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

2018-11-18 Thread Pacho Ramos
commit: fa0978ac4bbe357f5b2cbcf9a1f077eea0337c1e
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Nov 18 09:51:34 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Nov 18 10:52:50 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fa0978ac

net-print/cndrvcups-lb: Drop old

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

 net-print/cndrvcups-lb/cndrvcups-lb-3.60.ebuild | 109 
 1 file changed, 109 deletions(-)

diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-3.60.ebuild 
b/net-print/cndrvcups-lb/cndrvcups-lb-3.60.ebuild
deleted file mode 100644
index bb09609625f..000
--- a/net-print/cndrvcups-lb/cndrvcups-lb-3.60.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# 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="Canon UFR II / LIPSLX Printer Driver for Linux"
-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";
-
-LICENSE="Canon-UFR-II"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-   >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
-   >=gnome-base/libglade-2.4:2.0
-   >=net-print/cups-1.1.17
-   ~net-print/cndrvcups-common-lb-${PV}
-   >=x11-libs/gtk+-2.4:2
-   virtual/jpeg:62[abi_x86_32(-)]
-"
-DEPEND="${DEPEND}"
-
-S="${WORKDIR}/${SOURCES_NAME}/Sources/${P}"
-
-MAKEOPTS+=" -j1"
-
-pkg_setup() {
-   # Don't raise a fuss over pre-built binaries
-   QA_PREBUILT="
-   /usr/bin/cnpkbidi
-   /usr/bin/cnpkmoduleufr2
-   /usr/$(get_abi_LIBDIR x86)/libEnoJPEG.so.1.0.0
-   /usr/$(get_abi_LIBDIR x86)/libEnoJBIG.so.1.0.0
-   /usr/$(get_abi_LIBDIR x86)/libufr2filter.so.1.0.0
-   /usr/$(get_abi_LIBDIR x86)/libcnlbcm.so.1.0
-   /usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0
-   /usr/$(get_abi_LIBDIR x86)/libcanonufr2.so.1.0.0
-   "
-   QA_SONAME="/usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0"
-}
-
-src_unpack() {
-   unpack ${A}
-   cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die
-   unpack ./${P}-1.tar.gz
-}
-
-change_dir() {
-   for i in pstoufr2cpca cngplp cngplp/files cpca ; do
-   cd "${i}" || die
-   "${@}"
-   cd "${S}" || die
-   done
-}
-
-src_prepare() {
-   default
-   sed -i -e \
-   "s:filterdir = \$(libdir)/cups/filter:filterdir = `cups-config 
--serverbin`/filter:" \
-   pstoufr2cpca/filter/Makefile.am || die
-
-   export "LIBS=-lgmodule-2.0"
-   change_dir eautoreconf
-}
-
-src_configure() {
-   change_dir econf
-}
-
-src_install() {
-   default
-   einstalldocs
-
-   find "${D}" -name '*.la' -delete || die
-
-   cd "${S}/data" || die
-   insinto /usr/share/caepcm
-   doins *
-
-   cd "${S}/libs" || die
-   insinto /usr/share/cnpkbidi
-   doins cnpkbidi_info*
-
-   insinto /usr/share/ufr2filter
-   doins ThLB*
-
-   ABI=x86
-   dobin cnpkbidi cnpkmoduleufr2
-   dolib.so libcnlbcm.so.1.0
-   dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.so.1"
-   dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.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/libcnlbcm.so :(, bug #
-   # Skipped for now due to bug #642138
-#  if [[ "$(get_libdir)" != lib ]]; then
-#  dosym "../$(get_libdir)/libcnlbcm.so" /usr/lib/libcnlbcm.so
-#  fi
-}



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

2018-11-12 Thread Mikle Kolyada
commit: 1f495c7ed9e9ec171362c8402673e58465546fdc
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Mon Nov 12 14:33:37 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Mon Nov 12 18:52:23 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1f495c7e

net-print/cndrvcups-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-lb/cndrvcups-lb-3.50-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-3.50-r1.ebuild 
b/net-print/cndrvcups-lb/cndrvcups-lb-3.50-r1.ebuild
index 7d040c56c13..b0fc31e973c 100644
--- a/net-print/cndrvcups-lb/cndrvcups-lb-3.50-r1.ebuild
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-3.50-r1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="http://gdlp01.c-wss.com/gds/0/019240/01/${SOURCES_NAME}.tar.gz";
 
 LICENSE="Canon-UFR-II"
 SLOT="0"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 RDEPEND="



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

2018-11-11 Thread Thomas Deutschmann
commit: 39ecb84cc82c9b5742ba72a490ae2787028ea349
Author: Thomas Deutschmann  gentoo  org>
AuthorDate: Mon Nov 12 00:55:05 2018 +
Commit: Thomas Deutschmann  gentoo  org>
CommitDate: Mon Nov 12 01:13:03 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39ecb84c

net-print/cndrvcups-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-lb/cndrvcups-lb-3.50-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-3.50-r1.ebuild 
b/net-print/cndrvcups-lb/cndrvcups-lb-3.50-r1.ebuild
index b7fe520c91f..7d040c56c13 100644
--- a/net-print/cndrvcups-lb/cndrvcups-lb-3.50-r1.ebuild
+++ b/net-print/cndrvcups-lb/cndrvcups-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
@@ -13,7 +13,7 @@ 
SRC_URI="http://gdlp01.c-wss.com/gds/0/019240/01/${SOURCES_NAME}.tar.gz";
 
 LICENSE="Canon-UFR-II"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* ~amd64 x86"
 IUSE=""
 
 RDEPEND="



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

2018-11-11 Thread Pacho Ramos
commit: daa413b92846c478c83ae70c58a6b922014afa2a
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Nov 11 13:58:48 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Nov 11 13:59:36 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=daa413b9

net-print/cndrvcups-lb: Drop old

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

 net-print/cndrvcups-lb/Manifest |   1 -
 net-print/cndrvcups-lb/cndrvcups-lb-3.40.ebuild | 108 
 2 files changed, 109 deletions(-)

diff --git a/net-print/cndrvcups-lb/Manifest b/net-print/cndrvcups-lb/Manifest
index cac7f3b07c9..935aa7b6e66 100644
--- a/net-print/cndrvcups-lb/Manifest
+++ b/net-print/cndrvcups-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-lb/cndrvcups-lb-3.40.ebuild 
b/net-print/cndrvcups-lb/cndrvcups-lb-3.40.ebuild
deleted file mode 100644
index 5547321c051..000
--- a/net-print/cndrvcups-lb/cndrvcups-lb-3.40.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit autotools ltprune versionator
-
-MY_PV="$(delete_all_version_separators)"
-SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken"
-
-DESCRIPTION="Canon UFR II / LIPSLX Printer Driver for Linux"
-HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/imagerunner-1133.aspx?type=drivers&language=EN&os=LINUX";
-SRC_URI="http://gdlp01.c-wss.com/gds/8/017658/04/${SOURCES_NAME}.tar.gz";
-
-LICENSE="Canon-UFR-II"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-RDEPEND="
-   gnome-base/libglade
-   net-print/cups
-   ~net-print/cndrvcups-common-lb-${PV}
-   x11-libs/gtk+:2
-   >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
-   virtual/jpeg:62[abi_x86_32(-)]
-"
-DEPEND="${DEPEND}"
-
-S="${WORKDIR}/${SOURCES_NAME}/Sources/${P}"
-MAKEOPTS+=" -j1"
-
-pkg_setup() {
-   # Don't raise a fuss over pre-built binaries
-   QA_PREBUILT="
-   /usr/bin/cnpkbidi
-   /usr/bin/cnpkmoduleufr2
-   /usr/$(get_abi_LIBDIR x86)/libEnoJPEG.so.1.0.0
-   /usr/$(get_abi_LIBDIR x86)/libEnoJBIG.so.1.0.0
-   /usr/$(get_abi_LIBDIR x86)/libufr2filter.so.1.0.0
-   /usr/$(get_abi_LIBDIR x86)/libcnlbcm.so.1.0
-   /usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0
-   /usr/$(get_abi_LIBDIR x86)/libcanonufr2.so.1.0.0
-   "
-   QA_SONAME="/usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0"
-}
-
-src_unpack() {
-   unpack ${A}
-   cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die
-   unpack ./${P}-1.tar.gz
-}
-
-change_dir() {
-   for i in ppd pstoufr2cpca cngplp cngplp/files cpca ; do
-   cd "${i}" || die
-   "${@}"
-   cd "${S}" || die
-   done
-}
-
-src_prepare() {
-   default
-   sed -i -e \
-   "s:filterdir = \$(libdir)/cups/filter:filterdir = `cups-config 
--serverbin`/filter:" \
-   pstoufr2cpca/filter/Makefile.am || die
-
-   export "LIBS=-lgmodule-2.0"
-   change_dir eautoreconf
-}
-
-src_configure() {
-   change_dir econf
-}
-
-src_install() {
-   default
-
-   einstalldocs
-
-   prune_libtool_files
-
-   cd "${S}/data" || die
-   insinto /usr/share/caepcm
-   doins *
-
-   cd "${S}/libs" || die
-   insinto /usr/share/cnpkbidi
-   doins cnpkbidi_info*
-
-   insinto /usr/share/ufr2filter
-   doins ThLB*
-
-   ABI=x86
-   dobin cnpkbidi cnpkmoduleufr2
-   dolib.so libcnlbcm.so.1.0
-   dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.so.1"
-   dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.so"
-   for lib in *.so.?.?.?; do
-   dolib.so "${lib}"
-   dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?}"
-   dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?.?}"
-   done
-
-   # c3pldrv dlopens 

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

2018-11-11 Thread Pacho Ramos
commit: 53cec499a53d4b85865b44f018ea3e1dffde9c2a
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sun Nov 11 13:58:28 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sun Nov 11 13:59:35 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53cec499

net-print/cndrvcups-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-lb/Manifest |   1 +
 net-print/cndrvcups-lb/cndrvcups-lb-3.60.ebuild | 109 
 2 files changed, 110 insertions(+)

diff --git a/net-print/cndrvcups-lb/Manifest b/net-print/cndrvcups-lb/Manifest
index e1a0ef78f7b..cac7f3b07c9 100644
--- a/net-print/cndrvcups-lb/Manifest
+++ b/net-print/cndrvcups-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-lb/cndrvcups-lb-3.60.ebuild 
b/net-print/cndrvcups-lb/cndrvcups-lb-3.60.ebuild
new file mode 100644
index 000..bb09609625f
--- /dev/null
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-3.60.ebuild
@@ -0,0 +1,109 @@
+# 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="Canon UFR II / LIPSLX Printer Driver for Linux"
+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";
+
+LICENSE="Canon-UFR-II"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+   >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+   >=gnome-base/libglade-2.4:2.0
+   >=net-print/cups-1.1.17
+   ~net-print/cndrvcups-common-lb-${PV}
+   >=x11-libs/gtk+-2.4:2
+   virtual/jpeg:62[abi_x86_32(-)]
+"
+DEPEND="${DEPEND}"
+
+S="${WORKDIR}/${SOURCES_NAME}/Sources/${P}"
+
+MAKEOPTS+=" -j1"
+
+pkg_setup() {
+   # Don't raise a fuss over pre-built binaries
+   QA_PREBUILT="
+   /usr/bin/cnpkbidi
+   /usr/bin/cnpkmoduleufr2
+   /usr/$(get_abi_LIBDIR x86)/libEnoJPEG.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libEnoJBIG.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libufr2filter.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libcnlbcm.so.1.0
+   /usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libcanonufr2.so.1.0.0
+   "
+   QA_SONAME="/usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0"
+}
+
+src_unpack() {
+   unpack ${A}
+   cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die
+   unpack ./${P}-1.tar.gz
+}
+
+change_dir() {
+   for i in pstoufr2cpca cngplp cngplp/files cpca ; do
+   cd "${i}" || die
+   "${@}"
+   cd "${S}" || die
+   done
+}
+
+src_prepare() {
+   default
+   sed -i -e \
+   "s:filterdir = \$(libdir)/cups/filter:filterdir = `cups-config 
--serverbin`/filter:" \
+   pstoufr2cpca/filter/Makefile.am || die
+
+   export "LIBS=-lgmodule-2.0"
+   change_dir eautoreconf
+}
+
+src_configure() {
+   change_dir econf
+}
+
+src_install() {
+   default
+   einstalldocs
+
+   find "${D}" -name '*.la' -delete || die
+
+   cd "${S}/data" || die
+   insinto /usr/share/caepcm
+   doins *
+
+   cd "${S}/libs" || die
+   insinto /usr/share/cnpkbidi
+   doins cnpkbidi_info*
+
+   insinto /usr/share/ufr2filter
+   doins ThLB*
+
+   ABI=x86
+   dobin cnpkbidi cnpkmoduleufr2
+   dolib.so libcnlbcm.so.1.0
+   dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.so.1"
+   dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.so"
+   for lib in *.so.?.?.?; do
+   dolib.so "${lib}"
+   dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?}"
+   dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?.?}"
+   done
+
+   # c3p

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

2018-09-28 Thread Mikle Kolyada
commit: 0e4f66ba585e2d3edd71d177badf2070c946ba30
Author: Mikle Kolyada  gentoo  org>
AuthorDate: Fri Sep 28 11:49:16 2018 +
Commit: Mikle Kolyada  gentoo  org>
CommitDate: Fri Sep 28 11:49:16 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0e4f66ba

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

Package-Manager: Portage-2.3.49, Repoman-2.3.10

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

diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-3.50.ebuild 
b/net-print/cndrvcups-lb/cndrvcups-lb-3.50.ebuild
index a484adf870f..4679de0ecfa 100644
--- a/net-print/cndrvcups-lb/cndrvcups-lb-3.50.ebuild
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-3.50.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="http://gdlp01.c-wss.com/gds/0/019240/01/${SOURCES_NAME}.tar.gz";
 
 LICENSE="Canon-UFR-II"
 SLOT="0"
-KEYWORDS="-* ~amd64 x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 RDEPEND="



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

2018-09-15 Thread Pacho Ramos
commit: 382ee22b889d867a0f499eb560d080f7b47c45c9
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Sep 15 11:54:16 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Sep 15 11:58:20 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=382ee22b

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

Package-Manager: Portage-2.3.49, Repoman-2.3.10

 net-print/cndrvcups-lb/cndrvcups-lb-3.50-r1.ebuild | 109 +
 1 file changed, 109 insertions(+)

diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-3.50-r1.ebuild 
b/net-print/cndrvcups-lb/cndrvcups-lb-3.50-r1.ebuild
new file mode 100644
index 000..b7fe520c91f
--- /dev/null
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-3.50-r1.ebuild
@@ -0,0 +1,109 @@
+# 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="Canon UFR II / LIPSLX Printer Driver for Linux"
+HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/imagerunner-1133.aspx?type=drivers&language=EN&os=LINUX";
+SRC_URI="http://gdlp01.c-wss.com/gds/0/019240/01/${SOURCES_NAME}.tar.gz";
+
+LICENSE="Canon-UFR-II"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+   >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+   >=gnome-base/libglade-2.4:2.0
+   >=net-print/cups-1.1.17
+   ~net-print/cndrvcups-common-lb-${PV}
+   >=x11-libs/gtk+-2.4:2
+   virtual/jpeg:62[abi_x86_32(-)]
+"
+DEPEND="${DEPEND}"
+
+S="${WORKDIR}/${SOURCES_NAME}/Sources/${P}"
+
+MAKEOPTS+=" -j1"
+
+pkg_setup() {
+   # Don't raise a fuss over pre-built binaries
+   QA_PREBUILT="
+   /usr/bin/cnpkbidi
+   /usr/bin/cnpkmoduleufr2
+   /usr/$(get_abi_LIBDIR x86)/libEnoJPEG.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libEnoJBIG.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libufr2filter.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libcnlbcm.so.1.0
+   /usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libcanonufr2.so.1.0.0
+   "
+   QA_SONAME="/usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0"
+}
+
+src_unpack() {
+   unpack ${A}
+   cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die
+   unpack ./${P}-1.tar.gz
+}
+
+change_dir() {
+   for i in ppd pstoufr2cpca cngplp cngplp/files cpca ; do
+   cd "${i}" || die
+   "${@}"
+   cd "${S}" || die
+   done
+}
+
+src_prepare() {
+   default
+   sed -i -e \
+   "s:filterdir = \$(libdir)/cups/filter:filterdir = `cups-config 
--serverbin`/filter:" \
+   pstoufr2cpca/filter/Makefile.am || die
+
+   export "LIBS=-lgmodule-2.0"
+   change_dir eautoreconf
+}
+
+src_configure() {
+   change_dir econf
+}
+
+src_install() {
+   default
+   einstalldocs
+
+   find "${D}" -name '*.la' -delete || die
+
+   cd "${S}/data" || die
+   insinto /usr/share/caepcm
+   doins *
+
+   cd "${S}/libs" || die
+   insinto /usr/share/cnpkbidi
+   doins cnpkbidi_info*
+
+   insinto /usr/share/ufr2filter
+   doins ThLB*
+
+   ABI=x86
+   dobin cnpkbidi cnpkmoduleufr2
+   dolib.so libcnlbcm.so.1.0
+   dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.so.1"
+   dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.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/libcnlbcm.so :(, bug #
+   # Skipped for now due to bug #642138
+#  if [[ "$(get_libdir)" != lib ]]; then
+#  dosym "../$(get_libdir)/libcnlbcm.so" /usr/lib/libcnlbcm.so
+#  fi
+}



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

2018-02-27 Thread Pacho Ramos
commit: 68c7a7942d91857c0c85408878bc915606731a20
Author: Pacho Ramos  gentoo  org>
AuthorDate: Tue Feb 27 19:26:16 2018 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Tue Feb 27 19:29:05 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=68c7a794

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

Package-Manager: Portage-2.3.24, Repoman-2.3.6

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

diff --git a/net-print/cndrvcups-lb/Manifest b/net-print/cndrvcups-lb/Manifest
index 897a01b4ad8..e1a0ef78f7b 100644
--- a/net-print/cndrvcups-lb/Manifest
+++ b/net-print/cndrvcups-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-lb/cndrvcups-lb-3.50.ebuild 
b/net-print/cndrvcups-lb/cndrvcups-lb-3.50.ebuild
new file mode 100644
index 000..489c7b540f4
--- /dev/null
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-3.50.ebuild
@@ -0,0 +1,108 @@
+# 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="Canon UFR II / LIPSLX Printer Driver for Linux"
+HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/imagerunner-1133.aspx?type=drivers&language=EN&os=LINUX";
+SRC_URI="http://gdlp01.c-wss.com/gds/0/019240/01/${SOURCES_NAME}.tar.gz";
+
+LICENSE="Canon-UFR-II"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+   >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+   >=gnome-base/libglade-2.4:2.0
+   >=net-print/cups-1.1.17
+   ~net-print/cndrvcups-common-lb-${PV}
+   >=x11-libs/gtk+-2.4:2
+   virtual/jpeg:62[abi_x86_32(-)]
+"
+DEPEND="${DEPEND}"
+
+S="${WORKDIR}/${SOURCES_NAME}/Sources/${P}"
+
+MAKEOPTS+=" -j1"
+
+pkg_setup() {
+   # Don't raise a fuss over pre-built binaries
+   QA_PREBUILT="
+   /usr/bin/cnpkbidi
+   /usr/bin/cnpkmoduleufr2
+   /usr/$(get_abi_LIBDIR x86)/libEnoJPEG.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libEnoJBIG.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libufr2filter.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libcnlbcm.so.1.0
+   /usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libcanonufr2.so.1.0.0
+   "
+   QA_SONAME="/usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0"
+}
+
+src_unpack() {
+   unpack ${A}
+   cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die
+   unpack ./${P}-1.tar.gz
+}
+
+change_dir() {
+   for i in ppd pstoufr2cpca cngplp cngplp/files cpca ; do
+   cd "${i}" || die
+   "${@}"
+   cd "${S}" || die
+   done
+}
+
+src_prepare() {
+   default
+   sed -i -e \
+   "s:filterdir = \$(libdir)/cups/filter:filterdir = `cups-config 
--serverbin`/filter:" \
+   pstoufr2cpca/filter/Makefile.am || die
+
+   export "LIBS=-lgmodule-2.0"
+   change_dir eautoreconf
+}
+
+src_configure() {
+   change_dir econf
+}
+
+src_install() {
+   default
+   einstalldocs
+
+   find "${D}" -name '*.la' -delete || die
+
+   cd "${S}/data" || die
+   insinto /usr/share/caepcm
+   doins *
+
+   cd "${S}/libs" || die
+   insinto /usr/share/cnpkbidi
+   doins cnpkbidi_info*
+
+   insinto /usr/share/ufr2filter
+   doins ThLB*
+
+   ABI=x86
+   dobin cnpkbidi cnpkmoduleufr2
+   dolib.so libcnlbcm.so.1.0
+   dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.so.1"
+   dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.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/libcnlbcm.so :(
+   if [[ "$(get_libdir)" != lib ]]; then
+   dosym "../$(get_libdir)/libcnlbcm.so" /usr/lib/libcnlbcm.so
+   fi
+}



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

2017-09-05 Thread Pacho Ramos
commit: 0c10a2d5695aad184d6ffa0218cf02833deda417
Author: Pacho Ramos  gentoo  org>
AuthorDate: Tue Sep  5 18:35:56 2017 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Tue Sep  5 18:36:31 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0c10a2d5

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

Package-Manager: Portage-2.3.8, Repoman-2.3.3
RepoMan-Options: --force

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

diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-3.40.ebuild 
b/net-print/cndrvcups-lb/cndrvcups-lb-3.40.ebuild
index 89b9326dd8f..5547321c051 100644
--- a/net-print/cndrvcups-lb/cndrvcups-lb-3.40.ebuild
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-3.40.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="http://gdlp01.c-wss.com/gds/8/017658/04/${SOURCES_NAME}.tar.gz";
 
 LICENSE="Canon-UFR-II"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 RDEPEND="



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

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

net-print/cndrvcups-lb: Drop old

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-print/cndrvcups-lb/Manifest |   2 -
 net-print/cndrvcups-lb/cndrvcups-lb-3.00.ebuild | 105 ---
 net-print/cndrvcups-lb/cndrvcups-lb-3.20.ebuild | 108 
 3 files changed, 215 deletions(-)

diff --git a/net-print/cndrvcups-lb/Manifest b/net-print/cndrvcups-lb/Manifest
index 6c2ff20adfd..914bbc0e36b 100644
--- a/net-print/cndrvcups-lb/Manifest
+++ b/net-print/cndrvcups-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-lb/cndrvcups-lb-3.00.ebuild 
b/net-print/cndrvcups-lb/cndrvcups-lb-3.00.ebuild
deleted file mode 100644
index f991f37fdc4..000
--- a/net-print/cndrvcups-lb/cndrvcups-lb-3.00.ebuild
+++ /dev/null
@@ -1,105 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils autotools multilib versionator
-
-DESCRIPTION="Canon UFR II / LIPSLX Printer Driver for Linux"
-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"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-# Needed because GPL2 stuff miss their sources in tarball
-RESTRICT="mirror"
-
-RDEPEND="
-   ~net-print/cndrvcups-common-lb-3.10
-   gnome-base/libglade
-   net-print/cups
-   x11-libs/gtk+:2
-   >=dev-libs/libxml2-2.9.2-r4[abi_x86_32(-)]
-   virtual/jpeg:62[abi_x86_32(-)]
-"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/uk_eng/Sources/${P}"
-MAKEOPTS+=" -j1"
-
-# Don't raise a fuss over pre-built binaries
-QA_PREBUILT="
-   /usr/bin/cnpkbidi
-   /usr/bin/cnpkmoduleufr2
-   /usr/$(get_abi_LIBDIR x86)/libEnoJPEG.so.1.0.0
-   /usr/$(get_abi_LIBDIR x86)/libEnoJBIG.so.1.0.0
-   /usr/$(get_abi_LIBDIR x86)/libufr2filter.so.1.0.0
-   /usr/$(get_abi_LIBDIR x86)/libcnlbcm.so.1.0
-   /usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0
-   /usr/$(get_abi_LIBDIR x86)/libcanonufr2.so.1.0.0
-"
-QA_SONAME="/usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0"
-
-src_unpack() {
-   unpack ${A}
-   cd "${WORKDIR}/uk_eng/Sources/"
-   unpack ./${P}-1.tar.gz
-}
-
-change_dir() {
-   for i in ppd pstoufr2cpca cngplp cngplp/files cpca ; do
-   cd "${i}"
-   "${@}"
-   cd "${S}"
-   done
-}
-
-src_prepare() {
-   sed -i -e \
-   "s:filterdir = \$(libdir)/cups/filter:filterdir = `cups-config 
--serverbin`/filter:" \
-   pstoufr2cpca/filter/Makefile.am || die
-
-   export "LIBS=-lgmodule-2.0"
-   change_dir eautoreconf
-}
-
-src_configure() {
-   change_dir econf
-}
-
-src_install() {
-   default
-
-   einstalldocs
-
-   prune_libtool_files
-
-   cd "${S}/data"
-   insinto /usr/share/caepcm
-   doins *
-
-   cd "${S}/libs"
-   insinto /usr/share/cnpkbidi
-   doins cnpkbidi_info*
-
-   insinto /usr/share/ufr2filter
-   doins ThLB*
-
-   ABI=x86
-   dobin cnpkbidi cnpkmoduleufr2
-   dolib.so libcnlbcm.so.1.0
-   dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.so.1"
-   dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.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-lb/

2017-07-27 Thread Pacho Ramos
commit: dc056da3c5ec2d8cabacc80ab0a006ab8d567267
Author: Pacho Ramos  gentoo  org>
AuthorDate: Thu Jul 27 08:35:24 2017 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Thu Jul 27 08:35:24 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=dc056da3

net-print/cndrvcups-lb: Version bump

Package-Manager: Portage-2.3.6, Repoman-2.3.2

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

diff --git a/net-print/cndrvcups-lb/Manifest b/net-print/cndrvcups-lb/Manifest
index 9834de0cb88..6c2ff20adfd 100644
--- a/net-print/cndrvcups-lb/Manifest
+++ b/net-print/cndrvcups-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-lb/cndrvcups-lb-3.40.ebuild 
b/net-print/cndrvcups-lb/cndrvcups-lb-3.40.ebuild
new file mode 100644
index 000..89b9326dd8f
--- /dev/null
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-3.40.ebuild
@@ -0,0 +1,108 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools ltprune versionator
+
+MY_PV="$(delete_all_version_separators)"
+SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken"
+
+DESCRIPTION="Canon UFR II / LIPSLX Printer Driver for Linux"
+HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/imagerunner-1133.aspx?type=drivers&language=EN&os=LINUX";
+SRC_URI="http://gdlp01.c-wss.com/gds/8/017658/04/${SOURCES_NAME}.tar.gz";
+
+LICENSE="Canon-UFR-II"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="
+   gnome-base/libglade
+   net-print/cups
+   ~net-print/cndrvcups-common-lb-${PV}
+   x11-libs/gtk+:2
+   >=dev-libs/libxml2-2.9.1-r4[abi_x86_32(-)]
+   virtual/jpeg:62[abi_x86_32(-)]
+"
+DEPEND="${DEPEND}"
+
+S="${WORKDIR}/${SOURCES_NAME}/Sources/${P}"
+MAKEOPTS+=" -j1"
+
+pkg_setup() {
+   # Don't raise a fuss over pre-built binaries
+   QA_PREBUILT="
+   /usr/bin/cnpkbidi
+   /usr/bin/cnpkmoduleufr2
+   /usr/$(get_abi_LIBDIR x86)/libEnoJPEG.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libEnoJBIG.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libufr2filter.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libcnlbcm.so.1.0
+   /usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libcanonufr2.so.1.0.0
+   "
+   QA_SONAME="/usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0"
+}
+
+src_unpack() {
+   unpack ${A}
+   cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die
+   unpack ./${P}-1.tar.gz
+}
+
+change_dir() {
+   for i in ppd pstoufr2cpca cngplp cngplp/files cpca ; do
+   cd "${i}" || die
+   "${@}"
+   cd "${S}" || die
+   done
+}
+
+src_prepare() {
+   default
+   sed -i -e \
+   "s:filterdir = \$(libdir)/cups/filter:filterdir = `cups-config 
--serverbin`/filter:" \
+   pstoufr2cpca/filter/Makefile.am || die
+
+   export "LIBS=-lgmodule-2.0"
+   change_dir eautoreconf
+}
+
+src_configure() {
+   change_dir econf
+}
+
+src_install() {
+   default
+
+   einstalldocs
+
+   prune_libtool_files
+
+   cd "${S}/data" || die
+   insinto /usr/share/caepcm
+   doins *
+
+   cd "${S}/libs" || die
+   insinto /usr/share/cnpkbidi
+   doins cnpkbidi_info*
+
+   insinto /usr/share/ufr2filter
+   doins ThLB*
+
+   ABI=x86
+   dobin cnpkbidi cnpkmoduleufr2
+   dolib.so libcnlbcm.so.1.0
+   dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.so.1"
+   dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.so"
+   for lib in *.so.?.?.?; do
+

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

2016-07-09 Thread Patrice Clement
commit: a538610c31928e9fb3170fd032c9d924f0255562
Author: Leho Kraav  kraav  com>
AuthorDate: Sat Jul  9 11:52:40 2016 +
Commit: Patrice Clement  gentoo  org>
CommitDate: Sat Jul  9 13:09:36 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a538610c

net-print/cndrvcups-lb: correct 3.20 SRC_URI, fixup c505277.

Props toralf.foerster!

Gentoo-Bug: https://bugs.gentoo.org/587162
Closes: https://github.com/gentoo/gentoo/pull/1850

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

 net-print/cndrvcups-common-lb/Manifest| 2 +-
 net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.20.ebuild | 8 
 net-print/cndrvcups-lb/Manifest   | 2 +-
 net-print/cndrvcups-lb/cndrvcups-lb-3.20.ebuild   | 2 +-
 4 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/net-print/cndrvcups-common-lb/Manifest 
b/net-print/cndrvcups-common-lb/Manifest
index a5ddc60..9834de0 100644
--- a/net-print/cndrvcups-common-lb/Manifest
+++ b/net-print/cndrvcups-common-lb/Manifest
@@ -1,2 +1,2 @@
-DIST Linux_UFRII_PrinterDriver_V320_uk_EN.tar.gz 90901373 SHA256 
bcc9db26e261d239438aeb15f171b5b0e7fd305abd0729be0e806bb4c039654a SHA512 
23181155f5719fa0a9c216c058be749b5faaa8ee745d260eba2e5e284ef4ff161e344289a7c301a2d74cc919c5031763b0daf41cd07686cfdce188492a9b34b2
 WHIRLPOOL 
82bb966d823f8019d6275d421ebd2ff848556415e1767bd8fc2638d97479e15029a48818e5b45e9210781f4f37fd269dde46763404314b6c47ee0b4670e03600
+DIST Linux_UFRII_PrinterDriver_V320_uk_EN.tar.gz 109548632 SHA256 
b28bc2b460aeddcb7800983d2fad8c29ea6efcc95ad767a78fe6c25d0956f242 SHA512 
fc35670a07f067b6ccdebf5b96590eafac2ed984faaa8a90ce44dd44396d6de0964f6352cae0fdf8ce1f6127ebf3ea9f6610b56ba7dd9a7f382bd1c6d588a801
 WHIRLPOOL 
661f8d6863bd1694efcc168615d9a7107e4a7aa09f5934a33b0f201b6d327038320cf87201bf4220ec876e1cca550169c91925d9f58fa3dae8dd4ea99de1ad1e
 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.20.ebuild 
b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.20.ebuild
index d982497..762b098 100644
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.20.ebuild
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.20.ebuild
@@ -10,7 +10,7 @@ SOURCES_NAME="Linux_UFRII_PrinterDriver_V${MY_PV}_uk_EN"
 
 DESCRIPTION="Common files for Canon drivers"
 HOMEPAGE="http://support-au.canon.com.au/contents/AU/EN/0100270808.html";
-SRC_URI="http://pdisp01.c-wss.com/gdl/WWUFORedirectTarget.do?id=MDEwMDAwMjcwODEx&cmp=ABS&lang=EN
 -> ${SOURCES_NAME}.tar.gz"
+SRC_URI="http://pdisp01.c-wss.com/gdl/WWUFORedirectTarget.do?id=MDEwMDAwMjcwODE0&cmp=ABS&lang=EN
 -> ${SOURCES_NAME}.tar.gz"
 
 LICENSE="Canon-UFR-II GPL-2 MIT"
 SLOT="0"
@@ -28,7 +28,7 @@ RDEPEND="
 "
 DEPEND="${DEPEND}"
 
-S="${WORKDIR}/${SOURCES_NAME}/Sources/${P/-lb/}"
+S="${WORKDIR}/${SOURCES_NAME}/Sources/${P/-lb-${PV}/-3.60}"
 
 # Don't raise a fuss over pre-built binaries
 QA_PREBUILT="
@@ -47,7 +47,7 @@ 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/}-1.tar.gz
+   unpack ./${P/-lb-${PV}/-3.60}-1.tar.gz
 }
 
 change_dir() {
@@ -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" || die ) && emake
+   ( cd "${S}/c3plmod_ipc" && emake ) || die
 }
 
 src_install() {

diff --git a/net-print/cndrvcups-lb/Manifest b/net-print/cndrvcups-lb/Manifest
index a5ddc60..9834de0 100644
--- a/net-print/cndrvcups-lb/Manifest
+++ b/net-print/cndrvcups-lb/Manifest
@@ -1,2 +1,2 @@
-DIST Linux_UFRII_PrinterDriver_V320_uk_EN.tar.gz 90901373 SHA256 
bcc9db26e261d239438aeb15f171b5b0e7fd305abd0729be0e806bb4c039654a SHA512 
23181155f5719fa0a9c216c058be749b5faaa8ee745d260eba2e5e284ef4ff161e344289a7c301a2d74cc919c5031763b0daf41cd07686cfdce188492a9b34b2
 WHIRLPOOL 
82bb966d823f8019d6275d421ebd2ff848556415e1767bd8fc2638d97479e15029a48818e5b45e9210781f4f37fd269dde46763404314b6c47ee0b4670e03600
+DIST Linux_UFRII_PrinterDriver_V320_uk_EN.tar.gz 109548632 SHA256 
b28bc2b460aeddcb7800983d2fad8c29ea6efcc95ad767a78fe6c25d0956f242 SHA512 
fc35670a07f067b6ccdebf5b96590eafac2ed984faaa8a90ce44dd44396d6de0964f6352cae0fdf8ce1f6127ebf3ea9f6610b56ba7dd9a7f382bd1c6d588a801
 WHIRLPOOL 
661f8d6863bd1694efcc168615d9a7107e4a7aa09f5934a33b0f201b6d327038320cf87201bf4220ec876e1cca550169c91925d9f58fa3dae8dd4ea99de1ad1e
 DIST o1581en_linux_UFRII_v300.zip 94262679 SHA256 
1ec1b162411642dc1814608ec71a3b94d6e22ede234f6b750bbdfd3820d5ac46

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

2015-12-31 Thread Pacho Ramos
commit: 124725c1081d7090f48f39d1c34bb1802d42fe1b
Author: Pacho Ramos  gentoo  org>
AuthorDate: Thu Dec 31 12:38:09 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Thu Dec 31 12:38:09 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=124725c1

net-print/cndrvcups-lb: stabilize

Package-Manager: portage-2.2.26

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

diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-3.00.ebuild 
b/net-print/cndrvcups-lb/cndrvcups-lb-3.00.ebuild
index 6648bd7..535b81f 100644
--- a/net-print/cndrvcups-lb/cndrvcups-lb-3.00.ebuild
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-3.00.ebuild
@@ -11,7 +11,7 @@ 
SRC_URI="http://files.canon-europe.com/files/soft46530/software/o1581en_linux_UF
 
 LICENSE="Canon-UFR-II"
 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-lb/

2015-11-21 Thread Pacho Ramos
commit: e59ebfe0f69473e629a8d42a87199f4d6eb1ad0a
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Nov 21 11:26:35 2015 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Nov 21 11:26:56 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e59ebfe0

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

Package-Manager: portage-2.2.24

 net-print/cndrvcups-lb/Manifest |   1 +
 net-print/cndrvcups-lb/cndrvcups-lb-3.00.ebuild | 106 
 2 files changed, 107 insertions(+)

diff --git a/net-print/cndrvcups-lb/Manifest b/net-print/cndrvcups-lb/Manifest
index 19c82e7..0714db8 100644
--- a/net-print/cndrvcups-lb/Manifest
+++ b/net-print/cndrvcups-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-lb/cndrvcups-lb-3.00.ebuild 
b/net-print/cndrvcups-lb/cndrvcups-lb-3.00.ebuild
new file mode 100644
index 000..6648bd7
--- /dev/null
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-3.00.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+inherit eutils autotools multilib versionator
+
+DESCRIPTION="Canon UFR II / LIPSLX Printer Driver for Linux"
+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"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+# Needed because GPL2 stuff miss their sources in tarball
+RESTRICT="mirror"
+
+RDEPEND="
+   ~net-print/cndrvcups-common-lb-3.10
+   gnome-base/libglade
+   net-print/cups
+   x11-libs/gtk+:2
+   >=dev-libs/libxml2-2.9.2-r4[abi_x86_32(-)]
+   virtual/jpeg:62[abi_x86_32(-)]
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/uk_eng/Sources/${P}"
+MAKEOPTS+=" -j1"
+
+# Don't raise a fuss over pre-built binaries
+QA_PREBUILT="
+   /usr/bin/cnpkbidi
+   /usr/bin/cnpkmoduleufr2
+   /usr/$(get_abi_LIBDIR x86)/libEnoJPEG.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libEnoJBIG.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libufr2filter.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libcnlbcm.so.1.0
+   /usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0
+   /usr/$(get_abi_LIBDIR x86)/libcanonufr2.so.1.0.0
+"
+QA_SONAME="/usr/$(get_abi_LIBDIR x86)/libcaiocnpkbidi.so.1.0.0"
+
+src_unpack() {
+   unpack ${A}
+   cd "${WORKDIR}/uk_eng/Sources/"
+   unpack ./${P}-1.tar.gz
+}
+
+change_dir() {
+   for i in ppd pstoufr2cpca cngplp cngplp/files cpca ; do
+   cd "${i}"
+   "${@}"
+   cd "${S}"
+   done
+}
+
+src_prepare() {
+   sed -i -e \
+   "s:filterdir = \$(libdir)/cups/filter:filterdir = `cups-config 
--serverbin`/filter:" \
+   pstoufr2cpca/filter/Makefile.am || die
+
+   export "LIBS=-lgmodule-2.0"
+   change_dir eautoreconf
+}
+
+src_configure() {
+   change_dir econf
+}
+
+src_install() {
+   default
+
+   einstalldocs
+
+   prune_libtool_files
+
+   cd "${S}/data"
+   insinto /usr/share/caepcm
+   doins *
+
+   cd "${S}/libs"
+   insinto /usr/share/cnpkbidi
+   doins cnpkbidi_info*
+
+   insinto /usr/share/ufr2filter
+   doins ThLB*
+
+   ABI=x86
+   dobin cnpkbidi cnpkmoduleufr2
+   dolib.so libcnlbcm.so.1.0
+   dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.so.1"
+   dosym libcnlbcm.so.1.0 "/usr/$(get_libdir)/libcnlbcm.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/libcnlbcm.so :(
+   if [[ "$(get_libdir)" != lib ]]; then
+   dosym "../$(get_libdir)/libcnlbcm.so" /usr/lib/libcnlbcm.so
+   fi
+}