gentoo resync : 06.04.2022

4 files changed, 7 insertions, 158 deletions

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"  ;;