gentoo resync : 15.09.2018

7 files changed, 228 insertions, 2 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 9b6fd966e2b6..92d156822f26 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 4181a59f0caa..961d1b9c2874 100644
--- a/net-print/cndrvcups-common-lb/Manifest
+++ b/net-print/cndrvcups-common-lb/Manifest
@@ -1,5 +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
 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-r1.ebuild b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.50-r1.ebuild
new file mode 100644
index 000000000000..2a20a651679e
--- /dev/null
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.50-r1.ebuild
@@ -0,0 +1,115 @@
+# 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 :(, bug #????
+	# # Skipped for now due to bug #642138
+#	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 22c323de0947..17f2d24cad8f 100644
--- a/net-print/cndrvcups-lb/Manifest
+++ b/net-print/cndrvcups-lb/Manifest
@@ -1,5 +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
 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-r1.ebuild b/net-print/cndrvcups-lb/cndrvcups-lb-3.50-r1.ebuild
new file mode 100644
index 000000000000..b7fe520c91f3
--- /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/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 :(, bug #????
+	# Skipped for now due to bug #642138
+#	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 035b9acc9716..a7afc5dbb979 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.20.4.tar.xz 1474700 BLAKE2B 70948565e4a2b35d0c3bc510e7c03d77ac1ed47ab16a22bc9f60a7293fe5b5b08fdb1e95dd7a32f4c99a18676e50c48a515a954d437283ce7011ab616804e235 SHA512 4001cefbee945c326e3c597869763286e8665dee098b9aff76340dd249ef3e615f2a8df5c8e802e388b91dfd06ba9e8313b27908ca89ca120f899060785a6f07
 DIST cups-filters-1.21.2.tar.xz 1473008 BLAKE2B fea7f0f92464f5e95f57f71b6f6bb5acc9cd6ccb8c97a6a54a40be4f462b76603879f85c9ae0a0c5f47d113e6de9642ee9707d7af1b5cf93f3c47a619db2be55 SHA512 07672737108e1593374fa95582e2c8ad7a3fec6202846ba85224c1c89f65b7b89de96ebf67841ec5d948fe556dddd06ae6a58ad6c5c0a25a82ce643c9384aaf0
 EBUILD cups-filters-1.17.9.ebuild 3495 BLAKE2B 0354831007a19a9a5fc00152e52fec2d95a0b35adfb498278c3312cbcf00ecfc62f717e353e21085b1c55462ba81bb8aed9e60e8d439a5dbe9da9af838b2db92 SHA512 35391fc1cc809d8fbc2c7ba4944924244ea1f97bb14180532b30f841c2a6a8da3fc8e34def58417d11fc604821d010914d8f6462ce4fca69c44adcd754169d3e
-EBUILD cups-filters-1.20.4.ebuild 3562 BLAKE2B 9f8a4df8e99e1ffba24d09a4ea2ead20f7d3f16b36a9fe12e9b354aca21309c6f3e472e4c702ab24df6cdd5533ed7a6d8c4a98f6ba02b87e1eb99412c1e215a9 SHA512 d7016e8b3c2ec11e9c03a86b986b860331d718eb095f023d6e6e67fe0a5cf8952910887fbc7ff4e027887b05759200a86b6635bd77fa615a14fdc70a24554558
+EBUILD cups-filters-1.20.4.ebuild 3559 BLAKE2B a4c8d0bfcdced811f94541db220f08ed9360384011debc7439050cd58fd5cccc9e58aab085d019f99f4b63e928bd9bc1e1dfbe1578f349e02c18f807fa0a39ed SHA512 378d47ffe7219565f4fcf50ed8481858f3099a591bc962282236e0fa2caf4d3cd85fc72ff0631f9bc3d8f7c044bb9c2ceb9ea15ae684f5267fca8906ee5529e5
 EBUILD cups-filters-1.21.2.ebuild 3502 BLAKE2B 17085b5c41c8e20f5c829a0a0ee3a19f646e056d5884be0d49bb1e53ca2b563b4d2d55aaba633d0aae9cb1d3f8a02495b2b539cfb7b5293ebfb05ee2c6544488 SHA512 1f49982ee5ce6d0a6c572d01abb3afb7744d8cab6b26284365c1716eb93f78926eec580bb0be5fc3951fa6aaf2abc96c7f9692a2c6da1a1ed9d5eb1cbece6ef6
 EBUILD cups-filters-9999.ebuild 3502 BLAKE2B 17085b5c41c8e20f5c829a0a0ee3a19f646e056d5884be0d49bb1e53ca2b563b4d2d55aaba633d0aae9cb1d3f8a02495b2b539cfb7b5293ebfb05ee2c6544488 SHA512 1f49982ee5ce6d0a6c572d01abb3afb7744d8cab6b26284365c1716eb93f78926eec580bb0be5fc3951fa6aaf2abc96c7f9692a2c6da1a1ed9d5eb1cbece6ef6
 MISC metadata.xml 560 BLAKE2B ef0a2d2d0db2d065b1dcb444a6bf3333cc3cc8658629ffcdf44e9d39c4f13d8adb5e5b770d4abeb76fea5d4d3e85968daaf2ce2d9a13d3f396ab91f51b1ef723 SHA512 b734c24f2b65bc5c7d13b1ec8ec86f2188d758c295f7bd5aad12a794498ec92d43d543a0aed2ff49013c26aa3baf1f3e03fead90bd5c7f70bf430d48c063b06a
diff --git a/net-print/cups-filters/cups-filters-1.20.4.ebuild b/net-print/cups-filters/cups-filters-1.20.4.ebuild
index 63d047dca1cf..607764b5fbc4 100644
--- a/net-print/cups-filters/cups-filters-1.20.4.ebuild
+++ b/net-print/cups-filters/cups-filters-1.20.4.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"