gentoo resync : 30.05.2020

15 files changed, 45 insertions, 112 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 60b48c2dce4e..d346bd86c4d2 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cnijfilter2/Manifest b/net-print/cnijfilter2/Manifest
index 779b2dc37940..c7710b271097 100644
--- a/net-print/cnijfilter2/Manifest
+++ b/net-print/cnijfilter2/Manifest
@@ -1,6 +1,7 @@
 AUX cnijfilter2-5.20-gentoo.patch 1535 BLAKE2B c3861e039d0ecce6f1940c1f998ce23ab2834f18a7394c82070e83d7de4d7860869775d5e017a8e26999f3798090bcffab699916263953afbc52a24f39b3bb23 SHA512 29458eabdfe3f7c66b47ddbd490c741b78a3cb9b375be1769e65d2240e732fc184005de226eed8985f77aa153c00c39463d9fce41ba79a439874ebb031acb70d
 AUX cnijfilter2-5.70-gentoo.patch 1786 BLAKE2B 96c0f8b919dbc896c7b749ef52cc1c6f331921fe55b196782b613389372c5ba382b8a7f1e5f6e326bcfae4652cf4d1c40fcd052f435c721301cf4cdf7433faaa SHA512 9cc2b0a069a8ec045bdedb41e9f6246f6245ae5fb4567a23f03516bbc0d6661d54faa291a976d8a89ee216df31db4515ee04123f9ba7e1cfd629f3191c6ff657
 AUX cnijfilter2-5.80-cflags.patch 475 BLAKE2B 18cee126ff7bc58cce31e22bccbc220b3f3a149dce1d3e68a070739a08715d6093cb41e6db12bc8a3ade0d9e73ea18d9ed1b666c84f8364d263bf585a666c60f SHA512 ca36f72b0a4f5a1e9fa7c57722a55b3eb5f907fd86cdb92ec27cd1f8cd6bdba6f27b50612eb03c774d823a17598fcb475b1ea9fdba10b6de5d0acd575ddee07e
+AUX cnijfilter2-5.80-fno-common.patch 486 BLAKE2B 688d66202fddd0afeb757e7933fbf38af6cb65ee3a805e8af75a0c8c6bbf9e6951d2b5376c0204830c457a77d06d3f942a420496b98aafafe6df42f651b1da41 SHA512 fd5a21de395e93975b2118c06a6957de85157e4cac8b3c473f48f00cbd56e7178b59c03396ece47f21f49414eb7acdff53952469dca5498b875e0c488af80b53
 DIST cnijfilter2-source-5.20-1.tar.gz 466507 BLAKE2B 1ca96153350a157f56dfed691a04dcbe1e3ab5462b59c0cd919316a7c54a36bbeb34cf4205132f0aa3e5a23f89eb260c35c1a3ee14ea85bc36b9e3b67cd7e3f7 SHA512 60be49d34adf9a4d2cd8337cccb36eb8c078e9712bf8043c3552f1d83c3da307badfe34fc3683c99e3234da30f4ba82e0c4a0b48ea5f78f0d66db1408bd7d495
 DIST cnijfilter2-source-5.40-1.tar.gz 817298 BLAKE2B 1088eb19c70ed9133c38b8a6da9fbc26c42d6f077fda01678fb4485c2db21a17567fab8ab5c9565ece7ea13e5fac3f7c5842e984116d6c595e7a1f19092d3461 SHA512 bb4ce18864037fae9735fcb1b2c3198fe39f8abe0caa754e457e3cb0d03767742d82ff4fddf81451215395b23eea8207a880e238558e0ea2ac5c359186ecd859
 DIST cnijfilter2-source-5.50-1.tar.gz 1129057 BLAKE2B 20208b1fa679a4303b5f47ae733224fa1346277d539e62688ecbfaa6a1a9f7b01cb4742c299ec188d59787e4175896dfe8d812f8aa936977f8168d823216b239 SHA512 9a99d0230fb9498d2b17648e58009efa5812fe5c076c11fdc6c2afeec453e355c1e3406053330e965e46be23651df6b887d0edb20eebd564554a7bf31b155186
@@ -10,5 +11,5 @@ EBUILD cnijfilter2-5.20.ebuild 1403 BLAKE2B 1daedead655b9573ea422a8374bf04449bae
 EBUILD cnijfilter2-5.40.ebuild 1515 BLAKE2B 5c7452ce92474cc403a1051b622e18ff257759bfd80b45c0e928ecf2a68e69a78eefa31ec60f29e1c4c9aa218dbab5141ccb1251a9fd46f171332dbf069975ae SHA512 0e75f8248fe1d14e2bede4e172e662492c7e2483c2dbebe66d1a8ba719df3b3c6da31f83dd2be7c71db98367a62f969a6a0ad1d7cf8ea68eb17bfdc4f6097171
 EBUILD cnijfilter2-5.50.ebuild 1510 BLAKE2B b4d914fa287c315528c6598821ff75a8b7f9b14d5fc605dba5b35794f19fa9573733ad3f1575fbc908c988a6547f27d4752161b3af93f5146f9d39cb9cc53052 SHA512 16189d363f5464c492b788dfc75c2f3b45f91489d3f93983d4c449f8e7df99263ba3ae7c3514ad71869c1f1de6a8373cbd10797ac1d0e08aa32f2484100e8b63
 EBUILD cnijfilter2-5.70.ebuild 1520 BLAKE2B 526de368e3ada4e675ab6bd8b3cfc84fa6314a233be92ca072de738945011a1a76f017c0da1d6516d8879d2abfcd9636f4999860984298d5f3135b81b242c978 SHA512 44f3775f11b07387448703a7102a7d498ece24f5750e141a6838b994e4a9050a19b990514fe9a17a138683349372e40cfb6f178f3ded7cc6e6d6266d6f1e0d45
-EBUILD cnijfilter2-5.80.ebuild 1770 BLAKE2B c496c271e33c95c2af7c5d8ee5277defa10156d7e890665967f703ec449c24cf9b2896dfa2f3fda072f819195dcd3fe41b616486d9f55d24589394d3a8bc8aea SHA512 62ff4e92043814160283ea3112f9ed5d4a8ce6618486c318e6a24a4961c1992fce6052583acbc6e75a48020ffc97de48c6d772194eae4788fb895ae4fd2c88b8
+EBUILD cnijfilter2-5.80.ebuild 1807 BLAKE2B f1cb80a0e64fd7a82fd5115cdf9844dd06953b61419a2bec7251824b7a9a60c5a90836a53ef935789f0403fa7b424a38c19de60f8edfb14229d7621121edeeb1 SHA512 59dca6a4ff8431ead84c062d6fa126584e706dd7152079651d93ac9fbb67388181d5579f7f12607e52209a4de9aae24593585f1ec6f7663b9772352304e805d5
 MISC metadata.xml 247 BLAKE2B ca08677c4c0af66af431abe578122a2ea0278f7ffabab245eec806167a6226c65f97e9826d64fc4b82eb14b6200cd1e3a31a5b4999e18aac41a4f9af43d708d6 SHA512 fff6c25e644477aaa35b838e10c44ca8eae9824ef8f19795e31201db40c10068f0216dec38deb0ba80782155b43fd1d72fb888cb825eaabacc3bd1ec0d18f3ca
diff --git a/net-print/cnijfilter2/cnijfilter2-5.80.ebuild b/net-print/cnijfilter2/cnijfilter2-5.80.ebuild
index 4efba8cd2e1c..ec45c101ab1f 100644
--- a/net-print/cnijfilter2/cnijfilter2-5.80.ebuild
+++ b/net-print/cnijfilter2/cnijfilter2-5.80.ebuild
@@ -34,6 +34,7 @@ S="${WORKDIR}"/${MY_P}
 PATCHES=(
 	"${FILESDIR}"/${PN}-5.70-gentoo.patch
 	"${FILESDIR}"/${P}-cflags.patch
+	"${FILESDIR}"/${P}-fno-common.patch
 )
 
 src_prepare() {
diff --git a/net-print/cnijfilter2/files/cnijfilter2-5.80-fno-common.patch b/net-print/cnijfilter2/files/cnijfilter2-5.80-fno-common.patch
new file mode 100644
index 000000000000..7374aa92fba9
--- /dev/null
+++ b/net-print/cnijfilter2/files/cnijfilter2-5.80-fno-common.patch
@@ -0,0 +1,11 @@
+--- a/lgmon3/src/cnijlgmon3.c	2020-05-16 19:28:03.585781655 +0200
++++ b/lgmon3/src/cnijlgmon3.c	2020-05-16 19:28:13.488625335 +0200
+@@ -55,7 +55,7 @@
+ int (*GET_STATUS)(char *, int, int *, int * , char *);
+ int (*GET_STATUS2)(char *, int, char *, int *, int * , char *, char *);
+ int (*GET_STATUS2_MAINTENANCE)(char *, int, char *, int *, int * , char *, char *);
+-int (*GET_PROTOCOL)(char *, size_t);
++static int (*GET_PROTOCOL)(char *, size_t);
+ 
+ 
+  int main(int argc, char *argv[])
diff --git a/net-print/cups-pdf/Manifest b/net-print/cups-pdf/Manifest
index 31650e19a9b9..114335135a46 100644
--- a/net-print/cups-pdf/Manifest
+++ b/net-print/cups-pdf/Manifest
@@ -1,7 +1,3 @@
-DIST cups-pdf_2.6.1.tar.gz 33315 BLAKE2B 8268777d9c604622a801e663f9aac9ea1fd7253ea87f1f65c7954134f7473b7d8baf94cec09c5dd14bb5470df47ea4484cfbd90afb4b0da652395d657011f86d SHA512 60702159907f95e005c93a38551b5aaa65b7e4b8e009b48becf4523d606c4bbb127e81e5acf8519ce4c9aed90b41deb01d80171f3145086351dbd022863a3816
-DIST cups-pdf_3.0.0.tar.gz 29654 BLAKE2B ec1e89eb876161bd2b123568448e9b0075537aacc01623ca2ae5128f946ff2ea797893a009bcf88a1f26af9755d803e57de2271b4cd828fed00e74790f66f9f8 SHA512 14420e50b9ac93d12e75b98ba8c3456d35a3bcce0778eee8308ac7a3c3a987b4dca5a4f140353bd2060a5f0f4d3434c442b00ea309660b4e5a72fe11dba25276
 DIST cups-pdf_3.0.1.tar.gz 29754 BLAKE2B f964358c5e465447e703848a697f6c801624a1836e2a0a4026c507c66048cf4bef92327508598ec7e9a356d4f57894a6b610e55b7a9a34e942cf2b88c6c55b85 SHA512 a06580f3056dddbb883c8db0c71b37b883482ae1ac8aa9bcfd85e679c4dcb44278006b7110d2988173d0eeb05b0f19fb39081fad49bf26839235e97fbe27a818
-EBUILD cups-pdf-2.6.1.ebuild 1066 BLAKE2B 6ebcbd0235ffc72793fac8d9c10a11a21ccdf73efa9be1fe30b05ab38c8816cba38fbdf1c431f142a86e47f6e875eb371a843c3def3029f6c52d401a7af3b5eb SHA512 4d5b8c93c71b63720007abf54c319393a7b8d0e23b8142e12d79a5040a4adfbef81e4d121f3ca5fd56508b647d93962d649c846920eabcaad5b6d03c827f3d7e
-EBUILD cups-pdf-3.0.0.ebuild 893 BLAKE2B c91dc95e2f693ae7de87dc407c20826ff55c5a04dc123712024a4776558e6451bc8ef8af0b50db22cde9172ab0d6f3f0b25bf29f7540b3461987d3333d414e8e SHA512 18e8f9b02d82db9dea38dc8001cc5fafd22f545c53da1df15dac1c84023df3fcae63706f324b7ae8935ccfff149aaffe87833f93db185f5ccccd6b283d69c1c4
 EBUILD cups-pdf-3.0.1.ebuild 887 BLAKE2B b48e41fea1577d3a768243f6ade288d9f58f2a2d1cb2ce67b8e81bbe1bf496bac1c83af992043aaeae05b41948c568cdaf294bf81022e615d7e3bf0768add305 SHA512 453f117686e6761900a3e86a3eda8efe354aee7f03538434ceaafff3d43f9f5d465737ee4726aa2027019fafbb9ca6140cb25b5c4e0d2256d15ec54afd7ae67e
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/net-print/cups-pdf/cups-pdf-2.6.1.ebuild b/net-print/cups-pdf/cups-pdf-2.6.1.ebuild
deleted file mode 100644
index 785c25e65104..000000000000
--- a/net-print/cups-pdf/cups-pdf-2.6.1.ebuild
+++ /dev/null
@@ -1,46 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=4
-
-inherit toolchain-funcs
-
-DESCRIPTION="Provides a virtual printer for CUPS to produce PDF files"
-HOMEPAGE="https://www.cups-pdf.de/"
-SRC_URI="https://www.cups-pdf.de/src/${PN}_${PV}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ppc x86"
-IUSE=""
-
-DEPEND="net-print/cups
-	app-text/ghostscript-gpl"
-RDEPEND="${DEPEND}"
-
-src_compile() {
-	cd "${S}"/src
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} -o ${PN} ${PN}.c || die "Compilation failed."
-}
-
-src_install() {
-	exeinto /usr/libexec/cups/backend
-	exeopts -m0700
-	doexe src/cups-pdf
-
-	insinto /usr/share/cups/model
-	doins extra/CUPS-PDF.ppd
-
-	insinto /etc/cups
-	doins extra/cups-pdf.conf
-
-	dodoc ChangeLog README
-	newdoc contrib/Contents contrib_Contents
-}
-
-pkg_postinst() {
-	elog "Please view both the README and contrib_Contents files"
-	elog "as you may want to adjust some settings and/or use"
-	elog "contributed software. In the latter case you may need"
-	elog "to extract some files from the ${P} distfile."
-}
diff --git a/net-print/cups-pdf/cups-pdf-3.0.0.ebuild b/net-print/cups-pdf/cups-pdf-3.0.0.ebuild
deleted file mode 100644
index b2a6c83640ab..000000000000
--- a/net-print/cups-pdf/cups-pdf-3.0.0.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs
-
-DESCRIPTION="Provides a virtual printer for CUPS to produce PDF files"
-HOMEPAGE="https://www.cups-pdf.de/"
-SRC_URI="https://www.cups-pdf.de/src/${PN}_${PV/_}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
-IUSE="+ppds"
-
-RDEPEND="
-	net-print/cups
-	app-text/ghostscript-gpl
-"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}/${PN}-${PV/_}
-
-src_compile() {
-	pushd src >/dev/null
-	$(tc-getCC) ${LDFLAGS} ${CFLAGS} ${PN}.c -o ${PN} -lcups || die
-	popd >/dev/null
-}
-
-src_install() {
-	exeinto /usr/libexec/cups/backend
-	exeopts -m0700
-	doexe src/cups-pdf
-
-	insinto /etc/cups
-	doins extra/cups-pdf.conf
-
-	insinto /usr/share/cups/model
-	if use ppds; then
-		doins extra/CUPS-PDF_opt.ppd
-	else
-		doins extra/CUPS-PDF_noopt.ppd
-	fi
-
-	dodoc ChangeLog README
-}
diff --git a/net-print/epson-inkjet-printer-escpr/Manifest b/net-print/epson-inkjet-printer-escpr/Manifest
index 225a6e2cc5de..46a4b679fb7d 100644
--- a/net-print/epson-inkjet-printer-escpr/Manifest
+++ b/net-print/epson-inkjet-printer-escpr/Manifest
@@ -1,4 +1,5 @@
 AUX 1.6.5-warnings.patch 1115 BLAKE2B eac889dc8f5b39bbcf633c3ff2469ba1d3e07f475aa29f82e2ff81568aa72e2a3c25018c481b9d56bfd321314fb931561bbaed5b0883597c6fb296465ac486f1 SHA512 8a32ce7d22bb97cf1a7c1864353cab4a148eb4d1dc599f355420e0119dfb89abbfb66cbe58c8f35e2f8fc3a62b0c4018e0d48065acd21b17cb250e4722b9e027
+AUX epson-inkjet-printer-escpr-1.7.7-fnocommon.patch 309 BLAKE2B 70e10c99dcf8b5d06acd38722f419c09f994253538d88cc9621051ee58b8a9cbe203c35c279c9ef8b5f0f7cd091118a0b2ccf802e09e2996f4e6346e7927f695 SHA512 5cff64797453868d1d0540a22fd72b53d7214d2e9c574cdf635206baf71fc227147babcfe97c73193ca356ad40afa5bb7ea80107576efee138b936e052b9fb2d
 DIST epson-inkjet-printer-escpr-1.7.7-1lsb3.2.tar.gz 4767015 BLAKE2B a50be3f9975183c64a55225d81cb607ffbb018843aab682b077e7ab236e02b20d0d2aecbdb6fed58daab78d8d2382745f434d7dfec6098c2d8c111d2b4e4fabd SHA512 9663b9ed425fbe5d3f2b6f85f036cdbd230665919e2cc9d62a33ebae85a0068513417209dae97ce55e406124b92c96c455cdc204d3d2335f4215f57b79f9d2a9
-EBUILD epson-inkjet-printer-escpr-1.7.7.ebuild 868 BLAKE2B 48fd71b3831c386359db04fdfe40ec6b28982a011d536a2281417a4dd9d740bf745dcc24871f8007563e16f3aedeec05c95d8945064a8e9fd635a7b914c34570 SHA512 87937d67f848e1eb580a7316bceed6437d56a20d722a56c05963971c1cd062a2083395b604065fc1d9898a6952877db2064dea76b595d551feeb4c4e4eff8856
+EBUILD epson-inkjet-printer-escpr-1.7.7.ebuild 905 BLAKE2B 695aab74d4662046dfd60bff6bce0b9f821a702d380e4cebd17041e1d38a1ea222a53f0f677b433f9832dd6f4342448b284647e3d87fd0d63a6bd63faf2461b9 SHA512 751842ffc2d98fac16d34584c9f8a2c47da4e3fbc7441911d3fce5acde1a9f7177001321bcaf35ae7a74fa9c90352b5aeee4560c84f0e82125245b223b833955
 MISC metadata.xml 253 BLAKE2B 9f98272e44d92f62df07adebeb8942eb26113e29ae3021a9d1ef478a1bc2bdd26bd4700cc7d88dab9c5fd78d54958327997e9849c100ac00fbe051915ab3f2e0 SHA512 e8bc4d02500676e2506fbe7f0811be984878560deb05d09122cede2e62e633fb7644fa59b73a20da8f3fceea8f8cb928768726e8b679f32178c0aed9a874ea15
diff --git a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.7.ebuild b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.7.ebuild
index 1e0db2c8f85a..5407e22e9813 100644
--- a/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.7.ebuild
+++ b/net-print/epson-inkjet-printer-escpr/epson-inkjet-printer-escpr-1.7.7.ebuild
@@ -14,7 +14,10 @@ KEYWORDS="amd64 ~ppc64"
 DEPEND="net-print/cups"
 RDEPEND="${DEPEND}"
 
-PATCHES=( "${FILESDIR}/1.6.5-warnings.patch" )
+PATCHES=(
+	"${FILESDIR}/1.6.5-warnings.patch"
+	"${FILESDIR}/${P}-fnocommon.patch"
+)
 
 src_configure() {
 	econf --disable-shared
diff --git a/net-print/epson-inkjet-printer-escpr/files/epson-inkjet-printer-escpr-1.7.7-fnocommon.patch b/net-print/epson-inkjet-printer-escpr/files/epson-inkjet-printer-escpr-1.7.7-fnocommon.patch
new file mode 100644
index 000000000000..e2e35719ca8f
--- /dev/null
+++ b/net-print/epson-inkjet-printer-escpr/files/epson-inkjet-printer-escpr-1.7.7-fnocommon.patch
@@ -0,0 +1,11 @@
+--- a/src/filter.c	2020-05-23 13:50:19.064756474 +0200
++++ b/src/filter.c	2020-05-23 13:53:01.936647646 +0200
+@@ -68,7 +68,7 @@
+ extern EPS_UINT8*   tmpLineBuf;
+ 
+ extern EPS_CMN_FUNC epsCmnFnc;
+-EPS_JOB_FUNCS		jobFnc;
++extern EPS_JOB_FUNCS	jobFnc;
+ 
+ extern EPS_INT32 tonerSave;
+ extern EPS_INT32 back_type;
diff --git a/net-print/hplip-plugin/Manifest b/net-print/hplip-plugin/Manifest
index faf9510eb98d..24564adfe54f 100644
--- a/net-print/hplip-plugin/Manifest
+++ b/net-print/hplip-plugin/Manifest
@@ -1,5 +1,5 @@
 DIST hplip-3.19.12-plugin.run 11512079 BLAKE2B 534cbba51b2254f8227611b8f0449e100361fb445400f664e43e30412be8eb554bb35c2fe260d45cd5ad742b083af6d551532a9d14585029b0ff93675fab578a SHA512 ac2022d555f5084d5bf1e4519ddbb29828e9ca385aa6dff818ae9e79b60b4b2745e31ad4146cb01bca3747fae0d61b96e4a823b81179d2e2c55a643831165e4b
-DIST hplip-3.20.2-plugin.run 11517273 BLAKE2B 2e1a4829fad70c575ee86b02b80057cf5e3bd7d6ef2e5d76a532290b699ec908ef57e568938607ce8ee7ff8150aa4096ce6425023ce671150b7fac69310ec82b SHA512 632e9d5a0381b568fb1766df493134b9d8c53c13bd5da1e7e06fdf8369d8f30205378e64fec3372104b44ce6ed6a5e9c1f587914f0ad6454a750d07d384e5d28
+DIST hplip-3.20.3-plugin.run 11514166 BLAKE2B 15ff8caf13f82256a5e814acf2b0433a6d365cea8b0073ea133f2e8a175796be04b058f44f68fb86c0f43f4a7c0bebf14f486aa93548b5155490e7240d02355a SHA512 3481c852aed773d3b3bcecd203066476a670eb506688381c54bc88f4057ad15da99b128d8a1cc2358985c0b3772b5538e75988dd66221f50dcea78f9bab2e3ce
 EBUILD hplip-plugin-3.19.12.ebuild 1582 BLAKE2B a32bc580eaf2ee335739306a8f5661bd7bf3a0a49f2bd7fdf0ddab0265418807122d680d385e76a5eae243d2e56029ddb7d74ee9f362ec338290ff226b33e003 SHA512 a423e2ef0f2663ed772cebf37517d5373737c6c68ff387ece0aa17a43a934b4338ba2f2ff395b67ca00ae8f9e7b29f587e86c69cfb461dde6c0e9273358e851b
-EBUILD hplip-plugin-3.20.2.ebuild 1582 BLAKE2B a32bc580eaf2ee335739306a8f5661bd7bf3a0a49f2bd7fdf0ddab0265418807122d680d385e76a5eae243d2e56029ddb7d74ee9f362ec338290ff226b33e003 SHA512 a423e2ef0f2663ed772cebf37517d5373737c6c68ff387ece0aa17a43a934b4338ba2f2ff395b67ca00ae8f9e7b29f587e86c69cfb461dde6c0e9273358e851b
+EBUILD hplip-plugin-3.20.3.ebuild 1582 BLAKE2B a32bc580eaf2ee335739306a8f5661bd7bf3a0a49f2bd7fdf0ddab0265418807122d680d385e76a5eae243d2e56029ddb7d74ee9f362ec338290ff226b33e003 SHA512 a423e2ef0f2663ed772cebf37517d5373737c6c68ff387ece0aa17a43a934b4338ba2f2ff395b67ca00ae8f9e7b29f587e86c69cfb461dde6c0e9273358e851b
 MISC metadata.xml 334 BLAKE2B 8f1a0784c57af6204db98f443bdb09df2a6432674d711a5ecf577c20e29f04a030549ea19c6e04f51cd9a36e60a6da94bebafbfcc10d52da87109e59c32d42ee SHA512 105a5442ba05b94b2886f9075bd89268d4f2e0567ad69a637a1bd7d7d0eafdc280dfdb198aab5d72525300a9be0d4ad78f6bfe6398c896cc9de0f591651d102c
diff --git a/net-print/hplip-plugin/hplip-plugin-3.20.2.ebuild b/net-print/hplip-plugin/hplip-plugin-3.20.3.ebuild
index 315136510139..315136510139 100644
--- a/net-print/hplip-plugin/hplip-plugin-3.20.2.ebuild
+++ b/net-print/hplip-plugin/hplip-plugin-3.20.3.ebuild
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 04ad9aa65d8e..fd5d3c48503b 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -1,8 +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.2.tar.gz 25675649 BLAKE2B 8e98768736fe4ec667852fccebf2bb178047eedb1d92b995d3107ea4c8ba618caa24204c48069b06333a2797dabdf14e1d7d066f5aca77e2c88a85c7080223e6 SHA512 9343eca569c8367e8207708a76351c0f97472500d07f26b62867b4001d504f24b2d2ecfe431e8019623477e7e5d55623d5d91848b4aba71c3e88c8302ed51b4c
 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.5.tar.gz 25774089 BLAKE2B b1d95e5551ead7818c7fb8529edffea59718944e6838370594f20f8e4917ee23d0beb85f1b68867c332c196ab863f8479ab9b645ce57d9b03dae59fd1cab5f0a SHA512 fce3c7b8a2f3b0d2875bafd2ff65a3312fae867b658cd45eea16d9f3663646b6b0b70b58e6c2b46eb24627cdeefb318b6ca9ccf5a0e9790ff19519518992da07
 EBUILD hplip-3.19.12-r1.ebuild 7827 BLAKE2B e57c664d4802fed5721dc0d1d8a211ac292e955bf647d8b453fdf42a40214cd4a61918e764c24cc1dacaee05c77e5b3a8ca0fc7822c9c17e7089cf6b8a7a0692 SHA512 7f4cedf809f7b42c70ad46bc7674789becd4ecd24129465aa892885f80998a86d2919c371ecbe733a2654a8604a427739c85fe63edadebce7f53f5d687594739
-EBUILD hplip-3.20.2.ebuild 7832 BLAKE2B a6330e829cb0dbbf580ee6b41c2599a0fcb14ff6323a28f3feec3c00d7c0dde8915767c6e29c4738078bbd915b9f1226fb2bda57ad577a02985ac4a849c7b4d7 SHA512 79f50926870307c4825dee5268199bcfda42db0973cf10ea720a0907bf2f8e789710012d196e3e468cda66e941125777693415b0b8f55b12f57dfe67b685a415
-EBUILD hplip-3.20.3.ebuild 7873 BLAKE2B 5d44edb2e7b6b4716a6d57ebbf41d7b129ed34d57be4fe4bbbb909170c833c61ab7edb65b42bc73465f63432516d762c231efe1a462029ed89339c14f8531eb2 SHA512 c93ab876029bf2065c5ad607902cf99dddd1d2c1bc8caca43856409fdfe2b7933c137cef1ad68fde0cfa5135d76ea399df5f5bb18b57861bef1903c17ece5af9
+EBUILD hplip-3.20.3.ebuild 7869 BLAKE2B 16becfe7b3e8285b8e52326a84f66fe14a64a698c9eae228517196317424b59de1e651dd820c53ea562d046cfb74d6b15c74af6f9772a475f85186be244a52db SHA512 77556fc147f1b3593cdf57d856ce39278a8def19d2e39e2724eb30c4c4e064088570c331f78256ea5fde2b9d25bbce9c8a7e68ef146bfe31397754d351be755b
+EBUILD hplip-3.20.5.ebuild 7872 BLAKE2B 045c2a2f812087de1a717a7de4fac16e30de507ec7048100313e3477c5b3debb70b3215ed1df0d5d840f4e0350f2187c391b6d8af3dfc962b04499fd4b9448f9 SHA512 ea05d3c9019870aaf58c4a833775f3ffc4306569892803e716c528bdd7cc24488977ff1dbe546f5ea92fad3c5cda217baef92529ec13d4dc6690258208071a65
 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.3.ebuild
index d24a1c95865e..8dd5f02c2525 100644
--- a/net-print/hplip/hplip-3.20.3.ebuild
+++ b/net-print/hplip/hplip-3.20.3.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
+KEYWORDS="amd64 arm ppc64 x86"
 
 IUSE="doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
 
diff --git a/net-print/hplip/hplip-3.20.2.ebuild b/net-print/hplip/hplip-3.20.5.ebuild
index 49cad9be3506..19c12999e53d 100644
--- a/net-print/hplip/hplip-3.20.2.ebuild
+++ b/net-print/hplip/hplip-3.20.5.ebuild
@@ -3,22 +3,22 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{6,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
+inherit autotools flag-o-matic 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.5-patches-1.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 
 IUSE="doc fax +hpcups hpijs kde libnotify libressl -libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
 
@@ -54,6 +54,7 @@ RDEPEND="
 		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}]
@@ -117,7 +118,6 @@ src_prepare() {
 	default
 
 	if use !minimal ; then
-		python_export EPYTHON PYTHON
 		python_fix_shebang .
 	fi
 
@@ -148,6 +148,8 @@ 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
@@ -264,7 +266,6 @@ src_install() {
 	find "${D}" -name '*.la' -delete || die
 
 	if use !minimal ; then
-		python_export EPYTHON PYTHON
 		python_optimize "${ED}"/usr/share/hplip
 	fi