Fix unmerged changes from previous commit; Add original ebuilds

17 files changed, 433 insertions, 0 deletions

diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
new file mode 100644
index 00000000..623cedd3
--- /dev/null
+++ b/sys-fs/mdadm/Manifest
@@ -0,0 +1,17 @@
+AUX mdadm-2.6-syslog-updates.patch 1117 SHA256 207fd5ec76829fed5310f766001686807c623fe3eee541701f3366f96ef77b86 SHA512 268838ff1ff262b4ce6fdfda16b5b062b4debf0e4a9fa7b9e6e129d3ee60bac96f461ca02fa5663e166678cc03ef488eb24d160486a7504366deaedc42c05d83 WHIRLPOOL a2a806eab4fe0c116ce4c0d9d50ad6b70a1f2f9a1351622f1536f84764382bcb0fd53891e121d6b05349ae423ea0f455dd94027e51ccf09d661c4cf29a375c46
+AUX mdadm-2.6.4-mdassemble.patch 465 SHA256 015321cbb219f80444c9d56d01bde36f828d2814c57712a7655bdbae811ff8c4 SHA512 95e405b04fd7ed944e8c80840ada3b32e35c86aa260b27e827f2e8021a90d03ff644eba00fcfcd9def4ed7e1e672aba0ccb68bbb5840b34a34a68a8cb68cf727 WHIRLPOOL 9fde86d14b32e6c8345df0ca4d6baecb433389ebbb2b035c8142c2b85ccdecebd0bdf7f8edbe092c65420213ca43289055d80beee2a65c10ee484f259c42e102
+AUX mdadm-3.0-dont-make-man.patch 278 SHA256 bfc42300913a178c3bcd5f9af4c721893224b2741beddcfba6498d012b1d5679 SHA512 571a022b92c090e743adfdf2f7e0609d86c2bf729bcff42a002f2bfc999d5f814540753cd44b04eb4656e53b70679ab7381e688399a6cdd992a433cde3612140 WHIRLPOOL 0808d47b9a48fd799368d1e4334de8dd54e12f04aeb0458a7cbf87e2a502aa7084b9d1f8c97feaf32f438a645dab314e400c7c99b743f094e25992b136ef3ec0
+AUX mdadm-3.1.4-cflags.patch 842 SHA256 debf37081d731d86a5657f3bbf30feb90d401b9958c6eb014f05d1d155a3b298 SHA512 b326d7aa88fec67092fc2d69cc1f5de06617544cc9a538b1e727905e30a028881d17fe1fa017ad2d975c966d9fec9752d60f6349e39fa973062e0a7d3a70919b WHIRLPOOL fd277db2bf3030bfc64e38b10c787b97942b466f07f86813845217dc39e8d3a6383babf912b4b9c3449c1ffb9c2cf9d10a252665b62a9f4a0618494b1392df73
+AUX mdadm-3.1.5-cflags.patch 850 SHA256 1ebe42ca18830b2aec578f0d72e3e36275ac0caa351f7acec6a0caa3f9f8126a SHA512 36f5aefcd0aa97a00f2a580624927e0386e702b4b274f5b14024fadb5d797784dd67fb34d0d1a3f9603b0cfa4ce5db5d22e1df1625cfd56f435b6fe6cc7529ba WHIRLPOOL 59fff7c6a6a48d966d29858d5f3c3e45f085cd6ed30137941fde37fc69810e080943806252876f9b5c38a45e10b566ab441b22f4e6033bfcf89f67cd44300751
+AUX mdadm-3.2.1-mdassemble.patch 487 SHA256 505f9fec01fd8a40f773fd6709337b2b29fc30a600cddd3075a647198279592c SHA512 258a4c00aaf0448b173fc8e201595d7378c7d6e77e97c98050dfdc3a0ba889c5320ad6517e1aec951d9f84a014dbd5b78f66d52cb21d57eb6a0a85e51e8cd73d WHIRLPOOL 5cc398866b82425923a5524636e886fa44b32a3c02cf64f6d7c93ce253704e6fb041f77bef6b1cf755d3b67582496cbab8af70ee213046713f1306e5e192e206
+AUX mdadm-3.2.3-segv-assemble.patch 506 SHA256 4f1c91bb2a9a2b7354c119ac3dfc83acecae389bbe3e48c38950cb24892b0c66 SHA512 efc40a7fc584293de53fd2d3ef75df715273f6f219fef31eb58a5e980079366970ebcaaa7f0c55c56e1f15381d8580d19cf369d815420c7a26a2d8f515b533bd WHIRLPOOL a58fa29aada96d3c58c473236b9083b8f679892e6541fc4ec9a5d6a4f9057f98a972cab06a2f89930d441baea77726c00216a7ffaa968d98cf0b0715a28d6211
+AUX mdadm-3.2.x-udevdir.patch 876 SHA256 937132cf80fed615e9714940819874b9f8ec0125df08e55db876601a1ac84365 SHA512 67635a7c66f319ef7dfd2397925ac599015316f2715785abc25eae6c46e4bb0e69d0e402bff48264c2e3347af679940b81964147c61b9d6407266634bd29791f WHIRLPOOL 75b0b6d11d3b85598fa96881e0f309a09e2e7d465f9bf46b02bde3230308c8532d1612af242c3107895713c8caa4b25864c39d66c4599ed4b939d8c37840c9af
+AUX mdadm.confd 205 SHA256 ec55674955af7a31da51b8b72b599e8519809287dad796a9b16155bcba471b79 SHA512 7bf66898000b3d02bbf0704a8032b0f4fc045380501dc8d2bbbb31d33b122d9c35879b25714663079eeadd207c9da87c9d9af8464e76146bf5b68594e73fd92c WHIRLPOOL b6a86bae6d298bcff17a497739109fa07f2bfb2682454a089dfef7ad51d2d770eec2661a5dd77140fe6ec33e94bc87d2378790eb06d11eace8dbe4ff0b83b677
+AUX mdadm.rc 574 SHA256 3073b14619cb7b2c99c33f2d6cfd1e59ce5557899bffebaa65fa52f3caffadc7 SHA512 d01f5de3ca957189d3619fda4c982c776533b20fac232832bfb7f34de5724348be572c24ad35508e5dc48b2df4710a258a4d1af39471ff7ce2c56ada13dfa7ab WHIRLPOOL 1362c4cbef50bd904092c5cb575ac3336e7e75ead2819795221406e0f2665843e5500fa7ecaf9e48e0231773ed18ea7950ffb5188f2f4e2138944931418e6b69
+AUX mdraid.confd 225 SHA256 1b7918c4bdd024607bcb49d7cea0a77cb70502d2fbb4dbe07024bb5b5699c8e0 SHA512 645c36a445f80233e8bba141911bc2355fc932a22867df554d54f4f23cb8967a10f623de0935b18c1606dd6782e9b2f01a51960423d795c154f08607ca79e3be WHIRLPOOL ead77078688bc5db9f7c08bf97bff2634eb5f73b9197275e69d28b7f59ddd6b458cbaa2f0d243f5a07d5a1cda737b18534bab911a82a998e3be8ab23421333ab
+AUX mdraid.rc 838 SHA256 73303ec32b7010c7f6d4fd66dde1a5baea07e73c79d3e516dce31000abdb4089 SHA512 a80f745290ca4240d8485a686f19460c9504da5b6ed0da7b2c295b096bdbd9cb70b01c8cbfad4614ad89709b0e7d80074a69ff5248b45887273ca4d11d0dab92 WHIRLPOOL 65eff88b858082e46beca07ca2ccddbd1a116a8aac65d41c26717a3f075cca04ca278da00f0cd9a96297f95778e31a2b962923740300f1d73878b0f6eda1a7da
+AUX mdraid.rc-3.1.1 815 SHA256 95f759ba9d4f719bb5122546fdcce18dd9b0060df1296cf8ae17a04137e163e2 SHA512 4bf2235bdffde101d10c408de486e9629caf1eed3f574bf3ed206d7013e8a715016066069272d24894a4c428009003de4ee3d8291323e2aaae3157fbce4318ed WHIRLPOOL 65fed6723b508405ea67d4d5973a617b21c8b90ea480c69bc7da843718c16c98ed89a32013d102860c62fe0de8b8e8002180649e0176e303a887698baa7f053e
+AUX raid-start.sh-3.0 799 SHA256 7f4e6b5d148578f417bcc05d4d4d5c65641c2a810b74b2f7f43b808c7c52a9ce SHA512 ee4adfe57c28c0af00e6ca84c4e3c22eefee70dc57e0a362f56364e6f4c6d5f153e50505d7b067385843e0ecfd291fa6e589db33f0287763609e8b8bbe0b5015 WHIRLPOOL 8323589e8fb1694912e887ed5e9c296f0692be2e91641cc2be62af0ec7057db9993543adcbfbbf4fd45ada4ed9873db630e26e9be14f066490d09d6e629c1792
+AUX raid-stop.sh 645 SHA256 167a6bd452b5831cd5235eb80bf5f91bb2e5a10db132408fce29e60eb9d200db SHA512 8ee27e586dccf75bed3026f4beb42f429b53b0f11791122674122b90482010cd278c9d714a397bf1636617068e3e440c5fbc5babd89109f3c8e7a5a04dc82c05 WHIRLPOOL 14f76b1155299e7febd95e27e878e08997f4d57d5ef14e19b973a0917305617a47c242806399d17776e4d42885a199eec61dac8e0a12286f0ddf04f345283777
+DIST mdadm-3.1.4.tar.bz2 288578 SHA256 849ad0ad4ad3c1d2d8806a16b30e1f59ab2daf313cb103807207f7cba889ea63 SHA512 b668773d4f43bc90fba0ac27f01fc869aa2068d958ccc84de2bf8a64ac7e9a40cc8e461ff04a3619b17459d05478843b9fff0894868d9cbc97fc2cfa80faac73 WHIRLPOOL 28a3b43d4edfa4a097d2c410a9d67b75707dfa20d30c72870cc0584132bd2f896c02be26f97ca0d588be8cabdcf90e89d33c3f23ca727e966597ffea9af9a3a9
+EBUILD mdadm-3.1.4.ebuild 2277 SHA256 63890f88df3b70f7ccc7584f99a6c66ae7435eb4e44b4b262aab4c854bc2dd6b SHA512 46676cc4ef53536654c372ca44e4916e11bdc237ecf3d76256af9d9351796e9837febb9d2f3add958f0ae41c67ac2135494a2fa61fd70facaed9eb6bafc2b1f2 WHIRLPOOL 525fdc76f1a173a712111903dc02528611cc72946278d9460cc115d3986a48e926ced81114cf7626d79c1c8116be6cc736bd4184b8bc57574ab1479ac93429c6
diff --git a/sys-fs/mdadm/files/mdadm-2.6-syslog-updates.patch b/sys-fs/mdadm/files/mdadm-2.6-syslog-updates.patch
new file mode 100644
index 00000000..ca50c711
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-2.6-syslog-updates.patch
@@ -0,0 +1,30 @@
+--- mdadm-2.4.1/Monitor.c
++++ mdadm-2.4.1/Monitor.c
+@@ -126,7 +126,7 @@
+ 			fprintf(stderr, Name ": Monitor using program \"%s\" from config file\n",
+ 			       alert_cmd);
+ 	}
+-	if (scan && !mailaddr && !alert_cmd) {
++	if (scan && !mailaddr && !alert_cmd && !dosyslog) {
+ 		fprintf(stderr, Name ": No mail address or alert command - not monitoring.\n");
+ 		return 1;
+ 	}
+@@ -465,7 +465,7 @@
+ {
+ 	int priority;
+ 
+-	if (!cmd && !mailaddr) {
++	if (!cmd && !mailaddr && !dosyslog) {
+ 		time_t now = time(0);
+ 	       
+ 		printf("%1.15s: %s on %s %s\n", ctime(&now)+4, event, dev, disc?disc:"unknown device");
+--- mdadm-2.4.1/ReadMe.c
++++ mdadm-2.4.1/ReadMe.c
+@@ -463,6 +464,7 @@
+ "  --mail=       -m   : Address to mail alerts of failure to\n"
+ "  --program=    -p   : Program to run when an event is detected\n"
+ "  --alert=           : same as --program\n"
++"  --syslog      -y   : Report alerts via syslog\n"
+ "  --delay=      -d   : seconds of delay between polling state. default=60\n"
+ "  --config=     -c   : specify a different config file\n"
+ "  --scan        -s   : find mail-address/program in config file\n"
diff --git a/sys-fs/mdadm/files/mdadm-2.6.4-mdassemble.patch b/sys-fs/mdadm/files/mdadm-2.6.4-mdassemble.patch
new file mode 100644
index 00000000..69f35c99
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-2.6.4-mdassemble.patch
@@ -0,0 +1,16 @@
+http://bugs.gentoo.org/211426
+
+make default mdassemble sane
+
+--- Makefile
++++ Makefile
+@@ -121,8 +121,7 @@
+ 	$(CC) $(CXFLAGS) $(LDFLAGS) -o test_stripe -DMAIN restripe.c
+ 
+ mdassemble : $(ASSEMBLE_SRCS) mdadm.h
+-	rm -f $(OBJS)
+-	$(DIET_GCC) $(ASSEMBLE_FLAGS) -o mdassemble $(ASSEMBLE_SRCS)  $(STATICSRC)
++	$(CC) $(LDFLAGS) $(ASSEMBLE_FLAGS) -DHAVE_STDINT_H -o mdassemble $(ASSEMBLE_SRCS) $(STATICSRC)
+ 
+ mdassemble.static : $(ASSEMBLE_SRCS) mdadm.h
+ 	rm -f $(OBJS)
diff --git a/sys-fs/mdadm/files/mdadm-3.0-dont-make-man.patch b/sys-fs/mdadm/files/mdadm-3.0-dont-make-man.patch
new file mode 100644
index 00000000..8c43fef8
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-3.0-dont-make-man.patch
@@ -0,0 +1,11 @@
+The .man files are never installed so there's no point in 
+generating them, especially since the source manpages are 
+installed.
+
+--- mdadm-3.0/Makefile
++++ mdadm-3.0/Makefile
+@@ -69,3 +69,3 @@
+ 
+-all : mdadm mdmon mdadm.man md.man mdadm.conf.man mdmon.man
++all : mdadm mdmon
+ 
diff --git a/sys-fs/mdadm/files/mdadm-3.1.4-cflags.patch b/sys-fs/mdadm/files/mdadm-3.1.4-cflags.patch
new file mode 100644
index 00000000..4b59a0d5
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-3.1.4-cflags.patch
@@ -0,0 +1,27 @@
+by Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
+
+Use CFLAGS when using the compiler driver during the linking stage.
+Fixes Gentoo portage-multilib compilation failure.
+
+http://bugs.gentoo.org/336175
+
+--- a/Makefile
++++ b/Makefile
+@@ -144,7 +144,7 @@
+ # mdadm.tcc doesn't work..
+ 
+ mdadm : $(OBJS)
+-	$(CC) $(LDFLAGS) -o mdadm $(OBJS) $(LDLIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o mdadm $(OBJS) $(LDLIBS)
+ 
+ mdadm.static : $(OBJS) $(STATICOBJS)
+ 	$(CC) $(LDFLAGS) -static -o mdadm.static $(OBJS) $(STATICOBJS)
+@@ -167,7 +167,7 @@
+ 
+ # use '' to guarantee no dynamic linker interactions with the monitor thread
+ mdmon : $(MON_OBJS)
+-	$(CC) $(LDFLAGS) $(MON_LDFLAGS) -z now -o mdmon $(MON_OBJS) $(LDLIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(MON_LDFLAGS) -z now -o mdmon $(MON_OBJS) $(LDLIBS)
+ msg.o: msg.c msg.h
+ 
+ test_stripe : restripe.c mdadm.h
diff --git a/sys-fs/mdadm/files/mdadm-3.1.5-cflags.patch b/sys-fs/mdadm/files/mdadm-3.1.5-cflags.patch
new file mode 100644
index 00000000..36005b91
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-3.1.5-cflags.patch
@@ -0,0 +1,27 @@
+by Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
+
+Use CFLAGS when using the compiler driver during the linking stage.
+Fixes Gentoo portage-multilib compilation failure.
+
+http://bugs.gentoo.org/336175
+
+--- a/Makefile
++++ b/Makefile
+@@ -144,7 +144,7 @@
+ # mdadm.tcc doesn't work..
+ 
+ mdadm : $(OBJS)
+-	$(CC) $(LDFLAGS) -o mdadm $(OBJS) $(LDLIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) -o mdadm $(OBJS) $(LDLIBS)
+ 
+ mdadm.static : $(OBJS) $(STATICOBJS)
+ 	$(CC) $(LDFLAGS) -static -o mdadm.static $(OBJS) $(STATICOBJS)
+@@ -167,7 +167,7 @@
+ 
+ # use '' to guarantee no dynamic linker interactions with the monitor thread
+ mdmon : $(MON_OBJS)
+-	$(CC) $(LDFLAGS) $(MON_LDFLAGS) -Wl,-z,now -o mdmon $(MON_OBJS) $(LDLIBS)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(MON_LDFLAGS) -Wl,-z,now -o mdmon $(MON_OBJS) $(LDLIBS)
+ msg.o: msg.c msg.h
+ 
+ test_stripe : restripe.c mdadm.h
diff --git a/sys-fs/mdadm/files/mdadm-3.2.1-mdassemble.patch b/sys-fs/mdadm/files/mdadm-3.2.1-mdassemble.patch
new file mode 100644
index 00000000..6e12dc25
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-3.2.1-mdassemble.patch
@@ -0,0 +1,16 @@
+http://bugs.gentoo.org/211426
+
+make default mdassemble sane
+
+--- a/Makefile
++++ b/Makefile
+@@ -181,8 +181,7 @@
+ 	$(CC) $(CXFLAGS) $(LDFLAGS) -o raid6check raid6check.o $(CHECK_OBJS)
+ 
+ mdassemble : $(ASSEMBLE_SRCS) $(INCL)
+-	rm -f $(OBJS)
+-	$(DIET_GCC) $(ASSEMBLE_FLAGS) -o mdassemble $(ASSEMBLE_SRCS)  $(STATICSRC)
++	$(CC) $(CFLAGS) $(LDFLAGS) $(ASSEMBLE_FLAGS) -DHAVE_STDINT_H -o mdassemble $(ASSEMBLE_SRCS) $(STATICSRC)
+ 
+ mdassemble.static : $(ASSEMBLE_SRCS) $(INCL)
+ 	rm -f $(OBJS)
diff --git a/sys-fs/mdadm/files/mdadm-3.2.3-segv-assemble.patch b/sys-fs/mdadm/files/mdadm-3.2.3-segv-assemble.patch
new file mode 100644
index 00000000..e88d5aac
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-3.2.3-segv-assemble.patch
@@ -0,0 +1,16 @@
+https://bugs.gentoo.org/403593
+
+the merging of code in upstream commit 2244d1a9877d18bdc42a5204d31f41920d369e87
+introduced this bug.  patch by Nikita Kozlov.
+
+--- a/config.c
++++ b/config.c
+@@ -1045,7 +1045,7 @@ struct mddev_ident *conf_match(struct supertype *st,
+ 					array_list->devname);
+ 			continue;
+ 		}
+-		if (array_list->devices &&
++		if (array_list->devices && devname &&
+ 		    !match_oneof(array_list->devices, devname)) {
+ 			if (verbose >= 2 && array_list->devname)
+ 				fprintf(stderr, Name
diff --git a/sys-fs/mdadm/files/mdadm-3.2.x-udevdir.patch b/sys-fs/mdadm/files/mdadm-3.2.x-udevdir.patch
new file mode 100644
index 00000000..8bfdcd52
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm-3.2.x-udevdir.patch
@@ -0,0 +1,26 @@
+http://bugs.gentoo.org/430900
+
+--- Makefile
++++ Makefile
+@@ -97,6 +97,12 @@
+ MAN4DIR = $(MANDIR)/man4
+ MAN5DIR = $(MANDIR)/man5
+ MAN8DIR = $(MANDIR)/man8
++PKG_CONFIG ?= pkg-config
++
++UDEVDIR := $(shell $(PKG_CONFIG) --variable=udevdir udev 2>/dev/null)
++ifndef UDEVDIR
++  UDEVDIR = lib/udev
++endif
+ 
+ OBJS =  mdadm.o config.o policy.o mdstat.o  ReadMe.o util.o maps.o lib.o \
+ 	Manage.o Assemble.o Build.o \
+@@ -254,7 +260,7 @@
+ 	$(INSTALL) -D -m 644 mdadm.conf.5 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5
+ 
+ install-udev: udev-md-raid.rules
+-	$(INSTALL) -D -m 644 udev-md-raid.rules $(DESTDIR)/lib/udev/rules.d/64-md-raid.rules
++	$(INSTALL) -D -m 644 udev-md-raid.rules $(DESTDIR)/$(UDEVDIR)/rules.d/64-md-raid.rules
+ 
+ uninstall:
+ 	rm -f $(DESTDIR)$(MAN8DIR)/mdadm.8 $(DESTDIR)$(MAN8DIR)/mdmon.8 $(DESTDIR)$(MAN4DIR)/md.4 $(DESTDIR)$(MAN5DIR)/mdadm.conf.5 $(DESTDIR)$(BINDIR)/mdadm
diff --git a/sys-fs/mdadm/files/mdadm.confd b/sys-fs/mdadm/files/mdadm.confd
new file mode 100644
index 00000000..a4ead14d
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm.confd
@@ -0,0 +1,7 @@
+# /etc/conf.d/mdadm: config file for /etc/init.d/mdadm
+
+# Misc options to pass to mdadm in monitor mode.
+# For more info, run `mdadm --monitor --help` or see
+# the mdadm(8) manpage.
+
+MDADM_OPTS="--syslog"
diff --git a/sys-fs/mdadm/files/mdadm.rc b/sys-fs/mdadm/files/mdadm.rc
new file mode 100755
index 00000000..c30004d0
--- /dev/null
+++ b/sys-fs/mdadm/files/mdadm.rc
@@ -0,0 +1,26 @@
+#!/sbin/runscript
+# Copyright 1999-2006 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/files/mdadm.rc,v 1.2 2006/04/25 05:41:51 vapier Exp $
+
+depend() {
+	use logger dns net
+}
+
+start() {
+	ebegin "Starting mdadm monitor"
+	mdadm --monitor --scan \
+		--daemonise \
+		--pid-file /var/run/mdadm.pid \
+		${MDADM_OPTS}
+	eend $?
+}
+
+stop() {
+	local ret
+	ebegin "Stopping mdadm monitor"
+	start-stop-daemon --stop --pidfile /var/run/mdadm.pid
+	ret=$?
+	rm -f /var/run/mdadm.pid
+	eend ${ret}
+}
diff --git a/sys-fs/mdadm/files/mdraid.confd b/sys-fs/mdadm/files/mdraid.confd
new file mode 100644
index 00000000..daa17abd
--- /dev/null
+++ b/sys-fs/mdadm/files/mdraid.confd
@@ -0,0 +1,5 @@
+# /etc/conf.d/mdraid: config file for /etc/init.d/mdraid
+
+# For people who run raid on top of some other layer (like
+# dmcrypt), use rc_need to specify that requirement.  See
+# the runscript(8) man page for more information.
diff --git a/sys-fs/mdadm/files/mdraid.rc b/sys-fs/mdadm/files/mdraid.rc
new file mode 100644
index 00000000..27421e26
--- /dev/null
+++ b/sys-fs/mdadm/files/mdraid.rc
@@ -0,0 +1,40 @@
+#!/sbin/runscript
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/files/mdraid.rc,v 1.6 2011/11/12 21:06:44 vapier Exp $
+
+depend() {
+	before checkfs fsck
+	after modules
+}
+
+start() {
+	local output
+
+	ebegin "Starting up RAID devices"
+	output=$(mdadm -As 2>&1)
+	eend $? "${output}"
+
+	local pat="/dev/md_d*"
+	set -- ${pat}
+	if [ "$*" != "${pat}" ] ; then
+		ebegin "Creating RAID device partitions"
+		blockdev "$@"
+		eend $?
+		# wait because vgscan runs next, and we want udev to fire
+		sleep 1
+	fi
+
+	return 0
+}
+
+stop() {
+	local output
+
+	# XXX: Maybe drop this check ?
+	[ ! -e /etc/mdadm/mdadm.conf ] && [ ! -e /etc/mdadm.conf ] && return 0
+
+	ebegin "Shutting down RAID devices (mdadm)"
+	output=$(mdadm -Ss 2>&1)
+	eend $? "${output}"
+}
diff --git a/sys-fs/mdadm/files/mdraid.rc-3.1.1 b/sys-fs/mdadm/files/mdraid.rc-3.1.1
new file mode 100644
index 00000000..571c83f8
--- /dev/null
+++ b/sys-fs/mdadm/files/mdraid.rc-3.1.1
@@ -0,0 +1,40 @@
+#!/sbin/runscript
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/files/mdraid.rc-3.1.1,v 1.1 2010/01/24 22:20:57 robbat2 Exp $
+
+depend() {
+	if [ ! -e /sbin/functions.sh ] ; then
+		# on baselayout-1 this could cause
+		# dependency-cycles with checkroot (before *)
+		before checkfs fsck
+		after modules
+	fi
+}
+
+run_addon() {
+	local f=/lib/rcscripts/addons/$1.sh
+	if [ -r "$f" ]; then
+		( . "$f" )
+	fi
+}
+start_addon() {
+	run_addon "$1"-start
+}
+stop_addon() {
+	run_addon "$1"-stop
+}
+
+start() {
+	if [ -e /sbin/functions.sh ] ; then
+		eerror "The ${SVCNAME} init script is written for baselayout-2"
+		eerror "Please do not use it with baselayout-1"
+		return 1
+	fi
+
+	start_addon raid
+}
+
+stop() {
+	stop_addon raid
+}
diff --git a/sys-fs/mdadm/files/raid-start.sh-3.0 b/sys-fs/mdadm/files/raid-start.sh-3.0
new file mode 100755
index 00000000..4236622f
--- /dev/null
+++ b/sys-fs/mdadm/files/raid-start.sh-3.0
@@ -0,0 +1,28 @@
+# /lib/rcscripts/addons/raid-start.sh:  Setup raid volumes at boot
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/files/raid-start.sh-3.0,v 1.2 2010/06/03 02:03:40 vapier Exp $
+
+[ -f /proc/mdstat ] || exit 0
+
+# Start software raid with mdadm
+if [ -x /sbin/mdadm ] ; then
+	ebegin "Starting up RAID devices"
+	output=$(mdadm -As 2>&1)
+	ret=$?
+	[ ${ret} -ne 0 ] && echo "${output}"
+	eend ${ret}
+fi
+
+if [ -x /sbin/blockdev ] ; then
+	partitioned_devs=$(ls /dev/md_d* 2>/dev/null)
+	if [ -n "${partitioned_devs}" ]; then
+		ebegin "Creating RAID device partitions"
+		/sbin/blockdev ${partitioned_devs}
+		eend 0
+		# wait because vgscan runs next, and we want udev to fire
+		sleep 1
+	fi
+fi
+
+# vim:ts=4
diff --git a/sys-fs/mdadm/files/raid-stop.sh b/sys-fs/mdadm/files/raid-stop.sh
new file mode 100644
index 00000000..a59fd317
--- /dev/null
+++ b/sys-fs/mdadm/files/raid-stop.sh
@@ -0,0 +1,19 @@
+# /lib/rcscripts/addons/raid-stop.sh:  Stop raid volumes at shutdown
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/files/raid-stop.sh,v 1.4 2008/06/28 16:36:46 vapier Exp $
+
+[ -f /proc/mdstat ] || exit 0
+
+# Stop software raid with mdadm (new school)
+mdadm_conf="/etc/mdadm/mdadm.conf"
+[ -e /etc/mdadm.conf ] && mdadm_conf="/etc/mdadm.conf"
+if [ -x /sbin/mdadm -a -f "${mdadm_conf}" ] ; then
+	ebegin "Shutting down RAID devices (mdadm)"
+	output=$(mdadm -Ss 2>&1)
+	ret=$?
+	[ ${ret} -ne 0 ] && echo "${output}"
+	eend ${ret}
+fi
+
+# vim:ts=4
diff --git a/sys-fs/mdadm/mdadm-3.1.4.ebuild b/sys-fs/mdadm/mdadm-3.1.4.ebuild
new file mode 100644
index 00000000..bb92b422
--- /dev/null
+++ b/sys-fs/mdadm/mdadm-3.1.4.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-3.1.4.ebuild,v 1.11 2012/08/12 15:25:08 ssuominen Exp $
+
+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 ~arm hppa ia64 ~mips ppc ppc64 sparc x86"
+IUSE="static"
+
+DEPEND=""
+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"
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	epatch "${FILESDIR}"/${PN}-3.0-dont-make-man.patch
+	epatch "${FILESDIR}"/${PN}-2.6-syslog-updates.patch
+	epatch "${FILESDIR}"/${PN}-2.6.4-mdassemble.patch #211426
+	epatch "${FILESDIR}"/${PN}-3.1.4-cflags.patch #336175
+	use static && append-ldflags -static
+
+	sed -i -e 's:-z now::' Makefile || die #331653
+}
+
+mdadm_emake() {
+	emake \
+		CC="$(tc-getCC)" \
+		CWFLAGS="-Wall" \
+		CXFLAGS="${CFLAGS}" \
+		"$@" \
+		|| die
+}
+
+src_compile() {
+	mdadm_emake all mdassemble
+}
+
+src_test() {
+	mdadm_emake test
+
+	sh ./test || die
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die
+	into /
+	dosbin mdassemble || die
+	dodoc ChangeLog INSTALL TODO README* ANNOUNCE-${PV}
+
+	exeinto /$(get_libdir)/rcscripts/addons
+	newexe "${FILESDIR}"/raid-start.sh-3.0 raid-start.sh || die
+	newexe "${FILESDIR}"/raid-stop.sh raid-stop.sh || die
+
+	insinto /etc
+	newins mdadm.conf-example mdadm.conf
+	newinitd "${FILESDIR}"/mdadm.rc mdadm || die
+	newconfd "${FILESDIR}"/mdadm.confd mdadm || die
+	newinitd "${FILESDIR}"/mdraid.rc-3.1.1 mdraid || die
+	newconfd "${FILESDIR}"/mdraid.confd mdraid || die
+
+	# do not rely on /lib -> /libXX link
+	sed -i \
+		-e "s:/lib/rcscripts/:/$(get_libdir)/rcscripts/:" \
+		"${D}"/etc/init.d/*
+}
+
+pkg_postinst() {
+	elog "If using baselayout-2 and not relying on kernel auto-detect"
+	elog "of your RAID devices, you need to add 'mdraid' to your 'boot'"
+	elog "runlevel. Run the following command:"
+	elog "rc-update add mdraid boot"
+}