Use /run/mdadm instead of /var/run/mdadm with baselayout that has the /run directory wrt #416081 by Alexander Tsoy and Robin Bankhead

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

3 files changed, 90 insertions, 6 deletions

diff --git a/sys-fs/mdadm/ChangeLog b/sys-fs/mdadm/ChangeLog
index d6403b946fe4..5cb9c29cb326 100644
--- a/sys-fs/mdadm/ChangeLog
+++ b/sys-fs/mdadm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/mdadm
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.160 2012/12/11 18:29:11 axs Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.161 2013/02/08 13:45:41 ssuominen Exp $
+
+*mdadm-3.2.6-r1 (08 Feb 2013)
+
+  08 Feb 2013; Samuli Suominen <ssuominen@gentoo.org> +mdadm-3.2.6-r1.ebuild:
+  Use /run/mdadm instead of /var/run/mdadm with baselayout that has the /run
+  directory wrt #416081 by Alexander Tsoy and Robin Bankhead
 
   11 Dec 2012; Ian Stakenvicius <axs@gentoo.org> mdadm-3.2.3-r2.ebuild:
   use udev.eclass for handling udevdir on un-patched versions, to support
diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index 8f700519b1c3..ec60a0c2b172 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -25,13 +25,18 @@ EBUILD mdadm-3.1.4.ebuild 2277 SHA256 63890f88df3b70f7ccc7584f99a6c66ae7435eb4e4
 EBUILD mdadm-3.1.5.ebuild 2235 SHA256 038781a904accd76b9484df7317765c374d5c910beb0c0f7ec57deaafd0737a8 SHA512 ea4a730844ef093defd9a91acedbd00865a1d35eec9f378484c5290959685727d1ef38c4d7056584fe647fc034ae81b21ba504f2e25f7f77a1a310bf7e9ba889 WHIRLPOOL 39f25b4c53fbe3caa8a577b5089f3c8d79c32c49930c5166ee674250d3969b5a7ca7af013d0793da06be59170179779b9175af5d3b8def7d26dcd32d8829564b
 EBUILD mdadm-3.2.3-r2.ebuild 2018 SHA256 6607052b8b7d8260ba6362cf893065e39850b04bce4319ecb6da81b1d1c399d9 SHA512 10fa169071206d997e8b45838c9e16acd5670ab1404d75a9f4881b8d5730b7fa3c24966ee343cbc008c05a388b28f38c0c9efab29ce3320836450fe176404044 WHIRLPOOL 13de1db4fb8727fd1a6d20239098705aca111fb35e97adc8a7c20b743c030b55ddd9b9190df7206f7f1787a161636bcbf9b4c6cd0b4060de27f33b38b9b4f2b5
 EBUILD mdadm-3.2.5-r1.ebuild 1989 SHA256 6cc4f775d1bc3bb6204f80db64c14104da5f13aa3a0a5245577a845063f37211 SHA512 d1f784fbefafe5393a97313dfc372201ace3d7f2caa10f52eb81a6bf9d004e17b5cf2efdd83fc2e165ecb1051a60db6494d8d79bb59446fbb2cb5943668678a9 WHIRLPOOL 3df9ab6b72c2b582bbd16576e25c9533587bdc421a57e4086a41a53388a6a7e2a3abe404fe103df60700803b1c94a2752ae05660bcc257d448b33aa8509989e7
+EBUILD mdadm-3.2.6-r1.ebuild 1955 SHA256 b54b8c459d7183170188ac03a14df56fddea0ab8d2af5a220abfde9cf842fbc1 SHA512 02d17f7ff3b7b0b662f2a19089d888c17ba1042db70e4929c4735297d6a0e87fe10d124d4131413dca2253e05b30e69ba70451b39c208bb39ae62601e58d24ff WHIRLPOOL 88212e2ca04facb59d11ea2f90a748fff6fa0c5c899915e93c9633a9443dbbb5fc62298a9a67c57bcb2c9cf9ee7cf554b1de5bb68296bc1dc88445e84adb8a4d
 EBUILD mdadm-3.2.6.ebuild 1960 SHA256 6acbe9258f052b821d6396b7565684a1a2bad0caf9c2c73e7d84d37c98071569 SHA512 aaa111b614a1cccd30143da2d9fef989960ac4897dc97d84d8af536681ab7be562ef59d0d3978a092a194fe700807e5f5ffd67bbf82e01338bd5b8b4384e2a17 WHIRLPOOL 11a5ff3ca2fb7e71ff0c48567079aa2a3a460aaea85d566ef8354be6ad1ca494c61ac90e545ce0bff04af432948e8d19bd859469c09157ad65098f8b1c560662
-MISC ChangeLog 24561 SHA256 a3fa8fe9fe34a18ef9cb958fd987c76cc396af59fecf9b17821481028ea5a13d SHA512 c25e305e6dc56e049b721fe4f9ec99569174d028e919085217f5d097b5173b4a216dbfd967bac7dde5cc134808e1a6cbed1183f558032147b1fc92e03d3dee5a WHIRLPOOL 524ce9d991ee071215d41db9122162a2ddcd46a9bdfa7e6193ec6a8d4bdb87520eac8006d4fdecf4b4bd2a73b01e0897b3fc51770f82f2de916dcab5375ae5bb
+MISC ChangeLog 24815 SHA256 e4c7b1a7995103e0aa6446238ae038930982234b4f39108c8cd01ba91cf968ac SHA512 1275ffa5bb66a98a83160e4eff0d23b49af1dc8c817e2710343b7e3b7a9b367a9d56db474226f225354597a28998de321635d570435ad795687dd32f2765deb1 WHIRLPOOL d33597524ae3dd26d632c64b687dd7f43279d95390d0c84d95505323507f630f7b66710e39aa8199fa91052103da6e933a4c5843ad9e20290e222b8e8b52e609
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iF4EAREIAAYFAlDHe4YACgkQ2ugaI38ACPDN0gD/VG2CmrM8vsCh9lyBRjAb+qax
-0I8munZVymuQQhQTqfYA/02c8xQaWBzbtSyzI6wzYYHuR5YKXtQyxhAd9Bthdvlf
-=T5uL
+iQEcBAEBCAAGBQJRFQFSAAoJEEdUh39IaPFN95MH/2WgqDZoQMSqbSb+fKn3J+R7
+Dmm0utCIOCGkn2STbeYC6JSMfo8a3eYGzXFkbfLfhX3yB5JQ8n8wpPFqikIfgRNd
+OH8U5Rn709B2DcHS4OKjohkJ1RpAzCGLrQCXAPiESLBaDA8yMyHMJY0z9C7wERJ0
+70SQNwHXalMGuw53hEhiLfMkLMtuslc4jNTINYYpl8gslUxXGk8YFXzBHf2F85aj
+1GkKOAu8Xo22qweg1K3vIGjks641Gfq+pbvOkDGyURb5R2qL4CrJnKK1wEGDdiMk
+y9x+GyUh9byOK/WtunA3Oi8S1o4YCqmN6JxLwns4rq16IBMVtWmD7Fdf+IJuz/A=
+=SEsx
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/mdadm/mdadm-3.2.6-r1.ebuild b/sys-fs/mdadm/mdadm-3.2.6-r1.ebuild
new file mode 100644
index 000000000000..52376cc11ce5
--- /dev/null
+++ b/sys-fs/mdadm/mdadm-3.2.6-r1.ebuild
@@ -0,0 +1,73 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-3.2.6-r1.ebuild,v 1.1 2013/02/08 13:45:41 ssuominen Exp $
+
+EAPI="4"
+inherit multilib eutils flag-o-matic toolchain-funcs
+
+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"
+SRC_URI="mirror://kernel/linux/utils/raid/mdadm/${P}.tar.bz2"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE="static"
+
+DEPEND="virtual/pkgconfig"
+RDEPEND="!<sys-apps/baselayout-2.1-r1
+	!<sys-apps/openrc-0.10
+	>=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"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-3.2.1-mdassemble.patch #211426
+	epatch "${FILESDIR}"/${PN}-3.2.x-udevdir.patch #430900
+}
+
+mdadm_emake() {
+	emake \
+		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
+		CC="$(tc-getCC)" \
+		CWFLAGS="-Wall" \
+		CXFLAGS="${CFLAGS}" \
+		MAP_DIR=/run/mdadm \
+		"$@"
+}
+
+src_compile() {
+	use static && append-ldflags -static
+	mdadm_emake all mdassemble
+}
+
+src_test() {
+	mdadm_emake test
+
+	sh ./test || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	into /
+	dosbin mdassemble
+	dodoc ChangeLog INSTALL TODO README* ANNOUNCE-${PV}
+
+	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
+}
+
+pkg_preinst() {
+	if ! has_version ${CATEGORY}/${PN} ; 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
+}