Removed old versions. Rels bug #498062. Versions prior to 034-r4 have bugs

which were not backported from 034-r4, so there's no reason to keep them.

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0xF0134531E1DBFAB5

39 files changed, 46 insertions, 3821 deletions

diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog
index 0fface667cae..4505e48b558b 100644
--- a/sys-kernel/dracut/ChangeLog
+++ b/sys-kernel/dracut/ChangeLog
@@ -1,6 +1,42 @@
 # ChangeLog for sys-kernel/dracut
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.148 2013/12/28 18:36:37 aidecoe Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.149 2014/01/19 11:06:14 aidecoe Exp $
+
+  19 Jan 2014; Amadeusz Żołnowski <aidecoe@gentoo.org> -dracut-026-r2.ebuild,
+  -dracut-027-r3.ebuild, -dracut-029.ebuild, -dracut-030.ebuild,
+  -dracut-031-r1.ebuild, -dracut-033-r3.ebuild, -dracut-034-r3.ebuild,
+  -files/026-0000-fix-version-print.patch,
+  -files/027-0000-fix-version-print.patch,
+  -files/026-0001-dracut-functions.sh-support-for-altern.patch,
+  -files/027-0001-dracut-functions.sh-support-for-altern.patch,
+  -files/029-0001-dracut-functions.sh-support-for-altern.patch,
+  -files/030-0001-dracut-functions.sh-support-for-altern.patch,
+  -files/031-0001-dracut-functions.sh-support-for-altern.patch,
+  -files/033-0001-dracut-functions.sh-support-for-altern.patch,
+  -files/026-0002-gentoo.conf-let-udevdir-be-handled-by-.patch,
+  -files/027-0002-gentoo.conf-let-udevdir-be-handled-by-.patch,
+  -files/029-0002-gentoo.conf-let-udevdir-be-handled-by-.patch,
+  -files/030-0002-gentoo.conf-let-udevdir-be-handled-by-.patch,
+  -files/031-0002-gentoo.conf-let-udevdir-be-handled-by-.patch,
+  -files/033-0002-gentoo.conf-let-udevdir-be-handled-by-.patch,
+  -files/027-0003-Do-not-call-plymouth-with-full-path.patch,
+  -files/029-0003-LatArCyrHeb-16-as-a-default-i18n-font-.patch,
+  -files/030-0003-LatArCyrHeb-16-as-a-default-i18n-font-.patch,
+  -files/031-0003-Revert-base-setup-correct-system-time-.patch,
+  -files/026-0003-Revert-crypt-dmraid-mdraid-use-for_eac.patch,
+  -files/033-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch,
+  -files/033-0004-Install-dracut-install-into-libexec-di.patch,
+  -files/026-0004-lsinitrd.sh-fix-for-default-initrd-not.patch,
+  -files/027-0004-plymouth-plymouth-pretrigger.sh-fixup-.patch,
+  -files/033-0005-dracut.sh-harden-host_modalias-reading.patch,
+  -files/026-0005-lsinitrd.sh-removed-trailing.patch,
+  -files/033-0006-ifup-do-not-dhcp-on-network-interface-.patch,
+  -files/026-0006-make-host_fs_types-a-hashmap.patch,
+  -files/033-0007-lvm-mdraid-Fix-LVM-on-MD-activation.patch,
+  -files/033-0008-mdraid-module-setup.sh-install-configs.patch,
+  -files/033-0009-mdraid-module-setup.sh-fixes-for-mdadm.patch:
+  Removed old versions. Rels bug #498062. Versions prior to 034-r4 have bugs
+  which were not backported from 034-r4, so there's no reason to keep them.
 
   28 Dec 2013; Amadeusz Żołnowski <aidecoe@gentoo.org> dracut-034-r3.ebuild,
   dracut-034-r4.ebuild, +files/034-0010-module-setup.sh-add-comments.patch.bz2,
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 0a813e5f14e2..8a0dd50def48 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -1,36 +1,6 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 026-0000-fix-version-print.patch 365 SHA256 c065b20c95b24a9fc0e8e1e20de19ec3dca7cb4bd62d7a3d26adf099c39fc57b SHA512 2f622d8bc4e483d91674cb7acaa2ef9bde613bcda7c8b5c8b79bed4919fdcf0852798ba38615f796528e8c83fc18a89322a1fbde7fc5effaa6c4c4d0a389638f WHIRLPOOL b38923d3e04e161b23b9fa510b0dc0b3ce5238f3008ef0f92a1918e38c7a9ecf6d6c99a14006b734c8c77df01213c866bdce293c684c073a6cb61691a5700102
-AUX 026-0001-dracut-functions.sh-support-for-altern.patch 1387 SHA256 be904413df41df5800d0c07b79c4f92ba9041277325f65fbe186f42d87493b04 SHA512 a18a311cfc3586db342afabd5c8871d6b9a215f05481626a8d6cad64d6239e407b58326da8d81bc562605c400fb2961ab22e3a362ac3b4d9c31dbaf6f115157c WHIRLPOOL dab7d1748f3267bd4a0efe3d78c2b7d1a5a62e6596d09e3abca942cb2c8a6046296da65b794241b66078dbea78f9e815e58944cddcc12e345990ebe9f6e4729d
-AUX 026-0002-gentoo.conf-let-udevdir-be-handled-by-.patch 950 SHA256 72b03ba848dbb7644fb0211adbe25b26e2bdacde12afb41f56baea591f629f29 SHA512 f61bd11f3a635e7ec10d854eca963cbe94b687d7162a03a200ddfc8719d0e8b5c8fc90da38ce9249136a7fdd0446123f2048d563ea4e819ab825f45fb5a424ff WHIRLPOOL dea401b272e65d98fa6d194298c032f8e66a21eb25a49094d7c598c6a69863a6902d7161f4bfc51b63b8939ab625702c7082380fbd957d01b7662dc91203ef56
-AUX 026-0003-Revert-crypt-dmraid-mdraid-use-for_eac.patch 1809 SHA256 2928ef9bb5ede778ba508e168e2ff2ca54f85f10dd36f417c60d9b0815f0759a SHA512 20985b3ed23d0102501be1cf2893db25b5e037fdecc5f95a54da3262c7d099b2164f98330a305abeddfbdd874579e46e96f5821d8ea679077dd3833835b31b58 WHIRLPOOL 336aa39eb42fd7720e1f803e2f4ae21521f364bd7bca46203763cd118b848ee62f70b91c6e536b328933526173888d57d833c6f50cb3a272df14396f469efe0e
-AUX 026-0004-lsinitrd.sh-fix-for-default-initrd-not.patch 1249 SHA256 b9b29f65354120db67fa0a815def5d907f0a598367f616de86b473e16c087ddb SHA512 ef482d1f3b0bac385f4e4cbb030f4f6ef9cc7ec6143bb11773105b09a357bdb34f06b87cdd62f1f38b95e85ff4d1a6e6052c4b3e018db96ec5585c4ae74ef620 WHIRLPOOL a7c8697d380fcd876f5f10c590ecff4e74ded4f6f69bc4e1ceaa10f497c6aec45362dc9c778410ec30549f3fc54c2738a54bea27264cb8a39a71c16aee8243ca
-AUX 026-0005-lsinitrd.sh-removed-trailing.patch 714 SHA256 c54d8d5a8bf22e40edc82343fd20b80ffcf346a842f54af68d840c84e6ebab15 SHA512 96e5dcf866860705bb6138f82816bb1a7a6c1cc352db3803aba14af581882464a7762ea4020a0047c3081aca24b0f8c5cdf9c37dd79295b558ecd30cb72cdf70 WHIRLPOOL d371a09e6771f79be4fa27c4fe8be1094500a1d7af52900bb4b13b2a073a04e50dfa0bff49d62f5903940cc912604bc139b04276ff2da5864f221a95b245c132
-AUX 026-0006-make-host_fs_types-a-hashmap.patch 12563 SHA256 59ea961e4112c64840a98cc87223cf2ee412f3aab149d35d550aeac8b1dc9d47 SHA512 1ace774c411109338479c2686e7aa98f802eb8858f864eeff4c07dd1deeace23143e83849cfb50d523bff003669423beb793a9a44d71a5d390f6062a4559a610 WHIRLPOOL c134cc7027df34a7920ec04c33f2552560ca40fd5d6cab54162f4866196b45e0e8ccb95b8370a41f315ea4df30446f3bd330de539bca464009bc728475937bf6
-AUX 027-0000-fix-version-print.patch 365 SHA256 c065b20c95b24a9fc0e8e1e20de19ec3dca7cb4bd62d7a3d26adf099c39fc57b SHA512 2f622d8bc4e483d91674cb7acaa2ef9bde613bcda7c8b5c8b79bed4919fdcf0852798ba38615f796528e8c83fc18a89322a1fbde7fc5effaa6c4c4d0a389638f WHIRLPOOL b38923d3e04e161b23b9fa510b0dc0b3ce5238f3008ef0f92a1918e38c7a9ecf6d6c99a14006b734c8c77df01213c866bdce293c684c073a6cb61691a5700102
-AUX 027-0001-dracut-functions.sh-support-for-altern.patch 1387 SHA256 992e44243e87b07833154d4b2299d08df4d7c1d3b931aa22e1ad75acce21330b SHA512 d3dd82a6f976bb4aab0e70a5c483e89e6ef43f59401bbe756ea8376a758003b434610f31d2d661d749d865b6a943da01867d0223856981262dddc5f12457ccdf WHIRLPOOL eb11e2d39e18d6e2f47c34f4c9d52c90becefe71507069e333c08f96b2b3b2630e4f0d9acff265858546f63f876bd6f83227d8e9459a6732b7488c0f7e77503e
-AUX 027-0002-gentoo.conf-let-udevdir-be-handled-by-.patch 950 SHA256 e778ee1fb9179e3898b25e5ae558060d1ee75a0c63e03ad1ddb36b5275c53b35 SHA512 3ce017f58d7eea16342631b02f86330f8e86d8357928df2fb2009d3544b17f4d12a9446e83d6a47cd8fa90c2a910df34a0c680277174bf865a34f1a771f1902a WHIRLPOOL fb5cfa821abd55e6a16ec710cb418d34c1ace1be9e787310054ca5b0d08c31a26600a7ec2d8e27ee8b74773ecbc0d93810ec67f225e909e88623914eb0eb7bbc
-AUX 027-0003-Do-not-call-plymouth-with-full-path.patch 7131 SHA256 0a4d3482713417969a946760b4b25473ba9b4f42224d1fa4223bcc7967137e12 SHA512 bd35e3f22de44df839680f7b28db0bb5a14fd164faafc47a90d3fd799455d83e4e03811c003818c8db76ed56c14ca22b4806e8d6fec3e9f8d90831859f3dbe3f WHIRLPOOL 65917161c32c1f9796e7d8ddf498415ab4e9d09b19140798f4a44df2d3e75bf655bba723603598348f2c657d34bfa7376536e4361afd8ee5d8ab40e2bf233ee6
-AUX 027-0004-plymouth-plymouth-pretrigger.sh-fixup-.patch 1056 SHA256 8e126a78eb051ccc69b9a3edb2d7b74515170ce8acdb9420aceaee750068cc11 SHA512 b1bda85237331aa51d0105e1ad0dee655284ea23d8e47c0818e6ea74190b65593e70b366a254140c9706e33d23eccb7893b83f0a28514806318d9f08cae01281 WHIRLPOOL 5b78398b28cc06c5a25e99b5ae687ad1c7dc14c67605fe7256f3617b458fa21af24f783ab5cad24278225e93f59fd40d1ba97ed42b460f77d1814f0546058c25
-AUX 029-0001-dracut-functions.sh-support-for-altern.patch 1387 SHA256 ea63a0fb8e0e369e2bf523bd2b1fb70e296c40040529d5064a427d34de7fa048 SHA512 95bacbf84aac5092157f9f16f57a004c64c621dca13de3dfb107d9800ad502ea7deead0266338d1d3bb678730b625962bebe21794fd1df97715d6ec8998aad2b WHIRLPOOL 096256839e5794c342d2d7d48a51e1c57ce45a2e35b08052c5bd007e0241dc354b354fb81ad0b2e3dd75d8fbb2a23f778fefafa2727bd4dcc55c10e8aefd799d
-AUX 029-0002-gentoo.conf-let-udevdir-be-handled-by-.patch 950 SHA256 f42b2afd4f10caaf2d964a645482d472c34a94585880049ca128ea075c7deb10 SHA512 5e3e786e74c0a9be203854ead8cc15f5f023266328b4ecc1ed1afb14daa412c472811108a9a3fa71402684cc37418290d5f21340a553240327995e76df2e5de0 WHIRLPOOL 2d6a74b8455020746459c36f3df94d97a187aeec0c6ad54bda6ddfb48fd02a1f1fb5d4ad7f745a9698c90339505a68815d4619f4bc5a5f6179b0007860242956
-AUX 029-0003-LatArCyrHeb-16-as-a-default-i18n-font-.patch 814 SHA256 6a2d4e0f484c0a38fde15eddb70a033d2511e6368086403df95da9aaf1db020f SHA512 c7426688589f568916e591fb913b852cd74c439d2250d67eaf18f8a7307a04fbdbe3ab0bf31069aef8b59046a962be75c4f13c006a1e9a36974fc5248d6052da WHIRLPOOL 74e7885a91a2b124d94f996e790d4ee3ec7d5cd7f708061d102fd69ff5f21e42b9afc9cf394df316f7454768d903282b4b9922138ff92ce8ca4013d80bc150b3
-AUX 030-0001-dracut-functions.sh-support-for-altern.patch 1387 SHA256 96217737ad01fb35375c5c1cda4923f55489d32af2b99ace106dc50e0826b701 SHA512 831882c69bd40c33f4aefd9027ecaeb8b5c051c14109fb14549a897fc3ac6040ee9781ea412477450c495f035cd8c577a7da001428d9b0d3c43bab491e0fcc75 WHIRLPOOL 150a0b3deb646692a9f73b46090c0a07defa0e5fbda1c077d473438406fa462f577936b24b8116e0023249d25a3f0655cb4076ffe24c852cd655d48f01888efa
-AUX 030-0002-gentoo.conf-let-udevdir-be-handled-by-.patch 950 SHA256 8ea24859ae3ab5f93f4af814dc55ec8ba7e440d66c96a3e8c3635392e9f3de23 SHA512 743ea0258c0a80f21fd98f8c034c8bc3fedec3f6edb00c6d676040da0d3280084f39ef961eebf78559e4dfcc886f64619db5b1d1e3434a5b3a816fdc7ee3da07 WHIRLPOOL 7d03a32ca3ed609393c3d3884d4209fa0057e9907fcc9656f0e7efff71e9f8fe0c02373374d4235c44cfcf3cdc8a8b2b732c6dc210db7c09ac0f884a7662e8e3
-AUX 030-0003-LatArCyrHeb-16-as-a-default-i18n-font-.patch 814 SHA256 2e149999e93eec7ecf78db75fe0a0bd349bdce611ca50aeb87e3a76da47e82e4 SHA512 936800aeffe137171f17e97ca01272e50cff8aa5e2863cb4082c12dd69d4845ac2e5bc183ecfcb72c084dc8195567a654740d64de148136eac23e09a107f0c42 WHIRLPOOL 0fcdb45f25d1d2b6d31a828acc1f9747bcbeedb6752153da908876142ef6456f0c1f7380ec92b15d9e495789f99905489dad9cf5fd2983905164b4326a843300
-AUX 031-0001-dracut-functions.sh-support-for-altern.patch 1387 SHA256 3a1793c84f9f0185fb4159732e15fe674a9f611c65ca579b6e3263939e4a2bdc SHA512 632397dc733d1aae59a279b3b7f0575fc0c2a80f9eab2b696107adbf025854b23203b6df021248ac553de37c8c90a0b9f82589800716e1a48d129a723ca961a1 WHIRLPOOL 416944afd7fd01e2d6db1d68e4ce269809c9fd1aba28d448983bb576862ed67e0e0051fac15b99026b6b3fec596dd027342f64b4e0bbd1dc3aee9e24cbe73bad
-AUX 031-0002-gentoo.conf-let-udevdir-be-handled-by-.patch 950 SHA256 c9bac7e95442d378a19a087feef89cd212eb7417b816172c3cc6aabf6aec1a5e SHA512 2fe8a45fe26869920932cdd9f6d72d45b62e165ddd107aaa511ca531477947bbec635e0cb639dfeb1e76399ba436015bbc1c27871b2ad9cb4096e245e315cb80 WHIRLPOOL eb1fb02554cf9f4ca217c61b6343b759202f96de4e10524daf08ef7df6e139d936e6dec7b1df274d99225dbc8b84614cbb5aa57bf47d509517c0762d3b275555
-AUX 031-0003-Revert-base-setup-correct-system-time-.patch 2010 SHA256 b9e513ec12f3672e2a1a98757cf6918e9cb6a7a6c51f1809dbeb840c826c5b9c SHA512 99660673ffe3ef23bfcba2005785fe0de4512d0b7adb76932927bf23bc84df0a4eed3e551631a111e9f2f9d7e5e269a65841da3e7d404f95ec766bf752e8e24b WHIRLPOOL 5ac8c8d8de1ebf851dfb1fd7e87a22a14b29b9dfa54d61e3d3f91bdf5d9134f9b3ef11a5acb40a511297755d3895c55381d487e159d7e8be60be3cf6f561ac7b
-AUX 033-0001-dracut-functions.sh-support-for-altern.patch 1487 SHA256 4d642f9e4ee5385bf26b19b12fb2e7302bafca5b4ad8e501b147c51af991c018 SHA512 9a0c1d7c3302b227aa9080dd4b8f0b6b54885d38b7e1549fbccddad258a7da43e016554d2ca447acdf55bde8bececd84d4f9510de8a7a12c3150f895500b5747 WHIRLPOOL 6a78b1ff088fb90e841ea33437e266f150bdd45da246e00c902995709b85c58759f74d7e8170dc230d9dd20a53906c73934dbe17b946277e9d9276ce833c13a1
-AUX 033-0002-gentoo.conf-let-udevdir-be-handled-by-.patch 950 SHA256 4aa0a982241b6e35a206232577543131c073aa5147d1f0c475c9c718e246b7f4 SHA512 3389ddfb51f17c02d0d4b4f0d9bc79dd1f95b2d9bc0d2cd8304d65244a6fac056e32c034ac618b962a25b130f480133d50ca8cb0b877c6556d2fd9752b346596 WHIRLPOOL 360e6a6c3310dbbcd7fc46dbad3f520c5cfbad2d6d4ff664f381cf1b2152ebf3d39d2cb0c5ad27b19301737efa346b64636f471f79be906d940f67d991a757ba
-AUX 033-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch 2410 SHA256 da19327cd3412bf1b05a8594fccc16a83888e7d66614211caa95a87e4c6c8a82 SHA512 e80fed1f879fe9e86084dbedca71416bc3abea6f1c5e3950b8641bbe708e97d651d05313be8282637fae4c38c470ab55abd9a509d5d1fbdd0b3af9194a1de88d WHIRLPOOL 1ac64e546f59fd7b267621346df9cde1fa10a0eec0de82033af4907fb4bb189d1f9f57caf1e6e295ddb9d94d18354a2580f83033537a28a236c58126617dbd13
-AUX 033-0004-Install-dracut-install-into-libexec-di.patch 2618 SHA256 223cd9253d5dfd77cad9480c89f3ab1dfb2b36d9551f8b153ca01886ef4a4ddb SHA512 d767781d9a144eda10c280ff184390766222e74915eb60cc909728455abd7c14cb4c2cb0d69ffacfd8be78c23c0b783ae2cb16d8dfe70a9c7f11957333b56c96 WHIRLPOOL c058e9caf789c7ba2bac9c05f8b534a9bcb5b7ca803b2979b195bad2f6ad300a66848b44c785d57ebaab219222ff751fa26094bc902e5055fc32417338809d76
-AUX 033-0005-dracut.sh-harden-host_modalias-reading.patch 887 SHA256 f0ba1550ab6f9fee124e45556845ad0575c3250afba04aedf94ebabfe8b2887b SHA512 20ecafc65ce245ba6d52a49737651db3fdde3c2a0a0b05bca11cc857edc9fe92cfbf3b39ed2c97d7e6e0916d46c5cea2d214289cc4227e873d1fdfc8027e741f WHIRLPOOL 290c0ac638ec8b53d7fc803b5483de61d503b35246250ca48c61a0462613122dd84d4fb08f5ea21ff36911662fde0051a88e3dbc6d17766ea8e2cc073256f47b
-AUX 033-0006-ifup-do-not-dhcp-on-network-interface-.patch 1226 SHA256 cc63f4f428748c6af0d2b3f94103f19eb8d9841c2a62e9f262cfa1f5aa35b6de SHA512 41a6fef29dbcebab3f54f840e7e9d077af2d96c6c4b90cbe59a84b654f328e07ff8467b057cd3aa3c3b10232bd60e3ee40c05365cdcea913c9010a8a4710ad68 WHIRLPOOL 1a55062c46a19152f92f09ae4fa102cf865b99b682d80fb94275d04e0e45e487b5b090b9f524fe19f5e9c07a355ce11d91aed278a63fbd537383acc32fdeb9e7
-AUX 033-0007-lvm-mdraid-Fix-LVM-on-MD-activation.patch 1904 SHA256 7f06b7939865fdde71ea5751218ebe67eb31a72ab4c161585766973d2e4d58a8 SHA512 bebfda5a37c6b5470aef875648c545fc25bceb5609ae864d6ca447a7dbc56971f20018679c3da81b2ce1d52dd4d9278315b3eb5bc346977a4409e953333be338 WHIRLPOOL 94d92912adba430247f08df7c0c6ed835e3fd4b06a25ddca14afe6803efaf9f0bbb4b8a228c6a3f17652ec42d92410ad97515bcba8f88a1302a3529e8f65b937
-AUX 033-0008-mdraid-module-setup.sh-install-configs.patch 1052 SHA256 abb3ebc2dc0430d67ae8d0da08c5f20aca6c3a829ce6534b92bb4973eff28383 SHA512 d93382ae5930d456070350ae5aa6bd1eeeaec0c746e5251fc0ec11ad62f1c9e6cccbb7afdf7bea7cc02079998fbda58be6c1ddec7483054e089976e36149d677 WHIRLPOOL b04f8b0c92abe8e8d236e1ecb4b1646d3ebd619f9c79dda9b73a11f1baa63d0fa6924e6d7561924a2db69f6502b7a8c0a23026ca4f192eca2034306fb373d2fb
-AUX 033-0009-mdraid-module-setup.sh-fixes-for-mdadm.patch 2064 SHA256 d43ee0d10e123b989fd5e74d916e4c54ba643ff092dc4838697b7390b61f59fd SHA512 a985072ac24aa36cf50a2a464c3351332c431bd3f7d747274695f1aa2ddd430dcb5ec47db604c87eb78e0d963ce7568f0014457513a923f5f821eb45b5db9573 WHIRLPOOL 67cb1c3b78365ae863944fd2bed1e8a6583e6e0c3c75f0836e1d4b2e3cd87be0dfc9c33e53f0ee8ca6152672bef5657ea3fe469a94d785543c4f869ff069e4d8
 AUX 034-0001-dracut.sh-do-not-bail-out-if-kernel-mo.patch 1140 SHA256 4c69a0c918aa1351316aeaeaab926defc5841b9743633e23fdf4fd8e54773707 SHA512 74122a07e64ae410f76a0b630385ea6a146121c706f2235c3a43108f3743c9162fa3473ee1a266b0e5004f27bb02559f363dfa46764bc007f3395d16291904c6 WHIRLPOOL de4a4f7cfdc727f7a913ac7e005594b7392b95eb8540fd3bff44bdebd6dab136a2833f3f75bab04288e1a14a65e76303db356c0bbe7db421e51bc7d3447ce7cf
 AUX 034-0002-dracut-functions.sh-support-for-altern.patch 1487 SHA256 85cd66fe8d36405dbf459a496ee3d5ed32e0606933218a23266caf591c0c04ee SHA512 00e7a22b76911a5cc9ccf82815643409307159ec0fd329c6f86bf8f6f76c0c235b76c8fd4f588d0e5b1820b2654acbc4735eda09df68da7a676e7e5e252364aa WHIRLPOOL 9c05204b4eb8129598e1177203dd9c5312082f97c922c65e8e325bc89feded2c030e66a793b7bcdebd95feda06f8cf01327e95ad71693706e7de02369f9f2571
 AUX 034-0003-gentoo.conf-let-udevdir-be-handled-by-.patch 950 SHA256 2e6e49dd481048906275c5d31756cff1cb8e9166dbf4aa61a46de81b552f93ec SHA512 ecf99d9bbc326c4fce1319d67af9cc55e1e3559f98568df13e51728b0da40a9e18e201662cf7e743a61ddd90caa014987130894fc8bc3bf47f381ec35d36fcd4 WHIRLPOOL f6cff2f46dbf40bfbb15174e1c984ed84f1abf1707d9369c6b43ab874efbae3f50f2cae211bc31a9f8a81bf6fd00a93dc14f614d196716d19d5e15dc43c5ac87
@@ -45,31 +15,18 @@ AUX 034-0011-lvm-fix-thin-recognition.patch 1373 SHA256 5218cfaf55b50cfd128a64b3
 AUX 034-0012-lvm-always-install-thin-utils-for-lvm.patch 2264 SHA256 f322a4ef7a308839b77a9fe2d16d3d4fc043b5e089d55145b51877e9b5dc3d1c SHA512 708d43d9d04b191656d35b9a3594ba23620445d5eeebb9f598068765a2b8833987dd422a7760d4ead1792ce6607b18505f29868c23e0721e3af7c5c851586e0c WHIRLPOOL 47360e4523c0bd5112065c32e011e2a8dc190e6699d287b8d1c5c3b6d59b27bd689cf9daf76fd77beba132dec5c58144eda78e61565e408784cf7ff575551a2e
 AUX 034-0013-usrmount-always-install.patch 827 SHA256 5049b63e1095eb81d68d165f188cb512ce29468ace7abbcff8b469e63a8f6f2f SHA512 88abe8ea6ee70fd62d9b225e74063e1c3c31262084b2593df7e52000b0a0efea6c60eac275f7a9416c98d24b7bd548f1db2556a655f8a29706457adbc20b6aea WHIRLPOOL 3c7ce176250777031d7c38df79bfbcba3aa7a752151080fd1fe11ceb2df8e5aa50c1835fe135ce061c92f99de205b077ad3de6a8749e685c288ada512bea7a29
 AUX 034-0014-udev-rules-add-eudev-rules.patch 967 SHA256 20867f20970846434ffc82ca7c33f6aa63407aa316abc4a261d20f9955725d42 SHA512 4199e65459d33d2d99556bb2c753b143f1e2e71cb6150b83d7513f4887a2bbc3299ed1da33d9c8438a1d9e2231353ce7e39f9cacdd3fe346083eea2905d2f903 WHIRLPOOL 59f691a3663fa35329eb3aff776e1f637518b6fce36ec3d4f09a62c2b5ff11c4c67eb78ae73e57db8c4ad97de6b758d82705445639788bb819899a63a9f17318
-DIST dracut-026.tar.bz2 249079 SHA256 1b3b25350dbf71c9d92dd6fd0cd128db13453e200e89b649ec3753e6f92438f7 SHA512 6484645df118ce2337920f6da574e04ede8131c4f5ae2986008cba527b591fde2274c3cbf8cacf20e3dcd765adab7f6afaffd2e1cdbd5a5a021193f328a844cf WHIRLPOOL 87934eb5d7d118be61a609aebbec94a4e70df58a883f0c856f90e8e8b011c695a23d5b00a120bcd74e0644f06f54038712b1ca620d8182c1fcffb4f3f5ea8ec2
-DIST dracut-027.tar.bz2 253049 SHA256 9a8f1ad2e133b4072ff433410be5b14a01cec4f75ab72ef0296e5f49a15fad13 SHA512 1e44b1ad09bc631cc554be4917c5f56514d6f5f4f9658401a7c7e9dc20ef79029246106682146785cb63beef39061aaa944fb24acd106086f02ba1356c61e938 WHIRLPOOL ebd0e0f1c4ba6e95a320e01f98ed7e31d7f399b05c7133fff8a686750f39f29c803b02764995775fa3f2c383205bc09b35a905116d366298bd6587d8d1cac572
-DIST dracut-029.tar.bz2 259163 SHA256 f32f9deb42a03878d96a06a1b365ea26cc46345fc55631502ee2f68a4c6271b9 SHA512 0b68ab67e1b9cf98b7f4fdc29e73e68495077cd7c127c6d732e5f9c26a1312c48323ce3e9595e4d08b0d6766438cda425d04bded1286b70725b53c781e572c96 WHIRLPOOL 877f6dea157e7d6435ac983121fc8e69823960a173420a3e4eb448fe95de7f0bd69d48c17090fcf99d8bafc2bf35e30fd3723fddc481512d579f93e44c06c3a8
-DIST dracut-030.tar.bz2 260378 SHA256 3c05121cc3aa2281047dd4103762166307ff9b0c6ab798c121196be9725ea05c SHA512 c872b90c695f74ff7d5f597d2dc5f934c0365c6e907f00ffff770c0c4fad325002a9397e93727254d35b7a9bc73f628c59414bf9307e8742c5a6af476751216e WHIRLPOOL 184a11d17fea8bf781c32cafa92789d45503042e2f9916d8ebb024d036a6b69de8e8fc07dd6494a07c77de832d7eb38ab6d6bbeffc7d3dc8e1c3ef138270e7b6
-DIST dracut-031.tar.bz2 260601 SHA256 a62fd3d22600adc0f370d2eff474f9aec51bc3dfb2be619647f258a9805bbb77 SHA512 ddde1279cff61b6fd8567f5e21b5f8d95e935e42520a342960432749c6a085637a5e049e6fd121d491727aea3b35af59e86c8b80e55180f3b5e496aff2b6eb23 WHIRLPOOL 46c9d2a3717fd8c36aac269a213a433f6534b2a547e0b23a31ffca9a4101c69c7253358fccb8a55a0ab9b19d4c4218eb902c49a6cc0fc08c48e3cd70c40eebc2
-DIST dracut-033.tar.bz2 273118 SHA256 2ba778b0af2fbd3a3b11d19d5eafb7671bdf2431d06cebe73bc6b20126d378e3 SHA512 c8bb1335b58c37800586a4037e7fe8d2933158b7123b4c7a0e06bf841fdcbfb0d5e3ba26050d72b056164bbd2315541cc92ae6ba9380a57cda243f4e73adeb8c WHIRLPOOL af62ca9913910cdd84c335417d237ed12da38a96244be2d85e210bec8e75bf3c02eb052d0deeece3f669a7f7f8c6720aa88352683f7945dcb7e736bb4c0739dd
 DIST dracut-034.tar.bz2 277692 SHA256 48c7fd57e287d4f34dfff5b5ead14a4511926858f1e2ffaa40b762f257516d7f SHA512 ae06510668e63550d4d6b509b314c7668880387cfe696fc7f21cf04cc488be743440871dbd1fcf4e8314f9aa9e61ee3e78a42a75631123c420767677c6744e34 WHIRLPOOL 0412dea239fbd82d79e873869211ea31b7495dac74d7079e8aa52dd8d2484986fd0a0831aefffe29cfe5acfbf64fa01a9a1fa742192a28276a8671b663a69e13
-EBUILD dracut-026-r2.ebuild 8869 SHA256 efcae9d82d7ca72fdec3d70da5e8181b9206ca2640460a41548386eff7542adb SHA512 d398074717521f8aba56331a4a5d511615a5139cd25f9ab8226c98e215cd97341b529cf8c408de734b6582f6998f58809c5772058cef8824f44cd0a9f599ae27 WHIRLPOOL dc5a68b2fb07fd938fba6efc5ffb194ce39662cd0f36e1312fe6335907351afa975cecda6227e0e56db1cfe8e6b3fe82b1018ec606ac19465c1d5dab67982f71
-EBUILD dracut-027-r3.ebuild 8684 SHA256 080287aa50be699fe77467c660565640042cee605d09625e32bd34eef2fd5397 SHA512 551bd48f883d793d24cb2e160e64eafbe2a9e53a8e9e92b9bde09789e3c301e3288adf203845156345a666b29630a901ab4858170ef4ac1c3ccdca381bad482d WHIRLPOOL ecaf10e304937745980328d0a4739f10c04806844726fce1d9266e50b9e6b7465fea52b24737f65f918a9984e4ec380fd3dbd78ba7cd2cece8ca6a3b0998aeca
-EBUILD dracut-029.ebuild 8549 SHA256 21a5aaa06c4f8df6ef416788d683e6879aacd89e8d1b2be9724e963e0abc24b2 SHA512 35a11a025ea74d527a04d50944f83aced798857b67327720ca472bddddbb74b92cfe8b296bae95b74624751c29143a5c5f4f4a2d18e6dde82bc4149f1b67418b WHIRLPOOL 603c486aeb36508ff722f4c3e7e434a668bd299495f7bed816d5ef60b0eb23fb857e4ede9a79f576ed07dea5afd809ed298261a41c73267cfa07c14b3ba33cb0
-EBUILD dracut-030.ebuild 8566 SHA256 b20849f90ba703954dba9c8e42b3759f6f9fc9cc017574d3e80bb8425ed82a26 SHA512 97fae72894956ef26c0733563c87857d62d98d2924b856a4d3c2ed5b02a163b15443eb5d64b1873c0db60bde215153376a30b979fdb123c730cbadb433a20b81 WHIRLPOOL 1bb84aa43af16f3420890059b6aea892b2cc87bf12966115efce67fda3aced602a9d0eb5a507b3215fb98e7c418b54335250ccb7147c66029929be249a62b528
-EBUILD dracut-031-r1.ebuild 8569 SHA256 86a76e104015eb0476d9146aaaebe1cc9b6a542fb26b5f562d8346ead81ab9b6 SHA512 0a9fcb3498ac8a171adde3abcf50098cb2aba008951f4d519b0148f1738e3ee54aa296977be45809e58220907ca0d4aed98e95d341e9c2e63d9315fe85465561 WHIRLPOOL 0eb19af60d08aa86caa5a28b1111a7242b2c1890c2941a5a8e74b666067ccc17ada153b5a3716f22a407c354202926c1130f9ce516d986b4ec9a857b03a9dc33
-EBUILD dracut-033-r3.ebuild 9258 SHA256 384b2c31bca531dc7a6aa5bc8c430297c1198a8eda531c9ad9c0ce999fe94b9d SHA512 304f468a2c0bc20f0b1305a760750859d5479b6282b6d756311b6f1cdfed8e7aaa08d3f225d8fe4e59785e56a80b819233237615aa92581b4858e89378a6f68b WHIRLPOOL e70ea66e5c349fa4c64cf590316834acb799b0a06dd4a826f064e966e8145447078eb854fcb23a6f070dfb3a6344e83bbe498966ba8fdb5a7a2577d9f9cda15b
-EBUILD dracut-034-r3.ebuild 9765 SHA256 31be6eef8391cfe453b91d9534331f67a1fe1a2d7140b7f14eb58c4f25b670d4 SHA512 de055968fa53843685e39d7123ca07e002a4978f0d0f74dd134b3520c97d5a24120f5b756982f7ae60e70b36b0d798f3104bdabc4af888bad73e73dfb7934e1d WHIRLPOOL f2b972bfbf212e57f57f1e0dff05b85b17fa660021916f091e9e2228aecd16e98e179561d623f1413c78124a211df552969275cc82691de148ed17d5fe9f0978
 EBUILD dracut-034-r4.ebuild 10221 SHA256 1970471f47ea21c09a8e46b12390d1c618d23b8a298905840c0df4e8e8284301 SHA512 a81f9cced768c043f795ddec1dcfc4cec4855c3ae455c573dd75206e41256285abcc0034b1647840770de1d12de42a980df85546e4d3956c1c5159558b46cb66 WHIRLPOOL 2ee8752bed48822c486cc57d155f21426fd6f6e8b9661a06e87a9c3dfb19d6efccf34bd00bda0c656f73e97815f92b726ec3a29ed8bf16d7d272a1491190f270
-MISC ChangeLog 62506 SHA256 05231a238862f2214d992d458b09fc4b1acf64813d4a20679da68bd2af860bcb SHA512 9bb592e10f64d136852d08d4a2f1cebad6c6043227fb6272d7ddfea0e598d65c4592f324b9f4696981b33f94bc1f57ccc8432d4ca394af28d4541e3a24241948 WHIRLPOOL 8fd06e9d40da1dbd073927fb8dd7904c58dd99d43da52134e4049528d9a07daf7a2aa2664d2d0a578d6d27eab5b4c8cdd6745b580e8bb45ded22b19ebc1fa358
+MISC ChangeLog 64728 SHA256 d0b281f9bb319cede12611966eb7bf78a013d7431de40ea8bc90159ff6315f10 SHA512 238b606fa56c9fd737d92a6eeacc71de5a4f9d4993e27c7f2945ae1c75adb08143e2e278fdaf778f0acceb5c367ee9121150ada2397b714eeacc981c1afce7c3 WHIRLPOOL 9b1a2334596403c6d2a45fa585de086867256864ede09faf3b8ec3970f719726d9eaf701220a22ca9982e0faf709747d060bea50804700f50a240397d82c36a7
 MISC metadata.xml 1052 SHA256 536eed325e0e2fd7f780eb4d5df8e14407cdb4b6afc20b4d8aa4886256a89123 SHA512 ca3e60bc362fe27b3e7c835a146c57ad53820a1f67c403c14cf5d5df688b0dc6f7b22a7d389669be123f3f1904cad3680f6b88a95b80811df305a558d6c88377 WHIRLPOOL 7818f8932aee7ea285620eff17e4d2c1580e7dfb43043f08e1a8ccc714cae494dacecad5124e00f15fa277848e8ff713b30436f612fa7bc1821d4d9d662d97a8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSvxo2AAoJEPATRTHh2/q1u8gH/jP2p6vu1zdMcVWwtLzZfj+9
-2lzy8wz/C9jIZCPCK2U5FMua1SYhgG/VQ8h4Cgy/MEMVcy83/nUpn9bfshGpPi76
-l6xU4+btglFl7sy+Vg2MnqVmAoRf9U9NWGRZJ7euA0oYW2Fo4/Yi6fAkh+zBKZ9Y
-Rm01KpSpgZjqGk0VXvQJQHUpjHBEUas8ghJK6tg6XM64BvXpodoMr1jD4LNwfDRN
-GL3umiOqxVeI8mu8/fCuMOsE/thUDRi+vTbK0Picr3FCThVr4tMlTxiJldamiZkr
-4mBMkYzpYZidNjpQlQuQZM2lzeqEAWqQPMDmicocFDOYMfABVW8nhfLLlaKkYBQ=
-=TV/B
+iQEcBAEBCAAGBQJS27GoAAoJEPATRTHh2/q1mCYH+wR7S9gIm6ULUdWckQhExIRj
+bXhGEaMc7c/UVXVDIPUWyFVlOTvBVZxrU+0eyuBZLPWO1e80aZjFovNV4/Cq0JKu
+pbc+TRJP7SE7qDM3YEugNZ2K1hRLSCqZAdAV9fIKc64f2gGGMtqu3W8+yY1TK3Cp
+2iM8f/VNgf2CrDhQ4KWy38VvNHQQT26h8pIUTJDT7vV7F5zkPi1yGgRHQ1hxlnnh
+g3Ho3UGhvyJP8ol4V5TBmQ7BmPfDdE6xyDpF81UYpvDnlw3tqPCuBwXwdEXZUmk/
+QXll/QWCDXqcj/xFWUFzZIS8wN3kkz7eoAubOqh9XxZx3hq/RWS+9pMmKHy66FY=
+=TqsW
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/dracut/dracut-026-r2.ebuild b/sys-kernel/dracut/dracut-026-r2.ebuild
deleted file mode 100644
index ffdbfb2ac314..000000000000
--- a/sys-kernel/dracut/dracut-026-r2.ebuild
+++ /dev/null
@@ -1,305 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-026-r2.ebuild,v 1.5 2013/10/27 17:51:45 swift Exp $
-
-EAPI=4
-
-inherit eutils linux-info
-
-add_req_use_for() {
-	local dep="$1"; shift
-	local f
-
-	for f in "$@"; do
-		REQUIRED_USE+="${f}? ( ${dep} )
-"
-	done
-}
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="http://dracut.wiki.kernel.org"
-SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-REQUIRED_USE="
-	dracut_modules_bootchart? ( !dracut_modules_systemd )
-	dracut_modules_crypt-gpg? ( dracut_modules_crypt )
-	dracut_modules_crypt-loop? ( dracut_modules_crypt )
-	dracut_modules_livenet? ( dracut_modules_dmsquash-live )
-	"
-COMMON_MODULES="
-	dracut_modules_biosdevname
-	dracut_modules_bootchart
-	dracut_modules_btrfs
-	dracut_modules_caps
-	dracut_modules_crypt-gpg
-	dracut_modules_crypt-loop
-	dracut_modules_gensplash
-	dracut_modules_mdraid
-	dracut_modules_multipath
-	dracut_modules_plymouth
-	dracut_modules_syslog
-	dracut_modules_systemd
-	"
-DM_MODULES="
-	dracut_modules_crypt
-	dracut_modules_dmraid
-	dracut_modules_dmsquash-live
-	dracut_modules_livenet
-	dracut_modules_lvm
-	"
-NETWORK_MODULES="
-	dracut_modules_cifs
-	dracut_modules_iscsi
-	dracut_modules_livenet
-	dracut_modules_nbd
-	dracut_modules_nfs
-	dracut_modules_ssh-client
-	"
-add_req_use_for device-mapper ${DM_MODULES}
-add_req_use_for net ${NETWORK_MODULES}
-IUSE_DRACUT_MODULES="${COMMON_MODULES} ${DM_MODULES} ${NETWORK_MODULES}"
-IUSE="debug device-mapper optimization net selinux ${IUSE_DRACUT_MODULES}"
-
-RESTRICT="test"
-
-CDEPEND="virtual/udev
-	dracut_modules_systemd? ( >=sys-apps/systemd-198-r5 )
-	selinux? ( sec-policy/selinux-dracut )
-	"
-RDEPEND="${CDEPEND}
-	app-arch/cpio
-	>=app-shells/bash-4.0
-	>=app-shells/dash-0.5.4.11
-	>=sys-apps/baselayout-1.12.14-r1
-	>sys-apps/kmod-5[tools]
-	>=sys-apps/sysvinit-2.87-r3
-	>=sys-apps/util-linux-2.21
-	virtual/pkgconfig
-
-	debug? ( dev-util/strace )
-	device-mapper? ( >=sys-fs/lvm2-2.02.33 )
-	net? ( net-misc/curl >=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2 )
-	selinux? ( sys-libs/libselinux sys-libs/libsepol )
-	dracut_modules_biosdevname? ( sys-apps/biosdevname )
-	dracut_modules_bootchart? ( app-benchmarks/bootchart2 sys-apps/usleep
-		sys-process/acct )
-	dracut_modules_btrfs? ( sys-fs/btrfs-progs )
-	dracut_modules_caps? ( sys-libs/libcap )
-	dracut_modules_cifs? ( net-fs/cifs-utils )
-	dracut_modules_crypt? ( sys-fs/cryptsetup )
-	dracut_modules_crypt-gpg? ( app-crypt/gnupg )
-	dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools )
-	dracut_modules_gensplash? ( media-gfx/splashutils )
-	dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 )
-	dracut_modules_lvm? ( >=sys-fs/lvm2-2.02.33 )
-	dracut_modules_mdraid? ( >=sys-fs/mdadm-3.2.6-r1 )
-	dracut_modules_multipath? ( sys-fs/multipath-tools )
-	dracut_modules_nbd? ( sys-block/nbd )
-	dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind )
-	dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 )
-	dracut_modules_ssh-client? ( dev-libs/openssl )
-	dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) )
-	"
-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 )
-MY_LIBDIR="/usr/lib"
-
-#
-# Helper functions
-#
-
-# Returns true if any of specified modules is enabled by USE flag and false
-# otherwise.
-# $1 = list of modules (which have corresponding USE flags of the same name)
-any_module() {
-	local m modules=" $@ "
-
-	for m in ${modules}; do
-		! use $m && modules=${modules/ $m / }
-	done
-
-	shopt -s extglob
-	modules=${modules%%+( )}
-	shopt -u extglob
-
-	[[ ${modules} ]]
-}
-
-# 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
-}
-
-#
-# ebuild functions
-#
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-0000-fix-version-print.patch"
-	epatch "${FILESDIR}/${PV}-0001-dracut-functions.sh-support-for-altern.patch"
-	epatch "${FILESDIR}/${PV}-0002-gentoo.conf-let-udevdir-be-handled-by-.patch"
-	epatch "${FILESDIR}/${PV}-0004-lsinitrd.sh-fix-for-default-initrd-not.patch"
-	epatch "${FILESDIR}/${PV}-0005-lsinitrd.sh-removed-trailing.patch"
-	epatch "${FILESDIR}/${PV}-0006-make-host_fs_types-a-hashmap.patch"
-	chmod +x "${S}/modules.d/95udev-rules/udev-rules-prepare.sh"
-
-	if use dracut_modules_systemd; then
-		local systemdutildir="$($(tc-getPKG_CONFIG) systemd \
-			--variable=systemdutildir)"
-		local systemdsystemunitdir="$($(tc-getPKG_CONFIG) systemd \
-			--variable=systemdsystemunitdir)"
-		[[ ${systemdutildir} ]] || die "Couldn't detect systemdutildir"
-		[[ ${systemdsystemunitdir} ]] \
-			|| die "Couldn't detect systemdsystemunitdir"
-		einfo "Setting systemdutildir to ${systemdutildir} and ..."
-		sed -e "4asystemdutildir=\"${systemdutildir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-		einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir}..."
-		sed -e "5asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-	fi
-}
-
-src_configure() {
-	econf --libdir="${MY_LIBDIR}"
-}
-
-src_compile() {
-	emake doc
-
-	if use optimization; then
-		ewarn "Enabling experimental optimization!"
-		tc-export CC
-		emake install/dracut-install
-	fi
-}
-
-src_install() {
-	default
-
-	local libdir="${DRACUT_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
-
-	#
-	# Modules
-	#
-	local module
-	modules_dir="${D%/}/${dracutlibdir}/modules.d"
-
-	# Remove modules not enabled by USE flags
-	for module in ${IUSE_DRACUT_MODULES} ; do
-		! use ${module} && rm_module -f ${module#dracut_modules_}
-	done
-
-	# Those flags are specific, and even are corresponding to modules, they need
-	# to be declared as regular USE flags.
-	use debug || rm_module 95debug
-	use selinux || rm_module 98selinux
-
-	# Following flags define set of helper modules which are base dependencies
-	# for others and as so have no practical use, so remove these modules.
-	use device-mapper  || rm_module 90dm
-	use net || rm_module 40network 45ifcfg 45url-lib
-
-	if use dracut_modules_systemd; then
-		# With systemd following modules do not make sense
-		rm_module 96securityfs 98selinux
-	else
-		# Without systemd following modules do not make sense
-		rm_module 00systemd-bootchart
-	fi
-
-	# Remove S/390 modules which are not tested at all
-	rm_module 80cms 95dasd 95dasd_mod 95zfcp 95znet
-
-	# 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
-
-	# Remove extra modules which go to future dracut-extras
-	rm_module 05busybox 97masterkey 98ecryptfs 98integrity
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_src_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
-
-	if use dracut_modules_crypt || use dracut_modules_dmraid || use \
-		dracut_modules_mdraid || use dracut_modules_lvm; then
-
-		if ! [[ $(</proc/cmdline) =~ rd.auto[\ =] ]]; then
-			ewarn "Autoassembly of special devices like cryptoLUKS, dmraid, "
-			ewarn "mdraid or lvm is off for default as of  >=dracut-024."
-			ewarn "Use rd.auto option to turn it on."
-		fi
-	fi
-}
diff --git a/sys-kernel/dracut/dracut-027-r3.ebuild b/sys-kernel/dracut/dracut-027-r3.ebuild
deleted file mode 100644
index 7125c74cdf81..000000000000
--- a/sys-kernel/dracut/dracut-027-r3.ebuild
+++ /dev/null
@@ -1,303 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-027-r3.ebuild,v 1.5 2013/10/27 17:51:45 swift Exp $
-
-EAPI=4
-
-inherit bash-completion-r1 eutils linux-info systemd
-
-add_req_use_for() {
-	local dep="$1"; shift
-	local f
-
-	for f in "$@"; do
-		REQUIRED_USE+="${f}? ( ${dep} )
-"
-	done
-}
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="http://dracut.wiki.kernel.org"
-SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-REQUIRED_USE="
-	dracut_modules_bootchart? ( !dracut_modules_systemd )
-	dracut_modules_crypt-gpg? ( dracut_modules_crypt )
-	dracut_modules_crypt-loop? ( dracut_modules_crypt )
-	dracut_modules_livenet? ( dracut_modules_dmsquash-live )
-	"
-COMMON_MODULES="
-	dracut_modules_biosdevname
-	dracut_modules_bootchart
-	dracut_modules_btrfs
-	dracut_modules_caps
-	dracut_modules_crypt-gpg
-	dracut_modules_crypt-loop
-	dracut_modules_gensplash
-	dracut_modules_mdraid
-	dracut_modules_multipath
-	dracut_modules_plymouth
-	dracut_modules_syslog
-	dracut_modules_systemd
-	"
-DM_MODULES="
-	dracut_modules_crypt
-	dracut_modules_dmraid
-	dracut_modules_dmsquash-live
-	dracut_modules_livenet
-	dracut_modules_lvm
-	"
-NETWORK_MODULES="
-	dracut_modules_cifs
-	dracut_modules_iscsi
-	dracut_modules_livenet
-	dracut_modules_nbd
-	dracut_modules_nfs
-	dracut_modules_ssh-client
-	"
-add_req_use_for device-mapper ${DM_MODULES}
-add_req_use_for net ${NETWORK_MODULES}
-IUSE_DRACUT_MODULES="${COMMON_MODULES} ${DM_MODULES} ${NETWORK_MODULES}"
-IUSE="debug device-mapper optimization net selinux ${IUSE_DRACUT_MODULES}"
-
-RESTRICT="test"
-
-CDEPEND="virtual/udev
-	dracut_modules_systemd? ( >=sys-apps/systemd-199 )
-	selinux? ( sec-policy/selinux-dracut )
-	"
-RDEPEND="${CDEPEND}
-	app-arch/cpio
-	>=app-shells/bash-4.0
-	>=app-shells/dash-0.5.4.11
-	>=sys-apps/baselayout-1.12.14-r1
-	>sys-apps/kmod-5[tools]
-	>=sys-apps/sysvinit-2.87-r3
-	>=sys-apps/util-linux-2.21
-	virtual/pkgconfig
-
-	debug? ( dev-util/strace )
-	device-mapper? ( >=sys-fs/lvm2-2.02.33 )
-	net? ( net-misc/curl >=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2 )
-	selinux? ( sys-libs/libselinux sys-libs/libsepol )
-	dracut_modules_biosdevname? ( sys-apps/biosdevname )
-	dracut_modules_bootchart? ( app-benchmarks/bootchart2 sys-apps/usleep
-		sys-process/acct )
-	dracut_modules_btrfs? ( sys-fs/btrfs-progs )
-	dracut_modules_caps? ( sys-libs/libcap )
-	dracut_modules_cifs? ( net-fs/cifs-utils )
-	dracut_modules_crypt? ( sys-fs/cryptsetup )
-	dracut_modules_crypt-gpg? ( app-crypt/gnupg )
-	dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools )
-	dracut_modules_gensplash? ( media-gfx/splashutils )
-	dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 )
-	dracut_modules_lvm? ( >=sys-fs/lvm2-2.02.33 )
-	dracut_modules_mdraid? ( >=sys-fs/mdadm-3.2.6-r1 )
-	dracut_modules_multipath? ( sys-fs/multipath-tools )
-	dracut_modules_nbd? ( sys-block/nbd )
-	dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind )
-	dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 )
-	dracut_modules_ssh-client? ( dev-libs/openssl )
-	dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) )
-	"
-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 )
-MY_LIBDIR="/usr/lib"
-
-#
-# Helper functions
-#
-
-# Returns true if any of specified modules is enabled by USE flag and false
-# otherwise.
-# $1 = list of modules (which have corresponding USE flags of the same name)
-any_module() {
-	local m modules=" $@ "
-
-	for m in ${modules}; do
-		! use $m && modules=${modules/ $m / }
-	done
-
-	shopt -s extglob
-	modules=${modules%%+( )}
-	shopt -u extglob
-
-	[[ ${modules} ]]
-}
-
-# 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
-}
-
-#
-# ebuild functions
-#
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-0000-fix-version-print.patch"
-	epatch "${FILESDIR}/${PV}-0001-dracut-functions.sh-support-for-altern.patch"
-	epatch "${FILESDIR}/${PV}-0002-gentoo.conf-let-udevdir-be-handled-by-.patch"
-	epatch "${FILESDIR}/${PV}-0003-Do-not-call-plymouth-with-full-path.patch"
-	epatch "${FILESDIR}/${PV}-0004-plymouth-plymouth-pretrigger.sh-fixup-.patch"
-
-	if use dracut_modules_systemd; then
-		local systemdutildir="$(systemd_get_utildir)"
-		local systemdsystemunitdir="$(systemd_get_unitdir)"
-		einfo "Setting systemdutildir to ${systemdutildir} and ..."
-		sed -e "4asystemdutildir=\"${systemdutildir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-		einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir}..."
-		sed -e "5asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-	fi
-}
-
-src_configure() {
-	local myconf="--libdir='${MY_LIBDIR}'"
-	myconf+=" --bashcompletiondir=$(get_bashcompdir)"
-
-	if use dracut_modules_systemd; then
-		myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'"
-	fi
-
-	econf ${myconf}
-}
-
-src_compile() {
-	emake doc
-
-	if use optimization; then
-		ewarn "Enabling experimental optimization!"
-		tc-export CC
-		emake install/dracut-install
-	fi
-}
-
-src_install() {
-	default
-
-	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
-
-	#
-	# Modules
-	#
-	local module
-	modules_dir="${D%/}/${dracutlibdir}/modules.d"
-
-	# Remove modules not enabled by USE flags
-	for module in ${IUSE_DRACUT_MODULES} ; do
-		! use ${module} && rm_module -f ${module#dracut_modules_}
-	done
-
-	# Those flags are specific, and even are corresponding to modules, they need
-	# to be declared as regular USE flags.
-	use debug || rm_module 95debug
-	use selinux || rm_module 98selinux
-
-	# Following flags define set of helper modules which are base dependencies
-	# for others and as so have no practical use, so remove these modules.
-	use device-mapper  || rm_module 90dm
-	use net || rm_module 40network 45ifcfg 45url-lib
-
-	if use dracut_modules_systemd; then
-		# With systemd following modules do not make sense
-		rm_module 96securityfs 98selinux
-	else
-		# Without systemd following modules do not make sense
-		rm_module 00systemd-bootchart
-	fi
-
-	# Remove S/390 modules which are not tested at all
-	rm_module 80cms 95dasd 95dasd_mod 95zfcp 95znet
-
-	# 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
-
-	# Remove extra modules which go to future dracut-extras
-	rm_module 05busybox 97masterkey 98ecryptfs 98integrity
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_src_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
-
-	if use dracut_modules_crypt || use dracut_modules_dmraid || use \
-		dracut_modules_mdraid || use dracut_modules_lvm; then
-
-		if ! [[ $(</proc/cmdline) =~ rd.auto[\ =] ]]; then
-			ewarn "Autoassembly of special devices like cryptoLUKS, dmraid, "
-			ewarn "mdraid or lvm is off for default as of  >=dracut-024."
-			ewarn "Use rd.auto option to turn it on."
-		fi
-	fi
-}
diff --git a/sys-kernel/dracut/dracut-029.ebuild b/sys-kernel/dracut/dracut-029.ebuild
deleted file mode 100644
index 576bd1bdd8b9..000000000000
--- a/sys-kernel/dracut/dracut-029.ebuild
+++ /dev/null
@@ -1,301 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-029.ebuild,v 1.5 2013/10/27 17:51:45 swift Exp $
-
-EAPI=4
-
-inherit bash-completion-r1 eutils linux-info systemd
-
-add_req_use_for() {
-	local dep="$1"; shift
-	local f
-
-	for f in "$@"; do
-		REQUIRED_USE+="${f}? ( ${dep} )
-"
-	done
-}
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="http://dracut.wiki.kernel.org"
-SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-REQUIRED_USE="
-	dracut_modules_bootchart? ( !dracut_modules_systemd )
-	dracut_modules_crypt-gpg? ( dracut_modules_crypt )
-	dracut_modules_crypt-loop? ( dracut_modules_crypt )
-	dracut_modules_livenet? ( dracut_modules_dmsquash-live )
-	"
-COMMON_MODULES="
-	dracut_modules_biosdevname
-	dracut_modules_bootchart
-	dracut_modules_btrfs
-	dracut_modules_caps
-	dracut_modules_crypt-gpg
-	dracut_modules_crypt-loop
-	dracut_modules_gensplash
-	dracut_modules_mdraid
-	dracut_modules_multipath
-	dracut_modules_plymouth
-	dracut_modules_syslog
-	dracut_modules_systemd
-	"
-DM_MODULES="
-	dracut_modules_crypt
-	dracut_modules_dmraid
-	dracut_modules_dmsquash-live
-	dracut_modules_livenet
-	dracut_modules_lvm
-	"
-NETWORK_MODULES="
-	dracut_modules_cifs
-	dracut_modules_iscsi
-	dracut_modules_livenet
-	dracut_modules_nbd
-	dracut_modules_nfs
-	dracut_modules_ssh-client
-	"
-add_req_use_for device-mapper ${DM_MODULES}
-add_req_use_for net ${NETWORK_MODULES}
-IUSE_DRACUT_MODULES="${COMMON_MODULES} ${DM_MODULES} ${NETWORK_MODULES}"
-IUSE="debug device-mapper optimization net selinux ${IUSE_DRACUT_MODULES}"
-
-RESTRICT="test"
-
-CDEPEND="virtual/udev
-	dracut_modules_systemd? ( >=sys-apps/systemd-199 )
-	selinux? ( sec-policy/selinux-dracut )
-	"
-RDEPEND="${CDEPEND}
-	app-arch/cpio
-	>=app-shells/bash-4.0
-	>=app-shells/dash-0.5.4.11
-	>=sys-apps/baselayout-1.12.14-r1
-	>sys-apps/kmod-5[tools]
-	>=sys-apps/sysvinit-2.87-r3
-	>=sys-apps/util-linux-2.21
-	virtual/pkgconfig
-
-	debug? ( dev-util/strace )
-	device-mapper? ( >=sys-fs/lvm2-2.02.33 )
-	net? ( net-misc/curl >=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2 )
-	selinux? ( sys-libs/libselinux sys-libs/libsepol )
-	dracut_modules_biosdevname? ( sys-apps/biosdevname )
-	dracut_modules_bootchart? ( app-benchmarks/bootchart2 sys-apps/usleep
-		sys-process/acct )
-	dracut_modules_btrfs? ( sys-fs/btrfs-progs )
-	dracut_modules_caps? ( sys-libs/libcap )
-	dracut_modules_cifs? ( net-fs/cifs-utils )
-	dracut_modules_crypt? ( sys-fs/cryptsetup )
-	dracut_modules_crypt-gpg? ( app-crypt/gnupg )
-	dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools )
-	dracut_modules_gensplash? ( media-gfx/splashutils )
-	dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 )
-	dracut_modules_lvm? ( >=sys-fs/lvm2-2.02.33 )
-	dracut_modules_mdraid? ( >=sys-fs/mdadm-3.2.6-r1 )
-	dracut_modules_multipath? ( sys-fs/multipath-tools )
-	dracut_modules_nbd? ( sys-block/nbd )
-	dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind )
-	dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 )
-	dracut_modules_ssh-client? ( dev-libs/openssl )
-	dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) )
-	"
-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 )
-MY_LIBDIR="/usr/lib"
-
-#
-# Helper functions
-#
-
-# Returns true if any of specified modules is enabled by USE flag and false
-# otherwise.
-# $1 = list of modules (which have corresponding USE flags of the same name)
-any_module() {
-	local m modules=" $@ "
-
-	for m in ${modules}; do
-		! use $m && modules=${modules/ $m / }
-	done
-
-	shopt -s extglob
-	modules=${modules%%+( )}
-	shopt -u extglob
-
-	[[ ${modules} ]]
-}
-
-# 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
-}
-
-#
-# ebuild functions
-#
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-0001-dracut-functions.sh-support-for-altern.patch"
-	epatch "${FILESDIR}/${PV}-0002-gentoo.conf-let-udevdir-be-handled-by-.patch"
-	epatch "${FILESDIR}/${PV}-0003-LatArCyrHeb-16-as-a-default-i18n-font-.patch"
-
-	if use dracut_modules_systemd; then
-		local systemdutildir="$(systemd_get_utildir)"
-		local systemdsystemunitdir="$(systemd_get_unitdir)"
-		einfo "Setting systemdutildir to ${systemdutildir} and ..."
-		sed -e "4asystemdutildir=\"${systemdutildir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-		einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir}..."
-		sed -e "5asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-	fi
-}
-
-src_configure() {
-	local myconf="--libdir='${MY_LIBDIR}'"
-	myconf+=" --bashcompletiondir=$(get_bashcompdir)"
-
-	if use dracut_modules_systemd; then
-		myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'"
-	fi
-
-	econf ${myconf}
-}
-
-src_compile() {
-	emake doc
-
-	if use optimization; then
-		ewarn "Enabling experimental optimization!"
-		tc-export CC
-		emake install/dracut-install
-	fi
-}
-
-src_install() {
-	default
-
-	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
-
-	#
-	# Modules
-	#
-	local module
-	modules_dir="${D%/}/${dracutlibdir}/modules.d"
-
-	# Remove modules not enabled by USE flags
-	for module in ${IUSE_DRACUT_MODULES} ; do
-		! use ${module} && rm_module -f ${module#dracut_modules_}
-	done
-
-	# Those flags are specific, and even are corresponding to modules, they need
-	# to be declared as regular USE flags.
-	use debug || rm_module 95debug
-	use selinux || rm_module 98selinux
-
-	# Following flags define set of helper modules which are base dependencies
-	# for others and as so have no practical use, so remove these modules.
-	use device-mapper  || rm_module 90dm
-	use net || rm_module 40network 45ifcfg 45url-lib
-
-	if use dracut_modules_systemd; then
-		# With systemd following modules do not make sense
-		rm_module 96securityfs 98selinux
-	else
-		# Without systemd following modules do not make sense
-		rm_module 00systemd-bootchart
-	fi
-
-	# Remove S/390 modules which are not tested at all
-	rm_module 80cms 95dasd 95dasd_mod 95zfcp 95znet
-
-	# 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
-
-	# Remove extra modules which go to future dracut-extras
-	rm_module 05busybox 97masterkey 98ecryptfs 98integrity
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_src_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
-
-	if use dracut_modules_crypt || use dracut_modules_dmraid || use \
-		dracut_modules_mdraid || use dracut_modules_lvm; then
-
-		if ! [[ $(</proc/cmdline) =~ rd.auto[\ =] ]]; then
-			ewarn "Autoassembly of special devices like cryptoLUKS, dmraid, "
-			ewarn "mdraid or lvm is off for default as of  >=dracut-024."
-			ewarn "Use rd.auto option to turn it on."
-		fi
-	fi
-}
diff --git a/sys-kernel/dracut/dracut-030.ebuild b/sys-kernel/dracut/dracut-030.ebuild
deleted file mode 100644
index 78786ecb58e0..000000000000
--- a/sys-kernel/dracut/dracut-030.ebuild
+++ /dev/null
@@ -1,301 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-030.ebuild,v 1.3 2013/10/27 17:51:45 swift Exp $
-
-EAPI=4
-
-inherit bash-completion-r1 eutils linux-info systemd
-
-add_req_use_for() {
-	local dep="$1"; shift
-	local f
-
-	for f in "$@"; do
-		REQUIRED_USE+="${f}? ( ${dep} )
-"
-	done
-}
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="http://dracut.wiki.kernel.org"
-SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-REQUIRED_USE="
-	dracut_modules_bootchart? ( !dracut_modules_systemd )
-	dracut_modules_crypt-gpg? ( dracut_modules_crypt )
-	dracut_modules_crypt-loop? ( dracut_modules_crypt )
-	dracut_modules_livenet? ( dracut_modules_dmsquash-live )
-	"
-COMMON_MODULES="
-	dracut_modules_biosdevname
-	dracut_modules_bootchart
-	dracut_modules_btrfs
-	dracut_modules_caps
-	dracut_modules_crypt-gpg
-	dracut_modules_crypt-loop
-	dracut_modules_gensplash
-	dracut_modules_mdraid
-	dracut_modules_multipath
-	dracut_modules_plymouth
-	dracut_modules_syslog
-	dracut_modules_systemd
-	"
-DM_MODULES="
-	dracut_modules_crypt
-	dracut_modules_dmraid
-	dracut_modules_dmsquash-live
-	dracut_modules_livenet
-	dracut_modules_lvm
-	"
-NETWORK_MODULES="
-	dracut_modules_cifs
-	dracut_modules_iscsi
-	dracut_modules_livenet
-	dracut_modules_nbd
-	dracut_modules_nfs
-	dracut_modules_ssh-client
-	"
-add_req_use_for device-mapper ${DM_MODULES}
-add_req_use_for net ${NETWORK_MODULES}
-IUSE_DRACUT_MODULES="${COMMON_MODULES} ${DM_MODULES} ${NETWORK_MODULES}"
-IUSE="debug device-mapper optimization net selinux ${IUSE_DRACUT_MODULES}"
-
-RESTRICT="test"
-
-CDEPEND="virtual/udev
-	dracut_modules_systemd? ( >=sys-apps/systemd-199 )
-	selinux? ( sec-policy/selinux-dracut )
-	"
-RDEPEND="${CDEPEND}
-	app-arch/cpio
-	>=app-shells/bash-4.0
-	>=sys-apps/baselayout-1.12.14-r1
-	>sys-apps/kmod-5[tools]
-	>=sys-apps/sysvinit-2.87-r3
-	>=sys-apps/util-linux-2.21
-	virtual/pkgconfig
-
-	debug? ( dev-util/strace )
-	device-mapper? ( >=sys-fs/lvm2-2.02.33 )
-	net? ( net-misc/curl >=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2 )
-	selinux? ( sys-libs/libselinux sys-libs/libsepol )
-	dracut_modules_biosdevname? ( sys-apps/biosdevname )
-	dracut_modules_bootchart? ( app-benchmarks/bootchart2 sys-apps/usleep
-		sys-process/acct )
-	dracut_modules_btrfs? ( sys-fs/btrfs-progs )
-	dracut_modules_caps? ( sys-libs/libcap )
-	dracut_modules_cifs? ( net-fs/cifs-utils )
-	dracut_modules_crypt? ( sys-fs/cryptsetup )
-	dracut_modules_crypt-gpg? ( app-crypt/gnupg )
-	dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools )
-	dracut_modules_gensplash? ( media-gfx/splashutils )
-	dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 )
-	dracut_modules_lvm? ( >=sys-fs/lvm2-2.02.33 )
-	dracut_modules_mdraid? ( >=sys-fs/mdadm-3.2.6-r1 )
-	dracut_modules_multipath? ( sys-fs/multipath-tools )
-	dracut_modules_nbd? ( sys-block/nbd )
-	dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind )
-	dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 )
-	dracut_modules_ssh-client? ( dev-libs/openssl )
-	dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) )
-	"
-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 )
-MY_LIBDIR="/usr/lib"
-
-#
-# Helper functions
-#
-
-# Returns true if any of specified modules is enabled by USE flag and false
-# otherwise.
-# $1 = list of modules (which have corresponding USE flags of the same name)
-any_module() {
-	local m modules=" $@ "
-
-	for m in ${modules}; do
-		! use $m && modules=${modules/ $m / }
-	done
-
-	shopt -s extglob
-	modules=${modules%%+( )}
-	shopt -u extglob
-
-	[[ ${modules} ]]
-}
-
-# 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
-}
-
-#
-# ebuild functions
-#
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-0001-dracut-functions.sh-support-for-altern.patch"
-	epatch "${FILESDIR}/${PV}-0002-gentoo.conf-let-udevdir-be-handled-by-.patch"
-	epatch "${FILESDIR}/${PV}-0003-LatArCyrHeb-16-as-a-default-i18n-font-.patch"
-
-	if use dracut_modules_systemd; then
-		local systemdutildir="$(systemd_get_utildir)"
-		local systemdsystemunitdir="$(systemd_get_unitdir)"
-		einfo "Setting systemdutildir to ${systemdutildir} and ..."
-		sed -e "4asystemdutildir=\"${systemdutildir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-		einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir}..."
-		sed -e "5asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-	fi
-}
-
-src_configure() {
-	local myconf="--libdir='${MY_LIBDIR}'"
-	myconf+=" --bashcompletiondir=$(get_bashcompdir)"
-
-	if use dracut_modules_systemd; then
-		myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'"
-	fi
-
-	econf ${myconf}
-}
-
-src_compile() {
-	if use optimization; then
-		ewarn "Enabling experimental optimization!"
-		tc-export CC
-		emake install/dracut-install
-	fi
-}
-
-src_install() {
-	default
-
-	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
-
-	#
-	# Modules
-	#
-	local module
-	modules_dir="${D%/}/${dracutlibdir}/modules.d"
-
-	# Remove modules not enabled by USE flags
-	for module in ${IUSE_DRACUT_MODULES} ; do
-		! use ${module} && rm_module -f ${module#dracut_modules_}
-	done
-
-	# Those flags are specific, and even are corresponding to modules, they need
-	# to be declared as regular USE flags.
-	use debug || rm_module 95debug
-	use selinux || rm_module 98selinux
-
-	# Following flags define set of helper modules which are base dependencies
-	# for others and as so have no practical use, so remove these modules.
-	use device-mapper  || rm_module 90dm
-	use net || rm_module 40network 45ifcfg 45url-lib
-
-	if use dracut_modules_systemd; then
-		# With systemd following modules do not make sense
-		rm_module 96securityfs 98selinux
-	else
-		# Without systemd following modules do not make sense
-		rm_module 00systemd-bootchart
-	fi
-
-	# Remove S/390 modules which are not tested at all
-	rm_module 80cms 95dasd 95dasd_mod 95zfcp 95znet
-
-	# 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
-
-	# Remove extra modules which go to future dracut-extras
-	rm_module 05busybox 97masterkey 98ecryptfs 98integrity
-
-	# dash module is no longer supported
-	rm_module 00dash
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_src_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
-
-	if use dracut_modules_crypt || use dracut_modules_dmraid || use \
-		dracut_modules_mdraid || use dracut_modules_lvm; then
-
-		if ! [[ $(</proc/cmdline) =~ rd.auto[\ =] ]]; then
-			ewarn "Autoassembly of special devices like cryptoLUKS, dmraid, "
-			ewarn "mdraid or lvm is off for default as of  >=dracut-024."
-			ewarn "Use rd.auto option to turn it on."
-		fi
-	fi
-}
diff --git a/sys-kernel/dracut/dracut-031-r1.ebuild b/sys-kernel/dracut/dracut-031-r1.ebuild
deleted file mode 100644
index a34364f85f8c..000000000000
--- a/sys-kernel/dracut/dracut-031-r1.ebuild
+++ /dev/null
@@ -1,301 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-031-r1.ebuild,v 1.3 2013/10/27 17:51:45 swift Exp $
-
-EAPI=4
-
-inherit bash-completion-r1 eutils linux-info systemd
-
-add_req_use_for() {
-	local dep="$1"; shift
-	local f
-
-	for f in "$@"; do
-		REQUIRED_USE+="${f}? ( ${dep} )
-"
-	done
-}
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="http://dracut.wiki.kernel.org"
-SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-REQUIRED_USE="
-	dracut_modules_bootchart? ( !dracut_modules_systemd )
-	dracut_modules_crypt-gpg? ( dracut_modules_crypt )
-	dracut_modules_crypt-loop? ( dracut_modules_crypt )
-	dracut_modules_livenet? ( dracut_modules_dmsquash-live )
-	"
-COMMON_MODULES="
-	dracut_modules_biosdevname
-	dracut_modules_bootchart
-	dracut_modules_btrfs
-	dracut_modules_caps
-	dracut_modules_crypt-gpg
-	dracut_modules_crypt-loop
-	dracut_modules_gensplash
-	dracut_modules_mdraid
-	dracut_modules_multipath
-	dracut_modules_plymouth
-	dracut_modules_syslog
-	dracut_modules_systemd
-	"
-DM_MODULES="
-	dracut_modules_crypt
-	dracut_modules_dmraid
-	dracut_modules_dmsquash-live
-	dracut_modules_livenet
-	dracut_modules_lvm
-	"
-NETWORK_MODULES="
-	dracut_modules_cifs
-	dracut_modules_iscsi
-	dracut_modules_livenet
-	dracut_modules_nbd
-	dracut_modules_nfs
-	dracut_modules_ssh-client
-	"
-add_req_use_for device-mapper ${DM_MODULES}
-add_req_use_for net ${NETWORK_MODULES}
-IUSE_DRACUT_MODULES="${COMMON_MODULES} ${DM_MODULES} ${NETWORK_MODULES}"
-IUSE="debug device-mapper optimization net selinux ${IUSE_DRACUT_MODULES}"
-
-RESTRICT="test"
-
-CDEPEND="virtual/udev
-	dracut_modules_systemd? ( >=sys-apps/systemd-199 )
-	selinux? ( sec-policy/selinux-dracut )
-	"
-RDEPEND="${CDEPEND}
-	app-arch/cpio
-	>=app-shells/bash-4.0
-	>=sys-apps/baselayout-1.12.14-r1
-	>sys-apps/kmod-5[tools]
-	>=sys-apps/sysvinit-2.87-r3
-	>=sys-apps/util-linux-2.21
-	virtual/pkgconfig
-
-	debug? ( dev-util/strace )
-	device-mapper? ( >=sys-fs/lvm2-2.02.33 )
-	net? ( net-misc/curl >=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2 )
-	selinux? ( sys-libs/libselinux sys-libs/libsepol )
-	dracut_modules_biosdevname? ( sys-apps/biosdevname )
-	dracut_modules_bootchart? ( app-benchmarks/bootchart2 sys-apps/usleep
-		sys-process/acct )
-	dracut_modules_btrfs? ( sys-fs/btrfs-progs )
-	dracut_modules_caps? ( sys-libs/libcap )
-	dracut_modules_cifs? ( net-fs/cifs-utils )
-	dracut_modules_crypt? ( sys-fs/cryptsetup )
-	dracut_modules_crypt-gpg? ( app-crypt/gnupg )
-	dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools )
-	dracut_modules_gensplash? ( media-gfx/splashutils )
-	dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 )
-	dracut_modules_lvm? ( >=sys-fs/lvm2-2.02.33 )
-	dracut_modules_mdraid? ( >=sys-fs/mdadm-3.2.6-r1 )
-	dracut_modules_multipath? ( sys-fs/multipath-tools )
-	dracut_modules_nbd? ( sys-block/nbd )
-	dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind )
-	dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 )
-	dracut_modules_ssh-client? ( dev-libs/openssl )
-	dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) )
-	"
-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 )
-MY_LIBDIR="/usr/lib"
-
-#
-# Helper functions
-#
-
-# Returns true if any of specified modules is enabled by USE flag and false
-# otherwise.
-# $1 = list of modules (which have corresponding USE flags of the same name)
-any_module() {
-	local m modules=" $@ "
-
-	for m in ${modules}; do
-		! use $m && modules=${modules/ $m / }
-	done
-
-	shopt -s extglob
-	modules=${modules%%+( )}
-	shopt -u extglob
-
-	[[ ${modules} ]]
-}
-
-# 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
-}
-
-#
-# ebuild functions
-#
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-0001-dracut-functions.sh-support-for-altern.patch"
-	epatch "${FILESDIR}/${PV}-0002-gentoo.conf-let-udevdir-be-handled-by-.patch"
-	epatch "${FILESDIR}/${PV}-0003-Revert-base-setup-correct-system-time-.patch"
-
-	if use dracut_modules_systemd; then
-		local systemdutildir="$(systemd_get_utildir)"
-		local systemdsystemunitdir="$(systemd_get_unitdir)"
-		einfo "Setting systemdutildir to ${systemdutildir} and ..."
-		sed -e "4asystemdutildir=\"${systemdutildir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-		einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir}..."
-		sed -e "5asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-	fi
-}
-
-src_configure() {
-	local myconf="--libdir='${MY_LIBDIR}'"
-	myconf+=" --bashcompletiondir=$(get_bashcompdir)"
-
-	if use dracut_modules_systemd; then
-		myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'"
-	fi
-
-	econf ${myconf}
-}
-
-src_compile() {
-	if use optimization; then
-		ewarn "Enabling experimental optimization!"
-		tc-export CC
-		emake install/dracut-install
-	fi
-}
-
-src_install() {
-	default
-
-	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
-
-	#
-	# Modules
-	#
-	local module
-	modules_dir="${D%/}/${dracutlibdir}/modules.d"
-
-	# Remove modules not enabled by USE flags
-	for module in ${IUSE_DRACUT_MODULES} ; do
-		! use ${module} && rm_module -f ${module#dracut_modules_}
-	done
-
-	# Those flags are specific, and even are corresponding to modules, they need
-	# to be declared as regular USE flags.
-	use debug || rm_module 95debug
-	use selinux || rm_module 98selinux
-
-	# Following flags define set of helper modules which are base dependencies
-	# for others and as so have no practical use, so remove these modules.
-	use device-mapper  || rm_module 90dm
-	use net || rm_module 40network 45ifcfg 45url-lib
-
-	if use dracut_modules_systemd; then
-		# With systemd following modules do not make sense
-		rm_module 96securityfs 98selinux
-	else
-		# Without systemd following modules do not make sense
-		rm_module 00systemd-bootchart
-	fi
-
-	# Remove S/390 modules which are not tested at all
-	rm_module 80cms 95dasd 95dasd_mod 95zfcp 95znet
-
-	# 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
-
-	# Remove extra modules which go to future dracut-extras
-	rm_module 05busybox 97masterkey 98ecryptfs 98integrity
-
-	# dash module is no longer supported
-	rm_module 00dash
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_src_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
-
-	if use dracut_modules_crypt || use dracut_modules_dmraid || use \
-		dracut_modules_mdraid || use dracut_modules_lvm; then
-
-		if ! [[ $(</proc/cmdline) =~ rd.auto[\ =] ]]; then
-			ewarn "Autoassembly of special devices like cryptoLUKS, dmraid, "
-			ewarn "mdraid or lvm is off for default as of  >=dracut-024."
-			ewarn "Use rd.auto option to turn it on."
-		fi
-	fi
-}
diff --git a/sys-kernel/dracut/dracut-033-r3.ebuild b/sys-kernel/dracut/dracut-033-r3.ebuild
deleted file mode 100644
index c7ece3c25b78..000000000000
--- a/sys-kernel/dracut/dracut-033-r3.ebuild
+++ /dev/null
@@ -1,315 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-033-r3.ebuild,v 1.2 2013/10/27 17:51:45 swift Exp $
-
-EAPI=4
-
-inherit bash-completion-r1 eutils linux-info multilib systemd
-
-add_req_use_for() {
-	local dep="$1"; shift
-	local f
-
-	for f in "$@"; do
-		REQUIRED_USE+="${f}? ( ${dep} )
-"
-	done
-}
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="http://dracut.wiki.kernel.org"
-SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-REQUIRED_USE="
-	dracut_modules_bootchart? ( !dracut_modules_systemd )
-	dracut_modules_crypt-gpg? ( dracut_modules_crypt )
-	dracut_modules_crypt-loop? ( dracut_modules_crypt )
-	dracut_modules_livenet? ( dracut_modules_dmsquash-live )
-	"
-COMMON_MODULES="
-	dracut_modules_biosdevname
-	dracut_modules_bootchart
-	dracut_modules_btrfs
-	dracut_modules_caps
-	dracut_modules_crypt-gpg
-	dracut_modules_crypt-loop
-	dracut_modules_dash
-	dracut_modules_gensplash
-	dracut_modules_mdraid
-	dracut_modules_multipath
-	dracut_modules_plymouth
-	dracut_modules_syslog
-	dracut_modules_systemd
-	"
-DM_MODULES="
-	dracut_modules_crypt
-	dracut_modules_dmraid
-	dracut_modules_dmsquash-live
-	dracut_modules_livenet
-	dracut_modules_lvm
-	"
-NETWORK_MODULES="
-	dracut_modules_cifs
-	dracut_modules_iscsi
-	dracut_modules_livenet
-	dracut_modules_nbd
-	dracut_modules_nfs
-	dracut_modules_ssh-client
-	"
-add_req_use_for device-mapper ${DM_MODULES}
-add_req_use_for net ${NETWORK_MODULES}
-IUSE_DRACUT_MODULES="${COMMON_MODULES} ${DM_MODULES} ${NETWORK_MODULES}"
-IUSE="debug device-mapper net selinux ${IUSE_DRACUT_MODULES}"
-
-RESTRICT="test"
-
-CDEPEND="virtual/udev
-	dracut_modules_systemd? ( >=sys-apps/systemd-199 )
-	selinux? ( sec-policy/selinux-dracut )
-	"
-RDEPEND="${CDEPEND}
-	app-arch/cpio
-	>=app-shells/bash-4.0
-	>=sys-apps/baselayout-1.12.14-r1
-	>sys-apps/kmod-5[tools]
-	>=sys-apps/sysvinit-2.87-r3
-	>=sys-apps/util-linux-2.21
-	virtual/pkgconfig
-
-	debug? ( dev-util/strace )
-	device-mapper? ( >=sys-fs/lvm2-2.02.33 )
-	net? ( net-misc/curl >=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2 )
-	selinux? ( sys-libs/libselinux sys-libs/libsepol )
-	dracut_modules_biosdevname? ( sys-apps/biosdevname )
-	dracut_modules_bootchart? ( app-benchmarks/bootchart2 sys-apps/usleep
-		sys-process/acct )
-	dracut_modules_btrfs? ( sys-fs/btrfs-progs )
-	dracut_modules_caps? ( sys-libs/libcap )
-	dracut_modules_cifs? ( net-fs/cifs-utils )
-	dracut_modules_crypt? ( sys-fs/cryptsetup )
-	dracut_modules_crypt-gpg? ( app-crypt/gnupg )
-	dracut_modules_dash? ( >=app-shells/dash-0.5.4.11 )
-	dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools )
-	dracut_modules_gensplash? ( media-gfx/splashutils )
-	dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 )
-	dracut_modules_lvm? ( >=sys-fs/lvm2-2.02.33 )
-	dracut_modules_mdraid? ( >=sys-fs/mdadm-3.2.6-r1 )
-	dracut_modules_multipath? ( sys-fs/multipath-tools )
-	dracut_modules_nbd? ( sys-block/nbd )
-	dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind )
-	dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 )
-	dracut_modules_ssh-client? ( dev-libs/openssl )
-	dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) )
-	"
-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 )
-MY_LIBDIR=/usr/lib
-
-#
-# Helper functions
-#
-
-# Returns true if any of specified modules is enabled by USE flag and false
-# otherwise.
-# $1 = list of modules (which have corresponding USE flags of the same name)
-any_module() {
-	local m modules=" $@ "
-
-	for m in ${modules}; do
-		! use $m && modules=${modules/ $m / }
-	done
-
-	shopt -s extglob
-	modules=${modules%%+( )}
-	shopt -u extglob
-
-	[[ ${modules} ]]
-}
-
-# 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
-}
-
-#
-# ebuild functions
-#
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-0001-dracut-functions.sh-support-for-altern.patch"
-	epatch "${FILESDIR}/${PV}-0002-gentoo.conf-let-udevdir-be-handled-by-.patch"
-	epatch "${FILESDIR}/${PV}-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch"
-	epatch "${FILESDIR}/${PV}-0004-Install-dracut-install-into-libexec-di.patch"
-	epatch "${FILESDIR}/${PV}-0005-dracut.sh-harden-host_modalias-reading.patch"
-	epatch "${FILESDIR}/${PV}-0006-ifup-do-not-dhcp-on-network-interface-.patch"
-	epatch "${FILESDIR}/${PV}-0007-lvm-mdraid-Fix-LVM-on-MD-activation.patch"
-	epatch "${FILESDIR}/${PV}-0008-mdraid-module-setup.sh-install-configs.patch"
-	epatch "${FILESDIR}/${PV}-0009-mdraid-module-setup.sh-fixes-for-mdadm.patch"
-
-	local libdirs ldir
-
-	for ldir in $(get_all_libdirs); do
-		libdirs+=" /$ldir /usr/$ldir"
-	done
-
-	libdirs="${libdirs# }"
-	einfo "Setting libdirs to \"${libdirs}\" ..."
-	sed -e "3alibdirs=\"${libdirs}\"" \
-		-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-
-	if use dracut_modules_systemd; then
-		local systemdutildir="$(systemd_get_utildir)"
-		local systemdsystemunitdir="$(systemd_get_unitdir)"
-		einfo "Setting systemdutildir to ${systemdutildir} and ..."
-		sed -e "5asystemdutildir=\"${systemdutildir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-		einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir}..."
-		sed -e "6asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-	fi
-}
-
-src_configure() {
-	local myconf="--libdir=${MY_LIBDIR}"
-	myconf+=" --bashcompletiondir=$(get_bashcompdir)"
-
-	if use dracut_modules_systemd; then
-		myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'"
-	fi
-
-	econf ${myconf}
-}
-
-src_compile() {
-	tc-export CC
-	emake doc install/dracut-install
-}
-
-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
-
-	#
-	# Modules
-	#
-	local module
-	modules_dir="${D%/}/${dracutlibdir}/modules.d"
-
-	# Remove modules not enabled by USE flags
-	for module in ${IUSE_DRACUT_MODULES} ; do
-		! use ${module} && rm_module -f ${module#dracut_modules_}
-	done
-
-	# Those flags are specific, and even are corresponding to modules, they need
-	# to be declared as regular USE flags.
-	use debug || rm_module 95debug
-	use selinux || rm_module 98selinux
-
-	# Following flags define set of helper modules which are base dependencies
-	# for others and as so have no practical use, so remove these modules.
-	use device-mapper  || rm_module 90dm
-	use net || rm_module 40network 45ifcfg 45url-lib
-
-	if use dracut_modules_systemd; then
-		# With systemd following modules do not make sense
-		rm_module 96securityfs 98selinux
-	else
-		# Without systemd following modules do not make sense
-		rm_module 00systemd-bootchart
-	fi
-
-	# Remove S/390 modules which are not tested at all
-	rm_module 80cms 95dasd 95dasd_mod 95zfcp 95znet
-
-	# 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
-
-	# Remove extra modules which go to future dracut-extras
-	rm_module 05busybox 97masterkey 98ecryptfs 98integrity
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_src_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
-
-	if use dracut_modules_crypt || use dracut_modules_dmraid || use \
-		dracut_modules_mdraid || use dracut_modules_lvm; then
-
-		if ! [[ $(</proc/cmdline) =~ rd.auto[\ =] ]]; then
-			ewarn "Autoassembly of special devices like cryptoLUKS, dmraid, "
-			ewarn "mdraid or lvm is off for default as of  >=dracut-024."
-			ewarn "Use rd.auto option to turn it on."
-		fi
-	fi
-}
diff --git a/sys-kernel/dracut/dracut-034-r3.ebuild b/sys-kernel/dracut/dracut-034-r3.ebuild
deleted file mode 100644
index 4af25919f665..000000000000
--- a/sys-kernel/dracut/dracut-034-r3.ebuild
+++ /dev/null
@@ -1,325 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-034-r3.ebuild,v 1.2 2013/12/28 17:41:17 aidecoe Exp $
-
-EAPI=4
-
-inherit bash-completion-r1 eutils linux-info multilib systemd
-
-add_req_use_for() {
-	local dep="$1"; shift
-	local f
-
-	for f in "$@"; do
-		REQUIRED_USE+="${f}? ( ${dep} )
-"
-	done
-}
-
-DESCRIPTION="Generic initramfs generation tool"
-HOMEPAGE="http://dracut.wiki.kernel.org"
-SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.bz2"
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-REQUIRED_USE="
-	dracut_modules_bootchart? ( !dracut_modules_systemd )
-	dracut_modules_crypt-gpg? ( dracut_modules_crypt )
-	dracut_modules_crypt-loop? ( dracut_modules_crypt )
-	dracut_modules_livenet? ( dracut_modules_dmsquash-live )
-	"
-COMMON_MODULES="
-	dracut_modules_biosdevname
-	dracut_modules_bootchart
-	dracut_modules_btrfs
-	dracut_modules_caps
-	dracut_modules_crypt-gpg
-	dracut_modules_crypt-loop
-	dracut_modules_dash
-	dracut_modules_gensplash
-	dracut_modules_mdraid
-	dracut_modules_multipath
-	dracut_modules_plymouth
-	dracut_modules_syslog
-	dracut_modules_systemd
-	"
-DM_MODULES="
-	dracut_modules_crypt
-	dracut_modules_dmraid
-	dracut_modules_dmsquash-live
-	dracut_modules_livenet
-	dracut_modules_lvm
-	"
-NETWORK_MODULES="
-	dracut_modules_cifs
-	dracut_modules_iscsi
-	dracut_modules_livenet
-	dracut_modules_nbd
-	dracut_modules_nfs
-	dracut_modules_ssh-client
-	"
-add_req_use_for device-mapper ${DM_MODULES}
-add_req_use_for net ${NETWORK_MODULES}
-IUSE_DRACUT_MODULES="${COMMON_MODULES} ${DM_MODULES} ${NETWORK_MODULES}"
-IUSE="debug device-mapper net selinux ${IUSE_DRACUT_MODULES}"
-
-RESTRICT="test"
-
-CDEPEND="virtual/udev
-	dracut_modules_systemd? ( >=sys-apps/systemd-199 )
-	selinux? ( sec-policy/selinux-dracut )
-	"
-RDEPEND="${CDEPEND}
-	app-arch/cpio
-	>=app-shells/bash-4.0
-	>=sys-apps/baselayout-1.12.14-r1
-	>sys-apps/kmod-5[tools]
-	|| ( >=sys-apps/sysvinit-2.87-r3 sys-apps/systemd-sysv-utils )
-	>=sys-apps/util-linux-2.21
-	virtual/pkgconfig
-
-	debug? ( dev-util/strace )
-	device-mapper? ( >=sys-fs/lvm2-2.02.33 )
-	net? ( net-misc/curl >=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2 )
-	selinux? ( sys-libs/libselinux sys-libs/libsepol )
-	dracut_modules_biosdevname? ( sys-apps/biosdevname )
-	dracut_modules_bootchart? ( app-benchmarks/bootchart2 sys-apps/usleep
-		sys-process/acct )
-	dracut_modules_btrfs? ( sys-fs/btrfs-progs )
-	dracut_modules_caps? ( sys-libs/libcap )
-	dracut_modules_cifs? ( net-fs/cifs-utils )
-	dracut_modules_crypt? ( sys-fs/cryptsetup )
-	dracut_modules_crypt-gpg? ( app-crypt/gnupg )
-	dracut_modules_dash? ( >=app-shells/dash-0.5.4.11 )
-	dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools )
-	dracut_modules_gensplash? ( media-gfx/splashutils )
-	dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 )
-	dracut_modules_lvm? ( >=sys-fs/lvm2-2.02.33 )
-	dracut_modules_mdraid? ( >=sys-fs/mdadm-3.2.6-r1 )
-	dracut_modules_multipath? ( sys-fs/multipath-tools )
-	dracut_modules_nbd? ( sys-block/nbd )
-	dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind )
-	dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 )
-	dracut_modules_ssh-client? ( dev-libs/openssl )
-	dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) )
-	"
-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 )
-MY_LIBDIR=/usr/lib
-
-#
-# Helper functions
-#
-
-# Returns true if any of specified modules is enabled by USE flag and false
-# otherwise.
-# $1 = list of modules (which have corresponding USE flags of the same name)
-any_module() {
-	local m modules=" $@ "
-
-	for m in ${modules}; do
-		! use $m && modules=${modules/ $m / }
-	done
-
-	shopt -s extglob
-	modules=${modules%%+( )}
-	shopt -u extglob
-
-	[[ ${modules} ]]
-}
-
-# 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
-}
-
-#
-# ebuild functions
-#
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-0001-dracut.sh-do-not-bail-out-if-kernel-mo.patch"
-	epatch "${FILESDIR}/${PV}-0002-dracut-functions.sh-support-for-altern.patch"
-	epatch "${FILESDIR}/${PV}-0003-gentoo.conf-let-udevdir-be-handled-by-.patch"
-	epatch "${FILESDIR}/${PV}-0004-Use-the-same-paths-in-dracut.sh-as-tho.patch"
-	epatch "${FILESDIR}/${PV}-0005-Install-dracut-install-into-libexec-di.patch"
-	epatch "${FILESDIR}/${PV}-0006-resume-fix-swap-detection-in-hostonly.patch"
-	epatch "${FILESDIR}/${PV}-0007-dracut.sh-also-mkdir-run-lock-which-is.patch"
-	epatch "${FILESDIR}/${PV}-0008-dracut.sh-no-need-to-make-subdirs-in-r.patch"
-	epatch "${FILESDIR}/${PV}-0009-lvm-install-thin-utils-for-non-hostonl.patch"
-	epatch "${FILESDIR}/${PV}-0010-module-setup.sh-add-comments.patch.bz2"
-	epatch "${FILESDIR}/${PV}-0011-lvm-fix-thin-recognition.patch"
-	epatch "${FILESDIR}/${PV}-0012-lvm-always-install-thin-utils-for-lvm.patch"
-	epatch "${FILESDIR}/${PV}-0013-usrmount-always-install.patch"
-	epatch "${FILESDIR}/${PV}-0014-udev-rules-add-eudev-rules.patch"
-
-	local libdirs
-
-	#local ldir
-	#for ldir in $(get_all_libdirs); do
-	#	libdirs+=" /$ldir /usr/$ldir"
-	#done
-	#libdirs="${libdirs# }"
-
-	libdirs="/$(get_libdir) /usr/$(get_libdir)"
-	[[ $libdirs =~ /lib\  ]] || libdirs+=" /lib /usr/lib"
-	einfo "Setting libdirs to \"${libdirs}\" ..."
-	sed -e "3alibdirs=\"${libdirs}\"" \
-		-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-
-	if use dracut_modules_systemd; then
-		local systemdutildir="$(systemd_get_utildir)"
-		local systemdsystemunitdir="$(systemd_get_unitdir)"
-		einfo "Setting systemdutildir to ${systemdutildir} and ..."
-		sed -e "5asystemdutildir=\"${systemdutildir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-		einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir}..."
-		sed -e "6asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \
-			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-	fi
-
-	epatch_user
-}
-
-src_configure() {
-	local myconf="--libdir=${MY_LIBDIR}"
-	myconf+=" --bashcompletiondir=$(get_bashcompdir)"
-
-	if use dracut_modules_systemd; then
-		myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'"
-	fi
-
-	econf ${myconf}
-}
-
-src_compile() {
-	tc-export CC
-	emake doc install/dracut-install
-}
-
-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
-
-	#
-	# Modules
-	#
-	local module
-	modules_dir="${D%/}/${dracutlibdir}/modules.d"
-
-	# Remove modules not enabled by USE flags
-	for module in ${IUSE_DRACUT_MODULES} ; do
-		! use ${module} && rm_module -f ${module#dracut_modules_}
-	done
-
-	# Those flags are specific, and even are corresponding to modules, they need
-	# to be declared as regular USE flags.
-	use debug || rm_module 95debug
-	use selinux || rm_module 98selinux
-
-	# Following flags define set of helper modules which are base dependencies
-	# for others and as so have no practical use, so remove these modules.
-	use device-mapper  || rm_module 90dm
-	use net || rm_module 40network 45ifcfg 45url-lib
-
-	if use dracut_modules_systemd; then
-		# With systemd following modules do not make sense
-		rm_module 96securityfs 98selinux
-	else
-		# Without systemd following modules do not make sense
-		rm_module 00systemd-bootchart
-	fi
-
-	# Remove S/390 modules which are not tested at all
-	rm_module 80cms 95dasd 95dasd_mod 95zfcp 95znet
-
-	# 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
-
-	# Remove extra modules which go to future dracut-extras
-	rm_module 05busybox 97masterkey 98ecryptfs 98integrity
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_src_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
-
-	if use dracut_modules_crypt || use dracut_modules_dmraid || use \
-		dracut_modules_mdraid || use dracut_modules_lvm; then
-
-		if ! [[ $(</proc/cmdline) =~ rd.auto[\ =] ]]; then
-			ewarn "Autoassembly of special devices like cryptoLUKS, dmraid, "
-			ewarn "mdraid or lvm is off for default as of  >=dracut-024."
-			ewarn "Use rd.auto option to turn it on."
-		fi
-	fi
-}
diff --git a/sys-kernel/dracut/files/026-0000-fix-version-print.patch b/sys-kernel/dracut/files/026-0000-fix-version-print.patch
deleted file mode 100644
index 3607fb24552c..000000000000
--- a/sys-kernel/dracut/files/026-0000-fix-version-print.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
-index b441a27..410201a 100755
---- a/modules.d/99base/init.sh
-+++ b/modules.d/99base/init.sh
-@@ -104,7 +104,7 @@ else
- fi
- 
- [ -f /etc/initrd-release ] && . /etc/initrd-release
--[ -n "$VERSION" ] && info "dracut-$VERSION"
-+[ -n "$VERSION_ID" ] && info "$NAME-$VERSION_ID"
- 
- source_conf /etc/conf.d
- 
diff --git a/sys-kernel/dracut/files/026-0001-dracut-functions.sh-support-for-altern.patch b/sys-kernel/dracut/files/026-0001-dracut-functions.sh-support-for-altern.patch
deleted file mode 100644
index 05aad68a656a..000000000000
--- a/sys-kernel/dracut/files/026-0001-dracut-functions.sh-support-for-altern.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 76e3d3ac2d753f17c59dfe9758ea36897bedaddf Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sun, 6 Jan 2013 13:35:01 +0100
-Subject: [PATCH 1/3] dracut-functions.sh: support for alternative udev dirs -
- udevaltdirs
-
-It is required for Gentoo which moves udev from / to /usr and supports
-both /lib/udev and /usr/lib/udev for compatibility with other packages.
-
-Credits go to Alexander Tsoy <alexander@tsoy.me>.
----
- dracut-functions.sh | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index 2a84d17..a6a609c 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -955,6 +955,15 @@ inst_rules() {
-     inst_dir "$_target"
-     for _rule in "$@"; do
-         if [ "${_rule#/}" = "$_rule" ]; then
-+            for r in ${udevaltdirs}; do
-+                [[ "$r" = "${udevdir}" ]] && continue
-+                if [[ -f $r/rules.d/$_rule ]]; then
-+                    _found="$r/rules.d/$_rule"
-+                    inst_rule_programs "$_found"
-+                    inst_rule_group_owner "$_found"
-+                    inst_simple "$_found" "${udevdir}/rules.d/${_found##*/}"
-+                fi
-+            done
-             for r in ${udevdir}/rules.d /etc/udev/rules.d; do
-                 if [[ -f $r/$_rule ]]; then
-                     _found="$r/$_rule"
--- 
-1.8.1.4
-
diff --git a/sys-kernel/dracut/files/026-0002-gentoo.conf-let-udevdir-be-handled-by-.patch b/sys-kernel/dracut/files/026-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
deleted file mode 100644
index 6ae84ec8af9e..000000000000
--- a/sys-kernel/dracut/files/026-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f4bfd74c673c5f4d01cf9855f2e4f58c59f5b658 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sun, 16 Dec 2012 20:02:48 +0100
-Subject: [PATCH 2/3] gentoo.conf: let udevdir= be handled by pkg-config and
- use udevaltdirs
-
-To avoid need of rebuild after udev update/downgrade let udevdir= be set
-dynamically with pkg-config.  Use udevaltdirs to search for rules both
-in old and new locations.
----
- dracut.conf.d/gentoo.conf.example | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/dracut.conf.d/gentoo.conf.example b/dracut.conf.d/gentoo.conf.example
-index 1361a30..b78e5c6 100644
---- a/dracut.conf.d/gentoo.conf.example
-+++ b/dracut.conf.d/gentoo.conf.example
-@@ -1,7 +1,8 @@
- # /etc/dracut.conf.d/gentoo.conf
- # dracut config file customized for Gentoo Base System release 2
- 
--udevdir=/lib/udev
-+udevdir=
-+udevaltdirs="/lib/udev /usr/lib/udev"
- ro_mnt=yes
- 
- #
--- 
-1.8.1.4
-
diff --git a/sys-kernel/dracut/files/026-0003-Revert-crypt-dmraid-mdraid-use-for_eac.patch b/sys-kernel/dracut/files/026-0003-Revert-crypt-dmraid-mdraid-use-for_eac.patch
deleted file mode 100644
index 6fc948269c66..000000000000
--- a/sys-kernel/dracut/files/026-0003-Revert-crypt-dmraid-mdraid-use-for_eac.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From a6b0fde8f776d28988a9ab4e5bf09f78fa858744 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sun, 10 Mar 2013 13:31:02 +0100
-Subject: [PATCH 3/3] Revert "crypt, dmraid, mdraid: use
- for_each_host_dev_and_slaves_all()"
-
-This reverts commit cf24ac8c19b803e6f5c0576f2d7e78187331cf02.
----
- modules.d/90crypt/module-setup.sh  | 2 +-
- modules.d/90dmraid/module-setup.sh | 2 +-
- modules.d/90mdraid/module-setup.sh | 2 +-
- 3 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh
-index 2b4456b..93b996c 100755
---- a/modules.d/90crypt/module-setup.sh
-+++ b/modules.d/90crypt/module-setup.sh
-@@ -25,7 +25,7 @@ check() {
-     }
- 
-     [[ $hostonly ]] || [[ $mount_needs ]] && {
--        for_each_host_dev_and_slaves_all check_crypt || return 1
-+        for_each_host_dev_fs check_crypt || return 1
-     }
- 
-     return 0
-diff --git a/modules.d/90dmraid/module-setup.sh b/modules.d/90dmraid/module-setup.sh
-index c315961..eb949dc 100755
---- a/modules.d/90dmraid/module-setup.sh
-+++ b/modules.d/90dmraid/module-setup.sh
-@@ -38,7 +38,7 @@ check() {
-     }
- 
-     [[ $hostonly ]] || [[ $mount_needs ]] && {
--        for_each_host_dev_and_slaves_all check_dmraid || return 1
-+        for_each_host_dev_fs check_dmraid || return 1
-     }
- 
-     return 0
-diff --git a/modules.d/90mdraid/module-setup.sh b/modules.d/90mdraid/module-setup.sh
-index 0efffbb..a2b9ac2 100755
---- a/modules.d/90mdraid/module-setup.sh
-+++ b/modules.d/90mdraid/module-setup.sh
-@@ -27,7 +27,7 @@ check() {
-     }
- 
-     [[ $hostonly ]] || [[ $mount_needs ]] && {
--        for_each_host_dev_and_slaves_all check_mdraid || return 1
-+        for_each_host_dev_fs check_mdraid || return 1
-     }
- 
-     return 0
--- 
-1.8.1.4
-
diff --git a/sys-kernel/dracut/files/026-0004-lsinitrd.sh-fix-for-default-initrd-not.patch b/sys-kernel/dracut/files/026-0004-lsinitrd.sh-fix-for-default-initrd-not.patch
deleted file mode 100644
index 371644b25a2b..000000000000
--- a/sys-kernel/dracut/files/026-0004-lsinitrd.sh-fix-for-default-initrd-not.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-From f6e0e5653fac1f856192bfafdcb2fbd86ed8a22a Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Sun, 10 Mar 2013 14:44:32 +0100
-Subject: [PATCH 3/5] lsinitrd.sh: fix for default initrd not found, but image
- given
-
----
- lsinitrd.sh | 15 ++++++++-------
- 1 file changed, 8 insertions(+), 7 deletions(-)
-
-diff --git a/lsinitrd.sh b/lsinitrd.sh
-index 7a09423..4b8a7e2 100755
---- a/lsinitrd.sh
-+++ b/lsinitrd.sh
-@@ -54,16 +54,17 @@ if [[ "$1" ]]; then
-         usage
-         exit 1
-     fi
--fi
--
--[[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id
--
--if [[ $MACHINE_ID ]] && ( [[ -d /boot/${MACHINE_ID} ]] || [[ -L /boot/${MACHINE_ID} ]] ); then
--    image="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
- else
--    image="/boot/initramfs-${KERNEL_VERSION}.img}"
-+    [[ -f /etc/machine-id ]] && read MACHINE_ID < /etc/machine-id
-+
-+    if [[ $MACHINE_ID ]] && ( [[ -d /boot/${MACHINE_ID} ]] || [[ -L /boot/${MACHINE_ID} ]] ); then
-+        image="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
-+    else
-+        image="/boot/initramfs-${KERNEL_VERSION}.img}"
-+    fi
- fi
- 
-+
- if ! [[ -f "$image" ]]; then
-     {
-         echo "No <initramfs file> specified and the default image '$image' cannot be accessed!"
--- 
-1.8.1.4
-
diff --git a/sys-kernel/dracut/files/026-0005-lsinitrd.sh-removed-trailing.patch b/sys-kernel/dracut/files/026-0005-lsinitrd.sh-removed-trailing.patch
deleted file mode 100644
index de2b87866699..000000000000
--- a/sys-kernel/dracut/files/026-0005-lsinitrd.sh-removed-trailing.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From bf7a572d8f978e16d92385ebf36e2f837fc2f3d1 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Mon, 11 Mar 2013 15:46:37 +0100
-Subject: [PATCH 4/5] lsinitrd.sh: removed trailing "}"
-
----
- lsinitrd.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/lsinitrd.sh b/lsinitrd.sh
-index 4b8a7e2..5cd8c2a 100755
---- a/lsinitrd.sh
-+++ b/lsinitrd.sh
-@@ -60,7 +60,7 @@ else
-     if [[ $MACHINE_ID ]] && ( [[ -d /boot/${MACHINE_ID} ]] || [[ -L /boot/${MACHINE_ID} ]] ); then
-         image="/boot/${MACHINE_ID}/${KERNEL_VERSION}/initrd"
-     else
--        image="/boot/initramfs-${KERNEL_VERSION}.img}"
-+        image="/boot/initramfs-${KERNEL_VERSION}.img"
-     fi
- fi
- 
--- 
-1.8.1.4
-
diff --git a/sys-kernel/dracut/files/026-0006-make-host_fs_types-a-hashmap.patch b/sys-kernel/dracut/files/026-0006-make-host_fs_types-a-hashmap.patch
deleted file mode 100644
index 13b28c5e16fb..000000000000
--- a/sys-kernel/dracut/files/026-0006-make-host_fs_types-a-hashmap.patch
+++ /dev/null
@@ -1,409 +0,0 @@
-From 86152848ed452bf1a01d0bea25c47ea54884a4fd Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Mon, 11 Mar 2013 16:32:16 +0100
-Subject: [PATCH 5/5] make host_fs_types a hashmap
-
-This requires bash >= 4, but hash maps are so much more comfortable
----
- dracut-functions.sh                | 14 +++---------
- dracut.sh                          | 23 +++++++++----------
- modules.d/90btrfs/module-setup.sh  |  6 ++---
- modules.d/90crypt/module-setup.sh  | 39 +++++++++++++++++++--------------
- modules.d/90dmraid/module-setup.sh | 34 ++++++++++++++++------------
- modules.d/90lvm/module-setup.sh    | 36 +++++++++++++++++-------------
- modules.d/90mdraid/module-setup.sh | 45 +++++++++++++++++++++-----------------
- modules.d/95cifs/module-setup.sh   |  2 +-
- modules.d/95nfs/module-setup.sh    |  6 ++---
- modules.d/95virtfs/module-setup.sh |  4 ++--
- 10 files changed, 112 insertions(+), 97 deletions(-)
-
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index a6a609c..52a1781 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -450,23 +450,15 @@ find_mp_fstype() {
- find_root_block_device() { find_block_device /; }
- 
- # for_each_host_dev_fs <func>
--# Execute "<func> <dev> <filesystem>" for every "<dev>|<fs>" pair found
-+# Execute "<func> <dev> <filesystem>" for every "<dev> <fs>" pair found
- # in ${host_fs_types[@]}
- for_each_host_dev_fs()
- {
-     local _func="$1"
-     local _dev
--    local _fs
-     local _ret=1
--    for f in ${host_fs_types[@]}; do
--        OLDIFS="$IFS"
--        IFS="|"
--        set -- $f
--        IFS="$OLDIFS"
--        _dev="$1"
--        [[ -b "$_dev" ]] || continue
--        _fs="$2"
--        $_func $_dev $_fs && _ret=0
-+    for _dev in "${!host_fs_types[@]}"; do
-+        $_func "$_dev" "${host_fs_types[$_dev]}" && _ret=0
-     done
-     return $_ret
- }
-diff --git a/dracut.sh b/dracut.sh
-index 28ed4f1..15e66f3 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -744,11 +744,13 @@ trap 'exit 1;' SIGINT
- # Need to be able to have non-root users read stuff (rpcbind etc)
- chmod 755 "$initdir"
- 
-+declare -A host_fs_types
-+
- for line in "${fstab_lines[@]}"; do
-     set -- $line
-     #dev mp fs fsopts
-     push host_devs "$1"
--    push host_fs_types "$1|$3"
-+    host_fs_types["$1"]="$3"
- done
- 
- for f in $add_fstab; do
-@@ -791,28 +793,27 @@ fi
- _get_fs_type() (
-     [[ $1 ]] || return
-     if [[ -b $1 ]] && get_fs_env $1; then
--        echo "$(readlink -f $1)|$ID_FS_TYPE"
-+        echo "$(readlink -f $1) $ID_FS_TYPE"
-         return 1
-     fi
-     if [[ -b /dev/block/$1 ]] && get_fs_env /dev/block/$1; then
--        echo "$(readlink -f /dev/block/$1)|$ID_FS_TYPE"
-+        echo "$(readlink -f /dev/block/$1) $ID_FS_TYPE"
-         return 1
-     fi
-     if fstype=$(find_dev_fstype $1); then
--        echo "$1|$fstype"
-+        echo "$1 $fstype"
-         return 1
-     fi
-     return 1
- )
- 
- for dev in "${host_devs[@]}"; do
--    unset fs_type
--    for fstype in $(_get_fs_type $dev) \
--        $(check_block_and_slaves _get_fs_type $(get_maj_min $dev)); do
--        if ! strstr " ${host_fs_types[*]} " " $fstype ";then
--            push host_fs_types "$fstype"
--        fi
--    done
-+    while read key val; do
-+        host_fs_types["$key"]="$val"
-+    done < <(
-+        _get_fs_type $dev
-+        check_block_and_slaves_all _get_fs_type $(get_maj_min $dev)
-+    )
- done
- 
- [[ -d $udevdir ]] \
-diff --git a/modules.d/90btrfs/module-setup.sh b/modules.d/90btrfs/module-setup.sh
-index 0f79f5e..4a7c01d 100755
---- a/modules.d/90btrfs/module-setup.sh
-+++ b/modules.d/90btrfs/module-setup.sh
-@@ -9,12 +9,10 @@ check() {
-     type -P btrfs >/dev/null || return 1
- 
-     [[ $hostonly ]] || [[ $mount_needs ]] && {
--        local _found
-         for fs in ${host_fs_types[@]}; do
--            strstr "$fs" "\|btrfs" && _found="1"
-+            [[ "$fs" == "btrfs" ]] && return 0
-         done
--        [[ $_found ]] || return 1
--        unset _found
-+        return 255
-     }
- 
-     return 0
-diff --git a/modules.d/90crypt/module-setup.sh b/modules.d/90crypt/module-setup.sh
-index 2b4456b..b76f6ae 100755
---- a/modules.d/90crypt/module-setup.sh
-+++ b/modules.d/90crypt/module-setup.sh
-@@ -7,8 +7,30 @@ check() {
-     # if cryptsetup is not installed, then we cannot support encrypted devices.
-     type -P cryptsetup >/dev/null || return 1
- 
-+    [[ $hostonly ]] || [[ $mount_needs ]] && {
-+        for fs in "${host_fs_types[@]}"; do
-+            [[ $fs = "crypto_LUKS" ]] && return 0
-+        done
-+        return 255
-+    }
-+
-+    return 0
-+}
-+
-+depends() {
-+    echo dm rootfs-block
-+    return 0
-+}
-+
-+installkernel() {
-+    instmods dm_crypt =crypto
-+}
-+
-+install() {
-+
-     check_crypt() {
-         local dev=$1 fs=$2
-+
-         [[ $fs = "crypto_LUKS" ]] || return 1
-         ID_FS_UUID=$(udevadm info --query=property --name=$dev \
-             | while read line; do
-@@ -24,23 +46,8 @@ check() {
-         return 0
-     }
- 
--    [[ $hostonly ]] || [[ $mount_needs ]] && {
--        for_each_host_dev_and_slaves_all check_crypt || return 1
--    }
--
--    return 0
--}
--
--depends() {
--    echo dm rootfs-block
--    return 0
--}
--
--installkernel() {
--    instmods dm_crypt =crypto
--}
-+    for_each_host_dev_fs check_crypt
- 
--install() {
-     dracut_install cryptsetup rmdir readlink umount
-     inst_script "$moddir"/cryptroot-ask.sh /sbin/cryptroot-ask
-     inst_script "$moddir"/probe-keydev.sh /sbin/probe-keydev
-diff --git a/modules.d/90dmraid/module-setup.sh b/modules.d/90dmraid/module-setup.sh
-index c315961..76daa4a 100755
---- a/modules.d/90dmraid/module-setup.sh
-+++ b/modules.d/90dmraid/module-setup.sh
-@@ -8,9 +8,27 @@ check() {
-     # in trying to support it in the initramfs.
-     type -P dmraid >/dev/null || return 1
- 
-+    [[ $hostonly ]] || [[ $mount_needs ]] && {
-+        for fs in "${host_fs_types[@]}"; do
-+            [[ $fs = *_raid_member ]] && return 0
-+        done
-+        return 255
-+    }
-+
-+    return 0
-+}
-+
-+depends() {
-+    echo dm rootfs-block
-+    return 0
-+}
-+
-+install() {
-+    local _i
-+
-     check_dmraid() {
-         local dev=$1 fs=$2 holder DEVPATH DM_NAME
--        [[ "$fs" = "${fs%%_raid_member}" ]] && return 1
-+        [[ "$fs" != *_raid_member ]] && return 1
- 
-         DEVPATH=$(udevadm info --query=property --name=$dev \
-             | while read line; do
-@@ -37,20 +55,8 @@ check() {
-         return 0
-     }
- 
--    [[ $hostonly ]] || [[ $mount_needs ]] && {
--        for_each_host_dev_and_slaves_all check_dmraid || return 1
--    }
-+    for_each_host_dev_fs check_dmraid
- 
--    return 0
--}
--
--depends() {
--    echo dm rootfs-block
--    return 0
--}
--
--install() {
--    local _i
-     dracut_install dmraid
-     dracut_install -o kpartx
-     inst $(command -v partx) /sbin/partx
-diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh
-index e0e4043..22186f4 100755
---- a/modules.d/90lvm/module-setup.sh
-+++ b/modules.d/90lvm/module-setup.sh
-@@ -7,22 +7,11 @@ check() {
-     # No point trying to support lvm if the binaries are missing
-     type -P lvm >/dev/null || return 1
- 
--    check_lvm() {
--        local DM_VG_NAME DM_LV_NAME DM_UDEV_DISABLE_DISK_RULES_FLAG
--        eval $(udevadm info --query=property --name=/dev/block/$1|egrep '(DM_VG_NAME|DM_LV_NAME|DM_UDEV_DISABLE_DISK_RULES_FLAG)=')
--        [[ "$DM_UDEV_DISABLE_DISK_RULES_FLAG" = "1" ]] && return 1
--        [[ ${DM_VG_NAME} ]] && [[ ${DM_LV_NAME} ]] || return 1
--        if ! strstr " ${_activated[*]} " " ${DM_VG_NAME}/${DM_LV_NAME} "; then
--            if ! [[ $kernel_only ]]; then
--                echo " rd.lvm.lv=${DM_VG_NAME}/${DM_LV_NAME} " >> "${initdir}/etc/cmdline.d/90lvm.conf"
--            fi
--            push _activated "${DM_VG_NAME}/${DM_LV_NAME}"
--        fi
--        return 0
--    }
--
-     [[ $hostonly ]] || [[ $mount_needs ]] && {
--        for_each_host_dev_and_slaves_all check_lvm || return 1
-+        for fs in "${host_fs_types[@]}"; do
-+            [[ $fs = LVM*_member ]] && return 0
-+        done
-+        return 255
-     }
- 
-     return 0
-@@ -38,6 +27,23 @@ install() {
-     local _i
-     inst lvm
- 
-+    check_lvm() {
-+        local DM_VG_NAME DM_LV_NAME DM_UDEV_DISABLE_DISK_RULES_FLAG
-+
-+        eval $(udevadm info --query=property --name=$1 | egrep '(DM_VG_NAME|DM_LV_NAME|DM_UDEV_DISABLE_DISK_RULES_FLAG)=')
-+        [[ "$DM_UDEV_DISABLE_DISK_RULES_FLAG" = "1" ]] && return 1
-+        [[ ${DM_VG_NAME} ]] && [[ ${DM_LV_NAME} ]] || return 1
-+        if ! strstr " ${_activated[*]} " " ${DM_VG_NAME}/${DM_LV_NAME} "; then
-+            if ! [[ $kernel_only ]]; then
-+                echo " rd.lvm.lv=${DM_VG_NAME}/${DM_LV_NAME} " >> "${initdir}/etc/cmdline.d/90lvm.conf"
-+            fi
-+            push _activated "${DM_VG_NAME}/${DM_LV_NAME}"
-+        fi
-+        return 0
-+    }
-+
-+    for_each_host_dev_fs check_lvm
-+
-     inst_rules "$moddir/64-lvm.rules"
- 
-     if [[ $hostonly ]] || [[ $lvmconf = "yes" ]]; then
-diff --git a/modules.d/90mdraid/module-setup.sh b/modules.d/90mdraid/module-setup.sh
-index 0efffbb..70c27dd 100755
---- a/modules.d/90mdraid/module-setup.sh
-+++ b/modules.d/90mdraid/module-setup.sh
-@@ -7,27 +7,11 @@ check() {
-     # No mdadm?  No mdraid support.
-     type -P mdadm >/dev/null || return 1
- 
--    check_mdraid() {
--        local dev=$1 fs=$2 holder DEVPATH MD_UUID
--        [[ "$fs" = "${fs%%_raid_member}" ]] && return 1
--
--        MD_UUID=$(/sbin/mdadm --examine --export $dev \
--            | while read line; do
--                [[ ${line#MD_UUID} = $line ]] && continue
--                eval "$line"
--                echo $MD_UUID
--                break
--                done)
--
--        [[ ${MD_UUID} ]] || return 1
--        if ! [[ $kernel_only ]]; then
--            echo " rd.md.uuid=${MD_UUID} " >> "${initdir}/etc/cmdline.d/90mdraid.conf"
--        fi
--        return 0
--    }
--
-     [[ $hostonly ]] || [[ $mount_needs ]] && {
--        for_each_host_dev_and_slaves_all check_mdraid || return 1
-+        for fs in "${host_fs_types[@]}"; do
-+            [[ "$fs" == *_raid_member ]] && return 0
-+        done
-+        return 255
-     }
- 
-     return 0
-@@ -48,6 +32,27 @@ install() {
-     inst $(command -v partx) /sbin/partx
-     inst $(command -v mdadm) /sbin/mdadm
- 
-+    check_mdraid() {
-+        local dev=$1 fs=$2 holder DEVPATH MD_UUID
-+        [[ "$fs" != *_raid_member ]] && return 1
-+
-+        MD_UUID=$(/sbin/mdadm --examine --export $dev \
-+            | while read line; do
-+                [[ ${line#MD_UUID} = $line ]] && continue
-+                eval "$line"
-+                echo $MD_UUID
-+                break
-+                done)
-+
-+        [[ ${MD_UUID} ]] || return 1
-+        if ! [[ $kernel_only ]]; then
-+            echo " rd.md.uuid=${MD_UUID} " >> "${initdir}/etc/cmdline.d/90mdraid.conf"
-+        fi
-+        return 0
-+    }
-+
-+    for_each_host_dev_fs check_mdraid
-+
-     inst_rules 64-md-raid.rules
-     # remove incremental assembly from stock rules, so they don't shadow
-     # 65-md-inc*.rules and its fine-grained controls, or cause other problems
-diff --git a/modules.d/95cifs/module-setup.sh b/modules.d/95cifs/module-setup.sh
-index 1c7d0be..bf0eddf 100755
---- a/modules.d/95cifs/module-setup.sh
-+++ b/modules.d/95cifs/module-setup.sh
-@@ -8,7 +8,7 @@ check() {
- 
-     [[ $hostonly ]] || [[ $mount_needs ]] && {
-         for fs in ${host_fs_types[@]}; do
--            strstr "$fs" "\|cifs"  && return 0
-+            [[ "$fs" == "cifs" ]] && return 0
-         done
-         return 255
-     }
-diff --git a/modules.d/95nfs/module-setup.sh b/modules.d/95nfs/module-setup.sh
-index 38ee5d7..7c3a64d 100755
---- a/modules.d/95nfs/module-setup.sh
-+++ b/modules.d/95nfs/module-setup.sh
-@@ -9,9 +9,9 @@ check() {
- 
-     [[ $hostonly ]] || [[ $mount_needs ]] && {
-         for fs in ${host_fs_types[@]}; do
--            strstr "$fs" "\|nfs"  && return 0
--            strstr "$fs" "\|nfs3" && return 0
--            strstr "$fs" "\|nfs4" && return 0
-+            [[ "$fs" == "nfs" ]] && return 0
-+            [[ "$fs" == "nfs3" ]] && return 0
-+            [[ "$fs" == "nfs4" ]] && return 0
-         done
-         return 255
-     }
-diff --git a/modules.d/95virtfs/module-setup.sh b/modules.d/95virtfs/module-setup.sh
-index 0b961a8..12bd354 100755
---- a/modules.d/95virtfs/module-setup.sh
-+++ b/modules.d/95virtfs/module-setup.sh
-@@ -5,9 +5,9 @@
- check() {
-     [[ $hostonly ]] || [[ $mount_needs ]] && {
-         for fs in ${host_fs_types[@]}; do
--            strstr "$fs" "\|9p" && return 0
-+            [[ "$fs" == "9p" ]] && return 0
-         done
--        return 1
-+        return 255
-     }
- 
-     if type -P systemd-detect-virt >/dev/null 2>&1; then
--- 
-1.8.1.4
-
diff --git a/sys-kernel/dracut/files/027-0000-fix-version-print.patch b/sys-kernel/dracut/files/027-0000-fix-version-print.patch
deleted file mode 100644
index 3607fb24552c..000000000000
--- a/sys-kernel/dracut/files/027-0000-fix-version-print.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
-index b441a27..410201a 100755
---- a/modules.d/99base/init.sh
-+++ b/modules.d/99base/init.sh
-@@ -104,7 +104,7 @@ else
- fi
- 
- [ -f /etc/initrd-release ] && . /etc/initrd-release
--[ -n "$VERSION" ] && info "dracut-$VERSION"
-+[ -n "$VERSION_ID" ] && info "$NAME-$VERSION_ID"
- 
- source_conf /etc/conf.d
- 
diff --git a/sys-kernel/dracut/files/027-0001-dracut-functions.sh-support-for-altern.patch b/sys-kernel/dracut/files/027-0001-dracut-functions.sh-support-for-altern.patch
deleted file mode 100644
index ca079ad40d65..000000000000
--- a/sys-kernel/dracut/files/027-0001-dracut-functions.sh-support-for-altern.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 3688462730a97d4cc5644dab87aadf147d8c72f0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sun, 6 Jan 2013 13:35:01 +0100
-Subject: [PATCH 1/2] dracut-functions.sh: support for alternative udev dirs -
- udevaltdirs
-
-It is required for Gentoo which moves udev from / to /usr and supports
-both /lib/udev and /usr/lib/udev for compatibility with other packages.
-
-Credits go to Alexander Tsoy <alexander@tsoy.me>.
----
- dracut-functions.sh | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index eba7412..d888f4c 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -961,6 +961,15 @@ inst_rules() {
-     inst_dir "$_target"
-     for _rule in "$@"; do
-         if [ "${_rule#/}" = "$_rule" ]; then
-+            for r in ${udevaltdirs}; do
-+                [[ "$r" = "${udevdir}" ]] && continue
-+                if [[ -f $r/rules.d/$_rule ]]; then
-+                    _found="$r/rules.d/$_rule"
-+                    inst_rule_programs "$_found"
-+                    inst_rule_group_owner "$_found"
-+                    inst_simple "$_found" "${udevdir}/rules.d/${_found##*/}"
-+                fi
-+            done
-             for r in ${udevdir}/rules.d /etc/udev/rules.d; do
-                 if [[ -f $r/$_rule ]]; then
-                     _found="$r/$_rule"
--- 
-1.8.1.5
-
diff --git a/sys-kernel/dracut/files/027-0002-gentoo.conf-let-udevdir-be-handled-by-.patch b/sys-kernel/dracut/files/027-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
deleted file mode 100644
index d110afa83966..000000000000
--- a/sys-kernel/dracut/files/027-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 624a97d4e2b548889b5f758ed6a908a1495b44be Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sun, 16 Dec 2012 20:02:48 +0100
-Subject: [PATCH 2/2] gentoo.conf: let udevdir= be handled by pkg-config and
- use udevaltdirs
-
-To avoid need of rebuild after udev update/downgrade let udevdir= be set
-dynamically with pkg-config.  Use udevaltdirs to search for rules both
-in old and new locations.
----
- dracut.conf.d/gentoo.conf.example | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/dracut.conf.d/gentoo.conf.example b/dracut.conf.d/gentoo.conf.example
-index 1361a30..b78e5c6 100644
---- a/dracut.conf.d/gentoo.conf.example
-+++ b/dracut.conf.d/gentoo.conf.example
-@@ -1,7 +1,8 @@
- # /etc/dracut.conf.d/gentoo.conf
- # dracut config file customized for Gentoo Base System release 2
- 
--udevdir=/lib/udev
-+udevdir=
-+udevaltdirs="/lib/udev /usr/lib/udev"
- ro_mnt=yes
- 
- #
--- 
-1.8.1.5
-
diff --git a/sys-kernel/dracut/files/027-0003-Do-not-call-plymouth-with-full-path.patch b/sys-kernel/dracut/files/027-0003-Do-not-call-plymouth-with-full-path.patch
deleted file mode 100644
index 55a6630969d8..000000000000
--- a/sys-kernel/dracut/files/027-0003-Do-not-call-plymouth-with-full-path.patch
+++ /dev/null
@@ -1,167 +0,0 @@
-From d084ce382e70723854f960daa8b0e486ee1ce97f Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Thu, 11 Apr 2013 16:08:26 +0200
-Subject: [PATCH 3/4] Do not call plymouth with full path
-
----
- modules.d/50plymouth/module-setup.sh             | 2 +-
- modules.d/50plymouth/plymouth-emergency.sh       | 2 +-
- modules.d/50plymouth/plymouth-newroot.sh         | 4 ++--
- modules.d/50plymouth/plymouth-populate-initrd.sh | 5 ++---
- modules.d/50plymouth/plymouth-pretrigger.sh      | 6 +++---
- modules.d/90crypt/crypt-lib.sh                   | 4 ++--
- modules.d/90dmsquash-live/dmsquash-live-root.sh  | 4 ++--
- modules.d/98systemd/dracut-emergency.sh          | 2 +-
- modules.d/99base/dracut-lib.sh                   | 4 ++--
- 9 files changed, 16 insertions(+), 17 deletions(-)
-
-diff --git a/modules.d/50plymouth/module-setup.sh b/modules.d/50plymouth/module-setup.sh
-index f754e24..ae35b11 100755
---- a/modules.d/50plymouth/module-setup.sh
-+++ b/modules.d/50plymouth/module-setup.sh
-@@ -4,7 +4,7 @@
- 
- check() {
-     [[ "$mount_needs" ]] && return 1
--    [[ -x /sbin/plymouthd && -x /bin/plymouth && -x /usr/sbin/plymouth-set-default-theme ]]
-+    type -P plymouthd >/dev/null && type -P plymouth >/dev/null
- }
- 
- depends() {
-diff --git a/modules.d/50plymouth/plymouth-emergency.sh b/modules.d/50plymouth/plymouth-emergency.sh
-index 68955b8..ed0b0ac 100755
---- a/modules.d/50plymouth/plymouth-emergency.sh
-+++ b/modules.d/50plymouth/plymouth-emergency.sh
-@@ -1,4 +1,4 @@
- #!/bin/sh
- # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
- # ex: ts=8 sw=4 sts=4 et filetype=sh
--[ -x /bin/plymouth ] && /bin/plymouth --hide-splash
-+plymouth --hide-splash 2>/dev/null || :
-diff --git a/modules.d/50plymouth/plymouth-newroot.sh b/modules.d/50plymouth/plymouth-newroot.sh
-index 2311b47..96cd138 100755
---- a/modules.d/50plymouth/plymouth-newroot.sh
-+++ b/modules.d/50plymouth/plymouth-newroot.sh
-@@ -2,6 +2,6 @@
- # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
- # ex: ts=8 sw=4 sts=4 et filetype=sh
- 
--if [ -x /bin/plymouth -a -z "$DRACUT_SYSTEMD" ]; then
--    /bin/plymouth --newroot=$NEWROOT
-+if type plymouth >/dev/null 2>&1 && [ -z "$DRACUT_SYSTEMD" ]; then
-+    plymouth --newroot=$NEWROOT
- fi
-diff --git a/modules.d/50plymouth/plymouth-populate-initrd.sh b/modules.d/50plymouth/plymouth-populate-initrd.sh
-index 1e2ffe7..6e0f561 100755
---- a/modules.d/50plymouth/plymouth-populate-initrd.sh
-+++ b/modules.d/50plymouth/plymouth-populate-initrd.sh
-@@ -4,15 +4,14 @@
- PLYMOUTH_LOGO_FILE="/usr/share/pixmaps/system-logo-white.png"
- PLYMOUTH_THEME=$(plymouth-set-default-theme)
- 
--inst /sbin/plymouthd /bin/plymouthd
--dracut_install /bin/plymouth \
-+dracut_install plymouthd plymouth \
-     "${PLYMOUTH_LOGO_FILE}" \
-     /etc/system-release
- 
- mkdir -m 0755 -p "${initdir}/usr/share/plymouth"
- 
- inst_libdir_file "plymouth/text.so" "plymouth/details.so"
--    
-+
- if [[ $hostonly ]]; then
-     dracut_install \
-         "/usr/share/plymouth/themes/details/details.plymouth" \
-diff --git a/modules.d/50plymouth/plymouth-pretrigger.sh b/modules.d/50plymouth/plymouth-pretrigger.sh
-index 0e3cb02..8087bf6 100755
---- a/modules.d/50plymouth/plymouth-pretrigger.sh
-+++ b/modules.d/50plymouth/plymouth-pretrigger.sh
-@@ -2,7 +2,7 @@
- # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
- # ex: ts=8 sw=4 sts=4 et filetype=sh
- 
--if [ -x /bin/plymouthd -a -z "$DRACUT_SYSTEMD" ]; then
-+if type plymouthd >/dev/null 2>&1 && [-z "$DRACUT_SYSTEMD" ]; then
-     if getargbool 1 plymouth.enable && getargbool 1 rd.plymouth -d -n rd_NO_PLYMOUTH; then
-         # first trigger graphics subsystem
-         udevadm trigger --action=add --attr-match=class=0x030000 >/dev/null 2>&1
-@@ -16,8 +16,8 @@ if [ -x /bin/plymouthd -a -z "$DRACUT_SYSTEMD" ]; then
-         read consoledev rest < /sys/class/tty/console/active
-         consoledev=${consoledev:-tty0}
-         [ -x /lib/udev/console_init -a -e "/dev/$consoledev" ] && /lib/udev/console_init "/dev/$consoledev"
--        [ -x /bin/plymouthd ] && /bin/plymouthd --attach-to-session --pid-file /run/plymouth/pid
--        /bin/plymouth --show-splash 2>&1 | vinfo
-+        plymouthd --attach-to-session --pid-file /run/plymouth/pid
-+        plymouth --show-splash 2>&1 | vinfo
-         # reset tty after plymouth messed with it
-         [ -x /lib/udev/console_init -a -e "/dev/$consoledev" ] && /lib/udev/console_init "/dev/$consoledev"
-     fi
-diff --git a/modules.d/90crypt/crypt-lib.sh b/modules.d/90crypt/crypt-lib.sh
-index d66ba88..ebe09f8 100755
---- a/modules.d/90crypt/crypt-lib.sh
-+++ b/modules.d/90crypt/crypt-lib.sh
-@@ -47,8 +47,8 @@ ask_for_password() {
- 
-     { flock -s 9;
-         # Prompt for password with plymouth, if installed and running.
--        if [ -x /bin/plymouth ] && /bin/plymouth --ping; then
--            /bin/plymouth ask-for-password \
-+        if type plymouth >/dev/null 2>&1 && plymouth --ping 2>/dev/null; then
-+            plymouth ask-for-password \
-                 --prompt "$ply_prompt" --number-of-tries=$ply_tries \
-                 --command="$ply_cmd"
-             ret=$?
-diff --git a/modules.d/90dmsquash-live/dmsquash-live-root.sh b/modules.d/90dmsquash-live/dmsquash-live-root.sh
-index a79b0d9..07e41f0 100755
---- a/modules.d/90dmsquash-live/dmsquash-live-root.sh
-+++ b/modules.d/90dmsquash-live/dmsquash-live-root.sh
-@@ -31,7 +31,7 @@ if [ "$fs" = "iso9660" -o "$fs" = "udf" ]; then
- fi
- getarg rd.live.check -d check || check=""
- if [ -n "$check" ]; then
--    [ -x /bin/plymouth ] && /bin/plymouth --hide-splash
-+    type plymouth >/dev/null 2>&1 && plymouth --hide-splash
-     if [ -n "$DRACUT_SYSTEMD" ]; then
-         p=$(str_replace "$livedev" "-" '\x2d')
-         systemctl start checkisomd5@${p}.service
-@@ -42,7 +42,7 @@ if [ -n "$check" ]; then
-         die "CD check failed!"
-         exit 1
-     fi
--    [ -x /bin/plymouth ] && /bin/plymouth --show-splash
-+    type plymouth >/dev/null 2>&1 && plymouth --show-splash
- fi
- 
- ln -s $livedev /run/initramfs/livedev
-diff --git a/modules.d/98systemd/dracut-emergency.sh b/modules.d/98systemd/dracut-emergency.sh
-index a0a4b12..8ab045e 100755
---- a/modules.d/98systemd/dracut-emergency.sh
-+++ b/modules.d/98systemd/dracut-emergency.sh
-@@ -10,7 +10,7 @@ type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
- 
- source_conf /etc/conf.d
- 
--[ -x /bin/plymouth ] && /bin/plymouth quit
-+type plymouth >/dev/null 2>&1 && plymouth quit
- 
- export _rdshell_name="dracut" action="Boot" hook="emergency"
- 
-diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
-index e456b01..b8919f3 100755
---- a/modules.d/99base/dracut-lib.sh
-+++ b/modules.d/99base/dracut-lib.sh
-@@ -952,8 +952,8 @@ emergency_shell()
-         shift 2
-     elif [ "$1" = "--shutdown" ]; then
-         _rdshell_name=$2; action="Shutdown"; hook="shutdown-emergency"
--        if [ -x /bin/plymouth ]; then
--            /bin/plymouth --hide-splash
-+        if type plymouth >/dev/null 2>&1; then
-+            plymouth --hide-splash
-         elif [ -x /oldroot/bin/plymouth ]; then
-             /oldroot/bin/plymouth --hide-splash
-         fi
--- 
-1.8.2.1
-
diff --git a/sys-kernel/dracut/files/027-0004-plymouth-plymouth-pretrigger.sh-fixup-.patch b/sys-kernel/dracut/files/027-0004-plymouth-plymouth-pretrigger.sh-fixup-.patch
deleted file mode 100644
index 52e5b295c524..000000000000
--- a/sys-kernel/dracut/files/027-0004-plymouth-plymouth-pretrigger.sh-fixup-.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 331ebcb5f3530597f49a344c7392c7f330838fdd Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Fri, 12 Apr 2013 15:25:44 +0200
-Subject: [PATCH 4/4] plymouth/plymouth-pretrigger.sh: fixup of ca2c6936
-
----
- modules.d/50plymouth/plymouth-pretrigger.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/modules.d/50plymouth/plymouth-pretrigger.sh b/modules.d/50plymouth/plymouth-pretrigger.sh
-index 8087bf6..196f2f9 100755
---- a/modules.d/50plymouth/plymouth-pretrigger.sh
-+++ b/modules.d/50plymouth/plymouth-pretrigger.sh
-@@ -2,7 +2,7 @@
- # -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
- # ex: ts=8 sw=4 sts=4 et filetype=sh
- 
--if type plymouthd >/dev/null 2>&1 && [-z "$DRACUT_SYSTEMD" ]; then
-+if type plymouthd >/dev/null 2>&1 && [ -z "$DRACUT_SYSTEMD" ]; then
-     if getargbool 1 plymouth.enable && getargbool 1 rd.plymouth -d -n rd_NO_PLYMOUTH; then
-         # first trigger graphics subsystem
-         udevadm trigger --action=add --attr-match=class=0x030000 >/dev/null 2>&1
--- 
-1.8.2.1
-
diff --git a/sys-kernel/dracut/files/029-0001-dracut-functions.sh-support-for-altern.patch b/sys-kernel/dracut/files/029-0001-dracut-functions.sh-support-for-altern.patch
deleted file mode 100644
index be8703933996..000000000000
--- a/sys-kernel/dracut/files/029-0001-dracut-functions.sh-support-for-altern.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From aae4bcf10ea65b0e6f52279fd7a796d86cc9d21f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sun, 6 Jan 2013 13:35:01 +0100
-Subject: [PATCH 1/2] dracut-functions.sh: support for alternative udev dirs -
- udevaltdirs
-
-It is required for Gentoo which moves udev from / to /usr and supports
-both /lib/udev and /usr/lib/udev for compatibility with other packages.
-
-Credits go to Alexander Tsoy <alexander@tsoy.me>.
----
- dracut-functions.sh | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index 3d88c9d..63f92ee 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -927,6 +927,15 @@ inst_rules() {
-     inst_dir "$_target"
-     for _rule in "$@"; do
-         if [ "${_rule#/}" = "$_rule" ]; then
-+            for r in ${udevaltdirs}; do
-+                [[ "$r" = "${udevdir}" ]] && continue
-+                if [[ -f $r/rules.d/$_rule ]]; then
-+                    _found="$r/rules.d/$_rule"
-+                    inst_rule_programs "$_found"
-+                    inst_rule_group_owner "$_found"
-+                    inst_simple "$_found" "${udevdir}/rules.d/${_found##*/}"
-+                fi
-+            done
-             for r in ${udevdir}/rules.d /etc/udev/rules.d; do
-                 if [[ -f $r/$_rule ]]; then
-                     _found="$r/$_rule"
--- 
-1.8.2.1
-
diff --git a/sys-kernel/dracut/files/029-0002-gentoo.conf-let-udevdir-be-handled-by-.patch b/sys-kernel/dracut/files/029-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
deleted file mode 100644
index eb2c91ffac96..000000000000
--- a/sys-kernel/dracut/files/029-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From f884f2a855dbdd3b4fdec489e09b8fd878604b83 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sun, 16 Dec 2012 20:02:48 +0100
-Subject: [PATCH 2/2] gentoo.conf: let udevdir= be handled by pkg-config and
- use udevaltdirs
-
-To avoid need of rebuild after udev update/downgrade let udevdir= be set
-dynamically with pkg-config.  Use udevaltdirs to search for rules both
-in old and new locations.
----
- dracut.conf.d/gentoo.conf.example | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/dracut.conf.d/gentoo.conf.example b/dracut.conf.d/gentoo.conf.example
-index 1361a30..b78e5c6 100644
---- a/dracut.conf.d/gentoo.conf.example
-+++ b/dracut.conf.d/gentoo.conf.example
-@@ -1,7 +1,8 @@
- # /etc/dracut.conf.d/gentoo.conf
- # dracut config file customized for Gentoo Base System release 2
- 
--udevdir=/lib/udev
-+udevdir=
-+udevaltdirs="/lib/udev /usr/lib/udev"
- ro_mnt=yes
- 
- #
--- 
-1.8.2.1
-
diff --git a/sys-kernel/dracut/files/029-0003-LatArCyrHeb-16-as-a-default-i18n-font-.patch b/sys-kernel/dracut/files/029-0003-LatArCyrHeb-16-as-a-default-i18n-font-.patch
deleted file mode 100644
index cb95605e002a..000000000000
--- a/sys-kernel/dracut/files/029-0003-LatArCyrHeb-16-as-a-default-i18n-font-.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From 37f75e9eb50edc041242a486527dddec114dbd60 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Thu, 20 Jun 2013 20:33:14 +0200
-Subject: [PATCH 3/3] LatArCyrHeb-16 as a default i18n font for Gentoo
-
----
- dracut.conf.d/gentoo.conf.example | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/dracut.conf.d/gentoo.conf.example b/dracut.conf.d/gentoo.conf.example
-index b78e5c6..f9617f0 100644
---- a/dracut.conf.d/gentoo.conf.example
-+++ b/dracut.conf.d/gentoo.conf.example
-@@ -11,5 +11,6 @@ ro_mnt=yes
- 
- # i18n
- i18n_vars="/etc/conf.d/keymaps:keymap-KEYMAP,extended_keymaps-EXT_KEYMAPS /etc/conf.d/consolefont:consolefont-FONT,consoletranslation-FONT_MAP /etc/rc.conf:unicode-UNICODE"
-+i18n_default_font="LatArCyrHeb-16"
- 
- omit_drivers+=" i2o_scsi"
--- 
-1.8.2.1
-
diff --git a/sys-kernel/dracut/files/030-0001-dracut-functions.sh-support-for-altern.patch b/sys-kernel/dracut/files/030-0001-dracut-functions.sh-support-for-altern.patch
deleted file mode 100644
index e42e22db2a80..000000000000
--- a/sys-kernel/dracut/files/030-0001-dracut-functions.sh-support-for-altern.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 7db6780bf53c045975e1100b22ced174c19ce3c9 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sun, 6 Jan 2013 13:35:01 +0100
-Subject: [PATCH 1/3] dracut-functions.sh: support for alternative udev dirs -
- udevaltdirs
-
-It is required for Gentoo which moves udev from / to /usr and supports
-both /lib/udev and /usr/lib/udev for compatibility with other packages.
-
-Credits go to Alexander Tsoy <alexander@tsoy.me>.
----
- dracut-functions.sh | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index 4e1c90c..1b0c3a3 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -955,6 +955,15 @@ inst_rules() {
-     inst_dir "$_target"
-     for _rule in "$@"; do
-         if [ "${_rule#/}" = "$_rule" ]; then
-+            for r in ${udevaltdirs}; do
-+                [[ "$r" = "${udevdir}" ]] && continue
-+                if [[ -f $r/rules.d/$_rule ]]; then
-+                    _found="$r/rules.d/$_rule"
-+                    inst_rule_programs "$_found"
-+                    inst_rule_group_owner "$_found"
-+                    inst_simple "$_found" "${udevdir}/rules.d/${_found##*/}"
-+                fi
-+            done
-             for r in ${udevdir}/rules.d /etc/udev/rules.d; do
-                 if [[ -f $r/$_rule ]]; then
-                     _found="$r/$_rule"
--- 
-1.8.3.2
-
diff --git a/sys-kernel/dracut/files/030-0002-gentoo.conf-let-udevdir-be-handled-by-.patch b/sys-kernel/dracut/files/030-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
deleted file mode 100644
index fe0a9581ac42..000000000000
--- a/sys-kernel/dracut/files/030-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From abeb147411551b0b116b3a72306789734ecd7253 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sun, 16 Dec 2012 20:02:48 +0100
-Subject: [PATCH 2/3] gentoo.conf: let udevdir= be handled by pkg-config and
- use udevaltdirs
-
-To avoid need of rebuild after udev update/downgrade let udevdir= be set
-dynamically with pkg-config.  Use udevaltdirs to search for rules both
-in old and new locations.
----
- dracut.conf.d/gentoo.conf.example | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/dracut.conf.d/gentoo.conf.example b/dracut.conf.d/gentoo.conf.example
-index 1361a30..b78e5c6 100644
---- a/dracut.conf.d/gentoo.conf.example
-+++ b/dracut.conf.d/gentoo.conf.example
-@@ -1,7 +1,8 @@
- # /etc/dracut.conf.d/gentoo.conf
- # dracut config file customized for Gentoo Base System release 2
- 
--udevdir=/lib/udev
-+udevdir=
-+udevaltdirs="/lib/udev /usr/lib/udev"
- ro_mnt=yes
- 
- #
--- 
-1.8.3.2
-
diff --git a/sys-kernel/dracut/files/030-0003-LatArCyrHeb-16-as-a-default-i18n-font-.patch b/sys-kernel/dracut/files/030-0003-LatArCyrHeb-16-as-a-default-i18n-font-.patch
deleted file mode 100644
index 07ec0365d0f5..000000000000
--- a/sys-kernel/dracut/files/030-0003-LatArCyrHeb-16-as-a-default-i18n-font-.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-From b9aa302416387b5e31459c8dde21069e72001e5d Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Thu, 20 Jun 2013 20:33:14 +0200
-Subject: [PATCH 3/3] LatArCyrHeb-16 as a default i18n font for Gentoo
-
----
- dracut.conf.d/gentoo.conf.example | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/dracut.conf.d/gentoo.conf.example b/dracut.conf.d/gentoo.conf.example
-index b78e5c6..f9617f0 100644
---- a/dracut.conf.d/gentoo.conf.example
-+++ b/dracut.conf.d/gentoo.conf.example
-@@ -11,5 +11,6 @@ ro_mnt=yes
- 
- # i18n
- i18n_vars="/etc/conf.d/keymaps:keymap-KEYMAP,extended_keymaps-EXT_KEYMAPS /etc/conf.d/consolefont:consolefont-FONT,consoletranslation-FONT_MAP /etc/rc.conf:unicode-UNICODE"
-+i18n_default_font="LatArCyrHeb-16"
- 
- omit_drivers+=" i2o_scsi"
--- 
-1.8.3.2
-
diff --git a/sys-kernel/dracut/files/031-0001-dracut-functions.sh-support-for-altern.patch b/sys-kernel/dracut/files/031-0001-dracut-functions.sh-support-for-altern.patch
deleted file mode 100644
index a36324a01c7d..000000000000
--- a/sys-kernel/dracut/files/031-0001-dracut-functions.sh-support-for-altern.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 9a45dcf7c92d7e7b4ee7b0ff6ab61ae1a90f03f3 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sun, 6 Jan 2013 13:35:01 +0100
-Subject: [PATCH 1/2] dracut-functions.sh: support for alternative udev dirs -
- udevaltdirs
-
-It is required for Gentoo which moves udev from / to /usr and supports
-both /lib/udev and /usr/lib/udev for compatibility with other packages.
-
-Credits go to Alexander Tsoy <alexander@tsoy.me>.
----
- dracut-functions.sh | 9 +++++++++
- 1 file changed, 9 insertions(+)
-
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index eb1278e..eaa023c 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -960,6 +960,15 @@ inst_rules() {
-     inst_dir "$_target"
-     for _rule in "$@"; do
-         if [ "${_rule#/}" = "$_rule" ]; then
-+            for r in ${udevaltdirs}; do
-+                [[ "$r" = "${udevdir}" ]] && continue
-+                if [[ -f $r/rules.d/$_rule ]]; then
-+                    _found="$r/rules.d/$_rule"
-+                    inst_rule_programs "$_found"
-+                    inst_rule_group_owner "$_found"
-+                    inst_simple "$_found" "${udevdir}/rules.d/${_found##*/}"
-+                fi
-+            done
-             for r in ${udevdir}/rules.d /etc/udev/rules.d; do
-                 if [[ -f $r/$_rule ]]; then
-                     _found="$r/$_rule"
--- 
-1.8.3.2
-
diff --git a/sys-kernel/dracut/files/031-0002-gentoo.conf-let-udevdir-be-handled-by-.patch b/sys-kernel/dracut/files/031-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
deleted file mode 100644
index 34f8e038d515..000000000000
--- a/sys-kernel/dracut/files/031-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From fc2bb603bc17e67c66ffcf53a282aa6fb6a6261c Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sun, 16 Dec 2012 20:02:48 +0100
-Subject: [PATCH 2/2] gentoo.conf: let udevdir= be handled by pkg-config and
- use udevaltdirs
-
-To avoid need of rebuild after udev update/downgrade let udevdir= be set
-dynamically with pkg-config.  Use udevaltdirs to search for rules both
-in old and new locations.
----
- dracut.conf.d/gentoo.conf.example | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/dracut.conf.d/gentoo.conf.example b/dracut.conf.d/gentoo.conf.example
-index 26e7314..f9617f0 100644
---- a/dracut.conf.d/gentoo.conf.example
-+++ b/dracut.conf.d/gentoo.conf.example
-@@ -1,7 +1,8 @@
- # /etc/dracut.conf.d/gentoo.conf
- # dracut config file customized for Gentoo Base System release 2
- 
--udevdir=/lib/udev
-+udevdir=
-+udevaltdirs="/lib/udev /usr/lib/udev"
- ro_mnt=yes
- 
- #
--- 
-1.8.3.2
-
diff --git a/sys-kernel/dracut/files/031-0003-Revert-base-setup-correct-system-time-.patch b/sys-kernel/dracut/files/031-0003-Revert-base-setup-correct-system-time-.patch
deleted file mode 100644
index 7f2b40401f8c..000000000000
--- a/sys-kernel/dracut/files/031-0003-Revert-base-setup-correct-system-time-.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-From 744e0fded21d048f191b5dedb6d15ebb03318a20 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Wed, 31 Jul 2013 15:55:13 +0200
-Subject: [PATCH 3/3] Revert "base: setup correct system time and time zone in
- initrd"
-
-This reverts commit 77364fd6bb01ea184db73b1a5ad05da984752293.
-
-Too many problems with adjtime in the initramfs
-
-https://bugzilla.redhat.com/show_bug.cgi?id=981617
----
- modules.d/99base/init.sh         |  9 ---------
- modules.d/99base/module-setup.sh | 11 -----------
- 2 files changed, 20 deletions(-)
-
-diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
-index 0e4cac5..ae73fd2 100755
---- a/modules.d/99base/init.sh
-+++ b/modules.d/99base/init.sh
-@@ -48,15 +48,6 @@ if ! ismounted /dev; then
-     exit 1
- fi
- 
--# setup system time
--if [ -f /etc/adjtime ]; then
--    if strstr "$(cat /etc/adjtime)" LOCAL; then
--        hwclock --hctosys --localtime
--    else
--        hwclock --hctosys --utc
--    fi
--fi
--
- # prepare the /dev directory
- [ ! -h /dev/fd ] && ln -s /proc/self/fd /dev/fd >/dev/null 2>&1
- [ ! -h /dev/stdin ] && ln -s /proc/self/fd/0 /dev/stdin >/dev/null 2>&1
-diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh
-index c9ee838..842dde6 100755
---- a/modules.d/99base/module-setup.sh
-+++ b/modules.d/99base/module-setup.sh
-@@ -29,17 +29,6 @@ install() {
-     egrep '^root:' "$initdir/etc/passwd" 2>/dev/null || echo  'root:x:0:0::/root:/bin/sh' >> "$initdir/etc/passwd"
-     egrep '^nobody:' /etc/passwd >> "$initdir/etc/passwd"
- 
--    # install /etc/adjtime and time zone data
--    if [[ $hostonly ]]; then
--        dracut_install -o /etc/adjtime \
--                          /etc/localtime
--
--        # Our init.sh script needs hwclock to set system time
--        if ! dracut_module_included "systemd"; then
--            dracut_install -o hwclock
--        fi
--    fi
--
-     # install our scripts and hooks
-     inst_script "$moddir/init.sh" "/init"
-     inst_script "$moddir/initqueue.sh" "/sbin/initqueue"
--- 
-1.8.3.2
-
diff --git a/sys-kernel/dracut/files/033-0001-dracut-functions.sh-support-for-altern.patch b/sys-kernel/dracut/files/033-0001-dracut-functions.sh-support-for-altern.patch
deleted file mode 100644
index d87565823aaf..000000000000
--- a/sys-kernel/dracut/files/033-0001-dracut-functions.sh-support-for-altern.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 41ab65b884dbe289ce62f6eb7006f636b2dba878 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sun, 6 Jan 2013 13:35:01 +0100
-Subject: [PATCH 1/2] dracut-functions.sh: support for alternative udev dirs -
- udevaltdirs
-
-It is required for Gentoo which moves udev from / to /usr and supports
-both /lib/udev and /usr/lib/udev for compatibility with other packages.
-
-Credits go to Alexander Tsoy <alexander@tsoy.me>.
-
-Conflicts:
-	dracut-functions.sh
----
- dracut-functions.sh | 10 ++++++++++
- 1 file changed, 10 insertions(+)
-
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index cf33af5..b5eca31 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -872,6 +872,16 @@ inst_rules() {
-     inst_dir "$_target"
-     for _rule in "$@"; do
-         if [ "${_rule#/}" = "$_rule" ]; then
-+            for r in ${udevaltdirs}; do
-+                [[ "$r" = "${udevdir}" ]] && continue
-+                if [[ -e $r/rules.d/$_rule ]]; then
-+                    _found="$r/rules.d/$_rule"
-+                    inst_rule_programs "$_found"
-+                    inst_rule_group_owner "$_found"
-+                    inst_rule_initqueue "$_found"
-+                    inst_simple "$_found" "${udevdir}/rules.d/${_found##*/}"
-+                fi
-+            done
-             for r in ${udevdir}/rules.d ${hostonly:+/etc/udev/rules.d}; do
-                 if [[ -e $r/$_rule ]]; then
-                     _found="$r/$_rule"
--- 
-1.8.3.2
-
diff --git a/sys-kernel/dracut/files/033-0002-gentoo.conf-let-udevdir-be-handled-by-.patch b/sys-kernel/dracut/files/033-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
deleted file mode 100644
index 94a72d312dbe..000000000000
--- a/sys-kernel/dracut/files/033-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 342b61269a21b01844acdbb9b4396f4298e51c88 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sun, 16 Dec 2012 20:02:48 +0100
-Subject: [PATCH 2/2] gentoo.conf: let udevdir= be handled by pkg-config and
- use udevaltdirs
-
-To avoid need of rebuild after udev update/downgrade let udevdir= be set
-dynamically with pkg-config.  Use udevaltdirs to search for rules both
-in old and new locations.
----
- dracut.conf.d/gentoo.conf.example | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/dracut.conf.d/gentoo.conf.example b/dracut.conf.d/gentoo.conf.example
-index 26e7314..f9617f0 100644
---- a/dracut.conf.d/gentoo.conf.example
-+++ b/dracut.conf.d/gentoo.conf.example
-@@ -1,7 +1,8 @@
- # /etc/dracut.conf.d/gentoo.conf
- # dracut config file customized for Gentoo Base System release 2
- 
--udevdir=/lib/udev
-+udevdir=
-+udevaltdirs="/lib/udev /usr/lib/udev"
- ro_mnt=yes
- 
- #
--- 
-1.8.3.2
-
diff --git a/sys-kernel/dracut/files/033-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch b/sys-kernel/dracut/files/033-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch
deleted file mode 100644
index cbff97cc0edd..000000000000
--- a/sys-kernel/dracut/files/033-0003-Use-the-same-paths-in-dracut.sh-as-tho.patch
+++ /dev/null
@@ -1,74 +0,0 @@
-From 7e5b656e5880242b57bda6bf2f0ee8d4c5eb3292 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Wed, 2 Oct 2013 22:37:09 +0200
-Subject: [PATCH 3/4] Use the same paths in dracut.sh as those set with
- configure script
-
-Makefile alters destination main dracut script and sets dracutbasedir to
-the value of pkglibdir set in configure.
----
- Makefile  | 3 +++
- dracut.sh | 9 ++++-----
- 2 files changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 124a41b..ea504f5 100644
---- a/Makefile
-+++ b/Makefile
-@@ -91,6 +91,9 @@ install: dracut-version.sh
- 	mkdir -p $(DESTDIR)$(pkglibdir)/modules.d
- 	mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8
- 	install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut
-+	sed -r \
-+		-e "s|^(pkglibdir)=.*|\1=$(pkglibdir)|" \
-+		-i $(DESTDIR)$(bindir)/dracut
- 	install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages
- 	install -m 0755 mkinitrd-dracut.sh $(DESTDIR)$(bindir)/mkinitrd
- 	install -m 0755 lsinitrd.sh $(DESTDIR)$(bindir)/lsinitrd
-diff --git a/dracut.sh b/dracut.sh
-index bd905e3..768b76d 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -26,10 +26,13 @@
- # store for logging
- dracut_args=( "$@" )
- 
-+# base dirs
-+pkglibdir=/usr/lib/dracut
-+dracutbasedir="$pkglibdir"
-+
- set -o pipefail
- 
- usage() {
--    [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
-     if [[ -f $dracutbasedir/dracut-version.sh ]]; then
-         . $dracutbasedir/dracut-version.sh
-     fi
-@@ -54,7 +57,6 @@ EOF
- }
- 
- long_usage() {
--    [[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
-     if [[ -f $dracutbasedir/dracut-version.sh ]]; then
-         . $dracutbasedir/dracut-version.sh
-     fi
-@@ -542,8 +544,6 @@ export DRACUT_LOG_LEVEL=warning
-     debug=yes
- }
- 
--[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
--
- # if we were not passed a config file, try the default one
- if [[ ! -f $conffile ]]; then
-     if [[ $allowlocal ]]; then
-@@ -660,7 +660,6 @@ stdloglvl=$((stdloglvl + verbosity_mod_l))
- [[ $use_fstab_l ]] && use_fstab=$use_fstab_l
- [[ $mdadmconf_l ]] && mdadmconf=$mdadmconf_l
- [[ $lvmconf_l ]] && lvmconf=$lvmconf_l
--[[ $dracutbasedir ]] || dracutbasedir=/usr/lib/dracut
- [[ $fw_dir ]] || fw_dir="/lib/firmware/updates /lib/firmware"
- [[ $tmpdir_l ]] && tmpdir="$tmpdir_l"
- [[ $tmpdir ]] || tmpdir=/var/tmp
--- 
-1.8.3.2
-
diff --git a/sys-kernel/dracut/files/033-0004-Install-dracut-install-into-libexec-di.patch b/sys-kernel/dracut/files/033-0004-Install-dracut-install-into-libexec-di.patch
deleted file mode 100644
index aaa568481d63..000000000000
--- a/sys-kernel/dracut/files/033-0004-Install-dracut-install-into-libexec-di.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-From ddde4cb83f5f7bd5e4b4e7d8d094c3d8dbd59211 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Wed, 2 Oct 2013 22:40:43 +0200
-Subject: [PATCH 4/4] Install dracut-install into libexec dir instead of lib
- dir
-
-dracut-install script is the only thing ABI specific atm.
-
-See https://bugs.gentoo.org/show_bug.cgi?id=485218 for details on the
-problem.
----
- Makefile            | 4 +++-
- configure           | 1 +
- dracut-functions.sh | 4 ++++
- dracut.sh           | 1 +
- 4 files changed, 9 insertions(+), 1 deletion(-)
-
-diff --git a/Makefile b/Makefile
-index ea504f5..e004a79 100644
---- a/Makefile
-+++ b/Makefile
-@@ -92,6 +92,7 @@ install: dracut-version.sh
- 	mkdir -p $(DESTDIR)$(mandir)/man1 $(DESTDIR)$(mandir)/man5 $(DESTDIR)$(mandir)/man7 $(DESTDIR)$(mandir)/man8
- 	install -m 0755 dracut.sh $(DESTDIR)$(bindir)/dracut
- 	sed -r \
-+		-e "s|^(libexecdir)=.*|\1=$(libexecdir)|" \
- 		-e "s|^(pkglibdir)=.*|\1=$(pkglibdir)|" \
- 		-i $(DESTDIR)$(bindir)/dracut
- 	install -m 0755 dracut-catimages.sh $(DESTDIR)$(bindir)/dracut-catimages
-@@ -135,7 +136,8 @@ endif
- 		done \
- 	fi
- 	if [ -f install/dracut-install ]; then \
--		install -m 0755 install/dracut-install $(DESTDIR)$(pkglibdir)/dracut-install; \
-+		mkdir -p $(DESTDIR)$(libexecdir); \
-+		install -m 0755 install/dracut-install $(DESTDIR)$(libexecdir)/dracut-install; \
- 	fi
- 	mkdir -p $(DESTDIR)${prefix}/lib/kernel/install.d
- 	install -m 0755 50-dracut.install $(DESTDIR)${prefix}/lib/kernel/install.d/50-dracut.install
-diff --git a/configure b/configure
-index 19b5e1f..d2ffc2c 100755
---- a/configure
-+++ b/configure
-@@ -61,6 +61,7 @@ sbindir ?= ${sbindir:-${prefix}/sbin}
- mandir ?= ${mandir:-${prefix}/share/man}
- enable_documentation ?= ${enable_documentation:-yes}
- bindir ?= ${bindir:-${prefix}/bin}
-+libexecdir ?= ${libexecdir:-${prefix}/libexec}
- EOF
- 
- {
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index b5eca31..d6489d6 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -694,6 +694,10 @@ if ! [[ $DRACUT_INSTALL ]]; then
-     DRACUT_INSTALL=$(find_binary dracut-install)
- fi
- 
-+if ! [[ $DRACUT_INSTALL ]] && [[ -x $libexecdir/dracut-install ]]; then
-+    DRACUT_INSTALL=$libexecdir/dracut-install
-+fi
-+
- if ! [[ $DRACUT_INSTALL ]] && [[ -x $dracutbasedir/dracut-install ]]; then
-     DRACUT_INSTALL=$dracutbasedir/dracut-install
- fi
-diff --git a/dracut.sh b/dracut.sh
-index 768b76d..066d9d6 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -27,6 +27,7 @@
- dracut_args=( "$@" )
- 
- # base dirs
-+libexecdir=/usr/libexec
- pkglibdir=/usr/lib/dracut
- dracutbasedir="$pkglibdir"
- 
--- 
-1.8.3.2
-
diff --git a/sys-kernel/dracut/files/033-0005-dracut.sh-harden-host_modalias-reading.patch b/sys-kernel/dracut/files/033-0005-dracut.sh-harden-host_modalias-reading.patch
deleted file mode 100644
index 0c775702f9d1..000000000000
--- a/sys-kernel/dracut/files/033-0005-dracut.sh-harden-host_modalias-reading.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 5e588b0713bf149660817979e25fd443e319aeb9 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Fri, 13 Sep 2013 16:33:01 +0200
-Subject: [PATCH 5/9] dracut.sh: harden host_modalias reading
-
-Some weird PPC driver make their modulias unreadable
-
-$ cat /sys/devices/vio/4000/modalias
-cat: /sys/devices/vio/4000/modalias: No such device
----
- dracut.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dracut.sh b/dracut.sh
-index 066d9d6..bc46b1c 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -921,7 +921,7 @@ if [[ $hostonly ]]; then
-     declare -A host_modalias
-     find  /sys/devices/ -name modalias -print > "$initdir/.modalias"
-     while read m; do
--        host_modalias["$(<"$m")"]=1
-+        modalias="$(<"$m")" && [[ $modalias ]] && host_modalias["$modalias"]=1
-     done < "$initdir/.modalias"
-     rm -f -- "$initdir/.modalias"
- 
--- 
-1.8.3.2
-
diff --git a/sys-kernel/dracut/files/033-0006-ifup-do-not-dhcp-on-network-interface-.patch b/sys-kernel/dracut/files/033-0006-ifup-do-not-dhcp-on-network-interface-.patch
deleted file mode 100644
index fd15add1a0f5..000000000000
--- a/sys-kernel/dracut/files/033-0006-ifup-do-not-dhcp-on-network-interface-.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From dc03b57ca7fe5f83dc91b2d6b44aa67d83ccd399 Mon Sep 17 00:00:00 2001
-From: WANG Chao <chaowang@redhat.com>
-Date: Fri, 13 Sep 2013 22:28:44 +0800
-Subject: [PATCH 6/9] ifup: do not dhcp on network interface of secondary stack
-
-Configure cmdline to:
- ip=br0:dhcp bridge=br0:bond0 bond=bond0:eth0
-
-By default ifup bond0 will run dhcp on bond0, which is wrong. bond0
-isn't the top interface. we should really run dhcp on br0.
-
-So if we ifup an network interface on secondary stack, we should not
-dhcp. Fix this issue with this patch.
----
- modules.d/40network/ifup.sh | 7 +++++++
- 1 file changed, 7 insertions(+)
-
-diff --git a/modules.d/40network/ifup.sh b/modules.d/40network/ifup.sh
-index 3261647..9f6f449 100755
---- a/modules.d/40network/ifup.sh
-+++ b/modules.d/40network/ifup.sh
-@@ -336,6 +336,13 @@ for p in $(getargs ip=); do
-     exit 0
- done
- 
-+# netif isn't the top stack? Then we should exit here.
-+# eg. netif is bond0. br0 is on top of it. dhcp br0 is correct but dhcp
-+#     bond0 doesn't make sense.
-+if [ -n "$DO_BOND_SETUP" -o -n "$DO_TEAM_SETUP" -o -n "$DO_VLAN_SETUP" ]; then
-+    exit 0
-+fi
-+
- # no ip option directed at our interface?
- if [ ! -e /tmp/setup_net_${netif}.ok ]; then
-     do_dhcp -4
--- 
-1.8.3.2
-
diff --git a/sys-kernel/dracut/files/033-0007-lvm-mdraid-Fix-LVM-on-MD-activation.patch b/sys-kernel/dracut/files/033-0007-lvm-mdraid-Fix-LVM-on-MD-activation.patch
deleted file mode 100644
index 3663d6e6fb6f..000000000000
--- a/sys-kernel/dracut/files/033-0007-lvm-mdraid-Fix-LVM-on-MD-activation.patch
+++ /dev/null
@@ -1,46 +0,0 @@
-From cb669ae9816be6d213b68c380b5720f05d43e4c7 Mon Sep 17 00:00:00 2001
-From: Peter Rajnoha <prajnoha@redhat.com>
-Date: Fri, 4 Oct 2013 10:41:24 +0200
-Subject: [PATCH 7/9] lvm/mdraid: Fix LVM on MD activation
-
-The 69-dm-lvm-metad.rules set some udev env. variables that makes it
-possible to detect the right time to activate LVM on MD. The MD is very
-similar to DM during activation - it's usable only after proper device
-activation - the CHANGE event. We need to make a difference between a
-CHANGE event that comes from this activation and CHANGE event that is
-the outcome of the WATCH udev rule (otherwise we'd end up with LVM
-activation done on each CHANGE event - which is wrong).
-
-So we need the udev databse to be persistent during pivot to root fs
-even for MD devices.
----
- modules.d/90lvm/module-setup.sh                   | 2 +-
- modules.d/90mdraid/59-persistent-storage-md.rules | 1 +
- 2 files changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/90lvm/module-setup.sh b/modules.d/90lvm/module-setup.sh
-index 2ef9a51..f98ffff 100755
---- a/modules.d/90lvm/module-setup.sh
-+++ b/modules.d/90lvm/module-setup.sh
-@@ -82,7 +82,7 @@ install() {
-         } > "${initdir}/etc/lvm/lvm.conf"
-     fi
- 
--    inst_rules 11-dm-lvm.rules
-+    inst_rules 11-dm-lvm.rules 69-dm-lvm-metad.rules
-     # Gentoo ebuild for LVM2 prior to 2.02.63-r1 doesn't install above rules
-     # files, but provides the one below:
-     inst_rules 64-device-mapper.rules
-diff --git a/modules.d/90mdraid/59-persistent-storage-md.rules b/modules.d/90mdraid/59-persistent-storage-md.rules
-index bea9325..6ef858a 100644
---- a/modules.d/90mdraid/59-persistent-storage-md.rules
-+++ b/modules.d/90mdraid/59-persistent-storage-md.rules
-@@ -20,4 +20,5 @@ IMPORT{program}="/sbin/mdadm --detail --export $tempnode"
- IMPORT BLKID
- OPTIONS+="link_priority=100"
- OPTIONS+="watch"
-+OPTIONS+="db_persist"
- LABEL="md_end"
--- 
-1.8.3.2
-
diff --git a/sys-kernel/dracut/files/033-0008-mdraid-module-setup.sh-install-configs.patch b/sys-kernel/dracut/files/033-0008-mdraid-module-setup.sh-install-configs.patch
deleted file mode 100644
index c6e8d99af602..000000000000
--- a/sys-kernel/dracut/files/033-0008-mdraid-module-setup.sh-install-configs.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 5821cc78250075a855175572c420808cddcf40f5 Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Thu, 3 Oct 2013 14:54:42 +0400
-Subject: [PATCH 8/9] mdraid/module-setup.sh: install configs from
- /etc/mdadm.conf.d
-
-/etc/mdadm.conf.d directory is supported since mdadm-3.3
----
- modules.d/90mdraid/module-setup.sh | 8 ++++++++
- 1 file changed, 8 insertions(+)
-
-diff --git a/modules.d/90mdraid/module-setup.sh b/modules.d/90mdraid/module-setup.sh
-index 5df2274..45767c6 100755
---- a/modules.d/90mdraid/module-setup.sh
-+++ b/modules.d/90mdraid/module-setup.sh
-@@ -93,6 +93,14 @@ install() {
-         else
-             [ -f /etc/mdadm/mdadm.conf ] && inst /etc/mdadm/mdadm.conf /etc/mdadm.conf
-         fi
-+        if [ -d /etc/mdadm.conf.d ]; then
-+            local f
-+            inst_dir /etc/mdadm.conf.d
-+            for f in /etc/mdadm.conf.d/*.conf; do
-+                [ -f "$f" ] || continue
-+                inst "$f"
-+            done
-+        fi
-     fi
- 
-     inst_hook pre-udev 30 "$moddir/mdmon-pre-udev.sh"
--- 
-1.8.3.2
-
diff --git a/sys-kernel/dracut/files/033-0009-mdraid-module-setup.sh-fixes-for-mdadm.patch b/sys-kernel/dracut/files/033-0009-mdraid-module-setup.sh-fixes-for-mdadm.patch
deleted file mode 100644
index af4efb1d9968..000000000000
--- a/sys-kernel/dracut/files/033-0009-mdraid-module-setup.sh-fixes-for-mdadm.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-From 8cdb852fd2aa4d0746baee04018cde9b3fd04ddd Mon Sep 17 00:00:00 2001
-From: Alexander Tsoy <alexander@tsoy.me>
-Date: Sun, 29 Sep 2013 01:31:01 +0400
-Subject: [PATCH 9/9] mdraid/module-setup.sh: fixes for mdadm-3.2.6+
-
-mdadm-3.2.6+:
-Incremental assembly rule contains "--offroot" arg. Update
-regexp to catch this variant.
-
-mdadm-3.3+:
-Rules was splitted into two files: 63-md-raid-arrays.rules
-and 64-md-raid-assembly.rules. Install them both and edit
-the latter.
----
- modules.d/90mdraid/module-setup.sh | 11 ++++++++++-
- 1 file changed, 10 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/90mdraid/module-setup.sh b/modules.d/90mdraid/module-setup.sh
-index 45767c6..34aae1e 100755
---- a/modules.d/90mdraid/module-setup.sh
-+++ b/modules.d/90mdraid/module-setup.sh
-@@ -59,6 +59,7 @@ cmdline() {
- }
- 
- install() {
-+    local rule rule_path
-     inst_multiple cat
-     inst_multiple -o mdmon
-     inst $(command -v partx) /sbin/partx
-@@ -67,12 +68,20 @@ install() {
-     cmdline  >> "${initdir}/etc/cmdline.d/90mdraid.conf"
-     echo  >> "${initdir}/etc/cmdline.d/90mdraid.conf"
- 
-+    # <mdadm-3.3 udev rule
-     inst_rules 64-md-raid.rules
-+    # >=mdadm-3.3 udev rules
-+    inst_rules 63-md-raid-arrays.rules 64-md-raid-assembly.rules
-     # remove incremental assembly from stock rules, so they don't shadow
-     # 65-md-inc*.rules and its fine-grained controls, or cause other problems
-     # when we explicitly don't want certain components to be incrementally
-     # assembled
--    sed -i -r -e '/RUN\+?="[[:alpha:]/]*mdadm[[:blank:]]+(--incremental|-I)[[:blank:]]+(\$env\{DEVNAME\}|\$tempnode)"/d' "${initdir}${udevdir}/rules.d/64-md-raid.rules"
-+    for rule in 64-md-raid.rules 64-md-raid-assembly.rules; do
-+        rule_path="${initdir}${udevdir}/rules.d/${rule}"
-+        [ -f "${rule_path}" ] && sed -i -r \
-+            -e '/RUN\+?="[[:alpha:]/]*mdadm[[:blank:]]+(--incremental|-I)[[:blank:]]+(\$env\{DEVNAME\}|\$tempnode|\$devnode)/d' \
-+            "${rule_path}"
-+    done
- 
-     inst_rules "$moddir/65-md-incremental-imsm.rules"
- 
--- 
-1.8.3.2
-