gentoo auto-resync : 16:06:2024 - 00:09:44

6 files changed, 56 insertions, 53 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 28d29784e1c3..ae82227a363f 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/foomatic-db-ppds/Manifest b/net-print/foomatic-db-ppds/Manifest
index 071c0135f972..ec66844cca14 100644
--- a/net-print/foomatic-db-ppds/Manifest
+++ b/net-print/foomatic-db-ppds/Manifest
@@ -1,4 +1,4 @@
 AUX Makefile.in-4.0.20120117.patch 1161 BLAKE2B f935f674597d1edc4d70b2fc600e5a04dd55acbae7fa648089ded8f10f3d61390c62e24ba5d491b3a4ac2fb7c9636db3c4895842da798c5a870972d334b71b31 SHA512 75ab0f16ce0c187553fc7bdcdc9a23ae8fecd50942d3ba0282ec2d4001f141904e6f93c8a9b6496ab2b0205a31d46a082ea304e8dcbc25f5e38c86ff696d7935
 DIST foomatic-db-4.0-20190226.tar.xz 6438248 BLAKE2B c5ce6b3ec5a29524f6f8c73fdaec88a97a3fd4521753c5058d470ebadf7c35c3218bd7e78023a26b267796ccfbca98368ee4d4bc5252b9339ee1c067adbe80b2 SHA512 308cf8b5648ae8f3be1a1a5af1885319ae9f263575e7b0b06bd66e6e3e0b495656124face65e285bfa657dbff3cff226bb00d78b873f16849b426641dc7d52fe
-EBUILD foomatic-db-ppds-4.0.20190226.ebuild 833 BLAKE2B 881362cb462c4df160fd80398917761d08937dd10a24e6f5347bc2c2c9be8b4278fb687a13ea53a5e6028cfb1b6b1461a66275cb95677f7437060b0ab68afa5e SHA512 52c018e04d01dcf8d6c0c89afffcacdb1345098dce26657bf9a7b8a72e3b582e6026b090bb612cfbfcd8589e441e32eff8720d65b87c9f3d4de8f3fd2bd3fb49
+EBUILD foomatic-db-ppds-4.0.20190226-r1.ebuild 746 BLAKE2B 784aa6bfc8bb9b28ec80d8a0ddce6b336f5aa22f75c3e50f88bbd1fba870baef98c5006305337632b0c080444862a39bba9b233b98f56d41c2090a0c30fbd932 SHA512 4f98056553de0148c72229bc3061fceaef4d6d6095cc13dfbcb506a6ffb19cf24b9f9a791a8604f99321e8d756d25788ae695c4e99750d777d07a4e2544393ed
 MISC metadata.xml 284 BLAKE2B 36426f95cb354d191a324eb7a89eb8a6a18ba1c85403f6a7a39bd5f3872f7d48d7d4d59ace082d75e3c01227e02c87e846412044d5f478d3db505d70b60dada7 SHA512 fd6b64e299ddaf025ad25216c5c7010b6928ecd3f92b0d4fc72697a03551e17f6fbbf8478ab736483a4f219cb1d7da66075cd1b6b69850977ff836d562f63740
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-r1.ebuild
index aafc2714c037..0d96755a90e8 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-r1.ebuild
@@ -1,25 +1,22 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
-
-inherit versionator
-
-MY_P=${PN/-ppds}-$(replace_version_separator 2 '-')
+EAPI=8
 
 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.xz"
+SRC_URI="http://linuxprinting.org/download/foomatic/${PN/-ppds}-$(ver_rs 2 -).tar.xz"
+S=${WORKDIR}/${PN/-ppds}-$(ver_cut 3)
 
 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})"
+PATCHES=(
+	"${FILESDIR}/Makefile.in-4.0.20120117.patch"
+)
 
 src_prepare() {
-	eapply "${FILESDIR}/Makefile.in-4.0.20120117.patch"
 	rm db/source/PPD/Kyocera/ReadMe.htm || die # bug #559008
 	default
 }
diff --git a/net-print/foomatic-db/Manifest b/net-print/foomatic-db/Manifest
index 7a1891d022d6..894cb1cc6806 100644
--- a/net-print/foomatic-db/Manifest
+++ b/net-print/foomatic-db/Manifest
@@ -1,3 +1,3 @@
 DIST foomatic-db-4.0-20190226.tar.xz 6438248 BLAKE2B c5ce6b3ec5a29524f6f8c73fdaec88a97a3fd4521753c5058d470ebadf7c35c3218bd7e78023a26b267796ccfbca98368ee4d4bc5252b9339ee1c067adbe80b2 SHA512 308cf8b5648ae8f3be1a1a5af1885319ae9f263575e7b0b06bd66e6e3e0b495656124face65e285bfa657dbff3cff226bb00d78b873f16849b426641dc7d52fe
-EBUILD foomatic-db-4.0.20190226.ebuild 1202 BLAKE2B 141ce821655c6c75be3ee9962aee9215e2aae4e4fec37035f5385c24eb8b50ab9b6e8b21b1ab9de15f6bd835c9de3702a11063add807f8be441e273ce720f468 SHA512 e794015b64428aec28fdf7572bf38c4b34b7fb29a697ddbf17e9d79849741676a1bee79a2066bb6613e0a8bd6da5b081824a1bdd5755ab32b77860f40f7dafac
+EBUILD foomatic-db-4.0.20190226-r1.ebuild 1223 BLAKE2B 4bbba98509f14c700dedfaa210db7a01cc7a95247264b4f1491109c8e9ca9ad22ed1eb4bd967f56d92d85a22f0268a6e1dbcf7dc30ae6b2c75c760e0690e5f98 SHA512 2fc50cacbcdee69b542d815dd233f17ebef6e3e59703ee86e0dc7d87ba047f6e53ad76b735c4c5509e232e9905883585f7d365664045c1985668b04d1c511f87
 MISC metadata.xml 284 BLAKE2B 36426f95cb354d191a324eb7a89eb8a6a18ba1c85403f6a7a39bd5f3872f7d48d7d4d59ace082d75e3c01227e02c87e846412044d5f478d3db505d70b60dada7 SHA512 fd6b64e299ddaf025ad25216c5c7010b6928ecd3f92b0d4fc72697a03551e17f6fbbf8478ab736483a4f219cb1d7da66075cd1b6b69850977ff836d562f63740
diff --git a/net-print/foomatic-db/foomatic-db-4.0.20190226-r1.ebuild b/net-print/foomatic-db/foomatic-db-4.0.20190226-r1.ebuild
new file mode 100644
index 000000000000..89e2462b4179
--- /dev/null
+++ b/net-print/foomatic-db/foomatic-db-4.0.20190226-r1.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+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}-$(ver_rs 2 -).tar.xz"
+S=${WORKDIR}/${PN}-$(ver_cut 3)
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
+
+RDEPEND="
+	net-print/foomatic-db-engine
+	!net-print/foo2zjs[hp2600n]
+"
+
+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
+
+	cd "${ED}"/usr/share/foomatic/db/source/ || die
+	rm -r PPD || die
+	# Avoid collision with foo2zjs, bug 185486
+	local FILES=(
+		driver/foo2{hp,lava,xqx,zjs}.xml
+		printer/Generic-ZjStream_Printer.xml
+		printer/HP-Color_LaserJet_{1500,1600,2600n}.xml
+		printer/HP-LaserJet_10{00,05,18,20,22}.xml printer/HP-LaserJet_M1005_MFP.xml
+		printer/Minolta-Color_PageWorks_Pro_L.xml printer/Minolta-magicolor_2{20,30,43}0_DL.xml
+		printer/Samsung-CLP-{3,6}00.xml
+	)
+	rm -v "${FILES[@]}" || 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
deleted file mode 100644
index b559732c3d5b..000000000000
--- a/net-print/foomatic-db/foomatic-db-4.0.20190226.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 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
-}