gentoo resync : 28.04.2021

4 files changed, 4 insertions, 67 deletions

diff --git a/net-print/foomatic-db-ppds/Manifest b/net-print/foomatic-db-ppds/Manifest
index 3a4327395d56..6de04e764c59 100644
--- a/net-print/foomatic-db-ppds/Manifest
+++ b/net-print/foomatic-db-ppds/Manifest
@@ -1,8 +1,4 @@
 AUX Makefile.in-4.0.20120117.patch 1161 BLAKE2B f935f674597d1edc4d70b2fc600e5a04dd55acbae7fa648089ded8f10f3d61390c62e24ba5d491b3a4ac2fb7c9636db3c4895842da798c5a870972d334b71b31 SHA512 75ab0f16ce0c187553fc7bdcdc9a23ae8fecd50942d3ba0282ec2d4001f141904e6f93c8a9b6496ab2b0205a31d46a082ea304e8dcbc25f5e38c86ff696d7935
-DIST foomatic-db-4.0-20170331.tar.gz 53321292 BLAKE2B 375421205b80cc84d10629454cad053ea0022c8e230c0eab0797f3de79d42e6cc3769ad286095aa7a5bdde0f49d30fb3484e8cbefbae48a32840c0ca96885276 SHA512 33037b087eccfe08fb5b2c0220992f4ad4762c7206325f6bc8073903aafa27a260382cfa8edb4500f0feeea4d0489a3a345fe3017790484fdfb53aa577f691c0
-DIST foomatic-db-4.0-20180126.tar.gz 58697641 BLAKE2B ae063e5d82e70dcd4b7791d0ffc3914c6a7d218c9e1067f6fe99f029c7f4340399e7034da26119e4219096758d029c832797dc10e8076f49f0e24ca11188785c SHA512 84e9c70e797a5328317d0b2725ebb67aa630923516fd8f860740af58ee5337b6302669c822b6aba32fb10ad9670c5894b34356e3cfc0e1496bd051551f40026d
 DIST foomatic-db-4.0-20190226.tar.xz 6438248 BLAKE2B c5ce6b3ec5a29524f6f8c73fdaec88a97a3fd4521753c5058d470ebadf7c35c3218bd7e78023a26b267796ccfbca98368ee4d4bc5252b9339ee1c067adbe80b2 SHA512 308cf8b5648ae8f3be1a1a5af1885319ae9f263575e7b0b06bd66e6e3e0b495656124face65e285bfa657dbff3cff226bb00d78b873f16849b426641dc7d52fe
-EBUILD foomatic-db-ppds-4.0.20170331.ebuild 831 BLAKE2B d022ca0a544011a8c3bf055b12455807bf3ca022dbc2c84a422a0c6ff6b438f163532f895a3e1de9cd937078a3ca41864b1da6844e0c8804799180060aa50dcf SHA512 0b67e0f1f6e243f8c91834a773826aaff19dfa8c1756287df25ce69546c25b2554fb5b57c0b195985c7f962dd481d9a4aaf68ee31e3dcccccf0ff5b1c41fa4d5
-EBUILD foomatic-db-ppds-4.0.20180126.ebuild 846 BLAKE2B f405520d97618b119085d75e1851480b87acdb1fa86b28e9af5d7ee185f58b4dbf23471fbeda817c8825ca8ca6bbda5f629d2f59be1c76f83aa84f0d60965e54 SHA512 c0fd1ee6953854620536ebf565afffbbbe3438c81d2f6ee27eb23d5047f67ded18e75a67a80e42bd3cab4ef2e977c5d72d3f32f94df4ed836d15bd1cb9e79657
-EBUILD foomatic-db-ppds-4.0.20190226.ebuild 846 BLAKE2B 5f6a8ab72553c8b3f0a92eaa48183e4c4830e27cd5f40d4f76cb59f14b18c0b6d4daf3cf1246c879a6e10873e60308b66f252c39c7e1f05a6ec50b10d7b84064 SHA512 40e97c7c17fd3bf433bb6f06f048e6e6a1bb174986e061f8a94c0248af36dac3b0d55f525c85c875c8ad2e723998b1ce12bc953ab7a1e258bd3eb233387bbed1
+EBUILD foomatic-db-ppds-4.0.20190226.ebuild 833 BLAKE2B 881362cb462c4df160fd80398917761d08937dd10a24e6f5347bc2c2c9be8b4278fb687a13ea53a5e6028cfb1b6b1461a66275cb95677f7437060b0ab68afa5e SHA512 52c018e04d01dcf8d6c0c89afffcacdb1345098dce26657bf9a7b8a72e3b582e6026b090bb612cfbfcd8589e441e32eff8720d65b87c9f3d4de8f3fd2bd3fb49
 MISC metadata.xml 259 BLAKE2B 4a7248bc5a529d1cf3b51f8bcfff668a9e525df3e62584369d4b5526c89e70235378420b164073946ea91cf182065d9c8d2d46c8750d5f77855239b77ce45bae SHA512 7b1cbb90c1ddcf63b8802cfa3a53611f6367801b492c7677ef038738a337002c4606bcf93c5186abf808e74bca1fa76266169245acdb3b5997651bcabfecfa5c
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
deleted file mode 100644
index 902af43302a3..000000000000
--- a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20170331.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# 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 sparc x86"
-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.20180126.ebuild b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20180126.ebuild
deleted file mode 100644
index 725401eb0c11..000000000000
--- a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20180126.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-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 ~sparc ~x86"
-IUSE=""
-
-S="${WORKDIR}/${PN/-ppds}-$(get_version_component_range 3 ${PV})"
-
-src_prepare() {
-	eapply "${FILESDIR}/Makefile.in-4.0.20120117.patch"
-	rm db/source/PPD/Kyocera/ReadMe.htm || die # bug #559008
-	default
-}
-
-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.20190226.ebuild b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20190226.ebuild
index 509ab6d4b681..aafc2714c037 100644
--- a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20190226.ebuild
+++ b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20190226.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils versionator
+inherit versionator
 
 MY_P=${PN/-ppds}-$(replace_version_separator 2 '-')
 
@@ -13,7 +13,7 @@ SRC_URI="http://linuxprinting.org/download/foomatic/${MY_P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 S="${WORKDIR}/${PN/-ppds}-$(get_version_component_range 3 ${PV})"