gentoo resync : 30.09.2020

2 files changed, 13 insertions, 11 deletions

diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 2bbe158aecfa..68a62a51d19f 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,9 +1,9 @@
 DIST hplip-3.18.12-patches-1.tar.xz 12032 BLAKE2B 33e6e4e1e0e5b4f998459073cf0742b7c56929b23e6c1cc3ba9df4eafb8007273a5a2e7f27af0d2d4a3a97ebb9cfe462b74dcddd7149088980893b2c66113b7c SHA512 3b0e2b4f7d8da257c6fcf12f2e049276d059426f2d1c626324982ce862efa2323cbb191a373c53fea7880e3b6e44ec62e584091676556d97e6a456edea4c44cf
 DIST hplip-3.19.12.tar.gz 25676247 BLAKE2B 1373aa70a2307071c28a22b0ae85e242c3e6bec614ef7490c1ecc0e5e745b81b6c2097948fbd062b5e72e10714cdc8d6f9145aacafc0fedeafde375909cb2cb6 SHA512 5552cd717ae082ee55cdb77d79e8d035d8ecb7cf23c79d659fda43468d8ed414a33c4d869eab4ab83dee836f0d1cceb74c3c4a249e26f904a5ab2350e08a5677
-DIST hplip-3.20.3.tar.gz 25672070 BLAKE2B 4c6209a268898de123b2b557d662acddb3ad90b227c0752ebdd1e2afb3fe3d19fddc819aba999347708dd0c098f2b8fea4580dcfb3d5fc7893e47520cae7c1d5 SHA512 a397eb3896292ac956a1969b76707af62c866e47d88148fa75b68574e4639283f7414a2c77e6854c5d22daea49181d4f1bc2daf11fb3058372ff084d591696f1
 DIST hplip-3.20.5-patches-1.tar.xz 12716 BLAKE2B 982480185b2decb9f4e857336b474dab585d64aa44a9f0da70ba568e20488f451507aae3bd1427aef4274d36db93dd9bcb1d906f7b393939dfc43c81a1f9a9db SHA512 ae46a6f490253a1112838b08d56199c6257d33911569619483d925798b54a8bc9fe57afd1e86dedb9482d89d42f44bec81db215f37cbcd8fb5982596c80c1117
+DIST hplip-3.20.6-patches-1.tar.xz 14384 BLAKE2B 89436c36478e96f91053a75d65af99d3b32e8d0a60417c26baf4a9ae72070409e7210e1fb9232bd69309b251d2960671020c1203d3e6672b9639e00827c4e4bf SHA512 4b903438a56ca16846a7e940c09e9555d3d2ee54cbb77a7d031027cefd04c37bde6ea1dad4a266f89fd03f0595851db973947b9a363f49972bd02522704c20f8
 DIST hplip-3.20.6.tar.gz 25908476 BLAKE2B cd70d00081ff41d36b566d6f6f546b2cddabb46427afafcd2d04ea7769ce5114feff74612e58ffa83dde4e817ffa2804dbf41411187d9cd15ed7b888b87658ad SHA512 ccd82112afb5ee73f5d027819ab89ba8f52ec36a4b061d314565f95d288be24e045050c3368332eeae50c0fb170f8cb015fdd8dde4b32a08e3758f0f0f4e8e96
 EBUILD hplip-3.19.12-r1.ebuild 7744 BLAKE2B e19803ef105c70237b7c88d7d45f756a219195f3f0d01ad7040676226f0acba81bb9dc94de2d8ea20081e420155297414a87a303e779bca2d03d5ed82685d1dd SHA512 b15681bbf4f396df4abd145d02a7ddca006cff7619a852b5cbdbcd5fd89d6cf34534aadf5e33114f47a8ab1443453b03f6dac71c71a80ba6740418bd699280b0
-EBUILD hplip-3.20.3.ebuild 7791 BLAKE2B 08470deec20f0a8a184a3f69f5b49a8ee94ceb6ca62ac9a659b42597285c836a3f378d069cad1c470296df8880e85d87eb62745f2cd787ec1a98e28da7941ab4 SHA512 3ddb0b4e82b2c0060cece1595b3dd02c963e9bdacab28ed78618be7b1fe1f3603e6d8fd4a14f542bda0f4fb3867ce05730e14dd1ba551c6ffee4f547e8d13b8d
 EBUILD hplip-3.20.6-r1.ebuild 7913 BLAKE2B 0d991ff1f5d52716cbfa089c0eb4c0c18340168eec8742b588769f9cee575ece1ad38351db7066a1bddc3fdada1bffdfc6dac42580298811db6dbca128af52eb SHA512 2b7d729e4cb51d1e278eeabf57d18a379bb4545407e468290dc30a7bc7963be84bd54607b75c58b899176d3490066738fe7811e9b5fa0dcb64ecfac4f05de71f
+EBUILD hplip-3.20.6-r2.ebuild 7860 BLAKE2B f392bdd3fad24e315ba76a30ab7edf83fd329899151c6e771f844009b075ba092b0aa88613fef2e9a2189b724aa43218ddb6bf19056e9cc98fb509a8c5a1d579 SHA512 788ade726c473e0f36cd863573e2101b49097e318160edf01ed8be6f187b597ee9fa3e89f6f026c63b32aea069655064deb43b1122833170fbf2585784ecf28c
 MISC metadata.xml 1910 BLAKE2B fd9fc7a40bd2bb877e7b4e26104df247dc8c7aa5cbd7211f5d489ec889834aa64fff20d6624f3c8b3e1e4428704cb7f2eb4d1bffc1c6fb15f15b05fd422297e2 SHA512 022854843c9ae373aed3ebd3879c9f1312773dea5dca15c85fb839ff067ea5599532201fa51d9e91ec18b0be1773e2ad544cd4e5697eb9c91be22d8d9352d7ef
diff --git a/net-print/hplip/hplip-3.20.3.ebuild b/net-print/hplip/hplip-3.20.6-r2.ebuild
index ed4bfbdd0469..6dba4f978f09 100644
--- a/net-print/hplip/hplip-3.20.3.ebuild
+++ b/net-print/hplip/hplip-3.20.6-r2.ebuild
@@ -3,22 +3,22 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_COMPAT=( python3_{6,7,8,9} )
 PYTHON_REQ_USE="threads(+),xml"
 
 # 14 and 15 spit out a lot of warnings about subdirs
 WANT_AUTOMAKE="1.13"
 
-inherit autotools flag-o-matic linux-info python-single-r1 readme.gentoo-r1 udev
+inherit autotools linux-info python-single-r1 readme.gentoo-r1 udev
 
 DESCRIPTION="HP Linux Imaging and Printing - Print, scan, fax drivers and service tools"
 HOMEPAGE="https://developers.hp.com/hp-linux-imaging-and-printing"
 SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
-		https://dev.gentoo.org/~billie/distfiles/${PN}-3.18.12-patches-1.tar.xz"
+		https://dev.gentoo.org/~billie/distfiles/${PN}-3.20.6-patches-1.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 arm ~ppc ppc64 x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
 
 IUSE="doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
 
@@ -89,8 +89,6 @@ DOC_CONTENTS="
 For more information on setting up your printer please take
 a look at the hplip section of the gentoo printing guide:
 https://wiki.gentoo.org/wiki/Printing
-
-Any user who wants to print must be in the lp group.
 "
 
 pkg_setup() {
@@ -147,8 +145,6 @@ src_prepare() {
 src_configure() {
 	local myconf drv_build minimal_build
 
-	append-cppflags "$(python-config --includes)"
-
 	if use libusb0 ; then
 		myconf="${myconf} --enable-libusb01_build"
 	else
@@ -196,6 +192,13 @@ src_configure() {
 		else
 			minimal_build="${minimal_build} --disable-hpcups-only-build"
 		fi
+		minimal_build="${minimal_build} --disable-fax-build"
+	else
+		if use fax ; then
+			minimal_build="${minimal_build} --enable-fax-build"
+		else
+			minimal_build="${minimal_build} --disable-fax-build"
+		fi
 	fi
 
 	# disable class driver for now
@@ -217,7 +220,6 @@ src_configure() {
 		--enable-hpps-install \
 		--disable-class-driver \
 		$(use_enable doc doc-build) \
-		$(use_enable fax fax-build) \
 		$(use_enable !minimal gui-build) \
 		$(use_enable !minimal dbus-build) \
 		$(use_enable parport pp-build) \