Bump per bug #421249. Add UUID support per bug #420015.

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

6 files changed, 593 insertions, 25 deletions

diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index fbd5d9402a91..7d306811f281 100644
--- a/sys-fs/cryptsetup/ChangeLog
+++ b/sys-fs/cryptsetup/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-fs/cryptsetup
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.145 2012/12/21 05:17:04 vapier Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.146 2013/01/17 23:35:08 robbat2 Exp $
+
+*cryptsetup-1.6.0 (17 Jan 2013)
+*cryptsetup-1.5.1 (17 Jan 2013)
+
+  17 Jan 2013; Robin H. Johnson <robbat2@gentoo.org> +cryptsetup-1.5.1.ebuild,
+  +cryptsetup-1.6.0.ebuild, +files/1.5.1-dmcrypt.rc, metadata.xml:
+  Bump per bug #421249. Add UUID support per bug #420015.
 
   21 Dec 2012; Mike Frysinger <vapier@gentoo.org> cryptsetup-1.4.3.ebuild:
   Drop udev dep since cryptsetup no longer calls udevsettle at runtime #445660
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index becf1e852b8d..71f10a7e3cc1 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -1,6 +1,3 @@
------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
@@ -10,15 +7,18 @@ AUX 1.1.0_rc3-static-no-selinux.patch 813 SHA256 7ec5067c5b05b478f45cdd35953827e
 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 dmcrypt.rc 9336 SHA256 2cacfbe5b305c0ba9633764e79dfadd160e63ffb089f7347c0bca8c2ba9ec42f SHA512 0019cc0d0bb91c04b04949cdfb0126fdb04541ec4e76117760092e1287d4a4eb091ecbf643fb8e4346f226e6b01d8fe358f0f0e0221f31abc83415b5e235b17a WHIRLPOOL 527fbbebafcdd7e2e3687acdc59fb07e2fa26370508aa0758ca0deb6e12fcab789271b6733cdfd18381ddf55f606152febe6f1e4fdac26d1efd4206b7b219655
-DIST cryptsetup-1.0.6.tar.bz2 405713 SHA256 df7fda80cfa01f063caf39140287a47d018dfe056fc71a3ba605e690ff0183fd
+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
 EBUILD cryptsetup-1.0.6-r2.ebuild 3168 SHA256 2f59ad3e12eb45764951a5873acee13d0d9c7ece8d33c761671bddf5b7bfec58 SHA512 0178016bc8fce6b3a811058802b9d213424d6dd4a782766f838e985436e36d82e8c5eaac8f59c81846b0be13915f386a4566bf4dd910bf060d6cdb592a9e5431 WHIRLPOOL b0e0ed91a4fb9d63316b55ede906a1a761174bfa486d8b5d7044299d72068c7284771e14fb4b277f595e470c74463986056fc4cdedb2c04d38c5ded03b1c03b3
 EBUILD cryptsetup-1.1.2.ebuild 3405 SHA256 218301930c96355b1c5df5daa917df2ef7adb41015be702ba6f64f43b79d06b6 SHA512 34f1500c1c25b5c842d82073b5465bb018299ed701757a3aebeabc2e8db82727895917e464159fecbb6770080f77fa7cd6cafb16d726609f0578afb1860d985c WHIRLPOOL 91287f2abc0e2e82842be4fcf075124823bdadc0cb579a772433c37ca81c51e9940285c968caa5f945c7f603109485002a80bf9b87b7d200ad349d0b03eb054f
 EBUILD cryptsetup-1.1.3-r3.ebuild 3464 SHA256 a654e3098507aa1df7a317e8c3ca1daf347ea672b40fecf62d1adf4ba89ea2f3 SHA512 6dbb0e3e2b0aef7e3e5746301fd63b2e963cf6ab6094cdc2449794c14f0e9f9851b7a559863a165b71db000249a38cb42b618053e76eb5b93a4d2b5672a6f8b4 WHIRLPOOL 467e3b9d9714e2d5de08a2465ef604e158ef08a6dff53a6f29dd34df7df627793a691c45ebc7b64b24b4736b4051b1929bd3a8c10a5169a1586b3f86fb21688b
@@ -27,22 +27,7 @@ EBUILD cryptsetup-1.4.1-r1.ebuild 3299 SHA256 ca44a274630051eedbab63e8acee99c9a4
 EBUILD cryptsetup-1.4.1.ebuild 3347 SHA256 de14ca3516158d32e9f3399dfc7bea39afd8cb4a53393dc0ee3510d59604296b SHA512 9387142c3df615e7fe16b17c6cbbfe48b7a29bd9c00482386fca7c7287e86d44062f35787d750c8083257eed63dcaac492e4f0aa34f3a260c2cc738942731a72 WHIRLPOOL e94abe0105709dec4f254d607a13e37c90b59b63d5b632aee3fe62a5c00f5996ec6529e572e2c759544a5f097e9d94743f41a84c68ab41ca51cf19dee9860407
 EBUILD cryptsetup-1.4.2.ebuild 3530 SHA256 1a2e897f3affcf26d4418e08dda7578f9f5f68f74f8e7785d363a56e76ea38a9 SHA512 e56edf6ab2730357c617c850039dd094f6201c53cad6bcd7ae3bb555044e6183e3e2b8beed7fcccadd14c694c36958d1588b711de495bbfc2274aa7692da2bd6 WHIRLPOOL 6a21b02f85b60610861fc2487d7e3cd14226a2566115bc30fff45915315fa27dbc2801c6f2debc8c6638b2c30bf67a8cb94bfe3750fb37f6d23ef745fc916f9f
 EBUILD cryptsetup-1.4.3.ebuild 3486 SHA256 feaa26ee078fc2f9ba8437d3f1aefce8ca5bc2ebcd5482985839399fbad187c8 SHA512 928e0e9a0f54b4efe4e01ff4e153b2eef66d0eacbe10857f6683734ccd8484bda8791bc8a1464f9cd34fe9d77d103d45475502b921586528797cab0de508f87f WHIRLPOOL 390acf54f54515603b5ef91f23d5abc61514f854d46c9e894c90bc57b58a31efa85188bd7eadbe9bc3ba867e97d9ccf9e702180c3b528fc14358f9a8bfbfeb09
-MISC ChangeLog 21984 SHA256 a33f2e3a12c2ee6a51b73459ff50e048c8a271728e20362f11d1a7158d2e9b3b SHA512 5814e717e495ee8070aef940e55f1da6a6f7ba8278c1b0317be5db296cfc5fd4260e393c3e203305d8b68da6dca1f7d06b9c9141e0ddc25e4dd870cf1743832f WHIRLPOOL 608035ec94d954ec259362ec41f2a7284543352a50e94bbedcae2c793e7588794f1c1b63e3fa1e71c5aafb86704d38a0e14cc09f257b9395c5e53ea12d658beb
-MISC metadata.xml 319 SHA256 9f83a3638c5c1aaac590711dd3ac6b1a7fbea92b3f32be918cc6207689772705 SHA512 713566f8e8a6935dbd68c8145feec776a6d4cf03eb97c2033e2506f3d51752bba73dfa09a9bad5ea7616908accb72d11131f8ca192804b9fffede4f3206bb076 WHIRLPOOL d54e264cb10c5b143ca27de5340c830b62d1fedc1b9c79d24648d9c7161b18789df018b9618a73c1d55b903fc60291101527cc60ca3e862775f289af0af84997
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
-
-iQIcBAEBCAAGBQJQ0/DbAAoJELEHsLL7fEFWcSsP/1FiOh7HK5mjAOZUI9fKKEne
-KlkjA/gik8tY2HBB0iXg/xXUYqsxQuNx116kip1ewNp4tAqBpXd9msXds6lzqw4C
-5Gn/0WVD336k18vn+Zz9jeC9jwEVYCSQz+Js35mB7vX4qoW6zAyeU6+Q/4IxVAF8
-jyIXfRgu0miAg9wKiRH1ygEdrGNvQvazYM2H7aDoLoM8djMAy1cxvmIUmJ4rEhri
-WRxFnuPXZNKmKfxeVXVA3fNQgsUwDVLyURhnLTqnUHw9eoohFHogmH4vB2Elr5tj
-4jPeIYoo0nbruXzxpce8ZwJTus6K2Q8NdpPAswlt4uRepE/iiEjytvxPflredqhn
-B2Fki4Se2/Fr51q3lVJvoeFT5f53bmG3nXIc5Rk4sSnsV2ykwvAp8g0lyoepHJ/K
-/VBao6psFpgbJ+3AiWbRuO66398D/hDOLGbt7iC4Oo0Dr+InwqdjZb/JhOpIS2+a
-Lcm4fT9pBMaikMu0uF5vUNtJBsfPjAD69yBVnsb79yagjK2Fd5zhoc2fSn+MXuEB
-bBrxAoLspD7teBiHiPLeRVZk3ZFhVzD7ME4tysrIcjoeCkzrLci31/CfYgLzr8fb
-U8XlQ3FtsJynMogT+S3my3EVTOt267PMKhNybskIwujLUjgtHnZYiNAS2RXCYPar
-du1hqAvmN/CD5IOlVku4
-=P3WO
------END PGP SIGNATURE-----
+EBUILD cryptsetup-1.5.1.ebuild 3772 SHA256 2efbe3e20a33ccafd68f8cab66dbbfe28a7b34982d8290e11a9c160615abff38 SHA512 ac0b3838297994b14bfcb3e28bfaa9a8a0d52c1a372b8cd9bc09065ad3670a61e375dae5035a95d69aab22fea239fb3c461b4a5b05763943e2168873297323fb WHIRLPOOL d10ee0b3fd1b2c0010193716aeb96d8ffddca7b002ac61f525e82c82c5b50c452c53b72dabb2b0cb3e593fbb773816602e6cbd41d97a01936ac3f81f427e9953
+EBUILD cryptsetup-1.6.0.ebuild 3773 SHA256 fc301fea7caf6049d1da64d95bfdcc59cfe93a5c321bfef3b3c2281a6ae6c1e9 SHA512 282ef0c30910bf8fe2a01db2d51fa8aa6e3623f741bbbbba98f77095206d58ad6a75eb00e6b8111756ff6cad5031239f98be43945e2603c0c42cc85288342743 WHIRLPOOL c576ef5439b5be52b22d458ba197e7f9d61d6749ae5684d6598dea43bbfb3121bd2b8955cb1cbcf22673a1f23fd0158d5fcf686e4b1e8bbc322b2f5f249d5008
+MISC ChangeLog 22255 SHA256 d85a7c1f2b52d6bb6e0025025fc909c028bd60237c1734f7ab56e8eefb0e7189 SHA512 58f71079c9c76c1580724da445016b0d951a7717519db490c2e6cdf839175b3b8ff52eb4e15d10f72fb34c1e787b356769d9658baa502cccdf2abaa868bc5105 WHIRLPOOL d9ca3e34936abe9f0456aa48406a4a86075551ae71ca790a6c12fb423a7532ec5d5efc34d00a9ad8de7d20eef1998051cb8592f2441bcc015e4e3d4668150d94
+MISC metadata.xml 448 SHA256 01a7a181c94168a204916c36c0b7891c9275192368b916dbf21729902b116319 SHA512 22c21d1e773568522d20db0cd2d8bc8d1439046ba600bf930f33d9f96d0c08a3cdd5022f84596e79683f1832d62dc7e75be836bd3ed19a098afb576c8b49cfb1 WHIRLPOOL 6b80c4d1f863856a77c83deda92a4a70545603810dc643ca93f2050574a3db8baf62375da0e8d895e219d2e2533d51630f60b75cfa3a234cf739c67ee74ac9a2
diff --git a/sys-fs/cryptsetup/cryptsetup-1.5.1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.5.1.ebuild
new file mode 100644
index 000000000000..12fd2131bfd0
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-1.5.1.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2013 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.1 2013/01/17 23:35:08 robbat2 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 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[static-libs(+)]
+	sys-fs/lvm2[static-libs(+)]
+	sys-libs/e2fsprogs-libs[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 !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.0.ebuild b/sys-fs/cryptsetup/cryptsetup-1.6.0.ebuild
new file mode 100644
index 000000000000..8487f6bf55b0
--- /dev/null
+++ b/sys-fs/cryptsetup/cryptsetup-1.6.0.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2013 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.1 2013/01/17 23:35:08 robbat2 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 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[static-libs(+)]
+	sys-fs/lvm2[static-libs(+)]
+	sys-libs/e2fsprogs-libs[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 !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.5.1-dmcrypt.rc b/sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc
new file mode 100755
index 000000000000..fed2cc6aec62
--- /dev/null
+++ b/sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc
@@ -0,0 +1,350 @@
+#!/sbin/runscript
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/files/1.5.1-dmcrypt.rc,v 1.1 2013/01/17 23:35:08 robbat2 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 [ "x${source#UUID}" != "x${source}" ]; then
+		source=${source#UUID=}
+		source="$(blkid -U ${source})"
+	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
+}
diff --git a/sys-fs/cryptsetup/metadata.xml b/sys-fs/cryptsetup/metadata.xml
index 68952087adf0..c8836af873d7 100644
--- a/sys-fs/cryptsetup/metadata.xml
+++ b/sys-fs/cryptsetup/metadata.xml
@@ -4,6 +4,8 @@
 	<herd>base-system</herd>
 	<use>
 		<flag name="dynamic">Build cryptsetup dynamically</flag>
+		<flag name="urandom">Use /dev/urandom instead of /dev/random</flag>
+		<flag name="reencrypt">Build cryptsetup-reencrypt</flag>
 	</use>
 	<upstream>
 		<remote-id type="google-code">cryptsetup</remote-id>