gentoo resync : 05.02.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-02-05 18:44:56 +0000
committer: V3n3RiX <venerix@redcorelinux.org> 2020-02-05 18:44:56 +0000
commit: 29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch)
tree: ab466b4dfa7abecb401b2f8039d08af4689306bb /app-portage
parent: d42200bec37eef2a7478d88988ff00addd0a9202 (diff)
61 files changed, 402 insertions, 165 deletions
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 6f89e6af7ef4..dd1fcfde7a57 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/demerge/Manifest b/app-portage/demerge/Manifest
index 953b88cefcee..5f80bf412152 100644
--- a/app-portage/demerge/Manifest
+++ b/app-portage/demerge/Manifest
@@ -1,3 +1,3 @@
 DIST demerge-0.047.tar.gz 11142 BLAKE2B aba6e40d9a47032782bafe0bfc77f0bdda7e9782daac56712025c6a544db5624a824cfb1db8b32d2dc61a3e3c561432159eb8208bc5da6f94745ec603a457420 SHA512 6c2d172694516c030c358c9668ff4a1fe54d910583de6829bec0de6e67d428b1853b23f6ccd18fc9286932cb9a2bc5a37bab4b5ce43ddf2dd031c64c2ee6b1ce
-EBUILD demerge-0.047-r3.ebuild 1318 BLAKE2B bfdf846425ed1267174e78a843f19d52618765b9b1391828f5d37c5152933d09a9b1465be5b0e1fc9f9b369801529e529011d1e362d34a51d176e495690bbc32 SHA512 c7ab9fff4e269d7780cceecfaec2dea83da210b4de87303efb79dc293c7f04dd6be229e05fcce46cf2c310ddcdc4fd43f826a9c24bf4ca2ef901875352087082
+EBUILD demerge-0.047-r3.ebuild 1319 BLAKE2B 73628aca179e63a29c802ad47add9c44305e56ff476faa3c4380b5fd3561c75dab082ba304aa2c5abe4c5c732375ae2d4c5dd33779b78328fc019a69d37bc244 SHA512 336b107a6a147fa8c796fa89b38ddc3deadc2a4e702eda3f8c03ae3319cfa3613109cae775688b02ac7bc14a7b0ad4dd978db4eb96075351942443a409fa6624
 MISC metadata.xml 473 BLAKE2B b5851d52694607cb0f67dcf21d9d383b1076795e2f2d815b3597b78e149a7f3394312a8d092bc6a96b9e20b592eff074d7b38cc72d7110d4384a65cf28857388 SHA512 084e5b4c139be745f253a91466ad38846d047bca3e5c742a46c8795a47c32d027daf727d7bda4b26cb5fada3b1d77fb820ab52d1c250d67cfcd6591c50c4a97d
diff --git a/app-portage/demerge/demerge-0.047-r3.ebuild b/app-portage/demerge/demerge-0.047-r3.ebuild
index 91e025ff6079..07b43d833bd4 100644
--- a/app-portage/demerge/demerge-0.047-r3.ebuild
+++ b/app-portage/demerge/demerge-0.047-r3.ebuild
@@ -8,7 +8,7 @@ SRC_URI="http://download.mpsna.de/opensource/demerge/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ia64 ppc ~ppc64 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm ia64 ppc ~ppc64 ~sh sparc x86"
 IUSE=""
 
 DEPEND="dev-lang/perl
diff --git a/app-portage/eix/Manifest b/app-portage/eix/Manifest
index 00a09f1b6b8c..f1f6ba946b15 100644
--- a/app-portage/eix/Manifest
+++ b/app-portage/eix/Manifest
@@ -1,3 +1,3 @@
 DIST eix-0.33.9.tar.xz 627944 BLAKE2B cb4add12301a4f08b6ca052df92be34c8a448b386aa700e8ac7e1fbe8563cd76047994007ac94d8989747d843f70a5e1731b401510f58badd9811b30c2ce3be8 SHA512 7539a91d5b5343532ceab1f4aeb82a95413c39b1a57b9e7922032acc937cc8b839494fc40f3510218349561c6d50e89e1861d2fce5e60eabed2465316b28a756
-EBUILD eix-0.33.9-r1.ebuild 2750 BLAKE2B e1c970d1767e890517d21d8dc02c40aa7d0e29ca1e398c844dedd0cafae78383aaf54f794fc881c54a529b3e849487f32a0bf0f289703eda3bb0f19f45398c9f SHA512 43759c67e0c8f56fdc30eb5781736238c86376056d70421645dfbae98553f644e2971cb05736da66185e2f5dcb60c4f9d564c11de45dcfaa6bcda3e394bb607d
+EBUILD eix-0.33.9-r1.ebuild 2751 BLAKE2B 27c90574b7c05483ceec0d9985ec31988310f54d13a607175855adfc26ea0d46d55bc6a09fb20f129855ca2010253595fedc092b59b9a35c9f2aa6ee65530463 SHA512 3327c42e8156f7f8fbf29fc0844e9e9cda86b69414440891792a2a92d625b8ac30e848a20311cc0586df24523f77b9260b241558182291a96fb4aacca31b4e75
 MISC metadata.xml 1051 BLAKE2B b77439c3a8d8eab9fc711c96ce2b2ccaf307f2eca4cfee32bfb75279ff4da31fd05b3319136af38e70d274c28cb2f1c2567916390d81425b7b7daf956815c7e4 SHA512 208b3db2b2e5afb5667a29e6b18538f3cea5e3fb2758d3c9b30823d7b2a22f31f150d6a01abec6a6c8ca62486c975b47002de9e1bac89ded31eb7013bdbb38c6
diff --git a/app-portage/eix/eix-0.33.9-r1.ebuild b/app-portage/eix/eix-0.33.9-r1.ebuild
index a0b27e302f37..ca0dba09d33b 100644
--- a/app-portage/eix/eix-0.33.9-r1.ebuild
+++ b/app-portage/eix/eix-0.33.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/vaeth/eix/releases/download/v${PV}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="debug doc nls sqlite"
 
 BOTHDEPEND="nls? ( virtual/libintl )
diff --git a/app-portage/elicense/Manifest b/app-portage/elicense/Manifest
index 0a5e3e1ca324..d955ce852993 100644
--- a/app-portage/elicense/Manifest
+++ b/app-portage/elicense/Manifest
@@ -1,4 +1,4 @@
 DIST elicense-1.0.2.tar.gz 9262 BLAKE2B fd1e808f577269758ed46c8e8965dc1be7649c825a094ff5b2e09dba12af5249a5a73dc5489ed131c8221e88642f92ac8b859ad5185d3a0c095bd1485178cd27 SHA512 ac6788e7726d962e72855da053be0c44722a013dfa7f500dc137ae46d946c176a285455ddaa5eeee1f6e224d5960aa2a578caa7c3182a5f93d3bbfae8cfd4a93
-EBUILD elicense-1.0.2.ebuild 924 BLAKE2B 787aa5a2e7cbdfebfcb17a4d1b1736c676f153213721c99b7cb014c97850483b51689ebe2724de4ba65fa483a30a170294e293a375f7bc18c0b9f952d93bdf63 SHA512 93778b59ff763351b0f50120ccb7c286f34514728bf4303076dcd4b86953846fe1d491b35457af0f6c703fdea7d81a91e18bdf0f15aa716f61039142e9f16e44
+EBUILD elicense-1.0.2.ebuild 925 BLAKE2B a7299939c19b3635a21d79ee98e90ff5cf1e79bad8ef5257de64a702a3e977ae2a7ba551d59899f41cd076e2ec9d3c8d04cf8836da8bbb8144942024cd377fa0 SHA512 d848b86a8212a1b87e208b8a0b43f465d07129530de69cd99a4c26449f20d37dab5b637adf753e2a5ba5bed7fddd07025bdbeceecc15e27e5fc9dcd819d5c54d
 EBUILD elicense-9999.ebuild 936 BLAKE2B b7af1ed2a4fb2c5c1a4b662bd87833f2ebc1fba1ff3c9f432d40f38dbc96d64074bf42e20c10c1b847ca128dcbce5df88d41c36b6fd9aac3699edf52861faad0 SHA512 cc68786c84c5fae0a816ca579411bc134b4ecf571c5e9419c106a3f3943f3ca890eeb930388a348a7e11c8ff220db6ca2c062d965fbcb1bfdbd4fe27f421f687
 MISC metadata.xml 355 BLAKE2B 3b6e208a86ad1c40713f9e441d5ec81de0040c146d4cdfd1e1026d550dda0177ae659120ee272d84035fe9fbfc0d2089a7f2726056247710530db9b59e4ae1d2 SHA512 2c5c3010075adc10002bbce3613c30228993c3a14acf9785ac452b39608fa8cb7e9f810490710b91be4558c9a30342e679a44e7ba88fe060eb563da7369e2bba
diff --git a/app-portage/elicense/elicense-1.0.2.ebuild b/app-portage/elicense/elicense-1.0.2.ebuild
index c4613e531414..8fdb3ea349e7 100644
--- a/app-portage/elicense/elicense-1.0.2.ebuild
+++ b/app-portage/elicense/elicense-1.0.2.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/Whissi/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 mips ppc ppc64 ~riscv s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 mips ppc ppc64 ~riscv s390 sparc x86"
 fi
 
 DESCRIPTION="Tool to find installed packages in Gentoo with non-accepted license(s)"
diff --git a/app-portage/elt-patches/Manifest b/app-portage/elt-patches/Manifest
index 30ea09610cd5..29ee00e9b2a4 100644
--- a/app-portage/elt-patches/Manifest
+++ b/app-portage/elt-patches/Manifest
@@ -2,8 +2,8 @@ DIST elt-patches-20170317.tar.xz 23356 BLAKE2B 8e402496e4c064a56a6bafbf369bf9771
 DIST elt-patches-20170422.tar.xz 27864 BLAKE2B 0b6a764a7030d78618139f2c2a51f33b224f38e9f117ce45d119375e20566df55266f9684b53d3d311f91570803f937922f93801ad5a3664dae70828ebbedd12 SHA512 90867925f797ec815cfd8f45655cbc0bdc5f46e1a84792988ca76aaed97489907a926acf8f50c0499c56f6e70ea7081732f71c74a8d49bf24a6d265a0a4202dc
 DIST elt-patches-20170815.tar.xz 27864 BLAKE2B ca699e3fc3f5903f660fba70aa424603d42ef3b3aaa5e8768cfad0561d423972b21e75e578faeaaa89d8b0932f5161079a57e5d0d4ab7b56d5a09b91fb0e8d46 SHA512 deba10767b6a8cb5e8139e6f47a30e6f8a4a9312adb1d3e0199df24321d89601915fc91003da2d14fda679e7cbd30a4d4cf39d94ba57bce06432eefc168650dd
 DIST elt-patches-20170826.1.tar.xz 27912 BLAKE2B 886644713651448784e040fbcde6ef11f98f12abffb347f2213b990c1f0ec2df3af6c729c18781235a393e6de907b4da6ec5d140f7fb856466de6e7cefd54b00 SHA512 30a1e8b77d2963b7c56eef3a7a0a576ea6d30f1133c7bf6ad3b5b57cbe3e2de5e8cfbc50a929fea589b42ca02802a7ed16ccf7adb868290a2cc3add5b4fc77d3
-EBUILD elt-patches-20170317.ebuild 691 BLAKE2B 26f6cb8c68fd31ff7f23b2bfe549e51e9c5bafbfec38f8bb2608d170928214e84b304000c28f0763e382d7f8ebc6936c6740e2a21d1584c764159bdaeaff882f SHA512 a91efd852fddbfc278d5ce742fd84a5a521cd5f76f9d1b3fe9439f69a5607b75d3b48c95f3ae5802b3342150dd170a2fce63eb33a6eee53a6da40f567a4279f2
-EBUILD elt-patches-20170422.ebuild 814 BLAKE2B 221ddfb6aa8b5a6eb314c3e9b1db5cabf24bf7ec4974a922bc558cebcf153a499b4cc73dbd43769bb622204253db90e4087987a4b928c50c7aa9bc072a634502 SHA512 ec6390491e7394758c5c9118747ff55f01d55167bf1c668ec8db3c19ddebd6de9f3f4890ed74e55bedcebf7f847e60995a1130a7e96ab31c03386adafa13d869
-EBUILD elt-patches-20170815.ebuild 818 BLAKE2B ab2a57cf007d5c4100988a707d8b843e7ce50e4458f96c8a36e69f696fa35de1707c0b3bf77fb1a6c5d90043febe166470b203f455199efefd5e7b4ab5ee72d4 SHA512 657cf851830c95bd12e72c148688fc1a356de969ba7edeeed3a82114528d9f0125a6e80971d93081c2f8fca00cd2795c9dfc6673506732a0c1d60173487a53c3
+EBUILD elt-patches-20170317.ebuild 692 BLAKE2B c1b4c40736890b07d934d86fa36db875b8c35412d453985f5bc08b22b35966f110ba7765746b59eaedd2eebd0a812309b1f8a31572f8f0a9a8bd9beaed05fd0a SHA512 f282f6e223d70ed60106a3784b549517549d93787ce2746b971d1aabc65db9b0b9c5cbd5dfcfd3aa7b53bc339429697584e99fb4c2ba8f706fea91a0727718a9
+EBUILD elt-patches-20170422.ebuild 815 BLAKE2B 7d0b15643a486d844703349b8f01e1f7a248d6677777c0763b163cb6ef55ba7480e9d02ac09a039a26b68d8f80ee59952e958fe625d6f5b04de3ea1607077015 SHA512 ee9d939e63c3c5a0e544e6985082fecd7866cb027966579533eb4c64c04a551eb2c7d7edf2e9ce451b7e9f0411908929351a15f0e08168d5b0c748850fdbd795
+EBUILD elt-patches-20170815.ebuild 819 BLAKE2B 8b032449696046892d7d125031e2c40d9ef85593385c4f46c3d622d526505d948f03edc092158933e7017e099b47d48307c87727a63616ecef02130bddb83ca4 SHA512 5fffd1dfc88fb82afe2c13374e30aeb11cee8756ff2fa227d39763a094e22df5226e3f04ff3ac696327a3118afb7d98ff511c61897c8f614fa2583b14dacf095
 EBUILD elt-patches-20170826.1.ebuild 835 BLAKE2B d97df7d53db3f391e4b0c5edc6b819172430577a74b051d4e2a085d16d981ce85e0ce2b1b58a6e7066533e8c83d97b7e1a70c40a98e8bbb015f044ec43660d0d SHA512 86277957080d8f9f11a9b4c713da0832f5ddc146e007a6d3148b78eaf852933370e25831624c0664347164d18839a57ec2ef81663dd2bfbfc57885e33bdb04cd
 MISC metadata.xml 223 BLAKE2B ce9aaf73ccbc1745f44acf92e5a32b134fc36a7f40c1c83a4f8296bafe3902d851ca1d1b67829d82573b8e9df4bd2643122a98846ed7824bbf67fd88b0c822e0 SHA512 291302ff827472b8aaaa094bf6ed7b728166f21c9603b98beed59db2071a75193d7c5e462c4d435eea7e1047a1f31076bdf6deb08a1c8ab794ddd965c9be92bb
diff --git a/app-portage/elt-patches/elt-patches-20170317.ebuild b/app-portage/elt-patches/elt-patches-20170317.ebuild
index caa6aeec9251..dbc35482c20b 100644
--- a/app-portage/elt-patches/elt-patches-20170317.ebuild
+++ b/app-portage/elt-patches/elt-patches-20170317.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 DEPEND="app-arch/xz-utils"
diff --git a/app-portage/elt-patches/elt-patches-20170422.ebuild b/app-portage/elt-patches/elt-patches-20170422.ebuild
index 0b584e06a898..1662c016e13e 100644
--- a/app-portage/elt-patches/elt-patches-20170422.ebuild
+++ b/app-portage/elt-patches/elt-patches-20170422.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="sys-apps/gentoo-functions"
diff --git a/app-portage/elt-patches/elt-patches-20170815.ebuild b/app-portage/elt-patches/elt-patches-20170815.ebuild
index cb84f664c012..e3277fd1030d 100644
--- a/app-portage/elt-patches/elt-patches-20170815.ebuild
+++ b/app-portage/elt-patches/elt-patches-20170815.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~x86-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE=""
 
 RDEPEND="sys-apps/gentoo-functions"
diff --git a/app-portage/emerge-delta-webrsync/Manifest b/app-portage/emerge-delta-webrsync/Manifest
index 8ff54d7909f0..e158667c29c6 100644
--- a/app-portage/emerge-delta-webrsync/Manifest
+++ b/app-portage/emerge-delta-webrsync/Manifest
@@ -1,5 +1,5 @@
 DIST emerge-delta-webrsync-3.7.5 23446 BLAKE2B e4cecea69d4ddc3eff21130b45661bb942cd8f66443b8e55bea1340bab801176ccfcbbe41e762bab4e318e17dae6bfaaa9d98656b276838d782b94ef9c2bf0fc SHA512 dc64754ca3a2b5956b6ad017dbf987de6a45fd227a498c00f677c4c85ad6e3e02cdfb9b22b413ad10d077e509e47b0dd8d6116fc2ca03dd3e9f74e465c4e2527
 DIST emerge-delta-webrsync-3.7.6 24117 BLAKE2B 05bc77b6454e057247f225404cbf6f7b8fac8b54b19137434a4df028d5b6e8330ee853f4fa0f94a6c56e97ea088c7eac3f486c0013059b475f1ff36c858ad0a3 SHA512 85e5c2b5fffe952f6642507dd9dfd960725e86f385a5fc0ac289c5fcfe4666f0a50efdf7621342f8ae29f7623b8431f697ea33afe0fe2d6a837c820feefccae8
-EBUILD emerge-delta-webrsync-3.7.5.ebuild 1098 BLAKE2B 68edcdfc9da5ac20d22c0f67538e6892596ef1f6acb1fdb047678d5ba0281d3959a7996b8f3c343756c3300fa143bafd1f6204a7e0e82fb233d0f00ea5fa434c SHA512 9dc186c880600af3422c54f004a8a0e318427b3dc8fe47e3544e630dc9d87cb1003262d8342fc38c82156defa34a2b9a9e593eccaed47c24dc1f59ed6582ebea
-EBUILD emerge-delta-webrsync-3.7.6.ebuild 1098 BLAKE2B f06e052c696916b8042e8b9785904c56247249f08f9d902b5822fec349476c8bebfa373fc6c8b5cb9d998682892e2921304c60756ff4aa9d7ea18cfceb4f8777 SHA512 cb52b3e2372acadcea33df0557d43187cdb15af816def5d13a7eb18b40b1f32b04a34beb0081ac3055c23253af6e9f8a2f107c9db71329cd4d7e2679396086ac
+EBUILD emerge-delta-webrsync-3.7.5.ebuild 1099 BLAKE2B e85d87fe52a9b6d1bc01848a607b84884a1d172e35969e99b63c756db4e36fa4c0008faab9a7f4fb6f5f95ee482ba12b5203a0b0d75b41cdc20d5e2bbb6fbd00 SHA512 cdf0b59fac0d12c7d6edc7fa73e941b89d92d73f24fb68ef591fc7b6345429af83038cbf8bac4d794be8bef90647d9754a3b15fe91530f9b0d91a98f6634f6f1
+EBUILD emerge-delta-webrsync-3.7.6.ebuild 1099 BLAKE2B 8ee77f39760a505325aef5e27d4ca8507f5bbd79bfe98c2d65e7b12e7f824cda21667f653ef424395eebc6ff127b5fe599f877863d480ab68db618089494516f SHA512 335f0132cba419ff33a2dc89c7e25bd5690e4ab893c94c219ba573425151796b20b39255717a154f1de459e84b0433854f5c77825da21d7675a5114d7fc5ed3a
 MISC metadata.xml 294 BLAKE2B a26f2f113f9a9b66edbc88a0ab73a5da655fd240a97668cf1884e9192c4425cc478ab3f187ae1ba12b351c3de5b79d37b771e139cc51909d683decdc945454f5 SHA512 c4cdfd8350418cd0c231874c709d1fdf2c8132309dcd621682ebb77abd77ed57ce0d484a387b75f4762e58193150ca744e51b560d9b5a8cf631b4faef1465555
diff --git a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.5.ebuild b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.5.ebuild
index 32b19dae6d6c..952d73678862 100644
--- a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.5.ebuild
+++ b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.5.ebuild
@@ -7,7 +7,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 SRC_URI="https://gitweb.gentoo.org/proj/portage.git/plain/misc/emerge-delta-webrsync?id=b8c070708bbc6d0db544d4b04b530d6d03d39bb5 -> ${P}"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ia64 ~mips ppc ~sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.6.ebuild b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.6.ebuild
index b31bf5e59cbb..127834b3c486 100644
--- a/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.6.ebuild
+++ b/app-portage/emerge-delta-webrsync/emerge-delta-webrsync-3.7.6.ebuild
@@ -7,7 +7,7 @@ HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
 SRC_URI="https://gitweb.gentoo.org/proj/portage.git/plain/misc/emerge-delta-webrsync?id=829623eadbeda97d37c0ea50dc5f08f19bf4561b -> ${P}"
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~hppa ia64 ~mips ppc ~sparc x86"
+KEYWORDS="~alpha amd64 ~hppa ia64 ~mips ppc ~sparc x86"
 IUSE=""
 
 DEPEND=""
diff --git a/app-portage/esearch/Manifest b/app-portage/esearch/Manifest
index ddb2e2d75594..1e2c6c9353b6 100644
--- a/app-portage/esearch/Manifest
+++ b/app-portage/esearch/Manifest
@@ -2,6 +2,6 @@ AUX 1.3-Fix-python-3-compatability.patch 1177 BLAKE2B 1b119e299c6a1ab3a55e6f9319
 AUX 1.3-Fix-setup.py.patch 792 BLAKE2B 1bbaa8f4499d48508c38c48e579849dd8b5cfae587e982b4bae1932d3c8a23d0c4ad43639710576a9b7dcc53a93d47f1965166b271e93c4cee5309be03a05bc9 SHA512 db741e6effca01b8e71810bd455d227c93df2ca86f5b77c69ba227cb1426dfeca548854b626d4d626e311faa6b8bb137c9f22b21322b6fa9f5ac2dec4786a5d2
 AUX eupdatedb.cron 659 BLAKE2B c0e820e59ba42f9caf2997f0042836c564283edc1edbcd8fbae4d1a79c9acfe9df344d945dd2ffb1d13d0aeb36f32dada366332517b728e2e5fedfe725788f0a SHA512 4ebaa0f8f73215aa497dc0adb922eae1ca42047b7069d2d0dd279edca8c4d9e782ccbfbc421ccd4cdbbffcc5cd8cffcf0c56ab66747043c5743c217c1e33df92
 DIST esearch-1.3.tar.gz 19383 BLAKE2B 308cb075eff0a592135e883913bab3709b64a785602250ae06bfcb50eca6f8dacfb047bb4326b4b9476553bc8bd993b69295373cced7a18786a7834378e860e9 SHA512 7fbc1c362a320a76a40c45ddf83a29223eaafd3cfed1d8a9410a380e2025fb515eea26e38ebf0f304d14230c6c5cfc83ef2116b774b1d50ee4f7f4bb0ac046c4
-EBUILD esearch-1.3-r2.ebuild 1452 BLAKE2B fb6a2d7fa6e557f8aec26da27fafe944c85171bea5024a513fd9467429b1cd8aaaabb1ed56c0b08929c5e6bd6294350844c23cdca5e6e20a5afcade77f6f177a SHA512 d0af71f2e8986d13ebbf26c98795604b1a60c47fe8d0013564f12fa17a77151c37f6e1583c49559ba581d69d31f737de32f5eb97dded9a7e1a0fa52d124c44c9
+EBUILD esearch-1.3-r2.ebuild 1453 BLAKE2B 778d8987ddd29f4e1654ca22bc66d90e73324fb98b0f3915dae8d635f63124f64e347831ad1c6b99b54367f938677ca7ecacb3f76a0179fea093ab105f7be393 SHA512 475c056d7a7a28f2d498dc308fdced9d74fead13ea93e9af625eb38fa32c4b97bbb5b29bfdbc955a9f2178ac8db2c31cf5a59d9aeb1ce3f174f712540fb4898a
 EBUILD esearch-9999.ebuild 1042 BLAKE2B a42399fb3c2159df0cd649fea41bed2f30579322d88caac9b0cd5adea6d2feb1c32660ac32a72dbc792e6e7773e2633bf92a47b5b788854d3f7b70c7ab6b1036 SHA512 c138c8db4a8769ccd48edc64cd1df84f230570e3a0a26d0b72e8613a6cbe2f6b73919f4c0af401703e75c9723d4e0ef497bbd3da9c040e670ab73d6699d6656e
 MISC metadata.xml 357 BLAKE2B db12b57347ce8c8f1e41c64bf0a94c80509e27964353113c40d4c49aee85d3ab747d3ac2a05b1a1314b141feef9a014a3b475bad5101a077da803f55cc853098 SHA512 a84ae0adf855d68fc14b01d1583b0c264a27852df31397af387ee7d8948f413cd98d2fad937899a91387f23d70738a540522b393e2fdab21dc0f55014cf6557f
diff --git a/app-portage/esearch/esearch-1.3-r2.ebuild b/app-portage/esearch/esearch-1.3-r2.ebuild
index 49ee7afb28b1..de631c687cbf 100644
--- a/app-portage/esearch/esearch-1.3-r2.ebuild
+++ b/app-portage/esearch/esearch-1.3-r2.ebuild
@@ -16,7 +16,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="l10n_fr l10n_it"
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris"
 
 DEPEND="sys-apps/portage"
 RDEPEND="${DEPEND}"
diff --git a/app-portage/euses/Manifest b/app-portage/euses/Manifest
index fef1ad8d70d6..8d4e2d6a67de 100644
--- a/app-portage/euses/Manifest
+++ b/app-portage/euses/Manifest
@@ -1,3 +1,3 @@
 DIST euses-2.5.9.tar.bz2 44281 BLAKE2B 2da1309f8eeb5b4999212ddb0b2fb59a8fbd17c49f2c8e7bbfa64bba5c7831f84289ef833d9787506ed735ea1be92dc1f0ab765501b30f123a7f2f168da42c60 SHA512 afbacdcb73bc10548b32050bc38f71e9ac8613277d2cd961f2f96e32e7fa1827c5a208e68a6994efdcaa9e4a64a581138daadab2296a5e60c5e29677dbbd9ef8
-EBUILD euses-2.5.9.ebuild 445 BLAKE2B 752b7f29c257f8833e1c02220825dcf7635a5505de5b8ee87469f3e9c5012b82a5782eb31c724f399597eb720af998284d97da37daa8dd0764869192964fecbd SHA512 d63f860543cb12ba09d8e19774f4e176371250bdc8090613434e89d41aae753e5125a6014071b21e21ece906c3e9b8b64abda19b06ec637e2db563a1d5629987
+EBUILD euses-2.5.9.ebuild 446 BLAKE2B 3f3752e87fade09e96439be5a2c002e3fb2f8dd26996f0dfdb57db2f1517d95bdab8162788ee7546c773d1fad2f8393849d6cbae6c6050e5e132dcbe4cc522e7 SHA512 8bc7e2d5442aa9f1a5792fa8de59912051501116e1b1bb13112afc45dc5abec24380510a97d0bf51346c8a8860f78fcd2a7c00e6fe1ac050d5b5025be0e2a388
 MISC metadata.xml 363 BLAKE2B d048d26125f3c965a6f3e467d8cd211fa8a3999692bd507c036b625b23d0a75dfcea9f32544aeb3e3219d7ba2a2ab03005b0cbecb51cd58f11cc48cebff9ef59 SHA512 568c3af8e7aa91c9732a29b74b31b89869ae031fcdf94d9c13c64f740bf1c86ee45a257cf10a298090239c7a92119e0010fc9316962a625a6494ff3174e80e5f
diff --git a/app-portage/euses/euses-2.5.9.ebuild b/app-portage/euses/euses-2.5.9.ebuild
index c651d49035f4..052d5bd28397 100644
--- a/app-portage/euses/euses-2.5.9.ebuild
+++ b/app-portage/euses/euses-2.5.9.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://www.xs4all.nl/~rooversj/gentoo/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ppc ppc64 sparc x86"
 IUSE=""
 
 S=${WORKDIR}
diff --git a/app-portage/g-cpan/Manifest b/app-portage/g-cpan/Manifest
index 6dbbdc24288a..76c12b03d79e 100644
--- a/app-portage/g-cpan/Manifest
+++ b/app-portage/g-cpan/Manifest
@@ -2,9 +2,9 @@ DIST g-cpan-0.16.5.tar.gz 33894 BLAKE2B e5ffee0086b9a2dcc5bd32ae21f13f01464756d2
 DIST g-cpan-0.16.6.tar.gz 33844 BLAKE2B 3c8b4b39fbeec4e15aa49db877e24a99883112fb79538b5d94a87b60dfea436bffa6f50cbbb97f759c4a2ad75e254d30913105f3f1ee87628cbc9291be69ba87 SHA512 f8e9e211ffc09ca42d1444a42ad2b8111beb8988e4a01387cf8788f7e4a52e6133168820c2800ac82429fa022e2ff473a774c48ac140b5cde184b3d77cd6e1b1
 DIST g-cpan-0.16.7.tar.gz 33621 BLAKE2B 531c2668756b8f31dc038136580dc5fa26b4bb20307b72b4b15202f6f1135824271ae031113fbad71e6096e916d2e10c28c02d5c869d7cfa51ffb04b5a73a9a6 SHA512 2412b30fa4c3432882db0f31da6ace841e353a363e15a3b536ea1febcf601a7f9c4e14968e3abcf848e3557098088012472179688caf36cd97ae9b528a3db7fb
 DIST g-cpan-0.16.9.tar.gz 34463 BLAKE2B 7eff6b7da75219712504ac7b9ea1833e9eaa9ba4a49f609baec6407beb16f4764baf2c35e15c779c93ca8c09bba9058e6acb6fda7f3fd2df06296724f2c3c3fc SHA512 f26d81974fedb024808fe3671ae297fd36abc37a5b04783f36f6c9e8c6000a411c675e999e91da48801a7c84fde15a59587df02fa9d7b3833ccc0916993b1783
-EBUILD g-cpan-0.16.5.ebuild 1060 BLAKE2B 3be8d10a59f30f09900fdc04a0b1e9548f9f60e4d0d00edbff8ee104237e73d6e09414bbda59cebf717b9c2e195e17ebec0d6ebd5763f9bcc56bab2e5d5b4c73 SHA512 a2524f42f7df44c7eb2eceabb9fef72173b4d2f9981eba77d77c6728c549bc31e55eff27621ce736c46610d037dd33807d8fafe10efd2315abc6ca2f0295eb5c
+EBUILD g-cpan-0.16.5.ebuild 1061 BLAKE2B 82bd1a137245d4feb423fb1a64f316a7c2b51dfd18602594131a81bed23832dadaf6f521f5af47dfe760ab3160baca4c1eef56706d2fe3cc6e00db18a14941b5 SHA512 c680b1590f8e209039c9d100b8fb667dcc5bf621c95c949c1d5c71a43fbd23458fc71c354974f14f36012f9194cd81c900a1b72f7e9b1d7ff0922e6e3a4b0171
 EBUILD g-cpan-0.16.6.ebuild 1152 BLAKE2B 61e9caa00ce569ed6d60ff1f6fcd1bf758dbc4ef4b2eabb2b926c5788416eb068519a6de8aad5fbde96e4a6b3927494dead5e896b134c531f0b998469596a5c0 SHA512 0def8a8ea3c3644fc55dc1a99110213814063e881bf4c5ae49c8bd69fd460c9236b6d95d7a0ffa76bcd42d1175f451eeea4998832f09f780b96d07daedf0650f
 EBUILD g-cpan-0.16.7.ebuild 1468 BLAKE2B f8ba91e84563aac09c7266d1d9d2bf9c30162d5752355af3b63f4b759783eadfd37b5f35d68e49e34a11af25c51deb6edd11a8a1355bc4e2318b075e4d44c615 SHA512 7c0ed9ec7266b95e827265754ea1c81e9fe746769bad46ee9d5a24043e368afe30bcd5b987df07925a97482d6cb8af8c287b2533275426d2b964eb2dc299287f
-EBUILD g-cpan-0.16.9-r1.ebuild 1453 BLAKE2B 4986df0733001dd993c8c6f2dffb2bc8d02bf77fae87fa74215bcdd11b29d4994e3e289164a060e43a465e7d04bd3aba66cc87acb4ebcd7f379ff085f61c4007 SHA512 ed6ec66124bd3f422d55f577cf97621d7fecaa6b19119a1034bb026941b60bcb5a9091c0e5fb7eff4c865b8e5fc54124c3a8c1a5b1d2860e82cb634eb19fb1d6
+EBUILD g-cpan-0.16.9-r1.ebuild 1454 BLAKE2B 09f462d162729fb275db9e3dd57e361c45bc0d0464dba4598da46f8ac417437d91b0cd48a6fb0f3301a36a55aa9d96a88ff9c8a1433826eee401ff90fb82780d SHA512 d129d2a0c0261f7ad5bdb5566f8a778a450d3d487876f49277bdde5c7e42da90c9f43138a0d81c262b52aa85c24145ea249b72658683626bd71f0d207b4d687d
 EBUILD g-cpan-9999.ebuild 1504 BLAKE2B 7f81cadbbe38dd2b0249d81502a69727d29b20ab1961af4a8ce8ae6cd896408b77db96a9f29b564c456ea654aa6463dc578f2a9013400929bd2ab62b9ea5c43c SHA512 cbfab6a500463cc1c471e81bf5cf941d02ff0d00d07d9233f6bdf94c9cf1d6d4ceeaac3f68dd33496652797b91c1b6d6fd5be82cf06107bff773c79cf62a2cf8
 MISC metadata.xml 565 BLAKE2B 3614246d5827779c1fd4f713fcadc54210893e680d8d10edbd98bad63ac93bb0e642b6a44fa5496f2bdf40eb3accdb79eca0c1fbd8a459655d192fe7af6f99b5 SHA512 057c2d4a401423d789283661cef0a4c42955d10cbf9671f671de279975fde004d0836e5fec8bd1d34c5f0f1f0bf21d6ebded0bb716d7445001c975a22ff2d0c9
diff --git a/app-portage/g-cpan/g-cpan-0.16.5.ebuild b/app-portage/g-cpan/g-cpan-0.16.5.ebuild
index a6a38e8e0d2b..1b06a26b05e3 100644
--- a/app-portage/g-cpan/g-cpan-0.16.5.ebuild
+++ b/app-portage/g-cpan/g-cpan-0.16.5.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
 
 LICENSE="|| ( Artistic GPL-2 )"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 IUSE=""
 
 DEPEND="dev-lang/perl
diff --git a/app-portage/g-cpan/g-cpan-0.16.9-r1.ebuild b/app-portage/g-cpan/g-cpan-0.16.9-r1.ebuild
index 8a9ddc887c58..2da3eab3f05c 100644
--- a/app-portage/g-cpan/g-cpan-0.16.9-r1.ebuild
+++ b/app-portage/g-cpan/g-cpan-0.16.9-r1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == "9999" ]] ; then
 	SRC_URI=""
 else
 	SRC_URI="https://github.com/gentoo-perl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
+	KEYWORDS="~alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86"
 fi
 
 DESCRIPTION="Autogenerate and install ebuilds for CPAN modules"
diff --git a/app-portage/gemato/Manifest b/app-portage/gemato/Manifest
index 7aebc1bae035..78e8366d61c8 100644
--- a/app-portage/gemato/Manifest
+++ b/app-portage/gemato/Manifest
@@ -1,4 +1,4 @@
 DIST gemato-14.3.tar.gz 71325 BLAKE2B d42a5182c12bcc0281df47ddb6b933bb332b9b842b2a5c874c3fa4030ab5a8a16759ee289609d428a3fc1338078cd73d234060354513be88c184d5a6bbec545d SHA512 99904b1a38b8a05ff7bf7c265aa463a56ea3aa6c77dd844dc2d154faae5460e3535f4e9799e8863fda256ee6cd374e051ed98193c9b1fc52dc30c9c2655010cd
-EBUILD gemato-14.3.ebuild 1346 BLAKE2B 6dee342d7315c6b0d38bd8343ecdbefe2a850f706cd6f4062b72975338d6f9437f15ce85f1741369109d6989e5a39794b3ec53ae1d96231f6d2fab45fc683886 SHA512 c9b22c0a31faf4cd11b5f4b2702e65046bb9e5ed01b1521216bf2a0760acf3e53d020df637a4c8df4d2d4ca8a0303710af37b4633a05f339ee8f58e00d351e5a
+EBUILD gemato-14.3.ebuild 1347 BLAKE2B 3c025e4c28c50d9933ab42131efd56ecb3b4400e2fa4dd1a0e32c3042087b60425256c6b89d9051d514b743a7ffa1847b9c4834a184765f0d5a3ae029cca23fe SHA512 55cf8ac45fb041067a002b09ebe756012f907c779bd13ef80d87a31f4ed2853deca45d518e050463853d5458546fa4e08de58645cf53a3f2777dbcfc84c26116
 EBUILD gemato-9999.ebuild 1253 BLAKE2B e7ec95e09ae89f9637f12456f27fbca524a6065e8d497874bd9d01feb42d91ec2abf95ec8940c5ca5ed138f8587d2970bdd02175b8a1edc73bea438c9ce8f18b SHA512 42f14a37f272d02bb910bd3ce42b3e81ebcc18c8b7bf46ef4d1ed4791c5c5ee9a28bc65b81144b5bc177d5e0e59f4c67e31d9db69e0537d118f1949ce5014025
 MISC metadata.xml 814 BLAKE2B 1e6845b23a861560cb0972f787a14f7ade2b471d98ff28f2ae3153e99011d98f2751d720d312a6006554117e3241e5ea8557211073f8d03bbfb751c23565c390 SHA512 d2367bd897e76939768a3cf8f173723e773ec5d12b7144793a69843a3a18aec50bcdb593956cce6644d45f27c263ebf1893ac375e5d4ee3d894dcb0bd4aa6d9e
diff --git a/app-portage/gemato/gemato-14.3.ebuild b/app-portage/gemato/gemato-14.3.ebuild
index a45075df13b8..1c2e6cc874a7 100644
--- a/app-portage/gemato/gemato-14.3.ebuild
+++ b/app-portage/gemato/gemato-14.3.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux"
 IUSE="+blake2 bzip2 +gpg lzma sha3 test tools"
 RESTRICT="!test? ( test )"
 
diff --git a/app-portage/genlop/Manifest b/app-portage/genlop/Manifest
index c01c906b8978..e0dab8ab7aed 100644
--- a/app-portage/genlop/Manifest
+++ b/app-portage/genlop/Manifest
@@ -4,7 +4,7 @@ AUX genlop-0.30.9-display.patch 676 BLAKE2B 4fe5071ecbd13e1c10e969d66a9bd74dadaa
 DIST genlop-0.30.10.tar.gz 20872 BLAKE2B e06088678598464c67b78cf10a7472d7bf7b22d69c85fc072064b7a90fe57e2015fddba30edaa85574381cd59367b81c7bf514c269d5dc186fbcc367bba0cca4 SHA512 eab59d7dc012fbbdbe7de509deba66e6c7d0c5a37064e79c25a37c64becc259ee5206194615b60b3363022fa59e458356547edca307ceb4e19eeeaf4b146c593
 DIST genlop-0.30.9.tar.gz 21160 BLAKE2B 4d8fd34c8ea1e49498ebb887782c02b2dd20bd20bd1559b469dc93ccaa9873b27681c8c50ca85d3a96ca687f28f77750d79d9d93ac50e10c3d0fac2a593dd1ea SHA512 659c85bb1d75a90e37449a194fca2c610b2684dab3eb722d566aa929626d958aa1584d12a623f31518d982543be9392786291886ea66a5511e61de1beb3a6936
 EBUILD genlop-0.30.10-r1.ebuild 763 BLAKE2B 6b3449fe92fece540b2e68ebfc56ed24eb4c0247885eb089e93cab2adc75656d511d61e14ffabbebb6547987b2fb66b718e1f0960f8fdeb9c4d82e8289209d75 SHA512 a09435ea347bc23d6f6525aa09adb139df36d031b5e968313797895042e2e181b0a36dd3906db2b604f03c4b741df44d8c4fed2b4feb97f51f4448140fa9b60a
-EBUILD genlop-0.30.10-r2.ebuild 788 BLAKE2B 99b503d589dc15cca65cf790a149212fb9d16d674524eba3b5903a625783a24076364aa418c39c5ed68f8adbbb56789257d67a5517b4005df3288a3df059a2eb SHA512 24d5f6069acf12539bbce611622e6de20db9daf4c4827b47f009b421bafe56dfb866f3bf056bb5d17963b81386814d7502301f718e4294a10a8e582eecb12e52
-EBUILD genlop-0.30.9-r1.ebuild 705 BLAKE2B 3a6c06bc0a0952e04e7a3e1b6901119f295a66519f59ce0c625749fed2d805a2dd0989b763b3b8fe5d0c870173f55db3a5064e00f545a2356cf6911cda2d3d5a SHA512 427172978a2d3763343f19869571eef13cb675e7e52f0721e87a728109ee6b671db401438d737ab818754bf40a8660503898e45381b0e11e06d4d2a6206a0e61
+EBUILD genlop-0.30.10-r2.ebuild 789 BLAKE2B b95772a538538c20cc27a8569e51b0551887d743cdc28e723aa76015c908c7c59fb9ce16b64ae08232383a164bcb97818d2ce9f5114acf4378a3fe2b50a12318 SHA512 95775fc6a0aa1c50ac8e5e1dd84ef2941cfc9dff889f3d138dd90564148a4f94b045e49914f571658f631a92eb8c6d203708de8aed9722d59dbf4ff012c4228b
+EBUILD genlop-0.30.9-r1.ebuild 706 BLAKE2B 2527314786b0cddef4fa077511e4d315a56910a585b65ca5ca90f797204f55968f3e8e29442c4ee51e08323110c847db5de5dab4934f982956a5cb779225aacd SHA512 4f1602efdf4cc35e7d21e8dc6dadb2e1ffce8614334eb70e4d4e86b8ea95e3bfd144bbdc6bd8db7e99f74840c56804a52f1f90f86ab03daa5a6de1e500e513bd
 EBUILD genlop-9999.ebuild 540 BLAKE2B a1785e1dd85c8d0fc365a21175f8df825390f5ce3ba9da561d99bb7138b965eedae647e54536567aeffe32014edfd2ee909a1030db96248ddae48a13b23c8f7d SHA512 7912f2f2cd550ecee97e1778a77613b22595839f0effe4815b7afc710a03530027b1bf29baabdd75705aac5a1cd2f0721c097a6514c0556e050a400866c5f162
 MISC metadata.xml 377 BLAKE2B 275b2a7cd7c400a7f16f8031457520d9a1e44ffdf0f2a53ffc06194a4f2e752ede65f13f36b852a24a67267907a6a2a8c7a81f1cc812c5b4c676edcc1fc492cc SHA512 3bc89900e1d25dc84831f78427b06089a1f0a16710d2adf31871af825041522b2446eb2a8156c4506d7e19cb6c73fa055f318b9dc48c9bd15d92511493098f1c
diff --git a/app-portage/genlop/genlop-0.30.10-r2.ebuild b/app-portage/genlop/genlop-0.30.10-r2.ebuild
index cc0a33340409..48b077f7c9e7 100644
--- a/app-portage/genlop/genlop-0.30.10-r2.ebuild
+++ b/app-portage/genlop/genlop-0.30.10-r2.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~dilfridge/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~x64-solaris"
 IUSE=""
 
 DEPEND="dev-lang/perl
diff --git a/app-portage/genlop/genlop-0.30.9-r1.ebuild b/app-portage/genlop/genlop-0.30.9-r1.ebuild
index 4a68ff1273be..a6f1ce916235 100644
--- a/app-portage/genlop/genlop-0.30.9-r1.ebuild
+++ b/app-portage/genlop/genlop-0.30.9-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://gentoo//${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 IUSE=""
 
 DEPEND="dev-lang/perl
diff --git a/app-portage/gentoolkit/Manifest b/app-portage/gentoolkit/Manifest
index 603976e31e25..1f73bcf1b466 100644
--- a/app-portage/gentoolkit/Manifest
+++ b/app-portage/gentoolkit/Manifest
@@ -1,8 +1,6 @@
-DIST gentoolkit-0.4.2.tar.gz 3215652 BLAKE2B 97b4dcac7293b50161169a6c777623cb1c51e2f74020e0fa2f1f4441c203c03a1269c8c55e1461c5780ebfb8234d364837073d582a52a99f2d40c92e6b77a7f0 SHA512 3a9eac2fd214bcfe39380193cb2118edcd759dbf3eb165e7240525ce1047aa984f1d1f1d3a15324218d9be1f0a1ec960ae08a63191392f1bb3422277a52697ff
-DIST gentoolkit-0.4.5.tar.gz 3218757 BLAKE2B 9ac6e7bdee622ff3069ee0f59a1834f36496f2bd07c53a67677571e0cfc99366ba64d03fca8bd964c3517d7cbcb7d4d5d08e9f3ec721d7adf598b13944fea659 SHA512 6b459684a59c5a72f09da34a2e9491b98f49c861f763bddb52ae002413a2c89d7841d84658577e6fec36a096889265a1207eaf981adfdd5e9db6ad79ca364df3
 DIST gentoolkit-0.4.6.tar.gz 3205641 BLAKE2B 7da91a313c8a9263eb7b4abd6207ece9dd602a5069a87f1e78ada13fc9f396e1f2afddaf0637c473445034cf57b5ca7631e209361a88fa3892d302b20f4cc986 SHA512 3aa3c9af7e994313400607943b9090fd813227ddd6d550b50fbcf7eeb4053da8bcdb41c9ef2579d957d2f279fdcc4e2f2ceca1091c5fd457df4204dd11792d6e
-EBUILD gentoolkit-0.4.2-r1.ebuild 2278 BLAKE2B db1210735a308e4e2e470e9f769ceb94a1dc5278f2b6795b54b1b7efc21095e953a3768c1b9e98ed519e8dbf76743314e4da78d84861eeddf8728b95e5d96335 SHA512 c9d6200beddb8f50825eeef0bf0a43e1a6252c0f40b98c7d5aa1e5cfcd0242ddd1a19812998f32b2dea825ca8ed4002def4a197b5777a0d09184093254722696
-EBUILD gentoolkit-0.4.5.ebuild 2275 BLAKE2B 6844981966887b3b73d350456a5ecd04af7b507794c5d7f4c2bce4819507b772cf2cb9c48eab7454061f70b49c918bc2fd495645a518271f198052e98f3b0e26 SHA512 b28ae8c213638ca3d79845d787655f645b845bd5857925d54d615f6e7b53d5bd36ce12e8fdae7e533ab8fee6b2919f5a0e9203cc2ed72839546b28e680c29e32
-EBUILD gentoolkit-0.4.6.ebuild 2301 BLAKE2B c9e9599b9594bf55ac06ea7c2f522ac4972d2ad1ee18a5830180cca58def2ae6eb5fc7df96d9e5a07724ffdbb2206eec4432a7f5a2e7fda1506fd2574371461c SHA512 e2ef3cd654d0f9e07637882d333aea4eadd9f95b54ff69884ea8f6f9cb2a7cf558dc7068efc2108a56ae0f31982959234f53d0b67a728b2e38fee414e053e6ba
-EBUILD gentoolkit-9999.ebuild 2081 BLAKE2B abf030bda7368309bc1faad184b87da00fb5a9e20d17126c7dc53e236e321dbe749f3f3b33b13f83cb32e8647a4849af5646de28ec4784384ae923d9246038c2 SHA512 aa890958cc64f5e361d19a9bb4401a01c25d51f8e5536efddb0d25a30251989d10a04a4f78be67315d6dfcf6cae938a6970223c152879d5a10d0d1251d49f102
+DIST gentoolkit-0.4.7.tar.gz 3205669 BLAKE2B e5f64b85546bc10ad16e7fa42d288965539177375e8796b40df699859efa13fb98bb86aec58e60363c955b2d5e4b2e6379a7597252ee4fdbeec49559de67b328 SHA512 0fab600b4323d23e12009eeb4ade595950880a88b05bcfbfeada1a9b9af615b96d31c568285629bf6e5de7b45ed857bdf98b6261dc54974fbaf70c924e093c76
+EBUILD gentoolkit-0.4.6.ebuild 2302 BLAKE2B e5fa8c8aa6942d5416de606fe109c10b523095bedb4d4f09b0ad54cbbc76adc6243abe0a2eda4dd2b6300834f19c269ae89232285d4013e479214cafa65c8a43 SHA512 9f4d3e89740831e5d82a70cc5e2bd9f727729b7decff3278b98d5045ce9148cc631684de22247f0603bcc6c1542f604a5282e782673d73c05e1ab5c60f83a36e
+EBUILD gentoolkit-0.4.7.ebuild 2320 BLAKE2B 6e6c6685bd40aadfa6b4c0e4d842bc7266bfabed29ba9c627bf0b06347501440da9d6eb0f0541ea08086c2ff6ec78090adb182fedfbf898cf22d9bd93c63f862 SHA512 9118a094bb40519649abc49848a2137b5a32dd13cc856f4adac96262e1f5adfddc06fa1a623434ea4ee9cb967aa8089794b16745b6253ed29428ed72bfd33b80
+EBUILD gentoolkit-9999.ebuild 2089 BLAKE2B 21934a450e077df0ffd71dd975a6ee488fa49d6776a3b6c949832286dd8b094e167198475098a716f216cb30fbef2e08fb5f4782da67bf6b5e8b73b794c489e2 SHA512 7cfefb8d7f661390fbc8695d34946d2d4c2b1a7be3c44b858986b73d1238a6f3ba07af52166ce7934ff30e6bd635ba5fcf122f445dc0ec7ef4bf191a6c01e84b
 MISC metadata.xml 558 BLAKE2B 2ede18c080565469ba0be5ac6f2e34ab02f9367947ef1e380deed006c5ca2900468e142ee1d7c8664d62ed49caeb64069726f0426251a00d48a848af745128b4 SHA512 8e57275ae720065361529af42999f9bfe871007e45592ee6f539eec4ce61e6b141f44c65316ee10798bfaecc86a814fa18353becbb31ffc5e2c38df100ac3704
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild
deleted file mode 100644
index dd97569c42c7..000000000000
--- a/app-portage/gentoolkit/gentoolkit-0.4.2-r1.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
-PYTHON_REQ_USE="xml(+),threads(+)"
-
-inherit distutils-r1
-
-DESCRIPTION="Collection of administration scripts for Gentoo"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage-Tools"
-SRC_URI="https://dev.gentoo.org/~mgorny/dist/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE=""
-
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-DEPEND="sys-apps/portage[${PYTHON_USEDEP}]"
-RDEPEND="${DEPEND}
-	!app-portage/gentoolkit-dev
-	sys-apps/gawk
-	sys-apps/gentoo-functions"
-
-python_prepare_all() {
-	python_setup
-	echo VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	VERSION="${PVR}" "${PYTHON}" setup.py set_version
-	distutils-r1_python_prepare_all
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-}
-
-pkg_preinst() {
-	if has_version "<${CATEGORY}/${PN}-0.4.0"; then
-		SHOW_GENTOOKIT_DEV_DEPRECATED_MSG=1
-	fi
-}
-
-pkg_postinst() {
-	# Create cache directory for revdep-rebuild
-	mkdir -p -m 0755 "${EROOT%/}"/var/cache
-	mkdir -p -m 0700 "${EROOT%/}"/var/cache/revdep-rebuild
-
-	if [[ ${SHOW_GENTOOKIT_DEV_DEPRECATED_MSG} ]]; then
-		elog "Starting with version 0.4.0, ebump, ekeyword and imlate are now"
-		elog "part of the gentoolkit package."
-		elog "The gentoolkit-dev package is now deprecated in favor of a single"
-		elog "gentoolkit package.   The remaining tools from gentoolkit-dev"
-		elog "are now obsolete/unused with the git based tree."
-	fi
-
-	# Only show the elog information on a new install
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		elog
-		elog "For further information on gentoolkit, please read the gentoolkit"
-		elog "guide: https://wiki.gentoo.org/wiki/Gentoolkit"
-		elog
-		elog "Another alternative to equery is app-portage/portage-utils"
-		elog
-		elog "Additional tools that may be of interest:"
-		elog
-		elog "    app-admin/eclean-kernel"
-		elog "    app-portage/diffmask"
-		elog "    app-portage/flaggie"
-		elog "    app-portage/install-mask"
-		elog "    app-portage/portpeek"
-		elog "    app-portage/smart-live-rebuild"
-	fi
-}
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild
index 0e80f1b412c1..624a90da4a65 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.6.ebuild
@@ -17,7 +17,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	sys-apps/portage[${PYTHON_USEDEP}]"
diff --git a/app-portage/gentoolkit/gentoolkit-0.4.5.ebuild b/app-portage/gentoolkit/gentoolkit-0.4.7.ebuild
index 795b9eb6808c..4ecbc9343c9e 100644
--- a/app-portage/gentoolkit/gentoolkit-0.4.5.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-0.4.7.ebuild
@@ -3,7 +3,8 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="xml(+),threads(+)"
 
 inherit distutils-r1
@@ -16,7 +17,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="alpha amd64 ~arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 DEPEND="
 	sys-apps/portage[${PYTHON_USEDEP}]"
diff --git a/app-portage/gentoolkit/gentoolkit-9999.ebuild b/app-portage/gentoolkit/gentoolkit-9999.ebuild
index 8254566390ff..f79109cd9a4e 100644
--- a/app-portage/gentoolkit/gentoolkit-9999.ebuild
+++ b/app-portage/gentoolkit/gentoolkit-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 DISTUTILS_USE_SETUPTOOLS=no
-PYTHON_COMPAT=( python2_7 python3_{6,7} )
+PYTHON_COMPAT=( python2_7 python3_{6,7,8} pypy3 )
 PYTHON_REQ_USE="xml(+),threads(+)"
 
 EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoolkit.git"
diff --git a/app-portage/hackport/Manifest b/app-portage/hackport/Manifest
index 6eea1610edf5..e047af0b14b6 100644
--- a/app-portage/hackport/Manifest
+++ b/app-portage/hackport/Manifest
@@ -1,6 +1,11 @@
+AUX hackport-0.6.3-missing-ffi.patch 911 BLAKE2B 625631a2d2179f0568fa2d6f697cc591d88ba358e334a7cf574f10568b394acc28d8bc1b7a0ab13c6ab6d2fccdda56694fdc558387f03de13feda7192703c836 SHA512 f51b403d8781a064ba3c7ae00dec8f4d65e98d59b521586f8c2ce7060bfe49df94fcc00de0d41f39df38c92db2c520d59b65884fb09e96e4de9f9c286d16aa37
+AUX hackport-0.6.3-missing-test-deps.patch 2191 BLAKE2B 16ea252c7588cb8e64fc25e489a30cff629328f1e75068c1bea4a619c71dd95802a45cfcf28750b0348164848ed018dc8d4b73d3ee9168f5fafa69f3a78db6f3 SHA512 a73c0c80dd7081ead18d64664fbfe8b41483f60de6e1df9f3403c3334f9a7af9a405b78fcc7539cf788bf2faf47649585751bff24513a88c26bbc298a280b275
+AUX hackport-0.6.3-old-filepath.patch 1305 BLAKE2B de9aa9413b6611c7c1729420cf41e123cbef72fb222fd49d91845f5c2cd6b080fecb3492799d2a382ceba9b615b617aea42d600876753b8d89885aec519db980 SHA512 77715036e58be9eaa2e0e3e28b34c85d7742a3af9d129445ee0dce6d3f12fc94b38779ee2446c5547d554f2a43de5b2241bcb056bd3939ad2e48770ad310a317
 DIST hackport-0.5.6.tar.gz 1639896 BLAKE2B 2c5892b3206b4cbb10f8dcbce1d043446b7b804ae0b5d1e59c49c733c80194e79c9091cfc933cbc7e7a592c0747ee034d56969d4261ad0a6a585259d5e8b4f76 SHA512 5dc20f11392757224a6cf79d525792e14aba64ffb44c9dd9b4f0df4acd9c00127d85f2b1f23cf2063f80895dbcc90ccc745e8f9aba3ef82f7ae8364db155fe4f
 DIST hackport-0.6.2.tar.gz 1625948 BLAKE2B 9dbb7695d3ca806cfef342697717fa232be2156bcb76c87413907460a9cea2f8cdd517dce453ae7846a00df53ab46058c8f42bd36bc33580cb32452b82c77816 SHA512 99207c4903ee5f3fdcc648edcc3a39ed06f0629a1d5bda577fc2c443c544bfd746154bc5e9de044810c148b1a38028ec0fdf908513b4252c05bb6c9c6eb9aa92
+DIST hackport-0.6.3.tar.gz 1986620 BLAKE2B 6878b3f378b1c5303047c4e6ea27edd587527bc0f303dae8947f0e2a066452b5c4cf3a13594499c3b367ff515114f43c2fa7dece935a704f0f6855fc23f14100 SHA512 ef2f2125c89352207f82e02668bfd84c9e38d5ed3f8643d19d4f270cf7440169c7e6d24513f90e7d616900a06a429e54cf01a42363ff463d536fa37700b7d1cc
 EBUILD hackport-0.5.6.ebuild 1265 BLAKE2B 14c0e4692bdfa62cb118639e681886b537354b8f02132baa69e7098ec50e03e09d8f1da81a7ce5e1255e2423907e9af6fbb1e1c08250e256ea7c1a0bb1021140 SHA512 e7367caa9ee201016caa31e56aad82066a1e34989266594c60d42dfc44d45121dcc8c79304ecc71348e4d1d6b569666091908b368fd9f0b591b2b6a1b97cd6a5
 EBUILD hackport-0.6.2.ebuild 1263 BLAKE2B 4e1bda2c18c368209c20f6df94c664efeaf0fd5fbcd0e7e02da7d8fe0048963e7714bb06e5960fecd4dd1555449a44aa8ee7ca2497973b10c45fd1b0796dca5d SHA512 45a93a427efee5fecde630f9fa35e02267b58300f17498645d8bc11de6314421c10aa597009482bd97492b194988cab5c8c888aa26f218410a704c4b5331e681
+EBUILD hackport-0.6.3.ebuild 1420 BLAKE2B deab9182864e89057f0a0a646eb0badecb723e166c988d860a37fd3acb57d7bae4a8a18ae932c3008ad4c31b3d6ff1599016cc3119794fb9ea524e6829dc433c SHA512 349ef2d5b76c3e2150bf6d84849d014ef3762ca717c363851afaa9020c9d8ea7b7617a81851ee2bb6d3e2a8538f61e838ab6dbae805183652046e9bde29872e9
 EBUILD hackport-9999.ebuild 1387 BLAKE2B f216639e69d90b1559cd6cfab740b70876e3bf987cd336d1928a6ec0237cff4e9a051342e94d597eb1293be23bc0865a9be3502d3c155d390c5c6a317d7260c8 SHA512 e97c2b38bffb404301a528e4da160c0b6456a3485e11cc4e921577026be978ab30488fbbe78c1b37e6aeee46cd5c88aab2719b3ea1caf0d8ecee2c66790b5fc0
 MISC metadata.xml 497 BLAKE2B 513f311e8507da5bc7ab496ee848d1d50459839bd7df3b318583807d4d2ab056faf8284fe4417a5a81eea35c0b51ddc18b21b77c2569143d48eecc57a66e97ad SHA512 8f4884fa20eb6a46b2007e99a6787f51a7d8f6a8cbb18b1c7f12541914f6d6959274ace8f9576529e5ab6a372d3904f54d11470e9f5d81f6ee066628e1fc2de3
diff --git a/app-portage/hackport/files/hackport-0.6.3-missing-ffi.patch b/app-portage/hackport/files/hackport-0.6.3-missing-ffi.patch
new file mode 100644
index 000000000000..21c848ab53c5
--- /dev/null
+++ b/app-portage/hackport/files/hackport-0.6.3-missing-ffi.patch
@@ -0,0 +1,33 @@
+From 4264f8bc91dabce03ac858388358ff5f4c6db8df Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sat, 25 Jan 2020 23:52:58 +0000
+Subject: [PATCH 2/3] hackport.cabal: add missing ForeignFunctionInterface
+ extension
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+gcc-8.0 does not enable `ForeignFunctionInterface` by default.
+
+Reported-by: Toralf Förster
+Bug: https://bugs.gentoo.org/704778
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ hackport.cabal | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/hackport.cabal b/hackport.cabal
+index 049933e00..70928fe6b 100644
+--- a/hackport.cabal
++++ b/hackport.cabal
+@@ -70,6 +70,7 @@ Executable    hackport
+     DoAndIfThenElse,
+     EmptyDataDecls,
+     ExistentialQuantification,
++    ForeignFunctionInterface,
+     FlexibleContexts,
+     FlexibleInstances,
+     GADTs,
+-- 
+2.25.0
+
diff --git a/app-portage/hackport/files/hackport-0.6.3-missing-test-deps.patch b/app-portage/hackport/files/hackport-0.6.3-missing-test-deps.patch
new file mode 100644
index 000000000000..fa6c446cf38b
--- /dev/null
+++ b/app-portage/hackport/files/hackport-0.6.3-missing-test-deps.patch
@@ -0,0 +1,79 @@
+From 4cd81196f7a477327ce87971b376e785f362b9b7 Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Fri, 24 Jan 2020 08:09:34 +0000
+Subject: [PATCH 1/3] hackport.cabal: add missing test depends
+
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ hackport.cabal | 21 ++++++++++++++++++++-
+ 1 file changed, 20 insertions(+), 1 deletion(-)
+
+diff --git a/hackport.cabal b/hackport.cabal
+index 94d345292..049933e00 100644
+--- a/hackport.cabal
++++ b/hackport.cabal
+@@ -76,6 +76,7 @@ Executable    hackport
+     GeneralizedNewtypeDeriving,
+     KindSignatures,
+     MultiParamTypeClasses,
++    -- cabal
+     PatternGuards,
+     RankNTypes,
+     RecordWildCards,
+@@ -86,7 +87,6 @@ Executable    hackport
+     ViewPatterns
+   other-extensions:
+     DeriveDataTypeable,
+-    PatternGuards,
+     -- extensions due to bundled cabal-install
+     CPP,
+     ForeignFunctionInterface,
+@@ -151,9 +151,15 @@ Test-Suite test-resolve-category
+                         pretty,
+                         process,
+                         split,
++                        text,
+                         time,
++                        transformers,
+                         unix,
+                         xml
++  default-extensions:
++    -- cabal
++    PatternGuards,
++    DoAndIfThenElse
+ 
+ Test-Suite test-print-deps
+   ghc-options: -Wall
+@@ -174,9 +180,15 @@ Test-Suite test-print-deps
+                         parsec,
+                         pretty,
+                         process,
++                        text,
+                         time,
++                        transformers,
+                         unix,
+                         xml
++  default-extensions:
++    -- cabal
++    PatternGuards,
++    DoAndIfThenElse
+ 
+ Test-Suite test-normalize-deps
+   ghc-options: -Wall
+@@ -197,6 +209,13 @@ Test-Suite test-normalize-deps
+                         parsec,
+                         pretty,
+                         process,
++                        text,
+                         time,
++                        transformers,
+                         unix,
+                         xml
++
++  default-extensions:
++    -- cabal
++    PatternGuards,
++    DoAndIfThenElse
+-- 
+2.25.0
+
diff --git a/app-portage/hackport/files/hackport-0.6.3-old-filepath.patch b/app-portage/hackport/files/hackport-0.6.3-old-filepath.patch
new file mode 100644
index 000000000000..c660db766b26
--- /dev/null
+++ b/app-portage/hackport/files/hackport-0.6.3-old-filepath.patch
@@ -0,0 +1,40 @@
+From b4fe6e48679084ca28c1192612c60599ae81808c Mon Sep 17 00:00:00 2001
+From: Sergei Trofimovich <slyfox@gentoo.org>
+Date: Sat, 25 Jan 2020 23:53:39 +0000
+Subject: [PATCH 3/3] Merge.hs: avoid using isExtensionOf
+
+`isExtensionOf` is not available in gcc-8.0.
+
+Reported-by: Jeremy Stent
+Bug: https://bugs.gentoo.org/704778
+Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
+---
+ Merge.hs | 5 +++--
+ 1 file changed, 3 insertions(+), 2 deletions(-)
+
+diff --git a/Merge.hs b/Merge.hs
+index 645817345..522a3739d 100644
+--- a/Merge.hs
++++ b/Merge.hs
+@@ -39,7 +39,8 @@ import System.Directory ( getCurrentDirectory
+                         , listDirectory
+                         )
+ import System.Process (system)
+-import System.FilePath ((</>), isExtensionOf)
++import System.FilePath ((</>))
++import qualified System.FilePath as SF
+ import System.Exit
+ 
+ import qualified Cabal2Ebuild as C2E
+@@ -183,7 +184,7 @@ getPreviousPackageId pkgDir newPkgId = do
+                . L.sortOn (Portage.pkgVersion)
+                . filter (<newPkgId)
+                $ Portage.filePathToPackageId newPkgId
+-               <$> filter (\fp -> ".ebuild" `isExtensionOf` fp) pkgDir
++               <$> filter (\fp -> SF.takeExtension fp == ".ebuild") pkgDir
+   case pkgIds of
+     x:_ -> Just x
+     _ -> Nothing
+-- 
+2.25.0
+
diff --git a/app-portage/hackport/hackport-0.6.3.ebuild b/app-portage/hackport/hackport-0.6.3.ebuild
new file mode 100644
index 000000000000..5a74aa2efb67
--- /dev/null
+++ b/app-portage/hackport/hackport-0.6.3.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# ebuild generated by hackport 0.6.3.9999
+
+CABAL_FEATURES="test-suite"
+inherit haskell-cabal
+
+DESCRIPTION="Hackage and Portage integration tool"
+HOMEPAGE="http://hackage.haskell.org/package/hackport"
+SRC_URI="https://hackage.haskell.org/package/${P}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+RESTRICT=test # tests are broken: need path to ebuild tree
+
+RDEPEND="
+	app-portage/repoman
+	dev-haskell/async:=
+	dev-haskell/base16-bytestring:=
+	dev-haskell/base64-bytestring:=
+	dev-haskell/cryptohash:=
+	dev-haskell/ed25519:=
+	dev-haskell/extensible-exceptions:=
+	dev-haskell/hashable:=
+	>=dev-haskell/http-4000.0.3:=
+	dev-haskell/missingh:=
+	dev-haskell/mtl:=
+	>=dev-haskell/network-2.6:=
+	>=dev-haskell/network-uri-2.6:=
+	dev-haskell/old-locale:=
+	dev-haskell/old-time:=
+	dev-haskell/parsec:=
+	dev-haskell/random:=
+	dev-haskell/regex-compat:=
+	dev-haskell/split:=
+	dev-haskell/stm:=
+	>=dev-haskell/tar-0.5:=
+	dev-haskell/text:=
+	>=dev-haskell/xml-1.3.7:=
+	dev-haskell/zlib:=
+	>=dev-lang/ghc-7.8.2:=
+"
+DEPEND="${RDEPEND}
+	>=dev-haskell/cabal-1.18.1.3
+	test? ( dev-haskell/hunit )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${P}-missing-ffi.patch
+	"${FILESDIR}"/${P}-missing-test-deps.patch
+	"${FILESDIR}"/${P}-old-filepath.patch
+)
+
+src_install() {
+	haskell-cabal_src_install
+	doman man/hackport.1
+}
diff --git a/app-portage/metagen/Manifest b/app-portage/metagen/Manifest
index 574471ef36b5..e12ba6a923fd 100644
--- a/app-portage/metagen/Manifest
+++ b/app-portage/metagen/Manifest
@@ -3,11 +3,17 @@ DIST metagen-0.6.3.tar.bz2 6118 BLAKE2B 1356111b23a96c6435bd997ff824682fd76074d0
 DIST metagen-0.6.4.2.tar.bz2 6837 BLAKE2B a9595045fea006e53fd23e3b96da0acd884b6f33e0089fc56bc7fb118ba1d205ddc81754a8cc2bc3e5207ad9cd9f537e1a3e7b25be0e5c804ebed5e66b481abc SHA512 cec88403ee06449f30524e0fe485b2e76f4f3bdc23feee0eb60503ab6e9c351bab3f55cdf3847ccec14a8f1e1b9ebe820a5f76feb095b13be11fe5fcf258ed2c
 DIST metagen-0.6.5.tar.bz2 6973 BLAKE2B 2cac99056bde1e6420ef3bb54e6655b17fb43b27dc0024cd3eb2b5c09dcb05b5db318dc4f52c3389d562275e46c901fab863ab50bd0555a6409a8fe5c0bd8de7 SHA512 6a95ce78c7b8ead89a28ea927d9e36cf806a1d363cc703c86c553a74499304081ac360d3fba390d5cc54de08572e8305ab1896d73eceff35166de32760162fe0
 DIST metagen-0.6.6.tar.bz2 6341 BLAKE2B e45e06570cbe6c690b4fdfef036282c5828ec1c86b1773c35000f19c557df7784e777a59e20f1c27fc5ae0edf5169a6d1ebcfc2d08ffa1cc4ab77265041550ac SHA512 0accac41957a555a35261c72053fb93ade62eb449d9ee4a2b1683afddb853d7bfb6394dc06c90643044cba1b573932663f1c7b559bf400ec15fce0c3f8c231ca
+DIST metagen-0.7.0.tar.bz2 6367 BLAKE2B 939fff83d9b6af7600ab7a89293d12fdcc79fb5ca47c5285989af31a6d0ea2ba539f7bb56489f50d6b8272afcf956b6e5a71b98a952ba829de60dde5766c820b SHA512 a41b8d0fb401b7fd8e2a3899cbe2ba95e42acae9dc274923b25a2933e12587838c6d599045c16387d895df0a5823ebf7b4b71ca383a75cb714959baa8355a77e
+DIST metagen-0.7.1.tar.gz 8276 BLAKE2B 7445e9729e8f7eab7d808ad95c3ee775bfb90c9264feabbc31d77d65a9eda7b61f9d7dded8c54e1b5cad5a5577cb0ef31b8d5fafd747804b957c8890ad0a7fea SHA512 7532c6a82fac10bc775b990605a8b5d23dab14e1d8a7f166c37640ffb6bebdfff57885e129a727e78ffb926b164f716f5171ea333d640030316271d0b354af88
+DIST metagen-0.7.2.tar.gz 8391 BLAKE2B 3ec53ff7fa12ea816c88bcbd4e45a3cc66527e6a507f01bc8934abc6bb6ae142e6c6620f82af7c6775b9001d6549832d6fab42c1b44c966f72a40ec0a0f66b2a SHA512 8a78d47ce8228df73a36d4c0f346d75250fbf8568ca6c8cc9ff9313b61c43ba514cf6dc13b36ea90f1ea5b194337748224ff81449d56527fbfc6b7a91e408054
 EBUILD metagen-0.6.2-r1.ebuild 827 BLAKE2B afd29b67e0a12245aed69718d6aff71771c33214768d32b9ef6c6a362e07bfd0769ac3aa86302864aebd20e2412f0d649e9524b83cad81f7de8596db77b3fb59 SHA512 e856e57d1cec091360241cc19e6273396af76ef10e84cf0691af6daec509546a79864a1850fd8fc37ec1e3acc6e6ae4552dfe02bc3846aa8dc6c5c7b87740c17
 EBUILD metagen-0.6.3.ebuild 825 BLAKE2B a4a5044861e9c83e27b449648616853ca2703b2a804f9b1017f0aed460c2cc3e177fddc2de2c400ae7259d4ef912d0fcfd5afb23952662a97bf29df3e04b11d2 SHA512 9b2089d4723b1542f8cb1cb44f39eb56e46bec7fff835e47c90fc5f8dae1d4bd66af142f9d5714da6887a757e3c2156e7a96ee12c87ec09bb1ee800d8e44504c
 EBUILD metagen-0.6.4.2.ebuild 829 BLAKE2B 0abf87e7e3e3be9bc00248fbb09a1fbff50cd4eee23dad358b02566a5c1e6a7de201eb6af364246db40f7b33b22ee062327d9e7f7e10c128f8d400d9542c8212 SHA512 542fd0585a00e849a8692540992b6de31becfc3ecaa35f37873cfd4b2878568328ae3c61f004ba2d05637e856c179fa17d05eee7688bf02600abb96373f77760
 EBUILD metagen-0.6.5-r1.ebuild 882 BLAKE2B 65e2033758c982cf7ffe0658988e88e1e3032ce307197543a50c79f6b438c51acc1d1f4431f1e740c6daa2a21bb9c331ad000624245b8f9571c1f4d66bc35027 SHA512 846e0aebd1433b283c34ae0324b76c6dfe20edfaf5a7aeffeacbada9f51d5aa7a52ce49131122172f55b60f3352e89d6f5025aa336a9a6e879b3d35e07cc7e17
 EBUILD metagen-0.6.5.ebuild 825 BLAKE2B 11b103026c9fec8053f87f7f460d0d91ed1623c7157c953af8c64a93e223b8efcbdce79a08688bb220c7ae2aa5a19dce52c02b87d9f7108be4b39abc7dcebc4f SHA512 8892e342ee8b999c42e7f90dfcdf50f568fa886cf313c9c869387a21be4c3eeb298ba069e8d6b23eb2305cb3d5dcbfb638692ee8c3f69bf0dfb7ce4fa5453402
 EBUILD metagen-0.6.6-r1.ebuild 818 BLAKE2B cc65686fab9403da53a80196cac102d6bff698c740d00830babc7b13d0f9f9b442f9062ffedf75ecec251bb576ef8a3d98b1a444ebd548aa4ebfa854f6b58565 SHA512 96a7ce22921e7729b18f5b80213cdd09b015b0ad3aa69484f2d49a062bd247b686559f8ae629f1a5fe2c4e1f229f06980286a74f387370aa283dcc8f04f13396
-EBUILD metagen-9999.ebuild 831 BLAKE2B 90b4e3e29c3a1b5e01ef9d6ff29ffc1190476db7f77b4bd6fb47a6a1ad51586b4f381aa251fbfd0828d621adfa8d1008ae7e60ac7cb4ecaa1f70107188f74309 SHA512 2493adb68d6c4ee139ede4af042d9e518ce1ae57774589ec0c4dacebde21084b54becfa5eea774e52d7df02072d8e1d5bf5c945e327cb67b3f348aab624b6d6c
-MISC metadata.xml 295 BLAKE2B b7dab399d97c12c36ca3d8312dc628a9b1d393d6eaec7c941d6cc03fc7bae3c6cf7385e91758708712fd7e155a5051e8de5bc155563f552707bc1dd0c74262b4 SHA512 68ea6ebd27bc287655010afbfa6ea291c8bb7de14cef145c91b3179c4d28e865701ef8dfe914457ea933785045731277d3b245877d935d1163915a76db9511b8
+EBUILD metagen-0.7.0.ebuild 759 BLAKE2B 8b5bd111e2853060aa740f37c26f025c41741f53e3b16d0ac12f8ee012f8c117bf0e2f91152a5036996b1e4f38237f6ff7f12f628d161127a0d05a5849e9ab63 SHA512 89a29aab9f4c403c7ffcabd7a5842df93baea90195d6bc1d35d72dc9c5c1ccee80e3e2549e2b75523733ccf50f4bb47359f29a3ba75b5dd89cd20c675486309f
+EBUILD metagen-0.7.1.ebuild 740 BLAKE2B 36488209622d0b0b463451b66f68ff9ff3653bf4bc5ebefc478687c11fa1ada94ea72d54f25a2ee01d91af457090222bff17ad48e8dff330fbbb8831c985f3d1 SHA512 5e15cc0e71aa7bd57adf3ba9d397d602cbfe27ef7936bf079d692657d98904dc89f5b7511abd168a5aca32f1db8c5d88ff997777ced8ae1f21a7724770657d21
+EBUILD metagen-0.7.2.ebuild 740 BLAKE2B 36488209622d0b0b463451b66f68ff9ff3653bf4bc5ebefc478687c11fa1ada94ea72d54f25a2ee01d91af457090222bff17ad48e8dff330fbbb8831c985f3d1 SHA512 5e15cc0e71aa7bd57adf3ba9d397d602cbfe27ef7936bf079d692657d98904dc89f5b7511abd168a5aca32f1db8c5d88ff997777ced8ae1f21a7724770657d21
+EBUILD metagen-9999.ebuild 875 BLAKE2B 9a188abcd348c848793c87acb0ec7fe1386a60de9fd8e11feabb8827d28ac880c221881a208388f4b8c304bd34c3b2911f9bc58c829a534171eaae7d4ea23f61 SHA512 c89c02b942df1df8058c4bdbe170d47fbc73e7887892fd1266a59947ff38e867f538e677bf61160ab62eae1c671f7c8929cd1bca0bff46b1277f84faad36ff02
+MISC metadata.xml 249 BLAKE2B a4931a30c3947b238913053d611639235b076475e864914e684020d86ee1b4aa6da94e4cef59c53a0e5ccd3b3d15d3a4ae293800b17bbb89e0af9cff79314a70 SHA512 b1cb770984baef468e3d17e343acff395e1993b14f90def7f8582b5e5d1a512bd3c7727e03f1deca47f7359a8f8cc9a8360130923388a5c06fabbfb9b05d5138
diff --git a/app-portage/metagen/metadata.xml b/app-portage/metagen/metadata.xml
index eb3702fd181f..ab886b7f0382 100644
--- a/app-portage/metagen/metadata.xml
+++ b/app-portage/metagen/metadata.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<!DOCTYPE pkgmetadata SYSTEM 'http://www.gentoo.org/dtd/metadata.dtd'>
 <pkgmetadata>
-<maintainer type="person">
-	<email>sping@gentoo.org</email>
-</maintainer>
-<longdescription>metagen creates metadata.xml files for ebuilds</longdescription>
+	<maintainer type="person">
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
 </pkgmetadata>
diff --git a/app-portage/metagen/metagen-0.7.0.ebuild b/app-portage/metagen/metagen-0.7.0.ebuild
new file mode 100644
index 000000000000..b1219098e37f
--- /dev/null
+++ b/app-portage/metagen/metagen-0.7.0.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="metadata.xml generator for ebuilds"
+HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
+SRC_URI="https://cgit.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE=""
+DEPEND="dev-python/lxml[${PYTHON_USEDEP}]
+	sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman docs/metagen.1
+}
+
+python_test() {
+	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
+}
diff --git a/app-portage/metagen/metagen-0.7.1.ebuild b/app-portage/metagen/metagen-0.7.1.ebuild
new file mode 100644
index 000000000000..dff9c50a5517
--- /dev/null
+++ b/app-portage/metagen/metagen-0.7.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="metadata.xml generator for ebuilds"
+HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE=""
+DEPEND="dev-python/lxml[${PYTHON_USEDEP}]
+	sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman docs/metagen.1
+}
+
+python_test() {
+	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
+}
diff --git a/app-portage/metagen/metagen-0.7.2.ebuild b/app-portage/metagen/metagen-0.7.2.ebuild
new file mode 100644
index 000000000000..dff9c50a5517
--- /dev/null
+++ b/app-portage/metagen/metagen-0.7.2.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="7"
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+
+inherit distutils-r1
+
+DESCRIPTION="metadata.xml generator for ebuilds"
+HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE=""
+DEPEND="dev-python/lxml[${PYTHON_USEDEP}]
+	sys-apps/portage[${PYTHON_USEDEP}]"
+RDEPEND="${DEPEND}"
+
+python_install_all() {
+	distutils-r1_python_install_all
+	doman docs/metagen.1
+}
+
+python_test() {
+	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
+}
diff --git a/app-portage/metagen/metagen-9999.ebuild b/app-portage/metagen/metagen-9999.ebuild
index f479716b4b3c..9880fd95a4b3 100644
--- a/app-portage/metagen/metagen-9999.ebuild
+++ b/app-portage/metagen/metagen-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="5"
-PYTHON_COMPAT=( python2_7 )
+EAPI="7"
+PYTHON_COMPAT=( python{2_7,3_{6,7,8}} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
 
 inherit distutils-r1 git-r3
 
 DESCRIPTION="metadata.xml generator for ebuilds"
 HOMEPAGE="https://cgit.gentoo.org/proj/metagen.git"
-SRC_URI=""
 EGIT_REPO_URI="git://anongit.gentoo.org/proj/metagen.git"
 
 LICENSE="GPL-2"
@@ -16,20 +16,22 @@ SLOT="0"
 KEYWORDS=""
 
 IUSE=""
-DEPEND=">=dev-python/jaxml-3.01[${PYTHON_USEDEP}]
-	( >=sys-apps/portage-2.3.0_rc1[${PYTHON_USEDEP}] app-portage/repoman[${PYTHON_USEDEP}] )"
+DEPEND="dev-python/lxml[${PYTHON_USEDEP}]
+	sys-apps/portage[${PYTHON_USEDEP}]"
 RDEPEND="${DEPEND}"
 
-python_install() {
-	distutils-r1_python_install
-	python_newscript metagen/main.py metagen
-}
-
 python_install_all() {
 	distutils-r1_python_install_all
 	doman docs/metagen.1
 }
 
+src_install() {
+	distutils-r1_src_install
+
+	# Address expected path warning for /usr/share/doc/metagen-<not-9999>
+	mv "${D}"/usr/share/doc/metagen-{*,${PV}}/ || die
+}
+
 python_test() {
 	"${PYTHON}" -c "from metagen import metagenerator; metagenerator.do_tests()" || die
 }
diff --git a/app-portage/mirrorselect/Manifest b/app-portage/mirrorselect/Manifest
index 02fa6c7fa0c8..cbc579f78add 100644
--- a/app-portage/mirrorselect/Manifest
+++ b/app-portage/mirrorselect/Manifest
@@ -2,8 +2,8 @@ DIST mirrorselect-2.2.3.tar.gz 15230 BLAKE2B 7234ab8a681713c63b201e1ae362ea9a28d
 DIST mirrorselect-2.2.4.tar.gz 16085 BLAKE2B 67d3de3e25a993a4bfc546ae7d188b2a7e61da1cfbc85ac50119c88a81c4966959e31f88101880ba86ef27f0b0674a3d279b11135d2475d0b2fed1ea899021f5 SHA512 8749a916911088d128f9064d5aa78c3bf8b529d583db86eb6f7190959008257e231f7b0bae9a2f2fd6edc45f6d0ffb07364c16a3f190f8c97b88472c2d082037
 DIST mirrorselect-2.2.6.tar.gz 16727 BLAKE2B 8875bf61e26ac474338d81a602297fa4fdf3fab3dbd478b02129dbe71f2d09445efa9b82792e3e654725c5e87a4ca00d37a3d924f8bd6f2decdf74148d1069c8 SHA512 ff2b88bf568f79182275e2c85cafbeee7cbeb0226225a7c3289f0a1d7a8b5eae9d41c69b099bb7e0cc9b0300b23afea43c3ac1baa13f37c696159bb1b3ac05f8
 DIST mirrorselect-test 102403 BLAKE2B 8f23cebf111912ea6fcdea5f4a50a84751a4dd0c62956555a5c0b4fbe15d2329424a65b18c3608440bc0fedd4b2d25fc74cfe91e6e434eb90b7090b36e17b65f SHA512 f43d92e9bf7e77c8f04449a786cb659bdfc07257892caca842ab4a63eb9c5351fa48130c2e163857f3233a595cea7b83f5ea9fa879b782e15b73beb62f0e5e27
-EBUILD mirrorselect-2.2.3.ebuild 974 BLAKE2B 2dc0c14853ce31d5555012cb3af48298f2e331e3d6aa10f5abb315c1b5735744512e19c1ea407ab17d6fd8f4a48c78dd9a7fb8f0ba0228423d5c727a6082d3ab SHA512 bac40f86121b7e5c154de0392ce4e9d724a5c92508f532cb41bfc3f3157bacfa230c0539488d101664298a29177e96aff739fd1ef9328d0fee166615389dfdb8
-EBUILD mirrorselect-2.2.4-r1.ebuild 957 BLAKE2B 550a7349fde3439de7d32ca13a977abc56abff7327e4932617d8cc9d01ce8322523d7b84fc8707eaf8bbaa5894bd4702bad4ad8c491117d84573cb882717e034 SHA512 54fe735c423d57ed8070eedca95dee7a55d1c6a1d62efe1a34dc26c451d725c0930b6e20ecb19880f39ed4a5902432dd04d3bec74abe3f37878bab2fe36edad5
+EBUILD mirrorselect-2.2.3.ebuild 969 BLAKE2B f2c2c66b18f27038b5bc5e29863273f8df6f607cbe22dcf603990e40e34e14850559d60fb33724012818c711d6ef3f1de9fe9ce773b92794182c857a4d48b4f3 SHA512 3261ec6404d2bcc3a8d9399053d0c1fc2bcfc83ab28c0163327f2ab7d198d4b0652fdac090913e228dc0be17a9a19be79e098fb371a19e5adbbdb872e09ff7af
+EBUILD mirrorselect-2.2.4-r1.ebuild 958 BLAKE2B 60f4cf85ffadff8fb706b0b0c33e97ea17811ca454f69a6f249b4f096bcb65c6b4a1c619202aa3d332e2d10337fa5a21b20404f768221a4fa9960056196700ab SHA512 81b6c15725c92e21efa5e5f3384724b5ff3304d83028ea32d57b3dad45ad0936c4c19e0013555b7656e5aad5407629b045876d05b9a24dfafeb9f9f4e58aeed9
 EBUILD mirrorselect-2.2.6-r1.ebuild 1488 BLAKE2B 835bbb26b369d7fc25fd443c803922a409149731affd4b75b53cdeb87b34fe3f3968a834cb85c9a0a29d50a322d389050f49a443141cd78b4d4bb8b90f829698 SHA512 dc2e3598a2f9b5fcca0e1ffaae3bf70f9039880e51abcba2d9a5abd8ecb8f1e31c813ab17a8a478cb7c3ae9706c8c5da02262c95ee1209a49b2caa5c60536c66
 EBUILD mirrorselect-9999.ebuild 1125 BLAKE2B 1367e29df22a03d6d1c60da88dd6f5c7a267756a9480e916bdf989512d514ea2880aa1c407a0c837ab00b6d050ec16cac04b64a90d7237a7870a569a6fd52a60 SHA512 77ac529d5c967559bef59f21829253152deef3d72a3be7ba5ddf2c4c9bffece5aadd0611a90e2e788fda787b119c2ef08a56b3f53cb5917f0db6ddb1c961caec
 MISC metadata.xml 470 BLAKE2B 5b799aaffb1a8166846fbc1f4bc2f28c3e664bc2a17c8dc9d743c9294a682787c404c9f099faae26667d1b38c977910acbf5e4e0cff21467bad45fc0f0e142d7 SHA512 31405437e73acec409d4d9c14d33fb10b03aed300ac88d5f793666cc7324abd46ff8703d794009316716d1a63b2b80721dc5e0841f0e1d0fbebc1f9b83f13acc
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.3.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.3.ebuild
index c8fc41be312b..c2817fcb4edc 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.3.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.3.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="5"
 
-PYTHON_COMPAT=( python{2_7,3_6} )
+PYTHON_COMPAT=( python3_6 )
 PYTHON_REQ_USE="xml"
 
 inherit eutils distutils-r1 prefix
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86"
 
 RDEPEND="
 	dev-util/dialog
diff --git a/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild b/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild
index 5896de6d6c4d..701069cfcc2d 100644
--- a/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild
+++ b/app-portage/mirrorselect/mirrorselect-2.2.4-r1.ebuild
@@ -18,7 +18,7 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE=""
 
-KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~x86"
+KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc ~x86"
 
 RDEPEND="
 	dev-util/dialog
diff --git a/app-portage/perl-info/Manifest b/app-portage/perl-info/Manifest
index 35478d53e07c..1e30171a5af5 100644
--- a/app-portage/perl-info/Manifest
+++ b/app-portage/perl-info/Manifest
@@ -1,3 +1,3 @@
 DIST perl-info-0.16.tar.gz 2058 BLAKE2B 07691f2b2bbc36c171706e55257d8ed57a45f629e71e12d438d236a0d026d50fdf8a0ddc05644befb4d916cf8cb2ad6819753f27baf5e14ac00c86e331dfaeeb SHA512 4e37b2496d8a9490de9d105fcaf74ed24d7d2809a4aea4709d0f15811736a8101edf9a4274c82448c24be37692455350e490d29560e616d688da1e6d72d38483
-EBUILD perl-info-0.16.ebuild 554 BLAKE2B ebc9873d7449ead5f69b6fd0b028cd09b5e380ffd4f861b84c15441c5433de117393f9711986fb4b08306a7b0714bbb9ade1dbf594b60198d52ae74792ba3bcc SHA512 f2fcad3d5291d5737aa74f6b0738f5136d8c7175c1ae1869e258a063ad6c2ffcd69123337e7dfb0f0cd499d2f21fd9690e35d225c8150022302ef814efe21735
+EBUILD perl-info-0.16.ebuild 555 BLAKE2B 75366de2ee01a257f78cb70394d80f22313ceff01b34c6e6d653cdead4c6121cec261a370e44d0ba0993184d8bb6af1b5001bc0d6f49ee8a16a72ddc0f583b05 SHA512 ad58070ba8e3949ac7a32906648f454b857ce603dd502175c0d222e610b26307c2d12f4f9cdbd4b329b5bab57f475db5742e0bf19b68a0744dc010e576e4e8a3
 MISC metadata.xml 251 BLAKE2B 1de7d1f7a54ea11d1363a8a5673fe7e0e7c561103c03558042528680a9d5faab7222805b136c64d39abc56718c999581ccba9945fe5201ca12c962cc101fb267 SHA512 bc87b53817cd976bf8641fa1f7eeb62379b3bbb7d99d3a00078d1d55a0af6f296d54fda4bc2c2cda93434976b32b45a334fb3264fa3fbc1ed2f22728bf605695
diff --git a/app-portage/perl-info/perl-info-0.16.ebuild b/app-portage/perl-info/perl-info-0.16.ebuild
index 2eae853e43a4..cbf088560fba 100644
--- a/app-portage/perl-info/perl-info-0.16.ebuild
+++ b/app-portage/perl-info/perl-info-0.16.ebuild
@@ -10,7 +10,7 @@ SRC_URI="mirror://gentoo/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~ia64 ppc sparc x86"
+KEYWORDS="~alpha amd64 hppa ~ia64 ppc sparc x86"
 IUSE=""
 
 RDEPEND="dev-lang/perl
diff --git a/app-portage/portage-utils/Manifest b/app-portage/portage-utils/Manifest
index 43261fc96c6e..359334c25733 100644
--- a/app-portage/portage-utils/Manifest
+++ b/app-portage/portage-utils/Manifest
@@ -1,8 +1,8 @@
 DIST portage-utils-0.74.tar.xz 1587792 BLAKE2B 7c4588e3d44266a5260df42cc685aa03c584248e9970956033e4191a7a842a4b2162110ac99c2bb18645aaafc6ae6ee960e9b26ba0a8863497911eef1e943f64 SHA512 cd3f44c135b3d44e15a95eed41281fce62f225a9d05d5d5bb1be230b2d59cdb87755f011b313a9ec32e4cafdf3b3979c4ef423365edd7dcc472ca2e38c09c83e
 DIST portage-utils-0.80.tar.xz 1762692 BLAKE2B 32e4502d517ec088eadf17a4a348b9b9bc33348380b65f93ac7c043150732ba3ff0d18ee96f8877c697a91000fdc036de392d6e6711d62248bb7c57e25d4433f SHA512 cca86877e87e5bd2e9423822db4b7afa15e8f291717c808ef0455b121db0778b2364552e9f1d5e1a8bad3f1f8880ae2b5dbd586bf1dd74d7c4f4e72fa990c78c
-DIST portage-utils-0.84.tar.xz 1774396 BLAKE2B 964711e1d2277dbde814e86f9717381ea0b87fb2d8ae639c6134974cc141bdc88b4ee6a37c932495fb9b6153003d78832c34237a5c7076d4a0f7b7d9cfd3151a SHA512 90abe61dc30af4de34f57ff603afe4982d5951e7e0d702444ee7ab5e265976d03cda53518004b9ae1aa19c85eb235a732ea3fcf19705ac86977a42d49fe3b22e
-EBUILD portage-utils-0.74.ebuild 1051 BLAKE2B c8647973636f57b948978607ab73d4bea3a86eb51f045ecef3ca641a5d68976070cbf5c00520291c8876c6f003510c782252e5c5fc7a99245897a2e3585916b6 SHA512 158a8a3a4892bd99c48c6f0ae75c00b9b3c4df56678b6eb7deec2eb4f4a6974a0a4788f54dd4fc1e3b6d27d95cc989683f19ccf1bae214d376da0726255722fa
-EBUILD portage-utils-0.80.ebuild 2251 BLAKE2B 9c7238b96dc6dc7acc9ca3765f1f545ea2cf8df62c492820ee8e1c8c979a3b5337f01080d6a68b920a9a3fd1458bfc2a2cae9b795a3f7178b83ac6d15838b2e4 SHA512 7ef7e5094c1bb02bc633c410f27db6e77d6cfdbc820adbded8996e889aaa27071ff4a1fba992ba70f32723c4d76d240941caf135afc6d38eb42d708f6078b805
-EBUILD portage-utils-0.84-r1.ebuild 2300 BLAKE2B 63d6b566a9962ae53879883545f03615d13cf94a0d13f6a1e7cc6b844a883df8da7e4ffe6102a9d296c70a7703dc43204dcff1b38e4bb77c8a3e54da346aa1a8 SHA512 5c18f7bdfc30bef1eeb52b52c600df9721c5f857b10d0ca52b772cfd340e3d8628b1630f9c1af5371f7f4edd0e008a4937ee5aedf34c52fb7e360674a70c7e7c
-EBUILD portage-utils-9999.ebuild 1803 BLAKE2B 1f972e1295a2093606cc66f0c43a33f0134348dcd289e8c4b65d67d4607ea9c02908a1a112e14a1ecd82f7d43ed3510bd5931ff25ee428818a8dbb2a9de5d80b SHA512 43bd8cbaefea948ba613e8a85e3d3b812f15ee1a9b40ec7addfe617845f8bb72aaebb838e20dd094999e0a3fd2be9ddc1f899b83f529955ef39397de47330b49
+DIST portage-utils-0.85.tar.xz 1773300 BLAKE2B ba1482fc04e590612331e7dfdc0a330f81aba919fad21918912f490529cbab5f4f173cdefe70e0e40267f8cc7f64afd3c0e2a39e1b234034187f5bc75d10d9d1 SHA512 56b2cfa0fe6f7c5da0e7e7095568902173a7a976a5fb71b286e3269ac3c8f2fc878089d4c676d8ff2efd86ff150392c3407c838019e3846abef158f236d23830
+EBUILD portage-utils-0.74.ebuild 1052 BLAKE2B 580e1a910a3e31dc408b5a3ae47e6369c6df12eb3a15ea43d2e77c1dba67b6bf42699f2b0cd393ffc4bb577eeebca0def4a8d1ff5349401f7ead9fa9c928a650 SHA512 6509ba8e2dd8c9978e15da4a48cd122017a2ba763bc2953e323fa73f2ad38b7f1baf596ccc27f204f76314f94995ede4912d67ca6e2e377baefb376f28da6b59
+EBUILD portage-utils-0.80.ebuild 2252 BLAKE2B 9fa660784c3b2b15f7454d6dd6c6ff2d09b81f9fb0fbb73c22bb85e4293dfb3e4a2abb6e5daf063a5abe827dd7b518292ad683dc038fe3ef6863037d10ae04c8 SHA512 0b733e318124020b56598240c841d51274a50165fb1a0a00a23950ef298c9c9e95421289fa4a77c676922d207ab757552087ccd5e35553a2ee48c91ef5d17164
+EBUILD portage-utils-0.85.ebuild 2183 BLAKE2B 37dfa27802791a8f0488b31b0b378698f4d43dc5682e859696430aaa5ff3cf83d527d421e3fb2851159b4af50ff67aed9acae91e11f2da922f0483912cbaed5a SHA512 cd25ee41e03afb0c70b726afe0cebce0d71befab9b3944b0fa45b3eef400390ba15c583204bf9c24ad960e7ffc6bdc1b9086ad18d9bc7ca8ffa7813c38d814e6
+EBUILD portage-utils-9999.ebuild 1810 BLAKE2B c79ed6af9cf0c65fb1752011bb1909959960a3f02c0a4e6877f6dff9876a1661d32ba7f70964a9b883acd157717b307ba4c1ecbbcd79ef265a0cbe5955831131 SHA512 c1b7f25e06d30c34aa34deb82ae7dd60c379218669cde552be43c7b8dcf50623b38cfd4d54d055013e93b7e538221ce4e00cf6d19737bd69f600de59811d13ca
 MISC metadata.xml 490 BLAKE2B 36af527c82aa05f09ef3187a5c93ec34412a625a00016ad87fa1f6e7a00108f87bd3c8af42aad0aec87fa11e1ec25da71f1f4776c0da053e7426b8006d876103 SHA512 eacb9a20b0228c67896f7633619e67ef0e2de38444436ed720f849b8d9fcbed3c2569d2534e38fb7060cd755195bfd74cbcc9d77dbd5da4fb7b1654f87f70a1f
diff --git a/app-portage/portage-utils/portage-utils-0.74.ebuild b/app-portage/portage-utils/portage-utils-0.74.ebuild
index 2f4d01d634a2..4d32c0f59dba 100644
--- a/app-portage/portage-utils/portage-utils-0.74.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.74.ebuild
@@ -12,7 +12,7 @@ SRC_URI="mirror://gentoo/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls static"
 
 RDEPEND="dev-libs/iniparser:0"
diff --git a/app-portage/portage-utils/portage-utils-0.80.ebuild b/app-portage/portage-utils/portage-utils-0.80.ebuild
index 570f89a51977..b583074947cf 100644
--- a/app-portage/portage-utils/portage-utils-0.80.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.80.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
 else
 	SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 RDEPEND="
diff --git a/app-portage/portage-utils/portage-utils-0.84-r1.ebuild b/app-portage/portage-utils/portage-utils-0.85.ebuild
index f6aff824f7a9..d1e5d7ff75ff 100644
--- a/app-portage/portage-utils/portage-utils-0.84-r1.ebuild
+++ b/app-portage/portage-utils/portage-utils-0.85.ebuild
@@ -60,13 +60,6 @@ RDEPEND="
 "
 DEPEND="${RDEPEND}"
 
-src_prepare() {
-	default
-
-	# fix #705636, basically apply 2f917fee
-	sed -i -e '/free(name);/d' libq/tree.c || die
-}
-
 src_configure() {
 	econf \
 		--disable-maintainer-mode \
diff --git a/app-portage/portage-utils/portage-utils-9999.ebuild b/app-portage/portage-utils/portage-utils-9999.ebuild
index 437145f4f2ff..16f7d2ac6596 100644
--- a/app-portage/portage-utils/portage-utils-9999.ebuild
+++ b/app-portage/portage-utils/portage-utils-9999.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="6"
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/portage-utils.git"
 else
 	SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 RDEPEND="
diff --git a/app-portage/repoman/Manifest b/app-portage/repoman/Manifest
index 448df5afe021..d056dd8e7d19 100644
--- a/app-portage/repoman/Manifest
+++ b/app-portage/repoman/Manifest
@@ -1,6 +1,6 @@
 DIST repoman-2.3.16.tar.bz2 86739 BLAKE2B dc3e3b5e72df751cfacc17e6f5c847160438a4d6f5d86b4dd17ab8a3a69cd0502f2965934c456ea7538f228c40364535e861c489ab2a09a0df14183b111e9a38 SHA512 d0e8bee1e3bd6dd8aecb1278fc7877768552612c4638488b61a9b8856ad9cd7333c7d52f0c334925d90170a1d8af20e9ead6533edbc10cae02baec629dece121
 DIST repoman-2.3.20.tar.bz2 87313 BLAKE2B cc0ff9b651e01b12202b32d48979f42ffde6e8a7c72095a3f75228a54892bc11c521f015738443133bec223f9ca0faf5687388680ddfd19e07514f873094b0f9 SHA512 edb5564de920156fd89b4df136d86b73401d4d5cf591abc2fbbf97f0ebb7bb43ed17d076560a76a1f3269d19a64c7c52d48540134a9fb86d9fa952d1702e01e2
-EBUILD repoman-2.3.16.ebuild 1948 BLAKE2B 279f17c650948f278fd6a528c87672d459ab98c2e3c191de7cf41cb98c8ae1a633e9ade47eefeefec5f12c916fea4cc944ad86681787a01a04a9a9766e31e61d SHA512 810fe7e188616ee55740d610d4caf309e4aa57d4b74ad6a38757844e7eb798fd39251b0c3e5f83ea72ff210fafed79b950f9067393ebc956604cf0427d559fc1
-EBUILD repoman-2.3.20.ebuild 1985 BLAKE2B 3cd7e5d84bf9b3e01ab307c4b2f785ceb5d53a5e7d31f32bf8c9c1c04b7a7b14362827c994c23cbeefd9acb02dcb3a4bd8af7a822ed84f308a3e77c3cef21d9b SHA512 e1decf787c181da3e87b306040a818fa11d34037319a899296bcaa770967bd1a3b728669c53849744b6c9fe7c413ffa0f9d3992b4de26be5ad51f64ff31756a7
+EBUILD repoman-2.3.16.ebuild 1949 BLAKE2B d151104eea493157f9f1df62f38659bc8b94c12fed5faf7625b3415394d62ec6ff0054ca0e342754c09f4a391b80c3e26e9404f690dac598151d3cfa22426451 SHA512 34ae347c6981cc9cd397d67af870b4b4da40998b521a736b59e8af261c03da115de4d2cab2914838cf9f90f8991603042741ffb95b09e04904cce3552efcfbbb
+EBUILD repoman-2.3.20.ebuild 1983 BLAKE2B 1ccf8be975d6c31234f1701d5d3f62757ffab6bdfcb6b2ae0e8d4b554ff48769b2ee00cac162647a58b4e32fef02b8daee9ffcbd605ae59bee35315c3164e692 SHA512 226d5b810a47304c869a4d6476c6a658643b1426c22a476d2e5f597c181391d70076708c7a961eafb688f466518fcf9f3f649d77efb1002cc841785bce3fb7fc
 EBUILD repoman-9999.ebuild 1988 BLAKE2B 9f52d6cdd535e510127b092728c3acfd1fbea560399a7caa0ef58c9f975d2296eb5310faa5062b6f31be215f633e34525a113e6cd71a6a91d0dd0b615a31727d SHA512 374298336d3a8a1ec10b199040f10ff410ef450e4048024962daaebafa8dbf4611265081f14fe8699ce8eee2eda6fc424c897ea1d05b44a0c851f1fd59369ee9
 MISC metadata.xml 472 BLAKE2B 7433ca0ddf5b8554caba0893b28e5681419f18e7f8d28c1c202c98b9a198ea4222958dd537247e29e2f3300ee051860315b15ca7fbd92ba2c4fe614a43171942 SHA512 53566a405056159de7412ea3b447ce6a7b73833fe927a04b5576bc77b2f4b181de8413956ff2b0b1836025352566b0a44252c2ebaf313cfea4020ea5490f3ab0
diff --git a/app-portage/repoman/repoman-2.3.16.ebuild b/app-portage/repoman/repoman-2.3.16.ebuild
index 573ce64fbba8..900147ef47e0 100644
--- a/app-portage/repoman/repoman-2.3.16.ebuild
+++ b/app-portage/repoman/repoman-2.3.16.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999 ]]; then
 	S="${WORKDIR}/${P}/repoman"
 else
 	SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
diff --git a/app-portage/repoman/repoman-2.3.20.ebuild b/app-portage/repoman/repoman-2.3.20.ebuild
index d9fa10fac999..36e1b1daeb1d 100644
--- a/app-portage/repoman/repoman-2.3.20.ebuild
+++ b/app-portage/repoman/repoman-2.3.20.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]]; then
 	S="${WORKDIR}/${P}/repoman"
 else
 	SRC_URI="https://dev.gentoo.org/~zmedico/portage/archives/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 DESCRIPTION="Repoman is a Quality Assurance tool for Gentoo ebuilds"
diff --git a/app-portage/splat/Manifest b/app-portage/splat/Manifest
index 5ac432309a63..ea0c01bb9d3d 100644
--- a/app-portage/splat/Manifest
+++ b/app-portage/splat/Manifest
@@ -1,4 +1,4 @@
 AUX splat-0.08-prefix.patch 853 BLAKE2B aee44a919b6ae692d354d65b7ee622d78e0ed73a6d4ebfe9858b45ad6500a5c7e8d3d52a5953f74d395e8bd30da3cecabfec570f632fe79abe5e16dac7441528 SHA512 946764f7eb2eea8155806b842f6d5fd979bdf7e2a955c62d10cee0e652df51f70c0a0e7d9d4069cae3824c87bf6756edb0f0ca94e120a0d43bb6787705d62cf2
 DIST splat-0.08.tar.bz2 12180 BLAKE2B 9276bb0b2b8436b8becb6b502cf9b9d19f9d0a88928535939d043f88121ce3afb208de72971546f7ee8eb1ed44aff6ea4aa8d758638eec82dc7991c414542441 SHA512 18be949f601cd7ba61babc667a26df9bc5ba7ece33c9b680be7c3541418ea65f3ecf1ae402a70fa3499b79ca2b000c36a58e202d06456cbb7745bec749b1374f
-EBUILD splat-0.08-r1.ebuild 591 BLAKE2B edaed450223516049bb5b2fea8d1124e4ab51007a83442c7b726f4727dbff082c6de39659c9f634c81ff80892914f8cd3ae0b1a0772192e0fb01b474e6add6eb SHA512 2c2b6edd58f91b3c9716a03ef765f621ca04d900dba51da049db228da36168b5344bcd32b96fac478dbeb05bbd638d5990ad5ef117b60b32c6ef32ed208a12b7
+EBUILD splat-0.08-r1.ebuild 592 BLAKE2B 45926fc31d3ee0d7d0e9a28a3088e228f1eebb76340d76ea59f92ad4679b7f6f784a039401414fcdf441cb9cff46ce8b4b5aa0427b5811c4d610b262c6ccd505 SHA512 72acf4ceff3382c2fcad5ee9414ef24aad82fd00f7a69be9614a91e843fef9e5feab5653841cd8898c775eebcee9e9d8d5cb6b5d670720bd59d1e42ef610194e
 MISC metadata.xml 166 BLAKE2B c254f1fb642881aba57637be14fb0a89b10384f91a128feaec3a8c870d76efc2cbacb92caccc0dee2dd19a5ac5eaf8643080dafa05c4e2ac96a68568927e5afd SHA512 a56648c974a1d14dd4c18237532773c72057a13ab90c58b5da04f185e3c12a8bd8d5c21fb06053507f31766291a82dc7d87b34cd65fd94cfe2af7295c813ef84
diff --git a/app-portage/splat/splat-0.08-r1.ebuild b/app-portage/splat/splat-0.08-r1.ebuild
index 50fc4acc7f9b..7bc4a5e50d19 100644
--- a/app-portage/splat/splat-0.08-r1.ebuild
+++ b/app-portage/splat/splat-0.08-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="http://www.l8nite.net/projects/splat/downloads/${P}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+KEYWORDS="~alpha amd64 hppa ~mips ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 IUSE=""
 
 DEPEND="dev-lang/perl"
diff --git a/app-portage/tatt/Manifest b/app-portage/tatt/Manifest
index 17d9f3d796fe..a646feb85494 100644
--- a/app-portage/tatt/Manifest
+++ b/app-portage/tatt/Manifest
@@ -2,5 +2,5 @@ DIST tatt-0.5.tar.gz 23249 BLAKE2B d98456bab4ec4d820bddc2ec614e02582f5b0385d806c
 DIST tatt-0.6.tar.gz 21689 BLAKE2B d11bfb616cd27f1a303d4c95dec875cad42d31d72654be4649dac2c7b3f086b7c5a1886d9c9fbd0a858d9e042c9db0a7b5e2f4167c46b6291509f9d97a654097 SHA512 c12ea273af8b5bb410493f297776d730b7c36748a5f1b735c94dfb0542f9f03d28482060858951ac9fa161fc299c21473f5bdeaa4d89fb88ef61187a809dcac2
 EBUILD tatt-0.5.ebuild 827 BLAKE2B 64a4a7b8317c3c255bd5f2fde1e0e4ab873aea9da490e6a4dde74cb86ef30c2ab1a04d972fd0015f12c6e3f6b1521c2128f9e6612564b1cebd45b655f94124ec SHA512 2eca825604ecbce791e31bfa486d937b500d042326c26f06ae610c98897205a7bc985a7ea98f8b1c4431b7d5781edb18f6153f0c3f3d00d6700d9520a786e10f
 EBUILD tatt-0.6.ebuild 829 BLAKE2B eb17f1334a2d1d2990514e5daee3ee7cbcb6023da8695027c1ea8bb69b33370a99a6a11bd4b764ade735ab919b8587528ee769dc1ca630082650553ca88b9160 SHA512 41722f1e64065725e0298125d40a91b0e4b33a8d994aab29c3dd43bdaf0911c03243b30d4b828be2083d936ee7ce3251c8ec94f9ff938580a9b4d63015d8f0d7
-EBUILD tatt-9999.ebuild 741 BLAKE2B 7465e680ec62afd9c0c9d847f3a01ba3a680e586d33d57ee55908ffe4a93807caa07fa9d545c2bf0dd265d1724e7766c14d73f6f565fd358b59f3ee2291158c2 SHA512 d103954e60316698084dfc20ebf502f97b243df8d31070b5243d03eee1b326cddc023aa49904efb9d6abcbaee2cb94f0b4fb7c5f186ffa4c66c28206204a6444
+EBUILD tatt-9999.ebuild 787 BLAKE2B 86e616fb77044aaaf2182f31440eccaf99ff661ebd1b0226670fbd1ca26d2ec48204b1196d8dbc40a57a9c5b59050a18ac754450bf502bd715d317916579448f SHA512 b290521d30ed1fa0bdbf5ba2d25e242922c53ceea720fd3823254ebe01e2d609c1789fe2cf2dab295c98cfc39655405113a6f0d21c7fd5a847e4e124faab9569
 MISC metadata.xml 640 BLAKE2B ced0c34c83e7caaa4158afcb814c0dd58fdde9f1bf1db6c1a041ae080b6c188e5d92546ccc6229099560787292a252a16d4d636a35b969a3964fca5aaa151815 SHA512 1320dd15e0191463c28417c1fdc9084362356c89a0ed34c4002f6f0a2266596645e8170b781f39cbb60d40da58953f28893b4e9a6804f077393ca739f6bc15a2
diff --git a/app-portage/tatt/tatt-9999.ebuild b/app-portage/tatt/tatt-9999.ebuild
index e036b05013f1..c0f9e775f5c7 100644
--- a/app-portage/tatt/tatt-9999.ebuild
+++ b/app-portage/tatt/tatt-9999.ebuild
@@ -9,7 +9,8 @@ inherit distutils-r1 git-r3
 
 DESCRIPTION="arch testing tool"
 HOMEPAGE="https://github.com/gentoo/tatt"
-EGIT_REPO_URI="https://github.com/gentoo/tatt.git"
+EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/tatt.git
+	https://github.com/gentoo/tatt.git"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-portage/ufed/Manifest b/app-portage/ufed/Manifest
index eb02a03f6fd9..d4f2830fbafe 100644
--- a/app-portage/ufed/Manifest
+++ b/app-portage/ufed/Manifest
@@ -1,6 +1,6 @@
 DIST ufed-0.94.tar.bz2 48566 BLAKE2B db58624005c637c7133a298c17b60cae3cf54c1b1d2ba3337693e1f6c330a5305986e92b6c1b25a5ebc94b1f8934cb5a35db94eccb596f2eb15619dfb2ce4977 SHA512 a40e55db8afc99b5e16b080d93867ef8c832a7318af7a50edb582bfea99bcc6a467b4bf12b75a9d3943e8a008a0222ed73daa52a8e7dae57d73bece4ac084d24
 DIST ufed-0.95.tar.bz2 48956 BLAKE2B b2bd9210b314814fe9bd1e84ea4ce9de8f3285e5133c989d72284f775c1ed246b0fb641952d4babdf9252cd4b8689afab6b4023099f6c81c81358ab2cbbd9d28 SHA512 010273fc4ff13822ba42f6497a8865c0d29c1d0118b62fd7e2bab66390818fcfb09390fbac671ef612d8e71609fc920b951a11dd42ac79e846d9469a374d2629
-EBUILD ufed-0.94.ebuild 950 BLAKE2B 245cb247b3cdcc5cfa12f6d3001d1a7625807d47ecd9ddb93762e022e21720115d76d864e91e04b3d6daad8f14d82fa5d736f2df90dfea7d1314d8296f46fe52 SHA512 6f1306cb407ea2f5cf9cb842b89e6415d1a229f15270c0390f5918724e81edc105467cbb12df15296b03068bf6f9b9137e8914232f27e20482d327d19d50a9cf
+EBUILD ufed-0.94.ebuild 951 BLAKE2B 45f6741eac31585e553a31bd6fd3ca50810f647086470f964556b945257c9b42436e41aca940a612c5809d261615733e2322050b291d8379df09df66f726c506 SHA512 fbf259a4a7fb701809c5ab6ce6d78f3edbc0501185ed13a64e6be5bc30e3278724b8c302a0ebe06b419fed32380f98d8c5058e58f3de0b2176b9f7574f2d9f25
 EBUILD ufed-0.95.ebuild 968 BLAKE2B dfce0a964ca321ce66b8e74a7ee929e2292698cc26adf9e2f9649dc96ddbdb14e5b7a404e0a019de234b3e7f98b56821c2e8db075da07da22cffc812ec1ba5ea SHA512 d44490a0315951c5bb5617f435ed2ac184a586218304d88cb04573644c3566c6037cfecbc3158c32b34493280792c8e36df4d67f35eb42020c0a48b9c38bda0e
 EBUILD ufed-9999.ebuild 952 BLAKE2B 381447ef1162bc8f3ae6e53cf43216b9c097d64c2fe5426e7d12e8854843e1b20c92285564fc1700326182f81feea6ecb9b741dfcd54ec173a2e998e1e2136d0 SHA512 ba5d761545eed25bd6f330e980cfcc62bf7699304f442c7cfc70bd1914d3c98a2bfeefc7d87fb266773122ec738faa79186133c523318dee858f46cdedb6925c
 MISC metadata.xml 361 BLAKE2B e72a5c7191ded0d83e12bf682664958d80b884b5217d2cec7e711be07c6a94d6b4dee2a451d7661d2c9f800e1fa4ece99d0a840d613266afd203f0428c27086f SHA512 f9731e429d091d02b83f3c60247150fabb267e74510c397978ee215c0a9eede6e74297ec3433b3e4ff1db858382136c74c5efbc43d2a8fcd6b848d19998bb6da
diff --git a/app-portage/ufed/ufed-0.94.ebuild b/app-portage/ufed/ufed-0.94.ebuild
index aabf3d858cbb..d6e6bbc851a2 100644
--- a/app-portage/ufed/ufed-0.94.ebuild
+++ b/app-portage/ufed/ufed-0.94.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/ufed.git"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/ufed.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm ~arm64 hppa ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sh sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 inherit autotools out-of-source
author	V3n3RiX <venerix@redcorelinux.org>	2020-02-05 18:44:56 +0000
committer	V3n3RiX <venerix@redcorelinux.org>	2020-02-05 18:44:56 +0000
commit	29aabba0ea759c6a2864ff5631735b67ee38e5e0 (patch)
tree	ab466b4dfa7abecb401b2f8039d08af4689306bb /app-portage
parent	d42200bec37eef2a7478d88988ff00addd0a9202 (diff)