gentoo resync : 30.09.2020

10 files changed, 163 insertions, 116 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index cd3dfa3aaa71..870ef1ed8ba6 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cups-bjnp/Manifest b/net-print/cups-bjnp/Manifest
index 7e6807bcca12..f2943a047d91 100644
--- a/net-print/cups-bjnp/Manifest
+++ b/net-print/cups-bjnp/Manifest
@@ -1,7 +1,3 @@
-DIST cups-bjnp-1.1.tar.gz 139838 BLAKE2B 6613ca080afe2ec2cb72cf695aa4144ef16225d2e24077d209cd65e584e5d134b65224c93c636e3289949520787308406debedc3cc4506fb7f573685df02957a SHA512 9a1558c7f2530e14ecab3143e0e03239d430d261486309cbf12f28a43b6358e704f60fdbcfeb0150b3ca80d31bf03b0c628179fbf37d313ca23d2f6e1d28265d
-DIST cups-bjnp-1.2.1.tar.gz 140536 BLAKE2B a47fac5c9550de024b817401b7844c5f1812b9105f2e79534b78a840e5ac394ad5ac8eb5e8eab15cbadcf24c56f2fb5070d8c4229c10dbb549786189a5aea2cd SHA512 c14152592255f9092d543f00f67a8fdd71cc9b27bc12cc6e66d3d94e1112920feafba35b7f7a830b07666b9b2d8d070f52757a3e150195e71ec989985a74d489
 DIST cups-bjnp-2.0.tar.gz 140617 BLAKE2B 7d280346a6f29a3530b605d8e259007c004dc5c53386904db93e5302303a158b8a5a4ed86e8cf72692fb4d64f4b041625b224a1325d5c77e4ecc82cd59bfa0d2 SHA512 60b7c58828c736eab6986896730db7635d3364e94d6d7c4992eb7f49f22ced6a5643153c069d3823d4dc663ee7de8748b8e8ec527e04afc65389c521b791c8d0
-EBUILD cups-bjnp-1.1.ebuild 432 BLAKE2B 7c1993cf1053036750e47319e06015a666bf4422cd8f2ff826b1dc573bc3206270df02fd66aa28b6c05772ea8035926c5f75236d995039a6df5437ed6704a134 SHA512 d5c1ab4d82b7602c844c14d83c84b773ab92757e1766f93e64fec0f2b37c57d3ed35b26cafb71a2171ee81c7cad715fb4ed185c1bca2cf9f338880a7c6c1a6e8
-EBUILD cups-bjnp-1.2.1.ebuild 483 BLAKE2B 2be553cd6e1f21e532a687490f0f21a5db3b7a8502eb1b935287ef835da541773962283b23fba2bd1fe3cef577d5b09b049aca236c83980de78fc4d96af7fa1c SHA512 bc9b8d18009d951e7781463e0ea2150ee264beb23121f6acdecb0fcf43733b751df07bb978dfc2f0e27281e290bc4da78aa8b0e5a4b6b38a08ed0b19f1a10c0d
 EBUILD cups-bjnp-2.0.ebuild 481 BLAKE2B 75ff24ed8dba8575f614745ad86913156077eb877bbb0a35f58bf307c9429e90064ead3919c2795e675248c65c69673cfb0ca854bd62a47eddb0e66b38918d8a SHA512 4eab0921680a478ad9f4fe8217e5acd41acf787334743c53050076b139d4c6aed4e1d406e5b76d1b87c4d1f840719dc7d7f522ec327ec04bef0404d4388ad269
 MISC metadata.xml 338 BLAKE2B 672c0b7535be027177912e73ba4978fa3fbc6a7ff597f664ef719d0b11e3d95b6a0fa630385ff371ec2567aa016063c017cf8f38c4a2046214aa3d958b675b96 SHA512 be2e9f37b6456136fedac3ee2bcf004d8bf5ac644dd5154714aba02fa3dbc026b5c8f0e0518e494d9bc5d22902339c97cd8df8955df814306337883a68a87a84
diff --git a/net-print/cups-bjnp/cups-bjnp-1.1.ebuild b/net-print/cups-bjnp/cups-bjnp-1.1.ebuild
deleted file mode 100644
index ad806f5cf6c4..000000000000
--- a/net-print/cups-bjnp/cups-bjnp-1.1.ebuild
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="CUPS backend for the canon printers using the proprietary USB over IP BJNP protocol"
-HOMEPAGE="https://sourceforge.net/projects/cups-bjnp/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="net-print/cups"
-RDEPEND="${DEPEND}"
diff --git a/net-print/cups-bjnp/cups-bjnp-1.2.1.ebuild b/net-print/cups-bjnp/cups-bjnp-1.2.1.ebuild
deleted file mode 100644
index d720b507f029..000000000000
--- a/net-print/cups-bjnp/cups-bjnp-1.2.1.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-DESCRIPTION="CUPS backend for the canon printers using the proprietary USB over IP BJNP protocol"
-HOMEPAGE="https://sourceforge.net/projects/cups-bjnp/"
-SRC_URI="mirror://sourceforge/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~ppc64 ~x86"
-IUSE=""
-
-DEPEND="net-print/cups"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	econf --disable-Werror
-}
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index c5c3e10fd4ad..1606838be0e7 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -5,8 +5,10 @@ AUX cups-filters-1.28.2-make-missing-testfont-non-fatal.patch 477 BLAKE2B 30e8fd
 DIST cups-filters-1.27.4.tar.xz 1493860 BLAKE2B 424c3ba73ec7d6f4683eaedde86d657b1a2da17670c84097f5f3f8ef525cc8cc6d7843a88d35013a5f48bba8a903f7504df9054427b9a63d748ce39de458e71f SHA512 8005e94bb6b06d0a15fa4dfd8455d0bc67418478bf517e205af1c8c0018681a97ae9ea486db07570050ebeeb7f63f75319a8fe012c112c6d16c0941299eaa50e
 DIST cups-filters-1.27.5.tar.xz 1494864 BLAKE2B 457968139f0bc1a5fd4c587dfe4a88d1904eb0ca9ee2aa88c1360785eb53b59e7eb823535ef01a9f81551628514441077562e91487a55a9f0c9e6c9dbdba98b7 SHA512 8bc917b2a168add1062d091d02d99c39d72861c0d0cb1242c34b2bf117c9943e7fdc1fe002de7cde4cb1919fbce41073adc34916c328fc99e66e389b0a4fe103
 DIST cups-filters-1.28.2.tar.xz 1502352 BLAKE2B e0d95a7e1596d4dc05a8e2d32b2ee573cfa1ec304288e476a38c8b51de5ed8e0b6a71e371d2196802b116d63aea1e750e0b3a6c8fae749377de0ab72f92aa86e SHA512 aa5f075927286a8278259025aa5baf95445809a83b88e2d4654e8f0a124012591b045df115294242fae60a283d983d6cdbaafc6a51224af30a7e56b58d831da5
+DIST cups-filters-1.28.3.tar.xz 1501824 BLAKE2B b4f493681ac2a701648b3b9b071f4ebfb432dd4660b610579ff2ed6cba4f6cd4351d5a1f28f5c096b3ba20d9c45dc87837bf127b9bc98680a98dec58dd0a68ea SHA512 ac139ae7452342bd46e464bff3438d437f1c9a2e719a7b32b7abc22c2667acaa93dfb976decb277a02572e688ecd86289e01fca817bef93018dff2076fb2a30c
 EBUILD cups-filters-1.27.4.ebuild 3599 BLAKE2B eb2b2f3dce938b6516342c4926f962f35b51fcc8eb6d1ff5c3d2311515c78c68febfd1fd59633d120cc3fee71b2ed6119d1503e1937e1084560b10b2b4527abe SHA512 78120456764f960f89ae41405286f7b1105be5db5c3cf6cd852bb620120bb56a96798d08a469580947616851d3d23d4f47e5d28830476c8833a8194c6d9e2f8e
 EBUILD cups-filters-1.27.5.ebuild 3611 BLAKE2B b99ea19205844335e42753ae5dd3d443fa327b533293594aa4d2ed43cd20f29691539fd095268f30cf9dfec435ce09941c4761b8263eeadb774117bec10f7ef3 SHA512 f1404c9aa04f7fa5c49ffa1836666f4d3b044f617c4983af273f50d6258fc4a095fe91b93c72cadb1ab2e5e07e5bf57acb8be4544283adb294a58fc871bc353b
 EBUILD cups-filters-1.28.2.ebuild 3608 BLAKE2B 38a5c3f7d865315a8c2780a408b9d77cd043f144368aef425ee44b829f3ea7ae2cc660ff68cc2d46fb9eab799257cd65cb631a58ad59bc9d5d21c4dcac4e8a1b SHA512 77c1cf7be7f6a346d404ee2cbd82da3a8dab8715ae63ed66efede88e841928196a0fbdf2f71972a62b74cf145359aa89e05866eb79d37a9328761f8d666b7f79
+EBUILD cups-filters-1.28.3.ebuild 3608 BLAKE2B 38a5c3f7d865315a8c2780a408b9d77cd043f144368aef425ee44b829f3ea7ae2cc660ff68cc2d46fb9eab799257cd65cb631a58ad59bc9d5d21c4dcac4e8a1b SHA512 77c1cf7be7f6a346d404ee2cbd82da3a8dab8715ae63ed66efede88e841928196a0fbdf2f71972a62b74cf145359aa89e05866eb79d37a9328761f8d666b7f79
 EBUILD cups-filters-9999.ebuild 3537 BLAKE2B b632ca69c758df9a0a3c77a3f410b2212288f945cce61d3782249325eaf04cc5885172cb0f7e02b4f953c608a296889c13f4c16b9be0cd6994bcdad4b6c2b4e1 SHA512 6f506cbfb556e3a0d5e404a6cd802ce63d6bdf90ef7bbbbdd6ce5b6d45f12dd025e4324ee30df36d1d2ce23684550512743cb3ca95f04023ac945ae72aaa5999
 MISC metadata.xml 444 BLAKE2B 43542e8e11bcce56517af18fe24258495e3032a72bec385a513c741bb1b48f9b77d83b2d8ebcd52f83a16b099762e9e85ff4a91e688203cbfc4461b4a68a34fb SHA512 8eafb557741f3d771b445424c4bfeef6e4de60c7aca36c1a1e3541d234d2bcd5e459602bbb7b3b5327403993486d803f8e837ec51dfde64fcdbfa522ad131950
diff --git a/net-print/cups-filters/cups-filters-1.28.3.ebuild b/net-print/cups-filters/cups-filters-1.28.3.ebuild
new file mode 100644
index 000000000000..d3c34b7f443d
--- /dev/null
+++ b/net-print/cups-filters/cups-filters-1.28.3.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GENTOO_DEPEND_ON_PERL=no
+
+inherit autotools perl-module systemd flag-o-matic
+
+if [[ "${PV}" == "9999" ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/OpenPrinting/cups-filters.git"
+else
+	SRC_URI="http://www.openprinting.org/download/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~m68k-mint"
+fi
+DESCRIPTION="Cups filters"
+HOMEPAGE="https://wiki.linuxfoundation.org/openprinting/cups-filters"
+
+LICENSE="MIT GPL-2"
+SLOT="0"
+IUSE="dbus +foomatic jpeg ldap pclm pdf perl png +postscript static-libs test tiff zeroconf"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=app-text/poppler-0.32:=[cxx,jpeg?,lcms,tiff?,utils]
+	>=app-text/qpdf-8.3.0:=
+	dev-libs/glib:2
+	media-libs/fontconfig
+	media-libs/freetype:2
+	media-libs/lcms:2
+	>=net-print/cups-1.7.3
+	!<=net-print/cups-1.5.9999
+	sys-devel/bc
+	sys-libs/zlib
+	dbus? ( sys-apps/dbus )
+	foomatic? ( !net-print/foomatic-filters )
+	jpeg? ( virtual/jpeg:0 )
+	ldap? ( net-nds/openldap )
+	pdf? ( app-text/mupdf )
+	perl? ( dev-lang/perl:= )
+	png? ( media-libs/libpng:0= )
+	postscript? ( >=app-text/ghostscript-gpl-9.09[cups] )
+	tiff? ( media-libs/tiff:0 )
+	zeroconf? ( net-dns/avahi[dbus] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-util/gdbus-codegen
+	>=sys-devel/gettext-0.18.3
+	virtual/pkgconfig
+	test? ( media-fonts/dejavu )
+"
+
+src_prepare() {
+	local need_eautoreconf=
+
+	default
+
+	if ! use test ; then
+		eapply "${FILESDIR}"/${PN}-1.28.2-make-missing-testfont-non-fatal.patch
+		need_eautoreconf=yes
+	elif [[ "${PV}" == "9999" ]] ; then
+		need_eautoreconf=yes
+	fi
+
+	[[ -n ${need_eautoreconf} ]] && eautoreconf
+
+	# Bug #626800
+	append-cxxflags -std=c++11
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-imagefilters
+		--localstatedir="${EPREFIX}"/var
+		--with-browseremoteprotocols=DNSSD,CUPS
+		--with-cups-rundir="${EPREFIX}"/run/cups
+		--with-fontdir="fonts/conf.avail"
+		--with-pdftops=pdftops
+		--with-rcdir=no
+		--without-php
+		$(use_enable dbus)
+		$(use_enable foomatic)
+		$(use_enable ldap)
+		$(use_enable pclm)
+		$(use_enable pdf mutool)
+		$(use_enable postscript ghostscript)
+		$(use_enable static-libs static)
+		$(use_enable zeroconf avahi)
+		$(use_with jpeg)
+		$(use_with png)
+		$(use_with tiff)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_configure
+		perl-module_src_compile
+		popd > /dev/null
+	fi
+}
+
+src_install() {
+	default
+
+	if use perl; then
+		pushd "${S}/scripting/perl" > /dev/null
+		perl-module_src_install
+		perl_delete_localpod
+		popd > /dev/null
+	fi
+
+	if use postscript; then
+		# workaround: some printer drivers still require pstoraster and pstopxl, bug #383831
+		dosym gstoraster /usr/libexec/cups/filter/pstoraster
+		dosym gstopxl /usr/libexec/cups/filter/pstopxl
+	fi
+
+	find "${ED}" \( -name "*.a" -o -name "*.la" \) -delete || die
+
+	cp "${FILESDIR}"/cups-browsed.init.d-r1 "${T}"/cups-browsed || die
+
+	if ! use zeroconf ; then
+		sed -i -e 's:need cupsd avahi-daemon:need cupsd:g' "${T}"/cups-browsed || die
+		sed -i -e 's:cups\.service avahi-daemon\.service:cups.service:g' "${S}"/utils/cups-browsed.service || die
+	fi
+
+	doinitd "${T}"/cups-browsed
+	systemd_dounit "${S}/utils/cups-browsed.service"
+}
+
+src_test() {
+	emake check
+}
+
+pkg_postinst() {
+	if ! use foomatic ; then
+		ewarn "You are disabling the foomatic code in cups-filters. Please do that ONLY if absolutely."
+		ewarn "necessary. net-print/foomatic-filters as replacement is deprecated and unmaintained."
+	fi
+}
diff --git a/net-print/hplip-plugin/Manifest b/net-print/hplip-plugin/Manifest
index 7ee55f4e76bb..41da508bcb64 100644
--- a/net-print/hplip-plugin/Manifest
+++ b/net-print/hplip-plugin/Manifest
@@ -1,7 +1,5 @@
 DIST hplip-3.19.12-plugin.run 11512079 BLAKE2B 534cbba51b2254f8227611b8f0449e100361fb445400f664e43e30412be8eb554bb35c2fe260d45cd5ad742b083af6d551532a9d14585029b0ff93675fab578a SHA512 ac2022d555f5084d5bf1e4519ddbb29828e9ca385aa6dff818ae9e79b60b4b2745e31ad4146cb01bca3747fae0d61b96e4a823b81179d2e2c55a643831165e4b
-DIST hplip-3.20.3-plugin.run 11514166 BLAKE2B 15ff8caf13f82256a5e814acf2b0433a6d365cea8b0073ea133f2e8a175796be04b058f44f68fb86c0f43f4a7c0bebf14f486aa93548b5155490e7240d02355a SHA512 3481c852aed773d3b3bcecd203066476a670eb506688381c54bc88f4057ad15da99b128d8a1cc2358985c0b3772b5538e75988dd66221f50dcea78f9bab2e3ce
 DIST hplip-3.20.6-plugin.run 11514108 BLAKE2B 83e2d26fb397c5c5df1fc4371bfc2798cea049965499b6f1ad5daa05b44b74f51ba9deb933b564dfa47a8d0ef79d4921c3a96b9531730317742e1c5651d7b012 SHA512 6f9e5c92e302f4068abbe9134cf7f8081fcbe98568c9b75d6a668843b76c83afd0f4fbb3d90d3ac775c719ab8e2dca5beedd887ef6d072bd8ee0eb48d42521ed
 EBUILD hplip-plugin-3.19.12.ebuild 1301 BLAKE2B f4cd61c24495b61e9928e1b80cee878d647037af127d9b890ddb9301666b69c17efd15103ceab6983a0c18c24e240185ea0d967e6efdff917c3e250ef4094a45 SHA512 2b0c474f02f34078b603c47d02724f198416569befabc6d8ec6abd25b4002ba93a6d600e5aa07dff0092c9fbbd26f8330f04ac31661cbc721c566fab503cfcc9
-EBUILD hplip-plugin-3.20.3.ebuild 1301 BLAKE2B f4cd61c24495b61e9928e1b80cee878d647037af127d9b890ddb9301666b69c17efd15103ceab6983a0c18c24e240185ea0d967e6efdff917c3e250ef4094a45 SHA512 2b0c474f02f34078b603c47d02724f198416569befabc6d8ec6abd25b4002ba93a6d600e5aa07dff0092c9fbbd26f8330f04ac31661cbc721c566fab503cfcc9
 EBUILD hplip-plugin-3.20.6-r1.ebuild 1450 BLAKE2B ab91d2d615018b9d377e6397a122f3fa92cbf42ea00441cedd6e7eaa57873cd6137ff558395106f78006c066f18c28856dd171f5ccf0f86fdf1574ba5c848d2f SHA512 694394be4f54bb8e5f7a2ee2a0991fcbe3588dfc1798e3b84168c53087746a17982bd496401dfbe3016f598cf3c275734de5980fc34c23dcaf6cd7165b4ae559
 MISC metadata.xml 522 BLAKE2B 47eae04f2b9633c1707c451a53dbdd8d72491903525e04f82e6017cd4e1ce9a4ce71a488dd0afcc84401fa061d51bad545a8b8a3f50d378d5f19c33f2b43ec2d SHA512 8f1a5e7c4b50aa472433dc6e49cb4715731f146f29774ad4304d9e24f1ffbe2a4756bef024d01982d8c978208e5c47e5987a48fc2ad6dd3962fa3cfb68d01a31
diff --git a/net-print/hplip-plugin/hplip-plugin-3.20.3.ebuild b/net-print/hplip-plugin/hplip-plugin-3.20.3.ebuild
deleted file mode 100644
index 94c7a5c55145..000000000000
--- a/net-print/hplip-plugin/hplip-plugin-3.20.3.ebuild
+++ /dev/null
@@ -1,63 +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=""
-
-RDEPEND="
-	~net-print/hplip-${PV}
-	virtual/libusb:0
-	virtual/udev
-"
-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
-			fax_*) plugin_type=fax ;;
-			bb_*)  plugin_type=scan ;;
-		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/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) \