gentoo resync : 06.04.2022

14 files changed, 25 insertions, 1094 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 84271a55e549..6852e65af8bd 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 6a5809f8382a..8c12cdb0f4b6 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -3,15 +3,12 @@ AUX cups-browsed.init.d-r2 150 BLAKE2B c2098766ae08b38dead0a5bab2e30e1728ab93aa9
 AUX cups-filters-1.28.2-make-missing-testfont-non-fatal.patch 477 BLAKE2B 30e8fd049fb4d16439405aa052134d828a5f9e5e3f79c02e6121d3c15c5374c62d370fe88ab4b761e849ab48ecc0bdde97d36c6fd98056d0dc195464c7648a2d SHA512 797e8530f5a44b4e4975399076e4e1c537da968a9ed8272baaf1e457a025bc22478045e780208b1607dbcd4eb31b91ac605781cf6eae47ffcdd748e34d126327
 DIST cups-filters-1.28.10.tar.xz 1503924 BLAKE2B b745ad9d35e375411d43acc8936a7be3197deda26d64c3fcdf792abf751452a83ab4e77b25336509a4d15a7db3dd142c94f3fd108f514d4956ac62f00310b263 SHA512 d6079633e10c3cfdc744491df03adc73d98dab0d9c0c6d3bc426b751545ae3434ea875e0841cec9358c19336347903f2832b5f801700b371cc1959e031bfa659
 DIST cups-filters-1.28.12.tar.xz 1505868 BLAKE2B a30f4772f89822dd110312ad2b2fb40ffcd093cee119df0660191938b374f4f99178c8e8801c8ff41bf01822a7e9c0e8aebd1d2f96159d377a40f7047da3177a SHA512 430e31815fe3b40b2d12c8db0a9e38060398d9ba3306af5562bc887dd99b06971765b98ba7227a0478d9f6616dd825149f138a2367b442ea0593708eb34140f6
-DIST cups-filters-1.28.3.tar.xz 1501824 BLAKE2B b4f493681ac2a701648b3b9b071f4ebfb432dd4660b610579ff2ed6cba4f6cd4351d5a1f28f5c096b3ba20d9c45dc87837bf127b9bc98680a98dec58dd0a68ea SHA512 ac139ae7452342bd46e464bff3438d437f1c9a2e719a7b32b7abc22c2667acaa93dfb976decb277a02572e688ecd86289e01fca817bef93018dff2076fb2a30c
+DIST cups-filters-1.28.13.tar.xz 1510932 BLAKE2B 20c3d07c59d37ddb7960967fd88ba6be5363dcf4cac6cbde03311507063c3da230ed2026ceedf35c731d6582ad845c4963455e5dad9233295785b4cde80f2278 SHA512 52d0f37cf80d9de09d73337e2e32dd4d23eb47f3f8470770e164dabe78220316a4d4b2aea5b466f21d1f504df73cf9eed21a518128ca3ce8048a40deedd9a765
+DIST cups-filters-1.28.14.tar.xz 1510944 BLAKE2B 653f68a39ed16d3a8298e5784aebebead224a0ee08071add702bb02fc987f3c4d454793531db262d9a44618f4fe29a7ce0144cfb8fe77634e9b7c222de21fe62 SHA512 a128858ac582da1322edad1cfca02bb6e5a077a4d3ca61d9e33e07b83e5015bb1a11571d30c66069f503031a6b55a82d7867cd171a7090fa729d894441f7abdd
 DIST cups-filters-1.28.7.tar.xz 1503052 BLAKE2B b9d3280871faa79a7c277731bf6eb1eef161537829d4bc07ec36075ebc12a3617dce66994ed708991757ce7d78fc5ab010925a1d3d9811fd11cf1172f4786442 SHA512 fa94f51ca1c208dcacb1814d8b812c9a72dd09475b7cf836b02c72cb5e3290318f37e475ee3ae8d45351715c3a2ccc0df5ac51ae6fc11462f5acdfa303a04727
-DIST cups-filters-1.28.8.tar.xz 1502456 BLAKE2B 21dad6dc9a1d2f967f3938f2fc5e35eebadb67da8b526a9ea61599272bd3f87e8efff376661adc02b62b539798cbe46e0f7c5c25ba262da0561b53bbb3d08d5d SHA512 77b39ce2a30ad44d50aa58964b389fa5dd75b2b4307ccb25996050fd176e1e794ad0a66ddd4de76e95a671683c3bf448a4f471272c97a752f25ff6234f7d8511
-DIST cups-filters-1.28.9.tar.xz 1502888 BLAKE2B ddfed7c0815673d8a372af96cd879fb159a10d5cdaf07839a0157b94c43cead9d32c62a204513274f2a90b48a09e07d20049b93370b24604f14efe0e782116af SHA512 fbdf01b0a3acd70e3bf036ca4944a8b85ab4ab95d945458e924692008a8a37bb0b1fb097c4d4b3cf6f5ad68ae06e8358659cdfc24974ee629be37b54f5c3dca1
-EBUILD cups-filters-1.28.10-r2.ebuild 3608 BLAKE2B 5a7a7b491a7203d71a00e60562600255197140266e5ed7988434ea809afe46e084da26f4166c8d09b058c34e7d422a837ddd3a75af40bf5f83a368d558f98aed SHA512 f2d6bf1fc14b1bd2e3f92e25c84f189710640e470901a490fb095ddc498ca85514383fc3629a8173b1689a65794840a841a9e1c25494b222c0b844455a7feab6
 EBUILD cups-filters-1.28.10-r3.ebuild 3598 BLAKE2B dc8badc2e658a945d2b966ec598aed3606400135166d4c29f78b003e9b30a33dcc34553b879edecd11432fc5e09b78e9c79c5b9639eccb9b15d76ab3be3e9822 SHA512 9c6dcfff16f688fe6ef9b0dfab9b58673feb6dfa14dee691c039c9d5d3179eb59be68d158845274eb16fe5949243067b7767825541b386b30b686a1d4248eb63
 EBUILD cups-filters-1.28.12-r1.ebuild 3186 BLAKE2B ad1e3a859b3cd9be508ad41631e15ddbeaff985a7065d88f2d32438a753a11f4dbec422a3637baeb32782c10ea612984da702b0cf326a2b5de2977fec71f4cff SHA512 6c5dd1e8d5e0493ed14c407c48413bcbf0c8d7d4c573f97e5a429b0a3eb7c92d0d6d2f83bd9b55eb4f7e30fb9c90a4fccd2ca3ff28152bd0b42e7ce45b23171a
-EBUILD cups-filters-1.28.3-r1.ebuild 3591 BLAKE2B f0c4077bef642d0d546493c6881813ac9f28a572bead335066d79f93f07dc432138158aa9fe6d6b470d1188facaae9e0d0c8dabd2864501f680d18540339b4fd SHA512 1fe087018344fc8e6fe55720edfbd8e1d6c2e70d9e55a3da80bdbe79b39a3bd789988bf58bcd70fea0e2381df893b5e1cb11cd5d06a1fc8c65e7d82a7286f1ec
+EBUILD cups-filters-1.28.13.ebuild 3186 BLAKE2B ad1e3a859b3cd9be508ad41631e15ddbeaff985a7065d88f2d32438a753a11f4dbec422a3637baeb32782c10ea612984da702b0cf326a2b5de2977fec71f4cff SHA512 6c5dd1e8d5e0493ed14c407c48413bcbf0c8d7d4c573f97e5a429b0a3eb7c92d0d6d2f83bd9b55eb4f7e30fb9c90a4fccd2ca3ff28152bd0b42e7ce45b23171a
+EBUILD cups-filters-1.28.14.ebuild 3186 BLAKE2B 8e44b6241b325916a5e93edacb24f0b27c58aeb46b3fadfefe0a9128710e908cb7c0fc39a06b7c2db29fa61f3f1a03fecac993117094d12bdb6d2090034d1ee4 SHA512 2094382142d6ff59369c2d6f1056d1871f31e0bf18819621d57d46009cc4a5479c7dd927dc032e28da1c96e478a63af80ae39b9a7783932a9c30a77c7b2febd8
 EBUILD cups-filters-1.28.7-r1.ebuild 3591 BLAKE2B f0c4077bef642d0d546493c6881813ac9f28a572bead335066d79f93f07dc432138158aa9fe6d6b470d1188facaae9e0d0c8dabd2864501f680d18540339b4fd SHA512 1fe087018344fc8e6fe55720edfbd8e1d6c2e70d9e55a3da80bdbe79b39a3bd789988bf58bcd70fea0e2381df893b5e1cb11cd5d06a1fc8c65e7d82a7286f1ec
-EBUILD cups-filters-1.28.8-r1.ebuild 3599 BLAKE2B e22c955c80b05b95ae3879da4d267f5c1cabfc6f8e269cc99b0ff5b675a401cc212cc231b37d798732183a56089ee76b406adb98b670da89aa01d2532dc61f4d SHA512 a361a12b3d674a9eaaff7a1c01fc75fa5e5de371c9b466065019c1be5b246038ffdb998c582780b655a5fced943c0e24e84f87b1bb0fa059b953589303af2a5b
-EBUILD cups-filters-1.28.9-r1.ebuild 3608 BLAKE2B 5a7a7b491a7203d71a00e60562600255197140266e5ed7988434ea809afe46e084da26f4166c8d09b058c34e7d422a837ddd3a75af40bf5f83a368d558f98aed SHA512 f2d6bf1fc14b1bd2e3f92e25c84f189710640e470901a490fb095ddc498ca85514383fc3629a8173b1689a65794840a841a9e1c25494b222c0b844455a7feab6
 MISC metadata.xml 513 BLAKE2B b265a1645fe0da46a309086d9495564020ea15b7546237dc040589cba2e5d79540860301f8f72484081b726066414ad0414963b7c7c2ce3f08af898502c32521 SHA512 b9234992f05d59bffafb31f3d035e554389f250d8f3b951bb507e300f7cd3a6806406df60b1cae038ab330b3513934ec1250dcf0c9bfdba1bb033e6545727597
diff --git a/net-print/cups-filters/cups-filters-1.28.10-r2.ebuild b/net-print/cups-filters/cups-filters-1.28.13.ebuild
index 60bffc0de893..23c8bbe49a7f 100644
--- a/net-print/cups-filters/cups-filters-1.28.10-r2.ebuild
+++ b/net-print/cups-filters/cups-filters-1.28.13.ebuild
@@ -1,21 +1,16 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 GENTOO_DEPEND_ON_PERL=no
 
-inherit autotools perl-module systemd flag-o-matic
+inherit perl-module systemd flag-o-matic
 
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	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 ~riscv ~s390 ~sparc ~x86"
-fi
 DESCRIPTION="Cups filters"
 HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
+SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 LICENSE="MIT GPL-2"
 SLOT="0"
@@ -24,7 +19,7 @@ IUSE="dbus +foomatic jpeg ldap pclm pdf perl png +postscript test tiff zeroconf"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
+	>=app-text/poppler-0.32[cxx,jpeg?,lcms,tiff?,utils]
 	>=app-text/qpdf-8.3.0:=
 	dev-libs/glib:2
 	media-libs/fontconfig
@@ -53,21 +48,6 @@ BDEPEND="
 	test? ( media-fonts/dejavu )
 "
 
-src_prepare() {
-	local need_eautoreconf=
-
-	default
-
-	if ! use test ; then
-		eapply "${FILESDIR}"/${PN}-1.28.2-make-missing-testfont-non-fatal.patch
-		need_eautoreconf=yes
-	elif [[ "${PV}" == "9999" ]] ; then
-		need_eautoreconf=yes
-	fi
-
-	[[ -n ${need_eautoreconf} ]] && eautoreconf
-}
-
 src_configure() {
 	# Bug #626800
 	append-cxxflags -std=c++11
@@ -130,7 +110,7 @@ src_install() {
 
 	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
 
-	cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
+	cp "${FILESDIR}"/cups-browsed.init.d-r2 "${T}"/cups-browsed || die
 
 	if ! use zeroconf ; then
 		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
diff --git a/net-print/cups-filters/cups-filters-1.28.9-r1.ebuild b/net-print/cups-filters/cups-filters-1.28.14.ebuild
index 60bffc0de893..58faa6fecaac 100644
--- a/net-print/cups-filters/cups-filters-1.28.9-r1.ebuild
+++ b/net-print/cups-filters/cups-filters-1.28.14.ebuild
@@ -1,21 +1,15 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 GENTOO_DEPEND_ON_PERL=no
+inherit perl-module systemd flag-o-matic
 
-inherit autotools perl-module systemd flag-o-matic
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	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 ~riscv ~s390 ~sparc ~x86"
-fi
 DESCRIPTION="Cups filters"
 HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
+SRC_URI="https://www.openprinting.org/download/${PN}/${P}.tar.xz"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 LICENSE="MIT GPL-2"
 SLOT="0"
@@ -24,7 +18,7 @@ IUSE="dbus +foomatic jpeg ldap pclm pdf perl png +postscript test tiff zeroconf"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
+	>=app-text/poppler-0.32[cxx,jpeg?,lcms,tiff?,utils]
 	>=app-text/qpdf-8.3.0:=
 	dev-libs/glib:2
 	media-libs/fontconfig
@@ -53,21 +47,6 @@ BDEPEND="
 	test? ( media-fonts/dejavu )
 "
 
-src_prepare() {
-	local need_eautoreconf=
-
-	default
-
-	if ! use test ; then
-		eapply "${FILESDIR}"/${PN}-1.28.2-make-missing-testfont-non-fatal.patch
-		need_eautoreconf=yes
-	elif [[ "${PV}" == "9999" ]] ; then
-		need_eautoreconf=yes
-	fi
-
-	[[ -n ${need_eautoreconf} ]] && eautoreconf
-}
-
 src_configure() {
 	# Bug #626800
 	append-cxxflags -std=c++11
@@ -130,7 +109,7 @@ src_install() {
 
 	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
 
-	cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
+	cp "${FILESDIR}"/cups-browsed.init.d-r2 "${T}"/cups-browsed || die
 
 	if ! use zeroconf ; then
 		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
diff --git a/net-print/cups-filters/cups-filters-1.28.3-r1.ebuild b/net-print/cups-filters/cups-filters-1.28.3-r1.ebuild
deleted file mode 100644
index cc91c4d8edeb..000000000000
--- a/net-print/cups-filters/cups-filters-1.28.3-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit autotools perl-module systemd flag-o-matic
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	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"
-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 test tiff zeroconf"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
-	>=app-text/qpdf-8.3.0:=
-	dev-libs/glib:2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	>=net-print/cups-1.7.3
-	!<=net-print/cups-1.5.9999
-	sys-devel/bc
-	sys-libs/zlib
-	dbus? ( sys-apps/dbus )
-	foomatic? ( !net-print/foomatic-filters )
-	jpeg? ( virtual/jpeg:0 )
-	ldap? ( net-nds/openldap:= )
-	pdf? ( app-text/mupdf )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
-	tiff? ( media-libs/tiff:0 )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-	test? ( media-fonts/dejavu )
-"
-
-src_prepare() {
-	local need_eautoreconf=
-
-	default
-
-	if ! use test ; then
-		eapply "${FILESDIR}"/${PN}-1.28.2-make-missing-testfont-non-fatal.patch
-		need_eautoreconf=yes
-	elif [[ "${PV}" == "9999" ]] ; then
-		need_eautoreconf=yes
-	fi
-
-	[[ -n ${need_eautoreconf} ]] && eautoreconf
-
-	# Bug #626800
-	append-cxxflags -std=c++11
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-imagefilters
-		--localstatedir="${EPREFIX}"/var
-		--with-browseremoteprotocols=DNSSD,CUPS
-		--with-cups-rundir="${EPREFIX}"/run/cups
-		--with-fontdir="fonts/conf.avail"
-		--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 zeroconf avahi)
-		$(use_with jpeg)
-		$(use_with png)
-		$(use_with tiff)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null || die
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null || die
-	fi
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null || die
-		perl-module_src_install
-		perl_delete_localpod
-		popd > /dev/null || die
-	fi
-
-	if use postscript; then
-		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
-		dosym gstoraster /usr/libexec/cups/filter/pstoraster
-		dosym gstopxl /usr/libexec/cups/filter/pstopxl
-	fi
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-
-	cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
-
-	if ! use zeroconf ; then
-		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
-		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
-	fi
-
-	doinitd "${T}"/cups-browsed
-	systemd_dounit "${S}/utils/cups-browsed.service"
-}
-
-pkg_postinst() {
-	if ! use foomatic ; then
-		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
-		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
-	fi
-}
diff --git a/net-print/cups-filters/cups-filters-1.28.8-r1.ebuild b/net-print/cups-filters/cups-filters-1.28.8-r1.ebuild
deleted file mode 100644
index bd70287ac773..000000000000
--- a/net-print/cups-filters/cups-filters-1.28.8-r1.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-GENTOO_DEPEND_ON_PERL=no
-
-inherit autotools perl-module systemd flag-o-matic
-
-if [[ "${PV}" == "9999" ]] ; then
-	inherit git-r3
-	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"
-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 test tiff zeroconf"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
-	>=app-text/qpdf-8.3.0:=
-	dev-libs/glib:2
-	media-libs/fontconfig
-	media-libs/freetype:2
-	media-libs/lcms:2
-	>=net-print/cups-1.7.3
-	!<=net-print/cups-1.5.9999
-	sys-devel/bc
-	sys-libs/zlib
-	dbus? ( sys-apps/dbus )
-	foomatic? ( !net-print/foomatic-filters )
-	jpeg? ( virtual/jpeg:0 )
-	ldap? ( net-nds/openldap:= )
-	pdf? ( app-text/mupdf )
-	perl? ( dev-lang/perl:= )
-	png? ( media-libs/libpng:0= )
-	postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
-	tiff? ( media-libs/tiff:0 )
-	zeroconf? ( net-dns/avahi[dbus] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/gdbus-codegen
-	>=sys-devel/gettext-0.18.3
-	virtual/pkgconfig
-	test? ( media-fonts/dejavu )
-"
-
-src_prepare() {
-	local need_eautoreconf=
-
-	default
-
-	if ! use test ; then
-		eapply "${FILESDIR}"/${PN}-1.28.2-make-missing-testfont-non-fatal.patch
-		need_eautoreconf=yes
-	elif [[ "${PV}" == "9999" ]] ; then
-		need_eautoreconf=yes
-	fi
-
-	[[ -n ${need_eautoreconf} ]] && eautoreconf
-
-	# Bug #626800
-	append-cxxflags -std=c++11
-}
-
-src_configure() {
-	local myeconfargs=(
-		--enable-imagefilters
-		--localstatedir="${EPREFIX}"/var
-		--with-browseremoteprotocols=DNSSD,CUPS
-		--with-cups-rundir="${EPREFIX}"/run/cups
-		--with-fontdir="fonts/conf.avail"
-		--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 zeroconf avahi)
-		$(use_with jpeg)
-		$(use_with png)
-		$(use_with tiff)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null || die
-		perl-module_src_configure
-		perl-module_src_compile
-		popd > /dev/null || die
-	fi
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	default
-
-	if use perl; then
-		pushd "${S}/scripting/perl" > /dev/null || die
-		perl-module_src_install
-		perl_delete_localpod
-		popd > /dev/null || die
-	fi
-
-	if use postscript; then
-		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
-		dosym gstoraster /usr/libexec/cups/filter/pstoraster
-		dosym gstopxl /usr/libexec/cups/filter/pstopxl
-	fi
-
-	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
-
-	cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
-
-	if ! use zeroconf ; then
-		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
-		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
-	fi
-
-	doinitd "${T}"/cups-browsed
-	systemd_dounit "${S}/utils/cups-browsed.service"
-}
-
-pkg_postinst() {
-	if ! use foomatic ; then
-		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
-		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
-	fi
-}
diff --git a/net-print/hplip-plugin/Manifest b/net-print/hplip-plugin/Manifest
index e35d8d3986ea..6485e576ced0 100644
--- a/net-print/hplip-plugin/Manifest
+++ b/net-print/hplip-plugin/Manifest
@@ -1,7 +1,3 @@
-DIST hplip-3.20.11-plugin.run 11514293 BLAKE2B b3b7698a45e5e68a25ec1216e736484d26546b657f4a519a153acf0280847667e7ca81afc988f722668746281857d51d9e1703857514ffe5b57dea85f2bae4d3 SHA512 9075c1ac8e8f6e12d33b81b633025259f54352ea00271eec07ee898fd9a164445519608fc9ea61a7157845a4a03f87c28f486c7994f0d7db81d11d3fe51f1876
-DIST hplip-3.21.12-plugin.run 11487224 BLAKE2B 601f70d6d75bc0172b6de647af43afa0ec047eb8b0a9a37611f2496d43daf1d4de4b705d6e58cb209910d7341811dc365d7aeb60d738f5e8ede71337bf36b58e SHA512 5bf6c0d7fb10f9108baac5d9c0c62f080b15cb227ae39c6647111d6dd39a3f97ab1044bccce781f224b5886842da5bd5063d3ce05db374a43e57a7152c52683b
 DIST hplip-3.22.2-plugin.run 11487296 BLAKE2B 2c953e85b3ef299066aaf158121f4a3db68b00f2e2df3cb35acc78a54a466e8a3e204592fbfa2128acb87c0f9b258178cd29faf4e93600ee4b10fe81b93f213b SHA512 5efa533863bec3e7e5fc354411216e6e4232c2bbc15a062ff829296e1357c523333df8221a341b10c940022708299a33449020e633a9873205b568959327cb24
-EBUILD hplip-plugin-3.20.11.ebuild 1447 BLAKE2B 4833b0498319b3d1aa1bfcda87335d708efde09be0831cfc07bd9e0dc08bcfe5f3a98aad6f0828ca461dfaf271e920d8a0e33ce6abd33e6ecd72a8b561166e3c SHA512 cd1989698ea448e5e1b630d93bb164c856fa055783a3f00b7bac5a33b0c6597d3261260c8d267f7a43c15b0b89893c7245ba078014851be5345380615dcdda53
-EBUILD hplip-plugin-3.21.12.ebuild 1489 BLAKE2B 40383e62159c76e7918a2e4191e42d17e9be3c3aed959bc3a1579535cfe0dfdd8e44079a87a981f55271307b3eb41fa0ba045a2afcb1af69479bd884d2e86ff7 SHA512 3818d230057726b0b8e00f66052097601cff766cd5687e93892f1958b947552564646d1bcdbb44f4e1798126423bb938c17b826ee6e4e86b38d21b28ac2a2036
-EBUILD hplip-plugin-3.22.2.ebuild 1489 BLAKE2B 40383e62159c76e7918a2e4191e42d17e9be3c3aed959bc3a1579535cfe0dfdd8e44079a87a981f55271307b3eb41fa0ba045a2afcb1af69479bd884d2e86ff7 SHA512 3818d230057726b0b8e00f66052097601cff766cd5687e93892f1958b947552564646d1bcdbb44f4e1798126423bb938c17b826ee6e4e86b38d21b28ac2a2036
+EBUILD hplip-plugin-3.22.2.ebuild 1484 BLAKE2B 00d10feb206b7c70c6523e5c8757a4a1d4846d20be7d1b34e0d4ceda452d686404abee5a01d76b6cf9ba5510ecdb79e87807a4635c19cdce79ab9a3999e5faec SHA512 e6947d194de5aee27f8253d104ddc0d1ba82d83f54fee6106b4f5937c2d05e26fa78306dee8cfd208c84add673f953bd73462c8e64413ffc32979456eeba9260
 MISC metadata.xml 523 BLAKE2B 396a3e3f19f1929ac628fd3301f7de077e34d80b88f0f65dd4035a55b8ff16be6a89dc94b47085dafc7a8a2def19353aa52996a12e51e94154a61ba1329f8c91 SHA512 9d5abebbd6fdac76142c70aa911c4ac55eb5388fd39e010d72e8e6253f51a7924eda2a675cd8ce3475fea76b307805644cf8f7140b265e66b4fcd65a8546fd96
diff --git a/net-print/hplip-plugin/hplip-plugin-3.20.11.ebuild b/net-print/hplip-plugin/hplip-plugin-3.20.11.ebuild
deleted file mode 100644
index 0524ab3f3cae..000000000000
--- a/net-print/hplip-plugin/hplip-plugin-3.20.11.ebuild
+++ /dev/null
@@ -1,72 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit unpacker
-
-DESCRIPTION="Proprietary plugins and firmware for HPLIP"
-HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing/plugins"
-SRC_URI="https://developers.hp.com/sites/default/files/hplip-${PV}-plugin.run"
-LICENSE="hplip-plugin"
-SLOT="0"
-KEYWORDS="amd64 arm x86"
-IUSE="orblite"
-
-RDEPEND="
-	~net-print/hplip-${PV}
-	virtual/udev
-	orblite? (
-		media-gfx/sane-backends
-		>=sys-libs/glibc-2.26
-		virtual/libusb:0
-	)
-"
-DEPEND=""
-
-S=${WORKDIR}
-
-HPLIP_HOME=/usr/share/hplip
-
-# Binary prebuilt package
-QA_PREBUILT="${HPLIP_HOME}/*.so"
-
-# License does not allow us to redistribute the "source" package
-RESTRICT="mirror"
-
-src_install() {
-	local hplip_arch
-	case "${ARCH}" in
-		amd64) hplip_arch="x86_64" ;;
-		arm)   hplip_arch="arm32"  ;;
-		x86)   hplip_arch="x86_32" ;;
-		*)     die "Unsupported architecture." ;;
-	esac
-
-	insinto "${HPLIP_HOME}"/data/firmware
-	doins *.fw.gz
-
-	for plugin in *-${hplip_arch}.so; do
-		local plugin_type=prnt
-		case "${plugin}" in
-			bb_orblite-*)
-				use orblite || continue
-				plugin_type=scan ;;
-			bb_*)
-				plugin_type=scan ;;
-			fax_*)
-				plugin_type=fax ;;
-		esac
-
-		exeinto "${HPLIP_HOME}"/${plugin_type}/plugins
-		newexe ${plugin} ${plugin/-${hplip_arch}}
-	done
-
-	insinto /var/lib/hp
-	newins - hplip.state <<-_EOF_
-		[plugin]
-		installed = 1
-		eula = 1
-		version = ${PV}
-	_EOF_
-}
diff --git a/net-print/hplip-plugin/hplip-plugin-3.21.12.ebuild b/net-print/hplip-plugin/hplip-plugin-3.21.12.ebuild
deleted file mode 100644
index 354cee23d950..000000000000
--- a/net-print/hplip-plugin/hplip-plugin-3.21.12.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit unpacker
-
-DESCRIPTION="Proprietary plugins and firmware for HPLIP"
-HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing/plugins"
-SRC_URI="https://developers.hp.com/sites/default/files/hplip-${PV}-plugin.run"
-LICENSE="hplip-plugin"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="orblite"
-
-RDEPEND="
-	~net-print/hplip-${PV}
-	virtual/udev
-	orblite? (
-		media-gfx/sane-backends
-		>=sys-libs/glibc-2.26
-		virtual/libusb:0
-	)
-"
-DEPEND=""
-
-S=${WORKDIR}
-
-HPLIP_HOME=/usr/share/hplip
-
-# Binary prebuilt package
-QA_PREBUILT="${HPLIP_HOME}/*.so"
-
-# License does not allow us to redistribute the "source" package
-RESTRICT="mirror"
-
-src_install() {
-	local hplip_arch
-	case "${ARCH}" in
-		amd64) hplip_arch="x86_64" ;;
-		arm)   hplip_arch="arm32"  ;;
-		arm64) hplip_arch="arm64"  ;;
-		x86)   hplip_arch="x86_32" ;;
-		*)     die "Unsupported architecture." ;;
-	esac
-
-	insinto "${HPLIP_HOME}"/data/firmware
-	doins *.fw.gz
-
-	for plugin in *-${hplip_arch}.so; do
-		local plugin_type=prnt
-		case "${plugin}" in
-			bb_orblite-*)
-				use orblite || continue
-				plugin_type=scan ;;
-			bb_*)
-				plugin_type=scan ;;
-			fax_*)
-				plugin_type=fax ;;
-		esac
-
-		exeinto "${HPLIP_HOME}"/${plugin_type}/plugins
-		newexe ${plugin} ${plugin/-${hplip_arch}}
-	done
-
-	insinto /var/lib/hp
-	newins - hplip.state <<-_EOF_
-		[plugin]
-		installed = 1
-		eula = 1
-		version = ${PV}
-	_EOF_
-}
diff --git a/net-print/hplip-plugin/hplip-plugin-3.22.2.ebuild b/net-print/hplip-plugin/hplip-plugin-3.22.2.ebuild
index 354cee23d950..5f684cc91dfd 100644
--- a/net-print/hplip-plugin/hplip-plugin-3.22.2.ebuild
+++ b/net-print/hplip-plugin/hplip-plugin-3.22.2.ebuild
@@ -8,10 +8,14 @@ inherit unpacker
 DESCRIPTION="Proprietary plugins and firmware for HPLIP"
 HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing/plugins"
 SRC_URI="https://developers.hp.com/sites/default/files/hplip-${PV}-plugin.run"
+S="${WORKDIR}"
+
 LICENSE="hplip-plugin"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 arm ~arm64 x86"
 IUSE="orblite"
+# License does not allow us to redistribute the "source" package
+RESTRICT="mirror"
 
 RDEPEND="
 	~net-print/hplip-${PV}
@@ -22,20 +26,14 @@ RDEPEND="
 		virtual/libusb:0
 	)
 "
-DEPEND=""
-
-S=${WORKDIR}
 
 HPLIP_HOME=/usr/share/hplip
 
 # Binary prebuilt package
 QA_PREBUILT="${HPLIP_HOME}/*.so"
 
-# License does not allow us to redistribute the "source" package
-RESTRICT="mirror"
-
 src_install() {
-	local hplip_arch
+	local hplip_arch plugin
 	case "${ARCH}" in
 		amd64) hplip_arch="x86_64" ;;
 		arm)   hplip_arch="arm32"  ;;
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index e4211cbe0ab8..0cb990c19aae 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,10 +1,4 @@
-DIST hplip-3.20.11-patches-2.tar.xz 18140 BLAKE2B a0271d0c6fcfaa53c68ab00c4c6cfc121e4eef0368b7eff04677ccbd8b897897352fe44a111693d0d45ee1b40bc3c783984f23a35faedfa2fa0da52018aade3c SHA512 8d00d48e295572df19b6edf0efce005f6bae6e051cce5d618575f5e226e2c32896111ddc1a193d4aacfadbe9d7f525761b0ea2564277f4c263b3df5bc86c1f40
-DIST hplip-3.20.11.tar.gz 26301441 BLAKE2B 14667f33cc50b2887c8434ada7327a82e16b9acbcdc75d3a50c0261ec9aef3fada9be81e6c0cbdfb4d29914630799c6406893644386db99c0ce86245cca38cc2 SHA512 f583fb4140a29c5e21956c3e51fe3620baa65d33b40447af419d7fc61473a1148a1873216a84e89be785b155ee8e9aebd5e3eb19d2ded82b8415b1a35de1b55d
-DIST hplip-3.21.10-patches-1.tar.xz 17700 BLAKE2B a5d60802a3a9b76b18c0cc4d880b649c2ffceb38b9a0b1857e86eac6a4e840272ce8764db6544b273071e361bb29ae6863df64a3b39bcede2a37ea55c1957fe8 SHA512 d8cda2abadc9b0184bf6669e648fa060a9f0f78e9fcaa3998424b968d01c8a1e1e7ebf371c2614b3d1fbf9052c35368bd65ae265946367a72785ff88f753df8b
-DIST hplip-3.21.12.tar.gz 27314194 BLAKE2B 8ab204f9f655d5792aaeb729b416a994c7661a540602f755c58887d2b5694e85fab3fc9c800620de128979b43724d16603447e875c40e2530bb5566599535311 SHA512 b101a6958dbfa2b717b85bf38b05d682b9fe68ed3d08e2f6039485ac428867de66381e869c1d4ab2bd22e13a751704ca19915dd90661561c8dd68883a72ace2d
 DIST hplip-3.22.2-patches-1.tar.xz 17564 BLAKE2B df4d3c71679000febe68730fd88c81a82283874200d86934318b602fc1fb51f6d90a42effb5fbfef38a98ef6a150f9dc139ca3edeb519d9ac11f98ba7ef7ec63 SHA512 df3716b59bbdd87696900f111d3a0c7d27a474826d343503af43bb625f0796696ffdd24383564f5ff3e600f7ae8f5092700ffc9d130b6d5f812750c8856f6ef8
 DIST hplip-3.22.2.tar.gz 27341972 BLAKE2B d262307430b5a4ca05f2a58cdadc212e93b73141906c0852a2b9b2ced33b942dbec6d9f2fc1f79773d3d37a9d71f37b5fe457ba574d7bf826cd3afeb80d4f05d SHA512 9cde954a11bae2e2ad6120d8fe103ab52409c906dde4c1e82fa7a9e5e265e0a71e0578e3117a8b4508e2c7c87f05052d32b14b39b89e3e59baf7a4055ac5579f
-EBUILD hplip-3.20.11-r2.ebuild 8231 BLAKE2B 3e060f6b134cfb101500db89a889c092f3eecd8803d8d475212d0c91fb7be52759dac472cfe82dd59eff85f4d579b48d7c03d68fb5ded3f90495334294578dde SHA512 a0fe5d63efd08036fcb45b23dc943b529b07d214f3b8bde4b4c91e34d28ae33f8032cb314108922f74955d6e0a4ed88a29c7d6672e18cd90aef6bce03750d13d
-EBUILD hplip-3.21.12.ebuild 8200 BLAKE2B b6d63997766affb57eda1a2cf7cff860f0f021871a9bd063d82a740b88a893a4cfd82ec7da916613c42d0514c8cfec9ab05c5fb8396939ff7a60894ad1129e0b SHA512 e1c26962c7cefaae60efd9c514a9f064bb134c308018d28f7fa6a2d4456ddedcb7e44aac782d9ce3df9b1bb1619432b05b6e6ab1c3464f1345375648738f4d94
-EBUILD hplip-3.22.2.ebuild 8199 BLAKE2B 620ba24226a2771b3a57ebd25858a83cfba74a6a1455bc0d8cd10799383f7aeed8c818253b1607fca89ee76a20b6bae9c70085a6e4a13ae69a900107a23c1200 SHA512 8d20a04779bde80b45201530fea003256b0ddd87f487dd0db9096150605b14f2bbb807310e1c12778029316760099830ff00ce84b9ace7130a109b355b718432
+EBUILD hplip-3.22.2.ebuild 8193 BLAKE2B 72513998f3040c34f57befd449d793b1a5cd5eed25e1f0cc2f5ef15053bd466f6230492b178d2c31f72198592d522f8334ecc32ed20a0370acff2d3aa63fee22 SHA512 e666a9fb7b0753e82115895db6e8e8879ad02cb80aca5a75ec33c53c0ccdb125d6ac55132a1877a28253791dfcd89cfad81f92caf50407ebe733d402fa25a12f
 MISC metadata.xml 1911 BLAKE2B ccddda1b977dda5c8bb3c9e9d9d152ca57406a1b530ee92ccccc7a8a4b194b0749426e3012329fb982ce4c445c05d1fa74a3b3e0619b355ca0de429d9727bfc7 SHA512 290530d8260586d9cc07b63b7599c10a6c7b8304ffd72c22e9b9c2f7db9b6a28a72d0f53a8a84c2715cd9fd25228e0b64c005d97267f1d390114b5a46b88e4f1
diff --git a/net-print/hplip/hplip-3.20.11-r2.ebuild b/net-print/hplip/hplip-3.20.11-r2.ebuild
deleted file mode 100644
index b005d106d680..000000000000
--- a/net-print/hplip/hplip-3.20.11-r2.ebuild
+++ /dev/null
@@ -1,287 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8,9} )
-PYTHON_REQ_USE="threads(+),xml"
-
-# 14 and 15 spit out a lot of warnings about subdirs
-WANT_AUTOMAKE="1.13"
-
-inherit autotools linux-info python-single-r1 readme.gentoo-r1 udev
-
-DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools"
-HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing"
-SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
-		https://dev.gentoo.org/~billie/distfiles/${PN}-3.20.11-patches-2.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-
-IUSE="doc fax +hpcups hpijs kde libnotify libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
-
-COMMON_DEPEND="
-	net-print/cups
-	sys-apps/dbus
-	virtual/jpeg:0
-	hpijs? ( net-print/cups-filters[foomatic] )
-	!libusb0? ( virtual/libusb:1 )
-	libusb0? ( virtual/libusb:0 )
-	${PYTHON_DEPS}
-	!minimal? (
-		scanner? (
-			media-gfx/sane-backends
-		)
-		snmp? (
-			dev-libs/openssl:0=
-			net-analyzer/net-snmp:=
-			net-dns/avahi[dbus,python,${PYTHON_SINGLE_USEDEP}]
-		)
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	${COMMON_DEPEND}
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	app-text/ghostscript-gpl
-	!minimal? (
-		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*')
-		kernel_linux? ( virtual/udev )
-		$(python_gen_cond_dep '
-			>=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]
-			dev-python/distro[${PYTHON_USEDEP}]
-			fax? ( dev-python/reportlab[${PYTHON_USEDEP}] )
-			qt5? (
-				>=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}]
-				libnotify? ( dev-python/notify2[${PYTHON_USEDEP}] )
-			)
-			scanner? (
-				>=dev-python/reportlab-3.2[${PYTHON_USEDEP}]
-				>=dev-python/pillow-3.1.1[${PYTHON_USEDEP}]
-				X? (
-					|| (
-						kde? ( kde-misc/skanlite )
-						media-gfx/xsane
-						media-gfx/sane-frontends
-					)
-				)
-			)
-		')
-	)
-	policykit? ( sys-auth/polkit )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
-	"${WORKDIR}/patches"
-)
-
-CONFIG_CHECK="~PARPORT ~PPDEV"
-ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
-
-#DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-For more information on setting up your printer please take
-a look at the hplip section of the gentoo printing guide:
-https://wiki.gentoo.org/wiki/Printing
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-
-	use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
-
-	use parport && linux-info_pkg_setup
-
-	if use minimal ; then
-		ewarn "Installing driver portions only, make sure you know what you are doing."
-		ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
-		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
-		ewarn "This also disables fax, network, scanner and gui support!"
-	fi
-
-	if ! use hpcups && ! use hpijs ; then
-		ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
-		ewarn "which is probably not what you want."
-		ewarn "You will almost certainly not be able to print."
-	fi
-}
-
-src_prepare() {
-	default
-
-	python_fix_shebang .
-
-	# Make desktop files follow the specification
-	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
-	sed -i -e '/^Categories=/s/Application;//' \
-		-e '/^Encoding=.*/d' hplip.desktop.in || die
-	sed -i -e '/^Categories=/s/Application;//' \
-		-e '/^Version=.*/d' \
-		-e '/^Comment=.*/d' hplip-systray.desktop.in || die
-
-	# Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
-	# https://bugs.launchpad.net/hplip/+bug/500086
-	local udevdir=$(get_udevdir)
-	sed -i -e "s|/etc/udev|${udevdir}|g" \
-		$(find . -type f -exec grep -l /etc/udev {} +) || die
-
-	# Force recognition of Gentoo distro by hp-check
-	sed -i \
-		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
-		installer/core_install.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local drv_build minimal_build
-
-	if use hpcups ; then
-		drv_build="$(use_enable hpcups hpcups-install)"
-		if use static-ppds ; then
-			drv_build="${drv_build} --enable-cups-ppd-install"
-			drv_build="${drv_build} --disable-cups-drv-install"
-		else
-			drv_build="${drv_build} --enable-cups-drv-install"
-			drv_build="${drv_build} --disable-cups-ppd-install"
-		fi
-	else
-		drv_build="--disable-hpcups-install"
-		drv_build="${drv_build} --disable-cups-drv-install"
-		drv_build="${drv_build} --disable-cups-ppd-install"
-	fi
-
-	if use hpijs ; then
-		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
-		if use static-ppds ; then
-			drv_build="${drv_build} --enable-foomatic-ppd-install"
-			drv_build="${drv_build} --disable-foomatic-drv-install"
-		else
-			drv_build="${drv_build} --enable-foomatic-drv-install"
-			drv_build="${drv_build} --disable-foomatic-ppd-install"
-		fi
-	else
-		drv_build="${drv_build} --disable-hpijs-install"
-		drv_build="${drv_build} --disable-foomatic-drv-install"
-		drv_build="${drv_build} --disable-foomatic-ppd-install"
-	fi
-
-	if use minimal ; then
-		if use hpijs ; then
-			minimal_build="--enable-hpijs-only-build"
-		else
-			minimal_build="--disable-hpijs-only-build"
-		fi
-		if use hpcups ; then
-			minimal_build="${minimal_build} --enable-hpcups-only-build"
-		else
-			minimal_build="${minimal_build} --disable-hpcups-only-build"
-		fi
-		minimal_build="${minimal_build} --disable-fax-build"
-		minimal_build="${minimal_build} --disable-network-build"
-		minimal_build="${minimal_build} --disable-scan-build"
-		minimal_build="${minimal_build} --disable-gui-build"
-	else
-		if use fax ; then
-			minimal_build="${minimal_build} --enable-fax-build"
-		else
-			minimal_build="${minimal_build} --disable-fax-build"
-		fi
-		if use snmp ; then
-			minimal_build="${minimal_build} --enable-network-build"
-		else
-			minimal_build="${minimal_build} --disable-network-build"
-		fi
-		if use scanner ; then
-			minimal_build="${minimal_build} --enable-scan-build"
-		else
-			minimal_build="${minimal_build} --disable-scan-build"
-		fi
-		if use qt5 ; then
-			minimal_build="${minimal_build} --enable-qt5"
-			minimal_build="${minimal_build} --enable-gui-build"
-		else
-			minimal_build="${minimal_build} --disable-gui-build"
-			minimal_build="${minimal_build} --disable-qt5"
-		fi
-	fi
-
-	# disable class driver for now
-	econf \
-		--disable-class-driver \
-		--disable-foomatic-rip-hplip-install \
-		--disable-cups11-build \
-		--disable-lite-build \
-		--disable-shadow-build \
-		--disable-qt3 \
-		--disable-qt4 \
-		--disable-udev_sysfs_rules \
-		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
-		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
-		--with-docdir=/usr/share/doc/${PF} \
-		--with-htmldir=/usr/share/doc/${PF}/html \
-		--enable-hpps-install \
-		--enable-dbus-build \
-		${drv_build} \
-		${minimal_build} \
-		$(use_enable doc doc-build) \
-		$(use_enable libusb0 libusb01_build) \
-		$(use_enable parport pp-build) \
-		$(use_enable policykit)
-
-	# hpijs ppds are created at configure time but are not installed (3.17.11)
-
-	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
-	# The hpcups driver does not use foomatic-rip
-	#local i
-	#for i in ppd/hpijs/*.ppd.gz ; do
-	#	rm -f ${i}.temp || die
-	#	gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
-	#		gzip > ${i}.temp || die
-	#	mv ${i}.temp ${i} || die
-	#done
-}
-
-src_install() {
-	# Disable parallel install
-	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=578018
-	emake -j1 DESTDIR="${D}" install
-	einstalldocs
-	# default
-
-	# Installed by sane-backends
-	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
-	rm -f "${ED}"/etc/sane.d/dll.conf || die
-
-	# Remove desktop and autostart files
-	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=638770
-	use qt5 || {
-		rm -Rf "${ED}"/usr/share/applications "${ED}"/etc/xdg
-	}
-
-	rm -f "${ED}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
-	rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/doc/${PF}/ || die
-
-	# Remove hal fdi files
-	rm -rf "${ED}"/usr/share/hal || die
-
-	find "${D}" -name '*.la' -delete || die
-
-	python_optimize "${ED}"/usr/share/hplip
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/net-print/hplip/hplip-3.21.12.ebuild b/net-print/hplip/hplip-3.21.12.ebuild
deleted file mode 100644
index 9473b1dc2ea5..000000000000
--- a/net-print/hplip/hplip-3.21.12.ebuild
+++ /dev/null
@@ -1,285 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-PYTHON_REQ_USE="threads(+),xml"
-
-inherit autotools linux-info python-single-r1 readme.gentoo-r1 udev
-
-DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools"
-HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing"
-SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
-		https://dev.gentoo.org/~billie/distfiles/${PN}-3.21.10-patches-1.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-
-IUSE="doc fax +hpcups hpijs kde libnotify libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
-
-COMMON_DEPEND="
-	net-print/cups
-	sys-apps/dbus
-	virtual/jpeg:0
-	hpijs? ( net-print/cups-filters[foomatic] )
-	!libusb0? ( virtual/libusb:1 )
-	libusb0? ( virtual/libusb:0 )
-	${PYTHON_DEPS}
-	!minimal? (
-		scanner? (
-			media-gfx/sane-backends
-		)
-		snmp? (
-			dev-libs/openssl:0=
-			net-analyzer/net-snmp:=
-			net-dns/avahi[dbus,python,${PYTHON_SINGLE_USEDEP}]
-		)
-	)
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-DEPEND="
-	${COMMON_DEPEND}
-"
-RDEPEND="
-	${COMMON_DEPEND}
-	app-text/ghostscript-gpl
-	!minimal? (
-		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_USEDEP}]' 'python3*')
-		kernel_linux? ( virtual/udev )
-		$(python_gen_cond_dep '
-			>=dev-python/dbus-python-1.2.0-r1[${PYTHON_USEDEP}]
-			dev-python/distro[${PYTHON_USEDEP}]
-			fax? ( dev-python/reportlab[${PYTHON_USEDEP}] )
-			qt5? (
-				>=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_USEDEP}]
-				libnotify? ( dev-python/notify2[${PYTHON_USEDEP}] )
-			)
-			scanner? (
-				>=dev-python/reportlab-3.2[${PYTHON_USEDEP}]
-				>=dev-python/pillow-3.1.1[${PYTHON_USEDEP}]
-				X? (
-					|| (
-						kde? ( kde-misc/skanlite )
-						media-gfx/xsane
-						media-gfx/sane-frontends
-					)
-				)
-			)
-		')
-	)
-	policykit? ( sys-auth/polkit )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-PATCHES=(
-	"${WORKDIR}/patches"
-)
-
-CONFIG_CHECK="~PARPORT ~PPDEV"
-ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
-
-#DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-For more information on setting up your printer please take
-a look at the hplip section of the gentoo printing guide:
-https://wiki.gentoo.org/wiki/Printing
-"
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-
-	use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
-
-	use parport && linux-info_pkg_setup
-
-	if use minimal ; then
-		ewarn "Installing driver portions only, make sure you know what you are doing."
-		ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
-		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
-		ewarn "This also disables fax, network, scanner and gui support!"
-	fi
-
-	if ! use hpcups && ! use hpijs ; then
-		ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
-		ewarn "which is probably not what you want."
-		ewarn "You will almost certainly not be able to print."
-	fi
-}
-
-src_prepare() {
-	default
-
-	python_fix_shebang .
-
-	# Make desktop files follow the specification
-	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
-	sed -i -e '/^Categories=/s/Application;//' \
-		-e '/^Encoding=.*/d' hplip.desktop.in || die
-	sed -i -e '/^Categories=/s/Application;//' \
-		-e '/^Version=.*/d' \
-		-e '/^Comment=.*/d' hplip-systray.desktop.in || die
-
-	# Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
-	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
-	# https://bugs.launchpad.net/hplip/+bug/500086
-	local udevdir=$(get_udevdir)
-	sed -i -e "s|/etc/udev|${udevdir}|g" \
-		$(find . -type f -exec grep -l /etc/udev {} +) || die
-
-	# Force recognition of Gentoo distro by hp-check
-	sed -i \
-		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
-		installer/core_install.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local drv_build minimal_build
-
-	if use hpcups ; then
-		drv_build="$(use_enable hpcups hpcups-install)"
-		if use static-ppds ; then
-			drv_build="${drv_build} --enable-cups-ppd-install"
-			drv_build="${drv_build} --disable-cups-drv-install"
-		else
-			drv_build="${drv_build} --enable-cups-drv-install"
-			drv_build="${drv_build} --disable-cups-ppd-install"
-		fi
-	else
-		drv_build="--disable-hpcups-install"
-		drv_build="${drv_build} --disable-cups-drv-install"
-		drv_build="${drv_build} --disable-cups-ppd-install"
-	fi
-
-	if use hpijs ; then
-		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
-		if use static-ppds ; then
-			drv_build="${drv_build} --enable-foomatic-ppd-install"
-			drv_build="${drv_build} --disable-foomatic-drv-install"
-		else
-			drv_build="${drv_build} --enable-foomatic-drv-install"
-			drv_build="${drv_build} --disable-foomatic-ppd-install"
-		fi
-	else
-		drv_build="${drv_build} --disable-hpijs-install"
-		drv_build="${drv_build} --disable-foomatic-drv-install"
-		drv_build="${drv_build} --disable-foomatic-ppd-install"
-	fi
-
-	if use minimal ; then
-		if use hpijs ; then
-			minimal_build="--enable-hpijs-only-build"
-		else
-			minimal_build="--disable-hpijs-only-build"
-		fi
-		if use hpcups ; then
-			minimal_build="${minimal_build} --enable-hpcups-only-build"
-		else
-			minimal_build="${minimal_build} --disable-hpcups-only-build"
-		fi
-		minimal_build="${minimal_build} --disable-fax-build"
-		minimal_build="${minimal_build} --disable-network-build"
-		minimal_build="${minimal_build} --disable-scan-build"
-		minimal_build="${minimal_build} --disable-gui-build"
-	else
-		if use fax ; then
-			minimal_build="${minimal_build} --enable-fax-build"
-		else
-			minimal_build="${minimal_build} --disable-fax-build"
-		fi
-		if use snmp ; then
-			minimal_build="${minimal_build} --enable-network-build"
-		else
-			minimal_build="${minimal_build} --disable-network-build"
-		fi
-		if use scanner ; then
-			minimal_build="${minimal_build} --enable-scan-build"
-		else
-			minimal_build="${minimal_build} --disable-scan-build"
-		fi
-		if use qt5 ; then
-			minimal_build="${minimal_build} --enable-qt5"
-			minimal_build="${minimal_build} --enable-gui-build"
-		else
-			minimal_build="${minimal_build} --disable-gui-build"
-			minimal_build="${minimal_build} --disable-qt5"
-		fi
-	fi
-
-	# disable class driver for now
-	econf \
-		--disable-class-driver \
-		--disable-cups11-build \
-		--disable-foomatic-rip-hplip-install \
-		--disable-imageProcessor-build \
-		--disable-lite-build \
-		--disable-shadow-build \
-		--disable-qt3 \
-		--disable-qt4 \
-		--disable-udev_sysfs_rules \
-		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
-		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
-		--with-docdir=/usr/share/doc/${PF} \
-		--with-htmldir=/usr/share/doc/${PF}/html \
-		--enable-hpps-install \
-		--enable-dbus-build \
-		${drv_build} \
-		${minimal_build} \
-		$(use_enable doc doc-build) \
-		$(use_enable libusb0 libusb01_build) \
-		$(use_enable parport pp-build) \
-		$(use_enable policykit)
-
-	# hpijs ppds are created at configure time but are not installed (3.17.11)
-
-	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
-	# The hpcups driver does not use foomatic-rip
-	#local i
-	#for i in ppd/hpijs/*.ppd.gz ; do
-	#	rm -f ${i}.temp || die
-	#	gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
-	#		gzip > ${i}.temp || die
-	#	mv ${i}.temp ${i} || die
-	#done
-}
-
-src_install() {
-	# Disable parallel install
-	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=578018
-	emake -j1 DESTDIR="${D}" install
-	einstalldocs
-	# default
-
-	# Installed by sane-backends
-	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
-	rm -f "${ED}"/etc/sane.d/dll.conf || die
-
-	# Remove desktop and autostart files
-	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=638770
-	use qt5 || {
-		rm -Rf "${ED}"/usr/share/applications "${ED}"/etc/xdg
-	}
-
-	rm -f "${ED}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
-	rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/doc/${PF}/ || die
-
-	# Remove hal fdi files
-	rm -rf "${ED}"/usr/share/hal || die
-
-	find "${D}" -name '*.la' -delete || die
-
-	python_optimize "${ED}"/usr/share/hplip
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/net-print/hplip/hplip-3.22.2.ebuild b/net-print/hplip/hplip-3.22.2.ebuild
index eb73f61d2d52..6bbc21cf9e0e 100644
--- a/net-print/hplip/hplip-3.22.2.ebuild
+++ b/net-print/hplip/hplip-3.22.2.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 
 IUSE="doc fax +hpcups hpijs kde libnotify libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"