Added missing patch entry to the list.

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

3 files changed, 270 insertions, 9 deletions

diff --git a/sys-kernel/dracut/ChangeLog b/sys-kernel/dracut/ChangeLog
index bf7dd5e26353..edf9f838edb5 100644
--- a/sys-kernel/dracut/ChangeLog
+++ b/sys-kernel/dracut/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-kernel/dracut
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.154 2014/02/23 17:07:41 aidecoe Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/ChangeLog,v 1.155 2014/02/24 09:11:38 aidecoe Exp $
+
+*dracut-036-r3 (24 Feb 2014)
+
+  24 Feb 2014; Amadeusz Żołnowski <aidecoe@gentoo.org> +dracut-036-r3.ebuild:
+  Added missing patch entry to the list.
 
 *dracut-036-r2 (23 Feb 2014)
 
diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index 22cd162387d8..bc4c23030a4a 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -27,17 +27,18 @@ DIST dracut-036.tar.xz 255192 SHA256 6dd97c4323ec8bd87b24a95349692fb6c6ca2d1b352
 EBUILD dracut-034-r4.ebuild 10371 SHA256 58e2dbde568f0a913a9cfe43428a19119d061c94ab1a53bd950b6fafe88ecdde SHA512 5ea984d26f446061e9fbac2dc0a20ca93c44626d5cf689507747d2a7b3e87ad446784bf99cfc52c91818c222dd3f3c82afa4d927226818db0886d78dfa6d7984 WHIRLPOOL 9dbc755d90b34f5a1d66f2b72705a46abff81b1b5c56e1acc7b0bb27f6ecf33992e6e5037c449150720ac949132b444c2f6df735cfb977e989f868a7dbb04b70
 EBUILD dracut-036-r1.ebuild 7496 SHA256 bcb8b2a21cb86c04070962be46206da583ab6b1b97ff99aefda15faaf1951d66 SHA512 b396c29fe8a010b9a9e75ef964529f5f0678d1bce9ec5e99fd3316d30ef4cea505e3d8171d257d7579ec62b6242f9382a744ee4d858e4fc7717b1839c85ed7b3 WHIRLPOOL e806b00c9e32e2a1fbb977272047c5135f3d3b9e13e83ecc0135586a6ab84f091b57c0d692e11d5a70fa9cb3f7bd4734f3c637887694c4cf342f38c9f1809e6d
 EBUILD dracut-036-r2.ebuild 7510 SHA256 b07ab24c659795196d4d71274d663051b2b6bec8fa6313b2837623040d249c9b SHA512 3f3e08e3aec6412079ec7b07c75b26b76c8aee32d3e7bb1888f7a57e2ff828f69bd3be2e24fc0aa168a84771d1abc93a96c5ce5b2af8b77aa1dba1f627eb0139 WHIRLPOOL acf2a7365d646ea19957f54bfa847fac690dfa5f3c266196685af8cdb43d0aeedcfb87dda49d3443c92a18d94753e9f77e44b214f6db75542d87d28f005ce991
+EBUILD dracut-036-r3.ebuild 7563 SHA256 8ce7fe7a2320d6358161ef831eb5e4f484b47b3c4eea8929effd95f0cb5f4951 SHA512 23d71fc52d8071389874d9ad20f9279b6b2d5a489d895f2f276396b9b888a1d7760e2494419a345a3e681c75e2ebdd1752e1f53e73c459f268403f61f7f73eb6 WHIRLPOOL 6ad423557d32ef222d3a1b3cb08f07721455eea6728c497c1d7f1c71ff1146ac08b3842cbbe5e5823db4054dc4f6c4bde392364178de9c6e6b8f0e6e7799b788
 EBUILD dracut-036.ebuild 7428 SHA256 eeb2276bdc05a80f61b803c88f0cc428c3303fe31df7d6b597d1e4885f21d861 SHA512 f799e3e5f3f749ed9d656997e0c8234bfc006e53f41262fb78688b9ec697b776825b9430d27d6e070e22d270691c6e6d0d94371f953a94aeaff742369d209047 WHIRLPOOL f5d565e94985bd97a110bce61514261b8e0bf3d3a65c6544b8f213bc7e062c7b30c8fdb838ff14fb229e4001dd07decda6e4cab66dac7e661cce92cc785f2290
-MISC ChangeLog 67393 SHA256 6d2a6fc81838e4989ee359bd3b671176dff4f4c61d4079ed88fc9b5dd19beb2a SHA512 99d55a2bb50e199aab367aee550b96fed94ceec7ae8bfcaee59aaeea2ab0d485c68e840b83da3e0c4abed69b5886310aa548c2365de1e92091b44983a19e64da WHIRLPOOL 4db93300ab49d7dbc532e5462720de606e18a76d29e6abdc2372eeb542bede11e6e96e0365504fae8e1088c7220de79ecfa12d045a1472f38b159cba29b32bee
+MISC ChangeLog 67545 SHA256 bc6eff0651fee09985449d6929e67d543f606abdca9e7d16318fb530d2ac1c59 SHA512 d6912acc2cdeb605eb6438e645c52df15dfc51c0dfc45e98316c89b5e667c4e621cabf30c385baa10079238da5d1959b8a044bd5a53d33962f87edcadce019ea WHIRLPOOL 81d160424329f4d81b5ede137d09d26ef1d2f58c9de032a57ac8d97b771fc06da26e9c18bd8e885813371b9881721de37ecaaaf768265896821a414c0f0aa1f8
 MISC metadata.xml 906 SHA256 5f19b725d0669877fdd7814634b7aa7dd73331459bace52de02908417b833c3f SHA512 c5838d36080528d541b67cb38de17cc2351f7e5e17ab060c58f037792225ea223ade6b7e69376f4a9256b0bb3dcf4de578dcd50ee1c7d04a3f3288ca3c1ada43 WHIRLPOOL 532ea421fab965094820d5c0961a00ca38c858461f572a0cd4a145aa90340a569ee942062338ae03773c2709a08e4882f3176333aa5383b7e3c467cb01c0874d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTCireAAoJEPATRTHh2/q1fKgIAJMLQXzEGL0/4qmARIXPiHlX
-wzOReI6aa9JMY3E4XQ5An8dlqKH+ftIu9k/sGhuFF+xHz0PS9WfeXxnFxhR1cdZq
-zgRKMJqk0mn4ut8zVN1rE8L9RVsOLqKILUom3+MIcpWfie2c38My63Gr8qAUOw06
-KAThiR2/Z4ZSiVpqSRBm//x4H8nY/9rgvFupderiCUa1/Jp+ix7v96p5wR45Z43N
-ZCbqvH2UwEsTZMtHxbqGssNLK+RUhJOGMtEXgc+W85sw7icJd4T2RQpEee1TGH5c
-Zoh28WHD1Q5XfLLvimGZpitpwctK1fT71vEBSZWWIrQqRFNgbXzsPM7Xir9USfY=
-=A5Iy
+iQEcBAEBCAAGBQJTCwzLAAoJEPATRTHh2/q11egH/RbwscQhnZaXwnBYvQTYMSeH
+jEIAvGscK8WQPn0q5QEzpSQWkA97glnuR7n+/6QEidvE1Am7Qn0rF7B5MKZotUm1
+HKpYLJc/Tbv3FzQmuVWgx67Q08klK3VsSWalQ/rxiY1xhyAtWJSK83HzfzprnSPH
+1ZWn8LS7t1r61DFnCQWHTftui0/a1X3ORgxm/bq+p3/N0ZeqnoQADZ/sU9W7yzop
+1WL5K3KuKzDXCA2l/2bmNqs8wTEmS4W8eHLFBtoQvrW/G48QcK53ROEVmHdr9HQc
+znCyKEiNPgaPsoL1i3eXQyEWafThxMzyJDYK8dzo+S0LVo5KTawXkEDsV3GowME=
+=qVMR
 -----END PGP SIGNATURE-----
diff --git a/sys-kernel/dracut/dracut-036-r3.ebuild b/sys-kernel/dracut/dracut-036-r3.ebuild
new file mode 100644
index 000000000000..bcd69dde8880
--- /dev/null
+++ b/sys-kernel/dracut/dracut-036-r3.ebuild
@@ -0,0 +1,255 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-kernel/dracut/dracut-036-r3.ebuild,v 1.1 2014/02/24 09:11:38 aidecoe Exp $
+
+EAPI=4
+
+inherit bash-completion-r1 eutils linux-info multilib systemd
+
+DESCRIPTION="Generic initramfs generation tool"
+HOMEPAGE="http://dracut.wiki.kernel.org"
+SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz"
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug selinux systemd"
+
+RESTRICT="test"
+
+CDEPEND="virtual/udev
+	systemd? ( >=sys-apps/systemd-199 )
+	selinux? ( sec-policy/selinux-dracut )
+	"
+RDEPEND="${CDEPEND}
+	app-arch/cpio
+	>=app-shells/bash-4.0
+	>sys-apps/kmod-5[tools]
+	|| ( >=sys-apps/sysvinit-2.87-r3 sys-apps/systemd-sysv-utils )
+	>=sys-apps/util-linux-2.21
+
+	debug? ( dev-util/strace )
+	selinux? ( sys-libs/libselinux sys-libs/libsepol )
+	"
+DEPEND="${CDEPEND}
+	app-text/asciidoc
+	>=dev-libs/libxslt-1.1.26
+	app-text/docbook-xml-dtd:4.5
+	>=app-text/docbook-xsl-stylesheets-1.75.2
+	virtual/pkgconfig
+	"
+
+DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
+	README.testsuite TODO )
+MY_LIBDIR=/usr/lib
+PATCHES=(
+	"${FILESDIR}/${PV}-0001-NEWS-update-for-version-036.patch"
+	"${FILESDIR}/${PV}-0002-dracut-functions.sh-support-for-altern.patch"
+	"${FILESDIR}/${PV}-0003-gentoo.conf-let-udevdir-be-handled-by-.patch"
+	"${FILESDIR}/${PV}-0004-Use-the-same-paths-in-dracut.sh-as-tho.patch"
+	"${FILESDIR}/${PV}-0005-Install-dracut-install-into-libexec-di.patch"
+	"${FILESDIR}/${PV}-0006-dracut.sh-Fix-variable-name-typo.patch"
+	"${FILESDIR}/${PV}-0007-Added-missing-quotes.patch"
+	)
+
+#
+# Helper functions
+#
+
+# Removes module from modules.d.
+# $1 = module name
+# Module name can be specified without number prefix.
+rm_module() {
+	local force m
+	[[ $1 = -f ]] && force=-f
+
+	for m in $@; do
+		if [[ $m =~ ^[0-9][0-9][^\ ]*$ ]]; then
+			rm ${force} --interactive=never -r "${modules_dir}"/$m
+		else
+			rm ${force} --interactive=never -r "${modules_dir}"/[0-9][0-9]$m
+		fi
+	done
+}
+
+# Grabbed from net-misc/netctl ebuild.
+optfeature() {
+	local desc=$1
+	shift
+	while (( $# )); do
+		if has_version "$1"; then
+			elog "  [I] $1 to ${desc}"
+		else
+			elog "  [ ] $1 to ${desc}"
+		fi
+		shift
+	done
+}
+
+#
+# ebuild functions
+#
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+
+	local libdirs="/$(get_libdir) /usr/$(get_libdir)"
+	[[ $libdirs =~ /lib\  ]] || libdirs+=" /lib /usr/lib"
+	einfo "Setting libdirs to \"${libdirs}\" ..."
+	sed -e "3alibdirs=\"${libdirs}\"" \
+		-i "${S}/dracut.conf.d/gentoo.conf.example" || die
+
+	local udevdir="$("$(tc-getPKG_CONFIG)" udev --variable=udevdir)"
+	einfo "Setting udevdir to ${udevdir}..."
+	sed -r -e "s|^(udevdir=).*$|\1${udevdir}|" \
+			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
+
+	if use systemd; then
+		local systemdutildir="$(systemd_get_utildir)"
+		local systemdsystemunitdir="$(systemd_get_unitdir)"
+		local systemdsystemconfdir="$("$(tc-getPKG_CONFIG)" systemd \
+			--variable=systemdsystemconfdir)"
+		[[ ${systemdsystemconfdir} ]] \
+			|| systemdsystemconfdir=/etc/systemd/system
+		einfo "Setting systemdutildir to ${systemdutildir} and ..."
+		sed -e "5asystemdutildir=\"${systemdutildir}\"" \
+			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
+		einfo "Setting systemdsystemunitdir to ${systemdsystemunitdir} and..."
+		sed -e "6asystemdsystemunitdir=\"${systemdsystemunitdir}\"" \
+			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
+		einfo "Setting systemdsystemconfdir to ${systemdsystemconfdir}..."
+		sed -e "7asystemdsystemconfdir=\"${systemdsystemconfdir}\"" \
+			-i "${S}/dracut.conf.d/gentoo.conf.example" || die
+	fi
+
+	epatch_user
+}
+
+src_configure() {
+	local myconf="--libdir=${MY_LIBDIR}"
+	myconf+=" --bashcompletiondir=$(get_bashcompdir)"
+
+	if use systemd; then
+		myconf+=" --systemdsystemunitdir='$(systemd_get_unitdir)'"
+	fi
+
+	econf ${myconf}
+}
+
+src_compile() {
+	tc-export CC
+	emake doc install/dracut-install
+}
+
+src_install() {
+	default
+
+	local my_libdir="${MY_LIBDIR}"
+	local dracutlibdir="${my_libdir#/}/dracut"
+
+	echo "DRACUT_VERSION=$PVR" > "${D%/}/${dracutlibdir}/dracut-version.sh"
+
+	insinto "${dracutlibdir}/dracut.conf.d/"
+	newins dracut.conf.d/gentoo.conf.example gentoo.conf
+
+	insinto /etc/logrotate.d
+	newins dracut.logrotate dracut
+
+	dodir /var/lib/dracut/overlay
+
+	dohtml dracut.html
+
+	#
+	# Modules
+	#
+	local module
+	modules_dir="${D%/}/${dracutlibdir}/modules.d"
+
+	use debug || rm_module 95debug
+	use selinux || rm_module 98selinux
+
+	if use systemd; then
+		# With systemd following modules do not make sense
+		rm_module 96securityfs 97masterkey 98integrity
+	else
+		# Without systemd following modules do not make sense
+		rm_module 00systemd-bootchart
+	fi
+
+	# Remove modules which won't work for sure
+	rm_module 95fcoe # no tools
+	# fips module depends on masked app-crypt/hmaccalc
+	rm_module 01fips 02fips-aesni
+}
+
+pkg_postinst() {
+	if linux-info_get_any_version && linux_config_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
+
+	elog "To get additional features, a number of optional runtime dependencies may be"
+	elog "installed."
+	optfeature "Networking support"  net-misc/curl "net-misc/dhcp[client]" \
+		sys-apps/iproute2
+	optfeature \
+		"Measure performance of the boot process for later visualisation" \
+		app-benchmarks/bootchart2 sys-apps/usleep sys-process/acct
+	optfeature "Scan for Btrfs on block devices"  sys-fs/btrfs-progs
+	optfeature "Load kernel modules and drop this privilege for real init" \
+		sys-libs/libcap
+	optfeature "Support CIFS" net-fs/cifs-utils
+	optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \
+		sys-fs/cryptsetup
+	optfeature "Support for GPG-encrypted keys for crypt module" \
+		app-crypt/gnupg
+	optfeature \
+		"Allows use of dash instead of default bash (on your own risk)" \
+		app-shells/dash
+	optfeature "Framebuffer splash (media-gfx/splashutils)" \
+		media-gfx/splashutils
+	optfeature "Support iSCSI" sys-block/open-iscsi
+	optfeature "Support Logical Volume Manager" sys-fs/lvm2
+	optfeature "Support MD devices, also known as software RAID devices" \
+		sys-fs/mdadm
+	optfeature "Support Device Mapper multipathing" sys-fs/multipath-tools
+	optfeature "Plymouth boot splash" sys-boot/plymouth
+	optfeature "Support network block devices" sys-block/nbd
+	optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind
+	optfeature \
+		"Install ssh and scp along with config files and specified keys" \
+		dev-libs/openssl
+	optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \
+		app-admin/rsyslog
+}