gentoo resync : 20.10.2021

5 files changed, 77 insertions, 2 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 04d72a347fef..42f09e8b1a86 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cups-pdf/Manifest b/net-print/cups-pdf/Manifest
index 47169f578792..e31ee3234284 100644
--- a/net-print/cups-pdf/Manifest
+++ b/net-print/cups-pdf/Manifest
@@ -1,5 +1,5 @@
 AUX cups-pdf-3.0.1-ghostscript-gpl-9.54-compat.patch 2328 BLAKE2B fa03f0a69cbafe03387777645528132721a42d364df3d70bcf6abee1492ac6c4a74c27c30d2c66c395ad5939cbae7895d4470b7faafa59e65c67c158e096fbbf SHA512 679fa1229e34378e809699ae89024bdd624d54b22565cbc23029f01e9a3ba3fde37c0d6b52b9365cd3436a234055a5c1cc80d1c2a5482d4b2649a929ee89b3c7
 DIST cups-pdf_3.0.1.tar.gz 29754 BLAKE2B f964358c5e465447e703848a697f6c801624a1836e2a0a4026c507c66048cf4bef92327508598ec7e9a356d4f57894a6b610e55b7a9a34e942cf2b88c6c55b85 SHA512 a06580f3056dddbb883c8db0c71b37b883482ae1ac8aa9bcfd85e679c4dcb44278006b7110d2988173d0eeb05b0f19fb39081fad49bf26839235e97fbe27a818
 EBUILD cups-pdf-3.0.1-r1.ebuild 899 BLAKE2B 4602a2a84fd40676884649eac0a19efc3b33cc020566902c93d769d9fb310d69bb5e6ff711c2835327c99ebd958dd2f0e7427ed1488c138a1b2f0ec49f8cc5fa SHA512 475cd35f72f173bddfd30abec814d2d3287c00413c7f46a31c53d020761491a5f69321ffc660ec18d0ebe48507ef35b35ce9466f24ba6d104a62fd0830456772
-EBUILD cups-pdf-3.0.1-r2.ebuild 989 BLAKE2B 1716a98afcb5b05204523ff0af9848febb4a39428db655db79617c4c06b076d7d2925f96857df341ea2fa8af17798d4828558de25f40035f7dfda6b354eb6e25 SHA512 745bfcacd1e0d8dcbbe657b5737e8f82fdaf76a692ca5fc145f14d1926175a376428f80a7fdd0ba66f116637e9d80187262d1e390820cb8eb0d23c22f45b521f
+EBUILD cups-pdf-3.0.1-r2.ebuild 988 BLAKE2B f0f278fe196de4f9e0b70e000d27431cdf9bb6cc11bdc7b850d62617654deecbdb005b4b88363ca94b8e59078198d34ccf5042e051ddf760e8987f0e18603b2e SHA512 ed911466a4d73c3ab38d01423202ec624399297cdcba8faff1731335a73fe6a89c4f1e8148bcc83543e0ff3f1bd30d2effa2883fa25528ff52bd74a77cea8899
 MISC metadata.xml 256 BLAKE2B 16ea76357721c3ab7d672ade29d27338ddf9da983571e4ca4efe2520c741fc71315d9609b711850b00c19ed4eea848dea0d5b3955eecb401c42c4db257c300bf SHA512 2748afab7ffea0b3ddadf72dc720f7d83a1d76453fa569091abffe834ec187144a47f9365ccb4a97f676dbcfd799a6be92671f283b179fe4589d95486d7fd24d
diff --git a/net-print/cups-pdf/cups-pdf-3.0.1-r2.ebuild b/net-print/cups-pdf/cups-pdf-3.0.1-r2.ebuild
index eb1bfa417558..d95f554289f9 100644
--- a/net-print/cups-pdf/cups-pdf-3.0.1-r2.ebuild
+++ b/net-print/cups-pdf/cups-pdf-3.0.1-r2.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}/${PN}-${PV/_}
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
+KEYWORDS="amd64 ~arm ppc ~ppc64 x86"
 IUSE="+ppds"
 
 DEPEND="net-print/cups"
diff --git a/net-print/hplip-plugin/Manifest b/net-print/hplip-plugin/Manifest
index 82731e260606..cfff9ab751ab 100644
--- a/net-print/hplip-plugin/Manifest
+++ b/net-print/hplip-plugin/Manifest
@@ -1,5 +1,7 @@
 DIST hplip-3.20.11-plugin.run 11514293 BLAKE2B b3b7698a45e5e68a25ec1216e736484d26546b657f4a519a153acf0280847667e7ca81afc988f722668746281857d51d9e1703857514ffe5b57dea85f2bae4d3 SHA512 9075c1ac8e8f6e12d33b81b633025259f54352ea00271eec07ee898fd9a164445519608fc9ea61a7157845a4a03f87c28f486c7994f0d7db81d11d3fe51f1876
 DIST hplip-3.21.6-plugin.run 11514013 BLAKE2B 3ce0aea3642579838fc683a26a2ef16ce3477b3b664487764895504d1f488fa1246ece0ee19889403e6f22f18ebbe16a7ccd689ae6bbc48197179365dbeb672d SHA512 aa5620687a4b3ac1ff4c8278ac8d51bb38cedf6ea79782bd7c11e71beb0fe75672761874f271ff33e73a394f2a3aa04e1976455688b0f850b57ad7bc1eea3af8
+DIST hplip-3.21.8-plugin.run 11513942 BLAKE2B cbc5614b28a2032ade7fe9906ba5e93c773129121c5b6be950d8d04fd3edeaa97224cee6db4db72fbee6312151d4340b54c04753d03fea36a1772c961a3a0eba SHA512 5042e210d9c084e73a971d605a2eee5e96f2309101859fca09efbd09d60b6ae4959e54cdb334589f36a7aea16fb9eb23eb02bf2b330fab2e4c5a710cb0ec55e1
 EBUILD hplip-plugin-3.20.11.ebuild 1447 BLAKE2B 4833b0498319b3d1aa1bfcda87335d708efde09be0831cfc07bd9e0dc08bcfe5f3a98aad6f0828ca461dfaf271e920d8a0e33ce6abd33e6ecd72a8b561166e3c SHA512 cd1989698ea448e5e1b630d93bb164c856fa055783a3f00b7bac5a33b0c6597d3261260c8d267f7a43c15b0b89893c7245ba078014851be5345380615dcdda53
 EBUILD hplip-plugin-3.21.6.ebuild 1482 BLAKE2B 8c66152fa1c69e7de4262d46420427333cafd100287bd26a990fccb04c7044f8a12a289b0ebdc1a52c90ba155b70d5abaec239718366f9e5ca40673c04966d94 SHA512 75669d62756cba3607135ef952b4f2d00a7437db61de5e3d47553a8b4e744843a052e495d73cab02fca84cd7fcf0ec55549b525b56b18d701a54de8b1ebc63bb
+EBUILD hplip-plugin-3.21.8.ebuild 1482 BLAKE2B 8e0c160738053c605c2473891f4f146c18e630aa1789d009cf21daf6246e59f14d1d537294ae073878be753759ce1d6293ecf1ef604cae12e2899de3475e3d21 SHA512 ffd6cf68e9afc89cf45c616ac3f9d2ada6118e89f4bd172d08e896e9baec3d23a28cc6bffde9f000fabc18e89565c73159131a953e9480b864a60cf4103baf63
 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.8.ebuild
new file mode 100644
index 000000000000..66a474795496
--- /dev/null
+++ b/net-print/hplip-plugin/hplip-plugin-3.21.8.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2021 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 ~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_
+}