gentoo resync : 28.04.2021

author: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2021-04-28 20:21:43 +0100
commit: 40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree: 758c221bad35c9288d0bd6df9c7dfc226728e52c /net-print
parent: 8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)
43 files changed, 510 insertions, 411 deletions
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index c2c643f0e22e..0a509e6e17b7 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cndrvcups-common-lb/Manifest b/net-print/cndrvcups-common-lb/Manifest
index 19ae4bdbdca1..1d92cdf23bdc 100644
--- a/net-print/cndrvcups-common-lb/Manifest
+++ b/net-print/cndrvcups-common-lb/Manifest
@@ -1,4 +1,4 @@
 AUX cndrvcups-common-lb-3.70-fno-common.patch 2543 BLAKE2B 01af53fa5f40f9abe9aba3703ea9f84639aedc15dd7f0319c0beecb6ecf67bbe799baf089fba3a52a9cfc2700c6a09dc2581d699de9d92edb3eb14b17f039fe9 SHA512 256bfcade97eec388b8264fdc154a52c6623e902b469fb8ad55a76bbc52bfe85b1106a9055dfa3d79e70319dc2726841af4c6fb38e7c258fc6b989f8761952d4
 DIST linux-UFRII-drv-v370-uken-05.tar.gz 117334511 BLAKE2B 295c7a710b0f1ee29e642b29c7b0576f68317dba93758825aa85d431129cebea174d5c2dfa67f7506fa3b18fe48d373f0dc9331ed9caabc2e3bc733946aefd97 SHA512 d83254b7f7f87c56caeaaf151d898de36f746c03ad88d427959bdeec905b9cd92a14a8ac534073473a6cefbb5e2b0be9e9faa79b500e252ecd0a0564d2312bbc
-EBUILD cndrvcups-common-lb-3.70.ebuild 3234 BLAKE2B 06e5bcd884bb3de171e2cc4ba3328ae794249417bea107d517d1aa3de0cbc15c02e681c76e51f65c9ec4402de05876ee62743699ee744a26b23f54403327d4bf SHA512 e9b3a5b5d4b769db45a3c0361ed75e9af5bccb8fa3819f37e445c055259578ffd9eb5b733e575db1c1bff46db57c4dbae809a2bbc0d92fc6cd5ac8ee24705519
+EBUILD cndrvcups-common-lb-3.70.ebuild 3243 BLAKE2B 7b5738f2d60398c022097eb34940dc68b8612407faba4e2e9d6525ca0b314e063d6a178d207ac432f5bd9fd21a6fd739826a96981b4e3a532fa9b1644bc26bd6 SHA512 5ca991145b15f195bb7e1682fa2331472fd806cb1aea4d2af3c2b0fe3e783a83c0ea8e5f3ba3ae6386f5e816a2889d9548bca1a74ab4cdd2270f80c01c9f9e8b
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
index a838dd0d7670..ed940b40c224 100644
--- a/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
+++ b/net-print/cndrvcups-common-lb/cndrvcups-common-lb-3.70.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-inherit autotools toolchain-funcs
+inherit autotools multilib toolchain-funcs
 
 MY_PV="$(ver_rs 1- '')"
 SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken"
@@ -11,6 +11,7 @@ SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken"
 DESCRIPTION="Common files for Canon drivers"
 HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/imagerunner-1730i.aspx"
 SRC_URI="http://gdlp01.c-wss.com/gds/8/0100007658/08/${SOURCES_NAME}-05.tar.gz"
+S="${WORKDIR}/${SOURCES_NAME}/Sources/${P/-lb-${PV}/-4.10}"
 
 # GPL-2 License inside LICENSE-EN.txt files
 LICENSE="Canon-UFR-II GPL-2 MIT"
@@ -22,9 +23,7 @@ RDEPEND="
 	>=gnome-base/libglade-2.4:2.0
 	>=net-print/cups-1.1.17
 	>=x11-libs/gtk+-2.4:2"
-DEPEND="${DEPEND}"
-
-S="${WORKDIR}/${SOURCES_NAME}/Sources/${P/-lb-${PV}/-4.10}"
+DEPEND="${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
 
diff --git a/net-print/cndrvcups-lb/Manifest b/net-print/cndrvcups-lb/Manifest
index 1e09e44aa92a..4e95c587646a 100644
--- a/net-print/cndrvcups-lb/Manifest
+++ b/net-print/cndrvcups-lb/Manifest
@@ -1,3 +1,3 @@
 DIST linux-UFRII-drv-v370-uken-05.tar.gz 117334511 BLAKE2B 295c7a710b0f1ee29e642b29c7b0576f68317dba93758825aa85d431129cebea174d5c2dfa67f7506fa3b18fe48d373f0dc9331ed9caabc2e3bc733946aefd97 SHA512 d83254b7f7f87c56caeaaf151d898de36f746c03ad88d427959bdeec905b9cd92a14a8ac534073473a6cefbb5e2b0be9e9faa79b500e252ecd0a0564d2312bbc
-EBUILD cndrvcups-lb-3.70.ebuild 2789 BLAKE2B f0f9f2a308e2c6be0ecaa8aee25fc3fb3bcbb64cfbc24936f7eae36130b4931581b1eb4806fb9c139a4b03458e781bf895679cc8664eee87363e01b87ae229b5 SHA512 7e8a3dc0abd17ea86c5680d9900513cf57ed470e13977b1a313a16cde1212ec1a96c45e82c076c0ade7b733eefe3a549f15e5e0ef8d19a2b3fc4675c4b2784c2
+EBUILD cndrvcups-lb-3.70.ebuild 2789 BLAKE2B 7e13d6e7cf08c734ec3a412ccb4890160a10c01285cb0b88ae11908124f9f5ca5851895981772fd68815ca20a98e2a690c822c4e7f290366b47dbc3e591dfe4d SHA512 94bd0074cfc3e9fd98ca493f1f64cad244eef77db971ebf404fc042ede7e06d0c4d382a1bf465c61a7651ec451b9545dfb9e12a8edc5c1f0549f75d351108053
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-print/cndrvcups-lb/cndrvcups-lb-3.70.ebuild b/net-print/cndrvcups-lb/cndrvcups-lb-3.70.ebuild
index 79bcf17c8404..565d211983c3 100644
--- a/net-print/cndrvcups-lb/cndrvcups-lb-3.70.ebuild
+++ b/net-print/cndrvcups-lb/cndrvcups-lb-3.70.ebuild
@@ -2,7 +2,8 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit autotools
+
+inherit autotools multilib
 
 MY_PV="$(ver_rs 1- '')"
 SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken"
@@ -10,6 +11,7 @@ SOURCES_NAME="linux-UFRII-drv-v${MY_PV}-uken"
 DESCRIPTION="Canon UFR II / LIPSLX Printer Driver for Linux"
 HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/imagerunner-1730i.aspx"
 SRC_URI="http://gdlp01.c-wss.com/gds/8/0100007658/08/${SOURCES_NAME}-05.tar.gz"
+S="${WORKDIR}/${SOURCES_NAME}/Sources/${P}"
 
 LICENSE="Canon-UFR-II"
 SLOT="0"
@@ -23,10 +25,7 @@ RDEPEND="
 	~net-print/cndrvcups-common-lb-${PV}
 	>=x11-libs/gtk+-2.4:2
 "
-DEPEND="${DEPEND}"
-BDEPEND=""
-
-S="${WORKDIR}/${SOURCES_NAME}/Sources/${P}"
+DEPEND="${RDEPEND}"
 
 MAKEOPTS+=" -j1"
 
@@ -79,7 +78,7 @@ src_install() {
 	default
 	einstalldocs
 
-	find "${D}" -name '*.la' -type f -delete || die
+	find "${ED}" -name '*.la' -type f -delete || die
 
 	insinto /usr/share/cups/model
 	doins ppd/*.ppd
diff --git a/net-print/cnrdrvcups-lb/Manifest b/net-print/cnrdrvcups-lb/Manifest
index 8d60453b1192..329faa65a137 100644
--- a/net-print/cnrdrvcups-lb/Manifest
+++ b/net-print/cnrdrvcups-lb/Manifest
@@ -1,5 +1,3 @@
-DIST linux-UFRII-drv-v520-uken-05.tar.gz 107101656 BLAKE2B 4ea92eaaab76babca7fc94771c39b12804b9016ae7baeeaafc18e1979a83ffdcb2090a9cc8a5390314be129ca273c3571f95c83c9e4a29254aca18325687acb2 SHA512 31652894e8ad07e81ae044c5172ced73569a1b78f06f48bcafcd9cabcb19406f0645bfdf741cf3a60746859e671c443d14e5c0c04bffd540ac10406df7266b45
 DIST linux-UFRII-drv-v530-uken-12.tar.gz 188172378 BLAKE2B 9d069843bbd5fa693d584b1e1f9348ca2076656dff85fc6b34ca941c10221a48fc6119d7f2bf9c9bb8e4f512a0dabbd7d65f7fb86e16394f98ba80afc679998f SHA512 61f060a742c9e6cc7439f26fac63fbac33c96722ec80c604eca40716255920a65eab4cd6f592deee627a8c803776df2c0b8c3dbce9727e53862fa7551a172ebe
-EBUILD cnrdrvcups-lb-5.20.ebuild 6035 BLAKE2B d4c5b830c8bae5c7fd7aa30282d9471b1d3780ba7a1cd7f4b664f857948765fa4ecbd2470d2facbfbb9d99df42bef1ae91aed8ebf31f2819cb9bf5cf0dc724b0 SHA512 47ce97b8735ebbdce29abd248930e9c878ed33bf29998a1fb1a8e7e81a4d703c1e069744b3990300cc742ed4486143cecd5ee9c0277a87c5825e769f1374c1b4
-EBUILD cnrdrvcups-lb-5.30.ebuild 6097 BLAKE2B ea33b9b6a56e0d82d650a5e3b050e2c85ca19da2720fd6134e7ca8ad00b40156af6182ccdb32dc7dfc9142ef5afbeac2bb0f91e97206d5036115e55fd7242021 SHA512 25364fb6fede9f5229edae1eda27981f1fedac5fe63735d6dbef3382bef1cfad0e863b30673ac5b68750d34d5ad4446bb072acf762c132992e3b1ec847aa0f1b
+EBUILD cnrdrvcups-lb-5.30.ebuild 6095 BLAKE2B 4d478238178bacf02163a435395a95ef00fe628cfac472072c35dcfc0f8d34ddf43aefae0b5b625014d7e955836152c2a1ec4ce32d7ad0d8eaf5af41eeacbcea SHA512 7d841d4c3fbf9857f79362deebb7b77991f74cbac64bf1c84638ea2d6ddf9d23008ecce4f5b4e6932545193757adb753a56f59b801ed38bcea962f6fba60de08
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.20.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.20.ebuild
deleted file mode 100644
index 0e7853a6e6ca..000000000000
--- a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.20.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop flag-o-matic toolchain-funcs
-
-CANON_REL="05"
-MY_PV="${PV//\./}"
-
-DESCRIPTION="Canon UFR II / LIPSLX Printer Driver for Linux"
-HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/"
-SRC_URI="https://dev.gentoo.org/~juippis/distfiles/linux-UFRII-drv-v${MY_PV}-uken-${CANON_REL}.tar.gz"
-
-LICENSE="Canon-UFR-II GPL-2 MIT"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-DEPEND="dev-libs/libxml2:2
-	gnome-base/libglade:2.0
-	media-libs/jbigkit
-	net-print/cups
-	x11-libs/gtk+:2"
-RDEPEND="${DEPEND}
-	!net-print/cndrvcups-common-lb
-	!net-print/cndrvcups-lb"
-
-HTML_DOCS=(
-	"${WORKDIR}"/linux-UFRII-drv-v${MY_PV}-uken/Documents/README-ufr2-5.2xUK.html
-	"${WORKDIR}"/linux-UFRII-drv-v${MY_PV}-uken/Documents/UsersGuide-ufr2-UK.html
-)
-
-S="${WORKDIR}/linux-UFRII-drv-v${MY_PV}-uken/Sources"
-
-pkg_setup() {
-	QA_PREBUILT="/usr/bin/cnsetuputil2
-		/usr/bin/cnrsdrvufr2
-		/usr/bin/cnpkmoduleufr2r
-		/usr/bin/cnpkbidir
-		/usr/bin/cnpdfdrv
-		/usr/$(get_libdir)/libufr2filterr.so.1.0.0
-		/usr/$(get_libdir)/libColorGearCufr2.so.2.0.0
-		/usr/$(get_libdir)/libcnlbcmr.so.1.0
-		/usr/$(get_libdir)/libcanon_slimufr2.so.1.0.0
-		/usr/$(get_libdir)/libcanonufr2r.so.1.0.0
-		/usr/$(get_libdir)/libcaiowrapufr2.so.1.0.0
-		/usr/$(get_libdir)/libcaiocnpkbidir.so.1.0.0
-		/usr/$(get_libdir)/libcaepcmufr2.so.1.0"
-
-	QA_SONAME="/usr/$(get_libdir)/libcaiocnpkbidir.so.1.0.0"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}/linux-UFRII-drv-v${MY_PV}-uken/Sources/" || die
-	unpack ./${P}-1.tar.gz
-}
-
-common_op() {
-	local i
-	for i in backend buftool cngplp cnjbig rasterfilter; do
-		cd "${S}/cnrdrvcups-common-${PV}/${i}" ||
-			die "failed to switch dir to ${i}"
-		"${@}"
-		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
-	done
-}
-
-driver_op() {
-	local i
-	for i in cngplp cngplp/files cpca pdftocpca; do
-		cd "${S}/cnrdrvcups-lb-${PV}/${i}" ||
-			die "failed to switch dir to ${i}"
-		"${@}"
-		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
-	done
-}
-
-src_prepare() {
-	default
-
-	common_op mv configure.in configure.ac || die "failed to move configure.in"
-	driver_op mv configure.in configure.ac || die "failed to move configure.in"
-
-	common_op sed -i -e 's/configure.in/configure.ac/' configure.ac || die
-	driver_op sed -i -e 's/configure.in/configure.ac/' configure.ac || die
-
-	# This should work with autoreconf
-	export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"
-
-	# Other components already depend on compiled product
-	append-ldflags -L"${S}/cnrdrvcups-common-${PV}/buftool"
-
-	common_op eautoreconf
-	driver_op eautoreconf
-
-	# Fix a QA issue with .desktop file,
-	sed -i 's/Application;Utility/Utility/g' "${S}"/cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop ||
-		die "Failed to modify cnsetuputil2.desktop file."
-
-	append-cflags -fcommon
-
-	# For some reason, @AR@ is defined everywhere else correctly, but not here.
-	sed -i -e "s/AR = ar/AR = $(tc-getAR)/g" ./cnrdrvcups-common-${PV}/buftool/Makefile.in || die
-}
-
-src_configure() {
-	common_op econf
-	driver_op econf
-}
-
-src_compile() {
-	common_op emake
-	driver_op emake
-}
-
-src_install() {
-	common_op emake DESTDIR="${D}" install COMMON_SUFFIX=2
-	driver_op emake DESTDIR="${D}" install COMMON_SUFFIX=2
-
-	insinto /usr/share/cups
-	doins "${S}"/cnrdrvcups-common-${PV}/Rule/canon-laser-printer_ufr2.usb-quirks
-
-	if use amd64; then
-		cd "${S}"/lib/libs64 || die "failed to switch into libs64"
-	elif use x86; then
-		cd "${S}"/lib/libs32 || die "failed to switch into libs32"
-	else
-		die "I don't know what directory to switch into!"
-	fi
-
-	dolib.so libcaepcmufr2.so.1.0 libcaiocnpkbidir.so.1.0.0 \
-		libcaiowrapufr2.so.1.0.0 libcanonufr2r.so.1.0.0 \
-		libcanon_slimufr2.so.1.0.0 libcnlbcmr.so.1.0 \
-		libColorGearCufr2.so.2.0.0 libufr2filterr.so.1.0.0
-
-	dosym libcaepcmufr2.so.1.0 /usr/$(get_libdir)/libcaepcmufr2.so
-	dosym libcaepcmufr2.so.1.0 /usr/$(get_libdir)/libcaepcmufr2.so.1
-
-	dosym libcaiocnpkbidir.so.1.0.0 /usr/$(get_libdir)/libcaiocnpkbidir.so
-	dosym libcaiocnpkbidir.so.1.0.0 /usr/$(get_libdir)/libcaiocnpkbidir.so.1
-
-	dosym libcaiowrapufr2.so.1.0.0 /usr/$(get_libdir)/libcaiowrapufr2.so
-	dosym libcaiowrapufr2.so.1.0.0 /usr/$(get_libdir)/libcaiowrapufr2.so.1
-
-	dosym libcanonufr2r.so.1.0.0 /usr/$(get_libdir)/libcanonufr2r.so
-	dosym libcanonufr2r.so.1.0.0 /usr/$(get_libdir)/libcanonufr2r.so.1
-
-	dosym libcanon_slimufr2.so.1.0.0 /usr/$(get_libdir)/libcanon_slimufr2.so
-	dosym libcanon_slimufr2.so.1.0.0 /usr/$(get_libdir)/libcanon_slimufr2.so.1
-
-	dosym libcnlbcmr.so.1.0 /usr/$(get_libdir)/libcnlbcmr.so
-	dosym libcnlbcmr.so.1.0 /usr/$(get_libdir)/libcnlbcmr.so.1
-
-	dosym libColorGearCufr2.so.2.0.0 /usr/$(get_libdir)/libColorGearCufr2.so
-	dosym libColorGearCufr2.so.2.0.0 /usr/$(get_libdir)/libColorGearCufr2.so.2
-
-	dosym libufr2filterr.so.1.0.0 /usr/$(get_libdir)/libufr2filterr.so
-	dosym libufr2filterr.so.1.0.0 /usr/$(get_libdir)/libufr2filterr.so.1
-
-	dobin cnpdfdrv cnpkbidir cnpkmoduleufr2r cnrsdrvufr2 cnsetuputil2
-
-	insinto /usr/share/cnpkbidir
-	doins ./cnpkbidir_info*
-
-	insinto /usr/share/ufr2filterr
-	doins ./ThLB*
-
-	cd "${S}" || die "Failed to switch back into ${S} during installation."
-
-	dosym ../../../$(get_libdir)/cups/backend/cnusb /usr/libexec/cups/backend/cnusb
-	dosym ../../../$(get_libdir)/cups/filter/pdftocpca /usr/libexec/cups/filter/pdftocpca
-	dosym ../../../$(get_libdir)/cups/filter/rastertoufr2 /usr/libexec/cups/filter/rastertoufr2
-
-	insinto /usr/share/caepcm/ufr2
-	doins -r "${S}"/lib/data/ufr2/
-
-	insinto /usr/share/cups/model
-	doins ${P}/ppd/*.ppd
-
-	domenu ./cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop
-	doicon ./cnrdrvcups-utility-${PV}/data/cnsetuputil.png
-
-	einstalldocs
-	newdoc "${S}"/cnrdrvcups-common-${PV}/README README.common
-	newdoc "${S}"/cnrdrvcups-common-${PV}/cngplp/README README.cngplp.common
-	newdoc "${S}"/cnrdrvcups-lb-${PV}/README README.lb
-	newdoc "${S}"/cnrdrvcups-lb-${PV}/cngplp/README README.cngplp.driver
-
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.30.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.30.ebuild
index d0658f1dbbaf..df6c68146fc5 100644
--- a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.30.ebuild
+++ b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.30.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://gdlp01.c-wss.com/gds/${DL_ID}/linux-UFRII-drv-v${MY_PV}-uken-${
 
 LICENSE="Canon-UFR-II GPL-2 MIT"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 DEPEND="dev-libs/libxml2:2
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."
diff --git a/net-print/cups-pdf/Manifest b/net-print/cups-pdf/Manifest
index 682980d9e8e1..36d06326a944 100644
--- a/net-print/cups-pdf/Manifest
+++ b/net-print/cups-pdf/Manifest
@@ -1,3 +1,5 @@
+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.ebuild 894 BLAKE2B eb8a6cef7ed2789e863a28bae90bea9ffec5edd48425d639e10cc2a5df19fe51eded95c2aa9060046e1cd8cb6b3b240c33d6116e310e5b05d90dbceb8e8e824a SHA512 7eeca7e60f19c0d072b5ebeab3b7c49faf34cfd1893b48cd2f16d92c28e9e32d9787652fa7c5f690ec35a2b78e954abbd50246d0369b3772e8731e16ecb290fd
+EBUILD cups-pdf-3.0.1-r1.ebuild 899 BLAKE2B 4602a2a84fd40676884649eac0a19efc3b33cc020566902c93d769d9fb310d69bb5e6ff711c2835327c99ebd958dd2f0e7427ed1488c138a1b2f0ec49f8cc5fa SHA512 475cd35f72f173bddfd30abec814d2d3287c00413c7f46a31c53d020761491a5f69321ffc660ec18d0ebe48507ef35b35ce9466f24ba6d104a62fd0830456772
+EBUILD cups-pdf-3.0.1-r2.ebuild 991 BLAKE2B 5fa91bd611eec9e1fb18bd553a2ac79f7577fbe2a4761fa7fb7b7f9fb1b50e2a4382dd903cf367a63a82881e268682534f7e2dbc15a3d3725f0804c392ed25d7 SHA512 11ed060c0fc6b47cfd4411aa8a2d73a816d954f42868457f322db029423af3f363a82fe359e2c78b4ddf9822b16a21e5106863c50b3e06e69cfe4df427994d86
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/net-print/cups-pdf/cups-pdf-3.0.1.ebuild b/net-print/cups-pdf/cups-pdf-3.0.1-r1.ebuild
index c2856b42381b..f775a9ed1b83 100644
--- a/net-print/cups-pdf/cups-pdf-3.0.1.ebuild
+++ b/net-print/cups-pdf/cups-pdf-3.0.1-r1.ebuild
@@ -8,6 +8,7 @@ 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"
@@ -16,12 +17,10 @@ IUSE="+ppds"
 
 RDEPEND="
 	net-print/cups
-	app-text/ghostscript-gpl
+	<app-text/ghostscript-gpl-9.54
 "
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${PN}-${PV/_}
-
 src_compile() {
 	pushd src >/dev/null
 	$(tc-getCC) ${LDFLAGS} ${CFLAGS} ${PN}.c -o ${PN} -lcups || die
diff --git a/net-print/cups-pdf/cups-pdf-3.0.1-r2.ebuild b/net-print/cups-pdf/cups-pdf-3.0.1-r2.ebuild
new file mode 100644
index 000000000000..a27e4fb17d9e
--- /dev/null
+++ b/net-print/cups-pdf/cups-pdf-3.0.1-r2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+
+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"
+
+DEPEND="net-print/cups"
+
+RDEPEND="${DEPEND}
+	>=app-text/ghostscript-gpl-9.54"
+
+PATCHES=( "${FILESDIR}"/${PN}-3.0.1-ghostscript-gpl-9.54-compat.patch )
+
+src_compile() {
+	pushd src &>/dev/null || die
+	$(tc-getCC) ${LDFLAGS} ${CFLAGS} ${PN}.c -o ${PN} -lcups || die
+	popd &>/dev/null || die
+}
+
+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/cups-pdf/files/cups-pdf-3.0.1-ghostscript-gpl-9.54-compat.patch b/net-print/cups-pdf/files/cups-pdf-3.0.1-ghostscript-gpl-9.54-compat.patch
new file mode 100644
index 000000000000..3890743107e5
--- /dev/null
+++ b/net-print/cups-pdf/files/cups-pdf-3.0.1-ghostscript-gpl-9.54-compat.patch
@@ -0,0 +1,28 @@
+https://git.ghostscript.com/?p=ghostpdl.git;a=commitdiff;h=180419375973b9ce4664286a67106d712260ef7f
+
+--- a/extra/cups-pdf.conf
++++ b/extra/cups-pdf.conf
+@@ -250,9 +250,9 @@
+ ### Key: GSCall (config)
+ ## command line for calling GhostScript (!!! DO NOT USE NEWLINES !!!)
+ ## MacOSX: for using pstopdf set this to %s %s -o %s %s
+-### Default: %s -q -dCompatibilityLevel=%s -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile="%s" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f %s
++### Default: %s -q -dCompatibilityLevel=%s -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile="%s" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c -f %s
+ 
+-#GSCall %s -q -dCompatibilityLevel=%s -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile="%s" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f %s
++#GSCall %s -q -dCompatibilityLevel=%s -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile="%s" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c -f %s
+ 
+ ### Key: PDFVer (config, ppd, lptopions)
+ ##  PDF version to be created - can be "1.5", "1.4", "1.3" or "1.2" 
+--- a/src/cups-pdf.h
++++ b/src/cups-pdf.h
+@@ -58,7 +58,7 @@ struct {
+   { "AnonDirName", SEC_CONF|SEC_PPD, { "/var/spool/cups-pdf/ANONYMOUS" } },
+   { "AnonUser", SEC_CONF|SEC_PPD, { "nobody" } },
+   { "GhostScript", SEC_CONF|SEC_PPD, { "/usr/bin/gs" } },
+-  { "GSCall", SEC_CONF|SEC_PPD, { "%s -q -dCompatibilityLevel=%s -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c .setpdfwrite -f %s" } },
++  { "GSCall", SEC_CONF|SEC_PPD, { "%s -q -dCompatibilityLevel=%s -dNOPAUSE -dBATCH -dSAFER -sDEVICE=pdfwrite -sOutputFile=\"%s\" -dAutoRotatePages=/PageByPage -dAutoFilterColorImages=false -dColorImageFilter=/FlateEncode -dPDFSETTINGS=/prepress -c -f %s" } },
+   { "Grp", SEC_CONF|SEC_PPD, { "lp" } },
+   { "GSTmp", SEC_CONF|SEC_PPD, { "TMPDIR=/var/tmp" } },
+   { "Log", SEC_CONF|SEC_PPD, { "/var/log/cups" } },
+ 
diff --git a/net-print/cups-windows/Manifest b/net-print/cups-windows/Manifest
index 616118aaed06..075bcc7105ea 100644
--- a/net-print/cups-windows/Manifest
+++ b/net-print/cups-windows/Manifest
@@ -1,3 +1,3 @@
 DIST cups-windows-6.0-source.tar.bz2 38284 BLAKE2B 67722a99dc906ac9c39ba9a93b7fbbb24a44b7400de6209ac5d0ddedc4f891b48ad0284d6cfa8336400697af6eaa006e79349931cefe55cf72b428546c6ff43e SHA512 03bd66d210ee191d25139d9e462543a01d30e8a0dc797a9ee62673e84cfa9d057cc6d327792c74941a17e5021a7ffe52c40bcb52a3f3f4186f59f04796c809df
-EBUILD cups-windows-6.0-r1.ebuild 561 BLAKE2B 3179d14055455b58ee4625d30ab5954cfd224f99ccb4982ad3fa9dc9cc85d0682f09d2d8733236294b4b1712fe8889cb3186e74f43b4128112050e9dbb41120a SHA512 71d127ff5f103fa894a44402a040631e8ee9feb4650d6abf786ff2c5644a4b447fc803573531efb02dd3d1b9c085c385ad1bc467cd0a7b5e2d378d3aa33c9efd
+EBUILD cups-windows-6.0-r1.ebuild 562 BLAKE2B 5336e31814c9d0fb48015be7a2d510599e93f16cc4b601132d99cf505f6605ab3fbb272ecbe86ecbdad23a9f96b1e556e9c6f94022f5ffc3d3216bf00fb4d9aa SHA512 3eda7bed374eb608a09036e863dc9af1fa6e106e2c0752c57637e9a3fa8b13d1f7573088d190a5428e410120e41754c12e72ef27d2ca69e8575abc237fc25db5
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/net-print/cups-windows/cups-windows-6.0-r1.ebuild b/net-print/cups-windows/cups-windows-6.0-r1.ebuild
index a07178068f4a..d1f32d6457db 100644
--- a/net-print/cups-windows/cups-windows-6.0-r1.ebuild
+++ b/net-print/cups-windows/cups-windows-6.0-r1.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
@@ -9,7 +9,7 @@ SRC_URI="mirror://gentoo/${P}-source.tar.bz2"
 
 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"
 
 RDEPEND=">=net-print/cups-1.2"
 DEPEND="${RDEPEND}"
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index c2e901261932..840c859eec4d 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -6,6 +6,8 @@ AUX cups-2.3.3-no-libtool.patch 912 BLAKE2B 14c19e8a215e2a56af387c6cf904a6a2a11d
 AUX cups-2.3.3-user-AR.patch 593 BLAKE2B 4794e162b156075a507707296a045226af5f6342870fb7173017ff530aa052b4467cc64c03cfc80d4e2d3500e584e6c313414ed7237acaeda8a8107c3ed2e65a SHA512 ec570a3a7bd6710f50e8e702755a106158f8a2fd9b7e2efad6e345f12210bbd79e450f60ae0d30ae838f1abf1b4c7fd89d13363d2e4bbacd653177b60f05786c
 AUX cupsd.init.d-r3 584 BLAKE2B f503663a59673209fc6c161aed3cc214cab2b3e68692078dc47c1a833fe141225f48f2d07dab65fc19ea68e54bb7c9a7c94f6db1dac443111d04b392fd7855a4 SHA512 ace66b46c17f99f8c6487188c14e8a1baf7acad602156b88cdae7fb4738c163a045240a1b28c6db4af86caa317723357186812eed81f9553a9ef3517c966c6b3
 DIST cups-2.3.3-source.tar.gz 8140741 BLAKE2B 427e6ee3602aec33ac336d9b2c6c8eb270f2996371f0edd3d69e411b94b2e93fc58a0032ba9f6d048f2c58a1c6b48f742671b4011cd725b882adfcc06ed7fd8a SHA512 7d6f4a01794c5599cc71525778ea785fd17271c31ac146a56e8fc374a88f99e4035d018dae48e37e541455e9cc93b302e892b2e93ec558c1b4bfc46dad68c92d
-EBUILD cups-2.3.3-r2.ebuild 9670 BLAKE2B b9c176cbbd4f2a608a818112dc84be693941e84b454d1620fc430b6afc20799354a5b10df321c1bbb0c018378b5257db7f36fcb2003f2ef947416cd0710bc9c4 SHA512 46901ac1b2d5cb561ed99f2383d70dcfe8faadf674d08dfb54e0195e8f964210ae3533985407fb56153f9fa279b86273f141eb55468bff956de10d47e0380df8
-EBUILD cups-9999.ebuild 9594 BLAKE2B e7f43aeed561ba4eae3938b3739845286d3ff80ddd19140361d39a80992697eaaad2c5d845970a6d9c53124064ad986f3e5fe4d9a7e2f88ca949ebb46dc8719d SHA512 4f9a3bd84f529de97f25c3c400148ad28a17517cbed402aa1f1a1107c9321f9071eef04dd9c6e173d88f64b44e0c9a840b54667a43e214505ee9557de2c0762a
+DIST cups-2.3.3op2-source.tar.gz 7993205 BLAKE2B 8c115b91ec185a4820578561aaf681238280b22b5c68b68c484ffbd0fa3c4ec1beb4d426e3f0e33192e32bce78aa8b7f50ed6799732a467fa9e75c34787057ee SHA512 db27dd6fb616bd7ad895b2bdf4ea7b010501358a50dc8f2e7e29558d1cfc088a572b1b35ac512654d3ed410c84df87dc34ca636533a4499117253915d4763117
+EBUILD cups-2.3.3-r2.ebuild 9671 BLAKE2B 8dd97f894fa876cd2ca22162538bad495638cdf89d8eb3ee35698278c0a2be8e63f2e9db9d49b1fff102ebf75b6239f64d64382e735bb63b9479fdfff1a15bb6 SHA512 a2b510ea0f1dc4f59f175ac6103c07eb062e6a7691238086485d085b6ddd92d157149d5da3aed7dbd3beb3a14f49b2d5edddf188c9be01278201d5139259ca1f
+EBUILD cups-2.3.3_p2.ebuild 9042 BLAKE2B 38fe9073bbd19e5969790fdb234e84bb0e1d244672ab11fdb5ef4afde8c0eda0e3e40fe6eff311d0555c5cb8e447ce09044ee1b62e8febd8d8153f05cf56282c SHA512 221f57ce9983a77682b5397fa93e2aa4641a85bfb1c8d146ae3303ffef2c7cc1e4bc6c3aa8235ebf23eeb0ecb4ee68972889dd2626c08d73275d06289216f35e
+EBUILD cups-9999.ebuild 8975 BLAKE2B 29e80afc33d89883b8c8b2ec5a13bdb9207f687b63ff841128328db21c249e3921f45ec5d16958f680c5aaaad99d07fcf344ed989a95da6c1bc6f8b9536e2ca6 SHA512 44c0fe18abeeaa174c62aa505c4dbca776581edb52a1e017693b5ba35f56eaebc9139146afe91353b56a523c0ee83f5fe221edce828836c9316b26e2c2b61a21
 MISC metadata.xml 527 BLAKE2B ec1e13892e9264410a238328b21d77c2aa686674e3427d4bf04afedcf3e9d14927060eca98e8cfa1e1557c707a50efec3c3d5532e83470cba59acd912116717d SHA512 8db4eeb1ce4597679bf88c5657b7bfde4f8f8a40814c81624103172c22b65e1fb3354c183e7de1b37ba72621e29397d3510458048f78f4a4c99e7ddb669e7adb
diff --git a/net-print/cups/cups-2.3.3-r2.ebuild b/net-print/cups/cups-2.3.3-r2.ebuild
index a367e9deed5b..6b09cae365af 100644
--- a/net-print/cups/cups-2.3.3-r2.ebuild
+++ b/net-print/cups/cups-2.3.3-r2.ebuild
@@ -19,7 +19,7 @@ else
 	#SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	SRC_URI="https://github.com/apple/cups/releases/download/v${MY_PV}/${MY_P}-source.tar.gz"
 	if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *_rc* ]] ; then
-		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
 fi
 
diff --git a/net-print/cups/cups-2.3.3_p2.ebuild b/net-print/cups/cups-2.3.3_p2.ebuild
new file mode 100644
index 000000000000..f0415242e5aa
--- /dev/null
+++ b/net-print/cups/cups-2.3.3_p2.ebuild
@@ -0,0 +1,312 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic linux-info xdg multilib-minimal pam systemd toolchain-funcs
+
+MY_PV="${PV/_beta/b}"
+MY_PV="${MY_PV/_rc/rc}"
+MY_PV="${MY_PV/_p/op}"
+MY_P="${PN}-${MY_PV}"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+#	EGIT_REPO_URI="https://github.com/apple/cups.git"
+	EGIT_REPO_URI="https://github.com/OpenPrinting/cups.git"
+	[[ ${PV} != 9999 ]] && EGIT_BRANCH=branch-${PV/.9999}
+else
+#	SRC_URI="https://github.com/apple/cups/releases/download/v${MY_PV}/${MY_P}-source.tar.gz"
+	SRC_URI="https://github.com/OpenPrinting/cups/releases/download/v${MY_PV}/cups-${MY_PV}-source.tar.gz"
+	if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+	fi
+fi
+
+DESCRIPTION="The Common Unix Printing System"
+HOMEPAGE="https://www.cups.org/ https://github.com/OpenPrinting/cups"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="acl dbus debug kerberos pam selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
+
+REQUIRED_USE="usb? ( threads )"
+# upstream includes an interactive test which is a nono for gentoo
+RESTRICT="test"
+
+BDEPEND="
+	acct-group/lp
+	acct-group/lpadmin
+	virtual/pkgconfig
+"
+DEPEND="
+	app-text/libpaper
+	sys-libs/zlib
+	acl? (
+		kernel_linux? (
+			sys-apps/acl
+			sys-apps/attr
+		)
+	)
+	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
+	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
+	pam? ( sys-libs/pam )
+	ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] )
+	systemd? ( sys-apps/systemd )
+	usb? ( virtual/libusb:1 )
+	X? ( x11-misc/xdg-utils )
+	xinetd? ( sys-apps/xinetd )
+	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
+"
+RDEPEND="${DEPEND}
+	acct-group/lp
+	acct-group/lpadmin
+	selinux? ( sec-policy/selinux-cups )
+"
+PDEPEND=">=net-print/cups-filters-1.0.43"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-2.2.6-fix-install-perms.patch"
+	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
+	"${FILESDIR}/${PN}-2.3.3-user-AR.patch"
+)
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/cups-config
+)
+
+S="${WORKDIR}/${MY_P}"
+
+pkg_setup() {
+	#enewgroup lp -> acct-group/lp
+	# user lp already provided by baselayout
+	#enewuser lp -1 -1 -1 lp
+	#enewgroup lpadmin 106
+
+	if use kernel_linux; then
+		linux-info_pkg_setup
+		if  ! linux_config_exists; then
+			ewarn "Can't check the linux kernel configuration."
+			ewarn "You might have some incompatible options enabled."
+		else
+			# recheck that we don't have usblp to collide with libusb; this should now work in most cases (bug 501122)
+			if use usb; then
+				if linux_chkconfig_present USB_PRINTER; then
+					elog "Your USB printers will be managed via libusb. In case you run into problems, "
+					elog "please try disabling USB_PRINTER support in your kernel or blacklisting the"
+					elog "usblp kernel module."
+					elog "Alternatively, just disable the usb useflag for cups (your printer will still work)."
+				fi
+			else
+				#here we should warn user that he should enable it so he can print
+				if ! linux_chkconfig_present USB_PRINTER; then
+					ewarn "If you plan to use USB printers you should enable the USB_PRINTER"
+					ewarn "support in your kernel."
+					ewarn "Please enable it:"
+					ewarn "    CONFIG_USB_PRINTER=y"
+					ewarn "in /usr/src/linux/.config or"
+					ewarn "    Device Drivers --->"
+					ewarn "        USB support  --->"
+					ewarn "            [*] USB Printer support"
+					ewarn "Alternatively, enable the usb useflag for cups and use the libusb code."
+				fi
+			fi
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# Remove ".SILENT" rule for verbose output (bug 524338).
+	sed 's#^.SILENT:##g' -i Makedefs.in || die
+
+	# Fix install-sh, posix sh does not have 'function'.
+	sed 's#function gzipcp#gzipcp()#g' -i install-sh || die
+
+	# Do not add -Werror even for live ebuilds
+	sed '/WARNING_OPTIONS/s@-Werror@@' \
+		-i config-scripts/cups-compiler.m4 || die
+
+	AT_M4DIR=config-scripts eaclocal
+	eautoconf
+
+	# custom Makefiles
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	export DSOFLAGS="${LDFLAGS}"
+
+	einfo LINGUAS=\"${LINGUAS}\"
+
+	# explicitly specify compiler wrt bug 524340
+	#
+	# need to override KRB5CONFIG for proper flags
+	# https://github.com/apple/cups/issues/4423
+	local myeconfargs=(
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+		KRB5CONFIG="${EPREFIX}"/usr/bin/${CHOST}-krb5-config
+		--libdir="${EPREFIX}"/usr/$(get_libdir)
+		--localstatedir="${EPREFIX}"/var
+		--with-exe-file-perm=755
+		--with-rundir="${EPREFIX}"/run/cups
+		--with-cups-user=lp
+		--with-cups-group=lp
+		--with-docdir="${EPREFIX}"/usr/share/cups/html
+		--with-languages="${LINGUAS}"
+		--with-system-groups=lpadmin
+		--with-xinetd="${EPREFIX}"/etc/xinetd.d
+		$(multilib_native_use_enable acl)
+		$(use_enable dbus)
+		$(use_enable debug)
+		$(use_enable debug debug-guards)
+		$(use_enable debug debug-printfs)
+		$(use_enable kerberos gssapi)
+		$(multilib_native_use_enable pam)
+		$(use_enable static-libs static)
+		$(use_enable threads)
+		$(use_enable ssl gnutls)
+		$(use_enable systemd)
+		$(multilib_native_use_enable usb libusb)
+		$(use_enable zeroconf avahi)
+		--disable-dnssd
+		$(multilib_is_native_abi && echo --enable-libpaper || echo --disable-libpaper)
+	)
+
+	if tc-is-static-only; then
+		myeconfargs+=(
+			--disable-shared
+		)
+	fi
+
+	econf "${myeconfargs[@]}"
+
+	# install in /usr/libexec always, instead of using /usr/lib/cups, as that
+	# makes more sense when facing multilib support.
+	sed -i -e "s:SERVERBIN.*:SERVERBIN = \"\$\(BUILDROOT\)${EPREFIX}/usr/libexec/cups\":" Makedefs || die
+	sed -i -e "s:#define CUPS_SERVERBIN.*:#define CUPS_SERVERBIN \"${EPREFIX}/usr/libexec/cups\":" config.h || die
+	sed -i -e "s:cups_serverbin=.*:cups_serverbin=\"${EPREFIX}/usr/libexec/cups\":" cups-config || die
+
+	# additional path corrections needed for prefix, see bug 597728
+	sed \
+		-e "s:ICONDIR.*:ICONDIR = ${EPREFIX}/usr/share/icons:" \
+		-e "s:INITDIR.*:INITDIR = ${EPREFIX}/etc:" \
+		-e "s:DBUSDIR.*:DBUSDIR = ${EPREFIX}/etc/dbus-1:" \
+		-e "s:MENUDIR.*:MENUDIR = ${EPREFIX}/usr/share/applications:" \
+		-i Makedefs || die
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake libs
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake BUILDROOT="${D}" install
+	else
+		emake BUILDROOT="${D}" install-libs install-headers
+		dobin cups-config
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc {CHANGES,CREDITS,README}.md
+
+	# move the default config file to docs
+	dodoc "${ED}"/etc/cups/cupsd.conf.default
+	rm "${ED}"/etc/cups/cupsd.conf.default || die
+
+	# clean out cups init scripts
+	rm -r "${ED}"/etc/{init.d/cups,rc*} || die
+
+	# install our init script
+	local neededservices=(
+		$(usex zeroconf avahi-daemon '')
+		$(usex dbus dbus '')
+	)
+	[[ -n ${neededservices[@]} ]] && neededservices="need ${neededservices[@]}"
+	cp "${FILESDIR}"/cupsd.init.d-r3 "${T}"/cupsd || die
+	sed -i -e "s/@neededservices@/${neededservices}/" "${T}"/cupsd || die
+	doinitd "${T}"/cupsd
+
+	if use pam ; then
+		rm "${ED}"/etc/pam.d/${PN} || die
+		pamd_mimic_system cups auth account
+	fi
+
+	if use xinetd ; then
+		# correct path
+		sed -i -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \
+			"${ED}"/etc/xinetd.d/cups-lpd || die
+		# it is safer to disable this by default, bug #137130
+		grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \
+			{ sed -i -e "s:}:\tdisable = yes\n}:" "${ED}"/etc/xinetd.d/cups-lpd || die ; }
+		# write permission for file owner (root), bug #296221
+		fperms u+w /etc/xinetd.d/cups-lpd
+	else
+		# always configure with --with-xinetd= and clean up later,
+		# bug #525604
+		rm -r "${ED}"/etc/xinetd.d || die
+	fi
+
+	keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
+		/var/cache/cups /var/log/cups /var/spool/cups/tmp
+
+	keepdir /etc/cups/{interfaces,ppd,ssl}
+
+	if ! use X ; then
+		rm -r "${ED}"/usr/share/applications || die
+	fi
+
+	# create /etc/cups/client.conf, bug #196967 and #266678
+	echo "ServerName ${EPREFIX}/run/cups/cups.sock" >> "${ED}"/etc/cups/client.conf
+
+	# the following file is now provided by cups-filters:
+	rm -r "${ED}"/usr/share/cups/banners || die
+
+	# the following are created by the init script
+	rm -r "${ED}"/var/cache/cups || die
+	rm -r "${ED}"/run || die
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+}
+
+pkg_postinst() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	xdg_pkg_postinst
+
+	local v
+
+	for v in ${REPLACING_VERSIONS}; do
+		if ! ver_test ${v} -ge 2.2.2-r2 ; then
+			ewarn "The cupsd init script switched to using pidfiles. Shutting down"
+			ewarn "cupsd will fail the next time. To fix this, please run once as root"
+			ewarn "   killall cupsd ; /etc/init.d/cupsd zap ; /etc/init.d/cupsd start"
+			break
+		fi
+	done
+
+	for v in ${REPLACING_VERSIONS}; do
+		elog
+		elog "For information about installing a printer and general cups setup"
+		elog "take a look at: https://wiki.gentoo.org/wiki/Printing"
+		break
+	done
+}
+
+pkg_postrm() {
+	# Update desktop file database and gtk icon cache (bug 370059)
+	xdg_pkg_postrm
+}
diff --git a/net-print/cups/cups-9999.ebuild b/net-print/cups/cups-9999.ebuild
index 7fecb1e8f2ee..22caf91ef2bf 100644
--- a/net-print/cups/cups-9999.ebuild
+++ b/net-print/cups/cups-9999.ebuild
@@ -5,32 +5,41 @@ EAPI=7
 
 inherit autotools flag-o-matic linux-info xdg multilib-minimal pam systemd toolchain-funcs
 
-MY_PV="${PV/_rc/rc}"
-MY_PV="${MY_PV/_beta/b}"
+MY_PV="${PV/_beta/b}"
+MY_PV="${MY_PV/_rc/rc}"
+MY_PV="${MY_PV/_p/op}"
 MY_P="${PN}-${MY_PV}"
 
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/apple/cups.git"
-	if [[ ${PV} != 9999 ]]; then
-		EGIT_BRANCH=branch-${PV/.9999}
-	fi
+#	EGIT_REPO_URI="https://github.com/apple/cups.git"
+	EGIT_REPO_URI="https://github.com/OpenPrinting/cups.git"
+	[[ ${PV} != 9999 ]] && EGIT_BRANCH=branch-${PV/.9999}
 else
-	#SRC_URI="https://github.com/apple/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	SRC_URI="https://github.com/apple/cups/releases/download/v${MY_PV}/${MY_P}-source.tar.gz"
+#	SRC_URI="https://github.com/apple/cups/releases/download/v${MY_PV}/${MY_P}-source.tar.gz"
+	SRC_URI="https://github.com/OpenPrinting/cups/releases/download/v${MY_PV}/cups-${MY_PV}-source.tar.gz"
 	if [[ "${PV}" != *_beta* ]] && [[ "${PV}" != *_rc* ]] ; then
 		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
 	fi
 fi
 
 DESCRIPTION="The Common Unix Printing System"
-HOMEPAGE="https://www.cups.org/"
+HOMEPAGE="https://www.cups.org/ https://github.com/OpenPrinting/cups"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-IUSE="acl dbus debug kerberos lprng-compat pam selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
+IUSE="acl dbus debug kerberos pam selinux +ssl static-libs systemd +threads usb X xinetd zeroconf"
+
+REQUIRED_USE="usb? ( threads )"
+# upstream includes an interactive test which is a nono for gentoo
+RESTRICT="test"
 
-CDEPEND="
+BDEPEND="
+	acct-group/lp
+	acct-group/lpadmin
+	virtual/pkgconfig
+"
+DEPEND="
 	app-text/libpaper
 	sys-libs/zlib
 	acl? (
@@ -41,7 +50,6 @@ CDEPEND="
 	)
 	dbus? ( >=sys-apps/dbus-1.6.18-r1[${MULTILIB_USEDEP}] )
 	kerberos? ( >=virtual/krb5-0-r1[${MULTILIB_USEDEP}] )
-	!lprng-compat? ( !net-print/lprng )
 	pam? ( sys-libs/pam )
 	ssl? ( >=net-libs/gnutls-2.12.23-r6:0=[${MULTILIB_USEDEP}] )
 	systemd? ( sys-apps/systemd )
@@ -50,35 +58,16 @@ CDEPEND="
 	xinetd? ( sys-apps/xinetd )
 	zeroconf? ( >=net-dns/avahi-0.6.31-r2[${MULTILIB_USEDEP}] )
 "
-
-DEPEND="${CDEPEND}"
-BDEPEND="
-	acct-group/lp
-	acct-group/lpadmin
-	virtual/pkgconfig
-"
-
-RDEPEND="${CDEPEND}
+RDEPEND="${DEPEND}
 	acct-group/lp
 	acct-group/lpadmin
 	selinux? ( sec-policy/selinux-cups )
 "
-
 PDEPEND=">=net-print/cups-filters-1.0.43"
 
-REQUIRED_USE="
-	usb? ( threads )
-"
-
-# upstream includes an interactive test which is a nono for gentoo
-RESTRICT="test"
-
-# systemd-socket.patch from Fedora
 PATCHES=(
 	"${FILESDIR}/${PN}-2.2.6-fix-install-perms.patch"
 	"${FILESDIR}/${PN}-1.4.4-nostrip.patch"
-	"${FILESDIR}/${PN}-2.0.2-rename-systemd-service-files.patch"
-	"${FILESDIR}/${PN}-2.0.1-xinetd-installation-fix.patch"
 )
 
 MULTILIB_CHOST_TOOLS=(
@@ -129,10 +118,10 @@ src_prepare() {
 	default
 
 	# Remove ".SILENT" rule for verbose output (bug 524338).
-	sed 's#^.SILENT:##g' -i "${S}"/Makedefs.in || die "sed failed"
+	sed 's#^.SILENT:##g' -i Makedefs.in || die
 
 	# Fix install-sh, posix sh does not have 'function'.
-	sed 's#function gzipcp#gzipcp()#g' -i "${S}/install-sh"
+	sed 's#function gzipcp#gzipcp()#g' -i install-sh || die
 
 	# Do not add -Werror even for live ebuilds
 	sed '/WARNING_OPTIONS/s@-Werror@@' \
@@ -234,10 +223,10 @@ multilib_src_install_all() {
 
 	# move the default config file to docs
 	dodoc "${ED}"/etc/cups/cupsd.conf.default
-	rm -f "${ED}"/etc/cups/cupsd.conf.default
+	rm "${ED}"/etc/cups/cupsd.conf.default || die
 
 	# clean out cups init scripts
-	rm -rf "${ED}"/etc/{init.d/cups,rc*,pam.d/cups}
+	rm -r "${ED}"/etc/{init.d/cups,rc*,pam.d/cups} || die
 
 	# install our init script
 	local neededservices=(
@@ -246,9 +235,7 @@ multilib_src_install_all() {
 	)
 	[[ -n ${neededservices[@]} ]] && neededservices="need ${neededservices[@]}"
 	cp "${FILESDIR}"/cupsd.init.d-r3 "${T}"/cupsd || die
-	sed -i \
-		-e "s/@neededservices@/${neededservices}/" \
-		"${T}"/cupsd || die
+	sed -i -e "s/@neededservices@/${neededservices}/" "${T}"/cupsd || die
 	doinitd "${T}"/cupsd
 
 	if use pam; then
@@ -257,8 +244,7 @@ multilib_src_install_all() {
 
 	if use xinetd ; then
 		# correct path
-		sed -i \
-			-e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \
+		sed -i -e "s:server = .*:server = /usr/libexec/cups/daemon/cups-lpd:" \
 			"${ED}"/etc/xinetd.d/cups-lpd || die
 		# it is safer to disable this by default, bug #137130
 		grep -w 'disable' "${ED}"/etc/xinetd.d/cups-lpd || \
@@ -268,11 +254,11 @@ multilib_src_install_all() {
 	else
 		# always configure with --with-xinetd= and clean up later,
 		# bug #525604
-		rm -rf "${ED}"/etc/xinetd.d
+		rm -r "${ED}"/etc/xinetd.d || die
 	fi
 
 	keepdir /usr/libexec/cups/driver /usr/share/cups/{model,profiles} \
-		/var/log/cups /var/spool/cups/tmp
+		/var/cache/cups /var/log/cups /var/spool/cups/tmp
 
 	keepdir /etc/cups/{interfaces,ppd,ssl}
 
@@ -289,17 +275,6 @@ multilib_src_install_all() {
 	# the following are created by the init script
 	rm -r "${ED}"/var/cache/cups || die
 	rm -r "${ED}"/run || die
-
-	# for the special case of running lprng and cups together, bug 467226
-	if use lprng-compat ; then
-		rm -fv "${ED}"/usr/bin/{lp*,cancel}
-		rm -fv "${ED}"/usr/sbin/lp*
-		rm -fv "${ED}"/usr/share/man/man1/{lp*,cancel*}
-		rm -fv "${ED}"/usr/share/man/man8/lp*
-		ewarn "Not installing lp... binaries, since the lprng-compat useflag is set."
-		ewarn "Unless you plan to install an exotic server setup, you most likely"
-		ewarn "do not want this. Disable the useflag then and all will be fine."
-	fi
 }
 
 pkg_preinst() {
@@ -314,20 +289,17 @@ pkg_postinst() {
 
 	for v in ${REPLACING_VERSIONS}; do
 		if ! ver_test ${v} -ge 2.2.2-r2 ; then
-			echo
 			ewarn "The cupsd init script switched to using pidfiles. Shutting down"
 			ewarn "cupsd will fail the next time. To fix this, please run once as root"
 			ewarn "   killall cupsd ; /etc/init.d/cupsd zap ; /etc/init.d/cupsd start"
-			echo
 			break
 		fi
 	done
 
 	for v in ${REPLACING_VERSIONS}; do
-		echo
+		elog
 		elog "For information about installing a printer and general cups setup"
 		elog "take a look at: https://wiki.gentoo.org/wiki/Printing"
-		echo
 		break
 	done
 }
diff --git a/net-print/dymo-cups-drivers/Manifest b/net-print/dymo-cups-drivers/Manifest
index 39c5921df795..ef0af7616c64 100644
--- a/net-print/dymo-cups-drivers/Manifest
+++ b/net-print/dymo-cups-drivers/Manifest
@@ -3,5 +3,5 @@ AUX dymo-cups-drivers-1.2.0-cxxflags.patch 601 BLAKE2B f34dddaf64e3336744bf5493b
 AUX dymo-cups-drivers-1.4.0.5-flexible-tests.patch 426 BLAKE2B 4a4cab04846ad26e97f9af9d8b3c1c9abae9cf8257e25af8f9f77c7ad74f96f2ee2a8702f2a2756a04a328e0a73afa8a48da452a2c7cb07fcfce83a98180036a SHA512 3188ed2e07156cbbda377476532b62b39c14a1b94004d50bba6624b63ffb75b97edf4c4b0714e015a192fda45ffd3762b67edce14c5e244e81279c78fd1233f2
 AUX port_to_newer_cups_headers.patch 2222 BLAKE2B e5e27e9e8cdc16a1e9a6b85b4759c0b71bf977528775513cb75514900d6c53d27f5bb148a3b6fdb6857b065f45bbbbb7a3532a983e58d3dc7e1163fee0de916e SHA512 55398c498e41a5ce106756f51bbd6dbfc4d7602eeb001e4d1bd104b91c8607ae36a1719eba2a2c9e1124493d5b743370b379b05b093b88cbf9346b8931bf976a
 DIST dymo-cups-drivers-1.4.0.tar.gz 420068 BLAKE2B 586b1d044ea0bb499790b8955a1b7341eaeae92f5c56f0f1d5edb1ebaaa545bdf27371cbe783ac906ddf23946ab757bbaeb0567dabafdc5fd23df2548056383a SHA512 e8c375fa0bc87fa96b18db6213e308a1f32050004c0c8c7d516b548f9d369162431f5f56ebcbb1231be60f5d7a946dcca184c6ff4302952bf3744ba42521cd5c
-EBUILD dymo-cups-drivers-1.4.0-r2.ebuild 1613 BLAKE2B 422e6be44cb749d514ec3e17252ef378b931c52b1695616054924670d52f3b57d8af9d7cce2893c1c4711824fd0b94a7208643f323fee1e0c6e02f114b8777ed SHA512 e7a39e82879e85c00b1d7a7e96fcf16e20f16c88e3ad37d8c8abbb9a5b3c68be35a354cf2bde6b8466f7724fa15257cfc78b90ba31ebaf9cd7f0922b3b4b2359
+EBUILD dymo-cups-drivers-1.4.0-r2.ebuild 1606 BLAKE2B 36f8c560b3a220df76858b84aa8f242bfd38d283cb3551daefa604a9d7b802393f9e969a2a12ae33986ce625409e298b2e8b23777c45dbbe899891575558997d SHA512 61257146b1948c3491a36ef0cfdca9034c02b3d1532da443e64f7117e53c2f2c85bf48a435318358dfed76a2250aebfb2fdbd6cb11cbad0b74346a9715ed8425
 MISC metadata.xml 412 BLAKE2B 91e6f9f9856afab076505387b5f5ed7b2672961ae7fa4e63f1d34a6c460483d4249f215a67da6233eef92f87da2a279ba53b95e11dba92351e84a36e702e24b7 SHA512 86a3278589e19f311ad3b4b4cf3c4d3c5ea4bbd9099216c3ef86d5399bcf6341deeb17d9f6e7f8b5c4be48ba9f3bd59fc4dde671526aee09100094a2ccd4cc4b
diff --git a/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0-r2.ebuild b/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0-r2.ebuild
index 4f15dfb3ac98..bb216fa485f3 100644
--- a/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0-r2.ebuild
+++ b/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit eutils autotools
+inherit autotools
 
 DESCRIPTION="Dymo SDK for LabelWriter/LabelManager printers"
 HOMEPAGE="https://newellrubbermaid.secure.force.com/dymopkb"
diff --git a/net-print/foo2zjs/Manifest b/net-print/foo2zjs/Manifest
index 2cb2af820eec..009c207c8e83 100644
--- a/net-print/foo2zjs/Manifest
+++ b/net-print/foo2zjs/Manifest
@@ -1,6 +1,6 @@
 AUX foo2zjs-udev.patch 379 BLAKE2B 697ce0d25fa46941e6cd80f3d800d0b90af153d56f4385957b970ddaf1c2f15fb40cbed5b7d06288fc6764268a5f1ff1620fcf7be6207afe047202e4bd9727e8 SHA512 91810416934e0d92ca7717262bfed26fbf275b6193bc236566f2b7b6f34a1a38ab98f0b1a3e074b16f8e3822d67e3d4bf8b8e4562f3e6155090ae1dc82abb8f9
 AUX foo2zjs-usbbackend.patch 479 BLAKE2B 0b5e8af8e302d0b239da31aa9a238bff7cb4ebd70f87fb2f9dfebc4638d3f27ed70220905522359868efc038dd874ff8a404e962fe44fe6d3624d158aef496b5 SHA512 a37b3bc193a619992a2a0c24f947d96185919cab6f2cb61c0dcc76d942274ea2eb7c325bc960e05cf9ee8969ef17361ab45053a6932d601fe0f68ee19808395c
 DIST foo2zjs-20200221.tar.xz 6330264 BLAKE2B 71e290cbb76d4975d72627270406a8479437adc3e94d334827d5c219dc0269708ddc559f847f881076f40515396931a2b4a4f4604b121e6a7007a5b2fc5b3432 SHA512 8d992b48157189b800a2ba2f8e528f0c3d59a532e6172f2979c4b3f6fa9a3ac7167e0e28195019b70e260d2459ebd17aba118735d5a2c8e5c7603c750ea8dfaf
-EBUILD foo2zjs-20200221.ebuild 1509 BLAKE2B d41d13a215936173d8b37015c00b2e6a82b509d841a2f9eb70eea2e3db93be554a0d2f635285cd27426ab8dbc33157d7c0ae830e965afd0af7221114eede5468 SHA512 642fcb6b12aa3d22e87378aa1fcdfb96bf462cdfd05a5dc44a73df0dc8e5d0501df84c399f4a7141627c96923f2de1603a3ee8c99caaf31e3bb7904d79ceebfb
-EBUILD foo2zjs-99999999.ebuild 1810 BLAKE2B f4931ac6cfff7b8a58c7b16c374fc1578720742a5c671daea0557b1e2e1f3e235845eeb5edd230112a05f0bf3f80e95901676add9a93d2faa96b14d5a2b06b3e SHA512 a5c2e04c5226c193cde2ba5c9d0dbe2ad3dbb5e0a81acfa999b0357c0098ebfd19f358cf5bad67d09bbd9a8345579711a67acc55a0648a9a039030feac948324
+EBUILD foo2zjs-20200221.ebuild 1502 BLAKE2B f6eccabeba1952b1dffa397a14f96ce36c87df9d8109052e2eaae2f143eaa6f7205776bcd1cb2a8ab179621ba902b1c6d865490f47ecab6004a66d17d4862278 SHA512 c45228800f01b078cde2002cbfc9ae63fec48cbb7dc445ad49f6c0ee41969b62ca1eda95102f88dfaaf2473944a63baed733d71ddad490a76be17549d795245c
+EBUILD foo2zjs-99999999.ebuild 1803 BLAKE2B eaf624de2640e3d04f846ebb040abf9aebd1a48dfd55fcaa3465d3f13dac071891baa5e008619d6c00f71d345623ddeced55bc3d4d6cd39f387164e510caa8c9 SHA512 25a1900dc972af3b26b8a4d237be5f8f65f86976741509f54f42d59ee7ad922e898e5c8d3022ff13e32ccd086d49fd5d4c2cd2ce114072b5a403afa75cc68438
 MISC metadata.xml 265 BLAKE2B 90437751c83b28b75582d0e1588732b99bfc1da98cfeedf982178e01192da161352633d821465f38c4f31a6a75c562b54c5d1a6dff0173ff6c064d524073d56c SHA512 6546f5402491a7065802409af29815ec26d09fc6fe196be110860059a5af6511b01abfc8bb4c8dbe4954c90d2fb2c85fe9ffb221c0dadc90b302fb58369d2ba4
diff --git a/net-print/foo2zjs/foo2zjs-20200221.ebuild b/net-print/foo2zjs/foo2zjs-20200221.ebuild
index a3a8fb5c6d12..2e16ac81d528 100644
--- a/net-print/foo2zjs/foo2zjs-20200221.ebuild
+++ b/net-print/foo2zjs/foo2zjs-20200221.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=7
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
 
 DESCRIPTION="Support for printing to ZjStream-based printers"
 HOMEPAGE="http://foo2zjs.rkkda.com/"
diff --git a/net-print/foo2zjs/foo2zjs-99999999.ebuild b/net-print/foo2zjs/foo2zjs-99999999.ebuild
index 630ce3d9e595..a9d4aa9966f2 100644
--- a/net-print/foo2zjs/foo2zjs-99999999.ebuild
+++ b/net-print/foo2zjs/foo2zjs-99999999.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=7
 
-inherit toolchain-funcs eutils
+inherit toolchain-funcs
 
 DESCRIPTION="Support for printing to ZjStream-based printers"
 HOMEPAGE="http://foo2zjs.rkkda.com/"
diff --git a/net-print/foomatic-db-engine/Manifest b/net-print/foomatic-db-engine/Manifest
index 429578138da4..a0349bf4616d 100644
--- a/net-print/foomatic-db-engine/Manifest
+++ b/net-print/foomatic-db-engine/Manifest
@@ -2,5 +2,5 @@ AUX 4.0.12-use-pkgconfig.patch 1010 BLAKE2B d37cb4ad77e191229c0ca7ae64b8f51b7ce2
 AUX 4.0.7-perl-module.patch 392 BLAKE2B 48a1913833c637eaf80f0d9c8366e85750857356a28d346ec37a11c233e1cfed7d79eb5ada6033cfdc2743c6823d8db976f9095ee04694fa176979f2dbad9d62 SHA512 7f26ac25325dffa706bef97915be06707c4953ee7c436a86a79d4edf764bbe4db9e6eeb37b889f6f4214b9b8d5ceb31091398c5ccce7607be941a74b3fe4ebf7
 AUX 4.0.7-respect-ldflag.patch 719 BLAKE2B 534ac6b3b3333bd54c9abe8b7e658faed0759b95e0104d36e381ba178f8138b9b79fa38a35f66ef5c78ca54630d870da0fb1a12f949764e623247d10dcba61c6 SHA512 432c4b61c94d1b774fc909375217587f4d8336603db0b944ec9e98e3022c2b1355928445e2cc7fbbd06a1452927082ed0fb655bc955643cce6290fe8f2d5d6c9
 DIST foomatic-db-engine-4.0.12.tar.gz 360499 BLAKE2B b03ba0a0cddc2d1c59a64ffa33e577f991d36c478e3f7b43f66474c749b7fb546f0ad5b04fee056c69532a6f126b87c95a72e5561443ef79bf3bdfed650d6b07 SHA512 b7e99ace6a632e9b0213183bd2c6c2d11ca072ea0414e8ca569082b7ec183dd81c80594ad63fdee82d761ae36d4fce9d3c881569a95a6085ec326ef7fd21154f
-EBUILD foomatic-db-engine-4.0.12.ebuild 1162 BLAKE2B 08c8e225cd42a064187f6072e01eeaefbee913af9d9a569b8b15251bcecd07e709a324b358cc9b8b2375dc3315ecdfaa027b0b9415e7a9df8905b00a625316d3 SHA512 b8b1ceccf7de1bf27496a6e59cb2a16312ec07286879a32a1dbc95afbde2c78f5575674d30f4d7618c528cae4885b535cfb34e6eeb51ae5dc08496c3e4ab03c7
+EBUILD foomatic-db-engine-4.0.12.ebuild 1162 BLAKE2B c19f9501c7c2cb04eb5a1478c8f5bc9717abda0c5d43920bcda800c0e394cbc7d81829bb86866dfae74a494026721fc9a70b8795d9d9087a96a0e14e0128baf5 SHA512 431569b34e62111906dbb053178997cb04b7362d54e79f36e29389b99000598b0bd585f28d69bb6716f244fdb8bf2628e8bfc374dfce4c6dc527a4d2455c8bf7
 MISC metadata.xml 259 BLAKE2B 4a7248bc5a529d1cf3b51f8bcfff668a9e525df3e62584369d4b5526c89e70235378420b164073946ea91cf182065d9c8d2d46c8750d5f77855239b77ce45bae SHA512 7b1cbb90c1ddcf63b8802cfa3a53611f6367801b492c7677ef038738a337002c4606bcf93c5186abf808e74bca1fa76266169245acdb3b5997651bcabfecfa5c
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.ebuild
index 1c286c1cdefc..02025f3d87b6 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.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=5
 
-inherit eutils perl-module versionator autotools
+inherit epatch perl-module versionator autotools
 
 DESCRIPTION="Generates ppds out of xml foomatic printer description files"
 HOMEPAGE="http://www.linuxprinting.org/foomatic.html"
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})"
diff --git a/net-print/libgnomecups/Manifest b/net-print/libgnomecups/Manifest
index 97a5ec8e18da..44ea405be33b 100644
--- a/net-print/libgnomecups/Manifest
+++ b/net-print/libgnomecups/Manifest
@@ -7,5 +7,5 @@ AUX libgnomecups-0.2.3-glib.h.patch 1017 BLAKE2B 1b3ffe7417f1fdfa617a214162efcd0
 AUX libgnomecups-0.2.3-lpoptions.patch 408 BLAKE2B 970583a14c8850d1e65feab9459a11f8b72e72d6d6aebabe6fac188158128a2e5c17cc1322e223bdf1757852b1b5b8d6996764bc87d9bb2412c782d1b9f9ffb8 SHA512 6d64b0b14dcce03a36a1c0b257e19c37e93778552f306ee312b019690fc35b64b0f1f5c1dc54c72ee85dad755b1facb607d5ef7914c6af01c4bcb86ad4628c85
 AUX libgnomecups-0.2.3-pkgconfig.patch 404 BLAKE2B 78c0107172cf057975dcc4f4c938c2ae990b022d1afaf87e7b0d8623987148d5d240970311fbea0a8c23734d1130bde4c8a05a094e17c8102bcb26f90a43d714 SHA512 2a3ea4921c01c01a55266deaf36d9ff2b0511592be1e58add93af398b9d0d92b21d8c3fe62446b09a939b46569997381a8e56435797625758a22b7d52914c3f8
 DIST libgnomecups-0.2.3.tar.bz2 357129 BLAKE2B 8a8babf0af7a83232590c5e756c4e1c2ce329dae59b88ee5be84c0286a6ed6d6c39f891b7ab0bb68bfc29539769cdd82032422c44a6131c4da9c9355669b1a57 SHA512 7276dfc92209c8503d8a59ceb192273e41bc13cc5f3515dcc00444deca4b9de6a29d0ec4c89811398e03971fa3f5ccbb85ca477da6c5f2bc26f2fb70dccb6a75
-EBUILD libgnomecups-0.2.3-r5.ebuild 1616 BLAKE2B ec2e947261cda14f5ff1b92f81e603a167409df147550fd8722edea79d88c54daefc8850635f1df2b85a57b4733f4250e939daf2b3bf9f9ed755485cee1f1467 SHA512 c4c7d3432f95284426c46cf1021e53aa6a1bb93c8f3d2ce4c86d6e8b52a181798b72e6965c46b2fa82b0552dc01d71a076452228bcc3dd7c91204cfc91ce305f
+EBUILD libgnomecups-0.2.3-r5.ebuild 1616 BLAKE2B 8fcf1cf093844a7987907da8addacbf5fec15c240c5c3b17e77df01ba300b0ad7c258901e217135ef12c3b612a3eccae49dc86aa0687af0fe3b4b61d468bcb25 SHA512 8f73feae4eec7afade57036d7864fb4e2cfd3bfcfe3587444692b753c3dc9565e09190cbe9de83db5a49160b4947349b6d12dc1f7315b45c0dadc9c02b27848a
 MISC metadata.xml 365 BLAKE2B a34fd100f946a0e9b31486a7fbf620e8b63495fbd2a24ac665435526bf980e23715a2b9b1b24b7e114e23c4f86c1a3c144c1d92e034464bb26b051ff39bfd53b SHA512 6696e110749820558c770f257f4f74d8d4a6fb617e9f74b7170e12a6c353a03a4fbfbc1c39f2247657f515079d541752da8f6f993d37464523ae5364f0e7c6e9
diff --git a/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild b/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild
index e8a3dd22b718..ee9b210015d1 100644
--- a/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild
+++ b/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 GCONF_DEBUG="yes"
 GNOME_TARBALL_SUFFIX="bz2"
 
-inherit autotools eutils gnome2 multilib-minimal
+inherit autotools epatch gnome2 multilib-minimal
 
 DESCRIPTION="GNOME cups library"
 HOMEPAGE="https://www.gnome.org/"
diff --git a/net-print/libinklevel/Manifest b/net-print/libinklevel/Manifest
index dc580265e540..c9ade1df5af6 100644
--- a/net-print/libinklevel/Manifest
+++ b/net-print/libinklevel/Manifest
@@ -1,3 +1,3 @@
 DIST libinklevel-0.9.2.tar.gz 367928 BLAKE2B f74af31529246668a0bc00c17b2ec1432532eb484b7efb230873e251c26b349ff26f4eb51f7f610198416964c090f60232f10e40f5170783cbe806cbcf849155 SHA512 127acaef2d2c09981b4da80e4d86a869c66f0f2f9733e139800bc944c159ddca42829499a97ecbb712b74c950bb28a4e22382c9c2a42d374bc5593f8802b6c59
-EBUILD libinklevel-0.9.2.ebuild 836 BLAKE2B f86d9189063c3bc783961809ed0bb97ad9ff5f06334460f08a15357c8564c45653e2dfe54b197829fbf40c69c04791f5ba27ffcf02cc20b7f24ab0257f7a1a4a SHA512 72c62251e18997fc271ac1e5766fc0ce24398d52cd6e42e72d708de6266220e11e6fad17c3a2b37b29027b5e6f8d0c0a765564c9f9838e400ed4068a60894ab1
+EBUILD libinklevel-0.9.2.ebuild 829 BLAKE2B acd6dbe0f4e4367a933cd6ec55d19d9e15a22659bed1547868f724ca16acf0591c7888691d02718fb9bacb44cfc712f2e2482feb50aa9761f3c988245dc426b7 SHA512 f3d3ad5af722ab6a7efeaaa4b6ff0f5430ac5b285d86d43a8916016778956103041405be7931e74838303251f127de862f4f5dad3903f4c09c4eee81857f1740
 MISC metadata.xml 340 BLAKE2B 806c842e37b146f940771d5e121a9ea618fbafa287a6bee402cce2c99b7d1ba4d834d19153de7685166cc4efcc7f538ea0b1980fa374f18b0898c0d12683cf9e SHA512 d801f16f230f2e7bd5173ea283205cf0666928a447edbc68221dda7f221c220d453cd3500af6d3577b12e898af713ae2843718848a941802a9ce84ecc5127dc8
diff --git a/net-print/libinklevel/libinklevel-0.9.2.ebuild b/net-print/libinklevel/libinklevel-0.9.2.ebuild
index 48ac1c077b47..b6fb5ca58d72 100644
--- a/net-print/libinklevel/libinklevel-0.9.2.ebuild
+++ b/net-print/libinklevel/libinklevel-0.9.2.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=5
 
-inherit autotools eutils multilib
+inherit autotools multilib
 
 MY_P="${P/_/}"
 DESCRIPTION="A library to get the ink level of your printer"
diff --git a/net-print/lm1100/Manifest b/net-print/lm1100/Manifest
index 5e24a713af4d..cb31cf9680c1 100644
--- a/net-print/lm1100/Manifest
+++ b/net-print/lm1100/Manifest
@@ -5,5 +5,5 @@ AUX lm1100-1.0.2a-makefile.patch 1021 BLAKE2B f08deff4c4acfa705aa332ee8d44d50d04
 AUX lm1100maint-firmware.patch 638 BLAKE2B a6fadd4bf04bcc2ef4fcd11dc19dca1cf4452f081829c22a58a2fa56a7d049973e61f7fc8bb438df06855aa9a4a4698a1b222f7c4393bda4206300db75b714a3 SHA512 7605373b4777a5b880944d38b318144d8dab18f337080bbba3e6e164ab0c8285a648fc57659fe1efa77053db9af748f96c3c4bf98d114ec70306cf65a027409f
 DIST lm1100.1.0.2a.tar.gz 64316 BLAKE2B b47fef489b16568e2e2b0097bd79f90b1c7acb80b7fd28d00fc74c5072f83b1c2f2d6bb75534e0c678d4ad9312d222e311bd9593206acad8eaa3a5166fbbebcf SHA512 3dda80602af99d93a570e066ca2a121afd93b28b5d28b6f49b52c2c90e288de7b87cefdd5e00bf4edd73439fb6088433fabe884b841befd24183f27a12fcbcb1
 DIST lm1100maint.tar.gz 708 BLAKE2B 69b29e477a5491f88bafe92eb94a3742fe8b6074116544cd0689a98273b9bd4eb3ee5e5b74acc4e68cff3eef1d9c177b6d041db64712dad2e6fb189f56e9c1cb SHA512 fe81351705c36dd30e01d402461820ed583d2a8222af8dd81f4dff35c6629592e09fb6dbc0740b9ba0f555de65aeae41c0cb953fbedd0c8620db29b37d797b02
-EBUILD lm1100-1.0.2a-r1.ebuild 1132 BLAKE2B e498a6dcfb23723696c42633c10558a3197df674b7f687a0ed8420e563872abcf92db58be2236e2ec0ee3f3ef37400e1becba79b45b0dacfd5acb460abeb8ca9 SHA512 66faf7c1704f79a5dc9c03ddce75cf070e6a2ccbd35269b06f094904254f39a60fb053e85c5f432fe6423c272cb2f4b3397d7eaccbe5d4d4ecb9b4264d645999
+EBUILD lm1100-1.0.2a-r1.ebuild 1113 BLAKE2B 7ea8f1b342fb353b205c27f61ea53129176eaff492de331bb4ba88836a5df9b9da0ab00e86dbcbf491558fc110f5e5af95111bd5a27d3de8e13dfc330a11df59 SHA512 725d1e0ef3815c77664a013ba19b65c7268379b95da332582ac001fd5bd30843f4097543fbd40825dcc60dc60565c7313ab828b2da888bf4cae6ac7b3d9672c0
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/net-print/lm1100/lm1100-1.0.2a-r1.ebuild b/net-print/lm1100/lm1100-1.0.2a-r1.ebuild
index 507c39e260d8..1521dc21c771 100644
--- a/net-print/lm1100/lm1100-1.0.2a-r1.ebuild
+++ b/net-print/lm1100/lm1100-1.0.2a-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
 
-inherit eutils toolchain-funcs
+inherit epatch toolchain-funcs
 
 DESCRIPTION="The Tim Engler's Lexmark 1100 driver"
 HOMEPAGE="http://www.linuxprinting.org/show_driver.cgi?driver=lm1100"
@@ -12,13 +12,11 @@ SRC_URI="mirror://gentoo/${MY_P}.tar.gz
 	mirror://gentoo/${PN}maint.tar.gz"
 #http://www.linuxprinting.org/download/printing/${PN}/${PN}maint.tar.gz
 #http://www.linuxprinting.org/download/printing/${PN}/${MY_P}.tar.gz
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE=""
-DEPEND=""
-S=${WORKDIR}/${MY_P}
 
 src_prepare() {
 	epatch "${FILESDIR}/${P}-fix-compile-gcc-3.4.patch"\
diff --git a/net-print/npadmin/Manifest b/net-print/npadmin/Manifest
index 6cde41bf4109..bb392f716e23 100644
--- a/net-print/npadmin/Manifest
+++ b/net-print/npadmin/Manifest
@@ -1,5 +1,5 @@
 AUX npadmin-0.8.7-gcc6.patch 7135 BLAKE2B 31a446879e4f98b1eee543d3f54aa768d9b367cc9da982032d91429bbc094944c70689fb46ad6cf822550b97c3cb283024d489089abc5d00f21754460647cca8 SHA512 c3c79c5556b7d798323560b32326b09bc30d58aadb51c9dbbf28fca0d90f72a17d680f4696e7fbe94dd515cebb2f38158bf8e273064675ceeefad48f6d7c7bba
 AUX npadmin-0.8.7-stdlib.patch 258 BLAKE2B fe0cb1ce54563591e4bd2c7bdac5cb880ca52a7444d80b30ea81da7801ec26c986b1a920c1c16c48412a797e54205900679c2a9d32ecf3e175d98deaa09efca3 SHA512 36d4f8225e03f0d3ccde706414179a5489fbdf7ec5fa65e083c1de4a00db1626e40195e1e48b7213bc63241907716788c85cb10daea08c64aee6d8ac09094ecc
 DIST npadmin-0.8.7.tar.gz 104209 BLAKE2B 0badff83c3387d5e7b72803c5f42272a696ffb2e9bccffe8f004c9030aee604e6025781f30ff9944c63d3b54afe538ad898b0b9670a95cbf4f0ff1356e056f04 SHA512 da405a897e3ec057b355ac1e8a6237e876d1ba0365f5bffdd71b212fb8a5b3a79f7186d4b90d4ec321a9ff45bc222f6444b3dff666c819eb5efafddcfcecb026
-EBUILD npadmin-0.8.7-r1.ebuild 576 BLAKE2B e15b708da7d895b381c7fef0aca03833968627c6d972b4b489d40d3c9497d47ce6a953b379ba79b1e69825a2c504bceec8eec0a013b42dce467e3828ba9f9586 SHA512 81cf80b7a75bed997333e92c08cdd8e8709d18dd8948b106e7c14bd7702c1ebe3cd8e7cbfa084abe2a0deb74fd1cc73ac1a4d0a68301f6b36d17712cd0ab0c32
+EBUILD npadmin-0.8.7-r1.ebuild 557 BLAKE2B 224c23c745a39bc33bcffa702794770d050d434a9cba51f0ec8b650eb4f60da72247851997daaefa718ac628adf9752a28196029873ace987ab93bae631cbc4f SHA512 66556cd6b866f37ef10c5ad559e48cbb39e8f02256afc03ef236a8d9a92ebf09ff60ce914c91ba4fee4ae573e2c8487556e675f76d47e44d8bb1cf9787cb7665
 MISC metadata.xml 336 BLAKE2B a97ecc759ed842e6910ec71d9bb63379de89f37ffbeda0afff1f59ed6220f40732ba86111a7183c2af7af07013d610e5bc50b6952c75400ea6823fedccebc420 SHA512 8d4312ab8e426107a05e4f6a5cbc77970beb1ea46bbbd19882e8395a74ff791ffe2012ad7ae6d4656c3f0c33a7eb10e3d8d7515149213be4dfece650ad289101
diff --git a/net-print/npadmin/npadmin-0.8.7-r1.ebuild b/net-print/npadmin/npadmin-0.8.7-r1.ebuild
index d58da82c8b82..02d07aa1dfac 100644
--- a/net-print/npadmin/npadmin-0.8.7-r1.ebuild
+++ b/net-print/npadmin/npadmin-0.8.7-r1.ebuild
@@ -1,10 +1,8 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
-inherit eutils
-
 DESCRIPTION="Network printer command-line adminstration tool"
 SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
 HOMEPAGE="http://npadmin.sourceforge.net/"
diff --git a/net-print/splix/Manifest b/net-print/splix/Manifest
index aa13dcff4370..2670a2a4da96 100644
--- a/net-print/splix/Manifest
+++ b/net-print/splix/Manifest
@@ -1,5 +1,5 @@
 AUX splix-2.0.0_p20130826-algo0x11_le.patch 1231 BLAKE2B 8fe043f615bae54bf24635817696d2c38bf5250c77a4f52061b3cd7a82cc6c46a705ceed9ae4d46e47d5e8af64f8932a83acc718dabc614f6b03156274a34119 SHA512 9c96805deedc819cf4e663de63d35c4016b36a04ab56f5d3cee503e64dcd7a25d6ede2cd2ae3facf51d4e673476295a551e5659e9b91de6c30d1c21dc294be4a
 DIST samsung-cms-20120312.tar.xz 3354884 BLAKE2B ebff80c7e4ddebb87c46b0d282c64037d7584170ed224931e5b17fc93a76b162bd1b33ed00c59371464dcaef345cf6c33d428aa42c7b67c82958a23384ed0bac SHA512 448f111493540dc93b88d59fa50857bdca2aa9eb772e53c1d227402235d878ad599683d74bc4d815b4789527b5e7ebe207bb0c8fa9194eaf61ca95b78a1444db
 DIST splix-2.0.0_p20130826.tar.bz2 127278 BLAKE2B 6a8eb6b15e5208dd4173d50bf2b41d0e0f136057fbb46f36fb68ab1302c0c8a6b735311bc03f15e7afce0de802b3fa62df04ad5cd016532216b67a74e39835c3 SHA512 dda07e24b4321e6c1e3d4fbdd03fcc2b5931465db36ed9d8676a62313c4c64b7cbd58bf41996ddd1ab02086438f225439db0506aca7f0269f6c84e80eff72cb0
-EBUILD splix-2.0.0_p20130826-r1.ebuild 2185 BLAKE2B 397a6da1a164cffa6e57b5db4938e80cad4ae2eb5e43c195c9a847dc9831e3859996135fcae4efaaaa689a7a0780273aaae8e55edf21ca3d6e438d5cb19277af SHA512 ff981508fd1641eca3344318846dbe55caca28f7a640c91a11c3b5da4c236ba3262ebfa40fa4782654bac026341bee2492f18d8e979e8da00b0059d5d0858127
+EBUILD splix-2.0.0_p20130826-r1.ebuild 2178 BLAKE2B 229919899ea66870953daeb2209066499a36cf96f34ed923482bbc075ab352d6cdd4e40040b799e56e529e3b1fac6821995f25f785a6fd43a132a5c2782c3e29 SHA512 a99c872751ae47aa262740deed63464a84f1ac09c861401b3c58496e5663211acbc94717caa14ebac709d9e1c7fbfde36e09965b28b7265498045b9ae7740723
 MISC metadata.xml 447 BLAKE2B d4cc8e6c1baa4deff65208c385e0a3291198efa62523401f841d217edbffb4f65d66bc74cfa543e923173439db264d6d8fd1f7e73dd2b972e1402093a7cce12c SHA512 fc6ef6dbcd39d721cdd8a2c690b18c3739a08b245cbbe8a65cd5d4ca452be708705e121f5a59b61e08d93f425697cfd4d57acf5e817ea5c6b91a5f4c16e9f17e
diff --git a/net-print/splix/splix-2.0.0_p20130826-r1.ebuild b/net-print/splix/splix-2.0.0_p20130826-r1.ebuild
index fd915aa6e56c..c0d507a457a9 100644
--- a/net-print/splix/splix-2.0.0_p20130826-r1.ebuild
+++ b/net-print/splix/splix-2.0.0_p20130826-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit eutils toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="A set of CUPS printer drivers for SPL (Samsung Printer Language) printers"
 HOMEPAGE="http://splix.sourceforge.net/"
author	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2021-04-28 20:21:43 +0100
commit	40aaaa64e86ba6710bbeb31c4615a6ce80e75e11 (patch)
tree	758c221bad35c9288d0bd6df9c7dfc226728e52c /net-print
parent	8d5dbd847cbc704a6a06405856e94b461011afe3 (diff)