gentoo resync : 29.06.2020

15 files changed, 35 insertions, 320 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 572c9f392e35..546e4fd4defe 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/brlaser/Manifest b/net-print/brlaser/Manifest
index 4a1f79f75bf5..5c5ee255e375 100644
--- a/net-print/brlaser/Manifest
+++ b/net-print/brlaser/Manifest
@@ -1,5 +1,5 @@
 DIST brlaser-4.tar.gz 21963 BLAKE2B 03d5e16ff9b6a6838c82b197bec4a868e6be5752ad9a1df393b646b35642da8f2e1528031b10ece3b0cd7c6c426ff76d1df83c73a51bcac7abac803cd0a66535 SHA512 1e08091adc371a35f75c245fd86f132aae7811a00bd7e9d194c47038dc9aa29296fbf8769cef6b8ea42d82467857195ba8024a9d6de8048174ecc44e0bb76067
 DIST brlaser-6.tar.gz 22807 BLAKE2B be8041c1b6ddb8c4e5055fa35edc2c764562b2b4e52cad17aa968a51886621264d6bf289bd7bb5af0148098bb72aa96adea603091b38c3a245068d60737e80fc SHA512 d7e0e63b64be9ae7633381622c13ba0589e5fe58d277212bce4f5bb712a291ed0b0f2ac3d450dce61c7f9052c1ce7323fec66b5005c5cb3da1314b284d20f06f
 EBUILD brlaser-4.ebuild 425 BLAKE2B 7f00a81d641549355c179df3a23aceda8123fbb03ba2c435998e348024eaee2bd7fd0d357f96c5c978ffa64f70bda794a6ddf12961c4c4777200643573c9c25d SHA512 7daf3afc30fb45d95d68706d6ffe5b13dea0041f4604ebc2b44ad7341e31be2800e1d9a7f8193237b0d215896493176ff56673187de7c6a0f9f9f672665d6cc4
-EBUILD brlaser-6.ebuild 421 BLAKE2B 87d923c261444873473640b80b77c583f39ae123923033f54a9de3101a44cd6c1bfd2e43ae177a79f2432a3c099e3bc78177453cfb298334f43c01cea8ac2e62 SHA512 7f2f93b1c74d4eb3fc3c6a41f9a2d7823a412abe5a801500a0da3fdf9efa97752cae508c8ca7d4eaf2656f1042c2a75480c2248f73aa6fa34060290a03e1bb33
+EBUILD brlaser-6.ebuild 420 BLAKE2B 46798f8b312aedcf3b82660a55bd7334d6ce458f2f1718e7ab85b21d840a18d25ce09fe10b64567dabff27d6f01c5b511ff4afa55acd5b828f41d7164b170633 SHA512 3549bb3f5fe79613e121f4e089d27dffcd2fae90a856ee4d91ef5e5b49455f1b65407fb28ca79ae8636516d53f5155812ca6e85e41f133e13df8a2a27b7d78a6
 MISC metadata.xml 493 BLAKE2B 12ad209b87255457d7f70dcd68fe65d38252473d905c92cfa529996d2e117070011b0b91e1230806a5790611b3935cfdbf2bf484da65dcd50045a43fb1be8191 SHA512 4cdf7aa5a98fefdd13150b4d03534f9586429ae00b294bace8bbb25c59e11205b3d74a7f281707e7c60aa1a04c5b3a671865bf6d078ebc7f237b33bd23569418
diff --git a/net-print/brlaser/brlaser-6.ebuild b/net-print/brlaser/brlaser-6.ebuild
index 1faee9ad08d7..df8a0251088f 100644
--- a/net-print/brlaser/brlaser-6.ebuild
+++ b/net-print/brlaser/brlaser-6.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/pdewacht/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 DEPEND="net-print/cups"
 RDEPEND="
diff --git a/net-print/cnijfilter2/Manifest b/net-print/cnijfilter2/Manifest
index c7710b271097..13957a986859 100644
--- a/net-print/cnijfilter2/Manifest
+++ b/net-print/cnijfilter2/Manifest
@@ -1,4 +1,5 @@
 AUX cnijfilter2-5.20-gentoo.patch 1535 BLAKE2B c3861e039d0ecce6f1940c1f998ce23ab2834f18a7394c82070e83d7de4d7860869775d5e017a8e26999f3798090bcffab699916263953afbc52a24f39b3bb23 SHA512 29458eabdfe3f7c66b47ddbd490c741b78a3cb9b375be1769e65d2240e732fc184005de226eed8985f77aa153c00c39463d9fce41ba79a439874ebb031acb70d
+AUX cnijfilter2-5.50-gentoo.patch 276 BLAKE2B 9805afacbdc9e3a9dfcb13b250606058f55c8f33a71018f919ae61e5f252563c701b08faaef8e380491897e3fc89669879be159b52b556886f63bb6f13c20cf4 SHA512 206b808460b4c6f5c8f7fd5e999d6fd501e278a97ea79a4f2bbbdb8e061a3641bac7033cf55d75c0681a99b69aa152ac2cf512e54b2fde3339685a3c2e0af326
 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
@@ -9,7 +10,7 @@ DIST cnijfilter2-source-5.70-1.tar.gz 1366033 BLAKE2B 0d03c4c4f4bc00ea91cc46db65
 DIST cnijfilter2-source-5.80-1.tar.gz 1422542 BLAKE2B 046fa72752c5645f307dbee3f2d5f01cd24484859a2d9002135cbcaa9dba0adb3b8d961c7adede8aedd816d4932c526474e7cd252c13e1cef56a427b3b58740d SHA512 060af4834472d21f50f3a431ff6a1bfb36e14348b58eaa777ae471d44062d76b7fd3f247da1818f893285a94ac0335f656e3d026fc613d338dc2ce4d8e242d21
 EBUILD cnijfilter2-5.20.ebuild 1403 BLAKE2B 1daedead655b9573ea422a8374bf04449baed0d9f845fb64852f0a3515694d6a24cb799f83d98074553808b6e3cadeb273a4b54c1a743d079658c5f093f1cadf SHA512 e316d08d3e04b5bdc2b3281c4e2d983b8bb4d4a46b7b32b088fa65c370f613ec3a4a6d48252f620125974212b4c235d42316ef73c7748fed940ab44442d09027
 EBUILD cnijfilter2-5.40.ebuild 1515 BLAKE2B 5c7452ce92474cc403a1051b622e18ff257759bfd80b45c0e928ecf2a68e69a78eefa31ec60f29e1c4c9aa218dbab5141ccb1251a9fd46f171332dbf069975ae SHA512 0e75f8248fe1d14e2bede4e172e662492c7e2483c2dbebe66d1a8ba719df3b3c6da31f83dd2be7c71db98367a62f969a6a0ad1d7cf8ea68eb17bfdc4f6097171
-EBUILD cnijfilter2-5.50.ebuild 1510 BLAKE2B b4d914fa287c315528c6598821ff75a8b7f9b14d5fc605dba5b35794f19fa9573733ad3f1575fbc908c988a6547f27d4752161b3af93f5146f9d39cb9cc53052 SHA512 16189d363f5464c492b788dfc75c2f3b45f91489d3f93983d4c449f8e7df99263ba3ae7c3514ad71869c1f1de6a8373cbd10797ac1d0e08aa32f2484100e8b63
+EBUILD cnijfilter2-5.50.ebuild 1824 BLAKE2B 0bf3b50902e82594459eda12e60e7e7f5e95114c3c075434465c3922ea8cdc11785bb5ed40a9f664e1a98a3d666809a5a9f0aa660dc86edaa8a2598d0b2595d1 SHA512 9582f2fd8a578546000ffbc31d925802079e6131f0b907a0e9a846ff51341b171b5e25c578440808fac5782038bf8c2a63fc4343c588d733a0f4db9ab52187ca
 EBUILD cnijfilter2-5.70.ebuild 1520 BLAKE2B 526de368e3ada4e675ab6bd8b3cfc84fa6314a233be92ca072de738945011a1a76f017c0da1d6516d8879d2abfcd9636f4999860984298d5f3135b81b242c978 SHA512 44f3775f11b07387448703a7102a7d498ece24f5750e141a6838b994e4a9050a19b990514fe9a17a138683349372e40cfb6f178f3ded7cc6e6d6266d6f1e0d45
 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.50.ebuild b/net-print/cnijfilter2/cnijfilter2-5.50.ebuild
index b8e27bb386da..99edb10a5be2 100644
--- a/net-print/cnijfilter2/cnijfilter2-5.50.ebuild
+++ b/net-print/cnijfilter2/cnijfilter2-5.50.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
 
@@ -21,13 +21,25 @@ DEPEND="virtual/libusb:1
 	net-print/cups"
 RDEPEND="${DEPEND}"
 
+QA_FLAGS_IGNORED=(
+	"/usr/lib.*/libcnbpnet30.so.1.0.0"
+	"/usr/lib.*/libcnbpcnclapicom2.so.5.0.0"
+	"/usr/lib.*/libcnnet2.so.1.2.4"
+	"/usr/lib.*/libcnbpnet20.so.1.0.0"
+	/usr/bin/cnijlgmon3
+)
+
 S="${WORKDIR}"/${MY_P}
 
-PATCHES=( "${FILESDIR}"/${PN}-5.20-gentoo.patch )
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.20-gentoo.patch
+	"${FILESDIR}"/${P}-gentoo.patch
+	"${FILESDIR}"/${PN}-5.80-cflags.patch
+)
 
 src_prepare() {
 	default
-	DIRS="cmdtocanonij2 cnijbe2 lgmon3 rastertocanonij tocanonij tocnpwg"
+	DIRS="cmdtocanonij2 cmdtocanonij3 cnijbe2 lgmon3 rastertocanonij tocanonij tocnpwg"
 	LIBDIR=com/libs_bin$(usex amd64 64 32)
 	for d in ${DIRS}; do
 		mv "${d}"/configure.{in,ac} || die
@@ -40,6 +52,7 @@ src_prepare() {
 	echo "SUBDIRS= ${DIRS}" >> Makefile.am
 	sed -i \
 		-e "/^CFLAGS/d" \
+		cnijbe2/src/Makefile.am \
 		*/configure.ac || die
 	eautoreconf
 	cd ${LIBDIR}
@@ -53,7 +66,7 @@ src_prepare() {
 }
 
 src_configure() {
-	LDFLAGS="-L"${S}"/${LIBDIR}" econf --enable-progpath="${EPREFIX}/usr/bin"
+	LDFLAGS="-L${S}/${LIBDIR} ${LDFLAGS}" econf --enable-progpath="${EPREFIX}/usr/bin"
 }
 
 src_install() {
diff --git a/net-print/cnijfilter2/files/cnijfilter2-5.50-gentoo.patch b/net-print/cnijfilter2/files/cnijfilter2-5.50-gentoo.patch
new file mode 100644
index 000000000000..a7322bbce860
--- /dev/null
+++ b/net-print/cnijfilter2/files/cnijfilter2-5.50-gentoo.patch
@@ -0,0 +1,8 @@
+--- a/cmdtocanonij3/filter/Makefile.am.old	2018-01-14 18:14:20.645473030 +0100
++++ b/cmdtocanonij3/filter/Makefile.am	2018-01-14 18:14:36.078219959 +0100
+@@ -1,4 +1,4 @@
+-filterdir=$(libdir)/cups/filter
++filterdir=$(libexecdir)/cups/filter
+ 
+ filter_PROGRAMS= cmdtocanonij3
+ 
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index 99c34c040f0e..d1d738651cd0 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -2,5 +2,5 @@ AUX cups-browsed.init.d-r1 154 BLAKE2B 81a1b1b6c8b6f0d7ac874c32aa5c5531b7d791711
 AUX cups-filters-1.27.4-make-missing-testfont-non-fatal.patch 510 BLAKE2B 9b48f841b7034b4c56ed6ea7d229696aacc232b9d78c9984dad6db8f6e967e239c77dbb35886230ac968966ee04912add135a5932ca1483674e1bf2c087e81fc SHA512 ce14af0a4d2db1e67471b8986290261ac17709720fe5a52a6a81bda19e4ae7e4ab92a8f1e954b82b792690f9eae8116c59ee3a11594256a36bf8cff32846e97c
 DIST cups-filters-1.27.4.tar.xz 1493860 BLAKE2B 424c3ba73ec7d6f4683eaedde86d657b1a2da17670c84097f5f3f8ef525cc8cc6d7843a88d35013a5f48bba8a903f7504df9054427b9a63d748ce39de458e71f SHA512 8005e94bb6b06d0a15fa4dfd8455d0bc67418478bf517e205af1c8c0018681a97ae9ea486db07570050ebeeb7f63f75319a8fe012c112c6d16c0941299eaa50e
 EBUILD cups-filters-1.27.4.ebuild 3599 BLAKE2B eb2b2f3dce938b6516342c4926f962f35b51fcc8eb6d1ff5c3d2311515c78c68febfd1fd59633d120cc3fee71b2ed6119d1503e1937e1084560b10b2b4527abe SHA512 78120456764f960f89ae41405286f7b1105be5db5c3cf6cd852bb620120bb56a96798d08a469580947616851d3d23d4f47e5d28830476c8833a8194c6d9e2f8e
-EBUILD cups-filters-9999.ebuild 3608 BLAKE2B 52b38a7ff26bb0ae9e761e413a84edac3378fb24e0ae5a823f562ed06df45bca60a5f38f01feb3b72cba894d34668fb6428db052219c1392f681768b3fbe0929 SHA512 5a53ec01c203f44c531507480d04ce041016fa7afcab7b2e40f9f35657c5e9a15e2d0897c941bb3d3849679cb9898dd379d8ce74060406dfb920de388de5a8a6
-MISC metadata.xml 560 BLAKE2B ef0a2d2d0db2d065b1dcb444a6bf3333cc3cc8658629ffcdf44e9d39c4f13d8adb5e5b770d4abeb76fea5d4d3e85968daaf2ce2d9a13d3f396ab91f51b1ef723 SHA512 b734c24f2b65bc5c7d13b1ec8ec86f2188d758c295f7bd5aad12a794498ec92d43d543a0aed2ff49013c26aa3baf1f3e03fead90bd5c7f70bf430d48c063b06a
+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-9999.ebuild b/net-print/cups-filters/cups-filters-9999.ebuild
index 7abb7a7fcbf0..651c4dab158f 100644
--- a/net-print/cups-filters/cups-filters-9999.ebuild
+++ b/net-print/cups-filters/cups-filters-9999.ebuild
@@ -31,11 +31,9 @@ RDEPEND="
 	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 )
diff --git a/net-print/cups-filters/metadata.xml b/net-print/cups-filters/metadata.xml
index 8c940c947b64..4a6a4ace1fb1 100644
--- a/net-print/cups-filters/metadata.xml
+++ b/net-print/cups-filters/metadata.xml
@@ -9,9 +9,6 @@
   <flag name="foomatic">
      Build the included foomatic-rip printer driver. Strongly recommended.
   </flag>
-  <flag name="ipp_autosetup">
-     Let cups-browsed automatically set up IPP network printers by default.
-  </flag>
   <flag name="pclm">
      Enable PCLm support
   </flag>
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index d75387a9df94..29a2a7cb8e93 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -1,11 +1,10 @@
 AUX cups-1.4.4-nostrip.patch 487 BLAKE2B efc4b3db44b65a1b0c67c472e467d80b486969396a48443b8e6be007ba991bdf6830b1e36965bae053753440528e1aa58d792c4f42bea8464ffed1179f049960 SHA512 10f46e841aa5646f40564e92b6c5b90a5d27702ea8a4dd8652cfd39834be54feec20a2c8d4fea663b90685865deae17851e57161aad7ff250916ce4accbb01fa
 AUX cups-2.0.1-xinetd-installation-fix.patch 332 BLAKE2B 5688eeabaea0d2db636012e658f5cbbf6793138653df731c24c89149553994a2db423f85251385628de2f467597af98baa91ab954f63f77b5f7eec037d8db7af SHA512 e4111fb05ac381f5639868464734fbbc9296252bda288fc415274cb0eda37ff57d4d2816e34960a3e30a1c73c3aa6911267a5d2c29f1480d8e44fdb6e95f3836
 AUX cups-2.0.2-rename-systemd-service-files.patch 2092 BLAKE2B c34d8d6c5295aea6eaeb5aea05dcf32a9a554d445ae1b57b8d33386394e1d3f414095d89dc55eb0d4c5678e2985c37451e64101e6426bc2ad26aa50404b51844 SHA512 409a7508dccbbcfca60ba448f8cea84ecb2710890e7655c67b8292c34c8d555884e7e82e70c2c700691af1a786ce0d8c8c799b6fb471a18f1b87eda99eacd9cb
-AUX cups-2.2.0-dont-compress-manpages.patch 319 BLAKE2B b03a0ab815751055d79475423242bbc407e934cdc00e4596ab05e3d7f87ca0feb7201f6696a8eef59fdb73630431364f12146f1d32743e272de054019acb8380 SHA512 0f4822e50f9376dc2e8c87b55f6526ab514f5f08f737071f5b15696e71b51416203df6c9219d78989544bbc135cd92be91ef351a377be7ab4052e98c25c0c4f5
 AUX cups-2.2.6-fix-install-perms.patch 660 BLAKE2B 85c42742762dc72c746550c36160c5fd13b10727fa4e40793b7072c88c3856c580e408180819acc1668da06024b30173fd71f725175981305c739aaa40b7ba65 SHA512 f64ed254bc79935ea3d9fce4c4cd8074445397c20ee1bc1e759e3bc7a336b30f73722357d2702219932e7a774f925abf9a450d3b30a12ca1f0c5f3c92b0b5fbf
 AUX cups-2.3.3-user-AR.patch 593 BLAKE2B 4794e162b156075a507707296a045226af5f6342870fb7173017ff530aa052b4467cc64c03cfc80d4e2d3500e584e6c313414ed7237acaeda8a8107c3ed2e65a SHA512 ec570a3a7bd6710f50e8e702755a106158f8a2fd9b7e2efad6e345f12210bbd79e450f60ae0d30ae838f1abf1b4c7fd89d13363d2e4bbacd653177b60f05786c
 AUX cupsd.init.d-r3 584 BLAKE2B f503663a59673209fc6c161aed3cc214cab2b3e68692078dc47c1a833fe141225f48f2d07dab65fc19ea68e54bb7c9a7c94f6db1dac443111d04b392fd7855a4 SHA512 ace66b46c17f99f8c6487188c14e8a1baf7acad602156b88cdae7fb4738c163a045240a1b28c6db4af86caa317723357186812eed81f9553a9ef3517c966c6b3
 DIST cups-2.3.3-source.tar.gz 8140741 BLAKE2B 427e6ee3602aec33ac336d9b2c6c8eb270f2996371f0edd3d69e411b94b2e93fc58a0032ba9f6d048f2c58a1c6b48f742671b4011cd725b882adfcc06ed7fd8a SHA512 7d6f4a01794c5599cc71525778ea785fd17271c31ac146a56e8fc374a88f99e4035d018dae48e37e541455e9cc93b302e892b2e93ec558c1b4bfc46dad68c92d
 EBUILD cups-2.3.3-r1.ebuild 9669 BLAKE2B 3e5176e8489b9c1fb71054f0081daf723ed0472e2bb72afd574dcfa6929bb20a190173e49c29ebf50648dc9b2a273e03c354fee48a87c41e6e887b46f4112a41 SHA512 987e89faa67760aa987f509099926e5cbc1508d6cae5de92b5895415c65423fd6f99a98095fbdf8b32bbfb3a7c701d79f6ca880be87f5c2ab6f5d26087134426
 EBUILD cups-9999.ebuild 9637 BLAKE2B 8790be1a982a75e70c7aee3b09a5c7be45bc6846a17313ad1ec7ff8838fa39f87c1b2ef89334330adb71540e3a68955490d59ba9699c3fb727c1251638714fd8 SHA512 e565b74c705798090368a0601331303df8574a66f7975c1c63a2531e3ac9e2124a45c11003051997c58babfa37f1720f3fcbaf217385d1bd40b2b119ddb3165f
-MISC metadata.xml 733 BLAKE2B 2014cd9267e3f7f1a4f73124ab6bb9f4ba80b95ef08c9a781a03a95bbb3f97dadeb9e1a239d8dea5a6f6678d99eb906a2835df0168c13ba5456baff8ab3c6e0f SHA512 e4e2342cb4b0598fc23486753d9296254da78eb7d448fbdc250a2ba181e5692002e1e671799971c9cfaf25d40e034e3e2752836067b1b24813cfb3ed1b682e22
+MISC metadata.xml 527 BLAKE2B 432203e09b4b13065dd0fa3a799e1b707f079b146e4d89583fcde60b1a4d09ac21805573faee9c67fecbcb0fc364c22cda310d2b4ecc92be3f39c985b20fcbd5 SHA512 0f1469c396e9e47504ec44a1e4a8db2c6dbf34e4e8cd36862cee7b58d0402873273cb9b3b24ef9b676566cafa10aed6547f8d4b50233af7257ab1d8d828b483d
diff --git a/net-print/cups/files/cups-2.2.0-dont-compress-manpages.patch b/net-print/cups/files/cups-2.2.0-dont-compress-manpages.patch
deleted file mode 100644
index 7b61b39f16ad..000000000000
--- a/net-print/cups/files/cups-2.2.0-dont-compress-manpages.patch
+++ /dev/null
@@ -1,17 +0,0 @@
---- cups-2.2.0/config-scripts/cups-manpages.m4
-+++ cups-2.2.0/config-scripts/cups-manpages.m4
-@@ -53,10 +53,10 @@
- 		;;
- 	Linux* | GNU* | Darwin*)
- 		# Linux, GNU Hurd, and macOS
--		MAN1EXT=1.gz
--		MAN5EXT=5.gz
--		MAN7EXT=7.gz
--		MAN8EXT=8.gz
-+		MAN1EXT=1
-+		MAN5EXT=5
-+		MAN7EXT=7
-+		MAN8EXT=8
- 		MAN8DIR=8
- 		;;
- 	*)
diff --git a/net-print/cups/metadata.xml b/net-print/cups/metadata.xml
index eefca8bd29d2..487c6ec99fc7 100644
--- a/net-print/cups/metadata.xml
+++ b/net-print/cups/metadata.xml
@@ -9,12 +9,6 @@
     <flag name="lprng-compat">
       Do not install lp... binaries so cups and lprng can coexist.
     </flag>
-    <flag name="python">
-      Add support for the Python interpeter in the web server CGIs.
-    </flag>
-    <flag name="java">
-      Add support for the Java interpeter in the web server CGIs.
-    </flag>
   </use>
   <upstream>
     <remote-id type="cpe">cpe:/a:apple:cups</remote-id>
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index b858949f0063..717ed8d0cf80 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -2,10 +2,8 @@ DIST hplip-3.18.12-patches-1.tar.xz 12032 BLAKE2B 33e6e4e1e0e5b4f998459073cf0742
 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.5.tar.gz 25774089 BLAKE2B b1d95e5551ead7818c7fb8529edffea59718944e6838370594f20f8e4917ee23d0beb85f1b68867c332c196ab863f8479ab9b645ce57d9b03dae59fd1cab5f0a SHA512 fce3c7b8a2f3b0d2875bafd2ff65a3312fae867b658cd45eea16d9f3663646b6b0b70b58e6c2b46eb24627cdeefb318b6ca9ccf5a0e9790ff19519518992da07
 DIST hplip-3.20.6.tar.gz 25909290 BLAKE2B ac5720c0b0a871459f22d24658eb51b381afcb7cc76831908229e1f0d1cc2feb69122690915f817b835d71b17fe9ecaddd25f506f9e9809f49d8b935fdba962a SHA512 6a5ce55465e3a537ecc0b6e7d198835dbe495e191522e674a507a4993e2061da3ea084a5239a74b2279c065c0775067d5b6a4aeb2a7791825106a299fb55e8f8
 EBUILD hplip-3.19.12-r1.ebuild 7742 BLAKE2B a65c85f9249fb730e4f2db724ba1f8d12a946e219d1cdea42f8b270b880fbfc2113da667c40b295738318524663c0173df23818a8f5e233a21e4a2be48f7ef75 SHA512 14264395f135c78942287e5bd68577d66918511b59ab5c93410ca50c7597e10e0d8eaa43b6b2ee757a9323405fd8d6c3f507356b8defdf1c8fe1d8195db1b49e
 EBUILD hplip-3.20.3.ebuild 7789 BLAKE2B 9c983e4d2aa56aae1d76967b62f0c626c0dd58595c14fd4bd9b2b823f2fb1b24b5bd02837dc28cfa8fd3134d8fe2b41f695ffb991a7192b51b294b45249856ca SHA512 9b5fa8a34fbfb02317b46a45f69297c210bc258e65f47c1761a1aa51df466693132c50cd22acff401097a6c314127043f9de1b5822279084760eca70a1db2447
-EBUILD hplip-3.20.5.ebuild 7792 BLAKE2B 6ef0aac91d3527a1581f883655c5ea514f59c127b09ec320f88eb53482371bbefcf01065320c5222ec4ca842b52f0e8183a4b50df0093eb1420bab36244a08d6 SHA512 e3bc41d171e8112c4f6eeda9ba69ad1565e0a8fbd88e66a8a6136b832af043eec5ae7857b72f043c1ba7981b3a8aa1936ab4b213e18be414af19a8c5d037570d
-EBUILD hplip-3.20.6-r1.ebuild 7910 BLAKE2B 15b6b52ac69dcd704685beb1e7e43e2f7955b9b630bcc442d2585fb2dec14f341ef9c0c8d3d1be7587a60c1f24eaa2fe59167d487a4200f11b55c51500296912 SHA512 ee5fdbe9b8ca9bccf8007f963400b6ed743d87efade64364bc781349e4fb96eccc32318f0f0c49b13a31d68642f9eb015a03cf4ffb68ffe334b412cb009f83d4
+EBUILD hplip-3.20.6-r1.ebuild 7917 BLAKE2B de5eace7ba966ac0ea1d301788e1059588095ef4216a2f7adc7fbde7c3e9cfa6cd5f2e97f78f1a948dd34eba4a1da9aba8deb7969ddf49661da765bd360777ca SHA512 36eb5ee4e1098c180d5417a4d111dbde5fd0c9fc41d1fbc5293c8798e1e64210b41a59ce77ff1ebafa7438deeed5e993ef0e83a20cd20b6d7790ae22b9f55d32
 MISC metadata.xml 1910 BLAKE2B fd9fc7a40bd2bb877e7b4e26104df247dc8c7aa5cbd7211f5d489ec889834aa64fff20d6624f3c8b3e1e4428704cb7f2eb4d1bffc1c6fb15f15b05fd422297e2 SHA512 022854843c9ae373aed3ebd3879c9f1312773dea5dca15c85fb839ff067ea5599532201fa51d9e91ec18b0be1773e2ad544cd4e5697eb9c91be22d8d9352d7ef
diff --git a/net-print/hplip/hplip-3.20.5.ebuild b/net-print/hplip/hplip-3.20.5.ebuild
deleted file mode 100644
index 0577e0d45ea6..000000000000
--- a/net-print/hplip/hplip-3.20.5.ebuild
+++ /dev/null
@@ -1,276 +0,0 @@
-# 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 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.20.5-patches-1.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~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
-		)
-	)
-"
-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
-
-Any user who wants to print must be in the lp group.
-"
-
-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
-
-	append-cppflags "$(python-config --includes)"
-
-	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
-	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 fax fax-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.6-r1.ebuild b/net-print/hplip/hplip-3.20.6-r1.ebuild
index 6bf31b7b4b6e..f5b44b6010f0 100644
--- a/net-print/hplip/hplip-3.20.6-r1.ebuild
+++ b/net-print/hplip/hplip-3.20.6-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
 
 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"