gentoo resync : 25.01.2018

5 files changed, 10 insertions, 71 deletions

diff --git a/net-print/foomatic-db-ppds/Manifest b/net-print/foomatic-db-ppds/Manifest
index dda979bc02b6..1d81debd2f4f 100644
--- a/net-print/foomatic-db-ppds/Manifest
+++ b/net-print/foomatic-db-ppds/Manifest
@@ -1,10 +1,6 @@
 AUX Makefile.in-4.0.20120117.patch 1161 BLAKE2B f935f674597d1edc4d70b2fc600e5a04dd55acbae7fa648089ded8f10f3d61390c62e24ba5d491b3a4ac2fb7c9636db3c4895842da798c5a870972d334b71b31 SHA512 75ab0f16ce0c187553fc7bdcdc9a23ae8fecd50942d3ba0282ec2d4001f141904e6f93c8a9b6496ab2b0205a31d46a082ea304e8dcbc25f5e38c86ff696d7935
-DIST foomatic-db-4.0-20140105.tar.gz 38845034 BLAKE2B d61f6f2eb6eeb913d8875c16538b2c0dce2b2962ba85c4856471cd84b0866d1450b1d3fec863faa22ae0766848562f81d4ab543192bcc6c2a5f8bdc3435ec18c SHA512 4d06d63fe79bcfb912875b8209d658e018f4486821e7bf9433cb181d68df58602a58e755202d8ce53e0a9b9d8b0f1b31a7847c4d1346164e88105b06a4003ee4
-DIST foomatic-db-4.0-20160504.tar.gz 45782654 BLAKE2B b03374cc60564963578c88c3c25324ad0b1a5eb0812fe3eeed673d236c9ccb9938dc6d30bd00c023e99ccbed1ae02823a155477938c16e638410d7b9420bb5c2 SHA512 816a857b9529c8f71ba524c261812b83e30c660bd6f99a150e45950d212a54c62a8aad9ea9f7485f270972d42f5f333bcee8da55eb5c837b542187f25322f47f
-DIST foomatic-db-4.0-20161101.tar.gz 48879184 BLAKE2B 96c0e32e9a31d86fd55cbbea5b08e874faabd961ebee4ff15c4967ba4ac89272fa5d71e1080bacc7bc28c2bd7404b0a6db944f0aa3b51dc9426ce18c439b13ed SHA512 64bd45889b74ea376d432696541b7d7c03978ea126e9e08302761208b8e7d54399cdd7e218101ebccebc97d2f800cbe9f63c844bb3d943d4662ea2463c21653d
 DIST foomatic-db-4.0-20170331.tar.gz 53321292 BLAKE2B 375421205b80cc84d10629454cad053ea0022c8e230c0eab0797f3de79d42e6cc3769ad286095aa7a5bdde0f49d30fb3484e8cbefbae48a32840c0ca96885276 SHA512 33037b087eccfe08fb5b2c0220992f4ad4762c7206325f6bc8073903aafa27a260382cfa8edb4500f0feeea4d0489a3a345fe3017790484fdfb53aa577f691c0
-EBUILD foomatic-db-ppds-4.0.20140105.ebuild 869 BLAKE2B 8d96d2349824b149d31f89f350134f5829f0f8c25e9b2597b326c204fbef501f1fb3d6fc8e912bb67811a38c18f692a684a119b25b44bf77929130068377adce SHA512 ca5b9be9064a8b88f899866c6af881b9d0b64ed683b7f1c1bfc8982f362724231bebd3bcf795017d67b2a31f7cfc72493a75afe9b5f750f9be0a14e342852159
-EBUILD foomatic-db-ppds-4.0.20160504.ebuild 866 BLAKE2B 8be6489b9a3d55b242068ee174670d07afde24e2830bb8781635c175d508c7bcb236563fd47cb35aaa08b5b33ba3efa7e050e3d1167161ba6027651eb9da2327 SHA512 c598058bc3878a2cda44d6fd4f195d3b28ec16638f561587dd505925701b5790003d43cb770a82f2259d4b6714f96a334edc202b7fd15d1277bf6fe6925c114e
-EBUILD foomatic-db-ppds-4.0.20161101.ebuild 866 BLAKE2B 8be6489b9a3d55b242068ee174670d07afde24e2830bb8781635c175d508c7bcb236563fd47cb35aaa08b5b33ba3efa7e050e3d1167161ba6027651eb9da2327 SHA512 c598058bc3878a2cda44d6fd4f195d3b28ec16638f561587dd505925701b5790003d43cb770a82f2259d4b6714f96a334edc202b7fd15d1277bf6fe6925c114e
-EBUILD foomatic-db-ppds-4.0.20170331.ebuild 857 BLAKE2B 51e02fbea71948d2221ae7f5f6a4b0636499fc70eff53270531660c4479cae4cd4c63978c45ecc692f5f2b5bb95759ad43532af6c79d67ed082a035f59c2dfc1 SHA512 10ed93c630c9e241bd0083ea6815a2c980ce0535d865a5ef7ac9e8afae2d140ad2d1beaf47783a9d98bc429557ecc2fcdc77d947c6beb9930db87b546faaa2cc
+DIST foomatic-db-4.0-20180126.tar.gz 58697641 BLAKE2B ae063e5d82e70dcd4b7791d0ffc3914c6a7d218c9e1067f6fe99f029c7f4340399e7034da26119e4219096758d029c832797dc10e8076f49f0e24ca11188785c SHA512 84e9c70e797a5328317d0b2725ebb67aa630923516fd8f860740af58ee5337b6302669c822b6aba32fb10ad9670c5894b34356e3cfc0e1496bd051551f40026d
+EBUILD foomatic-db-ppds-4.0.20170331.ebuild 845 BLAKE2B 1e05baaa71842a77e33e2c1514dfcefb3a5f73722d52f2d2897dee75a721a6223ac2b75d9b631f10cf2255ef61e8cdc0542e4e4a5bd4429878d37e1d9e88fa93 SHA512 6d0491122d2de885047a92588ba11b6edc6abe95f265f6b62da655ce73bc22eae07b2e5ebc6e37b7cd2be5dc8df475336f51029100ff0124cfebda9529d2266d
+EBUILD foomatic-db-ppds-4.0.20180126.ebuild 863 BLAKE2B 704b3a2f8801d7ce86775323d3d5b93d590664dbba5a55b0b3e802c2f77fafd7d74a47ff5f8a3d03e16aa99a8f59ed4de59333373a0d92b32fa5406ec5b71dae SHA512 91759d2e20b22d17349519cb3ccba8fb140cf289e97da511b756e4c0aa4639a02fe8318a161724a57b1fdb43c7bb9244440623ff047078bd72f47bac5a21851f
 MISC metadata.xml 259 BLAKE2B 4a7248bc5a529d1cf3b51f8bcfff668a9e525df3e62584369d4b5526c89e70235378420b164073946ea91cf182065d9c8d2d46c8750d5f77855239b77ce45bae SHA512 7b1cbb90c1ddcf63b8802cfa3a53611f6367801b492c7677ef038738a337002c4606bcf93c5186abf808e74bca1fa76266169245acdb3b5997651bcabfecfa5c
diff --git a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20140105.ebuild b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20140105.ebuild
deleted file mode 100644
index e3b9373bfdcf..000000000000
--- a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20140105.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils versionator
-
-MY_P=${PN/-ppds}-$(replace_version_separator 2 '-')
-
-DESCRIPTION="linuxprinting.org PPD files for postscript printers"
-HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
-#SRC_URI="http://linuxprinting.org/download/foomatic/${MY_P}.tar.gz"
-SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~m68k ~mips ppc ppc64 ~s390 ~sh sparc x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-S="${WORKDIR}/${PN/-ppds}-$(get_version_component_range 3 ${PV})"
-
-src_prepare() {
-	epatch "${FILESDIR}/Makefile.in-4.0.20120117.patch"
-}
-
-src_install() {
-	default
-	rm -v "${ED}"/usr/share/foomatic/xmlschema/{driver,option,printer,types}.xsd || die "Cannot remove duplicates"
-}
diff --git a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20161101.ebuild b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20161101.ebuild
deleted file mode 100644
index 99af50ea5954..000000000000
--- a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20161101.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit eutils versionator
-
-MY_P=${PN/-ppds}-$(replace_version_separator 2 '-')
-
-DESCRIPTION="linuxprinting.org PPD files for postscript printers"
-HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
-SRC_URI="http://linuxprinting.org/download/foomatic/${MY_P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~sparc-fbsd ~x86-fbsd"
-IUSE=""
-
-S="${WORKDIR}/${PN/-ppds}-$(get_version_component_range 3 ${PV})"
-
-src_prepare() {
-	epatch "${FILESDIR}/Makefile.in-4.0.20120117.patch"
-	rm db/source/PPD/Kyocera/ReadMe.htm || die # bug #559008
-}
-
-src_install() {
-	default
-	rm -v "${ED}"/usr/share/foomatic/xmlschema/{driver,option,printer,types}.xsd || die "Cannot remove duplicates"
-}
diff --git a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20170331.ebuild b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20170331.ebuild
index 7cea5da00dae..077cc3318f07 100644
--- a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20170331.ebuild
+++ b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20170331.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -13,7 +13,7 @@ SRC_URI="http://linuxprinting.org/download/foomatic/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-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"
 IUSE=""
 
 S="${WORKDIR}/${PN/-ppds}-$(get_version_component_range 3 ${PV})"
diff --git a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20160504.ebuild b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20180126.ebuild
index 99af50ea5954..4acc8fdfb809 100644
--- a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20160504.ebuild
+++ b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20180126.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=6
 
 inherit eutils versionator
 
@@ -13,14 +13,15 @@ SRC_URI="http://linuxprinting.org/download/foomatic/${MY_P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-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"
 IUSE=""
 
 S="${WORKDIR}/${PN/-ppds}-$(get_version_component_range 3 ${PV})"
 
 src_prepare() {
-	epatch "${FILESDIR}/Makefile.in-4.0.20120117.patch"
+	eapply "${FILESDIR}/Makefile.in-4.0.20120117.patch"
 	rm db/source/PPD/Kyocera/ReadMe.htm || die # bug #559008
+	default
 }
 
 src_install() {