drop the one ebuild udev blocks as too old, 97. drop 2 other middle versions of 105.

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

13 files changed, 18 insertions, 1374 deletions

diff --git a/sys-fs/lvm2/ChangeLog b/sys-fs/lvm2/ChangeLog
index 60a283cf5a0a..b9e5823d4cb7 100644
--- a/sys-fs/lvm2/ChangeLog
+++ b/sys-fs/lvm2/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-fs/lvm2
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.351 2014/05/13 10:07:21 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/ChangeLog,v 1.352 2014/05/14 18:59:46 ssuominen Exp $
+
+  14 May 2014; Samuli Suominen <ssuominen@gentoo.org> -lvm2-2.02.97-r1.ebuild,
+  -lvm2-2.02.104.ebuild, -lvm2-2.02.105.ebuild, -lvm2-2.02.105-r1.ebuild,
+  -files/lvm2-2.02.88-respect-cc.patch, -files/lvm2-2.02.92-locale-muck.patch,
+  -files/lvm2-2.02.97-selinux-static.patch,
+  -files/lvm2-2.02.97-strict-aliasing.patch,
+  -files/lvm2-2.02.97-udev-static.patch, -files/lvm.rc-2.02.105,
+  -files/lvmetad.initd-2.02.105:
+  old
 
   13 May 2014; Samuli Suominen <ssuominen@gentoo.org> lvm2-2.02.106.ebuild:
   Fix install with USE="-thin" wrt #510202 by Patrick Lauer
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 50264355d00d..4d49536e4cae 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -12,7 +12,6 @@ AUX lvm-monitoring.initd-2.02.105-r2 1088 SHA256 d7655cadd3a3a9d3683a54041336531
 AUX lvm-monitoring.initd-2.02.67-r2 1183 SHA256 b89971a4f163e1a91df2416ff442cae7209f8343e6c8612eb3174ed8f5c5c788 SHA512 e99d8e0ed2f22e8f3f1e36581ce92bc2196dbebdeb7c301070c5f2e78079804de3ac782c732929e23a3a01536a270236513c849ec1574ff4c72045b8f69c98ed WHIRLPOOL 71eb7d1203bc2b6be22ebb0eb20e3d2e0786036bea9f0beda91c517f47b99374b52ca4c7d5cd76ae6338ddab187b68a7a371a437e5501996454e125e12e998a8
 AUX lvm.conf-2.02.67.patch 1676 SHA256 0d36c4de0503739d822b3103a62dc0110febc3c56cd25d04443b30f54da6d0cb SHA512 59cb4a4625a7a18ec81b10f4b70a1632cf608d30b1fd827cc7a97692ab3cbbe2e0108001952f5002f1ffe6b354be7b96430e5ce86ed183885afdd1b5f0aa76e4 WHIRLPOOL 71c42b80f390de73b116dbe4808b44559196175465126393128b87826248ac5a34d79c4f64647d6b4541288ae4d25669168120ce8889deb08bfb7919dde249ed
 AUX lvm.confd-2.02.28-r2 173 SHA256 28370c089c39c248d7ded0960b8d8a9256bada44d44c22ce3cec87d512ef6844 SHA512 67b153cbc5c2327c15f042b3b5590c1d8fdf9823efb19c80192ac4dcf98e530efea8ecae0aaaa4a54b0e3e4907565aa21455b364df1dbe8f2e7dffa1c5d355d0 WHIRLPOOL 06467b28ad2acf36984eef1b7b7e3d88277505760f848a808d85820cd1cccf6bb7397c00624d36961d9bdbb994e55de03444a7cfc97ecefd9bd3b785a3c6fdbf
-AUX lvm.rc-2.02.105 3062 SHA256 3c1a868b766e1a8e4fa19a9ef63d664fae039752c174bca49fa9b23cd82fe11c SHA512 7df015e554c55caff38e41b364eb810991e57b70f8d7967a4675bc46f71d162fcc9657bea46211a08df411a526e73647d43ee46c96bb409008fb9cf45619ecd7 WHIRLPOOL f27a40987101c0043fc030f0e6354531c8057486f789c519fd6c3e3ee24a0a74640630245171f970f09b041e2c30845729b3d54196eda973d1f7f78c23556041
 AUX lvm.rc-2.02.105-r2 3071 SHA256 a5754ffa0a05a0c29a9f6b5acf1b21dd313581fd6156c1ef722dc620e0114676 SHA512 9dd321b6d76628376b324de1ff47c4a37b98d3bf406abbf1b1755e20d957a9f1d77ff2e50a99b0c77ca8200800cd6071da5ab83c2f5afb9ff97f31e75671a617 WHIRLPOOL 6ba25a5152bf6f5052481e6ad2b1dc3ea65a818d11bff49e9688f537245c471f5446d4b8d381dba69ab8ece8f16340220f4c8173be096c7cb3d7c4c7fd10cebd
 AUX lvm.rc-2.02.95-r2 3001 SHA256 66844a70cedf61b2cd3373cdbd8f8c1afa817bde0764fdf5cf488857532d4553 SHA512 e5d34447db2fc050256222eff427703341b839a80c833c8ca2a814663b790bdffad967fa41bda8c182d5217dda629057a571520cb0a2e4cb06d5a8a241746ea3 WHIRLPOOL 102baf82bd5573ce90bdb19307ccf71026b6e03fd9e471a123f17072e0ac3785ecf017bb2cd81adf7a5332f33b42330e7c484c8804ed57d4ad6fb1cdd4c119f7
 AUX lvm2-2.02.100-selinux_and_udev_static.patch 3223 SHA256 15c20b1e16443932c560164ad9546ab01279601b0f0dd7fdc54f9cf3cd3ffee3 SHA512 232dc2908073254e23878098734cc65449c7be0707f7f0f7e73561e7b204bf71cf75ff5ee143b0f9f301ddabac1595c59cb0ec80c665464e8fe3f1b65a3eb0c2 WHIRLPOOL fdd908aa01cc3790be4ff8e7b2180cd526065c826657924edfccdc53f5c2266a12911c1ebface9de649b1974ff77401e94a64de507b5c72415614e5726dd4a2a
@@ -25,39 +24,27 @@ AUX lvm2-2.02.56-lvm2create_initrd.patch 2032 SHA256 b892d0544e05350e78ea400c16e
 AUX lvm2-2.02.63-always-make-static-libdm.patch 1420 SHA256 1c498b5efce77ed16bbbfcd9e0ec6da404a9c70c7ad0959ed7b60733adfcfc21 SHA512 67735af9e51369d5b3b400cab4f9ffa25f8dea1c1ec3d01855cb3c5aeade5c39a35eeed43f3a665204fe6bbba4ca43baecd845330bf26d023064b94ca3d1317c WHIRLPOOL f273c893acedfd658e7947abb5f4b528f15de9808ae3862ec8a9189ba7de4ea6998dc67dbc7af642ca3a27bba2ef8eabfd48337f532145f88500988f564313b1
 AUX lvm2-2.02.67-createinitrd.patch 660 SHA256 d59f5642fff9d9575227bfd0b3d103d928a6f7b08b417d6c458704171f11da39 SHA512 17fbba5d34ece5c1c25ef35fa3bbc3d6fcd20b44bd766c049bbc120853a8d60c9544db5790645a7814db5c272fd12d383699a8a9be6f4e9c56a7c0a1bb29ade2 WHIRLPOOL b358a31a9ee669a4fccf42280da5342c214932bfd83deee92d41351eb37dc6c0b2e5dc7419f2304128b5d285fed92db5b2e1634a71bbf1310d36b54d1a353bb0
 AUX lvm2-2.02.70-asneeded.patch 326 SHA256 b0f84dadc213a9daaa97ae7815f624f0bcdc883d627659c7fcf8b7131538b43e SHA512 e38d8ef5d13c8861f7d1ca5c16271b3da138e8747ba01442de3f55aab45265fdaf42513e596f5af1d024fa2cf0c959bd3e47da52bbe8b13c75e665dd95f81279 WHIRLPOOL 77143f2dafeca221f8b3cda4df1669111de44a4ae4916d9aa2228aa76d94b4d1c556cf90a6f90cae2f1938f7474fb678ec6eab1b4e57f7fd20eab473de667cda
-AUX lvm2-2.02.88-respect-cc.patch 467 SHA256 a19e1049fc6da2b9feb0898360a86ea3aab715329e294376b0b5fc2e11fc41f0 SHA512 e5224f4826dc1d475519719588a683cbb94d49c5449b22698f52cf7735c2b6a0f758e7a591851a01f3e7065a7adb43232370b25ba26127b75ca6280d0befe36e WHIRLPOOL fb2b1d66fa5af0a177561fc51ec447f550873c220f6344a9e705a4a425f547962eb780266bbc178220ba00a015f4311ca775e9751433fab1739c10a62b3124c1
 AUX lvm2-2.02.92-dynamic-static-ldflags.patch 3031 SHA256 90b880572186d4d1abf049d39e5f11e4cfedb3707c29eeb9740ceccdb3b62468 SHA512 edb78081d12bebaccd31c2474cb531563b729f1ad966afaff7892556177ee7a68217cc699c65383318066139ba62183adc8334f46f8f8933d62b6b5dcd11a023 WHIRLPOOL 6880a29dfb6747f167c41506e1472c0d48ef7af3a545238c733949f85f3f8f36110fb6908c6f626260f7ed975e56a4e8ccf42ece4d758fa3570154cbe970f2a3
-AUX lvm2-2.02.92-locale-muck.patch 570 SHA256 3b24abd3c1254de1727a91b6ade26c36dc8dbee8ecbfab4bf6afbad21fdd59ff SHA512 2496cd39b06a69441dc7fe223eab4da25ca76e9f79be85d0f162dba784c3a86afaf430a366dac83354e07dcf07a486d5abee2bb4c677a84c13bd22998cfdfd39 WHIRLPOOL ed28aa549983fb9c1b1e1fe17bf2eca624dec43400fe1c8b67b00e010c3d745ec5f29479e7b4bed67ac2d4d1d6237df91eba7318e33d5e592893f76b17e9074a
 AUX lvm2-2.02.95-lvmpath.patch 1247 SHA256 48d65570cbf86dcf749a0e77a1c57e26170ee90ddb8d8800988eab451f402456 SHA512 92b104476911882d0dae97251942a0dbf6c58d6d5c5af77e74b3e41de95a155966392fb539affef3de6def107168b436c54e5ee000bdff0c4701748481940eb4 WHIRLPOOL 26d00f35cdd4a0bbdabdda0a5a69956e7c7ed90dd3e774cfac46c4eb0e339a09e03dcd617b49863a550e79c72d327b3007ffa17ecd27750bf3a759058c4c9e7e
-AUX lvm2-2.02.97-selinux-static.patch 3194 SHA256 ec63bdee4fbea1ac2b97abd5d56ec599aaa1b022d40ec12bb541ad8cdea261ee SHA512 f59628618a053fb07bc8ccd6461296ae2425e750d770a850febca551560cc8f0f60f58943078141065c881249aa9541998b1d6e4acd4a80af74ab33b24b0f472 WHIRLPOOL 427d272eb3c66eded41ecc59fd48601f5650899a69ece55fba1740d54a0d324cfb013ff9681905ef9c8a62a61f40e72f15ba8c5de5991c5f78c48182a0cff68f
-AUX lvm2-2.02.97-strict-aliasing.patch 3142 SHA256 a4c799777c8e5a83fe1af52ed623ba472b859b5a0356dab2b53b31837b3a582e SHA512 7828562bb0fb95f3f75d08845b8c4767815dd74e117795ec873ea11135deaf389d6f0f8d66cf3c9b3843d6fa977c4be1a341013bcf4f016299e238c0d90be878 WHIRLPOOL 84f957d7b833896fe86fa9bf4c83183a8fb3c96780fd387288371df4fbf697f1ecc1c554862ea749ec72728bd608c1c8a1776cd26185903b53d559e3760d743c
-AUX lvm2-2.02.97-udev-static.patch 1170 SHA256 a797b0d767c7df83653b9da996b47425ad1d0d6bd79371c231b8f6480a013f41 SHA512 7c45fcccd4cd5097e88bef014fdff0bfde3959c57cffb34657674c4f557b36f4df73a2f3a8af17a12c1b0f52e4b5d99806f6f82c5ae60417ebcbf72b82616c89 WHIRLPOOL 4f303960be89b5e37d3f700eeb6e534c40750a8a486c33f21605d53dabef487b5a00e2bcda42d3dcbe60ebba3e444cea8a2375901bd92b9047b040584c66faea
 AUX lvm2-2.02.99-example.conf.in.patch 1489 SHA256 55273a2bc6df33057f4efdd947b75f0282a7993acd5e57f0019f8ca57ca7df38 SHA512 0c92a0e454505219653500d4fb2ee57626bb30375782be941bda17d7b841cb05eeebb87bfc4f7aa397b26fb4908bcbd0f69d2c07e63bf4f070756a1894851869 WHIRLPOOL 3f6c94dd63fcf5e2d1406aa074aee27997fa6d58da3db9d22281b3080ec36277bc5225c3b62f042b38f5d0870fb1e3e19433f218f01e03323c7ad1210d45d4b3
 AUX lvm2-2.02.99-locale-muck.patch 395 SHA256 14e7c65fd9aa71b7f09cc1aecfaccb3048dbb09dd4eb4c342556708aa6adba77 SHA512 4014abbaeb1106dbaa360e2573340651adc0cccc6c0c05cc57695e74e7a3d0b5a73e2b72242bab0d0a10c2506a7c30c2a4de0275c0f81a14dfb068ec91492497 WHIRLPOOL 3383e94ca4dbaefd2c628d3a95b17a14602481c98425caf48f490185289eb3f1af2ef234ff5b5c431ea4624edd8e48764252bdf5b7159ab3bbbad699c3f936ab
-AUX lvmetad.initd-2.02.105 402 SHA256 22c0168e35f7180efa6d1c1b85b65e920be3af91b99f9c31f021ee85f55d49c5 SHA512 788c92d8b945cb37e3dd408c0cdcd922285368b475dd63f81cbc9d9dcfdb6c9d22bfdeba3450bd51359b2600209a4716a90d17c8f8c38a08069d32ae0cb7861f WHIRLPOOL 28109ad14ea4e9e975134a094202e121c6a87569c94c456f2c4c593e30a2511a2509872f2d2d8abc2e30d29c7ec6c92261ba51e0ca47ea590050839aecebc18a
 AUX lvmetad.initd-2.02.105-r2 405 SHA256 60accb4b6114753232f2db0adf3fc3f46d4459bfedf79b888801a13c55d79fa9 SHA512 d9c6f6c68a83b8f391ded7ebe900009a61ff06e92eb68ccb3dcdc8f41e61bbcdf47246e523ea8cfd6e71790376b316b219d4afaf66cf11477e2b54d526b74998 WHIRLPOOL d959d8c8b5f4ef84c26f8e585fe1761ef9bfd37f590e783e937679a863982e7cc4a4e320c3e2e3bd635dbd3486c15baf7c24e1a21325521f4320e643a57fb0e7
 DIST LVM2.2.02.103.tgz 1343887 SHA256 71c5a2e8842ed2f13f52e02b44eb183110a3410dedd1e117348e4eecc29d3c2a SHA512 1a9920947312e3e248bff7ff5d5eb54dec3f3b05eb3388fa92f95369b26ae8e6838186f87d817b09e8c635ddc3cdf51bc1d07c2a9d65fd7eab33598998bb7afe WHIRLPOOL de96dd8b7fb46ec777f34169759852ee5ef03ccdc93e110bf63c92dddb9cf4f805635444ceeead6b581610d2a23217d3b4729c286f016623f73b99c0b35a42a0
-DIST LVM2.2.02.104.tgz 1352953 SHA256 0d68b5a5d751a1e595f60ae55babbbf131ac3ace5dcfc7ac35a9eb85ee8647f5 SHA512 5071e1c7ae0a006ea93b72dbbe460037a7fb5a87f3fd4191118b04066bf60318a219c9bc63858d44d1b1cdd8cb7ecc295257585e9d24dd53a9b22f2b5bda16e9 WHIRLPOOL 183bc98dbb4f785d0276620ae8797b9fc8f0a50e0aab772c9e3bceeaf8af70325ff0088c029cb6e215a97e7f52f4a98143a1a7d4b2f5cfdea7834f5abc171558
 DIST LVM2.2.02.105.tgz 1374752 SHA256 d0700c7000ff6375c1c36cb2a89b97b9ae6757f4219fa9ec65f313d13d71e51e SHA512 fb2f4eaceb8e643c7e081b6d8d77daf387960c39f880f5600df40c7eb32d7908835114b8619805a814fc1c59ce920fa36d9afa72314dfabcb69ddf134833e1fa WHIRLPOOL b0dfea302e0afced489d96d14a04bddc48cfff540d26f69217787fe95b571d5600647162da84a95c6cb42e02fb83473a00257ab73e920b9a1b3c46f5ab12f02d
 DIST LVM2.2.02.106.tgz 1426030 SHA256 6c83df279c2190543be750cda278c7d3e875dcadb5cbdc44c19f6040d718285b SHA512 52cfbe86ec89cebc639c6446195bba546fc5576165a38c5db6adf0d8aba6309a3140562d9c6a8bdc4ba415d91bb307989cdbb787cf4ec68dcacdcccbda71ae07 WHIRLPOOL 5853cd3e64ede16e21ee66a664cae222f707406e85379e051e72bf9264c8b6da83af9be7634d8d93c07bd772c395dc278ff37b55adc40f50b6e4c432e8e7a593
-DIST LVM2.2.02.97.tgz 1193141 SHA256 edda82012e8a9e1f0b00ba5a331468d3e0201992be14c0dbea71bf564a51fc2b SHA512 c209054832f36d7b9cbf833c702410ac95c9de1e213b550c01c42f087fcae346d3c931c409184086bc1fcbcbc154c9a4f8b82b06291cefeb7ae22fe7a4c254a0 WHIRLPOOL d4dafde0ae1607cb231acbf07e8aecd579b9e9042e9356df1074a2683f5f2d1036a3483e1799cf7dd14e64f1f4c5506d3628979fd7128cea70ad45b653403dfa
 EBUILD lvm2-2.02.103.ebuild 7433 SHA256 3ae965eab7c06b32ea1ec3718d4e866b9a53582959957d2e6afdadceb1c68847 SHA512 13c4c12b44bb2a9f46fc12afa5978e15ef31e90be18d917c86189cf02eba3edb6f5e7390cfd38c0d1716ccacdc18582c826b8933f3ecccba1d11cbbbb536d4d8 WHIRLPOOL b88350388468f6a00924e1b0ef2d99eb1b55a763a0951c8b51de621519cffe11ad53b18cc49a02cd8122caf9e4dd97f49b9aae1ac1dbb1c925cac63e82e5927a
-EBUILD lvm2-2.02.104.ebuild 7447 SHA256 60427d917e406d2304c2dcde1023f6ee85a5582015adf8e5258548d505c3909a SHA512 9c531cf71747749a325853fc9e11ea8745e06de4b7da319d14ccf7bec754996699ad0d45df18690d9891ea75c2d8c363df50ddaac7eee463df287797a09b3622 WHIRLPOOL 4cc1f6b2e0d8e37f78e25fa6ebd6860ceba7c5631aabf280cbfd5667a12ad77112d6fb7079e7bc863224ded27ecb8a162a259a411e7c5d9b8e3e48b4d93a56a8
-EBUILD lvm2-2.02.105-r1.ebuild 8236 SHA256 8f7abc8cc9d580e8c78261f2c3e57b4cbdc30f872edbe5ef8c143a6ff8c28eeb SHA512 2d4932af73281567e3a5cb1ca686a99205a66f0c5128ce5fc1ba371a6078679b87fd13c6a47a049c89823ed6e0a5ba4ea08c1bbc9634c6e545ad494fc632056c WHIRLPOOL 34af5fdfa3916e809a7b19faaf40b68d5aae23c693cb8859a4bdbf18adba0e155871a2ae756962b8c198ef997a2afb2c4d73ab487760713be60081448551debb
 EBUILD lvm2-2.02.105-r2.ebuild 8540 SHA256 c3d234e184cc6707196343a3215efa289847dd03f35933b3e580b0ab0109a6d6 SHA512 c8a60e153a7f46627c803e8a183defae047c67f66f40578e95a7fe4b5a6830e2167d7081595e5d3f3e6dd55f13c00e7e772713b0e708ec6f32da97ae8ce08337 WHIRLPOOL 16fd1fb43174259cdf7ce9c99711bf2e19d5d726af79762d37f0ce47e92489174a8d2c4519ad40d9f4f184d51bbdd353082bcfe6f93bf9ff7e1f5b1d6ff872ab
-EBUILD lvm2-2.02.105.ebuild 7735 SHA256 deb2c1d1db4f69ce1a99a495ed94fbb8a99c99f5c186936655ad79a905c28f3a SHA512 e5818de3c6334a87d0706c2db70bd41ebdc8a9208766669e1f6dab625af05bb01584d92f25ab4ce71bdbc34cb85d34afd17fc14f6509fc29201536b5a7fc21a3 WHIRLPOOL 3572a6a375da4f88867deb65936e4045a6da5bbf4a443dd4d24f3453160f906a91b62aa4425b22602096ed9d3d6a23e0df940ce37c13f4e0274266717facf71b
 EBUILD lvm2-2.02.106.ebuild 8717 SHA256 30c4768eff766802e7b85fb0c3b0b314c661fbe9197133e36f888329f427e361 SHA512 9c8dcd1d7458a4ba8693fc0c6689000f49a348cd7106e19787e565a9138ce7b393ea138c668b19577243d82220c358337683fadba62a7c39336d187ff02cd256 WHIRLPOOL 99c1ce32c27d367ca458130f75fe190b441e14a937279c43f89a2aab3ccd358665b0878d2a43fbe3a46e0a91cebb3e7f416aa324225c9f6417b1eeeb07f42bf4
-EBUILD lvm2-2.02.97-r1.ebuild 9081 SHA256 643e286908d2c5a040b325776bb889f8a924065c6a8679c8eac9a185eb698652 SHA512 49cf7c78644aa964d827aaa69a20db1998c312eeae4b64e95bd191ede106d3ffb699bdcc0be6025f088a88258eef7cfda76bd0f0a821825408a98c9bd3f6b7f1 WHIRLPOOL 46550b1891a9a3d6323c176844c3057d9980121547147b5a7289cdaa31dbb361c759221e60122a504ceefac86fb6c4515139327e6934331f7df76afb1d65e6b5
-MISC ChangeLog 67402 SHA256 b4b00a1fbfd39553fccfadcf4cb0c10971c269aaac6592cc73de8326191b2dec SHA512 9c988435097532e7f47f56c445b636b6afc2cfe1e218a493c47a01c150bf643632645156397c11031d629d9777c0fcd6828b747014d383afcd516862c290f295 WHIRLPOOL f5668e3cefae737c03249bb16340e103a22d7cdc4ebf7e41dc02166daca9a578ab98235659602e80ea61e814cfab7fb749d1236ae7f94fe38113635078fd2d9a
+MISC ChangeLog 67828 SHA256 47acdb1977d0bee3fe650d00f1af2788ea82564c309badc3c6221019bec26b8a SHA512 6d9b23634f503fcd2380fc56cc936f05428c08e0730caf92954d0d5f9e37f23769165539f0a8f8ac6ffe1314b7a1e9fb055c7fec68e1887f751874fb88e2469b WHIRLPOOL b32c65d20ff9adfd358ddcd01316ee3ab28b40542bbeae381ad3f1d77a2b9c06e489380bac35f828bb342033644e18771bd43108748df3a8526e852488d76d69
 MISC metadata.xml 995 SHA256 a2be36b695dab8ef65772af8d808cdc7a5c5855e2c9104060e7232e21b984216 SHA512 642abe2a196ffeaf3a67530befa8dc123f1e3e1238bf55d38c0affea82ab5b2f9e56da6b303410845c625494a59323ac8570f40e0f8a406db76295059958361a WHIRLPOOL cba3a6dd12fafc4719050082ee740d03ef0ed68e074b556a0c1f15f4a7b328d9b826d2b7ab3d3f19546de92e907a3fd466792db67423cb8630d5313154d5b6f2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJTce6hAAoJEEdUh39IaPFNDRYH+gLNBFsy/7N8OcG536qSKNpP
-Y1foDwYFLxG/fRh6GZXqmAHselyGEGXvCFYaIRafZhcfNCpSV3A8tG+F2PRNIGsb
-CUib4sP1cTmRf99z3hlt6SUE0/H3/Les7RhUGlbHWsXtCZrxaxQzVUmxXb2S1hWJ
-YoG2WIYXzTqAnJ6GCpo+mskdEDRGTXXJ/ae1/m/im5ysZaEqKfTwMPtbzDXpPcWb
-zM5VPCGdOGQDKN74G0UQPZCtZmHTeWlAwAJOFfXqhB9UqK5WsPsqowh0QegpO7IH
-89/UKYe0Ea8y9TTRCv49g1mlmuOPSOcfZxf9Yv/iX7vsXaTwgnS19CRNP6ep6yw=
-=3cmZ
+iQEcBAEBCAAGBQJTc7zkAAoJEEdUh39IaPFNRzoIAJ5fNC0y0oOdMJiWWixaSH0U
+AE0Y5YcM3NEnLk+zYTtj7dMSJ3hjDGEJGoWLO5gN1JxGQvVWHfzoCZuLGz+TqwxJ
++Zkm6fjWyjTBcIoVMn+UvvxH7LKYAdsvTDge21Z2l8Wn8f8zCnW35Lx/DGFigJmg
+J33OBgYyzBxJ/MR5gjrow8Q9NStJ/DHQDzMgZNFMMUjtOtDpjTcHeUtqTFT+kDlD
+CcaHOP7MNhEL539uil9Vxrbu/81DatQyA8a3D+Qw+b1NVi0p0Gf5JfDx3rzFDCL/
+lloVEkxoiP/1sHckEK5uBqBxRgi3U+gXpCp1MybxbDJ/WP6l+6/m0I1bDkYsCQM=
+=ddDT
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/lvm2/files/lvm.rc-2.02.105 b/sys-fs/lvm2/files/lvm.rc-2.02.105
deleted file mode 100644
index fb0d949aa3a3..000000000000
--- a/sys-fs/lvm2/files/lvm.rc-2.02.105
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 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.105,v 1.2 2014/02/02 05:56:20 robbat2 Exp $
-
-depend() {
-	before checkfs fsck
-	after modules device-mapper
-	need lvmetad
-}
-
-config='global { locking_dir = "/run/lock/lvm" }'
-
-dm_in_proc() {
-	local retval=0
-	for x in devices misc ; do
-		grep -qs 'device-mapper' /proc/${x}
-		retval=$((${retval} + $?))
-	done
-	return ${retval}
-}
-
-start() {
-	# 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
-	for lvm_path in /bin/lvm /sbin/lvm ; do
-		[ -x "$lvm_path" ] && break
-	done
-	if [ ! -x "$lvm_path" ]; then
-		eerror "Cannot find lvm binary in /sbin or /bin!"
-		return 1
-	fi
-	if [ -z "${CDBOOT}" ] ; 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
-			lvm_commands="#! ${lvm_path} --config '${config}'\n"
-			# Extra PV find pass because some devices might not have been available until very recently
-			lvm_commands="${lvm_commands}pvscan\n"
-			# Now make the nodes
-			lvm_commands="${lvm_commands}vgscan --mknodes\n"
-			# And turn them on!
-			lvm_commands="${lvm_commands}vgchange --sysinit -a ly\n"
-			# Order of this is important, have to work around dash and LVM readline
-			printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null
-			eend $? "Failed to setup the LVM"
-		fi
-	fi
-}
-
-stop() {
-	for lvm_path in /bin/lvm /sbin/lvm ; do
-		[ -x "$lvm_path" ] && break
-	done
-	if [ ! -x "$lvm_path" ]; then
-		eerror "Cannot find lvm binary in /sbin or /bin!"
-		return 1
-	fi
-# Stop LVM2
-if [ -x /sbin/vgs ] && \
-   [ -x /sbin/vgchange ] && \
-   [ -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"
-	
-
-        VGS=$($lvm_path vgs --config "${config}" -o vg_name --noheadings --nosuffix --rows 2> /dev/null)
-
-        if [ "$VGS" ]
-        then
-            ebegin "  Shutting Down LVs & VGs"
-			#still echo stderr for debugging
-			lvm_commands="#! ${lvm_path} --config '${config}'\n"
-			# Extra PV find pass because some devices might not have been available until very recently
-			lvm_commands="${lvm_commands}lvchange --sysinit -a ln ${VGS}\n"
-			# Now make the nodes
-			lvm_commands="${lvm_commands}vgchange --sysinit -a ln ${VGS}\n"
-			# Order of this is important, have to work around dash and LVM readline
-			printf "%b\n" "${lvm_commands}" | $lvm_path /proc/self/fd/0 --config "${config}" >/dev/null
-			eend $? "Failed (possibly some LVs still needed for /usr or root)"
-        fi
-
-	einfo "Finished shutting down the Logical Volume Manager"
-	return 0
-fi
-}
-
-# vim:ts=4
diff --git a/sys-fs/lvm2/files/lvm2-2.02.88-respect-cc.patch b/sys-fs/lvm2/files/lvm2-2.02.88-respect-cc.patch
deleted file mode 100644
index 13d99ade0771..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.88-respect-cc.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-GNU make always defaults CC to "cc", so using "?=" with the CC variable
-will never override the internal make value.  since @CC@ comes from the
-configure script, and that respects the $CC env var, don't bother trying
-to handle it in make too.  it's not like we do this with any other build
-variable after all.
-
---- a/make.tmpl.in
-+++ b/make.tmpl.in
-@@ -17,7 +17,7 @@
- 
- @SET_MAKE@
- 
--CC ?= @CC@
-+CC = @CC@
- RANLIB = @RANLIB@
- INSTALL = @INSTALL@
- MKDIR_P = @MKDIR_P@
diff --git a/sys-fs/lvm2/files/lvm2-2.02.92-locale-muck.patch b/sys-fs/lvm2/files/lvm2-2.02.92-locale-muck.patch
deleted file mode 100644
index be9e66d02c71..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.92-locale-muck.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nuar LVM2.2.02.92.orig/make.tmpl.in LVM2.2.02.92/make.tmpl.in
---- LVM2.2.02.92.orig/make.tmpl.in	2012-02-20 15:46:46.008422005 -0800
-+++ LVM2.2.02.92/make.tmpl.in	2012-02-20 15:47:19.639959941 -0800
-@@ -382,7 +382,7 @@
- 	( cat $(srcdir)/.exported_symbols; \
- 	  if test x$(EXPORTED_HEADER) != x; then \
- 		$(CC) -E -P $(INCLUDES) $(DEFS) $(EXPORTED_HEADER) | \
--		$(SED) -ne "/^typedef|}/!s/.*[ \*]\(\$(EXPORTED_FN_PREFIX)_[a-z0-9_]*\)(.*/\1/p"; \
-+		LC_ALL=C $(SED) -ne "/^typedef|}/!s/.*[ \*]\(\$(EXPORTED_FN_PREFIX)_[a-z0-9_]*\)(.*/\1/p"; \
- 	  fi \
- 	) > $@
- 
diff --git a/sys-fs/lvm2/files/lvm2-2.02.97-selinux-static.patch b/sys-fs/lvm2/files/lvm2-2.02.97-selinux-static.patch
deleted file mode 100644
index 38473989709a..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.97-selinux-static.patch
+++ /dev/null
@@ -1,91 +0,0 @@
-diff -Naur LVM2.2.02.97/configure.in LVM2.2.02.97.new/configure.in
---- LVM2.2.02.97/configure.in	2013-07-31 20:14:50.989498543 -0400
-+++ LVM2.2.02.97.new/configure.in	2013-07-31 20:58:36.195546461 -0400
-@@ -927,7 +927,6 @@
- 	UDEV_STATIC_LIBS=`$PKG_CONFIG --static --libs libudev`
- 	AC_DEFINE([UDEV_SYNC_SUPPORT], 1, [Define to 1 to enable synchronisation with udev processing.])
- fi
--AC_SUBST(UDEV_STATIC_LIBS)
- 
- dnl -- Enable udev rules
- AC_MSG_CHECKING(whether to enable installation of udev rules required for synchronisation)
-@@ -1130,19 +1129,32 @@
- if test x$SELINUX = xyes; then
- 	AC_CHECK_LIB([sepol], [sepol_check_context], [
- 		AC_DEFINE([HAVE_SEPOL], 1, [Define to 1 if sepol_check_context is available.])
--		SELINUX_LIBS="-lsepol"])
-+		SEPOL_LIBS="-lsepol"])
- 
--	AC_CHECK_LIB([selinux], [is_selinux_enabled], [
--		AC_CHECK_HEADERS([selinux/selinux.h],, hard_bailout)
--		AC_CHECK_HEADERS([selinux/label.h])
--		AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
--		SELINUX_LIBS="-lselinux $SELINUX_LIBS"
-+	dnl -- init pkgconfig if required
-+	if  test x$PKGCONFIG_INIT != x1; then
-+		pkg_config_init
-+	fi
-+	PKG_CHECK_MODULES(SELINUX, libselinux, [
- 		SELINUX_PC="libselinux"
--		HAVE_SELINUX=yes ], [
--		AC_MSG_WARN(Disabling selinux)
--		SELINUX_LIBS=
--		SELINUX_PC=
--		HAVE_SELINUX=no ])
-+		SELINUX_STATIC_LIBS=`$PKG_CONFIG --static --libs libselinux`
-+		SELINUX_LIBS="$SELINUX_LIBS $SEPOL_LIBS"
-+		AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
-+	],[
-+		dnl -- old non-pkgconfig method, is buggy with static builds
-+		AC_CHECK_LIB([selinux], [is_selinux_enabled], [
-+			AC_CHECK_HEADERS([selinux/selinux.h],, hard_bailout)
-+			AC_CHECK_HEADERS([selinux/label.h])
-+			AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
-+			SELINUX_LIBS="-lselinux $SEPOL_LIBS"
-+			SELINUX_STATIC_LIBS="$SELINUX_LIBS"
-+			SELINUX_PC="libselinux"
-+			HAVE_SELINUX=yes ], [
-+			AC_MSG_WARN(Disabling selinux)
-+			SELINUX_LIBS=
-+			SELINUX_PC=
-+			HAVE_SELINUX=no ])
-+	])
- fi
- 
- ################################################################################
-@@ -1531,6 +1543,7 @@
- AC_SUBST(SALCK_CFLAGS)
- AC_SUBST(SALCK_LIBS)
- AC_SUBST(SELINUX_LIBS)
-+AC_SUBST(SELINUX_STATIC_LIBS)
- AC_SUBST(SELINUX_PC)
- AC_SUBST(SNAPSHOTS)
- AC_SUBST(STATICDIR)
-@@ -1540,6 +1553,7 @@
- AC_SUBST(THIN)
- AC_SUBST(THIN_CHECK_CMD)
- AC_SUBST(UDEV_LIBS)
-+AC_SUBST(UDEV_STATIC_LIBS)
- AC_SUBST(UDEV_PC)
- AC_SUBST(UDEV_RULES)
- AC_SUBST(UDEV_SYNC)
-diff -Naur LVM2.2.02.97/make.tmpl.in LVM2.2.02.97.new/make.tmpl.in
---- LVM2.2.02.97/make.tmpl.in	2013-07-31 20:14:50.988498543 -0400
-+++ LVM2.2.02.97.new/make.tmpl.in	2013-07-31 20:49:32.291536533 -0400
-@@ -31,7 +31,7 @@
- 
- LIBS = @LIBS@
- # Extra libraries always linked with static binaries
--STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_STATIC_LIBS)
-+STATIC_LIBS = $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS)
- DEFS += @DEFS@
- CFLAGS += @CFLAGS@
- CLDFLAGS += @CLDFLAGS@
-@@ -45,6 +45,7 @@
- PTHREAD_LIBS = @PTHREAD_LIBS@
- READLINE_LIBS = @READLINE_LIBS@
- SELINUX_LIBS = @SELINUX_LIBS@
-+SELINUX_STATIC_LIBS = @SELINUX_STATIC_LIBS@
- UDEV_LIBS = @UDEV_LIBS@
- UDEV_STATIC_LIBS = @UDEV_STATIC_LIBS@
- TESTING = @TESTING@
diff --git a/sys-fs/lvm2/files/lvm2-2.02.97-strict-aliasing.patch b/sys-fs/lvm2/files/lvm2-2.02.97-strict-aliasing.patch
deleted file mode 100644
index 77394c0dc2fd..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.97-strict-aliasing.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-From 6595cae6e9b65658430714b9731b604c036d0816 Mon Sep 17 00:00:00 2001
-From: Zdenek Kabelac <zkabelac@redhat.com>
-Date: Sat, 13 Oct 2012 18:51:07 +0000
-Subject: cleanup: resolve dereferencing type-punned pointer
-
-fix gcc warning:
-dereferencing type-punned pointer will break strict-aliasing rules
-Replace call by value and pass just const pointer to pvid.
----
-diff --git a/lib/cache/lvmetad.c b/lib/cache/lvmetad.c
-index 1a52787..a3b45d5 100644
---- a/lib/cache/lvmetad.c
-+++ b/lib/cache/lvmetad.c
-@@ -444,7 +444,7 @@ int lvmetad_vg_update(struct volume_group *vg)
- 
- 	dm_list_iterate_items(pvl, &vg->pvs) {
- 		/* NB. the PV fmt pointer is sometimes wrong during vgconvert */
--		if (pvl->pv->dev && !lvmetad_pv_found(pvl->pv->id, pvl->pv->dev,
-+		if (pvl->pv->dev && !lvmetad_pv_found(&pvl->pv->id, pvl->pv->dev,
- 						      vg->fid ? vg->fid->fmt : pvl->pv->fmt,
- 						      pvl->pv->label_sector, NULL, NULL))
- 			return 0;
-@@ -657,7 +657,7 @@ static int _extract_mdas(struct lvmcache_info *info, struct dm_config_tree *cft,
- 	return 1;
- }
- 
--int lvmetad_pv_found(struct id pvid, struct device *device, const struct format_type *fmt,
-+int lvmetad_pv_found(const struct id *pvid, struct device *device, const struct format_type *fmt,
- 		     uint64_t label_sector, struct volume_group *vg, activation_handler handler)
- {
- 	char uuid[64];
-@@ -670,7 +670,7 @@ int lvmetad_pv_found(struct id pvid, struct device *device, const struct format_
- 	if (!lvmetad_active() || test_mode())
- 		return 1;
- 
--	if (!id_write_format(&pvid, uuid, sizeof(uuid)))
-+	if (!id_write_format(pvid, uuid, sizeof(uuid)))
-                 return_0;
- 
- 	pvmeta = dm_config_create();
-@@ -848,7 +848,7 @@ int lvmetad_pvscan_single(struct cmd_context *cmd, struct device *dev,
- 	 * *exact* image of the system, the lvmetad instance that went out of
- 	 * sync needs to be killed.
- 	 */
--	if (!lvmetad_pv_found(*(struct id *)dev->pvid, dev, lvmcache_fmt(info),
-+	if (!lvmetad_pv_found((const struct id *) &dev->pvid, dev, lvmcache_fmt(info),
- 			      label->sector, baton.vg, handler)) {
- 		release_vg(baton.vg);
- 		goto_bad;
-diff --git a/lib/cache/lvmetad.h b/lib/cache/lvmetad.h
-index 724922d..5f0f552 100644
---- a/lib/cache/lvmetad.h
-+++ b/lib/cache/lvmetad.h
-@@ -93,7 +93,7 @@ int lvmetad_vg_remove(struct volume_group *vg);
-  * number on the cached and on the discovered PV match but the metadata content
-  * does not.
-  */
--int lvmetad_pv_found(struct id pvid, struct device *device,
-+int lvmetad_pv_found(const struct id *pvid, struct device *device,
- 		     const struct format_type *fmt, uint64_t label_sector,
- 		     struct volume_group *vg, activation_handler handler);
- 
-diff --git a/lib/metadata/metadata.c b/lib/metadata/metadata.c
-index 5a633b6..c210a63 100644
---- a/lib/metadata/metadata.c
-+++ b/lib/metadata/metadata.c
-@@ -3807,7 +3807,7 @@ int pv_write(struct cmd_context *cmd __attribute__((unused)),
- 	if (!pv->fmt->ops->pv_write(pv->fmt, pv))
- 		return_0;
- 
--	if (!lvmetad_pv_found(pv->id, pv->dev, pv->fmt, pv->label_sector,
-+	if (!lvmetad_pv_found(&pv->id, pv->dev, pv->fmt, pv->label_sector,
- 			      NULL, NULL))
- 		return_0;
- 
---
-cgit v0.9.0.3
diff --git a/sys-fs/lvm2/files/lvm2-2.02.97-udev-static.patch b/sys-fs/lvm2/files/lvm2-2.02.97-udev-static.patch
deleted file mode 100644
index d1232d518201..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.97-udev-static.patch
+++ /dev/null
@@ -1,34 +0,0 @@
---- a/LVM2.2.02.98/make.tmpl.in	2013-07-31 18:36:16.313390582 -0400
-+++ b/LVM2.2.02.98/make.tmpl.in	2013-07-31 18:35:26.524389673 -0400
-@@ -32,7 +32,7 @@
- 
- LIBS = @LIBS@
- # Extra libraries always linked with static binaries
--STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS)
-+STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_STATIC_LIBS)
- DEFS += @DEFS@
- CFLAGS += @CFLAGS@
- CLDFLAGS += @CLDFLAGS@
-@@ -47,6 +47,7 @@
- READLINE_LIBS = @READLINE_LIBS@
- SELINUX_LIBS = @SELINUX_LIBS@
- UDEV_LIBS = @UDEV_LIBS@
-+UDEV_STATIC_LIBS = @UDEV_STATIC_LIBS@
- TESTING = @TESTING@
- 
- # Setup directory variables
---- a/LVM2.2.02.98/configure.in	2013-07-31 18:36:16.291390582 -0400
-+++ b/LVM2.2.02.98/configure.in	2013-07-31 18:32:18.849386248 -0400
-@@ -930,9 +930,11 @@
- 	if  test x$PKGCONFIG_INIT != x1; then
- 		pkg_config_init
- 	fi
-	PKG_CHECK_MODULES(UDEV, libudev >= 143, [UDEV_PC="libudev"])
-+	UDEV_STATIC_LIBS=`$PKG_CONFIG --static --libs libudev`
- 	AC_DEFINE([UDEV_SYNC_SUPPORT], 1, [Define to 1 to enable synchronisation with udev processing.])
- fi
-+AC_SUBST(UDEV_STATIC_LIBS)
- 
- dnl -- Enable udev rules
- AC_MSG_CHECKING(whether to enable installation of udev rules required for synchronisation)
-
diff --git a/sys-fs/lvm2/files/lvmetad.initd-2.02.105 b/sys-fs/lvm2/files/lvmetad.initd-2.02.105
deleted file mode 100755
index 9baf59473833..000000000000
--- a/sys-fs/lvm2/files/lvmetad.initd-2.02.105
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/files/lvmetad.initd-2.02.105,v 1.3 2014/02/08 21:17:46 robbat2 Exp $
-
-pidfile="/run/lvmetad.pid"
-command="/sbin/lvmetad"
-command_args="${LVMETAD_OPTS:=-p ${pidfile}}"
-start_stop_daemon_args="--pidfile ${pidfile}"
-
-depend() {
-	:
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.104.ebuild b/sys-fs/lvm2/lvm2-2.02.104.ebuild
deleted file mode 100644
index 5ac502de881d..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.104.ebuild
+++ /dev/null
@@ -1,235 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.104.ebuild,v 1.2 2014/02/03 15:56:45 vapier Exp $
-
-EAPI=5
-inherit autotools eutils linux-info multilib systemd toolchain-funcs udev
-
-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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="readline static static-libs clvm cman +lvm1 lvm2create_initrd selinux +udev +thin"
-
-DEPEND_COMMON="clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* )
-	readline? ( sys-libs/readline )
-	udev? ( >=virtual/udev-200[static-libs?] )"
-# /run is now required for locking during early boot. /var cannot be assumed to
-# be available -- thus, pull in recent enough baselayout for /run.
-# This version of LVM is incompatible with cryptsetup <1.1.2.
-RDEPEND="${DEPEND_COMMON}
-	>=sys-apps/baselayout-2.2
-	!<sys-apps/openrc-0.11
-	!<sys-fs/cryptsetup-1.1.2
-	!!sys-fs/clvm
-	!!sys-fs/lvm-user
-	>=sys-apps/util-linux-2.16
-	lvm2create_initrd? ( sys-apps/makedev )
-	thin? ( >=sys-block/thin-provisioning-tools-0.2.8-r1 )"
-DEPEND="${DEPEND_COMMON}
-	virtual/pkgconfig
-	>=sys-devel/binutils-2.20.1-r1
-	static? (
-		selinux? ( sys-libs/libselinux[static-libs] )
-		udev? ( virtual/udev[static-libs] )
-	)"
-
-S=${WORKDIR}/${PN/lvm/LVM}.${PV}
-
-pkg_setup() {
-	local CONFIG_CHECK="~SYSVIPC"
-
-	if use udev; then
-		local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-		fi
-	fi
-
-	check_extra_config
-
-	# 1. Genkernel no longer copies /sbin/lvm blindly.
-	if use static; then
-		elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
-		elog "their static versions. If you need the static binaries,"
-		elog "you must append .static to the filename!"
-	fi
-}
-
-src_prepare() {
-	# Gentoo specific modification(s):
-	epatch "${FILESDIR}"/${PN}-2.02.99-example.conf.in.patch
-
-	sed -i \
-		-e "1iAR = $(tc-getAR)" \
-		-e "s:CC ?= @CC@:CC = $(tc-getCC):" \
-		make.tmpl.in || die #444082
-
-	sed -i -e '/FLAG/s:-O2::' configure{,.in} || die #480212
-
-	# For upstream -- review and forward:
-	epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
-	epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
-	epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
-	epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
-	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
-	epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch #332905
-	epatch "${FILESDIR}"/${PN}-2.02.100-selinux_and_udev_static.patch #370217, #439414
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	local buildmode
-
-	myconf="${myconf} --enable-dmeventd"
-	myconf="${myconf} --enable-cmdlib"
-	myconf="${myconf} --enable-applib"
-	myconf="${myconf} --enable-fsadm"
-	myconf="${myconf} --enable-lvmetad"
-
-	# Most of this package does weird stuff.
-	# The build options are tristate, and --without is NOT supported
-	# options: 'none', 'internal', 'shared'
-	if use static; then
-		buildmode="internal"
-		# This only causes the .static versions to become available
-		myconf="${myconf} --enable-static_link"
-	else
-		buildmode="shared"
-	fi
-
-	# dmeventd requires mirrors to be internal, and snapshot available
-	# so we cannot disable them
-	myconf="${myconf} --with-mirrors=internal"
-	myconf="${myconf} --with-snapshots=internal"
-	use thin \
-		&& myconf="${myconf} --with-thin=internal" \
-		|| myconf="${myconf} --with-thin=none"
-
-	if use lvm1; then
-		myconf="${myconf} --with-lvm1=${buildmode}"
-	else
-		myconf="${myconf} --with-lvm1=none"
-	fi
-
-	# disable O_DIRECT support on hppa, breaks pv detection (#99532)
-	use hppa && myconf="${myconf} --disable-o_direct"
-
-	if use clvm; then
-		myconf="${myconf} --with-cluster=${buildmode}"
-		# 4-state! Make sure we get it right, per bug 210879
-		# Valid options are: none, cman, gulm, all
-		#
-		# 2009/02:
-		# gulm is removed now, now dual-state:
-		# cman, none
-		# all still exists, but is not needed
-		#
-		# 2009/07:
-		# TODO: add corosync and re-enable ALL
-		local clvmd=""
-		use cman && clvmd="cman"
-		#clvmd="${clvmd/cmangulm/all}"
-		[ -z "${clvmd}" ] && clvmd="none"
-		myconf="${myconf} --with-clvmd=${clvmd}"
-		myconf="${myconf} --with-pool=${buildmode}"
-	else
-		myconf="${myconf} --with-clvmd=none --with-cluster=none"
-	fi
-
-	econf \
-		$(use_enable readline) \
-		$(use_enable selinux) \
-		--enable-pkgconfig \
-		--with-confdir="${EPREFIX}"/etc \
-		--exec-prefix="${EPREFIX}" \
-		--sbindir="${EPREFIX}/sbin" \
-		--with-staticdir="${EPREFIX}"/sbin \
-		--libdir="${EPREFIX}/$(get_libdir)" \
-		--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--with-default-dm-run-dir=/run \
-		--with-default-run-dir=/run/lvm \
-		--with-default-locking-dir=/run/lock/lvm \
-		--with-default-pid-dir=/run \
-		$(use_enable udev udev_rules) \
-		$(use_enable udev udev_sync) \
-		$(use_with udev udevdir "$(get_udevdir)"/rules.d) \
-		"$(systemd_with_unitdir)" \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}"
-}
-
-src_compile() {
-	pushd include >/dev/null
-	emake
-	popd >/dev/null
-
-	emake
-	emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat
-}
-
-src_install() {
-	local inst
-	for inst in install install_systemd_units install_systemd_generators install_tmpfiles_configuration; do
-		emake DESTDIR="${D}" ${inst}
-	done
-
-	newinitd "${FILESDIR}"/lvm.rc-2.02.95-r2 lvm
-	newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm
-
-	newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.67-r2 lvm-monitoring
-
-	newinitd "${FILESDIR}"/device-mapper.rc-2.02.95-r2 device-mapper
-	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
-
-	newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd
-
-	if use clvm; then
-		newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd
-		newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd
-	fi
-
-	if use static-libs; then
-		dolib.a libdm/ioctl/libdevmapper.a
-		dolib.a libdaemon/client/libdaemonclient.a #462908
-		#gen_usr_ldscript libdevmapper.so
-		dolib.a daemons/dmeventd/libdevmapper-event.a
-		#gen_usr_ldscript libdevmapper-event.so
-	else
-		rm -f "${ED}"usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
-	fi
-
-	if use lvm2create_initrd; then
-		dosbin scripts/lvm2create_initrd/lvm2create_initrd
-		doman scripts/lvm2create_initrd/lvm2create_initrd.8
-		newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}"/dmtab
-
-	dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
-}
-
-pkg_postinst() {
-	ewarn "Make sure the \"lvm\" init script is in the runlevels:"
-	ewarn "# rc-update add lvm boot"
-	ewarn
-	ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want"
-	ewarn "to enable lvm autoactivation and metadata caching."
-}
-
-src_test() {
-	einfo "Tests are disabled because of device-node mucking, if you want to"
-	einfo "run tests, compile the package and see ${S}/tests"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.105-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.105-r1.ebuild
deleted file mode 100644
index 94a6b789a973..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.105-r1.ebuild
+++ /dev/null
@@ -1,247 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.105-r1.ebuild,v 1.4 2014/02/04 02:27:45 robbat2 Exp $
-
-EAPI=5
-inherit autotools eutils linux-info multilib systemd toolchain-funcs udev flag-o-matic
-
-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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="readline static static-libs clvm cman lvm1 lvm2create_initrd selinux +udev +thin device-mapper-only"
-REQUIRED_USE="device-mapper-only? ( !clvm !cman !lvm1 !lvm2create_initrd !thin )"
-
-DEPEND_COMMON="clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* )
-	readline? ( sys-libs/readline )
-	udev? ( >=virtual/udev-200[static-libs?] )"
-# /run is now required for locking during early boot. /var cannot be assumed to
-# be available -- thus, pull in recent enough baselayout for /run.
-# This version of LVM is incompatible with cryptsetup <1.1.2.
-RDEPEND="${DEPEND_COMMON}
-	>=sys-apps/baselayout-2.2
-	!<sys-apps/openrc-0.11
-	!<sys-fs/cryptsetup-1.1.2
-	!!sys-fs/clvm
-	!!sys-fs/lvm-user
-	>=sys-apps/util-linux-2.16
-	lvm2create_initrd? ( sys-apps/makedev )
-	thin? ( >=sys-block/thin-provisioning-tools-0.2.8-r1 )"
-DEPEND="${DEPEND_COMMON}
-	virtual/pkgconfig
-	>=sys-devel/binutils-2.20.1-r1
-	static? (
-		selinux? ( sys-libs/libselinux[static-libs] )
-		udev? ( virtual/udev[static-libs] )
-		>=sys-apps/util-linux-2.16[static-libs]
-	)"
-
-S=${WORKDIR}/${PN/lvm/LVM}.${PV}
-
-pkg_setup() {
-	local CONFIG_CHECK="~SYSVIPC"
-
-	if use udev; then
-		local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-		fi
-	fi
-
-	check_extra_config
-
-	# 1. Genkernel no longer copies /sbin/lvm blindly.
-	if use static; then
-		elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
-		elog "their static versions. If you need the static binaries,"
-		elog "you must append .static to the filename!"
-	fi
-}
-
-src_prepare() {
-	# Gentoo specific modification(s):
-	epatch "${FILESDIR}"/${PN}-2.02.99-example.conf.in.patch
-
-	sed -i \
-		-e "1iAR = $(tc-getAR)" \
-		-e "s:CC ?= @CC@:CC = $(tc-getCC):" \
-		make.tmpl.in || die #444082
-
-	sed -i -e '/FLAG/s:-O2::' configure{,.in} || die #480212
-
-	# For upstream -- review and forward:
-	epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
-	epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
-	epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
-	epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
-	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
-	epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch #332905
-	#epatch "${FILESDIR}"/${PN}-2.02.100-selinux_and_udev_static.patch #370217, #439414
-	epatch "${FILESDIR}"/${PN}-2.02.105-static-pkgconfig-libs.patch #370217, #439414 + blkid
-	epatch "${FILESDIR}"/${PN}-2.02.105-pthread-pkgconfig.patch #492450
-
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -flto
-	local myconf
-	local buildmode
-
-	myconf="${myconf} $(use_enable !device-mapper-only dmeventd)"
-	myconf="${myconf} $(use_enable !device-mapper-only cmdlib)"
-	myconf="${myconf} $(use_enable !device-mapper-only applib)"
-	myconf="${myconf} $(use_enable !device-mapper-only fsadm)"
-	myconf="${myconf} $(use_enable !device-mapper-only lvmetad)"
-
-	# Most of this package does weird stuff.
-	# The build options are tristate, and --without is NOT supported
-	# options: 'none', 'internal', 'shared'
-	if use static; then
-		buildmode="internal"
-		# This only causes the .static versions to become available
-		myconf="${myconf} --enable-static_link"
-	else
-		buildmode="shared"
-	fi
-	dmbuildmode=$(use !device-mapper-only && echo internal || echo none)
-
-	# dmeventd requires mirrors to be internal, and snapshot available
-	# so we cannot disable them
-	myconf="${myconf} --with-mirrors=${dmbuildmode}"
-	myconf="${myconf} --with-snapshots=${dmbuildmode}"
-	myconf="${myconf} --with-thin=$(use thin && echo internal || echo none)"
-
-	if use lvm1; then
-		myconf="${myconf} --with-lvm1=${buildmode}"
-	else
-		myconf="${myconf} --with-lvm1=none"
-	fi
-
-	# disable O_DIRECT support on hppa, breaks pv detection (#99532)
-	use hppa && myconf="${myconf} --disable-o_direct"
-
-	if use clvm; then
-		myconf="${myconf} --with-cluster=${buildmode}"
-		# 4-state! Make sure we get it right, per bug 210879
-		# Valid options are: none, cman, gulm, all
-		#
-		# 2009/02:
-		# gulm is removed now, now dual-state:
-		# cman, none
-		# all still exists, but is not needed
-		#
-		# 2009/07:
-		# TODO: add corosync and re-enable ALL
-		local clvmd=""
-		use cman && clvmd="cman"
-		#clvmd="${clvmd/cmangulm/all}"
-		[ -z "${clvmd}" ] && clvmd="none"
-		myconf="${myconf} --with-clvmd=${clvmd}"
-		myconf="${myconf} --with-pool=${buildmode}"
-	else
-		myconf="${myconf} --with-clvmd=none --with-cluster=none"
-	fi
-
-	econf \
-		$(use_enable readline) \
-		$(use_enable selinux) \
-		--enable-pkgconfig \
-		--with-confdir="${EPREFIX}"/etc \
-		--exec-prefix="${EPREFIX}" \
-		--sbindir="${EPREFIX}/sbin" \
-		--with-staticdir="${EPREFIX}"/sbin \
-		--libdir="${EPREFIX}/$(get_libdir)" \
-		--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--with-default-dm-run-dir=/run \
-		--with-default-run-dir=/run/lvm \
-		--with-default-locking-dir=/run/lock/lvm \
-		--with-default-pid-dir=/run \
-		$(use_enable udev udev_rules) \
-		$(use_enable udev udev_sync) \
-		$(use_with udev udevdir "$(get_udevdir)"/rules.d) \
-		"$(systemd_with_unitdir)" \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}"
-}
-
-src_compile() {
-	pushd include >/dev/null
-	emake
-	popd >/dev/null
-
-	if use device-mapper-only ; then
-		emake device-mapper
-	else
-		emake
-		emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat
-	fi
-}
-
-src_install() {
-	local inst
-	INSTALL_TARGETS="install install_systemd_units install_systemd_generators install_tmpfiles_configuration"
-	use device-mapper-only && INSTALL_TARGETS="install_device-mapper"
-	for inst in ${INSTALL_TARGETS}; do
-		emake DESTDIR="${D}" ${inst}
-	done
-
-	newinitd "${FILESDIR}"/device-mapper.rc-2.02.95-r2 device-mapper
-	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
-
-	if use !device-mapper-only ; then
-		newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd
-		newinitd "${FILESDIR}"/lvm.rc-2.02.105 lvm
-		newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm
-
-		newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.67-r2 lvm-monitoring
-		newinitd "${FILESDIR}"/lvmetad.initd-2.02.105 lvmetad
-	fi
-
-	if use clvm; then
-		newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd
-		newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd
-	fi
-
-	if use static-libs; then
-		dolib.a libdm/ioctl/libdevmapper.a
-		dolib.a libdaemon/client/libdaemonclient.a #462908
-		#gen_usr_ldscript libdevmapper.so
-		dolib.a daemons/dmeventd/libdevmapper-event.a
-		#gen_usr_ldscript libdevmapper-event.so
-	else
-		rm -f "${ED}"usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
-	fi
-
-	if use lvm2create_initrd; then
-		dosbin scripts/lvm2create_initrd/lvm2create_initrd
-		doman scripts/lvm2create_initrd/lvm2create_initrd.8
-		newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}"/dmtab
-
-	dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
-}
-
-pkg_postinst() {
-	ewarn "Make sure the \"lvm\" init script is in the runlevels:"
-	ewarn "# rc-update add lvm boot"
-	ewarn
-	ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want"
-	ewarn "to enable lvm autoactivation and metadata caching."
-}
-
-src_test() {
-	einfo "Tests are disabled because of device-node mucking, if you want to"
-	einfo "run tests, compile the package and see ${S}/tests"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.105.ebuild b/sys-fs/lvm2/lvm2-2.02.105.ebuild
deleted file mode 100644
index 38b5f38f1a8a..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.105.ebuild
+++ /dev/null
@@ -1,240 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.105.ebuild,v 1.3 2014/02/04 02:27:45 robbat2 Exp $
-
-EAPI=5
-inherit autotools eutils linux-info multilib systemd toolchain-funcs udev flag-o-matic
-
-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 ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~x86-linux"
-IUSE="readline static static-libs clvm cman lvm1 lvm2create_initrd selinux +udev +thin"
-
-DEPEND_COMMON="clvm? ( cman? ( =sys-cluster/cman-3* ) =sys-cluster/libdlm-3* )
-	readline? ( sys-libs/readline )
-	udev? ( >=virtual/udev-200[static-libs?] )"
-# /run is now required for locking during early boot. /var cannot be assumed to
-# be available -- thus, pull in recent enough baselayout for /run.
-# This version of LVM is incompatible with cryptsetup <1.1.2.
-RDEPEND="${DEPEND_COMMON}
-	>=sys-apps/baselayout-2.2
-	!<sys-apps/openrc-0.11
-	!<sys-fs/cryptsetup-1.1.2
-	!!sys-fs/clvm
-	!!sys-fs/lvm-user
-	>=sys-apps/util-linux-2.16
-	lvm2create_initrd? ( sys-apps/makedev )
-	thin? ( >=sys-block/thin-provisioning-tools-0.2.8-r1 )"
-DEPEND="${DEPEND_COMMON}
-	virtual/pkgconfig
-	>=sys-devel/binutils-2.20.1-r1
-	static? (
-		selinux? ( sys-libs/libselinux[static-libs] )
-		udev? ( virtual/udev[static-libs] )
-		>=sys-apps/util-linux-2.16[static-libs]
-	)"
-
-S=${WORKDIR}/${PN/lvm/LVM}.${PV}
-
-pkg_setup() {
-	local CONFIG_CHECK="~SYSVIPC"
-
-	if use udev; then
-		local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [ -n "${uevent_helper_path}" ] && [ "${uevent_helper_path}" != '""' ]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-		fi
-	fi
-
-	check_extra_config
-
-	# 1. Genkernel no longer copies /sbin/lvm blindly.
-	if use static; then
-		elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
-		elog "their static versions. If you need the static binaries,"
-		elog "you must append .static to the filename!"
-	fi
-}
-
-src_prepare() {
-	# Gentoo specific modification(s):
-	epatch "${FILESDIR}"/${PN}-2.02.99-example.conf.in.patch
-
-	sed -i \
-		-e "1iAR = $(tc-getAR)" \
-		-e "s:CC ?= @CC@:CC = $(tc-getCC):" \
-		make.tmpl.in || die #444082
-
-	sed -i -e '/FLAG/s:-O2::' configure{,.in} || die #480212
-
-	# For upstream -- review and forward:
-	epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
-	epatch "${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
-	epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
-	epatch "${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
-	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch # -Wl,--as-needed
-	epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch #332905
-	#epatch "${FILESDIR}"/${PN}-2.02.100-selinux_and_udev_static.patch #370217, #439414
-	epatch "${FILESDIR}"/${PN}-2.02.105-static-pkgconfig-libs.patch #370217, #439414 + blkid
-	epatch "${FILESDIR}"/${PN}-2.02.105-pthread-pkgconfig.patch #492450
-
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -flto
-	local myconf
-	local buildmode
-
-	myconf="${myconf} --enable-dmeventd"
-	myconf="${myconf} --enable-cmdlib"
-	myconf="${myconf} --enable-applib"
-	myconf="${myconf} --enable-fsadm"
-	myconf="${myconf} --enable-lvmetad"
-
-	# Most of this package does weird stuff.
-	# The build options are tristate, and --without is NOT supported
-	# options: 'none', 'internal', 'shared'
-	if use static; then
-		buildmode="internal"
-		# This only causes the .static versions to become available
-		myconf="${myconf} --enable-static_link"
-	else
-		buildmode="shared"
-	fi
-
-	# dmeventd requires mirrors to be internal, and snapshot available
-	# so we cannot disable them
-	myconf="${myconf} --with-mirrors=internal"
-	myconf="${myconf} --with-snapshots=internal"
-	use thin \
-		&& myconf="${myconf} --with-thin=internal" \
-		|| myconf="${myconf} --with-thin=none"
-
-	if use lvm1; then
-		myconf="${myconf} --with-lvm1=${buildmode}"
-	else
-		myconf="${myconf} --with-lvm1=none"
-	fi
-
-	# disable O_DIRECT support on hppa, breaks pv detection (#99532)
-	use hppa && myconf="${myconf} --disable-o_direct"
-
-	if use clvm; then
-		myconf="${myconf} --with-cluster=${buildmode}"
-		# 4-state! Make sure we get it right, per bug 210879
-		# Valid options are: none, cman, gulm, all
-		#
-		# 2009/02:
-		# gulm is removed now, now dual-state:
-		# cman, none
-		# all still exists, but is not needed
-		#
-		# 2009/07:
-		# TODO: add corosync and re-enable ALL
-		local clvmd=""
-		use cman && clvmd="cman"
-		#clvmd="${clvmd/cmangulm/all}"
-		[ -z "${clvmd}" ] && clvmd="none"
-		myconf="${myconf} --with-clvmd=${clvmd}"
-		myconf="${myconf} --with-pool=${buildmode}"
-	else
-		myconf="${myconf} --with-clvmd=none --with-cluster=none"
-	fi
-
-	econf \
-		$(use_enable readline) \
-		$(use_enable selinux) \
-		--enable-pkgconfig \
-		--with-confdir="${EPREFIX}"/etc \
-		--exec-prefix="${EPREFIX}" \
-		--sbindir="${EPREFIX}/sbin" \
-		--with-staticdir="${EPREFIX}"/sbin \
-		--libdir="${EPREFIX}/$(get_libdir)" \
-		--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--with-default-dm-run-dir=/run \
-		--with-default-run-dir=/run/lvm \
-		--with-default-locking-dir=/run/lock/lvm \
-		--with-default-pid-dir=/run \
-		$(use_enable udev udev_rules) \
-		$(use_enable udev udev_sync) \
-		$(use_with udev udevdir "$(get_udevdir)"/rules.d) \
-		"$(systemd_with_unitdir)" \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}"
-}
-
-src_compile() {
-	pushd include >/dev/null
-	emake
-	popd >/dev/null
-
-	emake
-	emake CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat
-}
-
-src_install() {
-	local inst
-	for inst in install install_systemd_units install_systemd_generators install_tmpfiles_configuration; do
-		emake DESTDIR="${D}" ${inst}
-	done
-
-	newinitd "${FILESDIR}"/lvm.rc-2.02.105 lvm
-	newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm
-
-	newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.67-r2 lvm-monitoring
-	newinitd "${FILESDIR}"/lvmetad.initd-2.02.105 lvmetad
-
-	newinitd "${FILESDIR}"/device-mapper.rc-2.02.95-r2 device-mapper
-	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
-
-	newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd
-
-	if use clvm; then
-		newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd
-		newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd
-	fi
-
-	if use static-libs; then
-		dolib.a libdm/ioctl/libdevmapper.a
-		dolib.a libdaemon/client/libdaemonclient.a #462908
-		#gen_usr_ldscript libdevmapper.so
-		dolib.a daemons/dmeventd/libdevmapper-event.a
-		#gen_usr_ldscript libdevmapper-event.so
-	else
-		rm -f "${ED}"usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
-	fi
-
-	if use lvm2create_initrd; then
-		dosbin scripts/lvm2create_initrd/lvm2create_initrd
-		doman scripts/lvm2create_initrd/lvm2create_initrd.8
-		newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}"/dmtab
-
-	dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
-}
-
-pkg_postinst() {
-	ewarn "Make sure the \"lvm\" init script is in the runlevels:"
-	ewarn "# rc-update add lvm boot"
-	ewarn
-	ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want"
-	ewarn "to enable lvm autoactivation and metadata caching."
-}
-
-src_test() {
-	einfo "Tests are disabled because of device-node mucking, if you want to"
-	einfo "run tests, compile the package and see ${S}/tests"
-}
diff --git a/sys-fs/lvm2/lvm2-2.02.97-r1.ebuild b/sys-fs/lvm2/lvm2-2.02.97-r1.ebuild
deleted file mode 100644
index 5bfc7270008d..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.97-r1.ebuild
+++ /dev/null
@@ -1,289 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/lvm2/lvm2-2.02.97-r1.ebuild,v 1.18 2014/02/03 15:56:45 vapier Exp $
-
-EAPI=5
-inherit eutils multilib toolchain-funcs autotools linux-info udev
-
-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 arm64 hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
-
-IUSE="readline static static-libs clvm cman +lvm1 selinux +udev +thin"
-
-DEPEND_COMMON="!!sys-fs/device-mapper
-	readline? ( sys-libs/readline )
-	clvm? ( =sys-cluster/libdlm-3*
-			cman? ( =sys-cluster/cman-3* ) )
-	udev? ( virtual/udev[static-libs?] )"
-
-# /run is now required for locking during early boot. /var cannot be assumed to
-# be available.
-RDEPEND="${DEPEND_COMMON}
-	!<sys-apps/openrc-0.10.1
-	>=sys-apps/baselayout-2.1-r1
-	!!sys-fs/lvm-user
-	!!sys-fs/clvm
-	>=sys-apps/util-linux-2.16
-	thin? ( sys-block/thin-provisioning-tools )"
-
-# Upgrading to this LVM will break older cryptsetup
-RDEPEND="${RDEPEND}
-		!<sys-fs/cryptsetup-1.1.2"
-
-DEPEND="${DEPEND_COMMON}
-		virtual/pkgconfig
-		>=sys-devel/binutils-2.20.1-r1
-		static? (
-			udev? ( virtual/udev[static-libs] )
-			selinux? ( sys-libs/libselinux[static-libs] )
-		)"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-pkg_setup() {
-	local CONFIG_CHECK="~SYSVIPC"
-	use udev && local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
-	check_extra_config
-	# 1. Genkernel no longer copies /sbin/lvm blindly.
-	if use static; then
-		elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
-		elog "their static versions. If you need the static binaries,"
-		elog "you must append .static to the filename!"
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/lvm.conf-2.02.67.patch
-
-	# Should not be needed due to upstream re-arrangement of build
-	#epatch "${FILESDIR}"/${PN}-2.02.56-dmeventd.patch
-	# Should not be need with new upstream udev rules
-	#epatch "${FILESDIR}"/${PN}-2.02.56-device-mapper-export-format.patch
-
-	# Merged upstream:
-	#epatch "${FILESDIR}"/${PN}-2.02.51-as-needed.patch
-	# Merged upstream:
-	#epatch "${FILESDIR}"/${PN}-2.02.48-fix-pkgconfig.patch
-	# Merged upstream:
-	#epatch "${FILESDIR}"/${PN}-2.02.51-fix-pvcreate.patch
-	# Fixed differently upstream:
-	#epatch "${FILESDIR}"/${PN}-2.02.51-dmsetup-selinux-linking-fix-r3.patch
-
-	epatch "${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
-	epatch "${FILESDIR}"/lvm2-2.02.56-lvm2create_initrd.patch
-	# bug 318513 - merged upstream
-	#epatch "${FILESDIR}"/${PN}-2.02.64-dmeventd-libs.patch
-	# bug 301331
-	epatch "${FILESDIR}"/${PN}-2.02.67-createinitrd.patch
-	# bug 330373
-	epatch "${FILESDIR}"/${PN}-2.02.92-locale-muck.patch
-	# --as-needed
-	epatch "${FILESDIR}"/${PN}-2.02.70-asneeded.patch
-	# bug 332905
-	epatch "${FILESDIR}"/${PN}-2.02.92-dynamic-static-ldflags.patch
-	# bug 361429 - merged upstream in .85
-	#epatch "${FILESDIR}"/${PN}-2.02.84-udev-pkgconfig.patch
-
-	# Merged upstream
-	#epatch "${FILESDIR}"/${PN}-2.02.73-asneeded.patch
-
-	epatch "${FILESDIR}"/${PN}-2.02.88-respect-cc.patch
-
-	# Upstream bug of LVM path
-	# Merged upstream
-	#epatch "${FILESDIR}"/${PN}-2.02.95-lvmpath.patch
-
-	# Upstream patch for http://bugs.gentoo.org/424810
-	# Merged upstream
-	#epatch "${FILESDIR}"/${PN}-2.02.95-udev185.patch
-
-	# Upstream patch for https://bugs.gentoo.org/444328
-	epatch "${FILESDIR}"/${P}-strict-aliasing.patch
-
-	# for https://bugs.gentoo.org/370217
-	epatch "${FILESDIR}"/${P}-udev-static.patch
-	# for https://bugs.gentoo.org/439414
-	epatch "${FILESDIR}"/${P}-selinux-static.patch
-
-	# Fix calling AR directly with USE static, bug #444082
-	if use static ; then
-		sed -i -e "s:\$(AR) rs \$@ \$(OBJECTS) lvmcmdlib.o lvm2cmd-static.o:$(tc-getAR) rs \$@ \$(OBJECTS) lvmcmdlib.o lvm2cmd-static.o:" \
-			tools/Makefile.in || die "sed failed"
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-	local buildmode
-
-	myconf="${myconf} --enable-dmeventd"
-	myconf="${myconf} --enable-cmdlib"
-	myconf="${myconf} --enable-applib"
-	myconf="${myconf} --enable-fsadm"
-	myconf="${myconf} --enable-lvmetad"
-
-	# Most of this package does weird stuff.
-	# The build options are tristate, and --without is NOT supported
-	# options: 'none', 'internal', 'shared'
-	if use static ; then
-		einfo "Building static LVM, for usage inside genkernel"
-		buildmode="internal"
-		# This only causes the .static versions to become available
-		# We explicitly provide the .static versions so that they can be included in
-		# initramfs environments.
-		myconf="${myconf} --enable-static_link"
-	else
-		ewarn "Building shared LVM, it will not work inside genkernel!"
-		buildmode="shared"
-	fi
-
-	# dmeventd requires mirrors to be internal, and snapshot available
-	# so we cannot disable them
-	myconf="${myconf} --with-mirrors=internal"
-	myconf="${myconf} --with-snapshots=internal"
-	use thin \
-		&& myconf="${myconf} --with-thin=internal" \
-		|| myconf="${myconf} --with-thin=none"
-
-	if use lvm1 ; then
-		myconf="${myconf} --with-lvm1=${buildmode}"
-	else
-		myconf="${myconf} --with-lvm1=none"
-	fi
-
-	# disable O_DIRECT support on hppa, breaks pv detection (#99532)
-	use hppa && myconf="${myconf} --disable-o_direct"
-
-	if use clvm; then
-		myconf="${myconf} --with-cluster=${buildmode}"
-		# 4-state! Make sure we get it right, per bug 210879
-		# Valid options are: none, cman, gulm, all
-		#
-		# 2009/02:
-		# gulm is removed now, now dual-state:
-		# cman, none
-		# all still exists, but is not needed
-		#
-		# 2009/07:
-		# TODO: add corosync and re-enable ALL
-		local clvmd=""
-		use cman && clvmd="cman"
-		#clvmd="${clvmd/cmangulm/all}"
-		[ -z "${clvmd}" ] && clvmd="none"
-		myconf="${myconf} --with-clvmd=${clvmd}"
-		myconf="${myconf} --with-pool=${buildmode}"
-	else
-		myconf="${myconf} --with-clvmd=none --with-cluster=none"
-	fi
-
-	local udevdir="${EPREFIX}/lib/udev/rules.d"
-	use udev && udevdir="${EPREFIX}/$(udev_get_udevdir)/rules.d"
-
-	econf \
-		$(use_enable readline) \
-		$(use_enable selinux) \
-		--enable-pkgconfig \
-		--with-confdir="${EPREFIX}/etc" \
-		--sbindir="${EPREFIX}/sbin" \
-		--with-staticdir="${EPREFIX}/sbin" \
-		--libdir="${EPREFIX}/$(get_libdir)" \
-		--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)" \
-		--with-default-run-dir=/run/lvm \
-		--with-default-locking-dir=/run/lock/lvm \
-		--with-dmeventd-path=/sbin/dmeventd \
-		$(use_enable udev udev_rules) \
-		$(use_enable udev udev_sync) \
-		$(use_with udev udevdir "${udevdir}") \
-		${myconf} \
-		CLDFLAGS="${LDFLAGS}"
-}
-
-src_compile() {
-	einfo "Doing symlinks"
-	pushd include
-	emake || die "Failed to prepare symlinks"
-	popd
-
-	einfo "Starting main build"
-	emake AR="$(tc-getAR)" || die "compile fail"
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{conf,c,txt}
-	newinitd "${FILESDIR}"/lvm.rc-2.02.95-r2 lvm
-	newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.67-r2 lvm-monitoring
-	newconfd "${FILESDIR}"/lvm.confd-2.02.28-r2 lvm
-	if use clvm; then
-		newinitd "${FILESDIR}"/clvmd.rc-2.02.39 clvmd
-		newconfd "${FILESDIR}"/clvmd.confd-2.02.39 clvmd
-	fi
-
-	# move shared libs to /lib(64)
-	if use static-libs; then
-		dolib.a libdm/ioctl/libdevmapper.a || die "dolib.a libdevmapper.a"
-		#gen_usr_ldscript libdevmapper.so
-	fi
-
-	dosbin "${S}"/scripts/lvm2create_initrd/lvm2create_initrd
-	doman  "${S}"/scripts/lvm2create_initrd/lvm2create_initrd.8
-	newdoc "${S}"/scripts/lvm2create_initrd/README README.lvm2create_initrd
-
-	insinto /etc
-	doins "${FILESDIR}"/dmtab
-
-	# Device mapper stuff
-	newinitd "${FILESDIR}"/device-mapper.rc-2.02.95-r2 device-mapper
-	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
-
-	newinitd "${FILESDIR}"/dmeventd.initd-2.02.67-r1 dmeventd
-	if use static-libs; then
-		dolib.a daemons/dmeventd/libdevmapper-event.a \
-		|| die "dolib.a libdevmapper-event.a"
-		#gen_usr_ldscript libdevmapper-event.so
-	fi
-
-	use static-libs || \
-	rm -f "${D}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
-
-	#insinto /etc/udev/rules.d/
-	#newins "${FILESDIR}"/64-device-mapper.rules-2.02.56-r3 64-device-mapper.rules
-
-	# do not rely on /lib -> /libXX link
-	sed -i \
-		-e "s|/lib/rcscripts/|/$(get_libdir)/rcscripts/|" \
-		"${ED}"/etc/init.d/* || die
-
-	elog "USE flag nocman is deprecated and replaced"
-	elog "with the cman USE flag."
-	elog ""
-	elog "USE flags clvm and cman are masked"
-	elog "by default and need to be unmasked to be used"
-	elog ""
-	elog "If you are using genkernel and root-on-LVM, rebuild the initramfs."
-}
-
-pkg_postinst() {
-	elog "lvm volumes are no longer automatically created for"
-	elog "baselayout-2 users. If you are using baselayout-2, be sure to"
-	elog "run: # rc-update add lvm boot"
-	elog "Do NOT add it if you are still using baselayout-1."
-}
-
-src_test() {
-	einfo "Testcases disabled because of device-node mucking"
-	einfo "If you want them, compile the package and see ${S}/tests"
-}