gentoo resync : 28.04.2021

4 files changed, 37 insertions, 37 deletions

diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index b3a0feb94281..b64d425a0319 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -3,7 +3,7 @@ AUX cups-filters-1.27.4-make-missing-testfont-non-fatal.patch 510 BLAKE2B 9b48f8
 AUX cups-filters-1.28.2-make-missing-testfont-non-fatal.patch 477 BLAKE2B 30e8fd049fb4d16439405aa052134d828a5f9e5e3f79c02e6121d3c15c5374c62d370fe88ab4b761e849ab48ecc0bdde97d36c6fd98056d0dc195464c7648a2d SHA512 797e8530f5a44b4e4975399076e4e1c537da968a9ed8272baaf1e457a025bc22478045e780208b1607dbcd4eb31b91ac605781cf6eae47ffcdd748e34d126327
 DIST cups-filters-1.28.3.tar.xz 1501824 BLAKE2B b4f493681ac2a701648b3b9b071f4ebfb432dd4660b610579ff2ed6cba4f6cd4351d5a1f28f5c096b3ba20d9c45dc87837bf127b9bc98680a98dec58dd0a68ea SHA512 ac139ae7452342bd46e464bff3438d437f1c9a2e719a7b32b7abc22c2667acaa93dfb976decb277a02572e688ecd86289e01fca817bef93018dff2076fb2a30c
 DIST cups-filters-1.28.7.tar.xz 1503052 BLAKE2B b9d3280871faa79a7c277731bf6eb1eef161537829d4bc07ec36075ebc12a3617dce66994ed708991757ce7d78fc5ab010925a1d3d9811fd11cf1172f4786442 SHA512 fa94f51ca1c208dcacb1814d8b812c9a72dd09475b7cf836b02c72cb5e3290318f37e475ee3ae8d45351715c3a2ccc0df5ac51ae6fc11462f5acdfa303a04727
-EBUILD cups-filters-1.28.3.ebuild 3588 BLAKE2B 13dd4b84406b23d346e49b578ece8ab0133c26df584bc2ba48154bccacaf1f3c8805056d5fdb60a5aa3ffa53a36c41e6ba6100be2dc5966f3acca8636c33ecc9 SHA512 e1f41da89145c942e974d57f9189baf68f3cb85ce6eea10619c6866f4346a99b1ab19c2f663c96525a8ae81701797f85fdc71faea01adb10aa708fec4dd3eb8d
-EBUILD cups-filters-1.28.7.ebuild 3588 BLAKE2B 601a6ea999ac8bd23907e04916d73e954d06390bbe99d6ddc1d6c62b972ca9f825c34ab2de92f3a624547021ddc2d8ea145658119727dc0fac45522e6e29ffb9 SHA512 2a7fc38f520c166283c5dd0925c0caf76521e06042a3e9fc534b27ddb0ba3645cfc95f93e6c7ed02ae31b41c41c4a79cfac94832c74fed1575244a8d112cca0c
-EBUILD cups-filters-9999.ebuild 3526 BLAKE2B c38824b7d039513ce3cdf39881193df39a36f2a3f1884fd88579e4a32600b5ada64024a689aad3b801eaf73322b7ce2509391997d77175a5e92e2509912df936 SHA512 4102b01ea57450437a4e6f594f137c8bf82dade5275e4719b546983a49f1a725bb209a1c88d89b18b9e5dd813395afd8865999c1e3158d77c32b50f675d143c5
+EBUILD cups-filters-1.28.3.ebuild 3589 BLAKE2B cea462810ff0d46a9f9a56e71b101425f389fba43bd70fc0130b59ca9665996c26af9b0b8ca73f762360a00cb24e067ea3ffd1898f433e940d717a18695bbda5 SHA512 0f6530019fca4fa788394716135643869c2d3aa3b2425a5b3dde6a250b44fb348b3f398a8de367e48805d8a6a604bc7ecf12e9cb34e9ce289f33da942ebdfcc4
+EBUILD cups-filters-1.28.7.ebuild 3589 BLAKE2B cea462810ff0d46a9f9a56e71b101425f389fba43bd70fc0130b59ca9665996c26af9b0b8ca73f762360a00cb24e067ea3ffd1898f433e940d717a18695bbda5 SHA512 0f6530019fca4fa788394716135643869c2d3aa3b2425a5b3dde6a250b44fb348b3f398a8de367e48805d8a6a604bc7ecf12e9cb34e9ce289f33da942ebdfcc4
+EBUILD cups-filters-9999.ebuild 3526 BLAKE2B c3463e14abd6402155213d223b0c92396623041a4ca29b24d4f5b745836d2c906b168996f9772549766eef19fb915b063c9842eb02107d6b540479b51e9aabd6 SHA512 32dd5cc7eb3fa1fce473849c02adec4ad816a3aa05b59f7c613636fd0bf822469b071ddb3bc6ffbd714ca40fae4af4ce2696ae42157ec239e73474ce7c59e7b0
 MISC metadata.xml 512 BLAKE2B 2dd3dbff375248f63add04f7cd136e0de7fbee885f359ee546de2060b4e0d965655e9c93b4f31c4cece89e1f750037766752f4b74d4f6216213e2dcd374e163f SHA512 9678f63f3ef2164ef837220914ce57111c118df556755e2c802d1476726312dc6d47baacc4d977e35e6a44ca1d5af8f0841a41323fdbd9a6471dea2c87103d32
diff --git a/net-print/cups-filters/cups-filters-1.28.3.ebuild b/net-print/cups-filters/cups-filters-1.28.3.ebuild
index d9d1f9e65e60..589687b5cf87 100644
--- a/net-print/cups-filters/cups-filters-1.28.3.ebuild
+++ b/net-print/cups-filters/cups-filters-1.28.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,14 +12,14 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
 else
 	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 fi
 DESCRIPTION="Cups filters"
 HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
 
 LICENSE="MIT GPL-2"
 SLOT="0"
-IUSE="dbus +foomatic jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf"
+IUSE="dbus +foomatic jpeg ldap pclm pdf perl png +postscript test tiff zeroconf"
 
 RESTRICT="!test? ( test )"
 
@@ -81,13 +81,13 @@ src_configure() {
 		--with-pdftops=pdftops
 		--with-rcdir=no
 		--without-php
+		--disable-static
 		$(use_enable dbus)
 		$(use_enable foomatic)
 		$(use_enable ldap)
 		$(use_enable pclm)
 		$(use_enable pdf mutool)
 		$(use_enable postscript ghostscript)
-		$(use_enable static-libs static)
 		$(use_enable zeroconf avahi)
 		$(use_with jpeg)
 		$(use_with png)
@@ -100,21 +100,25 @@ src_compile() {
 	default
 
 	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
+		pushd "${S}/scripting/perl" > /dev/null || die
 		perl-module_src_configure
 		perl-module_src_compile
-		popd > /dev/null
+		popd > /dev/null || die
 	fi
 }
 
+src_test() {
+	emake check
+}
+
 src_install() {
 	default
 
 	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
+		pushd "${S}/scripting/perl" > /dev/null || die
 		perl-module_src_install
 		perl_delete_localpod
-		popd > /dev/null
+		popd > /dev/null || die
 	fi
 
 	if use postscript; then
@@ -136,10 +140,6 @@ src_install() {
 	systemd_dounit "${S}/utils/cups-browsed.service"
 }
 
-src_test() {
-	emake check
-}
-
 pkg_postinst() {
 	if ! use foomatic ; then
 		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
diff --git a/net-print/cups-filters/cups-filters-1.28.7.ebuild b/net-print/cups-filters/cups-filters-1.28.7.ebuild
index 37b780aabfce..589687b5cf87 100644
--- a/net-print/cups-filters/cups-filters-1.28.7.ebuild
+++ b/net-print/cups-filters/cups-filters-1.28.7.ebuild
@@ -12,14 +12,14 @@ if [[ "${PV}" == "9999" ]] ; then
 	EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
 else
 	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86"
 fi
 DESCRIPTION="Cups filters"
 HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
 
 LICENSE="MIT GPL-2"
 SLOT="0"
-IUSE="dbus +foomatic jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf"
+IUSE="dbus +foomatic jpeg ldap pclm pdf perl png +postscript test tiff zeroconf"
 
 RESTRICT="!test? ( test )"
 
@@ -81,13 +81,13 @@ src_configure() {
 		--with-pdftops=pdftops
 		--with-rcdir=no
 		--without-php
+		--disable-static
 		$(use_enable dbus)
 		$(use_enable foomatic)
 		$(use_enable ldap)
 		$(use_enable pclm)
 		$(use_enable pdf mutool)
 		$(use_enable postscript ghostscript)
-		$(use_enable static-libs static)
 		$(use_enable zeroconf avahi)
 		$(use_with jpeg)
 		$(use_with png)
@@ -100,21 +100,25 @@ src_compile() {
 	default
 
 	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
+		pushd "${S}/scripting/perl" > /dev/null || die
 		perl-module_src_configure
 		perl-module_src_compile
-		popd > /dev/null
+		popd > /dev/null || die
 	fi
 }
 
+src_test() {
+	emake check
+}
+
 src_install() {
 	default
 
 	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
+		pushd "${S}/scripting/perl" > /dev/null || die
 		perl-module_src_install
 		perl_delete_localpod
-		popd > /dev/null
+		popd > /dev/null || die
 	fi
 
 	if use postscript; then
@@ -136,10 +140,6 @@ src_install() {
 	systemd_dounit "${S}/utils/cups-browsed.service"
 }
 
-src_test() {
-	emake check
-}
-
 pkg_postinst() {
 	if ! use foomatic ; then
 		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
diff --git a/net-print/cups-filters/cups-filters-9999.ebuild b/net-print/cups-filters/cups-filters-9999.ebuild
index 90abc670cca8..ddd2623dced4 100644
--- a/net-print/cups-filters/cups-filters-9999.ebuild
+++ b/net-print/cups-filters/cups-filters-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -19,7 +19,7 @@ HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
 
 LICENSE="MIT GPL-2"
 SLOT="0"
-IUSE="dbus +foomatic jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf"
+IUSE="dbus +foomatic jpeg ldap pclm pdf perl png +postscript test tiff zeroconf"
 
 RESTRICT="!test? ( test )"
 
@@ -79,13 +79,13 @@ src_configure() {
 		--with-pdftops=pdftops
 		--with-rcdir=no
 		--without-php
+		--disable-static
 		$(use_enable dbus)
 		$(use_enable foomatic)
 		$(use_enable ldap)
 		$(use_enable pclm)
 		$(use_enable pdf mutool)
 		$(use_enable postscript ghostscript)
-		$(use_enable static-libs static)
 		$(use_enable zeroconf avahi)
 		$(use_with jpeg)
 		$(use_with png)
@@ -98,21 +98,25 @@ src_compile() {
 	default
 
 	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
+		pushd "${S}/scripting/perl" > /dev/null || die
 		perl-module_src_configure
 		perl-module_src_compile
-		popd > /dev/null
+		popd > /dev/null || die
 	fi
 }
 
+src_test() {
+	emake check
+}
+
 src_install() {
 	default
 
 	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null
+		pushd "${S}/scripting/perl" > /dev/null || die
 		perl-module_src_install
 		perl_delete_localpod
-		popd > /dev/null
+		popd > /dev/null || die
 	fi
 
 	if use postscript; then
@@ -134,10 +138,6 @@ src_install() {
 	systemd_dounit "${S}/utils/cups-browsed.service"
 }
 
-src_test() {
-	emake check
-}
-
 pkg_postinst() {
 	if ! use foomatic ; then
 		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."