gentoo resync : 22.06.2019

24 files changed, 44 insertions, 1467 deletions

diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 20a2c949a407..c93beba224b2 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/baselayout-java/Manifest b/sys-apps/baselayout-java/Manifest
index 18252c11f2e6..63800f5f90e8 100644
--- a/sys-apps/baselayout-java/Manifest
+++ b/sys-apps/baselayout-java/Manifest
@@ -1,4 +1,4 @@
 DIST baselayout-java-0.1.0.tar.gz 72571 BLAKE2B 3a41752b1bdc3980fe8690e499738e19ba9c390164fba04d16eba8f85a73557c7f9c15e311fcd738c250ed1226cc143bc933eef14edad0546b27eb5b41cf3bd3 SHA512 6f5b6ff1ed07406711e15a768f5abdf9f7edef1b31e094760f265863aa8991bf60ff71c8b10003265d8ec1aa7c94a611bede96980d25c819908b705b4d2d1062
-EBUILD baselayout-java-0.1.0-r1.ebuild 1347 BLAKE2B bdf44c56186435dfe80cdfdd0690064f1ebc27d75b69fd12b16e20e58d6342f4ec070bb4880e1711146ef296732dc6be286901216f3213b10accfb26bc7bc92a SHA512 caee3c05a64edf4db4ed280ff6ecb8ea3914722a7de7cedbcf7a9e82176d8fc6cbee63321c3a75d743ec4faece972b7d63ec5464cd323f33b43258176d361e41
+EBUILD baselayout-java-0.1.0-r1.ebuild 1345 BLAKE2B 1f1a59dedd3ba52c0b58807c85c01472a4339e0e2b9a7b4a2960db409ac419eff40b95b7e18ba9a4157a5f76cbbe990b1916ec4f33fb540bdecc7e73a8aa9acc SHA512 a004475de5e316846a3d25ca6ef269172deb25806e67c9058927ce89f578e94c8cd94a99486c6ef064eb3316ad662cb7eb612a311f292d69fc795fd09193a74b
 EBUILD baselayout-java-0.1.0.ebuild 693 BLAKE2B 1602030e82d6c609815266571ed6e2569e03742485984367ae504db7976254514f5409eb46553ac87d323eb714f994e5010ce7707eae2e12fe67e941949ea292 SHA512 1acf9e4c15f850b7da3c063dd4145d213f6e8abc41fef1052411ddd5c929044a92a7dd99bdf99ef706d545714c2cf84c5668889350bd1930518d2df5cc3cd1f4
 MISC metadata.xml 232 BLAKE2B 513679b02247d8e4cb4c874abd785119d9ca62ad24c44969d52a42c3765d0ebf689024512a2c4c48e69688a4ce02a74ae05708b050a720bc73d8d2bf2ceff58d SHA512 00beaf2c81112ff757c4395f4ea47e85f2d48e369e241f10ddf200090dd6513d52ae2b1aef6d28b7417f1cf34608a7258a167eb307d5670323a2190f3710f893
diff --git a/sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild b/sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild
index eeba60bf8e9d..d0f4ed03cab4 100644
--- a/sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild
+++ b/sys-apps/baselayout-java/baselayout-java-0.1.0-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~gyakovlev/distfiles/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE=""
 
 BDEPEND="
diff --git a/sys-apps/fd/Manifest b/sys-apps/fd/Manifest
index 9753527cf5a9..f1a4ebd4ab95 100644
--- a/sys-apps/fd/Manifest
+++ b/sys-apps/fd/Manifest
@@ -1,61 +1,39 @@
-DIST aho-corasick-0.6.6.crate 26330 BLAKE2B dbdfcba15832736cf1ec65c9f93943e7ef368fc71e5545e1481788428ce1ebacaf87b4d045cb22695c1738ac6a0c579b38e886a461bd665b07898ca3a7f9e808 SHA512 6ac654a3e670ca53350ae6a4b21f7cc50335a42ac8557f34712575e9e9871991d29e45a45280f8c32a8a44340a54ac33585e7f1ab9b549462002e0ec24da2caa
 DIST aho-corasick-0.6.9.crate 25979 BLAKE2B a1bbec11c322d20d435d8683151b144e31f04b07ca47fc1c8128464533256f4004c8d346fe59a1e1c41be5609fdf768fad5f1afa5df94d1a02ced5c4f02c4bac SHA512 8dfc817b435d8a44fb4ca79bb20e283659c2fe9a75a4892389958f5880acc436bbe32552098429f15585ee025d064fdb5806b814f0e9d67a4261ffd23852172b
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST atty-0.2.11.crate 5916 BLAKE2B e502c23faaa9dd27cc5865b68a721b0403071edb483fca0c745707f4c0ca1b1787b5677b2d8ad7f327b8f5588ba784126ce78496c1db54f7ca4ce0ccea669499 SHA512 9d6417dc1e8abdb4969418525b36c451274fd76769adb57bef9875ef62ef521c50d58626ebc4f96d2bea32cbadb6999fd67653b570293d7253b403b6d0736c79
-DIST bitflags-1.0.3.crate 13838 BLAKE2B d053495250ce43970d4dbca6ec7dd541e5f5ca6597f35b8ac7cae3230e80f95d8f056f3ea030c12dd02228b51184c8020f8d2ab5ee4da4dad88a97638ea3db41 SHA512 c1410967948a0c44c434bcf952c586166cea656f98532980156bce5eb68ea2966ad7457abd2e45e7444d346f47950aad9d6b4d6779486cddfbda70dee5716bd8
 DIST bitflags-1.0.4.crate 15282 BLAKE2B 63f5feb47460c344983cef8822804b1c4ac2f3adfffcf206df2b05fafb9c7bfd73986721cde46705a3e4a0dc72a40683e4d369f2339adfc1b55208bad1766875 SHA512 81850d2be62eabb8486024ab263da67e6eb8ebfa732cac3a5d46a9186c564b2065cba15fa3da468bbd26eaf2b67038680e5de19d5dd99d78f60dae8a1776c8de
-DIST cc-1.0.18.crate 42127 BLAKE2B 158cddc9672713ed156403cf3a9663046978d692aec6b0a0785508d9ee612546e21afcd4cbaf5c9b76aec4c22cc2083615503aea553336cb01533762336fc4f9 SHA512 7e419ed8ad9dd1cf76ac9e7df82f89d93693299a80925f189b96416fd99b0217dd42918e577c0b9dc64c2fd7b6300b81e3b1b4bb176c940cdae4eff4ea303c76
 DIST cc-1.0.29.crate 42386 BLAKE2B 6145e3c18f4db24bb0f8b2bb8903c30623c5c63fc596375ef531fd5832ab5e22e896517022b5927dab756a72a69e33094543c665d6bc768d285307ec3f1fdba0 SHA512 8cfdbe735b547bbcb125ccfa54b4aa5273e8f952345713d42375376a388833bed791d1f28520821faa6586ec4c484ea210f19edafcd8a8c65793aa2fc3cd0756
-DIST cfg-if-0.1.5.crate 7363 BLAKE2B ca668ccdb4cf082d2b874976e6ac38e85e2618430cbb5123f9359e328e38b61e59a492116bd6a9f8ed986796095a763d148291378d32ac3a9e7d501c5ac967fb SHA512 48ab0bb1fe89d6e388ac4bf851b9aaed6479f9ca7da62945e2ebe58800b5201897feaf6aabd2b028110b0205b33d5abca7f02826ab3c688647b944e7140e6d94
 DIST cfg-if-0.1.6.crate 7411 BLAKE2B 0a19f5afaa89acfa7877e06e747c1e73af8b8a9886c97a803fc3d61d075b43f3fee6089c67ed28efe70aaf4082fc21dd5b24ea514fb1d761ba3d939dad496fee SHA512 e393816f659bb5b1e64ebc72a4b6e3e673afd00cba302c3c92c6f2e98db341a29197f6cf413107e569175a86aad85e74a93e2cd3a9fa9fa2d1b70b01c3fcf378
 DIST clap-2.32.0.crate 196073 BLAKE2B c262241a3ad1d0f944467f4ea9884ca3dc05b5e05656fd7b73700e0daeec035c07a5d06316cc1273e37f74f2c00429b0ee99da298804dc4deff9a252ca56ce07 SHA512 ee2a66cec0d867d73fce35c055bcac77cc3ea9537b355be04be3ee17ddabefebfe3649cbdfc30ea356c54cf9f066369540eac4f5dc67e60cdadc9c66be014ef0
-DIST crossbeam-0.3.2.crate 33440 BLAKE2B a5fe9d77b3fcb4ac890b3ccf4e2548cf82c99571961d3960326210ce63dbe8b04e4a5917b57dbb657777288942dec1689387b73e41175b86e013307e057e7257 SHA512 e467a84c3a3655ed1108e2af2ee75dc1fd7bd435dc28fa29e43c055edd26d24d8a5d95edac86fb428e52ba70fcca68ac960952442d0a451568877c371057f0e9
 DIST crossbeam-channel-0.3.8.crate 79923 BLAKE2B dae78c49f0a2c425c20481a9ab1150fa8fc1c1bb8007747f3cfa9b9e763f72c8f440b62f7d6ccc6f5a92ad0545a2b0918d71fd3e7ce1bb4af95c583696d0cda1 SHA512 9b4c4b9345276b0227041a64f7ea4971dcd37ac5a2d404408d7e1875cd9a1318cbbee0cd91d4ba4b73201927ae61cf35382d2c8ef9461f21d71e802d01063583
 DIST crossbeam-utils-0.6.5.crate 31735 BLAKE2B adeec7df0627b73169e04b53883f44b9d4c54f0b97ef2e49cfadc565c5c3324bf3dfe39158a65ec4b6676a8fba2696d43b2ce1aea75fb8bf2120ff4ad9eb45f9 SHA512 5bcf3eed8f28d608b675aa4588b133393ced515e2f7fa37b413b34aa5ee550100899d957906dd04fcaee68cea57d2c8f230e06d6903f5ef117c9313d6cdbc2a8
 DIST ctrlc-3.1.1.crate 12110 BLAKE2B d6dcf6c132d64e5450c834c1e5c032f33be6fbcf2265c727b4541feb92a1d8df31b6c67e667e920a406f26604971e1715946e40d201a90b84d8d9258169443ac SHA512 31e7208a6e6d2b8ff2e00dd9e12cdba3ba9eac24418cd3df137648698bb9489f4bf0b7cb8b28bacf3300c44a6001b4c4fe7f87fc11d3d47e2f0cca7f8b0d70fd
 DIST diff-0.1.11.crate 8165 BLAKE2B 6c651d00120b190b55b334c780ce7724e91f554cf3d85f99d8ae5f745bf4ced2e5b7d7aa307c6d0c2a6082534d238eb213868d3b528ea57a08a5e37ddc7051b8 SHA512 9c31d38bc29c9372984339b8d289317981ba483eee4430e936252b0fc44b1f500305082b19e6dc20b7d7fc81906f1c0d5c3f375b6db9f2c266e41c7015597073
-DIST fd-7.2.0.tar.gz 56838 BLAKE2B 526d5b7388593236810aefb3110da059db6f6a8c33884880f2424847dde30e13a4926ec5bfba97d9614f493fb9173822077daa358f4e55f78ea6d9784c9be721 SHA512 22823904e4a1645a6f248501e507cad6ef08341ac69d0e9675571a202fa2316fe6c85b274fc958676da6a8e26399b26bdb78fdca876146b0e91b4780948d8ca2
 DIST fd-7.3.0.tar.gz 57694 BLAKE2B 2f5fc19117fe0a8a611a8ea2fa1b96e6c9677a5049706908f42132b6f2a1090b92dd080c518a266bdcd17ffc4301282ab073c2d7126459ed4b3ea7c75587d6fa SHA512 48a7a9b41463070d26c76018909c527c4a33efd6b6c7e68184ff1e477bb87483ce7ed49c214893a01de0c57579026fe0616b989d169eed001529d377028371d5
-DIST filetime-0.2.1.crate 11797 BLAKE2B fa8f886afa7f7fea0f543e425bc06ab0bdbfbaccafb7a5bf5234fa1a3433d90398dc42bb24832132d042032e20042495fdc2763f81b8b7244c6b8d8a5e660367 SHA512 749770e2b484c7d1e94beec490ceef2552b7294e3cb5ea67033488800babf7d48898b5d6a0874b113dfe95004322476553249d57349dfc3cb575c26d4ebf5a9d
 DIST filetime-0.2.4.crate 12044 BLAKE2B 563df5750ef95e392f8458c0a23f106eb310d8e8e7253fba6b2b8245afb103a37b505fa41b915691b8f93ac9d6277e2940ee219a4993232781269c9876c5eb24 SHA512 a27ea45b6de09c93a818f56436e49ed358cd7cdab2a39913de159144da239bef14677b5b521633c68bb9a4f38e71d7e2404b6bf628348b3573e509c9440d0863
 DIST fnv-1.0.6.crate 11131 BLAKE2B 220cf5463749b21e1560419ab9b1f235de08dd548c4a9a7fa6190d9516ce7db884f877b67174ee50b66b22be80d3be73ccafca80e06e94e0fa6e96fbb94475f6 SHA512 f1356b3da25f76cb3ccb4336ff54d4967f1dc7523eae6cba21a4349b8ce563516f6a2aa10d626cd5bb6046b55ac2f246e61e4e526a03fad5e78d0ea174841844
 DIST fuchsia-cprng-0.1.1.crate 2950 BLAKE2B 8519407ab5d1f04d03cc946a07050db4dd7bc70e03894e35b9e66910a3be11224084a86ba45103fdec845e94b7ba4defbd7c5217b035a0796c0c4a94b9562cd7 SHA512 ea9f5beb0dfcb023c22cfc2b37ce52dfcf3a2cbbed0f79ffffc332878858386805c65dce8469a431002367562d857a6c064e075688540c27fcb4056a110059d2
-DIST fuchsia-zircon-0.3.3.crate 22565 BLAKE2B a4dac3457036efab8f79fe5d5b4545e4091e994d3dc63188f71fafbcc28bf98ef359dcd20add30ac1d990ab2e66159723302fb66697349c65fab0aa58d54535e SHA512 a43ee59452d49742111e506d6bdd8b8399a3a646e08648e25292864d7f71460c1dd1f2d77b8efa8ed09ac21fa4ff0442a2709f16d8833a3849bde0c388d83a93
-DIST fuchsia-zircon-sys-0.3.3.crate 7191 BLAKE2B 530bb5d475ac828843af248c6bbd24ca3b5dd8118c8884ccc6d7261818cff1c79038077114ffa04bc73a078177527824c4d9d20a9b022e4057afee3330258cff SHA512 978b7e8795a5877a68409ed3a1d7b4246263f8e7e7ce9ba8a022643be98f58f329cc1c234717df80a509db849da4394f39e90a8e2a6f56f8fa8dd3c07e7d4386
-DIST globset-0.4.1.crate 22363 BLAKE2B 8a2c7fbe083bfdb470866bc954579f50944c11d4460ef3d2115f7e523935ba8375c1073346f42d564d1d55f32e4e8fe51fe42fa2e5c31697bd943befefe7c303 SHA512 3cc7fb4b296ebc8c0a20d8080a9cf913ec61f2ed14bd45c2aebd0c73101514b3895123a93c5e1b5037362a74e18057fd6deefb5c91ff3880aa88ca0e1fb9095c
 DIST globset-0.4.2.crate 22474 BLAKE2B 0ae4fb4dcb52822a7c46d8e078ecac18775c1125c905e0769c0b204c2aa606828d902f4c0996899114e57ca39c42b43fa892d68f6ae7cd25f1ae58b71af74d89 SHA512 53b8d9cce33258882b8ad2bff526b31a94322742553ac2d01e41693a333947e0ed9d8a3c98f3ca2131731eb50935eec8f1f7b161338cf3cd10cb1a9f722570a6
-DIST humantime-1.1.1.crate 16689 BLAKE2B fe9d8ef8ad396bb8452f1e28c4a122e3918c61042f0cee8c5769683f9b321f82514474a100aecc5bfc39422bfaadacfb35bf9f14bd3814d1de62fd0b7517e67e SHA512 b18608d088519df5e0c531c8756635f41bb6515ed7463891e6145b9a78ca2bc45c0698789015c093463c704b240434d1b54ab327fc4182a06a8b1d01f50430c6
 DIST humantime-1.2.0.crate 16795 BLAKE2B cf3cbd2f89800994430b2634699eced4074d7fbc1ec53b8ebb145b8399bd2d5d05c86bc8d9adafc97d861b1133910ba67cf407b01815106e77ad5bdcdac60764 SHA512 718e5d3568305e09c359ffb8ca478b36ca3b829667029daf238517e2b88df198c33e29c93b7e2d02552a4ec746c121421128002d20c549400ecee1942c4be6cb
-DIST ignore-0.4.3.crate 42827 BLAKE2B 0ce4296d6a16b2b3f17e2e79c372325408f2ffcbf617024720b600843e91499f00088a74b377e98deb712f0b9aa38c19cfc44857f47f5ad21b7736a4f342de0d SHA512 a4372de85ee945e68c503e743f28621d88e19facd2ec0af5dd2cfccc45c8ad25abc655c16020427a4357bd0c07f48348ccd2d19dc7d6b9046d13fcb33973a06a
 DIST ignore-0.4.6.crate 45507 BLAKE2B 3ab9c229049683b9fb32942dff77f9d8c5977d1e4aa331244f9de76c5bdaa2b48c94d93ad953a6ff37021c14556ef2bf5b0306a3f8bd632a2b93b42deff29fef SHA512 7876a7572e89379a3480208632c9f34d99a9ca835bc19c543ccad1a835449ac2107444e3c65d2980444a78572f571b5c669ee4600bd02a67d864b341cab757df
 DIST kernel32-sys-0.2.2.crate 24537 BLAKE2B dfc4a1e31d3ec9e2ac62b890839919fb7fed1444070c1dcd75bb75acfb53556d6cf2eddf5a6639e7852a3df2a0cc715c5ce1d3fc898ef16a1687020d98f715bc SHA512 682bc7c629aefd035966a2873518fd60719121cca7d63d89d6c97ff5306f24d8b5055a3c91b4eedaec22b1d5dd3fb8b48ff7341a05bbd72d86e06c422dab473b
-DIST lazy_static-1.1.0.crate 12317 BLAKE2B 18c1c0312bc9b7835cef8a35797421be17a706f21a9dcb174527807c7617987fc165f1f99b6c7c665099ff90ab022b0aa4727e7764adc3dd23eb70245135cb6c SHA512 82df91ddf79e2c6e46cda92d6dc8afe20d428f40940a16a352db3c3482ec21ec4b5147bf723dd0b16320ebe0fea489d715671c7fecaf8d0d7982edad3b6919c5
 DIST lazy_static-1.2.0.crate 10840 BLAKE2B ab0adcf0421131ddd35e95a31a0053e2ffccb03dfc0f46ca4bbb6341f40bdd56d01aed0987489e5e73aa5f7289f3c323d1de0db353a30bb0a75acf53ce8436f8 SHA512 0d80334da99292d68fb2ea9879540676fd45788547b7170b6df1b0a606c1645a07188837f9414196eb44ac63010a3c84fe5c4319478f6fc2cef837295a255edc
-DIST libc-0.2.43.crate 353810 BLAKE2B 909f92f7014f33404f0525bed202575c7410d19b2383c48faf760c601f88bbd2c61b2b57550d35443483598bd9d213e1f20c2d34ba9619fec2c38c0748c3654d SHA512 d53b9fc460c68ed77b9c1a23c093c927125c0946b5231c343cf239e706d859af42efc2c7a4b95fecb46ab6ea9dd8473f7de308176a7dbab18e220246c5a7a8fe
 DIST libc-0.2.48.crate 353045 BLAKE2B 707f0311abe07e9a5bb9a1d2597d5a25f837dff783dff827f0c9e224b9ef0c915bc1f7f76a4a0afce5faa5bfe7896bbf1d22e645aed0cdd0e1197dcb45e495df SHA512 3ca3482cbdf8a031c6dfbc063537cee95b1735f8224baaad562f29279554ffd17999bb02c5ca54b25c845f63e70868b76d5d4123dcfa65d86d6e466527f4ce99
-DIST log-0.4.4.crate 22031 BLAKE2B 91071b2b1f3bf5df9fc658e902c9baa3eafaaf58282604df928d84ae6497383b5a43d876b5e74cf951f484175386824b5e5632f8ffc857f756ce24ea119a0acd SHA512 639c9b337cf6df44f7126927f6622ecc7684a2e336170ebbc86d0447de2e4932e8c12986fae80dcd9bed087669d2fe00b6ec8d7d1d61d1bba808831b5a4aad37
 DIST log-0.4.6.crate 22303 BLAKE2B 3b1ad5e1cc1cf7bb223df569a6024b5749fdc973bb99a2a1f11772774cb384cc98214366e62d846b57c7d150f925cdf0e906f8113039204a82fbf001ae15133a SHA512 3844c771f97531ae7312c6bb0cf74ccaab94925f68bf1172419cc44fa4b5373f3ac6b42fb6d0ba636a970b295ea5d1b5abbe72b4da67a103e8dc4ed48a0cc5cb
 DIST lscolors-0.5.0.crate 15937 BLAKE2B 27c9d42fbdfa32ce9f01fc627c2a758544dccd72f2b63f232b4984287f61f5f4dc8788a30ad60ae92ddc374b7b993b577bbc0d11a03c61756af81cc672300fc0 SHA512 97d881cf248dee1a744e6016941abb80579518ede0883e419b6c452215ddc0b2a6336c6c6c254e4f463cfa7f3a648ea56fef1df0ff044daba98c2d03e1731013
-DIST memchr-2.0.1.crate 9858 BLAKE2B ccf5530245bdcf1b892b98858d1cfd8cdeec3765422f6d1503bfaf3e48744dabfbc1767212b310d1951f1594ec3d4ca09447ca72782ed272cc396113a7f9fef8 SHA512 50daeb73062c30b244c8fec965ff0c69c29571022a9228dafd1ed397164956e39fbe260b8adce33522b5cedcd7f9135500ac45d6bc0b5e72bf9e89ebea0954d1
 DIST memchr-2.2.0.crate 20939 BLAKE2B 224963d641cf2bcad4b32699c9673c81d730f714f2df18878ce4ed78c816d38a2050dce11f9b3a529d45456e16027461bcfef9d5f0e08f7a70175a74e61b0131 SHA512 19bb5fe9c4ff471e2f8cba0e3be3ebb715f0eaf3d9c012c05833e78243d8baa6b98e14eb4c9a900caca48aa539483972f4ff8e5a47aec5141f96f3f23fc24088
 DIST nix-0.11.0.crate 162039 BLAKE2B d468eebf5bcd55f0e46e533de6cd318e3f1e0f5c457c7f6d0424e3a71fb60b93e9bf9b2ee4c80d5fdc68b7f3360048a9b832f2181ad69dffc14269470cad4d47 SHA512 bb3ffc5ae6a8de37a96e9951e182c2916016678265a3c4efdee2ca4d26bc5f4192f4facabeac2978788143d2707094dc0517c13b08833cc1ddcdb6fc1125c874
 DIST num_cpus-1.10.0.crate 10669 BLAKE2B 96500421a82aafbacbcf982e3041ddba40dd8ab7fb967d1fb386c2d543b7f3efe12e35c386602a20377e7dfe09f31ecc9094ee0a06aea588149bda7866fabedb SHA512 a97b282da6323fa37b93caaaa262e699f0a219f08d32bc8531363daa57ae3ea397927d09c36d38615dcd372443aa65a43b91f4a7a59910273b581b5322946a02
-DIST num_cpus-1.8.0.crate 10539 BLAKE2B df0b759bb2e1f6b31081968b190a804f168973a3c12b162106218ab0487421238021f15f6d97c4efdcec712277ab35873439e41ceff7ccc9c0bbc2fea0620bf5 SHA512 cd25a8da1a7c2639f33c3d36382580788d8056bce30f87b89993b92f39ea6ccce0527a907eb38dfdbe9219ae3a2bf86449dcb43ece978f834679dd4a8f8f2ea8
 DIST quick-error-1.2.2.crate 15132 BLAKE2B 0c35f1d0145d4a3bc4b835f203cc4348e1d9e8f6f7c1ef887d923bf8a9a63f896929da67e27978f0d797a9455be5aa868078bccfb8eac480569d62ad64e0fee8 SHA512 f4ed283635e1fb72bd30929457ac04b1b79c36b4b08603af6266a3ea6e18f12c834cb88ac090e42bb869c8a608f7521812de81932a81073a34f16fc882c6148b
-DIST rand-0.4.3.crate 76094 BLAKE2B 3889a26c9c41fd6b0b5bfdc75961aa4f74dd22aa61060914b0391361129a7557b504f3f23777cfddba6c2f71092ef9f2a76359245c0d594988c5ae7aa2968ad4 SHA512 d287faa583d07134a10db61d1dad30a3ac006624815240d50a8a21faca49085c3ef5c01c3741def25b3e93cb52507fff36497521caacf525e106f419013381d3
 DIST rand-0.4.6.crate 76401 BLAKE2B 5593ad2d7fb8214d917e2eb734f5eee548f48fd699c9fccc0de9c0c6ee49803a426492a25fda2ffcf844169e2bca00709d4dcd9ceede72a4667ec431f5502fda SHA512 a91c6da7188b426bf9cb832892ee2af87c4cd65fad505c34e9c63343da71efe8c0c67b75c405dca5345317b7940d1d0fc0b20be85afd6b3089203e5698d86f0a
 DIST rand_core-0.3.1.crate 15483 BLAKE2B 2e09b3b3306514c29bd7588498e79be7353de656d8cdeeb4dfc6a1ad092f15a861c2ac20591ff71f7f60d986de9a09c860de4a9f06799f04e736b31bc70a5fbe SHA512 5a7ae601124502bede760fd3179c2b28059ebc3b5983bfcb6b8fa62fb58df95cedc1aeb2734e792d894dfa4620801c13c29702f9cbee64243121575d4b6b9114
 DIST rand_core-0.4.0.crate 20326 BLAKE2B ff85118d2b5c793e3da37bd4d75032e2d73a87bbba0b4c0c07057c47c67b7e919e5c4458b4c929e3b55f53cd3ae6579be5d434369d307e962c00fb3272862937 SHA512 f80e76dabd3308a12880a9aa8b7be83db39b02778c95bb63f862488789a2a67e2f08d4f2dd1ad803c61df0a9fc7f6620aa753b3bf394542ce27c89189a911845
 DIST rdrand-0.4.0.crate 6456 BLAKE2B 330ee64d998a0358f95a3dce50b3e1bbda531a3b613db7e5ba4038a1cf7191b60be3a0f33416e05380c41040704ce52727928915e9d2f4565d39984d1c86fcd6 SHA512 6476275d124bee28747191471e8d8f321a3b1c148c1f2a7ece4175f5244a7de90afe5f99d2eba5244d886b92e38232398864bf90e6d434b09494533942c8d894
-DIST redox_syscall-0.1.40.crate 14745 BLAKE2B c63cf49985accd6b6b54291aff7a7950ed3bd862b7833b19d56e8f350bc2772f427bd6d83da9f6b603622008e90cabb2801cd70ebdb3343fdac020e6b4344901 SHA512 86e74bd8bd4fa12eb8d667cc91ab55df573c0a466c7786af76eefe70f7c294db5a307538089e2e3de2d0bbeee5c1691327020cd0eeacd9d6ab95048eea88b012
 DIST redox_syscall-0.1.51.crate 15646 BLAKE2B 5a033b0a20f50d66b3613cd0ef71a4a8f5a198ea3d9ad25752a4113ff1b54738ce820ace81f19b2f5de276509d52b6a69e709681fd006b132aa662e832e0f4df SHA512 cb84fc899f22b3c302654a959ce16a99518e8c39b8192634a0f3665dd052bbc6c4dd485ff66916dc20bbf8d494f59c1c761254bdbce6b184864c83325f6917e8
 DIST redox_termios-0.1.1.crate 3227 BLAKE2B 0b109d34e942735e804dd3da2a9639506e8bf6eb5b1f69ae021b115b0b75ae5159e8457abdf647dabfc19d5119cd3a44b8966635d7862cc66a8a997e4468e1ab SHA512 201d051900e919e2c6c6769ef252e51979d90133df16b6605e2a2f424cfb2e6e505e21add75ef5854fe5e0cab1ed1f1c1451010f072ae4bc8703c585a4323981
-DIST regex-1.0.2.crate 245163 BLAKE2B 11db7370515901dd40aab09cf37af555b2a48474b4afbe2bf9bc299b0cc0366c42af4a948cd8fed26d4462c090570edd0c1b0e2e942e148330494d8188c55e82 SHA512 546d38e992c4474d6cec812c1b6f57c7a1991f27cc0d5772d814a21f670128ce11f1ea1750a6ade402fba8b31a8485a61891a9ccbccdc8483054316eca84a047
 DIST regex-1.1.0.crate 241219 BLAKE2B 37441c1cedfa7fac3904a3a261f618afbdc64e9bcbd9f6913c551ac2cffd454456fce71ae1aefda70cf32d000d990d4e97d9867ffa042abf0e71bdc9df3cbec1 SHA512 f60d9e7c5a8647a1e0d35e995e799335ae695903985cd9f90923ab6483172602e9493005b7c7bd3dee0824de992dcd2f03320d58419206a0d5cfb675c68c4745
-DIST regex-syntax-0.6.2.crate 238572 BLAKE2B 0fcd5a6b20260a2dbd8f4dc611bb8ad8f0eb747ab4ac88682515bbbdeefba5ab149301da4e86e28ccef0fabca7f75258037613ba770b6c45d6024c63bd38f406 SHA512 87ce094b8cf61dd8c026b983199728b8eab876766580d3a8074aee780c8f4f6fc0777f1060652f843e87ba7ed21905bdbcac411f736ff8ae0943900d71f6d068
 DIST regex-syntax-0.6.5.crate 272475 BLAKE2B b2ff299b4b87ab91c925a10faa8a09507272600a12558cade5b18ce615844223384e8420f2025dbd642bf80acb5f608a6c0f5ca59a4c391d4f417fdea15058b0 SHA512 37f2c69b425335a28b8945fcd58a3a39a9adde5588fdcd4b460da0fbd137e0727a7835d71b4e87ff29185c153379402891847d93047e40a578f778a62b324f5d
 DIST remove_dir_all-0.5.1.crate 8726 BLAKE2B b654deae9905c03b068f07d17b5fe3715393cf7c495ee017467fe1cdf955bf44781516d0e6aaa1dd738ace3b3bdd4fb38f7edaaab062eeba02baf50a1250ed0f SHA512 9ee9a11717d45aebd28cd2f50719a2183cc623bdb1af099701e4edbdb9c98bc14cf2278ba06aca4658bfeddaffff00d0d1464c82d175fba7d6fb272918dd6928
-DIST same-file-1.0.2.crate 8870 BLAKE2B 0c723d2f7377e7837babe62ee55807943bb12f013d8608c895701e78f873785b0beb4a2ea84e83e3b44848dcf032b36b573a31be7e4ce9932578fb6ea6a51b7f SHA512 56c923ebd529308c5c1efdeae0314c150ec6fc3d68fe3057ae1a9ec78520f96a78e151985bcea2568775d0d59e4e04e262837d2f3965b175b71569fa703b0951
 DIST same-file-1.0.4.crate 8678 BLAKE2B a46a2572f18a9adb3a23c8142c78d55757f04e10ddf68568f6af810a6e30a4b212bbf21c453ccd9b2e5ea7c42c6216505a4119fc6f19645c28e5434e3e8d7847 SHA512 bfb961dc7a31d5dd3be748d6ac609006ba71e0a6f61ec06c5f96a651e1ad1e768873b7cc2a10d9a52a6c670e7b56bf015df2974158001cb3138e2108d3160fea
 DIST smallvec-0.6.8.crate 21448 BLAKE2B 0491237d8bb9d9c89355c6f6538bd962d3eb56ecb6a670a0d94032c4705d34c629b930d9465fef34efc8b4463f5c88b6b849f75306a143d7aca9574da32c9bcf SHA512 0eddd68498a20bb124fd7bf00700c98ca00a58ddfb4e6116aed0d7647b898760c9b46593c96b16bffb86541dd37f04559b75110fb3b520b1b91ad6429250250b
 DIST strsim-0.7.0.crate 8435 BLAKE2B 6869075bc3949fbdec1b74548b816560d1bf3759ba4c3e972a84f885e6732edd25596d75a4b6f6b85d93821f559757d096cb5f0b0eb04dabd8bb974d214f3188 SHA512 3f92df0f444129b16fbb15c533b7bc1d6f18970b487b57345f74747fb7f41e3dc0cb61255712e94d419a5777b8f6a9cdf1a716718698c479eb98dfb6464d1983
@@ -64,25 +42,19 @@ DIST term_size-0.3.1.crate 10754 BLAKE2B b8ed33afdf8348d9be3200b33b18d121d86fe5a
 DIST termion-1.5.1.crate 20659 BLAKE2B 5b4291c2c26a074c16eac2e7bcb40467380181bac69c941e5c958059dc239cbbfd74872d9bd3da65245d010f9fc39804c43dc96f4caab2499b021cf35977a6b0 SHA512 1d1536f08600c7c1f414b4579a1a6e7eff91f4c105504125118d3cadf71c7886a352d1c5f7e07f3d7c28aa8b4752f07b51eddb4d9adc6a9286f7b6bade2bec76
 DIST textwrap-0.10.0.crate 15986 BLAKE2B bcbd40fe4c8322e459c505e0f175b5b088322c33ba56d8c4b294788950681c2407ba08fae2c15711f8f0d5e1f0afed38f82deaffe1c2b16a4f4ab14723b71bb4 SHA512 cb50cc73f3f5ab704ef9e6d526b751f7e66de213fa534206e5b4e9da829f19aedda9f23f262f865fdb3247c703aeaa87f38099f6c575d1961ec923d62a9b2293
 DIST thread_local-0.3.6.crate 12388 BLAKE2B 290c35e5327e80a5cdca5609252b1efd1b78a654fc9ab4ba68eeaa3c2769d844f725d17d91cbb15048dbaac84913c51edcb39bb402882c9e7b4d0c4e4811518d SHA512 cd783d3d9caec43868da1f6118d4c4d520e03b9f1049d8f15d2c12482989401d3aee748e04a149953d35e5d6487355c2891d44569ef688bc1d45f01b6461d253
-DIST ucd-util-0.1.1.crate 24221 BLAKE2B b03c4b21f30b1d7497814e22471f0ec94f52bf9815a8d8c454ab998040593e179e869e6e3d2fde61f993fc8d15ad6cd689f878bac9f0e1ea9a658d2dda242bf3 SHA512 3101bb088f9a804f311c23cfbec1b59ed6daebcc985af3c4a25cee5c1a0c0b8fe15a3b95516361cfc75bf0322895f2acc4835ee94122c782abfc8b0a1e6f8738
 DIST ucd-util-0.1.3.crate 25897 BLAKE2B d67d250603625d7fe55b1bd17a8bff03ddf2e48b531e8f754f51dcd49370a2b66d0915842fb2fce85a69df2c38f9c086ac3c36115d40c5a8138e5451f71a1cfe SHA512 50a796feb198012241d73001bb53c8e3d3168df379de91d7ecaccfd829b08a356afe3db736fb8cced8748141d7a9e4b157440442c425816c78c0615c08e20f2e
 DIST unicode-width-0.1.5.crate 15761 BLAKE2B 575e6bfe8b8b70cb0e5a167bf546df2964361a223b03a65bdc588c32d4cf9f01194daa8d6d1c90319f1f9981aa5b092dce67c9c97450be4ea630784d834cdbe2 SHA512 bd5ac5f0433953d79408074239edc7c43ce23d56659d467805d81ab01c576a3cf77ccedb3bba41d48bc4ad46a8905ac8a1927b99312053ef6295fd940a6766d2
 DIST unreachable-1.0.0.crate 6355 BLAKE2B c41706721e8124c695259c12741ee95f98d3599871bb7fae2f8cb0d63a04f0cff11e01ab0376867de4de8707fd50fbd02f8b6d9c19bedda84bb5938876c5d803 SHA512 054e0a471d1068b7703853d838c7c381ac6865ac1f8abae08747581e3754416ccec5b80a5b04fedbcd01e68bfeba286b849e3b8ea67bbe62444f2974655e4948
-DIST utf8-ranges-1.0.0.crate 8599 BLAKE2B eb356d94a937f5f7cd6ed17ba85c03fc1ced30ab9215aad1cda3e600dc6efd8bedef744a2dadc9664dc2cac0ef815f451e88db5b75f70eb1f50670dceeb7e244 SHA512 da498433597582970860db1c66ff1cc2ed8b0e2bf816e6aabdb40424ec03c3f28e6ca5e7592e464442004077735dca4144acd13c8f6a2e799d67504699422643
 DIST utf8-ranges-1.0.2.crate 8510 BLAKE2B 877ff38444aec99bf8e0d09c6880d4835eb453c8c7e38fa5e7f8fe3cadd5b34b11a030193e46fe97b19fd90e94de156c0eaf12c613aae7cee47f0f016a3fb96d SHA512 ac168b908a34c4814a682b77502d2e5aa3130acb01fa87e29c78b760a61ba61b01f9fa2d67202604ac9824e0b2fe92143b72c0d4100a62ff9f53e4b00a4a12fb
 DIST vec_map-0.8.1.crate 14959 BLAKE2B f5c179ccb4349d543747d5e3bb3edfca4bc9f3f64ba3c2d40fb1d9cba98433b7a0641387aafda6347c9b3603592c64bd820b217b46fbfcd37f802f298e5793ab SHA512 026cf10dc7ba98ae51dd312fc847cbaea41c25f0da5db6e0e22c2ecf75584bbf876d7bd96035fbbcf6696d702d5a3f25977e02a2d77cf519aa21e3ed05710e40
-DIST version_check-0.1.4.crate 7946 BLAKE2B 1122354fd571c8879aa29d80aa2011ccbb0fc64545af4eb15a62c84ac81a4aeffe223bf776f48824a52c159f31acaf3501ffc2613a1041a1a1179446d830af0e SHA512 766fd53ddcdb7c60f7a62959c767cc10e498f92ad0eaed7a0ade90e13ee4293121153d5310fb987b9dd9ad32c3f6889339be29444a2bfaa73bb3b6a719f77e46
 DIST version_check-0.1.5.crate 8173 BLAKE2B c1778a95fbc79e93bc25d6ee85c408cbcc2afc1a2317bd96b6d5e1c99862f26cc031e0a8b14451d7ea5a44d96c9b599c899bcebda36d3974effc51f9c236ca56 SHA512 cd3ca0b36108b0fe8e6a5c26614b4f3e3c36ffd13cd9eeb7693086b4a1f7b67c025613d90e79f4dd1bd3234a3e387b2ee890c6c410fe67d293b9b5503f5e9362
 DIST void-1.0.2.crate 2356 BLAKE2B 41578fb5507f94e7d135f9595cec107ed00a926f4968df8b59792d1676ba5b6980cd67310f820fc37a9c14ebe43a171833fa8dfc09eac5dd42f2ebe808632a83 SHA512 1cc7d282600dc0164d7e410aa895d5dc99de1174991549c6733c94cc2027026517f66797751d737869eae58c560fa26edbf43f36b3015eb2fd99828fe40e0aa1
-DIST walkdir-2.2.0.crate 22695 BLAKE2B ab74bb750a4d955662a060167b43c34ea2295da8c5c0e97ffa18a1a37913c37552154aad9bfaff6379cc86cc76faf12cdd9b9777baa806d8f316e373d456ab8d SHA512 db892089e59650ceb7308f5ba05b10368bd5f2b7388a3610f4547b8e1c0e838162894d77b9eb2ea7eb9c169c082a8cc15ea01aa47c936dcb7ad20e377fbd60bc
 DIST walkdir-2.2.7.crate 23507 BLAKE2B 8c26d7970724f7fe2fb6b38f2d25ee4ffeacf115466c019c7fe082e9be1a3c3a0e076f248b53fca5f82234350e5f3d0521d8f7eef5463a372796e2485309dec0 SHA512 bf7c06f982383f4ac7c513bfaf18350924d57dfacb1e9469c1600cf578a759714fd51d261b7fa8c49d29293f24ce4075dc84ee267f5559459622fc97939d338c
 DIST winapi-0.2.8.crate 455145 BLAKE2B 50f3c2a0cf4eeedd6891b11392e520c1cca139a71f8f736eabaf43aa7e4b1b5d57697918978220459572d373940edf971eb8302f292cbff832283e905076319a SHA512 115e6f027cdd4a56f77ca24f4ab249d2a6cac1e1f955c826a9b6ee05db4861790a533f5e674aebbb540370fff52ed41618c2cd7c906e73200e92df213109cebe
-DIST winapi-0.3.5.crate 997942 BLAKE2B 7482b6c313129b1a574d499393a32b9bf4b857dcb6d380baacf3455fa43ec2d18061fad25b83c2022ffa36e30132358f3abf3bfdc74dd3fba6a5b54cf2eb5d10 SHA512 6d79a5cce1a234b5645fd1798d580602f89a202adb0672a213bd2fe54aec94c75b489d3c47320c6d5f53d415766a7cf628874f0713a347d9e3017e904449bf2f
 DIST winapi-0.3.6.crate 1029391 BLAKE2B 9a52085c3cb74d84bc66cee575da0105eeca69f6abd3c8c601a4de013bafea795f044748be10ec9ab419a9ec82a304a0b65ba4d74f6cb39baff91228f83009f1 SHA512 991eb3d6ba08d59e7f7ec81ebf469cecc56b3723b636392972d2fdc1d6f13d88f8a244ad5cbb20f6058d12b44e060ed663c12aa3fbcd1235ab511fafa105cd3c
 DIST winapi-build-0.1.1.crate 669 BLAKE2B 6c8d8e0f81574c086f06fb3f234b0e6759d293d1d254857c3d491e4d43279e5c2f57f2fcfdc9d5d7b083280f4cc2a75a6ee9bc1541ec6ce8f8d904ded0567faf SHA512 8b0a239e205a5368892f41c870a8a7ea16e3468c364b03382bef7fa3a2e7159b09c07661e95b1227578f6d72c14879daa4444b28c51ae20ef15d985d59ca5a77
 DIST winapi-i686-pc-windows-gnu-0.4.0.crate 2918815 BLAKE2B 4d357e4d30f9552972170d65b9a5358b69c46a3e772fe05efc22f3d4ffc1caeeaad7aacdc7abd503a7ad0545f8bd7d22bf351dcb6df76f812fa4d45c34d65df0 SHA512 a672ccefd0730a8166fef1d4e39f9034d9ae426a3f5e28d1f4169fa5c5790767693f281d890e7804773b34acdb0ae1febac33cde8c50c0044a5a6152c7209ec2
 DIST winapi-util-0.1.2.crate 7810 BLAKE2B 511f14b606b591da19159f0f49665846e55ef8e22c7519fedaa5dd65cdc0c51134606c2a7ff0a6cbd7f24e75aaf3109959decaf2a5171fe01fbfc7ad7453fbc4 SHA512 54514420da9851f9657f888d8b198b3a97a6009b7e965d5a23ec471251f6548c2a58c716a5f48fb5d83a5775503d696da98eaed7b71fdd9ba7cd74ba6923b11a
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
-EBUILD fd-7.2.0.ebuild 1741 BLAKE2B 95d1d56bfe93bbdd2d15f4721d52335c9f9e7aa597d1bf2a0da4ebae8722674cd0d52b291fb2ac8dd375651dd5c4a72921e017b85c35fc3b3711518ca022fc59 SHA512 64287a765ba9c93f4ffcf9ba1fd40fa8b99e9a589e6c621561a14b53e685d16d2b6cc276b16245a43561722c1c8e618e18aae5f2f23150f548e179ad0f6fc015
-EBUILD fd-7.3.0.ebuild 1863 BLAKE2B d90ff3bc399fb1b8a2f7adeeff2cae709e457ca6047c439d7aa0268d5ffaa4e5782f0f4f236fd7dbe80a0501544a4e6d992c16fe6bb48b3611b43618c0a7560d SHA512 91afbf00520a4c722d257dfad895bbd0d2645930890366155ba8f2d3784306cf31b7338c644907095f92661b88f3c8ad329547f08207841d4d452a3a233c0475
+EBUILD fd-7.3.0.ebuild 1861 BLAKE2B 3bccc82e48af260438ea4ba5d4057c9cdaa1805ce8c255f4c092daf46c46e7e3e6e8003803eecd55cc443ea59d00cb482fefa9ca8ddf6772193085c178dbf6b5 SHA512 631c7453570bd84d63da2dc2ac39c09175d5c2f8ba782844183fa081c9a29e391cd394c6f55d6236094da831c159342dba6d179e8bac77642b0ad6995e10b256
 MISC metadata.xml 574 BLAKE2B cd747fc4e172f68394809255369afc79c95ce0667115fdda99bb38635a267be76880a75d781d1988f1ec3a0ca4b139e74c9f97c7faf65ac240c40ee9f4f92e6f SHA512 4be62b10ffe12ecb6d4284ff29006f9d884590dac7f67658eb985906ac1bce609230f1385e388061111cfeae70de4df999d55e834b987b69f24bdb878548f758
diff --git a/sys-apps/fd/fd-7.2.0.ebuild b/sys-apps/fd/fd-7.2.0.ebuild
deleted file mode 100644
index a425dae0a6fe..000000000000
--- a/sys-apps/fd/fd-7.2.0.ebuild
+++ /dev/null
@@ -1,91 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-CRATES="
-aho-corasick-0.6.6
-ansi_term-0.11.0
-atty-0.2.11
-bitflags-1.0.3
-cc-1.0.18
-cfg-if-0.1.5
-clap-2.32.0
-crossbeam-0.3.2
-ctrlc-3.1.1
-diff-0.1.11
-filetime-0.2.1
-fnv-1.0.6
-fuchsia-zircon-0.3.3
-fuchsia-zircon-sys-0.3.3
-globset-0.4.1
-humantime-1.1.1
-ignore-0.4.3
-kernel32-sys-0.2.2
-lazy_static-1.1.0
-libc-0.2.43
-log-0.4.4
-memchr-2.0.1
-nix-0.11.0
-num_cpus-1.8.0
-quick-error-1.2.2
-rand-0.4.3
-redox_syscall-0.1.40
-redox_termios-0.1.1
-regex-1.0.2
-regex-syntax-0.6.2
-remove_dir_all-0.5.1
-same-file-1.0.2
-strsim-0.7.0
-tempdir-0.3.7
-term_size-0.3.1
-termion-1.5.1
-textwrap-0.10.0
-thread_local-0.3.6
-ucd-util-0.1.1
-unicode-width-0.1.5
-utf8-ranges-1.0.0
-vec_map-0.8.1
-version_check-0.1.4
-void-1.0.2
-walkdir-2.2.0
-winapi-0.2.8
-winapi-0.3.5
-winapi-build-0.1.1
-winapi-i686-pc-windows-gnu-0.4.0
-winapi-x86_64-pc-windows-gnu-0.4.0
-"
-
-inherit bash-completion-r1 cargo
-
-DESCRIPTION="Alternative to find that provides sensible defaults for 80% of the use cases"
-HOMEPAGE="https://github.com/sharkdp/fd"
-SRC_URI="https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	$(cargo_crate_uris ${CRATES})"
-
-LICENSE="|| ( MIT Apache-2.0 )"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-IUSE="test"
-
-DEPEND=">=virtual/rust-1.20.0"
-RDEPEND="${DEPEND}"
-
-QA_FLAGS_IGNORED="/usr/bin/fd"
-
-src_compile() {
-	export SHELL_COMPLETIONS_DIR="${T}/shell_completions"
-	cargo_src_compile
-}
-
-src_install() {
-	cargo_src_install
-
-	newbashcomp "${T}"/shell_completions/fd.bash fd
-	insinto /usr/share/zsh/site-functions
-	doins "${T}"/shell_completions/_fd
-	insinto /usr/share/fish/vendor_completions.d
-	doins "${T}"/shell_completions/fd.fish
-	dodoc README.md
-	doman doc/*.1
-}
diff --git a/sys-apps/fd/fd-7.3.0.ebuild b/sys-apps/fd/fd-7.3.0.ebuild
index f2cb550dfc19..b3c4bb938174 100644
--- a/sys-apps/fd/fd-7.3.0.ebuild
+++ b/sys-apps/fd/fd-7.3.0.ebuild
@@ -72,7 +72,7 @@ SRC_URI="https://github.com/sharkdp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="|| ( MIT Apache-2.0 )"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 DEPEND=">=virtual/rust-1.31.0"
diff --git a/sys-apps/gawk/Manifest b/sys-apps/gawk/Manifest
index b8f8c5a0d902..a131ea2c8771 100644
--- a/sys-apps/gawk/Manifest
+++ b/sys-apps/gawk/Manifest
@@ -1,7 +1,7 @@
-DIST gawk-4.1.4.tar.xz 2367832 BLAKE2B 67004e2867e4c4f43aac7142a52c83642d8bb3b0a5451293418bc15e575a8ed1d97c0a975e084bf46ffd1c27dc70e48de492cd2e007773622ef14886b9269ee1 SHA512 6a0e9cf086544212f54b54261dcd517b611aaf495ef99c4b7740d07e363bb00c5632f3d7fd5e12a954d5aa9793764162a57453e0e18884b29c6c54b5f444c097
 DIST gawk-4.2.1.tar.xz 2985412 BLAKE2B ea0635904ae8af8943d545b21affbfad64de5a688a615e22e1af2634583d0002094c0668c3260837184f965452ccf84141fff705bbf42d55b6d55c7516c24d8b SHA512 0e3006a795dc3ac91359a7d2590c0cccbfd39b18a1d491617d68505c55a2800355b1439050681b4fcacf65fb0d533151a046babe0fd774503037bab363ef2ae4
 DIST gawk-5.0.0.tar.xz 3000432 BLAKE2B d7885442c615e2b7986d6cb617db3ac376a5e572ab2aca3c6b2bd0f43feca4374f310bbf2e2a875b617df97cfebf98cb983d169468d51db39058b83eb9771afa SHA512 9eb663bbcad53165b7ddb7d72cfb8377252b68004733a9eb8c191b2ddddaff857e48ba811280311384243eb67574fbe7ac9edf4e507f9a82d67b4b2adff8ef6e
-EBUILD gawk-4.1.4.ebuild 2083 BLAKE2B 8032292269399040c80899263b2c4026ce5ddc8de078f1596d28aab56cb01a8a14b056264b9734d5765eee0a539158d090051219081cd19d2686e7b6f498f7a4 SHA512 e56f386e1a0411eddccc98e6702a2d10ea5ffab6be2f509e078dcffcf14ff20dad11e414235379311e6a74fa90a39b16171f11bd32c79d175f1e8dad6d00a408
+DIST gawk-5.0.1.tar.xz 3136004 BLAKE2B 1dd8a9bca2488f2d3c946406b01fcbdce0487922ece49fe2121c39d6d10bcfcb6a056edbbf88ba6c22772ef88a250fc8ffcba33ead399c0d7c8f5d19d0e896d3 SHA512 ff9842a91035f843482d93eac8a35cddf2ce16acaa43a0112c1efff08802aebf705ee70d47eff74a190dca7be330c31f7204ad27cb63bdee65333f9b9c984212
 EBUILD gawk-4.2.1-r1.ebuild 2554 BLAKE2B ab620a7ad4d854f4d54dd3c8eaa17308bcba51f80e161240f04893aab413a4807062b804245cdccf94de2ed042b272787ac91e9da582fb2da21a4038b448e0a4 SHA512 c49146b46688fc7b8b2f46a31b1866d7ca185dee47d468410e71f47ef664b55a82dd2246223cbb915400086c5268976f898414784557fc7cb4361cf7618580c0
 EBUILD gawk-5.0.0.ebuild 2567 BLAKE2B 8fc7398e48c66542cdb31a1b54647536abb256e5646c4c568a7c245a22073e710598a5319eddb8e36e6d1ae63650fec42571b73da18903d11557516774bf09e6 SHA512 92fc9e79ce27424f70091ee52eabd66ee4dc583e6f0fc8800e16a6c04f9318757a5164f5bbd0e37e6c484fb3a1a11c399d2927f4e68caf68744db88756bc6d22
+EBUILD gawk-5.0.1.ebuild 2625 BLAKE2B 7f9a77550d60ffd59708a367d66811c38e7768f56c07a57db85147169e5e1cdee9d6e1dbc3efc6b01aa5711777dd93bdb8f23dcde83408e21062d17bc35738f8 SHA512 d6733c4b729048c0df376aeaa954e59783a17c4243b93b965bb3294a48ff2ce158ffdac11d0f7c2ffb105814705e49619d7011ad0fe763863cfb27fc9a6a96cb
 MISC metadata.xml 465 BLAKE2B 4ae9d07b535014b76695db5d04b7a8b984c045dd78e90c8e7b0b3215a3021e5b190bfd89ca3f0dd5d9d8f1b55340ac57e40e02509e0d65288032458a0a247096 SHA512 517baceec7b9ea9311d1a946df59da35e6a5619344426ecdca6ff56e0da876ae1e6f793417e5d563da0f4528c535026deedf451eb6da8c7140db69709342a3cc
diff --git a/sys-apps/gawk/gawk-4.1.4.ebuild b/sys-apps/gawk/gawk-4.1.4.ebuild
deleted file mode 100644
index af2a3ecda34f..000000000000
--- a/sys-apps/gawk/gawk-4.1.4.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="5"
-
-inherit eutils toolchain-funcs multilib
-
-DESCRIPTION="GNU awk pattern-matching language"
-HOMEPAGE="https://www.gnu.org/software/gawk/gawk.html"
-SRC_URI="mirror://gnu/gawk/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 ~riscv s390 sh sparc x86 ~ppc-aix ~x64-cygwin ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="mpfr nls readline"
-
-RDEPEND="mpfr? ( dev-libs/mpfr:0= )
-	readline? ( sys-libs/readline:0= )"
-DEPEND="${RDEPEND}
-	nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	# use symlinks rather than hardlinks, and disable version links
-	sed -i \
-		-e '/^LN =/s:=.*:= $(LN_S):' \
-		-e '/install-exec-hook:/s|$|\nfoo:|' \
-		Makefile.in doc/Makefile.in || die
-	sed -i '/^pty1:$/s|$|\n_pty1:|' test/Makefile.in #413327
-	# fix standards conflict on Solaris
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i \
-			-e '/\<_XOPEN_SOURCE\>/s/$/600/' \
-			extension/inplace.c || die
-	fi
-}
-
-src_configure() {
-	export ac_cv_libsigsegv=no
-	econf \
-		--libexec='$(libdir)/misc' \
-		$(use_with mpfr) \
-		$(use_enable nls) \
-		$(use_with readline)
-}
-
-src_install() {
-	rm -rf README_d # automatic dodocs barfs
-	default
-
-	# Install headers
-	insinto /usr/include/awk
-	doins *.h || die
-	rm "${ED}"/usr/include/awk/config.h || die
-}
-
-pkg_postinst() {
-	# symlink creation here as the links do not belong to gawk, but to any awk
-	if has_version app-admin/eselect \
-			&& has_version app-eselect/eselect-awk ; then
-		eselect awk update ifunset
-	else
-		local l
-		for l in "${EROOT}"usr/share/man/man1/gawk.1* "${EROOT}"usr/bin/gawk; do
-			[[ -e ${l} && ! -e ${l/gawk/awk} ]] && ln -s "${l##*/}" "${l/gawk/awk}"
-		done
-		[[ ! -e ${EROOT}bin/awk ]] && ln -s "../usr/bin/gawk" "${EROOT}bin/awk"
-	fi
-}
-
-pkg_postrm() {
-	if has_version app-admin/eselect \
-			&& has_version app-eselect/eselect-awk ; then
-		eselect awk update ifunset
-	fi
-}
diff --git a/sys-apps/rng-tools/Manifest b/sys-apps/rng-tools/Manifest
index 93081a9f3042..9f0def13056d 100644
--- a/sys-apps/rng-tools/Manifest
+++ b/sys-apps/rng-tools/Manifest
@@ -15,5 +15,5 @@ DIST rng-tools-6.6.tar.gz 51468 BLAKE2B 47231c60d78a48ade07855dfe8a807d6c10b8e27
 DIST rng-tools-6.7.tar.gz 52792 BLAKE2B 3789aa4c6e2f024dcaef6b9b51521e206d65500a94ab456db61dc45c69ac5e4849a1e74abbe0f7640827ffb4bb20675c1f639a5be852d21d0d1a3c6b2e96bb5e SHA512 2f09edacb5448087041257326faf570c303b42f90bb695a1999b2c7543f20a28b15cdf705a2eca55cae8e9cf9fb5205c056fc26cfaf6af958bcda2cde1952b4d
 EBUILD rng-tools-5-r2.ebuild 1144 BLAKE2B 071f7d226fb3c5585be712206d4397c248501e1fb54122c01119444472b8888e7bc95cd21bfc7663bca9c0d40364361b012ef7dde824718918c6e8334436c74f SHA512 dfdbc4425a776b799c873948453091c4cfb674a190626b0d5035d872e31deb9255850f73f73e4e9f664c3e8d72ea316aff9dc0f8a0e70d5d676449aaf81e0339
 EBUILD rng-tools-6.6-r1.ebuild 1409 BLAKE2B 20dfe5ef85122bd102a654c3ef95ae651c18116721d0b42478269cc6e3941c449081325149337a215dc6e250296d298d21ac4eaa8052b53b2055451b777c803f SHA512 91710d9bc23534b1e4930a24ab609816838938ab54e4627748c6eab5c36a615ba6baa681fc46dff9bd15c0b75e6cf181f1383528e14bbd811106d23d55153492
-EBUILD rng-tools-6.7-r1.ebuild 2123 BLAKE2B 7cb287d94fd1c92539155843f003a4fec3ada1617f27fb1977d3cfbabc7efba53c66f1e0d3421eeb72b96a8e942e61a03a41663f1ac495ef2f3ab716b84ee123 SHA512 dd7656d6a00c3c723d6efd5f24986060ef47a0333df13f30f8893b91509b72e382600b6f4960ad0a4261c060ee5f1ca8f2bbf96f98f65fa35ba90374682a6ab6
+EBUILD rng-tools-6.7-r1.ebuild 2130 BLAKE2B 63f383597837556635c055c040688b6528a596222a7c7995ebf53a1a64c87192b9dbc060fe7f80a4eafb0b150cda490901c0df7a2ac9e3e37ec2fb85ebee487f SHA512 82b40e6efec8276d2a8e857aa4fcc1b72bd2d605a68ee062ca0843245b2a76b8a4b6c7bbdec334596710cbf97747e5f8190a53eafc70e2deac48c27c0038505e
 MISC metadata.xml 713 BLAKE2B c05a29fb9b1c47eff6e8fbdf72bcd911bff431d72e1fb432e40f5ef760d82c26ec29322ccef9d06816b5d137708922b8c44df7ed0c1c60a07eba3b319fa0e1f5 SHA512 65b2454b2161f61cf187bb14b66f8cac59de3b023ed007e7780338533b8bc5c6aa0cff00d99d958f33b566b3fd9d2a597d698275c3a7914541233a9f9336cd64
diff --git a/sys-apps/rng-tools/rng-tools-6.7-r1.ebuild b/sys-apps/rng-tools/rng-tools-6.7-r1.ebuild
index c112d9e0d3f6..5dae56a3f5b7 100644
--- a/sys-apps/rng-tools/rng-tools-6.7-r1.ebuild
+++ b/sys-apps/rng-tools/rng-tools-6.7-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/nhorman/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~riscv ~x86"
 IUSE="jitterentropy nistbeacon pkcs11 selinux"
 
 DEPEND="dev-libs/libgcrypt:0
diff --git a/sys-apps/s6-linux-init/Manifest b/sys-apps/s6-linux-init/Manifest
index e2b518ae759b..f82d08f93447 100644
--- a/sys-apps/s6-linux-init/Manifest
+++ b/sys-apps/s6-linux-init/Manifest
@@ -1,5 +1,7 @@
 DIST s6-linux-init-0.3.1.1.tar.gz 25955 BLAKE2B 46e8e88c9c48fd00819cd0f437eea7ca6a5c08751aa3196dda24a8d3a22fdb14270ae99c74134ab0e123dde65bf3cc86c7916a157e447a72428db9b3870ffe3f SHA512 b8a44e09fc6770e91f1ffeed3267bf5fb83cf857653727d52773674db5942fbbc010355bdf24e456d2b2df5a1ac72888b78b2ec502c0d42770af58aaaec00648
 DIST s6-linux-init-0.4.0.0.tar.gz 26744 BLAKE2B d56ba8def4e4a0158721fd9b9c4f19aa2e13e615e7e598fdced2b7c341820f31830c021d9181792bfd324e70163fed826c691a80fbbb7ae6f30be46eeb6330b9 SHA512 5b53d3afad28b476d366d649f9989de79adaaa3b7d255323bb121a6f8e6fef051306cd6368ddcc3745b6472bf4ac2ccb7f4088f6addeb6d52ebc40e703dcbb44
+DIST s6-linux-init-1.0.2.0.tar.gz 47666 BLAKE2B 95b092d624db23c0a31a3af8d381e471221f7e7608cad4b49e07ef1e12f6526532e912bd75ef9dd739e14dc1ca99f4aa80e8923ac31beee42828cdcc9c71030d SHA512 1140434b07bf85956382a43bc8f58fa32cbefc43e40a48825b9e938d7950d988585e872667b79ba1bd44f0befb69202bcb7347c0e722ab5d20dc9304cd1be843
 EBUILD s6-linux-init-0.3.1.1.ebuild 1472 BLAKE2B b2d10b719f4668df01bbf241390d6203cf489786e0129e4076336a5a5ef6e44de370749313e06e008984ea78b0f07014d68288fb33912902bee21f2bfb59c887 SHA512 57607c57abc5adb22a22c1aa3d24545d591d83c9a7bfb87931a394229fd4ace887b5a5e859983c5b30fb6d08d151bc76f6cc88b69d31154d218b258221aebb89
 EBUILD s6-linux-init-0.4.0.0.ebuild 1472 BLAKE2B b68c06f32c2f3482ba1f4bb38e70bc0fcde3d8523d74c77867811231e1126e26a042bffc3aa7b6a98e1d39fbf3d37f4a39f604e02e397d085a43e85a795ad58f SHA512 2cdfdb084ab008bd5ae29b63eaca26be3e8d6e40520e2d6c266f4072cf98709872ef0d79bf39d22a62a144c50c413e95eea6016ec3999286b7db75ea1d50a0a9
-MISC metadata.xml 578 BLAKE2B b561feef1f9d63bdacc7129cfb8d3c10731717f22eac65c85053e138ce52c2e8e0cb6cd36cfe132b52d082f610c0c2b3864bf0964f3f8e68eb0be474d67a0a2e SHA512 76ae04f79a98469ed522cb1f0a8b1088c85cfd2d06801b2d53428f08ac0bea6545e815884850e01661b4225d0d40206dc7d96dc479d258e3d64f3372d87cfcec
+EBUILD s6-linux-init-1.0.2.0.ebuild 1590 BLAKE2B eb23e5ed13fcbc208cf951b23491ec1ead98a1bb3d7c0b7233e628c189b2ff29ed035f8dd1c854d05f6b21d605730a9abf1f5c923a154605f3d1947264c3532d SHA512 d10177e7e87d88f2a44dbdd7909a024e26a8daa566fc5ed5afaec3d6198c515e0e6d20ab131f0f12b9fbbc672a73b89800405f635a6da4f9fd108e69ff09a4b9
+MISC metadata.xml 716 BLAKE2B 5c64e105fb653ff7705fff6ce4f233f11d0609eb0e6d154272bb8ddad00aa12d90a5bf37b5d6ea4e093d5d15d40d0936820b8e5789a4a94fb02aad6e77c68272 SHA512 866135f814d842aa697d455d2e154f2525f8e1f533bf9e7fcf4cfcbaeec429a13b7f4c33e2f4f714a0f513a3c5bb0a6983bb1f273fc42c8043e35e27299b5ccb
diff --git a/sys-apps/s6-linux-init/metadata.xml b/sys-apps/s6-linux-init/metadata.xml
index 34f39bd4b285..8035da6946ee 100644
--- a/sys-apps/s6-linux-init/metadata.xml
+++ b/sys-apps/s6-linux-init/metadata.xml
@@ -17,4 +17,7 @@
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>
 	</maintainer>
+	<use>
+		<flag name="sysv-utils">Install sysvinit compatibility symlinks for telinit, halt, poweroff, reboot, and shutdown</flag>
+	</use>
 </pkgmetadata>
diff --git a/sys-apps/s6-linux-utils/Manifest b/sys-apps/s6-linux-utils/Manifest
index 21fca9fcecbe..ec09497b06c5 100644
--- a/sys-apps/s6-linux-utils/Manifest
+++ b/sys-apps/s6-linux-utils/Manifest
@@ -1,5 +1,7 @@
 DIST s6-linux-utils-2.4.0.2.tar.gz 40832 BLAKE2B 24ce6d51aacfcaeeb8531931a0deac4e2430f627907157022ed6378e7058afcc946f1c620bb3758e43a1911db517dd46e65a43f338c446e61711b000d6751523 SHA512 4b0c8f1b65b8eb47f3aa7aa365d20dcd46fc144e166f78825ee53aeb789e009b2716a826efa1e92e86e8fe86421efc6ae07970ce421c6913f0b1db679eb6117e
 DIST s6-linux-utils-2.5.0.0.tar.gz 34976 BLAKE2B ccbe5a24c39d32a6d3e9c1ba09c76c278ed33e831ba9d124e30615204f4084823efd13500b2b2a0efa0ddd703996ec3a47ea66a2b5c1f832d8003cffccf6b773 SHA512 0433fd7863135629d2ab849db34c77f0cbc146f7a84833fcb9263d49ed8366f370f0513bb055990e40a17dff69a1b83a741b1bac2fc8d159d866b45a6b81bdc9
+DIST s6-linux-utils-2.5.0.1.tar.gz 35273 BLAKE2B 61ba3a8ee1fce5357d4c3e71b442ade2277adf6b0560646b78cab3b922183ff15478190a3c4b3a7cce88f13d3836711b81f2c37bc7e545012708ee25f7b036cb SHA512 bc4693486299d1027b6ce908684fe2c66b8173b17baad3bb35a660f1d42f00e48ae56c762c17d162c7be978f7246a9ac5218a5c93c0b93f24b5dc881782329d5
 EBUILD s6-linux-utils-2.4.0.2.ebuild 1149 BLAKE2B 9bde0a49a4d14c1be0642e590f568a0ab15c7a29f51480779f96ff25799494f73e268d6ca9e8ccbd82c3259b6df1dba770d29f94459b9c4d2fe97b1eba27eab1 SHA512 bfd9bba07e7071baa00df31f5980952f6312b370d4f9762650afb1dfce909f8d6d50029bd7d7d78f2cafafc8ac7e3162bdc31c68b13d610394730be35ebc429a
 EBUILD s6-linux-utils-2.5.0.0.ebuild 1111 BLAKE2B 929e7af3a4579360a9eae8292c1e8ea840b7d347f3c350b44e5699674bbc7e0c86ac4d7e5a8bb68e2232882cea8e93f94e104b0875b339d22946575d3a0c3b5b SHA512 cff3803a8525bd6760d8c1a3fec8aedb945b68a70228d30cd235a5bdb914d436979759cdba79c12606d58e29319754968510e4f1e8167421139810b9d32e1f09
+EBUILD s6-linux-utils-2.5.0.1.ebuild 1001 BLAKE2B 6e51048a2b8a083a9c6ecba5e7a8b468b6658c5d131aa502f5e8c608afef6a6a925df26598ea25fdf81944dc907a45141c28ba75f1feed0db8f5027da2f289fd SHA512 7d153190ebd07dd9a6e907cc96a748e24edbd8e75d5eacde8153bb5d4acee5d4ac3d048f93c92bed51ca77a6db0bd9f6dee634c9c9edf90baad7fa3fba5f4c69
 MISC metadata.xml 578 BLAKE2B b561feef1f9d63bdacc7129cfb8d3c10731717f22eac65c85053e138ce52c2e8e0cb6cd36cfe132b52d082f610c0c2b3864bf0964f3f8e68eb0be474d67a0a2e SHA512 76ae04f79a98469ed522cb1f0a8b1088c85cfd2d06801b2d53428f08ac0bea6545e815884850e01661b4225d0d40206dc7d96dc479d258e3d64f3372d87cfcec
diff --git a/sys-apps/s6-portable-utils/Manifest b/sys-apps/s6-portable-utils/Manifest
index a4cfdab827a9..39ebf10bb84a 100644
--- a/sys-apps/s6-portable-utils/Manifest
+++ b/sys-apps/s6-portable-utils/Manifest
@@ -1,5 +1,7 @@
 DIST s6-portable-utils-2.2.1.1.tar.gz 47138 BLAKE2B f5519fbedc2599c0b9366bbff38a9438cb4cdf3b770dfec6e519f8857bd77a3bea172284318df224104fe7003af4a68cadc8089d77c98ba4da85eb59d59819f4 SHA512 fba7a4d1f5e0c969dc254775f28c02f1b8673ead28022962175bd605125dc56012cfdeb177037c322780be93a5191a5292a47cb26cf5d466bb5eb081fa5a9657
 DIST s6-portable-utils-2.2.1.2.tar.gz 47446 BLAKE2B 31093828bbff8d7ebd68e9b9024abff802511d6def436b6c4a42e127fc8ee84544a3e590db2e59d76f2ab407b29edbd462725d8f6c8b4923b999809c58126c8f SHA512 697356a1bea6a0d9ca2dc995667fb2c3ab0e0ec72f9cba9f64a3b745e17ff85793be4b9a3bfcb8137938b732195fdabd2ffba5cef26f86f3ad2705907c6a8ab4
+DIST s6-portable-utils-2.2.1.3.tar.gz 47619 BLAKE2B fc9c7a77f42bb64bdd1cd1cfd23d9e0aa0a208451d28d7b76b67a91aa93eebc75148604877af16f102b27581d81549c1fd6e9bf8ff6f62ad3bb9e344191c3886 SHA512 6640027e65a19417461e1e9c778d276d6ceb3f95ea5c720dd21b0d1755bb8f1a218cd9f42effd6ab6034889cc415ab935b4583b6696c2a96351417d9a8f4d7b0
 EBUILD s6-portable-utils-2.2.1.1.ebuild 1165 BLAKE2B 2606b82a595387a09d74f1295ca6bf89428f339f55827290cdbaa185adb62982247fc61346adc75025c0d0312d0292c7364105cc787b550e52bac09dc4e9db1d SHA512 e29fc657d3088c4d160a0526ed09d6377d777ee3b9c4c5ff23db7eeb174e0ed52f14f08d7a02e3a72249391d0c91f038e1d348763071ed100a200b4611ccc5f3
 EBUILD s6-portable-utils-2.2.1.2.ebuild 1127 BLAKE2B 2b392e393616de97b9cceb711a5e9af725f580a66d9c945513f95724735b46c3ab83287b836b4915813b344cc66fe459ca50d1b7979792132fd1b8afc80ff9cd SHA512 456b6f9cbcccef87307f1fec2ec2302acccca5d362b81e56b1dbab1d32488391275959c9bfac9cb1e7b997c8e6fb1e8d8403cc63b55ab65fba78ea60ae88b260
+EBUILD s6-portable-utils-2.2.1.3.ebuild 1012 BLAKE2B 9f4d5751b9dd487f2ff35452fec88f33e54ecc9712dc9ed8cde0185620c06bb8ee99ab982ca141ddb52494c86880a1a6176a8637dc1851cd276ba2f90531f453 SHA512 9d4700fc09c15238d0a8d6662ce0538268fd9d6471400d4e1c595a9221f59bd8871a76325af162f2607a365938f9690985307ef38ef7160fa9da732ac047322a
 MISC metadata.xml 578 BLAKE2B b561feef1f9d63bdacc7129cfb8d3c10731717f22eac65c85053e138ce52c2e8e0cb6cd36cfe132b52d082f610c0c2b3864bf0964f3f8e68eb0be474d67a0a2e SHA512 76ae04f79a98469ed522cb1f0a8b1088c85cfd2d06801b2d53428f08ac0bea6545e815884850e01661b4225d0d40206dc7d96dc479d258e3d64f3372d87cfcec
diff --git a/sys-apps/s6-rc/Manifest b/sys-apps/s6-rc/Manifest
index 6405d39315a4..0e789da25a43 100644
--- a/sys-apps/s6-rc/Manifest
+++ b/sys-apps/s6-rc/Manifest
@@ -2,8 +2,10 @@ DIST s6-rc-0.3.0.0.tar.gz 93183 BLAKE2B 0096fe268393192867b1e2d45f9a46c0a7618478
 DIST s6-rc-0.4.0.0.tar.gz 96417 BLAKE2B fea4cfbadd82e8e775e4ba2cc1168fc3932f2f23335efa73f254fb17176954cf4d0c10e16bcecf4d62e9ebe05cb213e370042f86e40cb5a4a5583768fe313a83 SHA512 81ed2b09ab980e9d531e6b919f25fe9819f6144e7e639d488362fd872aead73244a03d83da9abd4cb64c10226c5e6fd163c517dcd59566b32a26841b4814ac21
 DIST s6-rc-0.4.0.1.tar.gz 96491 BLAKE2B fe6aa6e2ed868cca6d76928571d561784012ded476825501bb137798c644495a06c2b08c752198d6e985f48fe34404868fa24d49785ff42610e1dd7314ee8088 SHA512 f4e4105dd51eb9dfa4ba45d3f85970d763c70eb5e276de818d9b2c75db9153d3000dd7579ca8e7c4bf814b05bcbcde1dd9b363c57c6507f1cc5af7898049fba7
 DIST s6-rc-0.4.1.0.tar.gz 96840 BLAKE2B 07a05ab7f69a821c677d569051dbe4c22c4e774540866fee6acb91853195a7138965869698cf33eb8d02d183f55e8945beacd567fba742a0bf092cb6e65a7c89 SHA512 12bb1136bc1222e09f115118b631dd5ce7d8155151b1e57427ae932db7654484543dbf5b12f442708ca9defe51d44bba9785caf0a9857847a1f3acb375301e92
+DIST s6-rc-0.5.0.0.tar.gz 97247 BLAKE2B 5b38029c78a6910278819c6616cebfa1dfc4f11e8ad4e9b376e576a30ccdf881520212ef0c2c9a4ee4218c0b9a9751fc6855701ba0126bbf682c054ff2a7cfb7 SHA512 3fa084dd4eb489a8279135760d8051b74176994161cd989f038bef59b8abd6b8bc8c48a6ad2d2e7860627ee749d4abf6cda98857c7052f1097e9591a97355a18
 EBUILD s6-rc-0.3.0.0.ebuild 1619 BLAKE2B 3746812cc4b8c852ae97dad2b9e28e7b84713f98a08df1fd11660507f4810357d8cd1e4798ea246440206fbf4ad1ac452f773f0ac1442e27a4897b4d084d4db3 SHA512 30767d3accaed63968c91dba9d4d4eef80eef838cb2505a84cbc75ce8e966a0f5fa60a24942921a3bdec524f49e22148fd012c1212f206010dd8ef7061956f3c
 EBUILD s6-rc-0.4.0.0.ebuild 1866 BLAKE2B bdb83058265bfbeca41faf995b796c042f7b4f2f27816cfe6b6039e88ecc6b1f81db18337925673cd82106ce950c4d2ca533614009fb4e18d35072a562764bc0 SHA512 c0c00a6a58ea33ba062a41e26911875c944d77ff20875f8569542d17fa0e075fbe05e0018f92eab6671cd20d2ecfdcb9de0a64f1fe27f785b97ff8b0c75f6027
 EBUILD s6-rc-0.4.0.1.ebuild 1866 BLAKE2B 85c17232f071f38901f70e762f74ef89dda79d75f506b99321467f408978d23bc1bd568911357c2e5a76da03681e62ab62e58f5df95df961caac4b4d10a448f3 SHA512 30168528ecf7f8ab574c981f57fddc37d8b10b0f7985e789ecf3baa1f6f63575018aa7bf468f1439804db32f1b608b727c8d1bc7a79ef105c1abb5a3beb13035
 EBUILD s6-rc-0.4.1.0.ebuild 1671 BLAKE2B 610a7c4282a400632a26529f9d426e371c2b7c846ab06d021839797131ec3555084783e697d1247fb40494ea753d0f5ab71da60ae3a629baabe9a1e87583ca9e SHA512 f6a038ad6168aa2338ec492befe8fe8eb6d566bc9c46e87099f472b04d62b68d91527176b4aad3f4658ad9705d17855f693fb1a0101061b0bb9e8326872cd8db
+EBUILD s6-rc-0.5.0.0.ebuild 1491 BLAKE2B cab89c66165305a92494a0bbd1dda32d7a10b1559e9cd4b9c7e869733422833b11b872383d4311dd444e993e0650a071ae87dbbbe60ff8ff5f6a5e501aa16e21 SHA512 f47f93080b5d3bf1ab8001b20d45cea34bc4b0fa86d34dcb27b07f63fc49bccdb3fd69af649a7419e52d4e381aebb39a640cb3f56767f68044aca8b12fe0a2e2
 MISC metadata.xml 578 BLAKE2B b561feef1f9d63bdacc7129cfb8d3c10731717f22eac65c85053e138ce52c2e8e0cb6cd36cfe132b52d082f610c0c2b3864bf0964f3f8e68eb0be474d67a0a2e SHA512 76ae04f79a98469ed522cb1f0a8b1088c85cfd2d06801b2d53428f08ac0bea6545e815884850e01661b4225d0d40206dc7d96dc479d258e3d64f3372d87cfcec
diff --git a/sys-apps/s6/Manifest b/sys-apps/s6/Manifest
index e3075725e549..6b18f7ff716b 100644
--- a/sys-apps/s6/Manifest
+++ b/sys-apps/s6/Manifest
@@ -3,9 +3,11 @@ DIST s6-2.6.1.1.tar.gz 196083 BLAKE2B a05083adcba33770ccbc5621c0fc6d7f6c5be22f70
 DIST s6-2.7.0.0.tar.gz 198303 BLAKE2B e835fd25c75a25d3f39ed59098911e65441e3fcbb4f53c48b3c13de63600975839be4fafb9a620d9ec6168a27a2f0bf86efe08797803230e8e12cab1fb0bcd3a SHA512 495d73b8e5c34ad7295dcf94d34b6998341db063594b31be6b15bead5e47644cc3c7e893974bed4ed1feff7a8a3ad2430658c26eab361e8c90893f877476cc53
 DIST s6-2.7.1.1.tar.gz 204738 BLAKE2B 5a322fb992197b921f12fbf1e5bdec7cf1797a2bec81b72faf1eb2bf94c8f46392f9eb494de58d05b6df43daafa5b0abb3947c3c1a0cb5aa3cd83a56ccd45370 SHA512 59b0a611eaa0bbdeae3133a182e933e14806151d3b8d44c7f4258a63693cf2fa487fce91a4ea37527ed0f52f211a5391b3fcf6202773b0a80d6ce7f3de60ff79
 DIST s6-2.7.2.1.tar.gz 207088 BLAKE2B 233413e3cd400af291c20fc1b82e4a803be50eba9854fcbbe917715afe3a9c51467795f620a2596ab067dc7dbb4edcd09177c208bfcaaa7b3b0f392f49c49ff3 SHA512 dcf032b812ce955c2276af36aa93138debcfa9e429e79af7b8da4f1e98b21e7b658564024c713fef45ffee03704d78f7618ad4b890de0bd3defa51b4689d3790
+DIST s6-2.8.0.1.tar.gz 208122 BLAKE2B f24981b1f29566ae23b8a41a20a119918798ba96fad7e4e62be7d03096dfcbc44de9ea6832c166f541aa8c36bca92819dbe2acd4c46e83866130817237056aa2 SHA512 03478aed129c1e50b34e0b75d7ff50bd84f62eadee862b6227c4313153d47776e7cbeae728d63209773b91931a2abc8372bb7db4953762807d0ed3d305efd23f
 EBUILD s6-2.1.3.0.ebuild 1284 BLAKE2B 805f6f16a33b6a150ef75c2c3775c715598694b13d68dfb930a438df946ed1d0ea3c668024ed963997f2667883765dbe0814ade890b80c8c2ccd35ac2bb5e7c4 SHA512 f5f2e6a032852380cd2991cd09c09f4c55d498c42b33af819893f3f81335db221827e5400633d99f18502d0fb9e8965728d7ce32129f1736aee049c498bcf193
 EBUILD s6-2.6.1.1.ebuild 1508 BLAKE2B fbfa323712511650c38cfce93faf3c4408791ca887ba7a77e4c9b4022b36cd42ee719b8691bfe8976db608ff4a7822753fabd78d51f107b77ee84d117fc55d10 SHA512 194af6e8227a1f63e5285af765dcb43ae3c06e07daa33c83718e73077d3a3848e1edddef3acd49e48618e2ac10c240bb60313338248a1fc6395b326064cf6a6b
 EBUILD s6-2.7.0.0.ebuild 1508 BLAKE2B e04f58311a19ea1ed6088b46f7919296a234efd09d07bd77207f1d9432183c57081072974b4c720a40f57af0dfb8ebbd447f47ca862c89e8f612b825a43bfe25 SHA512 ad05a4ed4e5c0f98c52cf9a3b37c33de5025cfa04b3d240f7a8487b86637f4317ae6cd10d835f18734326bd3e47d1777d91c860dc2020f16e5d9f888172323b3
 EBUILD s6-2.7.1.1.ebuild 1508 BLAKE2B bd4df2ccff6fbe2e72e4643c33a1a37e6d008ada08f5f0806faa8c14905cda8e0e7e00b3d52da57dab5ba58428ded71d4b188b2b714a37ef015b424433ab8cea SHA512 fa2e5517bc36bbd43a56e35a960aacf13ca0d39bfeec82feb17dc0479c8bdc24b636f38a54d302149a816dc18e8f3fa1250e526bd8b8c890db01bf473fa3e5e2
 EBUILD s6-2.7.2.1.ebuild 1356 BLAKE2B cdd91b51bfe13f668b319b39ac60d158c866321066ccb25af78fa70ad0ed1d624378cfd9769c54439f096f6606ca6edacb9c4955b7f021656f47f24bab0a9ca7 SHA512 33afe19eac96603b5c5a856a437b7c15fa86cec7dc074749e69e4f7e93c32a49ba03f810ab2e14335f7ccb4d5d0fde7c241be3c6b21b0751a8ed34a347ff74a8
+EBUILD s6-2.8.0.1.ebuild 1184 BLAKE2B 03ba7fcba1419751cc10219cc1554068a608d928df9104f373809b712da9d38d2be866301621da719d3e0caa4d916b0e66bfbc82e0c4c4504ac05e20b745e25c SHA512 ae40d2c7d92877039de0ca63e3d38fffeb1726d634280b0898c119647eb14870d028e87e6cd3589c9dc12dbeb27aa2895e726230c06e65231fffdb50305b7912
 MISC metadata.xml 743 BLAKE2B 51cce1b0cbf5b0a026853d24c760d20cd8a82baae31bd4c7dc67af31933beaec632d8937dc8236ae2fec3807ffdc748f82cdd50a025179659ac3e3854f209006 SHA512 7391141506e39054d73b3ef9a336feaef887896603db105d493cfa50fa7dad721c8b0aaee16efb10be5aaa0561f2db19987de1431ee79e312cdb04e7edf77b6f
diff --git a/sys-apps/shadow/Manifest b/sys-apps/shadow/Manifest
index 910be360f63a..4f5988afc1db 100644
--- a/sys-apps/shadow/Manifest
+++ b/sys-apps/shadow/Manifest
@@ -3,5 +3,7 @@ AUX pam.d-include/passwd 144 BLAKE2B 95e159c70416218950ad5cdc41c83b52f8d2ec042d3
 AUX pam.d-include/shadow 152 BLAKE2B 82d1f678abc60586ea873da7e2f4907349d77a64085cc475fa09c47cb008b41a7a00a7de2816b2c5cb2f48452d1b07523be35f8dd29026736ba8fbd3ae3d7c56 SHA512 d07611c350d0d6f3386db5080c80a84e4135cf33e44fd3a390cb1092e034f9bd2a69495fadd4bda6ede9962e9658e77f2c8e12d3189cdcda6c7b3c607336f0c3
 AUX shadow-4.1.3-dots-in-usernames.patch 302 BLAKE2B a83f463be9267c3a704997b98d67cd0daddf8ee05debf447d091530517a855078bd53ce28c87045643b2b8c467dd09caad06a4eb0a6568c271e6a42b49a54dcc SHA512 ad20fb3f4f0292f39b5da796e41df71e9e8b1b81dd11a99b2d988440c1b435b0061333a0a5a37a909598d5a840a75946e8c59c74426bae7452de88cf673a5f7d
 DIST shadow-4.6.tar.gz 3804282 BLAKE2B 268c90e7daba138827aec6039f428f52cdcf7929743fa1f49f801cc669de7456ec5a69531194cdb29f051ce7d0b2f1e966fdf2513a9fc8f7fbdeb29d786a509f SHA512 36358333e7f03ef558772f3361bc5851a7d7fd3d85c993a6b732e37304b8068b2893d55607b9bfe8b8eed616a687264f947ff66cefc74ea1a48ba9396d464714
+DIST shadow-4.7.tar.gz 3833335 BLAKE2B 8e030d3dcc5eb76332ff76aad8e9141edb4ae660f56dd3b420968c538d3022a72ab620710b9274b9afb44f497399f5c4ceef339b7d2c52106b9b8368ff127654 SHA512 9b134dc90d8fb39bc72db69ddb78cef6263921c8a2f00abc00ac796bf468ac18393399920eec14bd2a78b814a06fc18eb6f5685ede13fe222fc66b2e411cbb01
 EBUILD shadow-4.6.ebuild 5356 BLAKE2B 46938d56576815e02989d871b6e44216c38255afaf2c51f71b964d6394fb3947c0794c425d3c03a43388788e74ff3f06c14bd54fe918562443fdd1b742700a30 SHA512 f61848d670b9c1fc3eac60162e5a77971002a40a5fe2e2e9aff13789d02dc0dd3f479f4b4cb2f4ba5cb4eb62f5b67d4f040bc84817f1783399ff76f5d9651beb
+EBUILD shadow-4.7.ebuild 5338 BLAKE2B 25f74960370da62556f217ba0ead53c077163549c3d4fd208ae36b030b066c18dfeda4dce33aadcac33cfa4ffb568be07baf57caad644bc104a2b64d797f874d SHA512 d8d27509dc665f14a1014523c94be24204bfa251a5d6b084b0f02e3a413a31df373b0b09d19bbc85945c73fa35f180f9ce019b4052aa7a3a2ced7c0a884fcc15
 MISC metadata.xml 425 BLAKE2B 363f3a5caf1aaf0ddc3852f11191d8c3b9168ea1196ebba22c235942c23411dee2197715a2a52f513323ed845b96c7bc58ce59e5f609449fad5b6e807960ff82 SHA512 23577cff767bb0330e95f0390e3d5b5c2c43096a7103f38a9b91755d443a1f68b6f933d9e5c61feb37926565fb00e00c0b2b2dcef54270d69a77fdd78b143abb
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 4c275507e368..330e9045301a 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -1,4 +1,5 @@
 AUX 241-version-dep.patch 5015 BLAKE2B 63a2f591c6199787cabc5af4c0df14c76e8dba189ca2d69cf539b13a0187fb7f29f7d6a2550b7eee046859d99c9b4de4af11573c624787968a8041e210d8bc75 SHA512 22667683fdec5b92d9dd7afe40930d7483f3025b24152a6d0f9497ac81e9e2a75b467d2b02770d2321ea53236444b5d01217b6f97d725913974ebd2522c6ac58
+AUX 242-file-max.patch 1314 BLAKE2B 3057d95ff701e188da4fba3b72b8a6e17dec2350a67e056cf1a2e0fa216d0b3aec22cbfbacd11e6ee17331cbda27dbf201fbc9ba2aa794fec9efbe0f612b3b43 SHA512 508a0b56b55839bccef3b3dc48f054e3d2876936cd8a36009dbadaa9a0ae85a5897f95de5c9c4b0e48d80d176e788fa342bd4235224e8cf3adacbe04dfbcebd0
 AUX 242-gcc-9.patch 7672 BLAKE2B 1cd98213f70e6813582706e7b523925fd7956507bd5bf113889189d3a5da3e0eb287163449d023755269827e3b5dc8db758a51cd9f37c3f3a69510de31b43109 SHA512 57add7e3215f25ec5547a905c7257ca06adca30d2f4a031eee9882ac16586ea5c5c9d3b50206674dffdb182c78f048834b6c73ab1490253a1ddae15c35878554
 AUX 242-socket-util-flush-accept.patch 2123 BLAKE2B 74bfbe440ae548b96d90b41ac45c440b21a63c61ae75a9d2b725d2bdec74a03aeca7b673a656821eb925e6740d6728a41d0dc30275287a92519b47d9c477c487 SHA512 7dd0daa70de4ee264d0b3dfe6f80b5e0c563e5bb5255ca2a92f26c4a993fca178f275f85c9048305b82b258d41c9bcbb28d74f9e2b6c2a0e77748464890cb907
 AUX 242-wireguard-listenport.patch 1598 BLAKE2B 3266fe600db530ebb5b8eb726822daf14ee87292b035c09a1eb9a46638cc2dc3b8a3f11dd74684a79f3e521d3999b6b8c3a641f8f7475a5d45706567e00d26f6 SHA512 69e047000eb5ed36850bcbc6b8ef37a646b60a642a07a68547624e81aa6e49c77b848745ca4daad883151ddcaee9e7957ea6430f5a0c0c67ffc7887778f536e9
@@ -12,7 +13,7 @@ AUX gentoo-uucp-group-r1.patch 562 BLAKE2B 98b629d9b20e4fedfb017864dca1346aa1766
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
 DIST systemd-241.tar.gz 7640538 BLAKE2B 69d7196fee0d0ad06ea8d7c78b0299cc17517ecce3ca4c0b1181a3fbb13bc2627629156785051e2ff427dcc21414f7a078724c6409ebaa431618e4799ebcd50a SHA512 a7757574590e8aa37e1291ea0b2c5eb03a8d8062fe9462fa5b0bf50830c933e2b301d106c70d904f94afc0aa8e43a8acfd11926dfa25b1b89174580e491e545e
 DIST systemd-242.tar.gz 7831435 BLAKE2B 288e65d0a8e133ef5885689eb16118a83d93c730e342da63115cea0892fc999104c3a4856c83f3e7ef909ba2f3311146730b05ee02d84cc0400851ccbdcd54cd SHA512 578f68a3c8f2d454198fc04ff8d943abcfb390531d57f9603d185857f7afa7f4dc641dafecf49ce50fe22f5837b252b181400891e8efd4459fd4f69bb4283cb4
-EBUILD systemd-241-r1.ebuild 13807 BLAKE2B bed17c8e35d3936f67fa538a314c716d7fbeb0b3e7057024f5cf5c0080b27f9f8e3739e47b419125e78b2f7f67d555b82e4155e7eecb0bd8b7ada58480f24428 SHA512 6cd80e98c0104cd7807fc0ddbe5e59a7558743cf98caaa40a84786caa5919603e683c3ca11f8ad215e3290ddd4fdc67988ef90fd4b9ff5ec12eb80adbe116729
-EBUILD systemd-242-r2.ebuild 13803 BLAKE2B be33f36f5610fae2f89795647c472ead227f58afee1bb72aea661174d64c3e1141e07e72d5ac544695151f80efec83871cdc7871fed801c613f830c165ca5852 SHA512 2e944d46414ffe887587d3f5087c56b04fdd607cb8c88a5d0e0075d65c0d82298e802e7f43493fd2ca1fe77417d9333a2cd156ab86b66726cb50067ef43991b8
+EBUILD systemd-241-r2.ebuild 13842 BLAKE2B b5d00f7241a5481fc7201675c3a7e5bf03f4689d6e9128d1236134e576faed3db92c7eb813ad334ed7b00d9e3c5f3796f1d43181c1f29e7db86e8cf5eaafbc28 SHA512 1216ae355a4c122feeafb1f66900de82c641d0ac5d087695531f558deb4a44bdc29b8a37f5c2521e1db71b2d1fbf0c2287f50a43215710f52f556b2a031f88d5
+EBUILD systemd-242-r3.ebuild 13838 BLAKE2B 41bb4c44967ef31883d455e0ef49ee6dca5f210882043c8db2b82c33fc117a26f945ee6283aef6feea2ab2e0238521113d29e1d612a189575be29d6a498737b8 SHA512 c7bf697a8c24af40807efb4d4d5baf9de65d1c3ff460dee1956557f2ca04941ca1be2425290e23b525301ee8749d68d9a453830ac25a00dc0ce29bd5e8defc80
 EBUILD systemd-9999.ebuild 13673 BLAKE2B d23c5d7f2963f102d98d388ba249400f52a96c95bf6d0e7471f4cae627ac5120289d5cb8c06c4d0c21667d513ac86fbaf4e4ec2bb274c37cc564b32afa239af4 SHA512 9ab3f1e0f6a7735a08dea7df7902427b9318b0edb2d4ed2c6717fb08c06bddd6b7ae7365dd2c88cbc8a36e2f93851769302e2deb2b6c6112affb9d4bdd871565
 MISC metadata.xml 2125 BLAKE2B fed24f3b56a79016c4df8554626c7ae67ff50f97adb9af809a726b226c52690642f9df71b22eab320d3964d764dec1439009d8b8bf6979e407a5704e843829d2 SHA512 414d069185451f72eb1e803da7019da8800b08eade46824620632d795007bdec0e9201af93bb895674e3c48907593062610eb2f22f20ac15d099a593b450b8de
diff --git a/sys-apps/systemd/systemd-241-r1.ebuild b/sys-apps/systemd/systemd-241-r1.ebuild
deleted file mode 100644
index a6ba1136fd72..000000000000
--- a/sys-apps/systemd/systemd-241-r1.ebuild
+++ /dev/null
@@ -1,469 +0,0 @@
-# Copyright 2011-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-	inherit git-r3
-else
-	MY_PV=${PV/_/-}
-	MY_P=${PN}-${MY_PV}
-	S=${WORKDIR}/${MY_P}
-	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="alpha amd64 arm arm64 ~hppa ia64 ~mips ppc ppc64 sparc x86"
-fi
-
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
-
-inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev user
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="acl apparmor audit build cryptsetup curl elfutils +gcrypt gnuefi http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr ssl +sysv-utils test vanilla xkb"
-
-REQUIRED_USE="importd? ( curl gcrypt lzma )"
-RESTRICT="!test? ( test )"
-
-MINKV="3.11"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	!<sys-libs/glibc-2.16
-	acl? ( sys-apps/acl:0= )
-	apparmor? ( sys-libs/libapparmor:0= )
-	audit? ( >=sys-process/audit-2:0= )
-	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
-	curl? ( net-misc/curl:0= )
-	elfutils? ( >=dev-libs/elfutils-0.158:0= )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
-	http? (
-		>=net-libs/libmicrohttpd-0.9.33:0=
-		ssl? ( >=net-libs/gnutls-3.1.4:0= )
-	)
-	idn? (
-		libidn2? ( net-dns/libidn2:= )
-		!libidn2? ( net-dns/libidn:= )
-	)
-	importd? (
-		app-arch/bzip2:0=
-		sys-libs/zlib:0=
-	)
-	kmod? ( >=sys-apps/kmod-15:0= )
-	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
-	nat? ( net-firewall/iptables:0= )
-	pam? ( virtual/pam:=[${MULTILIB_USEDEP}] )
-	pcre? ( dev-libs/libpcre2 )
-	qrcode? ( media-gfx/qrencode:0= )
-	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
-	selinux? ( sys-libs/libselinux:0= )
-	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/baselayout-2.2
-	selinux? ( sec-policy/selinux-base-policy[systemd] )
-	sysv-utils? ( !sys-apps/sysvinit )
-	!sysv-utils? ( sys-apps/sysvinit )
-	resolvconf? ( !net-dns/openresolv )
-	!build? ( || (
-		sys-apps/util-linux[kill(-)]
-		sys-process/procps[kill(+)]
-		sys-apps/coreutils[kill(-)]
-	) )
-	!sys-auth/nss-myhostname
-	!<sys-kernel/dracut-044
-	!sys-fs/eudev
-	!sys-fs/udev"
-
-# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
-PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
-	>=sys-apps/hwids-20150417[udev]
-	>=sys-fs/udev-init-scripts-25
-	policykit? ( sys-auth/polkit )
-	!vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="
-	>=sys-kernel/linux-headers-${MINKV}
-	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-
-BDEPEND="
-	app-arch/xz-utils:0
-	dev-util/gperf
-	>=dev-util/meson-0.46
-	>=dev-util/intltool-0.50
-	>=sys-apps/coreutils-8.16
-	sys-devel/m4
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	test? ( sys-apps/dbus )
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
-	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if use test && has pid-sandbox ${FEATURES}; then
-			ewarn "Tests are known to fail with PID sandboxing enabled."
-			ewarn "See https://bugs.gentoo.org/674458."
-		fi
-
-		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
-			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
-			~TIMERFD ~TMPFS_XATTR ~UNIX
-			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-			~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
-			~!SYSFS_DEPRECATED_V2"
-
-		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
-		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
-		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
-		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
-		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
-
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-			if linux_chkconfig_present X86; then
-				CONFIG_CHECK+=" ~DMIID"
-			fi
-		fi
-
-		if kernel_is -lt ${MINKV//./ }; then
-			ewarn "Kernel version at least ${MINKV} required"
-		fi
-
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	default
-	[[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
-	# Do NOT add patches here
-	local PATCHES=()
-
-	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
-	# Add local patches here
-	PATCHES+=(
-		"${FILESDIR}"/CVE-2019-6454/0001-Refuse-dbus-message-paths-longer-than-BUS_PATH_SIZE_.patch
-		"${FILESDIR}"/CVE-2019-6454/0002-Allocate-temporary-strings-to-hold-dbus-paths-on-the.patch
-		"${FILESDIR}"/241-version-dep.patch
-		"${FILESDIR}"/242-gcc-9.patch
-	)
-
-	if ! use vanilla; then
-		PATCHES+=(
-			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
-			"${FILESDIR}/gentoo-systemd-user-pam.patch"
-			"${FILESDIR}/gentoo-uucp-group-r1.patch"
-			"${FILESDIR}/gentoo-generator-path-r1.patch"
-		)
-	fi
-
-	default
-}
-
-src_configure() {
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-
-	python_setup
-
-	multilib-minimal_src_configure
-}
-
-meson_use() {
-	usex "$1" true false
-}
-
-meson_multilib() {
-	if multilib_is_native_abi; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-meson_multilib_native_use() {
-	if multilib_is_native_abi && use "$1"; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}/var"
-		-Dpamlibdir="$(getpam_mod_dir)"
-		# avoid bash-completion dep
-		-Dbashcompletiondir="$(get_bashcompdir)"
-		# make sure we get /bin:/sbin in PATH
-		-Dsplit-usr=$(usex split-usr true false)
-		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
-		-Dsysvinit-path=
-		-Dsysvrcnd-path=
-		# Avoid infinite exec recursion, bug 642724
-		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
-		# no deps
-		-Defi=$(meson_multilib)
-		-Dima=true
-		# Optional components/dependencies
-		-Dacl=$(meson_multilib_native_use acl)
-		-Dapparmor=$(meson_multilib_native_use apparmor)
-		-Daudit=$(meson_multilib_native_use audit)
-		-Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
-		-Dlibcurl=$(meson_multilib_native_use curl)
-		-Delfutils=$(meson_multilib_native_use elfutils)
-		-Dgcrypt=$(meson_use gcrypt)
-		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
-		-Defi-libdir="${EPREFIX}/usr/$(get_libdir)"
-		-Dmicrohttpd=$(meson_multilib_native_use http)
-		$(usex http -Dgnutls=$(meson_multilib_native_use ssl) -Dgnutls=false)
-		-Dimportd=$(meson_multilib_native_use importd)
-		-Dbzip2=$(meson_multilib_native_use importd)
-		-Dzlib=$(meson_multilib_native_use importd)
-		-Dkmod=$(meson_multilib_native_use kmod)
-		-Dlz4=$(meson_use lz4)
-		-Dxz=$(meson_use lzma)
-		-Dlibiptc=$(meson_multilib_native_use nat)
-		-Dpam=$(meson_use pam)
-		-Dpcre2=$(meson_multilib_native_use pcre)
-		-Dpolkit=$(meson_multilib_native_use policykit)
-		-Dqrencode=$(meson_multilib_native_use qrcode)
-		-Dseccomp=$(meson_multilib_native_use seccomp)
-		-Dselinux=$(meson_multilib_native_use selinux)
-		#-Dtests=$(meson_multilib_native_use test)
-		-Ddbus=$(meson_multilib_native_use test)
-		-Dxkbcommon=$(meson_multilib_native_use xkb)
-		# hardcode a few paths to spare some deps
-		-Dkill-path=/bin/kill
-		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
-		# Breaks screen, tmux, etc.
-		-Ddefault-kill-user-processes=false
-
-		# multilib options
-		-Dbacklight=$(meson_multilib)
-		-Dbinfmt=$(meson_multilib)
-		-Dcoredump=$(meson_multilib)
-		-Denvironment-d=$(meson_multilib)
-		-Dfirstboot=$(meson_multilib)
-		-Dhibernate=$(meson_multilib)
-		-Dhostnamed=$(meson_multilib)
-		-Dhwdb=$(meson_multilib)
-		-Dldconfig=$(meson_multilib)
-		-Dlocaled=$(meson_multilib)
-		-Dman=$(meson_multilib)
-		-Dnetworkd=$(meson_multilib)
-		-Dquotacheck=$(meson_multilib)
-		-Drandomseed=$(meson_multilib)
-		-Drfkill=$(meson_multilib)
-		-Dsysusers=$(meson_multilib)
-		-Dtimedated=$(meson_multilib)
-		-Dtimesyncd=$(meson_multilib)
-		-Dtmpfiles=$(meson_multilib)
-		-Dvconsole=$(meson_multilib)
-	)
-
-	if multilib_is_native_abi && use idn; then
-		myconf+=(
-			-Dlibidn2=$(usex libidn2 true false)
-			-Dlibidn=$(usex libidn2 false true)
-		)
-	else
-		myconf+=(
-			-Dlibidn2=false
-			-Dlibidn=false
-		)
-	fi
-
-	meson_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	eninja
-}
-
-multilib_src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-	eninja test
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
-}
-
-multilib_src_install_all() {
-	local rootprefix=$(usex split-usr '' /usr)
-
-	# meson doesn't know about docdir
-	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
-
-	einstalldocs
-	dodoc "${FILESDIR}"/nsswitch.conf
-
-	if ! use resolvconf; then
-		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
-	fi
-
-	if ! use sysv-utils; then
-		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
-		rm "${ED}"/usr/share/man/man1/init.1 || die
-		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
-	fi
-
-	if ! use resolvconf && ! use sysv-utils; then
-		rmdir "${ED}${rootprefix}"/sbin || die
-	fi
-
-	# Preserve empty dirs in /etc & /var, bug #437008
-	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
-	keepdir /etc/systemd/{ntp-units.d,user} /var/lib/systemd
-	keepdir /etc/udev/{hwdb.d,rules.d}
-	keepdir /var/log/journal/remote
-
-	# Symlink /etc/sysctl.conf for easy migration.
-	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
-
-	# If we install these symlinks, there is no way for the sysadmin to remove them
-	# permanently.
-	rm -f "${ED}"/etc/systemd/system/multi-user.target.wants/systemd-networkd.service || die
-	rm -f "${ED}"/etc/systemd/system/dbus-org.freedesktop.network1.service || die
-	rm -f "${ED}"/etc/systemd/system/multi-user.target.wants/systemd-resolved.service || die
-	rm -f "${ED}"/etc/systemd/system/dbus-org.freedesktop.resolve1.service || die
-	rm -fr "${ED}"/etc/systemd/system/network-online.target.wants || die
-	rm -fr "${ED}"/etc/systemd/system/sockets.target.wants || die
-	rm -fr "${ED}"/etc/systemd/system/sysinit.target.wants || die
-
-	local udevdir=/lib/udev
-	use split-usr || udevdir=/usr/lib/udev
-
-	rm -r "${ED}${udevdir}/hwdb.d" || die
-
-	if use split-usr; then
-		# Avoid breaking boot/reboot
-		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
-		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
-	fi
-}
-
-migrate_locale() {
-	local envd_locale_def="${EROOT}/etc/env.d/02locale"
-	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
-	local locale_conf="${EROOT}/etc/locale.conf"
-
-	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
-		# If locale.conf does not exist...
-		if [[ -e ${envd_locale} ]]; then
-			# ...either copy env.d/??locale if there's one
-			ebegin "Moving ${envd_locale} to ${locale_conf}"
-			mv "${envd_locale}" "${locale_conf}"
-			eend ${?} || FAIL=1
-		else
-			# ...or create a dummy default
-			ebegin "Creating ${locale_conf}"
-			cat > "${locale_conf}" <<-EOF
-				# This file has been created by the sys-apps/systemd ebuild.
-				# See locale.conf(5) and localectl(1).
-
-				# LANG=${LANG}
-			EOF
-			eend ${?} || FAIL=1
-		fi
-	fi
-
-	if [[ ! -L ${envd_locale} ]]; then
-		# now, if env.d/??locale is not a symlink (to locale.conf)...
-		if [[ -e ${envd_locale} ]]; then
-			# ...warn the user that he has duplicate locale settings
-			ewarn
-			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
-			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
-			ewarn "and create the symlink with the following command:"
-			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
-			ewarn
-		else
-			# ...or just create the symlink if there's nothing here
-			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
-			ln -n -s ../locale.conf "${envd_locale_def}"
-			eend ${?} || FAIL=1
-		fi
-	fi
-}
-
-pkg_postinst() {
-	newusergroup() {
-		enewgroup "$1"
-		enewuser "$1" -1 -1 -1 "$1"
-	}
-
-	enewgroup input
-	enewgroup kvm 78
-	enewgroup render
-	enewgroup systemd-journal
-	newusergroup systemd-bus-proxy
-	newusergroup systemd-coredump
-	newusergroup systemd-journal-gateway
-	newusergroup systemd-journal-remote
-	newusergroup systemd-journal-upload
-	newusergroup systemd-network
-	newusergroup systemd-resolve
-	newusergroup systemd-timesync
-
-	systemd_update_catalog
-
-	# Keep this here in case the database format changes so it gets updated
-	# when required. Despite that this file is owned by sys-apps/hwids.
-	if has_version "sys-apps/hwids[udev]"; then
-		udevadm hwdb --update --root="${EROOT}"
-	fi
-
-	udev_reload || FAIL=1
-
-	# Bug 465468, make sure locales are respect, and ensure consistency
-	# between OpenRC & systemd
-	migrate_locale
-
-	systemd_reenable systemd-networkd.service systemd-resolved.service
-
-	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
-		ebegin "Reexecuting system manager"
-		systemctl daemon-reexec
-		eend $?
-	fi
-
-	if [[ ${FAIL} ]]; then
-		eerror "One of the postinst commands failed. Please check the postinst output"
-		eerror "for errors. You may need to clean up your system and/or try installing"
-		eerror "systemd again."
-		eerror
-	fi
-}
-
-pkg_prerm() {
-	# If removing systemd completely, remove the catalog database.
-	if [[ ! ${REPLACED_BY_VERSION} ]]; then
-		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
-	fi
-}
diff --git a/sys-apps/systemd/systemd-242-r2.ebuild b/sys-apps/systemd/systemd-242-r2.ebuild
deleted file mode 100644
index c2b6ac9fb905..000000000000
--- a/sys-apps/systemd/systemd-242-r2.ebuild
+++ /dev/null
@@ -1,492 +0,0 @@
-# Copyright 2011-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-	inherit git-r3
-else
-	MY_PV=${PV/_/-}
-	MY_P=${PN}-${MY_PV}
-	S=${WORKDIR}/${MY_P}
-	SRC_URI="https://github.com/systemd/systemd/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-PYTHON_COMPAT=( python{3_5,3_6,3_7} )
-
-inherit bash-completion-r1 linux-info meson multilib-minimal ninja-utils pam python-any-r1 systemd toolchain-funcs udev user
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="https://www.freedesktop.org/wiki/Software/systemd"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="acl apparmor audit build cryptsetup curl dns-over-tls elfutils +gcrypt gnuefi gnutls http idn importd +kmod libidn2 +lz4 lzma nat pam pcre policykit qrcode +resolvconf +seccomp selinux +split-usr +sysv-utils test vanilla xkb"
-
-REQUIRED_USE="importd? ( curl gcrypt lzma )"
-RESTRICT="!test? ( test )"
-
-MINKV="3.11"
-
-COMMON_DEPEND=">=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	!<sys-libs/glibc-2.16
-	acl? ( sys-apps/acl:0= )
-	apparmor? ( sys-libs/libapparmor:0= )
-	audit? ( >=sys-process/audit-2:0= )
-	cryptsetup? ( >=sys-fs/cryptsetup-1.6:0= )
-	curl? ( net-misc/curl:0= )
-	dns-over-tls? (
-		gnutls? ( >=net-libs/gnutls-3.5.3:0= )
-		!gnutls? ( >=dev-libs/openssl-1.1.0:0= )
-	)
-	elfutils? ( >=dev-libs/elfutils-0.158:0= )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
-	http? (
-		>=net-libs/libmicrohttpd-0.9.33:0=
-		gnutls? ( >=net-libs/gnutls-3.1.4:0= )
-	)
-	idn? (
-		libidn2? ( net-dns/libidn2:= )
-		!libidn2? ( net-dns/libidn:= )
-	)
-	importd? (
-		app-arch/bzip2:0=
-		sys-libs/zlib:0=
-	)
-	kmod? ( >=sys-apps/kmod-15:0= )
-	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
-	nat? ( net-firewall/iptables:0= )
-	pam? ( virtual/pam:=[${MULTILIB_USEDEP}] )
-	pcre? ( dev-libs/libpcre2 )
-	qrcode? ( media-gfx/qrencode:0= )
-	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
-	selinux? ( sys-libs/libselinux:0= )
-	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
-	>=sys-apps/baselayout-2.2
-	selinux? ( sec-policy/selinux-base-policy[systemd] )
-	sysv-utils? ( !sys-apps/sysvinit )
-	!sysv-utils? ( sys-apps/sysvinit )
-	resolvconf? ( !net-dns/openresolv )
-	!build? ( || (
-		sys-apps/util-linux[kill(-)]
-		sys-process/procps[kill(+)]
-		sys-apps/coreutils[kill(-)]
-	) )
-	!sys-auth/nss-myhostname
-	!<sys-kernel/dracut-044
-	!sys-fs/eudev
-	!sys-fs/udev"
-
-# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
-PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
-	>=sys-apps/hwids-20150417[udev]
-	>=sys-fs/udev-init-scripts-25
-	policykit? ( sys-auth/polkit )
-	!vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="
-	>=sys-kernel/linux-headers-${MINKV}
-	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-
-BDEPEND="
-	app-arch/xz-utils:0
-	dev-util/gperf
-	>=dev-util/meson-0.46
-	>=dev-util/intltool-0.50
-	>=sys-apps/coreutils-8.16
-	sys-devel/m4
-	virtual/pkgconfig[${MULTILIB_USEDEP}]
-	test? ( sys-apps/dbus )
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
-	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if use test && has pid-sandbox ${FEATURES}; then
-			ewarn "Tests are known to fail with PID sandboxing enabled."
-			ewarn "See https://bugs.gentoo.org/674458."
-		fi
-
-		local CONFIG_CHECK="~AUTOFS4_FS ~BLK_DEV_BSG ~CGROUPS
-			~CHECKPOINT_RESTORE ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
-			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
-			~TIMERFD ~TMPFS_XATTR ~UNIX
-			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-			~!FW_LOADER_USER_HELPER_FALLBACK ~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
-			~!SYSFS_DEPRECATED_V2"
-
-		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
-		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
-		kernel_is -lt 3 7 && CONFIG_CHECK+=" ~HOTPLUG"
-		kernel_is -lt 4 7 && CONFIG_CHECK+=" ~DEVPTS_MULTIPLE_INSTANCES"
-		kernel_is -ge 4 10 && CONFIG_CHECK+=" ~CGROUP_BPF"
-
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-			if linux_chkconfig_present X86; then
-				CONFIG_CHECK+=" ~DMIID"
-			fi
-		fi
-
-		if kernel_is -lt ${MINKV//./ }; then
-			ewarn "Kernel version at least ${MINKV} required"
-		fi
-
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	default
-	[[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
-	# Do NOT add patches here
-	local PATCHES=()
-
-	[[ -d "${WORKDIR}"/patches ]] && PATCHES+=( "${WORKDIR}"/patches )
-
-	# Add local patches here
-	PATCHES+=(
-		"${FILESDIR}"/242-gcc-9.patch
-		"${FILESDIR}"/242-socket-util-flush-accept.patch
-		"${FILESDIR}"/242-wireguard-listenport.patch
-	)
-
-	if ! use vanilla; then
-		PATCHES+=(
-			"${FILESDIR}/gentoo-Dont-enable-audit-by-default.patch"
-			"${FILESDIR}/gentoo-systemd-user-pam.patch"
-			"${FILESDIR}/gentoo-uucp-group-r1.patch"
-			"${FILESDIR}/gentoo-generator-path-r1.patch"
-		)
-	fi
-
-	default
-}
-
-src_configure() {
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-
-	python_setup
-
-	multilib-minimal_src_configure
-}
-
-meson_use() {
-	usex "$1" true false
-}
-
-meson_multilib() {
-	if multilib_is_native_abi; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-meson_multilib_native_use() {
-	if multilib_is_native_abi && use "$1"; then
-		echo true
-	else
-		echo false
-	fi
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}/var"
-		-Dpamlibdir="$(getpam_mod_dir)"
-		# avoid bash-completion dep
-		-Dbashcompletiondir="$(get_bashcompdir)"
-		# make sure we get /bin:/sbin in PATH
-		-Dsplit-usr=$(usex split-usr true false)
-		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
-		-Dsysvinit-path=
-		-Dsysvrcnd-path=
-		# Avoid infinite exec recursion, bug 642724
-		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
-		# no deps
-		-Defi=$(meson_multilib)
-		-Dima=true
-		# Optional components/dependencies
-		-Dacl=$(meson_multilib_native_use acl)
-		-Dapparmor=$(meson_multilib_native_use apparmor)
-		-Daudit=$(meson_multilib_native_use audit)
-		-Dlibcryptsetup=$(meson_multilib_native_use cryptsetup)
-		-Dlibcurl=$(meson_multilib_native_use curl)
-		-Delfutils=$(meson_multilib_native_use elfutils)
-		-Dgcrypt=$(meson_use gcrypt)
-		-Dgnu-efi=$(meson_multilib_native_use gnuefi)
-		-Dgnutls=$(meson_multilib_native_use gnutls)
-		-Defi-libdir="${EPREFIX}/usr/$(get_libdir)"
-		-Dmicrohttpd=$(meson_multilib_native_use http)
-		-Dimportd=$(meson_multilib_native_use importd)
-		-Dbzip2=$(meson_multilib_native_use importd)
-		-Dzlib=$(meson_multilib_native_use importd)
-		-Dkmod=$(meson_multilib_native_use kmod)
-		-Dlz4=$(meson_use lz4)
-		-Dxz=$(meson_use lzma)
-		-Dlibiptc=$(meson_multilib_native_use nat)
-		-Dpam=$(meson_use pam)
-		-Dpcre2=$(meson_multilib_native_use pcre)
-		-Dpolkit=$(meson_multilib_native_use policykit)
-		-Dqrencode=$(meson_multilib_native_use qrcode)
-		-Dseccomp=$(meson_multilib_native_use seccomp)
-		-Dselinux=$(meson_multilib_native_use selinux)
-		-Ddbus=$(meson_multilib_native_use test)
-		-Dxkbcommon=$(meson_multilib_native_use xkb)
-		# hardcode a few paths to spare some deps
-		-Dkill-path=/bin/kill
-		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
-		# Breaks screen, tmux, etc.
-		-Ddefault-kill-user-processes=false
-
-		# multilib options
-		-Dbacklight=$(meson_multilib)
-		-Dbinfmt=$(meson_multilib)
-		-Dcoredump=$(meson_multilib)
-		-Denvironment-d=$(meson_multilib)
-		-Dfirstboot=$(meson_multilib)
-		-Dhibernate=$(meson_multilib)
-		-Dhostnamed=$(meson_multilib)
-		-Dhwdb=$(meson_multilib)
-		-Dldconfig=$(meson_multilib)
-		-Dlocaled=$(meson_multilib)
-		-Dman=$(meson_multilib)
-		-Dnetworkd=$(meson_multilib)
-		-Dquotacheck=$(meson_multilib)
-		-Drandomseed=$(meson_multilib)
-		-Drfkill=$(meson_multilib)
-		-Dsysusers=$(meson_multilib)
-		-Dtimedated=$(meson_multilib)
-		-Dtimesyncd=$(meson_multilib)
-		-Dtmpfiles=$(meson_multilib)
-		-Dvconsole=$(meson_multilib)
-	)
-
-	if multilib_is_native_abi && use idn; then
-		myconf+=(
-			-Dlibidn2=$(usex libidn2 true false)
-			-Dlibidn=$(usex libidn2 false true)
-		)
-	else
-		myconf+=(
-			-Dlibidn2=false
-			-Dlibidn=false
-		)
-	fi
-
-	if multilib_is_native_abi && use dns-over-tls; then
-		myconf+=(
-			-Ddns-over-tls=true
-			-Dopenssl=$(usex !gnutls true false)
-		)
-	else
-		myconf+=( -Ddns-over-tls=false -Dopenssl=false )
-	fi
-
-	meson_src_configure "${myconf[@]}"
-}
-
-multilib_src_compile() {
-	eninja
-}
-
-multilib_src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-	eninja test
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" eninja install
-}
-
-multilib_src_install_all() {
-	local rootprefix=$(usex split-usr '' /usr)
-
-	# meson doesn't know about docdir
-	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
-
-	einstalldocs
-	dodoc "${FILESDIR}"/nsswitch.conf
-
-	if ! use resolvconf; then
-		rm -f "${ED}${rootprefix}"/sbin/resolvconf || die
-	fi
-
-	if ! use sysv-utils; then
-		rm "${ED}${rootprefix}"/sbin/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
-		rm "${ED}"/usr/share/man/man1/init.1 || die
-		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
-	fi
-
-	if ! use resolvconf && ! use sysv-utils; then
-		rmdir "${ED}${rootprefix}"/sbin || die
-	fi
-
-	# Preserve empty dirs in /etc & /var, bug #437008
-	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
-	keepdir /etc/systemd/{ntp-units.d,user} /var/lib/systemd
-	keepdir /etc/udev/{hwdb.d,rules.d}
-	keepdir /var/log/journal/remote
-
-	# Symlink /etc/sysctl.conf for easy migration.
-	dosym ../sysctl.conf /etc/sysctl.d/99-sysctl.conf
-
-	local udevdir=/lib/udev
-	use split-usr || udevdir=/usr/lib/udev
-
-	rm -r "${ED}${udevdir}/hwdb.d" || die
-
-	if use split-usr; then
-		# Avoid breaking boot/reboot
-		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
-		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
-	fi
-}
-
-migrate_locale() {
-	local envd_locale_def="${EROOT}/etc/env.d/02locale"
-	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
-	local locale_conf="${EROOT}/etc/locale.conf"
-
-	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
-		# If locale.conf does not exist...
-		if [[ -e ${envd_locale} ]]; then
-			# ...either copy env.d/??locale if there's one
-			ebegin "Moving ${envd_locale} to ${locale_conf}"
-			mv "${envd_locale}" "${locale_conf}"
-			eend ${?} || FAIL=1
-		else
-			# ...or create a dummy default
-			ebegin "Creating ${locale_conf}"
-			cat > "${locale_conf}" <<-EOF
-				# This file has been created by the sys-apps/systemd ebuild.
-				# See locale.conf(5) and localectl(1).
-
-				# LANG=${LANG}
-			EOF
-			eend ${?} || FAIL=1
-		fi
-	fi
-
-	if [[ ! -L ${envd_locale} ]]; then
-		# now, if env.d/??locale is not a symlink (to locale.conf)...
-		if [[ -e ${envd_locale} ]]; then
-			# ...warn the user that he has duplicate locale settings
-			ewarn
-			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
-			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
-			ewarn "and create the symlink with the following command:"
-			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
-			ewarn
-		else
-			# ...or just create the symlink if there's nothing here
-			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
-			ln -n -s ../locale.conf "${envd_locale_def}"
-			eend ${?} || FAIL=1
-		fi
-	fi
-}
-
-save_enabled_units() {
-	ENABLED_UNITS=()
-	type systemctl &>/dev/null || return
-	for x; do
-		if systemctl --quiet --root="${ROOT:-/}" is-enabled "${x}"; then
-			ENABLED_UNITS+=( "${x}" )
-		fi
-	done
-}
-
-pkg_preinst() {
-	save_enabled_units {machines,remote-{cryptsetup,fs}}.target getty@tty1.service
-}
-
-pkg_postinst() {
-	newusergroup() {
-		enewgroup "$1"
-		enewuser "$1" -1 -1 -1 "$1"
-	}
-
-	enewgroup input
-	enewgroup kvm 78
-	enewgroup render
-	enewgroup systemd-journal
-	newusergroup systemd-bus-proxy
-	newusergroup systemd-coredump
-	newusergroup systemd-journal-gateway
-	newusergroup systemd-journal-remote
-	newusergroup systemd-journal-upload
-	newusergroup systemd-network
-	newusergroup systemd-resolve
-	newusergroup systemd-timesync
-
-	systemd_update_catalog
-
-	# Keep this here in case the database format changes so it gets updated
-	# when required. Despite that this file is owned by sys-apps/hwids.
-	if has_version "sys-apps/hwids[udev]"; then
-		udevadm hwdb --update --root="${EROOT}"
-	fi
-
-	udev_reload || FAIL=1
-
-	# Bug 465468, make sure locales are respect, and ensure consistency
-	# between OpenRC & systemd
-	migrate_locale
-
-	systemd_reenable systemd-networkd.service systemd-resolved.service
-
-	if [[ ${ENABLED_UNITS[@]} ]]; then
-		systemctl --root="${ROOT:-/}" enable "${ENABLED_UNITS[@]}"
-	fi
-
-	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
-		rm "${EROOT}/var/lib/systemd/timesync"
-	fi
-
-	if [[ -z ${ROOT} && -d /run/systemd/system ]]; then
-		ebegin "Reexecuting system manager"
-		systemctl daemon-reexec
-		eend $?
-	fi
-
-	if [[ ${FAIL} ]]; then
-		eerror "One of the postinst commands failed. Please check the postinst output"
-		eerror "for errors. You may need to clean up your system and/or try installing"
-		eerror "systemd again."
-		eerror
-	fi
-}
-
-pkg_prerm() {
-	# If removing systemd completely, remove the catalog database.
-	if [[ ! ${REPLACED_BY_VERSION} ]]; then
-		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
-	fi
-}
diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
index 25efd97a3613..02f7159e4125 100644
--- a/sys-apps/util-linux/Manifest
+++ b/sys-apps/util-linux/Manifest
@@ -6,10 +6,10 @@ AUX util-linux-2.33.1-fix-struct_termios-check.patch 1128 BLAKE2B 93d3722c44889d
 DIST util-linux-2.33.1.tar.xz 4650936 BLAKE2B 9ee6bc1a1b800e8537f5552c28cf608f32e89c8ab716434a2de6b4b5e257c53065b9c11cd355f2ef759f69069071ef930790ecd55806deef300ce77f31e38e98 SHA512 94ada47e472b62a612c26fd5a5b7423e09366690a8a96f777191a5d920981eb0f224474bc2f128e827299bf60062770011332757e1551a8cd3764b5c70ae4ba2
 DIST util-linux-2.33.2.tar.xz 4707024 BLAKE2B fdeed0a236edd26d268bccca8cde2cf1b7ecbff521ede9fa26ea22c8e5cdfc380a416a168789504b303f1b569d163e41f6630ee28829be7f2b2129fa14c4fffa SHA512 ac88790a0272366b384b54df19cb28318014d98819d5d96aa05528ff17ab57a8c66d012a2f1b59caca4c5d4ea669e8c041e1123517c1f1c2d9960ef701aaf749
 DIST util-linux-2.33.tar.xz 4663072 BLAKE2B df601f6aa6dd1e77c722d5e7350a3b14c6099057487384eb8cd7adee8693711c1d24663f76682c958884559fddf61cc4b6d987bdca70f88e6cb14109e328e8a9 SHA512 5eb419607c5a2634117a604d425d6413763d1e48910acabc7e19d574a4c3fb0ceb34a68671a8e4fe396a4c6d611932082f77cd669d009e218bf64095da0d5689
-DIST util-linux-2.34-rc2.tar.xz 4990080 BLAKE2B 63c7bc91d04e8cde2f67e2fad5a6a4b6ffe7b392d284c29b01b5a89eea26b42436656f8c4544555545b3718a739674c795c13a41e3a1e1cb2a98e952d02f9283 SHA512 54ae5ab146a2f8185dd1e46b363d3f83fd6791eb95f83522307ea59dcf23be93a9496fd1ca10bb09788ebd429c62db8fcde8747ed793c7826340289efb4e77d0
+DIST util-linux-2.34.tar.xz 4974812 BLAKE2B d26b2f74d490eaee0a40d4c75a1a351ba165b4a52f9bbf6cf9d1afd7ae1382a3a3dfe41180584e97e9aaad6950f604cad928f30747590e3e1e669c8797689758 SHA512 2d0b76f63d32e7afb7acf61a83fabbfd58baa34ab78b3a331ce87f9c676a5fd71c56a493ded95039540d2c46b6048caaa38d7fb4491eb3d52d7b09dc54655cd7
 EBUILD util-linux-2.33-r1.ebuild 8369 BLAKE2B c8991a1f9a36cc09ad888b439b1baba241740707112abda423a85fdaf13db09c10be9a29ff2c018166cb14f64f425b6f8ffd6c2680c3fce1e25369f4ee8d3209 SHA512 13e47582fe9ae0bced2ad9c2c47e8d4b062ad4ed1cc65973debb2b6fa54d5aa232936f91fc88b6183cd53c2ec2754f00d7a79e274e7cc41f2dd6a8949004311c
 EBUILD util-linux-2.33.1.ebuild 8638 BLAKE2B 9ed38cd12026e04327b38f33a2c0f5285cbe148f9e604e03fd2ba179cdc10351b12ef3768bd97da7f7ba5e65972c42b04c1cef50a2f7ab6854953a990eba8b10 SHA512 aca35d647f0d3d3e260acc67e95a2e32a6d5b4898c78a187306a9c2d228e4304503eeaaed8fe92a6b2c6f7e0a6110ae087d3f486d37ad1c429d04f30b49b8832
 EBUILD util-linux-2.33.2.ebuild 8573 BLAKE2B a8bc5375d2fae05fd4243f604307e0ab026a881fa95c93884f36082a9b46390c7d859c841bd43dd27e5decab9183c2b71e9b3295efdbea5f33cf4f6459ebfbd9 SHA512 905c909704adee2d975d734ae2b4a9286f86d9582bc6e603d0e0ad9d71e9a31c2d77e9c14685f81969845f58aa300dcdb8988d0409e34ad00101f1f71ff44851
-EBUILD util-linux-2.34_rc2.ebuild 8180 BLAKE2B 9a05060356ea2424f8c62b1e79f887c718820a10323835cc19a994492139d6b1cfe49a622fbf685c7b1e563f7874fb9d6bb22474f3dc7e7831a2b7d44b5ee4eb SHA512 35cb3fc8f619a44b0cc0b67890fe6868e9b403b3478bd154d79a05a853c61548d46474540803257cc6203ce8b2bdefbb48c1df1f344b8ca508f2df2467a1b039
-EBUILD util-linux-9999.ebuild 8174 BLAKE2B 58bbf2b8f49d4ab41376a96e2a92f4dac75f553c8198f20b250ab67652206a7301765d92277fa0a00c6f1055ddc0c03f0446b72c9cb3b551b03dfe33781177e4 SHA512 4d1e0dc4b05b95ef5736e1637f756c5951eb40b2748b1066ce2eefb5eb4a21c7c44a273b3a93213fb00171e4ac1f797b07517b30b3c7ce573d9a1feaf1623a89
-MISC metadata.xml 1005 BLAKE2B 37870785b249a3d630c74fbec873b3cc096f2194faf92e211344a9b359c43ba52826709eea6aa0534920a444b73812f75c835e626230a9c18836bfcc7429b500 SHA512 c14641961bc6aeb75bda7b166dfc45ba1b5be4d21722062269a2a749057a8a0dcf74290855965d739563c8340e60913d8bb9eb470a82f69f8f7371bd2163d133
+EBUILD util-linux-2.34.ebuild 8249 BLAKE2B 83a8351469d2c4a821d1a0a7ec90d6452429c61ed81d41612ba4a061c2adcda523bc196aa1216cad8e150f378aeda3576a0cfd3b7422d2150ecb0595ae09d5cd SHA512 238cec400c280a4fb2c2b1577029de9102adb44f34ab8b9d1d25c06441e901e765e4964dca3bbef07979ebc701e375b025e6f260cf562905ecb6613d41b838eb
+EBUILD util-linux-9999.ebuild 8249 BLAKE2B 83a8351469d2c4a821d1a0a7ec90d6452429c61ed81d41612ba4a061c2adcda523bc196aa1216cad8e150f378aeda3576a0cfd3b7422d2150ecb0595ae09d5cd SHA512 238cec400c280a4fb2c2b1577029de9102adb44f34ab8b9d1d25c06441e901e765e4964dca3bbef07979ebc701e375b025e6f260cf562905ecb6613d41b838eb
+MISC metadata.xml 1058 BLAKE2B 1e568d821c9af0470ce548d80959ce04d70fb4fd32215136335dbabf3f1aaa56c7b9ad481025f0014093e247a21c9ffb08ea133fbe77fe6ad520a37fecc055f4 SHA512 775e3da2951c79b284678ff4fe7efdf2f8297e9507f1640c7f8ca8ba24783ddaef9cde0f041a757dd6b1750636a6b207d71f92d58ef5b6d008960e7961eef026
diff --git a/sys-apps/util-linux/metadata.xml b/sys-apps/util-linux/metadata.xml
index d41121d081b1..ed7b2cf02a02 100644
--- a/sys-apps/util-linux/metadata.xml
+++ b/sys-apps/util-linux/metadata.xml
@@ -9,6 +9,7 @@
 	<flag name="caps">build setpriv helper (run programs with diff capabilities)</flag>
 	<flag name="cramfs">build mkfs/fsck helpers for cramfs filesystems</flag>
 	<flag name="fdformat">build fdformat (floppy disk format)</flag>
+	<flag name="hardlink">build hardlink program</flag>
 	<flag name="kill">build the kill program</flag>
 	<flag name="pam">build runuser helper</flag>
 	<flag name="suid">
diff --git a/sys-apps/util-linux/util-linux-2.34_rc2.ebuild b/sys-apps/util-linux/util-linux-2.34_rc2.ebuild
deleted file mode 100644
index 55b7c4d9ee9b..000000000000
--- a/sys-apps/util-linux/util-linux-2.34_rc2.ebuild
+++ /dev/null
@@ -1,289 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
-
-inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
-	pam python-r1 multilib-minimal multiprocessing systemd
-
-MY_PV="${PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
-else
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
-	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
-fi
-
-DESCRIPTION="Various useful Linux utilities"
-HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux"
-
-LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
-SLOT="0"
-IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU"
-
-# Most lib deps here are related to programs rather than our libs,
-# so we rarely need to specify ${MULTILIB_USEDEP}.
-DEPEND="
-	virtual/os-headers
-	caps? ( sys-libs/libcap-ng )
-	cramfs? ( sys-libs/zlib:= )
-	ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
-	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
-	pam? ( sys-libs/pam )
-	python? ( ${PYTHON_DEPS} )
-	readline? ( sys-libs/readline:0= )
-	selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
-	slang? ( sys-libs/slang )
-	!build? ( systemd? ( sys-apps/systemd ) )
-	udev? ( virtual/libudev:= )"
-BDEPEND="
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? ( sys-devel/bc )
-"
-RDEPEND="${DEPEND}
-	kill? (
-		!sys-apps/coreutils[kill]
-		!sys-process/procps[kill]
-	)
-	!net-wireless/rfkill
-	!sys-process/schedutils
-	!sys-apps/setarch
-	!<sys-apps/sysvinit-2.88-r7
-	!<sys-libs/e2fsprogs-libs-1.41.8
-	!<sys-fs/e2fsprogs-1.41.8
-	!<app-shells/bash-completion-2.7-r1"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-
-	# Prevent uuidd test failure due to socket path limit. #593304
-	sed -i \
-		-e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
-		tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
-
-	if ! use userland_GNU; then
-		# test runner is using GNU-specific xargs call
-		sed -i -e 's:xargs:gxargs:' tests/run.sh || die
-		# test requires util-linux uuidgen (which we don't build)
-		rm tests/ts/uuid/oids || die
-	fi
-
-	if [[ ${PV} == 9999 ]] ; then
-		po/update-potfiles
-		eautoreconf
-	fi
-
-	# Undo bad ncurses handling by upstream. #601530
-	sed -i -E \
-		-e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \
-		-e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \
-		configure || die
-
-	elibtoolize
-}
-
-lfs_fallocate_test() {
-	# Make sure we can use fallocate with LFS #300307
-	cat <<-EOF > "${T}"/fallocate.${ABI}.c
-		#define _GNU_SOURCE
-		#include <fcntl.h>
-		main() { return fallocate(0, 0, 0, 0); }
-	EOF
-	append-lfs-flags
-	$(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
-		|| export ac_cv_func_fallocate=no
-	rm -f "${T}"/fallocate.${ABI}.c
-}
-
-python_configure() {
-	local myeconfargs=(
-		--disable-all-programs
-		--disable-bash-completion
-		--without-systemdsystemunitdir
-		--with-python
-	)
-	if use userland_GNU; then
-		myeconfargs+=(
-			--enable-libblkid
-			--enable-libmount
-			--enable-pylibmount
-		)
-	fi
-	mkdir "${BUILD_DIR}" || die
-	pushd "${BUILD_DIR}" >/dev/null || die
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-	popd >/dev/null || die
-}
-
-multilib_src_configure() {
-	lfs_fallocate_test
-	# The scanf test in a run-time test which fails while cross-compiling.
-	# Blindly assume a POSIX setup since we require libmount, and libmount
-	# itself fails when the scanf test fails. #531856
-	tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
-	export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
-	export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
-
-	local myeconfargs=(
-		--enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-		--without-python
-		$(multilib_native_use_enable suid makeinstall-chown)
-		$(multilib_native_use_enable suid makeinstall-setuid)
-		$(multilib_native_use_with readline)
-		$(multilib_native_use_with slang)
-		$(multilib_native_use_with systemd)
-		$(multilib_native_use_with udev)
-		$(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
-		$(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
-		$(tc-has-tls || echo --disable-tls)
-		$(use_enable nls)
-		$(use_enable unicode widechar)
-		$(use_enable static-libs static)
-		$(use_with ncurses tinfo)
-		$(use_with selinux)
-	)
-	# build programs only on GNU, on *BSD we want libraries only
-	if multilib_is_native_abi && use userland_GNU; then
-		myeconfargs+=(
-			--disable-chfn-chsh
-			--disable-login
-			--disable-nologin
-			--disable-pylibmount
-			--disable-su
-			--enable-agetty
-			--enable-bash-completion
-			--enable-line
-			--enable-partx
-			--enable-raw
-			--enable-rename
-			--enable-rfkill
-			--enable-schedutils
-			--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-			$(use_enable caps setpriv)
-			$(use_enable cramfs)
-			$(use_enable fdformat)
-			$(use_enable tty-helpers mesg)
-			$(use_enable tty-helpers wall)
-			$(use_enable tty-helpers write)
-			$(use_enable kill)
-		)
-	else
-		myeconfargs+=(
-			--disable-all-programs
-			--disable-bash-completion
-			--without-systemdsystemunitdir
-			# build libraries
-			--enable-libuuid
-			--enable-libblkid
-			--enable-libsmartcols
-			--enable-libfdisk
-		)
-		if use userland_GNU; then
-			# those libraries don't work on *BSD
-			myeconfargs+=(
-				--enable-libmount
-			)
-		fi
-	fi
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl python_configure
-	fi
-}
-
-python_compile() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake all
-	popd >/dev/null || die
-}
-
-multilib_src_compile() {
-	emake all
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl python_compile
-	fi
-}
-
-python_test() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
-	popd >/dev/null || die
-}
-
-multilib_src_test() {
-	emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl python_test
-	fi
-}
-
-python_install() {
-	pushd "${BUILD_DIR}" >/dev/null || die
-	emake DESTDIR="${D}" install
-	python_optimize
-	popd >/dev/null || die
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	if multilib_is_native_abi && use userland_GNU; then
-		# need the libs in /
-		gen_usr_ldscript -a blkid fdisk mount smartcols uuid
-	fi
-
-	if multilib_is_native_abi && use python; then
-		python_foreach_impl python_install
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
-
-	# e2fsprogs-libs didnt install .la files, and .pc work fine
-	find "${ED}" -name "*.la" -delete || die
-
-	if ! use userland_GNU; then
-		# manpage collisions
-		# TODO: figure out a good way to keep them
-		rm "${ED}"/usr/share/man/man3/uuid* || die
-	fi
-
-	if use pam; then
-		newpamd "${FILESDIR}/runuser.pamd" runuser
-		newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
-	fi
-
-	# Note:
-	# Bash completion for "runuser" command is provided by same file which
-	# would also provide bash completion for "su" command. However, we don't
-	# use "su" command from this package.
-	# This triggers a known QA warning which we ignore for now to magically
-	# keep bash completion for "su" command which shadow package does not
-	# provide.
-}
-
-pkg_postinst() {
-	if ! use tty-helpers; then
-		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
-	fi
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		elog "The agetty util now clears the terminal by default. You"
-		elog "might want to add --noclear to your /etc/inittab lines."
-	fi
-}
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild
index 6940636a7b16..efc59ae73575 100644
--- a/sys-apps/util-linux/util-linux-9999.ebuild
+++ b/sys-apps/util-linux/util-linux-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
 PYTHON_COMPAT=( python2_7 python3_{5,6,7} )
 
@@ -16,7 +16,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
 	SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
 fi
 
@@ -25,11 +25,13 @@ HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/
 
 LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
 SLOT="0"
-IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU"
+IUSE="build caps +cramfs fdformat hardlink kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU"
 
 # Most lib deps here are related to programs rather than our libs,
 # so we rarely need to specify ${MULTILIB_USEDEP}.
-RDEPEND="caps? ( sys-libs/libcap-ng )
+DEPEND="
+	virtual/os-headers
+	caps? ( sys-libs/libcap-ng )
 	cramfs? ( sys-libs/zlib:= )
 	ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
 	nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
@@ -40,12 +42,13 @@ RDEPEND="caps? ( sys-libs/libcap-ng )
 	slang? ( sys-libs/slang )
 	!build? ( systemd? ( sys-apps/systemd ) )
 	udev? ( virtual/libudev:= )"
-DEPEND="${RDEPEND}
+BDEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 	test? ( sys-devel/bc )
-	virtual/os-headers"
-RDEPEND+="
+"
+RDEPEND="${DEPEND}
+	hardlink? ( !app-arch/hardlink )
 	kill? (
 		!sys-apps/coreutils[kill]
 		!sys-process/procps[kill]
@@ -172,6 +175,7 @@ multilib_src_configure() {
 			$(use_enable caps setpriv)
 			$(use_enable cramfs)
 			$(use_enable fdformat)
+			$(use_enable hardlink)
 			$(use_enable tty-helpers mesg)
 			$(use_enable tty-helpers wall)
 			$(use_enable tty-helpers write)
@@ -258,7 +262,7 @@ multilib_src_install_all() {
 	if ! use userland_GNU; then
 		# manpage collisions
 		# TODO: figure out a good way to keep them
-		rm "${ED%/}"/usr/share/man/man3/uuid* || die
+		rm "${ED}"/usr/share/man/man3/uuid* || die
 	fi
 
 	if use pam; then