Version bump, helps with new udev/systemd.

Package-Manager: portage-2.2.0_alpha120/cvs/Linux x86_64

3 files changed, 290 insertions, 25 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index 01c3d583c1a9..dcf5ea418882 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-fs/lvm2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.275 2012/08/08 07:54:45 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.276 2012/08/12 21:11:49 robbat2 Exp $
+
+*lvm2-2.02.97 (12 Aug 2012)
+
+  12 Aug 2012; Robin H. Johnson <robbat2@gentoo.org> +lvm2-2.02.97.ebuild,
+  files/lvm2-2.02.95-udev185.patch:
+  Version bump, helps with new udev/systemd.
 
 *lvm2-2.02.95-r4 (08 Aug 2012)
 
@@ -1335,4 +1341,3 @@
 
   12 May 2003; Max Kalika <max@gentoo.org> lvm2-1.95.10.ebuild:
   Initial version.
-
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 3f6197d62c0d..291e7875e9cf 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -1,6 +1,3 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
-
 AUX 1.02.22-dmeventd.initd 536 SHA256 c9dcee15ce55961e5df7928c350ae1c6db6e78c30d87f7fafa6ba4b016dd9191 SHA512 6f5e1ff94c4a89224f30d76821820e8e08952c929418892be623afc8b57cbc2f4e78dc2a293e74ef4fbcc0cdd49ac986cf76eff689f0280c4b3d0c8b96483f0c WHIRLPOOL 0a4647eb42798f0281704a50fc4cf1b0e2e90f11bca2362ee67c8ee50971b4743881e049520519038271b8fd7d6f150ded942832f20cc3705f1d491f71810745
 AUX clvmd.confd-2.02.39 213 SHA256 68442d5c9da81bad79fa6b1beaede290f24ea6a4e4415f3d9f4e37ccca6c524a SHA512 9614c4188c9a5bcf398d1f521b52d7e2281fcdf76265fdaca4acda22be282d8468e82b54a2661d5753f4b9a442ebe93a60daf87c846db4e275a283f71c9fd8e2 WHIRLPOOL b429d06a5200d37f46e72190060bc2fe866575ba441b5f92d12d939bdc5d411ef37e895a7369bbaaf733b1a0d0305a05d499c7ae6c7360fe8767e902d2a3bfc4
 AUX clvmd.rc-2.02.39 3682 SHA256 d60d88202589899e0856ac819cef1599103b7d5dc412afe5e0e38fc224aa79a8 SHA512 44779152b23ad21db054faf216daef9a17fbdf120cb064743d7eeff8a6a6686482b23d298c40f5569ca4ca3dfce9baa6bfc5f95b6730c12a46938253a9ec400d WHIRLPOOL 2081217dd77acae5b286eb4b7790cc0400cb8b90ae055f7ce5d8f8e9b44a970d5393dc98c9f8744cfbd8bb12047d9258774c16ec8250576d25fb5458b1dd2b2f
@@ -40,18 +37,19 @@ AUX lvm2-stop.sh 1939 SHA256 94a34e0b149ac43f5f1042c45ebdbaa69ac83bcbea7f894c15a
 AUX lvm2-stop.sh-2.02.49-r3 2253 SHA256 dea23f37d232437b15c743ca23af3d7baa95f2b7c71ac1e47ae5289bdcfe0a56 SHA512 909eae8d09157a7227c4240bb9d0a3d2a56347b8926a2209b3d778d6c4f709c94fec8d966839ea8ac4fcb0f2fed8ae4349bcb6b9d487ec83116b83123fff7979 WHIRLPOOL 057ea018b83f8480407cbbbc0b60ed17dcb84644476382f8a79dec9f08caea6f5a103d21389a12697927b205f91b3168db5db65596c5e86cd130482b78d6d489
 AUX lvm2-stop.sh-2.02.67-r1 964 SHA256 5a208c7ab780404e476afdff349deedad5c57b3feb7e22a07a7075d09c1370e7 SHA512 af58f625423ea96a0b10c27a0222dd960614985f7fd11d681ffdb0151954b8bbec05643ba5addf371556ca7a6fa6fa68d70fdc7aec7b223a71d53dc95a8ef34b WHIRLPOOL 1163be1b762b56c227ff41367fc188fe6c54455a3607059f717ebfdb099a12fdb8cd5c44e3c0cc03af2f3600d2fc2801b86f7330af90dd17515a0cce0a5fd173
 DIST LVM2.2.01.13.tgz 463900 SHA256 f98495cbf43128a67bf20fe21e74ef9aa8fb872de80c980f1f506b45b922df50
-DIST LVM2.2.02.67.tgz 893643 SHA256 6cf217d26eddec1a33cdb06958f0ae1a191e7bd9d42f63646a1c93ceeb47c702
-DIST LVM2.2.02.70.tgz 909516 SHA256 61a2bafce16d58200ca066cbfe4f8650cfae547369d1c722c3a3680a1f2284e7
-DIST LVM2.2.02.72.tgz 931612 SHA256 112e8a1bccc21c6d4d3095f2b26c38535cb2c88fe0087fbbce9b521e587d80b9
-DIST LVM2.2.02.73.tgz 937803 SHA256 9e8295d3ef36b5f56e213f8cb9ac9981cfa02fb2c95fe6879d6012d6128a8fc8
-DIST LVM2.2.02.74.tgz 943084 SHA256 a40c80c5b9a2547b8bd63e9321d7037c8bf041a35f734a5766ad2848d80bb697
-DIST LVM2.2.02.83.tgz 980283 SHA256 7c1e0e9d0001ae11422d34ba16666c7852013384992dec576c309395b392dee5
-DIST LVM2.2.02.84.tgz 980421 SHA256 9238f3400208f26c0e5be896dd3bf41c4d515ab534de23aae8ef4d6ad0d3576d
-DIST LVM2.2.02.85.tgz 1000194 SHA256 e5c2b0d76e7b1df7630e211734eb09697d66ab879b17eb19545cb77272813eb7
+DIST LVM2.2.02.67.tgz 893643 SHA256 6cf217d26eddec1a33cdb06958f0ae1a191e7bd9d42f63646a1c93ceeb47c702 SHA512 9873b4a4275e6ae1bd3224f97d8e58e7a6cff6a70211255f9521663a9dcc44a57ec4aae516f8d40f494e81bcd56cde7dbc1d8f1ee3286f48c4515beb01a3ca41 WHIRLPOOL 79f6de964ff099d3721fc43c1a23f2d9bf7b6bc7c3411ce96a1f80ed1a6806fbc39bffdba2a60c9eff530cfc59018cf516d39482ef4ee39219a29bfd6a696e4f
+DIST LVM2.2.02.70.tgz 909516 SHA256 61a2bafce16d58200ca066cbfe4f8650cfae547369d1c722c3a3680a1f2284e7 SHA512 e79a23ea47bfea95bd38aa9e3f89b7268d535db762506fb1c369d36235cae3a84b34b265d913ef7f7812496a02c7ff9ca28e799d4078411e4115162a0b6d8337 WHIRLPOOL 3c39c2acc2976b9178a58b9525ae7098b60dfea85444ee93f4152cf207cdc29302f39e157e2f6780cef24db49f4e9f2463059cf0451ec71ec12c5a0860048026
+DIST LVM2.2.02.72.tgz 931612 SHA256 112e8a1bccc21c6d4d3095f2b26c38535cb2c88fe0087fbbce9b521e587d80b9 SHA512 c730208b59b7b62850c0875b376a100218a0ccae9f2803b11f29bfcb83d38494febaf3f94082cbeddac0674377b97156950ca33a9a7c15495498b526dc685b7c WHIRLPOOL e6803368a6aa7398851fe1965926e91b7d50d97d59c861bbcc3906dacfb352ebbf2cb7b68264c93b47741e45777ed4a0bff17a12710e12735c1f3352173a132d
+DIST LVM2.2.02.73.tgz 937803 SHA256 9e8295d3ef36b5f56e213f8cb9ac9981cfa02fb2c95fe6879d6012d6128a8fc8 SHA512 238ea145e5cd37c39cedb19a2e4d0d8488a6724e366aabefea931dffe14465b55aef96e241f25a7c95d2bc7d08c5853a6d29eaaa1574af65b84454bf1b114f23 WHIRLPOOL 4544eb005bf993a36a923dcf0cd4db78020c151cd36e41e056b22e5f4bfc2ef0af3c1719a79f7b2377a2803f03ad67bea5faa47bf2be22a73ccb1bf65be5c056
+DIST LVM2.2.02.74.tgz 943084 SHA256 a40c80c5b9a2547b8bd63e9321d7037c8bf041a35f734a5766ad2848d80bb697 SHA512 c41701fb9e5d52da06a770e93346631e078cdae639ae707dee59dd4d51e8a0eb7ec56f0a685fac014106972833eea98d1f0a100009eac5cf332a4b8463b26dba WHIRLPOOL 3b1a2a791a9278aa892d90361c8a3765978d10cd89398664759a083659b84cc1d0560a2aeb16623afa86c97663cbcfbdd251a6d69245f7db48df272214721f42
+DIST LVM2.2.02.83.tgz 980283 SHA256 7c1e0e9d0001ae11422d34ba16666c7852013384992dec576c309395b392dee5 SHA512 e266685e2fd24575844f4e8262eb5521ec143763333296e3012c12f1bdf642df34c4197bbc27021869f1d0bba2f0b1dffc263f59ce5d9de75c682805c3c56e1e WHIRLPOOL 576d68229af8958b282d4fa44d82d549c2b83a3061ab6e17a9c51b016c87f0bbb40741960f3f123d85554eeac527a05b04853d063e154e7376ac81215787e9cd
+DIST LVM2.2.02.84.tgz 980421 SHA256 9238f3400208f26c0e5be896dd3bf41c4d515ab534de23aae8ef4d6ad0d3576d SHA512 2fdcfaac9e1e51b37453c4c0de379edf5185f1fdca53a921076ef2251778c99b51adbca0ba45b78d18aa463076827ec7084dc9fce11f29f4ddb99d2856f6445f WHIRLPOOL 20d67755354fd0760048b69995160b953bd55deb0c333e99dd56208ff4caadddd2350d34e084121e586a1890aca3aecc0c0cdd70e80ec3dbc6cc0beb36e5d620
+DIST LVM2.2.02.85.tgz 1000194 SHA256 e5c2b0d76e7b1df7630e211734eb09697d66ab879b17eb19545cb77272813eb7 SHA512 dddb765fe38511bbe8f8035bfa427a4a60ae05df9580766665346b5b5de5361d78f4e56df89b3765eaf88742db76fa9ab9ad2659057325231c596761bf8508d0 WHIRLPOOL 06ae1f64efb0d5b64e55331034b2d0cdd08558cdae74cc382f90a728089fe847dd70aa7a32bf60045625b73b4c636e3a0297e61ceb08c52486916c28749c3462
 DIST LVM2.2.02.88.tgz 1029151 SHA256 a129d1d3949524da7d6d2a67218254baea02df06a6744faa5808a4182b2fb432 SHA512 5c334c2c78220f4f9f082a74cbf0b156e96f2a07b5e55f054ff70c752ada97a67f83fa1d89c02accb7cbe5a62e356588831d96a102b7bf16cdce2591d4e37e4b WHIRLPOOL b30a1f2403e71ff6fb381ec82291018632e1d10258dd615efae4e39077a304a66271013247793390f57c26886599d8bad8f4b896d230f3e4f846e74c12282f71
 DIST LVM2.2.02.92.tgz 1120013 SHA256 6203ac8e7713d085d6051d72b858f1a86902dea9379cff3edaf13c2adf3a5143 SHA512 97c5f7d861318645c53260751034e1d76f15cd626cb576692f8eea6bab9758c3fa47eac748d854c23b729f83825c72d209b5e6b147085cb73fe3ec3e391a3178 WHIRLPOOL e7dd581fc5667a733813e78f0398028c5fe8575707de91e0205e7d03a046d8fcc527c722a4dff559c02402ea058a0a24acb758d0de643d0ede3ca8e3f25adc44
 DIST LVM2.2.02.93.tgz 1121289 SHA256 51bc2a74ef973eb0103fc81a5ab6f9151b271111d857642b1437d8d6659a9bb5 SHA512 8a98cea067bb8b28bd156d08dc2665b65040547c6e023b2f1956493aabca8c8bd336f8a680d4327451601fed43ff1eb01e75979d86629a9fee9a525de098ce4b WHIRLPOOL 41af591f1278207f7a56c790fe52ad818d6c98eef7b8552a6bcc0121dd246051f4acc797e84fe294c303929b4884610d93f5c563c4af82d6192f88b1093be0fb
 DIST LVM2.2.02.95.tgz 1156414 SHA256 0335af36a151dafe5778da55a684546bfb98e7d3193834915b5efe95dbed9125 SHA512 52e3add58d0d3e521688654c6021faee1c0d4298d984c3800c3cae67663fa6ecbf1aa8afd74f5ee6d6c1e626c7635cb8fb1b18be41f3d13e47564b870f3e68fe WHIRLPOOL c94610c5323cad71575bc4fea37afb19daf1dd5feb123ad5494def76ad3cfce6b4afd9ca9658b61f897e3c6401164728bfb65fc1a7c17e4c134bd8f45ba31239
+DIST LVM2.2.02.97.tgz 1193141 SHA256 edda82012e8a9e1f0b00ba5a331468d3e0201992be14c0dbea71bf564a51fc2b SHA512 c209054832f36d7b9cbf833c702410ac95c9de1e213b550c01c42f087fcae346d3c931c409184086bc1fcbcbc154c9a4f8b82b06291cefeb7ae22fe7a4c254a0 WHIRLPOOL d4dafde0ae1607cb231acbf07e8aecd579b9e9042e9356df1074a2683f5f2d1036a3483e1799cf7dd14e64f1f4c5506d3628979fd7128cea70ad45b653403dfa
 EBUILD lvm2-2.01.13.ebuild 1472 SHA256 eb50df516739fad59559def061da0c94cf7288a500782e65d19e73fe8aa6e886 SHA512 2bf0cd2a56b85f40a6b9ac032756d4db0c7e5e7a968cf55152c30ce2805dbae6392190074b2f03f10ceb3e6f7ae14fb2b1bf4ed0699e5d458151fca0d1779c23 WHIRLPOOL 8ac5bf961eb58070d869bcddfcbbeff899f8ae02f4574c2acc16d1a0d31ebe2846eb96aef1541a384098dbd2907b94565557245ba40cf57877d33ee977791fc0
 EBUILD lvm2-2.02.67-r1.ebuild 8256 SHA256 5ef9656962476e46451abe1329a5d992d7a971f0a4b307b99a87c1f024cd0f6e SHA512 d675b91781bd50e54d0bdc138f40c5bcd9b3de2958b77a300a90205af96f88bb71753e2845278703590e936ee0e85c2d0694cab62b32b88878f43180fa48307a WHIRLPOOL c9f9bcc6011073c63a37dd11ab064b9542514e781b4ce9d07c8ed301f887dc0694f41784ba1eece841d18f19e23b8c55e8a5b8368a8cd41813984801263329c8
 EBUILD lvm2-2.02.67-r2.ebuild 8324 SHA256 48321d14e12d33b266cd7e6786534f55bc005bcdf61a174038ccded6d0c1337c SHA512 c64e3e759cacd967fd3ab148d33ce6ef5a0fea4e3de9a9be55a8de6d73967b7bc288b415395e0c9bdb8fcb57732af8e2833d27fd6bd6717d1ed796167450c822 WHIRLPOOL e94892d15db33cc58669d3c3f02647114ca59212a73589557fd520e9a2dd652c4af7336e3cd02ae11d3e4ff4363bff24fb65be6b9b04205c568477ee4593687b
@@ -74,16 +72,6 @@ EBUILD lvm2-2.02.95-r2.ebuild 8362 SHA256 fbe641df066b4b2ab5a8675540890ed9362958
 EBUILD lvm2-2.02.95-r3.ebuild 8467 SHA256 a8b5a2e583d52bb15870f2dc3263a09bc2e699f226ba8e1201f68bf310033186 SHA512 11d78513738fb76d321f3f275c3890be96d1d6fe8329d2c79d10a569875f8b444738eaf6643af7fe2109306d7b163fc490a1163b34131051db4dd63e7b16ffb6 WHIRLPOOL 942905314fdf153cfc33ba696caddcc3c362f3037ba5a1692e94628ea07b27a876537b6e3ff3f6704ffa14fb8367c199cc33e7c746ab5f99486f61590ded56ac
 EBUILD lvm2-2.02.95-r4.ebuild 8576 SHA256 d37fc774ea63a4e9ed12f9793ba7e8e0fde50a6a5c01826c1ab053233be65c13 SHA512 9443d4f672f7650d69f467d1970fcc77d73b6ff21a9454c629a3a12e684a7842561245058d457188c2177e977fab5923dbac1a2dc56d71cdd100edc3be6a46a7 WHIRLPOOL 3efce3f6687460fc6bb3a057219e8fa41e73322414a803523deb9fe24dcdd64b09dda1cbcb2515df3fa60bb2c1ba4a0c5d7fea0b9e64e977f09247efa4d16992
 EBUILD lvm2-2.02.95.ebuild 8340 SHA256 fbd1b45682794c1567c0ee446732aa82ecd09adb8c9e1302f4abe3bee0cc81d1 SHA512 a248b9965ffa4c61cbd32fd6066ba19c10ac75e825bf09d33acb0990322c2756188b780f48c64ed1e79f8f8530060faaa860652606dcab2dd7499d0f5d38530a WHIRLPOOL 34b71d19dc765cab3c67181d99b5d8d7b4af2e39afdb1bfc525b8d2cc1965d887ab5ea93461793c23c81d241566b2011a9f8bcba8e1dfeb58e25731cbec72713
-MISC ChangeLog 50830 SHA256 eacdfb56401fb6117243b0484470095eb7943bd55ae708d927f9a88cb8824161 SHA512 659ce5a80309f87e4b8a778e1d8cecc0267fae7f7aeb725d96f2d7f73a364e914937c82a2128730b07381244b7eede395634e3d03928cf0063505899e92844ef WHIRLPOOL a8bff4cebbf879abfc1bb71578eb41faf9c25b833a1dc6be94877f525578bda3437061fb2cb4a2365131d2d1ccf4084c945891ad130d2a0498ccc0f4aaa1dcad
+EBUILD lvm2-2.02.97.ebuild 8611 SHA256 9ea852ce5485a7c32138bbc8a1115bf72c34cc2392ee21a5dd300a0de1fee60a SHA512 ac1221cb385518fddbc23c9414cc469ea894d945d307fa2568a980d6bd5a318ec5e9dc70c655d80ed293dd92d85950c0415592ac726b96d4f14b74a560094155 WHIRLPOOL 68ad0bc9b9d0085dc5147ff055736c887c284aea4a448dd33b3bedd9f8e9a3a6b996cbebe9910e7fc5f2f258ba83f7f5e0122a8eb0aa9086b7ed2314a02da4d3
+MISC ChangeLog 51013 SHA256 a1ad74d4560697d97e1df1053991f7a9828958e6a913c6d7b1db69dd7fde7d56 SHA512 8d8095fde756c38fcd8e0da56ba605f0579f719fb9603338ae31e645eba8040b9ce750b3128fd906ca642345ef1570702e3e34699a03c62accec560d824ba8b0 WHIRLPOOL 017caed06bcbd99ac8b4a98b9d81955e1c0cfaa7e77e45bdb099fd660eddf7d26ee9f0d9af53b0226b5f3c9abe9f99c934e00d88c9909ab47e594a32dae2aec9
 MISC metadata.xml 822 SHA256 419b6c05e9d710ff09188d6fd97d1d5a2e1f6a40ee04cfb9b8673c4898ea3a5d SHA512 a5a3c4a5a6eec44b451ee78077325e466cb9205ae8dcc5095792b93c0bf9d87fad71d81c04265480708d59a4cf45e2fe863f06fa1650176a5a2e03a1e2ed1098 WHIRLPOOL 111c1c52eda324439850db82ef69a0c5659186db646857ea549963a38b4b76a67bdbdf0a3ff8945ee8ccacf9bdcfd827ce94482d63fee55956eca08ee6d869df
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJQIhs5AAoJEEdUh39IaPFN0SoH/2BMMlbHuDfqnZTNYFUsOX+/
-rJ2ptEiyrKahssUTBHU2WQOnxzflOUlXaB/d5ydQXev5Nugv+d/9dp1r8bPPiqiH
-s41P4cMjK8TQInLYCMRh3whfY6BDheLogio3fVC9iEOCU2UPC4cp+WLx8hq/XFuC
-snomCANflB61Cva2YeLh5ph/DQR15cYOl3ysU/QN58MP8xEER/HwMuzYzI5PnkSN
-aDPRdRwJV0uP+/9yeYAaf9KZP/YwCFSaYHXB5O3OUYt3CgbnrafKWR8aTR7nolOj
-PfTriISmx7Pj9eLhYrc+sZv4VMGWQMLfU8y+eo+iPiU9bkEj1hFRE0sVpF2JvRU=
-=H8YX
------END PGP SIGNATURE-----
diff --git a/sys-fs/lvm2/lvm2-2.02.97.ebuild b/sys-fs/lvm2/lvm2-2.02.97.ebuild
new file mode 100644
index 000000000000..f0ddcfdafce6
--- /dev/null
+++ b/sys-fs/lvm2/lvm2-2.02.97.ebuild
@@ -0,0 +1,272 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.97.ebuild,v 1.1 2012/08/12 21:11:49 robbat2 Exp $
+
+EAPI=3
+inherit eutils multilib toolchain-funcs autotools linux-info
+
+DESCRIPTION="User-land utilities for LVM2 (device-mapper) software."
+HOMEPAGE="http://sources.redhat.com/lvm2/"
+SRC_URI="ftp://sources.redhat.com/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
+		 ftp://sources.redhat.com/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+IUSE="readline static static-libs clvm cman +lvm1 selinux +udev +thin"
+
+DEPEND_COMMON="!!sys-fs/device-mapper
+	readline? ( sys-libs/readline )
+	clvm? ( =sys-cluster/libdlm-3*
+			cman? ( =sys-cluster/cman-3* ) )
+	udev? ( >=sys-fs/udev-151-r4 )"
+
+# /run is now required for locking during early boot. /var cannot be assumed to
+# be available.
+RDEPEND="${DEPEND_COMMON}
+	!<sys-apps/openrc-0.10.1
+	>=sys-apps/baselayout-2.1-r1
+	!!sys-fs/lvm-user
+	!!sys-fs/clvm
+	>=sys-apps/util-linux-2.16
+	thin? ( sys-block/thin-provisioning-tools )"
+
+# Upgrading to this LVM will break older cryptsetup
+RDEPEND="${RDEPEND}
+		!<sys-fs/cryptsetup-1.1.2"
+
+DEPEND="${DEPEND_COMMON}
+		virtual/pkgconfig
+		>=sys-devel/binutils-2.20.1-r1
+		static? ( || ( >=sys-fs/udev-181[static-libs] <sys-fs/udev-181 ) )"
+
+S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
+
+pkg_setup() {
+	local CONFIG_CHECK="~SYSVIPC"
+	use udev && local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
+	check_extra_config
+	# 1. Genkernel no longer copies /sbin/lvm blindly.
+	if use static; then
+		elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
+		elog "their static versions. If you need the static binaries,"
+		elog "you must append .static to the filename!"
+	fi
+}
+
+src_unpack() {
+	unpack ${A}
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/lvm.conf-2.02.67.patch
+
+	# Should not be needed due to upstream re-arrangement of build
+	#epatch "${FILESDIR}"/${PN}-2.02.56-dmeventd.patch
+	# Should not be need with new upstream udev rules
+	#epatch "${FILESDIR}"/${PN}-2.02.56-device-mapper-export-format.patch
+
+	# Merged upstream:
+	#epatch "${FILESDIR}"/${PN}-2.02.51-as-needed.patch
+	# Merged upstream:
+	#epatch "${FILESDIR}"/${PN}-2.02.48-fix-pkgconfig.patch
+	# Merged upstream:
+	#epatch "${FILESDIR}"/${PN}-2.02.51-fix-pvcreate.patch
+	# Fixed differently upstream:
+	#epatch "${FILESDIR}"/${PN}-2.02.51-dmsetup-selinux-linking-fix-r3.patch
+
+	epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
+	epatch "${FILESDIR}"/lvm2-2.02.56-lvm2create_initrd.patch
+	# bug 318513 - merged upstream
+	#epatch "${FILESDIR}"/${PN}-2.02.64-dmeventd-libs.patch
+	# bug 301331
+	epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch
+	# bug 330373
+	epatch "${FILESDIR}"/${PN}-2.02.92-locale-muck.patch
+	# --as-needed
+	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch
+	# bug 332905
+	epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch
+	# bug 361429 - merged upstream in .85
+	#epatch "${FILESDIR}"/${PN}-2.02.84-udev-pkgconfig.patch
+
+	# Merged upstream
+	#epatch "${FILESDIR}"/${PN}-2.02.73-asneeded.patch
+
+	epatch "${FILESDIR}"/${PN}-2.02.88-respect-cc.patch
+
+	# Upstream bug of LVM path
+	# Merged upstream
+	#epatch "${FILESDIR}"/${PN}-2.02.95-lvmpath.patch
+
+	# Upstream patch for http://bugs.gentoo.org/424810
+	# Merged upstream
+	#epatch "${FILESDIR}"/${PN}-2.02.95-udev185.patch
+
+	eautoreconf
+}
+
+src_configure() {
+	local myconf
+	local buildmode
+
+	myconf="${myconf} --enable-dmeventd"
+	myconf="${myconf} --enable-cmdlib"
+	myconf="${myconf} --enable-applib"
+	myconf="${myconf} --enable-fsadm"
+	myconf="${myconf} --enable-lvmetad"
+
+	# Most of this package does weird stuff.
+	# The build options are tristate, and --without is NOT supported
+	# options: 'none', 'internal', 'shared'
+	if use static ; then
+		einfo "Building static LVM, for usage inside genkernel"
+		buildmode="internal"
+		# This only causes the .static versions to become available
+		# We explicitly provide the .static versions so that they can be included in
+		# initramfs environments.
+		myconf="${myconf} --enable-static_link"
+	else
+		ewarn "Building shared LVM, it will not work inside genkernel!"
+		buildmode="shared"
+	fi
+
+	# dmeventd requires mirrors to be internal, and snapshot available
+	# so we cannot disable them
+	myconf="${myconf} --with-mirrors=internal"
+	myconf="${myconf} --with-snapshots=internal"
+	use thin \
+		&& myconf="${myconf} --with-thin=internal" \
+		|| myconf="${myconf} --with-thin=none"
+
+	if use lvm1 ; then
+		myconf="${myconf} --with-lvm1=${buildmode}"
+	else
+		myconf="${myconf} --with-lvm1=none"
+	fi
+
+	# disable O_DIRECT support on hppa, breaks pv detection (#99532)
+	use hppa && myconf="${myconf} --disable-o_direct"
+
+	if use clvm; then
+		myconf="${myconf} --with-cluster=${buildmode}"
+		# 4-state! Make sure we get it right, per bug 210879
+		# Valid options are: none, cman, gulm, all
+		#
+		# 2009/02:
+		# gulm is removed now, now dual-state:
+		# cman, none
+		# all still exists, but is not needed
+		#
+		# 2009/07:
+		# TODO: add corosync and re-enable ALL
+		local clvmd=""
+		use cman && clvmd="cman"
+		#clvmd="${clvmd/cmangulm/all}"
+		[ -z "${clvmd}" ] && clvmd="none"
+		myconf="${myconf} --with-clvmd=${clvmd}"
+		myconf="${myconf} --with-pool=${buildmode}"
+	else
+		myconf="${myconf} --with-clvmd=none --with-cluster=none"
+	fi
+
+	local udevdir="${EPREFIX}/lib/udev/rules.d"
+	use udev && udevdir="${EPREFIX}$($(tc-getPKG_CONFIG) --variable=udevdir udev)/rules.d"
+
+	econf \
+		$(use_enable readline) \
+		$(use_enable selinux) \
+		--enable-pkgconfig \
+		--with-confdir="${EPREFIX}/etc" \
+		--sbindir="${EPREFIX}/sbin" \
+		--with-staticdir="${EPREFIX}/sbin" \
+		--libdir="${EPREFIX}/$(get_libdir)" \
+		--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \
+		--with-default-run-dir=/run/lvm \
+		--with-default-locking-dir=/run/lock/lvm \
+		--with-dmeventd-path=/sbin/dmeventd \
+		$(use_enable udev udev_rules) \
+		$(use_enable udev udev_sync) \
+		$(use_with udev udevdir "${udevdir}") \
+		${myconf} \
+		CLDFLAGS="${LDFLAGS}"
+}
+
+src_compile() {
+	einfo "Doing symlinks"
+	pushd include
+	emake || die "Failed to prepare symlinks"
+	popd
+
+	einfo "Starting main build"
+	emake || die "compile fail"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install || die "Failed to emake install"
+
+	dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{conf,c,txt}
+	newinitd "${FILESDIR}"/lvm.rc-2.02.95-r2 lvm || die
+	newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.67-r2 lvm-monitoring || die
+	newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm || die
+	if use clvm; then
+		newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd || die
+		newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd || die
+	fi
+
+	# move shared libs to /lib(64)
+	if use static-libs; then
+		dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a libdevmapper.a"
+		#gen_usr_ldscript libdevmapper.so
+	fi
+
+	dosbin "${S}"/scripts/lvm2create_initrd/lvm2create_initrd
+	doman  "${S}"/scripts/lvm2create_initrd/lvm2create_initrd.8
+	newdoc "${S}"/scripts/lvm2create_initrd/README README.lvm2create_initrd
+
+	insinto /etc
+	doins "${FILESDIR}"/dmtab
+
+	# Device mapper stuff
+	newinitd "${FILESDIR}"/device-mapper.rc-2.02.95-r2 device-mapper || die
+	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper || die
+
+	newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd || die
+	if use static-libs; then
+		dolib.a daemons/dmeventd/libdevmapper-event.a \
+		|| die "dolib.a libdevmapper-event.a"
+		#gen_usr_ldscript libdevmapper-event.so
+	fi
+
+	use static-libs || \
+	rm -f "${D}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
+
+	#insinto /etc/udev/rules.d/
+	#newins "${FILESDIR}"/64-device-mapper.rules-2.02.56-r3 64-device-mapper.rules || die
+
+	# do not rely on /lib -> /libXX link
+	sed -i \
+		-e "s|/lib/rcscripts/|/$(get_libdir)/rcscripts/|" \
+		"${ED}"/etc/init.d/* || die
+
+	elog "USE flag nocman is deprecated and replaced"
+	elog "with the cman USE flag."
+	elog ""
+	elog "USE flags clvm and cman are masked"
+	elog "by default and need to be unmasked to be used"
+	elog ""
+	elog "If you are using genkernel and root-on-LVM, rebuild the initramfs."
+}
+
+pkg_postinst() {
+	elog "lvm volumes are no longer automatically created for"
+	elog "baselayout-2 users. If you are using baselayout-2, be sure to"
+	elog "run: # rc-update add lvm boot"
+	elog "Do NOT add it if you are still using baselayout-1."
+}
+
+src_test() {
+	einfo "Testcases disabled because of device-node mucking"
+	einfo "If you want them, compile the package and see ${S}/tests"
+}