gentoo resync : 25.01.2018

10 files changed, 23 insertions, 53 deletions

diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 966b10b699cc..e46eb28d083c 100644
--- a/metadata/md5-cache/net-print/Manifest.gz
+++ b/metadata/md5-cache/net-print/Manifest.gz
diff --git a/metadata/md5-cache/net-print/cnijfilter2-5.20 b/metadata/md5-cache/net-print/cnijfilter2-5.20
new file mode 100644
index 000000000000..ad33e10ddc81
--- /dev/null
+++ b/metadata/md5-cache/net-print/cnijfilter2-5.20
@@ -0,0 +1,12 @@
+DEFINED_PHASES=configure install prepare
+DEPEND=virtual/libusb:1 dev-libs/libxml2 net-print/cups >=app-portage/elt-patches-20170422 !<sys-devel/gettext-0.18.1.1-r3 || ( >=sys-devel/automake-1.15:1.15 ) >=sys-devel/autoconf-2.69 >=sys-devel/libtool-2.4
+DESCRIPTION=IJ Printer Driver
+EAPI=6
+HOMEPAGE=https://www.canon.it/
+KEYWORDS=~amd64 ~x86
+LICENSE=Canon-IJ
+RDEPEND=virtual/libusb:1 dev-libs/libxml2 net-print/cups
+SLOT=0
+SRC_URI=http://gdlp01.c-wss.com/gds/0/0100006900/01/cnijfilter2-source-5.20-1.tar.gz
+_eclasses_=autotools	dc412f38566b91012efd58b9c203e6c3	libtool	0081a71a261724730ec4c248494f044d	multilib	97f470f374f2e94ccab04a2fb21d811e	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
+_md5_=40beb934a235b1c6efc6bfb85d853664
diff --git a/metadata/md5-cache/net-print/cups-filters-1.17.9 b/metadata/md5-cache/net-print/cups-filters-1.17.9
index b499e9cf9d6a..dc26bc51a32a 100644
--- a/metadata/md5-cache/net-print/cups-filters-1.17.9
+++ b/metadata/md5-cache/net-print/cups-filters-1.17.9
@@ -4,10 +4,10 @@ DESCRIPTION=Cups filters
 EAPI=6
 HOMEPAGE=https://wiki.linuxfoundation.org/openprinting/cups-filters
 IUSE=dbus +foomatic ipp_autosetup jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf
-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
 LICENSE=MIT GPL-2
 RDEPEND=>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils] >=app-text/qpdf-3.0.2:= dev-libs/glib:2 media-libs/fontconfig media-libs/freetype:2 media-libs/lcms:2 >=net-print/cups-1.7.3 !<=net-print/cups-1.5.9999 sys-devel/bc sys-libs/zlib dbus? ( sys-apps/dbus ) foomatic? ( !net-print/foomatic-filters ) jpeg? ( virtual/jpeg:0 ) ldap? ( net-nds/openldap ) pclm? ( >=app-text/qpdf-7.0_beta1 ) pdf? ( app-text/mupdf ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:0= ) postscript? ( >=app-text/ghostscript-gpl-9.09[cups] ) tiff? ( media-libs/tiff:0 ) zeroconf? ( net-dns/avahi[dbus] )
 SLOT=0
 SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.17.9.tar.xz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	flag-o-matic	02908f00f002f0f07c5b74783d778325	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	multiprocessing	cac3169468f893670dac3e7cb940e045	perl-functions	01e8c68d5a528bbcda4d3c60205983df	perl-module	863b35d127db98823d439f8d73c2d011	preserve-libs	ef207dc62baddfddfd39a164d9797648	systemd	8f5286f89e265842f5b5189666eae88b	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9
-_md5_=744e2ddf4c709103523fc489788e3dcb
+_md5_=a95c87e1a136868ab795ab37406ba85b
diff --git a/metadata/md5-cache/net-print/foomatic-db-4.0.20140105 b/metadata/md5-cache/net-print/foomatic-db-4.0.20140105
deleted file mode 100644
index 262e14ec851c..000000000000
--- a/metadata/md5-cache/net-print/foomatic-db-4.0.20140105
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Printer information files for foomatic-db-engine to generate ppds
-EAPI=5
-HOMEPAGE=http://www.linuxprinting.org/foomatic.html
-KEYWORDS=alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=net-print/foomatic-db-engine !net-print/foo2zjs[hp2600n]
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/foomatic-db-4.0-20140105.tar.gz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=37358152724ae74ec67fb67b5d9d26dd
diff --git a/metadata/md5-cache/net-print/foomatic-db-4.0.20161101 b/metadata/md5-cache/net-print/foomatic-db-4.0.20161101
deleted file mode 100644
index d99d32f253b2..000000000000
--- a/metadata/md5-cache/net-print/foomatic-db-4.0.20161101
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Printer information files for foomatic-db-engine to generate ppds
-EAPI=5
-HOMEPAGE=http://www.linuxprinting.org/foomatic.html
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
-LICENSE=GPL-2
-RDEPEND=net-print/foomatic-db-engine !net-print/foo2zjs[hp2600n]
-SLOT=0
-SRC_URI=http://www.openprinting.org/download/foomatic/foomatic-db-4.0-20161101.tar.xz
-_eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=17b5c40b4b85f6eb4ef68bd442cd5e55
diff --git a/metadata/md5-cache/net-print/foomatic-db-4.0.20160504 b/metadata/md5-cache/net-print/foomatic-db-4.0.20180126
index 53d7edd9e2a5..cc0b398da658 100644
--- a/metadata/md5-cache/net-print/foomatic-db-4.0.20160504
+++ b/metadata/md5-cache/net-print/foomatic-db-4.0.20180126
@@ -1,11 +1,11 @@
 DEFINED_PHASES=configure install prepare
 DESCRIPTION=Printer information files for foomatic-db-engine to generate ppds
-EAPI=5
+EAPI=6
 HOMEPAGE=http://www.linuxprinting.org/foomatic.html
 KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 RDEPEND=net-print/foomatic-db-engine !net-print/foo2zjs[hp2600n]
 SLOT=0
-SRC_URI=http://www.openprinting.org/download/foomatic/foomatic-db-4.0-20160504.tar.xz
+SRC_URI=http://www.openprinting.org/download/foomatic/foomatic-db-4.0-20180126.tar.xz
 _eclasses_=estack	43ddf5aaffa7a8d0482df54d25a66a1f	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=17b5c40b4b85f6eb4ef68bd442cd5e55
+_md5_=d5ff43a592e281736da6d09dc0dfddaa
diff --git a/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20140105 b/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20140105
deleted file mode 100644
index fec93b0f4232..000000000000
--- a/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20140105
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=linuxprinting.org PPD files for postscript printers
-EAPI=5
-HOMEPAGE=http://www.linuxprinting.org/foomatic.html
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~dilfridge/distfiles/foomatic-db-4.0-20140105.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=63bc3f1cbbe69b1a3406ae7f533ec778
diff --git a/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20161101 b/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20161101
deleted file mode 100644
index d1511c8eceed..000000000000
--- a/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20161101
+++ /dev/null
@@ -1,10 +0,0 @@
-DEFINED_PHASES=install prepare
-DESCRIPTION=linuxprinting.org PPD files for postscript printers
-EAPI=5
-HOMEPAGE=http://www.linuxprinting.org/foomatic.html
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=http://linuxprinting.org/download/foomatic/foomatic-db-4.0-20161101.tar.gz
-_eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f24df8df313e23fea9a1a3804b084c0e
diff --git a/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20170331 b/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20170331
index b050b7ef6e29..c028243e1a42 100644
--- a/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20170331
+++ b/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20170331
@@ -2,9 +2,9 @@ DEFINED_PHASES=install prepare
 DESCRIPTION=linuxprinting.org PPD files for postscript printers
 EAPI=5
 HOMEPAGE=http://www.linuxprinting.org/foomatic.html
-KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=http://linuxprinting.org/download/foomatic/foomatic-db-4.0-20170331.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=d8e0e3592dccc852aa3e9b1633da2a71
+_md5_=17d3a401f9e2eeeb94125bd9c78de1f5
diff --git a/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20160504 b/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20180126
index 50e4ac3b9d76..20f23753632c 100644
--- a/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20160504
+++ b/metadata/md5-cache/net-print/foomatic-db-ppds-4.0.20180126
@@ -1,10 +1,10 @@
 DEFINED_PHASES=install prepare
 DESCRIPTION=linuxprinting.org PPD files for postscript printers
-EAPI=5
+EAPI=6
 HOMEPAGE=http://www.linuxprinting.org/foomatic.html
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd
 LICENSE=GPL-2
 SLOT=0
-SRC_URI=http://linuxprinting.org/download/foomatic/foomatic-db-4.0-20160504.tar.gz
+SRC_URI=http://linuxprinting.org/download/foomatic/foomatic-db-4.0-20180126.tar.gz
 _eclasses_=desktop	2ccd1dd1dd7bfb8795eea024a4f91bb6	epatch	8233751dc5105a6ae8fcd86ce2bb0247	estack	43ddf5aaffa7a8d0482df54d25a66a1f	eutils	6e7258392d5eda499c1cfa94db650b61	ltprune	2770eed66a9b8ef944714cd0e968182e	multilib	97f470f374f2e94ccab04a2fb21d811e	preserve-libs	ef207dc62baddfddfd39a164d9797648	toolchain-funcs	885c7d8dd70a58825f3d17e35a3cd1e9	versionator	ce21313503c41896ebcd7d58b0607e37
-_md5_=f24df8df313e23fea9a1a3804b084c0e
+_md5_=7f5a5c3827e0ee392c9d6ceaf16946ce