gentoo resync : 17.02.2021

34 files changed, 248 insertions, 155 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 61c4a0c8a3d0..be0848715fb9 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/bubblewrap/Manifest b/sys-apps/bubblewrap/Manifest
index dd3f2e1b98df..d728f28f16a9 100644
--- a/sys-apps/bubblewrap/Manifest
+++ b/sys-apps/bubblewrap/Manifest
@@ -1,4 +1,4 @@
 AUX bubblewrap-0.3.1-selinux-configure.patch 5208 BLAKE2B 69db3066eebae54d34f02a02aa053a6bf5ed675329b3d18a4f261529a434d1c9dbfb637a3f96f4079a6adba586b666d7890370c8761c92dc9450f096a8368bbe SHA512 f6515a25c6b311c9b8336761c7daea2440964982f8a7a6587b6707ef9e9a5705ec380e13982b0765af205c221724ef418b44c3efd1b6e5f0c1788b143a88ef17
 DIST bubblewrap-0.4.1.tar.xz 214496 BLAKE2B bdbff50cc4e28c91d83c814df7f2ee15702962d26a9316bd841b1e63bf5976c4549c88e20869e8cc236a8a0c9a065518f945c356fa7a058f8831f5b1e9d4eb0d SHA512 0ff46dc0fda2d0cffbb36cc52ff43951b30cbd835a42cc56806acbbbd827796bfadbb1cfafc84d6b47a72c031ca44abe1c377acc0cc25fe3b33e854f5f687d35
-EBUILD bubblewrap-0.4.1.ebuild 1138 BLAKE2B 5607d1645cc81be516dac6146c6aa45fefb69d66137af886048664fec1d73f4cf00835ee9d7a21e72f93acc9ee49b9d079f6dbf2ce70f400eb9a6487a437dc31 SHA512 164790de09371c07d7df7311b022d9dbdb0cf28333152d96c0906d2966fd63aae99b7e6cb139efda2e8903b27302ed9d74a7e1071a6e4eadc42afe5f70dcb2ce
+EBUILD bubblewrap-0.4.1.ebuild 1137 BLAKE2B 140817832648087cff8d03cb78e51c794a1a4973208d63bdd24659487ac24f4b93d38bd0f50008a24a202a3846c595c35da73c95e078a0784f844f7671782a6f SHA512 1591fbf074c48844711f042a2de8c29aa2c09a5b2fc33cfca8eb4e1d33eb356c55aea60eb286aeabe7ccffdec90157af3ddc4eefd6b9bb15b512387f43bcdfb2
 MISC metadata.xml 452 BLAKE2B c11d7134d3623de9f970ddcb4782d1312f89b17955090ee7d4c56a1acb9b45f1c5ae0d08d091b57be21b696cceda0ed7d747c10aa6765c927df8dae81233d66c SHA512 3e6ec22d7109fdf7772edba88f6f76783df8ee233d9f927b6e5570d1453f611f93627c2ea3dfcbe9ae1259d1c23692b26d5403fef02558dcf296f569702c5103
diff --git a/sys-apps/bubblewrap/bubblewrap-0.4.1.ebuild b/sys-apps/bubblewrap/bubblewrap-0.4.1.ebuild
index bcd591ab652b..045b5a61571e 100644
--- a/sys-apps/bubblewrap/bubblewrap-0.4.1.ebuild
+++ b/sys-apps/bubblewrap/bubblewrap-0.4.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/containers/${PN}/releases/download/v${PV}/${P}.tar.x
 
 LICENSE="LGPL-2+"
 SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~ppc ppc64 x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 x86"
 IUSE="selinux +suid"
 
 RDEPEND="
diff --git a/sys-apps/colorized-logs/Manifest b/sys-apps/colorized-logs/Manifest
index 34799b8558be..8133f763f680 100644
--- a/sys-apps/colorized-logs/Manifest
+++ b/sys-apps/colorized-logs/Manifest
@@ -1,5 +1,3 @@
-DIST colorized-logs-2.4.tar.gz 10918 BLAKE2B 767d635155ebb66e212888c8e61e2ab65be665497a84c8820aa8183a5d94d30c9f2b653c16131916a907cb369d3b88a004573ae9eeaa1fda954cee239fa6da05 SHA512 5ac5734409f06262ad470a87e215c305f805a5701a604f1fc744632a25e4a1b8dd9c878897f72ad434b71ebe300c6d676cd53760a34f48b8202a62c765dcbe3f
 DIST colorized-logs-2.5.tar.gz 12331 BLAKE2B 79ee9d5a7d2e683ebba044a8b75666fe5824a087be3b41e9e1c4bb3b52d1d2a57b6dd5f3cc64a48fa6705b9074daa6cfaec61a730223bc3deb21835033fc3adb SHA512 a4849db1124bbf65a54285a121aa723a44b7270498858d0ac5f50892d3d8eb38c8109c3bb457cdf6ffe336e77703ba454217047ed819a0d61f415c5b8882cc28
-EBUILD colorized-logs-2.4.ebuild 658 BLAKE2B e815db4c00a458000eb7a9ecd3e02c67965d543a6bf0085d822fc1ad28427c10f090fa86a74e54ad747a636bd790d960fa3866f3f535102f354f86a0982590a9 SHA512 4d53be42d675a20bde974f630c342b47c718132cbfba6bebff8123c0d1faaeb0a25566c4e83c670daf6ce6a4c784fae4fba9f1e2b72ffe861f7bf5a51736936e
 EBUILD colorized-logs-2.5.ebuild 665 BLAKE2B 73f383328f1922d117670ad9c28acb604697d9267bcc4a43e8e4cf00eb8d44536c623ff58b3f57d1a26b99431f2928376f61dc73ae51f9f3b96b5f24be27fb1c SHA512 d1e80c867abd49622d660f055043ea083150eac03c95e152cce57cb1d814149bbdd837d841c1633330a6e74d14a167eae3e4f994b4f36937af3a18c5cdb8720e
 MISC metadata.xml 243 BLAKE2B f40c5d69470d5136cba32e1ea6b2351ca1842a5d83381e0bef3e063e266c64bebb9ba85e1f155010e219b136c2827c989d9adf3b2c6b2f6ca265f03339c9a7ce SHA512 640630eb9d42c319ca1da37b03a03677a3dd4e48f28ce2690b64f6e4e7d5885cfda41d439f3f9d8b009be04891b043a5b0ac6f9d43b701f65c8fcc0e0613b04a
diff --git a/sys-apps/colorized-logs/colorized-logs-2.4.ebuild b/sys-apps/colorized-logs/colorized-logs-2.4.ebuild
deleted file mode 100644
index c21dd88d5a8a..000000000000
--- a/sys-apps/colorized-logs/colorized-logs-2.4.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit cmake-utils
-
-DESCRIPTION="Tools for logs with ANSI color"
-HOMEPAGE="https://github.com/kilobyte/colorized-logs/"
-SRC_URI="https://github.com/kilobyte/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 x86"
-IUSE=""
-
-DEPEND=""
-RDEPEND="${DEPEND}"
-
-src_install() {
-	cmake-utils_src_install
-	# Rename to not collide with dev-python/ansi2html
-	mv "${ED}/usr/bin/ansi2html" "${ED}/usr/bin/cl-ansi2html" || die
-	mv "${ED}/usr/share/man/man1/ansi2html.1" "${ED}/usr/share/man/man1/cl-ansi2html.1" || die
-}
diff --git a/sys-apps/dbus-broker/Manifest b/sys-apps/dbus-broker/Manifest
index e9d7c8c2fabe..6312ceeba0bb 100644
--- a/sys-apps/dbus-broker/Manifest
+++ b/sys-apps/dbus-broker/Manifest
@@ -1,19 +1,14 @@
 DIST c-dvar-70f0f21e86a34577e674e202d5d09ef167102f02.tar.gz 24719 BLAKE2B 817c03739f56a3b741120896f98089bd6a379395b2f8e99697a79a3a2bdc855358a73b079434428c416373821e0e134acf6e30ef9bb9a384d25438c633e02433 SHA512 6a237100e66eef2413bf498d97a8fe1ca1b568df1f99276603f0b1627437a7f5741c38068cbafc49664f2a0438785a0ef7fb1de0fdb6768741585f1606d094e2
-DIST c-dvar-ebcef28b0da11ec20250f2fa710130967ddd8fa9.tar.gz 24584 BLAKE2B 6b9d488b14861084aa48a874d0db97d90ef554df4877650f66631474b12cd9c7d595726e074de4ddc549d7e053984aaa02f0cc0543811842fac468b2e3c3b8a4 SHA512 592ac99b75101e24babb0ab08ede530bf4cd3a31780d7da1e4d4ace04878811ab2db324c91dd962d6d9e433cd05658cc467a272d9ff3d17e2f594bfe08998b3e
 DIST c-ini-867f06a12a702c6869924575503877caa0adde75.tar.gz 13950 BLAKE2B 2cec6d49f7e698ee7f9514f8726c7c01dc72d2c186832122efcabeea37e082d0922be742c83f69c1ef93a820575c05dc2bb10790b41c2491e8c3719afbe5a37a SHA512 a3e82a24dc8119d90d573d87f5d92f24029490cae1564f66030f6781c95fa50c2c720378a8fbd07511007f1f53debbf62ca9ea86fdd905c42f325f28f35bd876
-DIST c-ini-f8336c98a74038a1104283fde284c5b82d6aef92.tar.gz 13957 BLAKE2B 7e0bb2d8b5cd8cdf2aefa48b9e8980327690bbc255937b12b54133014aac9473ddab517a126a0f24a2258cffc263043d643ccacb99c41bb666e4d0c18e62899e SHA512 5abba94f47f5155464e28b4f99ff147f1cd029db9b020c579508eec0f3e9d6be09462a56ed8b9320a4d8ccc0d03a8f959cdb9098fcd828c917f37e2deda90e1c
+DIST c-list-96455db9f04a6c9101a00957161551aea700b6aa.tar.gz 9221 BLAKE2B 3caa352a7be8ece056e69afbf556530f0a134f4fda987f4b46ec26e8b97d220726853b532a0479019374e90c06c9e1ff82198b04805b48db0a240d7929b08590 SHA512 ed4deb39dde17a57f4c8c9c8320e0df0cefe9a761fe5d684ee9a982d2175c5fba50c9fa29059844e96f46b008a6dc1ac1d17c47b1b52fc057ccb55dc7bd85148
 DIST c-list-ac7c831398219acd8d63038e866035a6f86f9e21.tar.gz 9218 BLAKE2B 5821032f60a27c696b0e34e2d26250c48df19ad0d8883eb50b5a0ee6acafeb3f570b23db7b0c823ecdd47de6eb0d2d02d5aedf467283e8293e848189af8d59ae SHA512 95a3e03b0b3aefcdaaf350de0b41cdbba081716ff01bf6e2442aaf0340f0411f32f6a06d204614b59af26df921a161b4bee5f83b5145ec2cae485c9954a6709c
-DIST c-rbtree-7624b79b26d020a796fe7c624a4f2d3340f3d66b.tar.gz 25835 BLAKE2B 080f8cc5168b40fcc87a3b21f8b8130385f6ccaafe1c229dca4b9a2e8b6294e7100784f9d2e12c336172e5eaa93645f41379e96bf85c622f0c46f27ad9dbaa65 SHA512 e231a040aedbd12309c4b57cd78fbbe931460fd0748f4a7d0f88ebbe5a0f088bdc6f473be94a5e9d9a28c0a8bf31d81a7a9669132b7eddb44a51a9a2e598cbb0
 DIST c-rbtree-a3b1f80548d1c736208c55e9251c49ada649dd62.tar.gz 25948 BLAKE2B 82e3692fd747191fc160ae5add4e037696f9209f7ef3003bcb72def18c96a7368b5e6408d38de6c0609ef27fa6762d9323a85e0ab5d1a50d8b10cca99b2930d1 SHA512 9ab0c6062e5cfb771c4f31a9c8d82f744762d2f9acf24849bcc6f04de57e85fc0f8487ef8c8484e2e0f0baec83a3011b1425ddd183c2836f90906636f1db8d94
-DIST c-shquote-80d4252f31c74785f0ec8c4578a26f1c16d5941e.tar.gz 10639 BLAKE2B 9a0f64e0af692a0872b5f40236543e551b7eb49134fc31ca6bfcf56b36e5eba1c2445093a089bf4eaa1aa89671270b35a7cf20767377b167c1cc2cec8f72a23a SHA512 1a79cf2c7c5d3f0d901a3947e371717314b1a4015eb0182b3b670c65abf9c054f30870ec73c628d7b2519b506035be45c23267594e76bc3b7d2e6b53a38cb068
 DIST c-shquote-95e4713a0de475688a5727a5d776dccbc69d3d28.tar.gz 10635 BLAKE2B 90dd5c343dcc7de13a7cc5a495052c058499fb7fcdf44d5463a45714ea8e330fc3c9756c84302f454cd46ef32801b74962d9e49ab930ebc6729cbdb1de9e8056 SHA512 494c55cb676998afc56e40f00661f49698e596a51019e9f227b111b4f16d7f2e65056adc57858c688957a07c972dadd217af2bbb95e390760ef758259e54a769
 DIST c-stdaux-346623b40eb8137cae7568a69ee42253ff098ff7.tar.gz 13046 BLAKE2B 19b22cc7cb6f4a5a970295a36ceecadf8d1fbd93524a39a22107c73df63516c643be711483aa0ca3fdb97941a9a41084802def7c6663824e7660908564f3ad96 SHA512 424512e8818ff56a9882806aa9879f4f5167ed02a19d01cffb42de620816318746898c27d9ccb857b466435d1a588d735ff51da45baa08f9b892dcef18ec34ce
-DIST c-stdaux-ffa3dcc365331e31eb0c0f73ccd258e7a29a162a.tar.gz 13000 BLAKE2B 23f5a264aa4a8c70e8562c62d4c4a3a865e5132febc9709576d4e565a72c171131c0d6292bb9d39a40cf5f3caa2dd6226a5c2e2bb763dd05c0e32e14f8a85725 SHA512 ac51a94b49db7b77c40fc3c1da74ee4a2a5fc8200f51e45d298cff2540fc7de0a348a028709562b8361f99c1978c37fac2de46941c2bd0ce31dabf80d405c042
-DIST c-utf8-9017bab6cef301229e2295bdcb19476466065788.tar.gz 9332 BLAKE2B 34c97e01305b45ae0370b15d9c9e6257497fa9954889252f0344e5d2418d054bed07060b92fd22434581d9d9b8875a4771dd60db161447e7e402e75ff073daee SHA512 11b4eb7342f844bf65205e87de18ef96b685f50884d39dc0a00db2d1f99489d463b3c4a4f196e08c9a7dd39be7e0b372a27c3a666658f6e4a5e03951fb1b4596
 DIST c-utf8-af5bf7f330078d285e5f58584abd6de01c4cfd7d.tar.gz 9331 BLAKE2B 32b6da3f92e25d3971abea08f336856f44e9180e73d776058c473a8140ad519b7b614177445f4e143e56276795d04127ec8c8c01561935683227fb2c391a51cd SHA512 84ee285d90d1a899a75e1fc63931d10ff1b652bb06b19b0916afd0a3af5c359628e2ec2951ca987a8a6e6cdfbe73a286bd5a664c24e9998ada6c29f3c34752ce
-DIST dbus-broker-24.tar.gz 210347 BLAKE2B 037ccb389bf1df6dfcc600e363c604d498bff9b5e37ff10f5040acca4917fcd96c03552d769fcf87e50927bac17b8d1fe70f3ec8835c744166518791cc725d81 SHA512 81819f496dd34a43b16e1b3bcc982bb9b8574aec061fef7831b259c2649b05ed8c866795f815de9eb7aff940404811f8b235832121dfabb0672de9b76acb09d8
 DIST dbus-broker-25.tar.gz 210739 BLAKE2B 6abf0a38fba3af41d95c4c1deea4c5d5b974bc1d0918d4b5ff317c08dd8e097212d966b76a76dad9674129f9babd00bd9c44d09b1d36fd25acb11298a10b0819 SHA512 bdeb0b002153234729a34f4163549f7589cb6ab03776cf6ab8956a5560fb7a6e089b4654913afd68d6c267036cd8b684e698075c06ee30aed7fb778394121a80
-EBUILD dbus-broker-24.ebuild 1830 BLAKE2B 0968973c86c3797e601f0eb7eec0f2a6b115de7523b41e1dc8c8f537f285195f04b004c8f6c9786065e5c5dce2d75904a1e90f9651458e8021c11d9cac94c09d SHA512 70d78ca26ff280f89c4370746809f0ee997d7aed053a4c0c121f8078614a523d602cb5d540517d694e8eda72fa2c743d38ba676e40c219784701f75c292f5190
+DIST dbus-broker-27.tar.gz 215070 BLAKE2B d7f12c588b3f11434e33c9eec603f2d3f8caa5ae892aa7951f98b533cbd05bbfdab93dd639c64975e79ffd8c7ca19185bf3e8b8f9546237a3686aea0a9f734fe SHA512 e33e48d7d29cb16f5aa10c7b5b98d85b9055adedcb2c4bda63113daa52597f9b322eeb1e128b7e6077378953b41914316485373b614a9a3a7f21cbbfcf5bec2b
 EBUILD dbus-broker-25.ebuild 1830 BLAKE2B 93e9b6dede776f524de17f52f2639b21d09e6653865ac8efd6d479508b1b3cd28e7b6b2258f357e805e3dfbed2375e7827d087fcdfa168bbda3420798fc5c286 SHA512 d78fe7188392c06107e54b70e6234b02853ef275e44099a03ac06653abf03f80282af1b24eefca2fb101969ccc46ab860c66601635c9a0c35ed1219c711dc0c0
+EBUILD dbus-broker-27.ebuild 1830 BLAKE2B 8b7e73a05cc9fd084ae5d75033f66c48d5fd8c7e5768e3bef49e76b327dfc9cae190e62b20c30e9810a3a53464d940462de5ebfed221a9138cad54d13e953f73 SHA512 c4402e82c3e4018141d0800f380858b6490529cfef94cf3dd8ebaa5cbc3197889896fbd513751a0d3e3b8608c36cec4f39e0cbe5bffaf41ef9afbd83c7aff80c
 EBUILD dbus-broker-9999.ebuild 1830 BLAKE2B 092eea3b81cc65d389c477ed3c1c16473628b417bf262f6609ef62edab4ce1da2efab34a278b66b9704944f3f5e9ada19e37dac40a13051c3eac03094f543c5f SHA512 c6e8f582a8d26de067f0cea6399750c6b93cbc856282a09e76630d1614ea559117f513b7cc59dc2a1dcdd98800f9012d17f16be69f712dfc4d7673ffda43534f
 MISC metadata.xml 327 BLAKE2B baaa6c7be634d16ffbe1196a29bcc2254c77d857dd1b807d50dac7adbd3d20370bf55ac0ea8f60b0fb160bf9ae69d42a5002b4150c4b22c101b37ecab96028a2 SHA512 b350af1c8be6e227fb301fca4dc1d6c90a8ceaf1e4cbf3d83ea54a302a15baa9df560d9b728a66be843b3eb679fa9536ca2f531776ee5d09753233148a0cabe1
diff --git a/sys-apps/dbus-broker/dbus-broker-24.ebuild b/sys-apps/dbus-broker/dbus-broker-27.ebuild
index c88e0f6dba1b..da12f461b58b 100644
--- a/sys-apps/dbus-broker/dbus-broker-24.ebuild
+++ b/sys-apps/dbus-broker/dbus-broker-27.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2017-2020 Gentoo Authors
+# Copyright 2017-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,13 +12,13 @@ else
 	KEYWORDS="~amd64 ~ppc64"
 	SRC_URI="https://github.com/bus1/dbus-broker/archive/v${PV}/${P}.tar.gz"
 	declare -Ag SUBPROJECTS=(
-		[c-dvar]=ebcef28b0da11ec20250f2fa710130967ddd8fa9
-		[c-ini]=f8336c98a74038a1104283fde284c5b82d6aef92
-		[c-list]=ac7c831398219acd8d63038e866035a6f86f9e21
-		[c-rbtree]=7624b79b26d020a796fe7c624a4f2d3340f3d66b
-		[c-shquote]=80d4252f31c74785f0ec8c4578a26f1c16d5941e
-		[c-stdaux]=ffa3dcc365331e31eb0c0f73ccd258e7a29a162a
-		[c-utf8]=9017bab6cef301229e2295bdcb19476466065788
+		[c-dvar]=70f0f21e86a34577e674e202d5d09ef167102f02
+		[c-ini]=867f06a12a702c6869924575503877caa0adde75
+		[c-list]=96455db9f04a6c9101a00957161551aea700b6aa
+		[c-rbtree]=a3b1f80548d1c736208c55e9251c49ada649dd62
+		[c-shquote]=95e4713a0de475688a5727a5d776dccbc69d3d28
+		[c-stdaux]=346623b40eb8137cae7568a69ee42253ff098ff7
+		[c-utf8]=af5bf7f330078d285e5f58584abd6de01c4cfd7d
 	)
 	for sp in "${!SUBPROJECTS[@]}"; do
 		commit=${SUBPROJECTS[${sp}]}
diff --git a/sys-apps/duc/Manifest b/sys-apps/duc/Manifest
index cf705ccf82e4..fadffafc7d29 100644
--- a/sys-apps/duc/Manifest
+++ b/sys-apps/duc/Manifest
@@ -1,7 +1,7 @@
 AUX duc-1.4.1-tinfo.patch 751 BLAKE2B 2928f2a12dc8755c5b43ce8255958ceac4b85dadd716d989bf1472b31ef9ee32e799fb83f4c69b617ef80d7479c070fcf784fc9b6efcdf234547167cca4d2119 SHA512 d0bfa984cad2691106038392297ae3e9ccb0dbf83a45456f50918c88d93bbddd33f9c5359367e6348d161b639e03f6e5339a44842d7fd5edb0306e21df846b4f
 DIST duc-1.4.1.tar.gz 325689 BLAKE2B 1e23204b60d1dd67eb094c1152c5056d0abc1fc6037a3811df5be18cbc4d61ccd2077b175f8f75559f368e2633476990e0c453cf88cff03c8aa3fc1796a42440 SHA512 88aa8f51651adf019c3a91c83eca308b822ff7569d6f6d30cf91338740ec9b0bd21c4f5dd783cf46c8d67aad6b03ad908cd7ed472e5db6feaf66ee02582d9f88
 DIST duc-1.4.3.tar.gz 363507 BLAKE2B 8d4364d48c247d7a83c8c5dd900b1c36ec78c68fa7d090e178a0e3209583e433c2e459d192f65ac350038c7e0d5a57df2c5c0d649cc9f554d7af74ad960c8db5 SHA512 5eb3e862e7003838e012dd1faab507a9b58607b77bd2af70a662005b6e4008ac44d1fb2e17b99da8e42ddfadb1cede2a468144ace7a72c12d0825fc7df4d18cd
-EBUILD duc-1.4.1-r1.ebuild 1749 BLAKE2B 17bba3460f3e11451315cde56b1428e53c1a43f405f47037edff35bdf8fa6af3018112aae6318fdbd78a07ec99c0a250cee01b936459bd60e42183413e0a9a35 SHA512 341c0fc7bdc58c3326e96ed1f924aedeba77d67ddbc7c6d7ff227bfb01bc8eb0594c2ee169a674e4ffb64eba17d422949d8e70a5b37a1053b89e9d32dd424808
-EBUILD duc-1.4.3-r1.ebuild 1802 BLAKE2B 579ae303743de52fad8e72a909dab568e6fb746c4846d9b94e54df5e32d0b9ec9b8a512d95c3746e934b7ffe86e125e894a4164f4149107023dd9ff86097ac78 SHA512 f02b1de439393de92acf3a987725e68b6fec294d2694e61f3387cda80fb601f955687c0dc27f7946d13ad3f17f8fec69796e0263fd24d89b4ca5fb7a02db2af8
-EBUILD duc-9999.ebuild 1802 BLAKE2B 579ae303743de52fad8e72a909dab568e6fb746c4846d9b94e54df5e32d0b9ec9b8a512d95c3746e934b7ffe86e125e894a4164f4149107023dd9ff86097ac78 SHA512 f02b1de439393de92acf3a987725e68b6fec294d2694e61f3387cda80fb601f955687c0dc27f7946d13ad3f17f8fec69796e0263fd24d89b4ca5fb7a02db2af8
+EBUILD duc-1.4.1-r1.ebuild 1733 BLAKE2B 42b1822de5a598f676893f58bc8254e3d25a6fc94cdfe2ba072c3fb86eecacb9322212d0788764dd7b0cd7637919c7fd8b17d0f4fbca91b22b81033a8b8d0d51 SHA512 6ad269c0d0a3353f2c2dc77b7ee73dfe6f5ee2802030619af2fcb36db7250d5e2960e63964fbf50f8d9d2fe37ffd48b799c6763b24184a47cc271a9472e0ae17
+EBUILD duc-1.4.3-r1.ebuild 1786 BLAKE2B ab3ff4a605e17af8e8684c95ca6fab309f321452119e7bfc1f8409346c1cffd37161138c61f65cd1b9f90683e9009a65f68cc4d68bd417fd8a55bbb1e8ed0fdb SHA512 b16673589ac327e782b8a98abb361c8aa732ab22d4e7306a0c87789c22a543b6018900ea68fab242238c20a6f3671feb2664992ec2a9a04f3bfe576d9940c7b7
+EBUILD duc-9999.ebuild 1786 BLAKE2B ab3ff4a605e17af8e8684c95ca6fab309f321452119e7bfc1f8409346c1cffd37161138c61f65cd1b9f90683e9009a65f68cc4d68bd417fd8a55bbb1e8ed0fdb SHA512 b16673589ac327e782b8a98abb361c8aa732ab22d4e7306a0c87789c22a543b6018900ea68fab242238c20a6f3671feb2664992ec2a9a04f3bfe576d9940c7b7
 MISC metadata.xml 836 BLAKE2B 4439120d5761b4101a201d2d6652ee8b06354bf05abaff97d0777d76d39d884df28532a3d321e018ec61cad2eee0fe207516dba2ec47fd659aa5b47ce069042e SHA512 36e1f82c58b004b86968d31a02bb3ce1740b409669d8bf5ad8d57a7187e2fa376115469b77255f732141aeb16cfa3be55094d130cf1c1a8fe2a479d28fa951b8
diff --git a/sys-apps/duc/duc-1.4.1-r1.ebuild b/sys-apps/duc/duc-1.4.1-r1.ebuild
index b063305e8b89..fbabb254f8d7 100644
--- a/sys-apps/duc/duc-1.4.1-r1.ebuild
+++ b/sys-apps/duc/duc-1.4.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,6 @@ inherit autotools
 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/zevv/duc.git"
-	KEYWORDS=""
 else
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/zevv/${PN}/releases/download/${PV}/${P}.tar.gz"
diff --git a/sys-apps/duc/duc-1.4.3-r1.ebuild b/sys-apps/duc/duc-1.4.3-r1.ebuild
index 0c79dbc7abe7..7425a6401b06 100644
--- a/sys-apps/duc/duc-1.4.3-r1.ebuild
+++ b/sys-apps/duc/duc-1.4.3-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,6 @@ inherit autotools
 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/zevv/duc.git"
-	KEYWORDS=""
 else
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/zevv/${PN}/releases/download/${PV}/${P}.tar.gz"
diff --git a/sys-apps/duc/duc-9999.ebuild b/sys-apps/duc/duc-9999.ebuild
index 0c79dbc7abe7..7425a6401b06 100644
--- a/sys-apps/duc/duc-9999.ebuild
+++ b/sys-apps/duc/duc-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,6 @@ inherit autotools
 if [[ "${PV}" == "9999" ]]; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/zevv/duc.git"
-	KEYWORDS=""
 else
 	KEYWORDS="~amd64 ~x86"
 	SRC_URI="https://github.com/zevv/${PN}/releases/download/${PV}/${P}.tar.gz"
diff --git a/sys-apps/fwupd/Manifest b/sys-apps/fwupd/Manifest
index ab8b5ee0759b..40e5ec81069b 100644
--- a/sys-apps/fwupd/Manifest
+++ b/sys-apps/fwupd/Manifest
@@ -1,10 +1,11 @@
 AUX fwupd-1.3.9-logind_plugin.patch 281 BLAKE2B 237c6d6f8a43408186c6707f1c373b2600bae6ad6ef750c579b7d51023615fc7f0569011aa88e73cb72030c4112f1d26e924676bc6fd1cb9e9c9a7fef76f8800 SHA512 148a5af93d2c3554239c5529d63e5f85ed70192856ca375ce0126c183babda7d7de5cf345e875f7cd88c6cce52f409f05f1689625ea6dde14bf330c9e11d98b9
 AUX fwupd-1.4.4-help2man_var.patch 2642 BLAKE2B c0a8f9f5a79c84a1521fc85feb9cd8afbb58a44b9af69726c86d4c1720a202d1721d74a83e35bb431b2c4e6e56281249353975954a69145a80f8e8b9b0152eea SHA512 f9b72f1ca470ac2e33428e03d3287420877d20597a83bf8db21510e3ab4980a26f1832091a087888f38891be4e912cf29e1568fc67d2e604622c28303cb5701e
+AUX fwupd-1.5.6-gusb_deps.patch 1553 BLAKE2B 799957e4902ae31d94a1a5f304c6a814862c7b4d4c5020e47fb24210f5ab80fca4977d9fec102c751d7944ce7f4dcc76ce8a6c712c78346f578c949783b3881d SHA512 295a00515968e4beea761f2552e4de32bb7b6028cf889412988fd4df7df61f352551c46639a4c4e5d9cf33f6d89af58711288f50d71c0215055e25eb442ef813
 AUX fwupd-r1 303 BLAKE2B c940e8272c042ce1f82817f15faa82a3fd1bcd495da187473c8409db21a5e2e10da7cbe4bfd3b89d5b51d4f4d24c7f3c10214fa93e81c78c2c021c74dfd228df SHA512 f69438b16d3fa237cec0e5b48afb37b65835cebb47c682997eb0fa8a05e1ee8872da120c4003a8c8ed0801f7b4fe6bfd252349f9aaa4efe4b9b65517e6826acb
 DIST fwupd-1.4.6.tar.gz 2368201 BLAKE2B 86f4e8a3264b69eb72a357f59db082e81534dc28822934df328b1bf94aacb7ed1a219f8e5a03a9a37a0d07c248410822a3d12c4fd6b5df3a14157795e092a095 SHA512 c456704f40e7c5a5225255dbe3e4b794819d3fa982683a31b15a81f5467f007eef00cd80dac1844eca00ebab9ae12061139ae31c1fd7e2a6e012779d2a4b59f9
-DIST fwupd-1.5.4.tar.gz 2435897 BLAKE2B 23318f5305e3f2478c866e17e150ca3863e5eebf922e81f28a35541af4d9786dada8d2084e51b51e97343bdbf132e9b9981b8bb321ad4e76fba8c42b8b1e2e64 SHA512 961c9298e7672f720f4b6865d374b6066379f0a1c1a99356a9efd9359ee737cf9f9ab2c708f81505c971484d172b8dae96bc5f06be6e6f13c4a55604e6c346e7
 DIST fwupd-1.5.5.tar.gz 2460482 BLAKE2B 79d1b34c07a0befe355e9a6c68770dfbbc575fd540802dd20ae4f65061d9fffd6245944e6f33b702539a5e88563afc7b4c619ca1507e31465dcf40138f92902f SHA512 a37f16b01e6700b0302293a916a379a89b574eed13f63577c19fa8b0ec396bd19f7f7d5c708085f3817af60fca65c02b0ddc4370de82104a5e8e65f583ff3f4a
+DIST fwupd-1.5.6.tar.gz 2480802 BLAKE2B ab9d9cffaf74b4ce6a9de47ef37aa05efae0c0b353f879eb3d0573fd4153c0893922c3a47b68188998752c2f9a75ca340ecb7af94e6c85890060f3826900f812 SHA512 6a04151b53c4446c15527f6b1396ba238b749c6f767dff4171849ccbdab8db2619fd1e3f0e146fd67681263621d55f20008709c7bac10a6d34f27f06c7118cfe
 EBUILD fwupd-1.4.6.ebuild 4056 BLAKE2B 061c425224845a2f3d3947abe7bcedcd11c3d859b111c68ee12b438a2788297e37b296d0ea8b7b2118fda490fa37a3bf9f801735ec4b2b9634b63ccd55000a9d SHA512 84b58cf5c6aef3d0bd5645cb19114b01e173049e1a263276ecb195d4925e22d2d36f248df1c3254e3fb6520e7cf72de35cffc4554bbe0353222d682b12ddc47a
-EBUILD fwupd-1.5.4.ebuild 4003 BLAKE2B 213a7af6b27788dfcc05afe402e3490e2e4ec7e9e5b249184545fcb5350f399641cd60fa05c2efed76b8c5c3592dbd31ed622227a46164db55a75f537e92e13e SHA512 8a2e31098784a8936383b8917fbc3544ba0e960ae782cf2da413a8c6c48109adaef4cd7afbf192b04d4e2c222b05616e84df6cbf2211fad681c50d621c90636c
 EBUILD fwupd-1.5.5.ebuild 4097 BLAKE2B a14977e523100693480d5aa6a60c98c20816e21e0cfbbf003675da54608737c5c4a0785fa18e145a94725458288e1753f3340262efbb250ccafa013113cb214b SHA512 2e2b9f8ccc12c66daed63404437434af2dc311e0b3569bbcb0b93e107182505942210e3badc5f7b3986cfd1511470c755ec9c95bb2fff5e7857148efc9e24c47
-MISC metadata.xml 1038 BLAKE2B e4c7d1ce48108981032cc875ed3512e16eb5ea81197380c42cbf828c67259ec42fa0623b12a4aca12015c2c72033e8edcfeab3a15f9970ad45886cb8b860e1a6 SHA512 0bc97498a83deb2d8ae85df1f7ed8d2191a4b9d0814f388fd32c5cd4efbdc86c5359eb9e8ba2e62561d73dd2af5537c5f6ec61862a2fd24606ac5a96c7fa30d2
+EBUILD fwupd-1.5.6.ebuild 4440 BLAKE2B 4c12a21a99aa943aaa16020a6ad61858c7397599654fed0cbccf5d3e644aea74e4ff8985d61bc6cf135e9769d5f7e47b9e46f94f5e6aa92d6a84b56208761ba2 SHA512 94b058117ca1707880df50ab4c4a375f58451382b6f31475f85ab5f80c027ee9b8fedc1ac49acc9ca120248073178c94923bb75809a2c6b5cf34c9b9dc32a674
+MISC metadata.xml 1198 BLAKE2B 7f11be3fdf5dd361e4e7f17cb6f14d8be875eafb2aee7a608ca351bd914f491db42437a284246e243f5899686cdf635a7e7bebfa91da98d701bbb77d20cf751d SHA512 ea5a7fdd5f33f6a51ee6e647562279aba534ef755662a519b4edc9a41c925b7463cfcc266f9611755ac88caed81eb433bcefeb9f95cdbe3c29fde7e6574dce74
diff --git a/sys-apps/fwupd/files/fwupd-1.5.6-gusb_deps.patch b/sys-apps/fwupd/files/fwupd-1.5.6-gusb_deps.patch
new file mode 100644
index 000000000000..00c79d7853b8
--- /dev/null
+++ b/sys-apps/fwupd/files/fwupd-1.5.6-gusb_deps.patch
@@ -0,0 +1,44 @@
+From c74992c62a32080208baf137d61f7d73b0cade2d Mon Sep 17 00:00:00 2001
+From: Lars Wendler <polynomial-c@gentoo.org>
+Date: Tue, 16 Feb 2021 16:57:36 +0100
+Subject: [PATCH] system76-launch plugin requires gusb
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+Otherwise the following build error happens:
+
+  ../fwupd-1.5.6/plugins/system76-launch/fu-system76-launch-device.c:117:9: error: ‘G_USB_DEVICE_CLAIM_INTERFACE_BIND_KERNEL_DRIVER’ undeclared (first use in this function)
+    117 |         G_USB_DEVICE_CLAIM_INTERFACE_BIND_KERNEL_DRIVER,
+        |         ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+  ../fwupd-1.5.6/plugins/system76-launch/fu-system76-launch-device.c:133:11: error: ‘G_USB_DEVICE_CLAIM_INTERFACE_BIND_KERNEL_DRIVER’ undeclared (first use in this function)
+    133 |           G_USB_DEVICE_CLAIM_INTERFACE_BIND_KERNEL_DRIVER,
+        |           ^~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+---
+ plugins/meson.build | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/plugins/meson.build b/plugins/meson.build
+index 138c47a4..12c7cb31 100644
+--- a/plugins/meson.build
++++ b/plugins/meson.build
+@@ -25,7 +25,6 @@ subdir('ata')
+ subdir('elantp')
+ subdir('optionrom')
+ subdir('superio')
+-subdir('system76-launch')
+ subdir('thelio-io')
+ subdir('wacom-raw')
+ endif
+@@ -59,6 +58,7 @@ subdir('solokey')
+ subdir('steelseries')
+ subdir('synaptics-cxaudio')
+ subdir('synaptics-prometheus')
++subdir('system76-launch')
+ subdir('vli')
+ subdir('wacom-usb')
+ 
+-- 
+2.30.1
+
diff --git a/sys-apps/fwupd/fwupd-1.5.4.ebuild b/sys-apps/fwupd/fwupd-1.5.6.ebuild
index 68a615fa9da6..605097ca1b75 100644
--- a/sys-apps/fwupd/fwupd-1.5.4.ebuild
+++ b/sys-apps/fwupd/fwupd-1.5.6.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7,8} )
+PYTHON_COMPAT=( python3_{7..9} )
 
 inherit linux-info meson python-single-r1 vala xdg toolchain-funcs
 
@@ -14,11 +14,12 @@ SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="agent amt dell gtk-doc elogind flashrom minimal introspection +man nvme policykit synaptics systemd test thunderbolt tpm uefi"
+IUSE="agent amt archive dell gnutls gtk-doc gusb elogind flashrom minimal introspection +man nvme policykit synaptics systemd test thunderbolt tpm uefi"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}
 	^^ ( elogind minimal systemd )
 	dell? ( uefi )
 	minimal? ( !introspection )
+	uefi? ( gnutls )
 "
 RESTRICT="!test? ( test )"
 
@@ -35,15 +36,13 @@ BDEPEND="$(vala_depend)
 		net-libs/gnutls[tools]
 	)
 "
-CDEPEND="${PYTHON_DEPS}
+COMMON_DEPEND="${PYTHON_DEPS}
 	>=app-arch/gcab-1.0
-	app-arch/libarchive:=
 	dev-db/sqlite
 	>=dev-libs/glib-2.45.8:2
 	dev-libs/json-glib
 	dev-libs/libgpg-error
 	dev-libs/libgudev:=
-	>=dev-libs/libgusb-0.3.5[introspection?]
 	>=dev-libs/libjcat-0.1.0[gpg,pkcs7]
 	>=dev-libs/libxmlb-0.1.13:=
 	$(python_gen_cond_dep '
@@ -55,9 +54,12 @@ CDEPEND="${PYTHON_DEPS}
 	net-misc/curl
 	virtual/libelf:0=
 	virtual/udev
+	archive? ( app-arch/libarchive:= )
 	dell? ( >=sys-libs/libsmbios-2.4.0 )
 	elogind? ( >=sys-auth/elogind-211 )
 	flashrom? ( >=sys-apps/flashrom-1.2-r3 )
+	gnutls? ( net-libs/gnutls )
+	gusb? ( >=dev-libs/libgusb-0.3.5[introspection?] )
 	policykit? ( >=sys-auth/polkit-0.103 )
 	systemd? ( >=sys-apps/systemd-211 )
 	tpm? ( app-crypt/tpm2-tss )
@@ -66,6 +68,7 @@ CDEPEND="${PYTHON_DEPS}
 		media-libs/freetype
 		sys-boot/gnu-efi
 		sys-boot/efibootmgr
+		sys-fs/udisks
 		sys-libs/efivar
 		x11-libs/cairo
 	)
@@ -73,17 +76,18 @@ CDEPEND="${PYTHON_DEPS}
 # Block sci-chemistry/chemical-mime-data for bug #701900
 RDEPEND="
 	!<sci-chemistry/chemical-mime-data-0.1.94-r4
-	${CDEPEND}
+	${COMMON_DEPEND}
 	sys-apps/dbus
 "
 
 DEPEND="
-	${CDEPEND}
+	${COMMON_DEPEND}
 	x11-libs/pango[introspection]
 "
 
 PATCHES=(
 	"${FILESDIR}/${PN}-1.3.9-logind_plugin.patch"
+	"${FILESDIR}/${PN}-1.5.6-gusb_deps.patch"
 )
 
 pkg_setup() {
@@ -109,25 +113,33 @@ src_configure() {
 		-Dbuild="$(usex minimal standalone all)"
 		$(meson_use agent)
 		$(meson_use amt plugin_amt)
+		$(meson_use archive libarchive)
 		$(meson_use dell plugin_dell)
 		$(meson_use elogind)
 		$(meson_use flashrom plugin_flashrom)
+		$(meson_use gnutls)
 		$(meson_use gtk-doc gtkdoc)
+		$(meson_use gusb)
+		$(meson_use gusb plugin_altos)
 		$(meson_use man)
 		$(meson_use nvme plugin_nvme)
 		$(meson_use introspection)
 		$(meson_use policykit polkit)
-		$(meson_use synaptics plugin_synaptics)
+		$(meson_use synaptics plugin_synaptics_mst)
+		$(meson_use synaptics plugin_synaptics_rmi)
 		$(meson_use systemd)
 		$(meson_use test tests)
 		$(meson_use thunderbolt plugin_thunderbolt)
 		$(meson_use tpm)
-		$(meson_use uefi plugin_uefi)
+		$(meson_use uefi plugin_uefi_capsule)
+		$(meson_use uefi plugin_uefi_pk)
+		-Dconsolekit="false"
+		-Dcurl="true"
 		# Dependencies are not available (yet?)
 		-Dplugin_modem_manager="false"
-		-Dconsolekit="false"
 	)
 	use ppc64 && emesonargs+=( -Dplugin_msr="false" )
+	use uefi && emesonargs+=( -Defi_os_dir="gentoo" )
 	export CACHE_DIRECTORY="${T}"
 	meson_src_configure
 }
diff --git a/sys-apps/fwupd/metadata.xml b/sys-apps/fwupd/metadata.xml
index c4fce7423fee..b2692d9a2fc8 100644
--- a/sys-apps/fwupd/metadata.xml
+++ b/sys-apps/fwupd/metadata.xml
@@ -7,9 +7,11 @@
   </maintainer>
   <use>
     <flag name="agent">Enable update notification agent</flag>
+    <flag name="archive">Use <pkg>app-arch/libarchive</pkg> for archives support</flag>
     <flag name="amt">Build and install Intel AMT plugin</flag>
     <flag name="dell">Enable Dell-specific support.</flag>
     <flag name="flashrom">Enable flashrom plugin via <pkg>sys-apps/flashrom</pkg></flag>
+    <flag name="gusb">Enable <pkg>dev-libs/libgusb</pkg> support</flag>
     <flag name="man">Build and install man pages</flag>
     <flag name="nvme">Build and install NVMe plugin</flag>
     <flag name="redfish">Install redfish plugin</flag>
diff --git a/sys-apps/gptfdisk/Manifest b/sys-apps/gptfdisk/Manifest
index 4655b08372b7..52b0380342e9 100644
--- a/sys-apps/gptfdisk/Manifest
+++ b/sys-apps/gptfdisk/Manifest
@@ -1,7 +1,9 @@
+AUX gptfdisk-1.0.6.1-spurious_mbr_warnings.patch 2708 BLAKE2B 538ee3c542fc7d0cfbb8f5857afa19be417ac9f93cf3feb0c5800a813690e453266d560a934c7066ad2aae0a83b08554cfe59eeecfb60a6f64a5c8fed800311c SHA512 11d7d990d8068f1310ceefc3d59069d9e563125b02011b6b6d6833c2bbcb101c45163c9371d698ab8d489bac0621f5454030f27c70773d7f30daad7aabace682
 DIST gptfdisk-1.0.4.tar.gz 204075 BLAKE2B 45be16bd4e8312e4797a70c07447702a7f966edec94a9e9e17cff89eee51bf33cb9418dcac2a103e68ea2ebb8df4e7a997fd006bfa4109cfd774838bd4bd7d19 SHA512 2df6db6974c06a6677a155d32566b8b46dad0df7781131e9018072db9acce5e41f6c4e7024b0e5f236dd43350a63572be34fb4b6fdb580cd9b946619a7a683bf
 DIST gptfdisk-1.0.5.tar.gz 205973 BLAKE2B e026dd4b4f2b63ca660feef34a1fdfb14034d0d64e4828fddf4a0c63756cbc840b3292231838f0c016256be2358069bde8a17ef0e33dec355c48406a9a930e75 SHA512 3d3a59e3488dd3d6bda5d103b9ad8b7936752210346b9787ddc936681498fba90577b6ae950c471d09a01bf6405fce32038ff1777c52db0b21e5277737fe3703
 DIST gptfdisk-1.0.6.tar.gz 207017 BLAKE2B d00e0f00dc8dce3b6088250aa39e05f41c96bee2218eec1dca34a160e70129d1006abc4341031994c53e77068b5de510b923c69858903627ccf786f3cc848a86 SHA512 a3bf95c813f707d9d41513295c3419916301a0e88b4c6ade70ad7d9422a507d519e092e68a3868d53092428d159bdbb248817c4f40d8ac88b0175d5afbd79dbc
 EBUILD gptfdisk-1.0.4.ebuild 1244 BLAKE2B 5e1ed279d0996ac37fb669a8025334a7d2168cb2956604eed0212fa6031ff97654b402d4c88434b90b9718b8993ac289c4889216a8b2dddf8097a372f6684b9d SHA512 74bbf5c72a625e7b8bc2cb6c219712bbde4e58679d3c1c0e56c2dde58a556ec25e7fe9c59c87042f419094db81b33fa85647a75246fcd398a91d3ae758ff2cba
 EBUILD gptfdisk-1.0.5.ebuild 1251 BLAKE2B 47a900ddfdf051e80f28f9c0ed3cb4649e7d1c8009aa978aba5f31c38565388249b5aa192173a8409fbd868a5a568f9a8b78c577b4f726e1f353516eac232dd8 SHA512 54a7a0f1ed2ca43c78261925be662a8ed46502a6e8f457aaed42da151e2b2804a92b0ef73db1a167e83cc9f8edd199b22e9bbae93c8167ab0bc7f2b52acb59f3
+EBUILD gptfdisk-1.0.6-r1.ebuild 1309 BLAKE2B 3e3bcabf9aa3e2542a8600aaf54202de4eec37dac7ed37cb278484912e4a2e6e98ed8b93b334388e5ca95b2a1e173f8963871c7300f454c05efb3b9594a35684 SHA512 21cd7814b85231bd3e981c8c0d2ebeef04b2397002a60ed153c454ce61b5e2529d19ed7cadbf1c25ea3906edb01a460ea99256207bc17ba6c78ecc774038a177
 EBUILD gptfdisk-1.0.6.ebuild 1252 BLAKE2B 31480c49e299e1dc5b3f533998d6a473c930cf18652a62ced07c6a0b27cf82d571972b47ca42f1402d4c30ae9b8b044ef3385d59a828920dc0c24c9255612375 SHA512 8392f645d7fa03a51a243bcb8c42dbee4dc7832ac32fb84d3c61016f96825dffffb2d440f1765d70da89ab498de38e874d9eaf890b922ae93b9090653b90d79c
 MISC metadata.xml 339 BLAKE2B 3f08c8aa6a482a6d923388fcbf800cac3282c5c864b9fe27868491d10e7edb75ed04f8d7bc86f5295c90e338d99d59b275ae79813b4d549a04331992526c6979 SHA512 d8334a3e741adf97739f9fef66d7b38bfab9e2d189ac5fbc96ab27a7c1551938b6184ebb08b03ef8b6864f6e43d536836f373e03f3491cacc8f6ee3496f615b5
diff --git a/sys-apps/gptfdisk/files/gptfdisk-1.0.6.1-spurious_mbr_warnings.patch b/sys-apps/gptfdisk/files/gptfdisk-1.0.6.1-spurious_mbr_warnings.patch
new file mode 100644
index 000000000000..e60aa9feeffb
--- /dev/null
+++ b/sys-apps/gptfdisk/files/gptfdisk-1.0.6.1-spurious_mbr_warnings.patch
@@ -0,0 +1,71 @@
+From f063fe08e424c99f133df18bf9dce49c851bcb0a Mon Sep 17 00:00:00 2001
+From: Rod Smith <rodsmith@rodsbooks.com>
+Date: Mon, 1 Feb 2021 10:19:50 -0500
+Subject: [PATCH] Fix spurious warnings of problems on MBR disks
+
+---
+ NEWS      |  7 +++++++
+ gpt.cc    | 18 +++++++++++++-----
+ support.h |  2 +-
+ 3 files changed, 21 insertions(+), 6 deletions(-)
+
+diff --git a/NEWS b/NEWS
+index f74bad0..a7131aa 100644
+--- a/NEWS
++++ b/NEWS
+@@ -1,3 +1,10 @@
++1.0.7 (?/??/2021):
++------------------
++
++- Fixed bug that caused spurious warnings about the partition table
++  header claiming an invalid size of partition entries when reading
++  some MBR disks.
++
+ 1.0.6 (1/13/2021):
+ ------------------
+ 
+diff --git a/gpt.cc b/gpt.cc
+index 1b4e10f..842dfb1 100644
+--- a/gpt.cc
++++ b/gpt.cc
+@@ -1042,11 +1042,19 @@ int GPTData::LoadHeader(struct GPTHeader *header, DiskIO & disk, uint64_t sector
+    *crcOk = CheckHeaderCRC(&tempHeader);
+ 
+    if (tempHeader.sizeOfPartitionEntries != sizeof(GPTPart)) {
+-       cerr << "Warning: Partition table header claims that the size of partition table\n";
+-       cerr << "entries is " << tempHeader.sizeOfPartitionEntries << " bytes, but this program ";
+-       cerr << " supports only " << sizeof(GPTPart) << "-byte entries.\n";
+-       cerr << "Adjusting accordingly, but partition table may be garbage.\n";
+-       tempHeader.sizeOfPartitionEntries = sizeof(GPTPart);
++      // Print the below warning only if the CRC is OK -- but correct the
++      // problem either way. The warning is printed only on a valid CRC
++      // because otherwise this warning will display inappropriately when
++      // reading MBR disks. If the CRC is invalid, then a warning about
++      // that will be shown later, so the user will still know that
++      // something is wrong.
++      if (*crcOk) {
++         cerr << "Warning: Partition table header claims that the size of partition table\n";
++         cerr << "entries is " << tempHeader.sizeOfPartitionEntries << " bytes, but this program ";
++         cerr << " supports only " << sizeof(GPTPart) << "-byte entries.\n";
++         cerr << "Adjusting accordingly, but partition table may be garbage.\n";
++      }
++      tempHeader.sizeOfPartitionEntries = sizeof(GPTPart);
+    }
+ 
+    if (allOK && (numParts != tempHeader.numParts) && *crcOk) {
+diff --git a/support.h b/support.h
+index d87fe9a..e3e1e12 100644
+--- a/support.h
++++ b/support.h
+@@ -8,7 +8,7 @@
+ #include <stdlib.h>
+ #include <string>
+ 
+-#define GPTFDISK_VERSION "1.0.6"
++#define GPTFDISK_VERSION "1.0.6.1"
+ 
+ #if defined (__FreeBSD__) || defined (__FreeBSD_kernel__) || defined (__APPLE__)
+ // Darwin (Mac OS) & FreeBSD: disk IOCTLs are different, and there is no lseek64
+-- 
+2.30.1
+
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.6-r1.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.6-r1.ebuild
new file mode 100644
index 000000000000..120bdc16b00f
--- /dev/null
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.6-r1.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="GPT partition table manipulator for Linux"
+HOMEPAGE="https://www.rodsbooks.com/gdisk/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="kernel_linux ncurses static"
+
+# libuuid from util-linux is required.
+RDEPEND="!static? (
+		dev-libs/popt
+		ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode] )
+		kernel_linux? ( sys-apps/util-linux )
+	)"
+DEPEND="
+	${RDEPEND}
+	static? (
+		dev-libs/popt[static-libs(+)]
+		ncurses? ( >=sys-libs/ncurses-5.7-r7:0=[unicode,static-libs(+)] )
+		kernel_linux? ( sys-apps/util-linux[static-libs(+)] )
+	)
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${P}.1-spurious_mbr_warnings.patch"
+)
+
+src_prepare() {
+	default
+
+	tc-export CXX PKG_CONFIG
+
+	if ! use ncurses ; then
+		sed -i \
+			-e '/^all:/s: cgdisk::' \
+			Makefile || die
+	fi
+
+	sed \
+		-e '/g++/s:=:?=:g' \
+		-e 's:-lncursesw:$(shell $(PKG_CONFIG) --libs ncursesw):g' \
+		-i Makefile || die
+
+	use static && append-ldflags -static
+}
+
+src_install() {
+	dosbin gdisk sgdisk $(usex ncurses cgdisk '') fixparts
+	doman *.8
+	dodoc NEWS README
+}
diff --git a/sys-apps/help2man/Manifest b/sys-apps/help2man/Manifest
index 6372e834ffff..828c88bcff38 100644
--- a/sys-apps/help2man/Manifest
+++ b/sys-apps/help2man/Manifest
@@ -3,6 +3,6 @@ DIST help2man-1.47.16.tar.xz 203036 BLAKE2B 8e06c2c2e90adfc2ab8345908516b15ae50b
 DIST help2man-1.47.17.tar.xz 211476 BLAKE2B 67b1ccd4b6b66510a2fff424663bc2051e49e93c37c7e2a2b4631f3781d3773a97fd1773f96ca5ca2ba644bcd79ae35338931eff857ce199a847cc312d778b0e SHA512 185cd04aa6db6d8a4c898b61ad6a0aded7775659c7f02244b45927310eb3f8cd932fe9dd725ccac3e793aa22c656338b5d16f291f3a0420ed121681d4a4bac25
 DIST help2man-1.48.1.tar.xz 210500 BLAKE2B 9993e1f0c1102025f80fb64fa1afe31efe982ef54c9d5ff88bed9038bcfe1f4d5624737e0953abeb252df78cf92a645bbbd8f3b44939d70a2b50494c22110991 SHA512 506e7a0e6571facc570df57b875d6d6b911b281b38af1831d3a058a6de658c3656e3a5be970fa3d89c053ab6eafd4853527512b48524ceeff6da60f946f1ecef
 EBUILD help2man-1.47.16.ebuild 1034 BLAKE2B dc7c42555d1efd3896ba09d0602017ad721ab5aa94cc2dad5b9cc4f127f191a64fffc19f47f838ed81d2f4918d5262189ff369c220e9afd4f02d6a2dc6f11bb9 SHA512 e6dac61eb7d535c184cc15ea54c70bda3e0745a21cb8d47acaf6186780fb836e90f92d1869c9335433f857a44b9d6be24cc21ffe25986320cd33b8bd4e2054bc
-EBUILD help2man-1.47.17.ebuild 1036 BLAKE2B b3d77f8cf4bb78a7adec3a7710d74f856f3b8f3baeb48cfef3d150a4b6458de7f614bdbd5cba0ae6480ded6956427799e916b2ed7f415a516c560552cb9603c5 SHA512 1cadbb8379a0d335875ea07609a6d8a4c9ea59a9013287ffb28d8ff6d53fc95c1f703084ae4ea971240b8eeb83cf2c086ce3e657de85fcfee51da60c537c81f5
+EBUILD help2man-1.47.17.ebuild 1035 BLAKE2B 0107c7d517894220aa0a4574dc85276d04c1e0ec1d6da669ba5bdb9b28eeb18735a6c8686bce041328944709820976acc5b56ac6335ba001353d7827d6e47f74 SHA512 17f59005fc4b94f918112c48080873aa2351e34cfa5eda84af031f0733d8225fe8daa8a58dd823b31f4a0f60f51c27491c5f7d0556948bbdcb23af089a209ab3
 EBUILD help2man-1.48.1.ebuild 1043 BLAKE2B a409c6688242306b58aa9b395c4800166b31a301bd356cd93505e522169ebb4e1b1b82b61b3f2ed737691956fae33516faf69dd9819b8b07abe4bbc981ab7f23 SHA512 68652e40fd2ab4e8ffd862c9783bc7aa891e76a30419b955891134a7a96f8e132ce08dcb4b1be32937398970dfff57c6a09b401fad7cb6207c16a99a12a2a491
 MISC metadata.xml 253 BLAKE2B 295e9d6d93aaa12af413972e1590c67087801cc09c9aa6b59d4606c0f4106d1dacf2baa9858559083b4c6d91beeef218d0729e8593a33788958da6d2897e8ce2 SHA512 54a9069aeb4165d2dff3d473c8001bc51613aac9dff3f7f5e9971a9891a737a31511ffa11cbd523febe581ac1d9de2bdf2f40410f0c4239138f2ccca3ef15555
diff --git a/sys-apps/help2man/help2man-1.47.17.ebuild b/sys-apps/help2man/help2man-1.47.17.ebuild
index 4b975fd76ccc..32e6029a73fb 100644
--- a/sys-apps/help2man/help2man-1.47.17.ebuild
+++ b/sys-apps/help2man/help2man-1.47.17.ebuild
@@ -9,7 +9,7 @@ SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls"
 
 RDEPEND="dev-lang/perl
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 49a84c77cf9f..1d58e11229b2 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -3,6 +3,6 @@ AUX kmod-static-nodes-r1 500 BLAKE2B 44ae03377e6cc7b5a271063828fcb39ec6925d82e52
 DIST kmod-27.tar.xz 548924 BLAKE2B 9f12bf5792d4c867e28e0776c279369c063e84269212e3f699ae6e5e69b8b2b466b5033e43e17ac64d6101592edcf3c34881916afb6ae676b49dc8838dfe1396 SHA512 e0513094935333fca1fb4c3e3493b232507a579ab00a6457cc9ed3e928363d05aad80634fb65a8287a336bf9895194c7be8ddc41bb088a6c2cca44fc1bfbdb6c
 DIST kmod-28.tar.xz 552448 BLAKE2B af41a0c5681fb94eb5264f46ed2ae666d171d4e2d0dc21419a3c2f4b12a783350a06b408fb02a7afb00fcea1cd994ee35864c1ec8b7a8cc58a8c9dcdeffaf1b3 SHA512 50646dc72675a5e17b01e327e3d41b972f18aaeac20c8b00983c4d099c6218f35c32c184a833a2d7f716755d6a86851c90913d2835874cef933bdc4a9722df9a
 EBUILD kmod-27-r2.ebuild 5266 BLAKE2B fdaaf909ed59811f502c721f1c616c8c0145afecb62df6bcd13b163a477b2dbd3110edc28baf3bf824c6e9d3bfc95a01f5ce69b7dc6345fa393370f0008ac529 SHA512 8863d4522fa38fa7425ea1ee4c733b57e89b4e794f106e50edf1be40424f3f5c549423a3c3ee1db938f657cb8e04b54656273979350a1097ebce6bb0355b0add
-EBUILD kmod-28.ebuild 5290 BLAKE2B 80c4f0771641a90d5b5180cbc3a75aaa63176e07fa4daa555107228b824a740fcf1fba22c272dbd1a2872605fef9db13edc042eb77bbba2ee24c324a282c45d4 SHA512 07c628a589fa27f0705b1f147f1b5ce67796c1c049e12662e62c5d95aa6f4090f419c2ccd1c164c40752ebebcf96d1c4dca2d190fef8c873ff7049107f6a5af2
+EBUILD kmod-28.ebuild 5287 BLAKE2B 36b748cc728a80090ea297b4fdbe4fb20526fe2107d088394f443c7b0d5ba34bb28ad6ea855f952ae9ec388391482b93f0afc00c624a10194de4aa31e399dfe7 SHA512 3403f581327fbc1f23f8e7a79602297ef7902c56a3e30944385a9322ae40925a8628fba094e6d3557523892d3bbf689e5d573703ca6ba2c2ae63d9d0f1a022d1
 EBUILD kmod-9999.ebuild 5300 BLAKE2B 1be8c47e29ac88475b5ab201147c5870e5b10fa9c1340b627ae690603c87aca6928587baa592e22fb1b9a7e3101236a2ad843974b6ea97cf795f589b01aab17a SHA512 9027d8b39b45a30c7721576a220a923c8a1a18adfae7348128c9303cce30aa7bbfc889de44c37addcb8b5c4aefae2084128c678403fd6d3da28f704396e0bc89
 MISC metadata.xml 689 BLAKE2B 51a8819951b28ef934c7de80176ef6aeeacb09ac073a7fcf056428ee2c1a0ad851119e680b4ef2cdd48a26541c2a3e16f6cb6606231a6ed542a00cfdb0e3b2d4 SHA512 4282ad5b89b14e8e50aad8779e68cca6eb2e1c876a3284b6782a221c0da2e79db871d1d23d686c8ac1532ea453faa1291ff596afff716431d0560460953c3aed
diff --git a/sys-apps/kmod/kmod-28.ebuild b/sys-apps/kmod/kmod-28.ebuild
index c163e6b8ac20..3a10626ae5cf 100644
--- a/sys-apps/kmod/kmod-28.ebuild
+++ b/sys-apps/kmod/kmod-28.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ppc64 ~riscv s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv s390 sparc x86"
 	#inherit libtool
 fi
 
diff --git a/sys-apps/miller/Manifest b/sys-apps/miller/Manifest
index 8027a4e56014..6bbdc69b4167 100644
--- a/sys-apps/miller/Manifest
+++ b/sys-apps/miller/Manifest
@@ -1,5 +1,5 @@
 DIST miller-5.10.0.tar.gz 6793426 BLAKE2B 25ec96e29ee8d913feffd6e9a54cd2d494c9050e180556ed462a6d94a6adaaea88dbdbc09b4753f8888673bdc33a1f0aa43f9dac37bdc3c25191b2a565fe8847 SHA512 a7cbaee9ad4075d27e74ab3a60297164c535ea2bc1e38128174f4f226ad061850d37108e7d7547821b7e6667cb9a024639795d7678b1897fedf6ee15d6064538
 DIST miller-5.3.0.tar.gz 4940072 BLAKE2B 2e34ae010d409877040a60b08dd615f32e6945ca3bf97c078c89b9d2811067fa4bca2403f8ad239f8245e050acb10305d351b1db4177541a4fa9ed9a4bc1396c SHA512 4c557d97eb1cda2e52093fa097677602491895dea3093776a03af56114022b8c0917df9fbf26071d4d1a3c1360f520c82e33b32635c7b4207fa62869ab564712
-EBUILD miller-5.10.0.ebuild 1045 BLAKE2B 6fe1bffdf46fffa9fd7a9754f29072612e13686d5cb921807aa9b84de784ff3e93ce14c9be8729489e20ff6cd7c01bbdf5a0072071ce0e4b63b531c163f455d0 SHA512 1e5cd3c00a15a96a7868738e5c11655be1b6c02813e898337e503e432aac87a5b3f79b6fea11bead06f9d7ab6bf11b3b2776bac90cade10d2bb8b1e92916c5c2
+EBUILD miller-5.10.0.ebuild 1044 BLAKE2B 74501a4d7622e89ae1bf1653466b7ad41950e3e15b5e25b0d344a28378edd4b9e2ee3950c48669bf8258bc794e9ddee6a2949bad5518b7ca695da0bfff6a714d SHA512 ce2b40ca3f6a0e360bb5a13e87c4e51a4b629458501f6dc9c07d5aa6e06c3077864316caab187e5cbee1dbe8914cdd16d8d7857a1c61a8aaccd83fc2bdbd14b1
 EBUILD miller-5.3.0.ebuild 1043 BLAKE2B bd9aba828d1e446d70ef561f9930eecf7ffb02030c03d03c779122d7e0d6362f8ddb7bde63a609b253aa5be45fd384c81ad272279e5835cb2ed573422b83faba SHA512 28594f3915eaa1e7bf01405db64a14551d476eae0ece718bf5c7c1ec36a78cddc037c04ceb500a599ab69a6bb4b2ab109e9720e6a1e31a7a216637a823764be2
 MISC metadata.xml 245 BLAKE2B 183034a40812aee01ddfd5d59eac1d2d1d42d281575fd5a3c900bd96af21cad81f9262b41f81c39f34dc60078ffa3db70149f8d50ecb09cb6003ed8602ab3ecd SHA512 b7b2cb8f6f35a36afa6a90e1d66747c2bc3e26a202483ec1d5c32346e75a738ee59be158af291a18c55140486d519c159492d12e3d25134ec20cc03fd7627cad
diff --git a/sys-apps/miller/miller-5.10.0.ebuild b/sys-apps/miller/miller-5.10.0.ebuild
index 0e24db797840..e7b6e45d36af 100644
--- a/sys-apps/miller/miller-5.10.0.ebuild
+++ b/sys-apps/miller/miller-5.10.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/johnkerl/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm x86"
+KEYWORDS="amd64 arm x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/moreutils/Manifest b/sys-apps/moreutils/Manifest
index 697223f7db6b..6b90e8c00331 100644
--- a/sys-apps/moreutils/Manifest
+++ b/sys-apps/moreutils/Manifest
@@ -1,6 +1,4 @@
 AUX moreutils-0.64-respect-env.patch 344 BLAKE2B 1b1dc56d77f9ddb4ffc05e911ac7ee92def3df7cc5bb74b476ae8172924421676bec09f6c74a59d7b07b82382e57b502088d75e5c365a5747ee7d38e8ba3c227 SHA512 db1ff22fb8a6284bea95488b71c456353379d4f9b4142f62ad7371e2546ff82fae6e7e2fb4be2e5b018d475ef5d19c677059cdb171d882e9c7a3641ed0ce4647
-DIST moreutils-0.64.tar.gz 92741 BLAKE2B 3e014a18a3b7615bcd83fd9b0a1e3010a059aae154395c2c1158f57634fe83c27503dc3aff1e116743cf80fc73ee2063ea60b03d4bece4119b962669095c71dc SHA512 94f131b9b02a8c1139dfe34abacab022687f51413c529288f57fa876676c028e200324ed855b910a7dbfb4290eb8b38b3dc182eda49988f521a550162b0a0eec
 DIST moreutils-0.65.tar.gz 93180 BLAKE2B 2105cc281b9f4c9598bb0cdd5a4b9b8042e77eb14de323ba889c182c956b00d7b8a899c4112542e0a3d513fd961ee0ed6c82dd2dbefffe50e1d4fd326919ef4f SHA512 dcad2a3b6d9621da6d2f860f39acb04c80d42cc2123e12a6ec84524f6a1fc7f5ae4bd5d00e698fe14d4c5e7d491d790970ce4370c9abd1f63318d1c512f596b9
-EBUILD moreutils-0.64.ebuild 1693 BLAKE2B c79acfacc2ac668ac1fcb78b0769198848faa2164db1ceaac5b9a1e0d2eac3f75ebfb530e5f472af68671a0695717760f7da29ea1e284817a3dc8c4df1332594 SHA512 02f522ca1dd8e61d1bf1eb538e7464469b431c05dcf6e8db7ef6c362aac81134ddbc2affc4021de68c6a08c875d8546a4cb830da8d904507f5c98aa821ec50f5
-EBUILD moreutils-0.65.ebuild 1697 BLAKE2B b62614d19666f240c8abe247ad03241e13f30ebe1e0e31606f09e0b6d75b744a8a632f8fb437d2e2d776d5a04bf87b3793969f49a8badad3331337491e00b037 SHA512 b70b29d0b0857baab8804219e0725f589afb830e10ab4bfca6012043230c30b03b0ef314506928f155f7c39046a081215af1283750730e356473bbaff6a7485b
+EBUILD moreutils-0.65.ebuild 1695 BLAKE2B e7804204f2162acf5a551abbad7a622def057c100cb04cddb4abdcd8169ce1dbf658f4e578af097a7d3e22cc10cb7b62b5a35eec647be273d9c57e5b318e3905 SHA512 4bc2cfba306082fe2dac9c3e43f25eaf66e3eea69b5ec4ac88c6237d4bd624fa1aa2a162e3be91766c38cfa12cae50f8cbfc4382aef96b47f8ce9b28168d8ea6
 MISC metadata.xml 313 BLAKE2B d0cd446eb7516dec44ac4eb8a73d268652317a7dd1b3531f9e69341ae5a768a2dbc554fb577d499d139a684d190c400c08b5a14023c1a0db03cc599321c651e5 SHA512 07345c6cea216cf9e7043eab1a33cdc9bd9bf52adb5a4019afa401faddfbf0129f2297d01e2a9595cf9963e55ba53c4496b7ab79a9c33be85fac18ca60220a3f
diff --git a/sys-apps/moreutils/moreutils-0.64.ebuild b/sys-apps/moreutils/moreutils-0.64.ebuild
deleted file mode 100644
index 0842fccd4011..000000000000
--- a/sys-apps/moreutils/moreutils-0.64.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="a collection of tools that nobody thought to write when Unix was young"
-HOMEPAGE="https://joeyh.name/code/moreutils/ https://git.joeyh.name/index.cgi/moreutils.git/"
-# Not available at time of release
-#SRC_URI="mirror://debian/pool/main/${PN:0:1}/${PN}/${PN}_${PV}.orig.tar.xz"
-SRC_URI="https://git.joeyh.name/index.cgi/moreutils.git/snapshot/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ~ppc64 x86 ~x86-linux ~x64-macos"
-IUSE="+doc +perl"
-
-RDEPEND="
-	perl? (
-		dev-lang/perl
-		dev-perl/IPC-Run
-		dev-perl/Time-Duration
-		dev-perl/TimeDate
-	)"
-DEPEND="
-	app-admin/eselect
-	doc? (
-		dev-lang/perl
-		>=app-text/docbook2X-0.8.8-r2
-		app-text/docbook-xml-dtd:4.4
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-0.64-respect-env.patch"
-)
-
-src_prepare() {
-	# don't build manpages
-	if ! use doc ; then
-		sed -i -e '/^all:/s/$(MANS)//' -e '/man1/d' Makefile || die
-	fi
-
-	# don't install perl scripts
-	if ! use perl ; then
-		sed -i -e '/PERLSCRIPTS/d' Makefile || die
-	fi
-
-	default
-}
-
-src_compile() {
-	tc-export CC
-	emake CFLAGS="${CFLAGS}" DOCBOOKXSL="${EPREFIX}"/usr/share/sgml/docbook/xsl-stylesheets PREFIX="${EPREFIX}/usr"
-}
-
-src_install() {
-	emake DESTDIR="${D}" PREFIX="${EPREFIX}/usr" INSTALL_BIN=install install
-
-	# sys-process is more advanced than parallel from moreutils, rename it
-	if use doc; then
-		mv "${ED}"/usr/share/man/man1/{,${PN}_}parallel.1 || die
-	fi
-
-	mv "${ED}"/usr/bin/{,${PN}_}parallel || die
-}
-
-pkg_postinst() {
-	# try to make sure $EDITOR is valid for vipe (bug #604630)
-	eselect editor update
-}
diff --git a/sys-apps/moreutils/moreutils-0.65.ebuild b/sys-apps/moreutils/moreutils-0.65.ebuild
index c82f477f7ba2..b540ade6601f 100644
--- a/sys-apps/moreutils/moreutils-0.65.ebuild
+++ b/sys-apps/moreutils/moreutils-0.65.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://git.joeyh.name/index.cgi/moreutils.git/snapshot/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 x86 ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ppc ~ppc64 x86 ~x86-linux ~x64-macos"
 IUSE="+doc +perl"
 
 RDEPEND="
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index af0b0ff390cc..db92459b2e27 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -7,8 +7,8 @@ AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f1
 DIST systemd-246.tar.gz 9534036 BLAKE2B 71b72abcd4d066d35d45d9835d41bec8faa9a7eddc80b48fe7073223f07d32f78a8442c52dc0800940f9750d9c5502123a633738981d797cf610d85df2035bf0 SHA512 7103f7da53f7ced3b5543c238f23bd11c82af8e37166c1720a90576b6b431b4329320c78726166c65a9f5e101dd465c0a86dd13c586c4e55e608a6273d8f324f
 DIST systemd-stable-246.6.tar.gz 9545237 BLAKE2B 5290736b30ca1a3188335a74d49b4f3e8b48007d9563efac1985ea6428a8b8fd6cad7ae87c35e13a32f851ebd27821829738274d35cfbff9340750bd3b086621 SHA512 1936b291d9831cf61f800fe718a4c2c2fe9b2a11fd817fe32bd48da2087a675dfc91013209a3478ea52e8ada593300ed906e248b8081dcf9141bf1cc17483ea9
 DIST systemd-stable-247.2.tar.gz 9890845 BLAKE2B 5363f429f4e629b9a05248b77f7c102da37e23c5678e14621ca67edeea59d7995064d037f04eb0ce57dd17a1b3a40a04e00619f77dbde82a61aabbc02f5bc412 SHA512 220739bedb7ccbb35d9d2ff441a52e0615fbe80da5141f7e0420d469f4d66d3604ea72ce70c3deaa2afa5a32b3c7eec4340738337c96891b471e23ed43cd6a82
-EBUILD systemd-246-r2.ebuild 15222 BLAKE2B ff9dd3e5ffbe8332b51b82416b1320b6ee7c7c4ae6c3d20ccc85b18132a6d75ccf3c999b35d54c22b94f8828f40ba34c880bb123caa2840d25ee009a5d56c9ed SHA512 6e81ffa68802db9b576391329557ce3223748889e74ff3868deb170411871639d293b38b7c294c1ea7b075b603e86cb803655200d26b01edc0d9a6d054439b34
-EBUILD systemd-246.6.ebuild 15282 BLAKE2B 16b7fcc621a922589d62278289460eab7a7edf4520c5297947a2c36a6861b7444f6bf384ff0756563c9e454718176c7258878fb4ba758ffe74bdb6edd0c88a9f SHA512 de1cef007b466bbf98057f9fd9fdfdcc0bec655b2396205b19bbaf6c698663c9f3b4b0ba4352fcf5700168c4e7aaacce5c1e6f15bb2d4c961e7a4e254971539d
-EBUILD systemd-247.2-r4.ebuild 15620 BLAKE2B f73c04ccc2f683941634ef9bf2be17683db869a4293199e6cc5e694857ac637f06eaf667f3b6b284196111b82728b58e205fa7ea544ac5c0baff212a9f068c14 SHA512 53d39f04617b5da817424eec18e07c5a0e5f1d4fed72272120942165aeee76159f4ba4e17d46b853ae2d7bbb2705420a86c5004bcb75b39b709ccbb9b12c55a3
-EBUILD systemd-9999.ebuild 15620 BLAKE2B f73c04ccc2f683941634ef9bf2be17683db869a4293199e6cc5e694857ac637f06eaf667f3b6b284196111b82728b58e205fa7ea544ac5c0baff212a9f068c14 SHA512 53d39f04617b5da817424eec18e07c5a0e5f1d4fed72272120942165aeee76159f4ba4e17d46b853ae2d7bbb2705420a86c5004bcb75b39b709ccbb9b12c55a3
+EBUILD systemd-246-r2.ebuild 15296 BLAKE2B 91f3b46502254f87a3238c58b44e8d9b3452e785ac7c03e27aed967aa1c5722d667df46fdba74becd72a94b69dffa4c929e19e01733e17146897a611e8944cec SHA512 6942d33e12f48006c7d2b11c491d30b60f69fcf2f847fa3e02a4d58506f4b9f3e76ec80c8eabe6635bcc92df03bc3df192471ff9d74dcba9f5d35fc0a65abd20
+EBUILD systemd-246.6.ebuild 15356 BLAKE2B 3825d77488946813fb285b6dfedd3ed003db267804087342c8a6227ad741c2f89abfd9cf709e26a2a4b049874910204b1123282929fb70f9b39677517f90c594 SHA512 cf9ca0c6c6bca30c63044d46d7505ed6f4e4a23ecf23f9695deeca3705e3a1d9af7b25a0b5783b115c1af5e331207f4d2bc5cfa7f397e52c9da840f0f94619af
+EBUILD systemd-247.2-r4.ebuild 15694 BLAKE2B 06c85326fb76774bdbe3f66e75bf6a5d3f9cb1dd8dba65089b77f80c4441b0c29d6a30d1c1ea9953d8b4834db0b584044b95ea6b6c69b5ce73f8b52d23f356bf SHA512 4b59eb5c4a41fb134741b16b87a3019a94c462dbee3aff38fe796e206eed53327a96722d0a947713ce003e61f8b1818421bfbcdbba3ae44eaf2259d54f3a72d0
+EBUILD systemd-9999.ebuild 15694 BLAKE2B 06c85326fb76774bdbe3f66e75bf6a5d3f9cb1dd8dba65089b77f80c4441b0c29d6a30d1c1ea9953d8b4834db0b584044b95ea6b6c69b5ce73f8b52d23f356bf SHA512 4b59eb5c4a41fb134741b16b87a3019a94c462dbee3aff38fe796e206eed53327a96722d0a947713ce003e61f8b1818421bfbcdbba3ae44eaf2259d54f3a72d0
 MISC metadata.xml 2373 BLAKE2B fac7a9db4c217998f84bcbb5bc490eee748a35f9d991962d5aa21c6ec562d494af06b67fe35879ee2b245445d22ea7eadc4db6305215f393c4565b86665b3130 SHA512 e2d999684255f6c6509af7dca1b9e1411eac9a4cde6f30d9631c5b9d2bbe749a40f3d08c067d2cad5eb1cdd8ad823c3afb6844cc5e3c1d455fbd8cd20d87a696
diff --git a/sys-apps/systemd/systemd-246-r2.ebuild b/sys-apps/systemd/systemd-246-r2.ebuild
index a91e932db0d3..1c2b227b30d1 100644
--- a/sys-apps/systemd/systemd-246-r2.ebuild
+++ b/sys-apps/systemd/systemd-246-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2011-2020 Gentoo Authors
+# Copyright 2011-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -272,6 +272,8 @@ multilib_src_configure() {
 		-Delfutils=$(meson_multilib_native_use elfutils)
 		-Dgcrypt=$(meson_use gcrypt)
 		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
+		-Defi-includedir="${ESYSROOT}/usr/include/efi"
+		-Defi-ld="$(tc-getLD)"
 		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
 		-Dhomed=$(meson_multilib_native_use homed)
 		-Dhwdb=$(meson_multilib_native_use hwdb)
diff --git a/sys-apps/systemd/systemd-246.6.ebuild b/sys-apps/systemd/systemd-246.6.ebuild
index 52ae9bc4baaf..587173ad06b0 100644
--- a/sys-apps/systemd/systemd-246.6.ebuild
+++ b/sys-apps/systemd/systemd-246.6.ebuild
@@ -274,6 +274,8 @@ multilib_src_configure() {
 		-Delfutils=$(meson_multilib_native_use elfutils)
 		-Dgcrypt=$(meson_use gcrypt)
 		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
+		-Defi-includedir="${ESYSROOT}/usr/include/efi"
+		-Defi-ld="$(tc-getLD)"
 		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
 		-Dhomed=$(meson_multilib_native_use homed)
 		-Dhwdb=$(meson_multilib_native_use hwdb)
diff --git a/sys-apps/systemd/systemd-247.2-r4.ebuild b/sys-apps/systemd/systemd-247.2-r4.ebuild
index abf3150703d8..513619833967 100644
--- a/sys-apps/systemd/systemd-247.2-r4.ebuild
+++ b/sys-apps/systemd/systemd-247.2-r4.ebuild
@@ -279,6 +279,8 @@ multilib_src_configure() {
 		-Delfutils=$(meson_multilib_native_use elfutils)
 		-Dgcrypt=$(meson_use gcrypt)
 		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
+		-Defi-includedir="${ESYSROOT}/usr/include/efi"
+		-Defi-ld="$(tc-getLD)"
 		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
 		-Dhomed=$(meson_multilib_native_use homed)
 		-Dhwdb=$(meson_multilib_native_use hwdb)
diff --git a/sys-apps/systemd/systemd-9999.ebuild b/sys-apps/systemd/systemd-9999.ebuild
index abf3150703d8..513619833967 100644
--- a/sys-apps/systemd/systemd-9999.ebuild
+++ b/sys-apps/systemd/systemd-9999.ebuild
@@ -279,6 +279,8 @@ multilib_src_configure() {
 		-Delfutils=$(meson_multilib_native_use elfutils)
 		-Dgcrypt=$(meson_use gcrypt)
 		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
+		-Defi-includedir="${ESYSROOT}/usr/include/efi"
+		-Defi-ld="$(tc-getLD)"
 		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
 		-Dhomed=$(meson_multilib_native_use homed)
 		-Dhwdb=$(meson_multilib_native_use hwdb)
diff --git a/sys-apps/xdg-desktop-portal/Manifest b/sys-apps/xdg-desktop-portal/Manifest
index 3f6640cc4539..0d4e77b98338 100644
--- a/sys-apps/xdg-desktop-portal/Manifest
+++ b/sys-apps/xdg-desktop-portal/Manifest
@@ -1,5 +1,5 @@
 AUX xdg-desktop-portal-1.8.0-fix-doc-portal.patch 4954 BLAKE2B 3ba7ad250eaabc707d5a139196d7ad428dc6356f7a35da6e8636214d8600f47b700eecbf5bca2194fd6b3e44d2fc60e38e0c664e6cd777a3400d608503445126 SHA512 350b0ae907c7927a08632f370f080296dcdfc054df5e9ca9e74fed3ec0b6e2d21af3f07d7ae072e372b5774ec578830f7187eb14e5baf3a5f516ff2faf0d97b1
 DIST xdg-desktop-portal-1.8.0.tar.xz 470692 BLAKE2B f21da5ad11dc2b1611983fdac87335b3c7e9c13222bbe3b90b276d75726a6f16d950a9ba62606aa31d52f57b8d076393ec0d48014b1623ab03dee23c524ed0ef SHA512 6d9760b41447af711d5937279b0031bcc88947e11204351accfcd9e6e19e498e9021675753185f92f7bd40336decc1895968796b1b71508c7caf5f6fc32a51a4
-EBUILD xdg-desktop-portal-1.8.0-r1.ebuild 1073 BLAKE2B 87d601924c2c2d8f4830478c30b8c3471343229106b2ea3d60db57eabd2a03d2bf3462f26517bc1cdd848e746b98431aa96d0ff5c8fa7e1ac46f4a69b482a639 SHA512 a3616d3411aa7838cd4a8ff386321a35013ae2108b45f499fd3d4ba1b22ffc969eedcc84c6ae599a6f9e980cf608478282947ee61ce44691eee21c119495e78c
+EBUILD xdg-desktop-portal-1.8.0-r1.ebuild 1071 BLAKE2B 8a2fc06c6697b2d583a864b6bae54a5407ec326b621cfc9265c48773c6639ec373b5b1e576fbddf498759473c7b888102b33e099f3b8c79c020db54fefe5410b SHA512 287a37f75ec1f043b185da99b89e09a803b33c82149dfcba1ee96c4280b565fc30ad8456fd03a2a8789bd5a391c62da8521f427fbb1bf09d81e70f464d694bb1
 EBUILD xdg-desktop-portal-1.8.0.ebuild 1017 BLAKE2B aebe178b476eb447327553bf9514a0e51e98cdc02265162d6c5f98b34aa1ff7501b490b7b2a12a100125a02e07ba7eb0846ebc61e5ea4025703d4379ee70eb5b SHA512 b313f6c0de8618f1dad47c6fc048466a312ea9e974802357a70d6ed5a98a08d07d3867ef503f9c01291d035225b0bdfb146134a330e6cfe3eaa28d45bc9f8ed4
 MISC metadata.xml 360 BLAKE2B 1e3fae0173fab20df0be6a2bd8432477d2c0ab2b9c4272e72a9d8a9eee3255c56311364ea079d288f87032fbc2ec8cad69f32a6bc41b152d19e307ee84493b49 SHA512 4e7232bd03fad6442491ce16c155b0d447050dfc383bb2c16b51297c8c2dcc2793b6d9ce6703451e9516d5a3017fb9e20e85ed7208c94c0faa4489bcbd897e22
diff --git a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.0-r1.ebuild b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.0-r1.ebuild
index bb8cc5472f0b..bb989a014f54 100644
--- a/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.0-r1.ebuild
+++ b/sys-apps/xdg-desktop-portal/xdg-desktop-portal-1.8.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/flatpak/${PN}/releases/download/${PV}/${P}.tar.xz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 IUSE="geolocation screencast"
 
 BDEPEND="