gentoo resync : 30.10.2021

5 files changed, 4 insertions, 88 deletions

diff --git a/net-print/foomatic-db/Manifest b/net-print/foomatic-db/Manifest
index 318ba40755f2..7a1891d022d6 100644
--- a/net-print/foomatic-db/Manifest
+++ b/net-print/foomatic-db/Manifest
@@ -1,7 +1,3 @@
-DIST foomatic-db-4.0-20170331.tar.xz 5083832 BLAKE2B 3c22869cc50f9e68e04bc9edaf6227764ede1566bf93311f1098d0022174911697a63685488be2c753205e40284ec22c31a64e672fee3851eeec920730b5a344 SHA512 f265a476533a77c27f0eb6414a3b93c6b269effba7bb0d46c9d3965c0e7218c3b081ae5e3f01ebfe7afbec70379543dd2e553b97b338eca43c34c11a4ffb4dcc
-DIST foomatic-db-4.0-20180126.tar.xz 5418608 BLAKE2B e11dbfc7e4cf121ba8b456820438b0418981c414c6a798dee463430dd8ccf65b424e1d597bc21b32929e858d0282b12df81fb419793bd34172b0c414619d2762 SHA512 1879e2601ad88262c99201bff5353ac40516985de72dd894eeeae2589ae2b82dd4dbfc972cb3ff43f209efb92753d4ed0ce584d89cd242fedc011511c45d8a87
 DIST foomatic-db-4.0-20190226.tar.xz 6438248 BLAKE2B c5ce6b3ec5a29524f6f8c73fdaec88a97a3fd4521753c5058d470ebadf7c35c3218bd7e78023a26b267796ccfbca98368ee4d4bc5252b9339ee1c067adbe80b2 SHA512 308cf8b5648ae8f3be1a1a5af1885319ae9f263575e7b0b06bd66e6e3e0b495656124face65e285bfa657dbff3cff226bb00d78b873f16849b426641dc7d52fe
-EBUILD foomatic-db-4.0.20170331.ebuild 1193 BLAKE2B 659143d2341385384f13f3a54a695e9427df7a44bd160fc5921a476ce79471436f5d53c3b89c34905c5cfa61d7476fe736f8b1d17c2e6d5139b52271ab867ac7 SHA512 70cfbf1e89e97a013623498287fee6730320a41704b315b4aec27f38a8fc71bf54faf073774217f9c81b3c290a35b9c6f0c25ad5f1dc242db8c5aad88529510b
-EBUILD foomatic-db-4.0.20180126.ebuild 1208 BLAKE2B 9ea02390f164fb33a2b85b24fb02a9bcc2646074676ae4a90767354452e7c371ac01bab7f836c3bca5b3300df894bdfa9305c50a46d6a718b60c6f2d44df0bf8 SHA512 7a569304fd23ab104393f34bda347cea778d2e7ec2c9565d2b0df04bac1e757c98e9b9ca189c7e4a626b45efb40a54ca6fd223f0ff35e6a06ee36a59a402f257
-EBUILD foomatic-db-4.0.20190226.ebuild 1205 BLAKE2B a2b24f21d9c7092d8fa958a948b8cc17c2016ccc787af13340e45a6deace90dbf62df918792a83a4dcb304b6b6c7008700cb49efde32e26cea1dde612397e812 SHA512 18db4712e9273ec530f6ef57073734a1469e5085c251d758a594587f7855de029bf341afcbf3879a162bde7033d0e0806a2ca4dfb382082d8b31815a613497e8
-MISC metadata.xml 260 BLAKE2B ef27f93753b1b9b96d35941f8a39c7e3b1695a49bff8076cb92b718524ddf1449ffa97d26ae289ad493695a8bfbeadb6bee0030f649bef02e0ae155ca851713e SHA512 94c019f5d5e8bec9d817d4b192ae0b87effc9f73283800b6ee7b5fe50a85bf6e245eb9720c2d8f3b497b40c7e298969c5e23c5afe3af14384eee92e76afacc8c
+EBUILD foomatic-db-4.0.20190226.ebuild 1202 BLAKE2B 141ce821655c6c75be3ee9962aee9215e2aae4e4fec37035f5385c24eb8b50ab9b6e8b21b1ab9de15f6bd835c9de3702a11063add807f8be441e273ce720f468 SHA512 e794015b64428aec28fdf7572bf38c4b34b7fb29a697ddbf17e9d79849741676a1bee79a2066bb6613e0a8bd6da5b081824a1bdd5755ab32b77860f40f7dafac
+MISC metadata.xml 284 BLAKE2B 36426f95cb354d191a324eb7a89eb8a6a18ba1c85403f6a7a39bd5f3872f7d48d7d4d59ace082d75e3c01227e02c87e846412044d5f478d3db505d70b60dada7 SHA512 fd6b64e299ddaf025ad25216c5c7010b6928ecd3f92b0d4fc72697a03551e17f6fbbf8478ab736483a4f219cb1d7da66075cd1b6b69850977ff836d562f63740
diff --git a/net-print/foomatic-db/foomatic-db-4.0.20170331.ebuild b/net-print/foomatic-db/foomatic-db-4.0.20170331.ebuild
deleted file mode 100644
index 1d54962f0f7f..000000000000
--- a/net-print/foomatic-db/foomatic-db-4.0.20170331.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit versionator
-
-DESCRIPTION="Printer information files for foomatic-db-engine to generate ppds"
-HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
-SRC_URI="http://www.openprinting.org/download/foomatic/${PN}-$(replace_version_separator 2 -).tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	net-print/foomatic-db-engine
-	!net-print/foo2zjs[hp2600n]"
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 3 ${PV})"
-
-src_prepare() {
-	# ppd files do not belong to this package
-	rm -r db/source/PPD || die
-}
-
-src_configure() {
-	econf \
-		--disable-gzip-ppds \
-		--disable-ppds-to-cups
-}
-
-src_install() {
-	default
-	rmdir "${ED}"/usr/share/foomatic/db/source/PPD || die
-	# Avoid collision with foo2zjs, bug 185486
-	rm "${ED}"/usr/share/foomatic/db/source/{driver/foo2{hp,lava,xqx,zjs}.xml,printer/{Generic-ZjStream_Printer,HP-{Color_LaserJet_{1500,1600,2600n},LaserJet_{10{00,05,18,20,22},M1005_MFP}},Minolta-{Color_PageWorks_Pro_L,magicolor_2{20,30,43}0_DL},Samsung-CLP-{3,6}00}.xml}  || die
-}
diff --git a/net-print/foomatic-db/foomatic-db-4.0.20180126.ebuild b/net-print/foomatic-db/foomatic-db-4.0.20180126.ebuild
deleted file mode 100644
index dc60de17c674..000000000000
--- a/net-print/foomatic-db/foomatic-db-4.0.20180126.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit versionator
-
-DESCRIPTION="Printer information files for foomatic-db-engine to generate ppds"
-HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
-SRC_URI="http://www.openprinting.org/download/foomatic/${PN}-$(replace_version_separator 2 -).tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="
-	net-print/foomatic-db-engine
-	!net-print/foo2zjs[hp2600n]"
-
-S="${WORKDIR}/${PN}-$(get_version_component_range 3 ${PV})"
-
-src_prepare() {
-	# ppd files do not belong to this package
-	rm -r db/source/PPD || die
-	default
-}
-
-src_configure() {
-	econf \
-		--disable-gzip-ppds \
-		--disable-ppds-to-cups
-}
-
-src_install() {
-	default
-	rmdir "${ED}"/usr/share/foomatic/db/source/PPD || die
-	# Avoid collision with foo2zjs, bug 185486
-	rm "${ED}"/usr/share/foomatic/db/source/{driver/foo2{hp,lava,xqx,zjs}.xml,printer/{Generic-ZjStream_Printer,HP-{Color_LaserJet_{1500,1600,2600n},LaserJet_{10{00,05,18,20,22},M1005_MFP}},Minolta-{Color_PageWorks_Pro_L,magicolor_2{20,30,43}0_DL},Samsung-CLP-{3,6}00}.xml}  || die
-}
diff --git a/net-print/foomatic-db/foomatic-db-4.0.20190226.ebuild b/net-print/foomatic-db/foomatic-db-4.0.20190226.ebuild
index e487f17abaf5..b559732c3d5b 100644
--- a/net-print/foomatic-db/foomatic-db-4.0.20190226.ebuild
+++ b/net-print/foomatic-db/foomatic-db-4.0.20190226.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.openprinting.org/download/foomatic/${PN}-$(replace_version_s
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/net-print/foomatic-db/metadata.xml b/net-print/foomatic-db/metadata.xml
index 882504794e17..07456818fddc 100644
--- a/net-print/foomatic-db/metadata.xml
+++ b/net-print/foomatic-db/metadata.xml
@@ -5,4 +5,5 @@
 		<email>printing@gentoo.org</email>
 		<name>Gentoo Printing Project</name>
 	</maintainer>
+	<stabilize-allarches/>
 </pkgmetadata>