gentoo resync : 17.02.2020

26 files changed, 30 insertions, 173 deletions

diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index 48c547ac1edc..f51116df415e 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/cups-filters/Manifest b/net-print/cups-filters/Manifest
index e9db73219eb9..7224c3b237d6 100644
--- a/net-print/cups-filters/Manifest
+++ b/net-print/cups-filters/Manifest
@@ -3,7 +3,7 @@ DIST cups-filters-1.25.11.tar.xz 1482792 BLAKE2B 67801904dbe025933d1209817e23ff7
 DIST cups-filters-1.25.13.tar.xz 1485860 BLAKE2B 03fbbbefdd36e8f619fabf17e6e13d051f48f68f87260747a181f6976ff88728d7d01b646227cd5f054e0321f6fe0e64e4c6b1bdba631d9d703304ad98a625eb SHA512 4b5ef647870235436276db68f3ef1879b578807338a025100a1d43115a7330a8f506be631df9c43edb2f1ec15f9a42f15f7cdc725bb5d39612b37bae04631611
 DIST cups-filters-1.26.1.tar.xz 1489804 BLAKE2B 8a5b18cdd192b2847889b4a5ab865152653b443ea01246b52a12fc20b022d6d0d09187cb9c2483d684452a8d7308ae60cb8217efe3e2e13de5001f43b727fe8d SHA512 0aaad7ceeb763aa3da4f961c99f85c0200cf4fcd071617506daf97dad4914de38fa744ae692b6fbc1d00a0eec62b4de4d7c5f865fd0e32e4155ab3f0c5a21ede
 DIST cups-filters-1.26.2.tar.xz 1490192 BLAKE2B 6bc5033c648e42a4590a941fd089c3bf3a901a36e26f12b3cdc892ea41943071903b2df2ef5730b7948270f4f59419083c9423af9482e032958360144fb04e9b SHA512 59a5eaba00e0f384f2b1498e58ea3d7272e42923a69eaa0c107ac103dc539c9bf14a94b7a91a73e7185d8a347b4ac7f4a7a655b1ffc373983da807c582e10264
-EBUILD cups-filters-1.25.11.ebuild 3448 BLAKE2B d9e41c472ae0d99a124bc49df00a326d12c45484ac4d565d32f2656bb59969764b855830c77d6eee81656c0a3e90d8e69880ab1378f4de6bf8444f7a14d14eb3 SHA512 13b282cc4b544ef0294512a065a36460a4d70c9de062bdc9e2be4c258e8626ca37896d72b8ef98187b8088e3bbd78507a27bfd3160e18995b44d3c4425730877
+EBUILD cups-filters-1.25.11.ebuild 3448 BLAKE2B 8f46f393cd53acb06f6d6026f09d2ce6fe43dc3b548be94859b4e7a72b533c94a2b338198fc68f783b8c646367fbfe8b3cbfb7fe4b5fce19e1ec737ef3ff983f SHA512 804343def2f49f7be59154a5e088e0d61190f0991a54392941760ffd4de1d2c501c3462cefd516ae4351081696198198138b2317ee787de3129c04dba35ef862
 EBUILD cups-filters-1.25.13.ebuild 3458 BLAKE2B 2be7cb7eaf1e59fb1ed02e1e64df7b6615d68be1dba9f1da7b3ea46db82f56dfcf54897d89d4af51879f1e30e8ce72144ff9ebca749e2d17cb79d15e8fcb9a10 SHA512 24c51dd6db5b8839eb1bc7ae5ee2a50bc884aab5e59be6af31d195f4dd88f45ad637f15ba907d60e9cc550e88fda3608730fe8f225608055466a9b90ada8d176
 EBUILD cups-filters-1.26.1.ebuild 3458 BLAKE2B 422cc3d8c474df23b15b94116dff3cb5cfff4eddaef554743e695e2e58717151370cebaf0b1d600f4d4a185c74af7aa45489be9ebc33f664588d85ae9245b800 SHA512 b31915b570574a117b6ef9e20807990d04085b8850206cf12dc8a9c222571974fb98738a7b6d4d36dc6a186722c797c73da401f85537f897c15f418aacee14c4
 EBUILD cups-filters-1.26.2.ebuild 3458 BLAKE2B 422cc3d8c474df23b15b94116dff3cb5cfff4eddaef554743e695e2e58717151370cebaf0b1d600f4d4a185c74af7aa45489be9ebc33f664588d85ae9245b800 SHA512 b31915b570574a117b6ef9e20807990d04085b8850206cf12dc8a9c222571974fb98738a7b6d4d36dc6a186722c797c73da401f85537f897c15f418aacee14c4
diff --git a/net-print/cups-filters/cups-filters-1.25.11.ebuild b/net-print/cups-filters/cups-filters-1.25.11.ebuild
index b61e061745e2..4f5594ee02e1 100644
--- a/net-print/cups-filters/cups-filters-1.25.11.ebuild
+++ b/net-print/cups-filters/cups-filters-1.25.11.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/net-print/cups-pdf/Manifest b/net-print/cups-pdf/Manifest
index 7211e4e2ca9f..154a0985f166 100644
--- a/net-print/cups-pdf/Manifest
+++ b/net-print/cups-pdf/Manifest
@@ -3,5 +3,5 @@ DIST cups-pdf_3.0.0.tar.gz 29654 BLAKE2B ec1e89eb876161bd2b123568448e9b0075537aa
 DIST cups-pdf_3.0.1.tar.gz 29754 BLAKE2B f964358c5e465447e703848a697f6c801624a1836e2a0a4026c507c66048cf4bef92327508598ec7e9a356d4f57894a6b610e55b7a9a34e942cf2b88c6c55b85 SHA512 a06580f3056dddbb883c8db0c71b37b883482ae1ac8aa9bcfd85e679c4dcb44278006b7110d2988173d0eeb05b0f19fb39081fad49bf26839235e97fbe27a818
 EBUILD cups-pdf-2.6.1.ebuild 1071 BLAKE2B 03ec0305e33dacc8e8164fb1e0dfb415a4459ff8598876f866c26f93b921dc96b1311e89c731896326e1bdeb92ab5fef4e8a08e2839435799c8b221d8b4ab294 SHA512 3c7f887eced242a62430a98723b013673297ae55e3c627fdf26784c4a90232a5a0898ee37b83f184dd08dbf5d3710fa82ea6c950fef80396325e3c824627ee5a
 EBUILD cups-pdf-3.0.0.ebuild 893 BLAKE2B c91dc95e2f693ae7de87dc407c20826ff55c5a04dc123712024a4776558e6451bc8ef8af0b50db22cde9172ab0d6f3f0b25bf29f7540b3461987d3333d414e8e SHA512 18e8f9b02d82db9dea38dc8001cc5fafd22f545c53da1df15dac1c84023df3fcae63706f324b7ae8935ccfff149aaffe87833f93db185f5ccccd6b283d69c1c4
-EBUILD cups-pdf-3.0.1.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-3.0.1.ebuild b/net-print/cups-pdf/cups-pdf-3.0.1.ebuild
index b2a6c83640ab..cd78862b5dec 100644
--- a/net-print/cups-pdf/cups-pdf-3.0.1.ebuild
+++ b/net-print/cups-pdf/cups-pdf-3.0.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -11,7 +11,7 @@ SRC_URI="https://www.cups-pdf.de/src/${PN}_${PV/_}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ppc ~x86"
+KEYWORDS="amd64 ~arm ppc x86"
 IUSE="+ppds"
 
 RDEPEND="
diff --git a/net-print/cups-windows/Manifest b/net-print/cups-windows/Manifest
index 571ec5d27433..1e241713a438 100644
--- a/net-print/cups-windows/Manifest
+++ b/net-print/cups-windows/Manifest
@@ -1,3 +1,3 @@
 DIST cups-windows-6.0-source.tar.bz2 38284 BLAKE2B 67722a99dc906ac9c39ba9a93b7fbbb24a44b7400de6209ac5d0ddedc4f891b48ad0284d6cfa8336400697af6eaa006e79349931cefe55cf72b428546c6ff43e SHA512 03bd66d210ee191d25139d9e462543a01d30e8a0dc797a9ee62673e84cfa9d057cc6d327792c74941a17e5021a7ffe52c40bcb52a3f3f4186f59f04796c809df
-EBUILD cups-windows-6.0-r1.ebuild 574 BLAKE2B 0823b827c58781d388b1953b3cd7d2583e240cedc03809615a298c4c99d6d2aff856f907077cf3b50b24f3de611d094fb990f4dab4c38a79c22d0cd3253dc82a SHA512 c30e2c87d6420794be11504f5c0ce7ce83337628e585e34b2c052cd94ecb5227fecebe0912b54e3acf453357b3ac047442c6a11453741623f2405c1d1bdce672
+EBUILD cups-windows-6.0-r1.ebuild 571 BLAKE2B d10588a872d323ce251d3cd592899a67c03f94e3bead89f9edc1d7954f0dc23794d5db1074b3a9960631de09b3032d8e0c6548b50e68b8a57c90bf82c1413d23 SHA512 3c0ddd80025afb423b000e7ea9a1735fe4f3d7da338d35d79804522610c3e6bcba2794225d82e5606d5c22a8e90f8ac485924e474b69571c8336883e8e81d542
 MISC metadata.xml 255 BLAKE2B 06f078acf8e4416705c8bad8b4802a44592eb962c08c050e11332bfa97564fafdf08754ab056eb813f6baeaa6cdfaf5d71672455d77e74045f86098c221d5136 SHA512 c6c5f966cfbe396fde1b15334442de9e0004b44c4b48775588b0b25a058ad1751252761370c9c254280e97561fa6306f5aa0cc7959c675d4ee11f7f95d777a36
diff --git a/net-print/cups-windows/cups-windows-6.0-r1.ebuild b/net-print/cups-windows/cups-windows-6.0-r1.ebuild
index eb699a2d98fa..3239233637b5 100644
--- a/net-print/cups-windows/cups-windows-6.0-r1.ebuild
+++ b/net-print/cups-windows/cups-windows-6.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=4
diff --git a/net-print/cups/Manifest b/net-print/cups/Manifest
index 410eb4e8eb92..bc72affdfad3 100644
--- a/net-print/cups/Manifest
+++ b/net-print/cups/Manifest
@@ -8,7 +8,7 @@ DIST cups-2.2.12-source.tar.gz 10409313 BLAKE2B 126ea81f7108b3b62f5e062ed522898d
 DIST cups-2.2.13-source.tar.gz 10410121 BLAKE2B 662ad7fe95a9cb82748a6035cf61bad8a823656522259fc8eafe4426cc57541beb29da9116174f9d6750ec207eacb83ab4e314021506d6a342577f03ff25b0cd SHA512 dc323bdcec86f11ec98e4881c540aa8be24f82d289c8a4f866e42bfd6f107b686346f1418b6347b3794dabac3c23d6e604e212aa8e169879c58b746fb1bc490d
 DIST cups-2.3.0-source.tar.gz 8129049 BLAKE2B 738dbc7ee5ddcc9ffee44083cd93d8a0e75f4d3bf0b704dd643dc59db2cc2381dd65f676c0979bc65fee03438d160d9d650ceb93f8c702102eb1449d306a81a3 SHA512 c51f173b5fbae1554a3f4a3786fb3b5566e50d9f775473788ee3553922ac7e02e4785492c87c93fd46f159f50d97cc10ff6feafb3397cd9c1840840f3a9cdfae
 DIST cups-2.3.1-source.tar.gz 8135891 BLAKE2B fab46dfeb8a1846c4d8c8a1c166b465e72928ecc5b52dedd9d6a6328619f6eda822a85da9545c405b7bc7375acd2f2677497b94ab00735979487417537438831 SHA512 e3f3ad9e78c1c723d46cc2276957ac67495483882f639421203d9dad227eacbb1259717a92489e710995fdc89e2d575202e4b43117aff08ff1230dcf06674376
-EBUILD cups-2.2.12.ebuild 9732 BLAKE2B 08dc001cbac0aef159a5bb61818566c9e7f63d4202a82d773833bc8d4586fcbbe5eef38ef5a17cac72d511a6b1ae0a71f142f8425b42d1816d95318d82f2ece1 SHA512 af09cbb0d2dc06323fc586be0620f3da30fbaa035c5bc46d89beb523c266ce48db015c281931a0ef8c860a8306794f2be9decff8476eb2442e568c9faceab169
+EBUILD cups-2.2.12.ebuild 9732 BLAKE2B 18a1a09845b92d17f78ab74c95d53412ee501eafe4f6b2f91e31e8684a5d669e1395b20915b9dc13cdd0fa42fa6fe1d62e488eacb84636a80d482005089179ee SHA512 35a7c77f2e5894fd1569d2f3bcd269a48f03ac8da81c4ce067205b2e214032b70b38bff8c627610f8e233b0e2d2468368cee5697e5ecec9daaa0550e108666e0
 EBUILD cups-2.2.13.ebuild 9732 BLAKE2B 18a1a09845b92d17f78ab74c95d53412ee501eafe4f6b2f91e31e8684a5d669e1395b20915b9dc13cdd0fa42fa6fe1d62e488eacb84636a80d482005089179ee SHA512 35a7c77f2e5894fd1569d2f3bcd269a48f03ac8da81c4ce067205b2e214032b70b38bff8c627610f8e233b0e2d2468368cee5697e5ecec9daaa0550e108666e0
 EBUILD cups-2.3.0.ebuild 9589 BLAKE2B e43f169ce612f1c5e0d4641522cd16d1d289c28190314aa594505ea1bb0d5909d820bf47a1d41fb7ed1ea51f5c5d00a965b051a70703c7dc970a6f1953a42212 SHA512 5db7879351520d8c478687b3ad74b8f6574d0c20a2b6319a098c501c6c82de4623e13898a014122e25740f362542f4d935ec210cd4eb984d8bfa82a23f66c09e
 EBUILD cups-2.3.1.ebuild 9589 BLAKE2B e43f169ce612f1c5e0d4641522cd16d1d289c28190314aa594505ea1bb0d5909d820bf47a1d41fb7ed1ea51f5c5d00a965b051a70703c7dc970a6f1953a42212 SHA512 5db7879351520d8c478687b3ad74b8f6574d0c20a2b6319a098c501c6c82de4623e13898a014122e25740f362542f4d935ec210cd4eb984d8bfa82a23f66c09e
diff --git a/net-print/cups/cups-2.2.12.ebuild b/net-print/cups/cups-2.2.12.ebuild
index db6326f540c3..dce403cc5758 100644
--- a/net-print/cups/cups-2.2.12.ebuild
+++ b/net-print/cups/cups-2.2.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/net-print/foomatic-db-engine/Manifest b/net-print/foomatic-db-engine/Manifest
index a888b061a39b..feab6c210a24 100644
--- a/net-print/foomatic-db-engine/Manifest
+++ b/net-print/foomatic-db-engine/Manifest
@@ -2,5 +2,5 @@ AUX 4.0.12-use-pkgconfig.patch 1010 BLAKE2B d37cb4ad77e191229c0ca7ae64b8f51b7ce2
 AUX 4.0.7-perl-module.patch 392 BLAKE2B 48a1913833c637eaf80f0d9c8366e85750857356a28d346ec37a11c233e1cfed7d79eb5ada6033cfdc2743c6823d8db976f9095ee04694fa176979f2dbad9d62 SHA512 7f26ac25325dffa706bef97915be06707c4953ee7c436a86a79d4edf764bbe4db9e6eeb37b889f6f4214b9b8d5ceb31091398c5ccce7607be941a74b3fe4ebf7
 AUX 4.0.7-respect-ldflag.patch 719 BLAKE2B 534ac6b3b3333bd54c9abe8b7e658faed0759b95e0104d36e381ba178f8138b9b79fa38a35f66ef5c78ca54630d870da0fb1a12f949764e623247d10dcba61c6 SHA512 432c4b61c94d1b774fc909375217587f4d8336603db0b944ec9e98e3022c2b1355928445e2cc7fbbd06a1452927082ed0fb655bc955643cce6290fe8f2d5d6c9
 DIST foomatic-db-engine-4.0.12.tar.gz 360499 BLAKE2B b03ba0a0cddc2d1c59a64ffa33e577f991d36c478e3f7b43f66474c749b7fb546f0ad5b04fee056c69532a6f126b87c95a72e5561443ef79bf3bdfed650d6b07 SHA512 b7e99ace6a632e9b0213183bd2c6c2d11ca072ea0414e8ca569082b7ec183dd81c80594ad63fdee82d761ae36d4fce9d3c881569a95a6085ec326ef7fd21154f
-EBUILD foomatic-db-engine-4.0.12.ebuild 1164 BLAKE2B 6c44052a560fba806842f854f5cdb7424ae9742e01345e1a53154800437c6cfe36a2047526d317b3a7ad1b9a76d88c2bd28afd05936d6d81d9e3fc87b7738f25 SHA512 bdb0d68af5c3d0c605aa1786d4cb45d4ff63f2e82adbdae3a1f51829ac0e323319442928c63e1905a1581bdb161ad55e59aef2f697f22ec31d46f259378e092f
+EBUILD foomatic-db-engine-4.0.12.ebuild 1164 BLAKE2B d8de19197f013c0c93d1c3cd79210df746ceb0eeab990f7e624c65cb15695725173a057fd160704d1f2584d33d52463d1ae771b2e192cd58f361f3a3f97c9fec SHA512 461fec1d8385c511ee07f4ac174995be1a610f7667a48be5de32e8d6bb7c01faf54c73d63df3891012e7bac6706e5dae4ebc5db4d6ef29a023ea2045acd09bb2
 MISC metadata.xml 259 BLAKE2B 4a7248bc5a529d1cf3b51f8bcfff668a9e525df3e62584369d4b5526c89e70235378420b164073946ea91cf182065d9c8d2d46c8750d5f77855239b77ce45bae SHA512 7b1cbb90c1ddcf63b8802cfa3a53611f6367801b492c7677ef038738a337002c4606bcf93c5186abf808e74bca1fa76266169245acdb3b5997651bcabfecfa5c
diff --git a/net-print/foomatic-db-engine/foomatic-db-engine-4.0.12.ebuild b/net-print/foomatic-db-engine/foomatic-db-engine-4.0.12.ebuild
index 8673f609fab7..2a6b4d1e9786 100644
--- a/net-print/foomatic-db-engine/foomatic-db-engine-4.0.12.ebuild
+++ b/net-print/foomatic-db-engine/foomatic-db-engine-4.0.12.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/net-print/foomatic-db-ppds/Manifest b/net-print/foomatic-db-ppds/Manifest
index 0db8886faa4a..ce37c19477ea 100644
--- a/net-print/foomatic-db-ppds/Manifest
+++ b/net-print/foomatic-db-ppds/Manifest
@@ -2,7 +2,7 @@ AUX Makefile.in-4.0.20120117.patch 1161 BLAKE2B f935f674597d1edc4d70b2fc600e5a04
 DIST foomatic-db-4.0-20170331.tar.gz 53321292 BLAKE2B 375421205b80cc84d10629454cad053ea0022c8e230c0eab0797f3de79d42e6cc3769ad286095aa7a5bdde0f49d30fb3484e8cbefbae48a32840c0ca96885276 SHA512 33037b087eccfe08fb5b2c0220992f4ad4762c7206325f6bc8073903aafa27a260382cfa8edb4500f0feeea4d0489a3a345fe3017790484fdfb53aa577f691c0
 DIST foomatic-db-4.0-20180126.tar.gz 58697641 BLAKE2B ae063e5d82e70dcd4b7791d0ffc3914c6a7d218c9e1067f6fe99f029c7f4340399e7034da26119e4219096758d029c832797dc10e8076f49f0e24ca11188785c SHA512 84e9c70e797a5328317d0b2725ebb67aa630923516fd8f860740af58ee5337b6302669c822b6aba32fb10ad9670c5894b34356e3cfc0e1496bd051551f40026d
 DIST foomatic-db-4.0-20190226.tar.xz 6438248 BLAKE2B c5ce6b3ec5a29524f6f8c73fdaec88a97a3fd4521753c5058d470ebadf7c35c3218bd7e78023a26b267796ccfbca98368ee4d4bc5252b9339ee1c067adbe80b2 SHA512 308cf8b5648ae8f3be1a1a5af1885319ae9f263575e7b0b06bd66e6e3e0b495656124face65e285bfa657dbff3cff226bb00d78b873f16849b426641dc7d52fe
-EBUILD foomatic-db-ppds-4.0.20170331.ebuild 836 BLAKE2B 51a9ea537f6247d475e62a5753c25d38664d7029e5f424941b12e33f88e861e8463f267a02dbf1eeb997ade29da686975b8b96745eee7c80452e084cb303e7cf SHA512 cd57672619df746e665cbedb96aab927b35b16d701b067b4be9822c8b7bc269f65c094288b90238e1785c83c8d79b3237e7a2f68bab02e4ac6b2b7abe5d32172
+EBUILD foomatic-db-ppds-4.0.20170331.ebuild 833 BLAKE2B 38e6839d61a415095dd4d6bf788ed1c97eea9db109bd302a9b63e3c9e4920305f3c81665bf00763cf08be94274c589b19d08aa6649893b201d8069aab8c1484c SHA512 ae7fea729d0ca1b69231fdf6c17d3a960a9261fa17d2f78138547d0b644bd43d8b8b3a3879d5a0a002a07c6d803b5e5de7b3ef5f773137d4c873bcab7932fd25
 EBUILD foomatic-db-ppds-4.0.20180126.ebuild 853 BLAKE2B 8d3245f5ef09d72f916840a45b295ea05cec1d1aae74d7e611f7f6e6c39b841ad806d9a52eecf1621ce2ce3fa3cded5520445e52457adf93a605f2731897f39a SHA512 9c39237c1d08cf8fd435406003231ac9f21e958c5f33f75bb23f53392007ad44bb16424f323f3053c95183a0652f20c24864b6dbd1e3d6738082b8958e3be0e8
 EBUILD foomatic-db-ppds-4.0.20190226.ebuild 850 BLAKE2B 7b64160725d98ae679bf79c63223d2bf8c8559f79527ac18b19060438fbf58234c8fa9ec6d0d2b71d5a0a36d072310fa985d14484ca0a8c29def073c2f44d365 SHA512 8835238947ec5d479f688507683b47c962ed1f10fdc084ca8b15b9963b0c434eeefc3e1043c2c2d2c9f3679241dbfe90bcb4e9d119590fd60059657caa1eba25
 MISC metadata.xml 259 BLAKE2B 4a7248bc5a529d1cf3b51f8bcfff668a9e525df3e62584369d4b5526c89e70235378420b164073946ea91cf182065d9c8d2d46c8750d5f77855239b77ce45bae SHA512 7b1cbb90c1ddcf63b8802cfa3a53611f6367801b492c7677ef038738a337002c4606bcf93c5186abf808e74bca1fa76266169245acdb3b5997651bcabfecfa5c
diff --git a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20170331.ebuild b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20170331.ebuild
index 5da8034ee926..7b8a654ba223 100644
--- a/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20170331.ebuild
+++ b/net-print/foomatic-db-ppds/foomatic-db-ppds-4.0.20170331.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/net-print/foomatic-db/Manifest b/net-print/foomatic-db/Manifest
index f62665074271..5e4e24af3933 100644
--- a/net-print/foomatic-db/Manifest
+++ b/net-print/foomatic-db/Manifest
@@ -1,7 +1,7 @@
 DIST foomatic-db-4.0-20170331.tar.xz 5083832 BLAKE2B 3c22869cc50f9e68e04bc9edaf6227764ede1566bf93311f1098d0022174911697a63685488be2c753205e40284ec22c31a64e672fee3851eeec920730b5a344 SHA512 f265a476533a77c27f0eb6414a3b93c6b269effba7bb0d46c9d3965c0e7218c3b081ae5e3f01ebfe7afbec70379543dd2e553b97b338eca43c34c11a4ffb4dcc
 DIST foomatic-db-4.0-20180126.tar.xz 5418608 BLAKE2B e11dbfc7e4cf121ba8b456820438b0418981c414c6a798dee463430dd8ccf65b424e1d597bc21b32929e858d0282b12df81fb419793bd34172b0c414619d2762 SHA512 1879e2601ad88262c99201bff5353ac40516985de72dd894eeeae2589ae2b82dd4dbfc972cb3ff43f209efb92753d4ed0ce584d89cd242fedc011511c45d8a87
 DIST foomatic-db-4.0-20190226.tar.xz 6438248 BLAKE2B c5ce6b3ec5a29524f6f8c73fdaec88a97a3fd4521753c5058d470ebadf7c35c3218bd7e78023a26b267796ccfbca98368ee4d4bc5252b9339ee1c067adbe80b2 SHA512 308cf8b5648ae8f3be1a1a5af1885319ae9f263575e7b0b06bd66e6e3e0b495656124face65e285bfa657dbff3cff226bb00d78b873f16849b426641dc7d52fe
-EBUILD foomatic-db-4.0.20170331.ebuild 1198 BLAKE2B 3e5ae9e910faa0d91c96b95b5db251637468be34c56fee3f9368a5db72909e946f39daeda36f64f082c1bcd96f834a012e87e9df2fe044ffcf1ef05247f4bd9a SHA512 9b48dfa41d8022e91786eaa40247c3070a34ddb37eea3cd884dc41fe2d77335b52af5f4a88abeadee1e288b906bea749ea9af0872ac7e6e6543dbdf1dcaacf86
+EBUILD foomatic-db-4.0.20170331.ebuild 1195 BLAKE2B e57786302b5f7db9e749ce9435342a8ed3906847bc03b4ee0e06566740126ddddb1e4c4c4b3d794f1be8a8d552b3b442686d9a967196de8a5ca44cbc3d6dd5ac SHA512 3c22f2e895d9309dd147032f103b78c3bf3c74ba7e760cc928c8ad772627c386bab92fbf504b38d4cf3cae8aac0fbcc2f1f28fc0fddc0567103c427e99359b7d
 EBUILD foomatic-db-4.0.20180126.ebuild 1215 BLAKE2B 094a32b3ccdf5ccf1a4304cd281656f7e503d88337c0194cf4d4bb58594be07885cf0ae7d7ed9ed168ce7bfec9ba2d79051fd1b6a5c015b8f941d9b1f86af901 SHA512 d23fdebede97f924bc39f4cb68e38f1c0602ed9049374a2cfd2f0abf83fe9e0a84748b30902383a1f528a16ae0884c55127290acaac12f0c99301d3e746743c4
 EBUILD foomatic-db-4.0.20190226.ebuild 1212 BLAKE2B f719061c34a5de8171f5656c5a1c598afaa047c56742162da4765d622256ec70d36ede5143bca333393000bfd8b4f9ccb043857c3e098e7dc036f78d4e951639 SHA512 3562b04899e313ae43c33a55cce639908d88df3be9e7dabc0cdbe3684ed1b8d6fee44c1f88cc1710e6a9a9e6136368b27dacc863a28261783bdcb9dc644b3daf
 MISC metadata.xml 259 BLAKE2B 4a7248bc5a529d1cf3b51f8bcfff668a9e525df3e62584369d4b5526c89e70235378420b164073946ea91cf182065d9c8d2d46c8750d5f77855239b77ce45bae SHA512 7b1cbb90c1ddcf63b8802cfa3a53611f6367801b492c7677ef038738a337002c4606bcf93c5186abf808e74bca1fa76266169245acdb3b5997651bcabfecfa5c
diff --git a/net-print/foomatic-db/foomatic-db-4.0.20170331.ebuild b/net-print/foomatic-db/foomatic-db-4.0.20170331.ebuild
index e3d6c6e5e119..6f0079adac14 100644
--- a/net-print/foomatic-db/foomatic-db-4.0.20170331.ebuild
+++ b/net-print/foomatic-db/foomatic-db-4.0.20170331.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/net-print/gutenprint/Manifest b/net-print/gutenprint/Manifest
index 66a58cc5e193..8750376c9859 100644
--- a/net-print/gutenprint/Manifest
+++ b/net-print/gutenprint/Manifest
@@ -1,10 +1,6 @@
-AUX gutenprint-5.2.10-genppd.patch 1609 BLAKE2B 96770083d99c537d6b883a9e06a32219e2c94e4fdb88853825c3e2b38934807786c26423410dcc5a73fc38285b49f6bb01628e9ad48717a5cd18d7b2c66ddb45 SHA512 d582bafdf593a9e00d0f20aa5dd9043f52ca0c53bc713e979fd162c023acef937fd4a1706bcc808579ea97d122ede54f7a505537bb97b4fba5f68eeffced0a96
-AUX gutenprint-5.2.4-CFLAGS.patch 781 BLAKE2B a1b29ce970b66eb56d9429ba9116380cd80f9ba3cc332e43ab2e974b0978ae9c9537c32354f714940a43568ef4a8f6bd8119f02df0bf3e733f742960a23a7ec9 SHA512 2bdfbb024251f79d06b24a5fc72ec35c7c7f794df8eb4cb06983047e4339d77d3d9a7c1b2913e96ef4c28f82ba7970276e27e8fe7709aecfd20b27357995ea20
 AUX gutenprint-5.3.1-cflags.patch 659 BLAKE2B 90beb435d0b9a036f31e25f78afedca178b2b6d7bba3cf294ae45699e139d136bbc996dfca86db65d64a61ef004c343ba55f7e097e7304b1d6392efe0ed9cc31 SHA512 f7bac5fd0cff9c1e5b47c965c0304ffda47478241f715de4ada829a295ec54adf198046699bab866166f974c692ac525207f0541e7ba6959e18d63765128327d
-DIST gutenprint-5.2.13.tar.bz2 6995005 BLAKE2B 7f9fe4bfee907fa6fe6de9bde674368701a221ea12459438053c231cc0e181601eb4fc700a95531135aecff2de6b2f41c2c78d89ad4445773efe0c11a8f45a35 SHA512 6a60a5e462bfd754ac4389b7e926715c06847c660df17e40d48cd57ece99a7ea6098bfd16c067cb27d8aef7ef705a2fdca9f05209d1f3ebf168b0ab16af4e36e
 DIST gutenprint-5.3.1.tar.xz 5153260 BLAKE2B 03465158944a77af93bfaf13878f821f13e63eac1bd92f9e33ba003b49a4cc1864e0ddf2bd3d72cec9fd2759401f90304f62ec068c3b62b0c210c53d1265c0d1 SHA512 214d07e6f78130e95c8c9d98f0862921d26f74a7c302afabdb138b35ef5f02f52fa143411983867fd7015477c16ca18cf8001e6552c27cd4a12c08ff77e92986
 DIST gutenprint-5.3.3.tar.xz 5050624 BLAKE2B dbcf74169d0756d991bbdad7338a6e6f995f8eeedc2610677b327abee6aecc787d1cc35949f73c1d93ad274de7d467542b72a5fe0abf58fbc4ec6f21667cbad7 SHA512 d2c47eb4ccc3c46ccb2f1042682edf7443f5c57439ead72f49ecd10537cf967251bacf7ca7da29fb8dceecc7eebd55ed021f2594ff9fb6509bab543fab1dc8d6
-EBUILD gutenprint-5.2.13.ebuild 2075 BLAKE2B a49cdb87fea621a80ffb299243e54fc3069bfe8b1ac654767c4e86de8d6e182a8a6a7341b3685f5268bbfcc93c1267ab189aade26fef5b77e76b19ced15d722f SHA512 64047f3c3d24de721524ef7bf8d7583ac6fe3ad68818dd6d69988acfaf4b6922f465acae2b884dd4ae8bf9085fcaa3014dbf18192417f0dda7fbd82470ed52c6
-EBUILD gutenprint-5.3.1.ebuild 2017 BLAKE2B 5ef9be0a6cdf02f4900de1b5f673e9e2f8e73ceaf4c418deee6b7d1abbf92db912a01abbd1eb849dc18e3cca6db716c20bb64f858c3684bfa954a87d9724db53 SHA512 72c6ac7c9729249b69279cfbd047a827b32677f51833e1e6d1316b069516cff26c6bbbaf9d6279e49264caf8b38636860e91e98bc358c279fc4a83aca1ee588c
-EBUILD gutenprint-5.3.3.ebuild 1851 BLAKE2B aa3c708ea3091b0246f54bdff5ab4f7d51d9ef920eda8601fc1a9ce911183035c5678ca76ec2fc8a0860518ead5ee4c092de4b43594c7fcd2a9cefdec98cf495 SHA512 2ec2b61bdcafd1e427b01f9d9903b1b69975d6ec32f70baf7b1fde697d155cbd8facac534a19b90c5da0103909d36ea9a796c4e1f3160b83ca30a4f0d9a1e100
+EBUILD gutenprint-5.3.1.ebuild 2086 BLAKE2B 05e7befb8217ee66c653029af49eb1600989d945bbb2d3782fe86cb5e3eeb06b6cf486da6060079198e9ab8b4fbf2f0430ae7e83cefd5c6a72a09dabaeb718b8 SHA512 092e6de1393a05ed0a9fc1c8d53b0307e7214e40c91abfd7d5346148ff23e1cebd0d491014103d72b4a48bbf50fcf6347cd6ee4cc649f4faebdfc03a1ad7eea2
+EBUILD gutenprint-5.3.3.ebuild 1919 BLAKE2B e5fb460976941ebaeed206f6df191ef2ddaa20ce42f58186efa787bec30e3eb004561b993cf696c574a9f33aaf8a508f07523f8ef0d23935d5c941d9b15a016c SHA512 893bbb9be07a62b2becc13231b9aa14465fd55b6e01984110a9a2bb94223a8cc76abbb2eac8c9541da034c514775e16a146267d3219b85b643760024af509eb2
 MISC metadata.xml 339 BLAKE2B 1090eefd725cc9e37f9c8e77daddb80c3791098af5ba2405dd2746426a46722bef0ed8706654100559735d9f29c2be45eec525cadc0653776dda60453abca786 SHA512 b2153b9425e34eb5561da4d5ea99c08bdfac03b036a94b0c471f985635e2a75f843956cd94d99cbb0d2e2b71b6a14493892bd8efa6eeecf2309ac4b964d9d6a6
diff --git a/net-print/gutenprint/files/gutenprint-5.2.10-genppd.patch b/net-print/gutenprint/files/gutenprint-5.2.10-genppd.patch
deleted file mode 100644
index 46d8d78b9ead..000000000000
--- a/net-print/gutenprint/files/gutenprint-5.2.10-genppd.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-diff -urN gutenprint-5.2.8.old/src/cups/Makefile.am gutenprint-5.2.8/src/cups/Makefile.am
---- gutenprint-5.2.8.old/src/cups/Makefile.am	2012-06-14 14:03:53.011828220 +0200
-+++ gutenprint-5.2.8/src/cups/Makefile.am	2012-06-14 14:04:57.672829331 +0200
-@@ -98,16 +98,16 @@
- 
- cups_genppd_@GUTENPRINT_RELEASE_VERSION@_SOURCES = genppd.c i18n.c i18n.h
- cups_genppd_@GUTENPRINT_RELEASE_VERSION@_CFLAGS = -DALL_LINGUAS='"$(ALL_LINGUAS)"' $(BUILD_SIMPLE_PPDS) $(TRANSLATE_PPDS)
--cups_genppd_@GUTENPRINT_RELEASE_VERSION@_LDADD = $(CUPS_LIBS) $(GENPPD_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
-+cups_genppd_@GUTENPRINT_RELEASE_VERSION@_LDADD = $(GUTENPRINT_LIBS) $(CUPS_LIBS) $(GENPPD_LIBS) @LIBICONV@
- cups_genppd_@GUTENPRINT_RELEASE_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
- 
- gutenprint_@GUTENPRINT_RELEASE_VERSION@_SOURCES = genppd.c i18n.c i18n.h
- gutenprint_@GUTENPRINT_RELEASE_VERSION@_CFLAGS = -DCUPS_DRIVER_INTERFACE -DALL_LINGUAS='"$(ALL_LINGUAS)"' $(BUILD_SIMPLE_PPDS) $(TRANSLATE_PPDS)
--gutenprint_@GUTENPRINT_RELEASE_VERSION@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
-+gutenprint_@GUTENPRINT_RELEASE_VERSION@_LDADD = $(GUTENPRINT_LIBS) $(CUPS_LIBS) @LIBICONV@
- gutenprint_@GUTENPRINT_RELEASE_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
- 
- rastertogutenprint_@GUTENPRINT_RELEASE_VERSION@_SOURCES = rastertoprinter.c i18n.c i18n.h
--rastertogutenprint_@GUTENPRINT_RELEASE_VERSION@_LDADD = $(CUPS_LIBS) $(GUTENPRINT_LIBS) @LIBICONV@
-+rastertogutenprint_@GUTENPRINT_RELEASE_VERSION@_LDADD = $(GUTENPRINT_LIBS) $(CUPS_LIBS) @LIBICONV@
- rastertogutenprint_@GUTENPRINT_RELEASE_VERSION@_LDFLAGS = $(STATIC_LDOPTS)
- 
- ## Data
diff --git a/net-print/gutenprint/files/gutenprint-5.2.4-CFLAGS.patch b/net-print/gutenprint/files/gutenprint-5.2.4-CFLAGS.patch
deleted file mode 100644
index e5d64e6042e0..000000000000
--- a/net-print/gutenprint/files/gutenprint-5.2.4-CFLAGS.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff -Naur gutenprint-5.2.3-orig/configure.ac gutenprint-5.2.3/configure.ac
---- gutenprint-5.2.3-orig/configure.ac	2008-12-20 18:04:24.000000000 -0600
-+++ gutenprint-5.2.3/configure.ac	2009-02-13 18:52:19.000000000 -0600
-@@ -631,20 +631,6 @@
-   if test x${USE_MAINTAINER_MODE} = xyes ; then
-     STP_ADD_COMPILER_ARGS([-pedantic -Waggregate-return -Wcast-qual -Wshadow -Wredundant-decls],, [GNUCFLAGS])
-   fi
--  if test x$ENABLE_DEBUG = xyes ; then
--    STP_ADD_COMPILER_ARG([-g])
--  else
--    STP_ADD_FIRST_COMPILER_ARG([-O6 -O3 -O2 -O1 -O])
--  fi
--else
--  if test x$ENABLE_DEBUG = xyes ; then
--    STP_ADD_COMPILER_ARG([-g])
--  else
--    STP_ADD_FIRST_COMPILER_ARG([-O])
--  fi
--fi
--if test x$ENABLE_PROFILE = xyes ; then
--  STP_ADD_COMPILER_ARG([-pg])
- fi
- AC_SUBST(GNUCFLAGS)
- 
diff --git a/net-print/gutenprint/gutenprint-5.2.13.ebuild b/net-print/gutenprint/gutenprint-5.2.13.ebuild
deleted file mode 100644
index 9a8df361c826..000000000000
--- a/net-print/gutenprint/gutenprint-5.2.13.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-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.bz2"
-
-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 )"
-
-RDEPEND="
-	dev-lang/perl
-	readline? ( sys-libs/readline:0= )
-	cups? ( >=net-print/cups-1.1.14 )
-	gimp? ( >=media-gfx/gimp-2.2 x11-libs/gtk+:2 )
-	gtk? ( x11-libs/gtk+:2 )
-	nls? ( virtual/libintl )
-"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-
-RESTRICT="test"
-
-DOCS=( AUTHORS ChangeLog NEWS README doc/gutenprint-users-manual.{pdf,odt} )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.2.4-CFLAGS.patch
-	"${FILESDIR}"/${PN}-5.2.10-genppd.patch # bug 382927
-)
-
-src_prepare() {
-	default
-
-	sed -i "s:m4local:m4extra:" Makefile.am || die
-
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" \
-		-e "s/AM_PROG_CC_STDC/AC_PROG_CC/" \
-		-i configure.ac || die
-
-	eautoreconf
-}
-
-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 [[ ${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/gutenprint/gutenprint-5.3.1.ebuild b/net-print/gutenprint/gutenprint-5.3.1.ebuild
index 9dc5d00a9770..fcbf7a181fed 100644
--- a/net-print/gutenprint/gutenprint-5.3.1.ebuild
+++ b/net-print/gutenprint/gutenprint-5.3.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -18,11 +18,12 @@ KEYWORDS="~alpha amd64 arm hppa ia64 ppc ppc64 sparc x86"
 IUSE="cups gimp gtk nls readline ppds static-libs"
 REQUIRED_USE="gimp? ( gtk )"
 
+# gimp restriction: https://sourceforge.net/p/gimp-print/bugs/725/
 RDEPEND="
 	dev-lang/perl
 	readline? ( sys-libs/readline:0= )
 	cups? ( >=net-print/cups-1.1.14 )
-	gimp? ( >=media-gfx/gimp-2.2 x11-libs/gtk+:2 )
+	gimp? ( <media-gfx/gimp-9999:2 x11-libs/gtk+:2 )
 	gtk? ( x11-libs/gtk+:2 )
 	nls? ( virtual/libintl )
 "
diff --git a/net-print/gutenprint/gutenprint-5.3.3.ebuild b/net-print/gutenprint/gutenprint-5.3.3.ebuild
index e27ce396ee4c..0d95e226f709 100644
--- a/net-print/gutenprint/gutenprint-5.3.3.ebuild
+++ b/net-print/gutenprint/gutenprint-5.3.3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ 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"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 sparc ~x86"
 
 IUSE="cups gimp gtk nls readline ppds static-libs"
 REQUIRED_USE="gimp? ( gtk )"
@@ -22,11 +22,12 @@ 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-2.2 x11-libs/gtk+:2 )
+	gimp? ( <media-gfx/gimp-9999:2 x11-libs/gtk+:2 )
 	gtk? ( x11-libs/gtk+:2 )
 	nls? ( virtual/libintl )
 "
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 21ae2252d67b..cfd3602114f1 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -4,5 +4,5 @@ DIST hplip-3.19.11.tar.gz 25632761 BLAKE2B d189fe4d4d25e7abfba216213aa8ba5541084
 DIST hplip-3.19.12.tar.gz 25676247 BLAKE2B 1373aa70a2307071c28a22b0ae85e242c3e6bec614ef7490c1ecc0e5e745b81b6c2097948fbd062b5e72e10714cdc8d6f9145aacafc0fedeafde375909cb2cb6 SHA512 5552cd717ae082ee55cdb77d79e8d035d8ecb7cf23c79d659fda43468d8ed414a33c4d869eab4ab83dee836f0d1cceb74c3c4a249e26f904a5ab2350e08a5677
 EBUILD hplip-3.18.12-r1.ebuild 7820 BLAKE2B a023d2f2e7e7b5aee6eb82c7c0e1615181835201030699e80195eb161b007146eb3a97ca7546836d0e86c72781b42821503b87a17d7d85b2d9c128c2e60f83fc SHA512 b0f54c778e56daa20b79604edb1c3fcb04bf1ee90bc71bcf0cbf4683f8be29782057aae3de7d9c803ab022964e2569aff32c0db3e9cff1a5cc5d353c5fad2ff8
 EBUILD hplip-3.19.11.ebuild 7832 BLAKE2B a6330e829cb0dbbf580ee6b41c2599a0fcb14ff6323a28f3feec3c00d7c0dde8915767c6e29c4738078bbd915b9f1226fb2bda57ad577a02985ac4a849c7b4d7 SHA512 79f50926870307c4825dee5268199bcfda42db0973cf10ea720a0907bf2f8e789710012d196e3e468cda66e941125777693415b0b8f55b12f57dfe67b685a415
-EBUILD hplip-3.19.12-r1.ebuild 7832 BLAKE2B a6330e829cb0dbbf580ee6b41c2599a0fcb14ff6323a28f3feec3c00d7c0dde8915767c6e29c4738078bbd915b9f1226fb2bda57ad577a02985ac4a849c7b4d7 SHA512 79f50926870307c4825dee5268199bcfda42db0973cf10ea720a0907bf2f8e789710012d196e3e468cda66e941125777693415b0b8f55b12f57dfe67b685a415
+EBUILD hplip-3.19.12-r1.ebuild 7827 BLAKE2B e57c664d4802fed5721dc0d1d8a211ac292e955bf647d8b453fdf42a40214cd4a61918e764c24cc1dacaee05c77e5b3a8ca0fc7822c9c17e7089cf6b8a7a0692 SHA512 7f4cedf809f7b42c70ad46bc7674789becd4ecd24129465aa892885f80998a86d2919c371ecbe733a2654a8604a427739c85fe63edadebce7f53f5d687594739
 MISC metadata.xml 1910 BLAKE2B fd9fc7a40bd2bb877e7b4e26104df247dc8c7aa5cbd7211f5d489ec889834aa64fff20d6624f3c8b3e1e4428704cb7f2eb4d1bffc1c6fb15f15b05fd422297e2 SHA512 022854843c9ae373aed3ebd3879c9f1312773dea5dca15c85fb839ff067ea5599532201fa51d9e91ec18b0be1773e2ad544cd4e5697eb9c91be22d8d9352d7ef
diff --git a/net-print/hplip/hplip-3.19.12-r1.ebuild b/net-print/hplip/hplip-3.19.12-r1.ebuild
index 49cad9be3506..11c11535587e 100644
--- a/net-print/hplip/hplip-3.19.12-r1.ebuild
+++ b/net-print/hplip/hplip-3.19.12-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 ppc 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/libgnomecups/Manifest b/net-print/libgnomecups/Manifest
index b49bd8cab2b1..b57ccbc62950 100644
--- a/net-print/libgnomecups/Manifest
+++ b/net-print/libgnomecups/Manifest
@@ -7,6 +7,6 @@ AUX libgnomecups-0.2.3-glib.h.patch 1017 BLAKE2B 1b3ffe7417f1fdfa617a214162efcd0
 AUX libgnomecups-0.2.3-lpoptions.patch 408 BLAKE2B 970583a14c8850d1e65feab9459a11f8b72e72d6d6aebabe6fac188158128a2e5c17cc1322e223bdf1757852b1b5b8d6996764bc87d9bb2412c782d1b9f9ffb8 SHA512 6d64b0b14dcce03a36a1c0b257e19c37e93778552f306ee312b019690fc35b64b0f1f5c1dc54c72ee85dad755b1facb607d5ef7914c6af01c4bcb86ad4628c85
 AUX libgnomecups-0.2.3-pkgconfig.patch 404 BLAKE2B 78c0107172cf057975dcc4f4c938c2ae990b022d1afaf87e7b0d8623987148d5d240970311fbea0a8c23734d1130bde4c8a05a094e17c8102bcb26f90a43d714 SHA512 2a3ea4921c01c01a55266deaf36d9ff2b0511592be1e58add93af398b9d0d92b21d8c3fe62446b09a939b46569997381a8e56435797625758a22b7d52914c3f8
 DIST libgnomecups-0.2.3.tar.bz2 357129 BLAKE2B 8a8babf0af7a83232590c5e756c4e1c2ce329dae59b88ee5be84c0286a6ed6d6c39f891b7ab0bb68bfc29539769cdd82032422c44a6131c4da9c9355669b1a57 SHA512 7276dfc92209c8503d8a59ceb192273e41bc13cc5f3515dcc00444deca4b9de6a29d0ec4c89811398e03971fa3f5ccbb85ca477da6c5f2bc26f2fb70dccb6a75
-EBUILD libgnomecups-0.2.3-r3.ebuild 1103 BLAKE2B b19ff3e3b549b5df388ea0b4c189811bc3b25b5ad480b5dc5be94a615de1e109915a7f1208f295b01fce95abde2404006509e48cbec1d9906a1a51e1bfb6ab0d SHA512 fd47177e61bb948cda1617185bf610bbb99dcc57ee4d3b85c874153d2e9fa80e089a6ab5821739ca8c9fe64fa187040251c053e48d95101ef7bdeb7e9a38903d
-EBUILD libgnomecups-0.2.3-r5.ebuild 1648 BLAKE2B 0e02cb35b24016ff947efb642140af99887295b4e8f50d0ad72fc45e4d87d30d80da0e1f739c814a9dc71bf59bb9ea4f6771891ea287e338c62212959a8f468b SHA512 f2e1fa05319fad1954947f579a85437752b6fed53aba2005b827c6cb0dbb34cc003126e1f1d89ff58ac3e342bf9d514d046dcd5b161bca1ea871edabdfadd0fc
+EBUILD libgnomecups-0.2.3-r3.ebuild 1100 BLAKE2B c52f4c07ff914fbcf2deefe1ab73b5ef43c9aa09b069d89f6a908709877fd242912799923e0517f1eb75aa228ea9cf5d9e8f7b675711e17b2f379eae80a1f30b SHA512 9e50a65fd803a1e1b9c94a3dd54f7f3993799b03b5c2ee9fa72ac109c618a0c27f674646ef0349e966e411a0315ae533e55c22ee6bf99532cd67013ecebbcb52
+EBUILD libgnomecups-0.2.3-r5.ebuild 1645 BLAKE2B fed111377262b2f53edb7d15d7cc4b6510023c847de3020b3f06049efc0b931efb2d281f3af8a93a96c874c2a275808a9132f29527fcc7eb0adab6ac22258403 SHA512 9a0b23709521fc4b4618f70eddfe053f56090b6881985d401673994eaaa4395b3d9977fb45cbab0095ac55f926538a7d8bdce2c06ffd6d6991a58216bfcbcd2f
 MISC metadata.xml 365 BLAKE2B a34fd100f946a0e9b31486a7fbf620e8b63495fbd2a24ac665435526bf980e23715a2b9b1b24b7e114e23c4f86c1a3c144c1d92e034464bb26b051ff39bfd53b SHA512 6696e110749820558c770f257f4f74d8d4a6fb617e9f74b7170e12a6c353a03a4fbfbc1c39f2247657f515079d541752da8f6f993d37464523ae5364f0e7c6e9
diff --git a/net-print/libgnomecups/libgnomecups-0.2.3-r3.ebuild b/net-print/libgnomecups/libgnomecups-0.2.3-r3.ebuild
index b3d384064080..d4a38b17a1fb 100644
--- a/net-print/libgnomecups/libgnomecups-0.2.3-r3.ebuild
+++ b/net-print/libgnomecups/libgnomecups-0.2.3-r3.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
diff --git a/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild b/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild
index f8198aa5c495..15342a0e5db6 100644
--- a/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild
+++ b/net-print/libgnomecups/libgnomecups-0.2.3-r5.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5