gentoo resync : 05.04.2019

5 files changed, 2 insertions, 350 deletions

diff --git a/net-print/cndrvcups-common-lb/Manifest b/net-print/cndrvcups-common-lb/Manifest
index 39adde209445..8371e2b3817e 100644
--- a/net-print/cndrvcups-common-lb/Manifest
+++ b/net-print/cndrvcups-common-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-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-r1.ebuild 2930 BLAKE2B 194e5758d5eeb5b9724ec56ecf24b13704ce7b59ef066a6be583a501c36d26d3f47a7b0a9bb8b7814df65b6c38393de6eab3993430f74b97593b08d12325b4d4 SHA512 1d14b72295fdc27cdec8b40b0af13763b1c8ec3ef5cf17b0bc4c234de19bbf29d67950d9fdf5febe90ac6a09d9eb0dca3c4d851549c4792814d4fbad3a03f3f5
-EBUILD cndrvcups-common-lb-3.60.ebuild 2899 BLAKE2B b893f04e1583dd32fe3937cd99eb4b9933cb09535349154ae0483a40c52e55fba5b9d364e828d72205651a4a9bedb1a2dc402bc26a515c989269cb4d460c1429 SHA512 76dc20f7e6bbfc473513487ee3af670a0c41a6e5b5713c2084048d0e2a4dbb0251d5f9375cf8ff3be995abc826e44a6e0ab8fed0f6778681a5a34b8ce2dda2a7
+EBUILD cndrvcups-common-lb-3.60-r1.ebuild 2928 BLAKE2B a1527ab6b8688adceda6d7db2f3d02de39e6c1ef0783f67c9444fa005b394ead97944460f655688a8dc6d7565f57eae339027187813280c7a91a44428be06472 SHA512 deccd0ca33f9f5868deaa6c9dcc19c780af8e406ede0cf8a0c28d81f9a69eaaf1242db1964a1f2be77959aa85a8d6e00010442ccd944c7a9d06434cf3b1c917d
 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
deleted file mode 100644
index 251dd60eae82..000000000000
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.50-r1.ebuild
+++ /dev/null
@@ -1,115 +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="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-common-lb/cndrvcups-common-lb-3.50.ebuild b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.50.ebuild
deleted file mode 100644
index ab5de5466e5c..000000000000
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.50.ebuild
+++ /dev/null
@@ -1,114 +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="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-common-lb/cndrvcups-common-lb-3.60-r1.ebuild b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild
index 3eef7fc8afc6..9e25fae92195 100644
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60-r1.ebuild
@@ -14,7 +14,7 @@ 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="
diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60.ebuild b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60.ebuild
deleted file mode 100644
index ce75e664a60a..000000000000
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.60.ebuild
+++ /dev/null
@@ -1,115 +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="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/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"
-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}/-4.00}"
-
-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.00}-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
-}