Add sys-fs/mdadm-4.0, update sys-fs/mdadm-3.4

3 files changed, 117 insertions, 3 deletions

diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index 39a26962..16625723 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -34,8 +34,10 @@ DIST mdadm-3.3.3.tar.xz 413140 SHA256 f5b50a6b506697fb9968d660444447473b453f9eae
 DIST mdadm-3.3.4.tar.xz 413396 SHA256 8ae5f45306b873190e91f410709b00e51997b633c072b33f8efd9f7df022ca68 SHA512 4393e5d3a50ee148cc7503d48e7dda30419ed72a8098eaa9b883ff1ee81e09c66414edbe40d8c80b28d3ae7a7b5e5b11f6a8e14188a1066c19ac08ca89ddbcb6 WHIRLPOOL 41a8bcf399a11da82c9a0bdf49a31d8c71aeccfcfe2000edf78fe2933c6bdf6f10f2c5450b0589564a75e3a37195abe2e4c0dbbc42911ca9dda4e2d538618caa
 DIST mdadm-3.3.tar.xz 399152 SHA256 565d2d0f3114679d7ac96c31282fdc61b0e2eddbed13d3ea723a64b079899151 SHA512 09eca8a8e26f4159be3d1988925d9ade5e580eac94ea4044ee92e0c5e08fbfbc8d7ec83d34621df4eab1217b97df372b868144db20e33ad2c6ed01210911bd9a WHIRLPOOL 32f83199b9327fa1124c80c63a815a16f7423f76ef9b9d77a568e2c25e2cef8ef84ffdff25f3314f77e976c0d9ed758a3e62837a15a46c6e60932d83b7bb805b
 DIST mdadm-3.4.tar.xz 422704 SHA256 27d0be4627d38a12ddcd1c1c3721d649d4e89e1093914497e22b57245cda8808 SHA512 5de06f3a2b83333e5346a1e858b15e76f75a13a1d5c5f2032fecc6eb167454b282e12ee111ac2abec778e058ec9554708ac317a476778328546603618e6f70f7 WHIRLPOOL 18a5f2ed027b919e2e365cf9ddc1b616bf1fe315d27196a248ce9600622eb86d5ce825f1b38ecf0a1f5dcf21fa59fd7d88856700aea25a721c8efa37e2b34d39
+DIST mdadm-4.0.tar.xz 430780 SHA256 1d6ae7f24ced3a0fa7b5613b32f4a589bb4881e3946a5a2c3724056254ada3a9 SHA512 12fb26e6b9c1912698defa406e5e47a7ca8d68d4a9aa7acdc9b463ee2d4a37fc6ecef6beb5395ff619018c3f6bdb6d8c573060d027707540f645ad2265170e8b WHIRLPOOL 6587c7817556fbf47f7624a05d000c3a8396c84fbabe43aa574b649a119f987181b909f4347b93b07a45bf4d6519e1c8a39b1c0245538d64fb0eddd27e3e4054
 DIST mdadm_3.3-2.debian.tar.gz 127889 SHA256 c38b155e7395b35380d506458d979b82c5b853de996f21ccab50b1202d726301 SHA512 92e4c403542caba4b9afb870ba803e6bc7ade143b27efdc27e03b3407f322722a635457cce9e8c195a3ecd7cbce66fdebdd6046fc4f36836e56e27d5d838c037 WHIRLPOOL 8f8ef1142a79044093a5f55b181dc35a142b83041a59a9b71945aa6fe84cd089a7e1b183ec6b5db210a0d07e94efad0ab3a0d0341fc6cbbbf4da9d0254b5c737
 DIST mdadm_3.3.4-1.1.debian.tar.xz 86312 SHA256 16dd6b77c14a15afa23e077f0c157c17ef5cc6054b17ccb38cf5af86f7bf55bd SHA512 ea9b34a9952e1ff836cb931c7eef0ae0c44e3f4d46162c7a7eca24936d6f7168e99d67749b3100bc68ebadc8f256e4833d42da48c531cf71e6e8f3100911828f WHIRLPOOL 44df72008fc89f21a461bc45be230383d906fd0c0ea062327a537024ceff245b47ced301d72d5bfe5a0fcde095e99e14cdf30c614550bce023851e7a6ac0c525
+DIST mdadm_3.4-4.debian.tar.xz 81200 SHA256 4b09a90aefc2833040ae570cf4ddc34f98a67525636d3c9f2fabf8c13b51e27e SHA512 86a9edb8f29931fdfa40037d535ca80f0bf59539fe1ef16f2639e666a5ac1bd90ec617ec1635080ae62a02f7986a6e10c97dce5389555ab7d417885f216c0f93 WHIRLPOOL 07ab64531da08999b3d351d3747a870cd996b67cc4e2df2c9f8d974d170bc9537bed4aefcf690a2e0a66715549ff046520bd1c559b11736467b3f881681068ed
 EBUILD mdadm-3.1.4.ebuild 2277 SHA256 63890f88df3b70f7ccc7584f99a6c66ae7435eb4e44b4b262aab4c854bc2dd6b SHA512 46676cc4ef53536654c372ca44e4916e11bdc237ecf3d76256af9d9351796e9837febb9d2f3add958f0ae41c67ac2135494a2fa61fd70facaed9eb6bafc2b1f2 WHIRLPOOL 525fdc76f1a173a712111903dc02528611cc72946278d9460cc115d3986a48e926ced81114cf7626d79c1c8116be6cc736bd4184b8bc57574ab1479ac93429c6
 EBUILD mdadm-3.2.6-r1.ebuild 2070 SHA256 65df9810e12550b341e26a458cc46fd619c7773fadb6089bd724a2be897b3ba6 SHA512 b3b527d2084dcefcc876c0dce0d338540d20e0d6f979400d20dc92c47c2e8491d095d551c0782df5f55dd76b6333b4be525d98aa1a7573f56d6e8db67c500bf9 WHIRLPOOL 5c8139cabe2d620684775982ab258656a439aee17a6bed5d1dcab301e710522d6b49d1f7a80f0be3a3217589518e67cdf643e4afb744bc4487e78e0c163ecbfb
 EBUILD mdadm-3.3-r1.ebuild 2231 SHA256 94829cee350bf6b289d3b41711021c7978bd7c9a8792fef5a7e2af426dc502fa SHA512 5b83ceb56647dbe095631e9e25a50b7f05451b0d1d6304bfb1ac6f6e4a99bd3628944114094a94f6618fed4c872b286e776ca4ce3f88fb73895692bc50e00743 WHIRLPOOL c26a7e5e533d8e9db390333b26030e9d0d20266741f480aef4828cb9a0f1118f9e8ee4e72ef4b91cf160bc3658b7596f00ac9f99bf6b8c5fa2535fe31ce450bf
@@ -47,4 +49,5 @@ EBUILD mdadm-3.3.2.ebuild 2429 SHA256 a6d8d366b4db8d17306caeaf8a1af6903041c907ea
 EBUILD mdadm-3.3.3.ebuild 2604 SHA256 1570fd0a1327a25f747261a3584d8dc5b203ba170299099bdce90430f672f899 SHA512 9da67e222f4488568a8d466b2e648c92b4592c7dcc95522a5ed5bbc3a39e0b302d9b4d72c5a819bb8e4c4bdbd5b25e6ce7217cb2320e1edbe20c54f3074bc501 WHIRLPOOL 43816fcc5202594f74cf09b8b90ae33ac006703c5677f1314eb6b037e99e8c233eaa0abacf35dd47063f77696877c9fbf10685d0f938d8c372e0ce3b9d4adbab
 EBUILD mdadm-3.3.4.ebuild 2604 SHA256 1570fd0a1327a25f747261a3584d8dc5b203ba170299099bdce90430f672f899 SHA512 9da67e222f4488568a8d466b2e648c92b4592c7dcc95522a5ed5bbc3a39e0b302d9b4d72c5a819bb8e4c4bdbd5b25e6ce7217cb2320e1edbe20c54f3074bc501 WHIRLPOOL 43816fcc5202594f74cf09b8b90ae33ac006703c5677f1314eb6b037e99e8c233eaa0abacf35dd47063f77696877c9fbf10685d0f938d8c372e0ce3b9d4adbab
 EBUILD mdadm-3.3.ebuild 2177 SHA256 33e178f2fb74d9dcedb3a5ee39cedf2bae65977a8fb0554e0eb14ba841074fbd SHA512 8569153fad096ace358a1383b2e83f75bea3dbd314ef871a5503586332cb33a56ee0de16261487896452814cdea10568405e54716d5c3e5898be8ff8565caa8a WHIRLPOOL 10492c5c9352d0a07bcf9364b41491fdddac8ff937613476f71714aee636765b7bda00b48a9b4d63d796471a5769a79c322866e5f06267e12d663d1ba9b8cca9
-EBUILD mdadm-3.4.ebuild 2816 SHA256 de324a1871b36edfd6654b566dce00d931ad2254a941478c9bc10f34eae3eb2f SHA512 1a443d6c4c8daabafdb82240176c5fde1378bb6d9562a8035ee29245d08f3c0260e0b6a967d1380b1ac772bf21cf5a4a69c6cb7b6789aba5050097f7bbe912e3 WHIRLPOOL a28b40c6df806abbe9ec01b4f98c4b09f131e520768fc15ec622b5892dd7ac506efc57f672a2ccbdabdd5ae6f9dfccf096fa5b7a1cc8539043507376fc3eeb7c
+EBUILD mdadm-3.4.ebuild 2815 SHA256 a7dbd4430e0179ac9b1cc42a837c37010d2db0d40cf5ccc56749eb78620bc1c6 SHA512 08be64a2f068637b0d7ccebf7292c33c3c304729208f257aa6e7aebf2027e7c40fd103687773f185865b05d2f86fb678022dbb1535a44bbdf7318185baf81314 WHIRLPOOL 0a9ba0be06d923a199f55e7efa51583a7c7bf60b6680c4d4f312b4069a0685b7d3608856b4a27812f16053c05728feacd828e261b6bddb78651c7108fb21692f
+EBUILD mdadm-4.0.ebuild 2805 SHA256 b226d75a3b031f7b7e005160ae20a7781f3aca3d40e0e51adc6aa975354e8d71 SHA512 c0f7aa8a160e38611c3a4a2b5bf1581f6ebbcac0ee49367094e543bd3851ed67f016bd2828f9afe62898b6f55e17cdf5af4efc3c43b37e9c725495b6bfb7ae61 WHIRLPOOL 46d85b26a6d83e32e0f51c0c72198b76207b8519c91aa81c364ffd2d1e9bc015fd46732b0de7342b8311260a9015e6b8bb422ea51fca0a183729ac706ff9755b
diff --git a/sys-fs/mdadm/mdadm-3.4.ebuild b/sys-fs/mdadm/mdadm-3.4.ebuild
index 72128b6b..02ff35a7 100644
--- a/sys-fs/mdadm/mdadm-3.4.ebuild
+++ b/sys-fs/mdadm/mdadm-3.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id: 0e58ce57c385977a7acd88ae3b81d0e7e15d7aa7 $
+# $Id: 7bb16429570fc47387cc6e866001ed5e5c67d4f6 $
 
 EAPI=5
 inherit eutils flag-o-matic multilib systemd toolchain-funcs udev
@@ -13,7 +13,7 @@ SRC_URI="mirror://kernel/linux/utils/raid/mdadm/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ~arm ~hppa ia64 ~mips ppc ppc64 sparc x86"
+KEYWORDS="alpha amd64 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
 IUSE="static systemd +udev"
 
 DEPEND="virtual/pkgconfig
diff --git a/sys-fs/mdadm/mdadm-4.0.ebuild b/sys-fs/mdadm/mdadm-4.0.ebuild
new file mode 100644
index 00000000..d36d9b1b
--- /dev/null
+++ b/sys-fs/mdadm/mdadm-4.0.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id: c73a60dac768fb689455a1c137bb1092e5619788 $
+
+EAPI=5
+inherit eutils flag-o-matic multilib systemd toolchain-funcs udev
+
+DESCRIPTION="A useful tool for running RAID systems - it can be used as a replacement for the raidtools"
+HOMEPAGE="http://neil.brown.name/blog/mdadm"
+DEB_PR=4
+SRC_URI="mirror://kernel/linux/utils/raid/mdadm/${P}.tar.xz
+		mirror://debian/pool/main/m/mdadm/${PN}_3.4-${DEB_PR}.debian.tar.xz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static"
+
+DEPEND="virtual/pkgconfig
+	app-arch/xz-utils"
+RDEPEND=">=sys-apps/util-linux-2.16"
+
+# The tests edit values in /proc and run tests on software raid devices.
+# Thus, they shouldn't be run on systems with active software RAID devices.
+RESTRICT="test"
+
+rundir="/dev/.mdadm"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.4-sysmacros.patch #580188
+}
+
+mdadm_emake() {
+	local myconf=()
+
+	# We should probably make corosync & libdlm into USE flags. #573782
+
+	myconf+=( PKG_CONFIG="$(tc-getPKG_CONFIG)" )
+	myconf+=( CC="$(tc-getCC)" )
+	myconf+=( CWFLAGS="-Wall" )
+	myconf+=( CXFLAGS="${CFLAGS}" )
+	myconf+=( COROSYNC="-DNO_COROSYNC" )
+	myconf+=( DLM="-DNO_DLM" )
+
+	if use udev; then
+		myconf+=( UDEVDIR="$(get_udevdir)" )
+	fi
+
+	if use systemd; then
+		myconf+=( SYSTEMD_DIR="$(systemd_get_unitdir)" )
+	else
+		myconf+=( RUN_DIR="${rundir}" )
+		myconf+=( MAP_DIR="${rundir}" )
+	fi
+
+	emake \
+		"${myconf[@]}" \
+		"$@"
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	mdadm_emake all mdassemble
+}
+
+src_test() {
+	mdadm_emake test
+
+	sh ./test || die
+}
+
+src_install() {
+	mdadm_emake DESTDIR="${D}" install
+	if use systemd; then
+		mdadm_emake DESTDIR="${D}" install-systemd
+	fi
+	dosbin mdassemble
+	dodoc ChangeLog INSTALL TODO README* ANNOUNCE-${PV}
+
+	if ! use udev; then
+		rm -v "${ED}"/$(get_udevdir)/rules.d/*.rules
+		rmdir -p "${ED}"/$(get_udevdir)/rules.d
+	fi
+
+	insinto /etc
+	newins mdadm.conf-example mdadm.conf
+	newinitd "${FILESDIR}"/mdadm.rc mdadm
+	newconfd "${FILESDIR}"/mdadm.confd mdadm
+	newinitd "${FILESDIR}"/mdraid.rc mdraid
+	newconfd "${FILESDIR}"/mdraid.confd mdraid
+
+	# From the Debian patchset
+	dodoc "${WORKDIR}"/debian/README.checkarray
+	dosbin "${WORKDIR}"/debian/checkarray
+	insinto /etc/default
+	newins "${FILESDIR}"/etc-default-mdadm mdadm
+
+	exeinto /etc/cron.weekly
+	newexe "${FILESDIR}"/mdadm.weekly mdadm
+}
+
+pkg_postinst() {
+	if use systemd && ! systemd_is_booted; then
+		if [[ -z ${REPLACING_VERSIONS} ]] ; then
+			# Only inform people the first time they install.
+			elog "If you're not relying on kernel auto-detect of your RAID"
+			elog "devices, you need to add 'mdraid' to your 'boot' runlevel:"
+			elog "	rc-update add mdraid boot"
+		fi
+	fi
+}