# HG changeset patch
# User Nathan Phillip Brink <ohnobinki@ohnopublishing.net>
# Date 2011-01-13 18:44:04
# Node ID 48f81b4c92c4f9e181999bd095ac1bd978291d7f
# Parent  769820bd8abf711dbc1043c383ce1bc89cc68aa1

sys-fs/mdadm: Follow ebuild editing suggestions by vapier in bug 336175 comment 14.

(Portage version: 2.2.0_alpha14-r1/hg/Linux x86_64, signed Manifest commit with key 6BA81050)

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 2298 RMD160 b4bdaa9e128fec3ce3183f4655189df067aeb600 SHA1 3819a3c639a24405071dd14aa3bdec67d649ad86 SHA256 3955d45ae92b393d646cf0eee90f8122d1319a8a3fd1dfec51d1dfec5cf47283
+EBUILD mdadm-3.1.4.ebuild 2193 RMD160 d30705dd66d8e6fde38e68f256bd3d8a6c7945a8 SHA1 46ae13b2bccf0bbfc830a44178568874d72af036 SHA256 f1f19426d9920cd2fd03a4316d921bffc4c48ccc4a62a3bd33fa9c321df110cd
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.14 (GNU/Linux)
 
-iQIcBAEBCAAGBQJNGqqKAAoJEHQ6UuhrqBBQYwEP/RZB7mq5cWjrUk1aPjR0H8+Z
-KjpaNcI8IKFrx0zFSusSkwP2A42rJtt6VOHBguRjLsZzWz8l3eAz8yI60RFSv0eY
-XTbHO5ihqiLFL4tu70nTrE5BIpvyFe+61GnPhPftPZQUiJvD8yetsw7PyXx1mjnL
-JtKqiXdd2ISr8VLb6rY3OhARD6Of5/R4bagSdPrx9BK9wcwH9vChXUW9DpjkDJ4o
-586ssiaLVaznt0uilVtGfJ7XFCygTV/Rtiug7aeiWZ1SQuveUTKmPJ7nGD3p73OP
-QMY/9zw8pDMuGrHNVh3za5JGM5wZT9mfE317Mz1UThF1TlitFamrpUaOqsGO4Gwr
-+2nuB7DYeWk8mv1nkmB967TmEthaZ948gbcZY9A8NeT1Y8/oGMO0XQFhfbqptX3e
-QCSS2qly5ab+tF4lqIkTU1MtbaRQuniX0ZTWkLxw2qneZCV7LhMr0K8Q0OkpsL9I
-HrlpoPPKZwSOmDhK9+w3HBvQOQwT04/rQEmvP2XNoqcc7ungDUh2ssxmc4Fva24c
-Mbg5LHb3CBCLdhyoq/Pm6SG63KgsVVWbf4rhvmN8Valk//y3jHr7Ij90xrQp9wpB
-RRUQgB16WTcKMyRlZOAW1YqfJZSMWRhOTD4R72qRxqhLaEDDgx4dnqQWBYLZPJoJ
-JE/KeUSnBVR7yi4Bdk6k
-=LoEL
+iQIcBAEBCAAGBQJNL449AAoJEHQ6UuhrqBBQT9YP/1D9qp9lF82UBLyC/Vq+M/RX
+GHOIh7cw2SVN1TNlKZnycNLcKtSZXxamAOMl28zlTwJa+ZeFgzZIb4143utA4Axi
+Ju2dVFBbJwXFMnzIPUR7AsJooUiWTUDkApYP0sFt2JtVyytyIp264qmFBw2ipDn7
+MODFPx8QAUsv8MNzisPbh2XnLAqLET3fAhwY8+V/Nl2wF4Am387YehoPiZUt7IAG
+ERE1vwEGSJUw5vC6kEuPYOhvbRc1xLGrgD4U6GAbV19/eHVTOYy0jEwBzQtrLpB8
+6LoqRB89r6xuhralcCaLC+28I9Dyqk0JONJkPMJk1RZZdP0mu8UmVr9XYacPROvI
+FdaS+BKwZl1ozAtfuNr435Iq2nlJ0X48ZJktzTa1yN1Vm9OGc0uu27uDRiTp18dC
+VGh48NL3nOF5qXmTSKJbKv3kMgct/NdordVQtBi1LcGhV+8J1Yq3XNUf0Axin5rP
+cpqOrQhUsYZ83v4mu1aQHBooNJLlWy5xcS0kKvSrs/YWJ3mpjLmKQau5cz3FmPQ5
+5Tv3I2nnvs9Lvs7ZFlgJsIEK9ybgbhvxLDIBLS8NxnlTD22piRCNCFg96sTPCc0J
+7RZntaoLeSqxbOc3ezZZNfmrTVGe8tK09Yn9M2NrRfJeonSnHxvrEgtxFoZ8ovGh
+kedixJDXOSpn6AoixlFq
+=tVbs
 -----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
@@ -30,22 +30,21 @@ src_unpack() {
 	sed -i -e 's:-z now::' Makefile || die #331653
 }
 
-src_compile() {
-	# set CC to prevent CROSS_COMPILE paradigm from being used.
+mdadm_emake() {
 	emake \
 		CC="$(tc-getCC)" \
 		CWFLAGS="-Wall" \
 		CXFLAGS="${CFLAGS}" \
-		all mdassemble \
-		|| die "emake failed"
+		"${@}" \
+		|| die "'emake ${@}' failed"
+}
+
+src_compile() {
+	mdadm_emake all mdassemble
 }
 
 src_test() {
-	emake \
-		CC="$(tc-getCC)" \
-		CWFLAGS="-Wall" \
-		CXFLAGS="${CFLAGS}" \
-		test || die "emake test failed"
+	mdadm_emake test
 
 	# are these tests dangerous? I'm not willing to try them. --binki
 	sh ./test || die