use udev.eclass for handling udevdir on un-patched versions, to support virtual/udev

Package-Manager: portage-2.1.11.33/cvs/Linux x86_64
Manifest-Sign-Key: 0x2B6559ED

3 files changed, 13 insertions, 21 deletions

diff --git a/sys-fs/mdadm/ChangeLog b/sys-fs/mdadm/ChangeLog
index 40bb255e78a6..d6403b946fe4 100644
--- a/sys-fs/mdadm/ChangeLog
+++ b/sys-fs/mdadm/ChangeLog
@@ -1,6 +1,10 @@
 # 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.159 2012/11/11 07:53:37 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.160 2012/12/11 18:29:11 axs Exp $
+
+  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
+  virtual/udev
 
   11 Nov 2012; Mike Frysinger <vapier@gentoo.org> mdadm-3.2.6.ebuild:
   Drop unused init.d munging and only show elog messages at first install.
diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index 429cdbf10aba..8f700519b1c3 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -23,25 +23,15 @@ DIST mdadm-3.2.5.tar.bz2 369582 SHA256 5ae2bfd241c88601c1ef9072806248491e025fa09
 DIST mdadm-3.2.6.tar.bz2 371525 SHA256 c44ed3b31238b41cffe67caffaf45067d01e095de94988889ea8a94e22dc6c38 SHA512 1ebcd4c797cd9f7388f9a27372a19205dc81a4b19adc83e1d6d7cfd4ef18f40a211fddf59ed027a1bf35bd36d4b6795e88e8086c3b022c188ec6e9f68bf1a4ee WHIRLPOOL 61d07512758491326c21bb745ca457a9f3d9215292358d7b4755eb84bb72877058fb239cbffe25c8121caff066aded84e8353b9716e9d4a45d724777f01a6714
 EBUILD mdadm-3.1.4.ebuild 2277 SHA256 63890f88df3b70f7ccc7584f99a6c66ae7435eb4e44b4b262aab4c854bc2dd6b SHA512 46676cc4ef53536654c372ca44e4916e11bdc237ecf3d76256af9d9351796e9837febb9d2f3add958f0ae41c67ac2135494a2fa61fd70facaed9eb6bafc2b1f2 WHIRLPOOL 525fdc76f1a173a712111903dc02528611cc72946278d9460cc115d3986a48e926ced81114cf7626d79c1c8116be6cc736bd4184b8bc57574ab1479ac93429c6
 EBUILD mdadm-3.1.5.ebuild 2235 SHA256 038781a904accd76b9484df7317765c374d5c910beb0c0f7ec57deaafd0737a8 SHA512 ea4a730844ef093defd9a91acedbd00865a1d35eec9f378484c5290959685727d1ef38c4d7056584fe647fc034ae81b21ba504f2e25f7f77a1a310bf7e9ba889 WHIRLPOOL 39f25b4c53fbe3caa8a577b5089f3c8d79c32c49930c5166ee674250d3969b5a7ca7af013d0793da06be59170179779b9175af5d3b8def7d26dcd32d8829564b
-EBUILD mdadm-3.2.3-r2.ebuild 2159 SHA256 9a40db1883f7aed4c497ee4bb55ed98b605cf6b746fd0a4e916ae3e28b71d4c7 SHA512 5b36ff6f514d5ff10995d0bee6db03b9851e48773f1f4ed8fbe0a2df28a43d14a23015dc3df32b58710a26c628fd4456d72cd36b5221dc85c34a57a305e8d070 WHIRLPOOL f46b86ac596d1b9832e006ab2b94020e35b48084024f60b603fe5fa9291d46d0860a6ac170cd0889702736b185475b82616dc03df363d80c28a1f2d188156018
+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.ebuild 1960 SHA256 6acbe9258f052b821d6396b7565684a1a2bad0caf9c2c73e7d84d37c98071569 SHA512 aaa111b614a1cccd30143da2d9fef989960ac4897dc97d84d8af536681ab7be562ef59d0d3978a092a194fe700807e5f5ffd67bbf82e01338bd5b8b4384e2a17 WHIRLPOOL 11a5ff3ca2fb7e71ff0c48567079aa2a3a460aaea85d566ef8354be6ad1ca494c61ac90e545ce0bff04af432948e8d19bd859469c09157ad65098f8b1c560662
-MISC ChangeLog 24402 SHA256 ef27b7359ab7d48fcbc20846910a2c40b5f8c86a10fc2a72653aead23c026a8d SHA512 102b44a39277cd79a2123e9db4392a318dc7ce4f9a076c853fc0a35c37b08ae9961155171a0084b43c625abee7d21a1ff15bbe6efdcb25a9a2134ab1e7930de0 WHIRLPOOL 0a9735d49d0ee028b1e5cf78f9847d45310fc3442ec56a7fd9bfe63bfc58554167bb4edb40a5872ff9b9f3ef87be71ba39d0b22e989e5df51125ae1a3b532399
+MISC ChangeLog 24561 SHA256 a3fa8fe9fe34a18ef9cb958fd987c76cc396af59fecf9b17821481028ea5a13d SHA512 c25e305e6dc56e049b721fe4f9ec99569174d028e919085217f5d097b5173b4a216dbfd967bac7dde5cc134808e1a6cbed1183f558032147b1fc92e03d3dee5a WHIRLPOOL 524ce9d991ee071215d41db9122162a2ddcd46a9bdfa7e6193ec6a8d4bdb87520eac8006d4fdecf4b4bd2a73b01e0897b3fc51770f82f2de916dcab5375ae5bb
 MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQn1mDAAoJELEHsLL7fEFWL2wP/ihbKqmRO/Y6xCVzB5wxVk4z
-ghznJdvwKM/GJBOLxyd8UbHt4N1+kGEb5vZAb0L7ydKQOHqEKe3s/hziYxrpr0eN
-mzdoY0oogMWAWdfrnp2tfOuoDz+KnXi0KCo+UtdK71Lvv7ueQsgj4X1WqUL1pDpv
-BoWCUeTtYNmvMqcTPO+67nzqGkl9J/UGzFslgLtkWeGEx/qoO/V3S8hh+oHhvbDr
-9Eni9MSOHPE8WvS7X1QpxhrCZ3STXi+y+7y2zRI6FWA/GZ0my8E5/CcgUBIJT2sx
-ygeIhSPV/mGbYEovcTJUhFKpQCrCzLK5xOvwLznzrJ2P2o45wc5i+m67uIDWzeRl
-rEnteRFZpSSa7Pe+0AThBVPh0Pr7rK0iP+8vaOvYm9oWLseF3OHexTO/n0wqzBNq
-hGx+1WwR3rHpF3YZMSFUdPYmchNz6s5Ej92fs09p5NKyIqczpdAqm5XEMZexnQTv
-uRXQXww/JoZatY8YvU/GrckxnIR+L+rc/f4YRCvYbxNw8Po+1hOUmtZizalk62zv
-xNExYte9WXOMl7H1qcp7p9P4s9m8z27whEv0PlT8wBcuxt6NzWpUdN44QPhcEuW8
-ALpytzZAWNqNuSHcSNIZymp1z6bBsY7Pi+4cZb3mXOslHHn/OROtGDyqmiLY6LzX
-/8Du8ZPlTNcz9/bTMnSz
-=amcV
+iF4EAREIAAYFAlDHe4YACgkQ2ugaI38ACPDN0gD/VG2CmrM8vsCh9lyBRjAb+qax
+0I8munZVymuQQhQTqfYA/02c8xQaWBzbtSyzI6wzYYHuR5YKXtQyxhAd9Bthdvlf
+=T5uL
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/mdadm/mdadm-3.2.3-r2.ebuild b/sys-fs/mdadm/mdadm-3.2.3-r2.ebuild
index 61d49810e5d0..eb94a1dbdc9c 100644
--- a/sys-fs/mdadm/mdadm-3.2.3-r2.ebuild
+++ b/sys-fs/mdadm/mdadm-3.2.3-r2.ebuild
@@ -1,9 +1,9 @@
 # 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.2.3-r2.ebuild,v 1.3 2012/08/12 15:40:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/mdadm-3.2.3-r2.ebuild,v 1.4 2012/12/11 18:29:11 axs Exp $
 
 EAPI="2"
-inherit multilib eutils flag-o-matic toolchain-funcs
+inherit multilib eutils flag-o-matic udev 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"
@@ -26,9 +26,7 @@ src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.2.1-mdassemble.patch #211426
 	epatch "${FILESDIR}"/${PN}-3.2.3-segv-assemble.patch #211426
 
-	local udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-	has_version sys-fs/udev && udevdir="$($(tc-getPKG_CONFIG) --variable=udevdir udev)"
-	sed -i -e "s:/lib/udev:${udevdir}:" Makefile || die #430900
+	sed -i -e "s:/lib/udev:$(udev_get_udevdir):" Makefile || die #430900
 }
 
 mdadm_emake() {