gentoo resync : 02.02.2022

3 files changed, 4 insertions, 79 deletions

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_
-}