gentoo Easter resync : 12.04.2020

author: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
committer: V3n3RiX <venerix@redcorelinux.org> 2020-04-12 03:41:30 +0100
commit: 623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree: 993eb27c93ec7a2d2d19550300d888fc1fed9e69 /sys-kernel/dracut
parent: ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)
26 files changed, 261 insertions, 1886 deletions
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 4b12c7978875..c9fbf6d2ecd4 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -1,10 +1,3 @@
-AUX 044-0001-base-dracut-lib.sh-dev_unit_name-guard-against-dev-b.patch 1027 BLAKE2B 23b461d4fa23785bf4380b84a671f1209136fb21f7612fda21a7489d8c9c70f2f3ab97a580fc3800983181058e1d1394fb94fc3400ca8b74a20fffc1d26e02ef SHA512 3d6a37d4f86b8a230cda1ed5dfbcc01edcf8a6be7109b4c0674627a07797db92d078c23426938a6324d93515b5db98e322e3aed2bbff650ffafd974e872e1cc5
-AUX 044-0002-systemd-initrd-add-initrd-root-device.target.patch 924 BLAKE2B eeeb9efe85637db0566dd8f4c2543626ed8786b97293ed1f25c9aa543a4c239ba6771f6add7cf76cf540bffae82b68ed699a601f0f28fd3651e4c11440345b63 SHA512 443391ad3a70c3933d42129a298e12de007944c3141f8ec2785666ee5f66a24edc1eb5faa5c2016540aeb1fadb93139fce3b53b3960f7a5492aac2ff9bc95e70
-AUX 044-0003-50-dracut.install-use-bin-bash-shebang.patch 558 BLAKE2B 7a5c30a6a70b4dba8463c4701910dd9878f6923a572532b022cfd0c63e9f3f01559d5c2e5c419f8e3b7196d3e2c587279e16761e60e8e67d8fc8ab5d35c96cdf SHA512 657685b27d3ffd326fd1976ccd89cbe4ab9122b63f2a6a03cae3bd54663bd1a26366552550ea50af671aa5a604b9ca08caf1bc689551e46f7d208c7d5e83730b
-AUX 045-systemdutildir.patch 1665 BLAKE2B ddca173403586e0ec4f8af86bf9d8004a0fa6176155c8b9d3e7906fdbf23db910290d60cf1834da7635c75b58b107616a722b560b076608920f9cc4b3a6351ff SHA512 f576cd166e9ad03ffa8317dcffcd7c6f920ffa92251eaacc5c2a95e4ca88687bd1870c8f75ecf3b5fc81773f2d3e082dff647d6a313d183a6017fc79b7bc604b
-AUX 046-amd-microcode.patch 1013 BLAKE2B be9f9b545e5d68285f2b4e3a4ccee3e39c0c41349450053e411532c47e9634157df190ea2bceacb422a3f1b874ae256c34a4822f3fb964b8c06a05f7adec3a59 SHA512 c37734a66a9727cb0effc5a02b85e6bd2d3e5b05913657f517fcb26fc6cacc89398e28dd2865e5abe0148520bc95530a6cffb904b5dbde00af1d85e7d1c26b65
-AUX 047-all-fix-issues-found-by-shellcheck.patch 3265 BLAKE2B 0f7e227311c96ca204d5b23093003b38c120dfe208482e421f7104fdfb29beb925239e007d372ba1e7b9e75ad395f2a4b59a5a0dbed02389398f678f480fb45b SHA512 21fbcb0558a543402325f3b356d08ce4747c82e337a3f196a1ded20b633bcf79ab14323858386a5c35ef4857f8795f14b0df874596ecb1a4f8aed90160405dc8
-AUX 047-plymouth-fix-detection-of-plymouth-directory.patch 1055 BLAKE2B 285e008dcbada06a475f1cbfe67602f046c7bb354b812ea614d99a921d40d09d099f3329cbc348b8bc4dd17bbbdcc0da986f0de5cce7f07464d2318dd9f0d719 SHA512 90372cd630903981528acd6aec1f1051e94ca2a0e53a834583faf6bf244aa7967f590f9bc38db3233e78bfd859388c011484a624d7f092c863755f73d6285b21
 AUX 048-dracut-install-simplify-ldd-parsing-logic.patch 1488 BLAKE2B 3a76ff666482b17adb49e3e9fb6483f7545136df33624d5bd76d472328c7a68532fbb1bace2988b62f279b0dba7d3c53e023146711474ef8497502aee8042a41 SHA512 09992afca26026b8f77de371486c655feabb1626120a571cbf24e1a230725c7debe56c9e47eb365aa200cf7aab15798ecc57e9d764887e42cee8d3c59fb341c9
 AUX 049-40network-Don-t-include-40network-by-default.patch 967 BLAKE2B 43c3942ae5199457f0cc394cb81bef58852a42ca7a25fb198001882f52089132780bbd0d8782d8ca383e1d19be210bd5fc14730b1f56b8053c52a832f2c3fd93 SHA512 a18c5b3b28915deff97cbfa151e67c58942f3cc407b101ca3ae16e51114279c1a05475461c9748b3debd4e05b609e02f431d2dcf4ca4fcb18d4f806d42cdaade
 AUX 049-configure-find-cflags-and-libs-for-fts-on-musl.patch 2432 BLAKE2B 8ee880257e72b8e6f269adc6e72cab1a8f0a4095ac4ffc48114f27cda20b0cd49584f82e64ce01a13e1d3c5bc722c978f334d1f4459c8fad8014f4fa8228d6ca SHA512 847e912965b510321340273b1d7f9a7f5cbe4c49d1e661e542fa741873643861e4fb436a83f60fafcc07ddb859121971c1c3151350d567eed89756019904671a
@@ -20,24 +13,15 @@ AUX 049-network-manager-fix-getting-of-ifname-from-the-sysfs.patch 1370 BLAKE2B
 AUX 049-network-manager-remove-useless-use-of-basename.patch 936 BLAKE2B ef9a08db966f55fe8d39802445cbdf8df3a402cf4cdcdeaf86312ce16ee90d6937c8235b555407d05913b28fc1bcd62f9ed417491bdd4f929cc4dda62edec41b SHA512 61650c162e1b40270ba2bd0d6d9117b4e52961728e8038ba4095cd3767d869904196ac843822dbbc14c2281e63b4cee5eea81b58730898dfb7d80cbf63fd6dfe
 AUX 049-remove-bashism-in-various-boot-scripts.patch 3423 BLAKE2B a2a5946b53eee63492f5e407fc18541e8ccd341c4ce607daf2bde81bf061328c7cfbdf5f9a2c9b09f3e19c23e6e746d8383a7c78dcfa1aaed78ff252fcaef520 SHA512 a381394c9aed25abe73adb58d07fd26ab19a99338fa9d60a5a4642b8f13a88d1b209ae9deffdc527beccd1bdbd93754c3e5f2687c9f9a6b6430481f08fae201f
 AUX 049-rngd-new-module-running-early-during-boot-to-help-ge.patch 3009 BLAKE2B 4a259a7f742574e02322bbd78337657daea8fe5c19e63331867c1e4b48bf68890860c1b91e420fa3b13412cad7eee64dcc69cb52ad93d28320cbf988726f22ed SHA512 8652310eaa1294f819e3d1c6dc9b2ae332652586462b044088167eb3a7af9d1303c2a667b75045d9b04deb4a9e1cdfd55aec85cf5f66b36412bfbe3b67bbaae5
-AUX dracut-044-bash-4.4.patch 5036 BLAKE2B faf944f4405b560d7f43ce2fd0595b223f1c91eed11422b19a5b61b710e69c10b855d3fb99fd28f204d8c31c49c272259704e148fcb794bbd8309b3779a62b4f SHA512 68522464fb446175f967c8453e8427f961e97522661a22a7c302a90ff716ab75b0cfc32f568a06f1e1821ba7115d6d2f48b6ded9ed65b30806d4d505a0903279
-AUX dracut-044-preserve-xattrs-when-copying.patch 2354 BLAKE2B a7195fdf0663e71b5e5eb2f8c9d971f5bd2bdc8b8a49399d836efc8efed2547118399ae7780c93014659d88c0359e7336f2e2a345ce009b5f872468d0412aaf9 SHA512 b15babf62a4ece46c8b55a2ac21c3284665da8c38c10fc1209c08605b778689cf80108b8baa0ce66eee2218d6975cc5b9401d8a70326ddb6f731c55373e52a02
-DIST dracut-044.tar.xz 280004 BLAKE2B 5b9603eb769b542e2d56fae4d0f0fe250e7e60eb9c85f9c7b7a472b9d889a9f323b3ba1cbbeb1d5de10507498542275cd4430695cc8b48426b42c03d0672ea87 SHA512 bc788076e425b223d98cf0e0b15ff57d75d423991d7a67fb564a2857c38d5c3a21d846d2ca4523f9d4b0128bb981d09b5c26031435c5fc5e30f53080bca19b3d
-DIST dracut-045.tar.xz 292652 BLAKE2B 0e7c57ddca6757d59823afdc4ff23dcb06cc9cec317ece8cca14c5b6dfd2a7984fb8e857f5f48ad61922ba11b4b68944b366bddb02552efb52375f6e12802de7 SHA512 b57aab1f6fbdd5ad52a13a0eb99937b1abcd11507a2a3e6ec9bcb94e578cc32edc01a814ea2cef93158c27c17e3e40bcdd32a66457a20363f8136b8b546bbb4a
-DIST dracut-046.tar.xz 299520 BLAKE2B 1e2d848aa0db0e90734d8c60610a60b1f0ff67f8c4d4f9933bec0bc1290071b1b1ee3cdb6c3da5b82d8f6d4cc7561ee17d38685659a4a6ee48a9085e388dfced SHA512 75cefc184960024ef32f7bb5a0fe060e9c7d82dbfd0fe247d54b585e2ebbf0f8af5d5dc1be7e5e8cf2c3bc27b3293842c6361ae62d047289d0c59d7d40b09122
-DIST dracut-047.tar.xz 305836 BLAKE2B 18333ae1e24cfbbb6a152bf9ba2c48884821f6a506344259ba56c581a9f3efac7b4c88e8ca149ef1f83347a5e4d59acba61e42b8e0ab3a9e9beb8684d5db28b0 SHA512 03369726b6c2b682d0c9dead7b7dbd1c3989aaf2b4a561015634d33a94e5230d03cb634c3890191b19dd8c1c83389533ae1a46d45d2024ba885e0d2d46c5d035
+AUX 050-Makefile-fix-VERSION-again.patch 1057 BLAKE2B 8373a43030c02bc0273aacb3f0f286d4f98812039c459ec16607e3e5b9bd83c367420c6b67d7cc8d2f6d9469bca2e5e5770f20390348e50abdbec7f12c4f36a3 SHA512 89e5ae4cf88d65ec5f31384c334b46f8e6e74a31e0225a62523524f87f35ead8cae221d3a0f8e5f837a1e22b51833db75b2d3f3b07fa3ac4ded5dac9012a8027
+AUX 050-Makefile-merge-main-version-and-git-version-earlier.patch 3071 BLAKE2B 0d20b6ca7bb92aca21b3afaaee6fffb94c23de806ebe46383074979e0afedc893aec478122391d7c6015882b7882dd3f6e4124fa1f6fa1dc0bb48beae50d4d9d SHA512 ad9219c66b0a921b2fcb9dc325d1afd4c17d447228ee3b95b7a7e799acdc9d48d1d963842643d6ee6e90f8891d5c924c707331041cde53701261cb670adbcd33
+AUX 050-dracut.sh-don-t-call-fsfreeze-on-subvol-of-root-file.patch 2779 BLAKE2B edb10ef79fd22863aef5184ca0d7abc88602cf3e8a3cfd198047e0970d10e9aa56e1222dc44a089afb3a0f15caa87e4e3233b32980b5fd56e9975196350000f4 SHA512 a31cfceb9ab53e53ce3f69ed6388bf7cfcf40ad7b036197194f34cd973a74e28ac8bfb7bf7d79068b48fc8c5feaf26540948b8008c1fdab997587bf4b31f8b71
+AUX 050-gentoo-ldconfig-paths.patch 1420 BLAKE2B 3ff093e1d244288585c369f0e3c1bc346abe1ee2ce8ee399098559765fa4e3a96611269de5f4edebe435e5a71fa1bb99eb650fcb221fad188e019837261645f4 SHA512 aa99bb08dbc8e38ee1794b7d77e5e6656afa7f6c67684d1b3fb6368861630ea7c7711d84cc48c2c5cf3b1fd98aa2673f816e4f5ebf651b63a07ded93b00d371a
 DIST dracut-048.tar.xz 308484 BLAKE2B b19c8122034a8b40cbc9d09245730900b59691c336f1d231e768786ad64068e0a8daf57ae9a4182ab50d9e1c683c9b7dcac354eb26d8a60f061db78121bc11c7 SHA512 97fcfd5d314ef40687c245d95d2f1d0f3f9ff0472e66b6e6324bf9bd6b98186104f9d71fd9af344126d6ea9fa47b744d52831a374225633225f6f17fb15c04e0
 DIST dracut-049.tar.gz 376857 BLAKE2B e50084164e26aae6de812345cc76782435ec84951b44eea454355d0c65fe84fdd0858733de534bdf018bdfd92922f0be30b74d74be329a918e55d96c5e4d4fb6 SHA512 51489570856538588868a66c7bcc8a3728574592529905484526c523398dc1b8f1416e6b264780303acd08d818417a9668b76f1d64d3194432b5af79dc15c9f7
-EBUILD dracut-044-r1.ebuild 7601 BLAKE2B a98f154c11596d708dd293c1e1cc634007ce922d2077922f1b501cdc81f419a2fcd7aea19f7231c65be173d22207f386941afb773000306bff2de341bf85d9ad SHA512 9391e7d1bbe16211e5ec6b2fd1938ec044da215a01df711209862b270caeb417cfe5040a1613fdfe6f562f5ff43fe1b338497d8fbb0c6e8b13afc95ca5bf577e
-EBUILD dracut-044-r3.ebuild 6841 BLAKE2B 983d83c6ecc2067525b07231d659f4206681a5453d76ebac4c2952d46b327fc07ae033fdf81f20a919cb89146ac187beb2f922cb1f8d163e45e46e83b8fb643b SHA512 7a9386db2f84e83d06ea239fd843d0c0494f2650c0c1550e2c034334cdbefa6b2e0079e132f81dae289c74561ccb1374e55600aa69721a96a8c977bb1a028f04
-EBUILD dracut-045-r2.ebuild 4694 BLAKE2B b9a3886363351ff292903db9a5f9e3a9034076fec09a343570c0a8f2de4dc1df3dacf9d734a0bf3cf572f984c013715f546c3f1df592ca350f373e3cf2cef2d9 SHA512 f00901b8db3f82e789d8f65bd1bb8e482e534b9d36d6847c76ee4773423ce1d05813c9f39de768864ba745c5d3d03f472d4c852fda4b9d328be12d1c509ba12b
-EBUILD dracut-046-r1.ebuild 4733 BLAKE2B 7eab88d4b96ad84d58fe761eb547e64e942a39e7a6859866744a366082b56ea5cb9a253ebe0f600038b33227055da4204d86a6d1eeb167b81e82595b9878614c SHA512 b173ff4d832103af82ee7855feb46c825f0c3fb702798a0697bd1759eecf0a03288fe2dd726939ae6a814188e8ef54ca2df1e20497da99c8547bade2cc63c009
-EBUILD dracut-047-r1.ebuild 4661 BLAKE2B a8d2872a8ed770e55871ebbdc1da21e89fee21eda0b89bec887dc13c0813a1fb5e53da1a0b31b7e7f59a0fa1389e7d8620f496cb5b22833c58ea0872b6e63c09 SHA512 4783cfcf04e5a6ade43a4c3447af8ec577fb835a01095ad450c1e3dfbec11e1dea58021a0bd2119a24efbccd6a273225f11c97ff6445cf1d68dda27b26250fe7
-EBUILD dracut-048-r1.ebuild 4553 BLAKE2B c7d81b498343f05e4c33dbc64dc4f59e071d7c81601db69141efd594cc7a360dddfef7bd903b915ee1550499d882cda99de578622f2e3478838ea4319c59ba37 SHA512 a59f0583d26813cbdd9a116ef3a96fd972a7e8833de05f385f32c675154b45a7ea467a17af8b6d3293537e0e71f317c320ca275e81675633383bc4d46b829baf
-EBUILD dracut-048.ebuild 4478 BLAKE2B 84ad2d4f65e63c2094a22ab3040a6bc2c6feef27fdea3d75996dc198abf3e2057b7c65d48e3d1db33adb685575b93e3990605195bf111043723745ca906ff19f SHA512 9a062e4d0b630f2dacd8b170bbb6a5774cb172750410e99829722f9123dfed4ae5f9658cb9554e3d90ebd6f1a08f2406e1a61d2a5af684660865af81ed9f7d6a
-EBUILD dracut-049-r1.ebuild 4615 BLAKE2B ea43727ba91acd3a31b902dae3f80945957f1bbe5397c76bc3d46eb323ab5249b8edea1366c77253a792373d0cdc5ebb075484305dfafd86bbebccd9c0268bfb SHA512 bc0ac08a471ba994f9da4beb5ded4db2da8770e1a973d324e0b7b28845e357dde4401367defdc421c323103408318098386b9228c28e94de71b95c1726d802fa
-EBUILD dracut-049-r2.ebuild 4654 BLAKE2B 8d3da740bf354e82e6bfd155ea5858d21ce0904b255e83d43c70c9987152ea0027b797d19f59bae703e515ac6a4b04c9034fa770bcaf83de7e9f2c6cf002a743 SHA512 de9257ca8c56b065aaf104514670777159b5ad64005ab596c348765ae5b0e9c64e1f18ac3907c5f68cd9edef94385805ef1efe5256d1c78c420f4ef3fa02485c
-EBUILD dracut-049-r3.ebuild 5702 BLAKE2B 2fe8ee786ef35f36d64b3f4b14a25b96a720986783928312d0905702908b2dcfbb7dcaccbca77f0ecba97ece7a98a8c3e05a9dba8c71d6e81d39ea0c2f40bb5b SHA512 ab3a6e2808dcc95653e2931f6168cca36c4ad8ad3f5975a08b30efb6e17814837db8a54b83c224c2f7b0e6f2b4f6e55770dfddc433b5e69b6c914dea9608f8a0
-EBUILD dracut-049.ebuild 4808 BLAKE2B 70418167cc13d508df24865d2c598dd208ce92963acc0c67b3106e24f3d97c8d82766cec91bbb475649b4003a2590f2279c663ff5b4b8785c3618c9bdca21f09 SHA512 cc9568f59f5d5be6605ff679cbaa55521beab37b7c9438fc096e4ceef7f194c6b21f35f1da177de17816eb7a1835bc27040b3ae21b3b31558e2606e7495e817b
-EBUILD dracut-9999.ebuild 4645 BLAKE2B 45f01786c492ba660572d510e5201f1b812e7b67a10b3d9a179b05ec4c05aa21e2556451c8007e2e370c0178a19286582951b691ba8d9cceb0dbe0a66df1d64c SHA512 17dd1ea2568b3915a64fd329c08c9ae74dd06f617b55bdc87fcd04ae8de222423e42e44dccd7aaa006b6e780fd9dca2b7f37a4c63ab96d73367ce1fdef08d1e3
+DIST dracut-050.tar.xz 333592 BLAKE2B cb0bfa5a8e7547260b8a80a3606eb284182c062926269c85b09e07d26ad177df0eeaa64b17005bff9290611f1c83fc8cd8e2216cfe14b5e66ec7f659d4c2fa7b SHA512 eba046cf1c8013369a398e585e0bff233daa8595d469ce9acc8bbc6a32d55c6a5429d4219db19abbf6001104be05b357f0961f9e66b7f926039a5d3ee7c2b850
+EBUILD dracut-048-r1.ebuild 4554 BLAKE2B 54bd6d89cc5085dfe7d6fa510651fdefb04e25b9ac05627646e9374d8ed6c0f2db184d1e9d948cbcd7ccca5c34f84c5a71de41c6af1d6b1962992ef04b369f45 SHA512 37cd893b1832e8c1fe2b54491372277978f68f3e21b763c9b8d70ba2507733d779fd40d748f08cb35015e0ef235dd8d3077202c9e8e286d6741da783d28c2e7c
+EBUILD dracut-049-r3.ebuild 5702 BLAKE2B 2fbeb9e53586918a0b08d8c2a2c49971e822d7e81e7de0d2ff0988fd579dd45fadcc7e2af83502f7b6c07c7cfe3d05f97b92a1ea3dfd0dedaa843512c71e1ab3 SHA512 845b57da9622b554a8201f339b14718f86812e7e38a8d574df06a8ffc7c90dc1d521a33ef372e7c3119900c58e1db2602f70800cef8868a14aca4408b80f98bc
+EBUILD dracut-050.ebuild 4917 BLAKE2B 663b729efc3876fc84b172b78893eb196e74ab8333c597de73ec8ab508a6227b1da928c96bcfd0450ffe09923f0f6e5263b6210279f6b1344e8e16d166e77695 SHA512 ccc4c12698444667c87b78e2b202bca9aec59f67e71a1360e8a202a5dca55ff9901aa963337e78f8e639e80412a065b203c13444c2089ee007a5f8c8a75c3114
+EBUILD dracut-9999.ebuild 4710 BLAKE2B e41d6ccd4d446f5a79dffbb874f26e1bd316b358de09d79a4893d72da7f237ddf9b62a267b2b35844f0ac8391597072ce739899d1aed1b04164e23df95688e55 SHA512 72a8360ab329bfb29100a8ea2cb9cc57d30594c0f8b7f5ea0e7ac310277be61f215fa378edadf5c8b77d55c51357893d8be409c6dd09024bf3d6ee6031a6879d
 MISC metadata.xml 725 BLAKE2B 475d51f4e2bebf318ef94ea1fec40a34bcf04b4f0c69e051c8840e0965a92fd9861c5aa8acfb2ccb5a4cf354665ab3efc6adfdf7d0191325c1f798ea5e49594e SHA512 b708d0eb6a792d5ba3495f321af5e10672af3354f1f42c60b175b7fb48ae836e24db7768511c44cbb0a949c1cca75948890d3b32904bbe47e50d9c43d71787fb
diff --git a/sys-kernel/dracut/dracut-044-r1.ebuild b/sys-kernel/dracut/dracut-044-r1.ebuild
deleted file mode 100644
index 32bb71fb5377..000000000000
--- a/sys-kernel/dracut/dracut-044-r1.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-inherit bash-completion-r1 eutils linux-info multilib systemd toolchain-funcs
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="https://dracut.wiki.kernel.org"
-SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ia64 ppc ~ppc64 sparc x86"
-IUSE="debug selinux systemd"
-
-RESTRICT="test"
-
-CDEPEND="virtual/udev
-	systemd? ( >=sys-apps/systemd-199 )
-	"
-RDEPEND="${CDEPEND}
-	app-arch/cpio
-	>=app-shells/bash-4.0
-	>sys-apps/kmod-5[tools]
-	|| (
-		>=sys-apps/sysvinit-2.87-r3
-		sys-apps/systemd[sysv-utils]
-	)
-	>=sys-apps/util-linux-2.21
-
-	debug? ( dev-util/strace )
-	selinux? (
-		sys-libs/libselinux
-		sys-libs/libsepol
-		sec-policy/selinux-dracut
-	)
-	!>=app-shells/bash-4.4"
-DEPEND="${CDEPEND}
-	app-text/asciidoc
-	>=dev-libs/libxslt-1.1.26
-	app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75.2
-	virtual/pkgconfig
-	"
-
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
-	README.testsuite TODO )
-MY_LIBDIR=/usr/lib
-QA_MULTILIB_PATHS="
-	usr/lib/dracut/dracut-install
-	usr/lib/dracut/skipcpio
-	"
-
-PATCHES=(
-	"${FILESDIR}"/044-0001-base-dracut-lib.sh-dev_unit_name-guard-against-dev-b.patch
-	"${FILESDIR}"/044-0002-systemd-initrd-add-initrd-root-device.target.patch
-	"${FILESDIR}"/044-0003-50-dracut.install-use-bin-bash-shebang.patch
-)
-
-#
-# Helper functions
-#
-
-# Removes module from modules.d.
-# $1 = module name
-# Module name can be specified without number prefix.
-rm_module() {
-	local force m
-	[[ $1 = -f ]] && force=-f
-
-	for m in $@; do
-		if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then
-			rm ${force} --interactive=never -r "${modules_dir}"/$m
-		else
-			rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m
-		fi
-	done
-}
-
-src_prepare() {
-	local libdirs="/$(get_libdir) /usr/$(get_libdir)"
-	if [[ ${SYMLINK_LIB} = yes ]]; then
-		# Preserve lib -> lib64 symlinks in initramfs
-		[[ $libdirs =~ /lib\  ]] || libdirs+=" /lib /usr/lib"
-	fi
-	einfo "Setting libdirs to \"${libdirs}\" ..."
-	sed -e "3alibdirs=\"${libdirs}\"" \
-		-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-
-	local udevdir="$("$(tc-getPKG_CONFIG)" udev --variable=udevdir)"
-	einfo "Setting udevdir to ${udevdir}..."
-	sed -r -e "s|^(udevdir=).*$|\1${udevdir}|" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-
-	if use systemd; then
-		local systemdutildir="$(systemd_get_utildir)"
-		local systemdsystemunitdir="$(systemd_get_unitdir)"
-		local systemdsystemconfdir="$("$(tc-getPKG_CONFIG)" systemd \
-			--variable=systemdsystemconfdir)"
-		[[ ${systemdsystemconfdir} ]] \
-			|| systemdsystemconfdir=/etc/systemd/system
-		einfo "Setting systemdutildir to ${systemdutildir} and ..."
-		sed -e "5asystemdutildir=\"${systemdutildir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-		einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir} and..."
-		sed -e "6asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-		einfo "Setting systemdsystemconfdir to ${systemdsystemconfdir}..."
-		sed -e "7asystemdsystemconfdir=\"${systemdsystemconfdir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-	else
-		local systemdutildir="/lib/systemd"
-		einfo "Setting systemdutildir for standalone udev to" \
-			"${systemdutildir}..."
-		sed -e "5asystemdutildir=\"${systemdutildir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-	fi
-
-	epatch "${PATCHES[@]}"
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf=(
-		--libdir="${MY_LIBDIR}"
-		--bashcompletiondir="$(get_bashcompdir)"
-	)
-
-	if use systemd; then
-		myconf+=( --systemdsystemunitdir="$(systemd_get_unitdir)" )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	tc-export CC
-	emake doc install/dracut-install skipcpio/skipcpio
-}
-
-src_install() {
-	default
-
-	local my_libdir="${MY_LIBDIR}"
-	local dracutlibdir="${my_libdir#/}/dracut"
-
-	echo "DRACUT_VERSION=$PVR" > "${D%/}/${dracutlibdir}/dracut-version.sh"
-
-	insinto "${dracutlibdir}/dracut.conf.d/"
-	newins dracut.conf.d/gentoo.conf.example gentoo.conf
-
-	insinto /etc/logrotate.d
-	newins dracut.logrotate dracut
-
-	dodir /var/lib/dracut/overlay
-
-	dohtml dracut.html
-
-	if ! use systemd; then
-		# Scripts in kernel/install.d are systemd-specific
-		rm -r "${D%/}/${my_libdir}/kernel" || die
-	fi
-
-	#
-	# Modules
-	#
-	local module
-	modules_dir="${D%/}/${dracutlibdir}/modules.d"
-
-	use debug || rm_module 95debug
-	use selinux || rm_module 98selinux
-
-	if use systemd; then
-		# With systemd following modules do not make sense
-		rm_module 96securityfs 97masterkey 98integrity
-	else
-		rm_module 00systemd 98dracut-systemd
-		# Without systemd following modules do not make sense
-		rm_module 00systemd-bootchart 01systemd-initrd 02systemd-networkd
-	fi
-
-	# Remove modules which won't work for sure
-	rm_module 95fcoe # no tools
-	# fips module depends on masked app-crypt/hmaccalc
-	rm_module 01fips 02fips-aesni
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_exists; then
-		ewarn ""
-		ewarn "If the following test report contains a missing kernel"
-		ewarn "configuration option, you should reconfigure and rebuild your"
-		ewarn "kernel before booting image generated with this Dracut version."
-		ewarn ""
-
-		local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
-		# Kernel configuration options descriptions:
-		local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev"
-		local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\
-"(initramfs/initrd) support"
-
-		local opt desc
-
-		# Generate ERROR_* variables for check_extra_config.
-		for opt in ${CONFIG_CHECK}; do
-			opt=${opt#\~}
-			desc=desc_${opt}
-			eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \
-				"is missing and REQUIRED'"
-		done
-
-		check_extra_config
-		echo
-	else
-		ewarn ""
-		ewarn "Your kernel configuration couldn't be checked.  Do you have"
-		ewarn "/usr/src/linux/.config file there?  Please check manually if"
-		ewarn "following options are enabled:"
-		ewarn ""
-		ewarn "  CONFIG_BLK_DEV_INITRD"
-		ewarn "  CONFIG_DEVTMPFS"
-		ewarn ""
-	fi
-
-	elog "To get additional features, a number of optional runtime"
-	elog "dependencies may be installed:"
-	elog ""
-	optfeature "Networking support"  net-misc/curl "net-misc/dhcp[client]" \
-		sys-apps/iproute2
-	optfeature \
-		"Measure performance of the boot process for later visualisation" \
-		app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
-	optfeature "Scan for Btrfs on block devices"  sys-fs/btrfs-progs
-	optfeature "Load kernel modules and drop this privilege for real init" \
-		sys-libs/libcap
-	optfeature "Support CIFS" net-fs/cifs-utils
-	optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \
-		"sys-fs/cryptsetup[-static-libs]"
-	optfeature "Support for GPG-encrypted keys for crypt module" \
-		app-crypt/gnupg
-	optfeature \
-		"Allows use of dash instead of default bash (on your own risk)" \
-		app-shells/dash
-	optfeature "Support iSCSI" sys-block/open-iscsi
-	optfeature "Support Logical Volume Manager" sys-fs/lvm2
-	optfeature "Support MD devices, also known as software RAID devices" \
-		sys-fs/mdadm
-	optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools
-	optfeature "Plymouth boot splash"  '>=sys-boot/plymouth-0.8.5-r5'
-	optfeature "Support network block devices" sys-block/nbd
-	optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind
-	optfeature \
-		"Install ssh and scp along with config files and specified keys" \
-		net-misc/openssh
-	optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \
-		app-admin/rsyslog
-}
diff --git a/sys-kernel/dracut/dracut-044-r3.ebuild b/sys-kernel/dracut/dracut-044-r3.ebuild
deleted file mode 100644
index 282b0fb417b9..000000000000
--- a/sys-kernel/dracut/dracut-044-r3.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 eutils linux-info toolchain-funcs systemd
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="https://dracut.wiki.kernel.org"
-SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug selinux systemd"
-
-RESTRICT="test"
-
-CDEPEND="virtual/udev
-	systemd? (
-		>=sys-apps/systemd-199
-		virtual/pkgconfig
-	)
-	"
-RDEPEND="${CDEPEND}
-	app-arch/cpio
-	>=app-shells/bash-4.0
-	>sys-apps/kmod-5[tools]
-	|| (
-		>=sys-apps/sysvinit-2.87-r3
-		sys-apps/systemd[sysv-utils]
-	)
-	>=sys-apps/util-linux-2.21
-
-	debug? ( dev-util/strace )
-	selinux? (
-		sys-libs/libselinux
-		sys-libs/libsepol
-		sec-policy/selinux-dracut
-	)
-	"
-DEPEND="${CDEPEND}
-	app-text/asciidoc
-	>=dev-libs/libxslt-1.1.26
-	app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75.2
-	virtual/pkgconfig
-	"
-
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
-	README.testsuite TODO )
-MY_LIBDIR=/usr/lib
-QA_MULTILIB_PATHS="
-	usr/lib/dracut/dracut-install
-	usr/lib/dracut/skipcpio
-	"
-
-PATCHES=(
-	"${FILESDIR}"/044-0001-base-dracut-lib.sh-dev_unit_name-guard-against-dev-b.patch
-	"${FILESDIR}"/044-0002-systemd-initrd-add-initrd-root-device.target.patch
-	"${FILESDIR}"/044-0003-50-dracut.install-use-bin-bash-shebang.patch
-	"${FILESDIR}"/dracut-044-bash-4.4.patch
-	"${FILESDIR}"/dracut-044-preserve-xattrs-when-copying.patch
-)
-
-#
-# Helper functions
-#
-
-# Removes module from modules.d.
-# $1 = module name
-# Module name can be specified without number prefix.
-rm_module() {
-	local force m
-	[[ $1 = -f ]] && force=-f
-
-	for m in $@; do
-		if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then
-			rm ${force} --interactive=never -r "${modules_dir}"/$m
-		else
-			rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m
-		fi
-	done
-}
-
-src_prepare() {
-	local libdirs="/$(get_libdir) /usr/$(get_libdir)"
-	if [[ ${SYMLINK_LIB} = yes ]]; then
-		# Preserve lib -> lib64 symlinks in initramfs
-		[[ $libdirs =~ /lib\  ]] || libdirs+=" /lib /usr/lib"
-	fi
-	einfo "Setting libdirs to \"${libdirs}\" ..."
-	sed -e "3alibdirs=\"${libdirs}\"" \
-		-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-
-	local udevdir="$("$(tc-getPKG_CONFIG)" udev --variable=udevdir)"
-	einfo "Setting udevdir to ${udevdir}..."
-	sed -r -e "s|^(udevdir=).*$|\1${udevdir}|" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-
-	if ! use systemd; then
-		local systemdutildir="/lib/systemd"
-		einfo "Setting systemdutildir for standalone udev to" \
-			"${systemdutildir}..."
-		sed -e "5asystemdutildir=\"${systemdutildir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-	fi
-
-	default
-}
-
-src_configure() {
-	local myconf=(
-		--libdir="${MY_LIBDIR}"
-		--bashcompletiondir="$(get_bashcompdir)"
-	)
-
-	if use systemd; then
-		myconf+=( --systemdsystemunitdir="$(systemd_get_systemunitdir)" )
-	fi
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	tc-export CC
-	emake doc install/dracut-install skipcpio/skipcpio
-}
-
-src_install() {
-	default
-
-	local my_libdir="${MY_LIBDIR}"
-	local dracutlibdir="${my_libdir#/}/dracut"
-
-	echo "DRACUT_VERSION=$PVR" > "${D%/}/${dracutlibdir}/dracut-version.sh"
-
-	insinto "${dracutlibdir}/dracut.conf.d/"
-	newins dracut.conf.d/gentoo.conf.example gentoo.conf
-
-	insinto /etc/logrotate.d
-	newins dracut.logrotate dracut
-
-	dodir /var/lib/dracut/overlay
-
-	dodoc dracut.html
-
-	if ! use systemd; then
-		# Scripts in kernel/install.d are systemd-specific
-		rm -r "${D%/}/${my_libdir}/kernel" || die
-	fi
-
-	#
-	# Modules
-	#
-	local module
-	modules_dir="${D%/}/${dracutlibdir}/modules.d"
-
-	use debug || rm_module 95debug
-	use selinux || rm_module 98selinux
-
-	if use systemd; then
-		# With systemd following modules do not make sense
-		rm_module 96securityfs 97masterkey 98integrity
-	else
-		rm_module 00systemd 98dracut-systemd
-		# Without systemd following modules do not make sense
-		rm_module 00systemd-bootchart 01systemd-initrd 02systemd-networkd
-	fi
-
-	# Remove modules which won't work for sure
-	rm_module 95fcoe # no tools
-	# fips module depends on masked app-crypt/hmaccalc
-	rm_module 01fips 02fips-aesni
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_exists; then
-		ewarn ""
-		ewarn "If the following test report contains a missing kernel"
-		ewarn "configuration option, you should reconfigure and rebuild your"
-		ewarn "kernel before booting image generated with this Dracut version."
-		ewarn ""
-
-		local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
-		# Kernel configuration options descriptions:
-		local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev"
-		local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\
-"(initramfs/initrd) support"
-
-		local opt desc
-
-		# Generate ERROR_* variables for check_extra_config.
-		for opt in ${CONFIG_CHECK}; do
-			opt=${opt#\~}
-			desc=desc_${opt}
-			eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \
-				"is missing and REQUIRED'"
-		done
-
-		check_extra_config
-		echo
-	else
-		ewarn ""
-		ewarn "Your kernel configuration couldn't be checked.  Do you have"
-		ewarn "/usr/src/linux/.config file there?  Please check manually if"
-		ewarn "following options are enabled:"
-		ewarn ""
-		ewarn "  CONFIG_BLK_DEV_INITRD"
-		ewarn "  CONFIG_DEVTMPFS"
-		ewarn ""
-	fi
-
-	elog "To get additional features, a number of optional runtime"
-	elog "dependencies may be installed:"
-	elog ""
-	optfeature "Networking support"  net-misc/curl "net-misc/dhcp[client]" \
-		sys-apps/iproute2
-	optfeature \
-		"Measure performance of the boot process for later visualisation" \
-		app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
-	optfeature "Scan for Btrfs on block devices"  sys-fs/btrfs-progs
-	optfeature "Load kernel modules and drop this privilege for real init" \
-		sys-libs/libcap
-	optfeature "Support CIFS" net-fs/cifs-utils
-	optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \
-		"sys-fs/cryptsetup[-static-libs]"
-	optfeature "Support for GPG-encrypted keys for crypt module" \
-		app-crypt/gnupg
-	optfeature \
-		"Allows use of dash instead of default bash (on your own risk)" \
-		app-shells/dash
-	optfeature "Support iSCSI" sys-block/open-iscsi
-	optfeature "Support Logical Volume Manager" sys-fs/lvm2
-	optfeature "Support MD devices, also known as software RAID devices" \
-		sys-fs/mdadm
-	optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools
-	optfeature "Plymouth boot splash"  '>=sys-boot/plymouth-0.8.5-r5'
-	optfeature "Support network block devices" sys-block/nbd
-	optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind
-	optfeature \
-		"Install ssh and scp along with config files and specified keys" \
-		net-misc/openssh
-	optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \
-		app-admin/rsyslog
-}
diff --git a/sys-kernel/dracut/dracut-045-r2.ebuild b/sys-kernel/dracut/dracut-045-r2.ebuild
deleted file mode 100644
index c8c943b0380a..000000000000
--- a/sys-kernel/dracut/dracut-045-r2.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 eutils linux-info toolchain-funcs systemd
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="https://dracut.wiki.kernel.org"
-SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ia64 ~mips ppc ~ppc64 sparc x86"
-IUSE="debug selinux"
-
-RESTRICT="test"
-
-CDEPEND="virtual/udev
-	virtual/pkgconfig
-	>=sys-apps/kmod-15[tools]
-	"
-RDEPEND="${CDEPEND}
-	app-arch/cpio
-	>=app-shells/bash-4.0:0
-	|| (
-		>=sys-apps/sysvinit-2.87-r3
-		sys-apps/systemd[sysv-utils]
-	)
-	sys-apps/coreutils[xattr(-)]
-	>=sys-apps/util-linux-2.21
-
-	debug? ( dev-util/strace )
-	selinux? (
-		sys-libs/libselinux
-		sys-libs/libsepol
-		sec-policy/selinux-dracut
-	)
-	!net-analyzer/arping
-	"
-DEPEND="${CDEPEND}
-	app-text/asciidoc
-	>=dev-libs/libxslt-1.1.26
-	app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75.2
-	"
-
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
-	README.testsuite TODO )
-
-QA_MULTILIB_PATHS="usr/lib/dracut/.*"
-
-PATCHES=(
-	"${FILESDIR}/045-systemdutildir.patch"
-)
-
-src_configure() {
-	local myconf=(
-		--prefix="${EPREFIX}/usr"
-		--sysconfdir="${EPREFIX}/etc"
-		--bashcompletiondir="$(get_bashcompdir)"
-		--systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	tc-export CC PKG_CONFIG
-
-	echo ./configure "${myconf[@]}"
-	./configure "${myconf[@]}" || die
-}
-
-src_install() {
-	default
-
-	local dracutlibdir="usr/lib/dracut"
-
-	local libdirs="/$(get_libdir) /usr/$(get_libdir)"
-	if [[ ${SYMLINK_LIB} = yes ]]; then
-		# Preserve lib -> lib64 symlinks in initramfs
-		[[ $libdirs =~ /lib\  ]] || libdirs+=" /lib /usr/lib"
-	fi
-
-	einfo "Setting libdirs to \"${libdirs}\" ..."
-	echo "libdirs=\"${libdirs}\"" > "${T}/gentoo.conf"
-	insinto "${dracutlibdir}/dracut.conf.d"
-	doins "${T}/gentoo.conf"
-
-	insinto /etc/logrotate.d
-	newins dracut.logrotate dracut
-
-	dodir /var/lib/dracut/overlay
-
-	dodoc dracut.html
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_exists; then
-		ewarn ""
-		ewarn "If the following test report contains a missing kernel"
-		ewarn "configuration option, you should reconfigure and rebuild your"
-		ewarn "kernel before booting image generated with this Dracut version."
-		ewarn ""
-
-		local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
-		# Kernel configuration options descriptions:
-		local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev"
-		local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\
-"(initramfs/initrd) support"
-
-		local opt desc
-
-		# Generate ERROR_* variables for check_extra_config.
-		for opt in ${CONFIG_CHECK}; do
-			opt=${opt#\~}
-			desc=desc_${opt}
-			eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \
-				"is missing and REQUIRED'"
-		done
-
-		check_extra_config
-		echo
-	else
-		ewarn ""
-		ewarn "Your kernel configuration couldn't be checked.  Do you have"
-		ewarn "/usr/src/linux/.config file there?  Please check manually if"
-		ewarn "following options are enabled:"
-		ewarn ""
-		ewarn "  CONFIG_BLK_DEV_INITRD"
-		ewarn "  CONFIG_DEVTMPFS"
-		ewarn ""
-	fi
-
-	elog "To get additional features, a number of optional runtime"
-	elog "dependencies may be installed:"
-	elog ""
-	optfeature "Networking support"  net-misc/curl "net-misc/dhcp[client]" \
-		sys-apps/iproute2 "net-misc/iputils[arping]"
-	optfeature \
-		"Measure performance of the boot process for later visualisation" \
-		app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
-	optfeature "Scan for Btrfs on block devices"  sys-fs/btrfs-progs
-	optfeature "Load kernel modules and drop this privilege for real init" \
-		sys-libs/libcap
-	optfeature "Support CIFS" net-fs/cifs-utils
-	optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \
-		"sys-fs/cryptsetup[-static-libs]"
-	optfeature "Support for GPG-encrypted keys for crypt module" \
-		app-crypt/gnupg
-	optfeature \
-		"Allows use of dash instead of default bash (on your own risk)" \
-		app-shells/dash
-	optfeature "Support iSCSI" sys-block/open-iscsi
-	optfeature "Support Logical Volume Manager" sys-fs/lvm2
-	optfeature "Support MD devices, also known as software RAID devices" \
-		sys-fs/mdadm
-	optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools
-	optfeature "Plymouth boot splash"  '>=sys-boot/plymouth-0.8.5-r5'
-	optfeature "Support network block devices" sys-block/nbd
-	optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind
-	optfeature \
-		"Install ssh and scp along with config files and specified keys" \
-		net-misc/openssh
-	optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \
-		app-admin/rsyslog
-}
diff --git a/sys-kernel/dracut/dracut-046-r1.ebuild b/sys-kernel/dracut/dracut-046-r1.ebuild
deleted file mode 100644
index a3a22b665f1c..000000000000
--- a/sys-kernel/dracut/dracut-046-r1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 eutils linux-info toolchain-funcs systemd
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="https://dracut.wiki.kernel.org"
-SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ia64 ~mips ppc ~ppc64 sparc x86"
-IUSE="debug selinux"
-
-RESTRICT="test"
-
-CDEPEND="virtual/udev
-	virtual/pkgconfig
-	>=sys-apps/kmod-15[tools]
-	"
-RDEPEND="${CDEPEND}
-	app-arch/cpio
-	>=app-shells/bash-4.0:0
-	|| (
-		>=sys-apps/sysvinit-2.87-r3
-		sys-apps/systemd[sysv-utils]
-	)
-	sys-apps/coreutils[xattr(-)]
-	>=sys-apps/util-linux-2.21
-
-	debug? ( dev-util/strace )
-	selinux? (
-		sys-libs/libselinux
-		sys-libs/libsepol
-		sec-policy/selinux-dracut
-	)
-	!net-analyzer/arping
-	"
-DEPEND="${CDEPEND}
-	app-text/asciidoc
-	>=dev-libs/libxslt-1.1.26
-	app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75.2
-	"
-
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
-	README.testsuite TODO )
-
-QA_MULTILIB_PATHS="usr/lib/dracut/.*"
-
-PATCHES=(
-	"${FILESDIR}/045-systemdutildir.patch"
-	"${FILESDIR}/046-amd-microcode.patch"
-)
-
-src_configure() {
-	local myconf=(
-		--prefix="${EPREFIX}/usr"
-		--sysconfdir="${EPREFIX}/etc"
-		--bashcompletiondir="$(get_bashcompdir)"
-		--systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	tc-export CC PKG_CONFIG
-
-	echo ./configure "${myconf[@]}"
-	./configure "${myconf[@]}" || die
-}
-
-src_install() {
-	default
-
-	local dracutlibdir="usr/lib/dracut"
-
-	local libdirs="/$(get_libdir) /usr/$(get_libdir)"
-	if [[ ${SYMLINK_LIB} = yes ]]; then
-		# Preserve lib -> lib64 symlinks in initramfs
-		[[ $libdirs =~ /lib\  ]] || libdirs+=" /lib /usr/lib"
-	fi
-
-	einfo "Setting libdirs to \"${libdirs}\" ..."
-	echo "libdirs=\"${libdirs}\"" > "${T}/gentoo.conf"
-	insinto "${dracutlibdir}/dracut.conf.d"
-	doins "${T}/gentoo.conf"
-
-	insinto /etc/logrotate.d
-	newins dracut.logrotate dracut
-
-	dodir /var/lib/dracut/overlay
-
-	dodoc dracut.html
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_exists; then
-		ewarn ""
-		ewarn "If the following test report contains a missing kernel"
-		ewarn "configuration option, you should reconfigure and rebuild your"
-		ewarn "kernel before booting image generated with this Dracut version."
-		ewarn ""
-
-		local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
-		# Kernel configuration options descriptions:
-		local desc_DEVTMPFS="Maintain a devtmpfs filesystem to mount at /dev"
-		local desc_BLK_DEV_INITRD="Initial RAM filesystem and RAM disk "\
-"(initramfs/initrd) support"
-
-		local opt desc
-
-		# Generate ERROR_* variables for check_extra_config.
-		for opt in ${CONFIG_CHECK}; do
-			opt=${opt#\~}
-			desc=desc_${opt}
-			eval "local ERROR_${opt}='CONFIG_${opt}: \"${!desc}\"" \
-				"is missing and REQUIRED'"
-		done
-
-		check_extra_config
-		echo
-	else
-		ewarn ""
-		ewarn "Your kernel configuration couldn't be checked.  Do you have"
-		ewarn "/usr/src/linux/.config file there?  Please check manually if"
-		ewarn "following options are enabled:"
-		ewarn ""
-		ewarn "  CONFIG_BLK_DEV_INITRD"
-		ewarn "  CONFIG_DEVTMPFS"
-		ewarn ""
-	fi
-
-	elog "To get additional features, a number of optional runtime"
-	elog "dependencies may be installed:"
-	elog ""
-	optfeature "Networking support"  net-misc/curl "net-misc/dhcp[client]" \
-		sys-apps/iproute2 "net-misc/iputils[arping]"
-	optfeature \
-		"Measure performance of the boot process for later visualisation" \
-		app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
-	optfeature "Scan for Btrfs on block devices"  sys-fs/btrfs-progs
-	optfeature "Load kernel modules and drop this privilege for real init" \
-		sys-libs/libcap
-	optfeature "Support CIFS" net-fs/cifs-utils
-	optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \
-		"sys-fs/cryptsetup[-static-libs]"
-	optfeature "Support for GPG-encrypted keys for crypt module" \
-		app-crypt/gnupg
-	optfeature \
-		"Allows use of dash instead of default bash (on your own risk)" \
-		app-shells/dash
-	optfeature "Support iSCSI" sys-block/open-iscsi
-	optfeature "Support Logical Volume Manager" sys-fs/lvm2
-	optfeature "Support MD devices, also known as software RAID devices" \
-		sys-fs/mdadm
-	optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools
-	optfeature "Plymouth boot splash"  '>=sys-boot/plymouth-0.8.5-r5'
-	optfeature "Support network block devices" sys-block/nbd
-	optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind
-	optfeature \
-		"Install ssh and scp along with config files and specified keys" \
-		net-misc/openssh
-	optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \
-		app-admin/rsyslog
-}
diff --git a/sys-kernel/dracut/dracut-047-r1.ebuild b/sys-kernel/dracut/dracut-047-r1.ebuild
deleted file mode 100644
index ffbb944a4c1e..000000000000
--- a/sys-kernel/dracut/dracut-047-r1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 eutils linux-info systemd toolchain-funcs
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="https://dracut.wiki.kernel.org"
-SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug selinux"
-
-# Tests need root privileges, bug #298014
-RESTRICT="test"
-
-COMMON_DEPEND=">=sys-apps/kmod-23[tools]
-	virtual/pkgconfig
-	virtual/udev
-	"
-RDEPEND="${COMMON_DEPEND}
-	app-arch/cpio
-	>=app-shells/bash-4.0:0
-	sys-apps/coreutils[xattr(-)]
-	|| (
-		>=sys-apps/sysvinit-2.87-r3
-		sys-apps/systemd[sysv-utils]
-	)
-	>=sys-apps/util-linux-2.21
-
-	debug? ( dev-util/strace )
-	selinux? (
-		sec-policy/selinux-dracut
-		sys-libs/libselinux
-		sys-libs/libsepol
-	)
-	"
-DEPEND="${COMMON_DEPEND}
-	app-text/asciidoc
-	app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75.2
-	>=dev-libs/libxslt-1.1.26
-	"
-
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
-	README.testsuite TODO )
-
-QA_MULTILIB_PATHS="usr/lib/dracut/.*"
-
-PATCHES=(
-	"${FILESDIR}/045-systemdutildir.patch"
-	"${FILESDIR}/047-all-fix-issues-found-by-shellcheck.patch"
-	"${FILESDIR}/047-plymouth-fix-detection-of-plymouth-directory.patch"
-)
-
-src_configure() {
-	local myconf=(
-		--prefix="${EPREFIX}/usr"
-		--sysconfdir="${EPREFIX}/etc"
-		--bashcompletiondir="$(get_bashcompdir)"
-		--systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	tc-export CC PKG_CONFIG
-
-	echo ./configure "${myconf[@]}"
-	./configure "${myconf[@]}" || die
-}
-
-src_install() {
-	default
-
-	local libdirs=( /$(get_libdir) /usr/$(get_libdir) )
-	if [[ ${SYMLINK_LIB} = yes && $(get_libdir) != lib ]]; then
-		# Preserve lib -> lib64 symlinks in initramfs
-		libdirs+=( /lib /usr/lib )
-	fi
-
-	einfo "Setting libdirs to \"${libdirs[*]}\" ..."
-	echo "libdirs=\"${libdirs[*]}\"" > "${T}/gentoo.conf" || die
-	insinto "/usr/lib/dracut/dracut.conf.d"
-	doins "${T}/gentoo.conf"
-
-	insinto /etc/logrotate.d
-	newins dracut.logrotate dracut
-
-	docinto html
-	dodoc dracut.html
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_exists; then
-		ewarn ""
-		ewarn "If the following test report contains a missing kernel"
-		ewarn "configuration option, you should reconfigure and rebuild your"
-		ewarn "kernel before booting image generated with this Dracut version."
-		ewarn ""
-
-		local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
-		# Kernel configuration options descriptions:
-		local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" '
-		ERROR_DEVTMPFS+='is missing and REQUIRED'
-		local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk '
-		ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED'
-
-		check_extra_config
-		echo
-	else
-		ewarn ""
-		ewarn "Your kernel configuration couldn't be checked."
-		ewarn "Please check manually if following options are enabled:"
-		ewarn ""
-		ewarn "  CONFIG_BLK_DEV_INITRD"
-		ewarn "  CONFIG_DEVTMPFS"
-		ewarn ""
-	fi
-
-	elog "To get additional features, a number of optional runtime"
-	elog "dependencies may be installed:"
-	elog ""
-	optfeature "Networking support"  net-misc/curl "net-misc/dhcp[client]" \
-		sys-apps/iproute2 "net-misc/iputils[arping]"
-	optfeature \
-		"Measure performance of the boot process for later visualisation" \
-		app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
-	optfeature "Scan for Btrfs on block devices"  sys-fs/btrfs-progs
-	optfeature "Load kernel modules and drop this privilege for real init" \
-		sys-libs/libcap
-	optfeature "Support CIFS" net-fs/cifs-utils
-	optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \
-		"sys-fs/cryptsetup[-static-libs]"
-	optfeature "Support for GPG-encrypted keys for crypt module" \
-		app-crypt/gnupg
-	optfeature \
-		"Allows use of dash instead of default bash (on your own risk)" \
-		app-shells/dash
-	optfeature "Support iSCSI" sys-block/open-iscsi
-	optfeature "Support Logical Volume Manager" sys-fs/lvm2
-	optfeature "Support MD devices, also known as software RAID devices" \
-		sys-fs/mdadm
-	optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools
-	optfeature "Plymouth boot splash"  '>=sys-boot/plymouth-0.8.5-r5'
-	optfeature "Support network block devices" sys-block/nbd
-	optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind
-	optfeature \
-		"Install ssh and scp along with config files and specified keys" \
-		net-misc/openssh
-	optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \
-		app-admin/rsyslog
-}
diff --git a/sys-kernel/dracut/dracut-048-r1.ebuild b/sys-kernel/dracut/dracut-048-r1.ebuild
index 7d8ddc788ce9..37162655c63f 100644
--- a/sys-kernel/dracut/dracut-048-r1.ebuild
+++ b/sys-kernel/dracut/dracut-048-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ia64 ~mips ppc ~ppc64 sparc x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~mips ppc ~ppc64 sparc x86"
 IUSE="debug selinux"
 
 # Tests need root privileges, bug #298014
diff --git a/sys-kernel/dracut/dracut-048.ebuild b/sys-kernel/dracut/dracut-048.ebuild
deleted file mode 100644
index 85f233b9f584..000000000000
--- a/sys-kernel/dracut/dracut-048.ebuild
+++ /dev/null
@@ -1,148 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit bash-completion-r1 eutils linux-info systemd toolchain-funcs
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="https://dracut.wiki.kernel.org"
-SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug selinux"
-
-# Tests need root privileges, bug #298014
-RESTRICT="test"
-
-COMMON_DEPEND=">=sys-apps/kmod-23[tools]
-	virtual/pkgconfig
-	virtual/udev
-	"
-RDEPEND="${COMMON_DEPEND}
-	app-arch/cpio
-	>=app-shells/bash-4.0:0
-	sys-apps/coreutils[xattr(-)]
-	|| (
-		>=sys-apps/sysvinit-2.87-r3
-		sys-apps/systemd[sysv-utils]
-	)
-	>=sys-apps/util-linux-2.21
-
-	debug? ( dev-util/strace )
-	selinux? (
-		sec-policy/selinux-dracut
-		sys-libs/libselinux
-		sys-libs/libsepol
-	)
-	"
-DEPEND="${COMMON_DEPEND}
-	app-text/asciidoc
-	app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75.2
-	>=dev-libs/libxslt-1.1.26
-	"
-
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
-	README.testsuite TODO )
-
-QA_MULTILIB_PATHS="usr/lib/dracut/.*"
-
-src_configure() {
-	local myconf=(
-		--prefix="${EPREFIX}/usr"
-		--sysconfdir="${EPREFIX}/etc"
-		--bashcompletiondir="$(get_bashcompdir)"
-		--systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	tc-export CC PKG_CONFIG
-
-	echo ./configure "${myconf[@]}"
-	./configure "${myconf[@]}" || die
-}
-
-src_install() {
-	default
-
-	local libdirs=( /$(get_libdir) /usr/$(get_libdir) )
-	if [[ ${SYMLINK_LIB} = yes && $(get_libdir) != lib ]]; then
-		# Preserve lib -> lib64 symlinks in initramfs
-		libdirs+=( /lib /usr/lib )
-	fi
-
-	einfo "Setting libdirs to \"${libdirs[*]}\" ..."
-	echo "libdirs=\"${libdirs[*]}\"" > "${T}/gentoo.conf" || die
-	insinto "/usr/lib/dracut/dracut.conf.d"
-	doins "${T}/gentoo.conf"
-
-	insinto /etc/logrotate.d
-	newins dracut.logrotate dracut
-
-	docinto html
-	dodoc dracut.html
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_exists; then
-		ewarn ""
-		ewarn "If the following test report contains a missing kernel"
-		ewarn "configuration option, you should reconfigure and rebuild your"
-		ewarn "kernel before booting image generated with this Dracut version."
-		ewarn ""
-
-		local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
-		# Kernel configuration options descriptions:
-		local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" '
-		ERROR_DEVTMPFS+='is missing and REQUIRED'
-		local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk '
-		ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED'
-
-		check_extra_config
-		echo
-	else
-		ewarn ""
-		ewarn "Your kernel configuration couldn't be checked."
-		ewarn "Please check manually if following options are enabled:"
-		ewarn ""
-		ewarn "  CONFIG_BLK_DEV_INITRD"
-		ewarn "  CONFIG_DEVTMPFS"
-		ewarn ""
-	fi
-
-	elog "To get additional features, a number of optional runtime"
-	elog "dependencies may be installed:"
-	elog ""
-	optfeature "Networking support"  net-misc/curl "net-misc/dhcp[client]" \
-		sys-apps/iproute2 "net-misc/iputils[arping]"
-	optfeature \
-		"Measure performance of the boot process for later visualisation" \
-		app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
-	optfeature "Scan for Btrfs on block devices"  sys-fs/btrfs-progs
-	optfeature "Load kernel modules and drop this privilege for real init" \
-		sys-libs/libcap
-	optfeature "Support CIFS" net-fs/cifs-utils
-	optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \
-		"sys-fs/cryptsetup[-static-libs]"
-	optfeature "Support for GPG-encrypted keys for crypt module" \
-		app-crypt/gnupg
-	optfeature \
-		"Allows use of dash instead of default bash (on your own risk)" \
-		app-shells/dash
-	optfeature "Support iSCSI" sys-block/open-iscsi
-	optfeature "Support Logical Volume Manager" sys-fs/lvm2
-	optfeature "Support MD devices, also known as software RAID devices" \
-		sys-fs/mdadm
-	optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools
-	optfeature "Plymouth boot splash"  '>=sys-boot/plymouth-0.8.5-r5'
-	optfeature "Support network block devices" sys-block/nbd
-	optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind
-	optfeature \
-		"Install ssh and scp along with config files and specified keys" \
-		net-misc/openssh
-	optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \
-		app-admin/rsyslog
-}
diff --git a/sys-kernel/dracut/dracut-049-r2.ebuild b/sys-kernel/dracut/dracut-049-r2.ebuild
deleted file mode 100644
index 872f2ff3a242..000000000000
--- a/sys-kernel/dracut/dracut-049-r2.ebuild
+++ /dev/null
@@ -1,157 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 eutils linux-info systemd toolchain-funcs
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/dracutdevs/dracut"
-else
-	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://github.com/dracutdevs/dracut/archive/${PV}.tar.gz -> ${P}.tar.gz"
-fi
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="https://dracut.wiki.kernel.org"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux"
-
-# Tests need root privileges, bug #298014
-RESTRICT="test"
-
-RDEPEND="
-	app-arch/cpio
-	>=app-shells/bash-4.0:0
-	sys-apps/coreutils[xattr(-)]
-	>=sys-apps/kmod-23[tools]
-	|| (
-		>=sys-apps/sysvinit-2.87-r3
-		sys-apps/openrc[sysv-utils,selinux?]
-		sys-apps/systemd[sysv-utils]
-	)
-	>=sys-apps/util-linux-2.21
-	virtual/pkgconfig
-	virtual/udev
-
-	selinux? (
-		sec-policy/selinux-dracut
-		sys-libs/libselinux
-		sys-libs/libsepol
-	)
-	"
-DEPEND=">=sys-apps/kmod-23"
-
-BDEPEND="
-	app-text/asciidoc
-	app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75.2
-	>=dev-libs/libxslt-1.1.26
-	virtual/pkgconfig
-	"
-
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
-	README.testsuite TODO )
-
-QA_MULTILIB_PATHS="usr/lib/dracut/.*"
-
-PATCHES=(
-	"${FILESDIR}"/048-dracut-install-simplify-ldd-parsing-logic.patch
-	"${FILESDIR}"/049-40network-Don-t-include-40network-by-default.patch
-	"${FILESDIR}"/049-remove-bashism-in-various-boot-scripts.patch
-)
-
-src_configure() {
-	local myconf=(
-		--prefix="${EPREFIX}/usr"
-		--sysconfdir="${EPREFIX}/etc"
-		--bashcompletiondir="$(get_bashcompdir)"
-		--systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	tc-export CC PKG_CONFIG
-
-	echo ./configure "${myconf[@]}"
-	./configure "${myconf[@]}" || die
-
-	if [[ ${PV} != 9999 ]] ; then
-		# Source tarball from github doesn't include this file
-		echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die
-	fi
-}
-
-src_install() {
-	default
-
-	insinto /etc/logrotate.d
-	newins dracut.logrotate dracut
-
-	docinto html
-	dodoc dracut.html
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_exists; then
-		ewarn ""
-		ewarn "If the following test report contains a missing kernel"
-		ewarn "configuration option, you should reconfigure and rebuild your"
-		ewarn "kernel before booting image generated with this Dracut version."
-		ewarn ""
-
-		local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
-		# Kernel configuration options descriptions:
-		local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" '
-		ERROR_DEVTMPFS+='is missing and REQUIRED'
-		local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk '
-		ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED'
-
-		check_extra_config
-		echo
-	else
-		ewarn ""
-		ewarn "Your kernel configuration couldn't be checked."
-		ewarn "Please check manually if following options are enabled:"
-		ewarn ""
-		ewarn "  CONFIG_BLK_DEV_INITRD"
-		ewarn "  CONFIG_DEVTMPFS"
-		ewarn ""
-	fi
-
-	elog "To get additional features, a number of optional runtime"
-	elog "dependencies may be installed:"
-	elog ""
-	optfeature "Networking support" net-misc/networkmanager
-	optfeature "Legacy networking support" net-misc/curl "net-misc/dhcp[client]" \
-		sys-apps/iproute2 "net-misc/iputils[arping]"
-	optfeature \
-		"Measure performance of the boot process for later visualisation" \
-		app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
-	optfeature "Scan for Btrfs on block devices"  sys-fs/btrfs-progs
-	optfeature "Load kernel modules and drop this privilege for real init" \
-		sys-libs/libcap
-	optfeature "Support CIFS" net-fs/cifs-utils
-	optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \
-		"sys-fs/cryptsetup[-static-libs]"
-	optfeature "Support for GPG-encrypted keys for crypt module" \
-		app-crypt/gnupg
-	optfeature \
-		"Allows use of dash instead of default bash (on your own risk)" \
-		app-shells/dash
-	optfeature "Support iSCSI" sys-block/open-iscsi
-	optfeature "Support Logical Volume Manager" sys-fs/lvm2
-	optfeature "Support MD devices, also known as software RAID devices" \
-		sys-fs/mdadm
-	optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools
-	optfeature "Plymouth boot splash"  '>=sys-boot/plymouth-0.8.5-r5'
-	optfeature "Support network block devices" sys-block/nbd
-	optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind
-	optfeature \
-		"Install ssh and scp along with config files and specified keys" \
-		net-misc/openssh
-	optfeature "Enable logging with rsyslog" app-admin/rsyslog
-}
diff --git a/sys-kernel/dracut/dracut-049-r3.ebuild b/sys-kernel/dracut/dracut-049-r3.ebuild
index 4d5a8b43e81e..e40fb5c82789 100644
--- a/sys-kernel/dracut/dracut-049-r3.ebuild
+++ b/sys-kernel/dracut/dracut-049-r3.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/dracutdevs/dracut"
 else
 	[[ "${PV}" = *_rc* ]] || \
-	KEYWORDS="~alpha amd64 arm ~arm64 ia64 ~mips ppc ppc64 ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~ia64 ~mips ppc ppc64 ~sparc x86"
 	SRC_URI="https://github.com/dracutdevs/dracut/archive/${PV}.tar.gz -> ${P}.tar.gz"
 fi
 
diff --git a/sys-kernel/dracut/dracut-049.ebuild b/sys-kernel/dracut/dracut-049.ebuild
deleted file mode 100644
index dda60561bf73..000000000000
--- a/sys-kernel/dracut/dracut-049.ebuild
+++ /dev/null
@@ -1,158 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit bash-completion-r1 eutils linux-info systemd toolchain-funcs
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="https://dracut.wiki.kernel.org"
-SRC_URI="https://github.com/dracutdevs/dracut/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="selinux"
-
-# Tests need root privileges, bug #298014
-RESTRICT="test"
-
-RDEPEND="
-	app-arch/cpio
-	>=app-shells/bash-4.0:0
-	sys-apps/coreutils[xattr(-)]
-	>=sys-apps/kmod-23[tools]
-	|| (
-		>=sys-apps/sysvinit-2.87-r3
-		sys-apps/systemd[sysv-utils]
-	)
-	>=sys-apps/util-linux-2.21
-	virtual/pkgconfig
-	virtual/udev
-
-	selinux? (
-		sec-policy/selinux-dracut
-		sys-libs/libselinux
-		sys-libs/libsepol
-	)
-	"
-DEPEND=">=sys-apps/kmod-23"
-
-BDEPEND="
-	app-text/asciidoc
-	app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75.2
-	>=dev-libs/libxslt-1.1.26
-	virtual/pkgconfig
-	"
-
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
-	README.testsuite TODO )
-
-QA_MULTILIB_PATHS="usr/lib/dracut/.*"
-
-PATCHES=(
-	"${FILESDIR}"/048-dracut-install-simplify-ldd-parsing-logic.patch
-	"${FILESDIR}"/049-40network-Don-t-include-40network-by-default.patch
-	"${FILESDIR}"/049-remove-bashism-in-various-boot-scripts.patch
-)
-
-src_configure() {
-	local myconf=(
-		--prefix="${EPREFIX}/usr"
-		--sysconfdir="${EPREFIX}/etc"
-		--bashcompletiondir="$(get_bashcompdir)"
-		--systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-
-	tc-export CC PKG_CONFIG
-
-	echo ./configure "${myconf[@]}"
-	./configure "${myconf[@]}" || die
-
-	# Source tarball from github doesn't include this file
-	echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die
-}
-
-src_install() {
-	default
-
-	local libdirs=( /$(get_libdir) /usr/$(get_libdir) )
-	if [[ ${SYMLINK_LIB} = yes && $(get_libdir) != lib ]]; then
-		# Preserve lib -> lib64 symlinks in initramfs
-		libdirs+=( /lib /usr/lib )
-	fi
-
-	einfo "Setting libdirs to \"${libdirs[*]}\" ..."
-	echo "libdirs=\"${libdirs[*]}\"" > "${T}/gentoo.conf" || die
-	insinto "/usr/lib/dracut/dracut.conf.d"
-	doins "${T}/gentoo.conf"
-
-	insinto /etc/logrotate.d
-	newins dracut.logrotate dracut
-
-	docinto html
-	dodoc dracut.html
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_exists; then
-		ewarn ""
-		ewarn "If the following test report contains a missing kernel"
-		ewarn "configuration option, you should reconfigure and rebuild your"
-		ewarn "kernel before booting image generated with this Dracut version."
-		ewarn ""
-
-		local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
-
-		# Kernel configuration options descriptions:
-		local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" '
-		ERROR_DEVTMPFS+='is missing and REQUIRED'
-		local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk '
-		ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED'
-
-		check_extra_config
-		echo
-	else
-		ewarn ""
-		ewarn "Your kernel configuration couldn't be checked."
-		ewarn "Please check manually if following options are enabled:"
-		ewarn ""
-		ewarn "  CONFIG_BLK_DEV_INITRD"
-		ewarn "  CONFIG_DEVTMPFS"
-		ewarn ""
-	fi
-
-	elog "To get additional features, a number of optional runtime"
-	elog "dependencies may be installed:"
-	elog ""
-	optfeature "Networking support" net-misc/networkmanager
-	optfeature "Legacy networking support" net-misc/curl "net-misc/dhcp[client]" \
-		sys-apps/iproute2 "net-misc/iputils[arping]"
-	optfeature \
-		"Measure performance of the boot process for later visualisation" \
-		app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
-	optfeature "Scan for Btrfs on block devices"  sys-fs/btrfs-progs
-	optfeature "Load kernel modules and drop this privilege for real init" \
-		sys-libs/libcap
-	optfeature "Support CIFS" net-fs/cifs-utils
-	optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \
-		"sys-fs/cryptsetup[-static-libs]"
-	optfeature "Support for GPG-encrypted keys for crypt module" \
-		app-crypt/gnupg
-	optfeature \
-		"Allows use of dash instead of default bash (on your own risk)" \
-		app-shells/dash
-	optfeature "Support iSCSI" sys-block/open-iscsi
-	optfeature "Support Logical Volume Manager" sys-fs/lvm2
-	optfeature "Support MD devices, also known as software RAID devices" \
-		sys-fs/mdadm
-	optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools
-	optfeature "Plymouth boot splash"  '>=sys-boot/plymouth-0.8.5-r5'
-	optfeature "Support network block devices" sys-block/nbd
-	optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind
-	optfeature \
-		"Install ssh and scp along with config files and specified keys" \
-		net-misc/openssh
-	optfeature "Enable logging with rsyslog" app-admin/rsyslog
-}
diff --git a/sys-kernel/dracut/dracut-049-r1.ebuild b/sys-kernel/dracut/dracut-050.ebuild
index 05dd8d5ad433..5b09940bf76f 100644
--- a/sys-kernel/dracut/dracut-049-r1.ebuild
+++ b/sys-kernel/dracut/dracut-050.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	[[ "${PV}" = *_rc* ]] || \
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://github.com/dracutdevs/dracut/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz"
 fi
 
 DESCRIPTION="Generic initramfs generation tool"
@@ -31,19 +31,24 @@ RDEPEND="
 	>=sys-apps/kmod-23[tools]
 	|| (
 		>=sys-apps/sysvinit-2.87-r3
+		sys-apps/openrc[sysv-utils(-),selinux?]
 		sys-apps/systemd[sysv-utils]
 	)
 	>=sys-apps/util-linux-2.21
 	virtual/pkgconfig
 	virtual/udev
 
+	elibc_musl? ( sys-libs/fts-standalone )
 	selinux? (
 		sec-policy/selinux-dracut
 		sys-libs/libselinux
 		sys-libs/libsepol
 	)
-	"
-DEPEND=">=sys-apps/kmod-23"
+"
+DEPEND="
+	>=sys-apps/kmod-23
+	elibc_musl? ( sys-libs/fts-standalone )
+"
 
 BDEPEND="
 	app-text/asciidoc
@@ -51,17 +56,18 @@ BDEPEND="
 	>=app-text/docbook-xsl-stylesheets-1.75.2
 	>=dev-libs/libxslt-1.1.26
 	virtual/pkgconfig
-	"
+"
 
-DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
+DOCS=( AUTHORS HACKING NEWS README.md README.generic README.kernel README.modules
 	README.testsuite TODO )
 
 QA_MULTILIB_PATHS="usr/lib/dracut/.*"
 
 PATCHES=(
-	"${FILESDIR}"/048-dracut-install-simplify-ldd-parsing-logic.patch
-	"${FILESDIR}"/049-40network-Don-t-include-40network-by-default.patch
-	"${FILESDIR}"/049-remove-bashism-in-various-boot-scripts.patch
+	"${FILESDIR}"/050-Makefile-merge-main-version-and-git-version-earlier.patch
+	"${FILESDIR}"/050-dracut.sh-don-t-call-fsfreeze-on-subvol-of-root-file.patch
+	"${FILESDIR}"/050-Makefile-fix-VERSION-again.patch
+	"${FILESDIR}"/050-gentoo-ldconfig-paths.patch
 )
 
 src_configure() {
@@ -77,7 +83,7 @@ src_configure() {
 	echo ./configure "${myconf[@]}"
 	./configure "${myconf[@]}" || die
 
-	if [[ ${PV} != 9999 ]] ; then
+	if [[ ${PV} != 9999 && ! -f dracut-version.sh ]] ; then
 		# Source tarball from github doesn't include this file
 		echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die
 	fi
@@ -153,4 +159,7 @@ pkg_postinst() {
 		"Install ssh and scp along with config files and specified keys" \
 		net-misc/openssh
 	optfeature "Enable logging with rsyslog" app-admin/rsyslog
+	optfeature \
+		"Enable rngd service to help generating entropy early during boot" \
+		sys-apps/rng-tools
 }
diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-9999.ebuild
index 192c96442040..f34a9db579a2 100644
--- a/sys-kernel/dracut/dracut-9999.ebuild
+++ b/sys-kernel/dracut/dracut-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -11,7 +11,7 @@ if [[ ${PV} == 9999 ]] ; then
 else
 	[[ "${PV}" = *_rc* ]] || \
 	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-	SRC_URI="https://github.com/dracutdevs/dracut/archive/${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://www.kernel.org/pub/linux/utils/boot/${PN}/${P}.tar.xz"
 fi
 
 DESCRIPTION="Generic initramfs generation tool"
@@ -31,7 +31,7 @@ RDEPEND="
 	>=sys-apps/kmod-23[tools]
 	|| (
 		>=sys-apps/sysvinit-2.87-r3
-		sys-apps/openrc[sysv-utils,selinux?]
+		sys-apps/openrc[sysv-utils(-),selinux?]
 		sys-apps/systemd[sysv-utils]
 	)
 	>=sys-apps/util-linux-2.21
@@ -64,6 +64,7 @@ DOCS=( AUTHORS HACKING NEWS README.md README.generic README.kernel README.module
 QA_MULTILIB_PATHS="usr/lib/dracut/.*"
 
 PATCHES=(
+	"${FILESDIR}"/050-gentoo-ldconfig-paths.patch
 )
 
 src_configure() {
@@ -79,7 +80,7 @@ src_configure() {
 	echo ./configure "${myconf[@]}"
 	./configure "${myconf[@]}" || die
 
-	if [[ ${PV} != 9999 ]] ; then
+	if [[ ${PV} != 9999 && ! -f dracut-version.sh ]] ; then
 		# Source tarball from github doesn't include this file
 		echo "DRACUT_VERSION=${PV}" > dracut-version.sh || die
 	fi
diff --git a/sys-kernel/dracut/files/044-0001-base-dracut-lib.sh-dev_unit_name-guard-against-dev-b.patch b/sys-kernel/dracut/files/044-0001-base-dracut-lib.sh-dev_unit_name-guard-against-dev-b.patch
deleted file mode 100644
index fd6f11859457..000000000000
--- a/sys-kernel/dracut/files/044-0001-base-dracut-lib.sh-dev_unit_name-guard-against-dev-b.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From c41df7e1db1adc51399ab2c22f251b15eb2065b1 Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Tue, 5 Jan 2016 22:11:57 +0300
-Subject: [PATCH] base/dracut-lib.sh:dev_unit_name() guard against $dev
- beginning with "-"
-
-crypt/parse-crypt.sh generate initqueue job which always call
-dev_unit_name() with an argument beginning with "-". This results
-in the following error:
-
-dracut-initqueue[307]: + systemd-escape -p -cfb4aa43-2f02-4c6b-a313-60ea99288087
-dracut-initqueue[307]: systemd-escape: invalid option -- 'c'
----
- modules.d/99base/dracut-lib.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
-index ad03394..0a0b1b9 100755
---- a/modules.d/99base/dracut-lib.sh
-+++ b/modules.d/99base/dracut-lib.sh
-@@ -874,7 +874,7 @@ dev_unit_name()
-     local dev="$1"
- 
-     if command -v systemd-escape >/dev/null; then
--        systemd-escape -p  "$dev"
-+        systemd-escape -p -- "$dev"
-         return
-     fi
- 
--- 
-2.10.2
-
diff --git a/sys-kernel/dracut/files/044-0002-systemd-initrd-add-initrd-root-device.target.patch b/sys-kernel/dracut/files/044-0002-systemd-initrd-add-initrd-root-device.target.patch
deleted file mode 100644
index 21cb6792acd2..000000000000
--- a/sys-kernel/dracut/files/044-0002-systemd-initrd-add-initrd-root-device.target.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From d4efc0aeeecc470d9a267b7f3c130f472488905c Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Wed, 25 May 2016 15:06:29 +0200
-Subject: [PATCH] systemd-initrd: add initrd-root-device.target
-
----
- modules.d/01systemd-initrd/module-setup.sh | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/modules.d/01systemd-initrd/module-setup.sh b/modules.d/01systemd-initrd/module-setup.sh
-index fb6a9ea..c1ccd2a 100755
---- a/modules.d/01systemd-initrd/module-setup.sh
-+++ b/modules.d/01systemd-initrd/module-setup.sh
-@@ -28,6 +28,7 @@ install() {
-     inst_multiple -o \
-         $systemdsystemunitdir/initrd.target \
-         $systemdsystemunitdir/initrd-fs.target \
-+        $systemdsystemunitdir/initrd-root-device.target \
-         $systemdsystemunitdir/initrd-root-fs.target \
-         $systemdsystemunitdir/initrd-switch-root.target \
-         $systemdsystemunitdir/initrd-switch-root.service \
--- 
-2.10.2
-
diff --git a/sys-kernel/dracut/files/044-0003-50-dracut.install-use-bin-bash-shebang.patch b/sys-kernel/dracut/files/044-0003-50-dracut.install-use-bin-bash-shebang.patch
deleted file mode 100644
index 85ebc7e638f2..000000000000
--- a/sys-kernel/dracut/files/044-0003-50-dracut.install-use-bin-bash-shebang.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 69395a528aed99ec04b16c14ebacf4c2e10afd26 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Fri, 4 Nov 2016 13:09:28 -0400
-Subject: [PATCH] 50-dracut.install: use /bin/bash shebang
-
-This script utilizes several bash-specific constructs.
----
- 50-dracut.install | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/50-dracut.install b/50-dracut.install
-index 7d081d5..54c71d4 100755
---- a/50-dracut.install
-+++ b/50-dracut.install
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#!/bin/bash
- 
- COMMAND="$1"
- KERNEL_VERSION="$2"
--- 
-2.10.2
-
diff --git a/sys-kernel/dracut/files/045-systemdutildir.patch b/sys-kernel/dracut/files/045-systemdutildir.patch
deleted file mode 100644
index e56abba35470..000000000000
--- a/sys-kernel/dracut/files/045-systemdutildir.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From ed5cc98864c28eab2c4cb45ec0f67450699aaaa8 Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Mon, 3 Jul 2017 22:39:42 -0400
-Subject: [PATCH] dracut.sh: improve udevdir and systemdutildir fallback logic
-
-Check for a common binary in systemdutildir. This resolves an issue on
-split-usr systems, where it is common to have both /lib/systemd[/system]
-and /usr/lib/systemd[/user] present.
-
-Check for systemd-udevd specifically, since some distros (Gentoo) allow
-udev to be installed without the rest of the systemd stack.
-
-Similar logic is applied to udevdir simply for consistency.
----
- dracut.sh | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/dracut.sh b/dracut.sh
-index 64d94201..67c12a72 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -1266,16 +1266,16 @@ done
- [[ -d $udevdir ]] \
-     || udevdir="$(pkg-config udev --variable=udevdir 2>/dev/null)"
- if ! [[ -d "$udevdir" ]]; then
--    [[ ! -h /lib ]] && [[ -d /lib/udev ]] && udevdir=/lib/udev
--    [[ -d /usr/lib/udev ]] && udevdir=/usr/lib/udev
-+    [[ -e /lib/udev/collect ]] && udevdir=/lib/udev
-+    [[ -e /usr/lib/udev/collect ]] && udevdir=/usr/lib/udev
- fi
- 
- [[ -d $systemdutildir ]] \
-     || systemdutildir=$(pkg-config systemd --variable=systemdutildir 2>/dev/null)
- 
- if ! [[ -d "$systemdutildir" ]]; then
--    [[ ! -h /lib ]] && [[ -d /lib/systemd ]] && systemdutildir=/lib/systemd
--    [[ -d /usr/lib/systemd ]] && systemdutildir=/usr/lib/systemd
-+    [[ -e /lib/systemd/systemd-udevd ]] && systemdutildir=/lib/systemd
-+    [[ -e /usr/lib/systemd/systemd-udevd ]] && systemdutildir=/usr/lib/systemd
- fi
- 
- [[ -d $systemdsystemunitdir ]] \
--- 
-2.13.2
-
diff --git a/sys-kernel/dracut/files/046-amd-microcode.patch b/sys-kernel/dracut/files/046-amd-microcode.patch
deleted file mode 100644
index c351275dbebc..000000000000
--- a/sys-kernel/dracut/files/046-amd-microcode.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From a1250a704e33c59f2395aaad054db1c745a5c98a Mon Sep 17 00:00:00 2001
-From: Daniel Molkentin <dmolkentin@suse.com>
-Date: Tue, 12 Dec 2017 17:48:36 +0100
-Subject: [PATCH] Simplify microcode lookup for for AMD CPUs
-
----
- dracut-functions.sh | 7 ++-----
- 1 file changed, 2 insertions(+), 5 deletions(-)
-
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index 112b2434..d7fc5303 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -661,11 +661,8 @@ get_ucode_file ()
-     local stepping=`grep -E "stepping" /proc/cpuinfo | head -1 | sed s/.*:\ //`
- 
-     if [[ "$(get_cpu_vendor)" == "AMD" ]]; then
--        # If family greater than or equal to 0x16
--        if [[ $family -ge 22 ]]; then
--            printf "microcode_amd_fam16h.bin"
--        elif [[ $family -eq 21 ]]; then
--            printf "microcode_amd_fam15h.bin"
-+        if [[ $family -ge 21 ]]; then
-+            printf "microcode_amd_fam%xh.bin" $family
-         else
-             printf "microcode_amd.bin"
-         fi
--- 
-2.16.0.rc0
-
diff --git a/sys-kernel/dracut/files/047-all-fix-issues-found-by-shellcheck.patch b/sys-kernel/dracut/files/047-all-fix-issues-found-by-shellcheck.patch
deleted file mode 100644
index d5cbe042b639..000000000000
--- a/sys-kernel/dracut/files/047-all-fix-issues-found-by-shellcheck.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 3aa37cafde734719f2377600a17459fad30edfbc Mon Sep 17 00:00:00 2001
-From: Lukas Nykryn <lnykryn@redhat.com>
-Date: Fri, 2 Mar 2018 12:29:46 +0100
-Subject: [PATCH 06/14] all: fix issues found by shellcheck
-To: <initramfs@vger.kernel.org>
-
-Error: SHELLCHECK_WARNING:
-/usr/lib/dracut/dracut-init.sh:939:20: error: Argument to implicit -n is always true due to literal strings. [SC2157]
-  937|   dracut_kernel_post() {
-  938|       for _f in modules.builtin.bin modules.builtin modules.order; do
-  939|->         [[ $srcmods/$_f ]] && inst_simple "$srcmods/$_f" "/lib/modules/$kernel/$_f"
-  940|       done
-  941|
-
-Error: SHELLCHECK_WARNING:
-/usr/lib/dracut/modules.d/98syslog/parse-syslog-opts.sh:18:12: error: This expression is constant. Did you forget a $ somewhere? [SC2078]
-   16|       elif [ -e /sbin/syslogd ]; then
-   17|           syslogtype="syslogd"
-   18|->     elif [ /sbin/syslog-ng ]; then
-   19|           syslogtype="syslog-ng"
-   20|       else
-
-Error: SHELLCHECK_WARNING:
-/usr/lib/dracut/modules.d/90crypt/crypt-lib.sh:15:29: error: Since you double quoted this, it will not word split, and the loop will only run once. [SC2066]
-   13|               strstr "$d" "${luks##luks-}" && return 0
-   14|               if [ -n "$dev" ]; then
-   15|->                 for _dev in "$(devnames $d)"; do
-   16|                       [ "$dev" -ef "$_dev" ] && return 0
-   17|                   done
----
- dracut-init.sh                          | 2 +-
- modules.d/90crypt/crypt-lib.sh          | 2 +-
- modules.d/98syslog/parse-syslog-opts.sh | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/dracut-init.sh b/dracut-init.sh
-index 53e6f13a..1278c638 100644
---- a/dracut-init.sh
-+++ b/dracut-init.sh
-@@ -942,7 +942,7 @@ for_each_kmod_dep() {
- 
- dracut_kernel_post() {
-     for _f in modules.builtin.bin modules.builtin modules.order; do
--        [[ $srcmods/$_f ]] && inst_simple "$srcmods/$_f" "/lib/modules/$kernel/$_f"
-+        [[ -e $srcmods/$_f ]] && inst_simple "$srcmods/$_f" "/lib/modules/$kernel/$_f"
-     done
- 
-     # generate module dependencies for the initrd
-diff --git a/modules.d/90crypt/crypt-lib.sh b/modules.d/90crypt/crypt-lib.sh
-index 532b9a71..bbf485e0 100755
---- a/modules.d/90crypt/crypt-lib.sh
-+++ b/modules.d/90crypt/crypt-lib.sh
-@@ -12,7 +12,7 @@ crypttab_contains() {
-             strstr "${l##luks-}" "${luks##luks-}" && return 0
-             strstr "$d" "${luks##luks-}" && return 0
-             if [ -n "$dev" ]; then
--                for _dev in "$(devnames $d)"; do
-+                for _dev in $(devnames $d); do
-                     [ "$dev" -ef "$_dev" ] && return 0
-                 done
-             fi
-diff --git a/modules.d/98syslog/parse-syslog-opts.sh b/modules.d/98syslog/parse-syslog-opts.sh
-index 50ec2759..9ec6ad47 100755
---- a/modules.d/98syslog/parse-syslog-opts.sh
-+++ b/modules.d/98syslog/parse-syslog-opts.sh
-@@ -15,7 +15,7 @@ detect_syslog() {
-         syslogtype="rsyslogd"
-     elif [ -e /sbin/syslogd ]; then
-         syslogtype="syslogd"
--    elif [ /sbin/syslog-ng ]; then
-+    elif [ -e /sbin/syslog-ng ]; then
-         syslogtype="syslog-ng"
-     else
-         warn "Could not find any syslog binary although the syslogmodule is selected to be installed. Please check."
--- 
-2.16.1
-
diff --git a/sys-kernel/dracut/files/047-plymouth-fix-detection-of-plymouth-directory.patch b/sys-kernel/dracut/files/047-plymouth-fix-detection-of-plymouth-directory.patch
deleted file mode 100644
index 42f877292a79..000000000000
--- a/sys-kernel/dracut/files/047-plymouth-fix-detection-of-plymouth-directory.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From fe6c7e0f06cde65effb3503a47c31ac39aceefb6 Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Fri, 23 Mar 2018 11:52:27 +0300
-Subject: [PATCH 14/14] plymouth: fix detection of plymouth directory
-To: <initramfs@vger.kernel.org>
-
-Some distros have both /usr/lib/plymouth and /usr/libexec/plymouth
-directorirs, so we should check the existance of plymouth-populate-initrd
-script.
-
-Fixes: 421b46f8ae89cfe2b62e880a8a5079ee8c1b3aae
----
- modules.d/50plymouth/module-setup.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/50plymouth/module-setup.sh b/modules.d/50plymouth/module-setup.sh
-index 5fbca8b0..b51913e8 100755
---- a/modules.d/50plymouth/module-setup.sh
-+++ b/modules.d/50plymouth/module-setup.sh
-@@ -6,7 +6,7 @@ pkglib_dir() {
-         _dirs+=" /usr/lib/$(dpkg-architecture -qDEB_HOST_MULTIARCH)/plymouth"
-     fi
-     for _dir in $_dirs; do
--        if [ -d $_dir ]; then
-+        if [ -x $_dir/plymouth-populate-initrd ]; then
-             echo $_dir
-             return
-         fi
--- 
-2.16.1
-
diff --git a/sys-kernel/dracut/files/050-Makefile-fix-VERSION-again.patch b/sys-kernel/dracut/files/050-Makefile-fix-VERSION-again.patch
new file mode 100644
index 000000000000..a091e4c9facc
--- /dev/null
+++ b/sys-kernel/dracut/files/050-Makefile-fix-VERSION-again.patch
@@ -0,0 +1,34 @@
+From a76aa8e39016a8564adb0f18f93bbf2e15d3243f Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy <alexander@tsoy.me>
+Date: Sun, 8 Mar 2020 05:47:50 +0300
+Subject: [PATCH] Makefile: fix VERSION again
+
+The variable is not undefined anymore after the first assignment, so
+we should check if variable is empty instead.
+---
+ Makefile | 8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index c69e2dfc..02e2c4b5 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,9 +1,13 @@
+ -include dracut-version.sh
+ 
+ DRACUT_MAIN_VERSION ?= $(shell env GIT_CEILING_DIRECTORIES=$(CWD)/.. git describe --abbrev=0 --tags --always 2>/dev/null || :)
+-DRACUT_MAIN_VERSION ?= $(DRACUT_VERSION)
++ifeq ($(DRACUT_MAIN_VERSION),)
++DRACUT_MAIN_VERSION = $(DRACUT_VERSION)
++endif
+ DRACUT_FULL_VERSION ?= $(shell env GIT_CEILING_DIRECTORIES=$(CWD)/.. git describe --tags --always 2>/dev/null || :)
+-DRACUT_FULL_VERSION ?= $(DRACUT_VERSION)
++ifeq ($(DRACUT_FULL_VERSION),)
++DRACUT_FULL_VERSION = $(DRACUT_VERSION)
++endif
+ 
+ -include Makefile.inc
+ 
+-- 
+2.24.1
+
diff --git a/sys-kernel/dracut/files/050-Makefile-merge-main-version-and-git-version-earlier.patch b/sys-kernel/dracut/files/050-Makefile-merge-main-version-and-git-version-earlier.patch
new file mode 100644
index 000000000000..49c532b92995
--- /dev/null
+++ b/sys-kernel/dracut/files/050-Makefile-merge-main-version-and-git-version-earlier.patch
@@ -0,0 +1,78 @@
+From eb8a7a96351b6e1cfd9dc34f1e854333a8f4a4e0 Mon Sep 17 00:00:00 2001
+From: =?UTF-8?q?=C4=90o=C3=A0n=20Tr=E1=BA=A7n=20C=C3=B4ng=20Danh?=
+ <congdanhqx@gmail.com>
+Date: Fri, 6 Mar 2020 08:46:36 +0700
+Subject: [PATCH] Makefile: merge main-version and git-version earlier
+
+With GNU Make 4.3 on both ArchLinux, and VoidLinux,
+GITVERION is always empty because of bad substitution.
+Change '\#' to simply '#' can fix it,
+but we don't need that complation.
+
+We can merge DRACUT_MAIN_VERSION and GITVERSION into DRACUT_FULL_VERSION.
+Because, GITVERSION will be attached back to DRACUT_MAIN_VERSION in all
+situation.
+
+While we're at it, detect if we're in git worktree by:
+limiting GIT_CEILING_DIRECTORIES to parent directory of
+dracut's top level directory; instead of checking for .git directory,
+in order to support git-worktree, in such case, .git will be a file, see
+gitrepository-layout(5)
+---
+ Makefile | 13 +++++++------
+ 1 file changed, 7 insertions(+), 6 deletions(-)
+
+diff --git a/Makefile b/Makefile
+index 22b584f1..c69e2dfc 100644
+--- a/Makefile
++++ b/Makefile
+@@ -1,8 +1,9 @@
+ -include dracut-version.sh
+ 
+-DRACUT_MAIN_VERSION ?= $(shell [ -d .git ] && git describe --abbrev=0 --tags --always 2>/dev/null || :)
++DRACUT_MAIN_VERSION ?= $(shell env GIT_CEILING_DIRECTORIES=$(CWD)/.. git describe --abbrev=0 --tags --always 2>/dev/null || :)
+ DRACUT_MAIN_VERSION ?= $(DRACUT_VERSION)
+-GITVERSION ?= $(shell [ -d .git ] && { v=$$(git describe --tags --always 2>/dev/null); [ -n "$$v" ] && [ $${v\#*-} != $$v ] && echo -$${v\#*-}; } )
++DRACUT_FULL_VERSION ?= $(shell env GIT_CEILING_DIRECTORIES=$(CWD)/.. git describe --tags --always 2>/dev/null || :)
++DRACUT_FULL_VERSION ?= $(DRACUT_VERSION)
+ 
+ -include Makefile.inc
+ 
+@@ -92,14 +93,14 @@ endif
+ 
+ %.xml: %.asc
+ 	@rm -f -- "$@"
+-	asciidoc -a "version=$(DRACUT_MAIN_VERSION)$(GITVERSION)" -d manpage -b docbook -o "$@" $<
++	asciidoc -a "version=$(DRACUT_FULL_VERSION)" -d manpage -b docbook -o "$@" $<
+ 
+ dracut.8: dracut.usage.asc dracut.8.asc
+ 
+ dracut.html: dracut.asc $(manpages) dracut.css dracut.usage.asc
+ 	@rm -f -- dracut.xml
+ 	asciidoc -a "mainversion=$(DRACUT_MAIN_VERSION)" \
+-		-a "version=$(DRACUT_MAIN_VERSION)$(GITVERSION)" \
++		-a "version=$(DRACUT_FULL_VERSION)" \
+ 		-a numbered \
+ 		-d book -b docbook -o dracut.xml dracut.asc
+ 	@rm -f -- dracut.html
+@@ -112,7 +113,7 @@ dracut.html: dracut.asc $(manpages) dracut.css dracut.usage.asc
+ dracut.pc: Makefile.inc Makefile
+ 	@echo "Name: dracut" > dracut.pc
+ 	@echo "Description: dracut" >> dracut.pc
+-	@echo "Version: $(DRACUT_MAIN_VERSION)$(GITVERSION)" >> dracut.pc
++	@echo "Version: $(DRACUT_FULL_VERSION)" >> dracut.pc
+ 	@echo "dracutdir=$(pkglibdir)" >> dracut.pc
+ 	@echo "dracutmodulesdir=$(pkglibdir)/modules.d" >> dracut.pc
+ 	@echo "dracutconfdir=$(pkglibdir)/dracut.conf.d" >> dracut.pc
+@@ -182,7 +183,7 @@ endif
+ 
+ dracut-version.sh:
+ 	@rm -f dracut-version.sh
+-	@echo "DRACUT_VERSION=$(DRACUT_MAIN_VERSION)$(GITVERSION)" > dracut-version.sh
++	@echo "DRACUT_VERSION=$(DRACUT_FULL_VERSION)" > dracut-version.sh
+ 
+ clean:
+ 	$(RM) *~
+-- 
+2.24.1
+
diff --git a/sys-kernel/dracut/files/050-dracut.sh-don-t-call-fsfreeze-on-subvol-of-root-file.patch b/sys-kernel/dracut/files/050-dracut.sh-don-t-call-fsfreeze-on-subvol-of-root-file.patch
new file mode 100644
index 000000000000..cf54cabb5eb6
--- /dev/null
+++ b/sys-kernel/dracut/files/050-dracut.sh-don-t-call-fsfreeze-on-subvol-of-root-file.patch
@@ -0,0 +1,75 @@
+From 0386e4627779cb51f4292b3c642d90586d5e71b4 Mon Sep 17 00:00:00 2001
+From: Martin Wilck <mwilck@suse.com>
+Date: Wed, 29 Jan 2020 23:53:29 +0100
+Subject: [PATCH] dracut.sh: don't call fsfreeze on subvol of root file system
+
+dracut.sh already doesn't call fsfreeze if the output file is on
+the root file system. For btrfs, however, this is not sufficient.
+Because fsfreeze is a superblock operation, and all btrfs subvolumes
+share the same superblock, fsfreeze may freeze the entire system
+if the subvolume on which the output file is written and / are
+subvolumes of the same file system. Avoid this by comparing file
+system UUIDs for btrfs.
+
+Fixes: de576db3c225 ("call fsfreeze(8) on /boot to flush initramfs data & metadata to media")
+---
+ dracut.sh | 36 +++++++++++++++++++++++++++++++++++-
+ 1 file changed, 35 insertions(+), 1 deletion(-)
+
+diff --git a/dracut.sh b/dracut.sh
+index af346f3a..c14f6c0b 100755
+--- a/dracut.sh
++++ b/dracut.sh
+@@ -2075,6 +2075,40 @@ fi
+ 
+ command -v restorecon &>/dev/null && restorecon -- "$outfile"
+ 
++btrfs_uuid() {
++    btrfs filesystem show "$1" | sed -n '1s/^.*uuid: //p'
++}
++
++freeze_ok_for_btrfs() {
++    local mnt uuid1 uuid2
++    # If the output file is on btrfs, we need to make sure that it's
++    # not on a subvolume of the same file system as the root FS.
++    # Otherwise, fsfreeze() might freeze the entire system.
++    # This is most conveniently checked by comparing the FS uuid.
++
++    [[ "$(stat -f -c %T -- "/")" == "btrfs" ]] || return 0
++    mnt=$(stat -c %m -- "$1")
++    uuid1=$(btrfs_uuid "$mnt")
++    uuid2=$(btrfs_uuid "/")
++    [[ "$uuid1" && "$uuid2" && "$uuid1" != "$uuid2" ]]
++}
++
++freeze_ok_for_fstype() {
++    local outfile=$1
++    local fstype
++
++    [[ "$(stat -c %m -- "$outfile")" == "/" ]] && return 1
++    fstype=$(stat -f -c %T -- "$outfile")
++    case $fstype in
++        msdos)
++            return 1;;
++        btrfs)
++            freeze_ok_for_btrfs "$outfile";;
++        *)
++            return 0;;
++    esac
++}
++
+ # We sync/fsfreeze only if we're operating on a live booted system.
+ # It's possible for e.g. `kernel` to be installed as an RPM BuildRequires or equivalent,
+ # and there's no reason to sync, and *definitely* no reason to fsfreeze.
+@@ -2087,7 +2121,7 @@ if test -d $dracutsysrootdir/run/systemd/system; then
+     fi
+ 
+     # use fsfreeze only if we're not writing to /
+-    if [[ "$(stat -c %m -- "$outfile")" != "/" && "$(stat -f -c %T -- "$outfile")" != "msdos" ]]; then
++    if [[ "$(stat -c %m -- "$outfile")" != "/" ]] && freeze_ok_for_fstype "$outfile"; then
+         if ! $(fsfreeze -f $(dirname "$outfile") 2>/dev/null && fsfreeze -u $(dirname "$outfile") 2>/dev/null); then
+             dinfo "dracut: warning: could not fsfreeze $(dirname "$outfile")"
+         fi
+-- 
+2.24.1
+
diff --git a/sys-kernel/dracut/files/050-gentoo-ldconfig-paths.patch b/sys-kernel/dracut/files/050-gentoo-ldconfig-paths.patch
new file mode 100644
index 000000000000..15522ef4fc1e
--- /dev/null
+++ b/sys-kernel/dracut/files/050-gentoo-ldconfig-paths.patch
@@ -0,0 +1,39 @@
+From 0674b9136831b1beb6a7ec91147fd5c280c693a3 Mon Sep 17 00:00:00 2001
+From: Alexander Tsoy <alexander@tsoy.me>
+Date: Mon, 9 Mar 2020 02:47:07 +0300
+Subject: [PATCH] Remove redundant gcc paths in ldconfig_paths()
+
+Bug: https://bugs.gentoo.org/705728
+---
+ dracut-functions.sh | 15 ++++++++++++++-
+ 1 file changed, 14 insertions(+), 1 deletion(-)
+
+diff --git a/dracut-functions.sh b/dracut-functions.sh
+index 3cb9c7af..5337ff6c 100755
+--- a/dracut-functions.sh
++++ b/dracut-functions.sh
+@@ -76,7 +76,20 @@ find_binary() {
+ 
+ ldconfig_paths()
+ {
+-    $DRACUT_LDCONFIG ${dracutsysrootdir:+-r ${dracutsysrootdir} -f /etc/ld.so.conf} -pN 2>/dev/null | grep -E -v '/(lib|lib64|usr/lib|usr/lib64)/[^/]*$' | sed -n 's,.* => \(.*\)/.*,\1,p' | sort | uniq
++    local gccpath
++
++    if type -P gcc-config &>/dev/null; then
++        gccpath=$(gcc-config -c)
++        gccpath=/usr/lib/gcc/${gccpath%-*}/${gccpath##*-}
++    fi
++
++    while read -r line; do
++        if [[ ${line} != /usr/lib/gcc/* || -z ${gccpath} ]]; then
++            echo ${line}
++        elif [[ ${line} == ${gccpath} ]]; then
++            echo ${line}
++        fi
++    done < <($DRACUT_LDCONFIG ${dracutsysrootdir:+-r ${dracutsysrootdir} -f /etc/ld.so.conf} -pN 2>/dev/null | grep -E -v '/(lib|lib64|usr/lib|usr/lib64)/[^/]*$' | sed -n 's,.* => \(.*\)/.*,\1,p' | sort | uniq)
+ }
+ 
+ # Version comparision function.  Assumes Linux style version scheme.
+-- 
+2.24.1
+
diff --git a/sys-kernel/dracut/files/dracut-044-bash-4.4.patch b/sys-kernel/dracut/files/dracut-044-bash-4.4.patch
deleted file mode 100644
index 3144c8e6b759..000000000000
--- a/sys-kernel/dracut/files/dracut-044-bash-4.4.patch
+++ /dev/null
@@ -1,80 +0,0 @@
-diff -urN dracut-044.orig/modules.d/50drm/module-setup.sh dracut-044/modules.d/50drm/module-setup.sh
---- dracut-044.orig/modules.d/50drm/module-setup.sh	2015-11-25 16:22:28.000000000 +0300
-+++ dracut-044/modules.d/50drm/module-setup.sh	2016-09-28 02:50:08.914967926 +0300
-@@ -24,9 +24,9 @@
-             local _fname _fcont
-             while read _fname || [ -n "$_fname" ]; do
-                 case "$_fname" in
--                    *.ko)    _fcont="$(<        $_fname)" ;;
--                    *.ko.gz) _fcont="$(gzip -dc $_fname)" ;;
--                    *.ko.xz) _fcont="$(xz -dc   $_fname)" ;;
-+                    *.ko)    _fcont="$(<        $_fname tr -d \\0)" ;;
-+                    *.ko.gz) _fcont="$(gzip -dc $_fname | tr -d \\0)" ;;
-+                    *.ko.xz) _fcont="$(xz -dc   $_fname | tr -d \\0)" ;;
-                 esac
-                 [[   $_fcont =~ $_drm_drivers
-                 && ! $_fcont =~ iw_handler_get_spy ]] \
-diff -urN dracut-044.orig/modules.d/90kernel-modules/module-setup.sh dracut-044/modules.d/90kernel-modules/module-setup.sh
---- dracut-044.orig/modules.d/90kernel-modules/module-setup.sh	2015-11-25 16:22:28.000000000 +0300
-+++ dracut-044/modules.d/90kernel-modules/module-setup.sh	2016-09-28 02:49:11.725390294 +0300
-@@ -10,9 +10,9 @@
-             function bmf1() {
-                 local _f
-                 while read _f || [ -n "$_f" ]; do case "$_f" in
--                    *.ko)    [[ $(<         $_f) =~ $_blockfuncs ]] && echo "$_f" ;;
--                    *.ko.gz) [[ $(gzip -dc <$_f) =~ $_blockfuncs ]] && echo "$_f" ;;
--                    *.ko.xz) [[ $(xz -dc   <$_f) =~ $_blockfuncs ]] && echo "$_f" ;;
-+                    *.ko)    [[ $(<         $_f tr -d \\0) =~ $_blockfuncs ]] && echo "$_f" ;;
-+                    *.ko.gz) [[ $(gzip -dc <$_f | tr -d \\0) =~ $_blockfuncs ]] && echo "$_f" ;;
-+                    *.ko.xz) [[ $(xz -dc   <$_f | tr -d \\0) =~ $_blockfuncs ]] && echo "$_f" ;;
-                     esac
-                 done
-                 return 0
-diff -urN dracut-044.orig/modules.d/90kernel-network-modules/module-setup.sh dracut-044/modules.d/90kernel-network-modules/module-setup.sh
---- dracut-044.orig/modules.d/90kernel-network-modules/module-setup.sh	2015-11-25 16:22:28.000000000 +0300
-+++ dracut-044/modules.d/90kernel-network-modules/module-setup.sh	2016-09-28 02:51:08.202422231 +0300
-@@ -26,9 +26,9 @@
-             while read _fname; do
-                 [[ $_fname =~ $_unwanted_drivers ]] && continue
-                 case "$_fname" in
--                    *.ko)    _fcont="$(<        $_fname)" ;;
--                    *.ko.gz) _fcont="$(gzip -dc $_fname)" ;;
--                    *.ko.xz) _fcont="$(xz -dc   $_fname)" ;;
-+                    *.ko)    _fcont="$(<        $_fname tr -d \\0)" ;;
-+                    *.ko.gz) _fcont="$(gzip -dc $_fname | tr -d \\0)" ;;
-+                    *.ko.xz) _fcont="$(xz -dc   $_fname | tr -d \\0)" ;;
-                 esac
-                 [[   $_fcont =~ $_net_drivers
-                 && ! $_fcont =~ iw_handler_get_spy ]] \
-diff -urN dracut-044.orig/modules.d/90multipath/module-setup.sh dracut-044/modules.d/90multipath/module-setup.sh
---- dracut-044.orig/modules.d/90multipath/module-setup.sh	2015-11-25 16:22:28.000000000 +0300
-+++ dracut-044/modules.d/90multipath/module-setup.sh	2016-09-28 02:49:11.726390235 +0300
-@@ -58,9 +58,9 @@
-             local _f
-             while read _f || [ -n "$_f" ]; do
-                 case "$_f" in
--                    *.ko)    [[ $(<         $_f) =~ $_funcs ]] && echo "$_f" ;;
--                    *.ko.gz) [[ $(gzip -dc <$_f) =~ $_funcs ]] && echo "$_f" ;;
--                    *.ko.xz) [[ $(xz -dc   <$_f) =~ $_funcs ]] && echo "$_f" ;;
-+                    *.ko)    [[ $(<         $_f tr -d \\0) =~ $_funcs ]] && echo "$_f" ;;
-+                    *.ko.gz) [[ $(gzip -dc <$_f | tr -d \\0) =~ $_funcs ]] && echo "$_f" ;;
-+                    *.ko.xz) [[ $(xz -dc   <$_f | tr -d \\0) =~ $_funcs ]] && echo "$_f" ;;
-                 esac
-             done
-             return 0
-diff -urN dracut-044.orig/modules.d/95iscsi/module-setup.sh dracut-044/modules.d/95iscsi/module-setup.sh
---- dracut-044.orig/modules.d/95iscsi/module-setup.sh	2015-11-25 16:22:28.000000000 +0300
-+++ dracut-044/modules.d/95iscsi/module-setup.sh	2016-09-28 02:49:11.726390235 +0300
-@@ -168,9 +168,9 @@
-             local _f
-             while read _f || [ -n "$_f" ]; do
-                 case "$_f" in
--                    *.ko)    [[ $(<         $_f) =~ $_funcs ]] && echo "$_f" ;;
--                    *.ko.gz) [[ $(gzip -dc <$_f) =~ $_funcs ]] && echo "$_f" ;;
--                    *.ko.xz) [[ $(xz -dc   <$_f) =~ $_funcs ]] && echo "$_f" ;;
-+                    *.ko)    [[ $(<         $_f tr -d \\0) =~ $_funcs ]] && echo "$_f" ;;
-+                    *.ko.gz) [[ $(gzip -dc <$_f | tr -d \\0) =~ $_funcs ]] && echo "$_f" ;;
-+                    *.ko.xz) [[ $(xz -dc   <$_f | tr -d \\0) =~ $_funcs ]] && echo "$_f" ;;
-                 esac
-             done
-             return 0
diff --git a/sys-kernel/dracut/files/dracut-044-preserve-xattrs-when-copying.patch b/sys-kernel/dracut/files/dracut-044-preserve-xattrs-when-copying.patch
deleted file mode 100644
index 3146d8485a9c..000000000000
--- a/sys-kernel/dracut/files/dracut-044-preserve-xattrs-when-copying.patch
+++ /dev/null
@@ -1,51 +0,0 @@
-From 61c761bc2c35fb244d46fbbde97161f5927071dc Mon Sep 17 00:00:00 2001
-From: Stefan Berger <stefanb@us.ibm.com>
-Date: Tue, 25 Oct 2016 15:09:49 -0400
-Subject: [PATCH] dracut-install: preserve extended attributes when copying
- files
-
-Preserve extended attributes when copying files using dracut-install.
-
-The copying of extended attributes avoids file execution denials when
-the Linux Integrity Measurement's Appraisal mode is active. In that mode
-executables need their file signatures copied. In particular, this patch
-solves the problem that dependent libaries are not included in the
-initramfs since the copied programs could not be executed due to missing
-signatures. The following audit record shows the type of failure that
-is now prevented:
-
-type=INTEGRITY_DATA msg=audit(1477409025.492:30065): pid=922 uid=0
- auid=4294967295 ses=4294967295
- subj=unconfined_u:unconfined_r:unconfined_t:s0-s0:c0.c1023
- op="appraise_data" cause="IMA-signature-required"
- comm="ld-linux-x86-64"
- name="/var/tmp/dracut.R6ySa4/initramfs/usr/bin/journalctl"
- dev="dm-0" ino=37136 res=0
-
-Signed-off-by: Stefan Berger <stefanb@linux.vnet.ibm.com>
----
- install/dracut-install.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/install/dracut-install.c b/install/dracut-install.c
-index fe30bba..c0f1c17 100644
---- a/install/dracut-install.c
-+++ b/install/dracut-install.c
-@@ -294,7 +294,7 @@ static int cp(const char *src, const char *dst)
-  normal_copy:
-         pid = fork();
-         if (pid == 0) {
--                execlp("cp", "cp", "--reflink=auto", "--sparse=auto", "--preserve=mode,timestamps", "-fL", src, dst,
-+                execlp("cp", "cp", "--reflink=auto", "--sparse=auto", "--preserve=mode,timestamps,xattr", "-fL", src, dst,
-                        NULL);
-                 _exit(EXIT_FAILURE);
-         }
-@@ -302,7 +302,7 @@ static int cp(const char *src, const char *dst)
-         while (waitpid(pid, &ret, 0) < 0) {
-                 if (errno != EINTR) {
-                         ret = -1;
--                        log_error("Failed: cp --reflink=auto --sparse=auto --preserve=mode,timestamps -fL %s %s", src,
-+                        log_error("Failed: cp --reflink=auto --sparse=auto --preserve=mode,timestamps,xattr -fL %s %s", src,
-                                   dst);
-                         break;
-                 }
author	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
committer	V3n3RiX <venerix@redcorelinux.org>	2020-04-12 03:41:30 +0100
commit	623ee73d661e5ed8475cb264511f683407d87365 (patch)
tree	993eb27c93ec7a2d2d19550300d888fc1fed9e69 /sys-kernel/dracut
parent	ceeeb463cc1eef97fd62eaee8bf2196ba04bc384 (diff)