gentoo resync : 18.08.2019

4 files changed, 17 insertions, 86 deletions

diff --git a/net-print/hplip-plugin/Manifest b/net-print/hplip-plugin/Manifest
index f9bb8557a888..6cae7d0603e4 100644
--- a/net-print/hplip-plugin/Manifest
+++ b/net-print/hplip-plugin/Manifest
@@ -1,7 +1,5 @@
 DIST hplip-3.18.12-plugin.run 10486821 BLAKE2B e48940b1b5fe94dc216383b63bee7807bce9ad265b7c454c201c0ed22ec1964e6c5adf653c3c230789c042cffaaf50bd604bae6f66f407a85f98248934307158 SHA512 82b90aa8245f787e088a1bebfa7892a7f2b97fd04b3702c46eed27306640e562aeec63b4b5b45c24943abe4672f2627d1821bdcdf58a5c1ac4e1d06c7270535f
-DIST hplip-3.18.6-plugin.run 2065663 BLAKE2B 501a37dd504250225ddad9712259e0e1b564aa034e433f24d277c5609fa95580417da1a0ae040a4624ff48806a3b34ec56ff31aed843e9f0f0b68b304d2ebd9e SHA512 7b5eb2f43dd014df25ccd9e72dd7efc069db47921f2de650b2ff993dbee60056063edeee6593be7d35019212daf623fff9696b13508a808db92128f5c81bde76
-DIST hplip-3.19.5-plugin.run 11516444 BLAKE2B c43aaa4dd3c4a8acf91b2746733e5237ef0ff39c3e6180530e0fcd34d5319e603c23806a3b010d70399772abc5564095fe2696c823d80eedf892b87acd170d23 SHA512 8c933f175bf0b91a8f30d6b362f8a487a964dd3304c859d78c9505357088047fdcacb99230f8696071269d5950f681adc0e4051617f1051be254fd6bed704cb9
-EBUILD hplip-plugin-3.18.12.ebuild 1635 BLAKE2B ae1570a85138b53a21ee01c9b6c2eed85b4f22f4040666289d2bf52bdc5df0ef063574e767109fec86d3f24765149774918e9aa39247df5d0b2af56b25dfffcc SHA512 e039e8f25c210638d6098e06e51861b5c35400554fba867abd533f2aa89584abc6c62546bdad04b5fb4ce6dc61bc9d33ef9b7a0ae9d3ed3a7b3b42c45c2888d2
-EBUILD hplip-plugin-3.18.6.ebuild 1551 BLAKE2B d034eacc21cb423a79ccd668d322d40f23aed57392d75aa75b10f3f90f634d96510e5e87c485b04bca566cfdc7bb59056f75a13493e90e92ad4ea13ffe4198f8 SHA512 6ed4f208ec25a1805ed377749d9232ed59f890eaedcdbc1f58fa6c2b41eb77ea52d8dad9f7beec5ad8b156eac22384956faddf458562febf7e20ed1b88bff356
-EBUILD hplip-plugin-3.19.5.ebuild 1635 BLAKE2B 421610d7a88268aced86e4b30a4e6798fcdb07fd1b321b3caf65c1e444d9034b461e606f42fe75879a6f19cddc7b5d6264a02febb24e11d126a073b50c517b9c SHA512 3ec01211d1ce65e56e3b2a904390a7ead68a4fec8681b26ed36d2dae7daf7c78d79fec06684b1fccf675290bfed8214693f429b58c2a395ce682016750337865
+DIST hplip-3.19.6-plugin.run 11517158 BLAKE2B c44707e29b104b45c110729c70ebeba1f392ad753eb98d8677657f735e547cdecfab357b348a30545274b51c18249ddb9102df49aa73d726a8e9145a302a8a0c SHA512 3636d655ba289331572f0762a5de2e0bf2f3108ac3f7ca9cb8bbec126942be954fe9c07c882bd8272e30ac46d67231d86a3c4249a6fe31e2d3e8d5e568bbbd8b
+EBUILD hplip-plugin-3.18.12.ebuild 1635 BLAKE2B 421610d7a88268aced86e4b30a4e6798fcdb07fd1b321b3caf65c1e444d9034b461e606f42fe75879a6f19cddc7b5d6264a02febb24e11d126a073b50c517b9c SHA512 3ec01211d1ce65e56e3b2a904390a7ead68a4fec8681b26ed36d2dae7daf7c78d79fec06684b1fccf675290bfed8214693f429b58c2a395ce682016750337865
+EBUILD hplip-plugin-3.19.6.ebuild 1582 BLAKE2B c154a00fae8a57e1b210714728fac79256f14fc8e850936caa1fd6273199f60087cb8cbaf96ba3d0afaf0109638031f9de010812f585676e6af8cca4e2d6cad6 SHA512 eca251a0e72c19a4bf4809a84de741b9704ee20fb82bf669eaeb4f4e9125ead78b3635002120e96c4fd1fbda2060bc8672a8d81caea048eb240ee7305bea7b51
 MISC metadata.xml 334 BLAKE2B 8f1a0784c57af6204db98f443bdb09df2a6432674d711a5ecf577c20e29f04a030549ea19c6e04f51cd9a36e60a6da94bebafbfcc10d52da87109e59c32d42ee SHA512 105a5442ba05b94b2886f9075bd89268d4f2e0567ad69a637a1bd7d7d0eafdc280dfdb198aab5d72525300a9be0d4ad78f6bfe6398c896cc9de0f591651d102c
diff --git a/net-print/hplip-plugin/hplip-plugin-3.18.12.ebuild b/net-print/hplip-plugin/hplip-plugin-3.18.12.ebuild
index d598946893c6..7714ffa082db 100644
--- a/net-print/hplip-plugin/hplip-plugin-3.18.12.ebuild
+++ b/net-print/hplip-plugin/hplip-plugin-3.18.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
diff --git a/net-print/hplip-plugin/hplip-plugin-3.18.6.ebuild b/net-print/hplip-plugin/hplip-plugin-3.18.6.ebuild
deleted file mode 100644
index afbacbc8fbc3..000000000000
--- a/net-print/hplip-plugin/hplip-plugin-3.18.6.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit udev unpacker
-
-DESCRIPTION="Proprietary plugins and firmware for HPLIP"
-HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing"
-SRC_URI="http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/hplip-${PV}-plugin.run"
-
-LICENSE="hplip-plugin"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="
-	~net-print/hplip-${PV}
-	virtual/udev
-"
-DEPEND=""
-
-S=${WORKDIR}
-
-HPLIP_HOME=/usr/share/hplip
-
-# Binary prebuilt package
-QA_PRESTRIPPED="
-	/usr/share/hplip/fax/plugins/fax_marvell.so
-	/usr/share/hplip/prnt/plugins/hbpl1.so
-	/usr/share/hplip/prnt/plugins/lj.so
-	/usr/share/hplip/scan/plugins/bb_escl.so
-	/usr/share/hplip/scan/plugins/bb_marvell.so
-	/usr/share/hplip/scan/plugins/bb_soapht.so
-	/usr/share/hplip/scan/plugins/bb_soap.so
-"
-
-# License does not allow us to redistribute the "source" package
-RESTRICT="mirror"
-
-src_unpack() {
-	unpack_makeself "hplip-${PV}-plugin.run"
-}
-
-src_install() {
-	local hplip_arch=$(use amd64 && echo 'x86_64' || echo 'x86_32')
-
-	insinto "${HPLIP_HOME}"/data/firmware
-	doins *.fw.gz
-
-	for plugin in *-${hplip_arch}.so; do
-		local plugin_type=prnt
-		case "${plugin}" in
-			fax_*) plugin_type=fax ;;
-			bb_*)  plugin_type=scan ;;
-		esac
-
-		exeinto "${HPLIP_HOME}"/${plugin_type}/plugins
-		newexe ${plugin} ${plugin/-${hplip_arch}}
-	done
-
-	mkdir -p "${ED}/var/lib/hp/"
-	cat >> "${ED}/var/lib/hp/hplip.state" <<-_EOF_
-		[plugin]
-		installed = 1
-		eula = 1
-		version = ${PV}
-	_EOF_
-}
diff --git a/net-print/hplip-plugin/hplip-plugin-3.19.5.ebuild b/net-print/hplip-plugin/hplip-plugin-3.19.6.ebuild
index 7714ffa082db..b497f4a93fa1 100644
--- a/net-print/hplip-plugin/hplip-plugin-3.19.5.ebuild
+++ b/net-print/hplip-plugin/hplip-plugin-3.19.6.ebuild
@@ -1,21 +1,21 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-inherit udev unpacker
+inherit unpacker
 
 DESCRIPTION="Proprietary plugins and firmware for HPLIP"
 HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing/plugins"
-#SRC_URI="http://www.openprinting.org/download/printdriver/auxfiles/HP/plugins/hplip-${PV}-plugin.run"
 SRC_URI="https://developers.hp.com/sites/default/files/hplip-${PV}-plugin.run"
 LICENSE="hplip-plugin"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm ~x86"
 IUSE=""
 
 RDEPEND="
 	~net-print/hplip-${PV}
+	virtual/libusb:0
 	virtual/udev
 "
 DEPEND=""
@@ -38,12 +38,14 @@ QA_PRESTRIPPED="
 # License does not allow us to redistribute the "source" package
 RESTRICT="mirror"
 
-src_unpack() {
-	unpack_makeself "hplip-${PV}-plugin.run"
-}
-
 src_install() {
-	local hplip_arch=$(use amd64 && echo 'x86_64' || echo 'x86_32')
+	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
@@ -59,8 +61,8 @@ src_install() {
 		newexe ${plugin} ${plugin/-${hplip_arch}}
 	done
 
-	mkdir -p "${ED}/var/lib/hp/"
-	cat >> "${ED}/var/lib/hp/hplip.state" <<-_EOF_
+	insinto /var/lib/hp
+	newins - hplip.state <<-_EOF_
 		[plugin]
 		installed = 1
 		eula = 1