gentoo resync : 29.06.2020

56 files changed, 1143 insertions, 787 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 83652c1f534f..bd51a38e0338 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/accountsservice/Manifest b/sys-apps/accountsservice/Manifest
index d2c386fe213a..b4099f920dbd 100644
--- a/sys-apps/accountsservice/Manifest
+++ b/sys-apps/accountsservice/Manifest
@@ -3,5 +3,5 @@ AUX accountsservice-0.6.50-loaded-state.patch 1579 BLAKE2B 40c5f1a641967fe24b740
 DIST accountsservice-0.6.50.tar.xz 384484 BLAKE2B 52c06ba85498f292204834f967211d8f0940786dc2ea3070124d3aecccd551375bfbc8fc31f23a2c3c86e23359294307656c3b927c4e819fc102d8626ae0dd82 SHA512 6e07cd318452b1cbedeacd729f0ebb200525caf1b09981abb2bac16fd90756a790ebec08aca0a0cea016f14ab27c159a68fe1332ef4bc636c5863b8c61040f64
 DIST accountsservice-0.6.55.tar.xz 97972 BLAKE2B aba3adfeb53e64455ce8e672b9db754bae4af6b4de0823cc021d0311a381ec40af04371e78f7c84eab7fb72356b26e22db78aad0343d57f65ea71a7742b51fc7 SHA512 c12e6a8e80f9b087f97238da4734d2d3a14a7c5cbd870a32a04b00116f176c818c39fb886f6dc72c3e93c136b0c2074ddf8f77e20431fa3bd54f138bea9d262d
 EBUILD accountsservice-0.6.50-r1.ebuild 1614 BLAKE2B 186817bfa9e51d665a856831cbcb537e3c671eea3f7eaa14d7549696720e6977e5b9ede900ec9656f916ebc809eb226da1e8210c9503b724db30462ca4592711 SHA512 fb1187baf22340be9c98adbfdc143288ef2e1bc4e08dfbc1c368e5718b398d6bd6f9816795760693b078cd3057d79c8ecb70dbb4581484296c761aff84088bcf
-EBUILD accountsservice-0.6.55.ebuild 1776 BLAKE2B 4282250f72efde99b74ce61ae7b5f6034abca3d6afe4ae1c282977a7f2c35f45cc36ae35354cb44b3822ac38fe3d590fc146c24e5c5fa7182e526720d13b19cb SHA512 702f9d5c2f1a182a9ff9e20483cf24945e65d23324ee3e707021be8080bb236c35df7fe2ad2f195944aeaada4dcb004f6ed0139171918b39434a9c27059f4aa5
+EBUILD accountsservice-0.6.55.ebuild 1773 BLAKE2B 3a2cb1891170494b531740577bccd987bcb98236a0178a0ad8e6030f3159fccd07dd51b5032ba64a238166941ff2b8046ae3b6de1137893e7f2bbdee9c19232a SHA512 65e9f962aff10e586ba6c8db8945c7df48733145d2c0d88c5904ff7e011968e3a8912351be9002444bc7363032b17374b7fd3fe31c1ef1435b4ea7bee5c40680
 MISC metadata.xml 523 BLAKE2B 6117c5e7b8e0120bbae31e46c4d1e3709111638afa43c18d000c975ea0fded590ecb9404e10eca2542b5262cb122be9e34d140b6b3101ad69321cbc2f73a5890 SHA512 41c7b3374cfc02ddd842f13c25039abf016fdc110716cd9f308c4d9050a793c8506d6459c3604eae946184f3d08b2848d63b1bf65eb845f9a551c27debf1794a
diff --git a/sys-apps/accountsservice/accountsservice-0.6.55.ebuild b/sys-apps/accountsservice/accountsservice-0.6.55.ebuild
index 8b9e10e0aa64..78a9dca8f4b9 100644
--- a/sys-apps/accountsservice/accountsservice-0.6.55.ebuild
+++ b/sys-apps/accountsservice/accountsservice-0.6.55.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.freedesktop.org/software/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 
 IUSE="doc consolekit elogind gtk-doc +introspection selinux systemd"
 REQUIRED_USE="^^ ( consolekit elogind systemd )"
diff --git a/sys-apps/biosdisk/Manifest b/sys-apps/biosdisk/Manifest
index aef44fd2f74d..09d9d460bc10 100644
--- a/sys-apps/biosdisk/Manifest
+++ b/sys-apps/biosdisk/Manifest
@@ -1,3 +1,5 @@
 DIST biosdisk-0_p20171116.tar.gz 712587 BLAKE2B f09a8c68f57cddb1949d369cfc18d1216c3e64612a7074c58e6c50c12682fce92a4d6295810d5358fac0340483387f14059811a5681ae4f37c7da8e40c34fec4 SHA512 27d99990d0e92f1295d2ddb949214946db681e7f80c6606b252473fe7b5b0d3254180b54cb26479c9014219f6b989aa6ba29e8a818f3801f9ccce4efd2f1c3b9
+DIST biosdisk-1.01.tar.gz 214715 BLAKE2B 1a42523d0ec713a895276e3ca3b383206bb841c59bf789eb2b869ce3ade6bfde1e96d47afb8874eec5efec1ef4d404c093a707e36d2d9ab785211fa62abb5782 SHA512 f1920a0eee0a1f8530488c5ccd3f37b36170150b7658658af55beb41c2084c66b6d6bded6e144e36dd9d74f963881c504d7869bbe5c8b57749bff4d918581537
 EBUILD biosdisk-0_p20171116.ebuild 971 BLAKE2B 19cc49a6fcf3e44298bf55c46edbe819dcbf1302fb8cbbae83831d6072bd31ecdeaca73695b01138ce42d65e05cfe3930c983a7d226de232c33da2f3f607fa31 SHA512 87024d007d88014c0ac837cbeaaecc24b453e596329f0f2d8a212b0243a79c437e272cd15cabb0afaeb8f2bf06969c1e4f1d92fd0d59ea2433b059aabb112627
-MISC metadata.xml 357 BLAKE2B 5fffc76231bdf56fba8728b3bef780c099b238aff410365f27bc13b408eddcc05259565e08e208522abb2631bc00929b56c8df7ced22e73bc311143bc0c772ec SHA512 dcd11ab94a75f3988677ef2e82929b37ac465764f2f040a0e11083ab3a2e7ef54215cb5628e7b4f65cc166adaec19d5ffb386700e16b5f56a4a68d8c5205b0b4
+EBUILD biosdisk-1.01.ebuild 588 BLAKE2B ca0d2e385dbf7138407ddb9ce60e4eb0ff8ff22e351a3ebf68d223c23490003721035bb54d2b128a419400f4b29312d2ee9d28e62ff032271000991dfd93dc19 SHA512 e81b6743cc3570f7ea0a903ea13d8f044eda3d538df6b5a3973ef4d943ab1c261832306c65bc4642e6df1e21724f5bc1f1add61b29531ea17f27744e26851f9c
+MISC metadata.xml 245 BLAKE2B 9d48c927e5844df237d0d7c23fe22d6b1896b0369c41a9c7d62c6ff09ccd0937de415f743270a074b9d389a6ea0c10933b9701a264a2ce155899ec2535f6bf0c SHA512 77077cbe810752d5fb24ae88ff5d9a00a175d7d043e95268d69b1f461546d9bf9053273e5d5bc3ba9dc80641b0ef908f8d189d7f51602f0c6786d04c8c991bfa
diff --git a/sys-apps/biosdisk/biosdisk-1.01.ebuild b/sys-apps/biosdisk/biosdisk-1.01.ebuild
new file mode 100644
index 000000000000..f4ae904c895e
--- /dev/null
+++ b/sys-apps/biosdisk/biosdisk-1.01.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit eutils
+
+DESCRIPTION="FreeDOS based BIOS updating utility for Dell machines"
+HOMEPAGE="https://github.com/dell/biosdisk"
+SRC_URI="https://github.com/dell/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-cdr/cdrtools
+	sys-boot/grub
+	sys-boot/syslinux
+"
+
+src_prepare() {
+	default
+
+	sed -e 's/biosdisk.8.gz/biosdisk.8/g' -e '/gzip/d' -i Makefile || die
+}
+
+src_install() {
+	default
+
+	keepdir /var/lib/biosdisk
+}
diff --git a/sys-apps/biosdisk/metadata.xml b/sys-apps/biosdisk/metadata.xml
index abf4a100a13d..b9de019cb593 100644
--- a/sys-apps/biosdisk/metadata.xml
+++ b/sys-apps/biosdisk/metadata.xml
@@ -1,12 +1,8 @@
-<?xml version="1.0" encoding="UTF-8"?>
+<?xml version='1.0' encoding='UTF-8'?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-	<email>mattsch@gmail.com</email>
-	<name>Matthew Schultz</name>
-</maintainer>
-<maintainer type="project">
-	<email>proxy-maint@gentoo.org</email>
-	<name>Proxy Maintainers</name>
-</maintainer>
+	<!-- maintainer-needed -->
+	<upstream>
+		<remote-id type="github">dell/biosdisk</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index bb532550ce2b..9ac5f8222606 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,7 +1,6 @@
 AUX 80-dbus 341 BLAKE2B 20849eb7c526475d3ff96766ac7183608aa51e5c069f07cf282a2b4d884b2a8580aa88cff182d54ef75aaa747848f3dbcc0bd0bd5da124e4a259851878c73b00 SHA512 fa019d903e5412d0c47dade4299995e9baa8b86d74ebc0b42967137762bc476628af57f8a6c354660fce731c33a49a66027cd8b5a25be4d898b7d1662c600e89
 AUX dbus-daemon-optional.patch 2701 BLAKE2B 28054bf147ffc29d893017dd9b8a6c9b3a032c31ec1860c38c7a54910b3fe8da2a9bce175d01fab1c224008ba38e1981dfc161fde80f725096e644495740052e SHA512 6d07220d8c80c49057396dc76d808cad2c995cce259544e8435d0c8fe328f85ac3a7da5a88209f80a127a04b48591ac20fe661683665adca2af75fedd2563bf2
 AUX dbus-enable-elogind.patch 2801 BLAKE2B c9ef41ff7b31af6cbaf28ca16974fb62aa0f2492f1c6970b41216758768d1139d2ce9aabbb3aff952d625b0decd1e8c2b25f79bb0a13c146aa9453dd4f7b5c5a SHA512 84c5eacc9c305ce1fa9f7a50407b7e836a20c679273cef06004ff57665c27818d2c33e0cfa9ea91ae89c50da4f7b9a92077e607f0f17b9300892d16e881a7d9a
-AUX dbus.initd-r1 852 BLAKE2B 8a574a3c2839f0b082067a87f2713348b0c25c47cb6c29db9e67af5d83cfe01fb6ddfd0413893048197d5478021528d9a8c2e8944545133e6eaa650d97c6dd98 SHA512 e5a884269b777b4cfe889dde2bf1f2a6ea8eb68ef044668887946a95960342283386815adedd116d2d668be51ba229714a5a5ec49a2cc1a813f384fc899e30c9
 AUX dbus.initd.in 841 BLAKE2B 7df68814224e066e6356ec30215cf76507c4c1d0b0fed7e97339cba680f7a6f4628b71ca5660f9bc2c0efde75b9a083c08b121d186fd7900b3dea0443a7c0760 SHA512 6bc5bf619369448a221e4eb7c5af421b7610d9488f0409cf1847539b94bc2554238a8e53a60432d7ef60f9b812a3efb0b2ae2ca2544b6ed77b845ec0f5ba1a21
 DIST dbus-1.12.16.tar.gz 2093296 BLAKE2B 46c4f0d384d76dffd31c18a2d2df03d0658479d8f5b2d14b1db2bf0941fecdc023307ec035e3f977fde570a9f6493bbabd020ac2cd81b0577597e355f5a72522 SHA512 27ae805170e9515a8bb0fba5f29d414edc70e3b6b28b7b65bbea47035b8eafa9ac4820cdc92645be6035f6748f8aa45679e1ffc84ba74a64859a3056d318b9bb
 DIST dbus-1.12.18.tar.gz 2094453 BLAKE2B eba48940c80a7483b858199156b297d97896232283988940d3cdb915eaa30bcdd13bc01f8410dcdb34193040a8bc8ce2dd45f1310aed791071e5dc5a6b38eb27 SHA512 817674e86a5d4cbfa705a79ca5197176311e47505c5da02334c2811f63b55014b582a12bce53bc73a08a3ad5061f210ba0d1e5f3bbf7697c81ca70c22a76fc13
diff --git a/sys-apps/dbus/files/dbus.initd-r1 b/sys-apps/dbus/files/dbus.initd-r1
deleted file mode 100644
index bd3542381a7a..000000000000
--- a/sys-apps/dbus/files/dbus.initd-r1
+++ /dev/null
@@ -1,36 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-
-extra_started_commands="reload"
-
-description="An IPC message bus daemon"
-pidfile="/var/run/dbus.pid"
-command="/usr/bin/dbus-daemon"
-command_args="--system"
-
-dbus_socket="/var/run/dbus/system_bus_socket"
-
-depend() {
-	need localmount
-	after bootmisc
-}
-
-start_pre() {
-	/usr/bin/dbus-uuidgen --ensure=/etc/machine-id
-
-	# We need to test if /var/run/dbus exists, since script will fail if it does not
-	checkpath -q -d /var/run/dbus 
-}
-
-stop_post() {
-	[ ! -S "${dbus_socket}" ] || rm -f "${dbus_socket}"
-}
-
-reload() {
-	ebegin "Reloading D-BUS messagebus config"
-	/usr/bin/dbus-send --print-reply --system --type=method_call \
-			--dest=org.freedesktop.DBus \
-			/ org.freedesktop.DBus.ReloadConfig > /dev/null
-	eend $?
-}
diff --git a/sys-apps/file/Manifest b/sys-apps/file/Manifest
index cc1d7b4f004e..18fe50194b8a 100644
--- a/sys-apps/file/Manifest
+++ b/sys-apps/file/Manifest
@@ -2,12 +2,16 @@ AUX file-5.37-CVE-2019-18218.patch 1038 BLAKE2B 30622d39fb4006b07fabab70dfe6fc3f
 AUX file-5.38-Revert-PR-93-iaeiaeiaeiae-Do-as-the-comment-says-and.patch 1184 BLAKE2B a2b6a11c1d89ac5683422e9d9734990d5b54dc14cc295853920c5ebfe28a5de2055c889d5f708ab55d8e292a514ce51fdbd260f0e15dce74ee048fe0f8a7d93b SHA512 7a710d32232d3484923937add7dd56e6d4c6160e32da4d65cb9b4083fbc85df229af108728f3cdf9313291bdf96259c7471c1b6c4b3548033205de47e0280e6c
 AUX file-5.38-The-executable-bit-is-only-set-when-DF_1_PIE-bit-is-.patch 823 BLAKE2B c2d4c40224d2fa3db4ca0069e1f5bf111cc782879c97f642d91dc4d545544af22ed11bade5c014494838d75ac8e4d607009af77d0dc9d3457d1eb28d8e2ea192 SHA512 4ddc901be88b61ab860817daeb9f4021a6dff1473d0a64ff6409b8327e07011b1d86f2a2c54e1751d03518fa5def25fed644c1a6cd691f2737b526e43098603c
 AUX file-5.38-td-is-for-ptrdiff_t-not-for-off_t.patch 813 BLAKE2B e0d0168f41eb868131cbed1e657f4a1e4f4d1f29d22f4a4685b43a6bece5a9229a25a1d96bbc4deca065dcb6342d388ebe86e984e3dda66729f974bcc4e7a32b SHA512 eae1267cf6f49d448cad51f3ba97cd1f8598bebccc014b8702cf3ea330184718dacd1570f20efdd119951b55fe57729392197cb86f89dcce23654e745c846417
+AUX file-5.39-add-missing-termios.patch 813 BLAKE2B 6b65d89bcf6b3a5b7d125e05b951d7ea0e06ba821d06e3165a6fedaada07d4bb78a35f1fe541f741e88cc1f5e179215626db35d894bf7aab84b132b9e5afc29d SHA512 a1ee1fe9dab05057d962ba9f8fb811aff49794ca0e8f82bf582e17bba884c73e792230ed90450e16c4203aea7f20dd6cb26dd3a22ca66a19074c6a62fe794dd9
+AUX file-5.39-portage_sandbox.patch 668 BLAKE2B ed7556d2f602d848411a5252825401042bef816601f767bc2d24a8e84be7845c459d1149d9a5adfddb59843474dea0f52aead6c4a17ffb27dbd0c7cf14d9cc0b SHA512 c648b7cdd520a91f1c152e1d098db4a0d1877a473bddb5f8fa511b0f556d7a15b958451e071c25595fe1ac8c2a81b475846c13f415d861dc48184d6b19b8b7b7
 AUX file-5.39-seccomp_sandbox.patch 320 BLAKE2B ab7c89575e61cfcaa4072b33716f1aa9af437541e3248b329d6cb44c62581ab65c7b7d455f5e0bbe95103f15c24a54a15325af8947da614c83f9f4bad7148eb3 SHA512 3219903e1c3d9f8973515871f073b54bb3396550b308dcb307d0d8cdbd7d76bbc35417e9764c8d3adc257fdcb4a5c62aa136f5175c420c54b86ea03fede6b2d4
 DIST file-5.37.tar.gz 887682 BLAKE2B c5635e5de879af31cbef1c988275ab8620133909d146769b27a2f8eefa90871fad5fa75e66b9e1d77a6261e5d6dec315fb5a8ad587d8c214eaa0bc2e5a929fe7 SHA512 bf153c15aebdd00329806231d20f295077b8b99efd0181d01279bcf3734a1718567df38cf75bc929eb8015ac98d29bb4bf1228d7ece8bfdfe14dd976391dd06d
 DIST file-5.38.tar.gz 932528 BLAKE2B 08d8d56e2e1b6a0c9fb0caed89ca6145bf683ecc52a639c036ded01b913e7eea75d9235851a2fbd410cbc9b929c26579b06fe1d54fb73817c951bef3544bc345 SHA512 9eeeba69cbc9f0c00a0bdf9eaf60c73a4a709e797068f109d85c1ef2a19c8b0e012ecd73714f03cbb1770dfa717e8a661ad746b644cc030cafbfb1f7aac35a40
 DIST file-5.39.tar.gz 954266 BLAKE2B 4d6d9a6317961e0a2aa391f502b0be8bbb40ede57c3470230d91aaf9ce5d35bcaceb32d551ca5a391fc8c40b64517fdb996833a8b1ca47ced7e92e9e545d2682 SHA512 9cf1a7b769c56eb6f5b25c66ce85fa1300128396e445b2e53dbbd8951e5da973a7a07c4ef9f7ebd1fe945d47bdaf2cd9ef09bd2be6c217a0bcb907d9449835e6
 EBUILD file-5.37-r1.ebuild 3186 BLAKE2B ae1dc50d4a3e863b7ad9e1732c96b75c97d780bd7b42a34b3cdf8559e21e55724df58e5cb0ec54d1ce33c33c180755803b4545fdec3026a66f364b4436610328 SHA512 58fe1683e40742719d76cb17e0d8cebbf04de75fe1c8d4c4d8873ed75c0a0f1a4f196fa74c182c170ef00a19e42e9e892ef0ce68ef7709194f55cddb0f382eb1
 EBUILD file-5.38-r1.ebuild 3397 BLAKE2B 7cd1c545d4df9e9f448a07ae492df789fe2503c81dc7ec1bf530904099a0ec25789e205e33c725feeb03671f2fab11d04052a161c895f42e7fa2994aea316002 SHA512 baef4c52a5e40e35a3cb1717f78ecb066a10513c1e75e2c69e9ac381c58fdaf1cdb935cfc51720c382ecead25ea485163d544ba6ca19ece6dc556ec7e75c32c1
+EBUILD file-5.39-r1.ebuild 3291 BLAKE2B ae8369b3553dd3b7813b3f45cebf7334e9508deaa4c0a6fbfcc0e3df5caf0111ba3943b788f18cfab3b74238c1e95f97965775c536060516f2ed83a4a3e720f6 SHA512 2ff57e9b96bfc89a77d848e75d9420699999f6c73f12a1282877cd4f3b64454b3249cbb151b4078984454eed13c824956b4edde6f4d238cc7eb83131ef887c4e
+EBUILD file-5.39-r2.ebuild 3345 BLAKE2B 42e68fc14e26709f9f4b92f05f7f0e9ce78c83b41b05bc51c7e706282c40088b14c1efd6a394ecee611871f4e6d5279ba59802f0a28a0cff1320cc4fc073dbbb SHA512 a00a867a66f5a0ddd91cc3de97c425d2103e8823d0b38da75d8cf5d4eafa009b2043c78e37b931ed9b52996931524b601c76423efd4c27dd0395ac3d333578c8
 EBUILD file-5.39.ebuild 3283 BLAKE2B de652a223726670f67d97998e9285b4b997ea3809ac76a41618d9295f2635833ea98e0e93c8cad47c5531cf2babe83bbf1b6b7a20c1e9f9f862ac99a607c50d1 SHA512 17cc98d07cad36198d8069d35ef36f973290402db72561ca42c0c935d61acf6592eb8d2fa5550c457e738bcea2bbebc233870932ea4a37508fd2f0adf4ca51a1
-EBUILD file-9999.ebuild 3283 BLAKE2B de652a223726670f67d97998e9285b4b997ea3809ac76a41618d9295f2635833ea98e0e93c8cad47c5531cf2babe83bbf1b6b7a20c1e9f9f862ac99a607c50d1 SHA512 17cc98d07cad36198d8069d35ef36f973290402db72561ca42c0c935d61acf6592eb8d2fa5550c457e738bcea2bbebc233870932ea4a37508fd2f0adf4ca51a1
+EBUILD file-9999.ebuild 3291 BLAKE2B ae8369b3553dd3b7813b3f45cebf7334e9508deaa4c0a6fbfcc0e3df5caf0111ba3943b788f18cfab3b74238c1e95f97965775c536060516f2ed83a4a3e720f6 SHA512 2ff57e9b96bfc89a77d848e75d9420699999f6c73f12a1282877cd4f3b64454b3249cbb151b4078984454eed13c824956b4edde6f4d238cc7eb83131ef887c4e
 MISC metadata.xml 381 BLAKE2B 242f4a2403d0a4c69c7ff400fdbd447bb7fb8572dc57dc05f3edd0c875da68433217bec46d43467fa03c5e9ec69616e3450635ff2662ae3ed830a138521e23ab SHA512 f69d67890ecb0b574d414c432df12f6e8d31ceb7755055683941017563da8713d07728e49cd4a7277699a97cd3ba732c946ecf5435cee94778a0d5652e7d6857
diff --git a/sys-apps/file/file-5.39-r1.ebuild b/sys-apps/file/file-5.39-r1.ebuild
new file mode 100644
index 000000000000..8333fd922e2c
--- /dev/null
+++ b/sys-apps/file/file-5.39-r1.ebuild
@@ -0,0 +1,140 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools distutils-r1 libtool toolchain-funcs multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/glensc/file.git"
+	inherit git-r3
+else
+	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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="identify a file's format by scanning binary data for patterns"
+HOMEPAGE="https://www.darwinsys.com/file/"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="bzip2 lzma python seccomp static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+	python? ( !dev-python/python-magic )
+	seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.39-portage_sandbox.patch" #713710 #728978
+)
+
+src_prepare() {
+	default
+	eautoreconf
+	elibtoolize
+
+	# don't let python README kill main README #60043
+	mv python/README.md python/README.python.md || die
+	sed 's@README.md@README.python.md@' -i python/setup.py || die #662090
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-fsect-man5
+		$(use_enable bzip2 bzlib)
+		$(use_enable lzma xzlib)
+		$(use_enable seccomp libseccomp)
+		$(use_enable static-libs static)
+		$(use_enable zlib)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+build_src_configure() {
+	local myeconfargs=(
+		--disable-shared
+		--disable-libseccomp
+		--disable-bzlib
+		--disable-xzlib
+		--disable-zlib
+	)
+	tc-env_build econf "${myeconfargs[@]}"
+}
+
+need_build_file() {
+	# when cross-compiling, we need to build up our own file
+	# because people often don't keep matching host/target
+	# file versions #362941
+	tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
+}
+
+src_configure() {
+	local ECONF_SOURCE=${S}
+
+	if need_build_file; then
+		mkdir -p "${WORKDIR}"/build || die
+		cd "${WORKDIR}"/build || die
+		build_src_configure
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi ; then
+		emake
+	else
+		cd src || die
+		emake magic.h #586444
+		emake libmagic.la
+	fi
+}
+
+src_compile() {
+	if need_build_file; then
+		emake -C "${WORKDIR}"/build/src magic.h #586444
+		emake -C "${WORKDIR}"/build/src file
+		local -x PATH="${WORKDIR}/build/src:${PATH}"
+	fi
+	multilib-minimal_src_compile
+
+	if use python ; then
+		cd python || die
+		distutils-r1_src_compile
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		default
+	else
+		emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc ChangeLog MAINT README
+
+	# Required for `file -C`
+	dodir /usr/share/misc/magic
+	insinto /usr/share/misc/magic
+	doins -r magic/Magdir/*
+
+	if use python ; then
+		cd python || die
+		distutils-r1_src_install
+	fi
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/sys-apps/file/file-5.39-r2.ebuild b/sys-apps/file/file-5.39-r2.ebuild
new file mode 100644
index 000000000000..204826c0d4d5
--- /dev/null
+++ b/sys-apps/file/file-5.39-r2.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{6..9} )
+DISTUTILS_OPTIONAL=1
+
+inherit autotools distutils-r1 libtool toolchain-funcs multilib-minimal
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="https://github.com/glensc/file.git"
+	inherit git-r3
+else
+	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~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="identify a file's format by scanning binary data for patterns"
+HOMEPAGE="https://www.darwinsys.com/file/"
+
+LICENSE="BSD-2"
+SLOT="0"
+IUSE="bzip2 lzma python seccomp static-libs zlib"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+DEPEND="
+	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
+	lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
+	python? (
+		${PYTHON_DEPS}
+		dev-python/setuptools[${PYTHON_USEDEP}]
+	)
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
+RDEPEND="${DEPEND}
+	python? ( !dev-python/python-magic )
+	seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.39-portage_sandbox.patch" #713710 #728978
+	"${FILESDIR}/${P}-add-missing-termios.patch" #728416
+)
+
+src_prepare() {
+	default
+	eautoreconf
+	elibtoolize
+
+	# don't let python README kill main README #60043
+	mv python/README.md python/README.python.md || die
+	sed 's@README.md@README.python.md@' -i python/setup.py || die #662090
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-fsect-man5
+		$(use_enable bzip2 bzlib)
+		$(use_enable lzma xzlib)
+		$(use_enable seccomp libseccomp)
+		$(use_enable static-libs static)
+		$(use_enable zlib)
+	)
+	econf "${myeconfargs[@]}"
+}
+
+build_src_configure() {
+	local myeconfargs=(
+		--disable-shared
+		--disable-libseccomp
+		--disable-bzlib
+		--disable-xzlib
+		--disable-zlib
+	)
+	tc-env_build econf "${myeconfargs[@]}"
+}
+
+need_build_file() {
+	# when cross-compiling, we need to build up our own file
+	# because people often don't keep matching host/target
+	# file versions #362941
+	tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
+}
+
+src_configure() {
+	local ECONF_SOURCE=${S}
+
+	if need_build_file; then
+		mkdir -p "${WORKDIR}"/build || die
+		cd "${WORKDIR}"/build || die
+		build_src_configure
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi ; then
+		emake
+	else
+		cd src || die
+		emake magic.h #586444
+		emake libmagic.la
+	fi
+}
+
+src_compile() {
+	if need_build_file; then
+		emake -C "${WORKDIR}"/build/src magic.h #586444
+		emake -C "${WORKDIR}"/build/src file
+		local -x PATH="${WORKDIR}/build/src:${PATH}"
+	fi
+	multilib-minimal_src_compile
+
+	if use python ; then
+		cd python || die
+		distutils-r1_src_compile
+	fi
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi ; then
+		default
+	else
+		emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
+	fi
+}
+
+multilib_src_install_all() {
+	dodoc ChangeLog MAINT README
+
+	# Required for `file -C`
+	dodir /usr/share/misc/magic
+	insinto /usr/share/misc/magic
+	doins -r magic/Magdir/*
+
+	if use python ; then
+		cd python || die
+		distutils-r1_src_install
+	fi
+	find "${ED}" -type f -name "*.la" -delete || die
+}
diff --git a/sys-apps/file/file-9999.ebuild b/sys-apps/file/file-9999.ebuild
index 98499a3c73df..8333fd922e2c 100644
--- a/sys-apps/file/file-9999.ebuild
+++ b/sys-apps/file/file-9999.ebuild
@@ -37,7 +37,7 @@ RDEPEND="${DEPEND}
 	seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
 
 PATCHES=(
-	"${FILESDIR}/${PN}-5.39-seccomp_sandbox.patch" #713710
+	"${FILESDIR}/${PN}-5.39-portage_sandbox.patch" #713710 #728978
 )
 
 src_prepare() {
diff --git a/sys-apps/file/files/file-5.39-add-missing-termios.patch b/sys-apps/file/files/file-5.39-add-missing-termios.patch
new file mode 100644
index 000000000000..e6cba0d4c28c
--- /dev/null
+++ b/sys-apps/file/files/file-5.39-add-missing-termios.patch
@@ -0,0 +1,27 @@
+From 769e9868c17a471323b81b12cab851c9fd22baf4 Mon Sep 17 00:00:00 2001
+From: Georgy Yakovlev <gyakovlev@gentoo.org>
+Date: Mon, 15 Jun 2020 14:18:45 -0700
+Subject: [PATCH] add missing termios.h include
+
+on ppc, TCGETS relies on struct termios being complete, on other
+architectures it does not.
+so termios.h should be included before ioctl.h
+---
+ src/seccomp.c      |   1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/src/seccomp.c b/src/seccomp.c
+index e667adf..296f5b3 100644
+--- a/src/seccomp.c
++++ b/src/seccomp.c
+@@ -33,6 +33,7 @@ FILE_RCSID("@(#)$File: seccomp.c,v 1.15 2020/05/30 23:56:26 christos Exp $")
+ #if HAVE_LIBSECCOMP
+ #include <seccomp.h> /* libseccomp */
+ #include <sys/prctl.h> /* prctl */
++#include <termios.h>
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <fcntl.h>
+-- 
+2.27.0
+
diff --git a/sys-apps/file/files/file-5.39-portage_sandbox.patch b/sys-apps/file/files/file-5.39-portage_sandbox.patch
new file mode 100644
index 000000000000..ff2caed413fc
--- /dev/null
+++ b/sys-apps/file/files/file-5.39-portage_sandbox.patch
@@ -0,0 +1,28 @@
+From 7e1d9d51329a0e0f3d9cd1dbc3f9509251950e81 Mon Sep 17 00:00:00 2001
+From: tka <tka@kamph.org>
+Date: Wed, 24 Jun 2020 11:18:45 +0200
+Subject: [PATCH] Allow getcwd for Gentoo's portage sandbox
+
+Gentoo-bug: https://bugs.gentoo.org/728978
+Signed-off-by: Lars Wendler <polynomial-c@gentoo.org>
+---
+ src/seccomp.c | 3 +++
+ 1 file changed, 3 insertions(+)
+
+diff --git a/src/seccomp.c b/src/seccomp.c
+index 68c56485..af55918e 100644
+--- a/src/seccomp.c
++++ b/src/seccomp.c
+@@ -227,6 +227,9 @@ enable_sandbox_full(void)
+ 	ALLOW_RULE(unlink);
+ 	ALLOW_RULE(write);
+ 
++	// needed by Gentoo's portage sandbox
++	ALLOW_RULE(getcwd);
++
+ 
+ #if 0
+ 	// needed by valgrind
+-- 
+2.27.0
+
diff --git a/sys-apps/firejail/Manifest b/sys-apps/firejail/Manifest
index 036b696cc14b..62f50af96ffd 100644
--- a/sys-apps/firejail/Manifest
+++ b/sys-apps/firejail/Manifest
@@ -1,4 +1,3 @@
-AUX 0.9.50-contrib-fix.patch 1446 BLAKE2B 934a1d2cfcdb070317bb47b6b451fe979279f5a4600a49ce2d79642479e5b649f5103d732aaa40ab2dbb8dcd563c75a5b0f048ae805134eef6d4afe52174b972 SHA512 04c88fbaa37c677efef1805c6b0bca6d87742acf5c80b047844e776e51c02c8803d2588a5dde74817b0cbbf6ce9d239ca39a823df1928ef36f232b403fb41889
 AUX firejail-compressed-manpages.patch 598 BLAKE2B d9b39a043a4d9219e1a8413c04aa77ec971d572b43112d6d2481796f237f00bf3927ea77fd84f15cb0c3c8c4e60549c7cbe0e26181b348408a9b873f1ae03154 SHA512 3f488582ff46ee8e87a4752c073b8f8ae4c07b2262e7bdbc9b5dc54f6b94323fbbebb7fadcbb112bc7d0d9a4a29a8f898209e8940c78127749e1006569120230
 DIST firejail-0.9.60.tar.gz 1067102 BLAKE2B c5fd9a9c60fe17fc7ae24946ae5ea2f666d1dd20d982c540783dd2e56d30859a24258c4f3426e2bafaff3530557f5865bc73af9573e399039e8d5b097e5cddee SHA512 cb3eeff2f77801b4593a719a6b63da09cdc6c7f96f8ea8ea1aaa7e8538b080421a284441c6e43ce036fdf8510e08a73816c58d22f0af048344b8752f4a02759a
 DIST firejail-0.9.62.tar.gz 918477 BLAKE2B 8654539a6a115b6f69ea94a0b699c9129cfcecaf3d478409eaf288b953563768716eae9b9a83ddc538249322daa62a764bc2eb286eddaa14fc0e5fa887c0e319 SHA512 dfdbfbffdcb9a239e071983035d57350440eb58d79bb4375bc1fe585471a260c8b090bea59ac939739ac3daddf296c041ab4cc47ebbf718b0c9deae47f16af9f
diff --git a/sys-apps/firejail/files/0.9.50-contrib-fix.patch b/sys-apps/firejail/files/0.9.50-contrib-fix.patch
deleted file mode 100644
index 7192bba34807..000000000000
--- a/sys-apps/firejail/files/0.9.50-contrib-fix.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-diff -Naur firejail-0.9.48/contrib/fix_private-bin.py firejail-0.9.48.new/contrib/fix_private-bin.py
---- firejail-0.9.48/contrib/fix_private-bin.py	2017-05-24 23:01:32.000000000 +0100
-+++ firejail-0.9.48.new/contrib/fix_private-bin.py	2017-08-27 23:19:52.868481040 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#!/usr/bin/env python3
- 
- __author__ = "KOLANICH"
- __copyright__ = """This is free and unencumbered software released into the public domain.
-diff -Naur firejail-0.9.48/contrib/fjclip.py firejail-0.9.48.new/contrib/fjclip.py
---- firejail-0.9.48/contrib/fjclip.py	2017-05-24 23:01:32.000000000 +0100
-+++ firejail-0.9.48.new/contrib/fjclip.py	2017-08-27 23:19:58.476562539 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- import re
- import sys
-diff -Naur firejail-0.9.48/contrib/fjdisplay.py firejail-0.9.48.new/contrib/fjdisplay.py
---- firejail-0.9.48/contrib/fjdisplay.py	2017-05-24 23:01:32.000000000 +0100
-+++ firejail-0.9.48.new/contrib/fjdisplay.py	2017-08-27 23:20:01.932612762 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- import re
- import sys
-diff -Naur firejail-0.9.48/contrib/fjresize.py firejail-0.9.48.new/contrib/fjresize.py
---- firejail-0.9.48/contrib/fjresize.py	2017-05-24 23:01:32.000000000 +0100
-+++ firejail-0.9.48.new/contrib/fjresize.py	2017-08-27 23:20:06.932685422 +0100
-@@ -1,4 +1,4 @@
--#!/usr/bin/env python
-+#!/usr/bin/env python2
- 
- import sys
- import fjdisplay
diff --git a/sys-apps/flashrom/Manifest b/sys-apps/flashrom/Manifest
index 78831fdf7507..3b2b3737927e 100644
--- a/sys-apps/flashrom/Manifest
+++ b/sys-apps/flashrom/Manifest
@@ -1,6 +1,6 @@
 DIST flashrom-0.9.8.tar.bz2 473902 BLAKE2B c127a41c2857ae2e1564777b49b1eff17e2e931c8a2417e738e8188871a6ce4e0fe6a0380c2139aaa906f299ca833563df895aa5fd1af333b24bf7467de0dc8f SHA512 1a1c4513bac7cdf91326ab68b822034101e688bfab0dc0b5698f664fc766027229128c55eed94f302cac05d949647cdec6a103a423c3861b047cf0ff7cc0b509
 DIST flashrom-v1.2.tar.bz2 366995 BLAKE2B 091e01a91e12b486154ace334a5e74bccbb5f5311ad76e37f43a28167080757873d8c78b8f549d2e77eb984922c830895ba955b23eb6ee4fc24f1ffed259954b SHA512 8e01395a54d0d1344bc55e7e4975f43bb8e59ebe83fb5f2766d14f76756d718b487254ce9a19ef4093aed04fb9d40fff5fe8f709b18c512f6e6fad894f83d7b8
 EBUILD flashrom-0.9.8.ebuild 4186 BLAKE2B 16f9f031ff5e2e6509ac875fecff28765b6887cc215a59af53297b75cbf724f988f22981c669ae7e196bd37644d123bca7924f3f271c33718279074c6c073a39 SHA512 060e93fc378994d2168b0deb196ef9f7c4fc8af52ffed9210742539eaff8a656e8eb97b28b8fc708256231b1077433ac381c097b0966c5b64573a054d088894a
-EBUILD flashrom-1.2-r1.ebuild 4525 BLAKE2B af163c66773928b9d1047f2edf32a5b7583c0642741bf7af17d9a4722667b803a00767fb7cc54d1154f84fbc59388bcccecc796ac593dfab29fbdab712590419 SHA512 4ed66130386c05ec66a3f1895f32a164e002b61b7613bd93a3b2c19593aab233f4dd9d35a0be555d8ae944a30e72adc1ce07368da6994d2d9a001dea06501b4b
+EBUILD flashrom-1.2-r1.ebuild 4520 BLAKE2B d00007833d23c42b7b59cc1503565e75037d7f4dc835f79c280299a2818bb5ff2f48868958940a237ef52721f971a1c055f0ef35c0167ef263b5ef36232266d9 SHA512 9c7a87c29bf7f57ff9878127c8b38d21d97f3019e0a350e64d7271a208253d85091addff5799e6e947182490a8494f6743e2e2029d3b4ae6d5ab9c9b14900d3f
 EBUILD flashrom-9999.ebuild 4423 BLAKE2B fc758295685fea683f2b7bdc07dc307525571b00745ced19910a95117a033964d037da53b86ddca9482c96b8dcb6f54e46eb6401e17e5268f2b565ed89bf6ee6 SHA512 b2ef614c5bee6c83a510306823ae34b2e32e8d03726479b6ceb89f29e51c2f9d6a91f7e6c1f24166fe572094299b3bbc49047ae4c865d3ca994be233cfa7d90e
 MISC metadata.xml 4595 BLAKE2B 0a7c4f212c57dccca72a7da1172b8eb36a7027703fea6137be5eefbadf5592abaa6e9841befa3e8f8ef65b1b5057af3c0f162584f0db65addd362a0a8880e648 SHA512 25b118e1150b405d34081add86fa02c04094ada970ea2a121bf21a3047d1df2566383549df7d0138883bcfed31c2574a420e9357dccce993c93179e3e769b8ef
diff --git a/sys-apps/flashrom/flashrom-1.2-r1.ebuild b/sys-apps/flashrom/flashrom-1.2-r1.ebuild
index 1415e8435f73..e984e762420a 100644
--- a/sys-apps/flashrom/flashrom-1.2-r1.ebuild
+++ b/sys-apps/flashrom/flashrom-1.2-r1.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 else
 	MY_P="${PN}-v${PV}"
 	SRC_URI="https://download.flashrom.org/releases/${MY_P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm arm64 ~ppc ~ppc64 sparc ~x86"
+	KEYWORDS="amd64 arm arm64 ppc ppc64 sparc x86"
 	S="${WORKDIR}/${MY_P}"
 fi
 
diff --git a/sys-apps/fwts/Manifest b/sys-apps/fwts/Manifest
index a978938e61a7..58e05e009c91 100644
--- a/sys-apps/fwts/Manifest
+++ b/sys-apps/fwts/Manifest
@@ -1,3 +1,3 @@
-DIST fwts_17.02.00.orig.tar.gz 3489625 BLAKE2B 04133b8fe251923b5cf4e146bd52d3d102c3080629a85c0205fd6aeb19b315f10657da28dc7de37ae4601599dc7033354268b88bb0768b56550fe1606bd000bf SHA512 1dcbd7f120b5c09127f1242d41d7cf5ec15e6b049fb0b0590fec221849c0195a18ee4b07b66c1de29cbb241ef39f6e11c26dcd2bc7c0a4c23bf2efaec5372b70
-EBUILD fwts-17.02.00.ebuild 1126 BLAKE2B 49e4a42f531c778bc118fd8c7fef09c756cc395fce3426c406bbbd274620f7344359bce0ce1c4b1918a6839ec7caddbdff4dabe072be9735433607ff7ac1736e SHA512 ddb18c63d887e1d3abd3a2def0d3267f76ca70de59088ff25ad05660e261ed276bd3699835bc2719d5ba3f15a5c1891f86745132e02aa38fb89fadc2120e7174
+DIST fwts_20.05.00.orig.tar.gz 3817917 BLAKE2B 10365979a1b6bf2768930e144baa3982d462f05b77b1ca81116f7b44b80487924f37e097e46602c49696e987d9061a1917e3613e016bdb126146d880699c38f8 SHA512 4f68f6fc8351024e877e6fa6c9b856c7c3720348c1936f33fc8b455f5e85df83c9dc39a5c2dc16e106c851d4ac622f0a1d23b70f2b7726689f92077dbca5d82f
+EBUILD fwts-20.05.00.ebuild 1127 BLAKE2B c966a749987a9f5a23d7bb2ae3b7f506a5ace2bdab79851615d601cafd0aae20d2a845d89b064944a0c12076d6cce058604195ad266918dde1e8295eed241ede SHA512 4ce7fd15f1bd44644998be1b7d0913a6a8176bf3d76738077e1d793294b8d865aea579e386deba766b3d8080d5f2b08bf58722c6b0e950e8b990c62abf7951fb
 MISC metadata.xml 241 BLAKE2B f00f58ea265e1a7321a74a2e8a86824f7a1930a6e99162af446a1c1f831139711d626045b21215856a29e6ba4575bc38c7ab965ffb547757dbf4305235245039 SHA512 9a4d0499ef0c9cb67816755a3313bbba0b42f01b35d5d7da31dfe3e14a94fead3b8c202b95ffd4a9c5edbda7b046045b19095924b57a08cd97aacbda5bbd4550
diff --git a/sys-apps/fwts/fwts-17.02.00.ebuild b/sys-apps/fwts/fwts-20.05.00.ebuild
index f17665061e40..55aaf54db461 100644
--- a/sys-apps/fwts/fwts-17.02.00.ebuild
+++ b/sys-apps/fwts/fwts-20.05.00.ebuild
@@ -1,9 +1,10 @@
 # Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 inherit autotools
+
 DESCRIPTION="Firmware Test Suite"
 HOMEPAGE="https://wiki.ubuntu.com/Kernel/Reference/fwts"
 SRC_URI="https://launchpad.net/ubuntu/+archive/primary/+files/${PN}_${PV}.orig.tar.gz"
@@ -13,13 +14,13 @@ SLOT="0"
 KEYWORDS="~amd64"
 IUSE=""
 
-RDEPEND=">=dev-libs/json-c-0.10-r1
-	dev-libs/glib:2
+RDEPEND="dev-libs/glib:2
+	>=dev-libs/json-c-0.10-r1
 	dev-libs/libpcre
+	sys-apps/dmidecode
 	sys-apps/pciutils
 	sys-power/iasl
-	sys-power/pmtools
-	sys-apps/dmidecode"
+	sys-power/pmtools"
 DEPEND="${RDEPEND}
 	sys-devel/libtool"
 
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index 5fd0db0632e8..cebbda26948a 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -7,7 +7,7 @@ DIST fwupd-1.3.11.tar.gz 2255359 BLAKE2B 0f91c32602459d31e53c63647762307cfe2313c
 DIST fwupd-1.4.2.tar.gz 2304086 BLAKE2B 9a725cc49479984c3a98b75e9c52211a26f81d4a7ecec3b261ff4486201a967a6c82df9a1dbd591b91d9cd6eb9d1a8cd8cccfd2c8dd98d5bb3f82cb03bbd0a52 SHA512 b092eedf3e5e84874de1fddb7f14ca87975d5895721ac4f87b6c88ec7c7b2367e573b30906588f9adad4cea52da5ebbaaa4a9c38a2273e8f31d26399e719166e
 DIST fwupd-1.4.4.tar.gz 2311975 BLAKE2B 04ba05e157a1662dcd5fa8a3835701ff6c39935aa5e2d91e2aad3f7c7f5449ce56ac8f85bd4df4c3f4901c1d55d036f159eaf761761086bb1eda770021d38160 SHA512 9ce2ee8963789b99e43ebd3a76ba2851339bde6bda0c85198bbac11ebca76525385f41223956410bc1cff72318de463031f7e38b784fc5a4bf9bc2a85788db1a
 EBUILD fwupd-1.2.11.ebuild 3782 BLAKE2B f71c26237f656c291c63a2c7e46f220fbb56751ad0b2742acaf65672acd8060850f654962a26b52210a05e638ec408ff780488d83b1e23f8333b8c81a6f08417 SHA512 3b3a7897e737afc5a7bef4e8743a5a3abd67ca9d6b0a75fa1f7af65879188d1f72b5bdfdf8c46f945a8bf7b0189efec169cd3547cf9253df74d6ca6e7dba07bd
-EBUILD fwupd-1.3.10.ebuild 4187 BLAKE2B 3ec354cadd6950895014084b7e8fb87e1cd32263ee27faae2fb14a0cf1fe602193b2324eba89e5d4e0736516c141ce7516c7a4ab92761b74724d50d461bbcbaa SHA512 933e85964b19c839e79671ba518970361b213039ece46aab2c936996ff7cd96a33049660eb61a3b55a8ff191db0e07a613bfd2a2faeee8aa4f84cc3b358ac5aa
+EBUILD fwupd-1.3.10.ebuild 4186 BLAKE2B 287319be4161408025db0307c6356e76e596cf6ef01ce2b3db932b30f288ac181faf43afdc8222be6fa69816ec15a4f8dbac56879575bcb761e56c5d89063163 SHA512 22a425094094484874f363c078143e1a3400415dab5e62f84d6d5b64d259c31811de5b08355275dbdcd3675a0fcc3a41b3245712a5a231c4fb9f133223306363
 EBUILD fwupd-1.3.11.ebuild 4188 BLAKE2B 10fcb95d9ddd6158b33be98a772db66e857ff34c06d71592dc894ea6b2308c28c0f2af71ee3135b4b12d5aa25fb1c9fd7a66646e3eca427309f5b402374a3a03 SHA512 0e24ebd628dd7f48a90cd6d745ededaddf4bbdf29e6e3df5406ba92280cb5818debbb72fdaf1af71e55aac1143512077769cc4e15d76e301c0dd3276fab28faf
 EBUILD fwupd-1.4.2.ebuild 4071 BLAKE2B 972cd1aadcc8db1deeca41be037437139eafb2c02d7b0c62a0d1d2576034ccbbb50f0ffc0bdd0572bdbe3c33d8fecebcdf300ec5c203b56eaae4debe08a4d907 SHA512 fcbb325424a6fbbe5a026b5e760456172af0a1ef2eee13018af03d088923b5497f9240e32bd91c082341532c0ce249b4b5760e122f2955f772fab1e9e0721402
 EBUILD fwupd-1.4.4.ebuild 4100 BLAKE2B 31c1c95fa28b6d94584282f2f7f6b14cd6e98ef7af4ced6e171237c5f9a8d99abfb9092ccaffa1941bb108bfc2589a2acb067ba32a1de0a5ae76182a8575a0c4 SHA512 369cb4c232c3cc6e2056ad91572aba9a7758985d5cb4d1d1edf7902fc4cff06aef2d21b7d7c698b4225457b76aa24faf81cd9daf0be8f078b4c29f06fe2ef6c4
diff --git a/sys-apps/fwupd/fwupd-1.3.10.ebuild b/sys-apps/fwupd/fwupd-1.3.10.ebuild
index 008eaf67978e..d7daed583481 100644
--- a/sys-apps/fwupd/fwupd-1.3.10.ebuild
+++ b/sys-apps/fwupd/fwupd-1.3.10.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/hughsie/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm x86"
+KEYWORDS="amd64 ~arm x86"
 IUSE="agent amt consolekit dell gtk-doc elogind minimal +gpg introspection +man nvme pkcs7 redfish synaptics systemd test thunderbolt tpm uefi"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( consolekit elogind minimal systemd )
diff --git a/sys-apps/haveged/Manifest b/sys-apps/haveged/Manifest
index 780c7377acf7..054f997dea36 100644
--- a/sys-apps/haveged/Manifest
+++ b/sys-apps/haveged/Manifest
@@ -3,18 +3,10 @@ AUX haveged-conf.d 207 BLAKE2B 0c6adb8c4e4f6d769e2ceb039b4a553c2e75bfdecd277c16c
 AUX haveged-init.d.3 322 BLAKE2B 7484eee6c17a5c6ecf20fa656b8c3976c732ba40f370d92635517dc14dfaab1b26778f660d03389a7bb1df217d78e9ee5d8a03934bec3b53f0edc717ca8f9ef9 SHA512 057cafb7f74423759834d470664558dcf16d226fbf1f47f569bacf04a8f76334aacc7fc25348d055847f6da4c644383b0519d80a7553058bae5264508eeb4ad4
 AUX haveged.conf 147 BLAKE2B 7bdf29071f7a1a3b90266af308ab0a0a56c46f8c9ae8b6acc3b4055a89ac14c0e3cbc2e370d344debe8fb69f9ceacae6882c17d2620e0daea171d349073672d4 SHA512 052696a31ab7b9a0dda06ccb24c08524bef0cfa9c601a1ba6819bb2e42886a6b3d9b77710880d589534fae3c600d123304586f825fac554e68ce50d8b5acd563
 AUX service.gentoo 322 BLAKE2B 302a1506492e5122a03ea616de11dea493637d904cde1415abbbdeff3794251e911c6efee7d9331a4cb1e8dde1dbb579f46935cd52c58fbaeb77404b587985cb SHA512 7d7caaef45cbf268a1c1a813537a9e4ef6543addcfebe99fd178e37a8c516bbd5419fb8f47decf2370cee0562f066c72501b6c176307b1f5884b56f561386b88
-DIST haveged-1.9.10.tar.gz 495820 BLAKE2B f3ef9d566275a9174ab3a3c280b3af234dcd1ea45408c18ea990d40f5e919fd97030802037932118631b204332a4f0ceb2090e64286ba3f361b63ec1bba9863b SHA512 d45ca46dfd596e4984c457b017952c195236f7fa84fb7a6d02ec47fa8326c63aefca700ae5872da11c35b2b1c5705514ea036a080a27e80f64f1a010831997e1
-DIST haveged-1.9.11.tar.gz 495008 BLAKE2B 65c2eff3deee5f06f437086d4ec028072aa7e7adff0e0748d437b8c38f191cbe4d3c8ade67aa6f9d0d12a5940dd5bd88fe6f619ddcf62ddd59a31a0cdaa5aabd SHA512 2ddee986d45049313246d9d84f23b5ed1257bb815c0716c7cea53b86e7bbf31b718d268ee45e1cbc87d2b9f1fbf7389da34ede72ca1ca044ccc6bd82d2943f01
+DIST haveged-1.9.12.tar.gz 495503 BLAKE2B 1fc775ced82980b4b657cf5626a0a88e1de3471ab06638832ed58da4d74e41f10ba7f95cf2c3e04e4cdf19014b41b8c11f690b74c139a235c8ec1159896552ec SHA512 8165cb45ca25ca3d1f6ee303eca47f28006fb4c221bdaea5b0b09b1a712362a41d340e64102ec468a1c8272c096cb416513e6cc98bc70cfd359bdcd481422c9b
 DIST haveged-1.9.2.tar.gz 494682 BLAKE2B a972d128b19fecc3d01e17bd4cf6d5ec03ae716c4b4934c73193e03f3d3f9ff3461a8280ec0a20885499fd334343deb193ddc98b0697b2b14f92fff897bbf59b SHA512 65f70950fb90ef9c24ff3bf1b26e19a9cde2bec4749e2e64d5461a51646a20cf610efa2a5014219b8605957afa0084abd2ba11c7dc15f9379afce784971627b8
-DIST haveged-1.9.4.tar.gz 493215 BLAKE2B e1a8bbda36c35523c7a0c72a1377d7006440742961f9be4527d52b7e05b176334529ee032f5bdf902e729fcfe045a7a0558dfea7c50a95019747d1158f1e4a19 SHA512 20017c7637779c0cfa414233bb67efb2976f92c08e4eb1b7ea41ccd483dad755629d8e05fb8560a2db811fc2ded7d05fa081ab10c59341cb4c206595a964641d
-DIST haveged-1.9.8.tar.gz 494473 BLAKE2B 3c656221ffc896a1c57cfcfa17524c1e40de04fc5cffa94ce71e0bf11a78b578b9f11f8e7683f2be7150d5ccfeba9eb2f553d9379006f2624bf78d5ed152da74 SHA512 6a4012c7ab0ad7df77ae61dd3aca072a7aeca942c180d37c8495009fad13a4c9c0e7bf64a3ffce00e50c06679d4b948c3930a960789a06edf074076cf68d37db
 DIST haveged-1.9.8c.tar.gz 494470 BLAKE2B 840aa0b985107feb38a7b5823f94de3473e79f75542565e571c4ec9b2640dddcabb09d598e101678defbdd2eb04fe2fc1fb1f8466157e53d7c41272131450dec SHA512 24167e8a9773d96b3c57cd3e57def7e291f3de86873e796cafc1a59d3f89818c6cb8d46d05e5ae4eb2683fc86b313b1acaed7f210724dadb7df3939e1b3900aa
-DIST haveged-1.9.9.tar.gz 495495 BLAKE2B e0cf1a68cfc91b5a0aadb424024c44980a312f5bc5f680f0cba50edc97d82fa9cfea09fc09988cc2e4b02b245471f2a6847d518503fd33f596fa8a00069587e5 SHA512 0d30c2effb859f4960320a4681a368973960c17afa295704ec330a1bb792848ba3be5ab5428274b9dddaa5c6d50447e8bf99ff5de14c03a8d59cf87cc7a4e4ce
-EBUILD haveged-1.9.10.ebuild 945 BLAKE2B 8dad88810d8e0bafe8655c51e8c5cfe98955ff6712f884254302c22655f880ad94481a4041454f2a1599eb8c25d36ba09ba914764fe6ee735dfa6d4b622bebc2 SHA512 ac291a8be5d047d7965817580e1131ed7ef067893275cb27fa50af48dcc601f9c9eec56009e7230a1679ba34d0b3fb5801af9ab18452de591662ca6ee50aba4c
-EBUILD haveged-1.9.11.ebuild 945 BLAKE2B 8dad88810d8e0bafe8655c51e8c5cfe98955ff6712f884254302c22655f880ad94481a4041454f2a1599eb8c25d36ba09ba914764fe6ee735dfa6d4b622bebc2 SHA512 ac291a8be5d047d7965817580e1131ed7ef067893275cb27fa50af48dcc601f9c9eec56009e7230a1679ba34d0b3fb5801af9ab18452de591662ca6ee50aba4c
+EBUILD haveged-1.9.12.ebuild 945 BLAKE2B 8dad88810d8e0bafe8655c51e8c5cfe98955ff6712f884254302c22655f880ad94481a4041454f2a1599eb8c25d36ba09ba914764fe6ee735dfa6d4b622bebc2 SHA512 ac291a8be5d047d7965817580e1131ed7ef067893275cb27fa50af48dcc601f9c9eec56009e7230a1679ba34d0b3fb5801af9ab18452de591662ca6ee50aba4c
 EBUILD haveged-1.9.2-r1.ebuild 960 BLAKE2B ca6650ea624b8ca6a372ace436bdef5c2a956fc627a16a2ccf8083a0ea3e147f5cec9571b560a5e423e1a4abd36337d632d74ac4365aa7c141a8fe81d214d79b SHA512 e18f627765762c3b64f34319bd3756bda5963cb861f6fd04a3d2e31a736bd19d99d9ab4dc3690563dbf9fbd11b750431cc808c9252c5f043c6dda4b0654c2a28
-EBUILD haveged-1.9.4.ebuild 977 BLAKE2B 9f9328f7fb42a1d625c5ca0413d11d8dd18d4ae4e9e6d3cffaab2b9969ce63359d30678cff3287f8bcbb36fca724e47af5167b6d21e5b08b8f18004b515ce299 SHA512 01517dfcaa91e879e18e9a330f4d7750e9e1a2d9fdf6f1ae6bd11cc44b4dc0a978363576fce2342feaab489ca5e335ac1fe2df31105f09388d261a7727c32930
-EBUILD haveged-1.9.8.ebuild 1010 BLAKE2B 6cf51da54096328fa8c4cf7f10c7be6b3c8e40eca18bd94111f0d13bf81d1fcb78d6ec99b0b60f4944befa185d15664777656cbc1952c95f27d7aa5cd9541669 SHA512 ee5fc0487504822b832479f216c703a95af2f02fc2768cb2aaaaf0c51b4791cb73b9379390db4244227bcc22a6ba03be84e7df6b028bda2ad94e2d90357d2ec5
 EBUILD haveged-1.9.8c.ebuild 1007 BLAKE2B 17ea013ddb1531b3890c510404467204545b38feedc14b46eabe5ea6bee101012610acfd389823023c403c87e082be5ef778549551da134cca69ccea6284743c SHA512 3280473cbc0efc70ad1b0ff942cec564481c77768025153d94377a377ed463a2d0e29513a0b7381bb192e0c20f98e0874a5f48145d440ccd13eab07cc5ec4f26
-EBUILD haveged-1.9.9.ebuild 945 BLAKE2B 8dad88810d8e0bafe8655c51e8c5cfe98955ff6712f884254302c22655f880ad94481a4041454f2a1599eb8c25d36ba09ba914764fe6ee735dfa6d4b622bebc2 SHA512 ac291a8be5d047d7965817580e1131ed7ef067893275cb27fa50af48dcc601f9c9eec56009e7230a1679ba34d0b3fb5801af9ab18452de591662ca6ee50aba4c
 MISC metadata.xml 371 BLAKE2B d44d1873136cfff8c9c1ae42ee0ded780af875987caecc98494afba60017c3da105423642f10f2475d344636d54c71885607649ceb4f285a477698b40449d2ef SHA512 640e188a0829d4408d9bc7ca0c7558222ed8148afef25a88a136c0ae5bb44531bc8352c9c1da1c13e395cb54d67c62a485fa4f6329ad7b76255def9d979b70d0
diff --git a/sys-apps/haveged/haveged-1.9.11.ebuild b/sys-apps/haveged/haveged-1.9.11.ebuild
deleted file mode 100644
index c439fda13266..000000000000
--- a/sys-apps/haveged/haveged-1.9.11.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd
-
-DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm"
-HOMEPAGE="http://www.issihosts.com/haveged/"
-SRC_URI="https://github.com/jirka-h/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="selinux static-libs threads"
-
-RDEPEND="
-	!<sys-apps/openrc-0.11.8
-	selinux? ( sec-policy/selinux-entropyd )
-"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		--bindir=/usr/sbin
-		--enable-nistest
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# Install gentoo ones instead
-	newinitd "${FILESDIR}"/haveged-init.d.3 haveged
-	newconfd "${FILESDIR}"/haveged-conf.d haveged
-
-	systemd_newunit "${FILESDIR}"/service.gentoo ${PN}.service
-	insinto /etc
-	doins "${FILESDIR}"/haveged.conf
-}
diff --git a/sys-apps/haveged/haveged-1.9.10.ebuild b/sys-apps/haveged/haveged-1.9.12.ebuild
index c439fda13266..c439fda13266 100644
--- a/sys-apps/haveged/haveged-1.9.10.ebuild
+++ b/sys-apps/haveged/haveged-1.9.12.ebuild
diff --git a/sys-apps/haveged/haveged-1.9.4.ebuild b/sys-apps/haveged/haveged-1.9.4.ebuild
deleted file mode 100644
index 4e82730b448d..000000000000
--- a/sys-apps/haveged/haveged-1.9.4.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd
-
-DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm"
-HOMEPAGE="http://www.issihosts.com/haveged/"
-SRC_URI="https://github.com/jirka-h/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-IUSE="selinux static-libs"
-
-RDEPEND="
-	!<sys-apps/openrc-0.11.8
-	selinux? ( sec-policy/selinux-entropyd )
-"
-
-# threads are broken right now, but eventually
-# we should add $(use_enable threads)
-src_configure() {
-	econf \
-		$(use_enable static-libs static) \
-		--bindir=/usr/sbin \
-		--enable-nistest \
-		--disable-threads
-}
-
-src_install() {
-	default
-
-	# Install gentoo ones instead
-	newinitd "${FILESDIR}"/haveged-init.d.3 haveged
-	newconfd "${FILESDIR}"/haveged-conf.d haveged
-
-	systemd_newunit "${FILESDIR}"/service.gentoo ${PN}.service
-	insinto /etc
-	doins "${FILESDIR}"/haveged.conf
-}
diff --git a/sys-apps/haveged/haveged-1.9.8.ebuild b/sys-apps/haveged/haveged-1.9.8.ebuild
deleted file mode 100644
index c792e4bd61fa..000000000000
--- a/sys-apps/haveged/haveged-1.9.8.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd
-
-DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm"
-HOMEPAGE="http://www.issihosts.com/haveged/"
-SRC_URI="https://github.com/jirka-h/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="selinux static-libs threads"
-
-RDEPEND="
-	!<sys-apps/openrc-0.11.8
-	selinux? ( sec-policy/selinux-entropyd )
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.9.8c-threads_build_fix.patch"
-)
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		--bindir=/usr/sbin
-		--enable-nistest
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# Install gentoo ones instead
-	newinitd "${FILESDIR}"/haveged-init.d.3 haveged
-	newconfd "${FILESDIR}"/haveged-conf.d haveged
-
-	systemd_newunit "${FILESDIR}"/service.gentoo ${PN}.service
-	insinto /etc
-	doins "${FILESDIR}"/haveged.conf
-}
diff --git a/sys-apps/haveged/haveged-1.9.9.ebuild b/sys-apps/haveged/haveged-1.9.9.ebuild
deleted file mode 100644
index c439fda13266..000000000000
--- a/sys-apps/haveged/haveged-1.9.9.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit systemd
-
-DESCRIPTION="A simple entropy daemon using the HAVEGE algorithm"
-HOMEPAGE="http://www.issihosts.com/haveged/"
-SRC_URI="https://github.com/jirka-h/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-IUSE="selinux static-libs threads"
-
-RDEPEND="
-	!<sys-apps/openrc-0.11.8
-	selinux? ( sec-policy/selinux-entropyd )
-"
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(use_enable threads)
-		--bindir=/usr/sbin
-		--enable-nistest
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	# Install gentoo ones instead
-	newinitd "${FILESDIR}"/haveged-init.d.3 haveged
-	newconfd "${FILESDIR}"/haveged-conf.d haveged
-
-	systemd_newunit "${FILESDIR}"/service.gentoo ${PN}.service
-	insinto /etc
-	doins "${FILESDIR}"/haveged.conf
-}
diff --git a/sys-apps/ipmiutil/Manifest b/sys-apps/ipmiutil/Manifest
index 86802fb3bfa7..17f93d061cba 100644
--- a/sys-apps/ipmiutil/Manifest
+++ b/sys-apps/ipmiutil/Manifest
@@ -1,6 +1,5 @@
 AUX ipmiutil-2.9.8-flags.patch 712 BLAKE2B d084480396ee8e546c2027e95ce9c95940d1d844a0aaec7448d6eb4c750d3a4a964fa53118a2cc92897733ab99b9b1064ecf2f05cdd30282b803ea511386f1e8 SHA512 3caf226020e1fffc6c45cb549a066a034a58165415d5e325445f949042c1ac756b61949c78c30d0172983d95264a0ee2c9f829f1f5c8395e8fa1a48025f87dc2
 AUX ipmiutil-2.9.9-lib_symlink.patch 468 BLAKE2B d24e4e0183f46a3a97b9a9db754b4948446eda7504d81b3854cf8ae65eebdc2f279272ecf09736ff2966dfd477219e19a900cce8665f865bc22a8674ea863f2b SHA512 35912b578b3e61e899f97d2fc6cd6352ac04da638c64c252aa71138d9b7fd1b1de474f2702febfb85ab3f5371971be7a1922a1c6bbe5960c04be2b9171f0e75e
-AUX ipmiutil-3.1.4-fix_lanplus_build.patch 485 BLAKE2B b4a5c7092b6ff6ab54c05b848d6f89b161cf79e271f8dd77eecae0a1fa523db83539a258c227d7b90f7e11b9103acf1f7ab4fd354654bd2e7aff8d8bf89a02e9 SHA512 270d94131e434a0be89929815f9ce2e52e2dfe77e69758f5201a837215fe364c622c22fbc9db03042427aaf7629ce09a896b1ad532443c57bc8d0327cae3d30b
 AUX ipmiutil-3.1.5-fix-configure.patch 5817 BLAKE2B 3a953a03d495a453d99dae70ea29ed95e03ee5d4da6a1a2aab42bda289f43725fff9a5721d7a08538f9a5f35b36ae956e5da493a50301fdaf487a8aef05ca0ba SHA512 c1f2c13f1aafc4244b1a3cdf2da23d4ff9e982613063b2e8995c0003db6cb31e1facce9d590725f5e02789fcd62c3b334ce20e1b8815b99c002bc2f90d9fa065
 DIST ipmiutil-3.0.6.tar.gz 1692679 BLAKE2B dcc02dbb5467b824005dbc95c8f5231b2e2758e7600231c1c3fc31c1207cff0540400857dd1bfa83fc8b033fe0277ab23c6013f110744bff57fe4bc7b89174f9 SHA512 0c47246b7aa6a060091745d36e33aae07e7907dcad5fefb1759aac62adf48316915ce5818d2f9241e24b73be13e54fbb57046234a69c60ce56f41a933915580f
 DIST ipmiutil-3.0.9.tar.gz 1697688 BLAKE2B 93ed8865cae1cea0ea4f7de4683f4698e3f75e9190cc7e0af1832ca44a08f52aa149393761f1ede3994827db78841061d54058bbe4178b5930accd3a4c225ba7 SHA512 c2c0a516216a46a52621159e665a77d96cf81f385fc9cf19877e72283be3e1a4dad5a4826454727b71576c22cc4de3c73ff428d26f35bf496c7dc1511305cda3
diff --git a/sys-apps/ipmiutil/files/ipmiutil-3.1.4-fix_lanplus_build.patch b/sys-apps/ipmiutil/files/ipmiutil-3.1.4-fix_lanplus_build.patch
deleted file mode 100644
index 3f1331412d85..000000000000
--- a/sys-apps/ipmiutil/files/ipmiutil-3.1.4-fix_lanplus_build.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/configure.ac	2020-01-24 23:32:53.768314546 +0700
-+++ b/configure.ac	2020-01-24 23:32:13.971662393 +0700
-@@ -94,7 +94,7 @@ AC_ARG_ENABLE([landesk],
- 
- dnl Configure ipmiutil for lanplus (libipmi_lanplus.a) or not (default yes)
- AC_ARG_ENABLE([lanplus],
--    [  --enable-lanplus      enable lanplus support (default=yes)],[default=yes],
-+    [  --enable-lanplus      enable lanplus support (default=yes)],
- [if test "x$enableval" = "xno"; then
- 	drv_lanplus=""
- 	LANPLUS_CFLAGS=""
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index 722946c3c0c0..900e041b606b 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -1,9 +1,9 @@
 AUX man-db.cron-r1 252 BLAKE2B 1d48851bd11ddf65ee24cae65a8bdb43b2c0df515a790661680775598fae21ef0776f04736425d511d48e97873d44b36a04d6ff41a53fceda0d8254482a4b53a SHA512 c2c7c05bcf241bb066c3ef98e33fb8c3b06abf92c20709f97c1e1e048d47aa4cf5ea412231a490008b3f1d87b284e381e611bb3275e8413ad031dac113112054
 DIST man-db-2.8.7.tar.xz 1839012 BLAKE2B 19b438b1083cfd838421f29ed053fe85686929bc9f2105fe399ea99622f138bca2c8888a17cddb9223362db2d5f9c4bb3669865ecf749fe845ea8e4223027f67 SHA512 9f9d6f3b776c0b35f95c179fb668f2dc3db3d3e63a162cfda98c5d126fe147f2418e1a1503037ebe28314f57d9b6f48b7f7674d611df14424973a866a61ff2d9
-DIST man-db-2.9.1.tar.xz 1875456 BLAKE2B 42d7d5f49bf19e031bde18dd60cbf18a7656e8756f2cc5d3789cab6ea82283115ed0303ae2f7f7ffd3e32310302b7b70b4e39704bd5c2a08ab60a38905d8c448 SHA512 ae2d1e9f293795c63f5a9a1a765478a9a59cbe5fe6f759647be5057c1ae53f90baee8d5467921f3d0102300f2111a5026eeb25f78401bcb16ce45ad790634977
 DIST man-db-2.9.2.tar.xz 1885484 BLAKE2B 46778ebdecffcdefedd062e3f6a01a54054b57aa9636450dd148f62184b9bb919deb72e3b57b2fc75670fc2d8d274417f00994f7030fee913d572637e080b4c1 SHA512 47b63c074cf61c15f82230cc35a0062ab6ded8c3229475c6667a47ca518346d0555616c5b07bb01515b31bd80cbdc9870cd05ffff35097d013252401c6927002
+DIST man-db-2.9.3.tar.xz 1885840 BLAKE2B 6163660af60a2900220d7b1de74caa9cb9e5764cc5da20469a8fb08e19ee1948937916664fdc493b89da8fd829aa512877892245fabc00fb586c7754c0da3d53 SHA512 ca1c1214753483f6e22efe69a9df9852e0de01a9ad3b9950dcbbc9f38e6060100b98a84333256f8c734002e66e2fd6256bc017a31bd9acfc42002dca2c0f879b
 EBUILD man-db-2.8.7.ebuild 3458 BLAKE2B f3096c090cfe4f5d6926389d0e3e1d8d417c7cdfd0cee59d9d4182d9c1a602b8a2a4c57fd3b92e110e8a1e9c6c4922160fda8f24bf54fca20797defa6443af42 SHA512 3b38dfae452716e3a68e1ae6dd5c74ba92ab130e25c8bd77d9e5802e3cda8dedbf5c7e7af8613e0e62c9f337b0ddb2c1a6fd69058967d3ed774c639897278f9d
-EBUILD man-db-2.9.1.ebuild 4015 BLAKE2B 6ad75623c176a62cf26afb94bd84ea3a214a949bdf534e58e7e9ccbf11bf56159e02d48e3999549fd2f1f2e0240b954298717d6bfe29523e6e7cd2382b20234b SHA512 773c65cdda7fd8275266b05450cae51996652689ce26e3095e5eee97990dcce39412e784a3a0104b43218ab3d411d78bc70cbed9d8602852decc9c06f96d6074
 EBUILD man-db-2.9.2.ebuild 4023 BLAKE2B ff89a69281aadbff8dda8687cb1466cd0b6216f705f946c5e44b4ea296e2460517dd12b6e1891bb56cbca2eff7ce252cd5314a9c5df1d4ca675a92e88241beee SHA512 f79e6ac596356ab4d8ed48d1c77a7ac7d5237fdc3893b6698a5df5e8d783684fff6a666228512dbec620e2ec783472c5211c924bd9d93398ed0825460e1028a4
+EBUILD man-db-2.9.3.ebuild 4023 BLAKE2B ff89a69281aadbff8dda8687cb1466cd0b6216f705f946c5e44b4ea296e2460517dd12b6e1891bb56cbca2eff7ce252cd5314a9c5df1d4ca675a92e88241beee SHA512 f79e6ac596356ab4d8ed48d1c77a7ac7d5237fdc3893b6698a5df5e8d783684fff6a666228512dbec620e2ec783472c5211c924bd9d93398ed0825460e1028a4
 EBUILD man-db-9999.ebuild 4023 BLAKE2B ff89a69281aadbff8dda8687cb1466cd0b6216f705f946c5e44b4ea296e2460517dd12b6e1891bb56cbca2eff7ce252cd5314a9c5df1d4ca675a92e88241beee SHA512 f79e6ac596356ab4d8ed48d1c77a7ac7d5237fdc3893b6698a5df5e8d783684fff6a666228512dbec620e2ec783472c5211c924bd9d93398ed0825460e1028a4
 MISC metadata.xml 342 BLAKE2B ac0d63182d2d7a73dc256fd0ae1f9994218da535ed39bd756e7db950899fda9a019f9107e8f0d9e4dab1987ba2650ae1fb8cddc9901240cba829c780db69e9b5 SHA512 553cf56ab0b3b6c9403612a7ccd1db073f557b432c68d60adb4716169250a9986b4c112023f6ae200a6fbc2df31cdafd9ab08e04d92ca35cffb81f690bd43d79
diff --git a/sys-apps/man-db/man-db-2.9.1.ebuild b/sys-apps/man-db/man-db-2.9.3.ebuild
index 92546556c66b..8ad0f47c8564 100644
--- a/sys-apps/man-db/man-db-2.9.1.ebuild
+++ b/sys-apps/man-db/man-db-2.9.3.ebuild
@@ -110,7 +110,7 @@ src_configure() {
 src_install() {
 	default
 	dodoc docs/{HACKING,TODO}
-	find "${ED}" -name "*.la" -delete || die
+	find "${ED}" -type f -name "*.la" -delete || die
 
 	exeinto /etc/cron.daily
 	newexe "${FILESDIR}"/man-db.cron-r1 man-db #289884
diff --git a/sys-apps/modutils/Manifest b/sys-apps/modutils/Manifest
index b0ab62ece977..103bd4eedd02 100644
--- a/sys-apps/modutils/Manifest
+++ b/sys-apps/modutils/Manifest
@@ -1,4 +1,3 @@
-AUX modutils-2.4.27-alias.patch 2250 BLAKE2B 623b62fa8aa70a2a28b7da0f60c92a4fd2178015c9de855b071df0fbe1a85b55d6d4604fb57ca518d22054288f16c8362483f15290714c2479596878a92c3cbd SHA512 06ffe92cab08411158324c0c9420185bc3726ff43ece6567f294a8c9d324ef588685462ce670bbc80661d5e3da6d55d856efed3ca71891e60e3b6ab5b66d7179
 AUX modutils-2.4.27-flex.patch 805 BLAKE2B 0efc0b03204181dc456667bdf2a15e2765c4ea50ef9213d090eacddcb72adf95e597547520df2694bb59e7c0c5f01cbb714d8290f71b6d7d5f45592e9cfc1c9a SHA512 2d427b2c9b5d45866a704caa3b564c986106aeb1c60898efa54c7272bcb536fa13a46df6970a8a0b6020bdbe4c86903503a2ec0e15092d0c254f9b5a940c2374
 AUX modutils-2.4.27-gcc.patch 7007 BLAKE2B 2aade76f6aeee64a4ca25d2adccadbf5bfdaff25ebac4c317fd4d75339fdc8da5d723ffb54e6efe0fad805d5d4d279648de1ea7436df9dd89fd9c5470c2d7027 SHA512 44024ec0e6be1be4ab52a95726dad69670247665241bddcb11030735be58a4c78569dca8399ace467842f933b0fc15f4c3767a465ea433fdcea74c8c68a5d584
 AUX modutils-2.4.27-no-nested-function.patch 1422 BLAKE2B 3f1b2e95ef05815bee49666863f767e416cc67dfc4566011f59dc1ba49064c1810a31b4a91c5dcbbad0a5f47f33431644834dc872637532919cc0e2077f830d0 SHA512 0a01f28f9d3f803b1e148af382b396ad793354363c36e690ed5a731c31482bc8b909fcf77902b62f50967e1ed782ec9e53412c906117dc3d7d12b1f21ecf075a
diff --git a/sys-apps/modutils/files/modutils-2.4.27-alias.patch b/sys-apps/modutils/files/modutils-2.4.27-alias.patch
deleted file mode 100644
index 3ca733984402..000000000000
--- a/sys-apps/modutils/files/modutils-2.4.27-alias.patch
+++ /dev/null
@@ -1,86 +0,0 @@
-Taken from Debian.
-
-Update misc alias cruft.
-
---- a/util/alias.h
-+++ b/util/alias.h
-@@ -52,7 +52,11 @@
- 	"binfmt--310 binfmt_java",
- 
- 	"block-major-1 rd",
-+#if defined(__s390__) || defined(__s390x__) || defined(__ia64__) || defined(__powerpc__)
-+	"block-major-2 off",
-+#else
- 	"block-major-2 floppy",
-+#endif
- 	"block-major-3 ide-probe-mod",
- 	"block-major-7 loop",
- 	"block-major-8 sd_mod",
-@@ -107,6 +111,7 @@
- 					/* /dev/sunmouse Sun mouse */
- 					/* /dev/beep Fancy beep device */
- 					/* /dev/modreq Kernel module load request */
-+	"char-major-10-116 snd",	
- 	"char-major-10-130 wdt",	/* /dev/watchdog Watchdog timer port */
- 	"char-major-10-131 wdt",	/* /dev/temperature Machine internal temperature */
- 					/* /dev/hwtrap Hardware fault trap */
-@@ -116,7 +121,11 @@
- 	"char-major-10-144 nvram",	/* from Tigran Aivazian <tigran@sco.COM> */
- 	"char-major-10-157 applicom",	/* from David Woodhouse <dwmw2@infradead.org> */
- 	"char-major-10-175 agpgart",    /* /dev/agpgart GART AGP mapping access */
-+	"char-major-10-181 toshiba",	
-+	"char-major-10-183 hw_random",	
- 	"char-major-10-184 microcode",	/* Tigran Aivazian <tigran@veritas.com> */
-+	"char-major-10-187 irnet",	
-+	"char-major-10-189 ussp",	
- 	"char-major-10-200 tun",	/* Universal TUN/TAP device driver */
- 	"char-major-10-250 hci_vhci",
- 
-@@ -179,6 +203,11 @@
- 	/* next two from <dairiki@matthews.dairiki.org>  Thanks! */
- 	"net-pf-17 af_packet",
- 	"net-pf-19 off",	/* acorn econet */
-+	"net-pf-20 atm",
-+	"net-pf-23 irda",
-+	"net-pf-24 pppoe",
-+	"net-pf-25 wanrouter",
-+	"net-pf-26 llc",
- 	
- 	"net-pf-31 bluez",
- 
-@@ -199,6 +228,10 @@
- 	"bt-proto-2 sco",
- 	"bt-proto-3 rfcomm",
- 	"bt-proto-4 bnep",
-+	"bt-proto-5 cmtp",
-+	"bt-proto-6 hidp",
-+	"bt-proto-7 avdtp",
-+
- 
- 	"plip0 plip",
- 	"plip1 plip",
-@@ -228,6 +261,7 @@
- 	"ppp-compress-21 bsd_comp",
- 	"ppp-compress-24 ppp_deflate",
- 	"ppp-compress-26 ppp_deflate",
-+        "ppp ppp_async", /* for 2.4 */
- 
- #ifndef __sparc__
- 	"parport_lowlevel parport_pc",
-@@ -271,9 +305,6 @@
-  */
- char *above[] =
- {
--	"hid keybdev mousedev",
--	"usbmouse hid",
--	"wacom evdev",
- 	NULL			/* marks the end of the list! */
- };
- 
-@@ -284,7 +315,6 @@
-  */
- char *below[] =
- {
--	"ov518_decomp ov511",
- 	NULL			/* marks the end of the list! */
- };
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index f1ca04f3989d..fed71ac8f6f6 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -4,10 +4,14 @@ DIST portage-2.3.100-bug-719810-escape-percent-signs.patch 1486 BLAKE2B 809e3897
 DIST portage-2.3.100.tar.bz2 1051559 BLAKE2B 32ee47c2d3e28dd7530c4d6518c264f01621677b5d8872c98088117de3bde21bb05f144935b1c035157953814573473a9ac0216595138d804dd30cf8a7c5b4a9 SHA512 b784ced00676020700a27a622a7a10162b8775185e28d639473243949ca32210458523e94960cafa908ca4a97cd8731d3515f768e2512c519c54598316ecf3c9
 DIST portage-2.3.101-revert2-bug-709746.patch 25365 BLAKE2B 84a451b3af5c6a79a99f7548fa920a888b76d31d4248d11592bf5e8ec8f26bd8e62f813cb69a684ff2816942c49a8661744c7ec9d0944aa256527cfa3b20323d SHA512 49a1f7e38cec1e06373154024a980eedf5bfacc9cc66e1f8c70e8cbb77c68b94a934b4cffe039acdc86179a8f44bd463771c3acecaab6ced3387fd47a312f69a
 DIST portage-2.3.101.tar.bz2 1052483 BLAKE2B 8abf5a0f5c3aace92fd5e74692240558b9fd6cc27f5030409289519edb5287e6b49a0e8c33d11d7b1427a8463fe98f6041de37638451fe639b295d7b595328f3 SHA512 e5d373fc435a9f7535c9bdc202bd0aa9a534ac9991987e21fbfd43492940210312b817284a2484cb4e98854050bb559aa49daef7f5d555e637a37eb312ccbe61
+DIST portage-2.3.102.tar.bz2 1051616 BLAKE2B e9158cd941d65575dab51e2f8cd768c5706ce2f7e6f37fb4c77bc615501b3b3893fdee0917780fe172307bf647a1e4e56e3d88a7c479e103b095fc295fe274e7 SHA512 08024707c552b5b5174a66825cc53bc459a3db2fbb36740713a4ac5834429550200bc458e1f4a2ea921aaf04f0632dc885ef9ab5ba2c3a22d48c031667ed23ca
+DIST portage-2.3.103.tar.bz2 1051807 BLAKE2B 6a05997ea8b87627523642664956f822b76bbc41511659abfa6ede12b5f9ecaf9d253ac816b0e1dc6b6a118d9efc80593b429ef179d9d01200333585498d44d9 SHA512 e5595ca3b12c35fb696dd86ed2f1a72e56c7bc6955a63e555e1f0a795415473e38363541495496464bdc4192e2708c8bff4192bd0c7dad7a527fac96deec2a4c
 DIST portage-2.3.89-bug-718578.patch 1325 BLAKE2B 7a3bc520274617736eac2e3d078e90d151bdb5d8615f6217a499c0f5d4c80813f2c753e7902cf34482df0725ad0b43a38707764c8be14aae9f7ca34f0bd8721f SHA512 6f1c5d7b42beb8078c45cccbad2bd65374b69af92521d9be3beb6784477ca5bcdd75d8e762b239e44e3121e6fe5e3a040c92c9b61521e4a9b1d6bafee10d4c88
 DIST portage-2.3.99.tar.bz2 1051210 BLAKE2B dd3f990dbc87e655a767ce01e1ee3f0b1d5226fa818949408e54b81a2f96e50a4215a79af42b00dc795792858c4f86453b238b14baef4f0793c937b5617534b8 SHA512 176842318a4134ce54c5aa6485fef296f5a14edd2a72421c2011973a0f1a6af39bc5398f1e9eb3b8666d5fc307589c5b91ab93c219bdedb2d307357d8ddefbf5
 EBUILD portage-2.3.100-r1.ebuild 8506 BLAKE2B c28cf46a4b962d3cc63c8b2761830ec23102b2fd2bb62812e93323307449bb2e40e5ff89e28addfa19f99da7e29fb8c11ff262d0b2a129e1d7d14b55ebcd5a10 SHA512 d3b5ae4297c201177d831c50df9e5d78475025fcac3fab8a07970363f60da72ad6850fe74996791040eb24518617b915bf01b74ef3ebfb172ec72f6fc79d91a2
 EBUILD portage-2.3.101-r2.ebuild 8524 BLAKE2B 66747258d25a467f7672574c132983ee7d00107fa0d435511d8c7b70e44c2e949485f0ef461c5b232aedfe55c5afecbdd3b1ffa76bbc67cf23ccc6272fc7cb99 SHA512 1b4a33f9b134b69c48ebdd71bc4c30bcc8c2d4968ac4fa9eec087cfd0f753aa1a34751789f225b0ea7d07ec7276c3c6739dc22ce9b60d5b379c1fbd76bbc262f
+EBUILD portage-2.3.102.ebuild 8277 BLAKE2B ce6f538d3810a507e6532cd5ffcec56fefdf536c427e83464b38c8e68cc886ed67fc0e80721b6b07dc946e2e38365e961fd04683e6335e29ac429c74f2e9867d SHA512 a39ad1a46a3e965a6c0a829470f236419860d67613d4a289178688044d40bc985c2bb1db488cd8ea37b6ba8a6a2d3463aa16fe6f88d331ce937280c0dc174832
+EBUILD portage-2.3.103.ebuild 8277 BLAKE2B ce6f538d3810a507e6532cd5ffcec56fefdf536c427e83464b38c8e68cc886ed67fc0e80721b6b07dc946e2e38365e961fd04683e6335e29ac429c74f2e9867d SHA512 a39ad1a46a3e965a6c0a829470f236419860d67613d4a289178688044d40bc985c2bb1db488cd8ea37b6ba8a6a2d3463aa16fe6f88d331ce937280c0dc174832
 EBUILD portage-2.3.99-r2.ebuild 8464 BLAKE2B 4d8dd4abded851e705f4a5dc7fe7692acecf16f0a47a08086589e7d6443ed28c4adc97d94a2cbbd7e5a3e36e4a04d80402502739d4a2b75b7d6ebc2ad20f50ff SHA512 884218ac0eb74afe5bf9fb618164e0fd5fe368afeedcd93d5bb50e50b473f98c8b5b890cd44a8610b08e0d557c2ca5faf5842bef0fc3ce44ea5777a974588058
 EBUILD portage-9999.ebuild 7423 BLAKE2B ea03765f419e9450349cb5cf956f6f86f73a2ecdd95be109edee4713de5d57fb38f1da502f6d5aa0ba3bcea28ee1985efcb252a40af83982aa36fcfecfb92c73 SHA512 4494b11c180586cf6b1f268a2f9c54926ad57a4d41f74841b2644026ce8f18b8044ec5bd0048678bcd3a8c97cb1a9a1b6c5b63cbb637c2af948fa6fcd13ac0d7
 MISC metadata.xml 1482 BLAKE2B 1f75075b708135bace30a6fb3caaca01a411bcc53805e47720f639d7a8866ad703aac0a1d0b5e5dc3db5efa502c112b733535d3c7c40a691d444958cab3f065b SHA512 5ccf338f8847b8e958efdadb475af12bf689e1227830dccd117682f74b1ae4711359337a5c688b3ed9fc8056e4cbbd37a7e24f5bfdc2f650ab90f6e185091c2a
diff --git a/sys-apps/portage/portage-2.3.102.ebuild b/sys-apps/portage/portage-2.3.102.ebuild
new file mode 100644
index 000000000000..6e1a8152761f
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.102.ebuild
@@ -0,0 +1,263 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 linux-info systemd prefix
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	apidoc? (
+		dev-python/sphinx
+		dev-python/sphinx-epytext
+	)"
+# Require sandbox-2.2 for bug #288863.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+	app-arch/zstd
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	!build? (
+		>=sys-apps/sed-4.0.5
+		app-shells/bash:0[readline]
+		>=app-admin/eselect-1.2
+		rsync-verify? (
+			>=app-portage/gemato-14[${PYTHON_USEDEP}]
+			>=app-crypt/openpgp-keys-gentoo-release-20180706
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	kernel_linux? ( sys-apps/util-linux )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+	) )
+	!<app-admin/logrotate-3.8.0
+	!<app-portage/gentoolkit-0.4.6
+	!<app-portage/repoman-2.3.10"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+
+	check_extra_config
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
+
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i lib/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+
+		einfo "Enabling additional FEATURES for gentoo-dev..."
+		echo 'FEATURES="${FEATURES} strict-keepdir"' \
+			>> cnf/make.globals || die
+	fi
+
+	if use native-extensions; then
+		printf "[build_ext]\nportage-ext-modules=true\n" >> \
+			setup.cfg || die
+	fi
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i lib/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use build || ! use rsync-verify; then
+		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+			-w "/_BINARY/" lib/portage/const.py
+
+		einfo "Prefixing shebangs ..."
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+					die "sed failed"
+			fi
+		done < <(find . -type f ! -name etc-update -print0)
+
+		einfo "Adjusting make.globals, repos.conf and etc-update ..."
+		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
+
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use apidoc && targets+=( apidoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=(
+		install_docbook
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	use apidoc && targets+=(
+		install_apidoc
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	python_setup
+	local sitedir=$(python_get_sitedir)
+	[[ -d ${D%/}${sitedir} ]] || die "${D%/}${sitedir}: No such directory"
+	env -u DISTDIR \
+		-u PORTAGE_OVERRIDE_EPREFIX \
+		-u PORTAGE_REPOSITORIES \
+		-u PORTDIR \
+		-u PORTDIR_OVERLAY \
+		PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
+
+	env -u BINPKG_COMPRESS \
+		PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+	fi
+
+	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+		elog "The emerge --autounmask option is now disabled by default, except for"
+		elog "portions of behavior which are controlled by the --autounmask-use and"
+		elog "--autounmask-license options. For backward compatibility, previous"
+		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
+		elog "Users can get the old behavior simply by adding --autounmask to the"
+		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
+		elog "change, see https://bugs.gentoo.org/658648."
+	fi
+}
diff --git a/sys-apps/portage/portage-2.3.103.ebuild b/sys-apps/portage/portage-2.3.103.ebuild
new file mode 100644
index 000000000000..6e1a8152761f
--- /dev/null
+++ b/sys-apps/portage/portage-2.3.103.ebuild
@@ -0,0 +1,263 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=5
+
+DISTUTILS_USE_SETUPTOOLS=no
+PYTHON_COMPAT=( pypy3 python3_{6..9} )
+PYTHON_REQ_USE='bzip2(+),threads(+)'
+
+inherit distutils-r1 linux-info systemd prefix
+
+DESCRIPTION="Portage is the package management and distribution system for Gentoo"
+HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Portage"
+
+LICENSE="GPL-2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+IUSE="apidoc build doc gentoo-dev +ipc +native-extensions +rsync-verify selinux xattr"
+
+DEPEND="!build? ( $(python_gen_impl_dep 'ssl(+)') )
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	>=sys-apps/sed-4.0.5 sys-devel/patch
+	doc? ( app-text/xmlto ~app-text/docbook-xml-dtd-4.4 )
+	apidoc? (
+		dev-python/sphinx
+		dev-python/sphinx-epytext
+	)"
+# Require sandbox-2.2 for bug #288863.
+# For whirlpool hash, require python[ssl] (bug #425046).
+# For compgen, require bash[readline] (bug #445576).
+# app-portage/gemato goes without PYTHON_USEDEP since we're calling
+# the executable.
+RDEPEND="
+	app-arch/zstd
+	>=app-arch/tar-1.27
+	dev-lang/python-exec:2
+	!build? (
+		>=sys-apps/sed-4.0.5
+		app-shells/bash:0[readline]
+		>=app-admin/eselect-1.2
+		rsync-verify? (
+			>=app-portage/gemato-14[${PYTHON_USEDEP}]
+			>=app-crypt/openpgp-keys-gentoo-release-20180706
+			>=app-crypt/gnupg-2.2.4-r2[ssl(-)]
+		)
+	)
+	elibc_glibc? ( >=sys-apps/sandbox-2.2 )
+	elibc_musl? ( >=sys-apps/sandbox-2.2 )
+	elibc_uclibc? ( >=sys-apps/sandbox-2.2 )
+	kernel_linux? ( sys-apps/util-linux )
+	>=app-misc/pax-utils-0.1.17
+	selinux? ( >=sys-libs/libselinux-2.0.94[python,${PYTHON_USEDEP}] )
+	xattr? ( kernel_linux? (
+		>=sys-apps/install-xattr-0.3
+	) )
+	!<app-admin/logrotate-3.8.0
+	!<app-portage/gentoolkit-0.4.6
+	!<app-portage/repoman-2.3.10"
+PDEPEND="
+	!build? (
+		>=net-misc/rsync-2.6.4
+		userland_GNU? ( >=sys-apps/coreutils-6.4 )
+	)"
+# coreutils-6.4 rdep is for date format in emerge-webrsync #164532
+# NOTE: FEATURES=installsources requires debugedit and rsync
+
+SRC_ARCHIVES="https://dev.gentoo.org/~zmedico/portage/archives"
+
+prefix_src_archives() {
+	local x y
+	for x in ${@}; do
+		for y in ${SRC_ARCHIVES}; do
+			echo ${y}/${x}
+		done
+	done
+}
+
+TARBALL_PV=${PV}
+SRC_URI="mirror://gentoo/${PN}-${TARBALL_PV}.tar.bz2
+	$(prefix_src_archives ${PN}-${TARBALL_PV}.tar.bz2)"
+
+pkg_pretend() {
+	local CONFIG_CHECK="~IPC_NS ~PID_NS ~NET_NS ~UTS_NS"
+
+	check_extra_config
+}
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+
+	sed -e "s:^VERSION = \"HEAD\"$:VERSION = \"${PV}\":" -i lib/portage/__init__.py || die
+
+	if use gentoo-dev; then
+		einfo "Disabling --dynamic-deps by default for gentoo-dev..."
+		sed -e 's:\("--dynamic-deps", \)\("y"\):\1"n":' \
+			-i lib/_emerge/create_depgraph_params.py || \
+			die "failed to patch create_depgraph_params.py"
+
+		einfo "Enabling additional FEATURES for gentoo-dev..."
+		echo 'FEATURES="${FEATURES} strict-keepdir"' \
+			>> cnf/make.globals || die
+	fi
+
+	if use native-extensions; then
+		printf "[build_ext]\nportage-ext-modules=true\n" >> \
+			setup.cfg || die
+	fi
+
+	if ! use ipc ; then
+		einfo "Disabling ipc..."
+		sed -e "s:_enable_ipc_daemon = True:_enable_ipc_daemon = False:" \
+			-i lib/_emerge/AbstractEbuildProcess.py || \
+			die "failed to patch AbstractEbuildProcess.py"
+	fi
+
+	if use xattr && use kernel_linux ; then
+		einfo "Adding FEATURES=xattr to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} xattr"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	if use build || ! use rsync-verify; then
+		sed -e '/^sync-rsync-verify-metamanifest/s|yes|no|' \
+			-e '/^sync-webrsync-verify-signature/s|yes|no|' \
+			-i cnf/repos.conf || die "sed failed"
+	fi
+
+	if [[ -n ${EPREFIX} ]] ; then
+		einfo "Setting portage.const.EPREFIX ..."
+		hprefixify -e "s|^(EPREFIX[[:space:]]*=[[:space:]]*\").*|\1${EPREFIX}\"|" \
+			-w "/_BINARY/" lib/portage/const.py
+
+		einfo "Prefixing shebangs ..."
+		while read -r -d $'\0' ; do
+			local shebang=$(head -n1 "$REPLY")
+			if [[ ${shebang} == "#!"* && ! ${shebang} == "#!${EPREFIX}/"* ]] ; then
+				sed -i -e "1s:.*:#!${EPREFIX}${shebang:2}:" "$REPLY" || \
+					die "sed failed"
+			fi
+		done < <(find . -type f ! -name etc-update -print0)
+
+		einfo "Adjusting make.globals, repos.conf and etc-update ..."
+		hprefixify cnf/{make.globals,repos.conf} bin/etc-update
+
+		if use prefix-guest ; then
+			sed -e "s|^\(main-repo = \).*|\\1gentoo_prefix|" \
+				-e "s|^\\[gentoo\\]|[gentoo_prefix]|" \
+				-e "s|^\(sync-uri = \).*|\\1rsync://rsync.prefix.bitzolder.nl/gentoo-portage-prefix|" \
+				-i cnf/repos.conf || die "sed failed"
+		fi
+
+		einfo "Adding FEATURES=force-prefix to make.globals ..."
+		echo -e '\nFEATURES="${FEATURES} force-prefix"' >> cnf/make.globals \
+			|| die "failed to append to make.globals"
+	fi
+
+	cd "${S}/cnf" || die
+	if [ -f "make.conf.example.${ARCH}".diff ]; then
+		patch make.conf.example "make.conf.example.${ARCH}".diff || \
+			die "Failed to patch make.conf.example"
+	else
+		eerror ""
+		eerror "Portage does not have an arch-specific configuration for this arch."
+		eerror "Please notify the arch maintainer about this issue. Using generic."
+		eerror ""
+	fi
+}
+
+python_compile_all() {
+	local targets=()
+	use doc && targets+=( docbook )
+	use apidoc && targets+=( apidoc )
+
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+}
+
+python_test() {
+	esetup.py test
+}
+
+python_install() {
+	# Install sbin scripts to bindir for python-exec linking
+	# they will be relocated in pkg_preinst()
+	distutils-r1_python_install \
+		--system-prefix="${EPREFIX}/usr" \
+		--bindir="$(python_get_scriptdir)" \
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html" \
+		--portage-bindir="${EPREFIX}/usr/lib/portage/${EPYTHON}" \
+		--sbindir="$(python_get_scriptdir)" \
+		--sysconfdir="${EPREFIX}/etc" \
+		"${@}"
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	local targets=()
+	use doc && targets+=(
+		install_docbook
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+	use apidoc && targets+=(
+		install_apidoc
+		--htmldir="${EPREFIX}/usr/share/doc/${PF}/html"
+	)
+
+	# install docs
+	if [[ ${targets[@]} ]]; then
+		esetup.py "${targets[@]}"
+	fi
+
+	systemd_dotmpfilesd "${FILESDIR}"/portage-ccache.conf
+
+	# Due to distutils/python-exec limitations
+	# these must be installed to /usr/bin.
+	local sbin_relocations='archive-conf dispatch-conf emaint env-update etc-update fixpackages regenworld'
+	einfo "Moving admin scripts to the correct directory"
+	dodir /usr/sbin
+	for target in ${sbin_relocations}; do
+		einfo "Moving /usr/bin/${target} to /usr/sbin/${target}"
+		mv "${ED}usr/bin/${target}" "${ED}usr/sbin/${target}" || die "sbin scripts move failed!"
+	done
+}
+
+pkg_preinst() {
+	python_setup
+	local sitedir=$(python_get_sitedir)
+	[[ -d ${D%/}${sitedir} ]] || die "${D%/}${sitedir}: No such directory"
+	env -u DISTDIR \
+		-u PORTAGE_OVERRIDE_EPREFIX \
+		-u PORTAGE_REPOSITORIES \
+		-u PORTDIR \
+		-u PORTDIR_OVERLAY \
+		PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.default_locations || die
+
+	env -u BINPKG_COMPRESS \
+		PYTHONPATH="${D%/}${sitedir}${PYTHONPATH:+:${PYTHONPATH}}" \
+		"${PYTHON}" -m portage._compat_upgrade.binpkg_compression || die
+
+	# elog dir must exist to avoid logrotate error for bug #415911.
+	# This code runs in preinst in order to bypass the mapping of
+	# portage:portage to root:root which happens after src_install.
+	keepdir /var/log/portage/elog
+	# This is allowed to fail if the user/group are invalid for prefix users.
+	if chown portage:portage "${ED}"var/log/portage{,/elog} 2>/dev/null ; then
+		chmod g+s,ug+rwx "${ED}"var/log/portage{,/elog}
+	fi
+
+	if has_version "<${CATEGORY}/${PN}-2.3.77"; then
+		elog "The emerge --autounmask option is now disabled by default, except for"
+		elog "portions of behavior which are controlled by the --autounmask-use and"
+		elog "--autounmask-license options. For backward compatibility, previous"
+		elog "behavior of --autounmask=y and --autounmask=n is entirely preserved."
+		elog "Users can get the old behavior simply by adding --autounmask to the"
+		elog "make.conf EMERGE_DEFAULT_OPTS variable. For the rationale for this"
+		elog "change, see https://bugs.gentoo.org/658648."
+	fi
+}
diff --git a/sys-apps/prctl/Manifest b/sys-apps/prctl/Manifest
index 5e9d93ef9e0f..41f6771c40b0 100644
--- a/sys-apps/prctl/Manifest
+++ b/sys-apps/prctl/Manifest
@@ -1,6 +1,5 @@
 AUX Makefile.am 70 BLAKE2B 9c2735d35e8a0c707d5fefd6721c5a8678266b64e0fa157e3ebac62982289558fd9bdd2e1c225ac527654154917bd6e0f088c9ca57d2cef8030463ffe486f97e SHA512 8c10ca443aa6cef485e1ffd2e50195bf0c8be9ced5c94342b2a04bc5658521fd5c5fe440139de9d2603780dfd69db1cae9feef15a4956098212e6b0fdd60bebb
 AUX configure.ac 200 BLAKE2B 3ec747f56bb304484671171dd61c72cac8b264563955b7759b0c5f42f1ec03c490f400df0bc381c87c006316cb00a1687dd4dd5d83471c0699266cf23a727788 SHA512 ae8a75d3a37cb33fa8958f2de48549b99fc0b6f5c15fab8d7b9478e38e0dbd6d31e4bbdc876a50d52598d8b7964a544c0eb2e4677b3b32e7034acab98d8d6fd7
-AUX prctl-1.6-configure.in.patch 312 BLAKE2B c4fd576e1d4c42ffb4cc97cc24cea1f2d629a147b03a96f273a99a292a46615714415ad3902ef0f553713cd5de50d00a5498b8435e82de9f0ac78ba12889bd7c SHA512 fb67287f072516542822be2c267a2fb7a089546fd79fc6f26c67ede4e4b8db40e11d5594c3392a42df455194df4d674639263783954172b975e1f78a0195e034
 AUX prctl-1.6-no-implicits.patch 381 BLAKE2B 4374744647de591232e9da6398465a5b9f31f75027f57ce7da5d2294321c6ee17d6bb3c4a108131602bdab7f6643aff2778313c764d659e15093a6cee1081fad SHA512 b01e17872a6c098ddbd4720cf62cd83d485fd1095a9da47c2f79cc09b50648a02bde2aeb38b8dec03d5be794223c898f2c753f576068540252071209e1701812
 DIST prctl-1.6.tar.gz 18876 BLAKE2B 9f26fec1d178141d7e5aa7390dc0403ab1774d711a12588074ee6dbf62c980ab3713179b2f476f20cac0d7e4b027899b144fa67164021dd13b10be3dc087fb2f SHA512 c5b70abbb76f76f4a4c53cebcbd34fa4e87d7db2278a2ea17128da30dea958cc4e4d75b641cb3b9fbd8fa56fee482e97dbae5e61c697e80ef4d13f4b6d28cfda
 EBUILD prctl-1.6-r1.ebuild 545 BLAKE2B d948fc8ac27ed240266ab6eeb805bc65a7ccb07c0a8008e9acd719649cc2380f4ca61dfb658cb40a099bc67a22ee98734d03cecc6c70d9485d2ac0d8353fc304 SHA512 64419216ed7f999f12fd0fe37005cfac90db415b3952abf7a5787e56d2a6ff88d7209280487dd94fc7a37236d11f70c3a4f6700f1bea416d575b2039dfc7f96b
diff --git a/sys-apps/prctl/files/prctl-1.6-configure.in.patch b/sys-apps/prctl/files/prctl-1.6-configure.in.patch
deleted file mode 100644
index 492733eb97e9..000000000000
--- a/sys-apps/prctl/files/prctl-1.6-configure.in.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Restored configure.in based on tarball's configure
---- /dev/null
-+++ b/configure.in
-@@ -0,0 +1,16 @@
-+AC_INIT(prctl.c)
-+
-+AC_PROG_LN_S
-+AC_PROG_CC
-+AC_PROG_CPP
-+AC_PROG_INSTALL
-+
-+
-+AC_HEADER_STDC
-+AC_CHECK_HEADERS(unistd.h)
-+
-+
-+AC_CHECK_FUNCS(strerror)
-+AC_SUBST(ASCPP)
-+AC_SUBST(INSTALL)
-+AC_OUTPUT(Makefile)
diff --git a/sys-apps/tcp-wrappers/Manifest b/sys-apps/tcp-wrappers/Manifest
index 46313102c45e..f1aea2e24947 100644
--- a/sys-apps/tcp-wrappers/Manifest
+++ b/sys-apps/tcp-wrappers/Manifest
@@ -1,5 +1,4 @@
 AUX hosts.allow.example 585 BLAKE2B 18a7786b0eb9d08b0536de6ef135189aa0527af34a9bfec378ceedf6b6479998f81bd40237bdb5ad09239f7221cdc076077c964a111f6eb651ce258496d1010f SHA512 63587dd4552b688dc5ed0adde3932e43e5287129315211498063f09e37c1f8beee0de60d7d4f69df7149bd500546a2fd59a6094d71f9c0be221426eae3cb869b
-AUX tcp-wrappers-7.6-headers.patch 5419 BLAKE2B 6d56c77652299c8bc75ea76ff42c5dfa915b94b4466c79a23529e1d815487145dffef73d262a1d79e209caaf627fbf81b4f5402fca45af6f995c129fcb2539e4 SHA512 48cd3d8951ef0f0106c51f1a1de6116fe1f68bf49f321b956d4f9dac1b3f1b6c2964163deb3d1bb449a2ac672e471c4b216e0e616de4a2dad0665d767d13f786
 AUX tcp-wrappers-7.6-redhat-bug11881.patch 956 BLAKE2B ac2e8e4c8778899c6460bf6ae680b189158c9936428644e7b93981403ed017ef26806f3de184f66eace573cf385ae350f3b0fa1b3f250b2a0b4708908289c558 SHA512 d530f788c3b40f5ec2836ba7c6e73df529869ef465b93fe2b2d8460dfcb5e9031e78c8e6a99c71d6262a05b82f25e694fdd717686198a87dfcb2c9b9d5a52ef4
 AUX tcp-wrappers-7.6.28-no-external-malloc.patch 317 BLAKE2B 4436d7bf54e13b038e8139c2dfd0a4a061b6113898560436ae0e5fb6e5a74c3c4c163c27f99e9957ec89665186beed30e7a57810db886b8a86148f6b58f5f594 SHA512 bdefe3dd35e96d1e140d1dc363f1904526aaf0c44952b8ec5e206c8e53693437f07be2ad136a0e22c38e09c1dcd1c73c755165cc68b4588715f6997f9c6affb8
 DIST tcp-wrappers_7.6.q-28.debian.tar.xz 36104 BLAKE2B 209fd9730785db8afc8ebec581f7132cfb4352f8807d2cea4715daf5c11aa08a92cf084ab1ff31222f5b265f032286ce2dcf49a238e9dc5616161c400fce4f08 SHA512 2c63201937737c19b4e5ca97dbc0ede9fc2d3b8fc344f8854a7d2afc0109ccb9ee52af94ba8a8498da910336a4f473825daa7a0cca26a0d93e1078e67abe16b0
diff --git a/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6-headers.patch b/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6-headers.patch
deleted file mode 100644
index 328a4a102618..000000000000
--- a/sys-apps/tcp-wrappers/files/tcp-wrappers-7.6-headers.patch
+++ /dev/null
@@ -1,295 +0,0 @@
---- a/options.c
-+++ b/options.c
-@@ -34,6 +34,8 @@
- 
- /* System libraries. */
- 
-+#include <unistd.h>
-+#include <stdlib.h>
- #include <sys/types.h>
- #include <sys/param.h>
- #include <sys/socket.h>
---- a/safe_finger.c
-+++ b/safe_finger.c
-@@ -20,6 +20,11 @@
- 
- /* System libraries */
- 
-+#include <unistd.h>
-+#include <fcntl.h>
-+#include <stdlib.h>
-+#include <sys/wait.h>
-+#include <grp.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <signal.h>
-@@ -27,7 +31,7 @@
- #include <ctype.h>
- #include <pwd.h>
- 
--extern void exit();
-+int pipe_stdin(char **argv);
- 
- /* Local stuff */
- 
---- a/scaffold.c
-+++ b/scaffold.c
-@@ -10,6 +10,7 @@
- 
- /* System libraries. */
- 
-+#include <stdlib.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/socket.h>
-@@ -27,7 +27,4 @@
- #endif
- 
--#ifndef INET6
--extern char *malloc();
--#endif
- 
- /* Application-specific. */
---- a/shell_cmd.c
-+++ b/shell_cmd.c
-@@ -14,6 +14,10 @@
- 
- /* System libraries. */
- 
-+#include <unistd.h>
-+#include <stdlib.h>
-+#include <fcntl.h>
-+#include <sys/wait.h>
- #include <sys/types.h>
- #include <sys/param.h>
- #include <signal.h>
-@@ -25,8 +25,6 @@
- #include <syslog.h>
- #include <string.h>
- 
--extern void exit();
--
- /* Local stuff. */
- 
- #include "tcpd.h"
---- a/tcpdchk.c
-+++ b/tcpdchk.c
-@@ -20,6 +20,8 @@
- 
- /* System libraries. */
- 
-+#include <unistd.h>
-+#include <stdlib.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #ifdef INET6
-@@ -35,10 +36,7 @@
- #include <netdb.h>
- #include <string.h>
- 
--extern int errno;
--extern void exit();
--extern int optind;
--extern char *optarg;
-+int cidr_mask_addr(char *str);
- 
- #ifndef INADDR_NONE
- #define INADDR_NONE     (-1)		/* XXX should be 0xffffffff */
---- a/clean_exit.c
-+++ b/clean_exit.c
-@@ -13,8 +13,8 @@
- #endif
- 
- #include <stdio.h>
--
--extern void exit();
-+#include <unistd.h>
-+#include <stdlib.h>
- 
- #include "tcpd.h"
- 
---- a/hosts_access.c
-+++ b/hosts_access.c
-@@ -23,6 +23,7 @@
- 
- /* System libraries. */
- 
-+#include <stdlib.h>
- #include <sys/types.h>
- #ifdef INT32_T
-     typedef uint32_t u_int32_t;
-@@ -43,8 +44,8 @@
- #include <netdb.h>
- #endif
- 
--extern char *fgets();
--extern int errno;
-+static int match_pattern_ylo(const char *s, const char *pattern);
-+int cidr_mask_addr(char *str);
- 
- #ifndef	INADDR_NONE
- #define	INADDR_NONE	(-1)		/* XXX should be 0xffffffff */
---- a/inetcf.c
-+++ b/inetcf.c
-@@ -9,15 +9,14 @@
- static char sccsid[] = "@(#) inetcf.c 1.7 97/02/12 02:13:23";
- #endif
- 
-+#include <stdlib.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <stdio.h>
- #include <errno.h>
- #include <string.h>
- 
--extern int errno;
--extern void exit();
--
-+#include "scaffold.h"
- #include "tcpd.h"
- #include "inetcf.h"
- 
---- a/percent_x.c
-+++ b/percent_x.c
-@@ -16,12 +16,12 @@
- 
- /* System libraries. */
- 
-+#include <unistd.h>
-+#include <stdlib.h>
- #include <stdio.h>
- #include <syslog.h>
- #include <string.h>
- 
--extern void exit();
--
- /* Local stuff. */
- 
- #include "tcpd.h"
---- a/rfc931.c
-+++ b/rfc931.c
-@@ -15,6 +15,7 @@
- 
- /* System libraries. */
- 
-+#include <unistd.h>
- #include <stdio.h>
- #include <syslog.h>
- #include <sys/types.h>
---- a/tcpd.c
-+++ b/tcpd.c
-@@ -16,6 +16,7 @@
- 
- /* System libraries. */
- 
-+#include <unistd.h>
- #include <sys/types.h>
- #include <sys/param.h>
- #include <sys/stat.h>
-@@ -39,6 +39,8 @@
- #include "patchlevel.h"
- #include "tcpd.h"
- 
-+void fix_options(struct request_info *request);
-+
- int     allow_severity = SEVERITY;	/* run-time adjustable */
- int     deny_severity = LOG_WARNING;	/* ditto */
- 
---- a/tcpdmatch.c
-+++ b/tcpdmatch.c
-@@ -19,6 +19,8 @@
- 
- /* System libraries. */
- 
-+#include <unistd.h>
-+#include <stdlib.h>
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/socket.h>
-@@ -30,9 +32,6 @@
- #include <setjmp.h>
- #include <string.h>
- 
--extern void exit();
--extern int optind;
--extern char *optarg;
- 
- #ifndef	INADDR_NONE
- #define	INADDR_NONE	(-1)		/* XXX should be 0xffffffff */
---- a/update.c
-+++ b/update.c
-@@ -19,6 +19,7 @@
- 
- /* System libraries */
- 
-+#include <unistd.h>
- #include <stdio.h>
- #include <syslog.h>
- #include <string.h>
---- a/misc.c
-+++ b/misc.c
-@@ -14,11 +14,10 @@
- #include <arpa/inet.h>
- #include <stdio.h>
- #include <string.h>
-+#include <stdlib.h>
- 
- #include "tcpd.h"
- 
--extern char *fgets();
--
- #ifndef	INADDR_NONE
- #define	INADDR_NONE	(-1)		/* XXX should be 0xffffffff */
- #endif
---- a/fix_options.c
-+++ b/fix_options.c
-@@ -32,6 +32,7 @@
- 
- /* fix_options - get rid of IP-level socket options */
- 
-+void
- fix_options(request)
- struct request_info *request;
- {
-@@ -38,11 +38,8 @@
- #ifdef IP_OPTIONS
-     unsigned char optbuf[BUFFER_SIZE / 3], *cp;
-     char    lbuf[BUFFER_SIZE], *lp;
--#ifdef __GLIBC__
--    size_t  optsize = sizeof(optbuf), ipproto;
--#else
--    int     optsize = sizeof(optbuf), ipproto;
--#endif
-+    socklen_t optsize = sizeof(optbuf);
-+    int ipproto;
-     struct protoent *ip;
-     int     fd = request->fd;
-     unsigned int opt;
---- a/socket.c
-+++ b/socket.c
-@@ -95,11 +95,7 @@
-     static struct sockaddr_in client;
-     static struct sockaddr_in server;
- #endif
--#ifdef __GLIBC__
--    size_t  len;
--#else
--    int     len;
--#endif
-+    socklen_t len;
-     char    buf[BUFSIZ];
-     int     fd = request->fd;
- 
-@@ -430,11 +426,7 @@
- #else
-     struct sockaddr_in sin;
- #endif
--#ifdef __GLIBC__
--    size_t  size = sizeof(sin);
--#else
--    int     size = sizeof(sin);
--#endif
-+    socklen_t size;
- 
-     /*
-      * Eat up the not-yet received datagram. Some systems insist on a
diff --git a/sys-apps/unscd/Manifest b/sys-apps/unscd/Manifest
index f13273db3207..0cd5af965542 100644
--- a/sys-apps/unscd/Manifest
+++ b/sys-apps/unscd/Manifest
@@ -1,8 +1,6 @@
 AUX unscd-tmpfiles.conf 29 BLAKE2B e899d228b801b5c86b9bca3eb500acf9f07bf2f46d54e6370b5f5a595614eefe879937e679cfa1df4aa471138d78f56c310142807d94fbaef718262cb95909c7 SHA512 2f5d67300493e32ba1efd31fbfd8483f42aff9e15950361b640e18451e76e0fc7a0ad08f547485ab5b1ed544407c8758b53c9b22a61d75bfe2f80b893dce0e77
 AUX unscd.initd-r1 321 BLAKE2B dd36cd5c9e5d677655204048b3d43d8e5fe8b2f5d9c69c862a230257ab73350a5d27c3c6b8a107f2541d617e4e6cbbb421d1e06c83270de3100ed3101715137f SHA512 41def8b588f818b7e6e42809b37ab9d794d7d30c4be7dca047f64cdded55a401fa00cee962066125efe69a8efb9080fa2588c0941f4fc915243f1e111ac169c7
 AUX unscd.service 513 BLAKE2B 443b97c41978967d2ce0d9ef021dd271e1fc292cec082f060109f28e96f83bc8c53937f63a4c38bc1e04cb5b72af9f80ddcf55b8537938e10fc8f8eca040ca38 SHA512 3a03be4807c06506caea41aa163bb036c2600566e7a73267e08ef0aebb3a288d37eb12e448740942277baee365654c6118102915479be882cb65dfefaf53917b
-DIST nscd-0.52.c 73144 BLAKE2B 962c619044d54d3136ce2cd3f4766a0a5a11b0f341fb595238332ec4ef521854f6ef60c846ae0c8e3069774361366b6b53c1b48c8d21ebdf11b42bf05677852a SHA512 ba48410309fced9b8d9f929c52b39ca9a8caaf451fe73742bde7d4a4ab9980bc0f353551e19c846e96d6cb8a71e3c5edc7ddddf76cce0613282f0d01fde0612f
 DIST nscd-0.53.c 73206 BLAKE2B ce3b8e02ce8879664bde7ee7362ee0d920ad9e9cd24da08b02e83d49b2e0bef7fb1b3c6635bc4e8a26d901170943a78bae608903459e4447edf004e5ef716468 SHA512 d14362d21282d0ea919af3b353f7838d1514c293b49df084bc8df424392b4121dba3443a07118f4c8c1cfdca0cbf8ebddde24cf73459b06349e9d1a68801403c
-EBUILD unscd-0.52-r2.ebuild 721 BLAKE2B 285e3465617c6cb8285f197a6916fb363cb0cf1a0bed6b4ab4a83a2ae1cb2f18c2b923fade56806c74229818160f14ece371373fdddd52df1faf7e496aa7d0a3 SHA512 d65568ef1c55d0bb689c7736e2ffaed83631abde06a4817797c937f508eefd8ec06362d8a17ff220c572e9253f5ecfc1de87329bc2e9599e1dbcde831bc11a9d
-EBUILD unscd-0.53.ebuild 723 BLAKE2B ff678564a24f51b673bbdb5cde9677b0fce4d41826b132066a88404d18bdc4999ee3c4c4ee2cc2f949a2362ff078cdd4b0336061dd2609fc362155dd21eb387b SHA512 52b3313f3f26144f93c53747df694706c1c6d9165fa7d3fceb2603f3c768fd989086fef0a5ec4353cba5642487e123415d9a630eb2e4f962f8a76f12701260ec
+EBUILD unscd-0.53.ebuild 718 BLAKE2B ac7705f4af247b6da44dcda6c1ae9067b92886ec5c23f03cffd9a7cd698758b97dabebba10297ef2208b753b83dc3bc09fdf3931c3c3e392465d264ab50048a3 SHA512 2fd72cf7aa2645a3ece10be2d8dd32e456122a93e2b4025b812197d95cf3932701e95a61f6b1c2c11b0f79f49571673f959fab2824faaa4531947e2dc8095d69
 MISC metadata.xml 267 BLAKE2B 5267526ad53ec7bedfe46f8cba86c810629394fa4f3c59e1b69619b0a11a9edbb746ae6abf818182da7ade72c862360f43a19209007a23da9701df26b96f77dd SHA512 715bb37d958c1e508b2ef00711ab3a4abee982efe90867fd2bcf91fa91305d5a413a4f3d13d01ea6e27eb15f5f9dcb58fa13ecfed7025cae43745792ac1a105d
diff --git a/sys-apps/unscd/unscd-0.52-r2.ebuild b/sys-apps/unscd/unscd-0.52-r2.ebuild
deleted file mode 100644
index f61fb7591b5f..000000000000
--- a/sys-apps/unscd/unscd-0.52-r2.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit systemd toolchain-funcs
-
-DESCRIPTION="simple & stable nscd replacement"
-HOMEPAGE="https://busybox.net/~vda/unscd/README"
-SRC_URI="https://busybox.net/~vda/unscd/nscd-${PV}.c"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="sys-libs/glibc[nscd(+)]"
-DEPEND="${RDEPEND}"
-
-S=${WORKDIR}
-
-src_unpack() {
-	cp "${DISTDIR}"/nscd-${PV}.c ${PN}.c || die
-}
-
-src_compile() {
-	tc-export CC
-	emake unscd
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/unscd.initd-r1 unscd
-	systemd_newtmpfilesd "${FILESDIR}"/unscd-tmpfiles.conf unscd.conf
-	systemd_dounit "${FILESDIR}"/unscd.service
-	dosbin unscd
-}
diff --git a/sys-apps/unscd/unscd-0.53.ebuild b/sys-apps/unscd/unscd-0.53.ebuild
index d191aa03c5e6..f3e81790194e 100644
--- a/sys-apps/unscd/unscd-0.53.ebuild
+++ b/sys-apps/unscd/unscd-0.53.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://busybox.net/~vda/unscd/nscd-${PV}.c"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="sys-libs/glibc[nscd(+)]"
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index c2e7a1dc1e78..3cda1993d8a7 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -12,7 +12,7 @@ DIST util-linux-2.36-rc1.tar.xz 5183900 BLAKE2B 5bdb0dd03835fc3e46585192aaf7320e
 EBUILD util-linux-2.33.2.ebuild 8417 BLAKE2B 3b6971e04a78a962f7bbd5e6b663ce3408d57befe412d40c6b4b05777f40aea034e9f5f52872aea7537393210a2127fa952ed548061e89c15ef627987d2cfcec SHA512 7a1e0c679a1c69f2e64b54c6897a5e7c430bd8ce1fde91f9b02a00dfec115ec0c2deccbc760c1280fa092f8782c48610366828b4ebdbbaa10b2a6741a1a65a03
 EBUILD util-linux-2.34-r3.ebuild 8450 BLAKE2B 84795217360708525a23bad91268d45c997fb0ae87215a7a0c9027e2245fb98decc6f523faff98855b101e380f49663e6f7b34bb82d18d93641326e91567edf2 SHA512 3444d77384f176ff6c1b3c7f023c90b021723a4158456b504fc927b141a1ad438dfe59802d297fc136cf55d08f01be002d8f136b85df50fa762d083abacb4857
 EBUILD util-linux-2.35.1-r2.ebuild 9020 BLAKE2B 85036f850b775f5474b32601392acf488b580cbeae534ed3715f87baf285c7b7a188d4a0621156c7baa68a228e77ccbde4d459a42863b020a36bfff1814c54f5 SHA512 7b7bf0a46658c32a83a96b4d4d9a1e7dd0ea325a1593689a9187ef00c55ffdedb4d786ba2ad96b488c40fe806dae143d5957c78f445bd70bbfd0ba179a0242a6
-EBUILD util-linux-2.35.2.ebuild 8901 BLAKE2B 754af3199c098612c27e96d7f07d24486c45b03c4378460e6e224d4e1ff5e0cb2944c41dced090d76a8834769379904d7757455bb93e8c5e322b173fa9ca7f82 SHA512 ed7171580c93ab14a4402d177194b726a04c3f5d81d074527755e891930f33e0f411fffe597b2d337097dacd991f0fc09f6b71564f97b9323d21d52546e20d16
+EBUILD util-linux-2.35.2.ebuild 8900 BLAKE2B fdbf9a40dc517a3cef5442503afe0655195a4100f369f1dc4b8600d13496ac1922d7458b028235a271494a94ff701d7de5bda3deec4a124425554f24599c0896 SHA512 770befe33e7066f36f9e0ef860da2b3b64f5f56b9405fae22fadf2f56585e7f58d26054e41b4b66adc2ba227667389f64e1414ff11800e775302ffefeade72f6
 EBUILD util-linux-2.36_rc1.ebuild 8827 BLAKE2B 8d93a0b2f43af1cb3ec7c54e257f270ffd854a4f51181bfface98d800c75f8f38d40f3d91bcc8336ef0671698a0304da219947e02d4ebf3c1f7955a2a9ca4752 SHA512 8b9794bcbfaa4f653b1a4bfffaddf9a681f8de4e24feae4d890df4a01f55afdbc01021a5c06176470c07233c9fd34d67a93efc1116817c7f105dbd0741281368
 EBUILD util-linux-9999.ebuild 8840 BLAKE2B 98ec331609c6d1b2bde50590b97f32f9644299f71b264d79d31ae9568432188bac49b8c66855b70dac3afd022cee4e9188200ac9149ea468e46e69ad8c767729 SHA512 c3b65a0e43d738b6b36d27ead3a0daacb03360914757723b6017ef44a00fb592310f87fce7af0d31d390b00e70b7b5d4f047679f5d7d3549bf7e1ddfa9f0908b
 MISC metadata.xml 1364 BLAKE2B 0221b836433dfffc122d794272c554b6114862efb7d474e68507fb399e56cf32bc86f0dba0d519782634eb45638d2e15dd25c8147d7209f5a3de536ba7ecf38b SHA512 094e0b577f2322b73ace41db762ea88736650a3f3010fb8a26f649a51efc83d09a66bbdaf7a24b24164264b2dbbf7839be49b21e0a125c95ca39f1c4cd6201e4
diff --git a/sys-apps/util-linux/util-linux-2.35.2.ebuild b/sys-apps/util-linux/util-linux-2.35.2.ebuild
index a81c1721fac4..00b2ddfd8773 100644
--- a/sys-apps/util-linux/util-linux-2.35.2.ebuild
+++ b/sys-apps/util-linux/util-linux-2.35.2.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
 fi
 
diff --git a/sys-apps/x86info/Manifest b/sys-apps/x86info/Manifest
index 10d1e74d447b..c7d7e566b654 100644
--- a/sys-apps/x86info/Manifest
+++ b/sys-apps/x86info/Manifest
@@ -4,5 +4,8 @@ AUX x86info-1.29-parallel-make-cleanup.patch 330 BLAKE2B 77d0b528bd5a5dae91442ae
 AUX x86info-1.30-fix-build-system.patch 268 BLAKE2B a1f57d38ea3836b51eef4ed6b6516ac8a3e1350496e5550a2070d8b7f1a8e6b15c5af664d2c45062ea347168edf882ee2ddafa976beaa8688b19c33ae4ac3b0c SHA512 80f7b0773737b83c35a8dc59aa1f844edf73c93ee89d8fceeed3eb69cf757b79d42e9e0acfea061c1e7f7f4c38b953dbc0943dda874c62db7b63102394f8f6ea
 AUX x86info-modules.conf-rc 204 BLAKE2B 1077f0a793ca7eedef6c996d2ec9075872d7df862d24885a8152ee22ef3e0ee1667f142a690b44c019c7d75093038ad5a9eb9be7b34e7bc08abf498aa91a7591 SHA512 54557bb1ee77749b7207ac886a31278ae003b52f5c4e76709c3a367e59ab0086872e8b39d30f018ad9d8b07d037a54b4817815880b5c9ebde106cad73421af6b
 DIST x86info-1.30.tgz 95727 BLAKE2B 6e9e345c6b4d05d4a137b898f1cc8a31e901b25b8a3822c06c103298e2ee60c6fada8e1fc314a5fcec04618b9a8a9ce05a4e631dbf9f03a24c5349f13d1e2301 SHA512 0b4c9f1be83a737aa26ec14d239d09465608fcf542766ef5b8634d2fe08f75857c0d2bd1969d971ab4b0d55cd3aa3e4e5f58b3b2865865aa68fd751377672e5f
+DIST x86info-1.30_p20190617.tar.gz 85913 BLAKE2B e19e5fd797617499c64e75522f0fd030beaa335a6ba9afd29cbb79fd67313a2e57236d1ad8817bf91f0131faf667ba88ac0945ff25301ba8806912979f094ea3 SHA512 352e2b00578dc54b8d5ee32f09f327ab6a23e6ab4743882ca78a5a5ec1a04ceed8780228ffbda34f84ebb02c7cb850002a686929726feac90c8083044f479bd6
+EBUILD x86info-1.30-r1.ebuild 1738 BLAKE2B f809a7f512452242dfb9580026f1adf61ba57337ed46ad9614e007d2be67ba2782f359378d3d67842fb437158c488db0349d1ac01d3fa57d1c9f656fb8e450ba SHA512 34b59d22cbe750be756adef44dbd79feedc59aa6921550cc1fca9a4662fedf781b6c619d25eef8a15468efe945e30ee5931ed15198f50eaffbe5edb2a0772660
 EBUILD x86info-1.30.ebuild 1733 BLAKE2B b3f271e8d4617c828069e438b201fa7ba8d2c84984dac8bf214cd6bf96a4c15c7033934b878c791d078bdb09ff61ff1871dbc3b749ce649d5ca9a8f797ff376b SHA512 ce72adfb475678dfee2f45c00d0ef89231ae81df793d88ff2f0879c17755c7cdfc23af79d12bbc65a24d178698d77c72775c91c010ebf42cf66c3fbdaa1fb87f
+EBUILD x86info-1.30_p20190617.ebuild 1856 BLAKE2B e4bca9efb1259b4eb475306dbf9cab3fe1399fc7b89061de4a65d0eec595f4fa20d7d476edb5ef4bfd05a644fa03f21aae1710dcbdcaa9819ce31ee24d3c7ce4 SHA512 c5e7aa9c9233d40b1be7290f67fd48c2af3b342851e4727f95caaa48de4da4617b799ea5c951128fb4dbf5f087ca8347ef0e58a56fb0fecd8720c829a524afc3
 MISC metadata.xml 329 BLAKE2B d3b79b0a53a4a98cf288ff1ee8ae8cb477b90dad4529cedf04a52b25a3fc359121851c2cea28d703b2d2a42c5813bfe9b84398786e9045521eaff01b94f543c4 SHA512 3baca06564c2219ea6175ea39cea467ada4e7bf21a4341fcdc9d5b885ae387f4ca4f93605464b900a2524d64badfae641c5459d0acd0569de1ce848528a46ee4
diff --git a/sys-apps/x86info/x86info-1.30-r1.ebuild b/sys-apps/x86info/x86info-1.30-r1.ebuild
new file mode 100644
index 000000000000..5a09ba8a8e78
--- /dev/null
+++ b/sys-apps/x86info/x86info-1.30-r1.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4..8} )
+
+inherit flag-o-matic linux-info python-any-r1 toolchain-funcs
+
+DESCRIPTION="Dave Jones' handy, informative x86 CPU diagnostic utility"
+HOMEPAGE="http://www.codemonkey.org.uk/projects/x86info/"
+SRC_URI="http://www.codemonkey.org.uk/projects/x86info/${P}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="sys-apps/pciutils:="
+DEPEND="
+	${PYTHON_DEPS}
+	${RDEPEND}"
+
+CONFIG_CHECK="~MTRR ~X86_CPUID"
+
+PATCHES=(
+	"${FILESDIR}"/1.21-pic.patch
+	"${FILESDIR}"/${PN}-1.24-pic.patch #270388
+	"${FILESDIR}"/${PN}-1.29-parallel-make-cleanup.patch
+	"${FILESDIR}"/${PN}-1.30-fix-build-system.patch
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# These flags taken from the 1.29 ebuild
+	append-flags -Wall -Wshadow -Wextra -Wmissing-declarations \
+		-Wdeclaration-after-statement -Wredundant-decls
+	append-ldflags -Wl,-z,relro,-z,now
+
+	tc-export CC
+}
+
+src_compile() {
+	emake x86info lsmsr
+}
+
+src_install() {
+	dobin x86info lsmsr
+
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}"/x86info-modules.conf-rc x86info.conf
+
+	einstalldocs
+	doman x86info.1 lsmsr.8
+
+	dodoc -r results
+}
+
+pkg_preinst() {
+	if [[ -a "${EROOT}"/etc/modules.d/x86info ]] && [[ ! -a "${EROOT}"/etc/modprobe.d/x86info ]]; then
+		elog "Moving x86info from /etc/modules.d/ to /etc/modprobe.d/"
+		mv "${EROOT}"/etc/{modules,modprobe}.d/x86info
+	fi
+	if [[ -a "${EROOT}"/etc/modprobe.d/x86info ]] && [[ ! -a "${EROOT}"/etc/modprobe.d/x86info.conf ]]; then
+		elog "Adding .conf suffix to x86info in /etc/modprobe.d/"
+		mv "${EROOT}"/etc/modprobe.d/x86info{,.conf}
+	fi
+}
diff --git a/sys-apps/x86info/x86info-1.30_p20190617.ebuild b/sys-apps/x86info/x86info-1.30_p20190617.ebuild
new file mode 100644
index 000000000000..d8a3b48dfadf
--- /dev/null
+++ b/sys-apps/x86info/x86info-1.30_p20190617.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python2_7 python3_{4..8} )
+
+inherit flag-o-matic linux-info python-any-r1 toolchain-funcs
+
+DESCRIPTION="Dave Jones' handy, informative x86 CPU diagnostic utility"
+HOMEPAGE="http://www.codemonkey.org.uk/projects/x86info/"
+# Upstream stopped versioned releases entirely
+COMMIT="8ea5ed19fae1d209eba9257171a10f7afd474618"
+SRC_URI="https://github.com/kernelslacker/x86info/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+IUSE=""
+
+RDEPEND="sys-apps/pciutils:="
+DEPEND="
+	${PYTHON_DEPS}
+	${RDEPEND}"
+
+CONFIG_CHECK="~MTRR ~X86_CPUID"
+S="${WORKDIR}/${PN}-${COMMIT}"
+
+PATCHES=(
+	#"${FILESDIR}"/1.21-pic.patch
+	"${FILESDIR}"/${PN}-1.24-pic.patch #270388
+	#"${FILESDIR}"/${PN}-1.29-parallel-make-cleanup.patch
+	#"${FILESDIR}"/${PN}-1.30-fix-build-system.patch
+)
+
+pkg_setup() {
+	linux-info_pkg_setup
+	python-any-r1_pkg_setup
+}
+
+src_configure() {
+	# These flags taken from the 1.29 ebuild
+	append-flags -Wall -Wshadow -Wextra -Wmissing-declarations \
+		-Wdeclaration-after-statement -Wredundant-decls
+	append-ldflags -Wl,-z,relro,-z,now
+
+	tc-export CC
+}
+
+src_compile() {
+	emake x86info
+}
+
+src_install() {
+	dobin x86info
+
+	insinto /etc/modprobe.d
+	newins "${FILESDIR}"/x86info-modules.conf-rc x86info.conf
+
+	einstalldocs
+	doman x86info.1
+}
+
+pkg_preinst() {
+	if [[ -a "${EROOT}"/etc/modules.d/x86info ]] && [[ ! -a "${EROOT}"/etc/modprobe.d/x86info ]]; then
+		elog "Moving x86info from /etc/modules.d/ to /etc/modprobe.d/"
+		mv "${EROOT}"/etc/{modules,modprobe}.d/x86info
+	fi
+	if [[ -a "${EROOT}"/etc/modprobe.d/x86info ]] && [[ ! -a "${EROOT}"/etc/modprobe.d/x86info.conf ]]; then
+		elog "Adding .conf suffix to x86info in /etc/modprobe.d/"
+		mv "${EROOT}"/etc/modprobe.d/x86info{,.conf}
+	fi
+}
diff --git a/sys-apps/xdg-desktop-portal/Manifest b/sys-apps/xdg-desktop-portal/Manifest
index c9709e610721..a4dec3ada6b3 100644
--- a/sys-apps/xdg-desktop-portal/Manifest
+++ b/sys-apps/xdg-desktop-portal/Manifest
@@ -1,3 +1,5 @@
 DIST xdg-desktop-portal-1.6.0.tar.xz 453516 BLAKE2B 13ffcb21de6b61ddeb0782dcfc7b684287e54f94b9494b19589178594d1383a15048b8f9aeed7fb1260c3a2c967b267061d1db401085a686938c8629de8824c3 SHA512 7a0c702851762a55326142cb6b470205775284e0f749620ae6b648f216afcd684f8b20500339680b42812f628634344c9e826ab7cf13dd918fdbf733381d44ce
-EBUILD xdg-desktop-portal-1.6.0-r1.ebuild 1054 BLAKE2B a5b271c247b8df1032b1f279f8f7ac7ef74e4cfefdfbb3e53ed6e634f1c5a98b7adcc014fa00f92d064d7aacdf62439ff306c1027b761f2c961ba3ed6b9f543b SHA512 c4db0e697e2eae48cd21006e37085ede3138200ffb271b2dece8a33297364a9cbaa26288f33b542cce242ec9a4e7e9f09c2a95ba4840c898ef6b0752cca38b25
+DIST xdg-desktop-portal-1.7.2.tar.xz 468140 BLAKE2B 6f2e92f79424f79e778db9c1bf94555332f1f88ef42f84e477c8784be74ce8e2cf924f34da5e17d78359bd493370dcee62aec77f60c9df5cf3475d745f3e4d8e SHA512 fac64281e89d8bf17c6f1b3751c159d9ca6c2896b71bb83622411bf2dc9b7813974d19902c81c3576b325c98edf4dae22ccc3fe290e32f717730b6aa3afbdc12
+EBUILD xdg-desktop-portal-1.6.0-r2.ebuild 1058 BLAKE2B cc38d747768e44535808c0b0b3305299a978eb73a62ab1864f967d80a38edd3ead4ee340a36345b955b1f1ff77a1f037c563c6ddc6c2eb5bd61eaecb065eaeec SHA512 fcabc1a7d2da0d0ddadd790156439d806608b0b8d917bb531c78e54ffdef745d20e7e7c61c61f606e1df6888ea17652c55afbc303b77cba3ec8c6ff2be849f49
+EBUILD xdg-desktop-portal-1.7.2.ebuild 1051 BLAKE2B c0287fb8e4dc90b2459c8755a4f4cd7b011f1f3c484a398429dca07910d656486670ecfa23060d90e174e0bdb0c6827fd99d9c9730ebf1e0ed11d96216989d16 SHA512 6cd390505de64d2c55a5c371fcab8ff3f2e9616681d53530b8a9b4862afe1c58a9d79950f840e36457b94a0f52353e015a169511844a361623a45b9ad22e4977
 MISC metadata.xml 360 BLAKE2B 1e3fae0173fab20df0be6a2bd8432477d2c0ab2b9c4272e72a9d8a9eee3255c56311364ea079d288f87032fbc2ec8cad69f32a6bc41b152d19e307ee84493b49 SHA512 4e7232bd03fad6442491ce16c155b0d447050dfc383bb2c16b51297c8c2dcc2793b6d9ce6703451e9516d5a3017fb9e20e85ed7208c94c0faa4489bcbd897e22
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.6.0-r1.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.6.0-r2.ebuild
index 52c483a59a5b..777122093897 100644
--- a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.6.0-r1.ebuild
+++ b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.6.0-r2.ebuild
@@ -19,8 +19,8 @@ BDEPEND="
 	sys-devel/gettext
 	virtual/pkgconfig
 	doc? (
-		app-text/xmlto
 		app-text/docbook-xml-dtd:4.3
+		app-text/xmlto
 	)
 "
 DEPEND="
@@ -29,7 +29,7 @@ DEPEND="
 	media-libs/fontconfig
 	sys-fs/fuse:0
 	geolocation? ( >=app-misc/geoclue-2.5.3:2.0 )
-	screencast? ( media-video/pipewire:= )
+	screencast? ( media-video/pipewire:0/0.2 )
 "
 RDEPEND="${DEPEND}
 	sys-apps/dbus
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.7.2.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.7.2.ebuild
new file mode 100644
index 000000000000..5037ce682d40
--- /dev/null
+++ b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.7.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools systemd
+
+DESCRIPTION="Desktop integration portal"
+HOMEPAGE="https://flatpak.org/ https://github.com/flatpak/xdg-desktop-portal"
+SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+IUSE="doc geolocation screencast"
+
+BDEPEND="
+	dev-util/gdbus-codegen
+	sys-devel/gettext
+	virtual/pkgconfig
+	doc? (
+		app-text/docbook-xml-dtd:4.3
+		app-text/xmlto
+	)
+"
+DEPEND="
+	dev-libs/glib:2
+	dev-libs/json-glib
+	media-libs/fontconfig
+	sys-fs/fuse:0
+	geolocation? ( >=app-misc/geoclue-2.5.3:2.0 )
+	screencast? ( >=media-video/pipewire-0.3:= )
+"
+RDEPEND="${DEPEND}
+	sys-apps/dbus
+"
+
+src_configure() {
+	local myeconfargs=(
+		--with-systemduserunitdir="$(systemd_get_userunitdir)"
+		$(use_enable doc docbook-docs)
+		$(use_enable geolocation geoclue)
+		$(use_enable screencast pipewire)
+		--disable-libportal # not packaged
+	)
+	econf "${myeconfargs[@]}"
+}
diff --git a/sys-apps/yarn/Manifest b/sys-apps/yarn/Manifest
index c2725ca47c08..de96470d9748 100644
--- a/sys-apps/yarn/Manifest
+++ b/sys-apps/yarn/Manifest
@@ -1,5 +1,3 @@
-DIST yarn-v1.22.0.tar.gz 1244012 BLAKE2B 2764704103e281de8fd8c2c28abae56c7ba863365989b884add045d2f80810f0f8b83acd77baeef2375fe1424ad54cabfd89e4d14b38068114552115d3b7a812 SHA512 28c1cffc9ab9de364a4d8f624d4b77748565fdb7ba50fb3620da3debe0676472cac583537f03269601d368c5b2199a0eef8448e00205be75a162b5ead9448992
 DIST yarn-v1.22.4.tar.gz 1244785 BLAKE2B 1f1eeb829096eaf19a8fdb48b46fa736769d9d3c247759e434413665186e4cccb750024afa836dae8a0130fc472df3c01805d263d81346e1dd7509e1b106e88a SHA512 a1833b862fe52169bd6c2a033045a07df5bc6a23595c259e675fed1b2d035ab37abe6ce309720abb6636d68f03615054b6292dc0a70da31c8697fda228b50d18
-EBUILD yarn-1.22.0.ebuild 1058 BLAKE2B cc521c197011573800b7671b187d0f5507df0dfb9283f4f5355cb29fc9c1f72a7e5e34589928bab4fea27a2d26f735b6274b011486efa70c6f347ff51327c4cd SHA512 ccdce002d42bd31f614e92bb8703eeba3c713504b1e2feb03120d76c35475328ff40772c1b3b237c48e87e09a86f4ba149bf3f38aed3d52a3a6f303b33621dc4
-EBUILD yarn-1.22.4.ebuild 1058 BLAKE2B cc521c197011573800b7671b187d0f5507df0dfb9283f4f5355cb29fc9c1f72a7e5e34589928bab4fea27a2d26f735b6274b011486efa70c6f347ff51327c4cd SHA512 ccdce002d42bd31f614e92bb8703eeba3c713504b1e2feb03120d76c35475328ff40772c1b3b237c48e87e09a86f4ba149bf3f38aed3d52a3a6f303b33621dc4
-MISC metadata.xml 545 BLAKE2B 223f9132b5cbabf71b64028e2fd75d4de88566b59069db3e1ebcf195cf3143e1c4c0f04dfa05d911a65f9d8ff29504385a9d8ed3001f66473e39ee2bca2417ba SHA512 f742b0908db5b89cd69b910497da75f129a0bc73b6068df891a4b8673d233b3bacc5347d98a872fdf8984f588c4991ae6c2b65ab60fbf81bfc5474402efae44a
+EBUILD yarn-1.22.4.ebuild 1057 BLAKE2B 40ca4f1e345f8914a672817c21b0a5974ac314b9bc10f54937dd7d607f492725e7e41632d4b75a0ab62b43607a2aa90b6f2ea83b4a1844ae098f0f12cefc7b45 SHA512 a50ec0902a9a509918b979a634350e048d9ba5f768cceab11b1b2af08076aaa85cd2e22174934f010330eb9ce0c08402ac77cfb7a58d6e33d7162e27784c261b
+MISC metadata.xml 654 BLAKE2B 4554ddbe2ccaaf07ae2324740b9776f7473ee6a10638b8b91dd75a4451c4030a0bc0cc41dc3fe91e392cdfe07ce6bbd55e9b04f2cd31b9c4021456c70e219237 SHA512 42ea44ef45e4c756ec6b04a657ae184380fe34829b3d770e125762bfa22e4d950a537d82e90e08ff6786dc46927212d0b5ab44e788070d0d7e05072c28440a5b
diff --git a/sys-apps/yarn/metadata.xml b/sys-apps/yarn/metadata.xml
index 3533828aaf9d..52bf09ed0f47 100644
--- a/sys-apps/yarn/metadata.xml
+++ b/sys-apps/yarn/metadata.xml
@@ -10,6 +10,10 @@
 		<name>Proxy Maintainers</name>
 	</maintainer>
 	<maintainer type="person">
+		<email>williamh@gentoo.org</email>
+		<name>William Hubbs</name>
+	</maintainer>
+	<maintainer type="person">
 		<email>zmedico@gentoo.org</email>
 		<name>Zac Medico</name>
 	</maintainer>
diff --git a/sys-apps/yarn/yarn-1.22.0.ebuild b/sys-apps/yarn/yarn-1.22.0.ebuild
deleted file mode 100644
index 706453936e75..000000000000
--- a/sys-apps/yarn/yarn-1.22.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_P="${PN}-v${PV}"
-
-DESCRIPTION="Fast, reliable, and secure node dependency management"
-HOMEPAGE="https://yarnpkg.com"
-SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/${MY_P}.tar.gz"
-
-LICENSE="BSD-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="!dev-util/cmdtest
-	net-libs/nodejs"
-DEPEND="${RDEPEND}"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	sed -i 's/"installationMethod": "tar"/"installationMethod": "portage"/g' "${S}/package.json" || die
-}
-
-src_install() {
-	local install_dir="/usr/$(get_libdir)/node_modules/yarn" path shebang
-	insinto "${install_dir}"
-	doins -r .
-	dosym "../$(get_libdir)/node_modules/yarn/bin/yarn.js" "/usr/bin/yarn"
-	dosym "../$(get_libdir)/node_modules/yarn/bin/yarnpkg" "/usr/bin/yarnpkg"
-
-	while read -r -d '' path; do
-		read -r shebang < "${ED}${path}" || die
-		[[ "${shebang}" == \#\!* ]] || continue
-		fperms +x "${path}"
-	done < <(find "${ED}" -type f -printf '/%P\0' || die)
-}
diff --git a/sys-apps/yarn/yarn-1.22.4.ebuild b/sys-apps/yarn/yarn-1.22.4.ebuild
index 706453936e75..0374a801dbc1 100644
--- a/sys-apps/yarn/yarn-1.22.4.ebuild
+++ b/sys-apps/yarn/yarn-1.22.4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/yarnpkg/yarn/releases/download/v${PV}/${MY_P}.tar.gz
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 IUSE=""
 
 RDEPEND="!dev-util/cmdtest