Trim lots of old versions. Trim of files/ to come later.

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

18 files changed, 11 insertions, 4262 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index 771548048ad0..155ebe098c8a 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,14 @@
 # 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.285 2012/12/11 21:48:10 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.286 2012/12/11 22:24:40 robbat2 Exp $
+
+  11 Dec 2012; Robin H. Johnson <robbat2@gentoo.org> -lvm2-2.02.67-r1.ebuild,
+  -lvm2-2.02.67.ebuild, -lvm2-2.02.70-r1.ebuild, -lvm2-2.02.70.ebuild,
+  -lvm2-2.02.72.ebuild, -lvm2-2.02.74.ebuild, -lvm2-2.02.83.ebuild,
+  -lvm2-2.02.84.ebuild, -lvm2-2.02.85.ebuild, -lvm2-2.02.92.ebuild,
+  -lvm2-2.02.93-r1.ebuild, -lvm2-2.02.93.ebuild, -lvm2-2.02.95-r1.ebuild,
+  -lvm2-2.02.95-r2.ebuild, -lvm2-2.02.95-r3.ebuild, -lvm2-2.02.95.ebuild:
+  Trim lots of old versions. Trim of files/ to come later.
 
   11 Dec 2012; Samuli Suominen <ssuominen@gentoo.org> lvm2-2.02.67.ebuild,
   lvm2-2.02.67-r1.ebuild, lvm2-2.02.67-r2.ebuild, lvm2-2.02.70.ebuild,
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index bc27cd18a7ed..ac904a3c9baf 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,54 +37,19 @@ AUX lvm2-start.sh-2.02.95 1535 SHA256 46225f0703ac66b8a41b34c74a93060749386be1e8
 AUX lvm2-stop.sh 1939 SHA256 94a34e0b149ac43f5f1042c45ebdbaa69ac83bcbea7f894c15ab59aad65cb22c SHA512 f372d458b5bccbf872f7a8cc6759bde1c6aea90ba28b0a8a40b05084339e2bebf2d26431de8862cbb072e0b1e9970f393ac82fcda9437adfc75127ca2c76f97a WHIRLPOOL 74bd413264d8c6342b74d363ff1154e4c56b44526151869619f14d3c9952e2b870673676ad23a11ea9fa2ae0034c677897a3d859ea58b269411703d3fc0ebf10
 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.01.13.tgz 463900 SHA256 f98495cbf43128a67bf20fe21e74ef9aa8fb872de80c980f1f506b45b922df50 SHA512 0ca840b52185e834d349dfbc843105994b3dbd6e62736ee99c61d13ff704043f47fa8711afbb5f0699ca0b59f797faeb510bcf98a5f5cd4074c6f2a95edd0726 WHIRLPOOL 46db39d64b14cf2c9cb8f5e4571dd2f22c92deb6e2e7e40df11e40b581fa866103d12548a109049acda9b714400c29edca654f743dc2b26a2070a789ba357547
 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 8219 SHA256 7d69dd9ca9f9e7abec9775036a62b965775370771799df518f7dbb63bfe83c76 SHA512 d0daaed91b13d4e983adb3b6a871170996f34a4711b089bcfc1b6826e32246d6937d607883907e84f4809f83a6704da0c2670733a15e40acb3023c9a48815913 WHIRLPOOL 7d8cb807712d9d653a73b1eaf79bbe696d91c54d3913e600bce2700efc6604b06b17a73c6e3f2f4d197e8877ffcba82b18da3cd932b6cd106d82cb6ee6168367
 EBUILD lvm2-2.02.67-r2.ebuild 8288 SHA256 a485884c1a21e8f0c97d1b6e3977e28752c1995610cdfb0b341c43137c1578c3 SHA512 7e3881a5f05d6df82ced3a9615b8b83688f01f295ce2cc46645df0a0e673aed279528d1bc9b82dd7414842a11c10b7163fd88992b2fbe668b4df81b51bdaeeca WHIRLPOOL c16d09f8a68b42b38b6c660b6984afc31d63fefff31b079484ef77f834d3bdabd785e6ab570a45feaa98484eed73f191b618e7ac7e882e172d7698e72cbbc9d9
-EBUILD lvm2-2.02.67.ebuild 8213 SHA256 7aa462380fde3b964867f0a3a44cf691914b30fa71ec2d4bd6c0c6358e151f18 SHA512 1996ba07a663cfba371b3fad659aed320d74f0a44ef8251a7aec8515cdd90d69c3a4a3e38c6bf40db0e1adad4559bac3b0102995eeb6db59e653e86c519c2c40 WHIRLPOOL a14a2ad4bbaee897163d13edf7d8db12a24b769b686c66b7d0c74563987965981f3185fad363f015028059490cef190c5084f48664077865d9c17955fca062ad
-EBUILD lvm2-2.02.70-r1.ebuild 8431 SHA256 4145def71767c181d9c968db13438007be6c4ab30998f00d9e2c123997ece5c2 SHA512 5958d34da17fbcc37906dbf353e61a9aa6a3a5984466e17a2467ac2bb08efdc50b939e1525d47725b2045fc6b8ceabea443c256f6499589f93474c8caad0a0e0 WHIRLPOOL b074741df6035b0a0cef0c13ffe5a9a8efc02642ae8d85a09786e503efd7dac6af52e5286c166bbe661fcc1edc15cae79c74fb6773cdd728161d2bb754ae25ba
-EBUILD lvm2-2.02.70.ebuild 8362 SHA256 8a0fc7fdce1740c02484832d4b189bf35281642d1067f8c996833ce116841eff SHA512 e8598e1ca4f3856c5798d5877a3e4d18620dbaeb5554d6996ca540de7cd267af5fb505fe21f09def032e28670cd3f1c5585c91149bb7d66b052c12fc8f183802 WHIRLPOOL 458524f69f275cdaa58039931ec448f875a92974412405aae03c36288a38278dd54634b20565f47114f8bc710606c1fef91625a9c2cfd05ae65ca3da102ed603
-EBUILD lvm2-2.02.72.ebuild 8506 SHA256 b765996701e22c3cdad26cf7f96d45f0766558afcd7ae0e64823d0b4c9c03739 SHA512 40f7a71fb02d536af871bb218cad3f620d2b3d25981a4b32b31f34fd22aad09d97e00ed6969ac96f0de7217cf53af08da34dd2476419aa0359b827958dc4fe54 WHIRLPOOL 540f07f93744184793926abe17950d3a69d97ed5f351eb9ea4e748c0488c9a491e2a2d23da8012649736030b3bda141f3d7ec871a2fa50ac17e66edf5e78cbb1
 EBUILD lvm2-2.02.73-r1.ebuild 8720 SHA256 496651fd6ad69553a1d980ff6fd908468d93553b086370fe36d3b2ab78ce891e SHA512 aef753478ff66292f559e60ed501f8fab97a619fe493ff551a1bf83d6323d25fe775e645d040656427f4dfb276c2bf2633d7021a663519585fce72b69b8fe2a3 WHIRLPOOL b7fe161eaca574c952bbfdf0d993047322c46b97212be364f935fe5fe18f7a1b521d5737a261674a1f4ec40931568c901acd3aeb0e438d35c54f86db88e82f4e
 EBUILD lvm2-2.02.73.ebuild 8602 SHA256 c552c6fa5b5cfabd4f9695af80aa36d6e1c6a58bd912ee7773645c2c202503b9 SHA512 191dd5ba3f1cfaed8d531e332356da6b133a1223e388cbd1204a0ccf06d0a2f3f152590b2171854ba11c9e2062dd380b2e874dae00b2cd109af5d5dfdf80149f WHIRLPOOL 8d9c6b274670fad717815b9381e7bf24022b4dd870cce9c764c205ae7e4466f267b582c1265459fb66333aa97cd6d1e9415c5e7f530a9cc37c1ad7b95978110f
-EBUILD lvm2-2.02.74.ebuild 8727 SHA256 20eced4597918e156a785d99b42fc7e3392428f1e4a841632dda0dc3dd4542a3 SHA512 c09ff7337ccb25da0ec3d430597a1974b0c21f9d8f091de24a0caa3e71bd0ca11b1673041b2246166215295dd413e1011fd7f4168ba40b251c2c51e2836f99e4 WHIRLPOOL a1ce45ed431db919dda93017fba46fae592ed131a254723cf050afb20c54db1656de826c45e4f10c541c5431ea8954079ee2d0c2ad8cedf6fbd4c96184063c05
-EBUILD lvm2-2.02.83.ebuild 8747 SHA256 242a3193664c3de85212212ec986c5475fb6b281f2ecf800336e5059b1989ffd SHA512 886a390e5932a7f1a2676db563bf8426b41e48d0f2ca6e587c4d2c3f7ea4e373445b5d15f575c58aaf304999c125994afd45cb0339834c543fd05533ee3825d1 WHIRLPOOL c1072f041dd0e10e0577ab06f396f8623bb2a9fb437f31236af72b9632bfb17f6fba867498867983ba8539483085221c68a249148d2d2143a0aad5d03c43c241
-EBUILD lvm2-2.02.84.ebuild 8818 SHA256 a178721ecdd86d65fc1497867795244e589f67055dd0774a89fd1a735d705f7d SHA512 fd0d94bb3ad21a4eab0f635d7cd8f656d64d4e265f6e9e2c8c74655c2c711daed489dacbad6fff8deb2964f9fea355a92b58c31ffc5dbda5b96b6b6ce0e77ff4 WHIRLPOOL bf0fb5c55eae70ee65b3944d21ab50ae762b9d70a06d9f9b3606c8c81d1defc048641581f51f93106ab8e545d704fcbc127b0755da04d220761ca6938b2d0cdc
-EBUILD lvm2-2.02.85.ebuild 8948 SHA256 617be57424f86c74ccd2bebc46a526a6b258257e704f1b10a4dc6a197d2252ae SHA512 b3218036af61eb8b12a85265b3b094d76990059b47f7b6dd488cc5d326de74bbf24402fcbd071347b48a33e3af8d0ef9bd7dae7440546ff9de8fcaf85d200165 WHIRLPOOL 32b9be37617ef220519d0c90eb2db6db8c6a78af03f82f9aa7e3c9c41654388eb421bc6ba5a81951c3f234b4a13b6091a1cfa0d5f02086da2abe647250c946e2
 EBUILD lvm2-2.02.88.ebuild 8083 SHA256 81d93c2baeefd0c6ed0314537f6bee57c24d823ec149230688b8f0e22dbf1889 SHA512 1430293b9ccadb81e2d504ced9fcb27e108ebffa0318df89e24bdc7720bf4033883dfd23190dfc5bd58265a4c6e18f0710eb5112b2fc57d81a61d9d60b8ad4cf WHIRLPOOL 1f41a5c25d326e18045ac1b3204ca9f725f16c4ac567b82e2068f12351a0c8c7494c5442ec570cb1599c7c7484d520aac92e917055eda432631a025385a4d7c0
-EBUILD lvm2-2.02.92.ebuild 8229 SHA256 f7fd1606b2593f945a74d94563414c4008c8debcd21a394459687689e954d96c SHA512 cb2f5ecde83efec21428bab51d2d6c9a6aa17e5e9d98ef48f0ae788edffe095029f18b12aa12491e6fc1e1239219078954bad6b0ceb65fd378528ed30d3988db WHIRLPOOL 81522c86165a60de339dc989c7a6442486517c81722e9d279d9cadafaa8e001c7bd273843679ac394c54fbbdb282b41565d69c523d96a86bea683375382a04d2
-EBUILD lvm2-2.02.93-r1.ebuild 8244 SHA256 d0180e1e67d73a337ab878a74594f0930b23028a9ca79f248cdf4ce66f4f53db SHA512 deded031237847ffc3f0f5157534b0f8bd41a99d72fd01ecfb74b5ad0f292d0674a162dcd5238cc5da55a8cd4a862888e87a32dc8ffb741efef3580b59189774 WHIRLPOOL f332d19af9f72884b03725f1621744039d0dc0011f41b55b3d9e7e6692e976689b305a353ecb104f81cf630fb01e142a9aa7c039c51560623d6581c08d846477
-EBUILD lvm2-2.02.93.ebuild 8243 SHA256 866d3d7fa835e6fda5a8fe5b4316ab5aec49aa64a0af2d10b266a3b899a05a14 SHA512 2b83bfbe63035a3637a2c59ca0c89fa8b9c13a46bc7865e79af928e55d9bf20f381199f9f920a0bdd3ed6675ddeac3ce262291295cbab9959e953047df58d132 WHIRLPOOL 033a93e07c0ec2b0c5f63231ce3297b8febc1e5b2431144d461c725e68d1808e9528c41eeed3df8d7c4764dc99d045818d723e25fffae2a269dd08008f82681a
-EBUILD lvm2-2.02.95-r1.ebuild 8401 SHA256 e2236394fa0bb8f1d3ee425b340efeba4e5344be440b6809e95e1b212e26727d SHA512 ef0868da7ff0c7cc39810357a0f413b4044289341a6955e3d7acb3c6975484ba5ef66b4da6670039ea2b9aac0171cbd700029eb959db16917833e2818b3f4016 WHIRLPOOL 6557eae4d898537f3ba99b41736410d2355f805d4e7f7220e711ed5270a934ac6857e620de886825118c970ac44b8d5a4fe06eb70bf426c699a2f9d15c2f4723
-EBUILD lvm2-2.02.95-r2.ebuild 8327 SHA256 cb583f3e9b5a548cb7482b73b21402ef1d268e8ca77b539518234a874da930f9 SHA512 5986b0dfaf40f0e5290d1675b052e0f66fa920ef40f8b329c37b76573754fd7bc4588d228fed6c56b20b89577fd4fa696f6e3017a02b292638c24d28c631fb9c WHIRLPOOL 509586b5fe441a6f78a80fd69e06ed68087567911b2181881dc0c7145ec938a9af725357dc3eb13c1454fedcc3430ed2c26f844836ba406d6e9fa21d21630c68
-EBUILD lvm2-2.02.95-r3.ebuild 8430 SHA256 645f384ebee05db244ecf36424ab5e06004dc22a10fd67fa20a18263c1095919 SHA512 2e5a17295a80a73dd27f45cbeea6e733157020d3a6dcbc8c0701ebb3d6f24bac4b697841868b8e28002d44a9deb7d09612e6fb444126c93af6b8118975edb857 WHIRLPOOL b4d5dc2b1f705e2f19d51ec8ed0565685ba125527f0a07053475178dc479fd0a90d79fcb43952b978d69c08122f8924e108da00542c14f799dcacb5bb17b7860
 EBUILD lvm2-2.02.95-r4.ebuild 8539 SHA256 a33dbeb82a45a0a6384519ed4917652c9c99957e77ef6bbfcc72ee69afcb6c7e SHA512 ad0a689ec7f3e268ab65dbe65397434ec8dce1fff799fdb6834d7dc44ecada02cef582f82d9550d360517f7a3cbaf5f549c4e72aa0a5f71f85d27047b1deaf48 WHIRLPOOL 73388baac602f2a080da4a6f531b85f1427f2a6f671b5d8b5cc0e81e115288b39f08c5f918a9c00204f63687ae85680f2f01575b8e67e2d7a788c1b4ac6c1ab0
-EBUILD lvm2-2.02.95.ebuild 8306 SHA256 cd002e92a0f3bbcfb5c3253a498461d5e71ea3b3ad6266aa2daaf6ba6da0399f SHA512 e484ced07d1f7310415a94868295f68655447a70b9b134323aae870ea656c6fe9eda8cd3891c4cbc4bc68f6c1bd6f53a3d394fdc3c7e97b79329ab0389129082 WHIRLPOOL e6d5a43fb6372b66f98eae61dc0a220c9f7c212f370a3a17a0f79b8a06cd4f072ecaefe6f1320abb9b7198a52e3c256fc59e5362f427aa3ae9223dea560389ff
 EBUILD lvm2-2.02.97-r1.ebuild 8831 SHA256 94c83b98f7c5c906933675fe02b45fff68518128e779ce86136d40769c1343bb SHA512 160abaf1653a6deafb5107e981e4105ab77d5fa00de6c079267df6342ce659c1fb40d707471972c3df594325c281ab2d5eea6ffe248806b14df60ec27c7561a1 WHIRLPOOL 59f73137c4d05ea2b686cf1d609707a849b290c00f9b2c0c765a0f0655507043e56b46246922adfc71e1dc567de851b5b4f1960283a3ddf9818f366a9f4154fb
 EBUILD lvm2-2.02.97.ebuild 8576 SHA256 5ec44ab7a0c249c378f772d6383367747bda458e0d92d2bbf52216f41cf8b3c1 SHA512 1eab6415477fef8ffd803f91704dc91f57a4890b82630bcc4a3da1172126ed8be441e9dd399826cabd9f95b1b554216ca310f7d1d10cc9aefe141a88855486e3 WHIRLPOOL a46b59057bd94f159a8474fb66d8b3d5ef72fa0e06e7469697765cdd6af49c9fd814ed793bece20a75c6118ca4bdc4b7e49ae3d58ab31cdde9463b03c829b9d5
-MISC ChangeLog 53770 SHA256 65bb3da1356109c099b8144e2401f97c804196d27dd2043b2191595feca71949 SHA512 ba087376ad783486528aa923df9fbd52c72c5520a4aff4d96a670b3a503f6074c402026ca01c97e054d0b9ef0029bd6778d0bb2d49a7ec7e16902b4923570671 WHIRLPOOL 66010e3ed59e0e3fbd49a5368ebd2af71adc0b151c3e5e21eca33576155abeb8f3ce9c97c5f111a11884cd9fabcfaba4bed8ee741dc8562371d05d33cb93de13
+MISC ChangeLog 54261 SHA256 f071714b7fc2f2b149cacc894978be41f068dc961e7754c73b72047e40c21a77 SHA512 e49c16aa559912c347aa8814eddc0e55637a347f9d1ee59ba2fbc61143f4d6f0792509b69d988fc2443cfaac0b5b4968e47cb9dc6171fd1647f2efccee53443d WHIRLPOOL 7b2429cacb866a4b1ecbf6d74cc60b4698689486b1a4a823117be0b42dbb9b4d1bd38d4d1b0548395ef310195ae364b0899610eabfab88b17273a46093e5e3c8
 MISC metadata.xml 822 SHA256 419b6c05e9d710ff09188d6fd97d1d5a2e1f6a40ee04cfb9b8673c4898ea3a5d SHA512 a5a3c4a5a6eec44b451ee78077325e466cb9205ae8dcc5095792b93c0bf9d87fad71d81c04265480708d59a4cf45e2fe863f06fa1650176a5a2e03a1e2ed1098 WHIRLPOOL 111c1c52eda324439850db82ef69a0c5659186db646857ea549963a38b4b76a67bdbdf0a3ff8945ee8ccacf9bdcfd827ce94482d63fee55956eca08ee6d869df
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQEcBAEBCAAGBQJQx6ocAAoJEEdUh39IaPFNskQH/0ps7PmlU9Qd01hzLSlC3ZX8
-G0UwVJVVTDio6S2MEPWDDoV04plSl8e5AmzRkEMNMbYgaZzRYZ/nb9W7D3ktsBrK
-IOiE7/dV87rkiuyMKrJOpMKcujIO1q3HWdGru5XAh23JrNbbOX23ZhyDb+mAUa3w
-FikseX+IlvSaAAntxapd+rD49OMP1g3pvwRt0g3jkO6Pncy0IkIhC2ikLkNZ+XUM
-Lx2oavWRI6wxyEtoUYdxjhgtCcWy/gPQx7KJkXQEZ/JZf23C63SGGJzMMkI9DegP
-sD277n60soDyjzWR5BkGQmjKA1HZYK/UuzM29Cde1FWHkR/AWSFXPug90G8TBpQ=
-=Qwn9
------END PGP SIGNATURE-----
diff --git a/sys-fs/lvm2/lvm2-2.02.67-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.67-r1.ebuild
deleted file mode 100644
index 086073f3b86f..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.67-r1.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# 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.67-r1.ebuild,v 1.7 2012/12/11 21:48:10 ssuominen Exp $
-
-EAPI=2
-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"
-
-IUSE="readline +static clvm cman +lvm1 selinux"
-
-DEPEND_COMMON="!!sys-fs/device-mapper
-	clvm? ( =sys-cluster/dlm-2*
-			cman? ( =sys-cluster/cman-2* ) )
-	<virtual/udev-196"
-
-RDEPEND="${DEPEND_COMMON}
-	!<sys-apps/openrc-0.4
-	!!sys-fs/lvm-user
-	!!sys-fs/clvm
-	>=sys-apps/util-linux-2.16"
-
-DEPEND="${DEPEND_COMMON}
-		virtual/pkgconfig"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	local CONFIG_CHECK="~SYSVIPC"
-	local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
-	check_extra_config
-	# 1. Genkernel no longer copies /sbin/lvm blindly.
-	# 2. There are no longer any linking deps in /usr.
-	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 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
-	epatch "${FILESDIR}"/${PN}-2.02.64-dmeventd-libs.patch
-	# bug 301331
-	epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	local buildmode
-
-	myconf="${myconf} --enable-dmeventd"
-	myconf="${myconf} --enable-cmdlib"
-	myconf="${myconf} --enable-applib"
-	myconf="${myconf} --enable-fsadm"
-
-	# 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
-		# For recent systems, there are no linkages against anything in /usr anyway.
-		# 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"
-
-	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
-
-	myconf="${myconf}
-			--sbindir=/sbin
-			--with-staticdir=/sbin
-			--with-dmeventd-path=/sbin/dmeventd"
-	econf $(use_enable readline) \
-		$(use_enable selinux) \
-		--enable-pkgconfig \
-		--libdir=/$(get_libdir) \
-		--with-usrlibdir=/usr/$(get_libdir) \
-		--enable-udev_rules \
-		--enable-udev_sync \
-		--with-udevdir=/lib/udev/rules.d/ \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}" || die
-}
-
-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"
-
-	# All of this was change by upstream, and if we don't get any problems, we
-	# can probably drop it in .65
-	#X## Revamp all of our library handling for bug #316571
-	#X## Upstream build script puts a lot of this stuff into /usr/lib regardless of
-	#X## libdir variable.
-	#X#dodir /$(get_libdir)
-	#X## .so -> /$(get_libdir)
-	#X#mv -f "${D}"/usr/lib/lib*.so* "${D}"/$(get_libdir)
-	#X#[[ "$(get_libdir)" != "lib" ]] && \
-	#X#	mv "${D}"/usr/$(get_libdir)/lib*.so* "${D}"/$(get_libdir)
-	#X## .a -> /usr/$(get_libdir)
-	#X#[[ "$(get_libdir)" != "lib" ]] && \
-	#X#	mv -f "${D}"/usr/lib/lib*.a "${D}"/usr/$(get_libdir)
-	#X## The upstream symlinks are borked. lets rebuild them instead.
-	#X#find "${D}"/{usr,}/{lib,$(get_libdir)} -type l \
-	#X#	| xargs rm -f 2>/dev/null
-	#X#for i in "${D}"/$(get_libdir)/*.so.* ; do
-	#X#	b="${i//*\/}" o="${b/.so.*/.so}"
-	#X#	ln -s "${b}" "${D}/$(get_libdir)/${o}"
-	#X#done
-	#X## Now enable building properly
-	#X#for i in \
-	#X#	libdevmapper-event{,-lvm2{,mirror,snapshot}} \
-	#X#	libdevmapper \
-	#X#	liblvm2{format1,snapshot,cmd,app} \
-	#X#	; do
-	#X#	gen_usr_ldscript ${i}.so || die
-	#X#done
-
-	dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt}
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/lvm2-start.sh-2.02.67-r1 lvm-start.sh || die
-	newins "${FILESDIR}"/lvm2-stop.sh-2.02.67-r1 lvm-stop.sh || die
-	newinitd "${FILESDIR}"/lvm.rc-2.02.67-r1 lvm || 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)
-	dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a libdevmapper.a"
-	#gen_usr_ldscript libdevmapper.so
-
-	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
-	insinto /$(get_libdir)/rcscripts/addons
-	doins "${FILESDIR}"/dm-start.sh
-
-	# Device mapper stuff
-	newinitd "${FILESDIR}"/device-mapper.rc-2.02.67-r1 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
-	dolib.a daemons/dmeventd/libdevmapper-event.a \
-	|| die "dolib.a libdevmapper-event.a"
-	#gen_usr_ldscript libdevmapper-event.so
-
-	#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 -e "s-/lib/rcscripts/-/$(get_libdir)/rcscripts/-" -i "${D}"/etc/init.d/*
-
-	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 use them"
-	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 using baselayout-1 still."
-}
-
-src_test() {
-	einfo "Testcases disabled because of device-node mucking"
-	einfo "If you want them, compile the package and see ${S}/tests"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.67.ebuild b/sys-fs/lvm2/lvm2-2.02.67.ebuild
deleted file mode 100644
index 00aa56edfede..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.67.ebuild
+++ /dev/null
@@ -1,256 +0,0 @@
-# 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.67.ebuild,v 1.8 2012/12/11 21:48:10 ssuominen Exp $
-
-EAPI=2
-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"
-
-IUSE="readline +static clvm cman +lvm1 selinux"
-
-DEPEND_COMMON="!!sys-fs/device-mapper
-	clvm? ( =sys-cluster/dlm-2*
-			cman? ( =sys-cluster/cman-2* ) )
-	<virtual/udev-196"
-
-RDEPEND="${DEPEND_COMMON}
-	!<sys-apps/openrc-0.4
-	!!sys-fs/lvm-user
-	!!sys-fs/clvm
-	>=sys-apps/util-linux-2.16"
-
-DEPEND="${DEPEND_COMMON}
-		virtual/pkgconfig"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	local CONFIG_CHECK="~SYSVIPC"
-	local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
-	check_extra_config
-	# 1. Genkernel no longer copies /sbin/lvm blindly.
-	# 2. There are no longer any linking deps in /usr.
-	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 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
-	epatch "${FILESDIR}"/${PN}-2.02.64-dmeventd-libs.patch
-	# bug 301331
-	epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	local buildmode
-
-	myconf="${myconf} --enable-dmeventd"
-	myconf="${myconf} --enable-cmdlib"
-	myconf="${myconf} --enable-applib"
-	myconf="${myconf} --enable-fsadm"
-
-	# 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
-		# For recent systems, there are no linkages against anything in /usr anyway.
-		# 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"
-
-	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
-
-	myconf="${myconf}
-			--sbindir=/sbin
-			--with-staticdir=/sbin
-			--with-dmeventd-path=/sbin/dmeventd"
-	econf $(use_enable readline) \
-		$(use_enable selinux) \
-		--enable-pkgconfig \
-		--libdir=/$(get_libdir) \
-		--with-usrlibdir=/usr/$(get_libdir) \
-		--enable-udev_rules \
-		--enable-udev_sync \
-		--with-udevdir=/lib/udev/rules.d/ \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}" || die
-}
-
-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"
-
-	# All of this was change by upstream, and if we don't get any problems, we
-	# can probably drop it in .65
-	#X## Revamp all of our library handling for bug #316571
-	#X## Upstream build script puts a lot of this stuff into /usr/lib regardless of
-	#X## libdir variable.
-	#X#dodir /$(get_libdir)
-	#X## .so -> /$(get_libdir)
-	#X#mv -f "${D}"/usr/lib/lib*.so* "${D}"/$(get_libdir)
-	#X#[[ "$(get_libdir)" != "lib" ]] && \
-	#X#	mv "${D}"/usr/$(get_libdir)/lib*.so* "${D}"/$(get_libdir)
-	#X## .a -> /usr/$(get_libdir)
-	#X#[[ "$(get_libdir)" != "lib" ]] && \
-	#X#	mv -f "${D}"/usr/lib/lib*.a "${D}"/usr/$(get_libdir)
-	#X## The upstream symlinks are borked. lets rebuild them instead.
-	#X#find "${D}"/{usr,}/{lib,$(get_libdir)} -type l \
-	#X#	| xargs rm -f 2>/dev/null
-	#X#for i in "${D}"/$(get_libdir)/*.so.* ; do
-	#X#	b="${i//*\/}" o="${b/.so.*/.so}"
-	#X#	ln -s "${b}" "${D}/$(get_libdir)/${o}"
-	#X#done
-	#X## Now enable building properly
-	#X#for i in \
-	#X#	libdevmapper-event{,-lvm2{,mirror,snapshot}} \
-	#X#	libdevmapper \
-	#X#	liblvm2{format1,snapshot,cmd,app} \
-	#X#	; do
-	#X#	gen_usr_ldscript ${i}.so || die
-	#X#done
-
-	dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt}
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/lvm2-start.sh-2.02.49-r3 lvm-start.sh || die
-	newins "${FILESDIR}"/lvm2-stop.sh-2.02.49-r3 lvm-stop.sh || die
-	newinitd "${FILESDIR}"/lvm.rc-2.02.51-r2 lvm || 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)
-	dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a libdevmapper.a"
-	#gen_usr_ldscript libdevmapper.so
-
-	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
-	insinto /$(get_libdir)/rcscripts/addons
-	doins "${FILESDIR}"/dm-start.sh
-
-	# Device mapper stuff
-	newinitd "${FILESDIR}"/device-mapper.rc-1.02.51-r2 device-mapper || die
-	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper || die
-
-	newinitd "${FILESDIR}"/1.02.22-dmeventd.initd dmeventd || die
-	dolib.a daemons/dmeventd/libdevmapper-event.a \
-	|| die "dolib.a libdevmapper-event.a"
-	#gen_usr_ldscript libdevmapper-event.so
-
-	#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 -e "s-/lib/rcscripts/-/$(get_libdir)/rcscripts/-" -i "${D}"/etc/init.d/*
-
-	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 use them"
-	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 using baselayout-1 still."
-}
-
-src_test() {
-	einfo "Testcases disabled because of device-node mucking"
-	einfo "If you want them, compile the package and see ${S}/tests"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.70-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.70-r1.ebuild
deleted file mode 100644
index fa07a65ce776..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.70-r1.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# 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.70-r1.ebuild,v 1.8 2012/12/11 21:48:10 ssuominen Exp $
-
-EAPI=2
-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"
-
-IUSE="readline +static clvm cman +lvm1 selinux"
-
-DEPEND_COMMON="!!sys-fs/device-mapper
-	clvm? ( =sys-cluster/dlm-2*
-			cman? ( =sys-cluster/cman-2* ) )
-	<virtual/udev-196"
-
-RDEPEND="${DEPEND_COMMON}
-	!<sys-apps/openrc-0.4
-	!!sys-fs/lvm-user
-	!!sys-fs/clvm
-	>=sys-apps/util-linux-2.16"
-
-DEPEND="${DEPEND_COMMON}
-		virtual/pkgconfig"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	local CONFIG_CHECK="~SYSVIPC"
-	local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
-	check_extra_config
-	# 1. Genkernel no longer copies /sbin/lvm blindly.
-	# 2. There are no longer any linking deps in /usr.
-	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 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
-	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.70-locale-muck.patch
-	# --as-needed
-	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	local buildmode
-
-	myconf="${myconf} --enable-dmeventd"
-	myconf="${myconf} --enable-cmdlib"
-	myconf="${myconf} --enable-applib"
-	myconf="${myconf} --enable-fsadm"
-
-	# 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
-		# For recent systems, there are no linkages against anything in /usr anyway.
-		# 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"
-
-	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
-
-	myconf="${myconf}
-			--sbindir=/sbin
-			--with-staticdir=/sbin
-			--with-dmeventd-path=/sbin/dmeventd"
-	econf $(use_enable readline) \
-		$(use_enable selinux) \
-		--enable-pkgconfig \
-		--libdir=/$(get_libdir) \
-		--with-usrlibdir=/usr/$(get_libdir) \
-		--enable-udev_rules \
-		--enable-udev_sync \
-		--with-udevdir=/lib/udev/rules.d/ \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}" || die
-}
-
-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"
-
-	# All of this was change by upstream, and if we don't get any problems, we
-	# can probably drop it in .65
-	#X## Revamp all of our library handling for bug #316571
-	#X## Upstream build script puts a lot of this stuff into /usr/lib regardless of
-	#X## libdir variable.
-	#X#dodir /$(get_libdir)
-	#X## .so -> /$(get_libdir)
-	#X#mv -f "${D}"/usr/lib/lib*.so* "${D}"/$(get_libdir)
-	#X#[[ "$(get_libdir)" != "lib" ]] && \
-	#X#	mv "${D}"/usr/$(get_libdir)/lib*.so* "${D}"/$(get_libdir)
-	#X## .a -> /usr/$(get_libdir)
-	#X#[[ "$(get_libdir)" != "lib" ]] && \
-	#X#	mv -f "${D}"/usr/lib/lib*.a "${D}"/usr/$(get_libdir)
-	#X## The upstream symlinks are borked. lets rebuild them instead.
-	#X#find "${D}"/{usr,}/{lib,$(get_libdir)} -type l \
-	#X#	| xargs rm -f 2>/dev/null
-	#X#for i in "${D}"/$(get_libdir)/*.so.* ; do
-	#X#	b="${i//*\/}" o="${b/.so.*/.so}"
-	#X#	ln -s "${b}" "${D}/$(get_libdir)/${o}"
-	#X#done
-	#X## Now enable building properly
-	#X#for i in \
-	#X#	libdevmapper-event{,-lvm2{,mirror,snapshot}} \
-	#X#	libdevmapper \
-	#X#	liblvm2{format1,snapshot,cmd,app} \
-	#X#	; do
-	#X#	gen_usr_ldscript ${i}.so || die
-	#X#done
-
-	dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt}
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/lvm2-start.sh-2.02.67-r1 lvm-start.sh || die
-	newins "${FILESDIR}"/lvm2-stop.sh-2.02.67-r1 lvm-stop.sh || die
-	newinitd "${FILESDIR}"/lvm.rc-2.02.67-r1 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)
-	dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a libdevmapper.a"
-	#gen_usr_ldscript libdevmapper.so
-
-	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
-	insinto /$(get_libdir)/rcscripts/addons
-	doins "${FILESDIR}"/dm-start.sh
-
-	# Device mapper stuff
-	newinitd "${FILESDIR}"/device-mapper.rc-2.02.67-r1 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
-	dolib.a daemons/dmeventd/libdevmapper-event.a \
-	|| die "dolib.a libdevmapper-event.a"
-	#gen_usr_ldscript libdevmapper-event.so
-
-	#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 -e "s-/lib/rcscripts/-/$(get_libdir)/rcscripts/-" -i "${D}"/etc/init.d/*
-
-	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 use them"
-	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 using baselayout-1 still."
-}
-
-src_test() {
-	einfo "Testcases disabled because of device-node mucking"
-	einfo "If you want them, compile the package and see ${S}/tests"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.70.ebuild b/sys-fs/lvm2/lvm2-2.02.70.ebuild
deleted file mode 100644
index b3aa80745854..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.70.ebuild
+++ /dev/null
@@ -1,259 +0,0 @@
-# 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.70.ebuild,v 1.8 2012/12/11 21:48:10 ssuominen Exp $
-
-EAPI=2
-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"
-
-IUSE="readline +static clvm cman +lvm1 selinux"
-
-DEPEND_COMMON="!!sys-fs/device-mapper
-	clvm? ( =sys-cluster/dlm-2*
-			cman? ( =sys-cluster/cman-2* ) )
-	<virtual/udev-196"
-
-RDEPEND="${DEPEND_COMMON}
-	!<sys-apps/openrc-0.4
-	!!sys-fs/lvm-user
-	!!sys-fs/clvm
-	>=sys-apps/util-linux-2.16"
-
-DEPEND="${DEPEND_COMMON}
-		virtual/pkgconfig"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	local CONFIG_CHECK="~SYSVIPC"
-	local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
-	check_extra_config
-	# 1. Genkernel no longer copies /sbin/lvm blindly.
-	# 2. There are no longer any linking deps in /usr.
-	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 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
-	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.70-locale-muck.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	local buildmode
-
-	myconf="${myconf} --enable-dmeventd"
-	myconf="${myconf} --enable-cmdlib"
-	myconf="${myconf} --enable-applib"
-	myconf="${myconf} --enable-fsadm"
-
-	# 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
-		# For recent systems, there are no linkages against anything in /usr anyway.
-		# 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"
-
-	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
-
-	myconf="${myconf}
-			--sbindir=/sbin
-			--with-staticdir=/sbin
-			--with-dmeventd-path=/sbin/dmeventd"
-	econf $(use_enable readline) \
-		$(use_enable selinux) \
-		--enable-pkgconfig \
-		--libdir=/$(get_libdir) \
-		--with-usrlibdir=/usr/$(get_libdir) \
-		--enable-udev_rules \
-		--enable-udev_sync \
-		--with-udevdir=/lib/udev/rules.d/ \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}" || die
-}
-
-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"
-
-	# All of this was change by upstream, and if we don't get any problems, we
-	# can probably drop it in .65
-	#X## Revamp all of our library handling for bug #316571
-	#X## Upstream build script puts a lot of this stuff into /usr/lib regardless of
-	#X## libdir variable.
-	#X#dodir /$(get_libdir)
-	#X## .so -> /$(get_libdir)
-	#X#mv -f "${D}"/usr/lib/lib*.so* "${D}"/$(get_libdir)
-	#X#[[ "$(get_libdir)" != "lib" ]] && \
-	#X#	mv "${D}"/usr/$(get_libdir)/lib*.so* "${D}"/$(get_libdir)
-	#X## .a -> /usr/$(get_libdir)
-	#X#[[ "$(get_libdir)" != "lib" ]] && \
-	#X#	mv -f "${D}"/usr/lib/lib*.a "${D}"/usr/$(get_libdir)
-	#X## The upstream symlinks are borked. lets rebuild them instead.
-	#X#find "${D}"/{usr,}/{lib,$(get_libdir)} -type l \
-	#X#	| xargs rm -f 2>/dev/null
-	#X#for i in "${D}"/$(get_libdir)/*.so.* ; do
-	#X#	b="${i//*\/}" o="${b/.so.*/.so}"
-	#X#	ln -s "${b}" "${D}/$(get_libdir)/${o}"
-	#X#done
-	#X## Now enable building properly
-	#X#for i in \
-	#X#	libdevmapper-event{,-lvm2{,mirror,snapshot}} \
-	#X#	libdevmapper \
-	#X#	liblvm2{format1,snapshot,cmd,app} \
-	#X#	; do
-	#X#	gen_usr_ldscript ${i}.so || die
-	#X#done
-
-	dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt}
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/lvm2-start.sh-2.02.67-r1 lvm-start.sh || die
-	newins "${FILESDIR}"/lvm2-stop.sh-2.02.67-r1 lvm-stop.sh || die
-	newinitd "${FILESDIR}"/lvm.rc-2.02.67-r1 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)
-	dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a libdevmapper.a"
-	#gen_usr_ldscript libdevmapper.so
-
-	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
-	insinto /$(get_libdir)/rcscripts/addons
-	doins "${FILESDIR}"/dm-start.sh
-
-	# Device mapper stuff
-	newinitd "${FILESDIR}"/device-mapper.rc-2.02.67-r1 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
-	dolib.a daemons/dmeventd/libdevmapper-event.a \
-	|| die "dolib.a libdevmapper-event.a"
-	#gen_usr_ldscript libdevmapper-event.so
-
-	#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 -e "s-/lib/rcscripts/-/$(get_libdir)/rcscripts/-" -i "${D}"/etc/init.d/*
-
-	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 use them"
-	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 using baselayout-1 still."
-}
-
-src_test() {
-	einfo "Testcases disabled because of device-node mucking"
-	einfo "If you want them, compile the package and see ${S}/tests"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.72.ebuild b/sys-fs/lvm2/lvm2-2.02.72.ebuild
deleted file mode 100644
index 3222bf4da67a..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.72.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# 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.72.ebuild,v 1.10 2012/12/11 21:48:10 ssuominen Exp $
-
-EAPI=2
-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"
-
-IUSE="readline +static clvm cman +lvm1 selinux"
-
-DEPEND_COMMON="!!sys-fs/device-mapper
-	clvm? ( =sys-cluster/dlm-2*
-			cman? ( =sys-cluster/cman-2* ) )
-	<virtual/udev-196"
-
-RDEPEND="${DEPEND_COMMON}
-	!<sys-apps/openrc-0.4
-	!!sys-fs/lvm-user
-	!!sys-fs/clvm
-	>=sys-apps/util-linux-2.16"
-
-DEPEND="${DEPEND_COMMON}
-		virtual/pkgconfig"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	local CONFIG_CHECK="~SYSVIPC"
-	local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
-	check_extra_config
-	# 1. Genkernel no longer copies /sbin/lvm blindly.
-	# 2. There are no longer any linking deps in /usr.
-	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 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
-	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.70-locale-muck.patch
-	# --as-needed
-	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch
-	# bug 332905
-	epatch "${FILESDIR}"/${PN}-2.02.72-dynamic-static-ldflags.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	local buildmode
-
-	myconf="${myconf} --enable-dmeventd"
-	myconf="${myconf} --enable-cmdlib"
-	myconf="${myconf} --enable-applib"
-	myconf="${myconf} --enable-fsadm"
-
-	# 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
-		# For recent systems, there are no linkages against anything in /usr anyway.
-		# 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"
-
-	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
-
-	myconf="${myconf}
-			--sbindir=/sbin
-			--with-staticdir=/sbin
-			--with-dmeventd-path=/sbin/dmeventd"
-	econf $(use_enable readline) \
-		$(use_enable selinux) \
-		--enable-pkgconfig \
-		--libdir=/$(get_libdir) \
-		--with-usrlibdir=/usr/$(get_libdir) \
-		--enable-udev_rules \
-		--enable-udev_sync \
-		--with-udevdir=/lib/udev/rules.d/ \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}" || die
-}
-
-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"
-
-	# All of this was change by upstream, and if we don't get any problems, we
-	# can probably drop it in .65
-	#X## Revamp all of our library handling for bug #316571
-	#X## Upstream build script puts a lot of this stuff into /usr/lib regardless of
-	#X## libdir variable.
-	#X#dodir /$(get_libdir)
-	#X## .so -> /$(get_libdir)
-	#X#mv -f "${D}"/usr/lib/lib*.so* "${D}"/$(get_libdir)
-	#X#[[ "$(get_libdir)" != "lib" ]] && \
-	#X#	mv "${D}"/usr/$(get_libdir)/lib*.so* "${D}"/$(get_libdir)
-	#X## .a -> /usr/$(get_libdir)
-	#X#[[ "$(get_libdir)" != "lib" ]] && \
-	#X#	mv -f "${D}"/usr/lib/lib*.a "${D}"/usr/$(get_libdir)
-	#X## The upstream symlinks are borked. lets rebuild them instead.
-	#X#find "${D}"/{usr,}/{lib,$(get_libdir)} -type l \
-	#X#	| xargs rm -f 2>/dev/null
-	#X#for i in "${D}"/$(get_libdir)/*.so.* ; do
-	#X#	b="${i//*\/}" o="${b/.so.*/.so}"
-	#X#	ln -s "${b}" "${D}/$(get_libdir)/${o}"
-	#X#done
-	#X## Now enable building properly
-	#X#for i in \
-	#X#	libdevmapper-event{,-lvm2{,mirror,snapshot}} \
-	#X#	libdevmapper \
-	#X#	liblvm2{format1,snapshot,cmd,app} \
-	#X#	; do
-	#X#	gen_usr_ldscript ${i}.so || die
-	#X#done
-
-	dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt}
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/lvm2-start.sh-2.02.67-r1 lvm-start.sh || die
-	newins "${FILESDIR}"/lvm2-stop.sh-2.02.67-r1 lvm-stop.sh || die
-	newinitd "${FILESDIR}"/lvm.rc-2.02.67-r1 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)
-	dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a libdevmapper.a"
-	#gen_usr_ldscript libdevmapper.so
-
-	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
-	insinto /$(get_libdir)/rcscripts/addons
-	doins "${FILESDIR}"/dm-start.sh
-
-	# Device mapper stuff
-	newinitd "${FILESDIR}"/device-mapper.rc-2.02.67-r1 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
-	dolib.a daemons/dmeventd/libdevmapper-event.a \
-	|| die "dolib.a libdevmapper-event.a"
-	#gen_usr_ldscript libdevmapper-event.so
-
-	#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 -e "s-/lib/rcscripts/-/$(get_libdir)/rcscripts/-" -i "${D}"/etc/init.d/*
-
-	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 use them"
-	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 using baselayout-1 still."
-}
-
-src_test() {
-	einfo "Testcases disabled because of device-node mucking"
-	einfo "If you want them, compile the package and see ${S}/tests"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.74.ebuild b/sys-fs/lvm2/lvm2-2.02.74.ebuild
deleted file mode 100644
index 336308aa1ad3..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.74.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# 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.74.ebuild,v 1.7 2012/12/11 21:48:10 ssuominen Exp $
-
-EAPI=2
-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"
-
-IUSE="readline +static clvm cman +lvm1 selinux"
-
-DEPEND_COMMON="!!sys-fs/device-mapper
-	readline? ( sys-libs/readline )
-	clvm? ( =sys-cluster/dlm-2*
-			cman? ( =sys-cluster/cman-2* ) )
-	<virtual/udev-196"
-
-RDEPEND="${DEPEND_COMMON}
-	!<sys-apps/openrc-0.4
-	!!sys-fs/lvm-user
-	!!sys-fs/clvm
-	>=sys-apps/util-linux-2.16"
-
-# 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"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	local CONFIG_CHECK="~SYSVIPC"
-	local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
-	check_extra_config
-	# 1. Genkernel no longer copies /sbin/lvm blindly.
-	# 2. There are no longer any linking deps in /usr.
-	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 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
-	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.73-locale-muck.patch
-	# --as-needed
-	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch
-	# bug 332905
-	epatch "${FILESDIR}"/${PN}-2.02.72-dynamic-static-ldflags.patch
-
-	epatch "${FILESDIR}"/${PN}-2.02.73-asneeded.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	local buildmode
-
-	myconf="${myconf} --enable-dmeventd"
-	myconf="${myconf} --enable-cmdlib"
-	myconf="${myconf} --enable-applib"
-	myconf="${myconf} --enable-fsadm"
-
-	# 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
-		# For recent systems, there are no linkages against anything in /usr anyway.
-		# 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"
-
-	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
-
-	myconf="${myconf}
-			--sbindir=/sbin
-			--with-staticdir=/sbin
-			--with-dmeventd-path=/sbin/dmeventd"
-	econf $(use_enable readline) \
-		$(use_enable selinux) \
-		--enable-pkgconfig \
-		--libdir=/$(get_libdir) \
-		--with-usrlibdir=/usr/$(get_libdir) \
-		--enable-udev_rules \
-		--enable-udev_sync \
-		--with-udevdir=/lib/udev/rules.d/ \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}" || die
-}
-
-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"
-
-	# All of this was change by upstream, and if we don't get any problems, we
-	# can probably drop it in .65
-	#X## Revamp all of our library handling for bug #316571
-	#X## Upstream build script puts a lot of this stuff into /usr/lib regardless of
-	#X## libdir variable.
-	#X#dodir /$(get_libdir)
-	#X## .so -> /$(get_libdir)
-	#X#mv -f "${D}"/usr/lib/lib*.so* "${D}"/$(get_libdir)
-	#X#[[ "$(get_libdir)" != "lib" ]] && \
-	#X#	mv "${D}"/usr/$(get_libdir)/lib*.so* "${D}"/$(get_libdir)
-	#X## .a -> /usr/$(get_libdir)
-	#X#[[ "$(get_libdir)" != "lib" ]] && \
-	#X#	mv -f "${D}"/usr/lib/lib*.a "${D}"/usr/$(get_libdir)
-	#X## The upstream symlinks are borked. lets rebuild them instead.
-	#X#find "${D}"/{usr,}/{lib,$(get_libdir)} -type l \
-	#X#	| xargs rm -f 2>/dev/null
-	#X#for i in "${D}"/$(get_libdir)/*.so.* ; do
-	#X#	b="${i//*\/}" o="${b/.so.*/.so}"
-	#X#	ln -s "${b}" "${D}/$(get_libdir)/${o}"
-	#X#done
-	#X## Now enable building properly
-	#X#for i in \
-	#X#	libdevmapper-event{,-lvm2{,mirror,snapshot}} \
-	#X#	libdevmapper \
-	#X#	liblvm2{format1,snapshot,cmd,app} \
-	#X#	; do
-	#X#	gen_usr_ldscript ${i}.so || die
-	#X#done
-
-	dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt}
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/lvm2-start.sh-2.02.67-r1 lvm-start.sh || die
-	newins "${FILESDIR}"/lvm2-stop.sh-2.02.67-r1 lvm-stop.sh || die
-	newinitd "${FILESDIR}"/lvm.rc-2.02.67-r1 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)
-	dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a libdevmapper.a"
-	#gen_usr_ldscript libdevmapper.so
-
-	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
-	insinto /$(get_libdir)/rcscripts/addons
-	doins "${FILESDIR}"/dm-start.sh
-
-	# Device mapper stuff
-	newinitd "${FILESDIR}"/device-mapper.rc-2.02.67-r1 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
-	dolib.a daemons/dmeventd/libdevmapper-event.a \
-	|| die "dolib.a libdevmapper-event.a"
-	#gen_usr_ldscript libdevmapper-event.so
-
-	#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 -e "s-/lib/rcscripts/-/$(get_libdir)/rcscripts/-" -i "${D}"/etc/init.d/*
-
-	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 use them"
-	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 using baselayout-1 still."
-}
-
-src_test() {
-	einfo "Testcases disabled because of device-node mucking"
-	einfo "If you want them, compile the package and see ${S}/tests"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.83.ebuild b/sys-fs/lvm2/lvm2-2.02.83.ebuild
deleted file mode 100644
index d25ce6e5a24c..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.83.ebuild
+++ /dev/null
@@ -1,272 +0,0 @@
-# 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.83.ebuild,v 1.7 2012/12/11 21:48:10 ssuominen Exp $
-
-EAPI=2
-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"
-
-IUSE="readline +static clvm cman +lvm1 selinux"
-
-DEPEND_COMMON="!!sys-fs/device-mapper
-	readline? ( sys-libs/readline )
-	clvm? ( =sys-cluster/dlm-2*
-			cman? ( =sys-cluster/cman-2* ) )
-	<virtual/udev-196"
-
-RDEPEND="${DEPEND_COMMON}
-	!<sys-apps/openrc-0.4
-	!!sys-fs/lvm-user
-	!!sys-fs/clvm
-	>=sys-apps/util-linux-2.16"
-
-# 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"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	local CONFIG_CHECK="~SYSVIPC"
-	local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
-	check_extra_config
-	# 1. Genkernel no longer copies /sbin/lvm blindly.
-	# 2. There are no longer any linking deps in /usr.
-	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 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
-	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.73-locale-muck.patch
-	# --as-needed
-	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch
-	# bug 332905
-	epatch "${FILESDIR}"/${PN}-2.02.72-dynamic-static-ldflags.patch
-
-	# Merged upstream
-	#epatch "${FILESDIR}"/${PN}-2.02.73-asneeded.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	local buildmode
-
-	myconf="${myconf} --enable-dmeventd"
-	myconf="${myconf} --enable-cmdlib"
-	myconf="${myconf} --enable-applib"
-	myconf="${myconf} --enable-fsadm"
-
-	# 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
-		# For recent systems, there are no linkages against anything in /usr anyway.
-		# 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"
-
-	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
-
-	myconf="${myconf}
-			--sbindir=/sbin
-			--with-staticdir=/sbin
-			--with-dmeventd-path=/sbin/dmeventd"
-	econf $(use_enable readline) \
-		$(use_enable selinux) \
-		--enable-pkgconfig \
-		--libdir=/$(get_libdir) \
-		--with-usrlibdir=/usr/$(get_libdir) \
-		--enable-udev_rules \
-		--enable-udev_sync \
-		--with-udevdir=/lib/udev/rules.d/ \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}" || die
-}
-
-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"
-
-	# All of this was change by upstream, and if we don't get any problems, we
-	# can probably drop it in .65
-	#X## Revamp all of our library handling for bug #316571
-	#X## Upstream build script puts a lot of this stuff into /usr/lib regardless of
-	#X## libdir variable.
-	#X#dodir /$(get_libdir)
-	#X## .so -> /$(get_libdir)
-	#X#mv -f "${D}"/usr/lib/lib*.so* "${D}"/$(get_libdir)
-	#X#[[ "$(get_libdir)" != "lib" ]] && \
-	#X#	mv "${D}"/usr/$(get_libdir)/lib*.so* "${D}"/$(get_libdir)
-	#X## .a -> /usr/$(get_libdir)
-	#X#[[ "$(get_libdir)" != "lib" ]] && \
-	#X#	mv -f "${D}"/usr/lib/lib*.a "${D}"/usr/$(get_libdir)
-	#X## The upstream symlinks are borked. lets rebuild them instead.
-	#X#find "${D}"/{usr,}/{lib,$(get_libdir)} -type l \
-	#X#	| xargs rm -f 2>/dev/null
-	#X#for i in "${D}"/$(get_libdir)/*.so.* ; do
-	#X#	b="${i//*\/}" o="${b/.so.*/.so}"
-	#X#	ln -s "${b}" "${D}/$(get_libdir)/${o}"
-	#X#done
-	#X## Now enable building properly
-	#X#for i in \
-	#X#	libdevmapper-event{,-lvm2{,mirror,snapshot}} \
-	#X#	libdevmapper \
-	#X#	liblvm2{format1,snapshot,cmd,app} \
-	#X#	; do
-	#X#	gen_usr_ldscript ${i}.so || die
-	#X#done
-
-	dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt}
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/lvm2-start.sh-2.02.67-r1 lvm-start.sh || die
-	newins "${FILESDIR}"/lvm2-stop.sh-2.02.67-r1 lvm-stop.sh || die
-	newinitd "${FILESDIR}"/lvm.rc-2.02.67-r1 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)
-	dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a libdevmapper.a"
-	#gen_usr_ldscript libdevmapper.so
-
-	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
-	insinto /$(get_libdir)/rcscripts/addons
-	doins "${FILESDIR}"/dm-start.sh
-
-	# Device mapper stuff
-	newinitd "${FILESDIR}"/device-mapper.rc-2.02.67-r1 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
-	dolib.a daemons/dmeventd/libdevmapper-event.a \
-	|| die "dolib.a libdevmapper-event.a"
-	#gen_usr_ldscript libdevmapper-event.so
-
-	#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 -e "s-/lib/rcscripts/-/$(get_libdir)/rcscripts/-" -i "${D}"/etc/init.d/*
-
-	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 use them"
-	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 using baselayout-1 still."
-}
-
-src_test() {
-	einfo "Testcases disabled because of device-node mucking"
-	einfo "If you want them, compile the package and see ${S}/tests"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.84.ebuild b/sys-fs/lvm2/lvm2-2.02.84.ebuild
deleted file mode 100644
index 5aa1636bdcaa..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.84.ebuild
+++ /dev/null
@@ -1,274 +0,0 @@
-# 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.84.ebuild,v 1.8 2012/12/11 21:48:10 ssuominen Exp $
-
-EAPI=2
-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"
-
-IUSE="readline +static clvm cman +lvm1 selinux"
-
-DEPEND_COMMON="!!sys-fs/device-mapper
-	readline? ( sys-libs/readline )
-	clvm? ( =sys-cluster/dlm-2*
-			cman? ( =sys-cluster/cman-2* ) )
-	<virtual/udev-196"
-
-RDEPEND="${DEPEND_COMMON}
-	!<sys-apps/openrc-0.4
-	!!sys-fs/lvm-user
-	!!sys-fs/clvm
-	>=sys-apps/util-linux-2.16"
-
-# 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"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	local CONFIG_CHECK="~SYSVIPC"
-	local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
-	check_extra_config
-	# 1. Genkernel no longer copies /sbin/lvm blindly.
-	# 2. There are no longer any linking deps in /usr.
-	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 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
-	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.73-locale-muck.patch
-	# --as-needed
-	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch
-	# bug 332905
-	epatch "${FILESDIR}"/${PN}-2.02.72-dynamic-static-ldflags.patch
-	# bug 361429
-	epatch "${FILESDIR}"/${PN}-2.02.84-udev-pkgconfig.patch
-
-	# Merged upstream
-	#epatch "${FILESDIR}"/${PN}-2.02.73-asneeded.patch
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	local buildmode
-
-	myconf="${myconf} --enable-dmeventd"
-	myconf="${myconf} --enable-cmdlib"
-	myconf="${myconf} --enable-applib"
-	myconf="${myconf} --enable-fsadm"
-
-	# 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
-		# For recent systems, there are no linkages against anything in /usr anyway.
-		# 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"
-
-	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
-
-	myconf="${myconf}
-			--sbindir=/sbin
-			--with-staticdir=/sbin
-			--with-dmeventd-path=/sbin/dmeventd"
-	econf $(use_enable readline) \
-		$(use_enable selinux) \
-		--enable-pkgconfig \
-		--libdir=/$(get_libdir) \
-		--with-usrlibdir=/usr/$(get_libdir) \
-		--enable-udev_rules \
-		--enable-udev_sync \
-		--with-udevdir=/lib/udev/rules.d/ \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}" || die
-}
-
-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"
-
-	# All of this was change by upstream, and if we don't get any problems, we
-	# can probably drop it in .65
-	#X## Revamp all of our library handling for bug #316571
-	#X## Upstream build script puts a lot of this stuff into /usr/lib regardless of
-	#X## libdir variable.
-	#X#dodir /$(get_libdir)
-	#X## .so -> /$(get_libdir)
-	#X#mv -f "${D}"/usr/lib/lib*.so* "${D}"/$(get_libdir)
-	#X#[[ "$(get_libdir)" != "lib" ]] && \
-	#X#	mv "${D}"/usr/$(get_libdir)/lib*.so* "${D}"/$(get_libdir)
-	#X## .a -> /usr/$(get_libdir)
-	#X#[[ "$(get_libdir)" != "lib" ]] && \
-	#X#	mv -f "${D}"/usr/lib/lib*.a "${D}"/usr/$(get_libdir)
-	#X## The upstream symlinks are borked. lets rebuild them instead.
-	#X#find "${D}"/{usr,}/{lib,$(get_libdir)} -type l \
-	#X#	| xargs rm -f 2>/dev/null
-	#X#for i in "${D}"/$(get_libdir)/*.so.* ; do
-	#X#	b="${i//*\/}" o="${b/.so.*/.so}"
-	#X#	ln -s "${b}" "${D}/$(get_libdir)/${o}"
-	#X#done
-	#X## Now enable building properly
-	#X#for i in \
-	#X#	libdevmapper-event{,-lvm2{,mirror,snapshot}} \
-	#X#	libdevmapper \
-	#X#	liblvm2{format1,snapshot,cmd,app} \
-	#X#	; do
-	#X#	gen_usr_ldscript ${i}.so || die
-	#X#done
-
-	dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt}
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/lvm2-start.sh-2.02.67-r1 lvm-start.sh || die
-	newins "${FILESDIR}"/lvm2-stop.sh-2.02.67-r1 lvm-stop.sh || die
-	newinitd "${FILESDIR}"/lvm.rc-2.02.67-r1 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)
-	dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a libdevmapper.a"
-	#gen_usr_ldscript libdevmapper.so
-
-	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
-	insinto /$(get_libdir)/rcscripts/addons
-	doins "${FILESDIR}"/dm-start.sh
-
-	# Device mapper stuff
-	newinitd "${FILESDIR}"/device-mapper.rc-2.02.67-r1 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
-	dolib.a daemons/dmeventd/libdevmapper-event.a \
-	|| die "dolib.a libdevmapper-event.a"
-	#gen_usr_ldscript libdevmapper-event.so
-
-	#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 -e "s-/lib/rcscripts/-/$(get_libdir)/rcscripts/-" -i "${D}"/etc/init.d/*
-
-	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 use them"
-	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 using baselayout-1 still."
-}
-
-src_test() {
-	einfo "Testcases disabled because of device-node mucking"
-	einfo "If you want them, compile the package and see ${S}/tests"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.85.ebuild b/sys-fs/lvm2/lvm2-2.02.85.ebuild
deleted file mode 100644
index e3cf8ddf4344..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.85.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# 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.85.ebuild,v 1.8 2012/12/10 20:41:45 axs 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 ~x86-linux"
-
-IUSE="readline +static clvm cman +lvm1 selinux"
-
-DEPEND_COMMON="!!sys-fs/device-mapper
-	readline? ( sys-libs/readline )
-	clvm? ( =sys-cluster/dlm-2*
-			cman? ( =sys-cluster/cman-2* ) )
-	<virtual/udev-196"
-
-RDEPEND="${DEPEND_COMMON}
-	!<sys-apps/openrc-0.4
-	!!sys-fs/lvm-user
-	!!sys-fs/clvm
-	>=sys-apps/util-linux-2.16"
-
-# 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"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	local CONFIG_CHECK="~SYSVIPC"
-	local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
-	check_extra_config
-	# 1. Genkernel no longer copies /sbin/lvm blindly.
-	# 2. There are no longer any linking deps in /usr.
-	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 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
-	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.73-locale-muck.patch
-	# --as-needed
-	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch
-	# bug 332905
-	epatch "${FILESDIR}"/${PN}-2.02.72-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
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	local buildmode
-
-	myconf="${myconf} --enable-dmeventd"
-	myconf="${myconf} --enable-cmdlib"
-	myconf="${myconf} --enable-applib"
-	myconf="${myconf} --enable-fsadm"
-
-	# 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
-		# For recent systems, there are no linkages against anything in /usr anyway.
-		# 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"
-
-	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
-
-	myconf="${myconf}
-			--with-dmeventd-path=/sbin/dmeventd"
-	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)" \
-		--enable-udev_rules \
-		--enable-udev_sync \
-		--with-udevdir="${EPREFIX}/lib/udev/rules.d/" \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}" || die
-}
-
-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"
-
-	# All of this was change by upstream, and if we don't get any problems, we
-	# can probably drop it in .65
-	#X## Revamp all of our library handling for bug #316571
-	#X## Upstream build script puts a lot of this stuff into /usr/lib regardless of
-	#X## libdir variable.
-	#X#dodir /$(get_libdir)
-	#X## .so -> /$(get_libdir)
-	#X#mv -f "${D}"/usr/lib/lib*.so* "${D}"/$(get_libdir)
-	#X#[[ "$(get_libdir)" != "lib" ]] && \
-	#X#	mv "${D}"/usr/$(get_libdir)/lib*.so* "${D}"/$(get_libdir)
-	#X## .a -> /usr/$(get_libdir)
-	#X#[[ "$(get_libdir)" != "lib" ]] && \
-	#X#	mv -f "${D}"/usr/lib/lib*.a "${D}"/usr/$(get_libdir)
-	#X## The upstream symlinks are borked. lets rebuild them instead.
-	#X#find "${D}"/{usr,}/{lib,$(get_libdir)} -type l \
-	#X#	| xargs rm -f 2>/dev/null
-	#X#for i in "${D}"/$(get_libdir)/*.so.* ; do
-	#X#	b="${i//*\/}" o="${b/.so.*/.so}"
-	#X#	ln -s "${b}" "${D}/$(get_libdir)/${o}"
-	#X#done
-	#X## Now enable building properly
-	#X#for i in \
-	#X#	libdevmapper-event{,-lvm2{,mirror,snapshot}} \
-	#X#	libdevmapper \
-	#X#	liblvm2{format1,snapshot,cmd,app} \
-	#X#	; do
-	#X#	gen_usr_ldscript ${i}.so || die
-	#X#done
-
-	dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt}
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/lvm2-start.sh-2.02.67-r1 lvm-start.sh || die
-	newins "${FILESDIR}"/lvm2-stop.sh-2.02.67-r1 lvm-stop.sh || die
-	newinitd "${FILESDIR}"/lvm.rc-2.02.67-r1 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)
-	dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a libdevmapper.a"
-	#gen_usr_ldscript libdevmapper.so
-
-	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
-	insinto /$(get_libdir)/rcscripts/addons
-	doins "${FILESDIR}"/dm-start.sh
-
-	# Device mapper stuff
-	newinitd "${FILESDIR}"/device-mapper.rc-2.02.67-r1 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
-	dolib.a daemons/dmeventd/libdevmapper-event.a \
-	|| die "dolib.a libdevmapper-event.a"
-	#gen_usr_ldscript libdevmapper-event.so
-
-	#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 -e "s-/lib/rcscripts/-/$(get_libdir)/rcscripts/-" -i "${ED}"/etc/init.d/*
-
-	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 use them"
-	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 using baselayout-1 still."
-}
-
-src_test() {
-	einfo "Testcases disabled because of device-node mucking"
-	einfo "If you want them, compile the package and see ${S}/tests"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.92.ebuild b/sys-fs/lvm2/lvm2-2.02.92.ebuild
deleted file mode 100644
index 72f7f1e79cf1..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.92.ebuild
+++ /dev/null
@@ -1,258 +0,0 @@
-# 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.92.ebuild,v 1.5 2012/11/28 10:55:33 ssuominen 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 ~x86-linux"
-
-IUSE="readline +static +static-libs clvm cman +lvm1 selinux"
-
-DEPEND_COMMON="!!sys-fs/device-mapper
-	readline? ( sys-libs/readline )
-	clvm? ( =sys-cluster/dlm-2*
-			cman? ( =sys-cluster/cman-2* ) )
-	virtual/udev"
-
-RDEPEND="${DEPEND_COMMON}
-	!<sys-apps/openrc-0.4
-	!!sys-fs/lvm-user
-	!!sys-fs/clvm
-	>=sys-apps/util-linux-2.16"
-
-# 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? ( virtual/udev[static-libs] )"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	local CONFIG_CHECK="~SYSVIPC"
-	local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
-	check_extra_config
-	# 1. Genkernel no longer copies /sbin/lvm blindly.
-	# 2. There are no longer any linking deps in /usr.
-	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
-	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
-
-	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" # Not ready yet
-
-	# 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
-		# For recent systems, there are no linkages against anything in /usr anyway.
-		# 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"
-	myconf="${myconf} --with-thin=internal"
-
-	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
-
-	myconf="${myconf}
-			--with-dmeventd-path=/sbin/dmeventd"
-	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)" \
-		--enable-udev_rules \
-		--enable-udev_sync \
-		--with-udevdir="${EPREFIX}/lib/udev/rules.d/" \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}" || die
-}
-
-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}
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/lvm2-start.sh-2.02.67-r1 lvm-start.sh || die
-	newins "${FILESDIR}"/lvm2-stop.sh-2.02.67-r1 lvm-stop.sh || die
-	newinitd "${FILESDIR}"/lvm.rc-2.02.67-r1 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
-	insinto /$(get_libdir)/rcscripts/addons
-	doins "${FILESDIR}"/dm-start.sh
-
-	# Device mapper stuff
-	newinitd "${FILESDIR}"/device-mapper.rc-2.02.67-r1 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 -e "s-/lib/rcscripts/-/$(get_libdir)/rcscripts/-" -i "${ED}"/etc/init.d/*
-
-	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"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.93-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.93-r1.ebuild
deleted file mode 100644
index 4f23de5bc1a9..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.93-r1.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# 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.93-r1.ebuild,v 1.4 2012/11/28 10:55:33 ssuominen 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 ~x86-linux"
-
-IUSE="readline static static-libs clvm cman +lvm1 selinux"
-
-DEPEND_COMMON="!!sys-fs/device-mapper
-	readline? ( sys-libs/readline )
-	clvm? ( =sys-cluster/dlm-2*
-			cman? ( =sys-cluster/cman-2* ) )
-	virtual/udev"
-
-RDEPEND="${DEPEND_COMMON}
-	!<sys-apps/openrc-0.4
-	!!sys-fs/lvm-user
-	!!sys-fs/clvm
-	>=sys-apps/util-linux-2.16"
-
-# 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? ( virtual/udev[static-libs] )"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	local CONFIG_CHECK="~SYSVIPC"
-	local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
-	check_extra_config
-	# 1. Genkernel no longer copies /sbin/lvm blindly.
-	# 2. There are no longer any linking deps in /usr.
-	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
-	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
-
-	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" # still broken
-
-	# 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
-		# For recent systems, there are no linkages against anything in /usr anyway.
-		# 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"
-	myconf="${myconf} --with-thin=internal"
-
-	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
-
-	myconf="${myconf}
-			--with-dmeventd-path=/sbin/dmeventd"
-	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)" \
-		--enable-udev_rules \
-		--enable-udev_sync \
-		--with-udevdir="${EPREFIX}/lib/udev/rules.d/" \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}" || die
-}
-
-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}
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/lvm2-start.sh-2.02.67-r1 lvm-start.sh || die
-	newins "${FILESDIR}"/lvm2-stop.sh-2.02.67-r1 lvm-stop.sh || die
-	newinitd "${FILESDIR}"/lvm.rc-2.02.67-r1 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
-	insinto /$(get_libdir)/rcscripts/addons
-	doins "${FILESDIR}"/dm-start.sh
-
-	# Device mapper stuff
-	newinitd "${FILESDIR}"/device-mapper.rc-2.02.67-r1 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"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.93.ebuild b/sys-fs/lvm2/lvm2-2.02.93.ebuild
deleted file mode 100644
index c1ed2f89dc36..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.93.ebuild
+++ /dev/null
@@ -1,260 +0,0 @@
-# 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.93.ebuild,v 1.6 2012/11/28 10:55:33 ssuominen 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 ~x86-linux"
-
-IUSE="readline +static +static-libs clvm cman +lvm1 selinux"
-
-DEPEND_COMMON="!!sys-fs/device-mapper
-	readline? ( sys-libs/readline )
-	clvm? ( =sys-cluster/dlm-2*
-			cman? ( =sys-cluster/cman-2* ) )
-	virtual/udev"
-
-RDEPEND="${DEPEND_COMMON}
-	!<sys-apps/openrc-0.4
-	!!sys-fs/lvm-user
-	!!sys-fs/clvm
-	>=sys-apps/util-linux-2.16"
-
-# 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? ( virtual/udev[static-libs] )"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	local CONFIG_CHECK="~SYSVIPC"
-	local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
-	check_extra_config
-	# 1. Genkernel no longer copies /sbin/lvm blindly.
-	# 2. There are no longer any linking deps in /usr.
-	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
-	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
-
-	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" # still broken
-
-	# 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
-		# For recent systems, there are no linkages against anything in /usr anyway.
-		# 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"
-	myconf="${myconf} --with-thin=internal"
-
-	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
-
-	myconf="${myconf}
-			--with-dmeventd-path=/sbin/dmeventd"
-	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)" \
-		--enable-udev_rules \
-		--enable-udev_sync \
-		--with-udevdir="${EPREFIX}/lib/udev/rules.d/" \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}" || die
-}
-
-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}
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/lvm2-start.sh-2.02.67-r1 lvm-start.sh || die
-	newins "${FILESDIR}"/lvm2-stop.sh-2.02.67-r1 lvm-stop.sh || die
-	newinitd "${FILESDIR}"/lvm.rc-2.02.67-r1 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
-	insinto /$(get_libdir)/rcscripts/addons
-	doins "${FILESDIR}"/dm-start.sh
-
-	# Device mapper stuff
-	newinitd "${FILESDIR}"/device-mapper.rc-2.02.67-r1 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"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.95-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.95-r1.ebuild
deleted file mode 100644
index 2f6095650989..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.95-r1.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# 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.95-r1.ebuild,v 1.5 2012/11/28 10:55:33 ssuominen 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"
-
-DEPEND_COMMON="!!sys-fs/device-mapper
-	readline? ( sys-libs/readline )
-	clvm? ( =sys-cluster/libdlm-3*
-			cman? ( =sys-cluster/cman-3* ) )
-	udev? ( virtual/udev )"
-
-RDEPEND="${DEPEND_COMMON}
-	!<sys-apps/openrc-0.4
-	!!sys-fs/lvm-user
-	!!sys-fs/clvm
-	>=sys-apps/util-linux-2.16"
-
-# 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? ( virtual/udev[static-libs] )"
-
-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.
-	# 2. There are no longer any linking deps in /usr.
-	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
-	epatch "${FILESDIR}"/${PN}-2.02.95-lvmpath.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
-		# For recent systems, there are no linkages against anything in /usr anyway.
-		# 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"
-	myconf="${myconf} --with-thin=internal"
-
-	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
-
-	myconf="${myconf}
-			--with-dmeventd-path=/sbin/dmeventd"
-	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)" \
-		$(use_enable udev udev_rules) \
-		$(use_enable udev udev_sync) \
-		$(use_with udev udevdir "${EPREFIX}/lib/udev/rules.d/") \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}" || die
-}
-
-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}
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/lvm2-start.sh-2.02.95 lvm-start.sh || die
-	newins "${FILESDIR}"/lvm2-stop.sh-2.02.67-r1 lvm-stop.sh || die
-	newinitd "${FILESDIR}"/lvm.rc-2.02.67-r1 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
-	insinto /$(get_libdir)/rcscripts/addons
-	doins "${FILESDIR}"/dm-start.sh
-
-	# Device mapper stuff
-	newinitd "${FILESDIR}"/device-mapper.rc-2.02.67-r1 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"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.95-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.95-r2.ebuild
deleted file mode 100644
index 716ed88a626a..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.95-r2.ebuild
+++ /dev/null
@@ -1,264 +0,0 @@
-# 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.95-r2.ebuild,v 1.5 2012/11/28 10:55:33 ssuominen 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? ( virtual/udev )"
-
-# /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? ( virtual/udev[static-libs] )"
-
-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
-	epatch "${FILESDIR}"/${PN}-2.02.95-lvmpath.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
-
-	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 "${EPREFIX}/lib/udev/rules.d/") \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}" || die
-}
-
-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"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.95-r3.ebuild b/sys-fs/lvm2/lvm2-2.02.95-r3.ebuild
deleted file mode 100644
index 6106d2f9e121..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.95-r3.ebuild
+++ /dev/null
@@ -1,267 +0,0 @@
-# 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.95-r3.ebuild,v 1.2 2012/11/28 10:55:33 ssuominen 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? ( virtual/udev )"
-
-# /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? ( virtual/udev[static-libs] )"
-
-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
-	epatch "${FILESDIR}"/${PN}-2.02.95-lvmpath.patch
-
-	# Upstream patch for http://bugs.gentoo.org/424810
-	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
-
-	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 "${EPREFIX}/lib/udev/rules.d/") \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}" || die
-}
-
-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"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.95.ebuild b/sys-fs/lvm2/lvm2-2.02.95.ebuild
deleted file mode 100644
index 30118750e9d4..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.95.ebuild
+++ /dev/null
@@ -1,261 +0,0 @@
-# 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.95.ebuild,v 1.5 2012/11/28 10:55:33 ssuominen 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 ~x86-linux"
-
-IUSE="readline static static-libs clvm cman +lvm1 selinux +udev"
-
-DEPEND_COMMON="!!sys-fs/device-mapper
-	readline? ( sys-libs/readline )
-	clvm? ( =sys-cluster/libdlm-3*
-			cman? ( =sys-cluster/cman-3* ) )
-	udev? ( virtual/udev )"
-
-RDEPEND="${DEPEND_COMMON}
-	!<sys-apps/openrc-0.4
-	!!sys-fs/lvm-user
-	!!sys-fs/clvm
-	>=sys-apps/util-linux-2.16"
-
-# 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? ( virtual/udev[static-libs] )"
-
-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.
-	# 2. There are no longer any linking deps in /usr.
-	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
-
-	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
-		# For recent systems, there are no linkages against anything in /usr anyway.
-		# 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"
-	myconf="${myconf} --with-thin=internal"
-
-	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
-
-	myconf="${myconf}
-			--with-dmeventd-path=/sbin/dmeventd"
-	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)" \
-		$(use_enable udev udev_rules) \
-		$(use_enable udev udev_sync) \
-		$(use_with udev udevdir "${EPREFIX}/lib/udev/rules.d/") \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}" || die
-}
-
-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}
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/lvm2-start.sh-2.02.95 lvm-start.sh || die
-	newins "${FILESDIR}"/lvm2-stop.sh-2.02.67-r1 lvm-stop.sh || die
-	newinitd "${FILESDIR}"/lvm.rc-2.02.67-r1 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
-	insinto /$(get_libdir)/rcscripts/addons
-	doins "${FILESDIR}"/dm-start.sh
-
-	# Device mapper stuff
-	newinitd "${FILESDIR}"/device-mapper.rc-2.02.67-r1 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"
-}