gentoo resync : 10.03.2018

3 files changed, 176 insertions, 39 deletions

diff --git a/sys-kernel/dracut/Manifest b/sys-kernel/dracut/Manifest
index bd969f039311..03d56415160c 100644
--- a/sys-kernel/dracut/Manifest
+++ b/sys-kernel/dracut/Manifest
@@ -8,9 +8,11 @@ AUX dracut-044-preserve-xattrs-when-copying.patch 2354 BLAKE2B a7195fdf0663e71b5
 DIST dracut-044.tar.xz 280004 BLAKE2B 5b9603eb769b542e2d56fae4d0f0fe250e7e60eb9c85f9c7b7a472b9d889a9f323b3ba1cbbeb1d5de10507498542275cd4430695cc8b48426b42c03d0672ea87 SHA512 bc788076e425b223d98cf0e0b15ff57d75d423991d7a67fb564a2857c38d5c3a21d846d2ca4523f9d4b0128bb981d09b5c26031435c5fc5e30f53080bca19b3d
 DIST dracut-045.tar.xz 292652 BLAKE2B 0e7c57ddca6757d59823afdc4ff23dcb06cc9cec317ece8cca14c5b6dfd2a7984fb8e857f5f48ad61922ba11b4b68944b366bddb02552efb52375f6e12802de7 SHA512 b57aab1f6fbdd5ad52a13a0eb99937b1abcd11507a2a3e6ec9bcb94e578cc32edc01a814ea2cef93158c27c17e3e40bcdd32a66457a20363f8136b8b546bbb4a
 DIST dracut-046.tar.xz 299520 BLAKE2B 1e2d848aa0db0e90734d8c60610a60b1f0ff67f8c4d4f9933bec0bc1290071b1b1ee3cdb6c3da5b82d8f6d4cc7561ee17d38685659a4a6ee48a9085e388dfced SHA512 75cefc184960024ef32f7bb5a0fe060e9c7d82dbfd0fe247d54b585e2ebbf0f8af5d5dc1be7e5e8cf2c3bc27b3293842c6361ae62d047289d0c59d7d40b09122
+DIST dracut-047.tar.xz 305836 BLAKE2B 18333ae1e24cfbbb6a152bf9ba2c48884821f6a506344259ba56c581a9f3efac7b4c88e8ca149ef1f83347a5e4d59acba61e42b8e0ab3a9e9beb8684d5db28b0 SHA512 03369726b6c2b682d0c9dead7b7dbd1c3989aaf2b4a561015634d33a94e5230d03cb634c3890191b19dd8c1c83389533ae1a46d45d2024ba885e0d2d46c5d035
 EBUILD dracut-044-r1.ebuild 7688 BLAKE2B 0746d8c7b1bc07fffceb5fd8e12ecffd663885396fe1d8c849977d4792e0f82ae4db517cc28aa1f676726f843a74cbdaead75305543bac19d99c2afe4cd74f73 SHA512 e82388ff89b4a9309f2e38c8d4cae5db63765b423d1066b978d7eb2b7374f355af49b3962ec22e4ca1a37fe699ed3311c610565f1218d249189e4f28a5677067
 EBUILD dracut-044-r3.ebuild 6946 BLAKE2B 0d8d4af31cee443564192cb02ef4b620f33a5388ada4c5359dd21c6e21abd2beebf194b7d5890c6f96016e15928118b88603e56bf4a81fe82ce09f5d33534bf5 SHA512 65f4f7193a6eb32c81cf57ac8d37c7a82ad2fe0bb580f5dc65c168b02a41f4cea29b81f6432f760bf59decdde501800d7a573dd6a5c021834896e911035f5ebd
 EBUILD dracut-045-r2.ebuild 4798 BLAKE2B 9ea482401d66d49eadca291a2fea9a7238d052f304cc6af83f509a92369383109d99d43a8a8caee258bd9d9fbadb23a2e6822314c95db26194567ab2f78cfd8c SHA512 3cd182bff67a90bc94e7b289ce1f09532dbe3784f93e798e7d5362418cc43d42c26277d4c4e13abcb389058b76629ad0babfe3b7a7176390358bf148167c2c26
 EBUILD dracut-046-r1.ebuild 4808 BLAKE2B f7845f9bc72343e5b6ee4c1f1ab1841e9c19fd95d2ff91d170767a5f9a24743a12591cfdc43791c86b6f0a05e6a6b18b98d8dfbd5d3459c0e26ea6a1bf4adb54 SHA512 71e55935f8eae2ded716c6aea1f4e9f0038b3cbf994f92d7018d2c72cd873cf4fb3c5227454ab58fde7c3a077f71dd5ad93616131f5c772a972f8bb1126393b4
-EBUILD dracut-9999.ebuild 4910 BLAKE2B b184a64af30692a6b41aff4a4703d623f5c54dbb3bef9893a7814070fc070f4213ff3228eb59dbf7e8647cdd2b310ccf91d16939415b9151c33919c770bb63f8 SHA512 2083f694159ead254b7a16e1b9251644dfb7545651bc04d74ead91b415d01c822e1b8122c62393d164d8ea286feeabe21940b07ff459811e2f09e919080071bb
+EBUILD dracut-047.ebuild 4584 BLAKE2B ad45aa14e8e521d4a88450f239c8666564d88876fe632d8b4678750209a47c3b54aca1ca93ecde2cde6bb6b4dd5cfcf814665a8bf643a38a14ddd519d97e5684 SHA512 57e1617da82ba2549c3d61661f1a2eb7bb3eccd0841a8f91c4eb23a39daee39de8b9abb2b35e33a31f3a9dfd93a4bcf9e52171bfcc9bb69c0e9b9e2dc4793789
+EBUILD dracut-9999.ebuild 4719 BLAKE2B 3c7f5ed4e95f956ed2f92d1d1553439d74aed8098c7936b3ced73f0eea680aa14915bd99952ab1a7d2fe7f30f205422c51911bd9cf158c6ab57cf223adcbfab5 SHA512 cefc18a54e7e9ce56bda7c2f25a5ef592d3086ed9975e06f603f00721fe2af086eef83bfa377038ae34b646d7bb2b26475ba5d76b312fe8ffd70eabab64280ef
 MISC metadata.xml 725 BLAKE2B 475d51f4e2bebf318ef94ea1fec40a34bcf04b4f0c69e051c8840e0965a92fd9861c5aa8acfb2ccb5a4cf354665ab3efc6adfdf7d0191325c1f798ea5e49594e SHA512 b708d0eb6a792d5ba3495f321af5e10672af3354f1f42c60b175b7fb48ae836e24db7768511c44cbb0a949c1cca75948890d3b32904bbe47e50d9c43d71787fb
diff --git a/sys-kernel/dracut/dracut-047.ebuild b/sys-kernel/dracut/dracut-047.ebuild
new file mode 100644
index 000000000000..b37520c7e9fc
--- /dev/null
+++ b/sys-kernel/dracut/dracut-047.ebuild
@@ -0,0 +1,151 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit bash-completion-r1 eutils linux-info systemd toolchain-funcs
+
+DESCRIPTION="Generic initramfs generation tool"
+HOMEPAGE="https://dracut.wiki.kernel.org"
+SRC_URI="mirror://kernel/linux/utils/boot/${PN}/${P}.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug selinux"
+
+# Tests need root privileges, bug #298014
+RESTRICT="test"
+
+COMMON_DEPEND=">=sys-apps/kmod-23[tools]
+	virtual/pkgconfig
+	virtual/udev
+	"
+RDEPEND="${COMMON_DEPEND}
+	app-arch/cpio
+	>=app-shells/bash-4.0:0
+	sys-apps/coreutils[xattr(-)]
+	|| (
+		>=sys-apps/sysvinit-2.87-r3
+		sys-apps/systemd[sysv-utils]
+	)
+	>=sys-apps/util-linux-2.21
+
+	debug? ( dev-util/strace )
+	selinux? (
+		sec-policy/selinux-dracut
+		sys-libs/libselinux
+		sys-libs/libsepol
+	)
+	"
+DEPEND="${COMMON_DEPEND}
+	app-text/asciidoc
+	app-text/docbook-xml-dtd:4.5
+	>=app-text/docbook-xsl-stylesheets-1.75.2
+	>=dev-libs/libxslt-1.1.26
+	"
+
+DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
+	README.testsuite TODO dracut.html )
+
+QA_MULTILIB_PATHS="usr/lib/dracut/.*"
+
+PATCHES=(
+	"${FILESDIR}/045-systemdutildir.patch"
+)
+
+src_configure() {
+	local myconf=(
+		--prefix="${EPREFIX}/usr"
+		--sysconfdir="${EPREFIX}/etc"
+		--bashcompletiondir="$(get_bashcompdir)"
+		--systemdsystemunitdir="$(systemd_get_systemunitdir)"
+	)
+
+	tc-export CC PKG_CONFIG
+
+	echo ./configure "${myconf[@]}"
+	./configure "${myconf[@]}" || die
+}
+
+src_install() {
+	default
+
+	local libdirs=( /$(get_libdir) /usr/$(get_libdir) )
+	if [[ ${SYMLINK_LIB} = yes && $(get_libdir) != lib ]]; then
+		# Preserve lib -> lib64 symlinks in initramfs
+		libdirs+=( /lib /usr/lib )
+	fi
+
+	einfo "Setting libdirs to \"${libdirs[*]}\" ..."
+	echo "libdirs=\"${libdirs[*]}\"" > "${T}/gentoo.conf" || die
+	insinto "/usr/lib/dracut/dracut.conf.d"
+	doins "${T}/gentoo.conf"
+
+	insinto /etc/logrotate.d
+	newins dracut.logrotate dracut
+}
+
+pkg_postinst() {
+	if linux-info_get_any_version && linux_config_exists; then
+		ewarn ""
+		ewarn "If the following test report contains a missing kernel"
+		ewarn "configuration option, you should reconfigure and rebuild your"
+		ewarn "kernel before booting image generated with this Dracut version."
+		ewarn ""
+
+		local CONFIG_CHECK="~BLK_DEV_INITRD ~DEVTMPFS"
+
+		# Kernel configuration options descriptions:
+		local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" '
+		ERROR_DEVTMPFS+='is missing and REQUIRED'
+		local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk '
+		ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED'
+
+		check_extra_config
+		echo
+	else
+		ewarn ""
+		ewarn "Your kernel configuration couldn't be checked."
+		ewarn "Please check manually if following options are enabled:"
+		ewarn ""
+		ewarn "  CONFIG_BLK_DEV_INITRD"
+		ewarn "  CONFIG_DEVTMPFS"
+		ewarn ""
+	fi
+
+	elog "To get additional features, a number of optional runtime"
+	elog "dependencies may be installed:"
+	elog ""
+	optfeature "Networking support"  net-misc/curl "net-misc/dhcp[client]" \
+		sys-apps/iproute2 "net-misc/iputils[arping]"
+	optfeature \
+		"Measure performance of the boot process for later visualisation" \
+		app-benchmarks/bootchart2 app-admin/killproc sys-process/acct
+	optfeature "Scan for Btrfs on block devices"  sys-fs/btrfs-progs
+	optfeature "Load kernel modules and drop this privilege for real init" \
+		sys-libs/libcap
+	optfeature "Support CIFS" net-fs/cifs-utils
+	optfeature "Decrypt devices encrypted with cryptsetup/LUKS" \
+		"sys-fs/cryptsetup[-static-libs]"
+	optfeature "Support for GPG-encrypted keys for crypt module" \
+		app-crypt/gnupg
+	optfeature \
+		"Allows use of dash instead of default bash (on your own risk)" \
+		app-shells/dash
+	optfeature "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-0.8.5-r5'
+	optfeature "Support network block devices" sys-block/nbd
+	optfeature "Support NFS" net-fs/nfs-utils net-nds/rpcbind
+	optfeature \
+		"Install ssh and scp along with config files and specified keys" \
+		net-misc/openssh
+	optfeature "Enable logging with syslog-ng or rsyslog" app-admin/syslog-ng \
+		app-admin/rsyslog
+}
diff --git a/sys-kernel/dracut/dracut-9999.ebuild b/sys-kernel/dracut/dracut-9999.ebuild
index 82d3ca269b1b..684ea423e895 100644
--- a/sys-kernel/dracut/dracut-9999.ebuild
+++ b/sys-kernel/dracut/dracut-9999.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=6
 
-inherit bash-completion-r1 eutils linux-info toolchain-funcs systemd
+inherit bash-completion-r1 eutils linux-info systemd toolchain-funcs
 
 if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
@@ -21,39 +21,39 @@ LICENSE="GPL-2"
 SLOT="0"
 IUSE="debug selinux"
 
+# Tests need root privileges, bug #298014
 RESTRICT="test"
 
-CDEPEND="virtual/udev
+COMMON_DEPEND=">=sys-apps/kmod-23[tools]
 	virtual/pkgconfig
-	>=sys-apps/kmod-15[tools]
+	virtual/udev
 	"
-RDEPEND="${CDEPEND}
+RDEPEND="${COMMON_DEPEND}
 	app-arch/cpio
 	>=app-shells/bash-4.0:0
+	sys-apps/coreutils[xattr(-)]
 	|| (
 		>=sys-apps/sysvinit-2.87-r3
 		sys-apps/systemd[sysv-utils]
 	)
-	sys-apps/coreutils[xattr(-)]
 	>=sys-apps/util-linux-2.21
 
 	debug? ( dev-util/strace )
 	selinux? (
+		sec-policy/selinux-dracut
 		sys-libs/libselinux
 		sys-libs/libsepol
-		sec-policy/selinux-dracut
 	)
-	!net-analyzer/arping
 	"
-DEPEND="${CDEPEND}
+DEPEND="${COMMON_DEPEND}
 	app-text/asciidoc
-	>=dev-libs/libxslt-1.1.26
 	app-text/docbook-xml-dtd:4.5
 	>=app-text/docbook-xsl-stylesheets-1.75.2
+	>=dev-libs/libxslt-1.1.26
 	"
 
 DOCS=( AUTHORS HACKING NEWS README README.generic README.kernel README.modules
-	README.testsuite TODO )
+	README.testsuite TODO dracut.html )
 
 QA_MULTILIB_PATHS="usr/lib/dracut/.*"
 
@@ -78,25 +78,19 @@ src_configure() {
 src_install() {
 	default
 
-	local dracutlibdir="usr/lib/dracut"
-
-	local libdirs="/$(get_libdir) /usr/$(get_libdir)"
-	if [[ ${SYMLINK_LIB} = yes ]]; then
+	local libdirs=( /$(get_libdir) /usr/$(get_libdir) )
+	if [[ ${SYMLINK_LIB} = yes && $(get_libdir) != lib ]]; then
 		# Preserve lib -> lib64 symlinks in initramfs
-		[[ $libdirs =~ /lib\  ]] || libdirs+=" /lib /usr/lib"
+		libdirs+=( /lib /usr/lib )
 	fi
 
-	einfo "Setting libdirs to \"${libdirs}\" ..."
-	echo "libdirs=\"${libdirs}\"" > "${T}/gentoo.conf"
-	insinto "${dracutlibdir}/dracut.conf.d"
+	einfo "Setting libdirs to \"${libdirs[*]}\" ..."
+	echo "libdirs=\"${libdirs[*]}\"" > "${T}/gentoo.conf" || die
+	insinto "/usr/lib/dracut/dracut.conf.d"
 	doins "${T}/gentoo.conf"
 
 	insinto /etc/logrotate.d
 	newins dracut.logrotate dracut
-
-	dodir /var/lib/dracut/overlay
-
-	dodoc dracut.html
 }
 
 pkg_postinst() {
@@ -110,27 +104,17 @@ pkg_postinst() {
 		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
+		local ERROR_DEVTMPFS='CONFIG_DEVTMPFS: "Maintain a devtmpfs filesystem to mount at /dev" '
+		ERROR_DEVTMPFS+='is missing and REQUIRED'
+		local ERROR_BLK_DEV_INITRD='CONFIG_BLK_DEV_INITRD: "Initial RAM filesystem and RAM disk '
+		ERROR_BLK_DEV_INITRD+='(initramfs/initrd) support" is missing and REQUIRED'
 
 		check_extra_config
 		echo
 	else
 		ewarn ""
-		ewarn "Your kernel configuration couldn't be checked.  Do you have"
-		ewarn "/usr/src/linux/.config file there?  Please check manually if"
-		ewarn "following options are enabled:"
+		ewarn "Your kernel configuration couldn't be checked."
+		ewarn "Please check manually if following options are enabled:"
 		ewarn ""
 		ewarn "  CONFIG_BLK_DEV_INITRD"
 		ewarn "  CONFIG_DEVTMPFS"