summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--sys-fs/mdadm/ChangeLog7
-rw-r--r--sys-fs/mdadm/Manifest18
-rw-r--r--sys-fs/mdadm/files/mdadm-3.2.x-udevdir.patch2
3 files changed, 16 insertions, 11 deletions
diff --git a/sys-fs/mdadm/ChangeLog b/sys-fs/mdadm/ChangeLog
index d3235d9ffc37..1348ee5b20b3 100644
--- a/sys-fs/mdadm/ChangeLog
+++ b/sys-fs/mdadm/ChangeLog
@@ -1,6 +1,11 @@
# 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.156 2012/08/12 17:53:26 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/mdadm/ChangeLog,v 1.157 2012/08/13 17:38:44 ssuominen Exp $
+
+ 13 Aug 2012; Samuli Suominen <ssuominen@gentoo.org>
+ files/mdadm-3.2.x-udevdir.patch:
+ Tweak -udevdir.patch in a way PKG_CONFIG is read from environment if
+ exported.
12 Aug 2012; Samuli Suominen <ssuominen@gentoo.org> mdadm-3.2.5-r1.ebuild,
+files/mdadm-3.2.x-udevdir.patch:
diff --git a/sys-fs/mdadm/Manifest b/sys-fs/mdadm/Manifest
index e2e3c0f0c22c..b9e439127c29 100644
--- a/sys-fs/mdadm/Manifest
+++ b/sys-fs/mdadm/Manifest
@@ -8,7 +8,7 @@ AUX mdadm-3.1.4-cflags.patch 842 SHA256 debf37081d731d86a5657f3bbf30feb90d401b99
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 875 SHA256 6318ff61af574987bdf4b34884f7ef236a452c5b928599c8ff747ee7950dddc8 SHA512 1f5ec3c394f85509c2109ba776ba28983b05f837fede93108648e58a8a1829ad4b153981876cf610e376e8fc292ba94d3814eb02d60741f713348fdecd03cdb4 WHIRLPOOL cd479fa082b6b214bbd85ce0f1a97cfb5199df470fa5e48b12feed87b742b800817d82375ebc92e24ca6b991521e489ce7f4553807af14d0e06999511442a84b
+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
@@ -24,16 +24,16 @@ 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 2159 SHA256 9a40db1883f7aed4c497ee4bb55ed98b605cf6b746fd0a4e916ae3e28b71d4c7 SHA512 5b36ff6f514d5ff10995d0bee6db03b9851e48773f1f4ed8fbe0a2df28a43d14a23015dc3df32b58710a26c628fd4456d72cd36b5221dc85c34a57a305e8d070 WHIRLPOOL f46b86ac596d1b9832e006ab2b94020e35b48084024f60b603fe5fa9291d46d0860a6ac170cd0889702736b185475b82616dc03df363d80c28a1f2d188156018
EBUILD mdadm-3.2.5-r1.ebuild 1989 SHA256 6cc4f775d1bc3bb6204f80db64c14104da5f13aa3a0a5245577a845063f37211 SHA512 d1f784fbefafe5393a97313dfc372201ace3d7f2caa10f52eb81a6bf9d004e17b5cf2efdd83fc2e165ecb1051a60db6494d8d79bb59446fbb2cb5943668678a9 WHIRLPOOL 3df9ab6b72c2b582bbd16576e25c9533587bdc421a57e4086a41a53388a6a7e2a3abe404fe103df60700803b1c94a2752ae05660bcc257d448b33aa8509989e7
-MISC ChangeLog 23971 SHA256 278954daadc88cc964ba99ff28a7b68ffee770340137fbfdc87c2c9b992cb85f SHA512 27cf5607daaf946683e4d4a6630dbd5d2924092158dc42d14f42744d433939006d11dfd3fe454f0d82915d5370260d1ade94cb056b252e907e80031e0a71e925 WHIRLPOOL fdb2e9d02ba275f12042fef198bd2d85a6a88a79c8614de1cb32ef7570db8d3411dcd6da93f72fb50ca4a58c04bf55a95bfc3d43b0354acab78963c6b321c11a
+MISC ChangeLog 24144 SHA256 cac4bd8e27e797f0b4fb7c77fb9307616c42a7f5d5e930199c851e233f771a29 SHA512 85c1f18f6f1ce43b1bfe21cc1d998cba97c26584570d38816382209e0ab228879b030bc64bb46211a3bfd36c77ee98bb92bdfed73a7352fdb3a529ebd6281a2a WHIRLPOOL c43aeabe3e9922c6296fe7a0c9996c2054b0059de9fed9c75bd951a5fd0ea33c499a85a483cd630c5f50b2b31412cf8b5725f11a208c25a42cb8a85fe4d7e390
MISC metadata.xml 164 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92 SHA512 8eb0d5153d388f6ea069c64b93882244816a0a09aecc0d73cb872121ce0eb24c5ccafa96aad0b620b2300f319e1af101fa7fa6c5d0d561719d49bb07da0a2eca WHIRLPOOL 11a1441bddb7a6c69653c663902b7da5767ae6ad515ac2aabfc42fe37927a1ccc21472deeee454009ff720201a41c3e4a912df42661a0a87150fb46126da2d52
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.19 (GNU/Linux)
-iQEcBAEBCAAGBQJQJ+1yAAoJEEdUh39IaPFNzMwIAJBk2eIVep5P9Kbm5P4R1c+I
-FpeF27VOLLvhm/bElwPGlK2guffJxXciwNn9zf3JsmhqYECkFn5hshNZytZ04GFw
-zOEJFSM9GTY3ZZI8CacM+Q+EeLUOR4ttgF6+iH4D1ulDY1h6Rb8lc8cSTZwMLUun
-3qHtoCDgUBN0iHFdgjdRINa0VVHyYFoyWd+d64NSEr3EAadxpFT+YNCm0ieL7K7l
-RnoJOSRDBrnIesZcjpqt4XYSddZrF+VKKMIrRlKX1CxFRKTnsVZTwk9hGnOwJWUM
-iqDLvAomEabQ1An7nuRidSdSbwvmt1e0pAXIDcM6xwEeLdIi+VrbW6fFsxUiTho=
-=G/tW
+iQEcBAEBCAAGBQJQKTt7AAoJEEdUh39IaPFNp6AH/2/QDT7KUKL/BEmIdwTthPy0
+72e2bLzfIldjmyDcllhOZI1P1Icghr3MBYN8u8XaUuitkaRdK+b5W09alCvjY3Q+
+aEUReF45lrNH4+A8R9ceCto7PvQ4ZdWDcJPU17PkazGc6NPsdYU3A4wOJ6JLvyLh
+USImaYlhVJmUzk/JySdV02NPG5q0WTnV1PWc1yEKY78NorrXB7ZNnvR1BypttORJ
+zi2S6GOj85N2JtwqJf2p7xTR6ZZM0xN3DkDhaL7KHW2iSLb/I6Kzyu+dxak4qMpw
+eP0cR7HYoZRN4T//ZKODz8HQ7J/XD/Wx0+aeAmN+zZimEYM/FehL4lh26wGiF8c=
+=upHj
-----END PGP SIGNATURE-----
diff --git a/sys-fs/mdadm/files/mdadm-3.2.x-udevdir.patch b/sys-fs/mdadm/files/mdadm-3.2.x-udevdir.patch
index e6dfce9d7e80..8bfdcd5261ab 100644
--- a/sys-fs/mdadm/files/mdadm-3.2.x-udevdir.patch
+++ b/sys-fs/mdadm/files/mdadm-3.2.x-udevdir.patch
@@ -6,7 +6,7 @@ http://bugs.gentoo.org/430900
MAN4DIR = $(MANDIR)/man4
MAN5DIR = $(MANDIR)/man5
MAN8DIR = $(MANDIR)/man8
-+PKG_CONFIG = pkg-config
++PKG_CONFIG ?= pkg-config
+
+UDEVDIR := $(shell $(PKG_CONFIG) --variable=udevdir udev 2>/dev/null)
+ifndef UDEVDIR