Clean up old versions and FILESDIR for them. Fix install of VERSION_DM in 2.02.88.

Package-Manager: portage-2.2.0_alpha51/cvs/Linux x86_64
author: Robin H. Johnson <robbat2@gentoo.org> 2011-09-13 05:47:25 +0000
committer: Robin H. Johnson <robbat2@gentoo.org> 2011-09-13 05:47:25 +0000
commit: 540ac594242a1ebd52fbf51e85c4b2b994c73ac4 (patch)
tree: f5f82223ef78f2cb7c8d9955e2db1a25c3dfcaa9 /sys-fs/lvm2
parent: Die if we fail to remove setup.cfg. (diff)
download: historical-540ac594242a1ebd52fbf51e85c4b2b994c73ac4.tar.gz
historical-540ac594242a1ebd52fbf51e85c4b2b994c73ac4.tar.bz2
historical-540ac594242a1ebd52fbf51e85c4b2b994c73ac4.zip
60 files changed, 39 insertions, 8659 deletions
diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index cbcd40143cc8..86a2585d3ff0 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,40 @@
 # ChangeLog for sys-fs/lvm2
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.248 2011/09/08 18:30:58 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.249 2011/09/13 05:47:23 robbat2 Exp $
+
+  13 Sep 2011; Robin H. Johnson <robbat2@gentoo.org>
+  -files/device-mapper.rc-1.02.22-r3, -files/64-device-mapper.rules-1.02.22-r5,
+  -files/64-device-mapper.rules-1.02.49-r2, -files/lvm.rc-2.02.28-r2,
+  -files/lvm2-start.sh-2.02.28-r2, -files/clvmd.rc-2.02.28-r3,
+  -files/lvm2-stop.sh-2.02.28-r5, -lvm2-2.02.33.ebuild,
+  -lvm2-2.02.33-r1.ebuild, -files/lvm.conf-2.02.33.patch, -lvm2-2.02.36.ebuild,
+  -files/lvm.conf-2.02.36.patch, -files/lvm2-stop.sh-2.02.37,
+  -lvm2-2.02.37.ebuild, -lvm2-2.02.39.ebuild, -lvm2-2.02.42.ebuild,
+  -lvm2-2.02.45.ebuild, -lvm2-2.02.45-r1.ebuild, -lvm2-2.02.45-r2.ebuild,
+  -files/lvm2-2.02.45-device-mapper-export-format.patch,
+  -files/lvm2-2.02.45-dmeventd.patch, -files/lvm.conf-2.02.45.patch,
+  -lvm2-2.02.48.ebuild, -lvm2-2.02.48-r1.ebuild, -lvm2-2.02.48-r2.ebuild,
+  -files/lvm2-2.02.48-as-needed.patch,
+  -files/lvm2-2.02.48-device-mapper-export-format.patch,
+  -files/lvm2-2.02.48-fix-pkgconfig.patch, -lvm2-2.02.49.ebuild,
+  -files/lvm2-start.sh-2.02.49-r1, -files/lvm2-stop.sh-2.02.49-r1,
+  -lvm2-2.02.49-r1.ebuild, -lvm2-2.02.49-r2.ebuild, -lvm2-2.02.49-r3.ebuild,
+  -files/lvm2-2.02.49-lockdir-override.patch, -lvm2-2.02.51.ebuild,
+  -lvm2-2.02.51-r1.ebuild, -lvm2-2.02.51-r2.ebuild, -lvm2-2.02.51-r3.ebuild,
+  -files/lvm2-2.02.51-as-needed.patch,
+  -files/lvm2-2.02.51-device-mapper-export-format.patch,
+  -files/lvm2-2.02.51-dmsetup-selinux-linking-fix.patch,
+  -files/lvm2-2.02.51-dmsetup-selinux-linking-fix-r3.patch,
+  -files/lvm2-2.02.51-fix-pvcreate.patch, -files/lvm.conf-2.02.51.patch,
+  -lvm2-2.02.56.ebuild, -lvm2-2.02.56-r1.ebuild, -lvm2-2.02.56-r2.ebuild,
+  -files/64-device-mapper.rules-2.02.56-r3, -lvm2-2.02.56-r3.ebuild,
+  -files/lvm2-2.02.56-always-make-static-libdm.patch,
+  -files/lvm2-2.02.56-device-mapper-export-format.patch,
+  -files/lvm2-2.02.56-dmeventd.patch, -files/lvm.conf-2.02.56.patch,
+  -lvm2-2.02.63-r1.ebuild, -lvm2-2.02.63-r2.ebuild, -lvm2-2.02.64.ebuild,
+  lvm2-2.02.88.ebuild:
+  Clean up old versions and FILESDIR for them. Fix install of VERSION_DM in
+  2.02.88.
 
   08 Sep 2011; Robin H. Johnson <robbat2@gentoo.org> lvm2-2.02.88.ebuild:
   Fix spelling and grammar (bug #382157).
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 42ff83f4e12d..d960044fb089 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -1,42 +1,17 @@
 AUX 1.02.22-dmeventd.initd 536 RMD160 2f65a288b735035e6b2451c71ab432a525b19b3a SHA1 5413ad7eaf63a5e7c52f1b21138422f9e4fd6186 SHA256 c9dcee15ce55961e5df7928c350ae1c6db6e78c30d87f7fafa6ba4b016dd9191
-AUX 64-device-mapper.rules-1.02.22-r5 1010 RMD160 3dbb70b60b0c86a77fb9d0e8a0a9cd16a7dd03cc SHA1 fec62b9d4357fe4160e3d017c103767b6c9bf232 SHA256 7c92c2ff3c8dee6588ac51f8367a7b4bcb31d42f2d306ed08ce01be809b9ffcd
-AUX 64-device-mapper.rules-1.02.49-r2 1104 RMD160 61acc7a3f39313df82a82fd4062e8eb10ee384cf SHA1 c6c6fa203982fcfaf11b4c9e4e79c5dd19dda6c3 SHA256 8fb11cac5757f16f67a62e3ee6ec7d986ee77fa020da7589142ac7efd6d24ac2
-AUX 64-device-mapper.rules-2.02.56-r3 1100 RMD160 0c43bc0b970cf755cd40c60c0d3c039fa7c13e4f SHA1 efe4ef6b8e9696c6999db4920fc03d692fa8ecaf SHA256 47b8b713ca809dcd73255c445ce5ef5ec6ba028f7ea685be3a7ba0c36bf38f1c
 AUX clvmd.confd-2.02.39 213 RMD160 d23f8acd6a844e05a3e0da83939513ef0dfab0d8 SHA1 546bfd48a7cfd7e7ffff07861f90e2b8ee29d436 SHA256 68442d5c9da81bad79fa6b1beaede290f24ea6a4e4415f3d9f4e37ccca6c524a
-AUX clvmd.rc-2.02.28-r3 3367 RMD160 eb09f9ef6d9402c9a22ab145ebb64db5f279adc7 SHA1 f15770f0919402f2fbbc7d8441ef3239e6178d0b SHA256 14c1c738b26869877a2bc74f0f8dd0ae4a764976823443db6f5575556285b519
 AUX clvmd.rc-2.02.39 3682 RMD160 891e8f770a5566fc9102cc02db8ff81174791aca SHA1 411670cedc62709e00ff2c0b5d883433f02ef9df SHA256 d60d88202589899e0856ac819cef1599103b7d5dc412afe5e0e38fc224aa79a8
 AUX device-mapper.conf-1.02.22-r3 15 RMD160 1954cbfeea6eeed764a6344039d9c1eb58f7b00a SHA1 0dd47dfb811946a11fbde987e2ce1e105ed7fafb SHA256 57777904f12a35617e5a4193c964ebb32396452487fd02353e71e16e7b46bc22
-AUX device-mapper.rc-1.02.22-r3 618 RMD160 c6d4c405ce381cc4c86c8e838ba25ddb64f4ac75 SHA1 92486f5a6f77b220e3d11589f12c458eaeeda0b1 SHA256 c682cfa6da469eed055bf6e6a88e2d48ecfa12be406cd857965ef08bb1ecdaf8
 AUX device-mapper.rc-1.02.51-r2 701 RMD160 cebd843b44b7d03acc113fbaa0af30f21d0f5de6 SHA1 f563adc35777030ec50b29005a9285a90e86a904 SHA256 dfdff0739dad521087ffa20f06e274bbc666e0ab85779621c360c04728e3cf58
 AUX device-mapper.rc-2.02.67-r1 841 RMD160 a6bb66fd8d2f30e168658c557efd99b4a277abe7 SHA1 3447311f2ee9cb104fc9db11f29264c9f4a48c22 SHA256 18be4a227c786a8cdbbb0fb0f6da295db55359b91884b4d4e0e9976b80aa4003
 AUX dm-start.sh 2114 RMD160 96a6b824e22d5c04f2710f98cda5361bde6a265c SHA1 b18c79802ab8bac9befe4a32cce6fe13beb3134c SHA256 c064c3e2a1d128a6326b539a675f1a6cf88b75f5526222e232d53ea1468a9bcf
 AUX dmeventd.initd-2.02.67-r1 683 RMD160 23e3787c3bd9d99a1d73d4688c91ec1198f4a7e6 SHA1 b00215e6297d69330df834e291b809c847396c28 SHA256 84e157b1b99b9fddfc97ab95bc6d37bfa4378578458744447e9478ebe6fc821b
 AUX dmtab 416 RMD160 d5da257f9ac48af9e831dbd6591e608577d87717 SHA1 f37631cb644b8a242a0426375b1b6acee0bde399 SHA256 e2e22bbe13fb97ec9a68659daa275b1d22fd0a3fd21e76b1f4bfba504a8bd7b5
 AUX lvm-monitoring.initd-2.02.67-r2 1181 RMD160 36306803e5c21ad3db6fda4fdd875375fed6bbcd SHA1 10580fb2470fa08eefb30044d25440a7b401c74b SHA256 83291ac20f7d7de07a6fd4452ce46e4bd75dc55c826c4305049d33a7b34a30da
-AUX lvm.conf-2.02.33.patch 3136 RMD160 c0292c39db064f0a4151ffccdc441be2fa78f8cf SHA1 8dbcbf66a841cc8acd889e174095df9932813a3e SHA256 63a8c21186f47979cb628970dca12df2a9f319745488a4d8a1e01f238a7fc711
-AUX lvm.conf-2.02.36.patch 3118 RMD160 b19039d550cd81d46f77d493cb6c5507a3fd66ee SHA1 dd4f4892c4b423348a764c1373ed81959ca0772b SHA256 85abba15c2dc52af9d518140e210abba852df83deb7740a19be3987a64f677f9
-AUX lvm.conf-2.02.45.patch 2657 RMD160 9f74ca92257162c978a690209878691fe13456b5 SHA1 9beccaa7933b9e53651b155bf6262229306e010f SHA256 f45a4ea427c38ca001ffd83eb73008b486d87ad8bf409d1e102a1eac386148d1
-AUX lvm.conf-2.02.51.patch 2690 RMD160 1aa597d10ee928d4c209fe5beb01dd1ab4b99b35 SHA1 697407509b408d91af2dc3f98a9d9dcc82abe81d SHA256 c163e64d1b0914154b72730f67b1face04802e6e89534766eb79d72a34ef5e67
-AUX lvm.conf-2.02.56.patch 1697 RMD160 159030156098e4aa5bc141a5a04f9ba60f5b430c SHA1 d37ee83b1c74043d413b99d52bf3c652cebc2eb3 SHA256 76dd9c5932b4c8c0d51eeb357e91c5e2af87dd180e3ca76940e3a7ad4de5f2e6
 AUX lvm.conf-2.02.67.patch 1676 RMD160 9bd0d32e205853b38493380373a7ba29d5b085ad SHA1 9f20cc6fb3038c8652f831b4d01e32b8f18336ba SHA256 0d36c4de0503739d822b3103a62dc0110febc3c56cd25d04443b30f54da6d0cb
 AUX lvm.confd-2.02.28-r2 173 RMD160 cf554372fa11df056e3757e5139fad6c7606a696 SHA1 e8186ebb91d12247d0865285dc62346d1cbc207a SHA256 28370c089c39c248d7ded0960b8d8a9256bada44d44c22ce3cec87d512ef6844
-AUX lvm.rc-2.02.28-r2 661 RMD160 3b267ab500785de249101548a15792708d3adc55 SHA1 b014a0d4344c58c963db20cefeb726dfd66d1b1a SHA256 962d9e8baa06a617671701d21f8a2849b45ab9baa6684b2e99b2b03192c9e66a
 AUX lvm.rc-2.02.51-r2 792 RMD160 9a5bb96606d20a420b7ff94e6de2b140d0a5022d SHA1 302111a801f1301f387db52180ec2f876d08898f SHA256 b883e8ae1d3b9d8a0bdf85b009125e9408ee6d22a159b2e4c340fce455d5fd9f
 AUX lvm.rc-2.02.67-r1 918 RMD160 f2918f4a25746f8ee2ee220cc2819e13c0093662 SHA1 9e6b995c2b8de569db01f09a070dc466fe0248d9 SHA256 63e8e9cbfbed5124d31b365f0e8108822847ceb381143c9529d9bf5439f2a99a
-AUX lvm2-2.02.45-device-mapper-export-format.patch 10323 RMD160 d36a0d80add1ea812cc7f4828aa4a71b0accff78 SHA1 29e5b230ce7562dee59cd61068a8faa6684518fe SHA256 563103fc0fa4c2a35a9adf94332f0502f36fd85e408916b7be7e3503121cc1d0
-AUX lvm2-2.02.45-dmeventd.patch 457 RMD160 280708918c33db4614d825e6c9f1909aa3f52a62 SHA1 3c3e17919d369457947944d428508a94049d3787 SHA256 1b275c4321c20227af6a758f962dfd2f14d2f25a65f9b74e9d43f93d3a6bf37e
-AUX lvm2-2.02.48-as-needed.patch 7894 RMD160 d44bc76d5f83249af6401c81d7a21082022446c8 SHA1 07b850f41425cd1505259d54de3daf9cdb3cf259 SHA256 8e23f75f9e51f1c94bcba4a4a87534146baa6e992f38f86552e8688091cfbc09
-AUX lvm2-2.02.48-device-mapper-export-format.patch 11244 RMD160 1ba7988ef2782b4565d66fb6e9800bc698042c22 SHA1 82548e5b97c3239f121ec5e542303f1acb269eac SHA256 3a0e1d6d4fa43bd4549c75b562f636c78e39fbba1aa8b127ca179e223a60c50e
-AUX lvm2-2.02.48-fix-pkgconfig.patch 1397 RMD160 1b877f041eebcf9af9a4ba15c0d823056c629dec SHA1 18a9ae390e0363a67463fb8b72dca0a100d5ca33 SHA256 ea505d8f3b0031336c8d5059ceaab62dae434b5ab663aa45c07532df4df7ef6f
-AUX lvm2-2.02.49-lockdir-override.patch 16498 RMD160 b1596accbd838f43960c5f8b667b30ccf4bacfcb SHA1 cbd3ef9d4e892d776ed51eda1b8d275caaa53d8d SHA256 0ce59c669f1886f49861ea771d40b34650c257c7f8e9f9cf370075ed4e447cf7
-AUX lvm2-2.02.51-as-needed.patch 7750 RMD160 a40917f69f20359bc3ddb7cce1d28851a9bdd152 SHA1 506ddb18fd44d225936c2ab1b642b7162e26f09b SHA256 872495767e184baf412de65b61b8603cfcee2c5728eeca431bd6d53569cdc18f
-AUX lvm2-2.02.51-device-mapper-export-format.patch 11318 RMD160 f194ef2dd9105ba32abef39f36eefe5f01353288 SHA1 a89e39f1bd104ba13d666aff6b13b7cd5f6b388a SHA256 1a2014a6bd259d1fdbd7dd16d3d2c7f7549f6d063b78394816c738ff1611b01e
-AUX lvm2-2.02.51-dmsetup-selinux-linking-fix-r3.patch 809 RMD160 4d8f2486426f0feba9cf44f55e7beb9eb6fbed7a SHA1 f9526d90f386ed4d0476b315dd9690d5d87c1f5d SHA256 8668fe3acf35390a06bc0aaf83b874f6e763b2c56edf0a2dcdea789031ede595
-AUX lvm2-2.02.51-dmsetup-selinux-linking-fix.patch 651 RMD160 34198b5959435ff37e6e0971737ee3e07a8b73b5 SHA1 ef46356219a4cc5d650846a45402b2dbf67d80a7 SHA256 5644b786cda599da2b3522d95d476ab105cee37e9418e43fbeb6dc029b300e9b
-AUX lvm2-2.02.51-fix-pvcreate.patch 3140 RMD160 c707cc280a893350a90c1258b0d73c154283738c SHA1 34c16b3a930ae2ab66ca3ea5b47ce19317de51d7 SHA256 7564a9ac374f53e3991f76967f1462709afa9661de4d2c6ff232f71d3d7b446f
-AUX lvm2-2.02.56-always-make-static-libdm.patch 1418 RMD160 f5102745ad3ee4613a212933552d78798c636dcb SHA1 8679926abe2f8c9731d66d714e824a7c4f04fe67 SHA256 b0b77c9046f46e764c1354e850dd735015c9779bb7efdc3005fbae5ea5b6e550
-AUX lvm2-2.02.56-device-mapper-export-format.patch 10774 RMD160 0e7c4d0b955e73663941f707315f18cfdccdb343 SHA1 e5247915cb3a6c49b3a5b04cb16e3c97531e51b2 SHA256 dd3cd1417bd8eef8da65d993c0178861265c14a166edde4f83c4ea18e7fa71c9
-AUX lvm2-2.02.56-dmeventd.patch 539 RMD160 8fbdf28707ae18ac8e2f45aabfbf10b8b89aa76b SHA1 6e61c3aa6be93b9cc90504e70959d02d0a165fdd SHA256 c70b96d7c3d9fbd78d00c8711a4243d1a874745dcb175b63620015301ee99c10
 AUX lvm2-2.02.56-lvm2create_initrd.patch 2032 RMD160 5e9ff47cb85829c41d9876048ee4be4e26554973 SHA1 bd83079490b19efca6846435b92b891aa1ff764a SHA256 b892d0544e05350e78ea400c16e6fd3657671d9bdf50bfae70505fd79bdda081
 AUX lvm2-2.02.63-always-make-static-libdm.patch 1420 RMD160 16079ddc546aa6dc6a21bdb3e7f81df7342b93f8 SHA1 3cd5011ec1177aee12d7d2d0768a5874bdf021ad SHA256 1c498b5efce77ed16bbbfcd9e0ec6da404a9c70c7ad0959ed7b60733adfcfc21
 AUX lvm2-2.02.64-dmeventd-libs.patch 618 RMD160 c030db2d971e0287fa9c65ab9bede9198501369d SHA1 76a3905e45609cc699221d6c32be8edbbcd2efec SHA256 1b8c281212b3c7edf456b38679c2c7ed838dd55789125c11cde691c2ccf62ace
@@ -48,29 +23,12 @@ AUX lvm2-2.02.73-asneeded.patch 640 RMD160 c3ac9b14d7bf6492461e4adb35dfb590000a2
 AUX lvm2-2.02.73-locale-muck.patch 605 RMD160 1f13c9e1c2d5ca4f7c47787089c488e2c7c170c5 SHA1 fa5ca4dabc530c4708655d753fbf28aef9a1eb3f SHA256 7e888d9c5dc9944c933ffd03755310bda48b5abcd686ec9c45fe852caa06d88f
 AUX lvm2-2.02.84-udev-pkgconfig.patch 1027 RMD160 9209452199af318ea05533e2513df3f5f8d67e6b SHA1 6bc062abe1a770c7c28c8cd44958a9a2c0e540da SHA256 62af214b1926b31205988dbed7ae7e7f2db825648e73eaed708042a9741edb95
 AUX lvm2-start.sh 1025 RMD160 fa27385e4640d59c33f2ca42db9d38f80def3977 SHA1 83a86ff292192b3f62e4686b70bbbfcc39158b53 SHA256 8c7da13b6326a383888110b25f53a4902cbec7d0dace274b9c5f1d6b0a775039
-AUX lvm2-start.sh-2.02.28-r2 1180 RMD160 3ec85899a19c56d4d49e4654e1b05f53bc7d9c93 SHA1 80fce53cc1925990fbb103e57314b3c1740de6ed SHA256 a891855ed04d4c59f17fc0b19dc61813a4ca3cc183166867606d92cb58498460
-AUX lvm2-start.sh-2.02.49-r1 1200 RMD160 b88e37e7e228fecdedf359c1132723077a3d4c94 SHA1 85eb83a83c598b3ea405ec4c597a9c77364e7fb4 SHA256 94d15b5dbeabb275b4d91b284b3113cd812b7e7c90ec3018693803b3e91d9535
 AUX lvm2-start.sh-2.02.49-r3 1244 RMD160 26916bf97b553ee19ebb5bacf2ee754cc5695ea7 SHA1 c5d9fa10089efd28e0dc0fb101ed90f0e6124f0a SHA256 e9c72d8500294301131183b37a7060dbcbd1d01b2a3e8425cf644e07652fae87
 AUX lvm2-start.sh-2.02.67-r1 1255 RMD160 da52e34dfbde91f179acaa9fcdbc7ffe4e9ea5d8 SHA1 47671b4f08ba5a72d06a2fa1bf048616af4e0dd5 SHA256 0351d2fa86fcf5b3b93611d9932dbc6d3fb2bb16210c321334895c51c67f8e91
 AUX lvm2-stop.sh 1939 RMD160 52d1adbf4bdbe6e75e9ff2e91c809b6eed5839d5 SHA1 8ccf316b02fb5f79bb6c0464cc3c1606704cec7b SHA256 94a34e0b149ac43f5f1042c45ebdbaa69ac83bcbea7f894c15ab59aad65cb22c
-AUX lvm2-stop.sh-2.02.28-r5 2055 RMD160 54ad47b7e48b651f1909df5e5b68440ebeb6d9f2 SHA1 07a85433d5a5d7295e781a8261f9265d050fe963 SHA256 3dd704eef9f7bd0cd97fc0afdb384c1d6e6163144c6c79b00f2dd8d27877f574
-AUX lvm2-stop.sh-2.02.37 2060 RMD160 1cd419f466c58382c852257878ab6bbbdd0061f9 SHA1 b487acbf219171afee029562f3b71188ca876dfc SHA256 e295acf3b53e00d6e868607ac422bbb196843165885a8f37323bfff4d147fa42
-AUX lvm2-stop.sh-2.02.49-r1 2169 RMD160 81048d1db521e8660bbbddbf43d72f572fb8cb7f SHA1 0684c7bb7b6f26eda9cf79b01869e380c0b66ae6 SHA256 6d60daab486896cbf6f52b4f792717bcc8418d3fd9b3335e4cb2e28a888c02d6
 AUX lvm2-stop.sh-2.02.49-r3 2253 RMD160 7b00d83fb35125f73349c49af765c1e7409de35a SHA1 e4f61120506e11f4a063ccf10bab2e495194d379 SHA256 dea23f37d232437b15c743ca23af3d7baa95f2b7c71ac1e47ae5289bdcfe0a56
 AUX lvm2-stop.sh-2.02.67-r1 964 RMD160 813e2dbf967c5114ca3eba441815216efd2ebe1e SHA1 ea5568cb54cd1efc0b724830e0d8538cf3c5cfed SHA256 5a208c7ab780404e476afdff349deedad5c57b3feb7e22a07a7075d09c1370e7
 DIST LVM2.2.01.13.tgz 463900 RMD160 5bbee0800fe4b04c3452445a5851c0d1960fb521 SHA1 34b18451aec6914da7e58f2d098a92216bb306f2 SHA256 f98495cbf43128a67bf20fe21e74ef9aa8fb872de80c980f1f506b45b922df50
-DIST LVM2.2.02.33.tgz 558820 RMD160 903d72844c4b309f26f9e58c4245b4f7377e23c7 SHA1 eb96a9f0cd90bdb61a8d5d5d44bd0b066420b70a SHA256 f8af333573e37b73ecc17eb0422e2ae9918e1e4f87a72f8e4054663e7d05e4b8
-DIST LVM2.2.02.36.tgz 568884 RMD160 dae1925160373c9f8e3c58954b394015c654c667 SHA1 29ddaf10a49868fb8d85afd21c8e7f6943846eae SHA256 359000abf276c65a4cab0ac682be3d0891130b75733a09543e340bce22486df7
-DIST LVM2.2.02.37.tgz 571462 RMD160 5fd5247f7fb977eb13b1db0caa6c570fecaacd83 SHA1 d24beacf4b9b60ae47aec253e3c48aead87dac5b SHA256 1f4a6c9de07442e8311b8a230fed55d273b62222164978ef104956bb50c1eb20
-DIST LVM2.2.02.39.tgz 578005 RMD160 8a6c0ce5d13e7e215a346bcfa3f2427803ab0a9d SHA1 0bc8a2c351f0ca0123e592bc3e808e39b0d03bbb SHA256 d07bbdda39307bd01e9a41eb50e265c72baed026abb6d4a4c452ba24e9f1cea2
-DIST LVM2.2.02.42.tgz 590809 RMD160 4ea3ceb6dc3abb299ec786ce262749b69ce62736 SHA1 354b360f210e5be7ba2b5ba0c822e785c12d2ea6 SHA256 a4eeaf59c08e22d813dbabe8f62b10385e3e3dfe6f1fa5aede326bb008ddd248
-DIST LVM2.2.02.45.tgz 740347 RMD160 18af03dac08d6bb96bba1614365a772e5b550fbc SHA1 d2b167198e7a4efea743fefaa84c3a43715341eb SHA256 2ad7490f5747ea8547ddfbf89256549fcdcffb990df2f3cbdea84d985887ecb8
-DIST LVM2.2.02.48.tgz 762435 RMD160 2ae5061c408db553f8b8af954552916c3d768130 SHA1 8a6f29f08f731caffa09f52e5ca41bcce80ff3b9 SHA256 32e0365ada6e18e16bfc2e6e1e5fb019f8c36de7476d87c4bf6613ee9cf024ad
-DIST LVM2.2.02.49.tgz 766327 RMD160 e5ef6d165e37c3d2534c612bbfd861f114e6e6aa SHA1 178eecfaeaef2dea67c76c0878be1e69b3a6ea37 SHA256 718f082f51bdd6474bb61a743acef269f2c77b8e2d19e7ddc463f2dd91fb9dd7
-DIST LVM2.2.02.51.tgz 790458 RMD160 7ca55e29c6d780b4b052b07eeabbd731a034721f SHA1 307281dfced6b5ab5904761a41c6a6775a511172 SHA256 7d88ebb1e74e46617f226c1ca987e337aa30c3f637c7a502e8f355096f36a4df
-DIST LVM2.2.02.56.tgz 822318 RMD160 b9bb04df127fe58d2b483035b2c17e2b049695d3 SHA1 1a70cb4d4fe7566aace9d38ee18413c79e91b684 SHA256 9c96ef2cb4a9606cb6a4af795cbb5503b04d676179b0c70a9883593992622f43
-DIST LVM2.2.02.63.tgz 862513 RMD160 49f005520ec92013d8dcb246e82236429aa09869 SHA1 0333d51b33a73cd2f38854557e72577a0523b7c2 SHA256 e41a163ba97de66e0825188311b1f0b4b181943a16e0a04971653baf99ad3036
-DIST LVM2.2.02.64.tgz 870110 RMD160 998e67cd4766cf743468c664e8a8bed969425613 SHA1 033a317f1ca8baa3b30e10cf4095f0491a10db7f SHA256 a01255feeaee33cb4690705bb12652455823a6a854d1a9323446009a147a1e8c
 DIST LVM2.2.02.67.tgz 893643 RMD160 ccaedf2bf7c56901b9ff15b204620934e626dd34 SHA1 511605f31e637cb34f4c73403ae079aa0f65daaa SHA256 6cf217d26eddec1a33cdb06958f0ae1a191e7bd9d42f63646a1c93ceeb47c702
 DIST LVM2.2.02.70.tgz 909516 RMD160 0f1911a46283898164299a7dd2d5264eb1eb5b16 SHA1 6f88114e72204feee491befd5f0e203036b90f11 SHA256 61a2bafce16d58200ca066cbfe4f8650cfae547369d1c722c3a3680a1f2284e7
 DIST LVM2.2.02.72.tgz 931612 RMD160 1f537b305f51838a157fdedbdbffb95e566ff4ca SHA1 a594980f7a6dad8f26572fd1fcd9341184837094 SHA256 112e8a1bccc21c6d4d3095f2b26c38535cb2c88fe0087fbbce9b521e587d80b9
@@ -81,33 +39,6 @@ DIST LVM2.2.02.84.tgz 980421 RMD160 82fba27c00dcffe293288b644cf8a4a2d6680c92 SHA
 DIST LVM2.2.02.85.tgz 1000194 RMD160 720db32d0b1c3d3803075b543f3ffd09aef54ff1 SHA1 43ba2a3be84b2e897ae6b47b0b0be7e212216be7 SHA256 e5c2b0d76e7b1df7630e211734eb09697d66ab879b17eb19545cb77272813eb7
 DIST LVM2.2.02.88.tgz 1029151 RMD160 a5918c6dfef8300b8ad9ab53e913ab487a051436 SHA1 05a4fb09cb5e3d680ad1b268c941968853fb1979 SHA256 a129d1d3949524da7d6d2a67218254baea02df06a6744faa5808a4182b2fb432
 EBUILD lvm2-2.01.13.ebuild 1470 RMD160 125ecf8a32609d67876e16afa155aa256bdc22ee SHA1 95c96a2158c40bc325da6eeaded050e9e426a0e5 SHA256 b3ee4c923da035604cdf69673c12824c7b74a1716550496ce38d9281d39fa6ef
-EBUILD lvm2-2.02.33-r1.ebuild 4571 RMD160 88ca4fa1c0ce0cc8618785bda4e36a9781294838 SHA1 6cd2a106efd2397e1e500455c71d7ec2a27fdf79 SHA256 235e5590b154d17fc8f3839936ed8ee3ceb43df182c506f1a73082eb842a04f7
-EBUILD lvm2-2.02.33.ebuild 4542 RMD160 b803cbf71bf828503a5d82cb5f4c6294e99fab71 SHA1 4fd433145e8582c9ff7b5682e996e55661397628 SHA256 22ebc15aace1cfce6259aa20162114a9639215763d39ef2b5d3ba657c9bea2d1
-EBUILD lvm2-2.02.36.ebuild 4588 RMD160 a77feb26b02869ab7cce129ea7be54cbc80f9f02 SHA1 34481c407fff0cfeff12a030652ca863d2ddc3f0 SHA256 c62f02e66b8ef8d78412d8ddd7270ba6256cfa644d7ea2eacc02a6f0a69220fd
-EBUILD lvm2-2.02.37.ebuild 4715 RMD160 2e61f2268a891f730a0b7f3eb299af31f7d9edda SHA1 5600a54234f0781e3de5fda32191cf2546bda298 SHA256 8289f75bdd4ef9bb5b281caa5e1ec32875cf3b34d7a5004ecd0148d4732ba309
-EBUILD lvm2-2.02.39.ebuild 4778 RMD160 2b31633e30195d4a5ae465d3987626870559f877 SHA1 4eb6413436f43255298b66d966e16c387c7f43fe SHA256 237061012d318a20ba4c8e8a4889dba1002abb250c92f48a38b4d39247d0bcdd
-EBUILD lvm2-2.02.42.ebuild 4777 RMD160 38839db85a9bc3173dc4b8d04a455a1c9e408f75 SHA1 6074b4fe3f8b5ca1f0372c7e390d9497344f7825 SHA256 de85b5bb129f0a60c32097017f63aaabdc3c989e86b6fcd5a117520e9fcd890b
-EBUILD lvm2-2.02.45-r1.ebuild 5787 RMD160 b9e055e94987f67aa051b4a3c934d6c418e4d147 SHA1 e8d0fab566fdb8c9a22d440f9cf20171d616b15a SHA256 4d87afed7439c0c3b1933ec60afdb4ad6125690bbdbfdaed5c36338e149e3204
-EBUILD lvm2-2.02.45-r2.ebuild 5928 RMD160 73e8ee16b2b276c09afac7c026c128ff51250c19 SHA1 4147b76b94b6ca1f481771174c182a55814d8cdc SHA256 44b3fe1c4e48ae9d75bfee863ca028d7942b4e6a391aa834e436e35bdad1fb49
-EBUILD lvm2-2.02.45.ebuild 5821 RMD160 ffece21bd862289160e99772702a50d6e4ac3809 SHA1 decd0fd187098a2f5870a1778a910a5b9f9c68df SHA256 50b7004b206a5bfadd05d75dad3bd8f28033c388af436bf0092bd59eff0270dd
-EBUILD lvm2-2.02.48-r1.ebuild 6254 RMD160 d7f3b267e3e1e5bda958df493fcfa8afeffd6a9b SHA1 0775085aa586dc43084d9e64d882cb5a5a8ea47c SHA256 858d01cc5903db2b7b237bc7bcb01c384300a4b41ec510057e9b040f5bf1638b
-EBUILD lvm2-2.02.48-r2.ebuild 6387 RMD160 7eceb956dca9de3e2fc2e69b344741f736c65d85 SHA1 47e763dfa86d14c2347bef7cd6bf4f80cae102c0 SHA256 5e7f040dbd602d75a7f3d70f036f8b545f8eebbb7506f906b7dec59e32b8d59b
-EBUILD lvm2-2.02.48.ebuild 6099 RMD160 021173f8e1284a2ec6ed53fcfed1b884e323a976 SHA1 60a385f704bbe63a6020338f1b5321ccdddfabd1 SHA256 4721af1b9a8194b7b537f4c7d2cc95e3129a6f6215c1673ccd9fad7bc20f39d0
-EBUILD lvm2-2.02.49-r1.ebuild 6449 RMD160 7e08391d71f01d3eca6f829321af7ca6e81bc6a0 SHA1 a31565f2d53e4eeaf7b127a8f0c56729417f8810 SHA256 395fb63e6ff9dd4242e1fd58716723b9eb8344c94c2bb7fb0f9689bac2b832d2
-EBUILD lvm2-2.02.49-r2.ebuild 6477 RMD160 75a343160cd733f8b5a1011c7177dfaeb7117033 SHA1 c2e58f422708f396dee48c11c351f418f93cb3d7 SHA256 7824bf1b9135e4202684d0a7490da7d2330ba9adf10dbf0006541bd3cc1012c8
-EBUILD lvm2-2.02.49-r3.ebuild 6418 RMD160 c688ccc13f27f26926841b87f851053e6c7005bf SHA1 ef26d9b60f9f214742c2bb272ddad75eb72023f2 SHA256 2799e2e1635ca31045d543074a17977ff8cbebd48031eae918ab8f544f9eff65
-EBUILD lvm2-2.02.49.ebuild 6384 RMD160 601a2e098e451ca0a6c421edf918469333c332ef SHA1 e012abd2f1a99ba5f31e8e9b42d298d4d6468532 SHA256 913d5b050055be8a68bff8746f91f7347ec0725fcc45d158b40fbd67922294df
-EBUILD lvm2-2.02.51-r1.ebuild 6653 RMD160 09dffe53ff6c49ae0f67c6d86fbaaaab7e58ae6e SHA1 5564a7b653347d5dbadeda4cd04982814f8bcde7 SHA256 d6e36c243c7d8c015252b875d800a13d420e784e78765dde5168c4dc27268f7f
-EBUILD lvm2-2.02.51-r2.ebuild 6780 RMD160 d61bc8dbcb1fc313f60c8fe6a91bd4c24ac8f926 SHA1 40c97a66b60c914f989ba9aee24e09ae08c87f12 SHA256 62cc29e582bec0c592e6743e43c76baeecef237de32d6b6ad1b72ea54e0030ee
-EBUILD lvm2-2.02.51-r3.ebuild 6437 RMD160 be7c7d76a225b9787a6fc6c2c3b1680e3ebc7733 SHA1 269b6f0439f48c63bba1ee93223e6ec3d204a196 SHA256 ed0a1932304d2c8380e5cd8c4bcb0b646fdf47cffe1f9947149d8e8db23418c6
-EBUILD lvm2-2.02.51.ebuild 6430 RMD160 47a02246d6283370afa6c7d5784d93004b3966da SHA1 c727c6f8732326ef888c2cde3284c9a65bf67d4b SHA256 11bc3b60cfb4b1365b9ae2edc82ec3963f0723723377686b591040c7c070b580
-EBUILD lvm2-2.02.56-r1.ebuild 6548 RMD160 71f5fe397f089b409494c7c23a0b93290e9de85f SHA1 d656afe93c0ce1439a5617a5b3c4d24fb15057cd SHA256 ec6ae2d06ee5864a6d074eaca8facf28701dbbcbc496f57d6cd028ec17574eba
-EBUILD lvm2-2.02.56-r2.ebuild 6854 RMD160 09c9c0968be807c724e6f21072b89691d273d753 SHA1 7ddcd9e28773c8281a1c4c132a66eac25f77aaae SHA256 5b2aef828061f241faec9a30da6d0696f2c98a3b035143a61e9a11e6f80d8915
-EBUILD lvm2-2.02.56-r3.ebuild 6865 RMD160 fc466e9c149b01a19fbf0f1ca7b2faad5761820a SHA1 db9da91595f7a987e0cd589d2e99041a44b78fef SHA256 3952fe1eb150f159c7e4ed0ef69233f0026c39902ef4a5cc0ecbf2169b8d16b9
-EBUILD lvm2-2.02.56.ebuild 6519 RMD160 15073500bde596fe5c5705f16809e62053b69b2b SHA1 a79952f7b3070064153686008c8e2a0a5903ed89 SHA256 175849799e6df22fa18ad71206d545a944dfdd75b7597d7c334adc787a74d8b6
-EBUILD lvm2-2.02.63-r1.ebuild 7570 RMD160 14640b0ec48c6906085c14b58357d02864f6fab6 SHA1 6fe1f1158d35e2f37e4594bf2b52a6515fd40d14 SHA256 574ba667ebadee7ff5c694bf99181f5180e99191740965cac7bf9f7f7849d5c4
-EBUILD lvm2-2.02.63-r2.ebuild 7708 RMD160 5e0176e9d4cdceba012dab3c6f9a929a8363dc91 SHA1 0f097f2822fb8ce1fe8b60d6f5c8870ff89af1ef SHA256 0aea1f557449094375ad26e6215f5b26beeef444c54fbfb07183729c4a04a5fd
-EBUILD lvm2-2.02.64.ebuild 7926 RMD160 ad843ab85e71c5752096d60446c8db5061e6b681 SHA1 cbc495d15de2b1ffa333ed2dce01835f6a1147d1 SHA256 a4a2ba51fa1d46a423cb1ae8adf942c0b2c7ff7f12298b4dc89c11367744bf00
 EBUILD lvm2-2.02.67-r1.ebuild 8258 RMD160 7d74055508cbbbc0f520efd3f1439ecdbde1d3fb SHA1 c88ba5d5710d8a892b9adea3e628911c928826b4 SHA256 30f308896f9ec401b6a1f673837e2d9159d4f49c56795c1461af1b2daab0eb47
 EBUILD lvm2-2.02.67-r2.ebuild 8326 RMD160 a3a00d56f47f28938efbd16c77b44a509449c391 SHA1 b77471826447f673e7026d4a4db2de9db2b6f59b SHA256 4f5c660e507baa800950a5643df9f4e016657e8285ef8288096c2c11840c021b
 EBUILD lvm2-2.02.67.ebuild 8252 RMD160 9da463656087e984efe4adecdc6649ba05068d5f SHA1 bac7dbfc373755a7ff3e1ac99196e0088f2e3901 SHA256 3d6d8b185354003c610216cdfd0390b8b951387e9ab31b6c6a2b1dd37c857730
@@ -120,6 +51,6 @@ EBUILD lvm2-2.02.74.ebuild 8706 RMD160 495c5b9bc446eabfb6e485e9c010effc24358623
 EBUILD lvm2-2.02.83.ebuild 8726 RMD160 63e4b84622f240b67fe877957563de0e068c3647 SHA1 d8fefdc661cd86febfd9454f9e2087b1596665e5 SHA256 cc18cdd6d63e6ca445fc470a054e887740f3d91c2235e13a631bb38a52a108e2
 EBUILD lvm2-2.02.84.ebuild 8797 RMD160 524b85dedef94030590e4bc6a5b9b2e9f31a6633 SHA1 3e4edeccee6693ed15d4f80260d8d492c960c5fb SHA256 d973bd93ea11ae47fac023841668e0563c3a3921560a62d49a9d5f9cdf1d134e
 EBUILD lvm2-2.02.85.ebuild 8923 RMD160 eaa7f57b4731f5487476b3d38356e6dd2f1cc705 SHA1 8ec6247acd6c4cae6a78993902165df41494aaf0 SHA256 639c2b26ab8565604c9d25ed4c4d54d2406e1e6d136a4cf41082be6cc5cd5ca2
-EBUILD lvm2-2.02.88.ebuild 9129 RMD160 b5ecc70dc9a4e22d3b3fcc919743161256a173a5 SHA1 b57b5ea6febc248123042ff996779300c5d7b745 SHA256 2356743c1d8232d7dc7b6d9401ed6621141643e0445c9fe19929d1c60dec7679
-MISC ChangeLog 43799 RMD160 fd28c5b45cae6d2f0a7c418733806d3f46bfb59d SHA1 d8b804682104858957acfdc7e9a5c9e48fbcea55 SHA256 778de0fc6a8d93ca4705fad56595bc7fcb4ff30f58f09520cff3cf795c8ece69
+EBUILD lvm2-2.02.88.ebuild 8014 RMD160 71fcadd58ea2a8cbd2ddd6aac67df3360d9543eb SHA1 81ac610c6dfbd2c45aa3f11b8f000f635d7a4b93 SHA256 e9193ad5bd11bef84bbab51687e6a1f95bc0f82134d612768e76590c1f72fee2
+MISC ChangeLog 45849 RMD160 f07360f3e94c3c79477d8e6b8d5fcb2c780773ef SHA1 121258e1d4574b8554aaa95b1755c176955ed09c SHA256 185d6cbc8834e2cd2ae8ac08c517ddcdff0d2c2beed8ad3d7ffc75b000715b13
 MISC metadata.xml 792 RMD160 f60db9169ee273ca2f97fa5e69d4e5329e988164 SHA1 42f85f30477c65a164a11e172db7e250f442dca5 SHA256 87ced5a3a6102985f7c2a619dd52f65e62ae916f8921c8e7115a25452cd44b7f
diff --git a/sys-fs/lvm2/files/64-device-mapper.rules-1.02.22-r5 b/sys-fs/lvm2/files/64-device-mapper.rules-1.02.22-r5
deleted file mode 100644
index 36c085b56b97..000000000000
--- a/sys-fs/lvm2/files/64-device-mapper.rules-1.02.22-r5
+++ /dev/null
@@ -1,25 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-KERNEL=="device-mapper", SYMLINK+="mapper/control"
-
-KERNEL!="dm-*", GOTO="device_mapper_end"
-ACTION!="add|change", GOTO="device_mapper_end"
-
-IMPORT{program}="/sbin/dmsetup info --export -j%M -m%m"
-ENV{DM_NAME}!="?*", GOTO="device_mapper_end"
-NAME="mapper/$env{DM_NAME}", SYMLINK+="%k"
-
-SYMLINK+="disk/by-id/dm-name-$env{DM_NAME}"
-ENV{DM_UUID}=="?*", SYMLINK+="disk/by-id/dm-uuid-$env{DM_UUID}"
-
-ENV{DM_SUSPENDED}=="1", GOTO="device_mapper_end"
-ENV{DM_EXISTS}=="0", GOTO="device_mapper_end"
-ENV{DM_TARGET_TYPES}=="|*error*", GOTO="device_mapper_end"
-
-IMPORT{program}="vol_id --export $tempnode"
-OPTIONS="link_priority=-100"
-ENV{DM_TARGET_TYPES}=="*snapshot-origin*", OPTIONS="link_priority=-90"
-ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
-ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
-
-LABEL="device_mapper_end"
diff --git a/sys-fs/lvm2/files/64-device-mapper.rules-1.02.49-r2 b/sys-fs/lvm2/files/64-device-mapper.rules-1.02.49-r2
deleted file mode 100644
index b6b2c889aef1..000000000000
--- a/sys-fs/lvm2/files/64-device-mapper.rules-1.02.49-r2
+++ /dev/null
@@ -1,26 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-KERNEL=="device-mapper", SYMLINK+="mapper/control"
-
-KERNEL!="dm-*", GOTO="device_mapper_end"
-ACTION!="add|change", GOTO="device_mapper_end"
-
-IMPORT{program}="/sbin/dmsetup info --export -j%M -m%m"
-ENV{DM_NAME}!="?*", GOTO="device_mapper_end"
-NAME="mapper/$env{DM_NAME}", SYMLINK+="%k"
-
-SYMLINK+="disk/by-id/dm-name-$env{DM_NAME}", OPTIONS+="string_escape=replace"
-ENV{DM_UUID}=="?*", SYMLINK+="disk/by-id/dm-uuid-$env{DM_UUID}", OPTIONS+="string_escape=replace"
-
-ENV{DM_SUSPENDED}=="1", GOTO="device_mapper_end"
-ENV{DM_EXISTS}=="0", GOTO="device_mapper_end"
-ENV{DM_TARGET_TYPES}=="|*error*", GOTO="device_mapper_end"
-
-IMPORT{program}="/sbin/blkid -o udev -p $tempnode"
-OPTIONS+="link_priority=-100"
-OPTIONS+="watch"
-ENV{DM_TARGET_TYPES}=="*snapshot-origin*", OPTIONS+="link_priority=-90"
-ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
-ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
-
-LABEL="device_mapper_end"
diff --git a/sys-fs/lvm2/files/64-device-mapper.rules-2.02.56-r3 b/sys-fs/lvm2/files/64-device-mapper.rules-2.02.56-r3
deleted file mode 100644
index 7fdf3b1eb575..000000000000
--- a/sys-fs/lvm2/files/64-device-mapper.rules-2.02.56-r3
+++ /dev/null
@@ -1,26 +0,0 @@
-# do not edit this file, it will be overwritten on update
-
-KERNEL=="device-mapper", NAME="mapper/control"
-
-KERNEL!="dm-*", GOTO="device_mapper_end"
-ACTION!="add|change", GOTO="device_mapper_end"
-
-IMPORT{program}="/sbin/dmsetup info --export -j%M -m%m"
-ENV{DM_NAME}!="?*", GOTO="device_mapper_end"
-NAME="mapper/$env{DM_NAME}", SYMLINK+="%k"
-
-SYMLINK+="disk/by-id/dm-name-$env{DM_NAME}", OPTIONS+="string_escape=replace"
-ENV{DM_UUID}=="?*", SYMLINK+="disk/by-id/dm-uuid-$env{DM_UUID}", OPTIONS+="string_escape=replace"
-
-ENV{DM_SUSPENDED}=="1", GOTO="device_mapper_end"
-ENV{DM_EXISTS}=="0", GOTO="device_mapper_end"
-ENV{DM_TARGET_TYPES}=="|*error*", GOTO="device_mapper_end"
-
-IMPORT{program}="/sbin/blkid -o udev -p $tempnode"
-OPTIONS+="link_priority=-100"
-OPTIONS+="watch"
-ENV{DM_TARGET_TYPES}=="*snapshot-origin*", OPTIONS+="link_priority=-90"
-ENV{ID_FS_USAGE}=="filesystem|other|crypto", ENV{ID_FS_UUID_ENC}=="?*", SYMLINK+="disk/by-uuid/$env{ID_FS_UUID_ENC}"
-ENV{ID_FS_USAGE}=="filesystem|other", ENV{ID_FS_LABEL_ENC}=="?*", SYMLINK+="disk/by-label/$env{ID_FS_LABEL_ENC}"
-
-LABEL="device_mapper_end"
diff --git a/sys-fs/lvm2/files/clvmd.rc-2.02.28-r3 b/sys-fs/lvm2/files/clvmd.rc-2.02.28-r3
deleted file mode 100755
index 80cfdb1b12bf..000000000000
--- a/sys-fs/lvm2/files/clvmd.rc-2.02.28-r3
+++ /dev/null
@@ -1,126 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/clvmd.rc-2.02.28-r3,v 1.1 2007/11/16 08:05:01 robbat2 Exp $
-
-depend() {
-	use dns logger
-	use net
-	need cluster-manager cluster-locking-manager fenced
-}
-
-exefile=/sbin/clvmd
-
-umount_gfs_filesystems() {
-	local sig retry
-	local remaining="$(awk '$3 == "gfs" { print $2 }' /proc/mounts | sort -r)"
-
-	if [ -n "${remaining}" ]
-	then
-	        sig=
-	        retry=3
-	        while [ -n "${remaining}" -a "${retry}" -gt 0 ]
-	        do
-	                if [ "${retry}" -lt 3 ]
-			then
-	                        ebegin "Unmounting GFS filesystems (retry)"
-	                        umount ${remaining} &>/dev/null
-	                        eend $? "Failed to unmount GFS filesystems this retry"
-	                else
-	                        ebegin "Unmounting GFS filesystems"
-	                        umount ${remaining} &>/dev/null
-	                        eend $? "Failed to unmount GFS filesystems"
-	                fi
-	                remaining="$(awk '$3 == "gfs" { print $2 }' /proc/mounts | sort -r)"
-	                [ -z "${remaining}" ] && break
-	                /bin/fuser -k -m ${sig} ${remaining} &>/dev/null
-	                sleep 5
-	                retry=$((${retry} -1))
-	                sig=-9
-	        done
-	fi
-}
-
-
-
-start() {
-	if [ -e /proc/modules -a ! -e /dev/device-mapper ] ; then
-		ebegin "Loading device-mapper module"
-		modprobe -q dm-mod
-		eend $?
-	fi
-	if [ ! -e /dev/device-mapper ]; then
-		eerror "device-mapper not available!"
-		exit 1
-	fi
-
-	ebegin "Starting clvmd"
-	start-stop-daemon --start --quiet --exec ${exefile}
-	rc=$?
-	eend $rc
-
-	ebegin "Scanning LVM volumes"
-	/sbin/vgscan &>/dev/null
-	rc=$?
-	eend $rc
-	
-	if [ "$rc" -eq 0 ] && [ -x /sbin/vgchange ] && [ -d /etc/lvm ]
-	then
-		ebegin "Setting up the Logical Volume Manager"
-		/sbin/vgchange -aly >/dev/null
-		eend $? "Failed to setup the LVM"
-	fi
-	
-}
-
-stop() {
-	# umount GFS filesystems
-	umount_gfs_filesystems
-
-	# This sucks majorly. We need to find a way to only take out the CLUSTER
-	# VGs and LVs, and never the local ones.
-	einfo "Shutting down the Logical Volume Manager"
-
-	LOGICAL_VOLUMES=`lvdisplay |grep "LV Name"|awk '{print $3}'|sort|xargs echo`
-	VOLUME_GROUPS=`vgdisplay |grep "VG Name"|awk '{print $3}'|sort|xargs echo`
-	for x in ${LOGICAL_VOLUMES}
-	do
-		LV_IS_ACTIVE=`lvdisplay ${x}|grep "# open"|awk '{print $3}'`
-		if [ "${LV_IS_ACTIVE}" = 0 ]
-		then
-			ebegin "  Shutting Down logical volume: ${x} "
-			lvchange -an --ignorelockingfailure -P ${x} >/dev/null
-			eend $?
-		fi
-	done
-
-	for x in ${VOLUME_GROUPS}
-	do
-		VG_HAS_ACTIVE_LV=`vgdisplay ${x}|grep "Open LV"|awk '{print $3}'|xargs echo`
-		if [ "${VG_HAS_ACTIVE_LV}" = 0 ]
-		then
-			ebegin "  Shutting Down volume group: ${x} "
-			vgchange -an --ignorelockingfailure -P ${x} >/dev/null
-			eend
-		fi
-	done
-
-	for x in ${LOGICAL_VOLUMES}
-	do
-		LV_IS_ACTIVE=`lvdisplay ${x}|grep "# open"|awk '{print $3}'`
-		if [ "${LV_IS_ACTIVE}" = 1 ]
-		then
-			
-			ROOT_DEVICE=`mount|grep " / "|awk '{print $1}'`
-			if [ ! ${ROOT_DEVICE} = ${x} ]
-			then
-				ewarn "  Unable to shutdown: ${x} "
-			fi
-		fi
-	done
-	einfo "Finished Shutting down the Logical Volume Manager"	
-
-	ebegin "Stopping clvmd"
-	start-stop-daemon --stop --quiet --exec ${exefile}
-	eend $?
-}
diff --git a/sys-fs/lvm2/files/device-mapper.rc-1.02.22-r3 b/sys-fs/lvm2/files/device-mapper.rc-1.02.22-r3
deleted file mode 100644
index 226ee80e30a3..000000000000
--- a/sys-fs/lvm2/files/device-mapper.rc-1.02.22-r3
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/device-mapper.rc-1.02.22-r3,v 1.1 2009/04/09 23:00:10 caleb Exp $
-
-depend() {
-	# necessary for services when using baselayout-2
-	# but conflict for baselayout-1
-	if [ -e /etc/init.d/root ] ; then
-		after modules
-		before checkfs fsck
-	fi
-}
-
-start() {
-	if [ ! -e /etc/init.d/root ] ; then
-		eerror "The ${SVCNAME} init script is written for baselayout-2"
-		eerror "Please do not use it with baselayout-1"
-		return 1
-	fi
-
-	start_addon dm	
-}
-
diff --git a/sys-fs/lvm2/files/lvm.conf-2.02.33.patch b/sys-fs/lvm2/files/lvm.conf-2.02.33.patch
deleted file mode 100644
index dd80f8b0fbb8..000000000000
--- a/sys-fs/lvm2/files/lvm.conf-2.02.33.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -Nuar --exclude '*.rej' --exclude '*.orig' LVM2.2.02.33.orig/doc/example.conf LVM2.2.02.33/doc/example.conf
---- LVM2.2.02.33.orig/doc/example.conf	2008-01-09 07:32:19.000000000 -0800
-+++ LVM2.2.02.33/doc/example.conf	2008-02-06 17:39:20.439958042 -0800
-@@ -49,7 +49,9 @@
- 
- 
-     # By default we accept every block device:
--    filter = [ "a/.*/" ]
-+    # Gentoo: we exclude /dev/nbd by default, because it makes a lot of kernel
-+    # noise when you probed while not available.
-+    filter = [ "r|/dev/nbd.*|", "a/.*/" ]
- 
-     # Exclude the cdrom drive
-     # filter = [ "r|/dev/cdrom|" ]
-@@ -85,7 +87,7 @@
-     # If sysfs is mounted (2.6 kernels) restrict device scanning to 
-     # the block devices it believes are valid.
-     # 1 enables; 0 disables.
--    sysfs_scan = 1	
-+    sysfs_scan = 1
- 
-     # By default, LVM2 will ignore devices used as components of
-     # software RAID (md) devices by looking for md superblocks.
-@@ -218,12 +220,14 @@
-     # e.g. vgscan.lvm1 and they will stop working after you start using
-     # the new lvm2 on-disk metadata format.
-     # The default value is set when the tools are built.
--    # fallback_to_lvm1 = 0
-+    # Gentoo: the LVM tools are a seperate package.
-+    fallback_to_lvm1 = 0
- 
-     # The default metadata format that commands should use - "lvm1" or "lvm2".
-     # The command line override is -M1 or -M2.
-     # Defaults to "lvm1" if compiled in, else "lvm2".
--    # format = "lvm1"
-+    # Gentoo: default to LVM2 format
-+    format = "lvm2"
- 
-     # Location of proc filesystem
-     proc = "/proc"
-@@ -350,12 +354,12 @@
- 
- # Metadata settings
- #
--# metadata {
-+metadata {
-     # Default number of copies of metadata to hold on each PV.  0, 1 or 2.
-     # You might want to override it from the command line with 0 
-     # when running pvcreate on new PVs which are to be added to large VGs.
--
--    # pvmetadatacopies = 1
-+    # Gentoo: enabled for data safety
-+    pvmetadatacopies = 2
- 
-     # Approximate default size of on-disk metadata areas in sectors.
-     # You should increase this if you have large volume groups or
-@@ -377,11 +381,11 @@
-     # the supplied toolset to make changes (e.g. vgcfgrestore).
- 
-     # dirs = [ "/etc/lvm/metadata", "/mnt/disk2/lvm/metadata2" ]
--#}
-+}
- 
- # Event daemon
--#
--# dmeventd {
-+# Gentoo: uncommented, since we provide the dmeventd init script
-+dmeventd {
-     # mirror_library is the library used when monitoring a mirror device.
-     #
-     # "libdevmapper-event-lvm2mirror.so" attempts to recover from
-@@ -389,7 +393,7 @@
-     # reconfigures a mirror as necessary. If no mirror library is
-     # provided, mirrors are not monitored through dmeventd.
- 
--    # mirror_library = "libdevmapper-event-lvm2mirror.so"
-+    mirror_library = "libdevmapper-event-lvm2mirror.so"
- 
-     # snapshot_library is the library used when monitoring a snapshot device.
-     #
-@@ -398,6 +402,6 @@
-     # snapshot exceedes 80%. The warning is repeated when 85%, 90% and
-     # 95% of the snapshot are filled.
- 
--    # snapshot_library = "libdevmapper-event-lvm2snapshot.so"
--#}
-+    snapshot_library = "libdevmapper-event-lvm2snapshot.so"
-+}
- 
diff --git a/sys-fs/lvm2/files/lvm.conf-2.02.36.patch b/sys-fs/lvm2/files/lvm.conf-2.02.36.patch
deleted file mode 100644
index 98ac3c1e7b1b..000000000000
--- a/sys-fs/lvm2/files/lvm.conf-2.02.36.patch
+++ /dev/null
@@ -1,89 +0,0 @@
-diff -Nuar --exclude '*.orig' LVM2.2.02.36.orig/doc/example.conf LVM2.2.02.36/doc/example.conf
---- LVM2.2.02.36.orig/doc/example.conf	2008-04-10 11:50:37.000000000 -0700
-+++ LVM2.2.02.36/doc/example.conf	2008-04-29 23:45:08.165059223 -0700
-@@ -50,7 +50,9 @@
- 
- 
-     # By default we accept every block device:
--    filter = [ "a/.*/" ]
-+    # Gentoo: we exclude /dev/nbd by default, because it makes a lot of kernel
-+    # noise when you probed while not available.
-+    filter = [ "r|/dev/nbd.*|", "a/.*/" ]
- 
-     # Exclude the cdrom drive
-     # filter = [ "r|/dev/cdrom|" ]
-@@ -86,7 +88,7 @@
-     # If sysfs is mounted (2.6 kernels) restrict device scanning to 
-     # the block devices it believes are valid.
-     # 1 enables; 0 disables.
--    sysfs_scan = 1	
-+    sysfs_scan = 1
- 
-     # By default, LVM2 will ignore devices used as components of
-     # software RAID (md) devices by looking for md superblocks.
-@@ -219,12 +221,14 @@
-     # e.g. vgscan.lvm1 and they will stop working after you start using
-     # the new lvm2 on-disk metadata format.
-     # The default value is set when the tools are built.
--    # fallback_to_lvm1 = 0
-+    # Gentoo: the LVM tools are a seperate package.
-+    fallback_to_lvm1 = 0
- 
-     # The default metadata format that commands should use - "lvm1" or "lvm2".
-     # The command line override is -M1 or -M2.
-     # Defaults to "lvm1" if compiled in, else "lvm2".
--    # format = "lvm1"
-+    # Gentoo: default to LVM2 format
-+    format = "lvm2"
- 
-     # Location of proc filesystem
-     proc = "/proc"
-@@ -351,12 +355,12 @@
- 
- # Metadata settings
- #
--# metadata {
-+metadata {
-     # Default number of copies of metadata to hold on each PV.  0, 1 or 2.
-     # You might want to override it from the command line with 0 
-     # when running pvcreate on new PVs which are to be added to large VGs.
--
--    # pvmetadatacopies = 1
-+    # Gentoo: enabled for data safety
-+    pvmetadatacopies = 2
- 
-     # Approximate default size of on-disk metadata areas in sectors.
-     # You should increase this if you have large volume groups or
-@@ -378,11 +382,11 @@
-     # the supplied toolset to make changes (e.g. vgcfgrestore).
- 
-     # dirs = [ "/etc/lvm/metadata", "/mnt/disk2/lvm/metadata2" ]
--#}
-+}
- 
- # Event daemon
--#
--# dmeventd {
-+# Gentoo: uncommented, since we provide the dmeventd init script
-+dmeventd {
-     # mirror_library is the library used when monitoring a mirror device.
-     #
-     # "libdevmapper-event-lvm2mirror.so" attempts to recover from
-@@ -390,7 +394,7 @@
-     # reconfigures a mirror as necessary. If no mirror library is
-     # provided, mirrors are not monitored through dmeventd.
- 
--    # mirror_library = "libdevmapper-event-lvm2mirror.so"
-+    mirror_library = "libdevmapper-event-lvm2mirror.so"
- 
-     # snapshot_library is the library used when monitoring a snapshot device.
-     #
-@@ -399,6 +403,6 @@
-     # snapshot exceedes 80%. The warning is repeated when 85%, 90% and
-     # 95% of the snapshot are filled.
- 
--    # snapshot_library = "libdevmapper-event-lvm2snapshot.so"
--#}
-+    snapshot_library = "libdevmapper-event-lvm2snapshot.so"
-+}
- 
diff --git a/sys-fs/lvm2/files/lvm.conf-2.02.45.patch b/sys-fs/lvm2/files/lvm.conf-2.02.45.patch
deleted file mode 100644
index 0bd98bc675eb..000000000000
--- a/sys-fs/lvm2/files/lvm.conf-2.02.45.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- doc/example.conf.orig	2009-02-22 14:00:26.000000000 -0500
-+++ doc/example.conf	2009-03-22 04:10:05.629026882 -0400
-@@ -50,7 +50,9 @@
- 
- 
-     # By default we accept every block device:
--    filter = [ "a/.*/" ]
-+    # Gentoo: we exclude /dev/nbd by default, because it makes a lot of kernel
-+    # noise when you probed while not available.
-+    filter = [ "r|/dev/nbd.*|", "a/.*/" ]
- 
-     # Exclude the cdrom drive
-     # filter = [ "r|/dev/cdrom|" ]
-@@ -230,12 +232,14 @@
-     # e.g. vgscan.lvm1 and they will stop working after you start using
-     # the new lvm2 on-disk metadata format.
-     # The default value is set when the tools are built.
--    # fallback_to_lvm1 = 0
-+    # Gentoo: the LVM tools are a seperate package.
-+    fallback_to_lvm1 = 0
- 
-     # The default metadata format that commands should use - "lvm1" or "lvm2".
-     # The command line override is -M1 or -M2.
-     # Defaults to "lvm1" if compiled in, else "lvm2".
--    # format = "lvm1"
-+    # Gentoo: default to LVM2 format
-+    format = "lvm2"
- 
-     # Location of proc filesystem
-     proc = "/proc"
-@@ -364,12 +368,12 @@
- 
- # Metadata settings
- #
--# metadata {
-+metadata {
-     # Default number of copies of metadata to hold on each PV.  0, 1 or 2.
-     # You might want to override it from the command line with 0 
-     # when running pvcreate on new PVs which are to be added to large VGs.
--
--    # pvmetadatacopies = 1
-+    # Gentoo: enabled for data safety
-+    pvmetadatacopies = 2
- 
-     # Approximate default size of on-disk metadata areas in sectors.
-     # You should increase this if you have large volume groups or
-@@ -391,11 +395,11 @@
-     # the supplied toolset to make changes (e.g. vgcfgrestore).
- 
-     # dirs = [ "/etc/lvm/metadata", "/mnt/disk2/lvm/metadata2" ]
--#}
-+}
- 
- # Event daemon
--#
--# dmeventd {
-+# Gentoo: uncommented, since we provide the dmeventd init script
-+dmeventd {
-     # mirror_library is the library used when monitoring a mirror device.
-     #
-     # "libdevmapper-event-lvm2mirror.so" attempts to recover from
-@@ -403,7 +407,7 @@
-     # reconfigures a mirror as necessary. If no mirror library is
-     # provided, mirrors are not monitored through dmeventd.
- 
--    # mirror_library = "libdevmapper-event-lvm2mirror.so"
-+    mirror_library = "libdevmapper-event-lvm2mirror.so"
- 
-     # snapshot_library is the library used when monitoring a snapshot device.
-     #
-@@ -412,6 +416,6 @@
-     # snapshot exceedes 80%. The warning is repeated when 85%, 90% and
-     # 95% of the snapshot are filled.
- 
--    # snapshot_library = "libdevmapper-event-lvm2snapshot.so"
--#}
-+    snapshot_library = "libdevmapper-event-lvm2snapshot.so"
-+}
- 
diff --git a/sys-fs/lvm2/files/lvm.conf-2.02.51.patch b/sys-fs/lvm2/files/lvm.conf-2.02.51.patch
deleted file mode 100644
index 25e95ae46b48..000000000000
--- a/sys-fs/lvm2/files/lvm.conf-2.02.51.patch
+++ /dev/null
@@ -1,79 +0,0 @@
---- doc/example.conf.orig	2009-02-22 14:00:26.000000000 -0500
-+++ doc/example.conf	2009-03-22 04:10:05.629026882 -0400
-@@ -50,7 +50,9 @@
- 
- 
-     # By default we accept every block device:
--    filter = [ "a/.*/" ]
-+    # Gentoo: we exclude /dev/nbd by default, because it makes a lot of kernel
-+    # noise when you probed while not available.
-+    filter = [ "r|/dev/nbd.*|", "a/.*/" ]
- 
-     # Exclude the cdrom drive
-     # filter = [ "r|/dev/cdrom|" ]
-@@ -230,12 +232,14 @@
-     # e.g. vgscan.lvm1 and they will stop working after you start using
-     # the new lvm2 on-disk metadata format.
-     # The default value is set when the tools are built.
--    # fallback_to_lvm1 = 0
-+    # Gentoo: the LVM tools are a seperate package.
-+    fallback_to_lvm1 = 0
- 
-     # The default metadata format that commands should use - "lvm1" or "lvm2".
-     # The command line override is -M1 or -M2.
-     # Defaults to "lvm1" if compiled in, else "lvm2".
--    # format = "lvm1"
-+    # Gentoo: default to LVM2 format
-+    format = "lvm2"
- 
-     # Location of proc filesystem
-     proc = "/proc"
-@@ -364,12 +368,12 @@
- 
- # Metadata settings
- #
--# metadata {
-+metadata {
-     # Default number of copies of metadata to hold on each PV.  0, 1 or 2.
-     # You might want to override it from the command line with 0 
-     # when running pvcreate on new PVs which are to be added to large VGs.
--
--    # pvmetadatacopies = 1
-+    # Gentoo: enable for data safety, but PV resize is then disabled.
-+    #pvmetadatacopies = 2
- 
-     # Approximate default size of on-disk metadata areas in sectors.
-     # You should increase this if you have large volume groups or
-@@ -391,11 +395,11 @@
-     # the supplied toolset to make changes (e.g. vgcfgrestore).
- 
-     # dirs = [ "/etc/lvm/metadata", "/mnt/disk2/lvm/metadata2" ]
--#}
-+}
- 
- # Event daemon
--#
--# dmeventd {
-+# Gentoo: uncommented, since we provide the dmeventd init script
-+dmeventd {
-     # mirror_library is the library used when monitoring a mirror device.
-     #
-     # "libdevmapper-event-lvm2mirror.so" attempts to recover from
-@@ -403,7 +407,7 @@
-     # reconfigures a mirror as necessary. If no mirror library is
-     # provided, mirrors are not monitored through dmeventd.
- 
--    # mirror_library = "libdevmapper-event-lvm2mirror.so"
-+    mirror_library = "libdevmapper-event-lvm2mirror.so"
- 
-     # snapshot_library is the library used when monitoring a snapshot device.
-     #
-@@ -412,6 +416,6 @@
-     # snapshot exceedes 80%. The warning is repeated when 85%, 90% and
-     # 95% of the snapshot are filled.
- 
--    # snapshot_library = "libdevmapper-event-lvm2snapshot.so"
--#}
-+    snapshot_library = "libdevmapper-event-lvm2snapshot.so"
-+}
- 
diff --git a/sys-fs/lvm2/files/lvm.conf-2.02.56.patch b/sys-fs/lvm2/files/lvm.conf-2.02.56.patch
deleted file mode 100644
index 5f2abd531763..000000000000
--- a/sys-fs/lvm2/files/lvm.conf-2.02.56.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -Nuar --exclude '*.orig' --exclude '*.rej' LVM2.2.02.56.orig/doc/example.conf LVM2.2.02.56/doc/example.conf
---- LVM2.2.02.56.orig/doc/example.conf	2009-10-05 12:44:21.000000000 +0000
-+++ LVM2.2.02.56/doc/example.conf	2009-11-29 23:53:00.123882589 +0000
-@@ -50,7 +50,9 @@
- 
- 
-     # By default we accept every block device:
--    filter = [ "a/.*/" ]
-+    # Gentoo: we exclude /dev/nbd by default, because it makes a lot of kernel
-+    # noise when you probed while not available.
-+    filter = [ "r|/dev/nbd.*|", "a/.*/" ]
- 
-     # Exclude the cdrom drive
-     # filter = [ "r|/dev/cdrom|" ]
-@@ -259,6 +261,8 @@
-     # the new lvm2 on-disk metadata format.
-     # The default value is set when the tools are built.
-     # fallback_to_lvm1 = 0
-+    # Gentoo: the LVM tools are a seperate package.
-+    fallback_to_lvm1 = 0
- 
-     # The default metadata format that commands should use - "lvm1" or "lvm2".
-     # The command line override is -M1 or -M2.
-@@ -411,12 +415,12 @@
- 
- # Metadata settings
- #
--# metadata {
-+metadata {
-     # Default number of copies of metadata to hold on each PV.  0, 1 or 2.
-     # You might want to override it from the command line with 0 
-     # when running pvcreate on new PVs which are to be added to large VGs.
--
--    # pvmetadatacopies = 1
-+    # Gentoo: enable for data safety, but PV resize is then disabled.
-+    #pvmetadatacopies = 2
- 
-     # Approximate default size of on-disk metadata areas in sectors.
-     # You should increase this if you have large volume groups or
-@@ -438,7 +442,7 @@
-     # the supplied toolset to make changes (e.g. vgcfgrestore).
- 
-     # dirs = [ "/etc/lvm/metadata", "/mnt/disk2/lvm/metadata2" ]
--#}
-+}
- 
- # Event daemon
- #
diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.28-r2 b/sys-fs/lvm2/files/lvm.rc-2.02.28-r2
deleted file mode 100644
index 0d17437b245f..000000000000
--- a/sys-fs/lvm2/files/lvm.rc-2.02.28-r2
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm.rc-2.02.28-r2,v 1.4 2009/01/17 22:53:15 robbat2 Exp $
-
-depend() {
-	if [ -f /etc/init.d/sysfs ]; then
-		# on baselayout-1 this causes
-		# dependency-cycles with checkroot (before *)
-		before checkfs fsck
-		after modules device-mapper
-	fi
-}
-
-start() {
-	if [ ! -f /etc/init.d/sysfs ]; then
-		eerror "The $SVCNAME init-script is written for baselayout-2!"
-		eerror "Please do not use it with baselayout-1!".
-		return 1
-	fi
-
-	start_addon lvm
-}
-
-stop() {
-	stop_addon lvm
-}
-
-# vim:ts=4
diff --git a/sys-fs/lvm2/files/lvm2-2.02.45-device-mapper-export-format.patch b/sys-fs/lvm2/files/lvm2-2.02.45-device-mapper-export-format.patch
deleted file mode 100644
index 6f541d484a47..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.45-device-mapper-export-format.patch
+++ /dev/null
@@ -1,285 +0,0 @@
---- tools/dmsetup.c	2008-06-24 15:53:47.000000000 -0700
-+++ tools/dmsetup.c	2008-06-28 01:53:56.048598048 -0700
-@@ -108,6 +108,7 @@
- enum {
- 	READ_ONLY = 0,
- 	COLS_ARG,
-+	EXPORT_ARG,
- 	EXEC_ARG,
- 	FORCE_ARG,
- 	GID_ARG,
-@@ -142,7 +143,8 @@
- 	DR_TASK = 1,
- 	DR_INFO = 2,
- 	DR_DEPS = 4,
--	DR_TREE = 8	/* Complete dependency tree required */
-+	DR_TREE = 8,	/* Complete dependency tree required */
-+	DR_TABLE = 0x10, /* table is required, not just info */
- } report_type_t;
- 
- static int _switches[NUM_SWITCHES];
-@@ -1126,8 +1128,13 @@
- 			name = argv[1];
- 	}
- 
--	if (!(dmt = dm_task_create(DM_DEVICE_INFO)))
--		return 0;
-+	if (_report_type & DR_TABLE ) {
-+		if (!(dmt = dm_task_create(DM_DEVICE_TABLE)))
-+			return 0;
-+	} else {
-+		if (!(dmt = dm_task_create(DM_DEVICE_INFO)))
-+			return 0;
-+	}
- 
- 	if (!_set_task_device(dmt, name, 0))
- 		goto out;
-@@ -1591,6 +1598,16 @@
- 	return dm_report_field_uint32(rh, field, &value);
- }
- 
-+static int _int_disp(struct dm_report *rh,
-+		      struct dm_pool *mem __attribute((unused)),
-+		      struct dm_report_field *field, const void *data,
-+		      void *private __attribute((unused)))
-+{
-+	const int value = *(const int *)data;
-+
-+	return dm_report_field_int(rh, field, &value);
-+}
-+
- static int _dm_name_disp(struct dm_report *rh,
- 			 struct dm_pool *mem __attribute((unused)),
- 			 struct dm_report_field *field, const void *data,
-@@ -1702,6 +1719,66 @@
- }
- 
- 
-+static int _dm_info_cleartext_status_disp(struct dm_report *rh,
-+					 struct dm_pool *mem __attribute((unused)),
-+					 struct dm_report_field *field, const void *data,
-+					 void *private __attribute((unused)))
-+{
-+	const char *buf = "NOTPRESENT";
-+	const struct dm_info *info = data;
-+
-+	if (info->exists) {
-+		if (info->suspended)
-+			buf = "SUSPENDED";
-+		else
-+			buf = info->read_only ? " READONLY" : "ACTIVE";
-+	}
-+		
-+	return dm_report_field_string(rh, field, &buf);
-+}
-+
-+static int _dm_info_target_types_disp(struct dm_report *rh,
-+					 struct dm_pool *mem __attribute((unused)),
-+					 struct dm_report_field *field, const void *data,
-+					 void *private __attribute((unused)))
-+{
-+	char buf[1024];
-+	char *dest = buf;
-+	int remains = sizeof(buf);
-+	int written;
-+	const char *s = buf;
-+	struct dm_task *dmt = (struct dm_task *) data;
-+	void *next = NULL;
-+	uint64_t start, length;
-+	char *target_type = NULL;
-+	char *params;
-+
-+
-+	buf[0] = '\0';
-+	
-+	next = dm_get_next_target(dmt, next, &start, &length,
-+				  &target_type, &params);
-+	if (target_type) {
-+		written = snprintf(dest, remains, "%s", target_type);
-+		dest += written;
-+		remains -= written;
-+
-+		while (remains > 0 && next) {
-+			next = dm_get_next_target(dmt, next, &start, &length,
-+						  &target_type, &params);
-+			if (target_type) {
-+				written = snprintf(dest, remains, ",%s", target_type);
-+				dest += written;
-+				remains -= written;
-+			}
-+		}
-+	}
-+
-+	buf[sizeof(buf)-1] = '\0';
-+	
-+	return dm_report_field_string(rh, field, &s);
-+}
-+
- static int _dm_info_devno_disp(struct dm_report *rh, struct dm_pool *mem,
- 			       struct dm_report_field *field, const void *data,
- 			       void *private)
-@@ -1925,6 +2002,7 @@
- 	{ DR_INFO, "Mapped Device Information", "", _info_get_obj },
- 	{ DR_DEPS, "Mapped Device Relationship Information", "", _deps_get_obj },
- 	{ DR_TREE, "Mapped Device Relationship Information", "", _tree_get_obj },
-+ 	{ DR_TABLE, "Mapped Device Table", "", _task_get_obj },
- 	{ 0, "", "", NULL },
- };
- 
-@@ -1944,6 +2022,7 @@
- FIELD_F(TASK, NUM, "RAhead", 6, dm_read_ahead, "read_ahead", "Read ahead in sectors.")
- 
- FIELD_F(INFO, STR, "Stat", 4, dm_info_status, "attr", "(L)ive, (I)nactive, (s)uspended, (r)ead-only, read-(w)rite.")
-+FIELD_F(INFO, STR, "State", 1, dm_info_cleartext_status, "status", "State as cleartext.")
- FIELD_F(INFO, STR, "Tables", 6, dm_info_table_loaded, "tables_loaded", "Which of the live and inactive table slots are filled.")
- FIELD_F(INFO, STR, "Suspended", 9, dm_info_suspended, "suspended", "Whether the device is suspended.")
- FIELD_F(INFO, STR, "Read-only", 9, dm_info_read_only, "readonly", "Whether the device is read-only or writeable.")
-@@ -1954,6 +2033,11 @@
- FIELD_O(INFO, dm_info, NUM, "Targ", target_count, 4, int32, "segments", "Number of segments in live table, if present.")
- FIELD_O(INFO, dm_info, NUM, "Event", event_nr, 6, uint32, "events", "Number of most recent event.")
- 
-+FIELD_O(INFO, dm_info, NUM, "RO", read_only, 2, int, "read_only", "Read only.")
-+FIELD_O(INFO, dm_info, NUM, "Ex", exists, 2, int, "exists", "Exists.")
-+FIELD_O(INFO, dm_info, NUM, "Susp", suspended, 4, int, "suspended", "Suspended.")
-+FIELD_O(INFO, dm_info, NUM, "tab_live", live_table, 8, int, "table_live", "Live table.")
-+FIELD_O(INFO, dm_info, NUM, "tab_inact", inactive_table, 9, int, "table_inactive", "Inactive table.")
- FIELD_O(DEPS, dm_deps, NUM, "#Devs", count, 5, int32, "device_count", "Number of devices used by this one.")
- FIELD_F(TREE, STR, "DevNames", 8, dm_deps_names, "devs_used", "List of names of mapped devices used by this one.")
- FIELD_F(DEPS, STR, "DevNos", 6, dm_deps, "devnos_used", "List of device numbers of devices used by this one.")
-@@ -1961,6 +2045,7 @@
- FIELD_F(TREE, NUM, "#Refs", 5, dm_tree_parents_count, "device_ref_count", "Number of mapped devices referencing this one.")
- FIELD_F(TREE, STR, "RefNames", 8, dm_tree_parents_names, "names_using_dev", "List of names of mapped devices using this one.")
- FIELD_F(TREE, STR, "RefDevNos", 9, dm_tree_parents_devs, "devnos_using_dev", "List of device numbers of mapped devices using this one.")
-+FIELD_F(TABLE, STR, "Targettypes", 32, dm_info_target_types, "target_types", "Used target types.")
- {0, 0, 0, 0, "", "", NULL, NULL},
- /* *INDENT-ON* */
- };
-@@ -1971,13 +2056,15 @@
- #undef FIELD_F
- 
- static const char *default_report_options = "name,major,minor,attr,open,segments,events,uuid";
-+static const char *default_export_options = "name,major,minor,status,read_only,exists,suspended,table_live,table_inactive,open,segments,events,uuid,target_types";
- 
- static int _report_init(struct command *c)
- {
--	char *options = (char *) default_report_options;
-+	char *default_options = (char *) default_report_options;
-+	char *options;
- 	const char *keys = "";
- 	const char *separator = " ";
--	int aligned = 1, headings = 1, buffered = 1, field_prefixes = 0;
-+ 	int aligned = 1, headings = 1, buffered = 1, field_prefixes = 0, export = 0;
- 	int quoted = 1, columns_as_rows = 0;
- 	uint32_t flags = 0;
- 	size_t len = 0;
-@@ -2004,6 +2091,15 @@
- 		field_prefixes = 1;
- 	}
- 
-+	if (_switches[EXPORT_ARG]) {
-+		default_options = (char *) default_export_options;
-+		separator = "\n";
-+		aligned = 0;
-+		headings = 0;
-+		export = 1;
-+	}
-+
-+	options = default_options;
- 	if (_switches[OPTIONS_ARG] && _string_args[OPTIONS_ARG]) {
- 		if (*_string_args[OPTIONS_ARG] != '+')
- 			options = _string_args[OPTIONS_ARG];
-@@ -2055,6 +2151,9 @@
- 	if (columns_as_rows)
- 		flags |= DM_REPORT_OUTPUT_COLUMNS_AS_ROWS;
- 
-+	if (export)
-+		flags |= DM_REPORT_OUTPUT_EXPORT;
-+
- 	if (!(_report = dm_report_init(&_report_type,
- 				       _report_types, _report_fields,
- 				       options, separator, flags, keys, NULL)))
-@@ -2133,7 +2232,8 @@
- 	fprintf(out, "dmsetup [--version] [-v|--verbose [-v|--verbose ...]]\n"
- 		"        [-r|--readonly] [--noopencount] [--nolockfs]\n"
- 		"        [--readahead [+]<sectors>|auto|none]\n"
--		"        [-c|-C|--columns] [-o <fields>] [-O|--sort <sort_fields>]\n"
-+ 		"        [-c|-C|--columns] [-e|--export]\n"
-+ 		"        [-o <fields>] [-O|--sort <sort_fields>]\n"
- 		"        [--nameprefixes] [--noheadings] [--separator <separator>]\n\n");
- 	for (i = 0; _commands[i].name; i++)
- 		fprintf(out, "\t%s %s\n", _commands[i].name, _commands[i].help);
-@@ -2484,6 +2584,7 @@
- 	static struct option long_options[] = {
- 		{"readonly", 0, &ind, READ_ONLY},
- 		{"columns", 0, &ind, COLS_ARG},
-+		{"export", 0, &ind, EXPORT_ARG},
- 		{"exec", 1, &ind, EXEC_ARG},
- 		{"force", 0, &ind, FORCE_ARG},
- 		{"gid", 1, &ind, GID_ARG},
-@@ -2566,12 +2667,16 @@
- 
- 	optarg = 0;
- 	optind = OPTIND_INIT;
--	while ((ind = -1, c = GETOPTLONG_FN(*argc, *argv, "cCfGj:m:Mno:O:ru:Uv",
-+	while ((ind = -1, c = GETOPTLONG_FN(*argc, *argv, "cCefGj:m:Mno:O:ru:Uv",
- 					    long_options, NULL)) != -1) {
- 		if (c == ':' || c == '?')
- 			return 0;
- 		if (c == 'c' || c == 'C' || ind == COLS_ARG)
- 			_switches[COLS_ARG]++;
-+		if (c == 'e' || ind == EXPORT_ARG) {
-+			_switches[EXPORT_ARG]++;
-+			_switches[COLS_ARG]++;
-+		}
- 		if (c == 'f' || ind == FORCE_ARG)
- 			_switches[FORCE_ARG]++;
- 		if (c == 'r' || ind == READ_ONLY)
-diff -Nuar --exclude '*.rej' --exclude '*.orig' device-mapper.1.02.27.orig/lib/libdevmapper.h device-mapper.1.02.27/lib/libdevmapper.h
---- libdm/libdevmapper.h	2008-06-24 15:53:48.000000000 -0700
-+++ libdm/libdevmapper.h	2008-06-28 01:54:55.588111461 -0700
-@@ -742,6 +742,7 @@
- #define DM_REPORT_OUTPUT_FIELD_NAME_PREFIX	0x00000008
- #define DM_REPORT_OUTPUT_FIELD_UNQUOTED		0x00000010
- #define DM_REPORT_OUTPUT_COLUMNS_AS_ROWS	0x00000020
-+#define DM_REPORT_OUTPUT_EXPORT				0x00000040
- 
- struct dm_report *dm_report_init(uint32_t *report_types,
- 				 const struct dm_report_object_type *types,
-diff -Nuar --exclude '*.rej' --exclude '*.orig' device-mapper.1.02.27.orig/lib/libdm-report.c device-mapper.1.02.27/lib/libdm-report.c
---- libdm/libdm-report.c	2008-06-24 17:10:36.000000000 -0700
-+++ libdm/libdm-report.c	2008-06-28 01:56:39.778466634 -0700
-@@ -808,6 +809,8 @@
- 	uint32_t align;
- 	const char *repstr;
- 	char buf[4096];
-+	const char *fname;
-+	char tmp_char;
- 
- 	if (rh->flags & DM_REPORT_OUTPUT_FIELD_NAME_PREFIX) {
- 		if (!(field_id = strdup(rh->fields[field->props->field_num].id))) {
-@@ -838,6 +841,25 @@
- 			return 0;
- 		}
- 	}
-+	if (rh->flags & DM_REPORT_OUTPUT_EXPORT) {
-+		fname = rh->fields[field->props->field_num].id;
-+		if (!dm_pool_grow_object(rh->mem, "DM_", strlen("DM_"))) {
-+			log_error("dm_report: Unable to extend output line");
-+			return 0;
-+		}
-+		while (fname && fname[0]) {
-+			tmp_char = toupper(fname[0]);
-+			if (!dm_pool_grow_object(rh->mem, &tmp_char, 1)) {
-+				log_error("dm_report: Unable to extend output line");
-+				return 0;
-+			}
-+			fname++;
-+		}
-+		if (!dm_pool_grow_object(rh->mem, "=", strlen("="))) {
-+			log_error("dm_report: Unable to extend output line");
-+			return 0;
-+		}
-+	}
- 
- 	repstr = field->report_string;
- 	width = field->props->width;
diff --git a/sys-fs/lvm2/files/lvm2-2.02.45-dmeventd.patch b/sys-fs/lvm2/files/lvm2-2.02.45-dmeventd.patch
deleted file mode 100644
index f8b5dadc3152..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.45-dmeventd.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- daemons/dmeventd/Makefile.in	2009-03-22 04:01:26.754802410 -0400
-+++ daemons/dmeventd/Makefile.in.new	2009-03-22 04:01:14.693689634 -0400
-@@ -42,7 +42,7 @@
- LDFLAGS += -ldl -ldevmapper -lpthread
- CLDFLAGS += -ldl -ldevmapper -lpthread
- 
--dmeventd: $(LIB_SHARED) $(VERSIONED_SHLIB) dmeventd.o
-+dmeventd: $(LIB_SHARED) $(LIB_STATIC) $(VERSIONED_SHLIB) dmeventd.o
- 	$(CC) -o $@ dmeventd.o $(CFLAGS) $(LDFLAGS) \
- 	-L. -ldevmapper-event $(LIBS) -rdynamic
- 
diff --git a/sys-fs/lvm2/files/lvm2-2.02.48-as-needed.patch b/sys-fs/lvm2/files/lvm2-2.02.48-as-needed.patch
deleted file mode 100644
index 2089beb72da8..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.48-as-needed.patch
+++ /dev/null
@@ -1,188 +0,0 @@
-Compile-fix with --as-needed.
-
-To ensure correct output when --as-needed are in the linker flags, the order of
-flags to the linker (directly or via the compiler) must explictly only include
-libraries and objects AFTER all compiler flags, linker flags and linker
-directory arguments.
-
-X-Gentoo-Bug: #217644
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-Signed-off-by: Christian Ruppert (idl0r) <idl0r@gentoo.org>
-
-diff -Nuarp --exclude '*.rej' --exclude '*.orig' LVM2.2.02.48.orig/daemons/clogd/Makefile LVM2.2.02.48/daemons/clogd/Makefile
---- LVM2.2.02.48.orig/daemons/clogd/Makefile	2009-01-08 09:12:33.000000000 -0800
-+++ LVM2.2.02.48/daemons/clogd/Makefile	2009-07-05 14:33:03.799446085 -0700
-@@ -45,12 +45,12 @@ LDFLAGS += $(shell if [ -e /usr/lib64/op
- 	else \
- 		echo '-L/usr/lib/openais -L/usr/lib'; \
- 	fi)
--LDFLAGS += -lcpg -lSaCkpt -lext2fs
-+LIBS += -lcpg -lSaCkpt -lext2fs
- 
- all: ${TARGET}
- 
- clogd: ${SOURCES}
--	${CC} ${CFLAGS} -o $@ $^ ${LDFLAGS}
-+	${CC} ${CFLAGS} ${LDFLAGS} -o $@ $^
- 
- no_clogd_kernel_headers:
- 	echo "Unable to find clogd kernel headers"
-diff -Nuarp --exclude '*.rej' --exclude '*.orig' LVM2.2.02.48.orig/daemons/clvmd/Makefile.in LVM2.2.02.48/daemons/clvmd/Makefile.in
---- LVM2.2.02.48.orig/daemons/clvmd/Makefile.in	2009-03-10 05:10:12.000000000 -0700
-+++ LVM2.2.02.48/daemons/clvmd/Makefile.in	2009-07-05 14:41:22.633723993 -0700
-@@ -101,7 +101,7 @@ INSTALL_TARGETS = \
- 	install_clvmd
- 
- clvmd: $(OBJECTS) $(top_srcdir)/lib/liblvm-internal.a
--	$(CC) -o clvmd $(OBJECTS) $(CFLAGS) $(LDFLAGS) \
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o clvmd $(OBJECTS) \
- 		$(LVMLIBS) $(LMLIBS) $(LIBS)
- 
- .PHONY: install_clvmd
-diff -Nuarp --exclude '*.rej' --exclude '*.orig' LVM2.2.02.48.orig/daemons/dmeventd/Makefile.in LVM2.2.02.48/daemons/dmeventd/Makefile.in
---- LVM2.2.02.48.orig/daemons/dmeventd/Makefile.in	2009-07-05 14:32:41.000000000 -0700
-+++ LVM2.2.02.48/daemons/dmeventd/Makefile.in	2009-07-05 14:40:43.094941107 -0700
-@@ -41,12 +41,12 @@ include $(top_srcdir)/make.tmpl
- all: dmeventd
- device-mapper: dmeventd $(LIB_STATIC)
- 
--LDFLAGS += -ldl -ldevmapper -lpthread
--CLDFLAGS += -ldl -ldevmapper -lpthread
-+LIBS += -ldl -ldevmapper -lpthread
- 
- dmeventd: $(LIB_SHARED) $(LIB_STATIC) $(VERSIONED_SHLIB) dmeventd.o
--	$(CC) -o $@ dmeventd.o $(CFLAGS) $(LDFLAGS) \
--	-L. -ldevmapper-event $(LIBS) -rdynamic
-+	$(CC) $(CFLAGS) $(LDFLAGS) -L. \
-+	-o $@ dmeventd.o \
-+	-ldevmapper-event $(LIBS) -rdynamic
- 
- .PHONY: install_dynamic install_static install_include \
- 	install_pkgconfig install_dmeventd
-diff -Nuarp --exclude '*.rej' --exclude '*.orig' LVM2.2.02.48.orig/daemons/dmeventd/plugins/mirror/Makefile.in LVM2.2.02.48/daemons/dmeventd/plugins/mirror/Makefile.in
---- LVM2.2.02.48.orig/daemons/dmeventd/plugins/mirror/Makefile.in	2009-05-11 03:28:46.000000000 -0700
-+++ LVM2.2.02.48/daemons/dmeventd/plugins/mirror/Makefile.in	2009-07-05 14:33:03.801620744 -0700
-@@ -17,7 +17,8 @@ top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- 
- INCLUDES += -I${top_srcdir}/tools
--CLDFLAGS += -L${top_srcdir}/tools -ldevmapper @LVM2CMD_LIB@
-+CLDFLAGS += -L${top_srcdir}/tools
-+LIBS += -ldevmapper -lpthread @LVM2CMD_LIB@
- 
- SOURCES = dmeventd_mirror.c
- 
-diff -Nuarp --exclude '*.rej' --exclude '*.orig' LVM2.2.02.48.orig/daemons/dmeventd/plugins/snapshot/Makefile.in LVM2.2.02.48/daemons/dmeventd/plugins/snapshot/Makefile.in
---- LVM2.2.02.48.orig/daemons/dmeventd/plugins/snapshot/Makefile.in	2009-05-11 03:28:46.000000000 -0700
-+++ LVM2.2.02.48/daemons/dmeventd/plugins/snapshot/Makefile.in	2009-07-05 14:33:03.801620744 -0700
-@@ -17,7 +17,8 @@ top_srcdir = @top_srcdir@
- VPATH = @srcdir@
- 
- INCLUDES += -I${top_srcdir}/tools
--CLDFLAGS += -L${top_srcdir}/tools -ldevmapper @LVM2CMD_LIB@
-+CLDFLAGS += -L${top_srcdir}/tools
-+LIBS += -lpthread -ldevmapper @LVM2CMD_LIB@
- 
- SOURCES = dmeventd_snapshot.c
- 
-diff -Nuarp --exclude '*.rej' --exclude '*.orig' LVM2.2.02.48.orig/lib/Makefile.in LVM2.2.02.48/lib/Makefile.in
---- LVM2.2.02.48.orig/lib/Makefile.in	2009-07-17 11:16:40.572301218 +0200
-+++ LVM2.2.02.48/lib/Makefile.in	2009-07-17 11:17:55.035551029 +0200
-@@ -137,7 +137,8 @@ ifeq ("@HAVE_LIBDL@", "yes")
- endif
- 
- ifeq ("@DMEVENTD@", "yes")
--  CLDFLAGS += -ldevmapper-event
-+  CLDFLAGS += -L../daemons/dmeventd
-+  LIBS += -ldevmapper-event
- endif
- 
- LIB_NAME = liblvm-internal
-diff -Nuarp --exclude '*.rej' --exclude '*.orig' LVM2.2.02.48.orig/make.tmpl.in LVM2.2.02.48/make.tmpl.in
---- LVM2.2.02.48.orig/make.tmpl.in	2009-05-11 03:28:45.000000000 -0700
-+++ LVM2.2.02.48/make.tmpl.in	2009-07-05 14:33:03.801620744 -0700
-@@ -28,7 +28,7 @@ GENHTML = @GENHTML@
- LN_S = @LN_S@
- SED = @SED@
- 
--LIBS = @LIBS@
-+LIBS += @LIBS@ $(LVMLIBS) $(LMLIBS)
- DEFS += @DEFS@
- CFLAGS += @CFLAGS@
- CLDFLAGS += @CLDFLAGS@
-@@ -203,19 +203,19 @@ $(TARGETS): $(OBJECTS)
- ifeq ("@LIB_SUFFIX@","so")
- $(LIB_SHARED): $(OBJECTS) $(LDDEPS)
- 	$(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \
--	$(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
-+	$(CFLAGS) $(CLDFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
- endif
- 
- ifeq ("@LIB_SUFFIX@","dylib")
- $(LIB_SHARED): $(OBJECTS) $(LDDEPS)
- 	$(CC) -dynamiclib -dylib_current_version,$(LIB_VERSION) \
--	$(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
-+	$(CFLAGS) $(CLDFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
- endif
- 
- %.so: %.a
- 	$(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \
--	$(CFLAGS) $(CLDFLAGS) $(LIBS) -o $@ \
--	@CLDWHOLEARCHIVE@ $< @CLDNOWHOLEARCHIVE@
-+	$(CFLAGS) $(CLDFLAGS) $(LDFLAGS) -o $@ \
-+	@CLDWHOLEARCHIVE@ $< @CLDNOWHOLEARCHIVE@ $(LIBS)
- 
- $(LIB_STATIC): $(OBJECTS)
- 	$(RM) $@
-diff -Nuarp --exclude '*.rej' --exclude '*.orig' LVM2.2.02.48.orig/test/api/Makefile.in LVM2.2.02.48/test/api/Makefile.in
---- LVM2.2.02.48.orig/test/api/Makefile.in	2009-05-22 07:45:00.000000000 -0700
-+++ LVM2.2.02.48/test/api/Makefile.in	2009-07-05 14:39:19.353146953 -0700
-@@ -36,5 +36,5 @@ LDFLAGS = -L$(top_srcdir)/libdm -L$(top_
- CLDFLAGS = -L$(top_srcdir)/libdm -L$(top_srcdir)/liblvm
- 
- test: $(OBJECTS) $(top_srcdir)/liblvm/liblvm2app.so $(top_srcdir)/libdm/libdevmapper.so
--	$(CC) -o test $(OBJECTS) $(CFLAGS) $(LDFLAGS) $(LVMLIBS) $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o test $(OBJECTS) $(LVMLIBS) $(LIBS)
- 
-diff -Nuarp --exclude '*.rej' --exclude '*.orig' LVM2.2.02.48.orig/tools/Makefile.in LVM2.2.02.48/tools/Makefile.in
---- LVM2.2.02.48.orig/tools/Makefile.in	2009-07-17 11:16:40.579301663 +0200
-+++ LVM2.2.02.48/tools/Makefile.in	2009-07-21 19:27:05.526972872 +0200
-@@ -106,24 +106,29 @@ include $(top_srcdir)/make.tmpl
- device-mapper: $(TARGETS_DM)
- 
- dmsetup: dmsetup.o $(top_srcdir)/libdm/libdevmapper.$(LIB_SUFFIX)
--	$(CC) -o $@ dmsetup.o $(CFLAGS) $(LDFLAGS) \
--	      -L$(top_srcdir)/libdm -ldevmapper $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) \
-+	      -L$(top_srcdir)/libdm \
-+		  -o $@ dmsetup.o \
-+		  -ldevmapper $(LIB_PTHREAD)
- 
- dmsetup.static: dmsetup.o $(interfacedir)/libdevmapper.a
--	$(CC) -o $@ dmsetup.o $(CFLAGS) $(LDFLAGS) -static \
--	      -L$(interfacedir) -ldevmapper $(LIBS) \
--	      $(LIB_PTHREAD)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -static \
-+	      -L$(interfacedir) \
-+		  -o $@ dmsetup.o \
-+		  -ldevmapper $(LIB_PTHREAD)
- 
- all: device-mapper
- 
- lvm: $(OBJECTS) lvm.o $(top_srcdir)/lib/liblvm-internal.a
--	$(CC) -o $@ $(CFLAGS) $(OBJECTS) lvm.o \
--		$(LDFLAGS) $(LVMLIBS) $(LIBS) -rdynamic
-+	$(CC) $(CFLAGS) $(LDFLAGS) \
-+		-o $@ $(OBJECTS) lvm.o \
-+		$(LVMLIBS) $(LIBS) -rdynamic
- 
- LIB_PTHREAD = @LIB_PTHREAD@
- lvm.static: $(OBJECTS) lvm-static.o $(top_srcdir)/lib/liblvm-internal.a  $(interfacedir)/libdevmapper.a
--	$(CC) -o $@ $(CFLAGS) $(OBJECTS) lvm-static.o -static \
--		-L$(interfacedir) $(LDFLAGS) $(LVMLIBS) $(LIBS) $(LIB_PTHREAD) -rdynamic
-+	$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacedir) \
-+		-o $@ $(OBJECTS) lvm-static.o \
-+		$(LVMLIBS) $(LIBS) $(LIB_PTHREAD) -rdynamic
- 
- liblvm2cmd.a: $(top_srcdir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
- 	cat $(top_srcdir)/lib/liblvm-internal.a > $@
-\ No newline at end of file
diff --git a/sys-fs/lvm2/files/lvm2-2.02.48-device-mapper-export-format.patch b/sys-fs/lvm2/files/lvm2-2.02.48-device-mapper-export-format.patch
deleted file mode 100644
index 6e73d414802a..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.48-device-mapper-export-format.patch
+++ /dev/null
@@ -1,306 +0,0 @@
-Add support for exporting the device-mapper table to userspace.
-
-Original patch written by Matthias Schwarzott <zzam@gentoo.org>, in response to
-Gentoo bug #189404.
-
-This makes it possible to have udev rules based on the properties of the
-device-mapper node, such as target types, suspended status etc.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-diff -Nuar --exclude '*.rej' --exclude '*.orig' LVM2.2.02.48.orig/libdm/libdevmapper.h LVM2.2.02.48/libdm/libdevmapper.h
---- LVM2.2.02.48.orig/libdm/libdevmapper.h	2009-06-17 13:55:24.000000000 -0700
-+++ LVM2.2.02.48/libdm/libdevmapper.h	2009-07-05 14:16:14.331690820 -0700
-@@ -953,6 +953,7 @@
- #define DM_REPORT_OUTPUT_FIELD_NAME_PREFIX	0x00000008
- #define DM_REPORT_OUTPUT_FIELD_UNQUOTED		0x00000010
- #define DM_REPORT_OUTPUT_COLUMNS_AS_ROWS	0x00000020
-+#define DM_REPORT_OUTPUT_EXPORT				0x00000040
- 
- struct dm_report *dm_report_init(uint32_t *report_types,
- 				 const struct dm_report_object_type *types,
-diff -Nuar --exclude '*.rej' --exclude '*.orig' LVM2.2.02.48.orig/libdm/libdm-report.c LVM2.2.02.48/libdm/libdm-report.c
---- LVM2.2.02.48.orig/libdm/libdm-report.c	2009-02-09 01:45:49.000000000 -0800
-+++ LVM2.2.02.48/libdm/libdm-report.c	2009-07-05 14:16:14.331690820 -0700
-@@ -891,6 +891,8 @@
- 	uint32_t align;
- 	const char *repstr;
- 	char buf[4096];
-+	const char *fname;
-+	char tmp_char;
- 
- 	if (rh->flags & DM_REPORT_OUTPUT_FIELD_NAME_PREFIX) {
- 		if (!(field_id = strdup(rh->fields[field->props->field_num].id))) {
-@@ -921,6 +923,25 @@
- 			return 0;
- 		}
- 	}
-+	if (rh->flags & DM_REPORT_OUTPUT_EXPORT) {
-+		fname = rh->fields[field->props->field_num].id;
-+		if (!dm_pool_grow_object(rh->mem, "DM_", strlen("DM_"))) {
-+			log_error("dm_report: Unable to extend output line");
-+			return 0;
-+		}
-+		while (fname && fname[0]) {
-+			tmp_char = toupper(fname[0]);
-+			if (!dm_pool_grow_object(rh->mem, &tmp_char, 1)) {
-+				log_error("dm_report: Unable to extend output line");
-+				return 0;
-+			}
-+			fname++;
-+		}
-+		if (!dm_pool_grow_object(rh->mem, "=", strlen("="))) {
-+			log_error("dm_report: Unable to extend output line");
-+			return 0;
-+		}
-+	}
- 
- 	repstr = field->report_string;
- 	width = field->props->width;
-diff -Nuar --exclude '*.rej' --exclude '*.orig' LVM2.2.02.48.orig/tools/dmsetup.c LVM2.2.02.48/tools/dmsetup.c
---- LVM2.2.02.48.orig/tools/dmsetup.c	2009-06-03 13:44:49.000000000 -0700
-+++ LVM2.2.02.48/tools/dmsetup.c	2009-07-05 14:22:41.972149507 -0700
-@@ -107,6 +107,7 @@
- enum {
- 	READ_ONLY = 0,
- 	COLS_ARG,
-+	EXPORT_ARG,
- 	EXEC_ARG,
- 	FORCE_ARG,
- 	GID_ARG,
-@@ -142,7 +143,8 @@
- 	DR_INFO = 2,
- 	DR_DEPS = 4,
- 	DR_TREE = 8,	/* Complete dependency tree required */
--	DR_NAME = 16
-+	DR_NAME = 16,
-+	DR_TABLE = 0x20, /* table is required, not just info */
- } report_type_t;
- 
- static int _switches[NUM_SWITCHES];
-@@ -1217,8 +1219,13 @@
- 			name = argv[1];
- 	}
- 
--	if (!(dmt = dm_task_create(DM_DEVICE_INFO)))
--		return 0;
-+	if (_report_type & DR_TABLE ) {
-+		if (!(dmt = dm_task_create(DM_DEVICE_TABLE)))
-+			return 0;
-+	} else {
-+		if (!(dmt = dm_task_create(DM_DEVICE_INFO)))
-+			return 0;
-+	}
- 
- 	if (!_set_task_device(dmt, name, 0))
- 		goto out;
-@@ -1682,6 +1689,16 @@
- 	return dm_report_field_uint32(rh, field, &value);
- }
- 
-+static int _int_disp(struct dm_report *rh,
-+		      struct dm_pool *mem __attribute((unused)),
-+		      struct dm_report_field *field, const void *data,
-+		      void *private __attribute((unused)))
-+{
-+	const int value = *(const int *)data;
-+
-+	return dm_report_field_int(rh, field, &value);
-+}
-+
- static int _dm_name_disp(struct dm_report *rh,
- 			 struct dm_pool *mem __attribute((unused)),
- 			 struct dm_report_field *field, const void *data,
-@@ -1793,6 +1810,66 @@
- }
- 
- 
-+static int _dm_info_cleartext_status_disp(struct dm_report *rh,
-+					 struct dm_pool *mem __attribute((unused)),
-+					 struct dm_report_field *field, const void *data,
-+					 void *private __attribute((unused)))
-+{
-+	const char *buf = "NOTPRESENT";
-+	const struct dm_info *info = data;
-+
-+	if (info->exists) {
-+		if (info->suspended)
-+			buf = "SUSPENDED";
-+		else
-+			buf = info->read_only ? " READONLY" : "ACTIVE";
-+	}
-+		
-+	return dm_report_field_string(rh, field, &buf);
-+}
-+
-+static int _dm_info_target_types_disp(struct dm_report *rh,
-+					 struct dm_pool *mem __attribute((unused)),
-+					 struct dm_report_field *field, const void *data,
-+					 void *private __attribute((unused)))
-+{
-+	char buf[1024];
-+	char *dest = buf;
-+	int remains = sizeof(buf);
-+	int written;
-+	const char *s = buf;
-+	struct dm_task *dmt = (struct dm_task *) data;
-+	void *next = NULL;
-+	uint64_t start, length;
-+	char *target_type = NULL;
-+	char *params;
-+
-+
-+	buf[0] = '\0';
-+	
-+	next = dm_get_next_target(dmt, next, &start, &length,
-+				  &target_type, &params);
-+	if (target_type) {
-+		written = snprintf(dest, remains, "%s", target_type);
-+		dest += written;
-+		remains -= written;
-+
-+		while (remains > 0 && next) {
-+			next = dm_get_next_target(dmt, next, &start, &length,
-+						  &target_type, &params);
-+			if (target_type) {
-+				written = snprintf(dest, remains, ",%s", target_type);
-+				dest += written;
-+				remains -= written;
-+			}
-+		}
-+	}
-+
-+	buf[sizeof(buf)-1] = '\0';
-+	
-+	return dm_report_field_string(rh, field, &s);
-+}
-+
- static int _dm_info_devno_disp(struct dm_report *rh, struct dm_pool *mem,
- 			       struct dm_report_field *field, const void *data,
- 			       void *private)
-@@ -2057,6 +2134,7 @@
- 	{ DR_DEPS, "Mapped Device Relationship Information", "", _deps_get_obj },
- 	{ DR_TREE, "Mapped Device Relationship Information", "", _tree_get_obj },
- 	{ DR_NAME, "Mapped Device Name Components", "", _split_name_get_obj },
-+	{ DR_TABLE, "Mapped Device Table", "", _task_get_obj },
- 	{ 0, "", "", NULL },
- };
- 
-@@ -2076,6 +2154,7 @@
- FIELD_F(TASK, NUM, "RAhead", 6, dm_read_ahead, "read_ahead", "Read ahead in sectors.")
- 
- FIELD_F(INFO, STR, "Stat", 4, dm_info_status, "attr", "(L)ive, (I)nactive, (s)uspended, (r)ead-only, read-(w)rite.")
-+FIELD_F(INFO, STR, "State", 1, dm_info_cleartext_status, "status", "State as cleartext.")
- FIELD_F(INFO, STR, "Tables", 6, dm_info_table_loaded, "tables_loaded", "Which of the live and inactive table slots are filled.")
- FIELD_F(INFO, STR, "Suspended", 9, dm_info_suspended, "suspended", "Whether the device is suspended.")
- FIELD_F(INFO, STR, "Read-only", 9, dm_info_read_only, "readonly", "Whether the device is read-only or writeable.")
-@@ -2086,6 +2165,11 @@
- FIELD_O(INFO, dm_info, NUM, "Targ", target_count, 4, int32, "segments", "Number of segments in live table, if present.")
- FIELD_O(INFO, dm_info, NUM, "Event", event_nr, 6, uint32, "events", "Number of most recent event.")
- 
-+FIELD_O(INFO, dm_info, NUM, "RO", read_only, 2, int, "read_only", "Read only.")
-+FIELD_O(INFO, dm_info, NUM, "Ex", exists, 2, int, "exists", "Exists.")
-+FIELD_O(INFO, dm_info, NUM, "Susp", suspended, 4, int, "suspended", "Suspended.")
-+FIELD_O(INFO, dm_info, NUM, "tab_live", live_table, 8, int, "table_live", "Live table.")
-+FIELD_O(INFO, dm_info, NUM, "tab_inact", inactive_table, 9, int, "table_inactive", "Inactive table.")
- FIELD_O(DEPS, dm_deps, NUM, "#Devs", count, 5, int32, "device_count", "Number of devices used by this one.")
- FIELD_F(TREE, STR, "DevNames", 8, dm_deps_names, "devs_used", "List of names of mapped devices used by this one.")
- FIELD_F(DEPS, STR, "DevNos", 6, dm_deps, "devnos_used", "List of device numbers of devices used by this one.")
-@@ -2093,6 +2177,7 @@
- FIELD_F(TREE, NUM, "#Refs", 5, dm_tree_parents_count, "device_ref_count", "Number of mapped devices referencing this one.")
- FIELD_F(TREE, STR, "RefNames", 8, dm_tree_parents_names, "names_using_dev", "List of names of mapped devices using this one.")
- FIELD_F(TREE, STR, "RefDevNos", 9, dm_tree_parents_devs, "devnos_using_dev", "List of device numbers of mapped devices using this one.")
-+FIELD_F(TABLE, STR, "Targettypes", 32, dm_info_target_types, "target_types", "Used target types.")
- 
- FIELD_O(NAME, dm_split_name, STR, "Subsys", subsystem, 6, dm_subsystem, "subsystem", "Userspace subsystem responsible for this device.")
- FIELD_O(NAME, dm_split_name, STR, "VG", vg_name, 4, dm_vg_name, "vg_name", "LVM Volume Group name.")
-@@ -2109,14 +2194,16 @@
- #undef FIELD_F
- 
- static const char *default_report_options = "name,major,minor,attr,open,segments,events,uuid";
-+static const char *default_export_options = "name,major,minor,status,read_only,exists,suspended,table_live,table_inactive,open,segments,events,uuid,target_types";
- static const char *splitname_report_options = "vg_name,lv_name,lv_layer";
- 
- static int _report_init(struct command *c)
- {
--	char *options = (char *) default_report_options;
-+	char *default_options = (char *) default_report_options;
-+	char *options;
- 	const char *keys = "";
- 	const char *separator = " ";
--	int aligned = 1, headings = 1, buffered = 1, field_prefixes = 0;
-+	int aligned = 1, headings = 1, buffered = 1, field_prefixes = 0, export = 0;
- 	int quoted = 1, columns_as_rows = 0;
- 	uint32_t flags = 0;
- 	size_t len = 0;
-@@ -2146,6 +2233,15 @@
- 		field_prefixes = 1;
- 	}
- 
-+	if (_switches[EXPORT_ARG]) {
-+		default_options = (char *) default_export_options;
-+		separator = "\n";
-+		aligned = 0;
-+		headings = 0;
-+		export = 1;
-+	}
-+
-+	options = default_options;
- 	if (_switches[OPTIONS_ARG] && _string_args[OPTIONS_ARG]) {
- 		if (*_string_args[OPTIONS_ARG] != '+')
- 			options = _string_args[OPTIONS_ARG];
-@@ -2197,6 +2293,9 @@
- 	if (columns_as_rows)
- 		flags |= DM_REPORT_OUTPUT_COLUMNS_AS_ROWS;
- 
-+	if (export)
-+		flags |= DM_REPORT_OUTPUT_EXPORT;
-+
- 	if (!(_report = dm_report_init(&_report_type,
- 				       _report_types, _report_fields,
- 				       options, separator, flags, keys, NULL)))
-@@ -2276,7 +2375,8 @@
- 	fprintf(out, "dmsetup [--version] [-v|--verbose [-v|--verbose ...]]\n"
- 		"        [-r|--readonly] [--noopencount] [--nolockfs]\n"
- 		"        [--readahead [+]<sectors>|auto|none]\n"
--		"        [-c|-C|--columns] [-o <fields>] [-O|--sort <sort_fields>]\n"
-+ 		"        [-c|-C|--columns] [-e|--export]\n"
-+ 		"        [-o <fields>] [-O|--sort <sort_fields>]\n"
- 		"        [--nameprefixes] [--noheadings] [--separator <separator>]\n\n");
- 	for (i = 0; _commands[i].name; i++)
- 		fprintf(out, "\t%s %s\n", _commands[i].name, _commands[i].help);
-@@ -2532,7 +2632,7 @@
- 			show_all++;
- 		if (c == 'd')
- 			delete++;
--		if (c == 'e')
-+		if (c == 'E')
- 			encrypt_loop++;
- 		if (c == 'f')
- 			find++;
-@@ -2627,6 +2727,7 @@
- 	static struct option long_options[] = {
- 		{"readonly", 0, &ind, READ_ONLY},
- 		{"columns", 0, &ind, COLS_ARG},
-+		{"export", 0, &ind, EXPORT_ARG},
- 		{"exec", 1, &ind, EXEC_ARG},
- 		{"force", 0, &ind, FORCE_ARG},
- 		{"gid", 1, &ind, GID_ARG},
-@@ -2709,12 +2810,16 @@
- 
- 	optarg = 0;
- 	optind = OPTIND_INIT;
--	while ((ind = -1, c = GETOPTLONG_FN(*argc, *argv, "cCfG:j:m:M:no:O:ru:U:v",
-+	while ((ind = -1, c = GETOPTLONG_FN(*argc, *argv, "cCefG:j:m:M:no:O:ru:U:v",
- 					    long_options, NULL)) != -1) {
- 		if (c == ':' || c == '?')
- 			return 0;
- 		if (c == 'c' || c == 'C' || ind == COLS_ARG)
- 			_switches[COLS_ARG]++;
-+		if (c == 'e' || ind == EXPORT_ARG) {
-+			_switches[EXPORT_ARG]++;
-+			_switches[COLS_ARG]++;
-+		}
- 		if (c == 'f' || ind == FORCE_ARG)
- 			_switches[FORCE_ARG]++;
- 		if (c == 'r' || ind == READ_ONLY)
diff --git a/sys-fs/lvm2/files/lvm2-2.02.48-fix-pkgconfig.patch b/sys-fs/lvm2/files/lvm2-2.02.48-fix-pkgconfig.patch
deleted file mode 100644
index 10d923b835b9..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.48-fix-pkgconfig.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-libdevmapper.so doesn't link to SELinux libraries unless SELinux is enabled.
-Adding those libraries to Libs.private unconditionally is wrong.
-
-See bug 270350
----
---- LVM2.2.02.48/configure.in
-+++ LVM2.2.02.48/configure.in
-@@ -558,18 +558,19 @@
- 	if test x$HAVE_SEPOL = xyes; then
- 		AC_DEFINE([HAVE_SEPOL], 1,
- 		  [Define to 1 if sepol_check_context is available.])
--		LIBS="-lsepol $LIBS"
-+		SELINUX_LIBS="-lsepol $SELINUX_LIBS"
- 	fi
- 
- 	AC_CHECK_LIB(selinux, is_selinux_enabled, HAVE_SELINUX=yes, HAVE_SELINUX=no)
- 
- 	if test x$HAVE_SELINUX = xyes; then
- 		AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
--		LIBS="-lselinux $LIBS"
-+		SELINUX_LIBS="-lselinux $SELINUX_LIBS"
- 	else
- 		AC_MSG_WARN(Disabling selinux)
- 	fi
- 
-+	LIBS="$SELINUX_LIBS $LIBS"
- 	# With --enable-static_link and selinux enabled, linking
- 	# fails on at least Debian unstable due to unsatisfied references
- 	# to pthread_mutex_lock and _unlock.  See if we need -lpthread.
-@@ -813,6 +814,7 @@
- AC_SUBST(POOL)
- AC_SUBST(QUORUM_CFLAGS)
- AC_SUBST(QUORUM_LIBS)
-+AC_SUBST(SELINUX_LIBS)
- AC_SUBST(SNAPSHOTS)
- AC_SUBST(STATICDIR)
- AC_SUBST(STATIC_LINK)
---- LVM2.2.02.48/libdm/libdevmapper.pc.in
-+++ LVM2.2.02.48/libdm/libdevmapper.pc.in
-@@ -8,4 +8,4 @@
- Version: @DM_LIB_PATCHLEVEL@
- Cflags: -I${includedir} 
- Libs: -L${libdir} -ldevmapper
--Libs.private: -lselinux -lsepol
-+Libs.private: @SELINUX_LIBS@
diff --git a/sys-fs/lvm2/files/lvm2-2.02.49-lockdir-override.patch b/sys-fs/lvm2/files/lvm2-2.02.49-lockdir-override.patch
deleted file mode 100644
index 12fc06563548..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.49-lockdir-override.patch
+++ /dev/null
@@ -1,386 +0,0 @@
-diff -Nuarp --exclude '*~' --exclude '*.[oda]' --exclude '*.so' --exclude '*.static' --exclude test --exclude '*.in' --exclude Makefile --exclude man --exclude '*.pc' --exclude autoconf --exclude '*.po' LVM2.2.02.49.orig/lib/locking/file_locking.c LVM2.2.02.49/lib/locking/file_locking.c
---- LVM2.2.02.49.orig/lib/locking/file_locking.c	2008-11-12 01:30:52.000000000 -0800
-+++ LVM2.2.02.49/lib/locking/file_locking.c	2009-07-23 17:39:10.021993262 -0700
-@@ -271,17 +271,22 @@ static int _file_lock_resource(struct cm
- 	return 1;
- }
- 
--int init_file_locking(struct locking_type *locking, struct cmd_context *cmd)
-+int init_file_locking(struct locking_type *locking, struct cmd_context *cmd, const char *lock_dir)
- {
- 	locking->lock_resource = _file_lock_resource;
- 	locking->reset_locking = _reset_file_locking;
- 	locking->fin_locking = _fin_file_locking;
- 	locking->flags = 0;
- 
--	/* Get lockfile directory from config file */
--	strncpy(_lock_dir, find_config_tree_str(cmd, "global/locking_dir",
--						DEFAULT_LOCK_DIR),
--		sizeof(_lock_dir));
-+	if(lock_dir) {
-+		/* Get lockfile directory from commandline */
-+		strncpy(_lock_dir, lock_dir, sizeof(_lock_dir));
-+	} else {
-+		/* Get lockfile directory from config file */
-+		strncpy(_lock_dir, find_config_tree_str(cmd, "global/locking_dir",
-+							DEFAULT_LOCK_DIR),
-+			sizeof(_lock_dir));
-+	}
- 
- 	if (!dm_create_dir(_lock_dir))
- 		return 0;
-diff -Nuarp --exclude '*~' --exclude '*.[oda]' --exclude '*.so' --exclude '*.static' --exclude test --exclude '*.in' --exclude Makefile --exclude man --exclude '*.pc' --exclude autoconf --exclude '*.po' LVM2.2.02.49.orig/lib/locking/locking.c LVM2.2.02.49/lib/locking/locking.c
---- LVM2.2.02.49.orig/lib/locking/locking.c	2009-07-14 22:49:47.000000000 -0700
-+++ LVM2.2.02.49/lib/locking/locking.c	2009-07-23 17:32:53.558509986 -0700
-@@ -213,7 +213,7 @@ static void _update_vg_lock_count(const 
-  * Select a locking type
-  * type: locking type; if < 0, then read config tree value
-  */
--int init_locking(int type, struct cmd_context *cmd)
-+int init_locking(int type, struct cmd_context *cmd, const char *lock_dir)
- {
- 	if (type < 0)
- 		type = find_config_tree_int(cmd, "global/locking_type", 1);
-@@ -228,7 +228,7 @@ int init_locking(int type, struct cmd_co
- 
- 	case 1:
- 		log_very_verbose("File-based locking selected.");
--		if (!init_file_locking(&_locking, cmd))
-+		if (!init_file_locking(&_locking, cmd, lock_dir))
- 			break;
- 		return 1;
- 
-@@ -268,7 +268,7 @@ int init_locking(int type, struct cmd_co
- 		log_warn("WARNING: Falling back to local file-based locking.");
- 		log_warn("Volume Groups with the clustered attribute will "
- 			  "be inaccessible.");
--		if (init_file_locking(&_locking, cmd))
-+		if (init_file_locking(&_locking, cmd, lock_dir))
- 			return 1;
- 	}
- 
-diff -Nuarp --exclude '*~' --exclude '*.[oda]' --exclude '*.so' --exclude '*.static' --exclude test --exclude '*.in' --exclude Makefile --exclude man --exclude '*.pc' --exclude autoconf --exclude '*.po' LVM2.2.02.49.orig/lib/locking/locking.h LVM2.2.02.49/lib/locking/locking.h
---- LVM2.2.02.49.orig/lib/locking/locking.h	2009-06-12 01:30:19.000000000 -0700
-+++ LVM2.2.02.49/lib/locking/locking.h	2009-07-23 17:31:49.638555398 -0700
-@@ -19,7 +19,7 @@
- #include "uuid.h"
- #include "config.h"
- 
--int init_locking(int type, struct cmd_context *cmd);
-+int init_locking(int type, struct cmd_context *cmd, const char *lock_dir);
- void fin_locking(void);
- void reset_locking(void);
- int vg_write_lock_held(void);
-diff -Nuarp --exclude '*~' --exclude '*.[oda]' --exclude '*.so' --exclude '*.static' --exclude test --exclude '*.in' --exclude Makefile --exclude man --exclude '*.pc' --exclude autoconf --exclude '*.po' LVM2.2.02.49.orig/lib/locking/locking_types.h LVM2.2.02.49/lib/locking/locking_types.h
---- LVM2.2.02.49.orig/lib/locking/locking_types.h	2009-07-14 22:57:11.000000000 -0700
-+++ LVM2.2.02.49/lib/locking/locking_types.h	2009-07-23 17:37:58.598009804 -0700
-@@ -42,7 +42,7 @@ int init_no_locking(struct locking_type 
- 
- int init_readonly_locking(struct locking_type *locking, struct cmd_context *cmd);
- 
--int init_file_locking(struct locking_type *locking, struct cmd_context *cmd);
-+int init_file_locking(struct locking_type *locking, struct cmd_context *cmd, const char *lock_dir);
- 
- int init_external_locking(struct locking_type *locking, struct cmd_context *cmd);
- 
-diff -Nuarp --exclude '*~' --exclude '*.[oda]' --exclude '*.so' --exclude '*.static' --exclude test --exclude '*.in' --exclude Makefile --exclude man --exclude '*.pc' --exclude autoconf --exclude '*.po' LVM2.2.02.49.orig/liblvm/lvm_base.c LVM2.2.02.49/liblvm/lvm_base.c
---- LVM2.2.02.49.orig/liblvm/lvm_base.c	2009-07-13 20:01:18.000000000 -0700
-+++ LVM2.2.02.49/liblvm/lvm_base.c	2009-07-23 17:38:09.830509799 -0700
-@@ -39,7 +39,7 @@ lvm_t lvm_create(const char *system_dir)
- 
- 	/* FIXME: locking_type config option needed? */
- 	/* initialize locking */
--	if (!init_locking(-1, cmd)) {
-+	if (!init_locking(-1, cmd, NULL)) {
- 		/* FIXME: use EAGAIN as error code here */
- 		log_error("Locking initialisation failed.");
- 		lvm_destroy((lvm_t) cmd);
-diff -Nuarp --exclude '*~' --exclude '*.[oda]' --exclude '*.so' --exclude '*.static' --exclude test --exclude '*.in' --exclude Makefile --exclude man --exclude '*.pc' --exclude autoconf --exclude '*.po' LVM2.2.02.49.orig/tools/args.h LVM2.2.02.49/tools/args.h
---- LVM2.2.02.49.orig/tools/args.h	2009-06-04 05:01:16.000000000 -0700
-+++ LVM2.2.02.49/tools/args.h	2009-07-23 17:30:36.680664586 -0700
-@@ -22,6 +22,7 @@ arg(version_ARG, '\0', "version", NULL, 
- arg(quiet_ARG, '\0', "quiet", NULL, 0)
- arg(physicalvolumesize_ARG, '\0', "setphysicalvolumesize", size_mb_arg, 0)
- arg(ignorelockingfailure_ARG, '\0', "ignorelockingfailure", NULL, 0)
-+arg(lock_dir_ARG, '\0', "lock-dir", string_arg, 0)
- arg(nolocking_ARG, '\0', "nolocking", NULL, 0)
- arg(metadatacopies_ARG, '\0', "metadatacopies", int_arg, 0)
- arg(metadatasize_ARG, '\0', "metadatasize", size_mb_arg, 0)
-diff -Nuarp --exclude '*~' --exclude '*.[oda]' --exclude '*.so' --exclude '*.static' --exclude test --exclude '*.in' --exclude Makefile --exclude man --exclude '*.pc' --exclude autoconf --exclude '*.po' LVM2.2.02.49.orig/tools/commands.h LVM2.2.02.49/tools/commands.h
---- LVM2.2.02.49.orig/tools/commands.h	2009-07-06 12:13:26.000000000 -0700
-+++ LVM2.2.02.49/tools/commands.h	2009-07-23 17:30:36.680664586 -0700
-@@ -70,6 +70,7 @@ xx(lvchange,
-    "\t[-f|--force]\n"
-    "\t[-h|--help]\n"
-    "\t[--ignorelockingfailure]\n"
-+   "\t[--lock-dir path]\n"
-    "\t[--ignoremonitoring]\n"
-    "\t[--monitor {y|n}]\n"
-    "\t[-M|--persistent y|n] [--major major] [--minor minor]\n"
-@@ -85,7 +86,7 @@ xx(lvchange,
-    "\tLogicalVolume[Path] [LogicalVolume[Path]...]\n",
- 
-    alloc_ARG, autobackup_ARG, available_ARG, contiguous_ARG, force_ARG,
--   ignorelockingfailure_ARG, ignoremonitoring_ARG, major_ARG, minor_ARG,
-+   ignorelockingfailure_ARG, lock_dir_ARG, ignoremonitoring_ARG, major_ARG, minor_ARG,
-    monitor_ARG, partial_ARG, permission_ARG, persistent_ARG, readahead_ARG,
-    resync_ARG, refresh_ARG, addtag_ARG, deltag_ARG, test_ARG, yes_ARG)
- 
-@@ -185,6 +186,7 @@ xx(lvdisplay,
-    "\t[-d|--debug]\n"
-    "\t[-h|--help]\n"
-    "\t[--ignorelockingfailure]\n"
-+   "\t[--lock-dir path]\n"
-    "\t[-m|--maps]\n"
-    "\t[--nosuffix]\n"
-    "\t[-P|--partial] " "\n"
-@@ -199,6 +201,7 @@ xx(lvdisplay,
-    "\t[-d|--debug]\n"
-    "\t[-h|--help]\n"
-    "\t[--ignorelockingfailure]\n"
-+   "\t[--lock-dir path]\n"
-    "\t[--noheadings]\n"
-    "\t[--nosuffix]\n"
-    "\t[-o|--options [+]Field[,Field]]\n"
-@@ -213,7 +216,7 @@ xx(lvdisplay,
-    "\t[LogicalVolume[Path] [LogicalVolume[Path]...]]\n",
- 
-     aligned_ARG, all_ARG, colon_ARG, columns_ARG, disk_ARG,
--    ignorelockingfailure_ARG, maps_ARG, noheadings_ARG, nosuffix_ARG,
-+    ignorelockingfailure_ARG, lock_dir_ARG, maps_ARG, noheadings_ARG, nosuffix_ARG,
-     options_ARG, sort_ARG, partial_ARG, segments_ARG, separator_ARG,
-     unbuffered_ARG, units_ARG)
- 
-@@ -373,6 +376,7 @@ xx(lvs,
-    "\t[-d|--debug]\n"
-    "\t[-h|--help]\n"
-    "\t[--ignorelockingfailure]\n"
-+   "\t[--lock-dir path]\n"
-    "\t[--nameprefixes]\n"
-    "\t[--noheadings]\n"
-    "\t[--nosuffix]\n"
-@@ -390,7 +394,7 @@ xx(lvs,
-    "\t[--version]" "\n"
-    "\t[LogicalVolume[Path] [LogicalVolume[Path]...]]\n",
- 
--   aligned_ARG, all_ARG, ignorelockingfailure_ARG, nameprefixes_ARG,
-+   aligned_ARG, all_ARG, ignorelockingfailure_ARG, lock_dir_ARG, nameprefixes_ARG,
-    noheadings_ARG, nolocking_ARG, nosuffix_ARG, options_ARG, partial_ARG, 
-    rows_ARG, segments_ARG, separator_ARG, sort_ARG, trustcache_ARG,
-    unbuffered_ARG, units_ARG, unquoted_ARG)
-@@ -404,11 +408,12 @@ xx(lvscan,
-    "\t[-d|--debug] " "\n"
-    "\t[-h|-?|--help] " "\n"
-    "\t[--ignorelockingfailure]\n"
-+   "\t[--lock-dir path]\n"
-    "\t[-P|--partial] " "\n"
-    "\t[-v|--verbose] " "\n"
-    "\t[--version]\n",
- 
--   all_ARG, blockdevice_ARG, disk_ARG, ignorelockingfailure_ARG, partial_ARG)
-+   all_ARG, blockdevice_ARG, disk_ARG, ignorelockingfailure_ARG, lock_dir_ARG, partial_ARG)
- 
- xx(pvchange,
-    "Change attributes of physical volume(s)",
-@@ -510,6 +515,7 @@ xx(pvdisplay,
-    "\t[-d|--debug]\n"
-    "\t[-h|--help]\n"
-    "\t[--ignorelockingfailure]\n"
-+   "\t[--lock-dir path]\n"
-    "\t[-m|--maps]\n"
-    "\t[--nosuffix]\n"
-    "\t[-s|--short]\n"
-@@ -524,6 +530,7 @@ xx(pvdisplay,
-    "\t[-d|--debug]\n"
-    "\t[-h|--help]\n"
-    "\t[--ignorelockingfailure]\n"
-+   "\t[--lock-dir path]\n"
-    "\t[--noheadings]\n"
-    "\t[--nosuffix]\n"
-    "\t[-o|--options [+]Field[,Field]]\n"
-@@ -535,7 +542,7 @@ xx(pvdisplay,
-    "\t[--version]" "\n"
-    "\t[PhysicalVolumePath [PhysicalVolumePath...]]\n",
- 
--   aligned_ARG, all_ARG, colon_ARG, columns_ARG, ignorelockingfailure_ARG,
-+   aligned_ARG, all_ARG, colon_ARG, columns_ARG, ignorelockingfailure_ARG, lock_dir_ARG,
-    maps_ARG, noheadings_ARG, nosuffix_ARG, options_ARG, separator_ARG,
-    short_ARG, sort_ARG, unbuffered_ARG, units_ARG)
- 
-@@ -585,6 +592,7 @@ xx(pvs,
-    "\t[-d|--debug]" "\n"
-    "\t[-h|-?|--help] " "\n"
-    "\t[--ignorelockingfailure]\n"
-+   "\t[--lock-dir path]\n"
-    "\t[--nameprefixes]\n"
-    "\t[--noheadings]\n"
-    "\t[--nosuffix]\n"
-@@ -602,7 +610,7 @@ xx(pvs,
-    "\t[--version]\n"
-    "\t[PhysicalVolume [PhysicalVolume...]]\n",
- 
--   aligned_ARG, all_ARG, ignorelockingfailure_ARG, nameprefixes_ARG,
-+   aligned_ARG, all_ARG, ignorelockingfailure_ARG, lock_dir_ARG, nameprefixes_ARG,
-    noheadings_ARG, nolocking_ARG, nosuffix_ARG, options_ARG, partial_ARG,
-    rows_ARG, segments_ARG, separator_ARG, sort_ARG, trustcache_ARG,
-    unbuffered_ARG, units_ARG, unquoted_ARG)
-@@ -615,13 +623,14 @@ xx(pvscan,
-    "\t{-e|--exported | -n|--novolumegroup} " "\n"
-    "\t[-h|-?|--help]" "\n"
-    "\t[--ignorelockingfailure]\n"
-+   "\t[--lock-dir path]\n"
-    "\t[-P|--partial] " "\n"
-    "\t[-s|--short] " "\n"
-    "\t[-u|--uuid] " "\n"
-    "\t[-v|--verbose] " "\n"
-    "\t[--version]\n",
- 
--   exported_ARG, ignorelockingfailure_ARG, novolumegroup_ARG, partial_ARG,
-+   exported_ARG, ignorelockingfailure_ARG, lock_dir_ARG, novolumegroup_ARG, partial_ARG,
-    short_ARG, uuid_ARG)
- 
- xx(segtypes,
-@@ -637,12 +646,13 @@ xx(vgcfgbackup,
-    "\t[-f|--file filename] " "\n"
-    "\t[-h|-?|--help] " "\n"
-    "\t[--ignorelockingfailure]\n"
-+   "\t[--lock-dir path]\n"
-    "\t[-P|--partial] " "\n"
-    "\t[-v|--verbose]" "\n"
-    "\t[--version] " "\n"
-    "\t[VolumeGroupName...]\n",
- 
--   file_ARG, ignorelockingfailure_ARG, partial_ARG)
-+   file_ARG, ignorelockingfailure_ARG, lock_dir_ARG, partial_ARG)
- 
- xx(vgcfgrestore,
-    "Restore volume group configuration",
-@@ -671,6 +681,7 @@ xx(vgchange,
-    "\t[-d|--debug] " "\n"
-    "\t[-h|--help] " "\n"
-    "\t[--ignorelockingfailure]\n"
-+   "\t[--lock-dir path]\n"
-    "\t[--ignoremonitoring]\n"
-    "\t[--monitor {y|n}]\n"
-    "\t[--refresh]\n"
-@@ -689,7 +700,7 @@ xx(vgchange,
-    "\t[VolumeGroupName...]\n",
- 
-    addtag_ARG, alloc_ARG, allocation_ARG, autobackup_ARG, available_ARG,
--   clustered_ARG, deltag_ARG, ignorelockingfailure_ARG, ignoremonitoring_ARG,
-+   clustered_ARG, deltag_ARG, ignorelockingfailure_ARG, lock_dir_ARG, ignoremonitoring_ARG,
-    logicalvolume_ARG, maxphysicalvolumes_ARG, monitor_ARG, partial_ARG,
-    physicalextentsize_ARG, refresh_ARG, resizeable_ARG, resizable_ARG,
-    test_ARG, uuid_ARG)
-@@ -752,6 +763,7 @@ xx(vgdisplay,
-    "\t[-d|--debug] " "\n"
-    "\t[-h|--help] " "\n"
-    "\t[--ignorelockingfailure]" "\n"
-+   "\t[--lock-dir path]\n"
-    "\t[--nosuffix]\n"
-    "\t[-P|--partial] " "\n"
-    "\t[--units hsbkmgtHKMGT]\n"
-@@ -764,6 +776,7 @@ xx(vgdisplay,
-    "\t[-d|--debug] " "\n"
-    "\t[-h|--help] " "\n"
-    "\t[--ignorelockingfailure]" "\n"
-+   "\t[--lock-dir path]\n"
-    "\t[--noheadings]\n"
-    "\t[--nosuffix]\n"
-    "\t[-o|--options [+]Field[,Field]]\n"
-@@ -777,7 +790,7 @@ xx(vgdisplay,
-    "\t[VolumeGroupName [VolumeGroupName...]]\n",
- 
-    activevolumegroups_ARG, aligned_ARG, colon_ARG, columns_ARG, disk_ARG,
--   ignorelockingfailure_ARG, noheadings_ARG, nosuffix_ARG, options_ARG,
-+   ignorelockingfailure_ARG, lock_dir_ARG, noheadings_ARG, nosuffix_ARG, options_ARG,
-    partial_ARG, short_ARG, separator_ARG, sort_ARG, unbuffered_ARG, units_ARG)
- 
- xx(vgexport,
-@@ -844,12 +857,13 @@ xx(vgmknodes,
-    "\t[-d|--debug]\n"
-    "\t[-h|--help]\n"
-    "\t[--ignorelockingfailure]\n"
-+   "\t[--lock-dir path]\n"
-    "\t[--refresh]\n"
-    "\t[-v|--verbose]\n"
-    "\t[--version]" "\n"
-    "\t[VolumeGroupName...]\n",
- 
--   ignorelockingfailure_ARG, refresh_ARG)
-+   ignorelockingfailure_ARG, lock_dir_ARG, refresh_ARG)
- 
- xx(vgreduce,
-    "Remove physical volume(s) from a volume group",
-@@ -909,6 +923,7 @@ xx(vgs,
-    "\t[-d|--debug]\n"
-    "\t[-h|--help]\n"
-    "\t[--ignorelockingfailure]\n"
-+   "\t[--lock-dir path]\n"
-    "\t[--nameprefixes]\n"
-    "\t[--noheadings]\n"
-    "\t[--nosuffix]\n"
-@@ -925,7 +940,7 @@ xx(vgs,
-    "\t[--version]\n"
-    "\t[VolumeGroupName [VolumeGroupName...]]\n",
- 
--   aligned_ARG, all_ARG, ignorelockingfailure_ARG, nameprefixes_ARG,
-+   aligned_ARG, all_ARG, ignorelockingfailure_ARG, lock_dir_ARG, nameprefixes_ARG,
-    noheadings_ARG, nolocking_ARG, nosuffix_ARG, options_ARG, partial_ARG, 
-    rows_ARG, separator_ARG, sort_ARG, trustcache_ARG, unbuffered_ARG, units_ARG,
-    unquoted_ARG)
-@@ -937,12 +952,13 @@ xx(vgscan,
-    "\t[-d|--debug]\n"
-    "\t[-h|--help]\n"
-    "\t[--ignorelockingfailure]\n"
-+   "\t[--lock-dir path]\n"
-    "\t[--mknodes]\n"
-    "\t[-P|--partial] " "\n"
-    "\t[-v|--verbose]\n"
-    "\t[--version]" "\n",
- 
--   ignorelockingfailure_ARG, mknodes_ARG, partial_ARG)
-+   ignorelockingfailure_ARG, lock_dir_ARG, mknodes_ARG, partial_ARG)
- 
- xx(vgsplit,
-    "Move physical volumes into a new or existing volume group",
-diff -Nuarp --exclude '*~' --exclude '*.[oda]' --exclude '*.so' --exclude '*.static' --exclude test --exclude '*.in' --exclude Makefile --exclude man --exclude '*.pc' --exclude autoconf --exclude '*.po' LVM2.2.02.49.orig/tools/lvmcmdline.c LVM2.2.02.49/tools/lvmcmdline.c
---- LVM2.2.02.49.orig/tools/lvmcmdline.c	2009-07-13 12:49:49.000000000 -0700
-+++ LVM2.2.02.49/tools/lvmcmdline.c	2009-07-23 17:37:30.774058849 -0700
-@@ -964,6 +964,7 @@ int lvm_run_command(struct cmd_context *
- {
- 	int ret = 0;
- 	int locking_type;
-+	const char *lock_dir;
- 
- 	init_error_message_produced(0);
- 
-@@ -1015,7 +1016,12 @@ int lvm_run_command(struct cmd_context *
- 	else
- 		locking_type = -1;
- 
--	if (!init_locking(locking_type, cmd)) {
-+	if(arg_count(cmd, lock_dir_ARG)) {
-+		/* Get lockfile directory from commandline */
-+		lock_dir = arg_str_value(cmd, lock_dir_ARG, "");
-+	}
-+
-+	if (!init_locking(locking_type, cmd, lock_dir)) {
- 		log_error("Locking type %d initialisation failed.",
- 			  locking_type);
- 		ret = ECMD_FAILED;
-diff -Nuarp LVM2.2.02.49.orig/man/lvm.8.in LVM2.2.02.49/man/lvm.8.in
---- LVM2.2.02.49.orig/man/lvm.8.in	2009-05-14 09:46:13.000000000 -0700
-+++ LVM2.2.02.49/man/lvm.8.in	2009-07-24 15:48:14.768492371 -0700
-@@ -202,6 +202,11 @@ This lets you proceed with read-only met
- One use for this is in a system init script if the lock directory 
- is mounted read-only when the script runs.
- .TP
-+\fB--lock-dir\fP
-+This lets you override the directory used for lockfiles, as an alternative to
-+entirely overriding locking failures. One use for this is in a system init script
-+where parts of the system are still read-only.
-+.TP
- \fB--addtag tag\fP
- Add the tag \fBtag\fP to a PV, VG or LV.  
- A tag is a word that can be used to group LVM2 objects of the same type 
diff --git a/sys-fs/lvm2/files/lvm2-2.02.51-as-needed.patch b/sys-fs/lvm2/files/lvm2-2.02.51-as-needed.patch
deleted file mode 100644
index 371ef48b395d..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.51-as-needed.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-Compile-fix with --as-needed.
-
-To ensure correct output when --as-needed are in the linker flags, the order of
-flags to the linker (directly or via the compiler) must explictly only include
-libraries and objects AFTER all compiler flags, linker flags and linker
-directory arguments.
-
-X-Gentoo-Bug: #217644
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-Ported-from: lvm2-2.02.48-as-needed.patch
-
-diff -Naru --exclude '*.rej' --exclude '*.orig' LVM2.2.02.51.orig/daemons/clogd/Makefile LVM2.2.02.51/daemons/clogd/Makefile
---- LVM2.2.02.51.orig/daemons/clogd/Makefile	2009-07-28 21:14:12.000000000 +0000
-+++ LVM2.2.02.51/daemons/clogd/Makefile	2009-08-27 00:09:53.215521890 +0000
-@@ -45,12 +45,12 @@
- 	else \
- 		echo '-L/usr/lib/openais -L/usr/lib -L/lib'; \
- 	fi)
--LDFLAGS += -lcpg -lSaCkpt -lext2fs -ldevmapper
-+LIBS += -lcpg -lSaCkpt -lext2fs -ldevmapper
- 
- all: ${TARGET}
- 
- clogd: ${SOURCES}
--	${CC} ${CFLAGS} -o $@ $^ ${LDFLAGS}
-+	${CC} ${CFLAGS} ${LDFLAGS} -o $@ $^ ${LIBS}
- 
- no_clogd_kernel_headers:
- 	echo "Unable to find clogd kernel headers"
-diff -Naru --exclude '*.rej' --exclude '*.orig' LVM2.2.02.51.orig/daemons/clvmd/Makefile.in LVM2.2.02.51/daemons/clvmd/Makefile.in
---- LVM2.2.02.51.orig/daemons/clvmd/Makefile.in	2009-03-10 12:10:12.000000000 +0000
-+++ LVM2.2.02.51/daemons/clvmd/Makefile.in	2009-08-27 00:06:20.642231272 +0000
-@@ -101,7 +101,7 @@
- 	install_clvmd
- 
- clvmd: $(OBJECTS) $(top_srcdir)/lib/liblvm-internal.a
--	$(CC) -o clvmd $(OBJECTS) $(CFLAGS) $(LDFLAGS) \
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o clvmd $(OBJECTS) \
- 		$(LVMLIBS) $(LMLIBS) $(LIBS)
- 
- .PHONY: install_clvmd
-diff -Naru --exclude '*.rej' --exclude '*.orig' LVM2.2.02.51.orig/daemons/dmeventd/Makefile.in LVM2.2.02.51/daemons/dmeventd/Makefile.in
---- LVM2.2.02.51.orig/daemons/dmeventd/Makefile.in	2009-08-27 00:04:46.805552570 +0000
-+++ LVM2.2.02.51/daemons/dmeventd/Makefile.in	2009-08-27 00:06:20.642231272 +0000
-@@ -41,12 +41,12 @@
- all: dmeventd
- device-mapper: dmeventd $(LIB_STATIC)
- 
--LDFLAGS += -ldl -ldevmapper -lpthread
--CLDFLAGS += -ldl -ldevmapper -lpthread
-+LIBS += -ldl -ldevmapper -lpthread
- 
- dmeventd: $(LIB_SHARED) $(LIB_STATIC) $(VERSIONED_SHLIB) dmeventd.o
--	$(CC) -o $@ dmeventd.o $(CFLAGS) $(LDFLAGS) \
--	-L. -ldevmapper-event $(LIBS) -rdynamic
-+	$(CC) $(CFLAGS) $(LDFLAGS) -L. \
-+	-o $@ dmeventd.o \
-+	-ldevmapper-event $(LIBS) -rdynamic
- 
- .PHONY: install_dynamic install_static install_include \
- 	install_pkgconfig install_dmeventd
-diff -Naru --exclude '*.rej' --exclude '*.orig' LVM2.2.02.51.orig/daemons/dmeventd/plugins/mirror/Makefile.in LVM2.2.02.51/daemons/dmeventd/plugins/mirror/Makefile.in
---- LVM2.2.02.51.orig/daemons/dmeventd/plugins/mirror/Makefile.in	2009-05-11 10:28:46.000000000 +0000
-+++ LVM2.2.02.51/daemons/dmeventd/plugins/mirror/Makefile.in	2009-08-27 00:06:20.642231272 +0000
-@@ -17,7 +17,8 @@
- VPATH = @srcdir@
- 
- INCLUDES += -I${top_srcdir}/tools
--CLDFLAGS += -L${top_srcdir}/tools -ldevmapper @LVM2CMD_LIB@
-+CLDFLAGS += -L${top_srcdir}/tools
-+LIBS += -ldevmapper -lpthread @LVM2CMD_LIB@
- 
- SOURCES = dmeventd_mirror.c
- 
-diff -Naru --exclude '*.rej' --exclude '*.orig' LVM2.2.02.51.orig/daemons/dmeventd/plugins/snapshot/Makefile.in LVM2.2.02.51/daemons/dmeventd/plugins/snapshot/Makefile.in
---- LVM2.2.02.51.orig/daemons/dmeventd/plugins/snapshot/Makefile.in	2009-05-11 10:28:46.000000000 +0000
-+++ LVM2.2.02.51/daemons/dmeventd/plugins/snapshot/Makefile.in	2009-08-27 00:06:20.642231272 +0000
-@@ -17,7 +17,8 @@
- VPATH = @srcdir@
- 
- INCLUDES += -I${top_srcdir}/tools
--CLDFLAGS += -L${top_srcdir}/tools -ldevmapper @LVM2CMD_LIB@
-+CLDFLAGS += -L${top_srcdir}/tools
-+LIBS += -lpthread -ldevmapper @LVM2CMD_LIB@
- 
- SOURCES = dmeventd_snapshot.c
- 
-diff -Naru --exclude '*.rej' --exclude '*.orig' LVM2.2.02.51.orig/lib/Makefile.in LVM2.2.02.51/lib/Makefile.in
---- LVM2.2.02.51.orig/lib/Makefile.in	2009-06-03 11:31:06.000000000 +0000
-+++ LVM2.2.02.51/lib/Makefile.in	2009-08-27 00:06:20.642231272 +0000
-@@ -137,7 +137,8 @@
- endif
- 
- ifeq ("@DMEVENTD@", "yes")
--  CLDFLAGS += -ldevmapper-event
-+  CLDFLAGS += -L../daemons/dmeventd
-+  LIBS += -ldevmapper-event
- endif
- 
- LIB_NAME = liblvm-internal
-diff -Naru --exclude '*.rej' --exclude '*.orig' LVM2.2.02.51.orig/make.tmpl.in LVM2.2.02.51/make.tmpl.in
---- LVM2.2.02.51.orig/make.tmpl.in	2009-07-31 11:49:53.000000000 +0000
-+++ LVM2.2.02.51/make.tmpl.in	2009-08-27 00:06:20.645583990 +0000
-@@ -28,7 +28,7 @@
- LN_S = @LN_S@
- SED = @SED@
- 
--LIBS = @LIBS@
-+LIBS += @LIBS@ $(LVMLIBS) $(LMLIBS)
- DEFS += @DEFS@
- CFLAGS += @CFLAGS@
- CLDFLAGS += @CLDFLAGS@
-@@ -208,19 +208,19 @@
- ifeq ("@LIB_SUFFIX@","so")
- $(LIB_SHARED): $(OBJECTS) $(LDDEPS)
- 	$(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \
--	$(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
-+	$(CFLAGS) $(CLDFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
- endif
- 
- ifeq ("@LIB_SUFFIX@","dylib")
- $(LIB_SHARED): $(OBJECTS) $(LDDEPS)
- 	$(CC) -dynamiclib -dylib_current_version,$(LIB_VERSION) \
--	$(CFLAGS) $(CLDFLAGS) $(OBJECTS) $(LIBS) -o $@
-+	$(CFLAGS) $(CLDFLAGS) $(LDFLAGS) $(OBJECTS) $(LIBS) -o $@
- endif
- 
- %.so: %.a
- 	$(CC) -shared -Wl,-soname,$(notdir $@).$(LIB_VERSION) \
--	$(CFLAGS) $(CLDFLAGS) $(LIBS) -o $@ \
--	@CLDWHOLEARCHIVE@ $< @CLDNOWHOLEARCHIVE@
-+	$(CFLAGS) $(CLDFLAGS) $(LDFLAGS) -o $@ \
-+	@CLDWHOLEARCHIVE@ $< @CLDNOWHOLEARCHIVE@ $(LIBS)
- 
- $(LIB_STATIC): $(OBJECTS)
- 	$(RM) $@
-diff -Naru --exclude '*.rej' --exclude '*.orig' LVM2.2.02.51.orig/test/api/Makefile.in LVM2.2.02.51/test/api/Makefile.in
---- LVM2.2.02.51.orig/test/api/Makefile.in	2009-07-21 13:51:05.000000000 +0000
-+++ LVM2.2.02.51/test/api/Makefile.in	2009-08-27 00:07:52.285533964 +0000
-@@ -38,7 +38,7 @@
- OBJECTS = $(test_OBJECTS) $(vgtest_OBJECTS)
- 
- test: $(test_OBJECTS) $(DEPLIBS)
--	$(CC) -o test $(test_OBJECTS) $(CFLAGS) $(LDFLAGS) $(LVMLIBS) $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o test $(test_OBJECTS) $(LVMLIBS) $(LIBS)
- 
- vgtest: $(vgtest_OBJECTS) $(DEPLIBS)
--	$(CC) -o vgtest $(vgtest_OBJECTS) $(CFLAGS) $(LDFLAGS) $(LVMLIBS) $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o vgtest $(vgtest_OBJECTS) $(LVMLIBS) $(LIBS)
-diff -Naru --exclude '*.rej' --exclude '*.orig' LVM2.2.02.51.orig/tools/Makefile.in LVM2.2.02.51/tools/Makefile.in
---- LVM2.2.02.51.orig/tools/Makefile.in	2009-05-21 11:11:29.000000000 +0000
-+++ LVM2.2.02.51/tools/Makefile.in	2009-08-27 00:06:20.645583990 +0000
-@@ -106,24 +106,29 @@
- device-mapper: $(TARGETS_DM)
- 
- dmsetup: dmsetup.o $(top_srcdir)/libdm/libdevmapper.$(LIB_SUFFIX)
--	$(CC) -o $@ dmsetup.o $(CFLAGS) $(LDFLAGS) \
--	      -L$(top_srcdir)/libdm -ldevmapper $(LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) \
-+	      -L$(top_srcdir)/libdm \
-+		  -o $@ dmsetup.o \
-+		  -ldevmapper $(LIB_PTHREAD)
- 
- dmsetup.static: dmsetup.o $(interfacedir)/libdevmapper.a
--	$(CC) -o $@ dmsetup.o $(CFLAGS) $(LDFLAGS) -static \
--	      -L$(interfacedir) -ldevmapper $(LIBS) \
--	      $(LIB_PTHREAD)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -static \
-+	      -L$(interfacedir) \
-+		  -o $@ dmsetup.o \
-+		  -ldevmapper $(LIB_PTHREAD)
- 
- all: device-mapper
- 
- lvm: $(OBJECTS) lvm.o $(top_srcdir)/lib/liblvm-internal.a
--	$(CC) -o $@ $(CFLAGS) $(OBJECTS) lvm.o \
--		$(LDFLAGS) $(LVMLIBS) $(LIBS) -rdynamic
-+	$(CC) $(CFLAGS) $(LDFLAGS) \
-+		-o $@ $(OBJECTS) lvm.o \
-+		$(LVMLIBS) $(LIBS) -rdynamic
- 
- LIB_PTHREAD = @LIB_PTHREAD@
- lvm.static: $(OBJECTS) lvm-static.o $(top_srcdir)/lib/liblvm-internal.a  $(interfacedir)/libdevmapper.a
--	$(CC) -o $@ $(CFLAGS) $(OBJECTS) lvm-static.o -static \
--		-L$(interfacedir) $(LDFLAGS) $(LVMLIBS) $(LIBS) $(LIB_PTHREAD) -rdynamic
-+	$(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacedir) \
-+		-o $@ $(OBJECTS) lvm-static.o \
-+		$(LVMLIBS) $(LIBS) $(LIB_PTHREAD) -rdynamic
- 
- liblvm2cmd.a: $(top_srcdir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
- 	cat $(top_srcdir)/lib/liblvm-internal.a > $@
diff --git a/sys-fs/lvm2/files/lvm2-2.02.51-device-mapper-export-format.patch b/sys-fs/lvm2/files/lvm2-2.02.51-device-mapper-export-format.patch
deleted file mode 100644
index 661c4907db9b..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.51-device-mapper-export-format.patch
+++ /dev/null
@@ -1,308 +0,0 @@
-Add support for exporting the device-mapper table to userspace.
-
-Original patch written by Matthias Schwarzott <zzam@gentoo.org>, in response to
-Gentoo bug #189404.
-
-This makes it possible to have udev rules based on the properties of the
-device-mapper node, such as target types, suspended status etc.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-Ported-from: lvm2-2.02.48-device-mapper-export-format.patch
-
-diff -Naru --exclude '*.rej' --exclude '*.orig' LVM2.2.02.51.orig/libdm/libdevmapper.h LVM2.2.02.51/libdm/libdevmapper.h
---- LVM2.2.02.51.orig/libdm/libdevmapper.h	2009-08-06 15:04:30.000000000 +0000
-+++ LVM2.2.02.51/libdm/libdevmapper.h	2009-08-26 23:59:20.109335044 +0000
-@@ -972,6 +972,7 @@
- #define DM_REPORT_OUTPUT_FIELD_NAME_PREFIX	0x00000008
- #define DM_REPORT_OUTPUT_FIELD_UNQUOTED		0x00000010
- #define DM_REPORT_OUTPUT_COLUMNS_AS_ROWS	0x00000020
-+#define DM_REPORT_OUTPUT_EXPORT				0x00000040
- 
- struct dm_report *dm_report_init(uint32_t *report_types,
- 				 const struct dm_report_object_type *types,
-diff -Naru --exclude '*.rej' --exclude '*.orig' LVM2.2.02.51.orig/libdm/libdm-report.c LVM2.2.02.51/libdm/libdm-report.c
---- LVM2.2.02.51.orig/libdm/libdm-report.c	2009-02-09 09:45:49.000000000 +0000
-+++ LVM2.2.02.51/libdm/libdm-report.c	2009-08-26 23:59:20.112668654 +0000
-@@ -891,6 +891,8 @@
- 	uint32_t align;
- 	const char *repstr;
- 	char buf[4096];
-+	const char *fname;
-+	char tmp_char;
- 
- 	if (rh->flags & DM_REPORT_OUTPUT_FIELD_NAME_PREFIX) {
- 		if (!(field_id = strdup(rh->fields[field->props->field_num].id))) {
-@@ -921,6 +923,25 @@
- 			return 0;
- 		}
- 	}
-+	if (rh->flags & DM_REPORT_OUTPUT_EXPORT) {
-+		fname = rh->fields[field->props->field_num].id;
-+		if (!dm_pool_grow_object(rh->mem, "DM_", strlen("DM_"))) {
-+			log_error("dm_report: Unable to extend output line");
-+			return 0;
-+		}
-+		while (fname && fname[0]) {
-+			tmp_char = toupper(fname[0]);
-+			if (!dm_pool_grow_object(rh->mem, &tmp_char, 1)) {
-+				log_error("dm_report: Unable to extend output line");
-+				return 0;
-+			}
-+			fname++;
-+		}
-+		if (!dm_pool_grow_object(rh->mem, "=", strlen("="))) {
-+			log_error("dm_report: Unable to extend output line");
-+			return 0;
-+		}
-+	}
- 
- 	repstr = field->report_string;
- 	width = field->props->width;
-diff -Naru --exclude '*.rej' --exclude '*.orig' LVM2.2.02.51.orig/tools/dmsetup.c LVM2.2.02.51/tools/dmsetup.c
---- LVM2.2.02.51.orig/tools/dmsetup.c	2009-08-06 15:56:50.000000000 +0000
-+++ LVM2.2.02.51/tools/dmsetup.c	2009-08-27 00:01:10.332242296 +0000
-@@ -114,6 +114,7 @@
- enum {
- 	READ_ONLY = 0,
- 	COLS_ARG,
-+	EXPORT_ARG,
- 	EXEC_ARG,
- 	FORCE_ARG,
- 	GID_ARG,
-@@ -150,7 +151,8 @@
- 	DR_INFO = 2,
- 	DR_DEPS = 4,
- 	DR_TREE = 8,	/* Complete dependency tree required */
--	DR_NAME = 16
-+	DR_NAME = 16,
-+	DR_TABLE = 0x20, /* table is required, not just info */
- } report_type_t;
- 
- static int _switches[NUM_SWITCHES];
-@@ -1383,8 +1385,13 @@
- 			name = argv[1];
- 	}
- 
--	if (!(dmt = dm_task_create(DM_DEVICE_INFO)))
--		return 0;
-+	if (_report_type & DR_TABLE ) {
-+		if (!(dmt = dm_task_create(DM_DEVICE_TABLE)))
-+			return 0;
-+	} else {
-+		if (!(dmt = dm_task_create(DM_DEVICE_INFO)))
-+			return 0;
-+	}
- 
- 	if (!_set_task_device(dmt, name, 0))
- 		goto out;
-@@ -1848,6 +1855,16 @@
- 	return dm_report_field_uint32(rh, field, &value);
- }
- 
-+static int _int_disp(struct dm_report *rh,
-+		      struct dm_pool *mem __attribute((unused)),
-+		      struct dm_report_field *field, const void *data,
-+		      void *private __attribute((unused)))
-+{
-+	const int value = *(const int *)data;
-+
-+	return dm_report_field_int(rh, field, &value);
-+}
-+
- static int _dm_name_disp(struct dm_report *rh,
- 			 struct dm_pool *mem __attribute((unused)),
- 			 struct dm_report_field *field, const void *data,
-@@ -1959,6 +1976,66 @@
- }
- 
- 
-+static int _dm_info_cleartext_status_disp(struct dm_report *rh,
-+					 struct dm_pool *mem __attribute((unused)),
-+					 struct dm_report_field *field, const void *data,
-+					 void *private __attribute((unused)))
-+{
-+	const char *buf = "NOTPRESENT";
-+	const struct dm_info *info = data;
-+
-+	if (info->exists) {
-+		if (info->suspended)
-+			buf = "SUSPENDED";
-+		else
-+			buf = info->read_only ? " READONLY" : "ACTIVE";
-+	}
-+		
-+	return dm_report_field_string(rh, field, &buf);
-+}
-+
-+static int _dm_info_target_types_disp(struct dm_report *rh,
-+					 struct dm_pool *mem __attribute((unused)),
-+					 struct dm_report_field *field, const void *data,
-+					 void *private __attribute((unused)))
-+{
-+	char buf[1024];
-+	char *dest = buf;
-+	int remains = sizeof(buf);
-+	int written;
-+	const char *s = buf;
-+	struct dm_task *dmt = (struct dm_task *) data;
-+	void *next = NULL;
-+	uint64_t start, length;
-+	char *target_type = NULL;
-+	char *params;
-+
-+
-+	buf[0] = '\0';
-+	
-+	next = dm_get_next_target(dmt, next, &start, &length,
-+				  &target_type, &params);
-+	if (target_type) {
-+		written = snprintf(dest, remains, "%s", target_type);
-+		dest += written;
-+		remains -= written;
-+
-+		while (remains > 0 && next) {
-+			next = dm_get_next_target(dmt, next, &start, &length,
-+						  &target_type, &params);
-+			if (target_type) {
-+				written = snprintf(dest, remains, ",%s", target_type);
-+				dest += written;
-+				remains -= written;
-+			}
-+		}
-+	}
-+
-+	buf[sizeof(buf)-1] = '\0';
-+	
-+	return dm_report_field_string(rh, field, &s);
-+}
-+
- static int _dm_info_devno_disp(struct dm_report *rh, struct dm_pool *mem,
- 			       struct dm_report_field *field, const void *data,
- 			       void *private)
-@@ -2223,6 +2300,7 @@
- 	{ DR_DEPS, "Mapped Device Relationship Information", "", _deps_get_obj },
- 	{ DR_TREE, "Mapped Device Relationship Information", "", _tree_get_obj },
- 	{ DR_NAME, "Mapped Device Name Components", "", _split_name_get_obj },
-+	{ DR_TABLE, "Mapped Device Table", "", _task_get_obj },
- 	{ 0, "", "", NULL },
- };
- 
-@@ -2242,6 +2320,7 @@
- FIELD_F(TASK, NUM, "RAhead", 6, dm_read_ahead, "read_ahead", "Read ahead in sectors.")
- 
- FIELD_F(INFO, STR, "Stat", 4, dm_info_status, "attr", "(L)ive, (I)nactive, (s)uspended, (r)ead-only, read-(w)rite.")
-+FIELD_F(INFO, STR, "State", 1, dm_info_cleartext_status, "status", "State as cleartext.")
- FIELD_F(INFO, STR, "Tables", 6, dm_info_table_loaded, "tables_loaded", "Which of the live and inactive table slots are filled.")
- FIELD_F(INFO, STR, "Suspended", 9, dm_info_suspended, "suspended", "Whether the device is suspended.")
- FIELD_F(INFO, STR, "Read-only", 9, dm_info_read_only, "readonly", "Whether the device is read-only or writeable.")
-@@ -2252,6 +2331,11 @@
- FIELD_O(INFO, dm_info, NUM, "Targ", target_count, 4, int32, "segments", "Number of segments in live table, if present.")
- FIELD_O(INFO, dm_info, NUM, "Event", event_nr, 6, uint32, "events", "Number of most recent event.")
- 
-+FIELD_O(INFO, dm_info, NUM, "RO", read_only, 2, int, "read_only", "Read only.")
-+FIELD_O(INFO, dm_info, NUM, "Ex", exists, 2, int, "exists", "Exists.")
-+FIELD_O(INFO, dm_info, NUM, "Susp", suspended, 4, int, "suspended", "Suspended.")
-+FIELD_O(INFO, dm_info, NUM, "tab_live", live_table, 8, int, "table_live", "Live table.")
-+FIELD_O(INFO, dm_info, NUM, "tab_inact", inactive_table, 9, int, "table_inactive", "Inactive table.")
- FIELD_O(DEPS, dm_deps, NUM, "#Devs", count, 5, int32, "device_count", "Number of devices used by this one.")
- FIELD_F(TREE, STR, "DevNames", 8, dm_deps_names, "devs_used", "List of names of mapped devices used by this one.")
- FIELD_F(DEPS, STR, "DevNos", 6, dm_deps, "devnos_used", "List of device numbers of devices used by this one.")
-@@ -2259,6 +2343,7 @@
- FIELD_F(TREE, NUM, "#Refs", 5, dm_tree_parents_count, "device_ref_count", "Number of mapped devices referencing this one.")
- FIELD_F(TREE, STR, "RefNames", 8, dm_tree_parents_names, "names_using_dev", "List of names of mapped devices using this one.")
- FIELD_F(TREE, STR, "RefDevNos", 9, dm_tree_parents_devs, "devnos_using_dev", "List of device numbers of mapped devices using this one.")
-+FIELD_F(TABLE, STR, "Targettypes", 32, dm_info_target_types, "target_types", "Used target types.")
- 
- FIELD_O(NAME, dm_split_name, STR, "Subsys", subsystem, 6, dm_subsystem, "subsystem", "Userspace subsystem responsible for this device.")
- FIELD_O(NAME, dm_split_name, STR, "VG", vg_name, 4, dm_vg_name, "vg_name", "LVM Volume Group name.")
-@@ -2275,14 +2360,16 @@
- #undef FIELD_F
- 
- static const char *default_report_options = "name,major,minor,attr,open,segments,events,uuid";
-+static const char *default_export_options = "name,major,minor,status,read_only,exists,suspended,table_live,table_inactive,open,segments,events,uuid,target_types";
- static const char *splitname_report_options = "vg_name,lv_name,lv_layer";
- 
- static int _report_init(struct command *c)
- {
--	char *options = (char *) default_report_options;
-+	char *default_options = (char *) default_report_options;
-+	char *options;
- 	const char *keys = "";
- 	const char *separator = " ";
--	int aligned = 1, headings = 1, buffered = 1, field_prefixes = 0;
-+	int aligned = 1, headings = 1, buffered = 1, field_prefixes = 0, export = 0;
- 	int quoted = 1, columns_as_rows = 0;
- 	uint32_t flags = 0;
- 	size_t len = 0;
-@@ -2312,6 +2399,15 @@
- 		field_prefixes = 1;
- 	}
- 
-+	if (_switches[EXPORT_ARG]) {
-+		default_options = (char *) default_export_options;
-+		separator = "\n";
-+		aligned = 0;
-+		headings = 0;
-+		export = 1;
-+	}
-+
-+	options = default_options;
- 	if (_switches[OPTIONS_ARG] && _string_args[OPTIONS_ARG]) {
- 		if (*_string_args[OPTIONS_ARG] != '+')
- 			options = _string_args[OPTIONS_ARG];
-@@ -2363,6 +2459,9 @@
- 	if (columns_as_rows)
- 		flags |= DM_REPORT_OUTPUT_COLUMNS_AS_ROWS;
- 
-+	if (export)
-+		flags |= DM_REPORT_OUTPUT_EXPORT;
-+
- 	if (!(_report = dm_report_init(&_report_type,
- 				       _report_types, _report_fields,
- 				       options, separator, flags, keys, NULL)))
-@@ -2446,7 +2545,9 @@
- 		"        [-r|--readonly] [--noopencount] [--nolockfs]\n"
- 		"        [--noudevsync] [--readahead [+]<sectors>|auto|none]\n"
- 		"        [-c|-C|--columns] [-o <fields>] [-O|--sort <sort_fields>]\n"
--		"        [--nameprefixes] [--noheadings] [--separator <separator>]\n\n");
-+		"        [--nameprefixes] [--noheadings] [--separator <separator>]\n"
-+		"        [-e|--export]\n"
-+		"\n");
- 	for (i = 0; _commands[i].name; i++)
- 		fprintf(out, "\t%s %s\n", _commands[i].name, _commands[i].help);
- 	fprintf(out, "\n<device> may be device name or -u <uuid> or "
-@@ -2701,7 +2802,7 @@
- 			show_all++;
- 		if (c == 'd')
- 			delete++;
--		if (c == 'e')
-+		if (c == 'E')
- 			encrypt_loop++;
- 		if (c == 'f')
- 			find++;
-@@ -2796,6 +2897,7 @@
- 	static struct option long_options[] = {
- 		{"readonly", 0, &ind, READ_ONLY},
- 		{"columns", 0, &ind, COLS_ARG},
-+		{"export", 0, &ind, EXPORT_ARG},
- 		{"exec", 1, &ind, EXEC_ARG},
- 		{"force", 0, &ind, FORCE_ARG},
- 		{"gid", 1, &ind, GID_ARG},
-@@ -2879,12 +2981,16 @@
- 
- 	optarg = 0;
- 	optind = OPTIND_INIT;
--	while ((ind = -1, c = GETOPTLONG_FN(*argc, *argv, "cCfG:j:m:M:no:O:ru:U:v",
-+	while ((ind = -1, c = GETOPTLONG_FN(*argc, *argv, "cCefG:j:m:M:no:O:ru:U:v",
- 					    long_options, NULL)) != -1) {
- 		if (c == ':' || c == '?')
- 			return 0;
- 		if (c == 'c' || c == 'C' || ind == COLS_ARG)
- 			_switches[COLS_ARG]++;
-+		if (c == 'e' || ind == EXPORT_ARG) {
-+			_switches[EXPORT_ARG]++;
-+			_switches[COLS_ARG]++;
-+		}
- 		if (c == 'f' || ind == FORCE_ARG)
- 			_switches[FORCE_ARG]++;
- 		if (c == 'r' || ind == READ_ONLY)
diff --git a/sys-fs/lvm2/files/lvm2-2.02.51-dmsetup-selinux-linking-fix-r3.patch b/sys-fs/lvm2/files/lvm2-2.02.51-dmsetup-selinux-linking-fix-r3.patch
deleted file mode 100644
index 9dfd80cd7ccf..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.51-dmsetup-selinux-linking-fix-r3.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -Nuar LVM2.2.02.51.orig/tools/Makefile.in LVM2.2.02.51/tools/Makefile.in
---- LVM2.2.02.51.orig/tools/Makefile.in	2009-11-29 22:41:54.008495958 +0000
-+++ LVM2.2.02.51/tools/Makefile.in	2009-11-29 22:44:40.207625943 +0000
-@@ -98,6 +98,7 @@
- endif
- 
- LVMLIBS += -ldevmapper
-+SELINUX_LIBS += @SELINUX_LIBS@
- 
- DEFS += -DLVM_SHARED_PATH=\"$(exec_prefix)/sbin/lvm\"
- 
-@@ -109,13 +110,13 @@
- 	$(CC) $(CFLAGS) $(LDFLAGS) \
- 	      -L$(top_srcdir)/libdm \
- 		  -o $@ dmsetup.o \
--		  -ldevmapper $(LIB_PTHREAD)
-+		  -ldevmapper $(SELINUX_LIBS) $(LIB_PTHREAD)
- 
- dmsetup.static: dmsetup.o $(interfacedir)/libdevmapper.a
- 	$(CC) $(CFLAGS) $(LDFLAGS) -static \
- 	      -L$(interfacedir) \
- 		  -o $@ dmsetup.o \
--		  -ldevmapper $(LIB_PTHREAD)
-+		  -ldevmapper $(SELINUX_LIBS) $(LIB_PTHREAD)
- 
- all: device-mapper
- 
diff --git a/sys-fs/lvm2/files/lvm2-2.02.51-dmsetup-selinux-linking-fix.patch b/sys-fs/lvm2/files/lvm2-2.02.51-dmsetup-selinux-linking-fix.patch
deleted file mode 100644
index 5b8c0db96bdc..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.51-dmsetup-selinux-linking-fix.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-diff -Nuar LVM2.2.02.51.orig/tools/Makefile.in LVM2.2.02.51/tools/Makefile.in
---- LVM2.2.02.51.orig/tools/Makefile.in	2009-11-09 21:31:21.785012413 +0000
-+++ LVM2.2.02.51/tools/Makefile.in	2009-11-09 21:40:50.157475714 +0000
-@@ -109,13 +109,13 @@
- 	$(CC) $(CFLAGS) $(LDFLAGS) \
- 	      -L$(top_srcdir)/libdm \
- 		  -o $@ dmsetup.o \
--		  -ldevmapper $(LIB_PTHREAD)
-+		  -ldevmapper $(LIBS) $(LIB_PTHREAD)
- 
- dmsetup.static: dmsetup.o $(interfacedir)/libdevmapper.a
- 	$(CC) $(CFLAGS) $(LDFLAGS) -static \
- 	      -L$(interfacedir) \
- 		  -o $@ dmsetup.o \
--		  -ldevmapper $(LIB_PTHREAD)
-+		  -ldevmapper $(LIBS) $(LIB_PTHREAD)
- 
- all: device-mapper
- 
diff --git a/sys-fs/lvm2/files/lvm2-2.02.51-fix-pvcreate.patch b/sys-fs/lvm2/files/lvm2-2.02.51-fix-pvcreate.patch
deleted file mode 100644
index 370ab6d5ad11..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.51-fix-pvcreate.patch
+++ /dev/null
@@ -1,98 +0,0 @@
-Upstream patch:
-https://www.redhat.com/archives/lvm-devel/2009-August/msg00106.html
-
-# ===================================================================
-# RCS file: /cvs/lvm2/LVM2/WHATS_NEW,v
-# retrieving revision 1.1241
-# retrieving revision 1.1242
-# diff -u -r1.1241 -r1.1242
-# --- LVM2/WHATS_NEW	2009/08/13 17:16:38	1.1241
-# +++ LVM2/WHATS_NEW	2009/08/19 15:34:33	1.1242
-# @@ -1,5 +1,6 @@
-#  Version 2.02.52 -
-#  =================================
-# +  Fix pvcreate on a partition (2.02.51).
-#    Fix vgcfgrestore error paths when locking fails (2.02.49).
-#    Added configure --enable-clogd to conditionally build the cluster log daemon.
-#    Make lvchange --refresh only take a read lock on volume group.
-# ===================================================================
-# RCS file: /cvs/lvm2/LVM2/lib/device/dev-md.c,v
-# retrieving revision 1.18
-# retrieving revision 1.19
-diff -u -r1.18 -r1.19
---- LVM2/lib/device/dev-md.c	2009/08/01 17:14:52	1.18
-+++ LVM2/lib/device/dev-md.c	2009/08/19 15:34:43	1.19
-@@ -137,13 +137,15 @@
- 	if (!sysfs_dir || !*sysfs_dir)
- 		return ret;
- 
--check_md_major:
--	if (MAJOR(dev) != md_major()) {
--		if (get_primary_dev(sysfs_dir, blkdev, &dev))
--			goto check_md_major;
--		return ret;
-+	if (MAJOR(dev) == blkext_major()) {
-+		/* lookup parent MD device from blkext partition */
-+		if (!get_primary_dev(sysfs_dir, blkdev, &dev))
-+			return ret;
- 	}
- 
-+	if (MAJOR(dev) != md_major())
-+		return ret;
-+
- 	ret = dm_snprintf(path, size, "%s/dev/block/%d:%d/md/%s", sysfs_dir,
- 			  (int)MAJOR(dev), (int)MINOR(dev), attribute);
- 	if (ret < 0) {
-===================================================================
-RCS file: /cvs/lvm2/LVM2/lib/filters/filter.c,v
-retrieving revision 1.48
-retrieving revision 1.49
-diff -u -r1.48 -r1.49
---- LVM2/lib/filters/filter.c	2009/07/09 22:34:02	1.48
-+++ LVM2/lib/filters/filter.c	2009/08/19 15:34:46	1.49
-@@ -38,6 +38,7 @@
- } device_info_t;
- 
- static int _md_major = -1;
-+static int _blkext_major = -1;
- static int _device_mapper_major = -1;
- 
- int md_major(void)
-@@ -45,6 +46,11 @@
- 	return _md_major;
- }
- 
-+int blkext_major(void)
-+{
-+	return _blkext_major;
-+}
-+
- /*
-  * Devices are only checked for partition tables if their minor number
-  * is a multiple of the number corresponding to their type below
-@@ -197,6 +203,10 @@
- 		if (!strncmp("md", line + i, 2) && isspace(*(line + i + 2)))
- 			_md_major = line_maj;
- 
-+		/* Look for blkext device */
-+		if (!strncmp("blkext", line + i, 6) && isspace(*(line + i + 6)))
-+			_blkext_major = line_maj;
-+
- 		/* Look for device-mapper device */
- 		/* FIXME Cope with multiple majors */
- 		if (!strncmp("device-mapper", line + i, 13) && isspace(*(line + i + 13)))
-===================================================================
-RCS file: /cvs/lvm2/LVM2/lib/filters/filter.h,v
-retrieving revision 1.15
-retrieving revision 1.16
-diff -u -r1.15 -r1.16
---- LVM2/lib/filters/filter.h	2007/08/20 20:55:25	1.15
-+++ LVM2/lib/filters/filter.h	2009/08/19 15:34:46	1.16
-@@ -36,6 +36,7 @@
- void lvm_type_filter_destroy(struct dev_filter *f);
- 
- int md_major(void);
-+int blkext_major(void);
- int max_partitions(int major);
- 
- #endif
diff --git a/sys-fs/lvm2/files/lvm2-2.02.56-always-make-static-libdm.patch b/sys-fs/lvm2/files/lvm2-2.02.56-always-make-static-libdm.patch
deleted file mode 100644
index 35e392ec7f97..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.56-always-make-static-libdm.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Nuar LVM2.2.02.56.orig/daemons/dmeventd/Makefile.in LVM2.2.02.56/daemons/dmeventd/Makefile.in
---- LVM2.2.02.56.orig/daemons/dmeventd/Makefile.in	2009-11-29 16:42:25.208865445 -0800
-+++ LVM2.2.02.56/daemons/dmeventd/Makefile.in	2009-11-29 16:45:18.904491124 -0800
-@@ -26,11 +26,11 @@
- INSTALL_DMEVENTD_TARGETS = install_dmeventd_dynamic
- INSTALL_LIB_TARGETS = install_lib_dynamic
- 
-+LIB_STATIC = libdevmapper-event.a
-+INSTALL_LIB_TARGETS += install_lib_static
- ifeq ("@STATIC_LINK@", "yes")
--  LIB_STATIC = libdevmapper-event.a
-   TARGETS += dmeventd.static
-   INSTALL_DMEVENTD_TARGETS += install_dmeventd_static
--  INSTALL_LIB_TARGETS += install_lib_static
- endif
- 
- LIB_VERSION = $(LIB_VERSION_DM)
-diff -Nuar LVM2.2.02.56.orig/libdm/Makefile.in LVM2.2.02.56/libdm/Makefile.in
---- LVM2.2.02.56.orig/libdm/Makefile.in	2009-10-02 12:10:36.000000000 -0700
-+++ LVM2.2.02.56/libdm/Makefile.in	2009-11-29 16:44:30.552491107 -0800
-@@ -35,9 +35,9 @@
- 
- INCLUDES = -I$(srcdir)/$(interface) -I$(srcdir)
- 
--ifeq ("@STATIC_LINK@", "yes")
- LIB_STATIC = $(interface)/libdevmapper.a
-+ifeq ("@STATIC_LINK@", "yes")
- endif
- 
- ifeq ("@LIB_SUFFIX@","dylib")
-   LIB_SHARED = $(interface)/libdevmapper.dylib
-@@ -60,9 +60,9 @@
- 
- INSTALL_TYPE = install_dynamic
- 
--ifeq ("@STATIC_LINK@", "yes")
-   INSTALL_TYPE += install_static
-+ifeq ("@STATIC_LINK@", "yes")
- endif
- 
- ifeq ("@PKGCONFIG@", "yes")
-   INSTALL_TYPE += install_pkgconfig
diff --git a/sys-fs/lvm2/files/lvm2-2.02.56-device-mapper-export-format.patch b/sys-fs/lvm2/files/lvm2-2.02.56-device-mapper-export-format.patch
deleted file mode 100644
index 28692ee3d77c..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.56-device-mapper-export-format.patch
+++ /dev/null
@@ -1,288 +0,0 @@
-diff -Nuar --exclude '*.orig' --exclude '*.rej' LVM2.2.02.56.orig/libdm/libdevmapper.h LVM2.2.02.56/libdm/libdevmapper.h
---- LVM2.2.02.56.orig/libdm/libdevmapper.h	2009-11-13 12:43:21.000000000 +0000
-+++ LVM2.2.02.56/libdm/libdevmapper.h	2009-11-29 23:56:16.410529643 +0000
-@@ -982,6 +982,7 @@
- #define DM_REPORT_OUTPUT_FIELD_NAME_PREFIX	0x00000008
- #define DM_REPORT_OUTPUT_FIELD_UNQUOTED		0x00000010
- #define DM_REPORT_OUTPUT_COLUMNS_AS_ROWS	0x00000020
-+#define DM_REPORT_OUTPUT_EXPORT				0x00000040
- 
- struct dm_report *dm_report_init(uint32_t *report_types,
- 				 const struct dm_report_object_type *types,
-diff -Nuar --exclude '*.orig' --exclude '*.rej' LVM2.2.02.56.orig/libdm/libdm-report.c LVM2.2.02.56/libdm/libdm-report.c
---- LVM2.2.02.56.orig/libdm/libdm-report.c	2009-02-09 09:45:49.000000000 +0000
-+++ LVM2.2.02.56/libdm/libdm-report.c	2009-11-29 23:56:16.410529643 +0000
-@@ -891,6 +891,8 @@
- 	uint32_t align;
- 	const char *repstr;
- 	char buf[4096];
-+	const char *fname;
-+	char tmp_char;
- 
- 	if (rh->flags & DM_REPORT_OUTPUT_FIELD_NAME_PREFIX) {
- 		if (!(field_id = strdup(rh->fields[field->props->field_num].id))) {
-@@ -921,6 +923,25 @@
- 			return 0;
- 		}
- 	}
-+	if (rh->flags & DM_REPORT_OUTPUT_EXPORT) {
-+		fname = rh->fields[field->props->field_num].id;
-+		if (!dm_pool_grow_object(rh->mem, "DM_", strlen("DM_"))) {
-+			log_error("dm_report: Unable to extend output line");
-+			return 0;
-+		}
-+		while (fname && fname[0]) {
-+			tmp_char = toupper(fname[0]);
-+			if (!dm_pool_grow_object(rh->mem, &tmp_char, 1)) {
-+				log_error("dm_report: Unable to extend output line");
-+				return 0;
-+			}
-+			fname++;
-+		}
-+		if (!dm_pool_grow_object(rh->mem, "=", strlen("="))) {
-+			log_error("dm_report: Unable to extend output line");
-+			return 0;
-+		}
-+	}
- 
- 	repstr = field->report_string;
- 	width = field->props->width;
-diff -Nuar --exclude '*.orig' --exclude '*.rej' LVM2.2.02.56.orig/tools/dmsetup.c LVM2.2.02.56/tools/dmsetup.c
---- LVM2.2.02.56.orig/tools/dmsetup.c	2009-11-13 12:43:22.000000000 +0000
-+++ LVM2.2.02.56/tools/dmsetup.c	2009-11-29 23:59:32.047603270 +0000
-@@ -114,6 +114,7 @@
- enum {
- 	READ_ONLY = 0,
- 	COLS_ARG,
-+	EXPORT_ARG,
- 	EXEC_ARG,
- 	FORCE_ARG,
- 	GID_ARG,
-@@ -152,7 +153,8 @@
- 	DR_INFO = 2,
- 	DR_DEPS = 4,
- 	DR_TREE = 8,	/* Complete dependency tree required */
--	DR_NAME = 16
-+	DR_NAME = 16,
-+	DR_TABLE = 0x20, /* table is required, not just info */
- } report_type_t;
- 
- static int _switches[NUM_SWITCHES];
-@@ -1491,8 +1493,13 @@
- 			name = argv[1];
- 	}
- 
--	if (!(dmt = dm_task_create(DM_DEVICE_INFO)))
--		return 0;
-+	if (_report_type & DR_TABLE ) {
-+		if (!(dmt = dm_task_create(DM_DEVICE_TABLE)))
-+			return 0;
-+	} else {
-+		if (!(dmt = dm_task_create(DM_DEVICE_INFO)))
-+			return 0;
-+	}
- 
- 	if (!_set_task_device(dmt, name, 0))
- 		goto out;
-@@ -1962,6 +1969,16 @@
- 	return dm_report_field_uint32(rh, field, &value);
- }
- 
-+static int _int_disp(struct dm_report *rh,
-+		      struct dm_pool *mem __attribute((unused)),
-+		      struct dm_report_field *field, const void *data,
-+		      void *private __attribute((unused)))
-+{
-+	const int value = *(const int *)data;
-+
-+	return dm_report_field_int(rh, field, &value);
-+}
-+
- static int _dm_name_disp(struct dm_report *rh,
- 			 struct dm_pool *mem __attribute((unused)),
- 			 struct dm_report_field *field, const void *data,
-@@ -2073,6 +2090,66 @@
- }
- 
- 
-+static int _dm_info_cleartext_status_disp(struct dm_report *rh,
-+					 struct dm_pool *mem __attribute((unused)),
-+					 struct dm_report_field *field, const void *data,
-+					 void *private __attribute((unused)))
-+{
-+	const char *buf = "NOTPRESENT";
-+	const struct dm_info *info = data;
-+
-+	if (info->exists) {
-+		if (info->suspended)
-+			buf = "SUSPENDED";
-+		else
-+			buf = info->read_only ? " READONLY" : "ACTIVE";
-+	}
-+		
-+	return dm_report_field_string(rh, field, &buf);
-+}
-+
-+static int _dm_info_target_types_disp(struct dm_report *rh,
-+					 struct dm_pool *mem __attribute((unused)),
-+					 struct dm_report_field *field, const void *data,
-+					 void *private __attribute((unused)))
-+{
-+	char buf[1024];
-+	char *dest = buf;
-+	int remains = sizeof(buf);
-+	int written;
-+	const char *s = buf;
-+	struct dm_task *dmt = (struct dm_task *) data;
-+	void *next = NULL;
-+	uint64_t start, length;
-+	char *target_type = NULL;
-+	char *params;
-+
-+
-+	buf[0] = '\0';
-+	
-+	next = dm_get_next_target(dmt, next, &start, &length,
-+				  &target_type, &params);
-+	if (target_type) {
-+		written = snprintf(dest, remains, "%s", target_type);
-+		dest += written;
-+		remains -= written;
-+
-+		while (remains > 0 && next) {
-+			next = dm_get_next_target(dmt, next, &start, &length,
-+						  &target_type, &params);
-+			if (target_type) {
-+				written = snprintf(dest, remains, ",%s", target_type);
-+				dest += written;
-+				remains -= written;
-+			}
-+		}
-+	}
-+
-+	buf[sizeof(buf)-1] = '\0';
-+	
-+	return dm_report_field_string(rh, field, &s);
-+}
-+
- static int _dm_info_devno_disp(struct dm_report *rh, struct dm_pool *mem,
- 			       struct dm_report_field *field, const void *data,
- 			       void *private)
-@@ -2337,6 +2414,7 @@
- 	{ DR_DEPS, "Mapped Device Relationship Information", "", _deps_get_obj },
- 	{ DR_TREE, "Mapped Device Relationship Information", "", _tree_get_obj },
- 	{ DR_NAME, "Mapped Device Name Components", "", _split_name_get_obj },
-+	{ DR_TABLE, "Mapped Device Table", "", _task_get_obj },
- 	{ 0, "", "", NULL },
- };
- 
-@@ -2356,6 +2434,7 @@
- FIELD_F(TASK, NUM, "RAhead", 6, dm_read_ahead, "read_ahead", "Read ahead in sectors.")
- 
- FIELD_F(INFO, STR, "Stat", 4, dm_info_status, "attr", "(L)ive, (I)nactive, (s)uspended, (r)ead-only, read-(w)rite.")
-+FIELD_F(INFO, STR, "State", 1, dm_info_cleartext_status, "status", "State as cleartext.")
- FIELD_F(INFO, STR, "Tables", 6, dm_info_table_loaded, "tables_loaded", "Which of the live and inactive table slots are filled.")
- FIELD_F(INFO, STR, "Suspended", 9, dm_info_suspended, "suspended", "Whether the device is suspended.")
- FIELD_F(INFO, STR, "Read-only", 9, dm_info_read_only, "readonly", "Whether the device is read-only or writeable.")
-@@ -2366,6 +2445,11 @@
- FIELD_O(INFO, dm_info, NUM, "Targ", target_count, 4, int32, "segments", "Number of segments in live table, if present.")
- FIELD_O(INFO, dm_info, NUM, "Event", event_nr, 6, uint32, "events", "Number of most recent event.")
- 
-+FIELD_O(INFO, dm_info, NUM, "RO", read_only, 2, int, "read_only", "Read only.")
-+FIELD_O(INFO, dm_info, NUM, "Ex", exists, 2, int, "exists", "Exists.")
-+FIELD_O(INFO, dm_info, NUM, "Susp", suspended, 4, int, "suspended", "Suspended.")
-+FIELD_O(INFO, dm_info, NUM, "tab_live", live_table, 8, int, "table_live", "Live table.")
-+FIELD_O(INFO, dm_info, NUM, "tab_inact", inactive_table, 9, int, "table_inactive", "Inactive table.")
- FIELD_O(DEPS, dm_deps, NUM, "#Devs", count, 5, int32, "device_count", "Number of devices used by this one.")
- FIELD_F(TREE, STR, "DevNames", 8, dm_deps_names, "devs_used", "List of names of mapped devices used by this one.")
- FIELD_F(DEPS, STR, "DevNos", 6, dm_deps, "devnos_used", "List of device numbers of devices used by this one.")
-@@ -2373,6 +2457,7 @@
- FIELD_F(TREE, NUM, "#Refs", 5, dm_tree_parents_count, "device_ref_count", "Number of mapped devices referencing this one.")
- FIELD_F(TREE, STR, "RefNames", 8, dm_tree_parents_names, "names_using_dev", "List of names of mapped devices using this one.")
- FIELD_F(TREE, STR, "RefDevNos", 9, dm_tree_parents_devs, "devnos_using_dev", "List of device numbers of mapped devices using this one.")
-+FIELD_F(TABLE, STR, "Targettypes", 32, dm_info_target_types, "target_types", "Used target types.")
- 
- FIELD_O(NAME, dm_split_name, STR, "Subsys", subsystem, 6, dm_subsystem, "subsystem", "Userspace subsystem responsible for this device.")
- FIELD_O(NAME, dm_split_name, STR, "VG", vg_name, 4, dm_vg_name, "vg_name", "LVM Volume Group name.")
-@@ -2389,14 +2474,16 @@
- #undef FIELD_F
- 
- static const char *default_report_options = "name,major,minor,attr,open,segments,events,uuid";
-+static const char *default_export_options = "name,major,minor,status,read_only,exists,suspended,table_live,table_inactive,open,segments,events,uuid,target_types";
- static const char *splitname_report_options = "vg_name,lv_name,lv_layer";
- 
- static int _report_init(struct command *c)
- {
--	char *options = (char *) default_report_options;
-+	char *default_options = (char *) default_report_options;
-+	char *options;
- 	const char *keys = "";
- 	const char *separator = " ";
--	int aligned = 1, headings = 1, buffered = 1, field_prefixes = 0;
-+	int aligned = 1, headings = 1, buffered = 1, field_prefixes = 0, export = 0;
- 	int quoted = 1, columns_as_rows = 0;
- 	uint32_t flags = 0;
- 	size_t len = 0;
-@@ -2426,6 +2513,15 @@
- 		field_prefixes = 1;
- 	}
- 
-+	if (_switches[EXPORT_ARG]) {
-+		default_options = (char *) default_export_options;
-+		separator = "\n";
-+		aligned = 0;
-+		headings = 0;
-+		export = 1;
-+	}
-+
-+	options = default_options;
- 	if (_switches[OPTIONS_ARG] && _string_args[OPTIONS_ARG]) {
- 		if (*_string_args[OPTIONS_ARG] != '+')
- 			options = _string_args[OPTIONS_ARG];
-@@ -2477,6 +2573,9 @@
- 	if (columns_as_rows)
- 		flags |= DM_REPORT_OUTPUT_COLUMNS_AS_ROWS;
- 
-+	if (export)
-+		flags |= DM_REPORT_OUTPUT_EXPORT;
-+
- 	if (!(_report = dm_report_init(&_report_type,
- 				       _report_types, _report_fields,
- 				       options, separator, flags, keys, NULL)))
-@@ -2561,7 +2660,9 @@
- 		"        [-r|--readonly] [--noopencount] [--nolockfs] [--inactive]\n"
- 		"        [--noudevsync] [-y|--yes] [--readahead [+]<sectors>|auto|none]\n"
- 		"        [-c|-C|--columns] [-o <fields>] [-O|--sort <sort_fields>]\n"
--		"        [--nameprefixes] [--noheadings] [--separator <separator>]\n\n");
-+		"        [--nameprefixes] [--noheadings] [--separator <separator>]\n"
-+		"        [-e|--export]\n"
-+		"\n");
- 	for (i = 0; _commands[i].name; i++)
- 		fprintf(out, "\t%s %s\n", _commands[i].name, _commands[i].help);
- 	fprintf(out, "\n<device> may be device name or -u <uuid> or "
-@@ -2911,6 +3012,7 @@
- 	static struct option long_options[] = {
- 		{"readonly", 0, &ind, READ_ONLY},
- 		{"columns", 0, &ind, COLS_ARG},
-+		{"export", 0, &ind, EXPORT_ARG},
- 		{"exec", 1, &ind, EXEC_ARG},
- 		{"force", 0, &ind, FORCE_ARG},
- 		{"gid", 1, &ind, GID_ARG},
-@@ -2996,12 +3098,16 @@
- 
- 	optarg = 0;
- 	optind = OPTIND_INIT;
--	while ((ind = -1, c = GETOPTLONG_FN(*argc, *argv, "cCfG:j:m:M:no:O:ru:U:vy",
-+	while ((ind = -1, c = GETOPTLONG_FN(*argc, *argv, "cCefG:j:m:M:no:O:ru:U:vy",
- 					    long_options, NULL)) != -1) {
- 		if (c == ':' || c == '?')
- 			return 0;
- 		if (c == 'c' || c == 'C' || ind == COLS_ARG)
- 			_switches[COLS_ARG]++;
-+		if (c == 'e' || ind == EXPORT_ARG) {
-+			_switches[EXPORT_ARG]++;
-+			_switches[COLS_ARG]++;
-+		}
- 		if (c == 'f' || ind == FORCE_ARG)
- 			_switches[FORCE_ARG]++;
- 		if (c == 'r' || ind == READ_ONLY)
diff --git a/sys-fs/lvm2/files/lvm2-2.02.56-dmeventd.patch b/sys-fs/lvm2/files/lvm2-2.02.56-dmeventd.patch
deleted file mode 100644
index 7d1e338adbbe..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.56-dmeventd.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar LVM2.2.02.56.orig/daemons/dmeventd/Makefile.in LVM2.2.02.56/daemons/dmeventd/Makefile.in
---- LVM2.2.02.56.orig/daemons/dmeventd/Makefile.in	2009-11-13 12:48:01.000000000 +0000
-+++ LVM2.2.02.56/daemons/dmeventd/Makefile.in	2009-11-29 23:50:22.873898621 +0000
-@@ -60,7 +60,7 @@
- 	$(RM) -f $@
- 	$(LN_S) $(LIB_SHARED) $@
- 
--dmeventd: $(LIB_SHARED) $(VERSIONED_SHLIB) dmeventd.o
-+dmeventd: $(LIB_SHARED) $(LIB_STATIC) $(VERSIONED_SHLIB) dmeventd.o
- 	$(CC) $(CFLAGS) $(LDFLAGS) -L. -o $@ dmeventd.o \
- 	$(LVMLIBS) $(LIBS) -rdynamic
- 
diff --git a/sys-fs/lvm2/files/lvm2-start.sh-2.02.28-r2 b/sys-fs/lvm2/files/lvm2-start.sh-2.02.28-r2
deleted file mode 100755
index 7c72199153e6..000000000000
--- a/sys-fs/lvm2/files/lvm2-start.sh-2.02.28-r2
+++ /dev/null
@@ -1,40 +0,0 @@
-# /lib/rcscripts/addons/lvm-start.sh
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm2-start.sh-2.02.28-r2,v 1.1 2007/10/08 21:11:16 robbat2 Exp $
-
-dm_in_proc() {
-	local retval=0
-	for x in devices misc ; do
-		grep -qs 'device-mapper' /proc/${x}
-		retval=$((${retval} + $?))
-	done
-	return ${retval}
-}
-
-# LVM support for /usr, /home, /opt ....
-# This should be done *before* checking local
-# volumes, or they never get checked.
-
-# NOTE: Add needed modules for LVM or RAID, etc
-#       to /etc/modules.autoload if needed
-if [ -z "${CDBOOT}" -a -x /sbin/vgscan ] ; then
-	if [ -e /proc/modules ] && ! dm_in_proc ; then
-		modprobe dm-mod 2>/dev/null
-	fi
-
-	if [ -d /proc/lvm ] || dm_in_proc ; then
-		ebegin "Setting up the Logical Volume Manager"
-		#still echo stderr for debugging
-		# Extra PV find pass because some devices might not have been available until very recently
-		/sbin/pvscan >/dev/null
-		# Now make the nodes
-		/sbin/vgscan --mknodes --ignorelockingfailure >/dev/null
-		if [ -x /sbin/vgchange ] && \
-		   [ -f /etc/lvmtab -o -d /etc/lvm ]
-		then
-			/sbin/vgchange --ignorelockingfailure -a y >/dev/null
-		fi
-		eend $? "Failed to setup the LVM"
-	fi
-fi
-
-# vim:ts=4
diff --git a/sys-fs/lvm2/files/lvm2-start.sh-2.02.49-r1 b/sys-fs/lvm2/files/lvm2-start.sh-2.02.49-r1
deleted file mode 100755
index 698300381572..000000000000
--- a/sys-fs/lvm2/files/lvm2-start.sh-2.02.49-r1
+++ /dev/null
@@ -1,42 +0,0 @@
-# /lib/rcscripts/addons/lvm-start.sh
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm2-start.sh-2.02.49-r1,v 1.1 2009/07/24 23:37:37 robbat2 Exp $
-
-locking="--lock-dir /dev/.lvm/"
-
-dm_in_proc() {
-	local retval=0
-	for x in devices misc ; do
-		grep -qs 'device-mapper' /proc/${x}
-		retval=$((${retval} + $?))
-	done
-	return ${retval}
-}
-
-# LVM support for /usr, /home, /opt ....
-# This should be done *before* checking local
-# volumes, or they never get checked.
-
-# NOTE: Add needed modules for LVM or RAID, etc
-#       to /etc/modules.autoload if needed
-if [ -z "${CDBOOT}" -a -x /sbin/vgscan ] ; then
-	if [ -e /proc/modules ] && ! dm_in_proc ; then
-		modprobe dm-mod 2>/dev/null
-	fi
-
-	if [ -d /proc/lvm ] || dm_in_proc ; then
-		ebegin "Setting up the Logical Volume Manager"
-		#still echo stderr for debugging
-		# Extra PV find pass because some devices might not have been available until very recently
-		/sbin/pvscan ${locking} >/dev/null
-		# Now make the nodes
-		/sbin/vgscan --mknodes ${locking} >/dev/null
-		if [ -x /sbin/vgchange ] && \
-		   [ -f /etc/lvmtab -o -d /etc/lvm ]
-		then
-			/sbin/vgchange ${locking} -a y >/dev/null
-		fi
-		eend $? "Failed to setup the LVM"
-	fi
-fi
-
-# vim:ts=4
diff --git a/sys-fs/lvm2/files/lvm2-stop.sh-2.02.28-r5 b/sys-fs/lvm2/files/lvm2-stop.sh-2.02.28-r5
deleted file mode 100755
index fda3de467ec0..000000000000
--- a/sys-fs/lvm2/files/lvm2-stop.sh-2.02.28-r5
+++ /dev/null
@@ -1,65 +0,0 @@
-# /lib/rcscripts/addons/lvm-stop.sh
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm2-stop.sh-2.02.28-r5,v 1.1 2008/01/30 14:37:06 cardoe Exp $
-
-# Stop LVM2
-if [ -x /sbin/vgchange ] && \
-   [ -x /sbin/lvdisplay ] && \
-   [ -x /sbin/vgdisplay ] && \
-   [ -x /sbin/lvchange ] && \
-   [ -f /etc/lvmtab -o -d /etc/lvm ] && \
-   [ -d /proc/lvm  -o "`grep device-mapper /proc/misc 2>/dev/null`" ]
-then
-	einfo "Shutting down the Logical Volume Manager"
-	# If these commands fail it is not currently an issue
-	# as the system is going down anyway based on the current LVM 
-	# functionality as described in this forum thread
-	#https://www.redhat.com/archives/linux-lvm/2001-May/msg00523.html
-
-	LOGICAL_VOLUMES=`lvdisplay |grep "LV Name"|sed -e 's/.*LV Name\s*\(.*\)/\1/'|sort`
-	VOLUME_GROUPS=`vgdisplay |grep "VG Name"|sed -e 's/.*VG Name\s*\(.*\)/\1/'|sort`
-	for x in ${LOGICAL_VOLUMES}
-	do
-		LV_IS_ACTIVE=`lvdisplay ${x}|grep "# open"|awk '{print $3}'`
-		if [ "${LV_IS_ACTIVE}" = 0 ]
-		then
-			ebegin "  Shutting Down logical volume: ${x} "
-			lvchange -an --ignorelockingfailure -P ${x} >/dev/null
-			eend $?
-		fi
-	done
-
-	for x in ${VOLUME_GROUPS}
-	do
-		VG_HAS_ACTIVE_LV=`vgdisplay ${x}|grep "Open LV"|sed -e 's/.*Open LV\s*\(.*\)/\1/'`
-		if [ "${VG_HAS_ACTIVE_LV}" = 0 ]
-		then
-			ebegin "  Shutting Down volume group: ${x} "
-			vgchange -an --ignorelockingfailure -P ${x} >/dev/null
-			eend
-		fi
-	done
-
-	for x in ${LOGICAL_VOLUMES}
-	do
-		LV_IS_ACTIVE=`lvdisplay ${x}|grep "# open"|sed -e 's/.*# open\s*\(.*\)/\1/'`
-		if [ "${LV_IS_ACTIVE}" = 1 ]
-		then
-			if type mountinfo >/dev/null 2>&1; then
-				ROOT_DEVICE=`mountinfo -t /`
-			else
-				ROOT_DEVICE=`mount|grep -v 'rootfs'|grep " / "|awk '{print $1}'`
-			fi
-
-			MOUNTED_DEVICE=${x}
-			[ -L ${ROOT_DEVICE} ] && ROOT_DEVICE="`/bin/readlink ${ROOT_DEVICE}`"
-			[ -L ${x} ] && MOUNTED_DEVICE="`/bin/readlink ${x}`"
-			if [ ! ${ROOT_DEVICE} = ${MOUNTED_DEVICE} ]
-			then
-				ewarn "  Unable to shutdown: ${x} "
-			fi
-		fi
-	done
-	einfo "Finished Shutting down the Logical Volume Manager"
-fi
-
-# vim:ts=4
diff --git a/sys-fs/lvm2/files/lvm2-stop.sh-2.02.37 b/sys-fs/lvm2/files/lvm2-stop.sh-2.02.37
deleted file mode 100755
index fccc7f9ef699..000000000000
--- a/sys-fs/lvm2/files/lvm2-stop.sh-2.02.37
+++ /dev/null
@@ -1,65 +0,0 @@
-# /lib/rcscripts/addons/lvm-stop.sh
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm2-stop.sh-2.02.37,v 1.1 2008/06/08 19:54:05 robbat2 Exp $
-
-# Stop LVM2
-if [ -x /sbin/vgchange ] && \
-   [ -x /sbin/lvdisplay ] && \
-   [ -x /sbin/vgdisplay ] && \
-   [ -x /sbin/lvchange ] && \
-   [ -f /etc/lvmtab -o -d /etc/lvm ] && \
-   [ -d /proc/lvm  -o "`grep device-mapper /proc/misc 2>/dev/null`" ]
-then
-	einfo "Shutting down the Logical Volume Manager"
-	# If these commands fail it is not currently an issue
-	# as the system is going down anyway based on the current LVM 
-	# functionality as described in this forum thread
-	#https://www.redhat.com/archives/linux-lvm/2001-May/msg00523.html
-
-	LOGICAL_VOLUMES=`lvdisplay |grep "LV Name"|sed -e 's/.*LV Name\s*\(.*\)/\1/'|sort`
-	VOLUME_GROUPS=`vgdisplay |grep "VG Name"|sed -e 's/.*VG Name\s*\(.*\)/\1/'|sort`
-	for x in ${LOGICAL_VOLUMES}
-	do
-		LV_IS_ACTIVE=`lvdisplay ${x}|grep "# open"|awk '{print $3}'`
-		if [ "${LV_IS_ACTIVE}" = 0 ]
-		then
-			ebegin "  Shutting Down logical volume: ${x} "
-			lvchange -an --ignorelockingfailure -P ${x} >/dev/null
-			eend $?
-		fi
-	done
-
-	for x in ${VOLUME_GROUPS}
-	do
-		VG_HAS_ACTIVE_LV=`vgdisplay ${x}|grep "Open LV"|sed -e 's/.*Open LV\s*\(.*\)/\1/'`
-		if [ "${VG_HAS_ACTIVE_LV}" = 0 ]
-		then
-			ebegin "  Shutting Down volume group: ${x} "
-			vgchange -an --ignorelockingfailure -P ${x} >/dev/null
-			eend
-		fi
-	done
-
-	for x in ${LOGICAL_VOLUMES}
-	do
-		LV_IS_ACTIVE=`lvdisplay ${x}|grep "# open"|sed -e 's/.*# open\s*\(.*\)/\1/'`
-		if [ "${LV_IS_ACTIVE}" = 1 ]
-		then
-			if type mountinfo >/dev/null 2>&1; then
-				ROOT_DEVICE=`mountinfo -t /`
-			else
-				ROOT_DEVICE=`mount | awk '{if($3 == "/" && $1 != "rootfs"){print $1}}'`
-			fi
-
-			MOUNTED_DEVICE=${x}
-			[ -L ${ROOT_DEVICE} ] && ROOT_DEVICE="`/bin/readlink ${ROOT_DEVICE}`"
-			[ -L ${x} ] && MOUNTED_DEVICE="`/bin/readlink ${x}`"
-			if [ ! ${ROOT_DEVICE} = ${MOUNTED_DEVICE} ]
-			then
-				ewarn "  Unable to shutdown: ${x} "
-			fi
-		fi
-	done
-	einfo "Finished Shutting down the Logical Volume Manager"
-fi
-
-# vim:ts=4
diff --git a/sys-fs/lvm2/files/lvm2-stop.sh-2.02.49-r1 b/sys-fs/lvm2/files/lvm2-stop.sh-2.02.49-r1
deleted file mode 100755
index d3252e5c71c2..000000000000
--- a/sys-fs/lvm2/files/lvm2-stop.sh-2.02.49-r1
+++ /dev/null
@@ -1,67 +0,0 @@
-# /lib/rcscripts/addons/lvm-stop.sh
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvm2-stop.sh-2.02.49-r1,v 1.1 2009/07/24 23:37:37 robbat2 Exp $
-
-locking="--lock-dir /dev/.lvm/"
-
-# Stop LVM2
-if [ -x /sbin/vgchange ] && \
-   [ -x /sbin/lvdisplay ] && \
-   [ -x /sbin/vgdisplay ] && \
-   [ -x /sbin/lvchange ] && \
-   [ -f /etc/lvmtab -o -d /etc/lvm ] && \
-   [ -d /proc/lvm  -o "`grep device-mapper /proc/misc 2>/dev/null`" ]
-then
-	einfo "Shutting down the Logical Volume Manager"
-	# If these commands fail it is not currently an issue
-	# as the system is going down anyway based on the current LVM 
-	# functionality as described in this forum thread
-	#https://www.redhat.com/archives/linux-lvm/2001-May/msg00523.html
-
-	LOGICAL_VOLUMES=`/sbin/lvdisplay ${locking} |grep "LV Name"|sed -e 's/.*LV Name\s*\(.*\)/\1/'|sort`
-	VOLUME_GROUPS=`/sbin/vgdisplay ${locking} |grep "VG Name"|sed -e 's/.*VG Name\s*\(.*\)/\1/'|sort`
-	for x in ${LOGICAL_VOLUMES}
-	do
-		LV_IS_ACTIVE=`/sbin/lvdisplay ${locking} ${x}|grep "# open"|awk '{print $3}'`
-		if [ "${LV_IS_ACTIVE}" = 0 ]
-		then
-			ebegin "  Shutting Down logical volume: ${x} "
-			/sbin/lvchange -an ${locking} -P ${x} >/dev/null
-			eend $?
-		fi
-	done
-
-	for x in ${VOLUME_GROUPS}
-	do
-		VG_HAS_ACTIVE_LV=`/sbin/vgdisplay ${locking} ${x}|grep "Open LV"|sed -e 's/.*Open LV\s*\(.*\)/\1/'`
-		if [ "${VG_HAS_ACTIVE_LV}" = 0 ]
-		then
-			ebegin "  Shutting Down volume group: ${x} "
-			/sbin/vgchange -an ${locking} -P ${x} >/dev/null
-			eend
-		fi
-	done
-
-	for x in ${LOGICAL_VOLUMES}
-	do
-		LV_IS_ACTIVE=`/sbin/lvdisplay ${locking} ${x}|grep "# open"|sed -e 's/.*# open\s*\(.*\)/\1/'`
-		if [ "${LV_IS_ACTIVE}" = 1 ]
-		then
-			if type mountinfo >/dev/null 2>&1; then
-				ROOT_DEVICE=`mountinfo -t /`
-			else
-				ROOT_DEVICE=`mount | awk '{if($3 == "/" && $1 != "rootfs"){print $1}}'`
-			fi
-
-			MOUNTED_DEVICE=${x}
-			[ -L ${ROOT_DEVICE} ] && ROOT_DEVICE="`/bin/readlink ${ROOT_DEVICE}`"
-			[ -L ${x} ] && MOUNTED_DEVICE="`/bin/readlink ${x}`"
-			if [ ! ${ROOT_DEVICE} = ${MOUNTED_DEVICE} ]
-			then
-				ewarn "  Unable to shutdown: ${x} "
-			fi
-		fi
-	done
-	einfo "Finished Shutting down the Logical Volume Manager"
-fi
-
-# vim:ts=4
diff --git a/sys-fs/lvm2/lvm2-2.02.33-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.33-r1.ebuild
deleted file mode 100644
index 96c4f4460053..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.33-r1.ebuild
+++ /dev/null
@@ -1,146 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.33-r1.ebuild,v 1.8 2010/06/07 23:09:45 robbat2 Exp $
-
-EAPI=1
-inherit eutils multilib
-
-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="readline +static clvm cman +lvm1 selinux"
-
-DEPEND=">=sys-fs/device-mapper-1.02.24
-		clvm? ( >=sys-cluster/dlm-1.01.00
-			cman? ( >=sys-cluster/cman-1.01.00 ) )"
-
-RDEPEND="${DEPEND}
-	!sys-fs/lvm-user
-	!sys-fs/clvm"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	use nolvmstatic && eerror "USE=nolvmstatic has changed to USE=static via package.use"
-	use nolvm1 && eerror "USE=nolvm1 has changed to USE=lvm1 via package.use"
-}
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/lvm.conf-2.02.33.patch
-}
-
-src_compile() {
-	# Static compile of lvm2 so that the install described in the handbook works
-	# http://www.gentoo.org/doc/en/lvm2.xml
-	# fixes http://bugs.gentoo.org/show_bug.cgi?id=84463
-	local myconf
-	local buildmode
-
-	# fsadm is broken, don't include it (2.02.28)
-	myconf="${myconf} --enable-dmeventd --enable-cmdlib"
-
-	# 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"
-		myconf="${myconf} --enable-static_link"
-		buildmode="internal"
-	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!
-		local clvmd="none"
-		use cman && clvmd="cman"
-		#clvmd="${clvmd/cmangulm/all}"
-		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"
-	econf $(use_enable readline) \
-		$(use_enable selinux) \
-		--libdir=/usr/$(get_libdir) \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}" || die
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Failed to emake install"
-	# TODO: At some point in the future, we need to stop installing the static
-	# as the /sbin/lvm name, and have both variants seperate.
-	if use static; then
-		cp -f "${D}"/sbin/lvm.static "${D}"/sbin/lvm \
-			|| die "Failed to copy lvm.static"
-	fi
-
-	dodir /$(get_libdir)
-	# Put these in root so we can reach before /usr is up
-	for i in libdevmapper-event-lvm2mirror liblvm2{format1,snapshot} ; do
-		b="${D}"/usr/$(get_libdir)/${i}
-		if [ -f "${b}".so ]; then
-			mv -f "${b}".so* "${D}"/$(get_libdir) || die
-		fi
-	done
-
-	dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt}
-	insinto /lib/rcscripts/addons
-	newins "${FILESDIR}"/lvm2-start.sh-2.02.28-r2 lvm-start.sh || die
-	newins "${FILESDIR}"/lvm2-stop.sh-2.02.28-r5 lvm-stop.sh || die
-	newinitd "${FILESDIR}"/lvm.rc-2.02.28-r2 lvm || die
-	newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm || die
-	if use clvm; then
-		newinitd "${FILESDIR}"/clvmd.rc-2.02.28-r3 clvmd || die
-	fi
-
-	elog "use flag nocman is deprecated and replaced"
-	elog "with cman and gulm use flags."
-	elog ""
-	elog "use flags clvm,cman and gulm 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."
-	use nolvmstatic && \
-		elog "USE=nolvmstatic has changed to USE=static via package.use"
-	use nolvm1 && \
-		elog "USE=nolvm1 has changed to USE=lvm1 via package.use"
-}
-
-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"
-}
-
-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.33.ebuild b/sys-fs/lvm2/lvm2-2.02.33.ebuild
deleted file mode 100644
index fd8faa1fb57e..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.33.ebuild
+++ /dev/null
@@ -1,145 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.33.ebuild,v 1.9 2010/06/07 23:09:45 robbat2 Exp $
-
-EAPI=1
-inherit eutils multilib
-
-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="readline +static clvm cman +lvm1 selinux"
-
-DEPEND=">=sys-fs/device-mapper-1.02.24
-		clvm? ( >=sys-cluster/dlm-1.01.00
-			cman? ( >=sys-cluster/cman-1.01.00 ) )"
-
-RDEPEND="${DEPEND}
-	!sys-fs/lvm-user
-	!sys-fs/clvm"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	use nolvmstatic && eerror "USE=nolvmstatic has changed to USE=static via package.use"
-	use nolvm1 && eerror "USE=nolvm1 has changed to USE=lvm1 via package.use"
-}
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/lvm.conf-2.02.33.patch
-}
-
-src_compile() {
-	# Static compile of lvm2 so that the install described in the handbook works
-	# http://www.gentoo.org/doc/en/lvm2.xml
-	# fixes http://bugs.gentoo.org/show_bug.cgi?id=84463
-	local myconf
-	local buildmode
-
-	# fsadm is broken, don't include it (2.02.28)
-	myconf="${myconf} --enable-dmeventd --enable-cmdlib"
-
-	# 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"
-		myconf="${myconf} --enable-static_link"
-		buildmode="internal"
-	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!
-		local clvmd="none"
-		use cman && clvmd="cman"
-		#clvmd="${clvmd/cmangulm/all}"
-		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"
-	econf $(use_enable readline) \
-		$(use_enable selinux) \
-		--libdir=/usr/$(get_libdir) \
-		${myconf} || die
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Failed to emake install"
-	# TODO: At some point in the future, we need to stop installing the static
-	# as the /sbin/lvm name, and have both variants seperate.
-	if use static; then
-		cp -f "${D}"/sbin/lvm.static "${D}"/sbin/lvm \
-			|| die "Failed to copy lvm.static"
-	fi
-
-	dodir /$(get_libdir)
-	# Put these in root so we can reach before /usr is up
-	for i in libdevmapper-event-lvm2mirror liblvm2{format1,snapshot} ; do
-		b="${D}"/usr/$(get_libdir)/${i}
-		if [ -f "${b}".so ]; then
-			mv -f "${b}".so* "${D}"/$(get_libdir) || die
-		fi
-	done
-
-	dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt}
-	insinto /lib/rcscripts/addons
-	newins "${FILESDIR}"/lvm2-start.sh-2.02.28-r2 lvm-start.sh || die
-	newins "${FILESDIR}"/lvm2-stop.sh-2.02.28-r5 lvm-stop.sh || die
-	newinitd "${FILESDIR}"/lvm.rc-2.02.28-r2 lvm || die
-	newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm || die
-	if use clvm; then
-		newinitd "${FILESDIR}"/clvmd.rc-2.02.28-r3 clvmd || die
-	fi
-
-	elog "use flag nocman is deprecated and replaced"
-	elog "with cman and gulm use flags."
-	elog ""
-	elog "use flags clvm,cman and gulm 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."
-	use nolvmstatic && \
-		elog "USE=nolvmstatic has changed to USE=static via package.use"
-	use nolvm1 && \
-		elog "USE=nolvm1 has changed to USE=lvm1 via package.use"
-}
-
-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"
-}
-
-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.36.ebuild b/sys-fs/lvm2/lvm2-2.02.36.ebuild
deleted file mode 100644
index 77d24fef2818..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.36.ebuild
+++ /dev/null
@@ -1,147 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.36.ebuild,v 1.13 2010/06/07 23:09:45 robbat2 Exp $
-
-EAPI=1
-inherit eutils multilib
-
-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 ~hppa ~ia64 ~mips ppc ~ppc64 ~sparc x86"
-
-IUSE="readline +static clvm cman +lvm1 selinux"
-
-DEPEND=">=sys-fs/device-mapper-1.02.24
-		clvm? ( >=sys-cluster/dlm-1.01.00
-			cman? ( >=sys-cluster/cman-1.01.00 ) )"
-
-RDEPEND="${DEPEND}
-	!<sys-apps/openrc-0.4
-	!sys-fs/lvm-user
-	!sys-fs/clvm"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	use nolvmstatic && eerror "USE=nolvmstatic has changed to USE=static via package.use"
-	use nolvm1 && eerror "USE=nolvm1 has changed to USE=lvm1 via package.use"
-}
-
-src_unpack() {
-	unpack ${A}
-	epatch "${FILESDIR}"/lvm.conf-2.02.36.patch
-}
-
-src_compile() {
-	# Static compile of lvm2 so that the install described in the handbook works
-	# http://www.gentoo.org/doc/en/lvm2.xml
-	# fixes http://bugs.gentoo.org/show_bug.cgi?id=84463
-	local myconf
-	local buildmode
-
-	# fsadm is broken, don't include it (2.02.28)
-	myconf="${myconf} --enable-dmeventd --enable-cmdlib"
-
-	# 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"
-		myconf="${myconf} --enable-static_link"
-		buildmode="internal"
-	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!
-		local clvmd="none"
-		use cman && clvmd="cman"
-		#clvmd="${clvmd/cmangulm/all}"
-		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"
-	econf $(use_enable readline) \
-		$(use_enable selinux) \
-		--libdir=/usr/$(get_libdir) \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}" || die
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Failed to emake install"
-	# TODO: At some point in the future, we need to stop installing the static
-	# as the /sbin/lvm name, and have both variants seperate.
-	if use static; then
-		cp -f "${D}"/sbin/lvm.static "${D}"/sbin/lvm \
-			|| die "Failed to copy lvm.static"
-	fi
-
-	dodir /$(get_libdir)
-	# Put these in root so we can reach before /usr is up
-	for i in libdevmapper-event-lvm2mirror liblvm2{format1,snapshot} ; do
-		b="${D}"/usr/$(get_libdir)/${i}
-		if [ -f "${b}".so ]; then
-			mv -f "${b}".so* "${D}"/$(get_libdir) || die
-		fi
-	done
-
-	dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt}
-	insinto /lib/rcscripts/addons
-	newins "${FILESDIR}"/lvm2-start.sh-2.02.28-r2 lvm-start.sh || die
-	newins "${FILESDIR}"/lvm2-stop.sh-2.02.28-r5 lvm-stop.sh || die
-	newinitd "${FILESDIR}"/lvm.rc-2.02.28-r2 lvm || die
-	newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm || die
-	if use clvm; then
-		newinitd "${FILESDIR}"/clvmd.rc-2.02.28-r3 clvmd || die
-	fi
-
-	elog "use flag nocman is deprecated and replaced"
-	elog "with cman and gulm use flags."
-	elog ""
-	elog "use flags clvm,cman and gulm 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."
-	use nolvmstatic && \
-		elog "USE=nolvmstatic has changed to USE=static via package.use"
-	use nolvm1 && \
-		elog "USE=nolvm1 has changed to USE=lvm1 via package.use"
-}
-
-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"
-}
-
-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.37.ebuild b/sys-fs/lvm2/lvm2-2.02.37.ebuild
deleted file mode 100644
index a82a06fc4c07..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.37.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.37.ebuild,v 1.12 2010/06/07 23:09:45 robbat2 Exp $
-
-EAPI=1
-inherit eutils multilib
-
-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 hppa ia64 ~mips ~ppc ppc64 sparc ~x86"
-
-IUSE="readline +static clvm cman +lvm1 selinux"
-
-DEPEND=">=sys-fs/device-mapper-1.02.26
-		clvm? ( >=sys-cluster/dlm-1.01.00
-			cman? ( >=sys-cluster/cman-1.01.00 ) )"
-
-RDEPEND="${DEPEND}
-	!<sys-apps/openrc-0.4
-	!sys-fs/lvm-user
-	!sys-fs/clvm"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	use nolvmstatic && eerror "USE=nolvmstatic has changed to USE=static via package.use"
-	use nolvm1 && eerror "USE=nolvm1 has changed to USE=lvm1 via package.use"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/lvm.conf-2.02.36.patch
-}
-
-src_compile() {
-	# Static compile of lvm2 so that the install described in the handbook works
-	# http://www.gentoo.org/doc/en/lvm2.xml
-	# fixes http://bugs.gentoo.org/show_bug.cgi?id=84463
-	local myconf
-	local buildmode
-
-	# fsadm is broken, don't include it (2.02.28)
-	myconf="${myconf} --enable-dmeventd --enable-cmdlib"
-
-	# 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"
-		myconf="${myconf} --enable-static_link"
-		buildmode="internal"
-	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
-		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"
-	econf $(use_enable readline) \
-		$(use_enable selinux) \
-		--libdir=/usr/$(get_libdir) \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}" || die
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Failed to emake install"
-	# TODO: At some point in the future, we need to stop installing the static
-	# as the /sbin/lvm name, and have both variants seperate.
-	if use static; then
-		cp -f "${D}"/sbin/lvm.static "${D}"/sbin/lvm \
-			|| die "Failed to copy lvm.static"
-	fi
-
-	dodir /$(get_libdir)
-	# Put these in root so we can reach before /usr is up
-	for i in libdevmapper-event-lvm2mirror liblvm2{format1,snapshot} ; do
-		b="${D}"/usr/$(get_libdir)/${i}
-		if [ -f "${b}".so ]; then
-			mv -f "${b}".so* "${D}"/$(get_libdir) || die
-		fi
-	done
-
-	dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt}
-	insinto /lib/rcscripts/addons
-	newins "${FILESDIR}"/lvm2-start.sh-2.02.28-r2 lvm-start.sh || die
-	newins "${FILESDIR}"/lvm2-stop.sh-2.02.37 lvm-stop.sh || die
-	newinitd "${FILESDIR}"/lvm.rc-2.02.28-r2 lvm || die
-	newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm || die
-	if use clvm; then
-		newinitd "${FILESDIR}"/clvmd.rc-2.02.28-r3 clvmd || die
-	fi
-
-	elog "use flag nocman is deprecated and replaced"
-	elog "with cman and gulm use flags."
-	elog ""
-	elog "use flags clvm,cman and gulm 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."
-	use nolvmstatic && \
-		elog "USE=nolvmstatic has changed to USE=static via package.use"
-	use nolvm1 && \
-		elog "USE=nolvm1 has changed to USE=lvm1 via package.use"
-}
-
-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"
-}
-
-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.39.ebuild b/sys-fs/lvm2/lvm2-2.02.39.ebuild
deleted file mode 100644
index 6dfba706f778..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.39.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.39.ebuild,v 1.10 2010/06/07 23:09:45 robbat2 Exp $
-
-EAPI=1
-inherit eutils multilib
-
-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="readline +static clvm cman +lvm1 selinux"
-
-DEPEND=">=sys-fs/device-mapper-1.02.27
-		clvm? ( >=sys-cluster/dlm-1.01.00
-			cman? ( >=sys-cluster/cman-1.01.00 ) )"
-
-RDEPEND="${DEPEND}
-	!<sys-apps/openrc-0.4
-	!sys-fs/lvm-user
-	!sys-fs/clvm"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	use nolvmstatic && eerror "USE=nolvmstatic has changed to USE=static via package.use"
-	use nolvm1 && eerror "USE=nolvm1 has changed to USE=lvm1 via package.use"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/lvm.conf-2.02.36.patch
-}
-
-src_compile() {
-	# Static compile of lvm2 so that the install described in the handbook works
-	# http://www.gentoo.org/doc/en/lvm2.xml
-	# fixes http://bugs.gentoo.org/show_bug.cgi?id=84463
-	local myconf
-	local buildmode
-
-	# fsadm is broken, don't include it (2.02.28)
-	myconf="${myconf} --enable-dmeventd --enable-cmdlib"
-
-	# 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"
-		myconf="${myconf} --enable-static_link"
-		buildmode="internal"
-	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
-		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"
-	econf $(use_enable readline) \
-		$(use_enable selinux) \
-		--libdir=/usr/$(get_libdir) \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}" || die
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Failed to emake install"
-	# TODO: At some point in the future, we need to stop installing the static
-	# as the /sbin/lvm name, and have both variants seperate.
-	if use static; then
-		cp -f "${D}"/sbin/lvm.static "${D}"/sbin/lvm \
-			|| die "Failed to copy lvm.static"
-	fi
-
-	dodir /$(get_libdir)
-	# Put these in root so we can reach before /usr is up
-	for i in libdevmapper-event-lvm2mirror liblvm2{format1,snapshot} ; do
-		b="${D}"/usr/$(get_libdir)/${i}
-		if [ -f "${b}".so ]; then
-			mv -f "${b}".so* "${D}"/$(get_libdir) || die
-		fi
-	done
-
-	dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt}
-	insinto /lib/rcscripts/addons
-	newins "${FILESDIR}"/lvm2-start.sh-2.02.28-r2 lvm-start.sh || die
-	newins "${FILESDIR}"/lvm2-stop.sh-2.02.37 lvm-stop.sh || die
-	newinitd "${FILESDIR}"/lvm.rc-2.02.28-r2 lvm || die
-	newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm || die
-	if use clvm; then
-		newinitd "${FILESDIR}"/clvmd.rc-2.02.28-r3 clvmd || die
-	fi
-
-	elog "use flag nocman is deprecated and replaced"
-	elog "with cman and gulm use flags."
-	elog ""
-	elog "use flags clvm,cman and gulm 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."
-	use nolvmstatic && \
-		elog "USE=nolvmstatic has changed to USE=static via package.use"
-	use nolvm1 && \
-		elog "USE=nolvm1 has changed to USE=lvm1 via package.use"
-}
-
-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.42.ebuild b/sys-fs/lvm2/lvm2-2.02.42.ebuild
deleted file mode 100644
index ef765faa113f..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.42.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.42.ebuild,v 1.9 2010/06/07 23:09:45 robbat2 Exp $
-
-EAPI=1
-inherit eutils multilib
-
-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="readline +static clvm cman +lvm1 selinux"
-
-DEPEND=">=sys-fs/device-mapper-1.02.28
-		clvm? ( >=sys-cluster/dlm-1.01.00
-			cman? ( >=sys-cluster/cman-1.01.00 ) )"
-
-RDEPEND="${DEPEND}
-	!<sys-apps/openrc-0.4
-	!sys-fs/lvm-user
-	!sys-fs/clvm"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	use nolvmstatic && eerror "USE=nolvmstatic has changed to USE=static via package.use"
-	use nolvm1 && eerror "USE=nolvm1 has changed to USE=lvm1 via package.use"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/lvm.conf-2.02.36.patch
-}
-
-src_compile() {
-	# Static compile of lvm2 so that the install described in the handbook works
-	# http://www.gentoo.org/doc/en/lvm2.xml
-	# fixes http://bugs.gentoo.org/show_bug.cgi?id=84463
-	local myconf
-	local buildmode
-
-	# fsadm is broken, don't include it (2.02.28)
-	myconf="${myconf} --enable-dmeventd --enable-cmdlib"
-
-	# 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"
-		myconf="${myconf} --enable-static_link"
-		buildmode="internal"
-	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
-		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"
-	econf $(use_enable readline) \
-		$(use_enable selinux) \
-		--libdir=/usr/$(get_libdir) \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}" || die
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Failed to emake install"
-	# TODO: At some point in the future, we need to stop installing the static
-	# as the /sbin/lvm name, and have both variants seperate.
-	if use static; then
-		cp -f "${D}"/sbin/lvm.static "${D}"/sbin/lvm \
-			|| die "Failed to copy lvm.static"
-	fi
-
-	dodir /$(get_libdir)
-	# Put these in root so we can reach before /usr is up
-	for i in libdevmapper-event-lvm2mirror liblvm2{format1,snapshot} ; do
-		b="${D}"/usr/$(get_libdir)/${i}
-		if [ -f "${b}".so ]; then
-			mv -f "${b}".so* "${D}"/$(get_libdir) || die
-		fi
-	done
-
-	dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt}
-	insinto /lib/rcscripts/addons
-	newins "${FILESDIR}"/lvm2-start.sh-2.02.28-r2 lvm-start.sh || die
-	newins "${FILESDIR}"/lvm2-stop.sh-2.02.37 lvm-stop.sh || die
-	newinitd "${FILESDIR}"/lvm.rc-2.02.28-r2 lvm || die
-	newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm || die
-	if use clvm; then
-		newinitd "${FILESDIR}"/clvmd.rc-2.02.28-r3 clvmd || die
-	fi
-
-	elog "use flag nocman is deprecated and replaced"
-	elog "with cman and gulm use flags."
-	elog ""
-	elog "use flags clvm,cman and gulm 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."
-	use nolvmstatic && \
-		elog "USE=nolvmstatic has changed to USE=static via package.use"
-	use nolvm1 && \
-		elog "USE=nolvm1 has changed to USE=lvm1 via package.use"
-}
-
-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.45-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.45-r1.ebuild
deleted file mode 100644
index 2ea89ff8ebe5..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.45-r1.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.45-r1.ebuild,v 1.7 2010/06/07 23:09:45 robbat2 Exp $
-
-EAPI=1
-inherit eutils multilib toolchain-funcs
-
-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="readline +static clvm cman +lvm1 selinux"
-
-DEPEND="!sys-fs/device-mapper
-	clvm? ( >=sys-cluster/dlm-1.01.00
-		cman? ( >=sys-cluster/cman-1.01.00 ) )"
-
-RDEPEND="${DEPEND}
-	!<sys-apps/openrc-0.4
-	!sys-fs/lvm-user
-	!sys-fs/clvm"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	use nolvmstatic && eerror "USE=nolvmstatic has changed to USE=static via package.use"
-	use nolvm1 && eerror "USE=nolvm1 has changed to USE=lvm1 via package.use"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-dmeventd.patch
-	epatch "${FILESDIR}"/lvm.conf-2.02.45.patch
-	epatch "${FILESDIR}"/${P}-device-mapper-export-format.patch
-}
-
-src_compile() {
-	# Static compile of lvm2 so that the install described in the handbook works
-	# http://www.gentoo.org/doc/en/lvm2.xml
-	# fixes http://bugs.gentoo.org/show_bug.cgi?id=84463
-	local myconf
-	local buildmode
-
-	# fsadm is broken, don't include it (2.02.28)
-	myconf="${myconf} --enable-dmeventd --enable-cmdlib"
-
-	# 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"
-		myconf="${myconf} --enable-static_link"
-		buildmode="internal"
-	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
-		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"
-	econf $(use_enable readline) \
-		$(use_enable selinux) \
-		--libdir=/usr/$(get_libdir) \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}" || die
-
-	pushd include
-	emake || die "Failed to prepare symlinks"
-	popd
-
-	pushd libdm
-	emake || die "failed to build libdm"
-	popd
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Failed to emake install"
-	# TODO: At some point in the future, we need to stop installing the static
-	# as the /sbin/lvm name, and have both variants seperate.
-	if use static; then
-		cp -f "${D}"/sbin/lvm.static "${D}"/sbin/lvm \
-			|| die "Failed to copy lvm.static"
-	fi
-
-	dodir /$(get_libdir)
-	# Put these in root so we can reach before /usr is up
-	for i in \
-		libdevmapper-event{,-lvm2{mirror,snapshot}} \
-		libdevmapper \
-		liblvm2{format1,snapshot,cmd} \
-		; do
-		b="${D}"/usr/$(get_libdir)/${i}
-		if [ -f "${b}".so ]; then
-			mv -f "${b}".so* "${D}"/$(get_libdir) || die
-			gen_usr_ldscript ${i}.so || die
-		fi
-	done
-
-	dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt}
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/lvm2-start.sh-2.02.28-r2 lvm-start.sh || die
-	newins "${FILESDIR}"/lvm2-stop.sh-2.02.37 lvm-stop.sh || die
-	newinitd "${FILESDIR}"/lvm.rc-2.02.28-r2 lvm || die
-	newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm || die
-	if use clvm; then
-		newinitd "${FILESDIR}"/clvmd.rc-2.02.28-r3 clvmd || die
-	fi
-
-	# move shared libs to /lib(64)
-	dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a"
-	#gen_usr_ldscript libdevmapper.so
-
-	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.22-r3 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
-	#gen_usr_ldscript libdevmapper-event.so
-
-	insinto /etc/udev/rules.d/
-	newins "${FILESDIR}"/64-device-mapper.rules-1.02.22-r5 64-device-mapper.rules || die
-
-	elog "use flag nocman is deprecated and replaced"
-	elog "with cman and gulm use flags."
-	elog ""
-	elog "use flags clvm,cman and gulm 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."
-	use nolvmstatic && \
-		elog "USE=nolvmstatic has changed to USE=static via package.use"
-	use nolvm1 && \
-		elog "USE=nolvm1 has changed to USE=lvm1 via package.use"
-}
-
-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.45-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.45-r2.ebuild
deleted file mode 100644
index c21856f11ffa..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.45-r2.ebuild
+++ /dev/null
@@ -1,192 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.45-r2.ebuild,v 1.7 2010/06/07 23:09:45 robbat2 Exp $
-
-EAPI=1
-inherit eutils multilib toolchain-funcs
-
-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="readline +static clvm cman +lvm1 selinux"
-
-DEPEND="!sys-fs/device-mapper
-	clvm? ( =sys-cluster/dlm-2*
-		cman? ( =sys-cluster/cman-2* ) )"
-
-RDEPEND="${DEPEND}
-	!<sys-apps/openrc-0.4
-	!sys-fs/lvm-user
-	!sys-fs/clvm"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	use nolvmstatic && eerror "USE=nolvmstatic has changed to USE=static via package.use"
-	use nolvm1 && eerror "USE=nolvm1 has changed to USE=lvm1 via package.use"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-dmeventd.patch
-	epatch "${FILESDIR}"/lvm.conf-2.02.45.patch
-	epatch "${FILESDIR}"/${P}-device-mapper-export-format.patch
-}
-
-src_compile() {
-	# Static compile of lvm2 so that the install described in the handbook works
-	# http://www.gentoo.org/doc/en/lvm2.xml
-	# fixes http://bugs.gentoo.org/show_bug.cgi?id=84463
-	local myconf
-	local buildmode
-
-	# fsadm is broken, don't include it (2.02.28)
-	myconf="${myconf} --enable-dmeventd --enable-cmdlib"
-
-	# 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"
-		myconf="${myconf} --enable-static_link"
-		buildmode="internal"
-	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
-		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"
-	econf $(use_enable readline) \
-		$(use_enable selinux) \
-		--libdir=/usr/$(get_libdir) \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}" || die
-
-	pushd include
-	emake || die "Failed to prepare symlinks"
-	popd
-
-	pushd libdm
-	emake || die "failed to build libdm"
-	popd
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Failed to emake install"
-	# TODO: At some point in the future, we need to stop installing the static
-	# as the /sbin/lvm name, and have both variants seperate.
-	if use static; then
-		cp -f "${D}"/sbin/lvm.static "${D}"/sbin/lvm \
-			|| die "Failed to copy lvm.static"
-	fi
-
-	dodir /$(get_libdir)
-	# Put these in root so we can reach before /usr is up
-	for i in \
-		libdevmapper-event{,-lvm2{mirror,snapshot}} \
-		libdevmapper \
-		liblvm2{format1,snapshot,cmd} \
-		; do
-		b="${D}"/usr/$(get_libdir)/${i}
-		if [ -f "${b}".so ]; then
-			mv -f "${b}".so* "${D}"/$(get_libdir) || die
-			gen_usr_ldscript ${i}.so || die
-		fi
-	done
-
-	dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt}
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/lvm2-start.sh-2.02.28-r2 lvm-start.sh || die
-	newins "${FILESDIR}"/lvm2-stop.sh-2.02.37 lvm-stop.sh || die
-	newinitd "${FILESDIR}"/lvm.rc-2.02.28-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"
-	#gen_usr_ldscript libdevmapper.so
-
-	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.22-r3 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
-	#gen_usr_ldscript libdevmapper-event.so
-
-	insinto /etc/udev/rules.d/
-	newins "${FILESDIR}"/64-device-mapper.rules-1.02.22-r5 64-device-mapper.rules || 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 use them"
-	elog ""
-	elog "If you are using genkernel and root-on-LVM, rebuild the initramfs."
-	use nolvmstatic && \
-		elog "USE=nolvmstatic has changed to USE=static via package.use"
-	use nolvm1 && \
-		elog "USE=nolvm1 has changed to USE=lvm1 via package.use"
-}
-
-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.45.ebuild b/sys-fs/lvm2/lvm2-2.02.45.ebuild
deleted file mode 100644
index f2066fe6cd51..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.45.ebuild
+++ /dev/null
@@ -1,184 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.45.ebuild,v 1.13 2010/06/07 23:09:45 robbat2 Exp $
-
-EAPI=1
-inherit eutils multilib toolchain-funcs
-
-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="readline +static clvm cman +lvm1 selinux"
-
-DEPEND="!sys-fs/device-mapper
-	clvm? ( >=sys-cluster/dlm-1.01.00
-		cman? ( >=sys-cluster/cman-1.01.00 ) )"
-
-RDEPEND="${DEPEND}
-	!<sys-apps/openrc-0.4
-	!sys-fs/lvm-user
-	!sys-fs/clvm"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	use nolvmstatic && eerror "USE=nolvmstatic has changed to USE=static via package.use"
-	use nolvm1 && eerror "USE=nolvm1 has changed to USE=lvm1 via package.use"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${P}-dmeventd.patch
-	epatch "${FILESDIR}"/lvm.conf-2.02.45.patch
-	epatch "${FILESDIR}"/${P}-device-mapper-export-format.patch
-}
-
-src_compile() {
-	# Static compile of lvm2 so that the install described in the handbook works
-	# http://www.gentoo.org/doc/en/lvm2.xml
-	# fixes http://bugs.gentoo.org/show_bug.cgi?id=84463
-	local myconf
-	local buildmode
-
-	# fsadm is broken, don't include it (2.02.28)
-	myconf="${myconf} --enable-dmeventd --enable-cmdlib"
-
-	# 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"
-		myconf="${myconf} --enable-static_link"
-		buildmode="internal"
-	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
-		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"
-	econf $(use_enable readline) \
-		$(use_enable selinux) \
-		--libdir=/usr/$(get_libdir) \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}" || die
-
-	pushd include
-	emake || die "Failed to prepare symlinks"
-	popd
-
-	pushd libdm
-	emake || die "failed to build libdm"
-	popd
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Failed to emake install"
-	# TODO: At some point in the future, we need to stop installing the static
-	# as the /sbin/lvm name, and have both variants seperate.
-	if use static; then
-		cp -f "${D}"/sbin/lvm.static "${D}"/sbin/lvm \
-			|| die "Failed to copy lvm.static"
-	fi
-
-	dodir /$(get_libdir)
-	# Put these in root so we can reach before /usr is up
-	for i in libdevmapper-event-lvm2mirror liblvm2{format1,snapshot} ; do
-		b="${D}"/usr/$(get_libdir)/${i}
-		if [ -f "${b}".so ]; then
-			mv -f "${b}".so* "${D}"/$(get_libdir) || die
-		fi
-	done
-
-	dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt}
-	insinto /lib/rcscripts/addons
-	newins "${FILESDIR}"/lvm2-start.sh-2.02.28-r2 lvm-start.sh || die
-	newins "${FILESDIR}"/lvm2-stop.sh-2.02.37 lvm-stop.sh || die
-	newinitd "${FILESDIR}"/lvm.rc-2.02.28-r2 lvm || die
-	newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm || die
-	if use clvm; then
-		newinitd "${FILESDIR}"/clvmd.rc-2.02.28-r3 clvmd || die
-	fi
-
-	# move shared libs to /lib(64)
-	mv "${D}"/usr/$(get_libdir)/libdevmapper.so* "${D}"/$(get_libdir)
-	mv "${D}"/usr/$(get_libdir)/libdevmapper-event.so* "${D}"/$(get_libdir)
-	dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a"
-	gen_usr_ldscript libdevmapper.so
-
-	insinto /etc
-	doins "${FILESDIR}"/dmtab
-	insinto /lib/rcscripts/addons
-	doins "${FILESDIR}"/dm-start.sh
-
-	# Device mapper stuff
-	newinitd "${FILESDIR}"/device-mapper.rc-1.02.22-r3 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
-	gen_usr_ldscript libdevmapper-event.so
-
-	insinto /etc/udev/rules.d/
-	newins "${FILESDIR}"/64-device-mapper.rules-1.02.22-r5 64-device-mapper.rules || die
-
-	elog "use flag nocman is deprecated and replaced"
-	elog "with cman and gulm use flags."
-	elog ""
-	elog "use flags clvm,cman and gulm 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."
-	use nolvmstatic && \
-		elog "USE=nolvmstatic has changed to USE=static via package.use"
-	use nolvm1 && \
-		elog "USE=nolvm1 has changed to USE=lvm1 via package.use"
-}
-
-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.48-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.48-r1.ebuild
deleted file mode 100644
index 6332f8bd146b..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.48-r1.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.48-r1.ebuild,v 1.7 2010/06/07 23:09:45 robbat2 Exp $
-
-EAPI=1
-inherit eutils multilib toolchain-funcs
-
-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="readline +static clvm cman +lvm1 selinux"
-
-DEPEND="!sys-fs/device-mapper
-	clvm? ( =sys-cluster/dlm-2*
-		cman? ( =sys-cluster/cman-2* ) )"
-
-RDEPEND="${DEPEND}
-	!<sys-apps/openrc-0.4
-	!sys-fs/lvm-user
-	!sys-fs/clvm"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	# 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}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-2.02.45-dmeventd.patch
-	epatch "${FILESDIR}"/lvm.conf-2.02.45.patch
-	epatch "${FILESDIR}"/${PN}-2.02.48-device-mapper-export-format.patch
-	epatch "${FILESDIR}"/${PN}-2.02.48-as-needed.patch
-}
-
-src_compile() {
-	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"
-	econf $(use_enable readline) \
-		$(use_enable selinux) \
-		--libdir=/usr/$(get_libdir) \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}" || die
-
-	einfo "Doing symlinks"
-	pushd include
-	emake || die "Failed to prepare symlinks"
-	popd
-
-	einfo "Doing device-mapper"
-	pushd libdm
-	emake || die "failed to build libdm"
-	#emake ioctl/libdevmapper.a || die "failed to build libdm/ioctl/libdevmapper.a"
-	popd
-
-	einfo "Doing lib"
-	pushd lib
-	emake || die "failed to build lib"
-	popd
-
-	einfo "Doing main build"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Failed to emake install"
-
-	dodir /$(get_libdir)
-	# Put these in root so we can reach before /usr is up
-	for i in \
-		libdevmapper-event{,-lvm2{mirror,snapshot}} \
-		libdevmapper \
-		liblvm2{format1,snapshot,cmd} \
-		; do
-		b="${D}"/usr/$(get_libdir)/${i}
-		if [ -f "${b}".so ]; then
-			mv -f "${b}".so* "${D}"/$(get_libdir) || die
-			gen_usr_ldscript ${i}.so || die
-		fi
-	done
-
-	dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt}
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/lvm2-start.sh-2.02.28-r2 lvm-start.sh || die
-	newins "${FILESDIR}"/lvm2-stop.sh-2.02.37 lvm-stop.sh || die
-	newinitd "${FILESDIR}"/lvm.rc-2.02.28-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)
-	if use static; then
-		dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a libdevmapper.a"
-	fi
-	#gen_usr_ldscript libdevmapper.so
-
-	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.22-r3 device-mapper || die
-	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper || die
-
-	newinitd "${FILESDIR}"/1.02.22-dmeventd.initd dmeventd || die
-	if use static; then
-		dolib.a daemons/dmeventd/libdevmapper-event.a \
-		|| die "dolib.a libdevmapper-event.a"
-	fi
-	#gen_usr_ldscript libdevmapper-event.so
-
-	insinto /etc/udev/rules.d/
-	newins "${FILESDIR}"/64-device-mapper.rules-1.02.22-r5 64-device-mapper.rules || 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 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.48-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.48-r2.ebuild
deleted file mode 100644
index 600a84677b36..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.48-r2.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.48-r2.ebuild,v 1.6 2010/06/07 23:09:45 robbat2 Exp $
-
-EAPI=2
-inherit eutils multilib toolchain-funcs autotools
-
-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="readline +static clvm cman +lvm1 selinux"
-
-DEPEND="!!sys-fs/device-mapper
-	clvm? ( =sys-cluster/dlm-2*
-		cman? ( =sys-cluster/cman-2* ) )"
-
-RDEPEND="${DEPEND}
-	!<sys-apps/openrc-0.4
-	!!sys-fs/lvm-user
-	!!sys-fs/clvm"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	# 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}"/${PN}-2.02.45-dmeventd.patch
-	epatch "${FILESDIR}"/lvm.conf-2.02.45.patch
-	epatch "${FILESDIR}"/${PN}-2.02.48-device-mapper-export-format.patch
-	epatch "${FILESDIR}"/${PN}-2.02.48-as-needed.patch
-	epatch "${FILESDIR}"/${PN}-2.02.48-fix-pkgconfig.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"
-	econf $(use_enable readline) \
-		$(use_enable selinux) \
-		--enable-pkgconfig \
-		--libdir=/usr/$(get_libdir) \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}" || die
-}
-
-src_compile() {
-	einfo "Doing symlinks"
-	pushd include
-	emake || die "Failed to prepare symlinks"
-	popd
-
-	einfo "Doing device-mapper"
-	pushd libdm
-	emake || die "failed to build libdm"
-	#emake ioctl/libdevmapper.a || die "failed to build libdm/ioctl/libdevmapper.a"
-	popd
-
-	einfo "Doing lib"
-	pushd lib
-	emake || die "failed to build lib"
-	popd
-
-	einfo "Doing main build"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Failed to emake install"
-
-	dodir /$(get_libdir)
-	# Put these in root so we can reach before /usr is up
-	for i in \
-		libdevmapper-event{,-lvm2{mirror,snapshot}} \
-		libdevmapper \
-		liblvm2{format1,snapshot,cmd} \
-		; do
-		b="${D}"/usr/$(get_libdir)/${i}
-		if [ -f "${b}".so ]; then
-			mv -f "${b}".so* "${D}"/$(get_libdir) || die
-			gen_usr_ldscript ${i}.so || die
-		fi
-	done
-
-	dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt}
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/lvm2-start.sh-2.02.28-r2 lvm-start.sh || die
-	newins "${FILESDIR}"/lvm2-stop.sh-2.02.37 lvm-stop.sh || die
-	newinitd "${FILESDIR}"/lvm.rc-2.02.28-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)
-	if use static; then
-		dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a libdevmapper.a"
-	fi
-	#gen_usr_ldscript libdevmapper.so
-
-	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.22-r3 device-mapper || die
-	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper || die
-
-	newinitd "${FILESDIR}"/1.02.22-dmeventd.initd dmeventd || die
-	if use static; then
-		dolib.a daemons/dmeventd/libdevmapper-event.a \
-		|| die "dolib.a libdevmapper-event.a"
-	fi
-	#gen_usr_ldscript libdevmapper-event.so
-
-	insinto /etc/udev/rules.d/
-	newins "${FILESDIR}"/64-device-mapper.rules-1.02.22-r5 64-device-mapper.rules || 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 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.48.ebuild b/sys-fs/lvm2/lvm2-2.02.48.ebuild
deleted file mode 100644
index 329adab389c6..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.48.ebuild
+++ /dev/null
@@ -1,197 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.48.ebuild,v 1.8 2010/06/07 23:09:45 robbat2 Exp $
-
-EAPI=1
-inherit eutils multilib toolchain-funcs
-
-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="readline +static clvm cman +lvm1 selinux"
-
-DEPEND="!sys-fs/device-mapper
-	clvm? ( =sys-cluster/dlm-2*
-		cman? ( =sys-cluster/cman-2* ) )"
-
-RDEPEND="${DEPEND}
-	!<sys-apps/openrc-0.4
-	!sys-fs/lvm-user
-	!sys-fs/clvm"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	use nolvmstatic && eerror "USE=nolvmstatic has changed to USE=static via package.use"
-	use nolvm1 && eerror "USE=nolvm1 has changed to USE=lvm1 via package.use"
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-	epatch "${FILESDIR}"/${PN}-2.02.45-dmeventd.patch
-	epatch "${FILESDIR}"/lvm.conf-2.02.45.patch
-	epatch "${FILESDIR}"/${PN}-2.02.48-device-mapper-export-format.patch
-	epatch "${FILESDIR}"/${PN}-2.02.48-as-needed.patch
-}
-
-src_compile() {
-	# Static compile of lvm2 so that the install described in the handbook works
-	# http://www.gentoo.org/doc/en/lvm2.xml
-	# fixes http://bugs.gentoo.org/show_bug.cgi?id=84463
-	local myconf
-	local buildmode
-
-	# fsadm is broken, don't include it (2.02.28)
-	myconf="${myconf} --enable-dmeventd --enable-cmdlib"
-
-	# 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"
-		myconf="${myconf} --enable-static_link"
-		buildmode="internal"
-	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
-		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"
-	econf $(use_enable readline) \
-		$(use_enable selinux) \
-		--libdir=/usr/$(get_libdir) \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}" || die
-
-	pushd include
-	emake || die "Failed to prepare symlinks"
-	popd
-
-	pushd libdm
-	emake || die "failed to build libdm"
-	popd
-
-	pushd lib
-	emake || die "failed to build lib"
-	popd
-
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Failed to emake install"
-	# TODO: At some point in the future, we need to stop installing the static
-	# as the /sbin/lvm name, and have both variants seperate.
-	if use static; then
-		cp -f "${D}"/sbin/lvm.static "${D}"/sbin/lvm \
-			|| die "Failed to copy lvm.static"
-	fi
-
-	dodir /$(get_libdir)
-	# Put these in root so we can reach before /usr is up
-	for i in \
-		libdevmapper-event{,-lvm2{mirror,snapshot}} \
-		libdevmapper \
-		liblvm2{format1,snapshot,cmd} \
-		; do
-		b="${D}"/usr/$(get_libdir)/${i}
-		if [ -f "${b}".so ]; then
-			mv -f "${b}".so* "${D}"/$(get_libdir) || die
-			gen_usr_ldscript ${i}.so || die
-		fi
-	done
-
-	dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt}
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/lvm2-start.sh-2.02.28-r2 lvm-start.sh || die
-	newins "${FILESDIR}"/lvm2-stop.sh-2.02.37 lvm-stop.sh || die
-	newinitd "${FILESDIR}"/lvm.rc-2.02.28-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)
-	if use static; then dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a" ; fi
-	#gen_usr_ldscript libdevmapper.so
-
-	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.22-r3 device-mapper || die
-	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper || die
-
-	newinitd "${FILESDIR}"/1.02.22-dmeventd.initd dmeventd || die
-	if use static; then dolib.a daemons/dmeventd/libdevmapper-event.a || die ; fi
-	#gen_usr_ldscript libdevmapper-event.so
-
-	insinto /etc/udev/rules.d/
-	newins "${FILESDIR}"/64-device-mapper.rules-1.02.22-r5 64-device-mapper.rules || 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 use them"
-	elog ""
-	elog "If you are using genkernel and root-on-LVM, rebuild the initramfs."
-	use nolvmstatic && \
-		elog "USE=nolvmstatic has changed to USE=static via package.use"
-	use nolvm1 && \
-		elog "USE=nolvm1 has changed to USE=lvm1 via package.use"
-}
-
-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.49-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.49-r1.ebuild
deleted file mode 100644
index 04fc1fefab25..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.49-r1.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.49-r1.ebuild,v 1.6 2010/06/07 23:09:45 robbat2 Exp $
-
-EAPI=2
-inherit eutils multilib toolchain-funcs autotools
-
-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="readline +static clvm cman +lvm1 selinux"
-
-DEPEND="!!sys-fs/device-mapper
-	clvm? ( =sys-cluster/dlm-2*
-		cman? ( =sys-cluster/cman-2* ) )"
-
-RDEPEND="${DEPEND}
-	!<sys-apps/openrc-0.4
-	!!sys-fs/lvm-user
-	!!sys-fs/clvm"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	# 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}"/${PN}-2.02.45-dmeventd.patch
-	epatch "${FILESDIR}"/lvm.conf-2.02.45.patch
-	epatch "${FILESDIR}"/${PN}-2.02.48-device-mapper-export-format.patch
-	epatch "${FILESDIR}"/${PN}-2.02.48-as-needed.patch
-	epatch "${FILESDIR}"/${PN}-2.02.48-fix-pkgconfig.patch
-	epatch "${FILESDIR}"/${PN}-2.02.49-lockdir-override.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"
-	econf $(use_enable readline) \
-		$(use_enable selinux) \
-		--enable-pkgconfig \
-		--libdir=/usr/$(get_libdir) \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}" || die
-}
-
-src_compile() {
-	einfo "Doing symlinks"
-	pushd include
-	emake || die "Failed to prepare symlinks"
-	popd
-
-	einfo "Doing device-mapper"
-	pushd libdm
-	emake || die "failed to build libdm"
-	#emake ioctl/libdevmapper.a || die "failed to build libdm/ioctl/libdevmapper.a"
-	popd
-
-	einfo "Doing lib"
-	pushd lib
-	emake || die "failed to build lib"
-	popd
-
-	einfo "Doing main build"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Failed to emake install"
-
-	dodir /$(get_libdir)
-	# Put these in root so we can reach before /usr is up
-	for i in \
-		libdevmapper-event{,-lvm2{mirror,snapshot}} \
-		libdevmapper \
-		liblvm2{format1,snapshot,cmd} \
-		; do
-		b="${D}"/usr/$(get_libdir)/${i}
-		if [ -f "${b}".so ]; then
-			mv -f "${b}".so* "${D}"/$(get_libdir) || die
-			gen_usr_ldscript ${i}.so || die
-		fi
-	done
-
-	dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt}
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/lvm2-start.sh-2.02.49-r1 lvm-start.sh || die
-	newins "${FILESDIR}"/lvm2-stop.sh-2.02.49-r1 lvm-stop.sh || die
-	newinitd "${FILESDIR}"/lvm.rc-2.02.28-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)
-	if use static; then
-		dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a libdevmapper.a"
-	fi
-	#gen_usr_ldscript libdevmapper.so
-
-	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.22-r3 device-mapper || die
-	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper || die
-
-	newinitd "${FILESDIR}"/1.02.22-dmeventd.initd dmeventd || die
-	if use static; then
-		dolib.a daemons/dmeventd/libdevmapper-event.a \
-		|| die "dolib.a libdevmapper-event.a"
-	fi
-	#gen_usr_ldscript libdevmapper-event.so
-
-	insinto /etc/udev/rules.d/
-	newins "${FILESDIR}"/64-device-mapper.rules-1.02.22-r5 64-device-mapper.rules || 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 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.49-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.49-r2.ebuild
deleted file mode 100644
index bf0fef851040..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.49-r2.ebuild
+++ /dev/null
@@ -1,218 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.49-r2.ebuild,v 1.6 2010/06/07 23:09:45 robbat2 Exp $
-
-EAPI=2
-inherit eutils multilib toolchain-funcs autotools
-
-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="readline +static clvm cman +lvm1 selinux"
-
-DEPEND="!!sys-fs/device-mapper
-	clvm? ( =sys-cluster/dlm-2*
-		cman? ( =sys-cluster/cman-2* ) )"
-
-RDEPEND="${DEPEND}
-	!<sys-apps/openrc-0.4
-	!!sys-fs/lvm-user
-	!!sys-fs/clvm
-	>=sys-apps/util-linux-2.16"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	# 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}"/${PN}-2.02.45-dmeventd.patch
-	epatch "${FILESDIR}"/lvm.conf-2.02.45.patch
-	epatch "${FILESDIR}"/${PN}-2.02.48-device-mapper-export-format.patch
-	epatch "${FILESDIR}"/${PN}-2.02.48-as-needed.patch
-	epatch "${FILESDIR}"/${PN}-2.02.48-fix-pkgconfig.patch
-	epatch "${FILESDIR}"/${PN}-2.02.49-lockdir-override.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"
-	econf $(use_enable readline) \
-		$(use_enable selinux) \
-		--enable-pkgconfig \
-		--libdir=/usr/$(get_libdir) \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}" || die
-}
-
-src_compile() {
-	einfo "Doing symlinks"
-	pushd include
-	emake || die "Failed to prepare symlinks"
-	popd
-
-	einfo "Doing device-mapper"
-	pushd libdm
-	emake || die "failed to build libdm"
-	#emake ioctl/libdevmapper.a || die "failed to build libdm/ioctl/libdevmapper.a"
-	popd
-
-	einfo "Doing lib"
-	pushd lib
-	emake || die "failed to build lib"
-	popd
-
-	einfo "Doing main build"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Failed to emake install"
-
-	dodir /$(get_libdir)
-	# Put these in root so we can reach before /usr is up
-	for i in \
-		libdevmapper-event{,-lvm2{mirror,snapshot}} \
-		libdevmapper \
-		liblvm2{format1,snapshot,cmd} \
-		; do
-		b="${D}"/usr/$(get_libdir)/${i}
-		if [ -f "${b}".so ]; then
-			mv -f "${b}".so* "${D}"/$(get_libdir) || die
-			gen_usr_ldscript ${i}.so || die
-		fi
-	done
-
-	dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt}
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/lvm2-start.sh-2.02.49-r1 lvm-start.sh || die
-	newins "${FILESDIR}"/lvm2-stop.sh-2.02.49-r1 lvm-stop.sh || die
-	newinitd "${FILESDIR}"/lvm.rc-2.02.28-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)
-	if use static; then
-		dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a libdevmapper.a"
-	fi
-	#gen_usr_ldscript libdevmapper.so
-
-	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.22-r3 device-mapper || die
-	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper || die
-
-	newinitd "${FILESDIR}"/1.02.22-dmeventd.initd dmeventd || die
-	if use static; then
-		dolib.a daemons/dmeventd/libdevmapper-event.a \
-		|| die "dolib.a libdevmapper-event.a"
-	fi
-	#gen_usr_ldscript libdevmapper-event.so
-
-	insinto /etc/udev/rules.d/
-	newins "${FILESDIR}"/64-device-mapper.rules-1.02.49-r2 64-device-mapper.rules || 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 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.49-r3.ebuild b/sys-fs/lvm2/lvm2-2.02.49-r3.ebuild
deleted file mode 100644
index 98dd92632d32..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.49-r3.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.49-r3.ebuild,v 1.5 2010/06/07 23:09:45 robbat2 Exp $
-
-EAPI=2
-inherit eutils multilib toolchain-funcs autotools
-
-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="readline +static clvm cman +lvm1 selinux"
-
-DEPEND="!!sys-fs/device-mapper
-	clvm? ( =sys-cluster/dlm-2*
-		cman? ( =sys-cluster/cman-2* ) )"
-
-RDEPEND="${DEPEND}
-	!<sys-apps/openrc-0.4
-	!!sys-fs/lvm-user
-	!!sys-fs/clvm
-	>=sys-apps/util-linux-2.16"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	# 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}"/${PN}-2.02.45-dmeventd.patch
-	epatch "${FILESDIR}"/lvm.conf-2.02.45.patch
-	epatch "${FILESDIR}"/${PN}-2.02.48-device-mapper-export-format.patch
-	epatch "${FILESDIR}"/${PN}-2.02.48-as-needed.patch
-	epatch "${FILESDIR}"/${PN}-2.02.48-fix-pkgconfig.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"
-	econf $(use_enable readline) \
-		$(use_enable selinux) \
-		--enable-pkgconfig \
-		--libdir=/usr/$(get_libdir) \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}" || die
-}
-
-src_compile() {
-	einfo "Doing symlinks"
-	pushd include
-	emake || die "Failed to prepare symlinks"
-	popd
-
-	einfo "Doing device-mapper"
-	pushd libdm
-	emake || die "failed to build libdm"
-	#emake ioctl/libdevmapper.a || die "failed to build libdm/ioctl/libdevmapper.a"
-	popd
-
-	einfo "Doing lib"
-	pushd lib
-	emake || die "failed to build lib"
-	popd
-
-	einfo "Doing main build"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Failed to emake install"
-
-	dodir /$(get_libdir)
-	# Put these in root so we can reach before /usr is up
-	for i in \
-		libdevmapper-event{,-lvm2{mirror,snapshot}} \
-		libdevmapper \
-		liblvm2{format1,snapshot,cmd} \
-		; do
-		b="${D}"/usr/$(get_libdir)/${i}
-		if [ -f "${b}".so ]; then
-			mv -f "${b}".so* "${D}"/$(get_libdir) || die
-			gen_usr_ldscript ${i}.so || die
-		fi
-	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.28-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)
-	if use static; then
-		dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a libdevmapper.a"
-	fi
-	#gen_usr_ldscript libdevmapper.so
-
-	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.22-r3 device-mapper || die
-	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper || die
-
-	newinitd "${FILESDIR}"/1.02.22-dmeventd.initd dmeventd || die
-	if use static; then
-		dolib.a daemons/dmeventd/libdevmapper-event.a \
-		|| die "dolib.a libdevmapper-event.a"
-	fi
-	#gen_usr_ldscript libdevmapper-event.so
-
-	insinto /etc/udev/rules.d/
-	newins "${FILESDIR}"/64-device-mapper.rules-1.02.49-r2 64-device-mapper.rules || 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 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.49.ebuild b/sys-fs/lvm2/lvm2-2.02.49.ebuild
deleted file mode 100644
index 1c56cb3db63d..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.49.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.49.ebuild,v 1.6 2010/06/07 23:09:45 robbat2 Exp $
-
-EAPI=2
-inherit eutils multilib toolchain-funcs autotools
-
-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 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-
-IUSE="readline +static clvm cman +lvm1 selinux"
-
-DEPEND="!!sys-fs/device-mapper
-	clvm? ( =sys-cluster/dlm-2*
-		cman? ( =sys-cluster/cman-2* ) )"
-
-RDEPEND="${DEPEND}
-	!<sys-apps/openrc-0.4
-	!!sys-fs/lvm-user
-	!!sys-fs/clvm"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	# 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}"/${PN}-2.02.45-dmeventd.patch
-	epatch "${FILESDIR}"/lvm.conf-2.02.45.patch
-	epatch "${FILESDIR}"/${PN}-2.02.48-device-mapper-export-format.patch
-	epatch "${FILESDIR}"/${PN}-2.02.48-as-needed.patch
-	epatch "${FILESDIR}"/${PN}-2.02.48-fix-pkgconfig.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"
-	econf $(use_enable readline) \
-		$(use_enable selinux) \
-		--enable-pkgconfig \
-		--libdir=/usr/$(get_libdir) \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}" || die
-}
-
-src_compile() {
-	einfo "Doing symlinks"
-	pushd include
-	emake || die "Failed to prepare symlinks"
-	popd
-
-	einfo "Doing device-mapper"
-	pushd libdm
-	emake || die "failed to build libdm"
-	#emake ioctl/libdevmapper.a || die "failed to build libdm/ioctl/libdevmapper.a"
-	popd
-
-	einfo "Doing lib"
-	pushd lib
-	emake || die "failed to build lib"
-	popd
-
-	einfo "Doing main build"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Failed to emake install"
-
-	dodir /$(get_libdir)
-	# Put these in root so we can reach before /usr is up
-	for i in \
-		libdevmapper-event{,-lvm2{mirror,snapshot}} \
-		libdevmapper \
-		liblvm2{format1,snapshot,cmd} \
-		; do
-		b="${D}"/usr/$(get_libdir)/${i}
-		if [ -f "${b}".so ]; then
-			mv -f "${b}".so* "${D}"/$(get_libdir) || die
-			gen_usr_ldscript ${i}.so || die
-		fi
-	done
-
-	dodoc README VERSION WHATS_NEW doc/*.{conf,c,txt}
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/lvm2-start.sh-2.02.28-r2 lvm-start.sh || die
-	newins "${FILESDIR}"/lvm2-stop.sh-2.02.37 lvm-stop.sh || die
-	newinitd "${FILESDIR}"/lvm.rc-2.02.28-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)
-	if use static; then
-		dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a libdevmapper.a"
-	fi
-	#gen_usr_ldscript libdevmapper.so
-
-	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.22-r3 device-mapper || die
-	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper || die
-
-	newinitd "${FILESDIR}"/1.02.22-dmeventd.initd dmeventd || die
-	if use static; then
-		dolib.a daemons/dmeventd/libdevmapper-event.a \
-		|| die "dolib.a libdevmapper-event.a"
-	fi
-	#gen_usr_ldscript libdevmapper-event.so
-
-	insinto /etc/udev/rules.d/
-	newins "${FILESDIR}"/64-device-mapper.rules-1.02.22-r5 64-device-mapper.rules || 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 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.51-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.51-r1.ebuild
deleted file mode 100644
index 8b740847dce4..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.51-r1.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.51-r1.ebuild,v 1.16 2010/06/07 23:09:45 robbat2 Exp $
-
-EAPI=2
-inherit eutils multilib toolchain-funcs autotools
-
-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="!!sys-fs/device-mapper
-	clvm? ( =sys-cluster/dlm-2*
-		cman? ( =sys-cluster/cman-2* ) )"
-
-RDEPEND="${DEPEND}
-	!<sys-apps/openrc-0.4
-	!!sys-fs/lvm-user
-	!!sys-fs/clvm
-	>=sys-apps/util-linux-2.16"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	# 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}"/${PN}-2.02.45-dmeventd.patch
-	epatch "${FILESDIR}"/lvm.conf-2.02.51.patch
-	epatch "${FILESDIR}"/${PN}-2.02.51-device-mapper-export-format.patch
-	epatch "${FILESDIR}"/${PN}-2.02.51-as-needed.patch
-	epatch "${FILESDIR}"/${PN}-2.02.48-fix-pkgconfig.patch
-	epatch "${FILESDIR}"/${PN}-2.02.51-fix-pvcreate.patch
-	epatch "${FILESDIR}"/${PN}-2.02.51-dmsetup-selinux-linking-fix.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"
-	econf $(use_enable readline) \
-		$(use_enable selinux) \
-		--enable-pkgconfig \
-		--libdir=/usr/$(get_libdir) \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}" || die
-}
-
-src_compile() {
-	einfo "Doing symlinks"
-	pushd include
-	emake || die "Failed to prepare symlinks"
-	popd
-
-	einfo "Doing device-mapper"
-	pushd libdm
-	emake || die "failed to build libdm"
-	#emake ioctl/libdevmapper.a || die "failed to build libdm/ioctl/libdevmapper.a"
-	popd
-
-	einfo "Doing lib"
-	pushd lib
-	emake || die "failed to build lib"
-	popd
-
-	einfo "Doing dmeventd"
-	pushd daemons/dmeventd
-	emake device-mapper || die "failed to build lib"
-	popd
-
-	einfo "Doing main build"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Failed to emake install"
-
-	dodir /$(get_libdir)
-	# Put these in root so we can reach before /usr is up
-	for i in \
-		libdevmapper-event{,-lvm2{mirror,snapshot}} \
-		libdevmapper \
-		liblvm2{format1,snapshot,cmd} \
-		; do
-		b="${D}"/usr/$(get_libdir)/${i}
-		if [ -f "${b}".so ]; then
-			mv -f "${b}".so* "${D}"/$(get_libdir) || die
-			gen_usr_ldscript ${i}.so || die
-		fi
-	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.28-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)
-	if use static; then
-		dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a libdevmapper.a"
-	fi
-	#gen_usr_ldscript libdevmapper.so
-
-	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.22-r3 device-mapper || die
-	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper || die
-
-	newinitd "${FILESDIR}"/1.02.22-dmeventd.initd dmeventd || die
-	if use static; then
-		dolib.a daemons/dmeventd/libdevmapper-event.a \
-		|| die "dolib.a libdevmapper-event.a"
-	fi
-	#gen_usr_ldscript libdevmapper-event.so
-
-	insinto /etc/udev/rules.d/
-	newins "${FILESDIR}"/64-device-mapper.rules-1.02.49-r2 64-device-mapper.rules || 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 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.51-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.51-r2.ebuild
deleted file mode 100644
index 6f1a86b9de60..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.51-r2.ebuild
+++ /dev/null
@@ -1,227 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.51-r2.ebuild,v 1.7 2010/06/07 23:09:45 robbat2 Exp $
-
-EAPI=2
-inherit eutils multilib toolchain-funcs autotools
-
-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="!!sys-fs/device-mapper
-	clvm? ( =sys-cluster/dlm-2*
-		cman? ( =sys-cluster/cman-2* ) )"
-
-RDEPEND="${DEPEND}
-	!<sys-apps/openrc-0.4
-	!!sys-fs/lvm-user
-	!!sys-fs/clvm
-	>=sys-apps/util-linux-2.16"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	# 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}"/${PN}-2.02.45-dmeventd.patch
-	epatch "${FILESDIR}"/lvm.conf-2.02.51.patch
-	epatch "${FILESDIR}"/${PN}-2.02.51-device-mapper-export-format.patch
-	epatch "${FILESDIR}"/${PN}-2.02.51-as-needed.patch
-	epatch "${FILESDIR}"/${PN}-2.02.48-fix-pkgconfig.patch
-	epatch "${FILESDIR}"/${PN}-2.02.51-fix-pvcreate.patch
-	epatch "${FILESDIR}"/${PN}-2.02.51-dmsetup-selinux-linking-fix.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"
-	econf $(use_enable readline) \
-		$(use_enable selinux) \
-		--enable-pkgconfig \
-		--libdir=/usr/$(get_libdir) \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}" || die
-}
-
-src_compile() {
-	einfo "Doing symlinks"
-	pushd include
-	emake || die "Failed to prepare symlinks"
-	popd
-
-	einfo "Doing device-mapper"
-	pushd libdm
-	emake || die "failed to build libdm"
-	#emake ioctl/libdevmapper.a || die "failed to build libdm/ioctl/libdevmapper.a"
-	popd
-
-	einfo "Doing lib"
-	pushd lib
-	emake || die "failed to build lib"
-	popd
-
-	einfo "Doing dmeventd"
-	pushd daemons/dmeventd
-	emake device-mapper || die "failed to build lib"
-	popd
-
-	einfo "Doing main build"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Failed to emake install"
-
-	dodir /$(get_libdir)
-	# Put these in root so we can reach before /usr is up
-	for i in \
-		libdevmapper-event{,-lvm2{mirror,snapshot}} \
-		libdevmapper \
-		liblvm2{format1,snapshot,cmd} \
-		; do
-		b="${D}"/usr/$(get_libdir)/${i}
-		if [ -f "${b}".so ]; then
-			mv -f "${b}".so* "${D}"/$(get_libdir) || die
-			gen_usr_ldscript ${i}.so || die
-		fi
-	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)
-	if use static; then
-		dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a libdevmapper.a"
-	fi
-	#gen_usr_ldscript libdevmapper.so
-
-	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
-	if use static; then
-		dolib.a daemons/dmeventd/libdevmapper-event.a \
-		|| die "dolib.a libdevmapper-event.a"
-	fi
-	#gen_usr_ldscript libdevmapper-event.so
-
-	insinto /etc/udev/rules.d/
-	newins "${FILESDIR}"/64-device-mapper.rules-1.02.49-r2 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.51-r3.ebuild b/sys-fs/lvm2/lvm2-2.02.51-r3.ebuild
deleted file mode 100644
index 62e7dba86698..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.51-r3.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.51-r3.ebuild,v 1.5 2010/06/07 23:09:45 robbat2 Exp $
-
-EAPI=2
-inherit eutils multilib toolchain-funcs autotools
-
-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="!!sys-fs/device-mapper
-	clvm? ( =sys-cluster/dlm-2*
-		cman? ( =sys-cluster/cman-2* ) )"
-
-RDEPEND="${DEPEND}
-	!<sys-apps/openrc-0.4
-	!!sys-fs/lvm-user
-	!!sys-fs/clvm
-	>=sys-apps/util-linux-2.16"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	# 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}"/${PN}-2.02.45-dmeventd.patch
-	epatch "${FILESDIR}"/lvm.conf-2.02.51.patch
-	epatch "${FILESDIR}"/${PN}-2.02.51-device-mapper-export-format.patch
-	epatch "${FILESDIR}"/${PN}-2.02.51-as-needed.patch
-	epatch "${FILESDIR}"/${PN}-2.02.48-fix-pkgconfig.patch
-	epatch "${FILESDIR}"/${PN}-2.02.51-fix-pvcreate.patch
-	epatch "${FILESDIR}"/${PN}-2.02.51-dmsetup-selinux-linking-fix-r3.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"
-	econf $(use_enable readline) \
-		$(use_enable selinux) \
-		--enable-pkgconfig \
-		--libdir=/usr/$(get_libdir) \
-		${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"
-
-	dodir /$(get_libdir)
-	# Put these in root so we can reach before /usr is up
-	for i in \
-		libdevmapper-event{,-lvm2{mirror,snapshot}} \
-		libdevmapper \
-		liblvm2{format1,snapshot,cmd} \
-		; do
-		b="${D}"/usr/$(get_libdir)/${i}
-		if [ -f "${b}".so ]; then
-			mv -f "${b}".so* "${D}"/$(get_libdir) || die
-			gen_usr_ldscript ${i}.so || die
-		fi
-	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)
-	if use static; then
-		dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a libdevmapper.a"
-	fi
-	#gen_usr_ldscript libdevmapper.so
-
-	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
-	if use static; then
-		dolib.a daemons/dmeventd/libdevmapper-event.a \
-		|| die "dolib.a libdevmapper-event.a"
-	fi
-	#gen_usr_ldscript libdevmapper-event.so
-
-	insinto /etc/udev/rules.d/
-	newins "${FILESDIR}"/64-device-mapper.rules-1.02.49-r2 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.51.ebuild b/sys-fs/lvm2/lvm2-2.02.51.ebuild
deleted file mode 100644
index 32af34026779..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.51.ebuild
+++ /dev/null
@@ -1,217 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.51.ebuild,v 1.7 2010/06/07 23:09:45 robbat2 Exp $
-
-EAPI=2
-inherit eutils multilib toolchain-funcs autotools
-
-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="!!sys-fs/device-mapper
-	clvm? ( =sys-cluster/dlm-2*
-		cman? ( =sys-cluster/cman-2* ) )"
-
-RDEPEND="${DEPEND}
-	!<sys-apps/openrc-0.4
-	!!sys-fs/lvm-user
-	!!sys-fs/clvm
-	>=sys-apps/util-linux-2.16"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	# 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}"/${PN}-2.02.45-dmeventd.patch
-	epatch "${FILESDIR}"/lvm.conf-2.02.51.patch
-	epatch "${FILESDIR}"/${PN}-2.02.51-device-mapper-export-format.patch
-	epatch "${FILESDIR}"/${PN}-2.02.51-as-needed.patch
-	epatch "${FILESDIR}"/${PN}-2.02.48-fix-pkgconfig.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"
-	econf $(use_enable readline) \
-		$(use_enable selinux) \
-		--enable-pkgconfig \
-		--libdir=/usr/$(get_libdir) \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}" || die
-}
-
-src_compile() {
-	einfo "Doing symlinks"
-	pushd include
-	emake || die "Failed to prepare symlinks"
-	popd
-
-	einfo "Doing device-mapper"
-	pushd libdm
-	emake || die "failed to build libdm"
-	#emake ioctl/libdevmapper.a || die "failed to build libdm/ioctl/libdevmapper.a"
-	popd
-
-	einfo "Doing lib"
-	pushd lib
-	emake || die "failed to build lib"
-	popd
-
-	einfo "Doing main build"
-	emake || die "compile problem"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "Failed to emake install"
-
-	dodir /$(get_libdir)
-	# Put these in root so we can reach before /usr is up
-	for i in \
-		libdevmapper-event{,-lvm2{mirror,snapshot}} \
-		libdevmapper \
-		liblvm2{format1,snapshot,cmd} \
-		; do
-		b="${D}"/usr/$(get_libdir)/${i}
-		if [ -f "${b}".so ]; then
-			mv -f "${b}".so* "${D}"/$(get_libdir) || die
-			gen_usr_ldscript ${i}.so || die
-		fi
-	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.28-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)
-	if use static; then
-		dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a libdevmapper.a"
-	fi
-	#gen_usr_ldscript libdevmapper.so
-
-	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.22-r3 device-mapper || die
-	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper || die
-
-	newinitd "${FILESDIR}"/1.02.22-dmeventd.initd dmeventd || die
-	if use static; then
-		dolib.a daemons/dmeventd/libdevmapper-event.a \
-		|| die "dolib.a libdevmapper-event.a"
-	fi
-	#gen_usr_ldscript libdevmapper-event.so
-
-	insinto /etc/udev/rules.d/
-	newins "${FILESDIR}"/64-device-mapper.rules-1.02.49-r2 64-device-mapper.rules || 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 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.56-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.56-r1.ebuild
deleted file mode 100644
index ff51512448e4..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.56-r1.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.56-r1.ebuild,v 1.5 2010/06/07 23:09:45 robbat2 Exp $
-
-EAPI=2
-inherit eutils multilib toolchain-funcs autotools
-
-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="!!sys-fs/device-mapper
-	clvm? ( =sys-cluster/dlm-2*
-		cman? ( =sys-cluster/cman-2* ) )"
-
-RDEPEND="${DEPEND}
-	!<sys-apps/openrc-0.4
-	!!sys-fs/lvm-user
-	!!sys-fs/clvm
-	>=sys-apps/util-linux-2.16"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	# 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}"/${PN}-2.02.56-dmeventd.patch
-	epatch "${FILESDIR}"/lvm.conf-2.02.56.patch
-	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.56-always-make-static-libdm.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"
-	econf $(use_enable readline) \
-		$(use_enable selinux) \
-		--enable-pkgconfig \
-		--libdir=/usr/$(get_libdir) \
-		${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"
-
-	dodir /$(get_libdir)
-	# Put these in root so we can reach before /usr is up
-	for i in \
-		libdevmapper-event{,-lvm2{mirror,snapshot}} \
-		libdevmapper \
-		liblvm2{format1,snapshot,cmd} \
-		; do
-		b="${D}"/usr/$(get_libdir)/${i}
-		if [ -f "${b}".so ]; then
-			mv -f "${b}".so* "${D}"/$(get_libdir) || die
-			gen_usr_ldscript ${i}.so || die
-		fi
-	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
-
-	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-1.02.49-r2 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.56-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.56-r2.ebuild
deleted file mode 100644
index fff2aec58087..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.56-r2.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.56-r2.ebuild,v 1.9 2010/06/07 23:09:45 robbat2 Exp $
-
-EAPI=2
-inherit eutils multilib toolchain-funcs autotools
-
-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* ) )"
-
-RDEPEND="${DEPEND_COMMON}
-	!<sys-apps/openrc-0.4
-	!!sys-fs/lvm-user
-	!!sys-fs/clvm
-	>=sys-apps/util-linux-2.16"
-
-DEPEND="${DEPEND_COMMON}
-		dev-util/pkgconfig"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	# 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}"/${PN}-2.02.56-dmeventd.patch
-	epatch "${FILESDIR}"/lvm.conf-2.02.56.patch
-	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.56-always-make-static-libdm.patch
-	epatch "${FILESDIR}"/lvm2-2.02.56-lvm2create_initrd.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"
-	econf $(use_enable readline) \
-		$(use_enable selinux) \
-		--enable-pkgconfig \
-		--libdir=/usr/$(get_libdir) \
-		${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"
-
-	dodir /$(get_libdir)
-	# Put these in root so we can reach before /usr is up
-	for i in \
-		libdevmapper-event{,-lvm2{mirror,snapshot}} \
-		libdevmapper \
-		liblvm2{format1,snapshot,cmd} \
-		; do
-		b="${D}"/usr/$(get_libdir)/${i}
-		if [ -f "${b}".so ]; then
-			mv -f "${b}".so* "${D}"/$(get_libdir) || die
-			gen_usr_ldscript ${i}.so || die
-		fi
-	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-1.02.49-r2 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.56-r3.ebuild b/sys-fs/lvm2/lvm2-2.02.56-r3.ebuild
deleted file mode 100644
index 9c643b894ce1..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.56-r3.ebuild
+++ /dev/null
@@ -1,223 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.56-r3.ebuild,v 1.3 2010/06/07 23:09:45 robbat2 Exp $
-
-EAPI=2
-inherit eutils multilib toolchain-funcs autotools
-
-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* ) )"
-
-RDEPEND="${DEPEND_COMMON}
-	!<sys-apps/openrc-0.4
-	!!sys-fs/lvm-user
-	!!sys-fs/clvm
-	>=sys-apps/util-linux-2.16"
-
-DEPEND="${DEPEND_COMMON}
-		dev-util/pkgconfig"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	# 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}"/${PN}-2.02.56-dmeventd.patch
-	epatch "${FILESDIR}"/lvm.conf-2.02.56.patch
-	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.56-always-make-static-libdm.patch
-	epatch "${FILESDIR}"/lvm2-2.02.56-lvm2create_initrd.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"
-	econf $(use_enable readline) \
-		$(use_enable selinux) \
-		--enable-pkgconfig \
-		--libdir=/usr/$(get_libdir) \
-		${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"
-
-	dodir /$(get_libdir)
-	# Put these in root so we can reach before /usr is up
-	for i in \
-		libdevmapper-event{,-lvm2{mirror,snapshot}} \
-		libdevmapper \
-		liblvm2{format1,snapshot,cmd} \
-		; do
-		b="${D}"/usr/$(get_libdir)/${i}
-		if [ -f "${b}".so ]; then
-			mv -f "${b}".so* "${D}"/$(get_libdir) || die
-			gen_usr_ldscript ${i}.so || die
-		fi
-	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.56.ebuild b/sys-fs/lvm2/lvm2-2.02.56.ebuild
deleted file mode 100644
index 8d5642c60658..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.56.ebuild
+++ /dev/null
@@ -1,215 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.56.ebuild,v 1.3 2010/06/07 23:09:45 robbat2 Exp $
-
-EAPI=2
-inherit eutils multilib toolchain-funcs autotools
-
-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 ~sparc ~x86"
-
-IUSE="readline +static clvm cman +lvm1 selinux"
-
-DEPEND="!!sys-fs/device-mapper
-	clvm? ( =sys-cluster/dlm-2*
-		cman? ( =sys-cluster/cman-2* ) )"
-
-RDEPEND="${DEPEND}
-	!<sys-apps/openrc-0.4
-	!!sys-fs/lvm-user
-	!!sys-fs/clvm
-	>=sys-apps/util-linux-2.16"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	# 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}"/${PN}-2.02.56-dmeventd.patch
-	epatch "${FILESDIR}"/lvm.conf-2.02.56.patch
-	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
-	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"
-	econf $(use_enable readline) \
-		$(use_enable selinux) \
-		--enable-pkgconfig \
-		--libdir=/usr/$(get_libdir) \
-		${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"
-
-	dodir /$(get_libdir)
-	# Put these in root so we can reach before /usr is up
-	for i in \
-		libdevmapper-event{,-lvm2{mirror,snapshot}} \
-		libdevmapper \
-		liblvm2{format1,snapshot,cmd} \
-		; do
-		b="${D}"/usr/$(get_libdir)/${i}
-		if [ -f "${b}".so ]; then
-			mv -f "${b}".so* "${D}"/$(get_libdir) || die
-			gen_usr_ldscript ${i}.so || die
-		fi
-	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)
-	if use static; then
-		dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a libdevmapper.a"
-	fi
-	#gen_usr_ldscript libdevmapper.so
-
-	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
-	if use static; then
-		dolib.a daemons/dmeventd/libdevmapper-event.a \
-		|| die "dolib.a libdevmapper-event.a"
-	fi
-	#gen_usr_ldscript libdevmapper-event.so
-
-	insinto /etc/udev/rules.d/
-	newins "${FILESDIR}"/64-device-mapper.rules-1.02.49-r2 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.63-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.63-r1.ebuild
deleted file mode 100644
index 5e8935a3b4bb..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.63-r1.ebuild
+++ /dev/null
@@ -1,244 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.63-r1.ebuild,v 1.3 2010/06/07 23:09:45 robbat2 Exp $
-
-EAPI=2
-inherit eutils multilib toolchain-funcs autotools
-
-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* ) )
-	|| ( >=sys-fs/udev-151-r2 =sys-fs/udev-146-r3 )"
-
-RDEPEND="${DEPEND_COMMON}
-	!<sys-apps/openrc-0.4
-	!!sys-fs/lvm-user
-	!!sys-fs/clvm
-	>=sys-apps/util-linux-2.16"
-
-DEPEND="${DEPEND_COMMON}
-		dev-util/pkgconfig"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	# 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.56.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
-
-	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"
-	econf $(use_enable readline) \
-		$(use_enable selinux) \
-		--enable-pkgconfig \
-		--libdir=/$(get_libdir) \
-		--enable-udev_rules \
-		--enable-udev_sync \
-		--with-udevdir=/$(get_libdir)/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"
-
-	# Upstream build script puts a lot of this stuff into /usr/lib regardless of
-	# libdir variable
-	dodir /$(get_libdir)
-	# Put these in root so we can reach before /usr is up
-	for i in \
-		libdevmapper-event{,-lvm2{,mirror,snapshot}} \
-		libdevmapper-event \
-		libdevmapper \
-		liblvm2{format1,snapshot,cmd,app} \
-		; do
-		for d in $(get_libdir) lib ; do
-			b="${D}"/usr/${d}/${i}
-			#einfo "$i in $d : $b"
-			if [ -n "$(ls "${b}".so* 2>/dev/null)" ]; then
-				[ -s "$b.so" ] && rm -f $b
-				mv -f "${b}".so* "${D}"/$(get_libdir) || die
-				gen_usr_ldscript ${i}.so || die
-			fi
-			if [ "$d" != "$(get_libdir)" -a -f "${b}.a" ]; then
-				mv -f "${b}.a" "${D}"/usr/$(get_libdir) || die
-			fi
-		done
-		for d in $(get_libdir) lib ; do
-			b="${D}"/${d}/${i}
-			[ -s "$b.so" ] && rm -f $b
-		done
-	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.63-r2.ebuild b/sys-fs/lvm2/lvm2-2.02.63-r2.ebuild
deleted file mode 100644
index 3689a5bb60a8..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.63-r2.ebuild
+++ /dev/null
@@ -1,243 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.63-r2.ebuild,v 1.3 2010/06/07 23:09:45 robbat2 Exp $
-
-EAPI=2
-inherit eutils multilib toolchain-funcs autotools
-
-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* ) )
-	|| ( >=sys-fs/udev-151-r2 =sys-fs/udev-146-r3 )"
-
-RDEPEND="${DEPEND_COMMON}
-	!<sys-apps/openrc-0.4
-	!!sys-fs/lvm-user
-	!!sys-fs/clvm
-	>=sys-apps/util-linux-2.16"
-
-DEPEND="${DEPEND_COMMON}
-		dev-util/pkgconfig"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	# 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.56.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
-
-	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"
-	econf $(use_enable readline) \
-		$(use_enable selinux) \
-		--enable-pkgconfig \
-		--libdir=/usr/$(get_libdir) \
-		--enable-udev_rules \
-		--enable-udev_sync \
-		--with-udevdir=/$(get_libdir)/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"
-
-	# Revamp all of our library handling for bug #316571
-	# Upstream build script puts a lot of this stuff into /usr/lib regardless of
-	# libdir variable.
-	dodir /$(get_libdir)
-	# .so -> /$(get_libdir)
-	mv -f "${D}"/usr/lib/lib*.so* "${D}"/$(get_libdir)
-	[[ "$(get_libdir)" != "lib" ]] && \
-		mv "${D}"/usr/$(get_libdir)/lib*.so* "${D}"/$(get_libdir)
-	# .a -> /usr/$(get_libdir)
-	[[ "$(get_libdir)" != "lib" ]] && \
-		mv -f "${D}"/usr/lib/lib*.a "${D}"/usr/$(get_libdir)
-	# The upstream symlinks are borked. lets rebuild them instead.
-	find "${D}"/{usr,}/{lib,$(get_libdir)} -type l \
-		| xargs rm -f 2>/dev/null
-	for i in "${D}"/$(get_libdir)/*.so.* ; do
-		b="${i//*\/}" o="${b/.so.*/.so}"
-		ln -s "${b}" "${D}/$(get_libdir)/${o}"
-	done
-	# Now enable building properly
-	for i in \
-		libdevmapper-event{,-lvm2{,mirror,snapshot}} \
-		libdevmapper \
-		liblvm2{format1,snapshot,cmd,app} \
-		; do
-		gen_usr_ldscript ${i}.so || die
-	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.64.ebuild b/sys-fs/lvm2/lvm2-2.02.64.ebuild
deleted file mode 100644
index d84c9368e98a..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.64.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.64.ebuild,v 1.3 2010/06/07 23:09:45 robbat2 Exp $
-
-EAPI=2
-inherit eutils multilib toolchain-funcs autotools
-
-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* ) )
-	|| ( >=sys-fs/udev-151-r2 =sys-fs/udev-146-r3 )"
-
-RDEPEND="${DEPEND_COMMON}
-	!<sys-apps/openrc-0.4
-	!!sys-fs/lvm-user
-	!!sys-fs/clvm
-	>=sys-apps/util-linux-2.16"
-
-DEPEND="${DEPEND_COMMON}
-		dev-util/pkgconfig"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	# 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.56.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
-
-	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"
-	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=/$(get_libdir)/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.88.ebuild b/sys-fs/lvm2/lvm2-2.02.88.ebuild
index d70ee99cefc3..b85108c63a46 100644
--- a/sys-fs/lvm2/lvm2-2.02.88.ebuild
+++ b/sys-fs/lvm2/lvm2-2.02.88.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.88.ebuild,v 1.2 2011/09/08 18:30:58 robbat2 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.88.ebuild,v 1.3 2011/09/13 05:47:23 robbat2 Exp $
 
 EAPI=3
 inherit eutils multilib toolchain-funcs autotools linux-info
@@ -183,36 +183,7 @@ src_compile() {
 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 WHATS_NEW_DM doc/*.{conf,c,txt}
+	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
author	Robin H. Johnson <robbat2@gentoo.org>	2011-09-13 05:47:25 +0000
committer	Robin H. Johnson <robbat2@gentoo.org>	2011-09-13 05:47:25 +0000
commit	540ac594242a1ebd52fbf51e85c4b2b994c73ac4 (patch)
tree	f5f82223ef78f2cb7c8d9955e2db1a25c3dfcaa9 /sys-fs/lvm2
parent	Die if we fail to remove setup.cfg. (diff)
download	historical-540ac594242a1ebd52fbf51e85c4b2b994c73ac4.tar.gz historical-540ac594242a1ebd52fbf51e85c4b2b994c73ac4.tar.bz2 historical-540ac594242a1ebd52fbf51e85c4b2b994c73ac4.zip