Remove old versions (prior to 026) and old revisions of 026 and 027.

(Portage version: 2.1.12.5/cvs/Linux x86_64, signed Manifest commit with key F0134531E1DBFAB5)

54 files changed, 49 insertions, 5106 deletions

diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog
index f44eb111bd4a..9ef96eb95140 100644
--- a/sys-kernel/dracut/ChangeLog
+++ b/sys-kernel/dracut/ChangeLog
@@ -1,6 +1,54 @@
 # 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.122 2013/06/23 09:43:16 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.123 2013/06/23 09:51:50 aidecoe Exp $
+
+  23 Jun 2013; Amadeusz Żołnowski <aidecoe@gentoo.org> -dracut-014-r3.ebuild,
+  -dracut-018-r3.ebuild, -dracut-019-r6.ebuild, -dracut-022-r6.ebuild,
+  -dracut-023-r4.ebuild, -dracut-024-r4.ebuild, -dracut-025.ebuild,
+  -dracut-026.ebuild, -dracut-026-r1.ebuild, -dracut-027.ebuild,
+  -dracut-027-r1.ebuild, -dracut-027-r2.ebuild,
+  -files/025-0000-fix-version-print.patch,
+  -files/019-0001-90multipath-added-kpartx.rules-multipa.patch,
+  -files/024-0001-Fallback-to-external-blkid-and-path_id.patch,
+  -files/023-0001-dracut-functions.sh-find_binary-path-s.patch,
+  -files/025-0001-dracut-functions.sh-support-for-altern.patch,
+  -files/022-0001-qemu-module-setup.sh-provide-alternati.patch,
+  -files/023-0002-90crypt-call-systemd-commands-only-if-.patch,
+  -files/019-0002-Avoid-annonying-warnings-when-pkg-conf.patch,
+  -files/022-0002-Makefile-use-implicit-rules-for-instal.patch,
+  -files/024-0002-dracut-functions.sh-fixed-inst_rules-s.patch,
+  -files/025-0002-gentoo.conf-let-udevdir-be-handled-by-.patch,
+  -files/019-0003-99shutdown-remove-no-wall-argument-for.patch,
+  -files/023-0003-Fallback-to-external-blkid-and-path_id.patch,
+  -files/024-0003-dracut-functions.sh-support-for-altern.patch,
+  -files/022-0003-kernel-modules-module-setup.sh-just-op.patch,
+  -files/025-0003-rootfs-block-mount-root.sh-fixup-for-8.patch,
+  -files/022-0004-90multipath-added-kpartx.rules-multipa.patch,
+  -files/019-0004-dracut.sh-do-not-copy-var-run-and-var-.patch,
+  -files/025-0004-dracut.sh-reverting-return-value-chang.patch,
+  -files/024-0004-gentoo.conf-let-udevdir-be-handled-by-.patch,
+  -files/025-0005-Mount-proc-before-including-dracut-lib.patch,
+  -files/019-0005-dracut.sh-create-relative-symlinks-for.patch,
+  -files/022-0005-gentoo.conf-set-udevdir.patch,
+  -files/022-0006-Config-file-for-systemd-on-Gentoo.patch,
+  -files/022-0007-Remove-obsolete-gentoo-conf-file.patch,
+  -files/022-0008-95rootfs-block-fix-left-fsck-rel.-chec.patch,
+  -files/022-0009-98usrmount-use-rw-and-ro-options-inste.patch,
+  -files/022-0010-98usrmount-print-mount-options.patch,
+  -files/022-0011-dracut-lib-new-functions-listlist-and-.patch,
+  -files/022-0012-apply-ro-and-rw-options-from-cmdline-t.patch,
+  -files/022-0013-ro_mnt-option-at-build-time-to-force-r.patch,
+  -files/dracut-014-multipath-udev-rules.patch,
+  -files/022-0014-parse-root-opts-first-check-for-ro-lat.patch,
+  -files/dracut-014-usrmount-fsck-fix.patch,
+  -files/022-0015-gentoo.conf-enable-ro_mnt.patch,
+  -files/022-0016-dracut.sh-test-if-we-can-lazy-resolve-.patch,
+  -files/022-0017-99shutdown-remove-no-wall-argument-for.patch,
+  -files/022-0018-dracut.sh-do-not-copy-var-run-and-var-.patch,
+  -files/dracut-018-lsinitrd-support-symlinks.patch,
+  -files/dracut-018-multipath-udev-rules.patch,
+  -files/022-0019-dracut.sh-create-relative-symlinks-for.patch:
+  Remove old versions (prior to 026) and old revisions of 026 and 027.
 
 *dracut-029 (23 Jun 2013)
 
diff --git a/sys-kernel/dracut/dracut-014-r3.ebuild b/sys-kernel/dracut/dracut-014-r3.ebuild
deleted file mode 100644
index 1a717d770a8a..000000000000
--- a/sys-kernel/dracut/dracut-014-r3.ebuild
+++ /dev/null
@@ -1,199 +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-014-r3.ebuild,v 1.9 2013/04/09 10:09:20 ssuominen Exp $
-
-EAPI=4
-
-inherit eutils multilib
-
-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="~x86 ~amd64"
-REQUIRED_USE="dracut_modules_livenet? ( dracut_modules_dmsquash-live )
-	dracut_modules_crypt-gpg? ( dracut_modules_crypt )
-	"
-
-COMMON_MODULES="
-	dracut_modules_biosdevname
-	dracut_modules_btrfs
-	dracut_modules_caps
-	dracut_modules_crypt-gpg
-	dracut_modules_gensplash
-	dracut_modules_mdraid
-	dracut_modules_multipath
-	dracut_modules_plymouth
-	dracut_modules_syslog
-	"
-NETWORK_MODULES="
-	dracut_modules_iscsi
-	dracut_modules_livenet
-	dracut_modules_nbd
-	dracut_modules_nfs
-	"
-DM_MODULES="
-	dracut_modules_crypt
-	dracut_modules_dmraid
-	dracut_modules_dmsquash-live
-	dracut_modules_livenet
-	dracut_modules_lvm
-	"
-IUSE_DRACUT_MODULES="${COMMON_MODULES} ${DM_MODULES} ${NETWORK_MODULES}"
-IUSE="debug selinux ${IUSE_DRACUT_MODULES}"
-RESTRICT="test"
-
-NETWORK_DEPS=">=net-misc/dhcp-4.2.4_p2-r1[client] sys-apps/iproute2"
-DM_DEPS=">=sys-fs/lvm2-2.02.33"
-
-RDEPEND="
-	app-arch/cpio
-	>=app-shells/bash-4.0
-	>=app-shells/dash-0.5.4.11
-	>=sys-apps/baselayout-1.12.14-r1
-	|| ( >=sys-apps/module-init-tools-3.8 >sys-apps/kmod-5[tools] )
-	>=sys-apps/sysvinit-2.87-r3
-	>=sys-apps/util-linux-2.20
-	>=sys-fs/udev-164
-	!>=sys-fs/udev-186
-
-	debug? ( dev-util/strace )
-	selinux? ( sys-libs/libselinux sys-libs/libsepol )
-	dracut_modules_biosdevname? ( sys-apps/biosdevname )
-	dracut_modules_btrfs? ( sys-fs/btrfs-progs )
-	dracut_modules_caps? ( sys-libs/libcap )
-	dracut_modules_crypt? ( sys-fs/cryptsetup ${DM_DEPS} )
-	dracut_modules_crypt-gpg? ( app-crypt/gnupg )
-	dracut_modules_dmraid? ( sys-fs/dmraid sys-fs/multipath-tools ${DM_DEPS} )
-	dracut_modules_dmsquash-live? ( ${DM_DEPS} )
-	dracut_modules_gensplash? ( media-gfx/splashutils )
-	dracut_modules_iscsi? ( >=sys-block/open-iscsi-2.0.871.3 ${NETWORK_DEPS} )
-	dracut_modules_lvm? ( >=sys-fs/lvm2-2.02.33 )
-	dracut_modules_mdraid? ( sys-fs/mdadm )
-	dracut_modules_multipath? ( sys-fs/multipath-tools )
-	dracut_modules_nbd? ( sys-block/nbd ${NETWORK_DEPS} )
-	dracut_modules_nfs? ( net-fs/nfs-utils net-nds/rpcbind ${NETWORK_DEPS} )
-	dracut_modules_plymouth? ( >=sys-boot/plymouth-0.8.3-r1 )
-	dracut_modules_syslog? ( || ( app-admin/syslog-ng app-admin/rsyslog ) )
-	"
-DEPEND="
-	>=dev-libs/libxslt-1.1.26
-	app-text/docbook-xml-dtd:4.5
-	>=app-text/docbook-xsl-stylesheets-1.75.2
-	"
-
-#
-# 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 m
-
-	for m in $@; do
-		if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then
-			rm -rf "${modules_dir}"/$m
-		else
-			rm -rf "${modules_dir}"/[0-9][0-9]$m
-		fi
-	done
-}
-
-# Displays Gentoo Base System major release number
-base_sys_maj_ver() {
-	local line
-
-	read line < /etc/gentoo-release
-	line=${line##* }
-	echo "${line%%.*}"
-}
-
-#
-# ebuild functions
-#
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-multipath-udev-rules.patch"
-	epatch "${FILESDIR}/${P}-usrmount-fsck-fix.patch"
-}
-
-src_compile() {
-	emake WITH_SWITCH_ROOT=0
-}
-
-src_install() {
-	emake WITH_SWITCH_ROOT=0 \
-		prefix=/usr libdir="/usr/$(get_libdir)" sysconfdir=/etc DESTDIR="${D}" \
-		install
-
-	local gen2conf
-
-	dodir /var/lib/dracut/overlay
-	dodoc HACKING TODO AUTHORS NEWS README*
-
-	case "$(base_sys_maj_ver)" in
-		1) gen2conf=gentoo.conf ;;
-		2) gen2conf=gentoo-openrc.conf ;;
-		*) die "Expected ver. 1 or 2 of Gentoo Base System (/etc/gentoo-release)."
-	esac
-
-	insinto /etc/dracut.conf.d
-	newins dracut.conf.d/${gen2conf}.example ${gen2conf}
-
-	insinto /etc/logrotate.d
-	newins dracut.logrotate dracut
-
-	#
-	# Modules
-	#
-	local module
-	modules_dir="${D}/usr/$(get_libdir)/dracut/modules.d"
-
-	echo "${PF}" > "${modules_dir}"/10rpmversion/dracut-version \
-		|| die 'dracut-version failed'
-
-	# Remove modules not enabled by USE flags
-	for module in ${IUSE_DRACUT_MODULES} ; do
-		! use ${module} && rm_module ${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
-
-	! any_module ${DM_MODULES} && rm_module 90dm
-	! any_module ${NETWORK_MODULES} && rm_module 45ifcfg 40network
-
-	# Remove S/390 modules which are not tested at all
-	rm_module 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 00bootchart 05busybox 97masterkey 98ecryptfs 98integrity
-}
diff --git a/sys-kernel/dracut/dracut-018-r3.ebuild b/sys-kernel/dracut/dracut-018-r3.ebuild
deleted file mode 100644
index 4070f7c19baa..000000000000
--- a/sys-kernel/dracut/dracut-018-r3.ebuild
+++ /dev/null
@@ -1,255 +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-018-r3.ebuild,v 1.6 2013/04/09 10:09:20 ssuominen Exp $
-
-EAPI=4
-
-inherit eutils linux-info multilib
-
-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="~amd64 ~x86"
-
-REQUIRED_USE="dracut_modules_crypt-gpg? ( 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_gensplash
-	dracut_modules_mdraid
-	dracut_modules_multipath
-	dracut_modules_plymouth
-	dracut_modules_syslog
-	"
-DM_MODULES="
-	dracut_modules_crypt
-	dracut_modules_dmraid
-	dracut_modules_dmsquash-live
-	dracut_modules_livenet
-	dracut_modules_lvm
-	"
-NETWORK_MODULES="
-	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"
-
-RDEPEND="
-	app-arch/cpio
-	>=app-shells/bash-4.0
-	>=app-shells/dash-0.5.4.11
-	>=sys-apps/baselayout-1.12.14-r1
-	|| ( >=sys-apps/module-init-tools-3.8 >sys-apps/kmod-5[tools] )
-	>=sys-apps/sysvinit-2.87-r3
-	>=sys-apps/util-linux-2.21
-	>=sys-fs/udev-166
-	!>=sys-fs/udev-186
-
-	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_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 )
-	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=""
-
-#
-# 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
-}
-
-# Displays Gentoo Base System major release number
-base_sys_maj_ver() {
-	local line
-
-	read line < /etc/gentoo-release
-	line=${line##* }
-	echo "${line%%.*}"
-}
-
-#
-# ebuild functions
-#
-
-src_prepare() {
-	epatch "${FILESDIR}/${P}-multipath-udev-rules.patch"
-	epatch "${FILESDIR}/${P}-lsinitrd-support-symlinks.patch"
-}
-
-src_compile() {
-	return
-}
-
-src_install() {
-	emake prefix=/usr libdir="/usr/$(get_libdir)" sysconfdir=/etc \
-		DESTDIR="${D}" install
-
-	local gen2conf
-
-	dodir /var/lib/dracut/overlay
-	dodoc HACKING TODO AUTHORS NEWS README*
-
-	case "$(base_sys_maj_ver)" in
-		1) gen2conf=gentoo.conf ;;
-		2) gen2conf=gentoo-openrc.conf ;;
-		*) die "Expected ver. 1 or 2 of Gentoo Base System (/etc/gentoo-release)."
-	esac
-
-	insinto /etc/dracut.conf.d
-	newins dracut.conf.d/${gen2conf}.example ${gen2conf}
-
-	insinto /etc/logrotate.d
-	newins dracut.logrotate dracut
-
-	dohtml dracut.html
-
-	#
-	# Modules
-	#
-	local module
-	modules_dir="${D}/usr/$(get_libdir)/dracut/modules.d"
-
-	echo "${PF}" > "${modules_dir}"/10rpmversion/dracut-version \
-		|| die 'dracut-version failed'
-
-	# 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
-
-	# 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
-		echo
-		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."
-		echo
-
-		local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS ~MODULES"
-
-		# 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 desc_MODULES="Enable loadable module 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
-		echo
-		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 "  CONFIG_MODULES"
-		echo
-	fi
-}
diff --git a/sys-kernel/dracut/dracut-019-r6.ebuild b/sys-kernel/dracut/dracut-019-r6.ebuild
deleted file mode 100644
index 9a2f07cec01f..000000000000
--- a/sys-kernel/dracut/dracut-019-r6.ebuild
+++ /dev/null
@@ -1,255 +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-019-r6.ebuild,v 1.7 2013/04/09 10:09:20 ssuominen Exp $
-
-EAPI=4
-
-inherit eutils linux-info multilib
-
-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="~amd64 ~x86"
-
-REQUIRED_USE="dracut_modules_crypt-gpg? ( 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_gensplash
-	dracut_modules_mdraid
-	dracut_modules_multipath
-	dracut_modules_plymouth
-	dracut_modules_syslog
-	"
-DM_MODULES="
-	dracut_modules_crypt
-	dracut_modules_dmraid
-	dracut_modules_dmsquash-live
-	dracut_modules_livenet
-	dracut_modules_lvm
-	"
-NETWORK_MODULES="
-	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"
-
-RDEPEND="
-	app-arch/cpio
-	>=app-shells/bash-4.0
-	>=app-shells/dash-0.5.4.11
-	>=sys-apps/baselayout-1.12.14-r1
-	|| ( >=sys-apps/module-init-tools-3.8 >sys-apps/kmod-5[tools] )
-	>=sys-apps/sysvinit-2.87-r3
-	>=sys-apps/util-linux-2.20
-	virtual/pkgconfig
-	virtual/udev
-
-	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_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 )
-	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=""
-
-#
-# 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
-}
-
-# Displays Gentoo Base System major release number
-base_sys_maj_ver() {
-	local line
-
-	read line < /etc/gentoo-release
-	line=${line##* }
-	echo "${line%%.*}"
-}
-
-#
-# ebuild functions
-#
-
-src_prepare() {
-	epatch "${FILESDIR}/${PV}-0001-90multipath-added-kpartx.rules-multipa.patch"
-	epatch "${FILESDIR}/${PV}-0002-Avoid-annonying-warnings-when-pkg-conf.patch"
-	epatch "${FILESDIR}/${PV}-0003-99shutdown-remove-no-wall-argument-for.patch"
-	epatch "${FILESDIR}/${PV}-0004-dracut.sh-do-not-copy-var-run-and-var-.patch"
-	epatch "${FILESDIR}/${PV}-0005-dracut.sh-create-relative-symlinks-for.patch"
-}
-
-src_compile() {
-	return
-}
-
-src_install() {
-	emake prefix=/usr libdir="/usr/$(get_libdir)" sysconfdir=/etc \
-		DESTDIR="${D}" install
-
-	local gen2conf
-
-	dodir /var/lib/dracut/overlay
-	dodoc HACKING TODO AUTHORS NEWS README*
-
-	case "$(base_sys_maj_ver)" in
-		1) gen2conf=gentoo.conf ;;
-		2) gen2conf=gentoo-openrc.conf ;;
-		*) die "Expected ver. 1 or 2 of Gentoo Base System (/etc/gentoo-release)."
-	esac
-
-	insinto /etc/dracut.conf.d
-	newins dracut.conf.d/${gen2conf}.example ${gen2conf}
-
-	insinto /etc/logrotate.d
-	newins dracut.logrotate dracut
-
-	dohtml dracut.html
-
-	#
-	# Modules
-	#
-	local module
-	modules_dir="${D}/usr/$(get_libdir)/dracut/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
-
-	# 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 98systemd
-}
-
-pkg_postinst() {
-	if linux-info_get_any_version && linux_config_src_exists; then
-		echo
-		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."
-		echo
-
-		local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS ~MODULES"
-
-		# 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 desc_MODULES="Enable loadable module 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
-		echo
-		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 "  CONFIG_MODULES"
-		echo
-	fi
-}
diff --git a/sys-kernel/dracut/dracut-022-r6.ebuild b/sys-kernel/dracut/dracut-022-r6.ebuild
deleted file mode 100644
index 7c4abcaf0a75..000000000000
--- a/sys-kernel/dracut/dracut-022-r6.ebuild
+++ /dev/null
@@ -1,269 +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-022-r6.ebuild,v 1.7 2013/04/09 10:09:20 ssuominen Exp $
-
-EAPI=4
-
-inherit eutils linux-info multilib toolchain-funcs
-
-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="~amd64 ~x86"
-
-REQUIRED_USE="dracut_modules_crypt-gpg? ( 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_gensplash
-	dracut_modules_mdraid
-	dracut_modules_multipath
-	dracut_modules_plymouth
-	dracut_modules_syslog
-	"
-DM_MODULES="
-	dracut_modules_crypt
-	dracut_modules_dmraid
-	dracut_modules_dmsquash-live
-	dracut_modules_livenet
-	dracut_modules_lvm
-	"
-NETWORK_MODULES="
-	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"
-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/module-init-tools-3.8 >sys-apps/kmod-5[tools] )
-	>=sys-apps/sysvinit-2.87-r3
-	>=sys-apps/util-linux-2.20
-
-	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_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 )
-	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
-	virtual/pkgconfig
-	"
-
-#
-# 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-qemu-module-setup.sh-provide-alternati.patch"
-	epatch "${FILESDIR}/${PV}-0002-Makefile-use-implicit-rules-for-instal.patch"
-	epatch "${FILESDIR}/${PV}-0003-kernel-modules-module-setup.sh-just-op.patch"
-	epatch "${FILESDIR}/${PV}-0004-90multipath-added-kpartx.rules-multipa.patch"
-	epatch "${FILESDIR}/${PV}-0005-gentoo.conf-set-udevdir.patch"
-	epatch "${FILESDIR}/${PV}-0006-Config-file-for-systemd-on-Gentoo.patch"
-	epatch "${FILESDIR}/${PV}-0007-Remove-obsolete-gentoo-conf-file.patch"
-	epatch "${FILESDIR}/${PV}-0008-95rootfs-block-fix-left-fsck-rel.-chec.patch"
-	epatch "${FILESDIR}/${PV}-0009-98usrmount-use-rw-and-ro-options-inste.patch"
-	epatch "${FILESDIR}/${PV}-0010-98usrmount-print-mount-options.patch"
-	epatch "${FILESDIR}/${PV}-0011-dracut-lib-new-functions-listlist-and-.patch"
-	epatch "${FILESDIR}/${PV}-0012-apply-ro-and-rw-options-from-cmdline-t.patch"
-	epatch "${FILESDIR}/${PV}-0013-ro_mnt-option-at-build-time-to-force-r.patch"
-	epatch "${FILESDIR}/${PV}-0014-parse-root-opts-first-check-for-ro-lat.patch"
-	epatch "${FILESDIR}/${PV}-0015-gentoo.conf-enable-ro_mnt.patch"
-	epatch "${FILESDIR}/${PV}-0016-dracut.sh-test-if-we-can-lazy-resolve-.patch"
-	epatch "${FILESDIR}/${PV}-0017-99shutdown-remove-no-wall-argument-for.patch"
-	epatch "${FILESDIR}/${PV}-0018-dracut.sh-do-not-copy-var-run-and-var-.patch"
-	epatch "${FILESDIR}/${PV}-0019-dracut.sh-create-relative-symlinks-for.patch"
-	einfo "Removing ${S}/install/hashmap.o ..."
-	rm "${S}/install/hashmap.o" || die
-	local udevdir="$($(tc-getPKG_CONFIG) udev --variable=udevdir)"
-	[[ ${udevdir} ]] || die "Couldn't detect udevdir"
-	einfo "Setting udevdir to ${udevdir}..."
-	sed -e "s@udevdir=.*@udevdir=${udevdir}@" \
-		-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-}
-
-src_compile() {
-	emake prefix=/usr sysconfdir=/etc DESTDIR="${D}" doc
-	if use optimization; then
-		ewarn "Enabling experimental optimization!"
-		tc-export CC
-		emake prefix=/usr sysconfdir=/etc DESTDIR="${D}" install/dracut-install
-	fi
-}
-
-src_install() {
-	emake prefix=/usr libdir="/usr/$(get_libdir)" sysconfdir=/etc \
-		DESTDIR="${D}" install
-
-	dodir /var/lib/dracut/overlay
-	dodoc HACKING TODO AUTHORS NEWS README*
-
-	insinto /etc/dracut.conf.d
-	newins dracut.conf.d/gentoo.conf.example gentoo.conf
-
-	insinto /etc/logrotate.d
-	newins dracut.logrotate dracut
-
-	dohtml dracut.html
-
-	#
-	# Modules
-	#
-	local module
-	modules_dir="${D}/usr/$(get_libdir)/dracut/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
-
-	# 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 98systemd
-}
-
-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 ~MODULES"
-
-		# 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 desc_MODULES="Enable loadable module 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 "  CONFIG_MODULES"
-		ewarn ""
-	fi
-}
diff --git a/sys-kernel/dracut/dracut-023-r4.ebuild b/sys-kernel/dracut/dracut-023-r4.ebuild
deleted file mode 100644
index 5104cc9624e0..000000000000
--- a/sys-kernel/dracut/dracut-023-r4.ebuild
+++ /dev/null
@@ -1,278 +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-023-r4.ebuild,v 1.5 2013/04/09 10:09:20 ssuominen Exp $
-
-EAPI=4
-
-inherit eutils linux-info toolchain-funcs
-
-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="~amd64 ~x86"
-
-REQUIRED_USE="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 )
-	"
-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/module-init-tools-3.8 >sys-apps/kmod-5[tools] )
-	>=sys-apps/sysvinit-2.87-r3
-	>=sys-apps/util-linux-2.21
-
-	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 )
-	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
-	virtual/pkgconfig
-	"
-
-#
-# 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-find_binary-path-s.patch"
-	epatch "${FILESDIR}/${PV}-0002-90crypt-call-systemd-commands-only-if-.patch"
-	epatch "${FILESDIR}/${PV}-0003-Fallback-to-external-blkid-and-path_id.patch"
-	chmod +x "${S}/modules.d/95udev-rules/udev-rules-prepare.sh"
-
-	local udevdir="$($(tc-getPKG_CONFIG) udev --variable=udevdir)"
-	[[ ${udevdir} ]] || die "Couldn't detect udevdir"
-	einfo "Setting udevdir to ${udevdir}..."
-	sed -e "s@udevdir=.*@udevdir=\"${udevdir}\"@" \
-		-i "${S}/dracut.conf.d/gentoo.conf.example" || die
-
-	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_compile() {
-	emake prefix=/usr sysconfdir=/etc DESTDIR="${D}" doc
-	if use optimization; then
-		ewarn "Enabling experimental optimization!"
-		tc-export CC
-		emake prefix=/usr sysconfdir=/etc DESTDIR="${D}" install/dracut-install
-	fi
-}
-
-src_install() {
-	local libdir="/usr/lib"
-
-	emake prefix=/usr libdir="${libdir}" sysconfdir=/etc \
-		DESTDIR="${D}" install
-
-	dodir /var/lib/dracut/overlay
-	dodoc HACKING TODO AUTHORS NEWS README*
-
-	insinto /etc/dracut.conf.d
-	newins dracut.conf.d/gentoo.conf.example gentoo.conf
-
-	insinto /etc/logrotate.d
-	newins dracut.logrotate dracut
-
-	dohtml dracut.html
-
-	#
-	# Modules
-	#
-	local module
-	modules_dir="${D%/}/${libdir#/}/dracut/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
-
-	# 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 ~MODULES"
-
-		# 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 desc_MODULES="Enable loadable module 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 "  CONFIG_MODULES"
-		ewarn ""
-	fi
-}
diff --git a/sys-kernel/dracut/dracut-024-r4.ebuild b/sys-kernel/dracut/dracut-024-r4.ebuild
deleted file mode 100644
index e3392ca249ba..000000000000
--- a/sys-kernel/dracut/dracut-024-r4.ebuild
+++ /dev/null
@@ -1,283 +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-024-r4.ebuild,v 1.5 2013/04/09 10:09:20 ssuominen 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_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 )
-	"
-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/module-init-tools-3.8 >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 )
-	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
-	"
-
-#
-# 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-Fallback-to-external-blkid-and-path_id.patch"
-	epatch "${FILESDIR}/${PV}-0002-dracut-functions.sh-fixed-inst_rules-s.patch"
-	epatch "${FILESDIR}/${PV}-0003-dracut-functions.sh-support-for-altern.patch"
-	epatch "${FILESDIR}/${PV}-0004-gentoo.conf-let-udevdir-be-handled-by-.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_compile() {
-	emake prefix=/usr sysconfdir=/etc DESTDIR="${D}" doc
-	if use optimization; then
-		ewarn "Enabling experimental optimization!"
-		tc-export CC
-		emake prefix=/usr sysconfdir=/etc DESTDIR="${D}" install/dracut-install
-	fi
-}
-
-src_install() {
-	local libdir="/usr/lib"
-
-	emake prefix=/usr libdir="${libdir}" sysconfdir=/etc \
-		DESTDIR="${D}" install
-
-	dodir /var/lib/dracut/overlay
-	dodoc HACKING TODO AUTHORS NEWS README*
-
-	insinto /etc/dracut.conf.d
-	newins dracut.conf.d/gentoo.conf.example gentoo.conf
-
-	insinto /etc/logrotate.d
-	newins dracut.logrotate dracut
-
-	dohtml dracut.html
-
-	#
-	# Modules
-	#
-	local module
-	modules_dir="${D%/}/${libdir#/}/dracut/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
-
-	# 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 ~MODULES"
-
-		# 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 desc_MODULES="Enable loadable module 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 "  CONFIG_MODULES"
-		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-025.ebuild b/sys-kernel/dracut/dracut-025.ebuild
deleted file mode 100644
index 5a9122c202e3..000000000000
--- a/sys-kernel/dracut/dracut-025.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-025.ebuild,v 1.5 2013/04/09 10:09:20 ssuominen 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_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 )
-	"
-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/module-init-tools-3.8 >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 )
-	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-rootfs-block-mount-root.sh-fixup-for-8.patch"
-	epatch "${FILESDIR}/${PV}-0004-dracut.sh-reverting-return-value-chang.patch"
-	epatch "${FILESDIR}/${PV}-0005-Mount-proc-before-including-dracut-lib.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 /etc/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
-	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 ~MODULES"
-
-		# 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 desc_MODULES="Enable loadable module 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 "  CONFIG_MODULES"
-		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-026-r1.ebuild b/sys-kernel/dracut/dracut-026-r1.ebuild
deleted file mode 100644
index 438c3dfadd10..000000000000
--- a/sys-kernel/dracut/dracut-026-r1.ebuild
+++ /dev/null
@@ -1,291 +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-r1.ebuild,v 1.4 2013/04/09 10:09:20 ssuominen 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_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 )
-	"
-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/module-init-tools-3.8 >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 )
-	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 )
-DRACUT_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}-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="${DRACUT_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}"
-
-	insinto "${libdir}/dracut/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%/}/${libdir#/}/dracut/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
-
-	# 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 ~MODULES"
-
-		# 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 desc_MODULES="Enable loadable module 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 "  CONFIG_MODULES"
-		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-026.ebuild b/sys-kernel/dracut/dracut-026.ebuild
deleted file mode 100644
index fb16c4927787..000000000000
--- a/sys-kernel/dracut/dracut-026.ebuild
+++ /dev/null
@@ -1,289 +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.ebuild,v 1.3 2013/04/09 10:09:20 ssuominen 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_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 )
-	"
-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/module-init-tools-3.8 >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 )
-	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 )
-DRACUT_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-crypt-dmraid-mdraid-use-for_eac.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="${DRACUT_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}"
-
-	insinto "${libdir}/dracut/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%/}/${libdir#/}/dracut/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
-
-	# 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 ~MODULES"
-
-		# 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 desc_MODULES="Enable loadable module 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 "  CONFIG_MODULES"
-		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-r1.ebuild b/sys-kernel/dracut/dracut-027-r1.ebuild
deleted file mode 100644
index ec8aea37ba3c..000000000000
--- a/sys-kernel/dracut/dracut-027-r1.ebuild
+++ /dev/null
@@ -1,302 +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-r1.ebuild,v 1.1 2013/04/18 13:37:10 aidecoe Exp $
-
-EAPI=4
-
-inherit bash-completion-r1 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-199 )
-	"
-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/module-init-tools-3.8 >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 )
-	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="$($(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
-
-	newbashcomp "${PN}-bash-completion.sh" "${PN}"
-
-	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-r2.ebuild b/sys-kernel/dracut/dracut-027-r2.ebuild
deleted file mode 100644
index d8a0576576fa..000000000000
--- a/sys-kernel/dracut/dracut-027-r2.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-r2.ebuild,v 1.2 2013/05/20 18:22:56 aidecoe 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 )
-	"
-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/module-init-tools-3.8 >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 )
-	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}'"
-
-	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
-
-	newbashcomp "${PN}-bash-completion.sh" "${PN}"
-
-	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.ebuild b/sys-kernel/dracut/dracut-027.ebuild
deleted file mode 100644
index 07ca65e0c3c3..000000000000
--- a/sys-kernel/dracut/dracut-027.ebuild
+++ /dev/null
@@ -1,300 +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.ebuild,v 1.3 2013/04/09 10:09:20 ssuominen Exp $
-
-EAPI=4
-
-inherit bash-completion-r1 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-199 )
-	"
-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/module-init-tools-3.8 >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 )
-	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"
-
-	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
-
-	newbashcomp "${PN}-bash-completion.sh" "${PN}"
-
-	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/019-0001-90multipath-added-kpartx.rules-multipa.patch b/sys-kernel/dracut/files/019-0001-90multipath-added-kpartx.rules-multipa.patch
deleted file mode 100644
index 62d1b44242e6..000000000000
--- a/sys-kernel/dracut/files/019-0001-90multipath-added-kpartx.rules-multipa.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 03d8ef0c6d58573d7a1bbc86fce490324ddd6725 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Thu, 26 Jul 2012 11:38:04 +0200
-Subject: [PATCH 1/5] 90multipath: added kpartx.rules; multipath.rules -
- different prefix
-
----
- modules.d/90multipath/module-setup.sh |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh
-index bf71fdc..67d6068 100755
---- a/modules.d/90multipath/module-setup.sh
-+++ b/modules.d/90multipath/module-setup.sh
-@@ -72,6 +72,6 @@ install() {
- 
-     inst_hook pre-trigger 02 "$moddir/multipathd.sh"
-     inst_hook cleanup   02 "$moddir/multipathd-stop.sh"
--    inst_rules 40-multipath.rules
-+    inst_rules 40-multipath.rules 65-multipath.rules 66-kpartx.rules
- }
- 
--- 
-1.7.8.6
-
diff --git a/sys-kernel/dracut/files/019-0002-Avoid-annonying-warnings-when-pkg-conf.patch b/sys-kernel/dracut/files/019-0002-Avoid-annonying-warnings-when-pkg-conf.patch
deleted file mode 100644
index 0acd439e30c7..000000000000
--- a/sys-kernel/dracut/files/019-0002-Avoid-annonying-warnings-when-pkg-conf.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From c3f0423502968bcee19f307cd2dfa6762a2e5ccf Mon Sep 17 00:00:00 2001
-From: Juan RP <xtraeme@gmail.com>
-Date: Wed, 6 Jun 2012 14:19:59 +0200
-Subject: [PATCH 2/5] Avoid annonying warnings when pkg-config is not
- installed.
-
----
- dracut-functions.sh                    |    2 +-
- modules.d/95udev-rules/module-setup.sh |    4 ++--
- 2 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index f788878..4180f03 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -531,7 +531,7 @@ inst_symlink() {
-     ln -sfn $(convert_abs_rel "${_target}" "${_realsrc}") "$initdir/$_target"
- }
- 
--udevdir=$(pkg-config udev --variable=udevdir)
-+udevdir=$(pkg-config udev --variable=udevdir 2>/dev/null)
- if ! [[ -d "$udevdir" ]]; then
-     [[ -d /lib/udev ]] && udevdir=/lib/udev
-     [[ -d /usr/lib/udev ]] && udevdir=/usr/lib/udev
-diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh
-index e8c1c04..ff47021 100755
---- a/modules.d/95udev-rules/module-setup.sh
-+++ b/modules.d/95udev-rules/module-setup.sh
-@@ -5,13 +5,13 @@
- install() {
-     local _i
- 
--    systemdutildir=$(pkg-config systemd --variable=systemdutildir)
-+    systemdutildir=$(pkg-config systemd --variable=systemdutildir 2>/dev/null)
-     if ! [[ -d "$systemdutildir" ]]; then
-         [[ -d /lib/systemd ]] && systemdutildir=/lib/systemd
-         [[ -d /usr/lib/systemd ]] && systemdutildir=/usr/lib/systemd
-     fi
- 
--    udevdir=$(pkg-config udev --variable=udevdir)
-+    udevdir=$(pkg-config udev --variable=udevdir 2>/dev/null)
-     if ! [[ -d "$udevdir" ]]; then
-         [[ -d /lib/udev ]] && udevdir=/lib/udev
-         [[ -d /usr/lib/udev ]] && udevdir=/usr/lib/udev
--- 
-1.7.8.6
-
diff --git a/sys-kernel/dracut/files/019-0003-99shutdown-remove-no-wall-argument-for.patch b/sys-kernel/dracut/files/019-0003-99shutdown-remove-no-wall-argument-for.patch
deleted file mode 100644
index 49392bc18fdf..000000000000
--- a/sys-kernel/dracut/files/019-0003-99shutdown-remove-no-wall-argument-for.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 7b565af4f41615bad43f710514a4f8fb9d2d2721 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Tue, 31 Jul 2012 10:49:58 +0200
-Subject: [PATCH 3/5] 99shutdown: remove --no-wall argument for reboot, halt,
- etc...
-
-In some distros (Gentoo, for example) these commands don't honor
---no-wall argument.
----
- modules.d/99shutdown/shutdown.sh |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/modules.d/99shutdown/shutdown.sh b/modules.d/99shutdown/shutdown.sh
-index aa0a81f..e1da91b 100755
---- a/modules.d/99shutdown/shutdown.sh
-+++ b/modules.d/99shutdown/shutdown.sh
-@@ -56,7 +56,7 @@ done
- _check_shutdown final
- 
- getarg 'rd.break=shutdown' && emergency_shell --shutdown shutdown "Break before shutdown"
--[ "$1" = "reboot" ] && reboot -f -d -n --no-wall
--[ "$1" = "poweroff" ] && poweroff -f -d -n --no-wall
--[ "$1" = "halt" ] && halt -f -d -n --no-wall
-+[ "$1" = "reboot" ] && reboot -f -d -n
-+[ "$1" = "poweroff" ] && poweroff -f -d -n
-+[ "$1" = "halt" ] && halt -f -d -n
- [ "$1" = "kexec" ] && kexec -e
--- 
-1.7.8.6
-
diff --git a/sys-kernel/dracut/files/019-0004-dracut.sh-do-not-copy-var-run-and-var-.patch b/sys-kernel/dracut/files/019-0004-dracut.sh-do-not-copy-var-run-and-var-.patch
deleted file mode 100644
index 5b6cd1c84982..000000000000
--- a/sys-kernel/dracut/files/019-0004-dracut.sh-do-not-copy-var-run-and-var-.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From a2540ba4d2f6a943a957775ac9a14f9207df1860 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 31 Jul 2012 11:44:40 +0200
-Subject: [PATCH 4/5] dracut.sh: do not copy /var/run and /var/lock from the
- system
-
-https://bugs.gentoo.org/show_bug.cgi?id=428142
-
-If /var/run and /var/lock are real directories, we would end up with:
-var/lock/lock -> /run/lock
-var/run/run -> /run
-
-Conflicts:
-
-	dracut.sh
----
- dracut.sh |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/dracut.sh b/dracut.sh
-index c9e412e..8a7cb01 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -678,7 +678,7 @@ if [[ $prefix ]]; then
- fi
- 
- if [[ $kernel_only != yes ]]; then
--    for d in usr/bin usr/sbin bin etc lib "$libdir" sbin tmp usr var var/log var/run var/lock; do
-+    for d in usr/bin usr/sbin bin etc lib sbin tmp usr var var/log $libdirs; do
-         [[ -e "${initdir}${prefix}/$d" ]] && continue
-         if [ -L "/$d" ]; then
-             inst_symlink "/$d" "${prefix}/$d"
--- 
-1.7.8.6
-
diff --git a/sys-kernel/dracut/files/019-0005-dracut.sh-create-relative-symlinks-for.patch b/sys-kernel/dracut/files/019-0005-dracut.sh-create-relative-symlinks-for.patch
deleted file mode 100644
index 71c38219bc30..000000000000
--- a/sys-kernel/dracut/files/019-0005-dracut.sh-create-relative-symlinks-for.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 7c687607133e1e58a601ad328898daec4bb41f3e Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 31 Jul 2012 11:48:03 +0200
-Subject: [PATCH 5/5] dracut.sh: create relative symlinks for /var/lock and
- /var/run
-
----
- dracut.sh |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dracut.sh b/dracut.sh
-index 8a7cb01..49421f6 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -695,8 +695,8 @@ if [[ $kernel_only != yes ]]; then
-         fi
-     done
- 
--    ln -sfn /run "$initdir/var/run"
--    ln -sfn /run/lock "$initdir/var/lock"
-+    ln -sfn ../run "$initdir/var/run"
-+    ln -sfn ../run/lock "$initdir/var/lock"
- else
-     for d in lib "$libdir"; do
-         [[ -e "${initdir}${prefix}/$d" ]] && continue
--- 
-1.7.8.6
-
diff --git a/sys-kernel/dracut/files/022-0001-qemu-module-setup.sh-provide-alternati.patch b/sys-kernel/dracut/files/022-0001-qemu-module-setup.sh-provide-alternati.patch
deleted file mode 100644
index fd8a472dd8cc..000000000000
--- a/sys-kernel/dracut/files/022-0001-qemu-module-setup.sh-provide-alternati.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From e72c3bf925e277f43d1c412f6a6bc9115a2257d5 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Wed, 25 Jul 2012 16:03:49 +0200
-Subject: [PATCH 01/14] qemu*/module-setup.sh: provide alternative for
- systemd-detect-virt
-
----
- modules.d/90qemu-net/module-setup.sh |   19 +++++++++++++++----
- modules.d/90qemu/module-setup.sh     |   18 ++++++++++++++----
- 2 files changed, 29 insertions(+), 8 deletions(-)
-
-diff --git a/modules.d/90qemu-net/module-setup.sh b/modules.d/90qemu-net/module-setup.sh
-index 35c8f0f..e617230 100755
---- a/modules.d/90qemu-net/module-setup.sh
-+++ b/modules.d/90qemu-net/module-setup.sh
-@@ -3,10 +3,21 @@
- # ex: ts=8 sw=4 sts=4 et filetype=sh
- 
- check() {
--    vm=$(systemd-detect-virt --vm &>/dev/null)
--    (($? != 0)) && return 255
--    [[ $vm = "qemu" ]] && return 0
--    [[ $vm = "kvm" ]] && return 0
-+    if type -P systemd-detect-virt &>/dev/null; then
-+        vm=$(systemd-detect-virt --vm &>/dev/null)
-+        (($? != 0)) && return 255
-+        [[ $vm = "qemu" ]] && return 0
-+        [[ $vm = "kvm" ]] && return 0
-+        [[ $vm = "bochs" ]] && return 0
-+    fi
-+
-+    for i in /sys/class/dmi/id/*_vendor; do
-+        [[ -f $i ]] || continue
-+        read vendor < $i
-+        [[  "$vendor" == "QEMU" ]] && return 0
-+        [[  "$vendor" == "Bochs" ]] && return 0
-+    done
-+
-     return 255
- }
- 
-diff --git a/modules.d/90qemu/module-setup.sh b/modules.d/90qemu/module-setup.sh
-index 3e55f23..fc258ac 100755
---- a/modules.d/90qemu/module-setup.sh
-+++ b/modules.d/90qemu/module-setup.sh
-@@ -3,10 +3,20 @@
- # ex: ts=8 sw=4 sts=4 et filetype=sh
- 
- check() {
--    vm=$(systemd-detect-virt --vm &>/dev/null)
--    (($? != 0)) && return 255
--    [[ $vm = "qemu" ]] && return 0
--    [[ $vm = "kvm" ]] && return 0
-+    if type -P systemd-detect-virt &>/dev/null; then
-+        vm=$(systemd-detect-virt --vm &>/dev/null)
-+        (($? != 0)) && return 255
-+        [[ $vm = "qemu" ]] && return 0
-+        [[ $vm = "kvm" ]] && return 0
-+        [[ $vm = "bochs" ]] && return 0
-+    fi
-+
-+    for i in /sys/class/dmi/id/*_vendor; do
-+        [[ -f $i ]] || continue
-+        read vendor < $i
-+        [[  "$vendor" == "QEMU" ]] && return 0
-+        [[  "$vendor" == "Bochs" ]] && return 0
-+    done
-     return 255
- }
- 
--- 
-1.7.8.6
-
diff --git a/sys-kernel/dracut/files/022-0002-Makefile-use-implicit-rules-for-instal.patch b/sys-kernel/dracut/files/022-0002-Makefile-use-implicit-rules-for-instal.patch
deleted file mode 100644
index 042a6ce5ef80..000000000000
--- a/sys-kernel/dracut/files/022-0002-Makefile-use-implicit-rules-for-instal.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From e1199b1fdcf09549cf415bb96a34d14633324719 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Wed, 25 Jul 2012 20:37:06 +0200
-Subject: [PATCH 02/14] Makefile: use implicit rules for
- install/dracut-install
-
-Don't fail on install rule if install/dracut-install is not build - just
-skip it.  $(strip) is not used by install rule, because it is nowhere
-set.
-
-Conflicts:
-
-	Makefile
----
- Makefile |   29 ++++++++++++++---------------
- 1 files changed, 14 insertions(+), 15 deletions(-)
-
-diff --git a/Makefile b/Makefile
-index 0b29161..e36c2c2 100644
---- a/Makefile
-+++ b/Makefile
-@@ -8,6 +8,8 @@ pkglibdir ?= ${libdir}/dracut
- sysconfdir ?= ${prefix}/etc
- bindir ?= ${prefix}/bin
- mandir ?= ${prefix}/share/man
-+CFLAGS ?= -O2 -g -Wall
-+CFLAGS += -std=gnu99
- 
- manpages = dracut.8 \
- 	   dracut.cmdline.7 \
-@@ -18,22 +20,17 @@ manpages = dracut.8 \
- 
- .PHONY: install clean archive rpm testimage test all check AUTHORS doc
- 
--all: syncheck dracut-version.sh dracut-install
-+DRACUT_INSTALL_BIN = install/dracut-install
- 
--DRACUT_INSTALL_SOURCE = \
--	install/dracut-install.c \
--	install/hashmap.c\
--	install/log.c \
--	install/util.c
-+DRACUT_INSTALL_OBJECTS = \
-+        install/dracut-install.o \
-+        install/hashmap.o\
-+        install/log.o \
-+        install/util.o
- 
--DRACUT_INSTALL_HEADER = \
--	install/hashmap.h \
--	install/log.h \
--	install/macro.h \
--	install/util.h
-+all: syncheck dracut-version.sh $(DRACUT_INSTALL_BIN)
- 
--dracut-install: $(DRACUT_INSTALL_SOURCE) $(DRACUT_INSTALL_HEADER)
--	gcc -std=gnu99 -O2 -g -Wall -o dracut-install $(DRACUT_INSTALL_SOURCE)
-+$(DRACUT_INSTALL_BIN): $(DRACUT_INSTALL_OBJECTS)
- 
- indent:
- 	indent -i8 -nut -br -linux -l120 install/dracut-install.c
-@@ -88,7 +85,9 @@ install: doc dracut-version.sh
- 		ln -s ../dracut-shutdown.service \
- 		$(DESTDIR)$(systemdsystemunitdir)/shutdown.target.wants/dracut-shutdown.service; \
- 	fi
--	install $(strip) -m 0755 dracut-install $(DESTDIR)$(pkglibdir)/dracut-install
-+	if [ -x $(DRACUT_INSTALL_BIN) ]; then \
-+		install -m 0755 $(DRACUT_INSTALL_BIN) $(DESTDIR)$(pkglibdir)/dracut-install; \
-+	fi
- 
- dracut-version.sh:
- 	@echo "DRACUT_VERSION=$(VERSION)-$(GITVERSION)" > dracut-version.sh
-@@ -99,7 +98,7 @@ clean:
- 	$(RM) */*/*~
- 	$(RM) test-*.img
- 	$(RM) dracut-*.rpm dracut-*.tar.bz2
--	$(RM) dracut-install
-+	$(RM) $(DRACUT_INSTALL_BIN) $(DRACUT_INSTALL_OBJECTS)
- 	$(RM) $(manpages) dracut.html
- 	$(MAKE) -C test clean
- 
--- 
-1.7.8.6
-
diff --git a/sys-kernel/dracut/files/022-0003-kernel-modules-module-setup.sh-just-op.patch b/sys-kernel/dracut/files/022-0003-kernel-modules-module-setup.sh-just-op.patch
deleted file mode 100644
index be8670c10535..000000000000
--- a/sys-kernel/dracut/files/022-0003-kernel-modules-module-setup.sh-just-op.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 418f79110e8df91cec5bdc23dd123555515c3e86 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Mon, 23 Jul 2012 15:40:20 +0200
-Subject: [PATCH 03/14] kernel-modules/module-setup.sh: just optionally
- install all modprobe.d
-
-Conflicts:
-
-	modules.d/90kernel-modules/module-setup.sh
----
- modules.d/90kernel-modules/module-setup.sh |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/modules.d/90kernel-modules/module-setup.sh b/modules.d/90kernel-modules/module-setup.sh
-index f309de8..1632367 100755
---- a/modules.d/90kernel-modules/module-setup.sh
-+++ b/modules.d/90kernel-modules/module-setup.sh
-@@ -77,7 +77,7 @@ installkernel() {
- install() {
-     local _f i
-     [ -f /etc/modprobe.conf ] && dracut_install /etc/modprobe.conf
--    dracut_install $(find -L /{etc,lib}/modprobe.d/ -maxdepth 1 -type f -name '*.conf')
-+    dracut_install -o /{etc,lib}/modprobe.d/*.conf
-     inst_hook cmdline 01 "$moddir/parse-kernel.sh"
-     inst_simple "$moddir/insmodpost.sh" /sbin/insmodpost.sh
- }
--- 
-1.7.8.6
-
diff --git a/sys-kernel/dracut/files/022-0004-90multipath-added-kpartx.rules-multipa.patch b/sys-kernel/dracut/files/022-0004-90multipath-added-kpartx.rules-multipa.patch
deleted file mode 100644
index 04a0d079c03e..000000000000
--- a/sys-kernel/dracut/files/022-0004-90multipath-added-kpartx.rules-multipa.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 2a45f1926adebc78940358d323d85ce89499eb0f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sat, 9 Jun 2012 14:18:56 +0200
-Subject: [PATCH 04/14] 90multipath: added kpartx.rules; multipath.rules -
- different prefix
-
----
- modules.d/90multipath/module-setup.sh |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh
-index 5944d25..69c4441 100755
---- a/modules.d/90multipath/module-setup.sh
-+++ b/modules.d/90multipath/module-setup.sh
-@@ -85,6 +85,6 @@ install() {
- 
-     inst_hook pre-trigger 02 "$moddir/multipathd.sh"
-     inst_hook cleanup   02 "$moddir/multipathd-stop.sh"
--    inst_rules 40-multipath.rules
-+    inst_rules 40-multipath.rules 65-multipath.rules 66-kpartx.rules
- }
- 
--- 
-1.7.8.6
-
diff --git a/sys-kernel/dracut/files/022-0005-gentoo.conf-set-udevdir.patch b/sys-kernel/dracut/files/022-0005-gentoo.conf-set-udevdir.patch
deleted file mode 100644
index 787824783ed8..000000000000
--- a/sys-kernel/dracut/files/022-0005-gentoo.conf-set-udevdir.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 58eb0686d99510c2b7c5e1296c8487de83ab6d5b Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Thu, 26 Jul 2012 09:35:58 +0200
-Subject: [PATCH 05/14] gentoo.conf: set udevdir
-
----
- dracut.conf.d/gentoo.conf.example |    2 ++
- 1 files changed, 2 insertions(+), 0 deletions(-)
-
-diff --git a/dracut.conf.d/gentoo.conf.example b/dracut.conf.d/gentoo.conf.example
-index a40b746..6e4d89f 100644
---- a/dracut.conf.d/gentoo.conf.example
-+++ b/dracut.conf.d/gentoo.conf.example
-@@ -1,6 +1,8 @@
- # /etc/dracut.conf.d/gentoo.conf
- # Dracut config file customized for Gentoo Base System release 1
- 
-+udevdir=/lib/udev
-+
- #
- # Modules
- #
--- 
-1.7.8.6
-
diff --git a/sys-kernel/dracut/files/022-0006-Config-file-for-systemd-on-Gentoo.patch b/sys-kernel/dracut/files/022-0006-Config-file-for-systemd-on-Gentoo.patch
deleted file mode 100644
index cba84af218a3..000000000000
--- a/sys-kernel/dracut/files/022-0006-Config-file-for-systemd-on-Gentoo.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 6046e77c8d71663a0cbe643d6410c3115c502256 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Thu, 26 Jul 2012 09:35:57 +0200
-Subject: [PATCH 06/14] Config file for systemd on Gentoo.
-
----
- dracut.conf.d/gentoo-systemd.conf.example |    5 +++++
- 1 files changed, 5 insertions(+), 0 deletions(-)
- create mode 100644 dracut.conf.d/gentoo-systemd.conf.example
-
-diff --git a/dracut.conf.d/gentoo-systemd.conf.example b/dracut.conf.d/gentoo-systemd.conf.example
-new file mode 100644
-index 0000000..00af70b
---- /dev/null
-+++ b/dracut.conf.d/gentoo-systemd.conf.example
-@@ -0,0 +1,5 @@
-+# /etc/dracut.conf.d/gentoo-systemd.conf
-+
-+# Paths of systemd dirs on Gentoo
-+systemdutildir=/usr/lib/systemd
-+systemdsystemunitdir=/usr/lib/systemd/system
--- 
-1.7.8.6
-
diff --git a/sys-kernel/dracut/files/022-0007-Remove-obsolete-gentoo-conf-file.patch b/sys-kernel/dracut/files/022-0007-Remove-obsolete-gentoo-conf-file.patch
deleted file mode 100644
index 60fd03c71209..000000000000
--- a/sys-kernel/dracut/files/022-0007-Remove-obsolete-gentoo-conf-file.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From f4b47f9394194140a6703b4ace34b81637fe69dc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Thu, 26 Jul 2012 09:35:56 +0200
-Subject: [PATCH 07/14] Remove obsolete gentoo conf file.
-
----
- dracut.conf.d/gentoo-openrc.conf.example |    9 ---------
- dracut.conf.d/gentoo.conf.example        |    6 +++---
- 2 files changed, 3 insertions(+), 12 deletions(-)
- delete mode 100644 dracut.conf.d/gentoo-openrc.conf.example
-
-diff --git a/dracut.conf.d/gentoo-openrc.conf.example b/dracut.conf.d/gentoo-openrc.conf.example
-deleted file mode 100644
-index f5aa8ed..0000000
---- a/dracut.conf.d/gentoo-openrc.conf.example
-+++ /dev/null
-@@ -1,9 +0,0 @@
--# /etc/dracut.conf.d/gentoo-openrc.conf
--# Dracut config file customized for Gentoo Base System release 2
--
--#
--# Modules
--#
--
--# 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"
-diff --git a/dracut.conf.d/gentoo.conf.example b/dracut.conf.d/gentoo.conf.example
-index 6e4d89f..411f9a0 100644
---- a/dracut.conf.d/gentoo.conf.example
-+++ b/dracut.conf.d/gentoo.conf.example
-@@ -1,5 +1,5 @@
--# /etc/dracut.conf.d/gentoo.conf
--# Dracut config file customized for Gentoo Base System release 1
-+# /etc/dracut.conf.d/gentoo-openrc.conf
-+# Dracut config file customized for Gentoo Base System release 2
- 
- udevdir=/lib/udev
- 
-@@ -8,4 +8,4 @@ udevdir=/lib/udev
- #
- 
- # i18n
--i18n_vars="/etc/conf.d/keymaps:KEYMAP,EXTENDED_KEYMAPS-EXT_KEYMAPS /etc/conf.d/consolefont:CONSOLEFONT-FONT,CONSOLETRANSLATION-FONT_MAP /etc/rc.conf:UNICODE"
-+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"
--- 
-1.7.8.6
-
diff --git a/sys-kernel/dracut/files/022-0008-95rootfs-block-fix-left-fsck-rel.-chec.patch b/sys-kernel/dracut/files/022-0008-95rootfs-block-fix-left-fsck-rel.-chec.patch
deleted file mode 100644
index 5af026b822ff..000000000000
--- a/sys-kernel/dracut/files/022-0008-95rootfs-block-fix-left-fsck-rel.-chec.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 5f2516a386ee422e75ec567f7af6abba84e06083 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Thu, 26 Jul 2012 11:32:13 +0200
-Subject: [PATCH 08/14] 95rootfs-block: fix left fsck rel. checks
-
----
- modules.d/95rootfs-block/mount-root.sh |   14 ++++++++------
- 1 files changed, 8 insertions(+), 6 deletions(-)
-
-diff --git a/modules.d/95rootfs-block/mount-root.sh b/modules.d/95rootfs-block/mount-root.sh
-index e61b0e8..8259ff9 100755
---- a/modules.d/95rootfs-block/mount-root.sh
-+++ b/modules.d/95rootfs-block/mount-root.sh
-@@ -52,11 +52,11 @@ mount_root() {
-         fastboot=yes
-     fi
- 
--    if [ -f "$NEWROOT"/fsckoptions ]; then
--        fsckoptions=$(cat "$NEWROOT"/fsckoptions)
--    fi
--
-     if ! getargbool 0 rd.skipfsck; then
-+        if [ -f "$NEWROOT"/fsckoptions ]; then
-+            fsckoptions=$(cat "$NEWROOT"/fsckoptions)
-+        fi
-+
-         if [ -f "$NEWROOT"/forcefsck ] || getargbool 0 forcefsck ; then
-             fsckoptions="-f $fsckoptions"
-         elif [ -f "$NEWROOT"/.autofsck ]; then
-@@ -130,8 +130,10 @@ mount_root() {
-         mount -o remount "$NEWROOT" 2>&1 | vinfo
-     fi
- 
--    [ -f "$NEWROOT"/forcefsck ] && rm -f "$NEWROOT"/forcefsck 2>/dev/null
--    [ -f "$NEWROOT"/.autofsck ] && rm -f "$NEWROOT"/.autofsck 2>/dev/null
-+    if ! getargbool 0 rd.skipfsck; then
-+        [ -f "$NEWROOT"/forcefsck ] && rm -f "$NEWROOT"/forcefsck 2>/dev/null
-+        [ -f "$NEWROOT"/.autofsck ] && rm -f "$NEWROOT"/.autofsck 2>/dev/null
-+    fi
- }
- 
- if [ -n "$root" -a -z "${root%%block:*}" ]; then
--- 
-1.7.8.6
-
diff --git a/sys-kernel/dracut/files/022-0009-98usrmount-use-rw-and-ro-options-inste.patch b/sys-kernel/dracut/files/022-0009-98usrmount-use-rw-and-ro-options-inste.patch
deleted file mode 100644
index 565b24100952..000000000000
--- a/sys-kernel/dracut/files/022-0009-98usrmount-use-rw-and-ro-options-inste.patch
+++ /dev/null
@@ -1,82 +0,0 @@
-From ff628b5614be607925fddd22c591ab9eda9c33c8 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Thu, 26 Jul 2012 12:31:30 +0200
-Subject: [PATCH 09/14] 98usrmount: use rw and ro options instead of
- rd.usrmount.ro
-
-In result /usr is forced to be mounted ro or rw along with /.
----
- dracut.cmdline.7.asc              |   12 ++++++++----
- modules.d/98usrmount/mount-usr.sh |   18 +++++++++---------
- 2 files changed, 17 insertions(+), 13 deletions(-)
-
-diff --git a/dracut.cmdline.7.asc b/dracut.cmdline.7.asc
-index 755d641..8f642f3 100644
---- a/dracut.cmdline.7.asc
-+++ b/dracut.cmdline.7.asc
-@@ -61,6 +61,14 @@ rootfstype=ext3
-     _/etc/fstab_ of the real root will be parsed for special mount options and
-     mounted accordingly.
- 
-+**ro**::
-+    force mounting _/_ and _/usr_ (if it is a separate device) read-only.  If
-+    none of ro and rw is present, both are mounted according to _/etc/fstab_.
-+
-+**rw**::
-+    force mounting _/_ and _/usr_ (if it is a separate device) read-write.
-+    See also ro option.
-+
- **rd.fstab=0**::
-     do not honor special mount options for the root filesystem found in
-     _/etc/fstab_ of the real root.
-@@ -81,10 +89,6 @@ resume=UUID=3f5ad593-4546-4a94-a374-bcfb68aa11f7
-     the init system performs fsck before remount, you might want to use this
-     option to avoid duplication.
- 
--**rd.usrmount.ro**:
--    force mounting _/usr_ read-only.  Use this option if your init system
--    performs remount of _/usr_ the same as it does with rootfs.
--
- 
- Misc
- ~~~~
-diff --git a/modules.d/98usrmount/mount-usr.sh b/modules.d/98usrmount/mount-usr.sh
-index c277d74..98e08e3 100755
---- a/modules.d/98usrmount/mount-usr.sh
-+++ b/modules.d/98usrmount/mount-usr.sh
-@@ -57,9 +57,12 @@ mount_usr()
-                 [ -n "$rflags" ]; then
-                 # for btrfs subvolumes we have to mount /usr with the same rflags
-                 _opts="${_opts:+${_opts},}${rflags}"
--            elif getarg ro; then
--                # if "ro" is specified, we want /usr to be readonly, too
-+            elif getargbool 0 ro; then
-+                # if "ro" is specified, we want /usr to be mounted read-only
-                 _opts="${_opts:+${_opts},}ro"
-+            elif getargbool 0 rw; then
-+                # if "rw" is specified, we want /usr to be mounted read-write
-+                _opts="${_opts:+${_opts},}rw"
-             fi
-             echo "$_dev ${NEWROOT}${_mp} $_fs ${_opts} $_freq $_passno"
-             _usr_found="1"
-@@ -77,13 +80,10 @@ mount_usr()
-                 [ $_fsck_ret -ne 255 ] && echo $_fsck_ret >/run/initramfs/usr-fsck
-             fi
-         fi
--        if getargbool 0 rd.usrmount.ro; then
--            info "Mounting /usr (read-only forced)"
--            mount -r "$NEWROOT/usr" 2>&1 | vinfo
--        else
--            info "Mounting /usr"
--            mount "$NEWROOT/usr" 2>&1 | vinfo
--        fi
-+
-+        info "Mounting /usr"
-+        mount "$NEWROOT/usr" 2>&1 | vinfo
-+
-         if ! ismounted "$NEWROOT/usr"; then
-             warn "Mounting /usr to $NEWROOT/usr failed"
-             warn "*** Dropping you to a shell; the system will continue"
--- 
-1.7.8.6
-
diff --git a/sys-kernel/dracut/files/022-0010-98usrmount-print-mount-options.patch b/sys-kernel/dracut/files/022-0010-98usrmount-print-mount-options.patch
deleted file mode 100644
index f45e7f76504d..000000000000
--- a/sys-kernel/dracut/files/022-0010-98usrmount-print-mount-options.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d5ed8b1f8b1240f31953a45992cbc92ee23601bc Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Thu, 26 Jul 2012 14:54:19 +0200
-Subject: [PATCH 10/14] 98usrmount: print mount options
-
----
- modules.d/98usrmount/mount-usr.sh |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/modules.d/98usrmount/mount-usr.sh b/modules.d/98usrmount/mount-usr.sh
-index 98e08e3..f4d59b3 100755
---- a/modules.d/98usrmount/mount-usr.sh
-+++ b/modules.d/98usrmount/mount-usr.sh
-@@ -81,7 +81,7 @@ mount_usr()
-             fi
-         fi
- 
--        info "Mounting /usr"
-+        info "Mounting /usr with -o $_opts"
-         mount "$NEWROOT/usr" 2>&1 | vinfo
- 
-         if ! ismounted "$NEWROOT/usr"; then
--- 
-1.7.8.6
-
diff --git a/sys-kernel/dracut/files/022-0011-dracut-lib-new-functions-listlist-and-.patch b/sys-kernel/dracut/files/022-0011-dracut-lib-new-functions-listlist-and-.patch
deleted file mode 100644
index 2228d9814877..000000000000
--- a/sys-kernel/dracut/files/022-0011-dracut-lib-new-functions-listlist-and-.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From c01f9b4827a50f8cc3e0a4832e70616c8faf990f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sat, 30 Jun 2012 18:11:11 +0200
-Subject: [PATCH 11/14] dracut-lib: new functions: listlist and are_lists_eq
-
-listlist is like strstr for lists with specified separator and
-are_lists_eq uses listlist to check equality of specified lists.
----
- modules.d/99base/dracut-lib.sh |   38 ++++++++++++++++++++++++++++++++++++++
- 1 files changed, 38 insertions(+), 0 deletions(-)
-
-diff --git a/modules.d/99base/dracut-lib.sh b/modules.d/99base/dracut-lib.sh
-index 1ee671e..ba94b81 100755
---- a/modules.d/99base/dracut-lib.sh
-+++ b/modules.d/99base/dracut-lib.sh
-@@ -878,3 +878,41 @@ export_n()
-         [ -n "$val" ] && eval $var=\"$val\"
-     done
- }
-+
-+# returns OK if list1 contains all elements of list2, i.e. checks if list2 is a
-+# sublist of list1.  An order and a duplication doesn't matter.
-+#
-+# $1 = separator
-+# $2 = list1
-+# $3 = list2
-+# $4 = ignore values, separated by $1
-+listlist() {
-+    local _sep="$1"
-+    local _list="${_sep}${2}${_sep}"
-+    local _sublist="$3"
-+    [ -n "$4" ] && local _iglist="${_sep}${4}${_sep}"
-+    local IFS="$_sep"
-+    local _v
-+
-+    [ "$_list" = "$_sublist" ] && return 0
-+
-+    for _v in $_sublist; do
-+        if [ -n "$_v" ] && ! ( [ -n "$_iglist" ] && strstr "$_iglist" "$_v" )
-+        then
-+            strstr "$_list" "$_v" || return 1
-+        fi
-+    done
-+
-+    return 0
-+}
-+
-+# returns OK if both lists contain the same values.  An order and a duplication
-+# doesn't matter.
-+# 
-+# $1 = separator
-+# $2 = list1
-+# $3 = list2
-+# $4 = ignore values, separated by $1
-+are_lists_eq() {
-+    listlist "$1" "$2" "$3" "$4" && listlist "$1" "$3" "$2" "$4"
-+}
--- 
-1.7.8.6
-
diff --git a/sys-kernel/dracut/files/022-0012-apply-ro-and-rw-options-from-cmdline-t.patch b/sys-kernel/dracut/files/022-0012-apply-ro-and-rw-options-from-cmdline-t.patch
deleted file mode 100644
index ca2d26af3084..000000000000
--- a/sys-kernel/dracut/files/022-0012-apply-ro-and-rw-options-from-cmdline-t.patch
+++ /dev/null
@@ -1,111 +0,0 @@
-From 6e9f7b09e4316b1337642f876092dcc429efaa52 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Thu, 26 Jul 2012 13:17:05 +0200
-Subject: [PATCH 12/14] apply "ro" and "rw" options from cmdline to / mount
-
-rflags is no longer guaranteed to be non empty.  / is mounted according
-to rootflags parameter but forced ro at first.  Later it is remounted
-according to /etc/fstab + rootflags parameter and "ro"/"rw".  If
-parameters are still the same as for first mount, / isn't remounted.
-
-Conflicts:
-
-    modules.d/95rootfs-block/mount-root.sh
-    modules.d/99base/parse-root-opts.sh
----
- modules.d/95rootfs-block/mount-root.sh |   35 +++++++------------------------
- modules.d/99base/parse-root-opts.sh    |   11 +++------
- 2 files changed, 12 insertions(+), 34 deletions(-)
-
-diff --git a/modules.d/95rootfs-block/mount-root.sh b/modules.d/95rootfs-block/mount-root.sh
-index 8259ff9..b5d45c4 100755
---- a/modules.d/95rootfs-block/mount-root.sh
-+++ b/modules.d/95rootfs-block/mount-root.sh
-@@ -5,32 +5,13 @@
- type getarg >/dev/null 2>&1 || . /lib/dracut-lib.sh
- type det_fs >/dev/null 2>&1 || . /lib/fs-lib.sh
- 
--filter_rootopts() {
--    rootopts=$1
--    # strip ro and rw options
--    local OLDIFS="$IFS"
--    IFS=,
--    set -- $rootopts
--    IFS="$OLDIFS"
--    local v
--    while [ $# -gt 0 ]; do
--        case $1 in
--            defaults);;
--            *)
--                v="$v,${1}";;
--        esac
--        shift
--    done
--    rootopts=${v#,}
--    echo $rootopts
--}
--
- mount_root() {
-     local _ret
-+    local _rflags_ro="$rflags,ro"
-     # sanity - determine/fix fstype
-     rootfs=$(det_fs "${root#block:}" "$fstype")
--    while ! mount -t ${rootfs} -o "$rflags",ro "${root#block:}" "$NEWROOT"; do
--        warn "Failed to mount -t ${rootfs} -o $rflags,ro ${root#block:} $NEWROOT"
-+    while ! mount -t ${rootfs} -o "$_rflags_ro" "${root#block:}" "$NEWROOT"; do
-+        warn "Failed to mount -t ${rootfs} -o $_rflags_ro ${root#block:} $NEWROOT"
-         fsck_ask_err
-     done
- 
-@@ -96,13 +77,13 @@ mount_root() {
-                 break
-             fi
-         done < "$NEWROOT/etc/fstab"
--
--        rootopts=$(filter_rootopts $rootopts)
-     fi
- 
-     # we want rootflags (rflags) to take precedence so prepend rootopts to
--    # them; rflags is guaranteed to not be empty
--    rflags="${rootopts:+${rootopts},}${rflags}"
-+    # them
-+    rflags="${rootopts},${rflags}"
-+    rflags="${rflags#,}"
-+    rflags="${rflags%,}"
- 
-     # backslashes are treated as escape character in fstab
-     # esc_root=$(echo ${root#block:} | sed 's,\\,\\\\,g')
-@@ -125,7 +106,7 @@ mount_root() {
-     if ! ismounted "$NEWROOT"; then
-         info "Mounting ${root#block:} with -o ${rflags}"
-         mount "$NEWROOT" 2>&1 | vinfo
--    else
-+    elif ! are_lists_eq , "$rflags" "$_rflags_ro" defaults; then
-         info "Remounting ${root#block:} with -o ${rflags}"
-         mount -o remount "$NEWROOT" 2>&1 | vinfo
-     fi
-diff --git a/modules.d/99base/parse-root-opts.sh b/modules.d/99base/parse-root-opts.sh
-index 44dcc09..7b0b758 100755
---- a/modules.d/99base/parse-root-opts.sh
-+++ b/modules.d/99base/parse-root-opts.sh
-@@ -4,13 +4,10 @@
- 
- root=$(getarg root=)
- 
--if rflags="$(getarg rootflags=)"; then
--    getarg rw && rflags="${rflags},rw"
--    getarg ro && rflags="${rflags},ro"
--else
--    getarg rw && rflags=rw
--    getarg ro && rflags=ro
--fi
-+rflags="$(getarg rootflags=)"
-+getargbool 0 rw && rflags="${rflags},rw"
-+getargbool 0 ro && rflags="${rflags},ro"
-+rflags="${rflags#,}"
- 
- fstype="$(getarg rootfstype=)"
- if [ -z "$fstype" ]; then
--- 
-1.7.8.6
-
diff --git a/sys-kernel/dracut/files/022-0013-ro_mnt-option-at-build-time-to-force-r.patch b/sys-kernel/dracut/files/022-0013-ro_mnt-option-at-build-time-to-force-r.patch
deleted file mode 100644
index 429883c64e48..000000000000
--- a/sys-kernel/dracut/files/022-0013-ro_mnt-option-at-build-time-to-force-r.patch
+++ /dev/null
@@ -1,103 +0,0 @@
-From 9e32e0e7e1f8daee9f8ae2912ece8b7789f31e87 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Thu, 26 Jul 2012 16:44:09 +0200
-Subject: [PATCH 13/14] ro_mnt - option at build time to force ro mount of /
- and /usr
-
----
- dracut.conf                      |    3 +++
- dracut.conf.5.asc                |    3 +++
- dracut.sh                        |    6 +++++-
- modules.d/99base/module-setup.sh |    3 +++
- 4 files changed, 14 insertions(+), 1 deletions(-)
-
-diff --git a/dracut.conf b/dracut.conf
-index f47d571..f912acc 100644
---- a/dracut.conf
-+++ b/dracut.conf
-@@ -43,6 +43,9 @@ lvmconf="yes"
- # inhibit installation of any fsck tools
- #nofscks="yes"
- 
-+# mount / and /usr read-only by default
-+#ro_mnt="no"
-+
- # set the directory for temporary files
- # default: /var/tmp
- #tmpdir=/tmp
-diff --git a/dracut.conf.5.asc b/dracut.conf.5.asc
-index d17477d..89bbf61 100644
---- a/dracut.conf.5.asc
-+++ b/dracut.conf.5.asc
-@@ -97,6 +97,9 @@ If chrooted to another root other than the real root device, use --fstab and pro
- *nofscks=*"__{yes|no}__"::
-     If specified, inhibit installation of any fsck tools.
- 
-+*ro_mnt*
-+    Mount _/_ and _/usr_ read-only by default.
-+
- *kernel_only=*"__{yes|no}__"::
-     Only install kernel drivers and firmware files. (default=no)
- 
-diff --git a/dracut.sh b/dracut.sh
-index ffdcbcc..107fc27 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -101,6 +101,7 @@ Creates initial ramdisk images for preloading modules
-   --nolvmconf           Do not include local /etc/lvm/lvm.conf
-   --fscks [LIST]        Add a space-separated list of fsck helpers.
-   --nofscks             Inhibit installation of any fsck helpers.
-+  --ro-mnt              Mount / and /usr read-only by default.
-   -h, --help            This message
-   --debug               Output debug information of the build process
-   --profile             Output profile information of the build process
-@@ -261,6 +262,7 @@ TEMP=$(unset POSIXLY_CORRECT; getopt \
-     --long add-fstab: \
-     --long mount: \
-     --long nofscks: \
-+    --long ro-mnt \
-     --long kmoddir: \
-     --long conf: \
-     --long confdir: \
-@@ -326,6 +328,7 @@ while :; do
-         --add-fstab)   push add_fstab_l          "$2"; shift;;
-         --mount)       push fstab_lines          "$2"; shift;;
-         --nofscks)     nofscks_l="yes";;
-+        --ro-mnt)      ro_mnt_l="yes";;
-         -k|--kmoddir)  drivers_dir_l="$2"; shift;;
-         -c|--conf)     conffile="$2"; shift;;
-         --confdir)     confdir="$2"; shift;;
-@@ -558,6 +561,7 @@ stdloglvl=$((stdloglvl + verbosity_mod_l))
- [[ $compress_l ]] && compress=$compress_l
- [[ $show_modules_l ]] && show_modules=$show_modules_l
- [[ $nofscks_l ]] && nofscks="yes"
-+[[ $ro_mnt_l ]] && ro_mnt="yes"
- # eliminate IFS hackery when messing with fw_dir
- fw_dir=${fw_dir//:/ }
- 
-@@ -779,7 +783,7 @@ fi
- export initdir dracutbasedir dracutmodules drivers \
-     fw_dir drivers_dir debug no_kernel kernel_only \
-     add_drivers omit_drivers mdadmconf lvmconf filesystems \
--    use_fstab fstab_lines libdirs fscks nofscks \
-+    use_fstab fstab_lines libdirs fscks nofscks ro_mnt \
-     stdloglvl sysloglvl fileloglvl kmsgloglvl logfile \
-     debug host_fs_types host_devs sshkey add_fstab \
-     DRACUT_VERSION udevdir systemdutildir systemdsystemunitdir \
-diff --git a/modules.d/99base/module-setup.sh b/modules.d/99base/module-setup.sh
-index f20ca1a..dde1285 100755
---- a/modules.d/99base/module-setup.sh
-+++ b/modules.d/99base/module-setup.sh
-@@ -50,6 +50,9 @@ install() {
-     fi
- 
-     ln -fs /proc/self/mounts "$initdir/etc/mtab"
-+    if [[ $ro_mnt = yes ]]; then
-+        echo ro >> "${initdir}/etc/cmdline.d/base.conf"
-+    fi
- 
-     if [ -e /etc/os-release ]; then
-         . /etc/os-release
--- 
-1.7.8.6
-
diff --git a/sys-kernel/dracut/files/022-0014-parse-root-opts-first-check-for-ro-lat.patch b/sys-kernel/dracut/files/022-0014-parse-root-opts-first-check-for-ro-lat.patch
deleted file mode 100644
index 7895815b555e..000000000000
--- a/sys-kernel/dracut/files/022-0014-parse-root-opts-first-check-for-ro-lat.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From e061c0f683d4c9504ed16284fd46e8fce3845c2e Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Thu, 26 Jul 2012 15:58:27 +0200
-Subject: [PATCH 14/14] parse-root-opts: first check for ro, later for rw
-
-This order is already in 98usrmount.
----
- modules.d/99base/parse-root-opts.sh |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/modules.d/99base/parse-root-opts.sh b/modules.d/99base/parse-root-opts.sh
-index 7b0b758..b74eeb3 100755
---- a/modules.d/99base/parse-root-opts.sh
-+++ b/modules.d/99base/parse-root-opts.sh
-@@ -5,8 +5,8 @@
- root=$(getarg root=)
- 
- rflags="$(getarg rootflags=)"
--getargbool 0 rw && rflags="${rflags},rw"
- getargbool 0 ro && rflags="${rflags},ro"
-+getargbool 0 rw && rflags="${rflags},rw"
- rflags="${rflags#,}"
- 
- fstype="$(getarg rootfstype=)"
--- 
-1.7.8.6
-
diff --git a/sys-kernel/dracut/files/022-0015-gentoo.conf-enable-ro_mnt.patch b/sys-kernel/dracut/files/022-0015-gentoo.conf-enable-ro_mnt.patch
deleted file mode 100644
index 546a6d020efa..000000000000
--- a/sys-kernel/dracut/files/022-0015-gentoo.conf-enable-ro_mnt.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 5ee9d6bad16c18d17cea4a9ca737bc5583209fa0 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Thu, 26 Jul 2012 19:04:30 +0200
-Subject: [PATCH 15/15] gentoo.conf: enable ro_mnt
-
----
- dracut.conf.d/gentoo.conf.example |    1 +
- 1 files changed, 1 insertions(+), 0 deletions(-)
-
-diff --git a/dracut.conf.d/gentoo.conf.example b/dracut.conf.d/gentoo.conf.example
-index 411f9a0..6b74954 100644
---- a/dracut.conf.d/gentoo.conf.example
-+++ b/dracut.conf.d/gentoo.conf.example
-@@ -2,6 +2,7 @@
- # Dracut config file customized for Gentoo Base System release 2
- 
- udevdir=/lib/udev
-+ro_mnt=yes
- 
- #
- # Modules
--- 
-1.7.8.6
-
diff --git a/sys-kernel/dracut/files/022-0016-dracut.sh-test-if-we-can-lazy-resolve-.patch b/sys-kernel/dracut/files/022-0016-dracut.sh-test-if-we-can-lazy-resolve-.patch
deleted file mode 100644
index 99b3bc5620c4..000000000000
--- a/sys-kernel/dracut/files/022-0016-dracut.sh-test-if-we-can-lazy-resolve-.patch
+++ /dev/null
@@ -1,36 +0,0 @@
-From d642c41070e1e8f3a74346a3105a35a5c0af0058 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Mon, 30 Jul 2012 13:02:41 +0200
-Subject: [PATCH 16/16] dracut.sh: test if we can lazy resolve with ldd
-
----
- dracut.sh |    9 ++++++++-
- 1 files changed, 8 insertions(+), 1 deletions(-)
-
-diff --git a/dracut.sh b/dracut.sh
-index 107fc27..2235e9a 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -600,11 +600,18 @@ else
-     exit 1
- fi
- 
-+inst /bin/sh
-+if ! $DRACUT_INSTALL ${initdir+-D "$initdir"} -R "$initdir/bin/sh" &>/dev/null; then
-+    unset DRACUT_RESOLVE_LAZY
-+    export DRACUT_RESOLVE_DEPS=1
-+fi
-+rm -fr ${initdir}/*
-+
- if [[ -f $dracutbasedir/dracut-version.sh ]]; then
-     . $dracutbasedir/dracut-version.sh
- fi
- 
--# Verify bash version, curret minimum is 3.1
-+# Verify bash version, current minimum is 3.1
- if (( ${BASH_VERSINFO[0]} < 3 ||
-     ( ${BASH_VERSINFO[0]} == 3 && ${BASH_VERSINFO[1]} < 1 ) )); then
-     dfatal 'You need at least Bash 3.1 to use dracut, sorry.'
--- 
-1.7.8.6
-
diff --git a/sys-kernel/dracut/files/022-0017-99shutdown-remove-no-wall-argument-for.patch b/sys-kernel/dracut/files/022-0017-99shutdown-remove-no-wall-argument-for.patch
deleted file mode 100644
index 35a6751fbdf5..000000000000
--- a/sys-kernel/dracut/files/022-0017-99shutdown-remove-no-wall-argument-for.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From dd3517f38302f6e55b3cba13ec764166163be541 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Tue, 31 Jul 2012 10:49:58 +0200
-Subject: [PATCH 17/17] 99shutdown: remove --no-wall argument for reboot,
- halt, etc...
-
-In some distros (Gentoo, for example) these commands don't honor
---no-wall argument.
----
- modules.d/99shutdown/shutdown.sh |    6 +++---
- 1 files changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/modules.d/99shutdown/shutdown.sh b/modules.d/99shutdown/shutdown.sh
-index aa0a81f..e1da91b 100755
---- a/modules.d/99shutdown/shutdown.sh
-+++ b/modules.d/99shutdown/shutdown.sh
-@@ -56,7 +56,7 @@ done
- _check_shutdown final
- 
- getarg 'rd.break=shutdown' && emergency_shell --shutdown shutdown "Break before shutdown"
--[ "$1" = "reboot" ] && reboot -f -d -n --no-wall
--[ "$1" = "poweroff" ] && poweroff -f -d -n --no-wall
--[ "$1" = "halt" ] && halt -f -d -n --no-wall
-+[ "$1" = "reboot" ] && reboot -f -d -n
-+[ "$1" = "poweroff" ] && poweroff -f -d -n
-+[ "$1" = "halt" ] && halt -f -d -n
- [ "$1" = "kexec" ] && kexec -e
--- 
-1.7.8.6
-
diff --git a/sys-kernel/dracut/files/022-0018-dracut.sh-do-not-copy-var-run-and-var-.patch b/sys-kernel/dracut/files/022-0018-dracut.sh-do-not-copy-var-run-and-var-.patch
deleted file mode 100644
index 9a8e3b824a35..000000000000
--- a/sys-kernel/dracut/files/022-0018-dracut.sh-do-not-copy-var-run-and-var-.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From f5e10c1e3911a1cdc928fa0e4ab9bf775e9bac30 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 31 Jul 2012 11:44:40 +0200
-Subject: [PATCH 18/19] dracut.sh: do not copy /var/run and /var/lock from the
- system
-
-https://bugs.gentoo.org/show_bug.cgi?id=428142
-
-If /var/run and /var/lock are real directories, we would end up with:
-var/lock/lock -> /run/lock
-var/run/run -> /run
----
- dracut.sh |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/dracut.sh b/dracut.sh
-index 2235e9a..91e510c 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -810,7 +810,7 @@ if [[ $prefix ]]; then
- fi
- 
- if [[ $kernel_only != yes ]]; then
--    for d in usr/bin usr/sbin bin etc lib sbin tmp usr var var/log var/run var/lock $libdirs; do
-+    for d in usr/bin usr/sbin bin etc lib sbin tmp usr var var/log $libdirs; do
-         [[ -e "${initdir}${prefix}/$d" ]] && continue
-         if [ -L "/$d" ]; then
-             inst_symlink "/$d" "${prefix}/$d"
--- 
-1.7.8.6
-
diff --git a/sys-kernel/dracut/files/022-0019-dracut.sh-create-relative-symlinks-for.patch b/sys-kernel/dracut/files/022-0019-dracut.sh-create-relative-symlinks-for.patch
deleted file mode 100644
index 319e85aa8898..000000000000
--- a/sys-kernel/dracut/files/022-0019-dracut.sh-create-relative-symlinks-for.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From 8156e70294a911c0dc2c762f925bf544354763df Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 31 Jul 2012 11:48:03 +0200
-Subject: [PATCH 19/19] dracut.sh: create relative symlinks for /var/lock and
- /var/run
-
----
- dracut.sh |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/dracut.sh b/dracut.sh
-index 91e510c..dfe0f08 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -827,8 +827,8 @@ if [[ $kernel_only != yes ]]; then
-         fi
-     done
- 
--    ln -sfn /run "$initdir/var/run"
--    ln -sfn /run/lock "$initdir/var/lock"
-+    ln -sfn ../run "$initdir/var/run"
-+    ln -sfn ../run/lock "$initdir/var/lock"
- else
-     for d in lib "$libdir"; do
-         [[ -e "${initdir}${prefix}/$d" ]] && continue
--- 
-1.7.8.6
-
diff --git a/sys-kernel/dracut/files/023-0001-dracut-functions.sh-find_binary-path-s.patch b/sys-kernel/dracut/files/023-0001-dracut-functions.sh-find_binary-path-s.patch
deleted file mode 100644
index dace9dd95d9f..000000000000
--- a/sys-kernel/dracut/files/023-0001-dracut-functions.sh-find_binary-path-s.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 3d15bc001e6ae4d92ff749a8159f9d1bfa2a7a74 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sun, 7 Oct 2012 14:23:29 +0200
-Subject: [PATCH 1/2] dracut-functions.sh: find_binary: path starting with
- variable
-
-Credits go to Alexander Tsoy <bugs+gentoo@puleglot.ru> who provided the
-patch with following explanation:
-
-  I get messages "Skipping program $env{DM_SBIN_PATH}/..." when
-  generating initramfs. This happens because some udev rules contains
-  variables in path to command:
-
-  $ egrep -r 'IMPORT\{program\}=\"\$' /lib64/udev/rules.d/
-  /lib64/udev/rules.d/10-dm.rules:ENV{DM_COOKIE}=="?*", IMPORT{program}="$env{DM_SBIN_PATH}/dmsetup udevflags $env{DM_COOKIE}"
-
-  [...]
-
-  $ sudo dracut -f "" 3.5.4-hardened-r1
-  I: *** Including module: dm ***
-  I: Skipping program $env{DM_SBIN_PATH}/dmsetup using in udev rule 10-dm.rules as it cannot be found
----
- dracut-functions.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index 2ad8f4a..43a0e16 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -45,7 +45,7 @@ find_binary() {
-         fi
-     fi
- 
--    type -P $1
-+    type -P ${1##*/}
- }
- 
- if ! [[ $dracutbasedir ]]; then
--- 
-1.7.12
-
diff --git a/sys-kernel/dracut/files/023-0002-90crypt-call-systemd-commands-only-if-.patch b/sys-kernel/dracut/files/023-0002-90crypt-call-systemd-commands-only-if-.patch
deleted file mode 100644
index d35962d82f23..000000000000
--- a/sys-kernel/dracut/files/023-0002-90crypt-call-systemd-commands-only-if-.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From df079b0cc8f5f0e564078c89513412f37ab58771 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Sun, 7 Oct 2012 15:00:22 +0200
-Subject: [PATCH 2/2] 90crypt: call systemd commands only if systemd binaries
- are there
-
----
- modules.d/90crypt/crypt-run-generator.sh | 9 ++++++---
- 1 file changed, 6 insertions(+), 3 deletions(-)
-
-diff --git a/modules.d/90crypt/crypt-run-generator.sh b/modules.d/90crypt/crypt-run-generator.sh
-index f2f2da1..aed2f20 100755
---- a/modules.d/90crypt/crypt-run-generator.sh
-+++ b/modules.d/90crypt/crypt-run-generator.sh
-@@ -12,7 +12,10 @@ if [ -f /etc/crypttab ]; then
- fi
- 
- echo "$luks $dev" >> /etc/crypttab
--/lib/systemd/system-generators/systemd-cryptsetup-generator
--systemctl daemon-reload
--systemctl start cryptsetup.target
-+if [ -x /lib/systemd/system-generators/systemd-cryptsetup-generator ] &&
-+        command -v systemctl >/dev/null; then
-+    /lib/systemd/system-generators/systemd-cryptsetup-generator
-+    systemctl daemon-reload
-+    systemctl start cryptsetup.target
-+fi
- exit 0
--- 
-1.7.12
-
diff --git a/sys-kernel/dracut/files/023-0003-Fallback-to-external-blkid-and-path_id.patch b/sys-kernel/dracut/files/023-0003-Fallback-to-external-blkid-and-path_id.patch
deleted file mode 100644
index 97b4e462dcfd..000000000000
--- a/sys-kernel/dracut/files/023-0003-Fallback-to-external-blkid-and-path_id.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From ee71a87472029c1838d0c834e9610ee578cb6d7f Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Thu, 1 Nov 2012 09:31:01 +0100
-Subject: [PATCH 3/3] Fallback to external blkid and path_id in udev rules for
- <udev-176.
-
-Starting with commit 24a38bc1cbe461c344ce61c7e10b6d51d5689c93 dracut
-uses udev builtins but still depends on >=udev-166 in dracut.spec.  This
-patch makes dracut work with older udev again.
-
-All credits go to Alexander Tsoy <alexander@tsoy.me>; see
-
-  https://bugs.gentoo.org/show_bug.cgi?id=437700
----
- modules.d/95udev-rules/59-persistent-storage.rules |  8 +++----
- modules.d/95udev-rules/61-persistent-storage.rules |  2 +-
- modules.d/95udev-rules/module-setup.sh             |  2 ++
- modules.d/95udev-rules/udev-rules-prepare.sh       | 27 ++++++++++++++++++++++
- 4 files changed, 34 insertions(+), 5 deletions(-)
- create mode 100755 modules.d/95udev-rules/udev-rules-prepare.sh
-
-diff --git a/modules.d/95udev-rules/59-persistent-storage.rules b/modules.d/95udev-rules/59-persistent-storage.rules
-index f2756ee..c221cda 100644
---- a/modules.d/95udev-rules/59-persistent-storage.rules
-+++ b/modules.d/95udev-rules/59-persistent-storage.rules
-@@ -3,8 +3,8 @@ ACTION!="add|change", GOTO="ps_end"
- # Also don't process disks that are slated to be a multipath device
- ENV{DM_MULTIPATH_DEVICE_PATH}=="?*", GOTO="ps_end"
- 
--KERNEL=="cciss[0-9]*", IMPORT{builtin}="blkid"
--KERNEL=="nbd[0-9]*", IMPORT{builtin}="blkid"
-+KERNEL=="cciss[0-9]*", IMPORT BLKID
-+KERNEL=="nbd[0-9]*", IMPORT BLKID
- 
- 
- KERNEL!="md[0-9]*|md_d[0-9]*|md/*", KERNEL!="md*", GOTO="md_end"
-@@ -21,7 +21,7 @@ ATTR{md/array_state}=="|clear|inactive", GOTO="md_end"
- LABEL="md_ignore_state"
- 
- IMPORT{program}="/sbin/mdadm --detail --export $tempnode"
--IMPORT{builtin}="blkid"
-+IMPORT BLKID
- OPTIONS+="link_priority=100"
- OPTIONS+="watch"
- LABEL="md_end"
-@@ -34,7 +34,7 @@ ENV{DM_NAME}!="?*", GOTO="ps_end"
- ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", GOTO="ps_end"
- ENV{DM_UUID}=="CRYPT-TEMP-?*", GOTO="ps_end"
- ENV{DM_UUID}!="?*", ENV{DM_NAME}=="temporary-cryptsetup-?*", GOTO="ps_end"
--IMPORT{builtin}="blkid"
-+IMPORT BLKID
- 
- 
- LABEL="ps_end"
-diff --git a/modules.d/95udev-rules/61-persistent-storage.rules b/modules.d/95udev-rules/61-persistent-storage.rules
-index 7dbd151..37148b0 100644
---- a/modules.d/95udev-rules/61-persistent-storage.rules
-+++ b/modules.d/95udev-rules/61-persistent-storage.rules
-@@ -12,7 +12,7 @@ GOTO="pss_end"
- 
- LABEL="do_pss"
- # by-path (parent device path)
--ENV{DEVTYPE}=="disk", ENV{ID_PATH}=="", DEVPATH!="*/virtual/*", IMPORT{builtin}="path_id"
-+ENV{DEVTYPE}=="disk", ENV{ID_PATH}=="", DEVPATH!="*/virtual/*", IMPORT PATH_ID
- ENV{DEVTYPE}=="disk", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}"
- ENV{DEVTYPE}=="partition", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}-part%n"
- 
-diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh
-index 2e3c955..a9a8655 100755
---- a/modules.d/95udev-rules/module-setup.sh
-+++ b/modules.d/95udev-rules/module-setup.sh
-@@ -55,5 +55,7 @@ install() {
-         inst_script "$moddir/load-modules.sh" /lib/udev/load-modules.sh
- 
-     inst_libdir_file "libnss_files*"
-+
-+    inst_hook pre-udev 10 "$moddir/udev-rules-prepare.sh"
- }
- 
-diff --git a/modules.d/95udev-rules/udev-rules-prepare.sh b/modules.d/95udev-rules/udev-rules-prepare.sh
-new file mode 100755
-index 0000000..a340e38
---- /dev/null
-+++ b/modules.d/95udev-rules/udev-rules-prepare.sh
-@@ -0,0 +1,27 @@
-+#!/bin/sh
-+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-+# ex: ts=8 sw=4 sts=4 et filetype=sh
-+
-+[ -z "$UDEVVERSION" ] && UDEVVERSION=$(udevadm --version)
-+
-+for f in /etc/udev/rules.d/*-persistent-storage.rules; do
-+    [ -e "$f" ] || continue
-+    while read line; do
-+        if [ "${line%%IMPORT PATH_ID}" != "$line" ]; then
-+            if [ $UDEVVERSION -ge 174 ]; then
-+                printf '%sIMPORT{builtin}="path_id"\n' "${line%%IMPORT PATH_ID}"
-+            else
-+                printf '%sIMPORT{program}="path_id %%p"\n' "${line%%IMPORT PATH_ID}"
-+            fi
-+        elif [ "${line%%IMPORT BLKID}" != "$line" ]; then
-+            if [ $UDEVVERSION -ge 176 ]; then
-+                printf '%sIMPORT{builtin}="blkid"\n' "${line%%IMPORT BLKID}"
-+            else
-+                printf '%sIMPORT{program}="/sbin/blkid -o udev -p $tempnode"\n' "${line%%IMPORT BLKID}"
-+            fi
-+        else
-+            echo "$line"
-+        fi
-+    done < "${f}" > "${f}.new"
-+    mv "${f}.new" "$f"
-+done
--- 
-1.7.12.4
-
diff --git a/sys-kernel/dracut/files/024-0001-Fallback-to-external-blkid-and-path_id.patch b/sys-kernel/dracut/files/024-0001-Fallback-to-external-blkid-and-path_id.patch
deleted file mode 100644
index 4951ad299cfb..000000000000
--- a/sys-kernel/dracut/files/024-0001-Fallback-to-external-blkid-and-path_id.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From 2a0b056b156c471a8cf5cbac918f9bfc30f86e06 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Thu, 1 Nov 2012 09:31:01 +0100
-Subject: [PATCH 1/3] Fallback to external blkid and path_id in udev rules for
- <udev-176.
-
-Starting with commit 24a38bc1cbe461c344ce61c7e10b6d51d5689c93 dracut
-uses udev builtins but still depends on >=udev-166 in dracut.spec.  This
-patch makes dracut work with older udev again.
-
-All credits go to Alexander Tsoy <alexander@tsoy.me>; see
-
-  https://bugs.gentoo.org/show_bug.cgi?id=437700
----
- modules.d/95udev-rules/59-persistent-storage.rules |  8 +++----
- modules.d/95udev-rules/61-persistent-storage.rules |  2 +-
- modules.d/95udev-rules/module-setup.sh             |  2 ++
- modules.d/95udev-rules/udev-rules-prepare.sh       | 27 ++++++++++++++++++++++
- 4 files changed, 34 insertions(+), 5 deletions(-)
- create mode 100755 modules.d/95udev-rules/udev-rules-prepare.sh
-
-diff --git a/modules.d/95udev-rules/59-persistent-storage.rules b/modules.d/95udev-rules/59-persistent-storage.rules
-index f2756ee..c221cda 100644
---- a/modules.d/95udev-rules/59-persistent-storage.rules
-+++ b/modules.d/95udev-rules/59-persistent-storage.rules
-@@ -3,8 +3,8 @@ ACTION!="add|change", GOTO="ps_end"
- # Also don't process disks that are slated to be a multipath device
- ENV{DM_MULTIPATH_DEVICE_PATH}=="?*", GOTO="ps_end"
- 
--KERNEL=="cciss[0-9]*", IMPORT{builtin}="blkid"
--KERNEL=="nbd[0-9]*", IMPORT{builtin}="blkid"
-+KERNEL=="cciss[0-9]*", IMPORT BLKID
-+KERNEL=="nbd[0-9]*", IMPORT BLKID
- 
- 
- KERNEL!="md[0-9]*|md_d[0-9]*|md/*", KERNEL!="md*", GOTO="md_end"
-@@ -21,7 +21,7 @@ ATTR{md/array_state}=="|clear|inactive", GOTO="md_end"
- LABEL="md_ignore_state"
- 
- IMPORT{program}="/sbin/mdadm --detail --export $tempnode"
--IMPORT{builtin}="blkid"
-+IMPORT BLKID
- OPTIONS+="link_priority=100"
- OPTIONS+="watch"
- LABEL="md_end"
-@@ -34,7 +34,7 @@ ENV{DM_NAME}!="?*", GOTO="ps_end"
- ENV{DM_UDEV_DISABLE_OTHER_RULES_FLAG}=="1", GOTO="ps_end"
- ENV{DM_UUID}=="CRYPT-TEMP-?*", GOTO="ps_end"
- ENV{DM_UUID}!="?*", ENV{DM_NAME}=="temporary-cryptsetup-?*", GOTO="ps_end"
--IMPORT{builtin}="blkid"
-+IMPORT BLKID
- 
- 
- LABEL="ps_end"
-diff --git a/modules.d/95udev-rules/61-persistent-storage.rules b/modules.d/95udev-rules/61-persistent-storage.rules
-index 7dbd151..37148b0 100644
---- a/modules.d/95udev-rules/61-persistent-storage.rules
-+++ b/modules.d/95udev-rules/61-persistent-storage.rules
-@@ -12,7 +12,7 @@ GOTO="pss_end"
- 
- LABEL="do_pss"
- # by-path (parent device path)
--ENV{DEVTYPE}=="disk", ENV{ID_PATH}=="", DEVPATH!="*/virtual/*", IMPORT{builtin}="path_id"
-+ENV{DEVTYPE}=="disk", ENV{ID_PATH}=="", DEVPATH!="*/virtual/*", IMPORT PATH_ID
- ENV{DEVTYPE}=="disk", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}"
- ENV{DEVTYPE}=="partition", ENV{ID_PATH}=="?*", SYMLINK+="disk/by-path/$env{ID_PATH}-part%n"
- 
-diff --git a/modules.d/95udev-rules/module-setup.sh b/modules.d/95udev-rules/module-setup.sh
-index 533dfeb..54a192e 100755
---- a/modules.d/95udev-rules/module-setup.sh
-+++ b/modules.d/95udev-rules/module-setup.sh
-@@ -74,5 +74,7 @@ install() {
-         inst_script "$moddir/load-modules.sh" /lib/udev/load-modules.sh
- 
-     inst_libdir_file "libnss_files*"
-+
-+    inst_hook pre-udev 10 "$moddir/udev-rules-prepare.sh"
- }
- 
-diff --git a/modules.d/95udev-rules/udev-rules-prepare.sh b/modules.d/95udev-rules/udev-rules-prepare.sh
-new file mode 100755
-index 0000000..a340e38
---- /dev/null
-+++ b/modules.d/95udev-rules/udev-rules-prepare.sh
-@@ -0,0 +1,27 @@
-+#!/bin/sh
-+# -*- mode: shell-script; indent-tabs-mode: nil; sh-basic-offset: 4; -*-
-+# ex: ts=8 sw=4 sts=4 et filetype=sh
-+
-+[ -z "$UDEVVERSION" ] && UDEVVERSION=$(udevadm --version)
-+
-+for f in /etc/udev/rules.d/*-persistent-storage.rules; do
-+    [ -e "$f" ] || continue
-+    while read line; do
-+        if [ "${line%%IMPORT PATH_ID}" != "$line" ]; then
-+            if [ $UDEVVERSION -ge 174 ]; then
-+                printf '%sIMPORT{builtin}="path_id"\n' "${line%%IMPORT PATH_ID}"
-+            else
-+                printf '%sIMPORT{program}="path_id %%p"\n' "${line%%IMPORT PATH_ID}"
-+            fi
-+        elif [ "${line%%IMPORT BLKID}" != "$line" ]; then
-+            if [ $UDEVVERSION -ge 176 ]; then
-+                printf '%sIMPORT{builtin}="blkid"\n' "${line%%IMPORT BLKID}"
-+            else
-+                printf '%sIMPORT{program}="/sbin/blkid -o udev -p $tempnode"\n' "${line%%IMPORT BLKID}"
-+            fi
-+        else
-+            echo "$line"
-+        fi
-+    done < "${f}" > "${f}.new"
-+    mv "${f}.new" "$f"
-+done
--- 
-1.8.0.2
-
diff --git a/sys-kernel/dracut/files/024-0002-dracut-functions.sh-fixed-inst_rules-s.patch b/sys-kernel/dracut/files/024-0002-dracut-functions.sh-fixed-inst_rules-s.patch
deleted file mode 100644
index ac611f0b047f..000000000000
--- a/sys-kernel/dracut/files/024-0002-dracut-functions.sh-fixed-inst_rules-s.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d49d600c12ed2a2ed057b082a46e3139ebe6afe5 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Thu, 3 Jan 2013 09:29:05 +0100
-Subject: [PATCH 2/4] dracut-functions.sh: fixed inst_rules search path
-
----
- dracut-functions.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/dracut-functions.sh b/dracut-functions.sh
-index f1c797c..5481368 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -900,7 +900,7 @@ inst_rules() {
-     inst_dir "${udevdir}/rules.d"
-     inst_dir "$_target"
-     for _rule in "$@"; do
--        if [ "${rule#/}" = "$rule" ]; then
-+        if [ "${_rule#/}" = "$_rule" ]; then
-             for r in ${udevdir}/rules.d /etc/udev/rules.d; do
-                 if [[ -f $r/$_rule ]]; then
-                     _found="$r/$_rule"
--- 
-1.8.0.2
-
diff --git a/sys-kernel/dracut/files/024-0003-dracut-functions.sh-support-for-altern.patch b/sys-kernel/dracut/files/024-0003-dracut-functions.sh-support-for-altern.patch
deleted file mode 100644
index 6773088c39b2..000000000000
--- a/sys-kernel/dracut/files/024-0003-dracut-functions.sh-support-for-altern.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From f0beefbb40b90ac53896dcc0d4b9ee33369373e8 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 3/4] 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 5481368..5b6394e 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -901,6 +901,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.0.2
-
diff --git a/sys-kernel/dracut/files/024-0004-gentoo.conf-let-udevdir-be-handled-by-.patch b/sys-kernel/dracut/files/024-0004-gentoo.conf-let-udevdir-be-handled-by-.patch
deleted file mode 100644
index 98e71b6b1e1c..000000000000
--- a/sys-kernel/dracut/files/024-0004-gentoo.conf-let-udevdir-be-handled-by-.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 3380611905062ef7796114a45502882b1ed0df65 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 4/4] 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.0.2
-
diff --git a/sys-kernel/dracut/files/025-0000-fix-version-print.patch b/sys-kernel/dracut/files/025-0000-fix-version-print.patch
deleted file mode 100644
index 3607fb24552c..000000000000
--- a/sys-kernel/dracut/files/025-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/025-0001-dracut-functions.sh-support-for-altern.patch b/sys-kernel/dracut/files/025-0001-dracut-functions.sh-support-for-altern.patch
deleted file mode 100644
index e23318cb0990..000000000000
--- a/sys-kernel/dracut/files/025-0001-dracut-functions.sh-support-for-altern.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From fcb28882b1eaaa20ad9d831857ecf176dd0e3006 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/5] 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 e23db76..812ea2b 100755
---- a/dracut-functions.sh
-+++ b/dracut-functions.sh
-@@ -941,6 +941,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/025-0002-gentoo.conf-let-udevdir-be-handled-by-.patch b/sys-kernel/dracut/files/025-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
deleted file mode 100644
index 3a1c8d1adb39..000000000000
--- a/sys-kernel/dracut/files/025-0002-gentoo.conf-let-udevdir-be-handled-by-.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From 1f8ab99eca988b15e9573155dd6207cc82842aff 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/5] 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/025-0003-rootfs-block-mount-root.sh-fixup-for-8.patch b/sys-kernel/dracut/files/025-0003-rootfs-block-mount-root.sh-fixup-for-8.patch
deleted file mode 100644
index ed265b09d6f8..000000000000
--- a/sys-kernel/dracut/files/025-0003-rootfs-block-mount-root.sh-fixup-for-8.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 6cf23a82629409c25d5d36ca71a02171075705ab Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Wed, 23 Jan 2013 16:23:07 +0100
-Subject: [PATCH 3/5] rootfs-block/mount-root.sh: fixup for 8b6bf0ef5
-
-not only fix the warning message, but the real mount arguments, too
----
- modules.d/95rootfs-block/mount-root.sh | 3 ++-
- 1 file changed, 2 insertions(+), 1 deletion(-)
-
-diff --git a/modules.d/95rootfs-block/mount-root.sh b/modules.d/95rootfs-block/mount-root.sh
-index 54d5012..c7626c3 100755
---- a/modules.d/95rootfs-block/mount-root.sh
-+++ b/modules.d/95rootfs-block/mount-root.sh
-@@ -26,9 +26,10 @@ mount_root() {
-     fi
- 
-     _rflags_ro="$rflags,ro"
-+    _rflags_ro="${_rflags_ro##,}"
- 
-     while ! mount -t ${rootfs} -o "$_rflags_ro" "${root#block:}" "$NEWROOT"; do
--        warn "Failed to mount -t ${rootfs} -o ${_rflags_ro##,} ${root#block:} $NEWROOT"
-+        warn "Failed to mount -t ${rootfs} -o $_rflags_ro ${root#block:} $NEWROOT"
-         fsck_ask_err
-     done
- 
--- 
-1.8.1.4
-
diff --git a/sys-kernel/dracut/files/025-0004-dracut.sh-reverting-return-value-chang.patch b/sys-kernel/dracut/files/025-0004-dracut.sh-reverting-return-value-chang.patch
deleted file mode 100644
index 9816ef811d14..000000000000
--- a/sys-kernel/dracut/files/025-0004-dracut.sh-reverting-return-value-chang.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-From 826b11e8adea942a7fb63fa54374d5571aab0930 Mon Sep 17 00:00:00 2001
-From: Harald Hoyer <harald@redhat.com>
-Date: Tue, 5 Feb 2013 16:45:42 +0100
-Subject: [PATCH 4/5] dracut.sh: reverting return value change
-
-reverting _get_fs_type() return values of patch
-c8d685c9d3860e49f39a9c85ffebbb4c4fec341f
----
- dracut.sh | 8 ++++----
- 1 file changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/dracut.sh b/dracut.sh
-index cfd10a1..23ffaa4 100755
---- a/dracut.sh
-+++ b/dracut.sh
-@@ -766,18 +766,18 @@ if [[ $hostonly ]]; then
- fi
- 
- _get_fs_type() (
--    [[ $1 ]] || return 1
-+    [[ $1 ]] || return
-     if [[ -b $1 ]] && get_fs_env $1; then
-         echo "$(readlink -f $1)|$ID_FS_TYPE"
--        return 0
-+        return 1
-     fi
-     if [[ -b /dev/block/$1 ]] && get_fs_env /dev/block/$1; then
-         echo "$(readlink -f /dev/block/$1)|$ID_FS_TYPE"
--        return 0
-+        return 1
-     fi
-     if fstype=$(find_dev_fstype $1); then
-         echo "$1|$fstype"
--        return 0
-+        return 1
-     fi
-     return 1
- )
--- 
-1.8.1.4
-
diff --git a/sys-kernel/dracut/files/025-0005-Mount-proc-before-including-dracut-lib.patch b/sys-kernel/dracut/files/025-0005-Mount-proc-before-including-dracut-lib.patch
deleted file mode 100644
index 6457b6cc1ecc..000000000000
--- a/sys-kernel/dracut/files/025-0005-Mount-proc-before-including-dracut-lib.patch
+++ /dev/null
@@ -1,44 +0,0 @@
-From 8ad40b5d5f3f036f38eb328cb35e8d0f8a1b3df2 Mon Sep 17 00:00:00 2001
-From: Colin Guthrie <colin@mageia.org>
-Date: Sat, 26 Jan 2013 18:13:28 +0000
-Subject: [PATCH 5/5] Mount /proc before including dracut-lib.sh.
-
-When dracut-lib.sh is sourced it checks the command line (when not using systemd)
-as part of the check_quiet() call.
-
-Therefore mount /proc earlier in init.
-
-Avoids the error:
-
-init: 77: /lib/dracut-lib.sh: /proc/cmdline: No such file or directory
----
- modules.d/99base/init.sh | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/modules.d/99base/init.sh b/modules.d/99base/init.sh
-index 0259053..37b5996 100755
---- a/modules.d/99base/init.sh
-+++ b/modules.d/99base/init.sh
-@@ -17,9 +17,6 @@ OLDPATH=$PATH
- PATH=/usr/sbin:/usr/bin:/sbin:/bin
- export PATH
- 
--RD_DEBUG=""
--. /lib/dracut-lib.sh
--
- # mount some important things
- [ ! -d /proc/self ] && \
-     mount -t proc -o nosuid,noexec,nodev proc /proc >/dev/null
-@@ -37,6 +34,9 @@ if [ "$?" != "0" ]; then
-     exit 1
- fi
- 
-+RD_DEBUG=""
-+. /lib/dracut-lib.sh
-+
- if [ -x /lib/systemd/systemd-timestamp ]; then
-     RD_TIMESTAMP=$(/lib/systemd/systemd-timestamp)
- else
--- 
-1.8.1.4
-
diff --git a/sys-kernel/dracut/files/dracut-014-multipath-udev-rules.patch b/sys-kernel/dracut/files/dracut-014-multipath-udev-rules.patch
deleted file mode 100644
index 2b9cffad38c4..000000000000
--- a/sys-kernel/dracut/files/dracut-014-multipath-udev-rules.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 7f3e0c13f1c10e93c3823b6367f9ac83865f3d90 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Fri, 25 Feb 2011 01:44:25 +0100
-Subject: [PATCH] 90multipath: added kpartx.rules; multipath.rules - different prefix
-
----
- modules.d/90multipath/module-setup.sh |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh
-index f78517c..3f4f612 100755
---- a/modules.d/90multipath/module-setup.sh
-+++ b/modules.d/90multipath/module-setup.sh
-@@ -58,6 +58,6 @@ install() {
- 
-     inst_hook pre-trigger 02 "$moddir/multipathd.sh"
-     inst_hook pre-pivot   02 "$moddir/multipathd-stop.sh"
--    inst_rules 40-multipath.rules
-+    inst_rules 40-multipath.rules 65-multipath.rules 66-kpartx.rules
- }
- 
--- 
-1.7.4.1
-
diff --git a/sys-kernel/dracut/files/dracut-014-usrmount-fsck-fix.patch b/sys-kernel/dracut/files/dracut-014-usrmount-fsck-fix.patch
deleted file mode 100644
index 2ed52835a705..000000000000
--- a/sys-kernel/dracut/files/dracut-014-usrmount-fsck-fix.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 5926a2cb526f11d4a4a3cd3980e5894f8e96e615 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Thu, 12 Jan 2012 10:23:38 +0100
-Subject: [PATCH] 98usrmount: don't pass fstab fs options as fsck options
-
-For example for line in /etc/fstab:
-
-  /dev/vg/usr  /usr  ext4  nosuid,nodev  0 2
-
-fsck_single is called as follows:
-
-  fsck_single /dev/vg/usr ext4 nosuid,nodev
-
-and this eventually resolves to:
-
-  e2fsck -a nosuid,nodev /dev/vg/usr
-
-which causes e2fsck usage error.
----
- modules.d/98usrmount/mount-usr.sh |    4 ++--
- 1 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/modules.d/98usrmount/mount-usr.sh b/modules.d/98usrmount/mount-usr.sh
-index a61f935..fc205d5 100755
---- a/modules.d/98usrmount/mount-usr.sh
-+++ b/modules.d/98usrmount/mount-usr.sh
-@@ -19,7 +19,7 @@ mount_usr()
- 
-     if [ "x$_usr_found" != "x" ]; then
-         # we have to mount /usr
--        fsck_single "$_dev" "$_fs" "$_opts"
-+        fsck_single "$_dev" "$_fs"
-         _ret=$?
-         echo $_ret >/run/initramfs/usr-fsck
-         if [ $_ret -ne 255 ]; then
-@@ -29,4 +29,4 @@ mount_usr()
-     fi
- }
- 
--mount_usr
-\ No newline at end of file
-+mount_usr
--- 
-1.7.8.3
-
diff --git a/sys-kernel/dracut/files/dracut-018-lsinitrd-support-symlinks.patch b/sys-kernel/dracut/files/dracut-018-lsinitrd-support-symlinks.patch
deleted file mode 100644
index c95331abc936..000000000000
--- a/sys-kernel/dracut/files/dracut-018-lsinitrd-support-symlinks.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From d8cb6a4ef1b51656566529f2315aa0828d693846 Mon Sep 17 00:00:00 2001
-From: Nikoli <nikoli@lavabit.com>
-Date: Tue, 17 Apr 2012 11:31:27 +0200
-Subject: [PATCH] lsinitrd: support symlinks
-
----
- lsinitrd.sh |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/lsinitrd.sh b/lsinitrd.sh
-index 1eaa37d..e6767dc 100755
---- a/lsinitrd.sh
-+++ b/lsinitrd.sh
-@@ -34,7 +34,7 @@ image="${1:-/boot/initramfs-$(uname -r).img}"
- [[ -f "$image" ]]    || { echo "$image does not exist" ; exit 1 ; }
- 
- CAT=zcat
--FILE_T=$(file "$image")
-+FILE_T=$(file --dereference "$image")
- 
- if echo "test"|xz|xz -dc --single-stream >/dev/null 2>&1; then
-     XZ_SINGLE_STREAM="--single-stream"
--- 
-1.7.8.6
-
diff --git a/sys-kernel/dracut/files/dracut-018-multipath-udev-rules.patch b/sys-kernel/dracut/files/dracut-018-multipath-udev-rules.patch
deleted file mode 100644
index 2b9cffad38c4..000000000000
--- a/sys-kernel/dracut/files/dracut-018-multipath-udev-rules.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 7f3e0c13f1c10e93c3823b6367f9ac83865f3d90 Mon Sep 17 00:00:00 2001
-From: =?UTF-8?q?Amadeusz=20=C5=BBo=C5=82nowski?= <aidecoe@aidecoe.name>
-Date: Fri, 25 Feb 2011 01:44:25 +0100
-Subject: [PATCH] 90multipath: added kpartx.rules; multipath.rules - different prefix
-
----
- modules.d/90multipath/module-setup.sh |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/modules.d/90multipath/module-setup.sh b/modules.d/90multipath/module-setup.sh
-index f78517c..3f4f612 100755
---- a/modules.d/90multipath/module-setup.sh
-+++ b/modules.d/90multipath/module-setup.sh
-@@ -58,6 +58,6 @@ install() {
- 
-     inst_hook pre-trigger 02 "$moddir/multipathd.sh"
-     inst_hook pre-pivot   02 "$moddir/multipathd-stop.sh"
--    inst_rules 40-multipath.rules
-+    inst_rules 40-multipath.rules 65-multipath.rules 66-kpartx.rules
- }
- 
--- 
-1.7.4.1
-