gentoo resync : 03.11.2019

12 files changed, 242 insertions, 126 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index abfefc90b44a..3144ec10879b 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/adobeps/Manifest b/net-print/adobeps/Manifest
deleted file mode 100644
index 78d097e490a7..000000000000
--- a/net-print/adobeps/Manifest
+++ /dev/null
@@ -1,17 +0,0 @@
-DIST Winstchs.exe 7763014 BLAKE2B 7fffc5be1ca8bb86286417bdc032deefcc997fbb9faf24caa6cb5067a6ae4373cb00464e85d4111d62d430460b50b88561ac986febdcb3101f7cd61485582bec SHA512 cf8041b9212adcabff6c3d5e547b9bb5d9c2d36ecec175cb7fff71185e8805909dc6ec7b42e68f794d66b5a4f3ce6d5b7f602c42926ffea57674f0f4597665e8
-DIST winstDan.exe 7815273 BLAKE2B bfb039559994b42a835940bb3e5f713a9a23e793e62529372e6b8399cd959a09ab1c8c4902a8acda8ed42cd685b56c8b7b12f14833ae0bc64fffc9719802d6dc SHA512 7981fe9655c798210de58a797227c7891c3355d29df8bd525bc99f8dacb7d235b1599e6b6a12136d78d63729827481edc2f8bb7eb60b728f0ae05861d925320a
-DIST winstbrz.exe 7820627 BLAKE2B c884ffce131b65f0426291215d6a1cd49c1936825241b0335236a4a95bb4a4147b69e69e7d75a45aeb3c26db38359e166b6b5e6668931114b92362dfb38888f9 SHA512 72f24812841945d49d0d1ccb99e2f906062f37ff9c0764b9ac58d999c85ce6e8c0348d09c638c01a82f68dc99dbb17abdbc11f0d1f712d2ee6b181d611d3b413
-DIST winstcht.exe 7780767 BLAKE2B 2df4f4e88382e31ea4adf0d97a87bd84e370e6fba6cc01e185dd344bffde13944727f0fc571442b727f564d7748fe644bf1911c32af7b0349bfb277f04ead676 SHA512 61d7957560edbe19928be5a55709156e3c55dc671bb0bbe4ddad0b0529a483281a24d6b37d29d2d202d672457a705715c1b52bb6e2187de353666bd4e2649dbc
-DIST winstdut.exe 7835281 BLAKE2B a83a5202af0b215edbcd77c290c1833bcab57b0cc882cf93717cde60de8a5d54ee30f73bdb113aaea1ab3c58e51e0724289fbee5fe0de5b9568738591571ca5b SHA512 0a125d98fb12a2ac7eb47d5a2e8649f09c9e4bb50803b68b891b9403d5655debeb22cca35d29b7544494ad71a6b5eb28efa2d9b1a34856584afeac1ed86c600d
-DIST winsteng.exe 7740765 BLAKE2B 1822e24652ccc9bf2ba68de5689e5f228b7c8647d08df513784855bb379cae16aeea722a3655906e8e5edb71d0fa60ca06024bbfc75831b8c03c00134858a874 SHA512 4da2460a85b9d86acdef20ed564ca1e19213f125487ec197eae9c88caf540fce123d2c2decf32978c2a3e55f52a5441cacd7826a7e916557087678532296f889
-DIST winstfin.exe 7821985 BLAKE2B b52627e2ee9013b784ed282cb469279bae2e3133f033263dfff9d6ad819d0693bb71efd2947cb3f9ad702f0a609f9b08796183910a7c311ecbf42c0f9d9a3828 SHA512 6eaf6ae2ff0e476cee3b75d476bf56078dad2c04194eb17e780add94c1a667836e950737054e0efd7a274e46f966852f3b2dcdeb26742a5c8fbdaa404d686224
-DIST winstfre.exe 7834972 BLAKE2B 0d87506d6e10b12aab60c7c6d9ff3a605dfa0b70dd2eb053b95fdaf68f3f1e2f613a72d2d826c77bd41893b57a7592837e9f5c193a679e2504dea35b36a01bbf SHA512 4d42cea3539daac9f485d4381960503ec7bc5c32dfa9ec2969f232c45f5552355fe02c7cb6b4f952425dfa820b22274190dd9d8b46a760da2a6e868bf44e3536
-DIST winstger.exe 7849748 BLAKE2B 3dc6aac6502bde357c10f4e35330d63da2bc3052415c24af33d649b59719041d3ea3ca720be3944bcc4e945a6013c6f6c27db5caa59ed637c1bc8bae8a098e5b SHA512 99a7d9fc2dd2968b59a96700db7ebd8ca467eb5a4d2e0596829758090aad264ab9acdcf82cc4cf359b018b6f337b8b80a99c82ff393f885b96e7b28880f2a2cc
-DIST winstita.exe 7839874 BLAKE2B a6c7b5d2b2a54afd1e734fa75a5db4da7186b0bf5641b07285a4029c2ac15f42222cc512dc668064347e34e11a45ebfd489861d2ae2426bf32b64ecdcc19af58 SHA512 9f082a1194509eb89a87c2fef32e16358710d3cf252fe63afa65fc66cc22fe9e3d5fc56e9df7fd2ec7bdf1607d45f084fcd2ad50d854c1d2aea756206ee9ad28
-DIST winstjpn.exe 7852247 BLAKE2B c16fc533069a91cc1d4e5df1ff7f63418524c682790857f3abc27eb4bb5f80b5e44d438947ef6c0e995af203e28e38029fa5b7d9fe8df30f6b0b2494026f49e5 SHA512 91512223c7f4124e26c4b047460334beb6c1a62f4594c7f693e3fcc921ac5a2a8067535d28a1e7e7a3c69b06c72248b6b6d5b6336a330e2a4e69678a018f8940
-DIST winstkor.exe 7794202 BLAKE2B 97b1e3d32706d03f1e09018c4a3763b49676959c22a34434d1ec1e57cfbe3bde20a51154ac53ef7ba94e3ec9e305f6040ab0a6cb98574f77ce3d86caf900b0c7 SHA512 43d3374cf456ba7864ea9f5602126877f80fefabc2313d10ca9e9b7a037a2a59c6190184f847ca1643aa4e98fb84878832251ff0bd58830f610aa5f08f44f7ad
-DIST winstnor.exe 7827002 BLAKE2B 22f2574155674b19b08ba1b4c1640a0f2d39026229435ac98e14db18e98d6b516531eabe4b272f7892e8963ecba0c4c36e5d8f94569617e2c56a6779667a0be8 SHA512 eb0621ae8b168ed4a37b77fe2452eb2a4fd85eef109dfd2b53303a3668594300baa2c7a611418817ecf009ad79c77fbef7a95a6f1d1008af087228965cf2e7a1
-DIST winstspa.exe 7839771 BLAKE2B f5850de72b0dcb5e1914be097c4785454df213d37e7ebd90e0d2ea6b5c434a181521cf88a9d4900b1f9500a8242e7bb1ae83352bd95792aa73132b2c2675ad0e SHA512 9ae33f151693a06a0c67490385cc45fd0226031ffd2d9fae5fd2b9da0e54a047315617b81937cefa54932c0379e1403645bc8c037fb276dc070b8fd7424d7c35
-DIST winstswe.exe 7803620 BLAKE2B 781f2220a84293e1958a5738f3289f6c8a74e97a0858e2b3685cc4032e9a5eb20b71b884915a1aa5bcddc7f3ff28d27b06f6834a080b0f04adb916b195ef7235 SHA512 4b8cab11bd210e487fc38e8304696802cff75a769b6b70fcbe691e1f1324bcf291ef61b4aaa3c989454822b4374d9903404a362caadb49e2c3a97a2e69cd828d
-EBUILD adobeps-1.0.6-r1.ebuild 2665 BLAKE2B 7fc1ce7c5d5e6dae29d37f17acae2aa53f2901ef60b7bedf22760fdc3831b386bfeaa2cb7f5d3bf0bbe42e0afe8e7efb0bfb3203f85d0dea0d233318f44ba389 SHA512 b5ef37ca24489d0d0b943292ef54c4d44686ee630b26e5adc33c9d0327a434e73a2656e0f028850446885bebca5e8cceccc24234c46ebb30a3ccdece4d48bfad
-MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-print/adobeps/adobeps-1.0.6-r1.ebuild b/net-print/adobeps/adobeps-1.0.6-r1.ebuild
deleted file mode 100644
index bcd8b1ef9332..000000000000
--- a/net-print/adobeps/adobeps-1.0.6-r1.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils
-
-DESCRIPTION="Adobe PostScript drivers for Windows for use with CUPS"
-HOMEPAGE="http://www.adobe.com/support/downloads/product.jsp?product=44&platform=Windows"
-SRC_URI_BASE="ftp://ftp.adobe.com/pub/adobe/printerdrivers/win/1.x"
-SRC_URI=""
-
-LICENSE="AdobePS"
-RESTRICT="mirror"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cups"
-
-DEPEND="app-arch/cabextract"
-RDEPEND="cups? ( >=net-print/cups-1.2 )"
-
-IUSE_L10N=( en da de es fi fr it ja ko nl no pt-BR sv zh-CN zh-TW )
-IUSE_FILES=( winsteng winstDan winstger winstspa winstfin winstfre winstita
-	winstjpn winstkor winstdut winstnor winstbrz winstswe Winstchs winstcht )
-
-IUSE_LANGS=""
-IUSE_CLOSE=""
-for (( X=0; X < ${#IUSE_L10N[@]}; X++ )); do
-	IUSE+=" l10n_${IUSE_L10N[X]}"
-	SRC_URI+=" l10n_${IUSE_L10N[X]}? ( ${SRC_URI_BASE}/${IUSE_FILES[X]}.exe )"
-	IUSE_LANGS+=" !l10n_${IUSE_L10N[X]}? ("
-	IUSE_CLOSE+=" )"
-done
-SRC_URI="${SRC_URI} ${IUSE_LANGS} ${SRC_URI_BASE}/${IUSE_FILES[0]}.exe${IUSE_CLOSE}"
-
-S="${WORKDIR}"
-
-pkg_setup() {
-	local X L=""
-	ADOBEPS_LANG=""
-	for X in "${IUSE_L10N[@]}"; do
-		if use l10n_"${X}"; then
-			L+=" ${X}"
-			[[ -z ${ADOBEPS_LANG} ]] && ADOBEPS_LANG="${X}"
-		fi
-	done
-	# default to English if no L10N flags are set
-	if [[ -z ${ADOBEPS_LANG} ]]; then
-		L="en"
-		ADOBEPS_LANG="en"
-	fi
-	elog "Selected languages:" ${L}
-	use cups && elog "CUPS drivers language: ${ADOBEPS_LANG}"
-}
-
-src_unpack() {
-	local X L
-	for (( X=0; X < ${#IUSE_L10N[@]}; X++ )); do
-		L="${IUSE_L10N[X]}"
-		if use l10n_"${L}" || [[ ${L} = "${ADOBEPS_LANG}" ]]; then
-			cabextract -Lq -d "${S}/${IUSE_L10N[X]}" \
-				"${DISTDIR}/${IUSE_FILES[X]}.exe" || die "unpack failed"
-		fi
-	done
-}
-
-src_install() {
-	local X
-	for X in "${IUSE_L10N[@]}"; do
-		if use l10n_"${X}" || [[ ${X} = "${ADOBEPS_LANG}" ]]; then
-			# files and filenames taken from cupsaddsmb man-page
-			insinto "/usr/share/${PN}/${X/-/_}"
-			# Windows 2000 and higher
-			doins ${X}/winxp/{ps5ui.dll,pscript.hlp,pscript.ntf,pscript5.dll}
-			# Windows 95, 98, and Me
-			newins ${X}/windows/adfonts.mfm  ADFONTS.MFM
-			newins ${X}/windows/adobeps4.drv ADOBEPS4.DRV
-			newins ${X}/windows/adobeps4.hlp ADOBEPS4.HLP
-			newins ${X}/windows/iconlib.dll  ICONLIB.DLL
-			newins ${X}/windows/psmon.dll    PSMON.DLL
-		fi
-	done
-	# symlink primary language to cups drivers
-	if use cups; then
-		dodir /usr/share/cups/drivers
-		for X in ps5ui.dll pscript.hlp pscript.ntf pscript5.dll \
-			ADFONTS.MFM ADOBEPS4.DRV ADOBEPS4.HLP ICONLIB.DLL PSMON.DLL; do
-			dosym "../../${PN}/${ADOBEPS_LANG/-/_}/${X}" \
-				"/usr/share/cups/drivers/${X}"
-		done
-	fi
-}
diff --git a/net-print/adobeps/metadata.xml b/net-print/adobeps/metadata.xml
deleted file mode 100644
index 6f49eba8f496..000000000000
--- a/net-print/adobeps/metadata.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<!-- maintainer-needed -->
-</pkgmetadata>
diff --git a/net-print/cndrvcups-common-lb/Manifest b/net-print/cndrvcups-common-lb/Manifest
index 8371e2b3817e..4d186ab1d147 100644
--- a/net-print/cndrvcups-common-lb/Manifest
+++ b/net-print/cndrvcups-common-lb/Manifest
@@ -1,3 +1,5 @@
 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
 EBUILD cndrvcups-common-lb-3.60-r1.ebuild 2928 BLAKE2B a1527ab6b8688adceda6d7db2f3d02de39e6c1ef0783f67c9444fa005b394ead97944460f655688a8dc6d7565f57eae339027187813280c7a91a44428be06472 SHA512 deccd0ca33f9f5868deaa6c9dcc19c780af8e406ede0cf8a0c28d81f9a69eaaf1242db1964a1f2be77959aa85a8d6e00010442ccd944c7a9d06434cf3b1c917d
-MISC metadata.xml 239 BLAKE2B 33a4b7a2007252ef09e319431769f16c7010fc511e2e2ff02853ce5bf064f90b3e3ff088d97510fa0cfdd2dffaf82872f836aff8385efcee22a62d611cc41a21 SHA512 e2741d7308653b7fb13bf9b4af86c5525cea22e23e31925db40ef76a3f228ac5fe520bbf6a0c5b83565e2257e588acaa9a33cc55480138932446642cbbf15623
+EBUILD cndrvcups-common-lb-3.70.ebuild 3058 BLAKE2B 03d02d8d8f73f569dd11478a5cabb1629dc0b9ee8b34d80c1c335e3cce38602f79c24a6bff09da665fb603a5f66b178ace98ce87cdcbb8d0ff7ba211d9667b10 SHA512 b47cfdaf5cbf4e1371379b3e09520e2eabb8092d5f3a05aa7267282a99aaa96691ead262abfab431e5f64710956f67351b3f481b69f40102b8148faaf7a76021
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
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 000000000000..92dd9f05754d
--- /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/0100007658/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 *.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
+}
diff --git a/net-print/cndrvcups-common-lb/metadata.xml b/net-print/cndrvcups-common-lb/metadata.xml
index f61881680816..6f49eba8f496 100644
--- a/net-print/cndrvcups-common-lb/metadata.xml
+++ b/net-print/cndrvcups-common-lb/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>pacho@gentoo.org</email>
-	<name>Pacho Ramos</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-print/cndrvcups-lb/Manifest b/net-print/cndrvcups-lb/Manifest
index 5471b235144c..01c43d7bcde0 100644
--- a/net-print/cndrvcups-lb/Manifest
+++ b/net-print/cndrvcups-lb/Manifest
@@ -1,3 +1,5 @@
 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
 EBUILD cndrvcups-lb-3.60-r2.ebuild 2645 BLAKE2B d691db4a3275fde32c17916fa4d7df7c9986d77968c60330a4cba3b0e1b36617665ff22d722c45814ef88db11d67942f1e9797277abceca6b554cba4ae2481a9 SHA512 ff473b4b6f4bd5ad685184ddddd269bf8b2ab5d4071ee064eae50e9c091fa110e324c255b05f44a944a1a96f4b818fa59536d30ca5bab75972aee94b13b1ab3d
-MISC metadata.xml 239 BLAKE2B 33a4b7a2007252ef09e319431769f16c7010fc511e2e2ff02853ce5bf064f90b3e3ff088d97510fa0cfdd2dffaf82872f836aff8385efcee22a62d611cc41a21 SHA512 e2741d7308653b7fb13bf9b4af86c5525cea22e23e31925db40ef76a3f228ac5fe520bbf6a0c5b83565e2257e588acaa9a33cc55480138932446642cbbf15623
+EBUILD cndrvcups-lb-3.70.ebuild 2791 BLAKE2B ab2dffe2b9fea99f7041bff5cc2ed74878b9208e76041887b2def108e97b5786fec555e5df5c70c9f3f91da2c20dd8ae66e98e67dc21c419f8f7bdb9886dca4b SHA512 a88c4ae9f310ce783d39b8c30d3f2a333d2b01979651c0974b92bbadc04773dd8e982e7c8434dc3e3d9deb83389d317679b89ddc636f0a3410c855915b7ca839
+MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
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 000000000000..b7afeb8bf4c2
--- /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/0100007658/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} = yes ]]; then
+		dosym "../$(get_libdir)/libcnlbcm.so" /usr/lib/libcnlbcm.so
+	fi
+}
diff --git a/net-print/cndrvcups-lb/metadata.xml b/net-print/cndrvcups-lb/metadata.xml
index f61881680816..6f49eba8f496 100644
--- a/net-print/cndrvcups-lb/metadata.xml
+++ b/net-print/cndrvcups-lb/metadata.xml
@@ -1,8 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>pacho@gentoo.org</email>
-	<name>Pacho Ramos</name>
-</maintainer>
+<!-- maintainer-needed -->
 </pkgmetadata>
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index df5ddb7b2dfa..70ceab5ec889 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -8,7 +8,7 @@ DIST cups-filters-1.25.6.tar.xz 1482160 BLAKE2B 13587dc5153e7e0368b2d4edcfab0aec
 EBUILD cups-filters-1.21.6.ebuild 3476 BLAKE2B 7c9acaa6d3990e169008c8538557535db6dcb43e5771f3914df0de3a60b4c78fa7d54920ce790753cc369921c7e1c9c470d6d49b918c6ad1bfb6f882ee0bf80e SHA512 4ab66b437984893ac38bec0d32b86d77b0bc05efcf09add70ff1df5bdb2628344eb4b2b5a4242c3df30074f0ed79e6dbfbb69c137fe94df3ccb995a09031198c
 EBUILD cups-filters-1.22.6.ebuild 3403 BLAKE2B 9549b2e0988f52962babe5bce222811d4dc8a66818da2bfcbe556b8d80c1ad3dfeb8be55c9f720da291c0e1ee854ca964fefd1132dfe4d0865655f301ffc69a6 SHA512 5a4911380b842abe3a1aada19fcd5194daae4d9d3866befe22df5d3ed570144f7ead77ce7055cf2f9450dd9fcc6f67646ea749a5af06d6fd941705bb195cbd71
 EBUILD cups-filters-1.25.10.ebuild 3372 BLAKE2B 8fdd4d6f858299e28ddc1063c402cbdd5a730a66f2ab24865bb6197fa474672813a3846ddf9d56de3b15860ffcfb88835fadeaea23d8747f05f649165ada1cf6 SHA512 c1e8815269ba2eb6fdb34930a9e5eeb9658d040c96ed073681e215b80026cfc6703bd9137ab6bb00b9b9c44255dd001b15339b4bef32ce0871dfc649e3f35c78
-EBUILD cups-filters-1.25.11.ebuild 3372 BLAKE2B 8fdd4d6f858299e28ddc1063c402cbdd5a730a66f2ab24865bb6197fa474672813a3846ddf9d56de3b15860ffcfb88835fadeaea23d8747f05f649165ada1cf6 SHA512 c1e8815269ba2eb6fdb34930a9e5eeb9658d040c96ed073681e215b80026cfc6703bd9137ab6bb00b9b9c44255dd001b15339b4bef32ce0871dfc649e3f35c78
+EBUILD cups-filters-1.25.11.ebuild 3365 BLAKE2B 75519469b3960391dd9058fc4cd39ab0c02e84746f2365d23455e473b00bf88dd24099e85dc693bea08ca811b05d02cc55bc23153c0582231d61acc1570f2115 SHA512 79a7e9f4c30d75501cc04876a1e27f57d337e9ce348472613c0305b5973d88b4451b7caf237efd30a62aaed3a5af8831d2aa127c8743aa478a7295b4a7e90f51
 EBUILD cups-filters-1.25.6.ebuild 3372 BLAKE2B 8fdd4d6f858299e28ddc1063c402cbdd5a730a66f2ab24865bb6197fa474672813a3846ddf9d56de3b15860ffcfb88835fadeaea23d8747f05f649165ada1cf6 SHA512 c1e8815269ba2eb6fdb34930a9e5eeb9658d040c96ed073681e215b80026cfc6703bd9137ab6bb00b9b9c44255dd001b15339b4bef32ce0871dfc649e3f35c78
 EBUILD cups-filters-9999.ebuild 3372 BLAKE2B 8fdd4d6f858299e28ddc1063c402cbdd5a730a66f2ab24865bb6197fa474672813a3846ddf9d56de3b15860ffcfb88835fadeaea23d8747f05f649165ada1cf6 SHA512 c1e8815269ba2eb6fdb34930a9e5eeb9658d040c96ed073681e215b80026cfc6703bd9137ab6bb00b9b9c44255dd001b15339b4bef32ce0871dfc649e3f35c78
 MISC metadata.xml 560 BLAKE2B ef0a2d2d0db2d065b1dcb444a6bf3333cc3cc8658629ffcdf44e9d39c4f13d8adb5e5b770d4abeb76fea5d4d3e85968daaf2ce2d9a13d3f396ab91f51b1ef723 SHA512 b734c24f2b65bc5c7d13b1ec8ec86f2188d758c295f7bd5aad12a794498ec92d43d543a0aed2ff49013c26aa3baf1f3e03fead90bd5c7f70bf430d48c063b06a
diff --git a/net-print/cups-filters/cups-filters-1.25.11.ebuild b/net-print/cups-filters/cups-filters-1.25.11.ebuild
index e581c47e5e42..9769b03b1b8d 100644
--- a/net-print/cups-filters/cups-filters-1.25.11.ebuild
+++ b/net-print/cups-filters/cups-filters-1.25.11.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
 else
 	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~m68k-mint"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~m68k-mint"
 fi
 DESCRIPTION="Cups filters"
 HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"