gentoo resync : 25.11.2020

23 files changed, 892 insertions, 275 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 0e40122780dc..b04c80b404aa 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/apsfilter/Manifest b/net-print/apsfilter/Manifest
index f451c186749d..565690a6da9d 100644
--- a/net-print/apsfilter/Manifest
+++ b/net-print/apsfilter/Manifest
@@ -1,3 +1,3 @@
 DIST apsfilter-7.2.8.tar.bz2 310587 BLAKE2B aae44a7e79157d3ddf9ce56fe51ae90106eb952d536658efe0f19dfcbe5f0d5c7dd078e3bb5044433e250df6b9289a08a466d6e9fc77c91d540daf07a70bf197 SHA512 ca07e7eb620a95b08fb912e899520d5ff85613eb3d1f712e1d38a66cf5b84516dbb35e3e40ef75ac10d1e717cfc2f49930a0f0873fee451d495c8ae572072012
-EBUILD apsfilter-7.2.8-r1.ebuild 1162 BLAKE2B ca9d552654d1f02ff411074e27014fb5f8871810b368c7be7964d8e55d47c25dd7c3209899d5ab995179dd0db1e5bb7425437f22e2bf5331dc88cd5d2e8fcedd SHA512 bb60ebb237a9bb9b08694ac3633443b2f7ba10386ad2457faa008de651554b32179af730e3957694abb94b752a1d71d6c260557c3255c3ca27bb35d7daae35ba
+EBUILD apsfilter-7.2.8-r1.ebuild 1211 BLAKE2B 54ca8fdeaf8438db0db91f30ba2fd390c23af65594199b8b8ded028c1ae9545109f220bfebd5e8bb65e1d591bdef7eb91bc7810e0929ded26df80e9e053882fd SHA512 e88cb423635985cd4e801a909eeb37a59f6256bdf485adddbe2b9d5efd6a010bbbd099f66fd74ee3275d1e9677696ba60514a052be92b2e99932743766a28031
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/net-print/apsfilter/apsfilter-7.2.8-r1.ebuild b/net-print/apsfilter/apsfilter-7.2.8-r1.ebuild
index dcc618969c3a..4f7f15844cab 100644
--- a/net-print/apsfilter/apsfilter-7.2.8-r1.ebuild
+++ b/net-print/apsfilter/apsfilter-7.2.8-r1.ebuild
@@ -1,42 +1,55 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
+EAPI=7
 
 DESCRIPTION="Apsfilter Prints So Fine, It Leads To Extraordinary Results"
 HOMEPAGE="http://www.apsfilter.org"
 SRC_URI="http://www.apsfilter.org/download/${P}.tar.bz2"
+S="${WORKDIR}/${PN}"
+
 KEYWORDS="~alpha ~amd64 ppc sparc x86"
 IUSE="cups"
 SLOT="0"
 LICENSE="GPL-2"
 
-RDEPEND="|| ( net-print/cups net-print/lprng )
+RDEPEND="
 	app-text/ghostscript-gpl
 	>=app-text/psutils-1.17
 	>=app-text/a2ps-4.13b-r4
+	net-print/cups
 	virtual/awk
 	virtual/imagemagick-tools
 	virtual/mta"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${PN}
-
 src_configure() {
-	# assume thet lprng is installed if cups isn't USEd
-	use cups && \
-	    myconf="--with-printcap=/etc/cups/printcap --with-spooldir=/var/spool/cups" || \
-	    myconf="--with-printcap=/etc/lprng/printcap"
+	local myconf=
+
+	# assume that lprng is installed if cups isn't USEd
+	if use cups ; then
+		myconf="--with-printcap=/etc/cups/printcap --with-spooldir=/var/spool/cups"
+	else
+		myconf="--with-printcap=/etc/lprng/printcap"
+	fi
 
 	# econf doesn't work here :(
-	./configure --prefix=/usr --mandir=/usr/share/man \
-		--docdir=/usr/share/doc/${PF} --sysconfdir=/etc ${myconf} || die
+	./configure \
+		--prefix="${EPREFIX}/usr" \
+		--mandir=/usr/share/man \
+		--docdir=/usr/share/doc/${PF} \
+		--sysconfdir=/etc \
+		"${myconf} ${EXTRA_ECONF}" \
+	|| die
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dosym /usr/share/apsfilter/SETUP /usr/bin/apsfilter
-	use cups && \
-	    dosym /etc/cups/printcap /etc/printcap || \
-	    dosym /etc/lprng/printcap /etc/printcap
+	emake DESTDIR="${ED}" install
+	dosym ../share/apsfilter/SETUP /usr/bin/apsfilter
+
+	if use cups ; then
+		dosym ../cups/printcap /etc/printcap
+	else
+		dosym ../lprng/printcap /etc/printcap
+	fi
 }
diff --git a/net-print/cnrdrvcups-lb/Manifest b/net-print/cnrdrvcups-lb/Manifest
index 34ac4f2168d8..bec4b7389384 100644
--- a/net-print/cnrdrvcups-lb/Manifest
+++ b/net-print/cnrdrvcups-lb/Manifest
@@ -1,5 +1,3 @@
-DIST linux-UFRII-drv-v510-uken-19.tar.gz 106848526 BLAKE2B afc6b158db038c4b5bacbd4965e8576a7dc4c6e4dcb8362823b69630372d60f8ecb82e1a7e9123fb251bbf8e459fb5fc314447e46dd1ad95058b912ac610fe56 SHA512 64f6af6fbd437076ca786b5904bf00145f49a19c3eb559fcc85316360e82aa90ab90c5763ff4f4c83d34608c4941a3fae78f93debb01f9c63f93fcc7615ae044
 DIST linux-UFRII-drv-v520-uken-05.tar.gz 107101656 BLAKE2B 4ea92eaaab76babca7fc94771c39b12804b9016ae7baeeaafc18e1979a83ffdcb2090a9cc8a5390314be129ca273c3571f95c83c9e4a29254aca18325687acb2 SHA512 31652894e8ad07e81ae044c5172ced73569a1b78f06f48bcafcd9cabcb19406f0645bfdf741cf3a60746859e671c443d14e5c0c04bffd540ac10406df7266b45
-EBUILD cnrdrvcups-lb-5.10-r1.ebuild 6048 BLAKE2B cd5c18eaaa539283e9ac6b3cf9a36e49a2f9b678063780e5c853cca4909db763d99763dde00110861c4e05a2a4ff01b4daf610f360c4d460113b39ec7490412b SHA512 ed4c1204f00077b32580490012a35cebe35a41727e42be295b6f08c897f071a5e6ec1528166bcab558bdedaded0a4e1f79705b8261785bbbb40492baab2d991d
-EBUILD cnrdrvcups-lb-5.20.ebuild 6038 BLAKE2B 34d72ac0453bd5df6b92489b277fe1d107675b787a255933ae503ea25c548d9f1530a37103416c189279dfe06b0f4562b03ae401562db89217cae98e85de6fae SHA512 6dd4e263aca45265ffc1eb43fb71c4c5fb7aeb1d8825fbdb6e4520a0a08e603cac727ea1100a944298edf51ef771d1c2413140e9c361f541756dd565b569b006
+EBUILD cnrdrvcups-lb-5.20.ebuild 6036 BLAKE2B 37fb90cc0f2941117c52c5c4737b3828aff71f51b8bf34e819507e39597ead69bc0acdacad2aa2aae9b9868de9f6301f40ba6af8603bd531063e5ee5be871813 SHA512 771ea0343fd5672548784955fd405d6e8cf8c470aa45d34274fcfec7cc48275aedacff7156ee9b1e4af119c1edd8a7f3028a1ead46ab1655ffba7bfd9f2508b2
 MISC metadata.xml 254 BLAKE2B 938f68b7b21ad386a35540a09e4bb956e241dfc963d4823c3c0cd46d3449ff4fb5a1cead67ad7c35a460503d30bdbde35822535f1c2d46f2939ee190f328b846 SHA512 26047ebb40fc49bfb4393121c5c5af69caee617a1d75676be84b0f5af75564828aeeef4503c7681eaaf7e48f6c662574874336296c18e002dca8e925162a1d4c
diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10-r1.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10-r1.ebuild
deleted file mode 100644
index 6d4bbe74b3f6..000000000000
--- a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.10-r1.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools desktop flag-o-matic toolchain-funcs
-
-MY_DOWNLOAD_ID="8/0100007658/14"
-MY_PV="${PV//\./}"
-
-DESCRIPTION="Canon UFR II / LIPSLX Printer Driver for Linux "
-HOMEPAGE="https://www.canon-europe.com/support/products/imagerunner/"
-SRC_URI="http://gdlp01.c-wss.com/gds/${MY_DOWNLOAD_ID}/linux-UFRII-drv-v${MY_PV}-uken-19.tar.gz"
-
-LICENSE="Canon-UFR-II GPL-2 MIT"
-SLOT="0"
-KEYWORDS="-* amd64 x86"
-IUSE=""
-
-DEPEND="dev-libs/libxml2:2
-	gnome-base/libglade:2.0
-	media-libs/jbigkit
-	net-print/cups
-	x11-libs/gtk+:2"
-RDEPEND="${DEPEND}
-	!net-print/cndrvcups-common-lb
-	!net-print/cndrvcups-lb"
-
-HTML_DOCS=(
-	"${WORKDIR}"/linux-UFRII-drv-v${MY_PV}-uken/Documents/README-ufr2-5.1xUK.html
-	"${WORKDIR}"/linux-UFRII-drv-v${MY_PV}-uken/Documents/UsersGuide-ufr2-UK.html
-)
-
-S="${WORKDIR}/linux-UFRII-drv-v${MY_PV}-uken/Sources"
-
-pkg_setup() {
-	QA_PREBUILT="/usr/bin/cnsetuputil2
-		/usr/bin/cnrsdrvufr2
-		/usr/bin/cnpkmoduleufr2r
-		/usr/bin/cnpkbidir
-		/usr/bin/cnpdfdrv
-		/usr/$(get_libdir)/libufr2filterr.so.1.0.0
-		/usr/$(get_libdir)/libColorGearCufr2.so.2.0.0
-		/usr/$(get_libdir)/libcnlbcmr.so.1.0
-		/usr/$(get_libdir)/libcanon_slimufr2.so.1.0.0
-		/usr/$(get_libdir)/libcanonufr2r.so.1.0.0
-		/usr/$(get_libdir)/libcaiowrapufr2.so.1.0.0
-		/usr/$(get_libdir)/libcaiocnpkbidir.so.1.0.0
-		/usr/$(get_libdir)/libcaepcmufr2.so.1.0"
-
-	QA_SONAME="/usr/$(get_libdir)/libcaiocnpkbidir.so.1.0.0"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${WORKDIR}/linux-UFRII-drv-v${MY_PV}-uken/Sources/" || die
-	unpack ./${P}-1.tar.gz
-}
-
-common_op() {
-	local i
-	for i in backend buftool cngplp cnjbig rasterfilter; do
-		cd "${S}/cnrdrvcups-common-${PV}/${i}" ||
-			die "failed to switch dir to ${i}"
-		"${@}"
-		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
-	done
-}
-
-driver_op() {
-	local i
-	for i in cngplp cngplp/files cpca pdftocpca; do
-		cd "${S}/cnrdrvcups-lb-${PV}/${i}" ||
-			die "failed to switch dir to ${i}"
-		"${@}"
-		cd "${S}" || die "failed to switch dir back from ${i} to ${S}"
-	done
-}
-
-src_prepare() {
-	default
-
-	common_op mv configure.in configure.ac || die "failed to move configure.in"
-	driver_op mv configure.in configure.ac || die "failed to move configure.in"
-
-	common_op sed -i -e 's/configure.in/configure.ac/' configure.ac || die
-	driver_op sed -i -e 's/configure.in/configure.ac/' configure.ac || die
-
-	# This should work with autoreconf
-	export "LIBS=-lgtk-x11-2.0 -lgobject-2.0 -lglib-2.0 -lgmodule-2.0"
-
-	# Other components already depend on compiled product
-	append-ldflags -L"${S}/cnrdrvcups-common-${PV}/buftool"
-
-	common_op eautoreconf
-	driver_op eautoreconf
-
-	# Fix a QA issue with .desktop file,
-	sed -i 's/Application;Utility/Utility/g' "${S}"/cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop ||
-		die "Failed to modify cnsetuputil2.desktop file."
-
-	append-cflags -fcommon
-
-	# For some reason, @AR@ is defined everywhere else correctly, but not here.
-	sed -i -e "s/AR = ar/AR = $(tc-getAR)/g" ./cnrdrvcups-common-${PV}/buftool/Makefile.in || die
-}
-
-src_configure() {
-	common_op econf
-	driver_op econf
-}
-
-src_compile() {
-	common_op emake
-	driver_op emake
-}
-
-src_install() {
-	common_op emake DESTDIR="${D}" install COMMON_SUFFIX=2
-	driver_op emake DESTDIR="${D}" install COMMON_SUFFIX=2
-
-	insinto /usr/share/cups
-	doins "${S}"/cnrdrvcups-common-${PV}/Rule/canon-laser-printer_ufr2.usb-quirks
-
-	if use amd64; then
-		cd "${S}"/lib/libs64 || die "failed to switch into libs64"
-	elif use x86; then
-		cd "${S}"/lib/libs32 || die "failed to switch into libs32"
-	else
-		die "I don't know what directory to switch into!"
-	fi
-
-	dolib.so libcaepcmufr2.so.1.0 libcaiocnpkbidir.so.1.0.0 \
-		libcaiowrapufr2.so.1.0.0 libcanonufr2r.so.1.0.0 \
-		libcanon_slimufr2.so.1.0.0 libcnlbcmr.so.1.0 \
-		libColorGearCufr2.so.2.0.0 libufr2filterr.so.1.0.0
-
-	dosym libcaepcmufr2.so.1.0 /usr/$(get_libdir)/libcaepcmufr2.so
-	dosym libcaepcmufr2.so.1.0 /usr/$(get_libdir)/libcaepcmufr2.so.1
-
-	dosym libcaiocnpkbidir.so.1.0.0 /usr/$(get_libdir)/libcaiocnpkbidir.so
-	dosym libcaiocnpkbidir.so.1.0.0 /usr/$(get_libdir)/libcaiocnpkbidir.so.1
-
-	dosym libcaiowrapufr2.so.1.0.0 /usr/$(get_libdir)/libcaiowrapufr2.so
-	dosym libcaiowrapufr2.so.1.0.0 /usr/$(get_libdir)/libcaiowrapufr2.so.1
-
-	dosym libcanonufr2r.so.1.0.0 /usr/$(get_libdir)/libcanonufr2r.so
-	dosym libcanonufr2r.so.1.0.0 /usr/$(get_libdir)/libcanonufr2r.so.1
-
-	dosym libcanon_slimufr2.so.1.0.0 /usr/$(get_libdir)/libcanon_slimufr2.so
-	dosym libcanon_slimufr2.so.1.0.0 /usr/$(get_libdir)/libcanon_slimufr2.so.1
-
-	dosym libcnlbcmr.so.1.0 /usr/$(get_libdir)/libcnlbcmr.so
-	dosym libcnlbcmr.so.1.0 /usr/$(get_libdir)/libcnlbcmr.so.1
-
-	dosym libColorGearCufr2.so.2.0.0 /usr/$(get_libdir)/libColorGearCufr2.so
-	dosym libColorGearCufr2.so.2.0.0 /usr/$(get_libdir)/libColorGearCufr2.so.2
-
-	dosym libufr2filterr.so.1.0.0 /usr/$(get_libdir)/libufr2filterr.so
-	dosym libufr2filterr.so.1.0.0 /usr/$(get_libdir)/libufr2filterr.so.1
-
-	dobin cnpdfdrv cnpkbidir cnpkmoduleufr2r cnrsdrvufr2 cnsetuputil2
-
-	insinto /usr/share/cnpkbidir
-	doins ./cnpkbidir_info*
-
-	insinto /usr/share/ufr2filterr
-	doins ./ThLB*
-
-	cd "${S}" || die "Failed to switch back into ${S} during installation."
-
-	dosym ../../../$(get_libdir)/cups/backend/cnusb /usr/libexec/cups/backend/cnusb
-	dosym ../../../$(get_libdir)/cups/filter/pdftocpca /usr/libexec/cups/filter/pdftocpca
-	dosym ../../../$(get_libdir)/cups/filter/rastertoufr2 /usr/libexec/cups/filter/rastertoufr2
-
-	insinto /usr/share/caepcm/ufr2
-	doins -r "${S}"/lib/data/ufr2/
-
-	insinto /usr/share/cups/model
-	doins ${P}/ppd/*.ppd
-
-	domenu ./cnrdrvcups-utility-${PV}/data/cnsetuputil2.desktop
-	doicon ./cnrdrvcups-utility-${PV}/data/cnsetuputil.png
-
-	einstalldocs
-	newdoc "${S}"/cnrdrvcups-common-${PV}/README README.common
-	newdoc "${S}"/cnrdrvcups-common-${PV}/cngplp/README README.cngplp.common
-	newdoc "${S}"/cnrdrvcups-lb-${PV}/README README.lb
-	newdoc "${S}"/cnrdrvcups-lb-${PV}/cngplp/README README.cngplp.driver
-
-	find "${D}" -name '*.la' -type f -delete || die
-}
diff --git a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.20.ebuild b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.20.ebuild
index 647cf5ade517..79a8cec887cc 100644
--- a/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.20.ebuild
+++ b/net-print/cnrdrvcups-lb/cnrdrvcups-lb-5.20.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://dev.gentoo.org/~juippis/distfiles/linux-UFRII-drv-v${MY_PV}-uke
 
 LICENSE="Canon-UFR-II GPL-2 MIT"
 SLOT="0"
-KEYWORDS="-* ~amd64 ~x86"
+KEYWORDS="-* amd64 x86"
 IUSE=""
 
 DEPEND="dev-libs/libxml2:2
diff --git a/net-print/dymo-cups-drivers/Manifest b/net-print/dymo-cups-drivers/Manifest
index 5dcae1d9c18b..39c5921df795 100644
--- a/net-print/dymo-cups-drivers/Manifest
+++ b/net-print/dymo-cups-drivers/Manifest
@@ -1,7 +1,7 @@
+AUX cups-2.3.0-headers.patch 818 BLAKE2B 9a72c21c1de12b9238585dbf830bf6c76ed089de1845d879305f0e2213dde40e7642304d7712899fce10ec79a330706bc40f80cf0aadfc9dccfd60f2f7e5f7f9 SHA512 eb47e5fb4e0bfc6f6500e1b12d36cea219274b19ae57050da3ef0c438bdfbb7ffc4f0e49b2b618e28664a9bf0318db3affe67fa36ad1103ceae57f785478923e
 AUX dymo-cups-drivers-1.2.0-cxxflags.patch 601 BLAKE2B f34dddaf64e3336744bf5493b12cfeaa45a613e7e92ad2d1957f587e72e47c74d0d20d25a702168d05b373fed7ec602049b947464b357eadfaad73e1df5eb92f SHA512 b0cee2a0bb4664a797b921f6b9bc41b16417ec693683fab548c549bd2681f97627f3b6c3734efc3d15f1843cc08ed43d73f50012e73006dc900937b0e7fbf979
 AUX dymo-cups-drivers-1.4.0.5-flexible-tests.patch 426 BLAKE2B 4a4cab04846ad26e97f9af9d8b3c1c9abae9cf8257e25af8f9f77c7ad74f96f2ee2a8702f2a2756a04a328e0a73afa8a48da452a2c7cb07fcfce83a98180036a SHA512 3188ed2e07156cbbda377476532b62b39c14a1b94004d50bba6624b63ffb75b97edf4c4b0714e015a192fda45ffd3762b67edce14c5e244e81279c78fd1233f2
 AUX port_to_newer_cups_headers.patch 2222 BLAKE2B e5e27e9e8cdc16a1e9a6b85b4759c0b71bf977528775513cb75514900d6c53d27f5bb148a3b6fdb6857b065f45bbbbb7a3532a983e58d3dc7e1163fee0de916e SHA512 55398c498e41a5ce106756f51bbd6dbfc4d7602eeb001e4d1bd104b91c8607ae36a1719eba2a2c9e1124493d5b743370b379b05b093b88cbf9346b8931bf976a
 DIST dymo-cups-drivers-1.4.0.tar.gz 420068 BLAKE2B 586b1d044ea0bb499790b8955a1b7341eaeae92f5c56f0f1d5edb1ebaaa545bdf27371cbe783ac906ddf23946ab757bbaeb0567dabafdc5fd23df2548056383a SHA512 e8c375fa0bc87fa96b18db6213e308a1f32050004c0c8c7d516b548f9d369162431f5f56ebcbb1231be60f5d7a946dcca184c6ff4302952bf3744ba42521cd5c
-EBUILD dymo-cups-drivers-1.4.0-r1.ebuild 1596 BLAKE2B ecd383750f2d5a204d8d0f688de57e54a90db1bba3110900b81647664d62390a01faae3fb540f05c808b7f5870107ca11ed694c4b4b20bc1ec64e5efbdc286ff SHA512 ee12781df59ddb4d2c08f2360096d92c8102b6cf2d385cd214287de4a323119d1321614a5045f5e8bfa70c2cb33c2923343b8c26ccfaeb53882b50e29977c615
-EBUILD dymo-cups-drivers-1.4.0.ebuild 834 BLAKE2B f7550d5f148a959ccb526783bd4696a3949732c4fe7765f6d76b1032daf8f5efc3347b54fff93b5f95851d257ecd9ea728b5e4a9ff9ad0a09567780f0c2b41fa SHA512 3421eeba6021798c3da43037e672f523b1382d91c28e5347adfea62c999ae80b47174f2ea2e3e9d770bc2f4f6c384dcdb91b71395d373fff5734198addd9acbd
-MISC metadata.xml 412 BLAKE2B a5c13d60ae5fdaffa75cb13ec0c1a0e1098a833443326b4b3cf8ef0587377c77ccbb950a98e67ae9c1a8457b80ceedf262f466ce87f95c47577ffade2e61c3bb SHA512 9c907b28318e22a9c72e4fdb00bc9d13d6e30bffcbc3116a441bb2388d9dcbb9ce82df68cd3c413c98d27e8408836fd7e4dfb678be99c133042e94a740f6195e
+EBUILD dymo-cups-drivers-1.4.0-r2.ebuild 1613 BLAKE2B 422e6be44cb749d514ec3e17252ef378b931c52b1695616054924670d52f3b57d8af9d7cce2893c1c4711824fd0b94a7208643f323fee1e0c6e02f114b8777ed SHA512 e7a39e82879e85c00b1d7a7e96fcf16e20f16c88e3ad37d8c8abbb9a5b3c68be35a354cf2bde6b8466f7724fa15257cfc78b90ba31ebaf9cd7f0922b3b4b2359
+MISC metadata.xml 412 BLAKE2B 91e6f9f9856afab076505387b5f5ed7b2672961ae7fa4e63f1d34a6c460483d4249f215a67da6233eef92f87da2a279ba53b95e11dba92351e84a36e702e24b7 SHA512 86a3278589e19f311ad3b4b4cf3c4d3c5ea4bbd9099216c3ef86d5399bcf6341deeb17d9f6e7f8b5c4be48ba9f3bd59fc4dde671526aee09100094a2ccd4cc4b
diff --git a/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0-r1.ebuild b/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0-r2.ebuild
index f5dba4224b3f..4f15dfb3ac98 100644
--- a/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0-r1.ebuild
+++ b/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0-r2.ebuild
@@ -12,20 +12,21 @@ S="${WORKDIR}/${P}.5"
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="test usb_modeswitch"
+IUSE="test usb-modeswitch"
 RESTRICT="!test? ( test )"
 
 KEYWORDS="~amd64 ~x86"
 
-RDEPEND="net-print/cups"
+RDEPEND=">=net-print/cups-2.3.0"
 DEPEND="${RDEPEND}
 	test? ( dev-util/cppunit )
-	usb_modeswitch? ( sys-apps/usb_modeswitch )"
+	usb-modeswitch? ( sys-apps/usb_modeswitch )"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.2.0-cxxflags.patch
 	"${FILESDIR}"/port_to_newer_cups_headers.patch
 	"${FILESDIR}"/dymo-cups-drivers-1.4.0.5-flexible-tests.patch
+	"${FILESDIR}"/cups-2.3.0-headers.patch
 )
 
 DOCS=( AUTHORS README ChangeLog docs/SAMPLES )
@@ -38,9 +39,7 @@ src_prepare() {
 
 src_install() {
 	default
-
-	insinto /usr/share/doc/${PF}
-	doins docs/*.{txt,rtf,ps,png}
+	dodoc docs/*.{txt,rtf,ps,png}
 }
 
 src_test() {
diff --git a/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0.ebuild b/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0.ebuild
deleted file mode 100644
index 3e7e04d9b913..000000000000
--- a/net-print/dymo-cups-drivers/dymo-cups-drivers-1.4.0.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils autotools
-
-DESCRIPTION="Dymo SDK for LabelWriter/LabelManager printers"
-HOMEPAGE="https://newellrubbermaid.secure.force.com/dymopkb"
-SRC_URI="http://download.dymo.com/Download%20Drivers/Linux/Download/${P}.tar.gz"
-
-S="${WORKDIR}/${P}.5"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="test"
-
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="net-print/cups"
-DEPEND="${RDEPEND}
-	test? ( dev-util/cppunit )"
-
-# tests fail but needs to be investigated
-RESTRICT=test
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.2.0-cxxflags.patch
-	epatch "${FILESDIR}"/port_to_newer_cups_headers.patch
-	eautoreconf
-}
-
-DOCS=( AUTHORS README ChangeLog docs/SAMPLES )
-
-src_install() {
-	default
-
-	insinto /usr/share/doc/${PF}
-	doins docs/*.{txt,rtf,ps,png}
-}
diff --git a/net-print/dymo-cups-drivers/files/cups-2.3.0-headers.patch b/net-print/dymo-cups-drivers/files/cups-2.3.0-headers.patch
new file mode 100644
index 000000000000..059c3d0c29c1
--- /dev/null
+++ b/net-print/dymo-cups-drivers/files/cups-2.3.0-headers.patch
@@ -0,0 +1,24 @@
+https://github.com/codeprofis/dymo-cups-drivers/commit/948abc3500f45578a386182c0d2a55bcfcbc2c66.patch
+
+From 948abc3500f45578a386182c0d2a55bcfcbc2c66 Mon Sep 17 00:00:00 2001
+From: Florian Knodt <adlerweb@adlerweb.info>
+Date: Fri, 28 Feb 2020 23:26:34 +0100
+Subject: [PATCH] Add missing backend header. Fixes #11.
+
+---
+ src/common/CupsPrintEnvironment.h | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/src/common/CupsPrintEnvironment.h b/src/common/CupsPrintEnvironment.h
+index 23043d8..76ecefc 100644
+--- a/src/common/CupsPrintEnvironment.h
++++ b/src/common/CupsPrintEnvironment.h
+@@ -21,6 +21,8 @@
+ #ifndef h952b1c81_8931_433a_8479_7ae6d8e85a86
+ #define h952b1c81_8931_433a_8479_7ae6d8e85a86
+ 
++#include <cups/backend.h>
++#include <cups/sidechannel.h>
+ #include "PrinterDriver.h"
+ 
+ namespace DymoPrinterDriver
diff --git a/net-print/dymo-cups-drivers/metadata.xml b/net-print/dymo-cups-drivers/metadata.xml
index 169f1f54e1f4..94da820c05d1 100644
--- a/net-print/dymo-cups-drivers/metadata.xml
+++ b/net-print/dymo-cups-drivers/metadata.xml
@@ -6,6 +6,6 @@
     <description>Occasional access to Dymo LabelWriter 450 Turbo</description>
   </maintainer>
   <use>
-    <flag name="usb_modeswitch">Include usb_modeswitch for some hardware (bug #601242)</flag>
+    <flag name="usb-modeswitch">Include usb_modeswitch for some hardware (bug #601242)</flag>
   </use>
 </pkgmetadata>
diff --git a/net-print/gutenprint/Manifest b/net-print/gutenprint/Manifest
index 09b2a5e2de3b..29488c4ef0fe 100644
--- a/net-print/gutenprint/Manifest
+++ b/net-print/gutenprint/Manifest
@@ -1,4 +1,7 @@
 AUX gutenprint-5.3.1-cflags.patch 659 BLAKE2B 90beb435d0b9a036f31e25f78afedca178b2b6d7bba3cf294ae45699e139d136bbc996dfca86db65d64a61ef004c343ba55f7e097e7304b1d6392efe0ed9cc31 SHA512 f7bac5fd0cff9c1e5b47c965c0304ffda47478241f715de4ada829a295ec54adf198046699bab866166f974c692ac525207f0541e7ba6959e18d63765128327d
+AUX gutenprint-5.3.3-epson.patch 5637 BLAKE2B 7cb05d40e23ca30bd59b0863318d22c9115c4462b960b154a0da61f66f08c4abf31606c762f5b35e4a3a55218e9929c72980d4855f1cfa06b08fc392be81984a SHA512 0cccd8eb17eb66524d79a867624f0822c365268cba9b15d4f71b9d3b8720663e590c24f322f1731fd21bdb863ab15464a980a5e0c76313050941f36c92d9b66b
+AUX gutenprint-5.3.3-selphy-typo.patch 1077 BLAKE2B c8ad7ebb032ac8320b11d88df6cba79dffe68c910f293116d2f04333d53b17fef7baaba5a0d453c6c087ee9f0a6d1150484280c10ac6ae3a9f6d54905d7884ee SHA512 0376b689b3c6d7d630937f56f19efb0d8d9e7a9726af39794106205aeaca00621ec10a56a28fcc25dadf106e66c7956245ee53709cb1cd39f120716dbc6927d1
 DIST gutenprint-5.3.3.tar.xz 5050624 BLAKE2B dbcf74169d0756d991bbdad7338a6e6f995f8eeedc2610677b327abee6aecc787d1cc35949f73c1d93ad274de7d467542b72a5fe0abf58fbc4ec6f21667cbad7 SHA512 d2c47eb4ccc3c46ccb2f1042682edf7443f5c57439ead72f49ecd10537cf967251bacf7ca7da29fb8dceecc7eebd55ed021f2594ff9fb6509bab543fab1dc8d6
-EBUILD gutenprint-5.3.3.ebuild 1913 BLAKE2B 85d129bd65dfda9e1bcd982aeb153b2f96fe726d3e62cc1dc09ebc2d5004e63047f3fb51389afabbfc47bd5e7195ba661e5d162706b985e3e886a40eba5d19f4 SHA512 c0bc210b367f3c3db07100a2fdcdb909d670aeba595c1053b74af60f4e1146ee926a66bf833639395de3052f5ce0eee45eb1091441b7b915082719e39f14ddca
+EBUILD gutenprint-5.3.3-r1.ebuild 1909 BLAKE2B b115e345785d59373c3cfc98c84c1fee3828cc6bc540c6e84b2941b0d35281c0d6e0174705fabf36cfaeac909d1598a2c8f0e784584f2dae707a1f7e19da4d5b SHA512 59cce5fa9265a04fdcf93856efbdc9193fc2611cc792c56782999e0609c99f218ef4081d516b37611c13cb53895e064aa21f7c21b3951e0bf0f0696210b41470
+EBUILD gutenprint-5.3.3-r2.ebuild 2024 BLAKE2B 830c4e05906a48e1fe389cc7c27214e61eb954e183f3296bd92d6345c7909d023fa221827625fbeba72310e2b02e6cce6ae8916aedc877019e2a5d40e496d6a1 SHA512 13401bc23d77b3c0c8569785c68aebfc41646c0c470683d3a6e9046f1417a09d35b0f06fcc8fd32ec6310cb93b712deb2749f753e9a0899967c8fe5bbf8ee330
 MISC metadata.xml 339 BLAKE2B 1090eefd725cc9e37f9c8e77daddb80c3791098af5ba2405dd2746426a46722bef0ed8706654100559735d9f29c2be45eec525cadc0653776dda60453abca786 SHA512 b2153b9425e34eb5561da4d5ea99c08bdfac03b036a94b0c471f985635e2a75f843956cd94d99cbb0d2e2b71b6a14493892bd8efa6eeecf2309ac4b964d9d6a6
diff --git a/net-print/gutenprint/files/gutenprint-5.3.3-epson.patch b/net-print/gutenprint/files/gutenprint-5.3.3-epson.patch
new file mode 100644
index 000000000000..28906470c7f6
--- /dev/null
+++ b/net-print/gutenprint/files/gutenprint-5.3.3-epson.patch
@@ -0,0 +1,54 @@
+From: Robert Krawitz <rlk@alum.mit.edu>
+Date: Sun, 16 Feb 2020 11:21:23 -0500
+Subject: Updates for Epson Stylus Office printers
+
+Add duplex support for the following printers:
+     Epson Stylus Office BX525WD
+     Epson Stylus Office BX535WD
+     Epson Stylus Office BX62F5WD
+     Epson Stylus Office BX635FWD
+     Epson Stylus Office TX620FWD
+
+Origin: upstream
+Closes: #951410
+---
+ src/xml/printers/escp2.xml | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/src/xml/printers/escp2.xml b/src/xml/printers/escp2.xml
+index 28716a4..79f5a70 100644
+--- a/src/xml/printers/escp2.xml
++++ b/src/xml/printers/escp2.xml
+@@ -189,7 +189,7 @@
+       <printer translate="name" name="Epson Stylus Office B30" driver="escp2-of-b30" manufacturer="Epson" model="85" parameters="standard_params" />
+       <printer translate="name" name="Epson Stylus Office B33" driver="escp2-of-b33" manufacturer="Epson" model="85" parameters="standard_params" />
+       <printer translate="name" name="Epson Stylus Office B40W" driver="escp2-of-b40w" manufacturer="Epson" model="92" parameters="standard_params" />
+-      <printer translate="name" name="Epson Stylus Office B42WD" driver="escp2-of-b42wd" manufacturer="Epson" model="92" parameters="standard_params" />
++      <printer translate="name" name="Epson Stylus Office B42WD" driver="escp2-of-b42wd" manufacturer="Epson" model="118" parameters="standard_params" />
+       <printer translate="name" name="Epson Stylus Office B1100" driver="escp2-of-b1100" manufacturer="Epson" model="99" parameters="standard_params" />
+       <printer translate="name" name="Epson Stylus Office T30" driver="escp2-of-t30" manufacturer="Epson" model="85" parameters="standard_params" />
+       <printer translate="name" name="Epson Stylus Office T33" driver="escp2-of-t33" manufacturer="Epson" model="85" parameters="standard_params" />
+@@ -197,17 +197,18 @@
+       <printer translate="name" name="Epson Stylus Office T1100" driver="escp2-of-t1100" manufacturer="Epson" model="99" parameters="standard_params" />
+       <printer translate="name" name="Epson Stylus Office T1110" driver="escp2-of-t1110" manufacturer="Epson" model="99" parameters="standard_params" />
+       <printer translate="name" name="Epson Stylus Office BX300F" driver="escp2-of-bx300f" manufacturer="Epson" model="94" parameters="standard_params" />
+-      <printer translate="name" name="Epson Stylus Office BX525WD" driver="escp2-of-bx525wd" manufacturer="Epson" model="92" parameters="standard_params" />
+-      <printer translate="name" name="Epson Stylus Office BX535WD" driver="escp2-of-bx535wd" manufacturer="Epson" model="92" parameters="standard_params" />
++      <printer translate="name" name="Epson Stylus Office BX305F" driver="escp2-of-bx305f" manufacturer="Epson" model="94" parameters="standard_params" />
++      <printer translate="name" name="Epson Stylus Office BX525WD" driver="escp2-of-bx525wd" manufacturer="Epson" model="118" parameters="standard_params" />
++      <printer translate="name" name="Epson Stylus Office BX535WD" driver="escp2-of-bx535wd" manufacturer="Epson" model="118" parameters="standard_params" />
+       <printer translate="name" name="Epson Stylus Office BX600FW" driver="escp2-of-bx600fw" manufacturer="Epson" model="92" parameters="standard_params" />
+-      <printer translate="name" name="Epson Stylus Office BX625FWD" driver="escp2-of-bx625fwd" manufacturer="Epson" model="92" parameters="standard_params" />
++      <printer translate="name" name="Epson Stylus Office BX625FWD" driver="escp2-of-bx625fwd" manufacturer="Epson" model="118" parameters="standard_params" />
+       <printer translate="name" name="Epson Stylus Office BX630FW" driver="escp2-of-bx630fw" manufacturer="Epson" model="92" parameters="standard_params" />
+-      <printer translate="name" name="Epson Stylus Office BX635FWD" driver="escp2-of-bx635fwd" manufacturer="Epson" model="92" parameters="standard_params" />
++      <printer translate="name" name="Epson Stylus Office BX635FWD" driver="escp2-of-bx635fwd" manufacturer="Epson" model="118" parameters="standard_params" />
+       <printer translate="name" name="Epson Stylus Office SX600FW" driver="escp2-of-sx600fw" manufacturer="Epson" model="92" parameters="standard_params" />
+       <printer translate="name" name="Epson Stylus Office SX620FW" driver="escp2-of-sx620fw" manufacturer="Epson" model="92" parameters="standard_params" />
+       <printer translate="name" name="Epson Stylus Office TX300F" driver="escp2-of-tx300f" manufacturer="Epson" model="94" parameters="standard_params" />
+       <printer translate="name" name="Epson Stylus Office TX600FW" driver="escp2-of-tx600fw" manufacturer="Epson" model="92" parameters="standard_params" />
+-      <printer translate="name" name="Epson Stylus Office TX620FWD" driver="escp2-of-tx620fwd" manufacturer="Epson" model="92" parameters="standard_params" />
++      <printer translate="name" name="Epson Stylus Office TX620FWD" driver="escp2-of-tx620fwd" manufacturer="Epson" model="118" parameters="standard_params" />
+       <printer translate="name" name="Epson Stylus Photo" driver="escp2-photo" manufacturer="Epson" model="9" parameters="standard_params" />
+       <printer translate="name" name="Epson Stylus Photo 700" deviceid="MFG:EPSON;MDL:Stylus Photo 700;DES:EPSON Stylus Photo 700;CMD:ESCPL2,BDC;" driver="escp2-700" manufacturer="Epson" model="7" parameters="standard_params" />
+       <printer translate="name" name="Epson Stylus Photo EX" deviceid="MFG:EPSON;MDL:Stylus Photo EX;CMD:ESCPL2,BDC;" driver="escp2-ex" manufacturer="Epson" model="8" parameters="standard_params" />
diff --git a/net-print/gutenprint/files/gutenprint-5.3.3-selphy-typo.patch b/net-print/gutenprint/files/gutenprint-5.3.3-selphy-typo.patch
new file mode 100644
index 000000000000..393fa718fd36
--- /dev/null
+++ b/net-print/gutenprint/files/gutenprint-5.3.3-selphy-typo.patch
@@ -0,0 +1,22 @@
+From: "Andreas B. Mundt" <andi@debian.org>
+Date: Mon, 4 Nov 2019 18:40:58 +0100
+Subject: Fix 'selpyh' for 'selphy' typo for Canon CP300
+
+Closes: #943964
+---
+ src/cups/backend_canonselphy.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/src/cups/backend_canonselphy.c b/src/cups/backend_canonselphy.c
+index 978df0d..3ef0c31 100644
+--- a/src/cups/backend_canonselphy.c
++++ b/src/cups/backend_canonselphy.c
+@@ -1165,7 +1165,7 @@ struct dyesub_backend canonselphy_backend = {
+ 		{ USB_VID_CANON, USB_PID_CANON_CP100, P_CP_XXX, NULL, "canon-cp100"},
+ 		{ USB_VID_CANON, USB_PID_CANON_CP200, P_CP_XXX, NULL, "canon-cp200"},
+ 		{ USB_VID_CANON, USB_PID_CANON_CP220, P_CP_XXX, NULL, "canon-cp220"},
+-		{ USB_VID_CANON, USB_PID_CANON_CP300, P_CP_XXX, NULL, "selpyhcp300"},
++		{ USB_VID_CANON, USB_PID_CANON_CP300, P_CP_XXX, NULL, "selphycp300"},
+ 		{ USB_VID_CANON, USB_PID_CANON_CP330, P_CP_XXX, NULL, "canon-cp330"},
+ 		{ USB_VID_CANON, USB_PID_CANON_CP400, P_CP_XXX, NULL, "canon-cp400"},
+ 		{ USB_VID_CANON, USB_PID_CANON_CP500, P_CP_XXX, NULL, "canon-cp500"},
diff --git a/net-print/gutenprint/gutenprint-5.3.3.ebuild b/net-print/gutenprint/gutenprint-5.3.3-r1.ebuild
index 9c31813e9e53..259480a4c3bc 100644
--- a/net-print/gutenprint/gutenprint-5.3.3.ebuild
+++ b/net-print/gutenprint/gutenprint-5.3.3-r1.ebuild
@@ -27,7 +27,7 @@ CDEPEND="
 	dev-lang/perl
 	readline? ( sys-libs/readline:0= )
 	cups? ( >=net-print/cups-1.1.14 )
-	gimp? ( <media-gfx/gimp-9999:2 x11-libs/gtk+:2 )
+	gimp? ( media-gfx/gimp:0/2 x11-libs/gtk+:2 )
 	gtk? ( x11-libs/gtk+:2 )
 	nls? ( virtual/libintl )
 "
diff --git a/net-print/gutenprint/gutenprint-5.3.3-r2.ebuild b/net-print/gutenprint/gutenprint-5.3.3-r2.ebuild
new file mode 100644
index 000000000000..2c2cceda92e9
--- /dev/null
+++ b/net-print/gutenprint/gutenprint-5.3.3-r2.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+inherit autotools
+
+DESCRIPTION="Ghostscript and cups printer drivers"
+HOMEPAGE="http://gutenprint.sourceforge.net"
+
+MY_P="${P/_/-}"
+S="${WORKDIR}/${MY_P}"
+SRC_URI="mirror://sourceforge/gimp-print/${MY_P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+IUSE="cups gimp gtk nls readline ppds static-libs"
+REQUIRED_USE="gimp? ( gtk )"
+
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+# gimp restriction: https://sourceforge.net/p/gimp-print/bugs/725/
+CDEPEND="
+	dev-lang/perl
+	readline? ( sys-libs/readline:0= )
+	cups? ( >=net-print/cups-1.1.14 )
+	gimp? ( media-gfx/gimp:0/2 x11-libs/gtk+:2 )
+	gtk? ( x11-libs/gtk+:2 )
+	nls? ( virtual/libintl )
+"
+RDEPEND="${CDEPEND}"
+DEPEND="${CDEPEND}"
+
+RESTRICT="test"
+
+DOCS=( AUTHORS ChangeLog NEWS README doc/gutenprint-users-manual.{pdf,odt} )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.3.1-cflags.patch
+	# From upstream, fixed in next version
+	"${FILESDIR}"/${P}-epson.patch
+	"${FILESDIR}"/${P}-selphy-typo.patch
+)
+
+src_configure() {
+	local myeconfargs=(
+		--enable-test
+		--disable-translated-cups-ppds
+		$(use_enable gtk libgutenprintui2)
+		$(use_with gimp gimp2)
+		$(use_with gimp gimp2-as-gutenprint)
+		$(use_with cups)
+		$(use_enable nls)
+		$(use_with readline)
+		$(use_enable static-libs static)
+	)
+
+	if use cups && use ppds; then
+		myeconfargs+=( --enable-cups-ppds --enable-cups-level3-ppds )
+	else
+		myeconfargs+=( --disable-cups-ppds )
+	fi
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	dodoc doc/FAQ.html
+	dodoc -r doc/gutenprintui2/html
+	rm -r "${ED}"/usr/share/gutenprint/doc || die
+
+	find "${ED}" -name '*.la' -exec rm -f '{}' + || die
+}
+
+pkg_postinst() {
+	if [[ -z ${ROOT} ]] && [[ -x /usr/sbin/cups-genppdupdate ]]; then
+		elog "Updating installed printer ppd files"
+		elog $(/usr/sbin/cups-genppdupdate)
+	else
+		elog "You need to update installed ppds manually using cups-genppdupdate"
+	fi
+}
diff --git a/net-print/hplip-plugin/Manifest b/net-print/hplip-plugin/Manifest
index 41da508bcb64..428f4e44ec07 100644
--- a/net-print/hplip-plugin/Manifest
+++ b/net-print/hplip-plugin/Manifest
@@ -1,5 +1,7 @@
 DIST hplip-3.19.12-plugin.run 11512079 BLAKE2B 534cbba51b2254f8227611b8f0449e100361fb445400f664e43e30412be8eb554bb35c2fe260d45cd5ad742b083af6d551532a9d14585029b0ff93675fab578a SHA512 ac2022d555f5084d5bf1e4519ddbb29828e9ca385aa6dff818ae9e79b60b4b2745e31ad4146cb01bca3747fae0d61b96e4a823b81179d2e2c55a643831165e4b
 DIST hplip-3.20.6-plugin.run 11514108 BLAKE2B 83e2d26fb397c5c5df1fc4371bfc2798cea049965499b6f1ad5daa05b44b74f51ba9deb933b564dfa47a8d0ef79d4921c3a96b9531730317742e1c5651d7b012 SHA512 6f9e5c92e302f4068abbe9134cf7f8081fcbe98568c9b75d6a668843b76c83afd0f4fbb3d90d3ac775c719ab8e2dca5beedd887ef6d072bd8ee0eb48d42521ed
+DIST hplip-3.20.9-plugin.run 11515336 BLAKE2B 27686828374675412ae82a0a5be121c87dbd9ed3adb8d5f30e2f946e315140a5641fdbc60d7f952323060de7fb7bce77b21f19e0d07aa0c5c36e898732030b8b SHA512 bbb5c5768c0f1e88f960f9decff65d70942bc40d8f0443fa2e1c0507895e2e6ba7bc8e0fbec5a74b335787ac45bd3c34cf6bc4d5e544ce7c2ef0965e074a440a
 EBUILD hplip-plugin-3.19.12.ebuild 1301 BLAKE2B f4cd61c24495b61e9928e1b80cee878d647037af127d9b890ddb9301666b69c17efd15103ceab6983a0c18c24e240185ea0d967e6efdff917c3e250ef4094a45 SHA512 2b0c474f02f34078b603c47d02724f198416569befabc6d8ec6abd25b4002ba93a6d600e5aa07dff0092c9fbbd26f8330f04ac31661cbc721c566fab503cfcc9
 EBUILD hplip-plugin-3.20.6-r1.ebuild 1450 BLAKE2B ab91d2d615018b9d377e6397a122f3fa92cbf42ea00441cedd6e7eaa57873cd6137ff558395106f78006c066f18c28856dd171f5ccf0f86fdf1574ba5c848d2f SHA512 694394be4f54bb8e5f7a2ee2a0991fcbe3588dfc1798e3b84168c53087746a17982bd496401dfbe3016f598cf3c275734de5980fc34c23dcaf6cd7165b4ae559
+EBUILD hplip-plugin-3.20.9.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.9.ebuild b/net-print/hplip-plugin/hplip-plugin-3.20.9.ebuild
new file mode 100644
index 000000000000..fa8335f3ab18
--- /dev/null
+++ b/net-print/hplip-plugin/hplip-plugin-3.20.9.ebuild
@@ -0,0 +1,72 @@
+# 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/Manifest b/net-print/hplip/Manifest
index 68a8c3c1a85f..9ee43fbe88fb 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -3,7 +3,11 @@ DIST hplip-3.19.12.tar.gz 25676247 BLAKE2B 1373aa70a2307071c28a22b0ae85e242c3e6b
 DIST hplip-3.20.5-patches-1.tar.xz 12716 BLAKE2B 982480185b2decb9f4e857336b474dab585d64aa44a9f0da70ba568e20488f451507aae3bd1427aef4274d36db93dd9bcb1d906f7b393939dfc43c81a1f9a9db SHA512 ae46a6f490253a1112838b08d56199c6257d33911569619483d925798b54a8bc9fe57afd1e86dedb9482d89d42f44bec81db215f37cbcd8fb5982596c80c1117
 DIST hplip-3.20.6-patches-2.tar.xz 14308 BLAKE2B b9982387364344e90d87769f4f5da2eae06ca9a21685d8d17aa8a0ac446285f806f8fdbc9c0aa3a7fdf6a2daee6440955974c2c34053d3e160931e327a2681da SHA512 e611be1eba5bc0d9c53b0563b5c42e2a06e73031431a40db9c360dc28106736eafa645be7fca86bbcfddf54efe6885369548cea508d51d03125f1807c18a62e3
 DIST hplip-3.20.6.tar.gz 25908476 BLAKE2B cd70d00081ff41d36b566d6f6f546b2cddabb46427afafcd2d04ea7769ce5114feff74612e58ffa83dde4e817ffa2804dbf41411187d9cd15ed7b888b87658ad SHA512 ccd82112afb5ee73f5d027819ab89ba8f52ec36a4b061d314565f95d288be24e045050c3368332eeae50c0fb170f8cb015fdd8dde4b32a08e3758f0f0f4e8e96
+DIST hplip-3.20.9-patches-2.tar.xz 18040 BLAKE2B f218703f5e6f319306b6cd178eb9f91981eed0d0c06b14c6846ad8a79b1d92b66176856f7b8bb272d0fa20194d4150fecf066c11fff5996f32b6fd71e1d6237d SHA512 5aa16f9c4e829774ea9266f30f6cd9d78556ea4ed36abc57cb11975c097c8bfdc44f139f5b1236af79859355ef715ec27d47f187d330541b29361e779d972fff
+DIST hplip-3.20.9.tar.gz 26141198 BLAKE2B 3aa353343ee79ae04dbe94cb9e135469586a50c2052a21ffcff6907be40522a1605f1174b0b8891dea25abb83a3b836350e1e6c9d12ab2798aa826f1d3ce4069 SHA512 d2981cf51f6d893a576c51808710ac9815aa6ac5fdc617d95cc372518731a48b0aca09af721c1792e1531df6cf8fc0ebf5ebd7e9c96950602a830ceed3d441ae
 EBUILD hplip-3.19.12-r1.ebuild 7744 BLAKE2B e19803ef105c70237b7c88d7d45f756a219195f3f0d01ad7040676226f0acba81bb9dc94de2d8ea20081e420155297414a87a303e779bca2d03d5ed82685d1dd SHA512 b15681bbf4f396df4abd145d02a7ddca006cff7619a852b5cbdbcd5fd89d6cf34534aadf5e33114f47a8ab1443453b03f6dac71c71a80ba6740418bd699280b0
 EBUILD hplip-3.20.6-r1.ebuild 7913 BLAKE2B 0d991ff1f5d52716cbfa089c0eb4c0c18340168eec8742b588769f9cee575ece1ad38351db7066a1bddc3fdada1bffdfc6dac42580298811db6dbca128af52eb SHA512 2b7d729e4cb51d1e278eeabf57d18a379bb4545407e468290dc30a7bc7963be84bd54607b75c58b899176d3490066738fe7811e9b5fa0dcb64ecfac4f05de71f
 EBUILD hplip-3.20.6-r3.ebuild 7860 BLAKE2B f214152b4af58e6ae3ec5921705669fba5b450717038e1a11a07fbb4681d95fe84ebb6ce172505e6e31cb5cfea559253c4a913d0481ed15ed181f7c4780407bc SHA512 d9db5ce52c87b9c13187a7a6cf9c3b119ce579f0b5e35525bbdd516c0c0909cb89e5aa7462c41c09bf4c5092de6fa21d76547ce7a0bfcb5c9a4abadd490b8843
+EBUILD hplip-3.20.9-r3.ebuild 7929 BLAKE2B ca7fad7a4eef708d5ac46691dcf39ea2d81037058e748ede78e0086c2998c73e8b2684c26bcd2a6e63e23490c7ac687d0d538ea1a32059bdb377cb63dedb961c SHA512 f2c93711956ca9acd38ab6f3575d3d9090366fe481b2a57a1743a65789b4a04dbd20b404c520cf7bbe7ec66a5bd77b0a58d6c12e9699d679287a13f02a3f1a47
+EBUILD hplip-3.20.9-r5.ebuild 8365 BLAKE2B 29abe2c8df46fd9fd6b4ba6b6eb57628018c0988526ac8330dbdf7d3fb85743c213e93c3622ed5ed671b743efc1833b894c065f596b45b605c4097e81fbfba5d SHA512 e50ab0e75e28fdf12e00b27eff905f6deaef038de8e257e0ff23176504dbd37afa7c40c08babc2d320f2f582c25349ac789564fc912aa0276616a5df91c3cda0
 MISC metadata.xml 1910 BLAKE2B fd9fc7a40bd2bb877e7b4e26104df247dc8c7aa5cbd7211f5d489ec889834aa64fff20d6624f3c8b3e1e4428704cb7f2eb4d1bffc1c6fb15f15b05fd422297e2 SHA512 022854843c9ae373aed3ebd3879c9f1312773dea5dca15c85fb839ff067ea5599532201fa51d9e91ec18b0be1773e2ad544cd4e5697eb9c91be22d8d9352d7ef
diff --git a/net-print/hplip/hplip-3.20.9-r3.ebuild b/net-print/hplip/hplip-3.20.9-r3.ebuild
new file mode 100644
index 000000000000..f7cb7ad36dcb
--- /dev/null
+++ b/net-print/hplip/hplip-3.20.9-r3.ebuild
@@ -0,0 +1,281 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+),xml"
+
+# 14 and 15 spit out a lot of warnings about subdirs
+WANT_AUTOMAKE="1.13"
+
+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.20.9-patches-2.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+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"
+
+COMMON_DEPEND="
+	net-print/cups
+	virtual/jpeg:0
+	hpijs? ( net-print/cups-filters[foomatic] )
+	!minimal? (
+		${PYTHON_DEPS}
+		sys-apps/dbus
+		!libusb0? ( virtual/libusb:1 )
+		libusb0? ( virtual/libusb:0 )
+		scanner? (
+			media-gfx/sane-backends
+		)
+		snmp? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+			net-analyzer/net-snmp:=
+			$(python_gen_cond_dep 'net-dns/avahi[dbus,${PYTHON_MULTI_USEDEP}]')
+		)
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	${COMMON_DEPEND}
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	app-text/ghostscript-gpl
+	!minimal? (
+		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' 'python3*')
+		kernel_linux? ( virtual/udev )
+		$(python_gen_cond_dep '
+			>=dev-python/dbus-python-1.2.0-r1[${PYTHON_MULTI_USEDEP}]
+			dev-python/distro[${PYTHON_MULTI_USEDEP}]
+			fax? ( dev-python/reportlab[${PYTHON_MULTI_USEDEP}] )
+			qt5? (
+				>=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_MULTI_USEDEP}]
+				libnotify? ( dev-python/notify2[${PYTHON_MULTI_USEDEP}] )
+			)
+			scanner? (
+				>=dev-python/reportlab-3.2[${PYTHON_MULTI_USEDEP}]
+				>=dev-python/pillow-3.1.1[${PYTHON_MULTI_USEDEP}]
+				X? (
+					|| (
+						kde? ( kde-misc/skanlite )
+						media-gfx/xsane
+						media-gfx/sane-frontends
+					)
+				)
+			)
+		')
+	)
+	policykit? ( sys-auth/polkit )
+"
+
+REQUIRED_USE="!minimal? ( ${PYTHON_REQUIRED_USE} )"
+
+PATCHES=(
+	"${WORKDIR}/patches"
+)
+
+CONFIG_CHECK="~PARPORT ~PPDEV"
+ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
+
+#DISABLE_AUTOFORMATTING="yes"
+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
+"
+
+pkg_setup() {
+	use !minimal && python-single-r1_pkg_setup
+
+	use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
+
+	if ! use hpcups && ! use hpijs ; then
+		ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
+		ewarn "which is probably not what you want."
+		ewarn "You will almost certainly not be able to print."
+	fi
+
+	if use minimal ; then
+		ewarn "Installing driver portions only, make sure you know what you are doing."
+		ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
+		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
+	else
+		use parport && linux-info_pkg_setup
+	fi
+}
+
+src_prepare() {
+	default
+
+	if use !minimal ; then
+		python_fix_shebang .
+	fi
+
+	# Make desktop files follow the specification
+	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Encoding=.*/d' hplip.desktop.in || die
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Version=.*/d' \
+		-e '/^Comment=.*/d' hplip-systray.desktop.in || die
+
+	# Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
+	# https://bugs.launchpad.net/hplip/+bug/500086
+	local udevdir=$(get_udevdir)
+	sed -i -e "s|/etc/udev|${udevdir}|g" \
+		$(find . -type f -exec grep -l /etc/udev {} +) || die
+
+	# Force recognition of Gentoo distro by hp-check
+	sed -i \
+		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
+		installer/core_install.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf drv_build minimal_build
+
+	if use libusb0 ; then
+		myconf="${myconf} --enable-libusb01_build"
+	else
+		myconf="${myconf} --disable-libusb01_build"
+	fi
+
+	if use hpcups ; then
+		drv_build="$(use_enable hpcups hpcups-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-cups-ppd-install"
+			drv_build="${drv_build} --disable-cups-drv-install"
+		else
+			drv_build="${drv_build} --enable-cups-drv-install"
+			drv_build="${drv_build} --disable-cups-ppd-install"
+		fi
+	else
+		drv_build="--disable-hpcups-install"
+		drv_build="${drv_build} --disable-cups-drv-install"
+		drv_build="${drv_build} --disable-cups-ppd-install"
+	fi
+
+	if use hpijs ; then
+		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-foomatic-ppd-install"
+			drv_build="${drv_build} --disable-foomatic-drv-install"
+		else
+			drv_build="${drv_build} --enable-foomatic-drv-install"
+			drv_build="${drv_build} --disable-foomatic-ppd-install"
+		fi
+	else
+		drv_build="${drv_build} --disable-hpijs-install"
+		drv_build="${drv_build} --disable-foomatic-drv-install"
+		drv_build="${drv_build} --disable-foomatic-ppd-install"
+	fi
+
+	if use minimal ; then
+		if use hpijs ; then
+			minimal_build="--enable-hpijs-only-build"
+		else
+			minimal_build="--disable-hpijs-only-build"
+		fi
+		if use hpcups ; then
+			minimal_build="${minimal_build} --enable-hpcups-only-build"
+		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
+	econf \
+		--disable-cups11-build \
+		--disable-lite-build \
+		--disable-foomatic-rip-hplip-install \
+		--disable-shadow-build \
+		--disable-qt3 \
+		--disable-qt4 \
+		--disable-udev_sysfs_rules \
+		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
+		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
+		--with-docdir=/usr/share/doc/${PF} \
+		--with-htmldir=/usr/share/doc/${PF}/html \
+		${myconf} \
+		${drv_build} \
+		${minimal_build} \
+		--enable-hpps-install \
+		--disable-class-driver \
+		$(use_enable doc doc-build) \
+		$(use_enable !minimal gui-build) \
+		$(use_enable !minimal dbus-build) \
+		$(use_enable parport pp-build) \
+		$(use_enable policykit) \
+		$(use_enable qt5) \
+		$(use_enable scanner scan-build) \
+		$(use_enable snmp network-build)
+
+	# hpijs ppds are created at configure time but are not installed (3.17.11)
+
+	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+	# The hpcups driver does not use foomatic-rip
+	#local i
+	#for i in ppd/hpijs/*.ppd.gz ; do
+	#	rm -f ${i}.temp || die
+	#	gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+	#		gzip > ${i}.temp || die
+	#	mv ${i}.temp ${i} || die
+	#done
+}
+
+src_install() {
+	# Disable parallel install
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=578018
+	emake -j1 DESTDIR="${D}" install
+	einstalldocs
+	# default
+
+	# Installed by sane-backends
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
+	rm -f "${ED}"/etc/sane.d/dll.conf || die
+
+	# Remove desktop and autostart files
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=638770
+	use qt5 || {
+		rm -Rf "${ED}"/usr/share/applications "${ED}"/etc/xdg
+	}
+
+	rm -f "${ED}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
+	rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/doc/${PF}/ || die
+
+	# Remove hal fdi files
+	rm -rf "${ED}"/usr/share/hal || die
+
+	find "${D}" -name '*.la' -delete || die
+
+	if use !minimal ; then
+		python_optimize "${ED}"/usr/share/hplip
+	fi
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-print/hplip/hplip-3.20.9-r5.ebuild b/net-print/hplip/hplip-3.20.9-r5.ebuild
new file mode 100644
index 000000000000..c7b0fa78fc6b
--- /dev/null
+++ b/net-print/hplip/hplip-3.20.9-r5.ebuild
@@ -0,0 +1,288 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6,7,8} )
+PYTHON_REQ_USE="threads(+),xml"
+
+# 14 and 15 spit out a lot of warnings about subdirs
+WANT_AUTOMAKE="1.13"
+
+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.20.9-patches-2.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+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"
+
+COMMON_DEPEND="
+	net-print/cups
+	sys-apps/dbus
+	virtual/jpeg:0
+	hpijs? ( net-print/cups-filters[foomatic] )
+	!libusb0? ( virtual/libusb:1 )
+	libusb0? ( virtual/libusb:0 )
+	${PYTHON_DEPS}
+	!minimal? (
+		scanner? (
+			media-gfx/sane-backends
+		)
+		snmp? (
+			!libressl? ( dev-libs/openssl:0= )
+			libressl? ( dev-libs/libressl:= )
+			net-analyzer/net-snmp:=
+			$(python_gen_cond_dep 'net-dns/avahi[dbus,${PYTHON_MULTI_USEDEP}]')
+		)
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+DEPEND="
+	${COMMON_DEPEND}
+"
+RDEPEND="
+	${COMMON_DEPEND}
+	app-text/ghostscript-gpl
+	!minimal? (
+		$(python_gen_cond_dep 'dev-python/pygobject:3[${PYTHON_MULTI_USEDEP}]' 'python3*')
+		kernel_linux? ( virtual/udev )
+		$(python_gen_cond_dep '
+			>=dev-python/dbus-python-1.2.0-r1[${PYTHON_MULTI_USEDEP}]
+			dev-python/distro[${PYTHON_MULTI_USEDEP}]
+			fax? ( dev-python/reportlab[${PYTHON_MULTI_USEDEP}] )
+			qt5? (
+				>=dev-python/PyQt5-5.5.1[dbus,gui,widgets,${PYTHON_MULTI_USEDEP}]
+				libnotify? ( dev-python/notify2[${PYTHON_MULTI_USEDEP}] )
+			)
+			scanner? (
+				>=dev-python/reportlab-3.2[${PYTHON_MULTI_USEDEP}]
+				>=dev-python/pillow-3.1.1[${PYTHON_MULTI_USEDEP}]
+				X? (
+					|| (
+						kde? ( kde-misc/skanlite )
+						media-gfx/xsane
+						media-gfx/sane-frontends
+					)
+				)
+			)
+		')
+	)
+	policykit? ( sys-auth/polkit )
+"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+PATCHES=(
+	"${WORKDIR}/patches"
+)
+
+CONFIG_CHECK="~PARPORT ~PPDEV"
+ERROR_PARPORT="Please make sure kernel parallel port support is enabled (PARPORT and PPDEV)."
+
+#DISABLE_AUTOFORMATTING="yes"
+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
+"
+
+pkg_setup() {
+	python-single-r1_pkg_setup
+
+	use scanner && ! use X && ewarn "You need USE=X for the scanner GUI."
+
+	use parport && linux-info_pkg_setup
+
+	if use minimal ; then
+		ewarn "Installing driver portions only, make sure you know what you are doing."
+		ewarn "Depending on the USE flags set for hpcups or hpijs the appropiate driver"
+		ewarn "is installed. If both USE flags are set hpijs overrides hpcups."
+		ewarn "This also disables fax, network, scanner and gui support!"
+	fi
+
+	if ! use hpcups && ! use hpijs ; then
+		ewarn "Installing neither hpcups (USE=-hpcups) nor hpijs (USE=-hpijs) driver,"
+		ewarn "which is probably not what you want."
+		ewarn "You will almost certainly not be able to print."
+	fi
+}
+
+src_prepare() {
+	default
+
+	python_fix_shebang .
+
+	# Make desktop files follow the specification
+	# Gentoo bug: https://bugs.gentoo.org/show_bug.cgi?id=443680
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/1080324
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Encoding=.*/d' hplip.desktop.in || die
+	sed -i -e '/^Categories=/s/Application;//' \
+		-e '/^Version=.*/d' \
+		-e '/^Comment=.*/d' hplip-systray.desktop.in || die
+
+	# Fix for Gentoo bug https://bugs.gentoo.org/show_bug.cgi?id=345725
+	# Upstream bug: https://bugs.launchpad.net/hplip/+bug/880847,
+	# https://bugs.launchpad.net/hplip/+bug/500086
+	local udevdir=$(get_udevdir)
+	sed -i -e "s|/etc/udev|${udevdir}|g" \
+		$(find . -type f -exec grep -l /etc/udev {} +) || die
+
+	# Force recognition of Gentoo distro by hp-check
+	sed -i \
+		-e "s:file('/etc/issue', 'r').read():'Gentoo':" \
+		installer/core_install.py || die
+
+	eautoreconf
+}
+
+src_configure() {
+	local drv_build minimal_build
+
+	if use hpcups ; then
+		drv_build="$(use_enable hpcups hpcups-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-cups-ppd-install"
+			drv_build="${drv_build} --disable-cups-drv-install"
+		else
+			drv_build="${drv_build} --enable-cups-drv-install"
+			drv_build="${drv_build} --disable-cups-ppd-install"
+		fi
+	else
+		drv_build="--disable-hpcups-install"
+		drv_build="${drv_build} --disable-cups-drv-install"
+		drv_build="${drv_build} --disable-cups-ppd-install"
+	fi
+
+	if use hpijs ; then
+		drv_build="${drv_build} $(use_enable hpijs hpijs-install)"
+		if use static-ppds ; then
+			drv_build="${drv_build} --enable-foomatic-ppd-install"
+			drv_build="${drv_build} --disable-foomatic-drv-install"
+		else
+			drv_build="${drv_build} --enable-foomatic-drv-install"
+			drv_build="${drv_build} --disable-foomatic-ppd-install"
+		fi
+	else
+		drv_build="${drv_build} --disable-hpijs-install"
+		drv_build="${drv_build} --disable-foomatic-drv-install"
+		drv_build="${drv_build} --disable-foomatic-ppd-install"
+	fi
+
+	if use minimal ; then
+		if use hpijs ; then
+			minimal_build="--enable-hpijs-only-build"
+		else
+			minimal_build="--disable-hpijs-only-build"
+		fi
+		if use hpcups ; then
+			minimal_build="${minimal_build} --enable-hpcups-only-build"
+		else
+			minimal_build="${minimal_build} --disable-hpcups-only-build"
+		fi
+		minimal_build="${minimal_build} --disable-fax-build"
+		minimal_build="${minimal_build} --disable-network-build"
+		minimal_build="${minimal_build} --disable-scan-build"
+		minimal_build="${minimal_build} --disable-gui-build"
+	else
+		if use fax ; then
+			minimal_build="${minimal_build} --enable-fax-build"
+		else
+			minimal_build="${minimal_build} --disable-fax-build"
+		fi
+		if use snmp ; then
+			minimal_build="${minimal_build} --enable-network-build"
+		else
+			minimal_build="${minimal_build} --disable-network-build"
+		fi
+		if use scanner ; then
+			minimal_build="${minimal_build} --enable-scan-build"
+		else
+			minimal_build="${minimal_build} --disable-scan-build"
+		fi
+		if use qt5 ; then
+			minimal_build="${minimal_build} --enable-qt5"
+			minimal_build="${minimal_build} --enable-gui-build"
+		else
+			minimal_build="${minimal_build} --disable-gui-build"
+			minimal_build="${minimal_build} --disable-qt5"
+		fi
+	fi
+
+	# disable class driver for now
+	econf \
+		--disable-class-driver \
+		--disable-foomatic-rip-hplip-install \
+		--disable-cups11-build \
+		--disable-lite-build \
+		--disable-shadow-build \
+		--disable-qt3 \
+		--disable-qt4 \
+		--disable-udev_sysfs_rules \
+		--with-cupsbackenddir=$(cups-config --serverbin)/backend \
+		--with-cupsfilterdir=$(cups-config --serverbin)/filter \
+		--with-docdir=/usr/share/doc/${PF} \
+		--with-htmldir=/usr/share/doc/${PF}/html \
+		--enable-hpps-install \
+		--enable-dbus-build \
+		${drv_build} \
+		${minimal_build} \
+		$(use_enable doc doc-build) \
+		$(use_enable libusb0 libusb01_build) \
+		$(use_enable parport pp-build) \
+		$(use_enable policykit)
+
+	# hpijs ppds are created at configure time but are not installed (3.17.11)
+
+	# Use system foomatic-rip for hpijs driver instead of foomatic-rip-hplip
+	# The hpcups driver does not use foomatic-rip
+	#local i
+	#for i in ppd/hpijs/*.ppd.gz ; do
+	#	rm -f ${i}.temp || die
+	#	gunzip -c ${i} | sed 's/foomatic-rip-hplip/foomatic-rip/g' | \
+	#		gzip > ${i}.temp || die
+	#	mv ${i}.temp ${i} || die
+	#done
+}
+
+src_install() {
+	# Disable parallel install
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=578018
+	emake -j1 DESTDIR="${D}" install
+	einstalldocs
+	# default
+
+	# Installed by sane-backends
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=201023
+	rm -f "${ED}"/etc/sane.d/dll.conf || die
+
+	# Remove desktop and autostart files
+	# Gentoo Bug: https://bugs.gentoo.org/show_bug.cgi?id=638770
+	use qt5 || {
+		rm -Rf "${ED}"/usr/share/applications "${ED}"/etc/xdg
+	}
+
+	rm -f "${ED}"/usr/share/doc/${PF}/{copyright,README_LIBJPG,COPYING} || die
+	rmdir --ignore-fail-on-non-empty "${ED}"/usr/share/doc/${PF}/ || die
+
+	# Remove hal fdi files
+	rm -rf "${ED}"/usr/share/hal || die
+
+	find "${D}" -name '*.la' -delete || die
+
+	python_optimize "${ED}"/usr/share/hplip
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/net-print/pnm2ppa/Manifest b/net-print/pnm2ppa/Manifest
index 5ce39205ae92..1a3651b502d6 100644
--- a/net-print/pnm2ppa/Manifest
+++ b/net-print/pnm2ppa/Manifest
@@ -1,3 +1,3 @@
 DIST pnm2ppa-1.13.tar.gz 291190 BLAKE2B c348f5582e8014a8dcc349a6254a302ce3e8272984b96828b3ce9f012654fb2520624aed6db2a97c3f0cbaf2be608a0d83da2b5b2b799e7500f89a6927c6d0d6 SHA512 8f96792cf7f03fd024db9a8d338f06d7484fa4474c1cd73048c90f0e88ae5540df30e6894c0bbc82dfd87126fc72875b6d71b2031c0e24b343ef88f51d00bb7a
-EBUILD pnm2ppa-1.13-r1.ebuild 1526 BLAKE2B 7e71f75ca5aabbb855b8c2e6018cfe737cfe345c6e204651a35713744243aa1f5c22abab50b596a401be6710116c2b7b126df170190c84779cd85c096bee0fe4 SHA512 9c6ba563811eb5970e883ff913885d7d128a14c9ed3fa60b7d004600fcadc6788e7f20b9d5bdd5da072a8f151fec23f62b33c28795b7344b70b737434e962bdd
+EBUILD pnm2ppa-1.13-r1.ebuild 1608 BLAKE2B 14c102f73eeca346bcd62eb134beeb9f262b650d5d1f741af87bf343d9ba7328990e8ef34f40ca458bfe2a7942a822326feb4d135d5515dc5d374b5ce9344e43 SHA512 c7efad8319669399b5d7ce400b296297bee2e94a64bff25ac161194673c2e0e28e3fccf53515506a3ffb42b21f07991f8f6a0b0f7661c921cc1c156ff9106fb3
 MISC metadata.xml 336 BLAKE2B 82376654bf2d655189b054c7e2168a59019ab7a5513fc7e4e306a5e8f9bb3eba86adfcb5fa4f1e112550d0123fa130446cb943e34b77b434f9278063caf0466d SHA512 345cc7f244621dee98b191a5b9704783490eccf9b27cda4c8d052657ebb35dc441ab752014a34f171115b26a9a2d8650c9cb2afc788e9271be6d91d47de3a507
diff --git a/net-print/pnm2ppa/pnm2ppa-1.13-r1.ebuild b/net-print/pnm2ppa/pnm2ppa-1.13-r1.ebuild
index 55c86714e946..bab71f44628c 100644
--- a/net-print/pnm2ppa/pnm2ppa-1.13-r1.ebuild
+++ b/net-print/pnm2ppa/pnm2ppa-1.13-r1.ebuild
@@ -1,17 +1,15 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=4
-
-inherit base
+EAPI=7
 
 DESCRIPTION="Print driver for Hp Deskjet 710, 712, 720, 722, 820, 1000 series"
 HOMEPAGE="http://pnm2ppa.sourceforge.net"
 SRC_URI="mirror://sourceforge/pnm2ppa/${P}.tar.gz"
 
-KEYWORDS="~amd64 ~x86"
-SLOT="0"
 LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
 IUSE="syslog"
 
 # en on first place so others can override it
@@ -25,8 +23,7 @@ RDEPEND="
 	net-print/cups
 	>=net-print/cups-filters-1.0.43-r1[foomatic]
 	sys-libs/glibc
-	syslog? ( virtual/logger )
-"
+	syslog? ( virtual/logger )"
 DEPEND="${RDEPEND}"
 
 src_configure() {
@@ -65,13 +62,17 @@ src_install() {
 
 	exeinto /etc/pdq/drivers/ghostscript
 	doexe pdq/gs-pnm2ppa
+
 	exeinto /etc/pdq/interfaces
 	doexe pdq/dummy
 
 	# install docs
-	cd docs/en
+	cd docs/en || die
 	dodoc CALIBRATION*txt COLOR*txt PPA*txt RELEASE* CREDITS README sgml/*.sgml
 
-	cd "${S}"
-	dohtml -r .
+	cd "${S}" || die
+	docinto html/docs/en
+	dodoc docs/en/*.html
+	docinto html/ppa_protocol
+	dodoc ppa_protocol/*.html
 }