gentoo resync : 05.04.2019

5 files changed, 2 insertions, 335 deletions

diff --git a/net-print/cndrvcups-lb/Manifest b/net-print/cndrvcups-lb/Manifest
index 80d98eec10c1..56ac2c0c4aab 100644
--- a/net-print/cndrvcups-lb/Manifest
+++ b/net-print/cndrvcups-lb/Manifest
@@ -1,7 +1,3 @@
-DIST linux-UFRII-drv-v350-uken.tar.gz 116120579 BLAKE2B fa5f521f4eec375fa0d9efb7b47ff6dd88f47c36fa5750818f7e367058b8ccafce99b9f8f9d9195e1e5e0e2f1b77a7c0cc1524786f111b065204d0472601202b SHA512 2eeb1448cb76ac156e1e5f6df46141ee5605b0bed1c25f31b0f039fb9f579fe3d5732b132cae391e78276c550febc19366f958d1fb53c93f955303f1f5c37ab3
 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-r1.ebuild 2646 BLAKE2B 91764edf202e42838c643d090ba858edf37fe2b48ad2601a0a85f73340888c0641d4d32d614f4a69daf079622ce4d7cda469140b3f1614b9814468685638d9bc SHA512 7abff092725c0b915792cd31639da7f43147889c72157850449140bc82e87830f1808d3a40fc46412827b5748ea1e054186502b01f1cc28417205ea97e2c0d17
-EBUILD cndrvcups-lb-3.60-r2.ebuild 2679 BLAKE2B b99a41cc690a27ce91775564a9e3f28f5927371d0ec93ea6bdeff0993bd08f08d06dcc3da7dc9dfe3e46179f51b4e3bef20575fb8311bd9024140d0688f31a31 SHA512 f9c7cd073d161333feeb0f9d4336a5d9080fd1da9b4185371f95e918e56f8b0ebb4362916a48439aa3ec0754c94805ba8115dea1c5ed13db8cfb6c109cf2acad
+EBUILD cndrvcups-lb-3.60-r2.ebuild 2677 BLAKE2B 4f99a32d087099a6c6e5c0b8ee60fb03553ca8f0e68226d1cb96ac8ae729bb4332a2879c90f5c4ff45bfa49f7f1818d098aed71e295cc416beb7a1c4550b54eb SHA512 10cc5d47d4b090e40dd47e08517896df89010c543d70b110e7f595e95cd0119790af6cab9a864e2c3036ab942540511b7495582b199d83463eb0384bb1cd603c
 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
deleted file mode 100644
index b0fc31e973c6..000000000000
--- a/net-print/cndrvcups-lb/cndrvcups-lb-3.50-r1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# 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/cndrvcups-lb/cndrvcups-lb-3.50.ebuild b/net-print/cndrvcups-lb/cndrvcups-lb-3.50.ebuild
deleted file mode 100644
index 4679de0ecfa7..000000000000
--- a/net-print/cndrvcups-lb/cndrvcups-lb-3.50.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# 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/cndrvcups-lb/cndrvcups-lb-3.60-r1.ebuild b/net-print/cndrvcups-lb/cndrvcups-lb-3.60-r1.ebuild
deleted file mode 100644
index 8a3ad4427ce3..000000000000
--- a/net-print/cndrvcups-lb/cndrvcups-lb-3.60-r1.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2018 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/0/0100009240/02/${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 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
-
-	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 #????
-	# 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/cndrvcups-lb/cndrvcups-lb-3.60-r2.ebuild b/net-print/cndrvcups-lb/cndrvcups-lb-3.60-r2.ebuild
index cfc16e198dfb..b345ec6eeddc 100644
--- a/net-print/cndrvcups-lb/cndrvcups-lb-3.60-r2.ebuild
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-3.60-r2.ebuild
@@ -13,7 +13,7 @@ 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="