gentoo resync : 02.02.2022

12 files changed, 21 insertions, 415 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index f7d0307f6d65..32412a2633e2 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cups-pk-helper/Manifest b/net-print/cups-pk-helper/Manifest
index 5a1e01c8c127..1feecae919da 100644
--- a/net-print/cups-pk-helper/Manifest
+++ b/net-print/cups-pk-helper/Manifest
@@ -1,3 +1,3 @@
 DIST cups-pk-helper-0.2.6.tar.xz 162368 BLAKE2B 3dec9a32f577c35a426ec4bbf2f96b2e18e0cd7bbb8a43fd93a6104d8fbb01de15cc7a168ae67fe5f2dca34823c70ac5f61acc01d876130d6ae9f5b789491d23 SHA512 33f1b6f58f4772148bd1cfb8163dacaffd3cc62f2d03731710c98b765ebb8b87541cb9cf43e886880134c32db91a43c7142b1556a0abdf1449068031b0d5fbd3
-EBUILD cups-pk-helper-0.2.6.ebuild 1011 BLAKE2B ef0914d04471c9b8785b85fe7c766cd69ae9bb864bcb8fb45f24261545e81e82724496a06190505a396e0525891ba8c196c9e3b65b4009637190995a856c0a22 SHA512 54bcf9263dc35227f687f9eabd0904a257e346a3a3c43f3ae9b3797bfb2228e569f5bdc790c8d81bee00b49a61a2105bc8584a770889873db7cdd5d8e55b89c2
+EBUILD cups-pk-helper-0.2.6-r1.ebuild 956 BLAKE2B 6d401a3e830a6795dd5c5f2969fa6d7ff814cca931d8f19e0c22115e3c2125f7c8b9a337ee8ad85442443ddaf49ba8c584de239b595050ed8ff342e2a0f00271 SHA512 05fc7309a054c034b5d18f1906f1d679e5eb5b2681f20f522ee1857ca7a4a5db7cfcd3ec5aa8a030320d41ffd3dd9ebfbb10a09284a8ec78c8632e230ed49518
 MISC metadata.xml 254 BLAKE2B de7a97001e5947704f42973c8a0c3a23c2d80afb976254f5fd21e9d372a946e055d4cdc3c0eaed010505f87929b56e8b1e650c945e2a302644adbc9440833be8 SHA512 c81da4f9b80e5691a167f4590906952e25356604ec17689c005be14efb394c0634776bbe84df936edde239480bdf46db41216b00da4a3a45f670e9ca18ab0132
diff --git a/net-print/cups-pk-helper/cups-pk-helper-0.2.6.ebuild b/net-print/cups-pk-helper/cups-pk-helper-0.2.6-r1.ebuild
index ed7774e538cc..39719a8af2cb 100644
--- a/net-print/cups-pk-helper/cups-pk-helper-0.2.6.ebuild
+++ b/net-print/cups-pk-helper/cups-pk-helper-0.2.6-r1.ebuild
@@ -1,8 +1,7 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-GCONF_DEBUG="no"
+EAPI=8
 
 inherit gnome2
 
@@ -13,28 +12,27 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/releases/${P}.tar.xz"
 LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ppc ppc64 ~riscv ~sparc x86"
-IUSE=""
 
 # Require {glib,gdbus-codegen}-2.30.0 due to GDBus changes between 2.29.92
 # and 2.30.0
-COMMON_DEPEND="
+DEPEND="
 	>=dev-libs/glib-2.30.0:2
 	net-print/cups
 	>=sys-auth/polkit-0.97
 "
-RDEPEND="${COMMON_DEPEND}
+RDEPEND="${DEPEND}
 	sys-apps/dbus
 "
-DEPEND="${COMMON_DEPEND}
+BDEPEND="
 	>=dev-util/gdbus-codegen-2.30.0
 	>=dev-util/intltool-0.40.6
 	virtual/pkgconfig
 	sys-devel/gettext
 "
 
-src_prepare() {
-	DOCS="AUTHORS HACKING NEWS README"
+DOCS=( AUTHORS HACKING NEWS README )
 
+src_prepare() {
 	# Regenerate dbus-codegen files to fix build with glib-2.30.x; bug #410773
 	rm -v src/cph-iface-mechanism.{c,h} || die
 
diff --git a/net-print/hplip-plugin/Manifest b/net-print/hplip-plugin/Manifest
index b07740724cdf..7430325702c5 100644
--- a/net-print/hplip-plugin/Manifest
+++ b/net-print/hplip-plugin/Manifest
@@ -1,9 +1,7 @@
 DIST hplip-3.20.11-plugin.run 11514293 BLAKE2B b3b7698a45e5e68a25ec1216e736484d26546b657f4a519a153acf0280847667e7ca81afc988f722668746281857d51d9e1703857514ffe5b57dea85f2bae4d3 SHA512 9075c1ac8e8f6e12d33b81b633025259f54352ea00271eec07ee898fd9a164445519608fc9ea61a7157845a4a03f87c28f486c7994f0d7db81d11d3fe51f1876
 DIST hplip-3.21.10-plugin.run 11514107 BLAKE2B a5e0d9d76e4575e8b99cf32749590d1b5209bfd9b33827f3d6f918a4574fb7452c68c816933fe6142b9acd8e336fd57a5a4ef6cf126e767ce37a05872db666ef SHA512 ee5c36b42e3f8e59607bf4e5a2b0e2b594f19aa7302125fff5dd5fdf392cc7cd142d6c44cbd35a53e1f160ee8293a25419caec2de7e09ecc926551723c793b67
-DIST hplip-3.21.6-plugin.run 11514013 BLAKE2B 3ce0aea3642579838fc683a26a2ef16ce3477b3b664487764895504d1f488fa1246ece0ee19889403e6f22f18ebbe16a7ccd689ae6bbc48197179365dbeb672d SHA512 aa5620687a4b3ac1ff4c8278ac8d51bb38cedf6ea79782bd7c11e71beb0fe75672761874f271ff33e73a394f2a3aa04e1976455688b0f850b57ad7bc1eea3af8
-DIST hplip-3.21.8-plugin.run 11513942 BLAKE2B cbc5614b28a2032ade7fe9906ba5e93c773129121c5b6be950d8d04fd3edeaa97224cee6db4db72fbee6312151d4340b54c04753d03fea36a1772c961a3a0eba SHA512 5042e210d9c084e73a971d605a2eee5e96f2309101859fca09efbd09d60b6ae4959e54cdb334589f36a7aea16fb9eb23eb02bf2b330fab2e4c5a710cb0ec55e1
+DIST hplip-3.21.12-plugin.run 11487224 BLAKE2B 601f70d6d75bc0172b6de647af43afa0ec047eb8b0a9a37611f2496d43daf1d4de4b705d6e58cb209910d7341811dc365d7aeb60d738f5e8ede71337bf36b58e SHA512 5bf6c0d7fb10f9108baac5d9c0c62f080b15cb227ae39c6647111d6dd39a3f97ab1044bccce781f224b5886842da5bd5063d3ce05db374a43e57a7152c52683b
 EBUILD hplip-plugin-3.20.11.ebuild 1447 BLAKE2B 4833b0498319b3d1aa1bfcda87335d708efde09be0831cfc07bd9e0dc08bcfe5f3a98aad6f0828ca461dfaf271e920d8a0e33ce6abd33e6ecd72a8b561166e3c SHA512 cd1989698ea448e5e1b630d93bb164c856fa055783a3f00b7bac5a33b0c6597d3261260c8d267f7a43c15b0b89893c7245ba078014851be5345380615dcdda53
 EBUILD hplip-plugin-3.21.10.ebuild 1489 BLAKE2B b9440a6e78da881a43be79763896252775eba6f1847779f278009ab41bb2e856529d7edb76dfc3fefd707759e77ca8d00522ec8de122a1012ffc98f80f42ca58 SHA512 d48c4d3ac5a38c367bac5bddf6a0758ee63412db310c70001c7d70abcba825fa232fc2559088b46999be962fc8daf29e95784f245ba766d3203a08edb1af9cc5
-EBUILD hplip-plugin-3.21.6.ebuild 1482 BLAKE2B 8c66152fa1c69e7de4262d46420427333cafd100287bd26a990fccb04c7044f8a12a289b0ebdc1a52c90ba155b70d5abaec239718366f9e5ca40673c04966d94 SHA512 75669d62756cba3607135ef952b4f2d00a7437db61de5e3d47553a8b4e744843a052e495d73cab02fca84cd7fcf0ec55549b525b56b18d701a54de8b1ebc63bb
-EBUILD hplip-plugin-3.21.8.ebuild 1482 BLAKE2B 8e0c160738053c605c2473891f4f146c18e630aa1789d009cf21daf6246e59f14d1d537294ae073878be753759ce1d6293ecf1ef604cae12e2899de3475e3d21 SHA512 ffd6cf68e9afc89cf45c616ac3f9d2ada6118e89f4bd172d08e896e9baec3d23a28cc6bffde9f000fabc18e89565c73159131a953e9480b864a60cf4103baf63
+EBUILD hplip-plugin-3.21.12.ebuild 1489 BLAKE2B 40383e62159c76e7918a2e4191e42d17e9be3c3aed959bc3a1579535cfe0dfdd8e44079a87a981f55271307b3eb41fa0ba045a2afcb1af69479bd884d2e86ff7 SHA512 3818d230057726b0b8e00f66052097601cff766cd5687e93892f1958b947552564646d1bcdbb44f4e1798126423bb938c17b826ee6e4e86b38d21b28ac2a2036
 MISC metadata.xml 523 BLAKE2B 396a3e3f19f1929ac628fd3301f7de077e34d80b88f0f65dd4035a55b8ff16be6a89dc94b47085dafc7a8a2def19353aa52996a12e51e94154a61ba1329f8c91 SHA512 9d5abebbd6fdac76142c70aa911c4ac55eb5388fd39e010d72e8e6253f51a7924eda2a675cd8ce3475fea76b307805644cf8f7140b265e66b4fcd65a8546fd96
diff --git a/net-print/hplip-plugin/hplip-plugin-3.21.8.ebuild b/net-print/hplip-plugin/hplip-plugin-3.21.12.ebuild
index 66a474795496..354cee23d950 100644
--- a/net-print/hplip-plugin/hplip-plugin-3.21.8.ebuild
+++ b/net-print/hplip-plugin/hplip-plugin-3.21.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -10,7 +10,7 @@ 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"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
 IUSE="orblite"
 
 RDEPEND="
diff --git a/net-print/hplip-plugin/hplip-plugin-3.21.6.ebuild b/net-print/hplip-plugin/hplip-plugin-3.21.6.ebuild
deleted file mode 100644
index 3d990cae58c0..000000000000
--- a/net-print/hplip-plugin/hplip-plugin-3.21.6.ebuild
+++ /dev/null
@@ -1,73 +0,0 @@
-# Copyright 1999-2021 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"  ;;
-		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/Manifest b/net-print/hplip/Manifest
index d50f36448744..22e196b0e4a5 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -2,11 +2,8 @@ DIST hplip-3.20.11-patches-2.tar.xz 18140 BLAKE2B a0271d0c6fcfaa53c68ab00c4c6cfc
 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.10.tar.gz 27309040 BLAKE2B 542304f4dd5f07b683982ad1218ed47dd06227511025eef6e285e9a3073a3472f7a9eaa5666ade59cc681cb3f4c4a7e1f4eb4d94a8518c322bc0a6c81b0eff94 SHA512 e9b49b7bfc3fa38ea83b357af01cfbc59bf238ad7add49c8e4cb281fbc87facfe6fed9e8428bb926f75fb22ff8e980d620ac102694ae0c8271ce0c4f1ab8b7ed
-DIST hplip-3.21.4-patches-1.tar.xz 17812 BLAKE2B d38584eb04e5e8d886cd4c8ecd05c31f3a32db185c87eed8a6593f3f2d1368a284bbef36f9d78b2689862165cd132597a3d616aaf5411e875f97de45c57e197e SHA512 fd7438353af8b05e100b5ef16fedcc6bf9257d49fe7d5a12a1a2b3b26965c2ebcd613788e7f585f7c0bd3a97e83381e36f3915eabd16a1e8c4ac50c1129804e8
-DIST hplip-3.21.6.tar.gz 27026295 BLAKE2B 12588ee31bfad45842bd09f8aa0e653bbdb3c80358150b15d391bb55077e52870a5fb047ae0d4c98d687409b5d244da4ee08ce56a7946ef67088de1493a0455b SHA512 08d0a93089669aa04b158aac8aa339da0278824ff2d9ecfcd967ed21ae5c4a1092910e103696e01dd230b8367471528687a4d4623759a561962116758a0b093c
-DIST hplip-3.21.8.tar.gz 27085456 BLAKE2B a3d5dc664c9e87a0a02a4bd5854c6e207a2d661aef70e3ac1cff023bacdd56a004d90caa9897eb9887a16362f73b93b30d8f52e592813e2239448fb22d549b9e SHA512 13802359a2a4510243fa81a27c3047f1fc54c25d53597011a2d5a6933121ae5aa1b020790d7d1a8a0970d5cef18e7e57b60afcbbe079dcf6219e2e64ed6675d4
+DIST hplip-3.21.12.tar.gz 27314194 BLAKE2B 8ab204f9f655d5792aaeb729b416a994c7661a540602f755c58887d2b5694e85fab3fc9c800620de128979b43724d16603447e875c40e2530bb5566599535311 SHA512 b101a6958dbfa2b717b85bf38b05d682b9fe68ed3d08e2f6039485ac428867de66381e869c1d4ab2bd22e13a751704ca19915dd90661561c8dd68883a72ace2d
 EBUILD hplip-3.20.11-r2.ebuild 8231 BLAKE2B 3e060f6b134cfb101500db89a889c092f3eecd8803d8d475212d0c91fb7be52759dac472cfe82dd59eff85f4d579b48d7c03d68fb5ded3f90495334294578dde SHA512 a0fe5d63efd08036fcb45b23dc943b529b07d214f3b8bde4b4c91e34d28ae33f8032cb314108922f74955d6e0a4ed88a29c7d6672e18cd90aef6bce03750d13d
 EBUILD hplip-3.21.10.ebuild 8197 BLAKE2B 422b38df83b6d7484fe52c91f7c36e39b554e16d45c78f99d120676fa3dac7e16a08bc17701e34ce5664fb1b1d0490c886bb0bb59edf5437375f3620f957c22b SHA512 0e6a2c250048a400b677596a2d9168d4dfcd8caa2aaa003a8a2455fde57e6eed6ebfdf2cdfc8e73ed889444bf1b4a3b24b02060f90790db7bcbc18f018896942
-EBUILD hplip-3.21.6.ebuild 8271 BLAKE2B 827899a109fb800b38206152ab83c49a3b0ad0838f66107295e36f5d701ef8be68bd9d14f037c02fb8f6fbc26e796d09b7687dceb89bead68d7958e905b0cff9 SHA512 4efa223ea600ecade69fe7d33ad376e071e6e476073f63bdc41946ce51fbe8b69e074d8f3b4eba4356bb9ef860c1d5ae5c73f51fac868459b470fbb321ce3dd1
-EBUILD hplip-3.21.8.ebuild 8271 BLAKE2B 827899a109fb800b38206152ab83c49a3b0ad0838f66107295e36f5d701ef8be68bd9d14f037c02fb8f6fbc26e796d09b7687dceb89bead68d7958e905b0cff9 SHA512 4efa223ea600ecade69fe7d33ad376e071e6e476073f63bdc41946ce51fbe8b69e074d8f3b4eba4356bb9ef860c1d5ae5c73f51fac868459b470fbb321ce3dd1
+EBUILD hplip-3.21.12.ebuild 8200 BLAKE2B b6d63997766affb57eda1a2cf7cff860f0f021871a9bd063d82a740b88a893a4cfd82ec7da916613c42d0514c8cfec9ab05c5fb8396939ff7a60894ad1129e0b SHA512 e1c26962c7cefaae60efd9c514a9f064bb134c308018d28f7fa6a2d4456ddedcb7e44aac782d9ce3df9b1bb1619432b05b6e6ab1c3464f1345375648738f4d94
 MISC metadata.xml 1911 BLAKE2B ccddda1b977dda5c8bb3c9e9d9d152ca57406a1b530ee92ccccc7a8a4b194b0749426e3012329fb982ce4c445c05d1fa74a3b3e0619b355ca0de429d9727bfc7 SHA512 290530d8260586d9cc07b63b7599c10a6c7b8304ffd72c22e9b9c2f7db9b6a28a72d0f53a8a84c2715cd9fd25228e0b64c005d97267f1d390114b5a46b88e4f1
diff --git a/net-print/hplip/hplip-3.21.8.ebuild b/net-print/hplip/hplip-3.21.12.ebuild
index e3f7c820026e..9473b1dc2ea5 100644
--- a/net-print/hplip/hplip-3.21.8.ebuild
+++ b/net-print/hplip/hplip-3.21.12.ebuild
@@ -1,20 +1,17 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-PYTHON_COMPAT=( python3_{8,9} )
+PYTHON_COMPAT=( python3_{8,9,10} )
 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.21.4-patches-1.tar.xz"
+		https://dev.gentoo.org/~billie/distfiles/${PN}-3.21.10-patches-1.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/net-print/hplip/hplip-3.21.6.ebuild b/net-print/hplip/hplip-3.21.6.ebuild
deleted file mode 100644
index e3f7c820026e..000000000000
--- a/net-print/hplip/hplip-3.21.6.ebuild
+++ /dev/null
@@ -1,288 +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.21.4-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/ink/Manifest b/net-print/ink/Manifest
index 36216d6a1f48..1fc748975386 100644
--- a/net-print/ink/Manifest
+++ b/net-print/ink/Manifest
@@ -1,5 +1,3 @@
-DIST ink-0.5.1.tar.gz 105174 BLAKE2B dc5807ee0f87e8e48e283e86d7d9ea9fe74b407591448eb66d45871185c2439fb97c81ef8c6ab0d10d871f28c49bd0d3a55b981d126314af829420ecacec7bb2 SHA512 12a21279ca4f390c5748b8ab1c62770c82decec1f9bfa3e6c13d7a269a7cb28fb96f92506c532f52fb4e3f1b72012e2c2a08e654a91edb1c73d1f7b778dc5848
 DIST ink-0.5.3.tar.gz 111791 BLAKE2B 15269a5ea267434f529256aeb144950111ffdaf9d9e182b62f5e1b0b3e6340495a2fdf22ffa6578a1960259a5f1a9097f27ca09ea6ecb1fb1f702aa15b7b2b5b SHA512 a05a3647d0fcae652f1b339006d22b7324e42615ed63fed47269dad409d0a6bd7640b9ec9fb6871d7ff0027af2577b64af98cbb8d9e38810e3b26490a5c0a2a1
-EBUILD ink-0.5.1.ebuild 505 BLAKE2B e09a6a1779b8501130d107164de2f9a6f4f0e0da55cc098082d3bcead9752685d3c228b61420c7c9aebbe589898bc11f561fe8e2baea88b5fa9d49f71cd3d8fd SHA512 9c167ff20458772e81b4704a2dd6ed6ddea9229a7baad1f64783de84ce1dc52480f8e8ebcb8bfc32e56c463a0679fc6d9d8522221a41726b41babbab240443b7
-EBUILD ink-0.5.3.ebuild 380 BLAKE2B 9851a56cf1a672141d7ce29ca52a8396f9c3dedb3d0335e0c2cbf434fe0cb7d81a9bca127a74bfd33af85e8272167a20497241562809eff8ba4442ca1c7f2073 SHA512 8cd9ceaf658b944b9bb6746d12d3948b1049dcfbb2327601da87273c7003fc4172b4fb0f532bb0492628221169f93860e8575837737c3b7564f2c2a24abc0218
+EBUILD ink-0.5.3.ebuild 378 BLAKE2B 6303ff16f976ff92296ac38c9a2ce0d5b71ddc599cfb53773d608db30e550e3b3d673ff9ed6b245bf3b2d09aafde5bd8c102be389719246bf0ab40d6b50050d9 SHA512 697adae4bd0161a31bdf928e4285eee9a960a8b2ef1fe330eb9d95f366704f0e20b7b329db559ddd2f2a6f5ae415b0c389dac7793582e6421c8a5de53e369835
 MISC metadata.xml 333 BLAKE2B 52927a7468c64aded68640d17cf20ce194779c23fb379770ff9496c5d4ce6c7d8a1b95ae6bd4d5810b5d02f5b9f4e5200fc99eed70e89c982dfde109a9695e5f SHA512 781d5d910ac309158d603b3872dd6d13142879feac149660e9255274e65b727376625c87463245ef6918a292bf5abf052d85b8b7bc4df25f86722790a06b731b
diff --git a/net-print/ink/ink-0.5.1.ebuild b/net-print/ink/ink-0.5.1.ebuild
deleted file mode 100644
index f0776c35f68c..000000000000
--- a/net-print/ink/ink-0.5.1.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-DESCRIPTION="A command line utility to display the ink level of your printer"
-SRC_URI="mirror://sourceforge/ink/${P/_}.tar.gz"
-HOMEPAGE="http://ink.sourceforge.net/"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND=">net-print/libinklevel-0.8"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	# always use /bin/bash as configure shell, bug #526548
-	CONFIG_SHELL=/bin/bash default
-}
diff --git a/net-print/ink/ink-0.5.3.ebuild b/net-print/ink/ink-0.5.3.ebuild
index 3371caf8ab65..9818121ef750 100644
--- a/net-print/ink/ink-0.5.3.ebuild
+++ b/net-print/ink/ink-0.5.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -9,7 +9,7 @@ HOMEPAGE="http://ink.sourceforge.net/"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="net-print/libinklevel"
 RDEPEND="${DEPEND}"