gentoo resync : 20.03.2022

17 files changed, 52 insertions, 69 deletions

diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 1b5844c0b9c6..761e97a31e35 100644
--- a/metadata/md5-cache/net-print/Manifest.gz
+++ b/metadata/md5-cache/net-print/Manifest.gz
diff --git a/metadata/md5-cache/net-print/brlaser-6 b/metadata/md5-cache/net-print/brlaser-6
index 3d6bfb8e52aa..ff540a8f4528 100644
--- a/metadata/md5-cache/net-print/brlaser-6
+++ b/metadata/md5-cache/net-print/brlaser-6
@@ -9,5 +9,5 @@ LICENSE=GPL-2
 RDEPEND=net-print/cups app-text/ghostscript-gpl
 SLOT=0
 SRC_URI=https://github.com/pdewacht/brlaser/archive/v6.tar.gz -> brlaser-6.tar.gz
-_eclasses_=cmake	11fee991ab428a3370e5c20fa8231fb6	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
+_eclasses_=cmake	9f12546ab831b81c615d90e6b9e34e68	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	ninja-utils	a4dab848a4490e8e48cf0baab3e61bc2	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
 _md5_=f5fdb80d87bc1077d6fe0edc79f14b25
diff --git a/metadata/md5-cache/net-print/cups-2.3.3-r4 b/metadata/md5-cache/net-print/cups-2.3.3-r4
index b897df4c852a..a10528660f4f 100644
--- a/metadata/md5-cache/net-print/cups-2.3.3-r4
+++ b/metadata/md5-cache/net-print/cups-2.3.3-r4
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/apple/cups/releases/download/v2.3.3/cups-2.3.3-source.tar.gz
 _eclasses_=autotools	6cc26735fa9dd59e8c62880beda05b6e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	2f039741fe92bcea55c78806d16ac0f5	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	75c3a5814f2cb851f641711bfcc100c0	multilib-minimal	4b0f1857965db8869a729948d5277e0b	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=32c7cc534fd856186b53e979527e2b54
+_md5_=6e536390720aa4aa690fdfbfaf9dbd5b
diff --git a/metadata/md5-cache/net-print/cups-2.3.3_p2-r2 b/metadata/md5-cache/net-print/cups-2.3.3_p2-r2
index 9b5b85bdfe4d..0cca72bc21a6 100644
--- a/metadata/md5-cache/net-print/cups-2.3.3_p2-r2
+++ b/metadata/md5-cache/net-print/cups-2.3.3_p2-r2
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/OpenPrinting/cups/releases/download/v2.3.3op2/cups-2.3.3op2-source.tar.gz
 _eclasses_=autotools	6cc26735fa9dd59e8c62880beda05b6e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	2f039741fe92bcea55c78806d16ac0f5	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	75c3a5814f2cb851f641711bfcc100c0	multilib-minimal	4b0f1857965db8869a729948d5277e0b	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=534fe9a928c95e9035e28fff5acfc799
+_md5_=5b600b800278b787b2bbb2f2fec90a0b
diff --git a/metadata/md5-cache/net-print/cups-2.3.3_p2-r3 b/metadata/md5-cache/net-print/cups-2.3.3_p2-r3
index 58899cd8a73f..3c1e70cb353e 100644
--- a/metadata/md5-cache/net-print/cups-2.3.3_p2-r3
+++ b/metadata/md5-cache/net-print/cups-2.3.3_p2-r3
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/OpenPrinting/cups/releases/download/v2.3.3op2/cups-2.3.3op2-source.tar.gz
 _eclasses_=autotools	6cc26735fa9dd59e8c62880beda05b6e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	2f039741fe92bcea55c78806d16ac0f5	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	75c3a5814f2cb851f641711bfcc100c0	multilib-minimal	4b0f1857965db8869a729948d5277e0b	optfeature	30ce9dec2b8943338c9b015bd32bac6a	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=71567fa1abcdb43de38f1e613e030367
+_md5_=b5ded893cd2108c5aecd88b7d458c13e
diff --git a/metadata/md5-cache/net-print/cups-9999 b/metadata/md5-cache/net-print/cups-9999
index 2862de977319..1a77ee7e2fec 100644
--- a/metadata/md5-cache/net-print/cups-9999
+++ b/metadata/md5-cache/net-print/cups-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=usb? ( threads )
 RESTRICT=test
 SLOT=0
 _eclasses_=autotools	6cc26735fa9dd59e8c62880beda05b6e	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	dab5d8ec471d025b79c9e6906bcf3bff	flag-o-matic	a500d7cc40da3de38c361e889153bdf7	git-r3	cc875b0c1e9b3bdac1af0f82f3ba29da	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	2f039741fe92bcea55c78806d16ac0f5	multibuild	d79bd5b4bc4edcb1f5bc19591f8d4714	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multilib-build	75c3a5814f2cb851f641711bfcc100c0	multilib-minimal	4b0f1857965db8869a729948d5277e0b	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	wrapper	4251d4c84c25f59094fd557e0063a974	xdg	6024fbc93167fad782e2032933654857	xdg-utils	4f29a8b760a594a212abe9c2ba957c31
-_md5_=8099e1e33c38d83dd33613ad2c1a7e2a
+_md5_=ee1cccded822c2e98f90fa5f312bc675
diff --git a/metadata/md5-cache/net-print/cups-filters-1.28.12 b/metadata/md5-cache/net-print/cups-filters-1.28.12
new file mode 100644
index 000000000000..3ab8ea1dbc37
--- /dev/null
+++ b/metadata/md5-cache/net-print/cups-filters-1.28.12
@@ -0,0 +1,15 @@
+BDEPEND=dev-util/gdbus-codegen >=sys-devel/gettext-0.18.3 virtual/pkgconfig test? ( media-fonts/dejavu ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=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] )
+DESCRIPTION=Cups filters
+EAPI=8
+HOMEPAGE=https://wiki.linuxfoundation.org/openprinting/cups-filters
+IUSE=dbus +foomatic jpeg ldap pclm pdf perl png +postscript test tiff zeroconf
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT GPL-2
+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] )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=http://www.openprinting.org/download/cups-filters/cups-filters-1.28.12.tar.xz
+_eclasses_=flag-o-matic	a500d7cc40da3de38c361e889153bdf7	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	perl-functions	fea344a91ebf37efadf172c6a3de5a72	perl-module	bd9574a79c5f0a347a9ea3db5ad9ca72	readme.gentoo-r1	eebd0164fe61f4f7b64a683e83fdceb1	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
+_md5_=19b6fd7eeb6878b52476b88acccb22e7
diff --git a/metadata/md5-cache/net-print/gutenprint-5.3.3-r1 b/metadata/md5-cache/net-print/gutenprint-5.3.3-r1
deleted file mode 100644
index e1b100c0441d..000000000000
--- a/metadata/md5-cache/net-print/gutenprint-5.3.3-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst
-DEPEND=dev-lang/perl readline? ( sys-libs/readline:0= ) cups? ( >=net-print/cups-1.1.14 ) gimp? ( media-gfx/gimp:0/2 x11-libs/gtk+:2 ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl )
-DESCRIPTION=Ghostscript and cups printer drivers
-EAPI=7
-HOMEPAGE=http://gutenprint.sourceforge.net
-IUSE=cups gimp gtk nls readline ppds static-libs
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl readline? ( sys-libs/readline:0= ) cups? ( >=net-print/cups-1.1.14 ) gimp? ( media-gfx/gimp:0/2 x11-libs/gtk+:2 ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl )
-REQUIRED_USE=gimp? ( gtk )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/gimp-print/gutenprint-5.3.3.tar.xz
-_eclasses_=autotools	6cc26735fa9dd59e8c62880beda05b6e	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=43bdd8f326bdefe706ea820c2244227c
diff --git a/metadata/md5-cache/net-print/gutenprint-5.3.3-r3 b/metadata/md5-cache/net-print/gutenprint-5.3.3-r3
deleted file mode 100644
index 86cbc3feedaf..000000000000
--- a/metadata/md5-cache/net-print/gutenprint-5.3.3-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=dev-lang/perl readline? ( sys-libs/readline:0= ) cups? ( >=net-print/cups-1.1.14 ) gimp? ( media-gfx/gimp:0/2 x11-libs/gtk+:2 ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl )
-DESCRIPTION=Ghostscript and cups printer drivers
-EAPI=7
-HOMEPAGE=http://gutenprint.sourceforge.net
-IUSE=cups gimp gtk nls readline ppds static-libs
-KEYWORDS=~alpha amd64 arm ~hppa ~ia64 ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=dev-lang/perl readline? ( sys-libs/readline:0= ) cups? ( >=net-print/cups-1.1.14 ) gimp? ( media-gfx/gimp:0/2 x11-libs/gtk+:2 ) gtk? ( x11-libs/gtk+:2 ) nls? ( virtual/libintl )
-REQUIRED_USE=gimp? ( gtk )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/gimp-print/gutenprint-5.3.3.tar.xz
-_eclasses_=autotools	6cc26735fa9dd59e8c62880beda05b6e	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8
-_md5_=d7787f336656c71e4b32696f0a8e07ee
diff --git a/metadata/md5-cache/net-print/hplip-3.20.11-r2 b/metadata/md5-cache/net-print/hplip-3.20.11-r2
index f6a79c998e12..7f24feb7f287 100644
--- a/metadata/md5-cache/net-print/hplip-3.20.11-r2
+++ b/metadata/md5-cache/net-print/hplip-3.20.11-r2
@@ -11,5 +11,5 @@ RDEPEND=net-print/cups sys-apps/dbus virtual/jpeg:0 hpijs? ( net-print/cups-filt
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=mirror://sourceforge/hplip/hplip-3.20.11.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.20.11-patches-2.tar.xz
-_eclasses_=autotools	6cc26735fa9dd59e8c62880beda05b6e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	2f039741fe92bcea55c78806d16ac0f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	003123b4d7119cfd295a7566b1830904	python-utils-r1	7ee47726753a2bd062a05f6643d849da	readme.gentoo-r1	eebd0164fe61f4f7b64a683e83fdceb1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=autotools	6cc26735fa9dd59e8c62880beda05b6e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	2f039741fe92bcea55c78806d16ac0f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	3c5721adc30f98c39739c5970a4762d8	python-utils-r1	d3d7da5aff94a677154819e0cb95ee36	readme.gentoo-r1	eebd0164fe61f4f7b64a683e83fdceb1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
 _md5_=fbeda7744a5094b1b940d8b84d0f4708
diff --git a/metadata/md5-cache/net-print/hplip-3.21.10 b/metadata/md5-cache/net-print/hplip-3.21.10
deleted file mode 100644
index 8e237abd22e3..000000000000
--- a/metadata/md5-cache/net-print/hplip-3.21.10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare setup
-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_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+),xml] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+),xml] ) !minimal? ( scanner? ( media-gfx/sane-backends ) snmp? ( dev-libs/openssl:0= net-analyzer/net-snmp:= net-dns/avahi[dbus,python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) )
-DESCRIPTION=HP Linux Imaging and Printing - Print, scan, fax drivers and service tools
-EAPI=7
-HOMEPAGE=https://developers.hp.com/hp-linux-imaging-and-printing
-IUSE=doc fax +hpcups hpijs kde libnotify libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X python_single_target_python3_8 python_single_target_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=net-print/cups sys-apps/dbus virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+),xml] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+),xml] ) !minimal? ( scanner? ( media-gfx/sane-backends ) snmp? ( dev-libs/openssl:0= net-analyzer/net-snmp:= net-dns/avahi[dbus,python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?] ) ) app-text/ghostscript-gpl !minimal? ( python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) kernel_linux? ( virtual/udev ) python_single_target_python3_8? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_8(-)] dev-python/distro[python_targets_python3_8(-)] fax? ( dev-python/reportlab[python_targets_python3_8(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_8(-)] libnotify? ( dev-python/notify2[python_targets_python3_8(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_8(-)] >=dev-python/pillow-3.1.1[python_targets_python3_8(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) python_single_target_python3_9? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_9(-)] dev-python/distro[python_targets_python3_9(-)] fax? ( dev-python/reportlab[python_targets_python3_9(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_9(-)] libnotify? ( dev-python/notify2[python_targets_python3_9(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_9(-)] >=dev-python/pillow-3.1.1[python_targets_python3_9(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) ) policykit? ( sys-auth/polkit )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
-SLOT=0
-SRC_URI=mirror://sourceforge/hplip/hplip-3.21.10.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.21.10-patches-1.tar.xz
-_eclasses_=autotools	6cc26735fa9dd59e8c62880beda05b6e	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	2f039741fe92bcea55c78806d16ac0f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	003123b4d7119cfd295a7566b1830904	python-utils-r1	7ee47726753a2bd062a05f6643d849da	readme.gentoo-r1	eebd0164fe61f4f7b64a683e83fdceb1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
-_md5_=3f4b9e5978f7a18fd426f092365f37c3
diff --git a/metadata/md5-cache/net-print/hplip-3.21.12 b/metadata/md5-cache/net-print/hplip-3.21.12
index d41462129195..ec2623390888 100644
--- a/metadata/md5-cache/net-print/hplip-3.21.12
+++ b/metadata/md5-cache/net-print/hplip-3.21.12
@@ -11,5 +11,5 @@ RDEPEND=net-print/cups sys-apps/dbus virtual/jpeg:0 hpijs? ( net-print/cups-filt
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=mirror://sourceforge/hplip/hplip-3.21.12.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.21.10-patches-1.tar.xz
-_eclasses_=autotools	6cc26735fa9dd59e8c62880beda05b6e	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	2f039741fe92bcea55c78806d16ac0f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	003123b4d7119cfd295a7566b1830904	python-utils-r1	7ee47726753a2bd062a05f6643d849da	readme.gentoo-r1	eebd0164fe61f4f7b64a683e83fdceb1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
+_eclasses_=autotools	6cc26735fa9dd59e8c62880beda05b6e	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	2f039741fe92bcea55c78806d16ac0f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	3c5721adc30f98c39739c5970a4762d8	python-utils-r1	d3d7da5aff94a677154819e0cb95ee36	readme.gentoo-r1	eebd0164fe61f4f7b64a683e83fdceb1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
 _md5_=b0558445dae787bf1cbd3ad44bf8b04c
diff --git a/metadata/md5-cache/net-print/hplip-3.22.2 b/metadata/md5-cache/net-print/hplip-3.22.2
new file mode 100644
index 000000000000..b093b01542a4
--- /dev/null
+++ b/metadata/md5-cache/net-print/hplip-3.22.2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.4:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare setup
+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_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+),xml] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+),xml] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+),xml] ) !minimal? ( scanner? ( media-gfx/sane-backends ) snmp? ( dev-libs/openssl:0= net-analyzer/net-snmp:= net-dns/avahi[dbus,python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) )
+DESCRIPTION=HP Linux Imaging and Printing - Print, scan, fax drivers and service tools
+EAPI=8
+HOMEPAGE=https://developers.hp.com/hp-linux-imaging-and-printing
+IUSE=doc fax +hpcups hpijs kde libnotify libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+RDEPEND=net-print/cups sys-apps/dbus virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.12_p1-r1:3.8[threads(+),xml] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.9-r1:3.9[threads(+),xml] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.0_p1-r1:3.10[threads(+),xml] ) !minimal? ( scanner? ( media-gfx/sane-backends ) snmp? ( dev-libs/openssl:0= net-analyzer/net-snmp:= net-dns/avahi[dbus,python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ) app-text/ghostscript-gpl !minimal? ( python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) kernel_linux? ( virtual/udev ) python_single_target_python3_8? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_8(-)] dev-python/distro[python_targets_python3_8(-)] fax? ( dev-python/reportlab[python_targets_python3_8(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_8(-)] libnotify? ( dev-python/notify2[python_targets_python3_8(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_8(-)] >=dev-python/pillow-3.1.1[python_targets_python3_8(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) python_single_target_python3_9? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_9(-)] dev-python/distro[python_targets_python3_9(-)] fax? ( dev-python/reportlab[python_targets_python3_9(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_9(-)] libnotify? ( dev-python/notify2[python_targets_python3_9(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_9(-)] >=dev-python/pillow-3.1.1[python_targets_python3_9(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) python_single_target_python3_10? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_10(-)] dev-python/distro[python_targets_python3_10(-)] fax? ( dev-python/reportlab[python_targets_python3_10(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_10(-)] libnotify? ( dev-python/notify2[python_targets_python3_10(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_10(-)] >=dev-python/pillow-3.1.1[python_targets_python3_10(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) ) policykit? ( sys-auth/polkit )
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+SLOT=0
+SRC_URI=mirror://sourceforge/hplip/hplip-3.22.2.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.22.2-patches-1.tar.xz
+_eclasses_=autotools	6cc26735fa9dd59e8c62880beda05b6e	gnuconfig	262062cef0ba4f22b397193da514a350	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	2f039741fe92bcea55c78806d16ac0f5	multilib	de4beb52bfa93c4c5d96792a6b5e1784	multiprocessing	61c959fc55c15c00bbb1079d6a71370b	python-single-r1	3c5721adc30f98c39739c5970a4762d8	python-utils-r1	d3d7da5aff94a677154819e0cb95ee36	readme.gentoo-r1	eebd0164fe61f4f7b64a683e83fdceb1	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	udev	2d229ad4bfa09058e0184b1ca900db32
+_md5_=57a4c23729c3d8b88412e8a6523981bf
diff --git a/metadata/md5-cache/net-print/hplip-plugin-3.20.11 b/metadata/md5-cache/net-print/hplip-plugin-3.20.11
index e1058e533f0e..20394fc4b543 100644
--- a/metadata/md5-cache/net-print/hplip-plugin-3.20.11
+++ b/metadata/md5-cache/net-print/hplip-plugin-3.20.11
@@ -9,5 +9,5 @@ RDEPEND=~net-print/hplip-3.20.11 virtual/udev orblite? ( media-gfx/sane-backends
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://developers.hp.com/sites/default/files/hplip-3.20.11-plugin.run
-_eclasses_=multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	03b2fab39d555f46843c92f44a40a721
+_eclasses_=multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	2e16b7d5aafeda049669c53c05ce03c9
 _md5_=41fd29dd363e98f7ada70cce96ab4d40
diff --git a/metadata/md5-cache/net-print/hplip-plugin-3.21.10 b/metadata/md5-cache/net-print/hplip-plugin-3.21.10
deleted file mode 100644
index f196c39f7a80..000000000000
--- a/metadata/md5-cache/net-print/hplip-plugin-3.21.10
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install unpack
-DESCRIPTION=Proprietary plugins and firmware for HPLIP
-EAPI=8
-HOMEPAGE=https://developers.hp.com/hp-linux-imaging-and-printing/plugins
-IUSE=orblite
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=hplip-plugin
-RDEPEND=~net-print/hplip-3.21.10 virtual/udev orblite? ( media-gfx/sane-backends >=sys-libs/glibc-2.26 virtual/libusb:0 )
-RESTRICT=mirror
-SLOT=0
-SRC_URI=https://developers.hp.com/sites/default/files/hplip-3.21.10-plugin.run
-_eclasses_=multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	03b2fab39d555f46843c92f44a40a721
-_md5_=1e8a2296c93e169f4a96f5d2fde62bea
diff --git a/metadata/md5-cache/net-print/hplip-plugin-3.21.12 b/metadata/md5-cache/net-print/hplip-plugin-3.21.12
index eb240d75542b..7f6e9deea20e 100644
--- a/metadata/md5-cache/net-print/hplip-plugin-3.21.12
+++ b/metadata/md5-cache/net-print/hplip-plugin-3.21.12
@@ -9,5 +9,5 @@ RDEPEND=~net-print/hplip-3.21.12 virtual/udev orblite? ( media-gfx/sane-backends
 RESTRICT=mirror
 SLOT=0
 SRC_URI=https://developers.hp.com/sites/default/files/hplip-3.21.12-plugin.run
-_eclasses_=multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	03b2fab39d555f46843c92f44a40a721
+_eclasses_=multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	2e16b7d5aafeda049669c53c05ce03c9
 _md5_=0474a188c7f683c8d5b7b341da7f211e
diff --git a/metadata/md5-cache/net-print/hplip-plugin-3.22.2 b/metadata/md5-cache/net-print/hplip-plugin-3.22.2
new file mode 100644
index 000000000000..d73baca08c99
--- /dev/null
+++ b/metadata/md5-cache/net-print/hplip-plugin-3.22.2
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install unpack
+DESCRIPTION=Proprietary plugins and firmware for HPLIP
+EAPI=8
+HOMEPAGE=https://developers.hp.com/hp-linux-imaging-and-printing/plugins
+IUSE=orblite
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=hplip-plugin
+RDEPEND=~net-print/hplip-3.22.2 virtual/udev orblite? ( media-gfx/sane-backends >=sys-libs/glibc-2.26 virtual/libusb:0 )
+RESTRICT=mirror
+SLOT=0
+SRC_URI=https://developers.hp.com/sites/default/files/hplip-3.22.2-plugin.run
+_eclasses_=multilib	de4beb52bfa93c4c5d96792a6b5e1784	toolchain-funcs	badd6e329e1f3e6bee99b35bf8763ce8	unpacker	2e16b7d5aafeda049669c53c05ce03c9
+_md5_=0474a188c7f683c8d5b7b341da7f211e