gentoo resync : 02.03.2018

7 files changed, 228 insertions, 2 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index dd846cd3be5f..68438b8d37c6 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cndrvcups-common-lb/Manifest b/net-print/cndrvcups-common-lb/Manifest
index 033cbfc3eb32..4181a59f0caa 100644
--- a/net-print/cndrvcups-common-lb/Manifest
+++ b/net-print/cndrvcups-common-lb/Manifest
@@ -1,3 +1,5 @@
 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.ebuild 2910 BLAKE2B 2ee52d961ceacf80d7d4bdeaddabbe9fe4768fc3860194696dbf2206ad908488b39369b3bdf9143471412f6514ee810bf61451e2dcb0f4a22a73aab9f3c1bdd2 SHA512 7737ecd3fde3f68fcc2f8e788a732c75b6c853c0e48d241f5f84a583b1ab090913a4346d9615699cbc372fad0e2eb53402228db2d559192893a15048479a2704
 MISC metadata.xml 239 BLAKE2B 33a4b7a2007252ef09e319431769f16c7010fc511e2e2ff02853ce5bf064f90b3e3ff088d97510fa0cfdd2dffaf82872f836aff8385efcee22a62d611cc41a21 SHA512 e2741d7308653b7fb13bf9b4af86c5525cea22e23e31925db40ef76a3f228ac5fe520bbf6a0c5b83565e2257e588acaa9a33cc55480138932446642cbbf15623
diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.50.ebuild b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.50.ebuild
new file mode 100644
index 000000000000..3aac9be9708d
--- /dev/null
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.50.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+inherit autotools versionator
+
+MY_PV="$(delete_all_version_separators)"
+SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken"
+
+DESCRIPTION="Common files for Canon drivers"
+HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/imagerunner-1133.aspx?type=drivers&language=EN&os=LINUX"
+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"
+IUSE=""
+
+RDEPEND="
+	>=dev-libs/libxml2-2.6:2
+	>=gnome-base/libglade-2.4:2.0
+	>=net-print/cups-1.1.17
+	>=x11-libs/gtk+-2.4:2
+"
+DEPEND="${DEPEND}"
+
+S="${WORKDIR}/${SOURCES_NAME}/Sources/${P/-lb-${PV}/-3.90}"
+
+pkg_setup() {
+	# Don't raise a fuss over pre-built binaries
+	QA_PREBUILT="
+		/usr/libexec/cups/filter/c3pldrv
+		/usr/$(get_abi_LIBDIR x86)/libColorGear.so.0.0.0
+		/usr/$(get_abi_LIBDIR x86)/libColorGearC.so.1.0.0
+		/usr/$(get_abi_LIBDIR x86)/libc3pl.so.0.0.1
+		/usr/$(get_abi_LIBDIR x86)/libcaepcm.so.1.0
+		/usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
+		/usr/$(get_abi_LIBDIR x86)/libcaiowrap.so.1.0.0
+		/usr/$(get_abi_LIBDIR x86)/libcanon_slim.so.1.0.0
+		/usr/$(get_libdir)/libcanonc3pl.so.1.0.0
+	"
+	QA_SONAME="
+		/usr/$(get_abi_LIBDIR x86)/libcaiousb.so.1.0.0
+	"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd "${WORKDIR}/${SOURCES_NAME}/Sources/" || die
+	unpack ./${P/-lb-${PV}/-3.90}-1.tar.gz
+}
+
+change_dir() {
+	for i in cngplp buftool backend; do
+		cd "${i}" || die
+		"${@}"
+		cd "${S}" || die
+	done
+}
+
+src_prepare() {
+	default
+	sed -i -e \
+		"s:backenddir = \$(libdir)/cups/backend:backenddir = `cups-config --serverbin`/backend:" \
+		backend/Makefile.am || die
+
+	export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"
+	change_dir eautoreconf
+}
+
+src_configure() {
+	change_dir econf
+}
+
+src_compile() {
+	change_dir emake
+
+	# Cannot be moved to 'change_dir' as it doesn't need eautoreconf
+	( cd "${S}/c3plmod_ipc" && emake ) || die
+}
+
+src_install() {
+	MAKEOPTS+=" -j1" default
+
+	einstalldocs
+
+	cd "${S}/c3plmod_ipc" || die
+	dolib.so libcanonc3pl.so.1.0.0
+	dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so.1"
+	dosym libcanonc3pl.so.1.0.0 "/usr/$(get_libdir)/libcanonc3pl.so"
+
+	cd "${S}/data" || die
+	insinto /usr/share/caepcm
+	doins *
+
+	ABI=x86
+	cd "${S}/libs" || die
+	exeinto $(cups-config --serverbin)/filter
+	doexe c3pldrv
+	dolib.so libcaepcm.so.1.0
+	dosym libcaepcm.so.1.0 "/usr/$(get_libdir)/libcaepcm.so.1"
+	dosym libcaepcm.so.1.0 "/usr/$(get_libdir)/libcaepcm.so"
+	for lib in *.so.?.?.?; do
+		dolib.so "${lib}"
+		dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?}"
+		dosym "${lib}" "/usr/$(get_libdir)/${lib%.?.?.?}"
+	done
+
+	# c3pldrv dlopens the absolute path /usr/lib/libc3pl.so :(
+	if [[ "$(get_libdir)" != lib ]]; then
+		dosym "../$(get_libdir)/libc3pl.so" /usr/lib/libc3pl.so
+	fi
+}
diff --git a/net-print/cndrvcups-lb/Manifest b/net-print/cndrvcups-lb/Manifest
index 6927814e1727..22c323de0947 100644
--- a/net-print/cndrvcups-lb/Manifest
+++ b/net-print/cndrvcups-lb/Manifest
@@ -1,3 +1,5 @@
 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.ebuild 2614 BLAKE2B f347fd292c7b582c5e768932b1c7e444fef9d0fb5d415b4325a7f154bac83eae950db7a96e7994cbb1d017973001f1e673cd0af22e0aadb1ce42aa90817f2070 SHA512 0d61406771d9c36418ba1e08ccd188083fa6323fb54aba6fceb74e7e4c231341580bfef7727a11b63e7dd564056e882e97747a648be1eba19f087b1d32d57e5d
 MISC metadata.xml 239 BLAKE2B 33a4b7a2007252ef09e319431769f16c7010fc511e2e2ff02853ce5bf064f90b3e3ff088d97510fa0cfdd2dffaf82872f836aff8385efcee22a62d611cc41a21 SHA512 e2741d7308653b7fb13bf9b4af86c5525cea22e23e31925db40ef76a3f228ac5fe520bbf6a0c5b83565e2257e588acaa9a33cc55480138932446642cbbf15623
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 000000000000..489c7b540f48
--- /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/0100009240/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
+}
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 21bc66af7900..1bbc44e28f33 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -4,7 +4,7 @@ DIST cups-filters-1.17.9.tar.xz 1454068 BLAKE2B 7c4b1c1a017cbaaf5d413071195ce53e
 DIST cups-filters-1.19.0.tar.xz 1465524 BLAKE2B 044ab5906f73a9405de55df953c76f7efd09ac4f7800df538c8c3cfd1651de6ed4ea6e3de9378221fef69d983f070b6dcab68dfd2b822fe59aa7f804a8c27907 SHA512 4b580734f7bac78c9d48aad7d8bb9e47227134e594fba76b1c82632fd8dd3e885f3897f7efd1a4b56647b74741f452f4e36d0157591c7fd5d626001028903d30
 DIST cups-filters-1.20.0.tar.xz 1465820 BLAKE2B 3ddc0ca7017776a8b69266dc7c19484626f0f6f70a44cefc9c6e1137a7c90123beb1e4d98e75906f5dfe156af01a7725ae8f1ce668f7194f07d4595f6cbba300 SHA512 b71722cc14f81cf8cbed5b8e980c9689adc2daf6cfa72e4174b6842bd89574090831f0e986b5e32a0e9fc4e29836f04e74e72c48918d7f3a8f65faa3a6c077af
 EBUILD cups-filters-1.16.4.ebuild 3432 BLAKE2B 9733302bc404c6454ba652bd523f2a41ba0070eb605c8b4150056ed5ddbd6093bdd72871889fa030093c7426721e45580ef75671080655eb6ec2c89dcff2bf25 SHA512 4a69c596427cbca25b3549aeb2fa91733065f1fd7a30d236234633a9955998147614d53b2e7e8044c034f297b292a67d83ebdba603079223f4f8352b4d4c3049
-EBUILD cups-filters-1.17.9.ebuild 3499 BLAKE2B 0004e1861d14ee5671312725369ec7edc37f2716b9b71a78077aef0904730d2888c0aef2db5fafad2e00e5650e71feeae773c8a0de52ed2cf8cadab7f6a7328b SHA512 039e9709b071444eeedefe59f44b4cf8cc0856e9ceff38ea911128a53541c01dce314bd047b7fe35ada7b6a12eb90dae265d270aae4b52ab06c6b7068bb4a71a
+EBUILD cups-filters-1.17.9.ebuild 3498 BLAKE2B 418dd0605dfd41b9b914fb6bfb57adb4eb46f916d828c7aa232a6ba23913febd43f67463735a2019dab3f6ed0aa9169a095fdaa7ee585635c781ff7532ce13c4 SHA512 c58bd87d12fd7bb7d5b94d3cd7820424e0fb33800f87e10892ef26139bf88ffbdc42b27a805198a9877254a4ec84b338a59f1e555839763ebcafe0fd07297f24
 EBUILD cups-filters-1.19.0.ebuild 3504 BLAKE2B ceb5f203394fcb688acb1e80e520b14bcbe5a664f20725841d4fce9b70b31ea95746f737fbd3181979fe214836fd4c16c9bb9434999b1b8542ac750f806d20a4 SHA512 cbc2fed9c50d9773530fe806ed177220cd6daaabc1f1bfe0c360c75bc33a899a3c8893694798e5cac0413d84a67e3163c40f19852738b21b7d13bb2c770f589a
 EBUILD cups-filters-1.20.0.ebuild 3504 BLAKE2B ceb5f203394fcb688acb1e80e520b14bcbe5a664f20725841d4fce9b70b31ea95746f737fbd3181979fe214836fd4c16c9bb9434999b1b8542ac750f806d20a4 SHA512 cbc2fed9c50d9773530fe806ed177220cd6daaabc1f1bfe0c360c75bc33a899a3c8893694798e5cac0413d84a67e3163c40f19852738b21b7d13bb2c770f589a
 EBUILD cups-filters-9999.ebuild 3504 BLAKE2B 5d8c026d3040863a9bbfe54dd4bcbd36ba20ff341dcc9348f21af574aa64162ee46536f9c868df3b0bf51caf55ee4ddf20e178741ab00bc1a24b5278fa26bfe0 SHA512 4eeff094b85dc861d817a58211fed3b812b9e8b7d73c2ffb2dd2245cfa53e325c0f8d7844b20580331f1d72c24f7d2e5bc2bb44e4385a83f7e2b466e30268a02
diff --git a/net-print/cups-filters/cups-filters-1.17.9.ebuild b/net-print/cups-filters/cups-filters-1.17.9.ebuild
index 66223cd5a521..b99d4154a530 100644
--- a/net-print/cups-filters/cups-filters-1.17.9.ebuild
+++ b/net-print/cups-filters/cups-filters-1.17.9.ebuild
@@ -12,7 +12,7 @@ if [[ "${PV}" == "9999" ]] ; then
 	EBZR_REPO_URI="http://bzr.linuxfoundation.org/openprinting/cups-filters"
 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 ~amd64-fbsd ~m68k-mint"
+	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ia64 ~mips ppc ~ppc64 ~s390 sparc x86 ~amd64-fbsd ~m68k-mint"
 fi
 DESCRIPTION="Cups filters"
 HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"