gentoo resync : 18.11.2018

3 files changed, 24 insertions, 23 deletions

diff --git a/net-print/cndrvcups-lb/Manifest b/net-print/cndrvcups-lb/Manifest
index cf8af18a4f19..a7108cd61074 100644
--- a/net-print/cndrvcups-lb/Manifest
+++ b/net-print/cndrvcups-lb/Manifest
@@ -1,6 +1,6 @@
-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
-EBUILD cndrvcups-lb-3.40.ebuild 2575 BLAKE2B 4d5708541461c764cf69dbc331116f7707adbd6c8a20b08e2b4dce6427f0374d873a8d5eb90dd807da6977a75c399c2178b641092cb26e78639adc6583ee483a SHA512 1e7b061e8e1c3c65e8c359f3b064ee728c54129b4e1af6028f61aca3c8ca4828c1a2a0bafcf2db4a76891c2c9b9819988f7f933fd1f843816a115af4ee6234d5
-EBUILD cndrvcups-lb-3.50-r1.ebuild 2666 BLAKE2B f3e6584508820d7ef2fc2c5beb687f13fbd6f019bca5342ac2d06c9fcfa32ee6b713bc0e7b70a4cdb43e4cd634e016f9dba06d15c11486070559b3dba498075a SHA512 cc52d37cf782c6c13d204b13cc6fa84a4a318b06c799b8d55ca797f32631b696362ddd721cbab47ecc1a857f59543c621efb6c6e291c5dbd434a00bc28cd3ce7
+DIST linux-UFRII-drv-v360-uken.tar.gz 116695930 BLAKE2B 75b0ed7a957fbc1677a834e67b92b7752cfa74536cb238b553f1c2c98b86399c29209240d093492ea212618c0092ad59a22f03f992462b8ef488f8ed58b51d21 SHA512 c8b2abb2d0e9ccf972241dda5154c0ddd1ba9cfe6c721c242c40c90cf29e8d0b2c6a559907318cd191232f699a42425cc4148aebcaab6aa111f1cb5439777ce7
+EBUILD cndrvcups-lb-3.50-r1.ebuild 2661 BLAKE2B 8d6efa1d90606289ca418beda23d0aeac3b7bed4ba39d5a5525d29bffda50ba826e798d9843fbf46ca952e26fa3f8149dfe8af1fb2a32f82bf05433caba951b2 SHA512 cc53d15407dd84597531b094b9365bd28d85eb4b52cabcd61bdb825b325a59b9261ad915f44ea1df279c7fe4d38846418a63da54864dff17ab05abb5f62a38d5
 EBUILD cndrvcups-lb-3.50.ebuild 2612 BLAKE2B d96957081bcec6c14310fba0edb5e0106692548c9ada3e31432b9dbfd9a9602d2989a00dbbd7430d402ddfb2b69e371ecb6fa13a9b9883763280c2540ea315ff SHA512 428241bbc275f2ffdc4f82e43b75d9c065fad2531eac51e5037173431b6781cccbff1aae04aa384e162a611aa71e972cd93348db1197bc5e687dda93cda6a564
+EBUILD cndrvcups-lb-3.60.ebuild 2597 BLAKE2B 4a952bf9007e40454a86f7fcff984a564815ae932d65e7883b9e41f94176c86e3f766af059ca73ed5ea18e1314185e8f2df66c5c35107996d226f8154b318173 SHA512 a3e0ca1e78e0f4e4d889bcd13cdc4d8b0e971e4a02770d750e8ae391d9f685b41a3ca90fcf0ebb3a1e8f590afcc9eaab5521a9d81d2d69f54c26aca80ac2e236
 MISC metadata.xml 239 BLAKE2B 33a4b7a2007252ef09e319431769f16c7010fc511e2e2ff02853ce5bf064f90b3e3ff088d97510fa0cfdd2dffaf82872f836aff8385efcee22a62d611cc41a21 SHA512 e2741d7308653b7fb13bf9b4af86c5525cea22e23e31925db40ef76a3f228ac5fe520bbf6a0c5b83565e2257e588acaa9a33cc55480138932446642cbbf15623
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 b7fe520c91f3..b0fc31e973c6 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/0100009240/01/${SOURCES_NAME}.tar.gz"
 
 LICENSE="Canon-UFR-II"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 RDEPEND="
diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-3.40.ebuild b/net-print/cndrvcups-lb/cndrvcups-lb-3.60.ebuild
index 5547321c0517..bb09609625f5 100644
--- a/net-print/cndrvcups-lb/cndrvcups-lb-3.40.ebuild
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-3.60.ebuild
@@ -1,32 +1,33 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-inherit autotools ltprune versionator
+EAPI=7
+inherit autotools
 
-MY_PV="$(delete_all_version_separators)"
+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-1133.aspx?type=drivers&language=EN&os=LINUX"
-SRC_URI="http://gdlp01.c-wss.com/gds/8/0100007658/04/${SOURCES_NAME}.tar.gz"
+HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/imagerunner-1730i.aspx"
+SRC_URI="http://gdlp01.c-wss.com/gds/0/0100009240/02/${SOURCES_NAME}.tar.gz"
 
 LICENSE="Canon-UFR-II"
 SLOT="0"
-KEYWORDS="-* amd64 x86"
+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(-)]
+	>=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() {
@@ -51,7 +52,7 @@ src_unpack() {
 }
 
 change_dir() {
-	for i in ppd pstoufr2cpca cngplp cngplp/files cpca ; do
+	for i in pstoufr2cpca cngplp cngplp/files cpca ; do
 		cd "${i}" || die
 		"${@}"
 		cd "${S}" || die
@@ -74,10 +75,9 @@ src_configure() {
 
 src_install() {
 	default
-
 	einstalldocs
 
-	prune_libtool_files
+	find "${D}" -name '*.la' -delete || die
 
 	cd "${S}/data" || die
 	insinto /usr/share/caepcm
@@ -101,8 +101,9 @@ src_install() {
 		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
+	# 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
 }