gentoo auto-resync : 26:12:2022 - 02:06:21

46 files changed, 391 insertions, 127 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 79c6d0a6e77e..59bd55c8bb09 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/arrayprobe/Manifest b/sys-apps/arrayprobe/Manifest
index 6ec134d6893f..f9f28e560212 100644
--- a/sys-apps/arrayprobe/Manifest
+++ b/sys-apps/arrayprobe/Manifest
@@ -1,5 +1,5 @@
 AUX 2.0-ida_headers.patch 15371 BLAKE2B 2a551fd71e90255abb853fd9ab544e839fa4a44b7b65c1951d867dd7583c62ab420b4c7d2d70ab30ab8035aa1fc8cd8fdd83f0a48d853a6827e88ca99ff254c4 SHA512 73d4addbaaecbffe762c7b0866c2ddca62efadf3e00997939be2c859508f93b24516fdae95ab001f438c8c8493f382043d7214f01f5d0eb4e1fcf272ab9d9461
 AUX 2.0-malloc-strlen.patch 1080 BLAKE2B 55a1ba7f3c18bc4d2b1bef277a250a9cab8aff7eaf9760981a564a3df671875fd47be0b658b01bd379d1682788c856271c66046ea412cca3838a2da4ff202a16 SHA512 6eca6fdc118ab21451640540f4ab76213a8a79d9e6bb4cbb1519535c8b44b955824486fdeab622cf6fe1ad421b36012399d029ae2679deb159a56918e7003981
 DIST arrayprobe-2.0.tar.gz 83831 BLAKE2B 6a9b76260c91b271068be914161bd99c4ce2285c58ce98c689f6bef32200701430bb65306e74a1d9277d7a4d9e4aa0adf4af60af0c4264020ae07a73f49a51de SHA512 4664e20604697edf2f848447419b26ff860dd302b3d3e5aa0f3977855c590b5acbe23c39b684a2ecb1603c86cf7762e86bfc7125421ccad7f322e387c4178870
-EBUILD arrayprobe-2.0-r2.ebuild 558 BLAKE2B 4b94a0963538e77755d008decd74b4f26d3a787058bc4864252843c452548a37192ead816eb8b33de43f6fba62fb29f561b618bb01bc61705ccc3dba749f575c SHA512 af2f61ca914863caa32b63c21fda428e63817b1cec1f4d401f89cea5e4cc3ae50a982fde8d04486df1ce4b1afbd0b9ec8c46569dd54d4e4612c165f7babd7bda
+EBUILD arrayprobe-2.0-r3.ebuild 547 BLAKE2B 5d1f6cb6decf8b7441ff0462bfb4660e1f6ab9114a96f4f80381f597362f3d76b5e3ef994931e7f4e1172b59af075374fccea915efe4a1e1abe39793292383d0 SHA512 796796c4de7d5fff61cb0a8dd74437ef599941ab83ae70ec8ab6f1d1b2d4f47383e16d2da815ff691d7ae891ecbb82d354366c6d4d6c5d7eea09fa3ce69ba899
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/arrayprobe/arrayprobe-2.0-r2.ebuild b/sys-apps/arrayprobe/arrayprobe-2.0-r3.ebuild
index 5f961969810b..6aca72bbef67 100644
--- a/sys-apps/arrayprobe/arrayprobe-2.0-r2.ebuild
+++ b/sys-apps/arrayprobe/arrayprobe-2.0-r3.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit autotools
 
@@ -12,7 +12,6 @@ SRC_URI="http://www.strocamp.net/opensource/compaq/downloads/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~ia64 x86"
-IUSE=""
 
 PATCHES=(
 	"${FILESDIR}/${PV}-malloc-strlen.patch"
diff --git a/sys-apps/collectl/Manifest b/sys-apps/collectl/Manifest
index 6b0fae893db8..c24d3a480abc 100644
--- a/sys-apps/collectl/Manifest
+++ b/sys-apps/collectl/Manifest
@@ -1,4 +1,4 @@
 AUX collectl.initd-2 348 BLAKE2B df64bad334058680e3b78469120f44d99d38eda84ce5eacf3cb0650d64674b1c0fd0a92efd8974f73fdbb1a706ce48d61b37417b75c1a8d59ca13685af8b1b4c SHA512 441c5c90baa194dead6c764317ca4e10f864e82c1ee1f0c0d99f301ecf0baf197349df13fc155ac8e42366c56d13478d6004d6648e1131deea3a002c5e89ab66
 DIST collectl-4.3.1.src.tar.gz 620693 BLAKE2B bcf8c41e0f6b51daa32fa9752dfd603230321718de190a8a9d71bf71e2c5f65e3b170bc85fbdcc78d2ab131bf5a5bfdfebf49225151ecf2cc444d2ca4ef0faaf SHA512 6f2df8a3da37f7ccb9d7f34a20e63b0601e5da7126bb3a9a11af7ee4959b682d59f44a1885bfb5882410e9de0191093ea4d5d43c8f2fa0f0904fd2ca4a3c5a90
-EBUILD collectl-4.3.1.ebuild 838 BLAKE2B a2bd226521ea75de4b9ff31e77f4de0970bf820906580922350e28988ea9836bf2ce0c50f41aa42cd0ca8fd1c409537c3dd893e3443c1a2a2c6de4c5a35e2769 SHA512 94feb59492482fae8f0117f41fb1aca70a8f2c0a6958d158fac5360ad28ab69e22ba45b8f77b5caf7ab49e94c79a3f4302c5a6643fef5a980cd366f62f7462bf
+EBUILD collectl-4.3.1-r1.ebuild 831 BLAKE2B 2e8ff3cba5c0f4e7f537f71b55faa44c34d7901f90ee5e59302f119e12d84d61830c45cab659c315cebd9bdc978dd15eaf6c2ab764113f299bbb6ca57b2340a6 SHA512 6cec4a71a8e331c94f4cabd3b7ae0c152618b8e25e9006af445a811f7a72392bd6c033a5927ca6b0f9a97b6cf5412bdc7094f31bed476bee640ae12dce9d6265
 MISC metadata.xml 329 BLAKE2B fb2d4bc9a148073087028dbfe896a20002d238523d10904701334f9148ed5a47086b57e6ef311d16f3749171ee73cc9c899904a117afdfc672df4240c426d15e SHA512 b590bf76cdcf0d2bf0b8f3ffc88d3c2d8c1f6e4cfe227a023c9abc4c7d52fb369f9b10800f05fa9fbed13cbc8ccb018c1d187ad8827f7f9f63a63752900c6f90
diff --git a/sys-apps/collectl/collectl-4.3.1.ebuild b/sys-apps/collectl/collectl-4.3.1-r1.ebuild
index d9b81f3dd223..a4aa255f26f7 100644
--- a/sys-apps/collectl/collectl-4.3.1.ebuild
+++ b/sys-apps/collectl/collectl-4.3.1-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Performance monitoring tool capable of interactive reporting and logging to disk"
 HOMEPAGE="http://collectl.sourceforge.net/"
@@ -10,22 +10,20 @@ SRC_URI="mirror://sourceforge/collectl/${P}.src.tar.gz"
 LICENSE="GPL-2 Artistic"
 SLOT="0"
 KEYWORDS="~alpha amd64 ~ia64 x86"
-IUSE=""
 
-RDEPEND=">=dev-lang/perl-5.8.8
+RDEPEND="
+	>=dev-lang/perl-5.8.8
 	virtual/perl-Time-HiRes
 	>=dev-perl/Archive-Zip-1.20
 	sys-apps/ethtool
-	sys-apps/pciutils"
+	sys-apps/pciutils
+"
 
-HTML_DOCS="docs/*"
-
-DOCS=(
-	README
-	RELEASE-collectl
-)
+HTML_DOCS=( docs/. )
 
 src_install() {
+	dodoc README RELEASE-collectl
+
 	dobin collectl colmux
 
 	insinto /etc
diff --git a/sys-apps/dnotify/Manifest b/sys-apps/dnotify/Manifest
index 68768d3bd5e7..211fa78ad15e 100644
--- a/sys-apps/dnotify/Manifest
+++ b/sys-apps/dnotify/Manifest
@@ -1,5 +1,5 @@
 AUX dnotify-0.18.0-glibc-212.patch 217 BLAKE2B 79ba1f388c427af04cca8481d1fcf685e9a8d1b4124e2e1e61b051b568f39bbb230b1951d4d25e47925cdc2e0ffcc665aadf5c6a00e5b67f23bf11f48ba040b4 SHA512 bf32edfc97aabf5eaae1289105f0c65bd25adf60fe44ec139666265f01ed9fa7b664d12e26bcbbcd95069797b40f386276b6b730739c9900c039b432f6494db1
-AUX dnotify-0.18.0-nls.patch 247 BLAKE2B fbc019f1a7ced4d74bfef9d9109ac7e9934d8b3cb10881f3d0b42d93961961abac8faa9a43baf52729a6467a03c8966b785b38347a2285aa686e1471f10d48cd SHA512 1628ac545126cb0c3929ac97471ef9e8146d0af842b18bb4c7afe36879cafcfea6f6091ed233685b4bbc4a1ed81ac8ae55c3ba91de241e64c31412e2d8b486ef
+AUX dnotify-0.18.0-nls.patch 175 BLAKE2B e16d86e6448b784509004912931fb5cf381274aa1c4a3b5c0d3238b497732f8b03fb72edbe24dea378bb4f505e097db9f6552460387dbe8ce3a678399cbd0bad SHA512 f1abed01b278c1a198edc5fd52eb69b9479a1879805fac58bdc079e0cac6a1507c7974b87579fe9b426d920d8f82f41cb47eb3cedfcd56531c11745ce8abe52b
 DIST dnotify-0.18.0.tar.gz 187909 BLAKE2B 35131f6a04b1bf7cb9b6461fe99e28205ed6ba39b6e660cbf9ac9c059e6339d83485848dcbb858f2a1ff0a021181f897da7322a3a0f02283f83b1649e2d6753a SHA512 5b41fcf131b3ed5e16f7003e0b9b11952b03b7e2ef27554dd40b0b3de3f9c6d2f7911a76e5c4abe079edd5596f416226a28ebd6b4a8f05c589216c2a6e16446e
-EBUILD dnotify-0.18.0.ebuild 532 BLAKE2B cf854b8250fd5ba78b8440ec18a27432a9767517b288fa1031bc7bcc4a219ad1f57a3e5ffdc79b9cfeb578df0753e9700fc022d26525bf3da484475a8972b724 SHA512 9b2db57c5518e9a5c4c02b2f71d9124c2cdfe141c7a6bedfe4c50d65cc287bd764521b97f16f29de7ad0bd2b8d24b575c9b93fca53b3f601ece2df350914cd37
+EBUILD dnotify-0.18.0-r1.ebuild 514 BLAKE2B f1861c9eca6aac93de01caa15056424a27f94e2bd7314fcde4f3608a3b2db7090ce717aa80ef9173383e2bcccdee41b85e5092f86e7f491ef60009f2c4cdf229 SHA512 5778a655d5ef9394a8a69a8e7ab112776b4bc4554ba87ade73b22e228cf35e8600e6b469b03b5671da958a1b684b98b683953dfa0c67454fcedd13b3153ea72f
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/dnotify/dnotify-0.18.0.ebuild b/sys-apps/dnotify/dnotify-0.18.0-r1.ebuild
index 6c11fbe8b1dc..b92ef1d92179 100644
--- a/sys-apps/dnotify/dnotify-0.18.0.ebuild
+++ b/sys-apps/dnotify/dnotify-0.18.0-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Execute a command when the contents of a directory change"
 HOMEPAGE="https://directory.fsf.org/project/dnotify/"
@@ -12,7 +12,6 @@ SLOT="0"
 KEYWORDS="amd64 ~mips ppc -sparc x86"
 IUSE="nls"
 
-RDEPEND=""
 DEPEND="nls? ( sys-devel/gettext )"
 
 PATCHES=(
@@ -21,6 +20,5 @@ PATCHES=(
 )
 
 src_configure() {
-	econf \
-		$(use_enable nls)
+	econf $(use_enable nls)
 }
diff --git a/sys-apps/dnotify/files/dnotify-0.18.0-nls.patch b/sys-apps/dnotify/files/dnotify-0.18.0-nls.patch
index 55400b704983..7bcb3a3a320e 100644
--- a/sys-apps/dnotify/files/dnotify-0.18.0-nls.patch
+++ b/sys-apps/dnotify/files/dnotify-0.18.0-nls.patch
@@ -1,5 +1,5 @@
---- a/src/gettext.h	2006-01-27 18:23:31.000000000 +0100
-+++ b/src/gettext.h	2006-01-27 18:25:07.000000000 +0100
+--- a/src/gettext.h
++++ b/src/gettext.h
 @@ -24,6 +24,7 @@
  
  /* Get declarations of GNU message catalog functions.  */
diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
index bae210a03ded..e6db3ab4e477 100644
--- a/sys-apps/findutils/Manifest
+++ b/sys-apps/findutils/Manifest
@@ -1,5 +1,5 @@
 DIST findutils-4.9.0.tar.xz 2046252 BLAKE2B 3ada8903fc552ad2e580a7b631a4b9d941935b3f4231029564c6f2b7b10ba6f2244e2de57f6d79268c5e0481a193f64edbbae637e7a51ae6f495e3eefabf52c9 SHA512 ba4844f4403de0148ad14b46a3dbefd5a721f6257c864bf41a6789b11705408524751c627420b15a52af95564d8e5b52f0978474f640a62ab86a41d20cf14be9
 DIST findutils-4.9.0.tar.xz.sig 488 BLAKE2B 7aab47ccb1351f08be03e781332b79d6778ff0d5d7959adf75fa8eab11325ee9971c89972338edfb58daac7f702891a1a5dd8379a703ccfa601e6b99db588197 SHA512 b8e0b5471242912a20b9e468fa27b7f27339af5f7be8918173105262dee0152183bf4cf516844d348b206a694e028490d5d3b190f3aed8c698ba5444941f8dfc
 EBUILD findutils-4.9.0-r1.ebuild 2117 BLAKE2B d70aba6309ccdbe7035f40844de967b4708590201e0bb51f212ca5cba2d3c446117c8dbf1eed5444aba82f12ec223072474de92534206fdfebd34ad79c4d9f74 SHA512 59c4da8b925afbc04a2264944bd48d7d60a1961457f764aaba965ed51d7c008c706422cb36d775bd281a2ae87c888d764fbca7bf5e57f39c709bf39b28e1dfaa
-EBUILD findutils-4.9.0-r2.ebuild 2407 BLAKE2B c6375d243fcc96d628745bf8b1d2af6b9b84a19719e29fca58769641f81bb2ae1802ac0bc06b63d36f82256599ffe52f3983c2c0eb07c028b24ae1d96a840523 SHA512 8b0ce846f7eed7035a597dafa36247b3308a032f076af01dcefe90b1cf152a1b514f72b36d582a602324e9b01d106e315b36ecdb13077b2e3ea25257416cad53
+EBUILD findutils-4.9.0-r2.ebuild 2400 BLAKE2B 103ba365c6b32b5481388435766a26b7c6620f86613beb418700126a6a09c9cb64741c892979cf85e0463200762f5965960bc253196d32515a253ad67f9f5993 SHA512 db7b6f27091ac1039ffc7ef88c5062e410054866a009c1a0ca0aed2f77132b311f2e8dcd3bffc749633447858642c8dba63ccf9dd491cc72a8ba10ab41f80049
 MISC metadata.xml 333 BLAKE2B 321643b5c847879de4e8c0a4abebd5534e91fc7e58313ec3258520fc1f1266f98cc1892b57589cd1427ad4a0cea39b3c03ce12741b04f75290346fddc6c245fe SHA512 b36dfd42e3af70bc1ef3c7629297a390dced3edb1dc3d7d10d7672ff532da743453d9382cb15d3102885150c2440bd85019865d61c4e4342004db2dcf993f0a2
diff --git a/sys-apps/findutils/findutils-4.9.0-r2.ebuild b/sys-apps/findutils/findutils-4.9.0-r2.ebuild
index 86f171f6797f..b8b566f85ed5 100644
--- a/sys-apps/findutils/findutils-4.9.0-r2.ebuild
+++ b/sys-apps/findutils/findutils-4.9.0-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.xz.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="nls selinux static test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-apps/hprofile/Manifest b/sys-apps/hprofile/Manifest
index 5e99cd4c2480..06c7b55cc164 100644
--- a/sys-apps/hprofile/Manifest
+++ b/sys-apps/hprofile/Manifest
@@ -1,3 +1,5 @@
 DIST hprofile-6.1.3.tar.gz 18719 BLAKE2B 1e70bad6426b73fa03d4c987bc5c585413122462dfd7270f140a78b351633b75d366dd2efd328296f5ad3c78ccafe2182f758e730e6af809e1f16e010f5a93b1 SHA512 33987e1fa61619794c40dce737878a37a7c202e50edcd086fe6b59829908f019438a5dccdbda45eb798e227eb2a6ffd3510788645cd73751baa14b5028f6f670
-EBUILD hprofile-6.1.3.ebuild 523 BLAKE2B e0cfa25051185334bc936d05b871144f8917575aff7f9bc63678ad67c991aa91e57696c0f75a914236213c4aaeb500d8a2c27203d62611d798df71ef47ae1360 SHA512 c726f3d32ef34db1081560de32880ec4c838ed81084e78931d0f6342cf837ce4c957c783bcadbbaa6e06e01ea92ed3afaf6ebead2422f30285bc943c6c82be6e
+DIST hprofile-6.2.1.tar.gz 19249 BLAKE2B 3af40718aaac95219cbf93613eb9c121890f3dba40fb64188e04a07549eba1ce11f7891467d0b8293100c45d8806e68bfca7e6a123bbed179f28eecba5d53790 SHA512 efc1fd14d478e6a932e1e7955d389aeac93c598d27e288f663cc88b1fb3f4f47969741f7e1bc4cd6068c6e20930205ec3224f2cfaaf25be7de9ff9914fd2fc79
+EBUILD hprofile-6.1.3-r1.ebuild 520 BLAKE2B 8be61bbb0b7ec1398f3ea8189a9032dd2c87b9f822db1a566bdb2e0be7f5b1b5a1ff8a2ccc6ddd3efffb87c6f2fc160bf63d18bbcf374fe16a0594b46b3ed1be SHA512 f88f612c7bf05fa2a9b13410d8e232573dcf4903ee1f5f2534a693dd8f1632b714020d270092fbd66f6f94e861dd35d0eaf202786d3654a636997acd6e10705a
+EBUILD hprofile-6.2.1.ebuild 520 BLAKE2B 8be61bbb0b7ec1398f3ea8189a9032dd2c87b9f822db1a566bdb2e0be7f5b1b5a1ff8a2ccc6ddd3efffb87c6f2fc160bf63d18bbcf374fe16a0594b46b3ed1be SHA512 f88f612c7bf05fa2a9b13410d8e232573dcf4903ee1f5f2534a693dd8f1632b714020d270092fbd66f6f94e861dd35d0eaf202786d3654a636997acd6e10705a
 MISC metadata.xml 335 BLAKE2B 5e22f234d4d60bf089c44aec66507ec90b0db05c04a784f474460ea8aec880bb6306a6827aa7d74d7fe0cf9ed442ffccb0802deba9714b6b6a2ee11d5aeb21eb SHA512 5fc524c444553f84ed2c2f33ee4f0e5fdd8143ef068d9e861ba144ebf1a4c522c140aaf421ee26ce2ccde7280900ff211101493f04707506c46411567e7d3c2f
diff --git a/sys-apps/hprofile/hprofile-6.1.3.ebuild b/sys-apps/hprofile/hprofile-6.1.3-r1.ebuild
index 4bff3d42441c..b928e6c0c06c 100644
--- a/sys-apps/hprofile/hprofile-6.1.3.ebuild
+++ b/sys-apps/hprofile/hprofile-6.1.3-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Utility to manage hardware, network, power or other profiles (fork)"
 HOMEPAGE="https://github.com/tokiclover/hprofile"
diff --git a/sys-apps/hprofile/hprofile-6.2.1.ebuild b/sys-apps/hprofile/hprofile-6.2.1.ebuild
new file mode 100644
index 000000000000..b928e6c0c06c
--- /dev/null
+++ b/sys-apps/hprofile/hprofile-6.2.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Utility to manage hardware, network, power or other profiles (fork)"
+HOMEPAGE="https://github.com/tokiclover/hprofile"
+SRC_URI="https://github.com/tokiclover/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_prepare() {
+	default
+	sed -i '1s:.*:#!/sbin/openrc-run:' hprofile.initd || die
+	sed -i "/^prefix/s:=.*:=${EPREFIX}/usr:" Makefile || die
+}
diff --git a/sys-apps/lcdsplash/Manifest b/sys-apps/lcdsplash/Manifest
index 225786a9ba4e..622d42824f0d 100644
--- a/sys-apps/lcdsplash/Manifest
+++ b/sys-apps/lcdsplash/Manifest
@@ -1,3 +1,3 @@
 DIST lcdsplash-0.3.tar.bz2 8121 BLAKE2B 52baebd47f6b72fd55c3afaa4a44803fd71b3674419a6fe43b8a642cdfbd14fd964e82db995707e48b23ccf0d323f9f6853f1a5558ae3ff64b6332cc9880ecf1 SHA512 4d40200882260c31cfe20988cf64d27be0af7f1ab983e5a998dcaeafede074e882379508a775f54690105591e0802eb897559eb7437d81f0b24096dd8c363243
-EBUILD lcdsplash-0.3.ebuild 605 BLAKE2B fbd6be1e83f900e3716782da67ebe12a2f857b93aa5f6f7505423ecb63294b2ba29953ea4240c449a962d49d631e28fcb5dd126406289c576f07e6335ee2f024 SHA512 53cc2f0525a6bc52fa10857a80f20b8362f707cf35ebbbe2a1d07ead81370a763f3063edea5b7059776d8051072e8f771bd327a9116ef17973580770f8c0110a
+EBUILD lcdsplash-0.3-r1.ebuild 601 BLAKE2B 75e7183a0cfcaf422304dcfeed4b57c855ec7b648beb121262bbd42b897b7ce88b96da9a747da49e990ab9ad3e4f76a5da13e57f2cbd1d3bd991b94ee6482f0b SHA512 5345d7ba1b049b1edbbb186f5ae4b60eff64e2f94f91cdf27c8b30618fbccab4b78263f3f1e01b6453dde69fb4d870af3686afbeaefb0ee1ae1605b992fe3e86
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/lcdsplash/lcdsplash-0.3.ebuild b/sys-apps/lcdsplash/lcdsplash-0.3-r1.ebuild
index 2246f6ecf7fd..b47d14c72f94 100644
--- a/sys-apps/lcdsplash/lcdsplash-0.3.ebuild
+++ b/sys-apps/lcdsplash/lcdsplash-0.3-r1.ebuild
@@ -1,22 +1,22 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="splash Gentoo boot information on LCD's"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="mirror://gentoo/${P}.tar.bz2
-	https://dev.gentoo.org/~vapier/dist/${P}.tar.bz2"
+SRC_URI="
+	mirror://gentoo/${P}.tar.bz2
+	https://dev.gentoo.org/~vapier/dist/${P}.tar.bz2
+"
+S="${WORKDIR}"/${PN}
 
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="hppa ~mips x86"
-IUSE=""
 
 RDEPEND="mips? ( sys-apps/lcdutils )"
 
-S=${WORKDIR}/${PN}
-
 src_install() {
 	insinto /sbin
 	doins splash-functions.sh
diff --git a/sys-apps/makedev/Manifest b/sys-apps/makedev/Manifest
index e796bbd9cdd8..34b489f250bf 100644
--- a/sys-apps/makedev/Manifest
+++ b/sys-apps/makedev/Manifest
@@ -1,4 +1,4 @@
 AUX makedev-3.23.1-headers.patch 433 BLAKE2B bd8e6e4b32c69be3b5ccec72b425cdafbfa9723b0fdd1b634da6f130590a72fd251c6f21ff29224a705211274efad53f8fecff3ac3710eccff4833e1769c75dc SHA512 ffc80692b9bc317c0c14c5e7211155c4a7849967a9a3588a811f21feb6034da264c7aecdb7ce4e67786aa2a28f8d33af381ff410afd118ab44f47edddc421d0d
 DIST MAKEDEV-3.23-1.tar.gz 122613 BLAKE2B 2b0a4a02db36d7a3a71018378396c7d5ac8bbd4e9f8b24a1d3659084f381e8cc686f3d9198dc54e1efd93095ea09c21aab3b9866b942bff8e8a393355403f28a SHA512 5ca82cdcc4544042ede552370acf6266929fa34d177bd8e831573ccc1c57e06ec87766b9e60a686ec1449b204ae0ac3c048eab32b57ce8d610366219d3a77dbc
-EBUILD makedev-3.23.1-r1.ebuild 1353 BLAKE2B c31056749a6345c450f4e55c217107c119c2ffe7150db64df252bc795fb5ecc4d2babb9b902326072c216b01b075f5c5bf52d9bd86033289e5c10d64b2f05a32 SHA512 565b762c925191dad2e6b87af0df6a731202dbeeadc92a4f469a789627a84984917baa280c46c7a523090b24b93b308b448f78a6361f0e5aa1da2db094d69bd4
+EBUILD makedev-3.23.1-r2.ebuild 1358 BLAKE2B a8aba144970a6a6e5c95f9ace0096c72a7a62dd29ebc51009e4e6dd4a5d19cce3210841caf2bb60a43cb88769d083d2205eedb0f470dc4c4f2e5c0c7d5f22281 SHA512 1ff3dba200568023311577a4dadb9a487b1b4a3cc03d5894c5352ee253ad4abe7246b47d2409d5fdad240fe68be9c0ce4f5e07a9268513a961103eb51c56e60a
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/makedev/makedev-3.23.1-r1.ebuild b/sys-apps/makedev/makedev-3.23.1-r2.ebuild
index 34b779032631..5219a9f4aa53 100644
--- a/sys-apps/makedev/makedev-3.23.1-r1.ebuild
+++ b/sys-apps/makedev/makedev-3.23.1-r2.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 inherit toolchain-funcs
 
@@ -9,9 +9,11 @@ MY_PN="MAKEDEV"
 MY_VER=${PV%.*}
 MY_REL=${PV#${MY_VER}.}
 MY_P="${MY_PN}-${MY_VER}"
-DESCRIPTION="program used for creating device files in /dev"
+
+DESCRIPTION="Program used for creating device files in /dev"
 HOMEPAGE="https://people.redhat.com/nalin/MAKEDEV/"
 SRC_URI="https://people.redhat.com/nalin/MAKEDEV/${MY_P}-${MY_REL}.tar.gz"
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -19,12 +21,9 @@ KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv
 IUSE="build selinux"
 
 RDEPEND="!<sys-apps/baselayout-2.0.0_rc"
-DEPEND=""
-
-S=${WORKDIR}/${MY_P}
 
 PATCHES=(
-	"${FILESDIR}"/${P}-headers.patch #339674
+	"${FILESDIR}"/${P}-headers.patch # bug #339674
 )
 
 src_compile() {
@@ -33,7 +32,7 @@ src_compile() {
 }
 
 src_install() {
-	# set devdir to makedevdir so we dont have to worry about /dev
+	# set devdir to makedevdir so we don't have to worry about /dev
 	emake install DESTDIR="${D}" makedevdir=/sbin devdir=/sbin
 	dodoc *.txt
 	keepdir /dev
@@ -41,10 +40,11 @@ src_install() {
 
 pkg_postinst() {
 	if use build ; then
-		# set up a base set of nodes to make recovery easier #368597
+		# Set up a base set of nodes to make recovery easier, bug #368597
 		"${ROOT}"/sbin/MAKEDEV -c "${ROOT}"/etc/makedev.d \
 			-d "${ROOT}"/dev console hda input ptmx std sd tty
-		# trim useless nodes
+
+		# Trim useless nodes
 		rm -f "${ROOT}"/dev/fd[0-9]* # floppy
 		rm -f "${ROOT}"/dev/sd[a-d][a-z]* "${ROOT}"/dev/sd[e-z]* # excess sata/scsi
 		rm -f "${ROOT}"/dev/tty[a-zA-Z]* # excess tty
diff --git a/sys-apps/man-db/Manifest b/sys-apps/man-db/Manifest
index 461651a0cc2a..7ed1680edffb 100644
--- a/sys-apps/man-db/Manifest
+++ b/sys-apps/man-db/Manifest
@@ -3,6 +3,6 @@ AUX man-db.cron-r1 252 BLAKE2B 1d48851bd11ddf65ee24cae65a8bdb43b2c0df515a7906616
 DIST man-db-2.10.2.tar.xz 1902840 BLAKE2B 8d1748503cdf66a613d7544a27b42df9436bdf4e07ccb130d2fa62343488d2c4ab791238c348236a253abddb564db9d1bb851249da9911737ff822d822819599 SHA512 5ad7a7b601aadf4d2d7cc068881fffe3d91dc85fcf4c17e66fbe6e2b04bb1c46f5ba5d4bc7f6ab3f39e00065be39061b101d3064c12b1e89f0fee61c088611bf
 DIST man-db-2.11.1.tar.xz 1948788 BLAKE2B 60c3895a6326222e0a3f40902caa18991b5f767018ccb60f844c3a329e50fdda3db96b1c80b5337f4a5f129bdf0e7084cca7b216473328e4d2606cf811a88dab SHA512 249d65d01d83feac2503bfc1fba6d018ea0f7485c1112f1bfb4849ef7fbc3c1a50b97ab0844a7792d83bb1084a89abb4fa309ce1bc2bdf1183fe35b9e4f06263
 EBUILD man-db-2.10.2-r1.ebuild 5128 BLAKE2B 532d907a06f95b28f8b6705fe58d9d62797ae5ac2633b25981cae36ed16678e44a7026c19d7449244b7fcbdc5187d08a898753af1c7c2c3d2e718ab4c450032b SHA512 a80d67860f7ebc8b029fb5b83adbbef32ab1714102351cee8c2605228e00caf87627dfc08e129d255c80f04a232e0b30eeaee196bb7da969c3cad1021153751d
-EBUILD man-db-2.11.1.ebuild 5126 BLAKE2B d9cdcdd39ed3a813330092d43d1e6c2431669e9b083dde0f1efd99481c8364c4cd7cb01a52b25aeec518a93926a82693a19ed58cf51338c2f74e09347210fb64 SHA512 99a2c0aa6fcb1426887fe320c6dc6368b80b9a0fbe45ca320c831ea27f42dca2abd96b1421b86696bddef90d122225bd6bc97d7372d144fe4cc009d02469d041
+EBUILD man-db-2.11.1.ebuild 5118 BLAKE2B 6ecaf35f62b4bae1939956384c57fc00792db0aa84d9b5945c9ea67f2f8cb799e1182df47248c1a66fe80e48c99df9c56c89c25ea73b8f73e2af86536acfd4ca SHA512 6adb3bc7adf22ea2f6ab51bf823be5834b88b2f15bd2d4293d078ef06942fa69c5757903f7ce71df234d68f89c39ef5c36f3cbeeb0221f7a36bbb6a689938e35
 EBUILD man-db-9999.ebuild 5126 BLAKE2B d9cdcdd39ed3a813330092d43d1e6c2431669e9b083dde0f1efd99481c8364c4cd7cb01a52b25aeec518a93926a82693a19ed58cf51338c2f74e09347210fb64 SHA512 99a2c0aa6fcb1426887fe320c6dc6368b80b9a0fbe45ca320c831ea27f42dca2abd96b1421b86696bddef90d122225bd6bc97d7372d144fe4cc009d02469d041
 MISC metadata.xml 428 BLAKE2B 6d0c1067a27f4ba0467b268fefcab6a208d3367592284349e15eb2ed967f29e9505eb786bbd0236b1fb41d58c2788d8f5e61ce34b97cc7a5702ff3dbe32a1f36 SHA512 2542a4c5c15ad471d143fb713617d6868e9dba49ef14840f44ae3c9d05e74041a845b3a820c4dfb9a819a72eae763f9f8883e933e4012318043baada11fc85b4
diff --git a/sys-apps/man-db/man-db-2.11.1.ebuild b/sys-apps/man-db/man-db-2.11.1.ebuild
index 656aff6f15d3..95309bbf6d67 100644
--- a/sys-apps/man-db/man-db-2.11.1.ebuild
+++ b/sys-apps/man-db/man-db-2.11.1.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]] ; then
 else
 	# TODO: Change tarballs to gitlab too...?
 	SRC_URI="mirror://nongnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~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 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="GPL-3"
diff --git a/sys-apps/pciutils/Manifest b/sys-apps/pciutils/Manifest
index 2f244b87051e..79c06b253ec2 100644
--- a/sys-apps/pciutils/Manifest
+++ b/sys-apps/pciutils/Manifest
@@ -5,5 +5,5 @@ AUX pciutils-3.8.0-pkg-config.patch 691 BLAKE2B c12a6a6f19a62d5d161479e401f5bd9e
 DIST pciutils-3.8.0.tar.gz 575255 BLAKE2B 7339189f7115af31ccc19663d54e12ef966fbcd75c6b6b4c28c8ddcaafa3e233313ca14300ef70100edb00f5f2e1e767af9d6527a9d836edd07b598f0a40f4f4 SHA512 4b0de02a54c6ed19d5ea85a01d89a62386000bc0f816498872479aba26fb007a8c394cba3f95e77a7ffe52d36ad2726169b7b83bda5ab0647f00e49d8a34bf15
 DIST pciutils-3.9.0.tar.gz 908219 BLAKE2B 59d2a151b114691980b8f0a0bfdf8e48b9e1a0a9976df6dbc94962c251d8bfc61e7bd3b0f3c47a4295f52b5df67ad0e44ed6f2e6a87728e213e4ef0b8a55c028 SHA512 e17225c2adcc21c9ff4253998aec5805ae5e031888fa01841a1ff680796f7515f9dd6e5c2e0588edba854f66f1268ba8e28ae1a2f794574e715fec8a8c8def4f
 EBUILD pciutils-3.8.0-r1.ebuild 4915 BLAKE2B ddc1ba11cefb65a69392aad79260482827a62476200518f5d5aeac8209713b791f5fd389fcdd93c4acb3e40663180338584b17c04ea7148a5123a8bd274d0909 SHA512 ea895c2400ea0af258d0dc1151e81b3f972218f03054ddc20edf847fe053794d7286932fee44f008f53f641193bcdfd8cfac8b08800f4b0a620ae30e8591962a
-EBUILD pciutils-3.9.0.ebuild 4826 BLAKE2B b98e3a74c12189551f1eb98dd23a870435706bb54755a3b084116c472e573564f90bde6dabd1370b5b3f7c573cafd612ebf93c1b8f5193123feb0cf95b089dc8 SHA512 84d49aead96a2899277538b46c2852b8800d7208f673d93d65640494ebb36f32af339eef63695359d792214ef89b74954d1622290d12b7f8ff0ad887bd993c24
+EBUILD pciutils-3.9.0.ebuild 4820 BLAKE2B af6ce59ebe89b0151ffc737afc9d6eb9934c0a55aafd7f363ca9a4128c5b1dea5397670429d7e2f3b1d9e565b2cb6bd39ceaacf029755d0f4fdab5d70f5baebe SHA512 561ef9ab021301967ad790348bd35a68c4b9e659fceacaede74c0d2cf3fe6d254795e8c4267a36ebce7721426f5f723d821cd137e2dd1d9b721036de0c7b86de
 MISC metadata.xml 616 BLAKE2B 0aefbd7995f4bf549cba3e9c60066675efb8dc8e4d38e320c8cb28f7f6a275527e90d2526248c57fd34d09125693e3f185f51c05d0ae10fd8a61d058d4f8a9d0 SHA512 5f44a15a2a18a40ac7a46a5c1dfed741082e48321d5ee3f53bebb6b12e310ea05070e03853cf15655ef800a768d49515f174e3a73ca923177ce0be3963154a59
diff --git a/sys-apps/pciutils/pciutils-3.9.0.ebuild b/sys-apps/pciutils/pciutils-3.9.0.ebuild
index 43f9e6d798f4..c3bdc6c139aa 100644
--- a/sys-apps/pciutils/pciutils-3.9.0.ebuild
+++ b/sys-apps/pciutils/pciutils-3.9.0.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 IUSE="dns +kmod static-libs +udev zlib"
 REQUIRED_USE="static-libs? ( !udev )"
 
diff --git a/sys-apps/readahead-list/Manifest b/sys-apps/readahead-list/Manifest
index 5ee99ec21479..4ac46ccbb7e7 100644
--- a/sys-apps/readahead-list/Manifest
+++ b/sys-apps/readahead-list/Manifest
@@ -1,8 +1,11 @@
+AUX 1.20060421.1016/0001-Modernise-autotools.patch 1535 BLAKE2B e73ca5fc69cb4a1f5856cc48caaeb82ac823a0003e284a66ecd335ad64344f03cf01705c4627f075ebcaa33af6d3068cbd1638255d4f533ffd8a48aea86c8de1 SHA512 e6e9bc0f9349cd8c0f5cad312c984f0fcd4b6198f376b11946b6092d668666fa22e9ef5d0a3e8a62d32bde144beeb107915b9567b494ca32ed50b31f8a866536
+AUX 1.20060421.1016/0002-Set-D_GNU_SOURCE-for-readahead-to-fix-Wimplicit-func.patch 2038 BLAKE2B 95ea6a5e5f88263c53d86ca470f143b60a3c9205db1f18cdcc0b2c15c5c8adbf97c888c0727f894bad0fb4a0304a29d0d646c7d8c9b774d1b9a7bba10c4777d5 SHA512 7ec81b5597418bb64b45167f29e7112bc24e4c1f20308d837d7d254b977d2468f24b4f132bb578ac2c51fe3837b5037d38b1db55fcb28bb90ebb7c5418e13273
+AUX 1.20060421.1016/0003-Simplify-setting-up-Large-File-Support-use-AC_SYS_LA.patch 1256 BLAKE2B db0ff77c8095a081aa2e92d31eb5e165a26d6840daeec8ab00f5e1a3f5e8dcbeb962d2bc2b8d2f47b6b6fec8cb7e3c0c52827cf9f18f9bb56c8bdbd6ac4b19fb SHA512 08bcec95702e491bb5bc7da7ed6b3741a8696eace33cbb9993fb3d257b343788e68578e1e1d96dac5a77d43fbc81b5fcb607d1b3a1ace5aa3a2d95ae8fc6a23a
+AUX 1.20060421.1016/0004-filelist-order.cxx-Add-missing-cstdlib-include-for-e.patch 507 BLAKE2B b731a4e215cbbbe694607b15101daf6be712121e6e8330e5b3ae9735e8ebda7544dbe5c9766ce77380a23e6c427b86b881fa651faa8977740bf01559327b3fe8 SHA512 b9841297193ce85e9b1593e79d8fcf0002f1cbca9edbaf2401d7368368a51e97c2420fa7ca378fe93316a1aa076e0cee06d0e79a695a938aeedc789df5faf68c
+AUX 1.20060421.1016/0005-Fix-build-with-modern-C.patch 1621 BLAKE2B ad1acace062cf2125f4a8dd84b8fc61d94556d910bbe880ff696eaadbdaaf19010ee068d1fbff92835f78bcf23215eb08d20a4baf0597b129d38ffb9cbde0e4f SHA512 a327c3ce7a6871850d8f6ad1ff30b9f4f09697d7823b12ba40a98d11b8ae1db3e73fcce628b56871ceb9b32ac720c7c46f1b9dbd437290baf7d27d820b21a3ae
 AUX conf.d-readahead-list 582 BLAKE2B 992bf29545e2f59f53a5d580b651f38d1b04c38d245a2e1630786175fc3f435bed5106752b3112ab4c11fb246855febc31273fa9fc1b6bb1ccdf926e05b6c9eb SHA512 00d5f750bdcfc1e68c602709575da4c329d22c8b1dd1e2c68ddb587217f4d2f2bca07ccec2bc0db19a47cd7864239a53f86786ee7c09eda438602fa4890bd0ea
-AUX init.d-readahead-list 517 BLAKE2B b7a77a26c679dfb9f1abf11ee53fdf1e2e07a32e22b4200b02f24fb6a4a2d97c3c00b35a9dda5d163105198e613cd2fe8b073c6ba1a024dec5fd097e366a343c SHA512 aede2051cfdc41e6175517af532eb182b760ec61d12dcb756323694d017b1a3488f06db357a18790cd2fbcd951517f69fe0f9d16acd6b8bb6bd486acb926f445
-AUX init.d-readahead-list-early 516 BLAKE2B 61f56105177fa70318a0076ba327f9795023c3f7f8d37d65ddcab999b523c925ce91d98ad85ca6d0a8f05a72ee7daf2ebf29d02f00362b8b7d9416ccc201d520 SHA512 fc06d5008bb37b83e259b0868f168e51619a63aebca9b5105610e029c9130b633ca0bdcf44c7ccd741c13caab11b251bb34f051bcc8f76965ad68eb999c969f1
-AUX readahead-list-1.20060421.1016-gcc-4.3.patch 200 BLAKE2B ba4051a07214477f948af0e1c310b97e43cd7aaed9c1d79b3937da8ea42ad4b604bb69967a15da21dda219e82a5b71ccfa82c947f51f116f3a69ac2e1c67bc22 SHA512 eb292b74e4fdc167a7edaf9d0f3f8ebabd69eff14a18b860ecbe26241708875153dd43ba3bce41a94bd83892093cf8f41d3f7bc421fadaab8a88d9728cb67795
-AUX readahead-list-1.20060421.1016-gcc6.patch 674 BLAKE2B 5749541d931ec45679c3c43fc2afb0b625fa53e54c86f4da413774d6e2cdf8f94f9819e0f802fe27d2ec6bff8dffe368ca72952769d1d6596ae0958030625ebb SHA512 3b070f6ffe5c396c2535e0fb7cbe8ba3ed87dcada1cacc39e9a607298c8a9fa4af37dd0942733b3a6d9bdbf55f6d1ad3916da7ac25bcce3188ce29c76711bdc8
+AUX init.d-readahead-list 512 BLAKE2B 471f1d3a86cce3ffb27728b0d0f76ee3fe49330a09f733fe8be99535c13bde1d93811f8b500c45078d2b1959fce90d92594f4ebc69ef184b08a67388dd326186 SHA512 f734fb3408636e99a51db44600d18363463afcba1ebb02d24d41f8d9f99b046265207d6baf143ae03d1ddd7e14e111722da2dce2c6f612c363d9de2b85169254
+AUX init.d-readahead-list-early 510 BLAKE2B 26ce550c6c09863cf1274ed619b7b5043c4ec10e6819b4db832b4745665fd836524761fb52c12d06290af7ddc444242c87904aab23533085d63b246789d83f27 SHA512 9c7f7c2814df7d8ca05fda46094d9b0c1a308c26dbf152a8d2dff53c28c3ae077dfd9ff58af4a3bab37111dfccc54125ab4c8afa934cfea31d20367fb4be0450
 DIST readahead-list-1.20060421.1016.tar.bz2 108337 BLAKE2B d806e5afd9ba5334522e90cae830496ba3316927a5b2f605834de4b6cd3cbf6a8fbf840e92069546bc526e65d0beac04bc8c6f6dbff5f2fdfc9f033b0f5a2682 SHA512 fa5644be139c37f9464823e20472a607d7ab754259c6545f83cc9679419bf643ee70aebd7aa4d496a8fb349048ba4836e2ac45ae727ade76156b5ad6e6889ec5
-EBUILD readahead-list-1.20060421.1016-r3.ebuild 1459 BLAKE2B 302d0597843d3cbf525d7b55923f6cec864ef888724fb1d65908b0483f3a9ef24b95f247977c374c546ceb2100491c9c71fea53a9503091d51668cb2a7663acb SHA512 b2e8fffd52c93142bc3f7771600d3f034f011e99362fecc595ec4dfbc40a96f52eb0c5b2c13a67d0f6bddc0a77a8d3573e68d1d9fd70dcbe989a05881bf00638
+EBUILD readahead-list-1.20060421.1016-r4.ebuild 1728 BLAKE2B 73ab375b60498c90e11b7c8fb4f2de7e11362b242792e706883cd5b828cb93bb3a7e3bad9369aaf59ebd955a35c3940b2771160e00368a95cf5b2a158513ae77 SHA512 af8217749c3e328f430ea99ee99788c5e3892dc02db0b7254d31543d86b53b839aa400b20b4be98434596de0e25c7c7cb230493b41582f3413c8831fb311c76b
 MISC metadata.xml 414 BLAKE2B b6764a2d07f42adfc6c7e3e22b4ff6168b6f348268af12502ce6710148f6ff5cea76ce83fa72d7063d6c8b9d1b8bc89fb5a067ec9bc60375bdbfd55b6ab7d0ac SHA512 af627ca8684c253508a5c564b1ce7ec0630dc9142a8a1d7dbeea02b62b0475e682191391d1fb2263dd10ec9277ec8d392db744013db1470bc015ae4d30b07df5
diff --git a/sys-apps/readahead-list/files/1.20060421.1016/0001-Modernise-autotools.patch b/sys-apps/readahead-list/files/1.20060421.1016/0001-Modernise-autotools.patch
new file mode 100644
index 000000000000..bd8052139f62
--- /dev/null
+++ b/sys-apps/readahead-list/files/1.20060421.1016/0001-Modernise-autotools.patch
@@ -0,0 +1,44 @@
+https://github.com/robbat2/readahead-list/pull/1
+
+From 8cfc35923827b6f6e3aff9641aa4cb7c4ac7949c Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 25 Dec 2022 20:33:44 +0000
+Subject: [PATCH 1/6] Modernise autotools
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -1,14 +1,14 @@
+ # Copyright (C) 2004-2005 Robin Hugh Johnson <robbat2@orbis-terrarum.net>
+-#  
++#
+ # This file is free software; as a special exception the author gives
+-# unlimited permission to copy and/or distribute it, with or without 
++# unlimited permission to copy and/or distribute it, with or without
+ # modifications, as long as this notice is preserved.
+-# 
++#
+ # This program is distributed in the hope that it will be useful, but
+ # WITHOUT ANY WARRANTY, to the extent permitted by law; without even the
+ # implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
+ 
+-AC_PREREQ(2.59)
++AC_PREREQ([2.71])
+ # version stamp is 0.YYYYMMDD.HHMM in UTC!
+ # date +"1.%Y%m%d.%H%M" -u
+ AC_INIT([readahead-list],[1.20060421.1016],[Robin H. Johnson robbat2@orbis-terrarum.net],[readahead-list])
+@@ -38,11 +38,9 @@ AC_PATH_PROG(SED, sed, sed)
+ AC_PATH_PROG(CMP, cmp, cmp)
+ 
+ AC_CANONICAL_HOST
+-LF_SET_WARNINGS
+ AC_PROG_RANLIB
+ 
+ # Checks for header files.
+-AC_HEADER_STDC
+ AC_CHECK_HEADERS([ errno.h fcntl.h getopt.h linux/fs.h sched.h stdio.h stdlib.h string.h sys/ioctl.h sys/mman.h sys/syscall.h sys/types.h unistd.h ])
+ 
+ # Checks for typedefs, structures, and compiler characteristics.
+-- 
+2.39.0
+
diff --git a/sys-apps/readahead-list/files/1.20060421.1016/0002-Set-D_GNU_SOURCE-for-readahead-to-fix-Wimplicit-func.patch b/sys-apps/readahead-list/files/1.20060421.1016/0002-Set-D_GNU_SOURCE-for-readahead-to-fix-Wimplicit-func.patch
new file mode 100644
index 000000000000..3e368ef40829
--- /dev/null
+++ b/sys-apps/readahead-list/files/1.20060421.1016/0002-Set-D_GNU_SOURCE-for-readahead-to-fix-Wimplicit-func.patch
@@ -0,0 +1,70 @@
+https://github.com/robbat2/readahead-list/pull/1
+
+From 37e699689661249c88a020681a70cd0633ee7ef4 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 25 Dec 2022 20:34:38 +0000
+Subject: [PATCH 2/6] Set -D_GNU_SOURCE for readahead() to fix
+ -Wimplicit-function-declaration
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+readahead-list.c: In function ‘process_file’:
+readahead-list.c:111:17: error: implicit declaration of function ‘readahead’ [-Werror=implicit-function-declaration]
+  111 |                 readahead(fd, (loff_t)0, (size_t)buf.st_size);
+      |                 ^~~~~~~~~
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -40,6 +40,9 @@ AC_PATH_PROG(CMP, cmp, cmp)
+ AC_CANONICAL_HOST
+ AC_PROG_RANLIB
+ 
++# Provides _GNU_SOURCE for readahead()
++AC_USE_SYSTEM_EXTENSIONS
++
+ # Checks for header files.
+ AC_CHECK_HEADERS([ errno.h fcntl.h getopt.h linux/fs.h sched.h stdio.h stdlib.h string.h sys/ioctl.h sys/mman.h sys/syscall.h sys/types.h unistd.h ])
+ 
+--- a/src/filelist-order.cxx
++++ b/src/filelist-order.cxx
+@@ -14,6 +14,9 @@
+ // along with this program; if not, write to the Free Software 
+ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ //
++
++#include <../config.h>
++
+ #include <map>
+ #include <set>
+ #include <iostream>
+@@ -31,7 +34,6 @@
+ 
+ #include <fcntl.h>
+ #include <linux/fs.h>
+-#include <../config.h>
+ 
+ #ifndef BUFFER_SIZE
+ #define BUFFER_SIZE 2048
+--- a/src/readahead-list.c
++++ b/src/readahead-list.c
+@@ -19,6 +19,7 @@
+ // Based on code originally written by Erich Schubert <erich@debian.org>.
+ // $Header: /code/convert/cvsroot/infrastructure/readahead-list/src/readahead-list.c,v 1.5 2006/04/21 10:13:54 robbat2 Exp $
+ 
++#include <../config.h>
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <unistd.h>
+@@ -31,7 +32,6 @@
+ #include <sched.h>
+ #include <string.h>
+ #include <errno.h>
+-#include <../config.h>
+ 
+ #if __STDC_VERSION__ < 199901L
+ # if __GNUC__ >= 2
+-- 
+2.39.0
+
diff --git a/sys-apps/readahead-list/files/1.20060421.1016/0003-Simplify-setting-up-Large-File-Support-use-AC_SYS_LA.patch b/sys-apps/readahead-list/files/1.20060421.1016/0003-Simplify-setting-up-Large-File-Support-use-AC_SYS_LA.patch
new file mode 100644
index 000000000000..dc1a092eb117
--- /dev/null
+++ b/sys-apps/readahead-list/files/1.20060421.1016/0003-Simplify-setting-up-Large-File-Support-use-AC_SYS_LA.patch
@@ -0,0 +1,43 @@
+https://github.com/robbat2/readahead-list/pull/1
+
+From 9d7b7a13ac265b76bb7933072a20bf462e5377a6 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 25 Dec 2022 20:35:38 +0000
+Subject: [PATCH 3/6] Simplify setting up Large File Support (use
+ AC_SYS_LARGEFILE)
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -13,18 +13,15 @@ AC_PREREQ([2.71])
+ # date +"1.%Y%m%d.%H%M" -u
+ AC_INIT([readahead-list],[1.20060421.1016],[Robin H. Johnson robbat2@orbis-terrarum.net],[readahead-list])
+ 
+-LFS_CPPFLAGS="-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE"
+ WARN_CFLAGS="-Wall -W"
+ CFLAGS="$CFLAGS $WARN_CFLAGS"
+ CXXFLAGS="$CXXFLAGS $WARN_CFLAGS"
+-CPPFLAGS="$CPPFLAGS $LFS_CPPFLAGS"
+-export CFLAGS CXXFLAGS CPPFLAGS
++export CFLAGS CXXFLAGS
+ 
+ AC_CONFIG_AUX_DIR(config)
+ AC_CONFIG_HEADERS([config.h])
+ AM_INIT_AUTOMAKE([dist-bzip2])
+ 
+-
+ # Checks for programs.
+ AC_PROG_AWK
+ AC_PROG_CC
+@@ -43,6 +40,8 @@ AC_PROG_RANLIB
+ # Provides _GNU_SOURCE for readahead()
+ AC_USE_SYSTEM_EXTENSIONS
+ 
++AC_SYS_LARGEFILE
++
+ # Checks for header files.
+ AC_CHECK_HEADERS([ errno.h fcntl.h getopt.h linux/fs.h sched.h stdio.h stdlib.h string.h sys/ioctl.h sys/mman.h sys/syscall.h sys/types.h unistd.h ])
+ 
+-- 
+2.39.0
+
diff --git a/sys-apps/readahead-list/files/1.20060421.1016/0004-filelist-order.cxx-Add-missing-cstdlib-include-for-e.patch b/sys-apps/readahead-list/files/1.20060421.1016/0004-filelist-order.cxx-Add-missing-cstdlib-include-for-e.patch
new file mode 100644
index 000000000000..c9a23e309b66
--- /dev/null
+++ b/sys-apps/readahead-list/files/1.20060421.1016/0004-filelist-order.cxx-Add-missing-cstdlib-include-for-e.patch
@@ -0,0 +1,22 @@
+https://github.com/robbat2/readahead-list/pull/1
+
+From f0f32adfb4eaf26e33fc1655a22a529961257db9 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 25 Dec 2022 20:38:01 +0000
+Subject: [PATCH 4/6] filelist-order.cxx: Add missing <cstdlib> include for
+ exit()
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/src/filelist-order.cxx
++++ b/src/filelist-order.cxx
+@@ -17,6 +17,7 @@
+ 
+ #include <../config.h>
+ 
++#include <cstdlib>
+ #include <map>
+ #include <set>
+ #include <iostream>
+-- 
+2.39.0
+
diff --git a/sys-apps/readahead-list/files/1.20060421.1016/0005-Fix-build-with-modern-C.patch b/sys-apps/readahead-list/files/1.20060421.1016/0005-Fix-build-with-modern-C.patch
new file mode 100644
index 000000000000..7c456001e404
--- /dev/null
+++ b/sys-apps/readahead-list/files/1.20060421.1016/0005-Fix-build-with-modern-C.patch
@@ -0,0 +1,50 @@
+https://github.com/robbat2/readahead-list/pull/1
+
+From 4a22080a30c8906f99eb5899218b9a5f1291b634 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sun, 25 Dec 2022 20:57:43 +0000
+Subject: [PATCH 5/6] Fix build with modern C++
+MIME-Version: 1.0
+Content-Type: text/plain; charset=UTF-8
+Content-Transfer-Encoding: 8bit
+
+```
+filelist-order.cxx: In function ‘void printItem(std::pair<mapkey*, const char*>, std::vector<OrderField*>*)’:
+filelist-order.cxx:276:37: error: unable to find string literal operator ‘operator""fmt’ with ‘const char [3]’, ‘long unsigned int’ arguments
+  276 | #define case_entry(fmt,func) printf("%s"fmt,(first ? "" : " "),func_##func(mk)); break;
+      |                                     ^~~~~~~
+```
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/src/filelist-order.cxx
++++ b/src/filelist-order.cxx
+@@ -15,8 +15,6 @@
+ // Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
+ //
+ 
+-#include <../config.h>
+-
+ #include <cstdlib>
+ #include <map>
+ #include <set>
+@@ -36,6 +34,8 @@
+ #include <fcntl.h>
+ #include <linux/fs.h>
+ 
++#include <../config.h>
++
+ #ifndef BUFFER_SIZE
+ #define BUFFER_SIZE 2048
+ #endif
+@@ -275,7 +275,7 @@ void printItem(PAIR_COMPLETE_TYPE p,vector <OrderField*> *ofa) {
+ 					continue;
+ 				}
+ 				OrderField of = *ofp;
+-#define case_entry(fmt,func) printf("%s"fmt,(first ? "" : " "),func_##func(mk)); break;
++#define case_entry(fmt,func) printf("%s" fmt,(first ? "" : " "),func_##func(mk)); break;
+ 				switch(of.type) {
+ 					case ST_DEV: case_entry("%lld",ST_DEV);
+ 					case ST_INO: case_entry("%lld",ST_INO);
+-- 
+2.39.0
+
diff --git a/sys-apps/readahead-list/files/init.d-readahead-list b/sys-apps/readahead-list/files/init.d-readahead-list
index fa5d7fab8eb5..b9156acb7071 100644
--- a/sys-apps/readahead-list/files/init.d-readahead-list
+++ b/sys-apps/readahead-list/files/init.d-readahead-list
@@ -11,7 +11,7 @@ depend() {
 
 start() {
 	# force reading
-	source /etc/conf.d/readahead-list
+	. /etc/conf.d/readahead-list
 
 	f="${READAHEAD_LIST_call_main}"
 	ebegin "readahead(2): ${f}"
diff --git a/sys-apps/readahead-list/files/init.d-readahead-list-early b/sys-apps/readahead-list/files/init.d-readahead-list-early
index dba700c6d398..3a0ff17f4c14 100644
--- a/sys-apps/readahead-list/files/init.d-readahead-list-early
+++ b/sys-apps/readahead-list/files/init.d-readahead-list-early
@@ -2,7 +2,6 @@
 # Copyright 2005 Robin H. Johnson <robbat2@orbis-terrarum.net>
 # Distributed under the terms of the GNU General Public License v2
 
-
 depend() {
 	after checkroot
 	# this should start as early as possible
@@ -12,7 +11,7 @@ depend() {
 
 start() {
 	# force reading
-	source /etc/conf.d/readahead-list
+	. /etc/conf.d/readahead-list
 	f="${READAHEAD_LIST_call_early}"
 	ebegin "readahead(2): ${f}"
 	/sbin/readahead-list ${f}
diff --git a/sys-apps/readahead-list/files/readahead-list-1.20060421.1016-gcc-4.3.patch b/sys-apps/readahead-list/files/readahead-list-1.20060421.1016-gcc-4.3.patch
deleted file mode 100644
index ccee025dcbf8..000000000000
--- a/sys-apps/readahead-list/files/readahead-list-1.20060421.1016-gcc-4.3.patch
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/src/filelist-order.cxx
-+++ b/src/filelist-order.cxx
-@@ -19,6 +19,7 @@
- #include <iostream>
- #include <fstream>
- #include <vector>
-+#include <cstdlib>
- 
- #include <assert.h>
- #include <string.h>
diff --git a/sys-apps/readahead-list/files/readahead-list-1.20060421.1016-gcc6.patch b/sys-apps/readahead-list/files/readahead-list-1.20060421.1016-gcc6.patch
deleted file mode 100644
index a987e4aa767d..000000000000
--- a/sys-apps/readahead-list/files/readahead-list-1.20060421.1016-gcc6.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-filelist-order.cxx:276:37: error: unable to find string literal operator ‘operator""fmt’ with ‘const char [3]’, ‘long unsigned int’ arguments
-
-https://bugs.gentoo.org/594092
-
---- a/src/filelist-order.cxx
-+++ b/src/filelist-order.cxx
-@@ -273,7 +273,7 @@ void printItem(PAIR_COMPLETE_TYPE p,vector <OrderField*> *ofa) {
- 					continue;
- 				}
- 				OrderField of = *ofp;
--#define case_entry(fmt,func) printf("%s"fmt,(first ? "" : " "),func_##func(mk)); break;
-+#define case_entry(fmt,func) printf("%s" fmt,(first ? "" : " "),func_##func(mk)); break;
- 				switch(of.type) {
- 					case ST_DEV: case_entry("%lld",ST_DEV);
- 					case ST_INO: case_entry("%lld",ST_INO);
diff --git a/sys-apps/readahead-list/readahead-list-1.20060421.1016-r3.ebuild b/sys-apps/readahead-list/readahead-list-1.20060421.1016-r4.ebuild
index f75dd67ab1d3..1c06ff2d1e17 100644
--- a/sys-apps/readahead-list/readahead-list-1.20060421.1016-r3.ebuild
+++ b/sys-apps/readahead-list/readahead-list-1.20060421.1016-r4.ebuild
@@ -1,11 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
+
+inherit autotools
 
 DESCRIPTION="Preloads files into the page cache to accelerate program loading"
 HOMEPAGE="https://github.com/robbat2/readahead-list"
 SRC_URI="mirror://gentoo/${P}.tar.bz2"
+
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ppc x86"
@@ -14,10 +17,16 @@ IUSE="doc"
 DEPEND="virtual/os-headers"
 
 PATCHES=(
-	"${FILESDIR}/${P}-gcc-4.3.patch"
-	"${FILESDIR}/${P}-gcc6.patch"
+	"${FILESDIR}/1.20060421.1016/"
 )
 
+src_prepare() {
+	default
+
+	# Drop once ${P}-modernisation.patch is in a release
+	eautoreconf
+}
+
 src_configure() {
 	econf --sbindir=/sbin
 }
@@ -25,33 +34,37 @@ src_configure() {
 src_install() {
 	default
 
-	# init scripts
-	#cd "${S}/contrib/init/gentoo/"
+	# Init scripts
+	#cd "${S}/contrib/init/gentoo" || die
+	#newinitd init.d-readahead-list readahead-list
+	#newinitd init.d-readahead-list-early readahead-list-early
+	#newconfd conf.d-readahead-list readahead-list
 	newinitd "${FILESDIR}"/init.d-readahead-list readahead-list
 	newinitd "${FILESDIR}"/init.d-readahead-list-early readahead-list-early
 	newconfd "${FILESDIR}"/conf.d-readahead-list readahead-list
 
-	# default config
+	# Default config
 	insinto /etc/readahead-list
-	cd "${S}/contrib/data"
+	cd "${S}/contrib/data" || die
 	newins readahead.runlevel-default.list runlevel-default
 	newins readahead.runlevel-boot.list runlevel-boot
 	newins readahead._sbin_rc.list exec_sbin_rc
 
 	# docs
-	cd "${S}"
+	cd "${S}" || die
 	if use doc; then
 		docinto scripts
 		dodoc contrib/scripts/*
 	fi
-	# clean up a bit
-	find "${D}/usr/share/doc/${PF}/" -type f -name 'Makefile*' -exec rm -f \{\} \;
+
+	# Clean up a bit
+	find "${ED}/usr/share/doc/${PF}/" -type f -name 'Makefile*' -exec rm -f \{\} \;
 }
 
 pkg_postinst() {
 	einfo "You should add readahead-list to your runlevels:"
 	einfo "  rc-update add readahead-list-early boot"
 	einfo "  rc-update add readahead-list boot"
-	einfo "Also consider customizing the lists in /etc/readahead-list"
+	einfo "Also consider customizing the lists in ${EROOT}/etc/readahead-list"
 	einfo "for maximum performance gain."
 }
diff --git a/sys-apps/rename/Manifest b/sys-apps/rename/Manifest
index d5c54d3695fb..ad14453eb9b1 100644
--- a/sys-apps/rename/Manifest
+++ b/sys-apps/rename/Manifest
@@ -2,5 +2,5 @@ AUX rename-1.3-build.patch 172 BLAKE2B 47ae1d23ce99ad6ef2099bd6484cfad23a7aa46cd
 AUX rename-1.3-gcc44.patch 330 BLAKE2B c574203c3df6d984de18dda43512ac3f91165789ee6a7525824d2ac0a11403a53e33a31dc843eb295b31c8119ced7bc3f0393482e60003673c9cf83d43d78b80 SHA512 5a40ab4c81b4c197af051e01682f4fbb580b3fea9287539f601b4c07c6155c3aba802e38752566f9d2a41239cf2d20d748bfd64d2f7007eff578344cd12852c9
 AUX rename-1.3-rename.patch 2345 BLAKE2B 7c7e513726d482c8243e64d1f414c242f8f3b49e2a028567fcee0ae2acf65af4e50f63ffb1a3b6b9740544970e2b648e3c5795e5d60224103a776b6f8bd1b08a SHA512 6d0d757c3991448a1937480bb5c1cd219b681e7cbb9b1fbdb27097715cac04b2d2c0bb0b9c77ab2b131f6bbb8e0774f4da5845e815918d4de6faf96f218adb47
 DIST rename-1.3.tar.gz 83854 BLAKE2B 2dedb5f7765f9f44da1efe61b2152c56b2d3731a2787a89677792434663252f4a0f22c3c2703211fd1c7f0017e98a7e566e369c13a4affeeea62843278d9e940 SHA512 7959ef0417d02aecd23200fbc226acd0cc34595d16efdb931657c2292ec2a0b9ff794406b6baa5234db5c95b1eae8a1dcf1862936a40e66bb70710154c89e5dd
-EBUILD rename-1.3-r2.ebuild 885 BLAKE2B 0672e6f4f0dc94b709f7cbaa03878316db1a0329af18650e45da88464534c6b017321954a72412106043a887669305334820edbc866b7c1e4c8b7e15a4d81a5c SHA512 7419f53b7a50fd328e5bdb9c53bb03816025d87dda82ef6f927f7a29ac4281c6120d671f1edb5e0d131baf60c3707c3291daf449f9eb50333fbad1eda82784c8
+EBUILD rename-1.3-r3.ebuild 923 BLAKE2B e0ad8dd31add6fe0ca33d43b3882f3a4ab71a9f8d85c0bd61a12e247befb78dbd27de080a6dc2658d25d8a5aaf6c263b8caa202690e391651fd4275e52547b7e SHA512 b5741426fe6e69c024ad8489eea6de5e862651e4b9666d218b95b78a88a474733418b3b9299ecffb5207a087d07e8234465415e9a19d18c8ba74c0d99cdd4510
 MISC metadata.xml 327 BLAKE2B d5e4b2a40f939e0a95fdfcd866a09e0b46a354ae87edcaddfff9cdbe90aa48c61156ac5b076b78def23334629a9bfb52f62e36d49e2593483815d08cf6e5fb09 SHA512 a1fee1ceaa34fff005847b5e8f31c4e8a68048f6bb8a81547379f6d0f03712f72dc8f3478d63c72f69f1f99a61b7fea6695c0a46b995865a0fbdbb9a1ac0d950
diff --git a/sys-apps/rename/rename-1.3-r2.ebuild b/sys-apps/rename/rename-1.3-r3.ebuild
index 57f4b006dfbe..0b6df9d1ad66 100644
--- a/sys-apps/rename/rename-1.3-r2.ebuild
+++ b/sys-apps/rename/rename-1.3-r3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Easily rename files"
 HOMEPAGE="http://rename.sourceforge.net/"
@@ -13,7 +13,7 @@ LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ~ia64 ppc ppc64 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 
-MY_PATCHES=(
+PATCHES=(
 	"${FILESDIR}"/${P}-rename.patch
 	"${FILESDIR}"/${P}-build.patch
 	"${FILESDIR}"/${P}-gcc44.patch
@@ -22,13 +22,21 @@ MY_PATCHES=(
 DOCS=( README ChangeLog )
 
 src_prepare() {
-	default
 	sed -i \
 		-e '/^CFLAGS/s:-O3:@CFLAGS@:' \
 		-e '/strip /s:.*::' \
 		Makefile.in || die
-	eapply "${MY_PATCHES[@]}"
+
+	default
+
+	# Clang 16
+	eautoreconf
+}
+
+src_configure() {
 	tc-export CC
+
+	default
 }
 
 src_install() {
diff --git a/sys-apps/setserial/Manifest b/sys-apps/setserial/Manifest
index 62db9c104c04..56eb9d06afa0 100644
--- a/sys-apps/setserial/Manifest
+++ b/sys-apps/setserial/Manifest
@@ -1,10 +1,11 @@
 AUX serial-2.17-r4 504 BLAKE2B 7167acdc403f238a64ebb9dadbec651334d1773276027f490f8c93bd6c263ff1831b1cf63c6895c93db96c7810cc328d8a6dfca82ff07cbd87b90a617e863b10 SHA512 91e8be9fafdefc5dbdde832c3d0c85c5b99203fba65f1e934b390efc4c19ca74ec5fd5656f389152fa2b46e7d74d7cce33728a01d6b3413bc398f33a7dc19378
 AUX setserial-2.17-build.patch 322 BLAKE2B 4d3c8a303a6d56219caaaf529653cf43c817fdecaa068c93f449d792f68abd484d06dad67f17dfa7d9e50d79eca85ab465aa66305b1606423bf91962486af523 SHA512 558843dc66398c6050e9fe4b26b18ece2c100a3bab746b6bcc538c92639bd3a8bb05f132e37a1d9601c030da2ce16c8736696ed013d8a663ab353c8cbcbd5ced
-AUX setserial-2.17-darwin.patch 755 BLAKE2B dd5fdc5255f9f183c3e434e7d52a54aa1f4ec85ea136da3d3c29bbfd2051aac214ae05072822c6b6874fbcfbfca457a2bf113077925b626958b31570e75ad860 SHA512 de95f5c0c7a5b371b97919091c60450bdeb8ebf543882def97537d558b540dc830699abe5d6b6bf341f74bd172273504eb7ede538b652cd1da7702c4d39f1bd2
+AUX setserial-2.17-darwin.patch 686 BLAKE2B 7d03f13945e4f24fb14ad4c1c8c9e2969a826738a300833f5ac8a1304ad34885324324a5deb1564ea5990dce16815d7684c106ef11aa2239eb4d0154702966b7 SHA512 8494068948962fae0203babb63558c4cff726feb555802098c4e589c623ea2c65828af839f5f576145dfed3c5f6ad45eb0882b1643888f695197b4d775db986f
 AUX setserial-2.17-hayes-esp.patch 278 BLAKE2B 33ced60bdeecb7973415aa5df54bc75acb365328e4632d9aa17d6c702bbd5687dd2287b59df6ed60814de775141aaf8a443f264ebe75d4c40fbeb336d89ea1d6 SHA512 f7e272d3acae953823550dc84c0fdc1e5cb33c7417fb44fedd5b13a211926ac51cb82eeaa19005f0d1a6b41edf365452016dfa5768891a7bc5028d910e8bbd47
 AUX setserial-2.17-headers.patch 236 BLAKE2B 06ba0f4ad6ecc3788115b02fa4f5762b2724253114c3e9ee72e17fde6b9211b276b634dce4fd33202c66f580e8f9bfa7e3cf2c77d13ef2246e4af8e36d8bc41d SHA512 1c849d17fe67fedda59d8cd11015339131ce09dd280e1a5df67726009bbe974693bdd006c5f16dc1f76f37d48e84b4997dbe65446059ac54aad7551cb3972009
+AUX setserial-2.17-implicit-int-clang16.patch 237 BLAKE2B 549b19c81e3f66c207409eb7475ddda8a540d4302b16aee7999c55369ec30c2580b15b5f88c7df31c236e3e68953fb4d7c8a554ee1e17ca18a23a428daa5c3ab SHA512 56fdb90860fd2f15844933b164a6df808b78cfddabe033b00e96ec378b07dc66f953bf33f38f8824f40fb32d05e612970266f7430bd44c46396e348753f20417
 AUX setserial-2.17-manpage-updates.patch 1015 BLAKE2B aa164a5d52aa2a479f1815c2adcb7adc8e04f6d20594395cc01e821364d04aeb02608644c88e511453599af451d00dda8c8ab54bdd1710030cbdc7833c32286f SHA512 6041894014b3d139a8c2d59460003310c17aee407dab2fa3713f98ea2c29fd347906f68f3d988f052cbee45de43fa00afadc4359b562bfd34fd4931b48505cf8
 AUX setserial-2.17-spelling.patch 257 BLAKE2B 522183e8792b4f9bf814563d847bb06b954e75e6443d987fb6ceed534288734597385589a9c9aea9678a439d952742ccb2856e31c50e4798c5ead6bd554f237f SHA512 7511c46d4676cdd34d8abb0c124ca514d9d970078ea1cd03396b7e9699ec3fc2c0ff3ff04f01a50dd3fe28244ce75078566f8fe21aca89d063b939f1c2cb354c
 DIST setserial-2.17.tar.gz 52437 BLAKE2B 0f01611db185f2d55333ff3b4d29ca19e53bef414ed3b5c735f21a724670c6cb8d00e817f5afcf7d1924faae0ad2c2a20b8d0d844468f898dbc6c7800eba42fe SHA512 27b4918d303302dfdbca2f8c4fe500685068cfbf3de70b4907bac5a9cdb2e643656c1d821e714c08723abcfbaf99129866002117450bef731a0a09cd38138645
-EBUILD setserial-2.17-r5.ebuild 960 BLAKE2B 26d902599bb196e1fa05350b27debf041f9d970754b24d6c3b8f992105bd3ca97c39333378346cbad80ee07d50648e83b5f7ceb9cc1c39ee38cb67994c898ec3 SHA512 d8265a1eba44c193543e3e203db3749543bd37704d70c89abcc29ac463736c61495256974eab8c6f8a399c258b8d9ba12ac73a47cdd3bcaa285408becbc80f17
+EBUILD setserial-2.17-r6.ebuild 1134 BLAKE2B fbb67d0beb82c72e1c7484b2af77728a7d3c68607b2dcdface442067628532ce89bc1dbf4bb9a4db369fd9f3d4edcb015d62e57506051a0b75bd1c3b418662ac SHA512 644adffb8e46c870570d0ccfe21754614c9e9ba42846f8023098ea04038a7c66a03b358ba3e0366b14406deb69baab90ca2ebb5ce874666ed4fa4546c4e1c354
 MISC metadata.xml 330 BLAKE2B 911c480b4963e51f555f0ae07e9795194bd381ca1bfb86e1e1760187e676c7683e039193c58a86d18f167a6f80d214435f611193a7145a3068f5e13f3eb80799 SHA512 34422f5f444bc2fdb4bea8fed7e434d57d5aa54bb0b00ca24dcfc1f9431d7c661807405ecb091f58b59b2a3d39e544f4a423ab7f2ab063251daa030823f47cdb
diff --git a/sys-apps/setserial/files/setserial-2.17-darwin.patch b/sys-apps/setserial/files/setserial-2.17-darwin.patch
index 681f793383cd..3f1fa684ba8c 100644
--- a/sys-apps/setserial/files/setserial-2.17-darwin.patch
+++ b/sys-apps/setserial/files/setserial-2.17-darwin.patch
@@ -1,8 +1,6 @@
 https://541536.bugs.gentoo.org/attachment.cgi?id=397618
 https://bugs.gentoo.org/show_bug.cgi?id=541536
 
-diff --git a/setserial.c b/setserial.c
-index 3474402..3ce8009 100644
 --- a/setserial.c
 +++ b/setserial.c
 @@ -31,6 +31,25 @@
diff --git a/sys-apps/setserial/files/setserial-2.17-implicit-int-clang16.patch b/sys-apps/setserial/files/setserial-2.17-implicit-int-clang16.patch
new file mode 100644
index 000000000000..62d6b6411259
--- /dev/null
+++ b/sys-apps/setserial/files/setserial-2.17-implicit-int-clang16.patch
@@ -0,0 +1,11 @@
+--- a/setserial.c
++++ b/setserial.c
+@@ -738,7 +738,7 @@ fprintf(stderr, "\t* port\t\tset the I/O port\n");
+ 	exit(1);
+ }
+ 
+-main(int argc, char **argv)
++int main(int argc, char **argv)
+ {
+ 	int	get_flag = 0, wild_intr_flag = 0;
+ 	int	c;
diff --git a/sys-apps/setserial/setserial-2.17-r5.ebuild b/sys-apps/setserial/setserial-2.17-r6.ebuild
index 2fddb3b824a0..828b89ea43da 100644
--- a/sys-apps/setserial/setserial-2.17-r5.ebuild
+++ b/sys-apps/setserial/setserial-2.17-r6.ebuild
@@ -1,15 +1,16 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
-inherit toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Configure your serial ports with it"
 HOMEPAGE="http://setserial.sourceforge.net/"
 SRC_URI="
 	ftp://tsx-11.mit.edu/pub/linux/sources/sbin/${P}.tar.gz
-	ftp://ftp.sunsite.org.uk/Mirrors/tsx-11.mit.edu/pub/linux/sources/sbin/${P}.tar.gz"
+	ftp://ftp.sunsite.org.uk/Mirrors/tsx-11.mit.edu/pub/linux/sources/sbin/${P}.tar.gz
+"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -22,8 +23,18 @@ PATCHES=(
 	"${FILESDIR}"/${P}-build.patch
 	"${FILESDIR}"/${P}-hayes-esp.patch
 	"${FILESDIR}"/${P}-darwin.patch
+	"${FILESDIR}"/${P}-implicit-int-clang16.patch
 )
 
+src_prepare() {
+	default
+
+	sed -i -e 's:configure.in:configure.ac:' Makefile.in || die
+
+	# Clang 16
+	eautoreconf
+}
+
 src_compile() {
 	tc-export CC
 	emake "${PN}"
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 51448aaee496..87e7a9c17d9d 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -10,5 +10,5 @@ DIST shadow-4.12.3.tar.xz.asc 488 BLAKE2B b23525c3303f78df9d046c0225ed3ee1715cb0
 DIST shadow-4.13.tar.xz 1762908 BLAKE2B 315ab8a7e598aeefb50c11293e20cfa0982c3c3ae21c35ae243d09a4facf97a13c1d672990876e74ef94f5284402acf14997663743e2aaefa6cfc4369b7d24dc SHA512 2949a728c3312bef13d23138d6b79caf402781b1cb179e33b5be546c1790971ec20778d0e9cd3dbe09691d928ffcbe88e60da42fab58c69a90d5ebe5e3e2ab8e
 DIST shadow-4.13.tar.xz.asc 488 BLAKE2B de1f8285c5713a772343a2a7c638d1d13429dd4fa867d4f91d4922aa0d083b4a3110d38e8a8ab82137fdf4fecb12ba3677f3fb235401fc6438ae663fbd9bfbd2 SHA512 f8549c4e699c65721d53946d61b6127712572f7ad9ee13018ef3a25307002992aa727471c948d1bb22dcddf112715bed387d28f436123f30e153ae6bc0cd3648
 EBUILD shadow-4.12.3.ebuild 6482 BLAKE2B bc7bc19a961369429b2850e04957c3c4b66aa6b57482897f051b4f93e9ca68c0dc1979e75b3323e498ed6da8bed01f0e56605a4fed0edb58f90e3ad8de9c42e7 SHA512 842e434b064fc30675805c360c1ff73830c9d01016d5f9a8f74ba70d0892f48de8e792e963d25b82db2d75380a51fcfd0789fc655f85e720f9c86d5bfc081192
-EBUILD shadow-4.13-r1.ebuild 6658 BLAKE2B 6b124e978a6107dd2425c40450589b58252c33a2574deab3269c8032e6c09d5d8ddc494bdf57ab9e11d0f43d91977a31bead094a33fcc3696322d1cfd7d612ed SHA512 0a0e1e6c38f8ff7a1c325b8afe7f067a1e383833efbc09e44dcc6a40fee5d9a5ceb233a270d522833c7cf34275a2f36bc4fcb7c7c5bcd4744a151f5004759a4d
+EBUILD shadow-4.13-r1.ebuild 6653 BLAKE2B e579924e5b567f04c7fec826d9457703b1c7c42dc4ac05e2b2d81ec63acf6e47d7dc86b4eaf335517391ed3d3bcd9076bb07a3f083380fb26d0b4d752f6369e6 SHA512 50f3644a6e15a0c173761a77831bd09f15b311a01760f1ab3669ddc6a0ec757199a98673873b99ce904a2909c5d1b201f7a4e58416db6a83871518ec6e8ad86b
 MISC metadata.xml 606 BLAKE2B 2b14042f4702a908f8250c3fb6499ea33d8a8c44072707aa44881a36e3cc710256a821f8cd82c5214b32e9f5632745db4fdf00dd722f6fb7401e2f6b0bfbb4fd SHA512 694e039ae781982e8cbe6670b4e9c93b43455715ce4b9830a5fa61e6bf3eb91abcc284bf29c64fab055ba9754edaeab5d2da8140dbb2794fc1f534e2ccbb2b16
diff --git a/sys-apps/shadow/shadow-4.13-r1.ebuild b/sys-apps/shadow/shadow-4.13-r1.ebuild
index 16d90343c084..51e650331e2a 100644
--- a/sys-apps/shadow/shadow-4.13-r1.ebuild
+++ b/sys-apps/shadow/shadow-4.13-r1.ebuild
@@ -18,7 +18,7 @@ SRC_URI+=" verify-sig? ( https://github.com/shadow-maint/shadow/releases/downloa
 LICENSE="BSD GPL-2"
 # Subslot is for libsubid's SONAME.
 SLOT="0/4"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="acl audit bcrypt cracklib nls pam selinux skey split-usr su xattr"
 # Taken from the man/Makefile.am file.
 LANGS=( cs da de es fi fr hu id it ja ko pl pt_BR ru sv tr zh_CN zh_TW )
diff --git a/sys-apps/usbredir/Manifest b/sys-apps/usbredir/Manifest
index 40e34f8fed13..6e8bbac98d16 100644
--- a/sys-apps/usbredir/Manifest
+++ b/sys-apps/usbredir/Manifest
@@ -1,5 +1,5 @@
 DIST usbredir-0.12.0.tar.bz2 70102 BLAKE2B c6891e14a7951520066fdc7e8095c905599aa3186c72ff378d25e46335843df6daa746937619f8bcb9e60447f19ce671317e9b21e6ce127d2b977d82cb39a337 SHA512 586465d3a18c3bbf621e6b7d1dc24edb333e00491dbd0d0dc781a9e0640f3483a8abf73c55d4ad76b3be0a27a4b1801d08dffb77db3f9aab2234039a60a605ca
 DIST usbredir-usbredir-0.13.0.tar.bz2 68836 BLAKE2B c0efabd12dec51bffa6e639db0a82547ec5c93ca649de823a6240373154d0929df599924ab3868d24ad74c7795202ad92ff1221589f37799944e34424acadf2d SHA512 b71eb1814ef456bebf62bac2e273f9a41b1451ae50941018c36d79298d74ac29c1137b66a4a928fd46c1fcd2905b83d3774fab703d88f9ea7e3e4e14420958ca
 EBUILD usbredir-0.12.0.ebuild 702 BLAKE2B a0f54f19b14c44174e742c1e5193a629fe54829482c62b08253993ce3987977ae4de06b03607ba658900476920296a4b01f24a31ea6062b8cf5908cad6b5a65e SHA512 88b3087854b7f3d2d75e7e0b7930398f8eecef24fabbec7fd6d5041a1b1741d3610820d87a13208d07abd0da71a0b1ef12ecda91463dd73a827955c99af7adec
-EBUILD usbredir-0.13.0.ebuild 698 BLAKE2B cf14101668c7dd4c477f2812b32a3354ff7902e62086eec227b0f857b024ea69fdb3616e5532fee14d65703cb8cb083867f3fda4156c2a5f31fc499d16c0d7ac SHA512 7742aec97ad149705827df9535a221e61b4cc52e7d7f4def8ab678c3e7bf7546cb942cd5c7e9764a7dd89040bbfdd06055b98889f48d1294cf3092b15820caaa
+EBUILD usbredir-0.13.0.ebuild 692 BLAKE2B bfa7aacf90bb5056921c0af4ad54dbfe7c119a8f36790f3e9e24096658797f11e065fdd3b385cc5a455e2a98cb52e9ee14fc81a9f0eba69fc7efec9e127936cc SHA512 760376eb2116f67e758543a963f7e7ae11cedef9fb20062bd366af434082d7654efe080ef40a81d83d73e9b84586fe618b404cf535e59f0e48b6b857d93bda70
 MISC metadata.xml 481 BLAKE2B 705eee8b08c628f347b7f31d7f45b2323660442520fd6644a41ca16bf28605f904b80a451e3821fbfe07362d09242bf2b041067ba19563052385f61efd5d67be SHA512 8d68d6428971fed1283fd6d0eb91819cf9b87a9b00efb228e437115d636f4eb7c3c1c6d07fb11697a3a6b825f1975b53431068675df0624be3a55ffed9efaf50
diff --git a/sys-apps/usbredir/usbredir-0.13.0.ebuild b/sys-apps/usbredir/usbredir-0.13.0.ebuild
index b36d0d8391ef..0edea99661f3 100644
--- a/sys-apps/usbredir/usbredir-0.13.0.ebuild
+++ b/sys-apps/usbredir/usbredir-0.13.0.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/usbredir-${P}
 
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 DEPEND="dev-libs/glib:2
 	virtual/libusb:1"
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index cd166b02003a..ff269a1fe884 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -7,6 +7,6 @@ DIST util-linux-2.37.4.tar.xz 6114232 BLAKE2B 7f6cd12ec9bc68a6db787be78c1ee19fdf
 DIST util-linux-2.38.1.tar.sign 833 BLAKE2B 2468c6b8c881d7a17666aac954edfd421085111937f5d0daada37a679e9bbfe61fc98bb57cca9bf7bea20be483f38e2a758039f9baf5b1a901852e2b5dd014d8 SHA512 d8b3e936065ae1dc105b8ce773c874bb037ebf84ee571676509543f79c39950180e7f252c6b0d4500119568ed4ac3aa7117793de839f983e9287f26649e91dad
 DIST util-linux-2.38.1.tar.xz 7495904 BLAKE2B a0e86ca62f82adaccc01ad6ec5a058dac429b81c310989cbad136f96c2770c60bbd4287067817520e8e0653146a10f13128e0af32122402bab416e1c2d6680b8 SHA512 07f11147f67dfc6c8bc766dfc83266054e6ede776feada0566b447d13276b6882ee85c6fe53e8d94a17c03332106fc0549deca3cf5f2e92dda554e9bc0551957
 EBUILD util-linux-2.37.4.ebuild 9434 BLAKE2B e5bcbf418867e65ffcecd1348115e68cc611736994e1d2fd648c67d7a6d0ca9572d752871ec41bda9e07c94f99882e730e1c024d358c7bd263a58d2caaefef50 SHA512 ae8e6ed5c350afe109a578716676f4189e1bc02e4ebe1b9ba1beb24daf6e7774edef703fe2187c9d2c0332ff32175922aa170dc959c5ec393f0cb5b7cd7a354a
-EBUILD util-linux-2.38.1.ebuild 10821 BLAKE2B 796146093c56e08c20a174e627ba190c6506c6ebece82c515d6c79023b091cb0dc98454694e8682fcb0ac77c0fa35defd1d722e044e3cf3c39b8cb51ae4c54ba SHA512 cc69ab74eed977731e6352555dfcf8042e2288a196d8130f86c7b0e0973dcb7948750d24b41f5a45f0c5d4c68d22014d3b91387b33af0282af68ccd08cce912c
+EBUILD util-linux-2.38.1.ebuild 10819 BLAKE2B ab78913d856cf1977bd7a275da46f7add90285b08f2b39870e9350319b9b5b770c40c96d7c90c0fb0962b0321efc85ffcf433363b2534404d006d79e893eb829 SHA512 8e451b62d66d373a01dec582d334ecdb9052df0937d9fbbb45aafc5ef83ce88be06e42a5bc669043ffebd546f702baeeeb0778bdaed98fcee9c9888c6e9ed5a0
 EBUILD util-linux-9999.ebuild 10821 BLAKE2B 796146093c56e08c20a174e627ba190c6506c6ebece82c515d6c79023b091cb0dc98454694e8682fcb0ac77c0fa35defd1d722e044e3cf3c39b8cb51ae4c54ba SHA512 cc69ab74eed977731e6352555dfcf8042e2288a196d8130f86c7b0e0973dcb7948750d24b41f5a45f0c5d4c68d22014d3b91387b33af0282af68ccd08cce912c
 MISC metadata.xml 1553 BLAKE2B 1c4a18f6d91be4c90bf2505745cae42f6d249a1295c6a46fc1b8ea08297842b4d3a2aa232e679a167af9fef26730ed71f651b2f71b58cbfe66bd7a5cd3743c3b SHA512 e01d390c983ac47b9a6684f70b11cc796cde1355ae7d4c12406b3d6fc5b0897a9471720844e74fceee1648f4c7d685e6b12f157adc1ad951506acefb7441635c
diff --git a/sys-apps/util-linux/util-linux-2.38.1.ebuild b/sys-apps/util-linux/util-linux-2.38.1.ebuild
index 59eecef07674..bcf9a09b7ac4 100644
--- a/sys-apps/util-linux/util-linux-2.38.1.ebuild
+++ b/sys-apps/util-linux/util-linux-2.38.1.ebuild
@@ -19,7 +19,7 @@ else
 	inherit verify-sig
 
 	if [[ ${PV} != *_rc* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+		KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 	fi
 
 	SRC_URI="https://www.kernel.org/pub/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
diff --git a/sys-apps/xmbmon/Manifest b/sys-apps/xmbmon/Manifest
index 5a805cdcae4c..f16f66f4d020 100644
--- a/sys-apps/xmbmon/Manifest
+++ b/sys-apps/xmbmon/Manifest
@@ -5,5 +5,5 @@ AUX xmbmon-2.0.5-fflush.patch 191 BLAKE2B 38c8a858a89c5c915252be88e81bdf549f4727
 AUX xmbmon-2.0.5-loopback.patch 1185 BLAKE2B 6f5378afac536131daf02173b2330ed29de2003d467d2d55ce6b2908dd8a828fa1355d43a9f4a1a88c3e08c02770920643f8cfa50ff0e7c41ede6741374bb196 SHA512 9f19fa6ea36f12a7d6dcf9a2c87167b612d8cb5d3d81cba7158e92173feb146fff3b2cb02ff30aef328ffb83a6998842a5ded4e1297482d26862e629fec5b37e
 AUX xmbmon-2.0.5-pid.patch 508 BLAKE2B e52468a3a92f051efc6574af4ff124f3f04ba817248b6564bfa633ccb64eb597b3be28f6404185927288119a3d75609e0cfc62317b7faa6a435f652f53eada90 SHA512 caa1a23cd21c33546acbcb703bec778367abde739eed03ab30ffa7051cb2455a9a2fcf776dcbc29109e28a58d2aa2d588b04464d114c083738be45124056515d
 DIST xmbmon205.tar.gz 142987 BLAKE2B 7c39c78068106c828273c077a2a375bfd4dbfa686a4f6b592a986b6cebec6b3e2ae7c9318ecd1b1d91c0757fe7ebb023ac135aa8167b5c86c3e42c1c173cdb72 SHA512 0ee2f3616976af6edc3777391f657d12670be1557f726f67f51edc23866d96d5cd4cfa9ac8aaad52cce2bdd2b9c616efd6edba1a019e4360a0fcaae0aef99a9c
-EBUILD xmbmon-2.0.5-r1.ebuild 1584 BLAKE2B 0e1d72c99a90286ef29d0a6c30c8e5a94dd4a3608a1c94095f762c55bf5c818414ba6468827c8d9491c391ec04c87f54368bafe3a4f21388831c23dff9cee8fe SHA512 76a309b2420916a24a705520c45c50f474a4f59f370a60ac0bf3f850e1131ec36c09ec41ad0593b33e2a2beea8c6f5df18d6a712d0e50f8e42c1aadf26902c2f
+EBUILD xmbmon-2.0.5-r2.ebuild 1595 BLAKE2B aa798374e2f55cae3f67282b1f90f37cdabf20907b06585f18befdcdfef186a3a2602ba7c051327a060e020ced84e51572a3095d220af71fba373e5aa0c0697b SHA512 4dab94f7c14c0ba78ae5971487ca2546f9d71f5715a6480ed96c757bac35093fa55243b80327853bbd038672be5dd4b4d0c7b542b8ddb847c693b4c6490d6075
 MISC metadata.xml 254 BLAKE2B f3a9f843cf94243d1129711770df727fcdc8808bca829ef784819cab6f5410dfa463cfed85182f8228c7de796a674dd602653ad3ef817a62c0c3e7198b23befe SHA512 b9fcd3084a7e197f6138e1ce8b0eff99c4c203c37a7d5c40de207040ba1501ef0e5b2f4e00216a567037bcd6d3394fdec6ff587484c9ba2fca9d04f431733b7c
diff --git a/sys-apps/xmbmon/xmbmon-2.0.5-r1.ebuild b/sys-apps/xmbmon/xmbmon-2.0.5-r2.ebuild
index 9e6a406be1c0..40e0701452e6 100644
--- a/sys-apps/xmbmon/xmbmon-2.0.5-r1.ebuild
+++ b/sys-apps/xmbmon/xmbmon-2.0.5-r2.ebuild
@@ -1,30 +1,31 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 MY_P=${PN}${PV//.}
 
 DESCRIPTION="Mother Board Monitor Program for X Window System"
 HOMEPAGE="http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/download.html"
 SRC_URI="http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/xmbmon/${MY_P}.tar.gz"
-#	http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/xmbmon/${MY_P}_A7N8X-VM.patch
+# http://www.nt.phys.kyushu-u.ac.jp/shimizu/download/xmbmon/${MY_P}_A7N8X-VM.patch
+S="${WORKDIR}"/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="X"
+IUSE="gui"
 
 RDEPEND="
-	X? (
+	gui? (
 		x11-libs/libXt
 		x11-libs/libSM
 		x11-libs/libX11
 		x11-libs/libICE
-	)"
+	)
+"
 DEPEND="${RDEPEND}"
 
-S=${WORKDIR}/${MY_P}
 PATCHES=(
 	# "${DISTDIR}"/${MY_P}_A7N8X-VM.patch
 	"${FILESDIR}"/${P}-fflush.patch
@@ -47,7 +48,7 @@ src_prepare() {
 
 src_compile() {
 	emake mbmon
-	use X && emake xmbmon
+	use gui && emake xmbmon
 }
 
 src_install() {
@@ -55,7 +56,7 @@ src_install() {
 	doman mbmon.1
 	dodoc ChangeLog* ReadMe* mbmon-rrd.pl
 
-	if use X; then
+	if use gui; then
 		dosbin xmbmon
 		doman xmbmon.1x