Version bump (bug #503280). Removed old

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x981CA6FC

11 files changed, 30 insertions, 937 deletions

diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index 6ee26cc5aa6d..333514b95312 100644
--- a/sys-fs/cryptsetup/ChangeLog
+++ b/sys-fs/cryptsetup/ChangeLog
@@ -1,6 +1,15 @@
 # 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.167 2014/03/01 22:49:18 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.168 2014/03/03 09:28:07 polynomial-c Exp $
+
+*cryptsetup-1.6.4 (03 Mar 2014)
+
+  03 Mar 2014; Lars Wendler <polynomial-c@gentoo.org> -cryptsetup-1.1.2.ebuild,
+  -cryptsetup-1.4.1.ebuild, -cryptsetup-1.4.1-r1.ebuild,
+  -cryptsetup-1.4.2.ebuild, -cryptsetup-1.6.0.ebuild, -cryptsetup-1.6.1.ebuild,
+  +cryptsetup-1.6.4.ebuild, -files/1.1.0-libudev.patch,
+  -files/1.1.0_rc3-static-no-selinux.patch, -files/1.4.1-dmcrypt.rc:
+  Version bump (bug #503280). Removed old.
 
   01 Mar 2014; Michał Górny <mgorny@gentoo.org> cryptsetup-1.1.2.ebuild,
   cryptsetup-1.1.3-r3.ebuild, cryptsetup-1.2.0-r1.ebuild,
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 36d600dec047..9c5e905f8c38 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -5,58 +5,44 @@ AUX 1.0.5-dm-crypt-stop.sh 1022 SHA256 42015047c708aa73eae615559ff76c9c8948a5d01
 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.0-libudev.patch 964 SHA256 02529608ee3743ada736ae3a6205c363cb1777ca5d72c5824287ec99fe9fe5f7 SHA512 f786e83d133c46d2dd61c8bf3fed781c8efbe7e045e2efde8255219360a214802937322d636fd156193a665dd020276494f687f5fea56ef08853de754db3ecc6 WHIRLPOOL a3eb49008885c883cb2a993cef9772369dbe5631e51968045d1eaef2ddd9c3eaed90b8601addb962c66fb50e9adaa5e5374a292ce3d7c321659f0acfccad344e
-AUX 1.1.0_rc3-static-no-selinux.patch 813 SHA256 7ec5067c5b05b478f45cdd35953827e4696011104f533b3339d18c4becc1985a SHA512 1d11d5e2d68de724c3a9a9ffa8b2a74c16f14c702a58bacaad171caf3e9bcd4b7130a7669e0c88bc169ae974e41ae4069fb16b47546f8461c77fb9503c93d851 WHIRLPOOL 7ebf5345fc6b40f003a854130e5e2eafa776318e186d1d679ce9340d5dad4fcdb5244050cc99ba3fc53db31a56cf044e7dc7f27b30cefda908442b2148f02d7b
 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.4.1-dmcrypt.rc 8942 SHA256 3868b61751d36cb57d14c02a0dcbae9ed76965f4409ca6a328a0378e40ba1ce0 SHA512 afd45faddb3cd2553f860963611644f2786d56a4688624c6922dd60f5b9e07c5fa0da2b4f256f0780a902b4e6bdf6456f14e0b64f2d76dda3813e397684c32bf WHIRLPOOL 955133032bcf5b1e9530fcae5afe84ce2a48195dfa647888e061c65a79b8e6689f25dddc9e6c95be3156acdc12507a2f4eaf42ded55d1c76dc857c322b40c943
 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.2.tar.bz2 478501 SHA256 45972839fbb169b3ad5649454c217b7f5b0b3c8bf07e32f51a334a88217c7293 SHA512 8becefdd3074ea2ab4121d0f3e17e0b3cd8eedbaf6cb7eb8e88152f596d224499dbfdc6e021cb26b8e416ea0e16d0c3806f5e64f73ed9be7b1511e080f7ba36a WHIRLPOOL dbd84b2536849e0a2ac068ab905de0d952e63c3ace43e549541ac7c786d9480129963c32a593c75627223822a3fe726c9fa092720e97aa944a15af8c3cf6bab2
 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.1.tar.bz2 772971 SHA256 82b143328c2b427ef2b89fb76c701d311c95b54093c21bbf22342f7b393bddcb SHA512 663e6d90a19ff64e2b37e4b7b14bfb3f6ccdbabf0598b3a7c4a79409c0075884dbc9e3d6f93a4298254fee2f47be98b040d2eced6890c5575db96aaee2d13e8d WHIRLPOOL 3d81e3a418459d8a7d3b86fc97deeadd39c242d83ececa64e8a06cf8f7c972952aea10e123422faa8087b24830c4f9c1f1fc2fe713a47c0909e01e70f48e250c
-DIST cryptsetup-1.4.2.tar.bz2 787016 SHA256 1fe80d7b19d24b3f65d2e446decfed859e2c4d17fdf7c19289d82dc7cd60dfe7 SHA512 00927efa1cddfd43113c3fab3b21a9877810328fe162c55e8a5f946268a039ed2b556d9932d4afb2b4a62d4268fed7726b3e21ab2583320a259b21351b1cd961 WHIRLPOOL de36931e133495d609958452148caed7130e3c459894243cb0ee6f21a900ecf502078bb343a747eadd58021679c4fc2332bfa45ca82425312774debcac99a6c8
 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
-DIST cryptsetup-1.6.0.tar.bz2 1180090 SHA256 dd9686fce5d3276b2eb2ac40d513a9b64850af8fff881442f2cfe87257ba2406 SHA512 2d1b5289d79fa70af1958f77a04cf2d5e426e22b429f05f76c47eb93d50ab3a18ce75e85c6f86304f8fe4b2c06d909eba9ccf84422d6b7d033437489bad9f79f WHIRLPOOL 52be2dc1ae5b620007655138ff372ba80398c5cb5545805e48b6b54d68241bf57c6e67f3986982a70c6cf156c7297127f03f9dc4d8226cc0f56120e32ab5997a
-DIST cryptsetup-1.6.1.tar.bz2 1175052 SHA256 baf36e663c03eb6440482d91c486d61ed47ce5c9268ad04c18ca09082755149c SHA512 6d85720a33e05f2687f0ac9dd6730d025a14389091c06c047983b4875edc55db1b5c4878f7dee1720be192fa1ab06df2c7d0a0edfea0fb5bd787ee73a33302ca WHIRLPOOL 7951ac7623cca575899ff8741f0867bfa50f69433a124224cb60f73ed63437fa8b5a7da27dd455ae6f768d4764f6672b1cb90a4312dd2c2f91f0310bec8b2796
 DIST cryptsetup-1.6.2.tar.bz2 1189584 SHA256 15723f0198303d4bcb99d480b7a773918e2d319f0348457988c063bdd03e109a SHA512 59fb835ef8bcd6d0c704a021055032639840ef4bb7be6ade8ff91d347ae74d8e6cba4583d8ced7a4a8c6f09ebc16c4eff3549c13c4327d92fd9234db58e18c10 WHIRLPOOL 3ab24572ea42dfdd0d5176dfa4621520cd0bccda53c3a01676d400a7a841ab9643c979c4942daa774658602bd8cdf659376cbc94c553e2097c5eb3c51a7edb31
 DIST cryptsetup-1.6.3.tar.bz2 1263747 SHA256 a2af4731d9442cb70bc84b7cecdd069493055d29ab65ab625c574b0f599938d8 SHA512 f11c58db2643f5a1035be9de699fa7cef7780f83da261dbb0425d233bcf73df6f120b71c23a8a122b1f648c8fe43eea3e15f75aa536184a537f3e5dd00a1f988 WHIRLPOOL 5e9075082c920563aeeb34556415b031c5ce51182c3430c0a679bf9873a11d6e74599fc10b4b26ca79971130dffb330e83d9ecd1365b6e892e588895df7b8a65
+DIST cryptsetup-1.6.4.tar.xz 1081492 SHA256 70b8e86eef94bbb4441ad38460d87138130d7aaaafe5d01131c3ba50b9f0dca0 SHA512 0208d856fa59425fcd1216c92f32af2efcf8bbd6f32730ae8e0fe93720d4adceadbff94684d5d3f76bae347669949fa6029ab9832dc3812830a84801f4006669 WHIRLPOOL ffde0b3774663cb897aeab6ce84f5851b6b18ed83fdfec17ebc8ea2ce4fba243fb73c95415b3c052745145b5b2478dde790120dc42c419d0bde73f47435e94a0
 EBUILD cryptsetup-1.0.6-r2.ebuild 3122 SHA256 e0428878fb5416942255112eb70d7a6fdb13583504fdbcdac641a0457f7b97e9 SHA512 178ba72e4687ca0b388b423626eb3ad12ae694567c2f18faf09830cda1a633c29268df13f9b074a421a31715b6e46853a942e8833381500ca7becf688571ac0d WHIRLPOOL 773a0858a6c479f1020c328ca1bd202f0e316db22f9ee075cf21a40032a4543a2337631352ab6804f05041a4bde7925aee98576fcf5ab064b603357d7be4b3d7
-EBUILD cryptsetup-1.1.2.ebuild 3404 SHA256 5fd526705749db487acccb783132a5084c241b1116c1783fedfae5485fa3d809 SHA512 8634c41f9a3a756a9a992960d9dc45260342c453a1cf2121c076d5aa2d1050aaa84a8cb0c4ea06cb9e6c709d448e17a0428349ed2a5352e931cc0e612f9b71a2 WHIRLPOOL 54ce0372880f2da3e70761fa6b89a779a72c3402d595a3092ca7d36b1fa37f6b7987b8a48f9c8aadb809e71a0fed70e94e37e5890ee593f923c60c8e7975542d
 EBUILD cryptsetup-1.1.3-r3.ebuild 3465 SHA256 5ad4b06a3cf68ea96ae8be24789435ab5398af40f510a2916a6b62ae4819c9a8 SHA512 6ab8e527e6df332803e65e3e385f3633153278251cd024dd671b4e71ec0696e5594348edf91441c308161689ed7465caa4a5d25ee73f31f797c796b9dd76d8f5 WHIRLPOOL 1ccbe5f4e085b8acd5ea86ea003f30a14c4d43ae61a69718d86b553029f9e63f612c84b7b2f24b8a0c77ceeb418f62a2dc42ccf17b73dd8fb837d72f8d84dc8b
 EBUILD cryptsetup-1.2.0-r1.ebuild 3656 SHA256 5a066c639ceed3b8ddbf82ebc8adb60666917273f5cab992c75418d6cfe030fe SHA512 a22cc0f0457c9f9e323b8c3752b76f1198171e44dc7379f86b5173e74a5d44a9d48c8c74fb61d1627cc895206a88a01a9fc4d7b9f5e689b03545ce9889040121 WHIRLPOOL 28553355a7e1d894a659dfe2447b17ab3240289687f2ca147371061b0daacbe9718d3dee27dc9122237fa42d4265d3ca68a365343a6999035e4f93337cdf459b
-EBUILD cryptsetup-1.4.1-r1.ebuild 3298 SHA256 2126c7862dff733285e0c4e5f0232e88ee29d4ff03b0f40211857f2f4050cd99 SHA512 4ca8f8f2801437e26413b186832445cbf094db1969790a8177dd795c8a08e5bd862597ddbe55ae00c4840a52375c099697ad7670cd15e7ded881e7647416bebc WHIRLPOOL da905f978d337d9e43b431906dd1621e373eec703949642b591284b999b668d1720fd04cdcecc938869226794e1e5a6588562ca6ad5ef33cdf51194066be420a
-EBUILD cryptsetup-1.4.1.ebuild 3348 SHA256 884d85046d84dccaad28bc031c1bb54ea3c640cc130979fc3fbfe08dadc70773 SHA512 524f68b5db2389bac8f0c4e8c7490b57ee7a671e93e330ecf3aab61fd17e923b5ba87887e67efebce7177d15fe2a4990b405efc8d64788bea50fcbfa72178543 WHIRLPOOL 225d208dd971bf5264474c1c571314fe173969723bdfdc9adc0142c8a79661589022b0ef163b5241500668f38041035b732f2324883138c0d34104ebb1855e96
-EBUILD cryptsetup-1.4.2.ebuild 3529 SHA256 f4b4117073b12b783c89ca9b580da9b55ff955f08d1341c6e6d1e7c562461686 SHA512 76d1d084e266898a8cf1965a139994aedf62da8af33d7be29f1663851e85589c9c6fc356319149acf6e54f12e543d6760a08d5fe277b49bac0a500536356d4be WHIRLPOOL 265687c12768fc320f81cbf04152e239021a7972faf8df7a6ea718fa4518ea0f57c5b5a85d66789c03ce6bdfc6fd0197ad33176383c4d1ad7c379a083e5010a2
 EBUILD cryptsetup-1.4.3.ebuild 3557 SHA256 e52546b86cdcae464416c6264d5cf39c12b17c3380417c45095a659d9e460dbc SHA512 069b6e48e6839eb5d547828bffbedcadd13dc9f868b69493e8c5c6095052dbfdb1a30fa5339f626c6ddb73dfc38dd9dd862a2475f6c7dc9db375edd2239d95b1 WHIRLPOOL 693fcf51ec4484b869d69c975f4d7e8e04004ac0ebb649ca418ccd4618d059aa63a3bd5538df8c01fce3e701c024baea91daef3f4d15bafe7cd1ca8f87a1096b
 EBUILD cryptsetup-1.5.1.ebuild 3841 SHA256 ee28ec449fe8e1cbf85d134c1f83f93ffc89b5901768302685db0c89b632b2b4 SHA512 6c05ba5ee426211dd91bea0269b300366b73f3b02a1d2d7943d9193ed91932f74031177b71e8bd2d116a9ee7a272b4a5c7a1d9957911ba7ec6e16c90e76c99e6 WHIRLPOOL 9d1896939e355f86ac3c5896e4659028b5ebee3ef72592d7e94a378d122481594ca3172461c7f000ffbbf0888031792be50ad49aea30dbf6c69b42fac675f80b
-EBUILD cryptsetup-1.6.0.ebuild 3842 SHA256 464fa51b6dfcb468c1a87e7a532526e9f98ccaeb1df26ed4289b500961421839 SHA512 0707c8cd5eb39bfef6f928d6d736a00b269b8fceb014f412cb0c867fcd8c5cf09e58ef1679177abc2df2da4bcd6b2693c2fe31753731f94e14f54152b78781f1 WHIRLPOOL 8e59283c8c0b80b0662e4a9f2fad341b61b2ec344201431a5dde167f24cf7444fc0bad80428ba85aa47b67d18af741bd3b51d42b9c1280161bdf4071e676b652
-EBUILD cryptsetup-1.6.1.ebuild 4337 SHA256 1178bd47ecddbd3fc5a89eb8d09b671bdb2474746acd90daa73ddcede4eead66 SHA512 f47af8ea0ad23704ddc15376ed4bd633dbf56c72a8d4665a45cf7a5260ea82c7f4eb49c811f71d926c67748ca246e68801056b7667f81a698e2d3f6fd6784a9f WHIRLPOOL 30bbb6c6f5948d3ceebde5773ebbf5fc0e605a8e4ebc94a2bb440469a70127cb3c743566635446053a443ccfe01bc0b215327508e946082838753abca7b4c54f
 EBUILD cryptsetup-1.6.2.ebuild 4336 SHA256 d6fcda5bf1ca14e1eb3c44538dc8bd262a6e981360452d4f34c67d26bdf44dc4 SHA512 9f891931cc22554f78bbadcbf30c966feeeda060de4f6d5752e9297b9eacc8dc06fed2315af8719c5c56b26334383631b85d136637a1a12ceffc452280cb6e3f WHIRLPOOL 6b7601283a6ea93c891954d4725a798f5b2f2ef608cd43cfec8c1c0d4d0763d0b710bd2d952ccab4ec1b4ccccc0e8869c57f229c3f7b371327f12cf05728f0c7
 EBUILD cryptsetup-1.6.3.ebuild 4289 SHA256 89803dc31a19496a793bcdd257af2066899954cd2c7992c75a95fc939a59e5ad SHA512 f652f1a6ff27f580056963668d069a1dce178bfbbb9795ef5ce3a76876a7f421d431d34f2cc06ab02a56e7cf077adfc5cf8673eec705ce868bf2b3805b9d44dd WHIRLPOOL 5bee95e56b1549af8d2e177a02eefb5a08eab94c82e1d66c593eee951c972ef5c095ece98e1487681d86426ed4bda50ec4d3cc20d54ddd8b733b3f659265c505
-MISC ChangeLog 25614 SHA256 373b5a73b65ce7bf00dfb87967412b9904e9bec2691806c7d04b0e57b3ed4a2a SHA512 71ea135a6dc7ec3f0fb5b5afe1333c7884e452a62a64b6c391ac97a940741dc964beab1f1c567c1fc9bb48835eb2bed25be05a3d6e50f40647b46e08836a3dd4 WHIRLPOOL 2f84db65d5612a3df760d366180b58ec76a163135a6403e69774ef27008bf3d632f6551e4962e54a649f1f8d3d101766c872ae2e6b3bab2b832635406af6d545
+EBUILD cryptsetup-1.6.4.ebuild 4398 SHA256 4bdaf08c4bbbab4d537cb6fca4b58a3192ab4605a27713e09154d97fd57d9d17 SHA512 1fbf44658f90a050b9501cc47da08456c9439fe6b51b4eb2ad02225f563ddde3931421cdf86f1312670625f9d30cbeed01b1e36283570f2a4eee7ec679678464 WHIRLPOOL 3fa6210779f7b03cd8be05624750ade452702c6d4aa0e273e12843c3bf126c7472259ea2e252ae9cacfe0ae434afeef9369c22131dd0372bf75b6c216b38125f
+MISC ChangeLog 26039 SHA256 159eccfd310ed46c027e010cd00dece3c97a152d21ef94144e07aac2b92cd422 SHA512 d675227150c9552ddf9078abb3419b879aa08d91e56d9b622532aa0455a7354796440d354bef20c265076e41fc6f80bf91a045afb5a04b1ecf3bbf257c7b2227 WHIRLPOOL a8d12604c87f271f163f12c628e03341ad37f4378fa2889fd57e272045afa03ba9f30f1d8acb64bc0a9d7972e83084d083a4ea5db7891c2c9ede960cfce0eeea
 MISC metadata.xml 763 SHA256 494337a4a156da7feba29856957ffe6babede998bbbe2aa76ad68463f7a3ba4d SHA512 4124c6744a491b4b59115fe561408bde963d7527b835e5c554b3b99b460c6b2a9e98abb294f0e3de5af8625e27efecc7b139b8887b5e8b51af93772bd3574b1a WHIRLPOOL 1b76543228dffe7115e547dc068b6db84b06ff0a5f244c5964eb21cba55c9b6ee9637d4a19c38b4b9ebeba55ac7fe4437e97c4be32f26380fec6773b76ef8fce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQJ8BAEBCABmBQJTEmPyXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOGfcP/i3aWZ7Cfd9wf46Tv5grgHtV
-4Hz3Z4/p9maMvhahscbeY99zxNbWBfBK+7leyXeWqeWmbnRUgz+kI9Rqr1pS7AVN
-miCzc76VSvQ1nxr3npWOpwDx8vwrrEaJOZCyznrZ10OoCioWBf5YhoidEC0N5YJR
-F5hHUIOjRDAgcRy8tR/9yV8DL+0LA0A/uB8lPi0N3gTx+clJJ5kt+lLjBvdnuLV+
-1019dIeJr9r9oD/HPDpge2Kpa7VEn4ppjGFadsSHDd/0yz4SX2ykaINLcp6Hcoul
-d24YgkjwacY8VtOWK2yvpZFM04CHa8hXnhtdZXVM4F2ULwdBomD1kBZ2Eb6pEy7j
-yfubfPHied4E77vpubCxCgCZpMji/3WzDPqPZ29KknX1dRv0/6aMTL/gjAGjr+ro
-k3eP24j+xGNyKIM5aqn+cltiy9hVavUGe9wDqFQk8eEcD56KxXQhM2ymiNAwshaG
-8H45C1b8KH+qAEH/JLHl+eZ2N+UheMoELL3BFSrGmiH2yVjLyoao/aoI1xGavh8Z
-aahC9ghIyNadFYJV6kueNSU3P8sL18A0ZMATvMalxCsNQ7owJ40gNY3qaF7DEIv0
-XPKQtShGeD1QMeuanhgrTGdAijJRtKC1oMcnPrxZkc9PNCAJSGVW3BndnqAhS2He
-H0gbxXrWpWC6vFZZO5tF
-=3PWA
+iQIcBAEBCAAGBQJTFEspAAoJEPiazRVxLXTFGGAP/2oiwsNQqe+GkeM7s1kPET7T
+AAO2o08RlC1MboUNNZHu92L0BeLzchzB8H595A0g2cWW+WwFvd7BhxsbFGFAiBvx
+XsC8oUFk9H8zzi4hgKE7q1vj+XbExP3EEJGGxK2DAeryyY18OVQU35HkY3soR+sp
+iIoFZw3PMqB0goVClmUOcgMSML7AP0cYWo+2epPQ5clF39vqYFhjZAtWLiP9oT5t
+9Shh6ySNI+D11VOMXAw2wFRuJ6xL1XGUwgzzFRMxvIght1VqBC1i0l0GqfVQ7rMP
+NtT84PA4xqY1O1/7UcLmhmyKZr8eKbU2GbJgFiluYNlR9RvQg2roXylNdeaEg1/M
+EotL9/Ky1D5xPRwlWKYfhaYD+6sZiZ8FvpmCAEn5OizTi03tFHmOB4zB3APBd3uy
+49/wcLsQxqDOCph8NlZVAHV7uKC89/brUGXrtwFAzJwSRYzGDzn8fKw/TnD8yvQr
+lMZIPOmdAm4I55/6XRTPGzDPVIJh1QauFs4JwxoKYZQ880CdQaMOV+jFSCHWfs6p
+4SH+KA5iyj7JYZ9YWo7HkS/up3miiBPKeG7XsNISW8kLn/VWy5C2SdtI0ev29IoO
+eYpCVkvxhYIHE0XwZnwAmz34qonK8LmqKebBQNgs+c/8MMYDdPs22fZB0JgbEW8M
+biVBWCOKzkkYR2FAWqH1
+=JMfB
 -----END PGP SIGNATURE-----
diff --git a/sys-fs/cryptsetup/cryptsetup-1.1.2.ebuild b/sys-fs/cryptsetup/cryptsetup-1.1.2.ebuild
deleted file mode 100644
index d6f399d27c17..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-1.1.2.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.1.2.ebuild,v 1.12 2014/03/01 22:49:18 mgorny Exp $
-
-EAPI=2
-
-inherit linux-info eutils flag-o-matic multilib autotools
-
-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/udev
-	|| ( >=sys-libs/e2fsprogs-libs-1.41 <sys-fs/e2fsprogs-1.41 )
-	selinux? ( sys-libs/libselinux )
-	!sys-fs/cryptsetup-luks"
-DEPEND="${RDEPEND}"
-
-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() {
-	# Both merged upstream
-	#epatch "${FILESDIR}"/1.1.0_rc3-static-no-selinux.patch
-	#epatch "${FILESDIR}"/1.1.0-libudev.patch
-	eautoreconf
-	:
-}
-
-src_configure() {
-	econf \
-		--sbindir=/sbin \
-		--enable-shared \
-		$(use_enable !dynamic static) \
-		--libdir=/usr/$(get_libdir) \
-		$(use_enable nls) \
-		$(use_enable selinux) \
-		|| die
-}
-
-src_compile() {
-	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
-	dodoc TODO ChangeLog # README NEWS # last ones are empty
-}
-
-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.1-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.4.1-r1.ebuild
deleted file mode 100644
index cf6549305c19..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-1.4.1-r1.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.4.1-r1.ebuild,v 1.7 2014/03/01 22:49:18 mgorny 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"
-
-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(+)]
-	virtual/udev[static-libs(+)]
-	>=sys-libs/e2fsprogs-libs-1.41[static-libs(+)]"
-RDEPEND="!static? ( ${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 nls) \
-		$(use_enable selinux)
-}
-
-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() {
-	emake DESTDIR="${D}" install
-	use static && { mv "${D}"/sbin/cryptsetup{.static,} || die ; }
-	dodoc TODO ChangeLog README NEWS
-
-	newconfd "${FILESDIR}"/1.0.6-dmcrypt.confd dmcrypt
-	newinitd "${FILESDIR}"/1.4.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/cryptsetup-1.4.1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.4.1.ebuild
deleted file mode 100644
index 67d4f69f2957..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-1.4.1.ebuild
+++ /dev/null
@@ -1,103 +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.1.ebuild,v 1.13 2014/03/01 22:49:18 mgorny Exp $
-
-EAPI="2"
-
-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"
-
-S=${WORKDIR}/${MY_P}
-
-RDEPEND="!<sys-apps/baselayout-2
-	!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/udev
-	>=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/udev
-	)"
-
-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 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
-
-	newconfd "${FILESDIR}"/1.0.6-dmcrypt.confd dmcrypt || die
-	newinitd "${FILESDIR}"/1.4.1-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.2.ebuild b/sys-fs/cryptsetup/cryptsetup-1.4.2.ebuild
deleted file mode 100644
index 2f8a59c044d5..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-1.4.2.ebuild
+++ /dev/null
@@ -1,104 +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.2.ebuild,v 1.4 2014/03/01 22:49:18 mgorny 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"
-
-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(+)]
-	virtual/udev[static-libs(+)]
-	>=sys-libs/e2fsprogs-libs-1.41[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)
-}
-
-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.6.0.ebuild b/sys-fs/cryptsetup/cryptsetup-1.6.0.ebuild
deleted file mode 100644
index 76dc5e78ab40..000000000000
--- a/sys-fs/cryptsetup/cryptsetup-1.6.0.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.6.0.ebuild,v 1.4 2014/03/01 22:49:18 mgorny 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/udev[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/cryptsetup-1.6.1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.6.4.ebuild
index 58d3ec819507..706d19412b13 100644
--- a/sys-fs/cryptsetup/cryptsetup-1.6.1.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-1.6.4.ebuild
@@ -1,15 +1,16 @@
 # 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.6.1.ebuild,v 1.6 2014/03/01 22:49:18 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.6.4.ebuild,v 1.1 2014/03/03 09:28:07 polynomial-c Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7} )
 
-inherit autotools python-single-r1 linux-info libtool eutils
+inherit autotools python-single-r1 linux-info libtool eutils versionator
 
 DESCRIPTION="Tool to setup encrypted devices with dm-crypt"
 HOMEPAGE="http://code.google.com/p/cryptsetup/"
-SRC_URI="http://cryptsetup.googlecode.com/files/${P}.tar.bz2"
+SRC_URI="http://cryptsetup.googlecode.com/files/${P}.tar.xz"
+SRC_URI="mirror://kernel/linux/utils/${PN}/v$(get_version_component_range 1-2)/${P}.tar.xz"
 
 LICENSE="GPL-2+"
 SLOT="0"
@@ -52,7 +53,6 @@ pkg_setup() {
 
 src_prepare() {
 	sed -i '/^LOOPDEV=/s:$: || exit 0:' tests/{compat,mode}-test || die
-	epatch "${FILESDIR}"/${P}-openssl-static.patch
 	eautoreconf
 }
 
diff --git a/sys-fs/cryptsetup/files/1.1.0-libudev.patch b/sys-fs/cryptsetup/files/1.1.0-libudev.patch
deleted file mode 100644
index 12d589e4eb06..000000000000
--- a/sys-fs/cryptsetup/files/1.1.0-libudev.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff -ur cryptsetup-1.1.0.orig/configure.in cryptsetup-1.1.0/configure.in
---- cryptsetup-1.1.0.orig/configure.in	2010-04-23 21:39:29.000000000 +0300
-+++ cryptsetup-1.1.0/configure.in	2010-04-23 21:38:18.000000000 +0300
-@@ -62,6 +62,11 @@
- 
- dnl ==========================================================================
- 
-+saved_LIBS=$LIBS
-+AC_CHECK_LIB([udev], [udev_queue_get_udev_is_active])
-+AC_SUBST(UDEV_LIBS, $LIBS)
-+LIBS=$saved_LIBS
-+
- AC_ARG_ENABLE(shared-library,
- [  --disable-shared-library
-                           disable building of shared cryptsetup library],,
-diff -ur cryptsetup-1.1.0.orig/lib/Makefile.am cryptsetup-1.1.0/lib/Makefile.am
---- cryptsetup-1.1.0.orig/lib/Makefile.am	2009-12-30 18:29:28.000000000 +0200
-+++ cryptsetup-1.1.0/lib/Makefile.am	2010-04-23 21:41:34.000000000 +0300
-@@ -33,6 +33,7 @@
- libcryptsetup_la_LIBADD = \
- 	@UUID_LIBS@				\
- 	@DEVMAPPER_LIBS@			\
-+	@UDEV_LIBS@				\
- 	@LIBGCRYPT_LIBS@			\
- 	../luks/libluks.la
- 
diff --git a/sys-fs/cryptsetup/files/1.1.0_rc3-static-no-selinux.patch b/sys-fs/cryptsetup/files/1.1.0_rc3-static-no-selinux.patch
deleted file mode 100644
index d64867d42352..000000000000
--- a/sys-fs/cryptsetup/files/1.1.0_rc3-static-no-selinux.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Naur cryptsetup-1.1.0-rc3/configure.in cryptsetup-1.1.0-rc3-areyoufuckingserious/configure.in
---- cryptsetup-1.1.0-rc3/configure.in	2009-11-16 17:39:37.000000000 -0500
-+++ cryptsetup-1.1.0-rc3-areyoufuckingserious/configure.in	2009-11-17 19:49:08.000000000 -0500
-@@ -93,9 +93,11 @@
- 	saved_LIBS2=$LIBS
- 	LIBS="$LIBS -static"
- 	# Check if it there is still not some missing dependency like static selinux libs
--	AC_SEARCH_LIBS([dm_set_selinux_context], [devmapper],,
--		[AC_MSG_ERROR([Your system requires SElinux libraries for static compilation.])])
--	LIBS=$saved_LIBS2
-+	if test "x$enable_selinux" != xno; then
-+		AC_SEARCH_LIBS([dm_set_selinux_context], [devmapper],,
-+			[AC_MSG_ERROR([Your system requires SElinux libraries for static compilation.])])
-+		LIBS=$saved_LIBS2
-+	fi
- fi
- 
- LIBS=$saved_LIBS
diff --git a/sys-fs/cryptsetup/files/1.4.1-dmcrypt.rc b/sys-fs/cryptsetup/files/1.4.1-dmcrypt.rc
deleted file mode 100755
index 79ec634279dd..000000000000
--- a/sys-fs/cryptsetup/files/1.4.1-dmcrypt.rc
+++ /dev/null
@@ -1,337 +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/1.4.1-dmcrypt.rc,v 1.1 2012/05/11 08:31:51 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
-			shift
-			[ -z "${NORMAL}" ] && eval $(eval_ecolors)
-			einfon "  $1? (${WARN}yes${NORMAL}/${GOOD}No${NORMAL}) "
-			if ! read -n 1 $* ans ; then
-				printf '\r'
-			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 += 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
-}