diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -13,22 +13,22 @@ AUX mdraid.rc-3.1.1 815 RMD160 df283e9b5
 AUX raid-start.sh-3.0 799 RMD160 6495c44ea5be6e18a2b76e0c724f2dbf36073f90 SHA1 2df50d9f03cc907990ddd4b235dbc605c3e208c8 SHA256 7f4e6b5d148578f417bcc05d4d4d5c65641c2a810b74b2f7f43b808c7c52a9ce
 AUX raid-stop.sh 645 RMD160 a2855fbdad1222044a9de5b7a9f441592d42960b SHA1 daa2052a3835ca178005a96a3675759a96119203 SHA256 167a6bd452b5831cd5235eb80bf5f91bb2e5a10db132408fce29e60eb9d200db
 DIST mdadm-3.1.4.tar.bz2 288578 RMD160 f41a2be4158efac08dbe2e95f1c6812609475fad SHA1 4ee43922d38b15a930daaaa026ef1b4efacdbc8a SHA256 849ad0ad4ad3c1d2d8806a16b30e1f59ab2daf313cb103807207f7cba889ea63
-EBUILD mdadm-3.1.4.ebuild 2271 RMD160 233b8572588054d71bb00faddb480b322fdf1827 SHA1 70f7e1975e95ac31d216f7fe45abaf65cb108142 SHA256 83d7d5e15a09e87bd63dbaad808a063feb37a6aac5184ba44782460aebfe4966
+EBUILD mdadm-3.1.4.ebuild 2295 RMD160 9b4923e5670fecd608c4c717e299dbc1a104fc12 SHA1 0bf0e2f4493ee95899e5ba501af5d17a4cbdf4cf SHA256 ce131ebb7101e134acbe98adbdd6ee5a6828204141691b6188f390ce5e398456
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNL8A9AAoJEHQ6UuhrqBBQLB4P/AsK3RKarYz9OBF8cqDyIFAE
-H3zCne1akSmXLCKoIXsnkowlqUc7otwrP4b6s/wqUVhv75jgdOxLOXQYa1dw8PpD
-x+jUS0OfU0VZ4R0X5cH+kvkmj5Id4X6Efr3eedjboqd2yzPPVM2w0Chng9Z9EbjC
-2EdqjSbumktnutBalwrXH423vgf6si6DGAClZSTAapSpOsrNIM12c5iAu+FfyOxZ
-eU0rXSCjIj6GUZ3iiJGD6nAty0KuHalh6HNoaKMmrCNpp+yElyRA8rOQLgBhXqyY
-bIo+h2kbn5e8M6J1b5XzX//vmrGe0wXcGtxkpvjzAajDZTgLf5P9eWjkjMvWjbuK
-9fT5c3FIVVq/bbXWATRXEqE6mgFwka/1nPgG7W8NKe9gMoIDTL+EiX8TCSznqlr7
-0nWWtj7ivJjSz95ang2z4lq+D2EPpanKoIBRr93pDK6nYiSaWiYcaZDkDXXMeIca
-GsbSYcFpzxVKZ+Q6RpTaMLV5LUfeLOS52uCJ5WRBXKwOVD4Jnh3XQWYy5uu+L4tF
-552oz0ye/+GgCWtOF6FmU8lz2s1gMOyOjW9KVQX+MqERSgJmIY7x9q1GYTt0EMnF
-qlJAwwDEUJNPOrfFzysSReeLY2kmMt72vz5xOZJKbbLpVh0PwFzpYF7OZhGpQIZP
-URVsfTBH8m2/qUfwUq8l
-=8lmx
+iQIcBAEBCAAGBQJNMU4gAAoJEHQ6UuhrqBBQVnQP/1ImS7nMzfXtvRBuxMwekyqN
+onatSp5WcyzfRpsGnVYdB8H6odVkb+6PHVgAmUciw3LvCj/Qbp7flTbVl8XrWtRS
+OxFcgg7gGSAd126BzIZia1wJ0qHb2aZdWfDg1JN76qMUsJEyD0I0+4l9GzE2VwRC
+rzOlt8yJ+Ig8K3+NjMEegV6bWJSNpnjPFEN5NI/8bStQ+ME+v5hNn/jfEg8dcpm9
+THPdi2FuvM2v3VgQqsJZeQy9VYvbPjtZeble4sxjgP54gHacyem0US9rSOlvxIDN
+9LHisv4EH+vxWGABRRiC8C9ExM4nuFtST4wS623hl185EsDZg/72plN2pSL8128Y
+CpTjKoCtR7cTX+H6vuslxl4ZaJ9N2FLrnCiJGjse6BU2xAhvoKrZta1hEXSM+jJx
+FXE19HwZxAh0ulhLbm4rBOwJEcDPvQMyNPDlWQ94I+oB6ST1fGwVZtIKyyWk9HVt
+jh84J4V2mnIqT6mvmtPXBS2zI95w6dYy2JIS2wnETQW+u5PYBIKMLG7CV1Op7TWb
+p1Kl+qngpa3CgLD0hTvupoIQfSNrjLcz8fQ3d3vNR5WuWDaZ6bcQQ2sP8jSuCUue
+khM6HWQk5HfC+iR6/e5suyPvmbPoI/+9YtBeCxA4Ol+8xbDvdu9/8IZkKmsE++Sa
+Q4d37s2gM8MCUqQT7vnO
+=KhEg
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/mdadm/mdadm-3.1.4.ebuild b/sys-fs/mdadm/mdadm-3.1.4.ebuild
--- a/sys-fs/mdadm/mdadm-3.1.4.ebuild
+++ b/sys-fs/mdadm/mdadm-3.1.4.ebuild
@@ -18,7 +18,7 @@ RDEPEND=">=sys-apps/util-linux-2.16"
 
 # 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.
+# RAID devices. See bug #336175
 RESTRICT="test"
 
 src_unpack() {
@@ -27,7 +27,7 @@ src_unpack() {
 	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}"/${P}-cflags.patch
+	epatch "${FILESDIR}"/${P}-cflags.patch #336175
 	use static && append-ldflags -static
 
 	sed -i -e 's:-z now::' Makefile || die #331653