gentoo resync : 18.11.2018

3 files changed, 23 insertions, 22 deletions

diff --git a/net-print/cndrvcups-common-lb/Manifest b/net-print/cndrvcups-common-lb/Manifest
index 9eeda254f297..8bf33e51012c 100644
--- a/net-print/cndrvcups-common-lb/Manifest
+++ b/net-print/cndrvcups-common-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-common-lb-3.40.ebuild 2875 BLAKE2B d0590d4149db16ebfd62447e094d5acd32b25a1b5d2b3414fbbcbcba2e2987fa2c4feacea8fb054805470e8f8c4b2f98867d77665bc3e2649877a5ec435c2495 SHA512 e2a95ded32ff1f4be31bdc92a5909e9e1131cc1cd3ec8fd3dedca7969e7bb0a43584a4f158859e01127129b0c9efe4929c4c607c532f78c40c880e7934e2492c
-EBUILD cndrvcups-common-lb-3.50-r1.ebuild 2964 BLAKE2B da67fc87539c5afe8bcdda8ce4a9ebf733b106422509848e7dca2a9428ee8fb6d6c46703bcec52d4a1e63bea4091fa60782c2eae0f3e3cca14e1848afa6c49e8 SHA512 733a995b1f75d462c4c9d5e3020f6930ffa62160bd3d310e3fd897a7565177049e48719db1e15e76569953c630bef40248c053c3b9832432eb66c1f1fc28c215
+DIST linux-UFRII-drv-v360-uken.tar.gz 116695930 BLAKE2B 75b0ed7a957fbc1677a834e67b92b7752cfa74536cb238b553f1c2c98b86399c29209240d093492ea212618c0092ad59a22f03f992462b8ef488f8ed58b51d21 SHA512 c8b2abb2d0e9ccf972241dda5154c0ddd1ba9cfe6c721c242c40c90cf29e8d0b2c6a559907318cd191232f699a42425cc4148aebcaab6aa111f1cb5439777ce7
+EBUILD cndrvcups-common-lb-3.50-r1.ebuild 2959 BLAKE2B 6d4dbeb5f84e62c36a50587950c642b7ff4647a54a26f7fd7eb9b8651241c7bdd532c589f2e4ac202ed4197abd428c02bf532fdb888b6c757773970e0124768f SHA512 9a1e84267d2174842e8c4f96ffc7038acffac1209cb9bd45c7df6bee745174973cd12e23f3811308b097f79d516cfa73a92db48ea7169815ae88f791b09cc46b
 EBUILD cndrvcups-common-lb-3.50.ebuild 2908 BLAKE2B d94d0bb052e2bec96dd89a31cf492ea4fb87cda1c18e3ceac871c5c4476a4a1da0ba64a8fff320fc44a9051e4efc058e24852e152a554fc398409f4c58595afc SHA512 54d04efc82ccbb790615f5c57b907e4303290884146b83cf445d53e4f8d89efde2cc94c78b0cb1aac7126bf8237c8d451dafc923f77668e491b5d555e0391700
+EBUILD cndrvcups-common-lb-3.60.ebuild 2899 BLAKE2B b893f04e1583dd32fe3937cd99eb4b9933cb09535349154ae0483a40c52e55fba5b9d364e828d72205651a4a9bedb1a2dc402bc26a515c989269cb4d460c1429 SHA512 76dc20f7e6bbfc473513487ee3af670a0c41a6e5b5713c2084048d0e2a4dbb0251d5f9375cf8ff3be995abc826e44a6e0ab8fed0f6778681a5a34b8ce2dda2a7
 MISC metadata.xml 239 BLAKE2B 33a4b7a2007252ef09e319431769f16c7010fc511e2e2ff02853ce5bf064f90b3e3ff088d97510fa0cfdd2dffaf82872f836aff8385efcee22a62d611cc41a21 SHA512 e2741d7308653b7fb13bf9b4af86c5525cea22e23e31925db40ef76a3f228ac5fe520bbf6a0c5b83565e2257e588acaa9a33cc55480138932446642cbbf15623
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 2a20a651679e..251dd60eae82 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/0100009240/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="
diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.40.ebuild b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60.ebuild
index f8318f3d2fea..ce75e664a60a 100644
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.40.ebuild
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60.ebuild
@@ -1,31 +1,31 @@
-# 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 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="Common files for Canon drivers"
-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"
 
 # 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="
-	dev-libs/libxml2
-	gnome-base/libglade
-	net-print/cups
-	x11-libs/gtk+:2
+	>=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.80}"
+S="${WORKDIR}/${SOURCES_NAME}/Sources/${P/-lb-${PV}/-4.00}"
 
 pkg_setup() {
 	# Don't raise a fuss over pre-built binaries
@@ -48,7 +48,7 @@ pkg_setup() {
 src_unpack() {
 	unpack ${A}
 	cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die
-	unpack ./${P/-lb-${PV}/-3.80}-1.tar.gz
+	unpack ./${P/-lb-${PV}/-4.00}-1.tar.gz
 }
 
 change_dir() {
@@ -107,8 +107,9 @@ src_install() {
 		dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?.?}"
 	done
 
-	# c3pldrv dlopens the absolute path /usr/lib/libc3pl.so :(
-	if [[ "$(get_libdir)" != lib ]]; then
-		dosym "../$(get_libdir)/libc3pl.so" /usr/lib/libc3pl.so
-	fi
+	# 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
 }