gentoo resync : 16.01.2021

9 files changed, 23 insertions, 114 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index ee36d30ff24a..f7d0307f6d65 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cups-pdf/Manifest b/net-print/cups-pdf/Manifest
index e31ee3234284..9529ae850bca 100644
--- a/net-print/cups-pdf/Manifest
+++ b/net-print/cups-pdf/Manifest
@@ -1,5 +1,4 @@
 AUX cups-pdf-3.0.1-ghostscript-gpl-9.54-compat.patch 2328 BLAKE2B fa03f0a69cbafe03387777645528132721a42d364df3d70bcf6abee1492ac6c4a74c27c30d2c66c395ad5939cbae7895d4470b7faafa59e65c67c158e096fbbf SHA512 679fa1229e34378e809699ae89024bdd624d54b22565cbc23029f01e9a3ba3fde37c0d6b52b9365cd3436a234055a5c1cc80d1c2a5482d4b2649a929ee89b3c7
 DIST cups-pdf_3.0.1.tar.gz 29754 BLAKE2B f964358c5e465447e703848a697f6c801624a1836e2a0a4026c507c66048cf4bef92327508598ec7e9a356d4f57894a6b610e55b7a9a34e942cf2b88c6c55b85 SHA512 a06580f3056dddbb883c8db0c71b37b883482ae1ac8aa9bcfd85e679c4dcb44278006b7110d2988173d0eeb05b0f19fb39081fad49bf26839235e97fbe27a818
-EBUILD cups-pdf-3.0.1-r1.ebuild 899 BLAKE2B 4602a2a84fd40676884649eac0a19efc3b33cc020566902c93d769d9fb310d69bb5e6ff711c2835327c99ebd958dd2f0e7427ed1488c138a1b2f0ec49f8cc5fa SHA512 475cd35f72f173bddfd30abec814d2d3287c00413c7f46a31c53d020761491a5f69321ffc660ec18d0ebe48507ef35b35ce9466f24ba6d104a62fd0830456772
 EBUILD cups-pdf-3.0.1-r2.ebuild 988 BLAKE2B f0f278fe196de4f9e0b70e000d27431cdf9bb6cc11bdc7b850d62617654deecbdb005b4b88363ca94b8e59078198d34ccf5042e051ddf760e8987f0e18603b2e SHA512 ed911466a4d73c3ab38d01423202ec624399297cdcba8faff1731335a73fe6a89c4f1e8148bcc83543e0ff3f1bd30d2effa2883fa25528ff52bd74a77cea8899
 MISC metadata.xml 256 BLAKE2B 16ea76357721c3ab7d672ade29d27338ddf9da983571e4ca4efe2520c741fc71315d9609b711850b00c19ed4eea848dea0d5b3955eecb401c42c4db257c300bf SHA512 2748afab7ffea0b3ddadf72dc720f7d83a1d76453fa569091abffe834ec187144a47f9365ccb4a97f676dbcfd799a6be92671f283b179fe4589d95486d7fd24d
diff --git a/net-print/cups-pdf/cups-pdf-3.0.1-r1.ebuild b/net-print/cups-pdf/cups-pdf-3.0.1-r1.ebuild
deleted file mode 100644
index f775a9ed1b83..000000000000
--- a/net-print/cups-pdf/cups-pdf-3.0.1-r1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Provides a virtual printer for CUPS to produce PDF files"
-HOMEPAGE="https://www.cups-pdf.de/"
-SRC_URI="https://www.cups-pdf.de/src/${PN}_${PV/_}.tar.gz"
-S=${WORKDIR}/${PN}-${PV/_}
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
-IUSE="+ppds"
-
-RDEPEND="
-	net-print/cups
-	<app-text/ghostscript-gpl-9.54
-"
-DEPEND="${RDEPEND}"
-
-src_compile() {
-	pushd src >/dev/null
-	$(tc-getCC) ${LDFLAGS} ${CFLAGS} ${PN}.c -o ${PN} -lcups || die
-	popd >/dev/null
-}
-
-src_install() {
-	exeinto /usr/libexec/cups/backend
-	exeopts -m0700
-	doexe src/cups-pdf
-
-	insinto /etc/cups
-	doins extra/cups-pdf.conf
-
-	insinto /usr/share/cups/model
-	if use ppds; then
-		doins extra/CUPS-PDF_opt.ppd
-	else
-		doins extra/CUPS-PDF_noopt.ppd
-	fi
-
-	dodoc ChangeLog README
-}
diff --git a/net-print/foomatic-db-engine/Manifest b/net-print/foomatic-db-engine/Manifest
index 4a4a5a4a75c9..747aec97f1d3 100644
--- a/net-print/foomatic-db-engine/Manifest
+++ b/net-print/foomatic-db-engine/Manifest
@@ -1,6 +1,6 @@
 AUX 4.0.12-use-pkgconfig.patch 1010 BLAKE2B d37cb4ad77e191229c0ca7ae64b8f51b7ce275ea7f7434b0fdf629c0773f2b4f742e05a6afb06a627d4f7bb609e053f00e994bbea8b157d959a5852e8dcf135e SHA512 d0ea9514dbc7354d2d771af049de04455ccdf9145823174b99f963c82d1a4453f3198e31abc6a4953883f860df86b55452a2bfc0dd269112c029df6eddd3e1e6
-AUX 4.0.7-perl-module.patch 392 BLAKE2B 48a1913833c637eaf80f0d9c8366e85750857356a28d346ec37a11c233e1cfed7d79eb5ada6033cfdc2743c6823d8db976f9095ee04694fa176979f2dbad9d62 SHA512 7f26ac25325dffa706bef97915be06707c4953ee7c436a86a79d4edf764bbe4db9e6eeb37b889f6f4214b9b8d5ceb31091398c5ccce7607be941a74b3fe4ebf7
-AUX 4.0.7-respect-ldflag.patch 719 BLAKE2B 534ac6b3b3333bd54c9abe8b7e658faed0759b95e0104d36e381ba178f8138b9b79fa38a35f66ef5c78ca54630d870da0fb1a12f949764e623247d10dcba61c6 SHA512 432c4b61c94d1b774fc909375217587f4d8336603db0b944ec9e98e3022c2b1355928445e2cc7fbbd06a1452927082ed0fb655bc955643cce6290fe8f2d5d6c9
+AUX 4.0.7-perl-module.patch 323 BLAKE2B c291580e579f27efe5d1bbf26ff1a5ad7345cae33a8e1499437f096691c53f6d43be3c4c55491bdcc7c852d9538064a1d9df575012f4d83c451a6c7920d466a3 SHA512 913cf4dca46b028581d7e5cf11ef8a4d03b3a0ad415059eea4db5825a67c18e2e62adff26c7a7d67b6af78109c176553849a28b57d06c383ff59c8b0c12a514a
+AUX 4.0.7-respect-ldflag.patch 596 BLAKE2B b540f6b0a03a8abe28e245069ce1703e8505862c326ae8fa95c9b548c8eb908b90b6c7681d928b0e74a9963daec0a8fba6f7e37efaadfd79d46aa8961da615d7 SHA512 afb080f281c1c5a6b0011964a7c73e9f843fa347543324b4441c40aabe7b534a5689ae4be285095e43b91f5cf37f4cbd1d8f091740fc3c1824eb0099aabc9ca8
 DIST foomatic-db-engine-4.0.12.tar.gz 360499 BLAKE2B b03ba0a0cddc2d1c59a64ffa33e577f991d36c478e3f7b43f66474c749b7fb546f0ad5b04fee056c69532a6f126b87c95a72e5561443ef79bf3bdfed650d6b07 SHA512 b7e99ace6a632e9b0213183bd2c6c2d11ca072ea0414e8ca569082b7ec183dd81c80594ad63fdee82d761ae36d4fce9d3c881569a95a6085ec326ef7fd21154f
-EBUILD foomatic-db-engine-4.0.12.ebuild 1162 BLAKE2B c19f9501c7c2cb04eb5a1478c8f5bc9717abda0c5d43920bcda800c0e394cbc7d81829bb86866dfae74a494026721fc9a70b8795d9d9087a96a0e14e0128baf5 SHA512 431569b34e62111906dbb053178997cb04b7362d54e79f36e29389b99000598b0bd585f28d69bb6716f244fdb8bf2628e8bfc374dfce4c6dc527a4d2455c8bf7
+EBUILD foomatic-db-engine-4.0.12-r1.ebuild 1202 BLAKE2B 926bc57d053c2c1fa98d28ddf4fa3c1fc251b05b27c34b85e9683a528cdd16283410092d414fc95124c1482490ce26fda080edd320cfcf844f257c6d14e49b2f SHA512 1cab980f6dc6be95d1570ac6e1661ced45de007f49571870b059f3615a04a06fb2d533af11624020d66b7b3deb1696e975e9d65e698add5098d5df62dc775331
 MISC metadata.xml 260 BLAKE2B ef27f93753b1b9b96d35941f8a39c7e3b1695a49bff8076cb92b718524ddf1449ffa97d26ae289ad493695a8bfbeadb6bee0030f649bef02e0ae155ca851713e SHA512 94c019f5d5e8bec9d817d4b192ae0b87effc9f73283800b6ee7b5fe50a85bf6e245eb9720c2d8f3b497b40c7e298969c5e23c5afe3af14384eee92e76afacc8c
diff --git a/net-print/foomatic-db-engine/files/4.0.7-perl-module.patch b/net-print/foomatic-db-engine/files/4.0.7-perl-module.patch
index dbb53feb2a87..172f37fc42d3 100644
--- a/net-print/foomatic-db-engine/files/4.0.7-perl-module.patch
+++ b/net-print/foomatic-db-engine/files/4.0.7-perl-module.patch
@@ -1,5 +1,3 @@
-diff --git a/Makefile.in b/Makefile.in
-index 3014185..81e090d 100644
 --- a/Makefile.in
 +++ b/Makefile.in
 @@ -42,7 +42,7 @@ LOCAL_LIBDIR=@LOCAL_LIBDIR@
diff --git a/net-print/foomatic-db-engine/files/4.0.7-respect-ldflag.patch b/net-print/foomatic-db-engine/files/4.0.7-respect-ldflag.patch
index 9e6071276a4e..7a62faabc684 100644
--- a/net-print/foomatic-db-engine/files/4.0.7-respect-ldflag.patch
+++ b/net-print/foomatic-db-engine/files/4.0.7-respect-ldflag.patch
@@ -1,5 +1,5 @@
---- foomatic-db-engine-4.0.2/Makefile.in.orig	2009-07-23 11:45:28.487999828 +0200
-+++ foomatic-db-engine-4.0.2/Makefile.in	2009-07-23 11:45:53.939525006 +0200
+--- a/Makefile.in
++++ b/Makefile.in
 @@ -231,10 +231,10 @@
  	( cd lib && $(PERL) Makefile.PL verbose INSTALLDIRS=$(PERL_INSTALLDIRS) )
  
diff --git a/net-print/foomatic-db-engine/foomatic-db-engine-4.0.12.ebuild b/net-print/foomatic-db-engine/foomatic-db-engine-4.0.12-r1.ebuild
index 02025f3d87b6..ff3713e2c096 100644
--- a/net-print/foomatic-db-engine/foomatic-db-engine-4.0.12.ebuild
+++ b/net-print/foomatic-db-engine/foomatic-db-engine-4.0.12-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=5
+EAPI=8
 
-inherit epatch perl-module versionator autotools
+inherit autotools perl-module
 
 DESCRIPTION="Generates ppds out of xml foomatic printer description files"
 HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
@@ -12,52 +12,54 @@ SRC_URI="http://www.openprinting.org/download/foomatic/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~alpha amd64 arm ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
-IUSE=""
 
-DEPEND="net-print/cups
+BDEPEND="
+	net-print/cups
 	virtual/pkgconfig"
 RDEPEND="
 	dev-libs/libxml2
 	>=net-print/cups-filters-1.0.43-r1[foomatic]
 "
+DEPEND="${RDEPEND}"
 PDEPEND="net-print/foomatic-db"
 
 src_prepare() {
-	epatch \
+	default
+	eapply \
 		"${FILESDIR}"/4.0.7-perl-module.patch \
 		"${FILESDIR}"/4.0.7-respect-ldflag.patch \
 		"${FILESDIR}"/4.0.12-use-pkgconfig.patch
 	sed -i -e "s:@LIB_CUPS@:$(cups-config --serverbin):" Makefile.in || die
 	eautoreconf
 
-	cd lib
+	cd lib || die
 	perl-module_src_prepare
 }
 
 src_configure() {
 	default
-	emake defaults
 
-	cd lib
+	cd lib || die
 	perl-module_src_configure
 }
 
 src_compile() {
+	emake defaults
 	default
 
-	cd lib
+	cd lib || die
 	perl-module_src_compile
 }
 
+src_test() {
+	cd lib || die
+	perl-module_src_test
+}
+
 src_install() {
 	default
 	dodoc USAGE
 
-	cd lib
+	cd lib || die
 	perl-module_src_install
 }
-
-src_test() {
-	cd lib
-	perl-module_src_test
-}
diff --git a/net-print/libinklevel/Manifest b/net-print/libinklevel/Manifest
index 283bde125d38..9ca0ea7f4877 100644
--- a/net-print/libinklevel/Manifest
+++ b/net-print/libinklevel/Manifest
@@ -1,6 +1,4 @@
 AUX libinklevel-0.9.2-autoconf-2.70.patch 1911 BLAKE2B a5fa846bf17c252be5f58fe2c1f265592a636de4d631632f41622df736f47ebbb975672895e10ce9ceb009711c36643d3fdc5a7d1462a6d16e6b3f2f85067606 SHA512 ba24cc8b9b0075740d7d871f74cb333f0fd3b02ebcb277ead4f6228840efeb51bce245c96ece8e502a4af5770c8fc2a6a2ad7a0be1524512f45e535872d2a3a0
-DIST libinklevel-0.9.2.tar.gz 367928 BLAKE2B f74af31529246668a0bc00c17b2ec1432532eb484b7efb230873e251c26b349ff26f4eb51f7f610198416964c090f60232f10e40f5170783cbe806cbcf849155 SHA512 127acaef2d2c09981b4da80e4d86a869c66f0f2f9733e139800bc944c159ddca42829499a97ecbb712b74c950bb28a4e22382c9c2a42d374bc5593f8802b6c59
 DIST libinklevel-0.9.3.tar.gz 385622 BLAKE2B c44726239d09719b634046dd40e168b6d0aefe86e675ac6669e7ffcefffbe30f9116fd2b778d7b6c9ae06d7781126202b6dcdddc50359e8905c9dab3893a6cb7 SHA512 bc45661fb861fb8fc6e209ceb4023e7eed2e474e05de76a9185e698aac7bc14d302bd254a1d95bdda104bce066d85ca27bb69d6620e17eca41b95bb279a6ad47
-EBUILD libinklevel-0.9.2.ebuild 889 BLAKE2B bb459cafb3504903003fec7cca8c6b0c63a794419ec5a1307977ce81c1105c09eff8add253f43daacfd0d7e903cb6c57b2680c3bde0fdbe71630f56a75b5f828 SHA512 c3386c22e2c7d555d8b7817e30e4f89843524d3868b6fdf7e0fb8d3ed9ac8fb78a9c83f20af491a095d39251f3e3310f0f351922bf3abc9e758611330d8b19ee
 EBUILD libinklevel-0.9.3.ebuild 795 BLAKE2B 9db48e736ee62da4b7ca93ba41517df3a1ee883a8acbe8e43f1032e9bd0ecbd5bcfc9d97df3f52f813cc356fc0c4503c6be6982544be1a4c09cb432a43a0ffde SHA512 75269ec0dd16ee074db2148e98b8effbfd26dae4ef9a7e245599a908ac537a743f1335136194cb0c5a72779aa358cd8358d47a5ff4fa2d5eb93386a8f99c53a8
 MISC metadata.xml 341 BLAKE2B 0704370a2a25c5d5bb5bcf775b75235cb01bd402d51d3335c0ca46b345e6729a2139f51e9cb1a57ab586c140d279a029be79cf5234c60bab9c28218c014b23ff SHA512 10b7818239b88f229321028831803666ac6c51df61a412201ed82d88a7d1862d54b49b1c99267132bb46a14565dc0bab599161277318423f9242d22feae26d6d
diff --git a/net-print/libinklevel/libinklevel-0.9.2.ebuild b/net-print/libinklevel/libinklevel-0.9.2.ebuild
deleted file mode 100644
index 59afe1969cd3..000000000000
--- a/net-print/libinklevel/libinklevel-0.9.2.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit autotools multilib
-
-MY_P="${P/_/}"
-DESCRIPTION="A library to get the ink level of your printer"
-HOMEPAGE="http://libinklevel.sourceforge.net/"
-SRC_URI="mirror://sourceforge/libinklevel/${MY_P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-LICENSE="GPL-2"
-IUSE="debug static-libs"
-
-DEPEND=">=sys-libs/libieee1284-0.2.11
-	virtual/libusb:1"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.9.2-autoconf-2.70.patch
-)
-
-src_prepare() {
-	sed -i -e "/^dist_doc_DATA/d" Makefile.am \
-		|| die "Failed to disable installation of docs"
-	eautoreconf
-}
-
-src_configure() {
-	econf $(use_enable debug)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog NEWS README
-	use static-libs || rm "${D}"/usr/$(get_libdir)/libinklevel.{a,la}
-}