old

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

15 files changed, 20 insertions, 1641 deletions

diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index 34fd792a0911..e463ce6d12ab 100644
--- a/sys-fs/cryptsetup/ChangeLog
+++ b/sys-fs/cryptsetup/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-fs/cryptsetup
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.174 2014/08/26 14:36:19 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.175 2014/08/26 14:43:47 ssuominen Exp $
+
+  26 Aug 2014; Samuli Suominen <ssuominen@gentoo.org>
+  +files/dmcrypt-1.0.6.confd, -cryptsetup-1.0.6-r2.ebuild,
+  -cryptsetup-1.1.3-r3.ebuild, -cryptsetup-1.2.0-r1.ebuild,
+  -cryptsetup-1.4.3.ebuild, -cryptsetup-1.5.1.ebuild,
+  -files/1.0.5-dm-crypt-stop.sh, -files/1.0.5-dmcrypt.rc,
+  -files/1.0.6-dmcrypt.confd, -files/1.0.6-r2-dm-crypt-start.sh,
+  -files/1.1.3-dm-crypt-start.sh, -files/1.1.3-dm-crypt-stop.sh,
+  -files/cryptsetup-1.0.6-udevsettle.patch, -files/dmcrypt.rc:
+  old
 
   26 Aug 2014; Samuli Suominen <ssuominen@gentoo.org> cryptsetup-1.6.2.ebuild,
   cryptsetup-1.6.6.ebuild:
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 08433f43eaf9..8d1b37bc7118 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,42 +1,25 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX 1.0.5-dm-crypt-stop.sh 1022 SHA256 42015047c708aa73eae615559ff76c9c8948a5d01fba68f64c5432e30ec799a4 SHA512 6a8e55a2458278a48edaa8563ff7a586f521280587f4aacf03ab903fe6c3ae312b1925ee73a1462352d86cdc7097945f7ea842ba633ed527bbfb3a80689b1ae0 WHIRLPOOL c97f3d3485f56cb687acda6c697c4bb97e531d3aacc819ffa7073d9ac99f3e3d237e154064476e5f7ef1fce9b990792ffc992a90e083b5c93c45501f74564c58
-AUX 1.0.5-dmcrypt.rc 601 SHA256 0b58b18dc903d0d4a23e5e2df1e6f3c5db64c65b8884e24710e4b7528ea3f8dc SHA512 d18f0192eea97d5051b81b4287b96d5ffb59e2dc3611f93111ff92700916d561c246f956417f438180b9f65313f35fa85ca076872592ef87c984b91d9625c3c6 WHIRLPOOL 66eaefe2ea4ab4d82e2956891efac6e884f7997a36b9cd9527412b3d3713394d5d5144b0ec3807daee3de05dba15a0f9c7a2a1cc9f4919121f6d13ffbb2d582e
-AUX 1.0.6-dmcrypt.confd 3309 SHA256 0c30e081c0b8f879964ae49735f10b05a1d92f4f481042851958860945e13271 SHA512 d04ae17d3708ef20ade7afb223d4ef19e1b6812e0be8f9499e37e9c71344568b42030d9dd8f6918a9bfb211a3a94b40a9354e3b32a009cb165e84508d0a5e14b WHIRLPOOL 9496cd3fb3f8e8d84a5d70fd6e9853fdd2fe87df96244cb00fe73fee9a711847d795937b800ff13f98a888a288cfc5b33f564392794413e2a0b8e033165d4f5f
-AUX 1.0.6-r2-dm-crypt-start.sh 8092 SHA256 56004bef91b8fad57fe67fec19427dd7c48e01c8e1ba7ff60f8c370295775fdc SHA512 e55949ed23518f9530476973ab632f9d4af9a5a684546baf662caabe4566aeb0164484ed972ab2edf220120609c593b05fc07173da388b3fceb5063acef3aadb WHIRLPOOL 6f67efbf34bfc62b316026106fe89914c8a16f7377a64ff787e81fa80ab32654c88e803e5f0cb4ecaa943d36499d4b72c469cb2bb030c830d064836cc4ecae61
-AUX 1.1.3-dm-crypt-start.sh 8651 SHA256 1489ce5480d51beb81cf4f5178468ad4b2f2e4b3f53bc75ee8fe47d3e050a76a SHA512 4cd3e4c28f1c3da4b864c556873c2036854da78d0c3055f06ea8e2d359f16dc7020b4ebc2c0d4024dc557f51e923a919ecf384add07e92525d908efe4073af4d WHIRLPOOL b68eacec508861821c1573dd85b4fb1a5d909ab70ad8445997796cf328cd54c8a2363dfc54ae8da82b4d7e526df6938baab5332bd8cb2d1c095ac15e730541ae
-AUX 1.1.3-dm-crypt-stop.sh 1272 SHA256 c81bf0cf8e57b3f83f55c808dba619b0a0f60eef8c3ed406d266be7cecdf96f9 SHA512 ec184e988f3ab36c5f661cc4743edf8ce0798ff69e4e40df854c172eaf0bae264de10160ee098dbfb7814318b2cd875ea18e1b447789c7e08b9549b11db3f175 WHIRLPOOL cb0c1afb4929229dc7bdade5657f053192c72a6011fd0eb05ef1e649f6a31925a57e61913cbea208eb0b3e2547b8bbe37cecb4e343ba84722efe2affadfa12ca
 AUX 1.5.1-dmcrypt.rc 9453 SHA256 02faf27470ea0e50b764c923786724847e77dfdf9680a50cc202546cad2bf02f SHA512 660d1a29294e8e01343aea0b92d9159d42891261d41313c3f9e77ed3bd69e648d19d3799a8ad1b00884b6f4c0f48d4e12cb406ca291e64b789e71ba70ab3c29f WHIRLPOOL 3f36f078eb5f8d07d52b2559b2f7ba7280c620bab895b3ab34ee12619a4145ad3f04879f821b91a17805c792f0395ec96070aa218836373a38aa839fe0260505
-AUX cryptsetup-1.0.6-udevsettle.patch 561 SHA256 80c4914071769dedc20198425b4ea528ec22264ff4c54516a9e5722a8e671f60 SHA512 74631c2aab95bd32a67dce1ae75ea30acdb167be78503a31ef8afbf178b651917cc65a37bafc5d6d60c1d3545664a2f53bf07885ba3ba86f562b12db17733228 WHIRLPOOL beb109875aa9579f05527d79a12eb0ebfd187853322accb70dc9e2a36e7ca4be881aa7f504f7573a040a64e0df777e70c4fbf31f79f29728c74cffaea8029d74
 AUX cryptsetup-1.6.1-openssl-static.patch 472 SHA256 7029ba7870ff183b7dac3c658140c8c01286efd29e9427d1195b5b4e85fe2f4f SHA512 4292ee661b3e1a26b3c9b6fe8f360ed1df1cb416a13162ffa40d6610d5d0431c3dbdb17280fb1aa3aa6eeacb735ead3da4e6cc126d8be74121565b4c9bf6c6a2 WHIRLPOOL f0186cf9317560a480dab53c8c538f35ba5273401f2d37b4be9e3aae06203c43fcd22c4ce17c41cf80a01db5cd22877105ff2be0a8f3effd50cde8c9f42b68df
-AUX dmcrypt.rc 9336 SHA256 2cacfbe5b305c0ba9633764e79dfadd160e63ffb089f7347c0bca8c2ba9ec42f SHA512 0019cc0d0bb91c04b04949cdfb0126fdb04541ec4e76117760092e1287d4a4eb091ecbf643fb8e4346f226e6b01d8fe358f0f0e0221f31abc83415b5e235b17a WHIRLPOOL 527fbbebafcdd7e2e3687acdc59fb07e2fa26370508aa0758ca0deb6e12fcab789271b6733cdfd18381ddf55f606152febe6f1e4fdac26d1efd4206b7b219655
-DIST cryptsetup-1.0.6.tar.bz2 405713 SHA256 df7fda80cfa01f063caf39140287a47d018dfe056fc71a3ba605e690ff0183fd SHA512 deed2c603bfba3b26eb1cab65d880eb9fd69dc4aabc9e8fa2bf78de0879ecd5ddb03c4c6bd9c0ec166d2d5e87a13bb370e6e46d50f5dd246522e81bf75380e1b WHIRLPOOL 71e9c71387f0d6242303bcb53825595023af387b8a76c48681b74ccd38fa19b225930edddcd1369ea62854e5d95b05447b72ede707bd2a8af110242fcc41536f
-DIST cryptsetup-1.1.3.tar.bz2 499276 SHA256 9c8e68a272f6d9cfb6cd65cc0743f4c44a2096c61f74e0602bf40208b5e69c0a SHA512 ecf259f41384d0d10d522c01f12815743e3a245b897a223909bce91b95401b73d1d0bd22cbe73d1d26e44df13c0666d039879404c26b66835d49983be69637ea WHIRLPOOL 8a7ebfc3dc6a2eda339add80682f678186272ecde027006196d3a9ffebd69ddbf76665df75f1f602c22a1309d35af9c1d320d0432acb2dd89f5287dad4b04af0
-DIST cryptsetup-1.2.0.tar.bz2 523859 SHA256 411129817ff29e6a957bcbdcd9a2c4c953c1539acd8af912c383262ba901b5ea SHA512 7af9b26581d544e6207ad126e0ee4cf963b013cb1306f05e82fda1703d3fdf35b29e11f56e1fbc3641db9f52874a44057fba5b96597cfa595710cc94619692be WHIRLPOOL eb05a564bbdfac23f0b35409c30fc16b145bbe98bab364ea3e25bbdb54fe16b1238bd537788b2de6dc53271c51f6257b05380706f94e41303453f411fba57b4e
-DIST cryptsetup-1.4.3.tar.bz2 798101 SHA256 d5ff2c00f6f791d77fa5636a02ae43ddbb46c6c793bdeafdec5e38fd15f99d0a SHA512 e91ad9cda9549802e9ea5cec02273ee4bc1a040883650e903e91a07c8cce8131b0bda068fa3433d2b5b3b7470cf9481d73670267cd419ce2d7b0f673b3601ba3 WHIRLPOOL e30c3bb9ad24145e425d64069cc84d8c129dc06d775299668dea9ad06c14c95e21b8bb734f94872990c7c1586666bdc6aee79aac5c8a64bacc3aa416d23a2f24
-DIST cryptsetup-1.5.1.tar.bz2 958979 SHA256 16d23f78cab35937281a0ae7a8febce0c3a1a0f291cc94e169a7b968b81d2b36 SHA512 f1847d1833f0aba59af334a5b3919ca44b1a6dce152a44ccb76747fed5996ce83bddac9b6550ab8c63d7ca66dd9e0e79ccc2399b7b3860e8090bf776a72a77b0 WHIRLPOOL 2f24c43ba689039ab3548225cda91bea0c65cf2014e7cd57157def111493c3c2037a283cb778c3301c9d7b138f4fc8da21ce5752b9d1379d66fa01ef2481823e
+AUX dmcrypt-1.0.6.confd 3309 SHA256 0c30e081c0b8f879964ae49735f10b05a1d92f4f481042851958860945e13271 SHA512 d04ae17d3708ef20ade7afb223d4ef19e1b6812e0be8f9499e37e9c71344568b42030d9dd8f6918a9bfb211a3a94b40a9354e3b32a009cb165e84508d0a5e14b WHIRLPOOL 9496cd3fb3f8e8d84a5d70fd6e9853fdd2fe87df96244cb00fe73fee9a711847d795937b800ff13f98a888a288cfc5b33f564392794413e2a0b8e033165d4f5f
 DIST cryptsetup-1.6.2.tar.bz2 1189584 SHA256 15723f0198303d4bcb99d480b7a773918e2d319f0348457988c063bdd03e109a SHA512 59fb835ef8bcd6d0c704a021055032639840ef4bb7be6ade8ff91d347ae74d8e6cba4583d8ced7a4a8c6f09ebc16c4eff3549c13c4327d92fd9234db58e18c10 WHIRLPOOL 3ab24572ea42dfdd0d5176dfa4621520cd0bccda53c3a01676d400a7a841ab9643c979c4942daa774658602bd8cdf659376cbc94c553e2097c5eb3c51a7edb31
 DIST cryptsetup-1.6.5.tar.xz 1136892 SHA256 267973f20be43f9d685f7193aa23954b60768c74a1d330243114d4b8bc17ca9a SHA512 c77ac590d28954e7bd430d1069b820a288c4668857a7ced7f81546ea39676f2b536abbcda06f20440e31c205b7ada68bcfa5aab220b102a2b62198a788d9b65e WHIRLPOOL 74a597abbdcc1225bb811597e53737eab2348a328f3ba30e7eb519a0621b06e6c898e320db8e24a16decfd4706b6a2e68b06894dde91124e4c089e952dbff9c1
 DIST cryptsetup-1.6.6.tar.xz 1145940 SHA256 2d2ce28e4e1137dd599d87884b62ef6dbf14fd7848b2a2bf7d61cf125fbd8e6f SHA512 6ee6b4e8fe4f721bb97d1cf47c5e2d1c96001dd3ac48154d414f64d23620ac3ec3eeea2ad584a1a3111e07a086c8a4fdbfabdf4859cda58ba2bd6765b1f009a8 WHIRLPOOL 07bb6b7f5153cfcd3a585f111733a05926d1f6f0ec190e0b0dc1777591bd0fec3c8782dc79f43bafd3829da28efbdd2d8f97daef8186392787c22c7f5e454376
-EBUILD cryptsetup-1.0.6-r2.ebuild 3125 SHA256 d26d9886d4f6d17f11952424686409a03db8fb2e381cc34d19ab2d790a6e88b5 SHA512 7d9fe5e825ebc88f43af0890cb55a7269bf6b8a0ed784f9679c317399525f7ccfd69c2a2d91d17dcd736491878c080bc39abde3ad56f304597962b453542c48b WHIRLPOOL 4385f07032a73e314c6c7e56aa91ac0d9d21ff7937d38703fdea7ee82ee430ca1d4c3c305eb107f449983189929252a5660be908071bee3a3c64d2433468f7ed
-EBUILD cryptsetup-1.1.3-r3.ebuild 3472 SHA256 a4056e57b7931d6bb6638cfa571457498ccc7cddb650c9ff727903ce5146512b SHA512 30221170b6ef664c4f8fae60d04312605a3ca44553a55213232409957a6e613dd761b37fb04804ec9c602d2fdf975bc62d021182a84baf3eb2b2ef13ea932e2e WHIRLPOOL e178e6c9e2a3833924987d87b1387532af36ba186ba474b35925dde03ad86fb80c59709fb76ff12613cc551c059d4bc97b3d408f60a493667190c7b99df9acd8
-EBUILD cryptsetup-1.2.0-r1.ebuild 3665 SHA256 7aad104464a6c467d194f986fc915749a3615f9e0a479a25c9cd1e9345926111 SHA512 068d9669bc789aaa74f43aff99ba20ceee087a8e8d98aef2a2b63b2c08cf7d4a92b9258ace8c301a12d2d78d36158727c34a591dc0f64655fdbebaa9332a0e8f WHIRLPOOL eabd43d1baae63d1ae0bc07f5c1e2739b40889329e7209c0c98610d59e5087016be350fcfa0cc34472e67fef56de61b48dc93308adc1e670600cccdb3501ee4c
-EBUILD cryptsetup-1.4.3.ebuild 3563 SHA256 ab0ac49da7b0273794d955667d0d2b33e06faa010456fb5766e4bc974f4a1d5d SHA512 2ecd31b7a40e618ca5762337b3d4a2933eefa0d6865c71fdab2142a99f2bec99d83f813e645d85d14c88f9e4b0da437abe7330145d8d6b88e83d04f5ab3a61b8 WHIRLPOOL ae1202f9ad40e14d8bd3a6c581dd6dfb52c8afe0d5d8766e335ff359f7165c8c1d2b0679d9d516dfed8a6c5bfb0a87551dcb65565620ab9d8e77ee1ce0259eba
-EBUILD cryptsetup-1.5.1.ebuild 3847 SHA256 a733ee59e5d34564ca7b6a53e5ed91cfeb2778d016b11becfbb1a24b16e99dbb SHA512 bf2267ab37070da548d0dfd2d5a92b1d44f71d4969121f3cf5c6f14406cdf7e7bba20d308d96c2f4f715cf178f81cbffc8e2ce2c2e8944f1953d5352334bf2ab WHIRLPOOL 940835f38375504cd0d5e0153772fb89212b892187eab63fe70735a08e6b9c73a7fb34e6e009c6cb00e287f29a13930859916cac79402a85bf890b32d9ea125c
 EBUILD cryptsetup-1.6.2.ebuild 4371 SHA256 95d18eada6add203ca239fb02b0e8e889d631e91bf92743e32e00521d7c1699b SHA512 69c3d87f2a624ec18f7850698bc8e0c6fdf95971c9cfb6096b29137c4460789f4be9a01d4c86cb0051be14ce35cd8f0ad64db2580918d89641f97bd11b478847 WHIRLPOOL ea3405559c9af45c0af146d1a7773a36e405edb819d452ff7aeea5843b554a186a001d5c2e9d8030ad26dc07f5418edbcfb6331b9ba3ed8295f013c77f23c9d2
 EBUILD cryptsetup-1.6.5.ebuild 4405 SHA256 f7d8d1bbb9294c12a15fab20b82198fab237802c1772bfda7762f0693f3d03b3 SHA512 63963066e5d1d6c6e4117f41bbea972f8881eac741f54f8b8778f73d528e5c662911f9fa404489ea408c478bb57c9a9158aaca1f36b3edd53c58419d0d6ff333 WHIRLPOOL d2936bfc27fad010cf317fbda0af5fc6bb67969aa92f48449d4d904e27225d7f4f01383bdec5d8ce3d9cf4a45538f978923761b467529769b9c8cac6cd9fb7e8
 EBUILD cryptsetup-1.6.6.ebuild 4444 SHA256 6b7ca2f0022446cf86b8340392514be0a9fb59b61da3ce92b120d51b5fccf0bc SHA512 d5c7bc3c00aac8c80714597487d5557a0ab4a5dcd53dc1ec008612a7b2279038462561e7a8636cc19998add6a81ea67487c0e1fbf9c5e60bb40118d81e4b13ed WHIRLPOOL 155b28f285322fdff84d15a3b5ee7d5a717045b1bb34e645e88b553d1125c7b35e29703e2e7c38ba7d1e91e53669251950224b8de0040ca2d5d175921ba0cb2a
-MISC ChangeLog 27229 SHA256 3849469724bdcebb7017b3bf63c13de1a554352919cea7251fc88895b595b5fc SHA512 593a9dd152f2710b245b7cd6663da1c846893774dd38347e7f95e14834293b2277ce7fff63034f5548ee51976cda1b0f023ffc7ed18b6f92118cbb6f71efe94c WHIRLPOOL 65633663a2e435538a9b16716f788bea326b3a2ee26b69be35be569ecb103f28357dc4e01e54e87c9fcd9c045489176c26fdc5afe36d87e70c15f29a20985e09
+MISC ChangeLog 27714 SHA256 5fc2488d803fd18262cd581ca693f6c5587998d87648152aa20b026340f9e43d SHA512 8893b2ea9de138e55accbd3a4d33c508d0be613f5d247af6fea24196ebbe3202733cf5ab30b73683de0c7fcb14dc0ceb8b8e488aff177c3ff3458690f1bda03c WHIRLPOOL 6becda54af1b5b1ffe81c0d0c33e2552ffe9a2f3a71449f7d0d51524ad672f7f168eeda7c7f7561c051d56940729d45138ffc0953d0f1477773ff221f776cf24
 MISC metadata.xml 763 SHA256 494337a4a156da7feba29856957ffe6babede998bbbe2aa76ad68463f7a3ba4d SHA512 4124c6744a491b4b59115fe561408bde963d7527b835e5c554b3b99b460c6b2a9e98abb294f0e3de5af8625e27efecc7b139b8887b5e8b51af93772bd3574b1a WHIRLPOOL 1b76543228dffe7115e547dc068b6db84b06ff0a5f244c5964eb21cba55c9b6ee9637d4a19c38b4b9ebeba55ac7fe4437e97c4be32f26380fec6773b76ef8fce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT/JrfAAoJEEdUh39IaPFNrO0IAJGWMrHpBKsdhLTh2Dh/5D2U
-ldTFImCwKnbpyD3pEA+2rzMOkSVYhduZcoIdujuuQvZhPQvbLTmanTGFW+pFQZqk
-aM4uiIE0lSUUrYRpw7cvkngkEVHVPlEQK6JYBdC6h7vlmQ0teMfbJqPjMyIt+vX2
-KiuM7nj8pvfggmicJgDMeW1ddyonx7Tw+fM5FJiISMSCs4cHifVBjJzBItEFYJMh
-Vc5xRimn1V9zDJpQug9Xct3EqgujWUaXdTb7AOOIPUbJAvEDBZMenJYVFMJXvTrO
-IkLvtZZaXv3cmqoPK2xi21htfrBrYijfjxap83aoB2611RPZKzosj9BsAoShVTc=
-=pW/7
+iQEcBAEBCAAGBQJT/JyeAAoJEEdUh39IaPFN2cQH/ReMrsJ/r4I0MbSjb1XcvG6L
+rN5fJq8+07QUEZd2OyH1fDmzvVB6NQBE/Rk1FP7eVuXYyh1SzaZCkGdf6Y5u/fzW
+zb/7VtmnxLaDX3o9KdhEPQViQjXfyf2W4H7ujTNMRixS7aRu+aizW6FbJrY4CknO
+GVzW1zQvU/bGwgqHsjJqvtSBgiwBvBH/tyXkJMnCd/8/UI/d94+nWbTVHUNIJHBp
+26OAaWySVnZXcJdOIQxi3s/WcRjlJvLneNORiGh143AFjkSnkivBrnkINRY9AvJZ
+pryq59S9ezBTUOfU9pMumczOzgInHzL8vIz9LCebE/DDUecZJRrNOko/iq7ywsk=
+=cbRI
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/cryptsetup/cryptsetup-1.0.6-r2.ebuild b/sys-fs/cryptsetup/cryptsetup-1.0.6-r2.ebuild
deleted file mode 100644
index 8ca679b0640a..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-1.0.6-r2.ebuild
+++ /dev/null
@@ -1,101 +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/cryptsetup/cryptsetup-1.0.6-r2.ebuild,v 1.18 2014/07/25 19:59:10 ssuominen Exp $
-
-inherit linux-info eutils flag-o-matic multilib
-
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="http://luks.endorphin.org/ http://code.google.com/p/cryptsetup/"
-SRC_URI="http://luks.endorphin.org/source/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="dynamic nls selinux"
-
-RDEPEND=">=sys-fs/lvm2-2.02.45
-	>=dev-libs/libgcrypt-1.1.42
-	>=dev-libs/libgpg-error-1.0-r1
-	>=dev-libs/popt-1.7
-	virtual/libudev
-	|| ( >=sys-libs/e2fsprogs-libs-1.41 <sys-fs/e2fsprogs-1.41 )
-	selinux? ( sys-libs/libselinux )
-	!sys-fs/cryptsetup-luks"
-DEPEND="${RDEPEND}"
-
-dm-crypt_check() {
-	local CONFIG_CHECK="~DM_CRYPT"
-	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
-	check_extra_config
-}
-
-crypto_check() {
-	local CONFIG_CHECK="~CRYPTO"
-	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
-	check_extra_config
-}
-
-cbc_check() {
-	local CONFIG_CHECK="~CRYPTO_CBC"
-	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
-	check_extra_config
-}
-
-pkg_setup() {
-	dm-crypt_check
-	crypto_check
-	cbc_check
-
-	if use dynamic ; then
-		ewarn "If you need cryptsetup for an initrd or initramfs then you"
-		ewarn "should NOT use the dynamic USE flag"
-		epause 5
-	fi
-}
-
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# fix for bug #236481, use udevadm instead of udevsettle
-	epatch "${FILESDIR}"/${PN}-1.0.6-udevsettle.patch
-}
-
-src_compile() {
-	use selinux || export ac_cv_lib_selinux_is_selinux_enabled=no
-	econf \
-		--sbindir=/sbin \
-		$(use_enable !dynamic static) \
-		--libdir=/usr/$(get_libdir) \
-		$(use_enable nls) \
-		|| die
-	emake || die
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "install failed"
-	rmdir "${D}"/usr/$(get_libdir)/cryptsetup
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/1.0.6-r2-dm-crypt-start.sh dm-crypt-start.sh || die
-	newins "${FILESDIR}"/1.0.5-dm-crypt-stop.sh dm-crypt-stop.sh || die
-	newconfd "${FILESDIR}"/1.0.6-dmcrypt.confd dmcrypt || die
-	newinitd "${FILESDIR}"/1.0.5-dmcrypt.rc dmcrypt || die
-}
-
-pkg_postinst() {
-	ewarn "This ebuild introduces a new set of scripts and configuration"
-	ewarn "than the last version. If you are currently using /etc/conf.d/cryptfs"
-	ewarn "then you *MUST* copy your old file to:"
-	ewarn "/etc/conf.d/dmcrypt"
-	ewarn "Or your encrypted partitions will *NOT* work."
-	elog "Please see the example for configuring a LUKS mountpoint"
-	elog "in /etc/conf.d/dmcrypt"
-	elog
-	elog "If you are using baselayout-2 then please do:"
-	elog "rc-update add dmcrypt boot"
-	elog "This version introduces a command line arguement 'key_timeout'."
-	elog "If you want the search for the removable key device to timeout"
-	elog "after 10 seconds add the following to your bootloader config:"
-	elog "key_timeout=10"
-	elog "A timeout of 0 will mean it will wait indefinitely."
-}
diff --git a/sys-fs/cryptsetup/cryptsetup-1.1.3-r3.ebuild b/sys-fs/cryptsetup/cryptsetup-1.1.3-r3.ebuild
deleted file mode 100644
index e71df767a977..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-1.1.3-r3.ebuild
+++ /dev/null
@@ -1,99 +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/cryptsetup/cryptsetup-1.1.3-r3.ebuild,v 1.10 2014/07/25 19:59:09 ssuominen Exp $
-
-EAPI="2"
-
-inherit linux-info eutils multilib libtool
-
-MY_P=${P/_rc/-rc}
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="http://code.google.com/p/cryptsetup/"
-SRC_URI="http://cryptsetup.googlecode.com/files/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="dynamic nls selinux"
-
-S=${WORKDIR}/${MY_P}
-
-RDEPEND=">=sys-fs/lvm2-2.02.64
-	>=dev-libs/libgcrypt-1.1.42:0
-	>=dev-libs/libgpg-error-1.0-r1
-	>=dev-libs/popt-1.7
-	virtual/libudev
-	|| ( >=sys-libs/e2fsprogs-libs-1.41 <sys-fs/e2fsprogs-1.41 )
-	selinux? ( sys-libs/libselinux )
-	!sys-fs/cryptsetup-luks
-	>=sys-apps/util-linux-2.17.2"
-DEPEND="${RDEPEND}
-	!dynamic? (
-		|| ( >=dev-libs/libgpg-error-1.10[static-libs] <dev-libs/libgpg-error-1.10 )
-		|| ( >=dev-libs/popt-1.16-r1[static-libs] <dev-libs/popt-1.16-r1 )
-		dev-libs/libgcrypt:0[static-libs]
-		|| ( >=sys-apps/util-linux-2.20[static-libs] <sys-apps/util-linux-2.20 )
-	)"
-
-pkg_setup() {
-	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC"
-	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
-	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
-	check_extra_config
-
-	if use dynamic ; then
-		ewarn "If you need cryptsetup for an initrd or initramfs then you"
-		ewarn "should NOT use the dynamic USE flag"
-		epause 5
-	fi
-}
-
-src_prepare() {
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--sbindir=/sbin \
-		--enable-shared \
-		$(use_enable !dynamic static) \
-		--libdir=/usr/$(get_libdir) \
-		$(use_enable nls) \
-		$(use_enable selinux)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	dodoc TODO ChangeLog # README NEWS # last ones are empty
-
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/1.1.3-dm-crypt-start.sh dm-crypt-start.sh || die
-	newins "${FILESDIR}"/1.1.3-dm-crypt-stop.sh dm-crypt-stop.sh || die
-	newconfd "${FILESDIR}"/1.0.6-dmcrypt.confd dmcrypt || die
-	newinitd "${FILESDIR}"/1.0.5-dmcrypt.rc dmcrypt || die
-}
-
-pkg_postinst() {
-	ewarn "This ebuild introduces a new set of scripts and configuration"
-	ewarn "than the last version. If you are currently using /etc/conf.d/cryptfs"
-	ewarn "then you *MUST* copy your old file to:"
-	ewarn "/etc/conf.d/dmcrypt"
-	ewarn "Or your encrypted partitions will *NOT* work."
-	elog "Please see the example for configuring a LUKS mountpoint"
-	elog "in /etc/conf.d/dmcrypt"
-	elog
-	elog "If you are using baselayout-2 then please do:"
-	elog "rc-update add dmcrypt boot"
-	elog "This version introduces a command line arguement 'key_timeout'."
-	elog "If you want the search for the removable key device to timeout"
-	elog "after 10 seconds add the following to your bootloader config:"
-	elog "key_timeout=10"
-	elog "A timeout of 0 will mean it will wait indefinitely."
-	elog
-	elog "Users using cryptsetup-1.0.x (dm-crypt plain) volumes must use"
-	elog "a compatibility mode when using cryptsetup-1.1.x. This can be"
-	elog "done by specifying the cipher (-c), key size (-s) and hash (-h)."
-	elog "For more info, see http://code.google.com/p/cryptsetup/wiki/FrequentlyAskedQuestions#6._Issues_with_Specific_Versions_of_cryptsetup"
-
-}
diff --git a/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild
deleted file mode 100644
index 61a42b754798..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild
+++ /dev/null
@@ -1,108 +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/cryptsetup/cryptsetup-1.2.0-r1.ebuild,v 1.15 2014/07/25 19:59:10 ssuominen Exp $
-
-EAPI="2"
-
-inherit linux-info eutils multilib libtool
-
-MY_P=${P/_rc/-rc}
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="http://code.google.com/p/cryptsetup/"
-SRC_URI="http://cryptsetup.googlecode.com/files/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="nls selinux +static"
-
-S=${WORKDIR}/${MY_P}
-
-RDEPEND="
-	!static? (
-		>=dev-libs/libgcrypt-1.1.42:0
-		dev-libs/libgpg-error
-		>=dev-libs/popt-1.7
-		>=sys-apps/util-linux-2.17.2
-		>=sys-fs/lvm2-2.02.64
-	)
-	virtual/libudev
-	>=sys-libs/e2fsprogs-libs-1.41
-	selinux? ( sys-libs/libselinux )
-	!sys-fs/cryptsetup-luks"
-DEPEND="${RDEPEND}
-	static? (
-		>=dev-libs/libgpg-error-1.10[static-libs]
-		>=dev-libs/popt-1.16-r1[static-libs]
-		|| ( >=sys-apps/util-linux-2.20[static-libs] <sys-apps/util-linux-2.20 )
-		dev-libs/libgcrypt:0[static-libs]
-		|| ( >=sys-fs/lvm2-2.02.88[static-libs] <sys-fs/lvm2-2.02.88 )
-		virtual/libudev[static-libs]
-	)"
-
-pkg_setup() {
-	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC"
-	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
-	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
-	check_extra_config
-}
-
-src_prepare() {
-	sed -i '/enable_static_cryptsetup=yes/d' configure #350463
-	sed -i '/^LOOPDEV=/s:=.*:=`losetup -f` || exit 0:' tests/{compat,mode}-test
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--sbindir=/sbin \
-		--enable-shared \
-		--libdir=/usr/$(get_libdir) \
-		$(use_enable static static-cryptsetup) \
-		$(use_enable nls) \
-		$(use_enable selinux)
-}
-
-src_test() {
-	if [[ ! -e /dev/mapper/control ]] ; then
-		ewarn "No /dev/mapper/control found -- skipping tests"
-		return 0
-	fi
-	default
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-	use static && { mv "${D}"/sbin/cryptsetup{.static,} || die ; }
-	dodoc TODO ChangeLog README NEWS
-
-	insinto /$(get_libdir)/rcscripts/addons
-	newins "${FILESDIR}"/1.1.3-dm-crypt-start.sh dm-crypt-start.sh || die
-	newins "${FILESDIR}"/1.1.3-dm-crypt-stop.sh dm-crypt-stop.sh || die
-	newconfd "${FILESDIR}"/1.0.6-dmcrypt.confd dmcrypt || die
-	newinitd "${FILESDIR}"/1.0.5-dmcrypt.rc dmcrypt || die
-}
-
-pkg_postinst() {
-	ewarn "This ebuild introduces a new set of scripts and configuration"
-	ewarn "than the last version. If you are currently using /etc/conf.d/cryptfs"
-	ewarn "then you *MUST* copy your old file to:"
-	ewarn "/etc/conf.d/dmcrypt"
-	ewarn "Or your encrypted partitions will *NOT* work."
-	elog "Please see the example for configuring a LUKS mountpoint"
-	elog "in /etc/conf.d/dmcrypt"
-	elog
-	elog "If you are using baselayout-2 then please do:"
-	elog "rc-update add dmcrypt boot"
-	elog "This version introduces a command line arguement 'key_timeout'."
-	elog "If you want the search for the removable key device to timeout"
-	elog "after 10 seconds add the following to your bootloader config:"
-	elog "key_timeout=10"
-	elog "A timeout of 0 will mean it will wait indefinitely."
-	elog
-	elog "Users using cryptsetup-1.0.x (dm-crypt plain) volumes must use"
-	elog "a compatibility mode when using cryptsetup-1.1.x. This can be"
-	elog "done by specifying the cipher (-c), key size (-s) and hash (-h)."
-	elog "For more info, see http://code.google.com/p/cryptsetup/wiki/FrequentlyAskedQuestions#6._Issues_with_Specific_Versions_of_cryptsetup"
-}
diff --git a/sys-fs/cryptsetup/cryptsetup-1.4.3.ebuild b/sys-fs/cryptsetup/cryptsetup-1.4.3.ebuild
deleted file mode 100644
index 3745b4758660..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-1.4.3.ebuild
+++ /dev/null
@@ -1,105 +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/cryptsetup/cryptsetup-1.4.3.ebuild,v 1.11 2014/07/25 19:59:09 ssuominen Exp $
-
-EAPI="4"
-
-inherit linux-info libtool
-
-MY_P=${P/_rc/-rc}
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="http://code.google.com/p/cryptsetup/"
-SRC_URI="http://cryptsetup.googlecode.com/files/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86"
-IUSE="nls selinux static static-libs udev"
-
-S=${WORKDIR}/${MY_P}
-
-LIB_DEPEND="dev-libs/libgpg-error[static-libs(+)]
-	>=dev-libs/popt-1.7[static-libs(+)]
-	>=sys-apps/util-linux-2.17.2[static-libs(+)]
-	>=dev-libs/libgcrypt-1.1.42:0[static-libs(+)]
-	>=sys-fs/lvm2-2.02.64[static-libs(+)]
-	>=sys-libs/e2fsprogs-libs-1.41[static-libs(+)]
-	udev? ( virtual/libudev[static-libs(+)] )"
-# We have to always depend on ${LIB_DEPEND} rather than put behind
-# static? () because we provide a shared library which links against
-# these other packages. #414665
-RDEPEND="static-libs? ( ${LIB_DEPEND} )
-	${LIB_DEPEND//\[static-libs(+)]}
-	!<sys-apps/baselayout-2
-	!sys-fs/cryptsetup-luks
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-
-pkg_setup() {
-	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC"
-	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
-	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
-	check_extra_config
-}
-
-src_prepare() {
-	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--sbindir=/sbin \
-		--enable-shared \
-		$(use_enable static static-cryptsetup) \
-		$(use_enable static-libs static) \
-		$(use_enable nls) \
-		$(use_enable selinux) \
-		$(use_enable udev)
-}
-
-src_test() {
-	if [[ ! -e /dev/mapper/control ]] ; then
-		ewarn "No /dev/mapper/control found -- skipping tests"
-		return 0
-	fi
-	local p
-	for p in /dev/mapper /dev/loop* ; do
-		addwrite ${p}
-	done
-	default
-}
-
-src_install() {
-	default
-	use static && { mv "${ED}"/sbin/cryptsetup{.static,} || die ; }
-	use static-libs || find "${ED}"/usr -name '*.la' -delete
-
-	newconfd "${FILESDIR}"/1.0.6-dmcrypt.confd dmcrypt
-	newinitd "${FILESDIR}"/dmcrypt.rc dmcrypt
-}
-
-pkg_postinst() {
-	ewarn "This ebuild introduces a new set of scripts and configuration"
-	ewarn "than the last version. If you are currently using /etc/conf.d/cryptfs"
-	ewarn "then you *MUST* copy your old file to:"
-	ewarn "/etc/conf.d/dmcrypt"
-	ewarn "Or your encrypted partitions will *NOT* work."
-	elog "Please see the example for configuring a LUKS mountpoint"
-	elog "in /etc/conf.d/dmcrypt"
-	elog
-	elog "If you are using baselayout-2 then please do:"
-	elog "rc-update add dmcrypt boot"
-	elog "This version introduces a command line arguement 'key_timeout'."
-	elog "If you want the search for the removable key device to timeout"
-	elog "after 10 seconds add the following to your bootloader config:"
-	elog "key_timeout=10"
-	elog "A timeout of 0 will mean it will wait indefinitely."
-	elog
-	elog "Users using cryptsetup-1.0.x (dm-crypt plain) volumes must use"
-	elog "a compatibility mode when using cryptsetup-1.1.x. This can be"
-	elog "done by specifying the cipher (-c), key size (-s) and hash (-h)."
-	elog "For more info, see http://code.google.com/p/cryptsetup/wiki/FrequentlyAskedQuestions#6._Issues_with_Specific_Versions_of_cryptsetup"
-}
diff --git a/sys-fs/cryptsetup/cryptsetup-1.5.1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.5.1.ebuild
deleted file mode 100644
index 6753b566fab1..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-1.5.1.ebuild
+++ /dev/null
@@ -1,114 +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/cryptsetup/cryptsetup-1.5.1.ebuild,v 1.5 2014/07/25 19:59:10 ssuominen Exp $
-
-EAPI="4"
-
-inherit python linux-info libtool
-
-MY_P=${P/_rc/-rc}
-DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
-HOMEPAGE="http://code.google.com/p/cryptsetup/"
-SRC_URI="http://cryptsetup.googlecode.com/files/${MY_P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-IUSE="nls python reencrypt selinux static static-libs udev urandom"
-
-S=${WORKDIR}/${MY_P}
-
-LIB_DEPEND="dev-libs/libgpg-error[static-libs(+)]
-	dev-libs/popt[static-libs(+)]
-	sys-apps/util-linux[static-libs(+)]
-	dev-libs/libgcrypt:0[static-libs(+)]
-	sys-fs/lvm2[static-libs(+)]
-	sys-libs/e2fsprogs-libs[static-libs(+)]
-	udev? ( virtual/libudev[static-libs(+)] )"
-# We have to always depend on ${LIB_DEPEND} rather than put behind
-# static? () because we provide a shared library which links against
-# these other packages. #414665
-RDEPEND="static-libs? ( ${LIB_DEPEND} )
-	${LIB_DEPEND//\[static-libs(+)]}
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-
-pkg_setup() {
-	local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC"
-	local WARNING_DM_CRYPT="CONFIG_DM_CRYPT:\tis not set (required for cryptsetup)\n"
-	local WARNING_CRYPTO_CBC="CONFIG_CRYPTO_CBC:\tis not set (required for kernel 2.6.19)\n"
-	local WARNING_CRYPTO="CONFIG_CRYPTO:\tis not set (required for cryptsetup)\n"
-	check_extra_config
-	if use python ; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
-	elibtoolize
-}
-
-src_configure() {
-	econf \
-		--sbindir=/sbin \
-		--enable-shared \
-		$(use_enable static static-cryptsetup) \
-		$(use_enable static-libs static) \
-		$(use_enable nls) \
-		$(use_enable python) \
-		$(use_enable reencrypt cryptsetup-reencrypt) \
-		$(use_enable selinux) \
-		$(use_enable udev) \
-		$(use_enable !urandom dev-random)
-}
-
-src_test() {
-	if [[ ! -e /dev/mapper/control ]] ; then
-		ewarn "No /dev/mapper/control found -- skipping tests"
-		return 0
-	fi
-	local p
-	for p in /dev/mapper /dev/loop* ; do
-		addwrite ${p}
-	done
-	default
-}
-
-src_install() {
-	default
-	if use static ; then
-		mv "${ED}"/sbin/cryptsetup{.static,} || die
-		mv "${ED}"/sbin/veritysetup{.static,} || die
-		use reencrypt && { mv "${ED}"/sbin/cryptsetup-reencrypt{.static,} || die ; }
-	fi
-	use static-libs || find "${ED}"/usr -name '*.la' -delete
-
-	newconfd "${FILESDIR}"/1.0.6-dmcrypt.confd dmcrypt
-	newinitd "${FILESDIR}"/1.5.1-dmcrypt.rc dmcrypt
-}
-
-pkg_postinst() {
-	ewarn "This ebuild introduces a new set of scripts and configuration"
-	ewarn "than the last version. If you are currently using /etc/conf.d/cryptfs"
-	ewarn "then you *MUST* copy your old file to:"
-	ewarn "/etc/conf.d/dmcrypt"
-	ewarn "Or your encrypted partitions will *NOT* work."
-	elog "Please see the example for configuring a LUKS mountpoint"
-	elog "in /etc/conf.d/dmcrypt"
-	elog
-	elog "If you are using baselayout-2 then please do:"
-	elog "rc-update add dmcrypt boot"
-	elog "This version introduces a command line arguement 'key_timeout'."
-	elog "If you want the search for the removable key device to timeout"
-	elog "after 10 seconds add the following to your bootloader config:"
-	elog "key_timeout=10"
-	elog "A timeout of 0 will mean it will wait indefinitely."
-	elog
-	elog "Users using cryptsetup-1.0.x (dm-crypt plain) volumes must use"
-	elog "a compatibility mode when using cryptsetup-1.1.x. This can be"
-	elog "done by specifying the cipher (-c), key size (-s) and hash (-h)."
-	elog "For more info, see http://code.google.com/p/cryptsetup/wiki/FrequentlyAskedQuestions#6._Issues_with_Specific_Versions_of_cryptsetup"
-}
diff --git a/sys-fs/cryptsetup/files/1.0.5-dm-crypt-stop.sh b/sys-fs/cryptsetup/files/1.0.5-dm-crypt-stop.sh
deleted file mode 100644
index 299e43bb9b2f..000000000000
--- a/sys-fs/cryptsetup/files/1.0.5-dm-crypt-stop.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-# /lib/rcscripts/addons/dm-crypt-stop.sh
-
-# Try to remove any dm-crypt mappings
-csetup=/sbin/cryptsetup
-if [ -f /etc/conf.d/dmcrypt ] && [ -x "$csetup" ]
-then
-	einfo "Removing dm-crypt mappings"
-
-	/bin/egrep "^(target|swap)" /etc/conf.d/dmcrypt | \
-	while read targetline
-	do
-		target=
-		swap=
-
-		eval ${targetline}
-
-		[ -n "${swap}" ] && target=${swap}
-		[ -z "${target}" ] && ewarn "Invalid line in /etc/conf.d/dmcrypt: ${targetline}"
-
-		ebegin "Removing dm-crypt mapping for: ${target}"
-		${csetup} remove ${target}
-		eend $? "Failed to remove dm-crypt mapping for: ${target}"
-	done
-
-	if [[ -n $(/bin/egrep -e "^(source=)./dev/loop*" /etc/conf.d/dmcrypt) ]] ; then
-		einfo "Taking down any dm-crypt loop devices"
-		/bin/egrep -e "^(source)" /etc/conf.d/dmcrypt | while read sourceline
-		do
-			source=
-			eval ${sourceline}
-			if [[ -n $(echo ${source} | grep /dev/loop) ]] ; then
-				ebegin "   Taking down ${source}"
-				/sbin/losetup -d ${source}
-				eend $? "  Failed to remove loop"
-			fi
-		done
-	fi
-fi
-
-# vim:ts=4
diff --git a/sys-fs/cryptsetup/files/1.0.5-dmcrypt.rc b/sys-fs/cryptsetup/files/1.0.5-dmcrypt.rc
deleted file mode 100644
index dd7585b7f65e..000000000000
--- a/sys-fs/cryptsetup/files/1.0.5-dmcrypt.rc
+++ /dev/null
@@ -1,26 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/1.0.5-dmcrypt.rc,v 1.4 2011/01/18 20:05:18 vapier Exp $
-
-depend() {
-	before checkfs fsck
-}
-
-start() {
-	if [ ! -e /lib/librc.so ]; then
-		eerror "The ${myservice} init script is written for baselayout-2"
-		eerror "Please do not use it with baselayout-1"
-		return 1
-	fi
-
-	. /lib/rcscripts/addons/dm-crypt-start.sh
-}
-
-stop() {
-	if [ ! -e /lib/librc.so ]; then
-		return 0
-	fi
-
-	. /lib/rcscripts/addons/dm-crypt-stop.sh
-}
diff --git a/sys-fs/cryptsetup/files/1.0.6-r2-dm-crypt-start.sh b/sys-fs/cryptsetup/files/1.0.6-r2-dm-crypt-start.sh
deleted file mode 100644
index 44d2c4563b18..000000000000
--- a/sys-fs/cryptsetup/files/1.0.6-r2-dm-crypt-start.sh
+++ /dev/null
@@ -1,294 +0,0 @@
-# /lib/rcscripts/addons/dm-crypt-start.sh
-
-# For backwards compatability with baselayout < 1.13.0
-dm_crypt_execute_checkfs() {
-	dm_crypt_execute_dmcrypt
-}
-
-dm_crypt_execute_volumes() {
-	dm_crypt_execute_dmcrypt
-}
-
-# Setup mappings for an individual target/swap
-# Note: This relies on variables localized in the main body below.
-dm_crypt_execute_dmcrypt() {
-	local dev ret mode foo
-	# some colors
-	local red='\x1b[31;01m' green='\x1b[32;01m' off='\x1b[0;0m'
-
-	if [ -n "$target" ]; then
-		# let user set options, otherwise leave empty
-		: ${options:=' '}
-	elif [ -n "$swap" ]; then
-		einfo "Checking swap is not LUKS"
-		cryptsetup isLuks ${source} 2>/dev/null
-		foo="$?"
-		if [ "${foo}" -eq 0 ]; then
-		ewarn "The swap you have defined is a LUKS partition. Aborting crypt-swap setup."
-		return
-		fi
-		target=${swap}
-		# swap contents do not need to be preserved between boots, luks not required.
-		# suspend2 users should have initramfs's init handling their swap partition either way.
-		: ${options:='-c aes -h sha1 -d /dev/urandom'}
-		: ${pre_mount:='mkswap ${dev}'}
-	else
-		return
-	fi
-	if [ -z "$source" ] && [ ! -e "$source" ]; then
-		ewarn "source \"${source}\" for ${target} missing, skipping..."
-		return
-	fi
-
-	if [[ -n ${loop_file} ]] ; then
-		dev="/dev/mapper/${target}"
-		ebegin "  Setting up loop device ${source}"
-		/sbin/losetup ${source} ${loop_file}
-	fi
-
-	# cryptsetup:
-	# luksOpen <device> <name>      # <device> is $source
-	# create   <name>   <device>    # <name>   is $target
-	local arg1="create" arg2="$target" arg3="$source" luks=0
-
-	cryptsetup isLuks ${source} 2>/dev/null && { arg1="luksOpen"; arg2="$source"; arg3="$target"; luks=1; }
-
-	if /sbin/cryptsetup status ${target} | egrep -q '\<active:' ; then
-		einfo "dm-crypt mapping ${target} is already configured"
-		return
-	fi
-	splash svc_input_begin ${SVCNAME} >/dev/null 2>&1
-
-	# Handle keys
-	if [ -n "$key" ]; then
-		read_abort() {
-			local ans
-			local prompt=" ${green}*${off}  $1? (${red}yes${off}/${green}No${off}) "
-			shift
-			echo -n -e "${prompt}"
-			if ! read -n 1 $* ans ; then
-				local back=${prompt//?/\\b}
-				echo -n -e "${back}"
-			else
-				echo
-			fi
-			case $ans in
-				[yY]|[yY][eE][sS]) return 0;;
-				*) return 1;;
-			esac
-		}
-
-		# Notes: sed not used to avoid case where /usr partition is encrypted.
-		mode=${key/*:/} && ( [ "$mode" == "$key" ] || [ -z "$mode" ] ) && mode=reg
-		key=${key/:*/}
-		case "$mode" in
-		gpg|reg)
-			# handle key on removable device
-			if [ -n "$remdev" ]; then
-				# temp directory to mount removable device
-				local mntrem="${RC_SVCDIR}/dm-crypt-remdev.$$"
-				if [ ! -d "${mntrem}" ] ; then
-					if ! mkdir -p "${mntrem}" ; then
-						ewarn "${source} will not be decrypted ..."
-						einfo "Reason: Unable to create temporary mount point '${mntrem}'"
-						return
-					fi
-				fi
-				i=0
-				einfo "Please insert removable device for ${target}"
-				while [ ${i} -lt ${dmcrypt_max_timeout:-120} ] ; do
-					foo=""
-					if mount -n -o ro "${remdev}" "${mntrem}" 2>/dev/null >/dev/null ; then
-						# keyfile exists?
-						if [ ! -e "${mntrem}${key}" ]; then
-							umount -n "${mntrem}"
-							rmdir "${mntrem}"
-							einfo "Cannot find ${key} on removable media."
-							read_abort "Abort" ${read_timeout:--t 1} && return
-						else
-							key="${mntrem}${key}"
-							break
-						fi
-					else
-						[ -e "${remdev}" ] \
-							&& foo="mount failed" \
-							|| foo="mount source not found"
-					fi
-					((++i))
-					read_abort "Stop waiting after $i attempts (${foo})" -t 1 && return
-				done
-			else    # keyfile ! on removable device
-				if [ ! -e "$key" ]; then
-					ewarn "${source} will not be decrypted ..."
-					einfo "Reason: keyfile ${key} does not exist."
-					return
-				fi
-			fi
-			;;
-		*)
-			ewarn "${source} will not be decrypted ..."
-			einfo "Reason: mode ${mode} is invalid."
-			return
-			;;
-		esac
-	else
-		mode=none
-	fi
-	ebegin "dm-crypt map ${target}"
-	einfo "cryptsetup will be called with : ${options} ${arg1} ${arg2} ${arg3}"
-	if [ "$mode" == "gpg" ]; then
-		: ${gpg_options:='-q -d'}
-		# gpg available ?
-		if type -p gpg >/dev/null ; then
-			for (( i = 0 ; i < 3 ; i++ ))
-			do
-				# paranoid, don't store key in a variable, pipe it so it stays very little in ram unprotected.
-				# save stdin stdout stderr "values"
-				gpg ${gpg_options} ${key} 2>/dev/null | cryptsetup ${options} ${arg1} ${arg2} ${arg3}
-				ret="$?"
-				[ "$ret" -eq 0 ] && break
-			done
-			eend "${ret}" "failure running cryptsetup"
-		else
-			ewarn "${source} will not be decrypted ..."
-			einfo "Reason: cannot find gpg application."
-			einfo "You have to install app-crypt/gnupg first."
-			einfo "If you have /usr on its own partition, try copying gpg to /bin ."
-		fi
-	else
-		if [ "$mode" == "reg" ]; then
-			cryptsetup ${options} -d ${key} ${arg1} ${arg2} ${arg3}
-			ret="$?"
-			eend "${ret}" "failure running cryptsetup"
-		else
-			cryptsetup ${options} ${arg1} ${arg2} ${arg3}
-			ret="$?"
-			eend "${ret}" "failure running cryptsetup"
-		fi
-	fi
-	if [ -d "$mntrem" ]; then
-		umount -n ${mntrem} 2>/dev/null >/dev/null
-		rmdir ${mntrem} 2>/dev/null >/dev/null
-	fi
-	splash svc_input_end ${SVCNAME} >/dev/null 2>&1
-
-	if [[ ${ret} != 0 ]] ; then
-		cryptfs_status=1
-	else
-		if [[ -n ${pre_mount} ]] ; then
-			dev="/dev/mapper/${target}"
-			ebegin "  Running pre_mount commands for ${target}"
-			eval "${pre_mount}" > /dev/null
-			ewend $? || cryptfs_status=1
-		fi
-	fi
-}
-
-# Run any post_mount commands for an individual mount
-#
-# Note: This relies on variables localized in the main body below.
-dm_crypt_execute_localmount() {
-	local mount_point
-
-	[ -z "$target" ] && [ -z "$post_mount" ] && return
-
-	if ! /sbin/cryptsetup status ${target} | egrep -q '\<active:' ; then
-		ewarn "Skipping unmapped target ${target}"
-		cryptfs_status=1
-		return
-	fi
-
-	mount_point=$(grep "/dev/mapper/${target}" /proc/mounts | cut -d' ' -f2)
-	if [[ -z ${mount_point} ]] ; then
-		ewarn "Failed to find mount point for ${target}, skipping"
-		cryptfs_status=1
-	fi
-
-	if [[ -n ${post_mount} ]] ; then
-		ebegin "Running post_mount commands for target ${target}"
-		eval "${post_mount}" >/dev/null
-		eend $? || cryptfs_status=1
-	fi
-}
-
-# Determine string lengths
-strlen() {
-	if [ -z "$1" ]
-		then
-			echo "usage: strlen <variable_name>"
-			die
-		fi
-	eval echo "\${#${1}}"
-}
-
-# Lookup optional bootparams
-parse_opt() {
-	case "$1" in
-		*\=*)
-			local key_name="`echo "$1" | cut -f1 -d=`"
-			local key_len=`strlen key_name`
-			local value_start=$((key_len+2))
-			echo "$1" | cut -c ${value_start}-
-		;;
-	esac
-}
-
-local cryptfs_status=0
-local gpg_options key loop_file target targetline options pre_mount post_mount source swap remdev
-
-CMDLINE="`cat /proc/cmdline`"
-for x in ${CMDLINE}
-do
-	case "${x}" in
-		key_timeout\=*)
-			KEY_TIMEOUT=`parse_opt "${x}"`
-			if [ ${KEY_TIMEOUT} -gt 0 ]; then
-				read_timeout="-t ${KEY_TIMEOUT}"
-			fi
-		;;
-	esac
-done
-
-if [[ -f /etc/conf.d/dmcrypt ]] && [[ -x /sbin/cryptsetup ]] ; then
-	ebegin "Setting up dm-crypt mappings"
-
-	# Fix for baselayout-1.12.10 (bug 174256)
-	[ -z ${SVCNAME} ] && SVCNAME="${myservice}"
-
-	while read -u 3 targetline ; do
-		# skip comments and blank lines
-		[[ ${targetline}\# == \#* ]] && continue
-
-		# check for the start of a new target/swap
-		case ${targetline} in
-			target=*|swap=*)
-				# If we have a target queued up, then execute it
-				dm_crypt_execute_${SVCNAME}
-
-				# Prepare for the next target/swap by resetting variables
-				unset gpg_options key loop_file target options pre_mount post_mount source swap remdev
-				;;
-
-			gpg_options=*|remdev=*|key=*|loop_file=*|options=*|pre_mount=*|post_mount=*|source=*)
-				if [[ -z ${target} && -z ${swap} ]] ; then
-					ewarn "Ignoring setting outside target/swap section: ${targetline}"
-					continue
-				fi
-				;;
-
-			*)
-				ewarn "Skipping invalid line in /etc/conf.d/dmcrypt: ${targetline}"
-				;;
-		esac
-
-		# Queue this setting for the next call to dm_crypt_execute_${SVCNAME}
-		eval "${targetline}"
-	done 3< /etc/conf.d/dmcrypt
-
-	# If we have a target queued up, then execute it
-	dm_crypt_execute_${SVCNAME}
-
-	ewend ${cryptfs_status} "Failed to setup dm-crypt devices"
-fi
-
-# vim:ts=4
diff --git a/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh b/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh
deleted file mode 100644
index e56dbc97815d..000000000000
--- a/sys-fs/cryptsetup/files/1.1.3-dm-crypt-start.sh
+++ /dev/null
@@ -1,309 +0,0 @@
-# /lib/rcscripts/addons/dm-crypt-start.sh
-
-# For backwards compatibility with baselayout < 1.13.0 #174256
-: ${SVCNAME:=${myservice}}
-
-# We might be hooked into init.d scripts (ala baselayout-1), or we might
-# be a standalone dmcrypt script.  We support multiple dmcrypt instances,
-# but they must start with "dmcrypt." to be detected that way.  It keeps
-# our lives much simpler with this multiplexed arrangement.
-execute_hook="dm_crypt_execute_dmcrypt"
-conf_file="dmcrypt"
-case ${SVCNAME} in
-	localmount) execute_hook="dm_crypt_execute_localmount" ;;
-	dmcrypt.*)  conf_file="${SVCNAME}" ;;
-esac
-conf_file="/etc/conf.d/${conf_file}"
-
-# Setup mappings for an individual target/swap
-# Note: This relies on variables localized in the main body below.
-dm_crypt_execute_dmcrypt() {
-	local dev ret mode foo
-	# some colors
-	local red='\x1b[31;01m' green='\x1b[32;01m' off='\x1b[0;0m'
-
-	if [ -n "$target" ]; then
-		# let user set options, otherwise leave empty
-		: ${options:=' '}
-	elif [ -n "$swap" ]; then
-		einfo "Checking swap is not LUKS"
-		cryptsetup isLuks ${source} 2>/dev/null
-		foo="$?"
-		if [ "${foo}" -eq 0 ]; then
-		ewarn "The swap you have defined is a LUKS partition. Aborting crypt-swap setup."
-		return
-		fi
-		target=${swap}
-		# swap contents do not need to be preserved between boots, luks not required.
-		# suspend2 users should have initramfs's init handling their swap partition either way.
-		: ${options:='-c aes -h sha1 -d /dev/urandom'}
-		: ${pre_mount:='mkswap ${dev}'}
-	else
-		return
-	fi
-	if [ -z "$source" ] && [ ! -e "$source" ]; then
-		ewarn "source \"${source}\" for ${target} missing, skipping..."
-		return
-	fi
-
-	if [[ -n ${loop_file} ]] ; then
-		dev="/dev/mapper/${target}"
-		ebegin "  Setting up loop device ${source}"
-		/sbin/losetup ${source} ${loop_file}
-	fi
-
-	# cryptsetup:
-	# luksOpen <device> <name>      # <device> is $source
-	# create   <name>   <device>    # <name>   is $target
-	local arg1="create" arg2="$target" arg3="$source" luks=0
-
-	cryptsetup isLuks ${source} 2>/dev/null && { arg1="luksOpen"; arg2="$source"; arg3="$target"; luks=1; }
-
-	# Older versions reported:
-	#	${target} is active:
-	# Newer versions report:
-	#	${target} is active[ and is in use.]
-	if cryptsetup status ${target} | egrep -q ' is active' ; then
-		einfo "dm-crypt mapping ${target} is already configured"
-		return
-	fi
-	splash svc_input_begin ${SVCNAME} >/dev/null 2>&1
-
-	# Handle keys
-	if [ -n "$key" ]; then
-		read_abort() {
-			local ans
-			local prompt=" ${green}*${off}  $1? (${red}yes${off}/${green}No${off}) "
-			shift
-			echo -n -e "${prompt}"
-			if ! read -n 1 $* ans ; then
-				local back=${prompt//?/\\b}
-				echo -n -e "${back}"
-			else
-				echo
-			fi
-			case $ans in
-				[yY]|[yY][eE][sS]) return 0;;
-				*) return 1;;
-			esac
-		}
-
-		# Notes: sed not used to avoid case where /usr partition is encrypted.
-		mode=${key/*:/} && ( [ "$mode" == "$key" ] || [ -z "$mode" ] ) && mode=reg
-		key=${key/:*/}
-		case "$mode" in
-		gpg|reg)
-			# handle key on removable device
-			if [ -n "$remdev" ]; then
-				# temp directory to mount removable device
-				local mntrem="${RC_SVCDIR}/dm-crypt-remdev.$$"
-				if [ ! -d "${mntrem}" ] ; then
-					if ! mkdir -p "${mntrem}" ; then
-						ewarn "${source} will not be decrypted ..."
-						einfo "Reason: Unable to create temporary mount point '${mntrem}'"
-						return
-					fi
-				fi
-				i=0
-				einfo "Please insert removable device for ${target}"
-				while [ ${i} -lt ${dmcrypt_max_timeout:-120} ] ; do
-					foo=""
-					if mount -n -o ro "${remdev}" "${mntrem}" 2>/dev/null >/dev/null ; then
-						# keyfile exists?
-						if [ ! -e "${mntrem}${key}" ]; then
-							umount -n "${mntrem}"
-							rmdir "${mntrem}"
-							einfo "Cannot find ${key} on removable media."
-							read_abort "Abort" ${read_timeout:--t 1} && return
-						else
-							key="${mntrem}${key}"
-							break
-						fi
-					else
-						[ -e "${remdev}" ] \
-							&& foo="mount failed" \
-							|| foo="mount source not found"
-					fi
-					((++i))
-					read_abort "Stop waiting after $i attempts (${foo})" -t 1 && return
-				done
-			else    # keyfile ! on removable device
-				if [ ! -e "$key" ]; then
-					ewarn "${source} will not be decrypted ..."
-					einfo "Reason: keyfile ${key} does not exist."
-					return
-				fi
-			fi
-			;;
-		*)
-			ewarn "${source} will not be decrypted ..."
-			einfo "Reason: mode ${mode} is invalid."
-			return
-			;;
-		esac
-	else
-		mode=none
-	fi
-	ebegin "dm-crypt map ${target}"
-	einfo "cryptsetup will be called with : ${options} ${arg1} ${arg2} ${arg3}"
-	if [ "$mode" == "gpg" ]; then
-		: ${gpg_options:='-q -d'}
-		# gpg available ?
-		if type -p gpg >/dev/null ; then
-			for (( i = 0 ; i < 3 ; i++ ))
-			do
-				# paranoid, don't store key in a variable, pipe it so it stays very little in ram unprotected.
-				# save stdin stdout stderr "values"
-				gpg ${gpg_options} ${key} 2>/dev/null | cryptsetup ${options} ${arg1} ${arg2} ${arg3}
-				ret="$?"
-				[ "$ret" -eq 0 ] && break
-			done
-			eend "${ret}" "failure running cryptsetup"
-		else
-			ewarn "${source} will not be decrypted ..."
-			einfo "Reason: cannot find gpg application."
-			einfo "You have to install app-crypt/gnupg first."
-			einfo "If you have /usr on its own partition, try copying gpg to /bin ."
-		fi
-	else
-		if [ "$mode" == "reg" ]; then
-			cryptsetup ${options} -d ${key} ${arg1} ${arg2} ${arg3}
-			ret="$?"
-			eend "${ret}" "failure running cryptsetup"
-		else
-			cryptsetup ${options} ${arg1} ${arg2} ${arg3}
-			ret="$?"
-			eend "${ret}" "failure running cryptsetup"
-		fi
-	fi
-	if [ -d "$mntrem" ]; then
-		umount -n ${mntrem} 2>/dev/null >/dev/null
-		rmdir ${mntrem} 2>/dev/null >/dev/null
-	fi
-	splash svc_input_end ${SVCNAME} >/dev/null 2>&1
-
-	if [[ ${ret} != 0 ]] ; then
-		cryptfs_status=1
-	else
-		if [[ -n ${pre_mount} ]] ; then
-			dev="/dev/mapper/${target}"
-			ebegin "  Running pre_mount commands for ${target}"
-			eval "${pre_mount}" > /dev/null
-			ewend $? || cryptfs_status=1
-		fi
-	fi
-}
-
-# Run any post_mount commands for an individual mount
-#
-# Note: This relies on variables localized in the main body below.
-dm_crypt_execute_localmount() {
-	local mount_point
-
-	[ -z "$target" ] && [ -z "$post_mount" ] && return
-
-	if ! /sbin/cryptsetup status ${target} | egrep -q '\<active:' ; then
-		ewarn "Skipping unmapped target ${target}"
-		cryptfs_status=1
-		return
-	fi
-
-	mount_point=$(grep "/dev/mapper/${target}" /proc/mounts | cut -d' ' -f2)
-	if [[ -z ${mount_point} ]] ; then
-		ewarn "Failed to find mount point for ${target}, skipping"
-		cryptfs_status=1
-	fi
-
-	if [[ -n ${post_mount} ]] ; then
-		ebegin "Running post_mount commands for target ${target}"
-		eval "${post_mount}" >/dev/null
-		eend $? || cryptfs_status=1
-	fi
-}
-
-# Determine string lengths
-strlen() {
-	if [ -z "$1" ]
-		then
-			echo "usage: strlen <variable_name>"
-			die
-		fi
-	eval echo "\${#${1}}"
-}
-
-# Lookup optional bootparams
-parse_opt() {
-	case "$1" in
-		*\=*)
-			local key_name="`echo "$1" | cut -f1 -d=`"
-			local key_len=`strlen key_name`
-			local value_start=$((key_len+2))
-			echo "$1" | cut -c ${value_start}-
-		;;
-	esac
-}
-
-local cryptfs_status=0
-local gpg_options key loop_file target targetline options pre_mount post_mount source swap remdev
-
-CMDLINE="`cat /proc/cmdline`"
-for x in ${CMDLINE}
-do
-	case "${x}" in
-		key_timeout\=*)
-			KEY_TIMEOUT=`parse_opt "${x}"`
-			if [ ${KEY_TIMEOUT} -gt 0 ]; then
-				read_timeout="-t ${KEY_TIMEOUT}"
-			fi
-		;;
-	esac
-done
-
-if [[ -f ${conf_file} ]] && [[ -x /sbin/cryptsetup ]] ; then
-	ebegin "Setting up dm-crypt mappings"
-
-	while read -u 3 targetline ; do
-		# skip comments and blank lines
-		[[ ${targetline}\# == \#* ]] && continue
-
-		# skip service-specific openrc configs #377927
-		[[ ${targetline} == rc_* ]] && continue
-
-		# check for the start of a new target/swap
-		case ${targetline} in
-			target=*|swap=*)
-				# If we have a target queued up, then execute it
-				${execute_hook}
-
-				# Prepare for the next target/swap by resetting variables
-				unset gpg_options key loop_file target options pre_mount post_mount source swap remdev
-				;;
-
-			gpg_options=*|remdev=*|key=*|loop_file=*|options=*|pre_mount=*|post_mount=*|source=*)
-				if [[ -z ${target} && -z ${swap} ]] ; then
-					ewarn "Ignoring setting outside target/swap section: ${targetline}"
-					continue
-				fi
-				;;
-
-			dmcrypt_max_timeout=*)
-				# ignore global options
-				continue
-				;;
-
-			*)
-				ewarn "Skipping invalid line in ${conf_file}: ${targetline}"
-				;;
-		esac
-
-		# Queue this setting for the next call to dm_crypt_execute_xxx
-		eval "${targetline}"
-	done 3< ${conf_file}
-
-	# If we have a target queued up, then execute it
-	${execute_hook}
-
-	ewend ${cryptfs_status} "Failed to setup dm-crypt devices"
-fi
-
-# vim:ts=4
diff --git a/sys-fs/cryptsetup/files/1.1.3-dm-crypt-stop.sh b/sys-fs/cryptsetup/files/1.1.3-dm-crypt-stop.sh
deleted file mode 100644
index 548269c0ae3b..000000000000
--- a/sys-fs/cryptsetup/files/1.1.3-dm-crypt-stop.sh
+++ /dev/null
@@ -1,51 +0,0 @@
-# /lib/rcscripts/addons/dm-crypt-stop.sh
-
-# For backwards compatibility with baselayout < 1.13.0 #174256
-: ${SVCNAME:=${myservice}}
-
-# See notes in dm-crypt-start.sh
-execute_hook="dm_crypt_execute_dmcrypt"
-conf_file="dmcrypt"
-case ${SVCNAME} in
-	dmcrypt.*)  conf_file="${SVCNAME}" ;;
-esac
-conf_file="/etc/conf.d/${conf_file}"
-
-# Try to remove any dm-crypt mappings
-csetup=/sbin/cryptsetup
-if [ -f ${conf_file} ] && [ -x "$csetup" ]
-then
-	einfo "Removing dm-crypt mappings"
-
-	/bin/egrep "^(target|swap)" ${conf_file} | \
-	while read targetline
-	do
-		target=
-		swap=
-
-		eval ${targetline}
-
-		[ -n "${swap}" ] && target=${swap}
-		[ -z "${target}" ] && ewarn "Invalid line in ${conf_file}: ${targetline}"
-
-		ebegin "Removing dm-crypt mapping for: ${target}"
-		${csetup} remove ${target}
-		eend $? "Failed to remove dm-crypt mapping for: ${target}"
-	done
-
-	if [[ -n $(/bin/egrep -e "^(source=)./dev/loop*" ${conf_file}) ]] ; then
-		einfo "Taking down any dm-crypt loop devices"
-		/bin/egrep -e "^(source)" ${conf_file} | while read sourceline
-		do
-			source=
-			eval ${sourceline}
-			if [[ -n $(echo ${source} | grep /dev/loop) ]] ; then
-				ebegin "   Taking down ${source}"
-				/sbin/losetup -d ${source}
-				eend $? "  Failed to remove loop"
-			fi
-		done
-	fi
-fi
-
-# vim:ts=4
diff --git a/sys-fs/cryptsetup/files/cryptsetup-1.0.6-udevsettle.patch b/sys-fs/cryptsetup/files/cryptsetup-1.0.6-udevsettle.patch
deleted file mode 100644
index 6860a7c4c34c..000000000000
--- a/sys-fs/cryptsetup/files/cryptsetup-1.0.6-udevsettle.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-2008-09-13  Doug Goldstein  <cardoe@gentoo.org>
-	* switch to udevadm settle since udevsettle has been deprecated
-	  and finally removed with udev 126.
-
---- cryptsetup-1.0.6/lib/libdevmapper.c
-+++ cryptsetup-1.0.6/lib/libdevmapper.c
-@@ -18,11 +18,11 @@
- 
- #define	CRYPT_TARGET	"crypt"
- 
--#define UDEVSETTLE	"/sbin/udevsettle"
-+#define UDEVSETTLE	"/sbin/udevadm settle"
- 
--static void run_udevsettle(void)
-+static int run_udevsettle(void)
- {
--	system(UDEVSETTLE);
-+	return system(UDEVSETTLE);
- }
- 
- static void set_dm_error(int level, const char *file, int line,
diff --git a/sys-fs/cryptsetup/files/1.0.6-dmcrypt.confd b/sys-fs/cryptsetup/files/dmcrypt-1.0.6.confd
index 35a1fd2cb3d0..35a1fd2cb3d0 100644
--- a/sys-fs/cryptsetup/files/1.0.6-dmcrypt.confd
+++ b/sys-fs/cryptsetup/files/dmcrypt-1.0.6.confd
diff --git a/sys-fs/cryptsetup/files/dmcrypt.rc b/sys-fs/cryptsetup/files/dmcrypt.rc
deleted file mode 100755
index 130036b9202f..000000000000
--- a/sys-fs/cryptsetup/files/dmcrypt.rc
+++ /dev/null
@@ -1,346 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/dmcrypt.rc,v 1.4 2012/05/11 08:33:01 vapier Exp $
-
-depend() {
-	before checkfs fsck
-}
-
-# We support multiple dmcrypt instances based on $SVCNAME
-execute_hook="dm_crypt_execute_dmcrypt"
-# XXX: Should we drop this ?
-# execute_hook="dm_crypt_execute_localmount"
-conf_file="/etc/conf.d/${SVCNAME}"
-
-# Get splash helpers if available.
-if [ -e /sbin/splash-functions.sh ] ; then
-	. /sbin/splash-functions.sh
-fi
-
-# Setup mappings for an individual target/swap
-# Note: This relies on variables localized in the main body below.
-dm_crypt_execute_dmcrypt() {
-	local dev ret mode foo
-
-	if [ -n "${target}" ] ; then
-		# let user set options, otherwise leave empty
-		: ${options:=' '}
-	elif [ -n "${swap}" ] ; then
-		if cryptsetup isLuks ${source} 2>/dev/null ; then
-			ewarn "The swap you have defined is a LUKS partition. Aborting crypt-swap setup."
-			return
-		fi
-		target=${swap}
-		# swap contents do not need to be preserved between boots, luks not required.
-		# suspend2 users should have initramfs's init handling their swap partition either way.
-		: ${options:='-c aes -h sha1 -d /dev/urandom'}
-		: ${pre_mount:='mkswap ${dev}'}
-	else
-		return
-	fi
-	if [ -z "${source}" ] && [ ! -e "${source}" ] ; then
-		ewarn "source \"${source}\" for ${target} missing, skipping..."
-		return
-	fi
-
-	if [ -n "${loop_file}" ] ; then
-		dev="/dev/mapper/${target}"
-		ebegin "  Setting up loop device ${source}"
-		losetup ${source} ${loop_file}
-	fi
-
-	# cryptsetup:
-	# luksOpen <device> <name>      # <device> is $source
-	# create   <name>   <device>    # <name>   is $target
-	local arg1="create" arg2="${target}" arg3="${source}" luks=0
-
-	cryptsetup isLuks ${source} 2>/dev/null && { arg1="luksOpen"; arg2="${source}"; arg3="${target}"; luks=1; }
-
-	# Older versions reported:
-	#	${target} is active:
-	# Newer versions report:
-	#	${target} is active[ and is in use.]
-	if cryptsetup status ${target} | egrep -q ' is active' ; then
-		einfo "dm-crypt mapping ${target} is already configured"
-		return
-	fi
-	splash svc_input_begin ${SVCNAME} >/dev/null 2>&1
-
-	# Handle keys
-	if [ -n "${key}" ] ; then
-		read_abort() {
-			# some colors
-			local ans savetty resettty
-			[ -z "${NORMAL}" ] && eval $(eval_ecolors)
-			einfon "  $1? (${WARN}yes${NORMAL}/${GOOD}No${NORMAL}) "
-			shift
-			# This is ugly as s**t.  But POSIX doesn't provide `read -t`, so
-			# we end up having to implement our own crap with stty/etc...
-			savetty=$(stty -g)
-			resettty='stty ${savetty}; trap - EXIT HUP INT TERM'
-			trap 'eval "${resettty}"' EXIT HUP INT TERM
-			stty -icanon
-			[ "${1}" = -t ] && stty min 0 time "$(( $2 * 10 ))"
-			ans=$(dd count=1 bs=1 2>/dev/null) || ans=''
-			eval "${resettty}"
-			if [ -z "${ans}" ] ; then
-				printf '\r'
-			else
-				echo
-			fi
-			case ${ans} in
-				[yY]) return 0;;
-				*) return 1;;
-			esac
-		}
-
-		# Notes: sed not used to avoid case where /usr partition is encrypted.
-		mode=${key/*:/} && ( [ "${mode}" = "${key}" ] || [ -z "${mode}" ] ) && mode=reg
-		key=${key/:*/}
-		case "${mode}" in
-		gpg|reg)
-			# handle key on removable device
-			if [ -n "${remdev}" ] ; then
-				# temp directory to mount removable device
-				local mntrem="${RC_SVCDIR}/dm-crypt-remdev.$$"
-				if [ ! -d "${mntrem}" ] ; then
-					if ! mkdir -p "${mntrem}" ; then
-						ewarn "${source} will not be decrypted ..."
-						einfo "Reason: Unable to create temporary mount point '${mntrem}'"
-						return
-					fi
-				fi
-				i=0
-				einfo "Please insert removable device for ${target}"
-				while [ ${i} -lt ${dmcrypt_max_timeout:-120} ] ; do
-					foo=""
-					if mount -n -o ro "${remdev}" "${mntrem}" 2>/dev/null >/dev/null ; then
-						# keyfile exists?
-						if [ ! -e "${mntrem}${key}" ] ; then
-							umount -n "${mntrem}"
-							rmdir "${mntrem}"
-							einfo "Cannot find ${key} on removable media."
-							read_abort "Abort" ${read_timeout:--t 1} && return
-						else
-							key="${mntrem}${key}"
-							break
-						fi
-					else
-						[ -e "${remdev}" ] \
-							&& foo="mount failed" \
-							|| foo="mount source not found"
-					fi
-					: $((i += 1))
-					read_abort "Stop waiting after $i attempts (${foo})" -t 1 && return
-				done
-			else    # keyfile ! on removable device
-				if [ ! -e "${key}" ] ; then
-					ewarn "${source} will not be decrypted ..."
-					einfo "Reason: keyfile ${key} does not exist."
-					return
-				fi
-			fi
-			;;
-		*)
-			ewarn "${source} will not be decrypted ..."
-			einfo "Reason: mode ${mode} is invalid."
-			return
-			;;
-		esac
-	else
-		mode=none
-	fi
-	ebegin "  ${target} using: ${options} ${arg1} ${arg2} ${arg3}"
-	if [ "${mode}" = "gpg" ] ; then
-		: ${gpg_options:='-q -d'}
-		# gpg available ?
-		if type -p gpg >/dev/null ; then
-			for i in 0 1 2 ; do
-				# paranoid, don't store key in a variable, pipe it so it stays very little in ram unprotected.
-				# save stdin stdout stderr "values"
-				gpg ${gpg_options} ${key} 2>/dev/null | cryptsetup ${options} ${arg1} ${arg2} ${arg3}
-				ret=$?
-				[ ${ret} -eq 0 ] && break
-			done
-			eend ${ret} "failure running cryptsetup"
-		else
-			ewarn "${source} will not be decrypted ..."
-			einfo "Reason: cannot find gpg application."
-			einfo "You have to install app-crypt/gnupg first."
-			einfo "If you have /usr on its own partition, try copying gpg to /bin ."
-		fi
-	else
-		if [ "${mode}" = "reg" ] ; then
-			cryptsetup ${options} -d ${key} ${arg1} ${arg2} ${arg3}
-			ret=$?
-			eend ${ret} "failure running cryptsetup"
-		else
-			cryptsetup ${options} ${arg1} ${arg2} ${arg3}
-			ret=$?
-			eend ${ret} "failure running cryptsetup"
-		fi
-	fi
-	if [ -d "${mntrem}" ] ; then
-		umount -n ${mntrem} 2>/dev/null >/dev/null
-		rmdir ${mntrem} 2>/dev/null >/dev/null
-	fi
-	splash svc_input_end ${SVCNAME} >/dev/null 2>&1
-
-	if [ ${ret} -ne 0 ] ; then
-		cryptfs_status=1
-	else
-		if [ -n "${pre_mount}" ] ; then
-			dev="/dev/mapper/${target}"
-			ebegin "    pre_mount: ${pre_mount}"
-			eval "${pre_mount}" > /dev/null
-			ewend $? || cryptfs_status=1
-		fi
-	fi
-}
-
-# Run any post_mount commands for an individual mount
-#
-# Note: This relies on variables localized in the main body below.
-dm_crypt_execute_localmount() {
-	local mount_point
-
-	[ -z "${target}" ] && [ -z "${post_mount}" ] && return
-
-	if ! cryptsetup status ${target} | egrep -q '\<active:' ; then
-		ewarn "Skipping unmapped target ${target}"
-		cryptfs_status=1
-		return
-	fi
-
-	mount_point=$(grep "/dev/mapper/${target}" /proc/mounts | cut -d' ' -f2)
-	if [ -z "${mount_point}" ] ; then
-		ewarn "Failed to find mount point for ${target}, skipping"
-		cryptfs_status=1
-	fi
-
-	if [ -n "${post_mount}" ] ; then
-		ebegin "Running post_mount commands for target ${target}"
-		eval "${post_mount}" >/dev/null
-		eend $? || cryptfs_status=1
-	fi
-}
-
-# Lookup optional bootparams
-get_bootparam_val() {
-	# We're given something like:
-	#    foo=bar=cow
-	# Return the "bar=cow" part.
-	case $1 in
-	*\=*)
-		local key=$(echo "$1" | cut -f1 -d=)
-		echo "$1" | cut -c $(( ${#key} + 2 ))
-		;;
-	esac
-}
-
-start() {
-	local header=true cryptfs_status=0
-	local gpg_options key loop_file target targetline options pre_mount post_mount source swap remdev
-
-	local x
-	for x in $(cat /proc/cmdline) ; do
-		case "${x}" in
-		key_timeout\=*)
-			local KEY_TIMEOUT=$(get_bootparam_val "${x}")
-			if [ ${KEY_TIMEOUT} -gt 0 ] ; then
-				read_timeout="-t ${KEY_TIMEOUT}"
-			fi
-		;;
-		esac
-	done
-
-	while read -u 3 targetline ; do
-		case ${targetline} in
-		# skip comments and blank lines
-		""|"#"*) continue ;;
-		# skip service-specific openrc configs #377927
-		rc_*) continue ;;
-		esac
-
-		${header} && ebegin "Setting up dm-crypt mappings"
-		header=false
-
-		# check for the start of a new target/swap
-		case ${targetline} in
-		target=*|swap=*)
-			# If we have a target queued up, then execute it
-			${execute_hook}
-
-			# Prepare for the next target/swap by resetting variables
-			unset gpg_options key loop_file target options pre_mount post_mount source swap remdev
-			;;
-
-		gpg_options=*|remdev=*|key=*|loop_file=*|options=*|pre_mount=*|post_mount=*|source=*)
-			if [ -z "${target}${swap}" ] ; then
-				ewarn "Ignoring setting outside target/swap section: ${targetline}"
-				continue
-			fi
-			;;
-
-		dmcrypt_max_timeout=*)
-			# ignore global options
-			continue
-			;;
-
-		*)
-			ewarn "Skipping invalid line in ${conf_file}: ${targetline}"
-			;;
-		esac
-
-		# Queue this setting for the next call to dm_crypt_execute_xxx
-		eval "${targetline}"
-	done 3< ${conf_file}
-
-	# If we have a target queued up, then execute it
-	${execute_hook}
-
-	ewend ${cryptfs_status} "Failed to setup dm-crypt devices"
-}
-
-stop() {
-	local line header
-
-	# Break down all mappings
-	header=true
-	egrep "^(target|swap)=" ${conf_file} | \
-	while read line ; do
-		${header} && einfo "Removing dm-crypt mappings"
-		header=false
-
-		target= swap=
-		eval ${line}
-
-		[ -n "${swap}" ] && target=${swap}
-		if [ -z "${target}" ] ; then
-			ewarn "invalid line in ${conf_file}: ${line}"
-			continue
-		fi
-
-		ebegin "  ${target}"
-		cryptsetup remove ${target}
-		eend $?
-	done
-
-	# Break down loop devices
-	header=true
-	grep '^source=./dev/loop' ${conf_file} | \
-	while read line ; do
-		${header} && einfo "Detaching dm-crypt loop devices"
-		header=false
-
-		source=
-		eval ${line}
-
-		ebegin "  ${source}"
-		losetup -d "${source}"
-		eend $?
-	done
-
-	return 0
-}