Remove sys-fs/device-mapper from || () syntax in favour of sys-fs/lvm2 wrt #461382

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

3 files changed, 25 insertions, 7 deletions

diff --git a/app-crypt/truecrypt/ChangeLog b/app-crypt/truecrypt/ChangeLog
index 4a153278d79c..f98e897aab2e 100644
--- a/app-crypt/truecrypt/ChangeLog
+++ b/app-crypt/truecrypt/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/truecrypt
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.74 2012/12/22 00:10:44 alonbl Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/ChangeLog,v 1.75 2013/04/09 10:14:47 ssuominen Exp $
+
+  09 Apr 2013; Samuli Suominen <ssuominen@gentoo.org> truecrypt-7.1a.ebuild:
+  Remove sys-fs/device-mapper from || () syntax in favour of sys-fs/lvm2 wrt
+  #461382
 
   22 Dec 2012; Alon Bar-Lev <alonbl@gentoo.org> metadata.xml,
   truecrypt-7.1a.ebuild:
diff --git a/app-crypt/truecrypt/Manifest b/app-crypt/truecrypt/Manifest
index 23579df374d6..d0157a279c46 100644
--- a/app-crypt/truecrypt/Manifest
+++ b/app-crypt/truecrypt/Manifest
@@ -1,9 +1,23 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX execstack-fix.diff 1955 SHA256 227c8e0bb04bd5f6915fc2570fbcbf1cca704b4b818bc5de283653197309a5fb SHA512 c64f9255303a521b4e531ebea574befe80a9f193c9aa42fd9cb552e56d087815ca161b50b593e7c3ede10a65c67dc36d0447dbffb0f4d4614f181a95759c2f79 WHIRLPOOL d1bcd4e09d7fccb2b10bdf53e21bff7da8dbce7b361c24ae6e8a9ab3fe772e9896d98068bfc7b6962186c010c956b73aad7da6d62fdc819205f66983888687ec
 AUX makefile-archdetect.diff 266 SHA256 aa201bb7c93852c814d71c963b1d416d62aa2d1e685f9f5149b1388dca9ae883 SHA512 68102ff27708df26b1844ed969d98d05f18782164ca349138a304ff69730560c544783c4544067eec90965e41e7fab8bb8eff4885787593840f44f7f0011769d WHIRLPOOL 0d11b8bfd85532067973aa07bd4f70489b3b22f6fb33c9c699b5ef30e504e57e60bbf8820bd414640d6f0943fb83b8528d61757bb77aacd66c4670ef4f3a3f22
 AUX truecrypt-stop.sh 308 SHA256 243a9d1041b291e12ce2065959838f0cfe01484bffac7915991ebeb90d2ccd2c SHA512 d524fd0eb957ce6ea72590b6ddd0501f911e0ec4abdc4a9add34c021b6fa8bd65747c2dd9fd19bea8c093ec0df5d4a418f44c770e1e2dfaab6fede21de9b061d WHIRLPOOL 1829a4ffb28fa127ec5944492205c16c564e1fbb8874bc497e61576edf015c74b4c47f0792e94b6c05c5b251f058879ff76ee5a71572d566b53fd4c165538a7d
 AUX truecrypt.init 729 SHA256 6530577c5f86800a7d92a76b927538006a27f57cf517c6f2bdb793cebaa70b59 SHA512 0bb428457c5c5f5a5f5979291edbdba5fea6461e8a8103deab484b52746f677fd6e337650770eff8e52f7656d22436348d3589f60a17d2ec560be38d4b5028e3 WHIRLPOOL 3e3489fdf1cc4101e3ecb4a75f7f50d7d83fb89c43da72dca8daa8f7fd36901faf4ad1494a1e67d17f3d251d1b4e92383acb6a29d286c2ae0fde021c93b82960
 DIST truecrypt-7.1a-pkcs11.h 43544 SHA256 662d39cec5a0063c8aacc430d4fcba4b31b80a174f1e824dcc359f1c1420bc2c SHA512 bffce5344383a07c4313c30ee1cb0ed7063a749527521bd964263deb5d951cc181acf9c4386bcd2ad44d40be35b3a08d56b1404730b4994e43760db71649ef3c WHIRLPOOL bc5bfbcf711f8d8d8f13625bd2ea98b195662ca458b9186a6a1a01f51897ba1e9a488b91ddfec97af7fdbb770637db27b5c124ba5fa376a415c512af3c6aac74
 DIST truecrypt-7.1a.tar.gz 1949303 SHA256 e6214e911d0bbededba274a2f8f8d7b3f6f6951e20f1c3a598fc7a23af81c8dc SHA512 b5e766023168015cb91bfd85c9e2621055dd98408215e02704775861b5070c5a0234a00c64c1bf7faa34e6d0b51ac71cd36169dd7a6f84d7a34ad0cfa304796a WHIRLPOOL 5e7f4360746a30639aea96eaf4deac268289c111c0efa96f50487527f04064992c26ad4c8ae0fd565d80e77f0ce8add82b03930d877fe5adedc8a733b482fe38
-EBUILD truecrypt-7.1a.ebuild 3574 SHA256 5b3ed900fe506b91c9ee2d0021943d8217097b3c849d3ac5b908a4a71137666c SHA512 c0b568f7e3d5499dd18592f4bdecc299dee87c73bfa1c63b651d1dbefec8c4b9c9992b7c660c53dde86f5944ca4f13cca88c000dfd67be2f4093204f91995687 WHIRLPOOL 1211a6ffaa14c1f1dab2a96af9969ebcd4e80e3de00ee0bbd3bf328e22b4c2853c8a9c38ad6faaf70e85645b0ff8fea1d33c999d960769095e377cc1cee9e1dc
-MISC ChangeLog 14218 SHA256 9c4205cc958b242af92742fa54080733c858f796bdef89c87a94dd9f05604e52 SHA512 fdb77ad596ab6a55bb3ff9b4b0365961c5e45d969845a3a4b9196176c6c2a7989c74c1113657ba936081caa24d42489dcf0438e0e8d8a81364abd914444b68e5 WHIRLPOOL 24c0dcb41c341cdaa30de9c63d160371edc2716a67b2fd1bf3f5e46f30fcf519fb2b903d14a1418cb584d511b532ab47c2f7bae3d9a558fa163eb525224fdbee
+EBUILD truecrypt-7.1a.ebuild 3549 SHA256 34fa5b59dc9bee577bf03938c9fd14674d7c2ec362d71ae34d1c88de61d7836d SHA512 d89b4dd9429bf6024a6032236de64fa38a7b35e6c289b06bf78506a21cda1435840e7b9bd04add64662998e3176b8ac2f74fbd4e31ca8b31bbb86b19f19065c3 WHIRLPOOL 4be8b915b993b655b2a05a68a6dc10335396c048a65e7f36864f1b5b1aa78e0106b7e2c6561eac779d5d1f3bf5e7f9e7796e5553866b75c91e7853363076c53a
+MISC ChangeLog 14386 SHA256 4c93d43b9da29c8b22987cc682fd5726b7fdf5471cb9436f0c818587f39540f5 SHA512 6bea5666f9806eeca5a473e0c9a8e77ecb8ce3554f0f5032b6062adda2c90fa48ba6e45f7c4001aa0d60d6343019638a6ce7a6a3a3957bc4836f38eb2a62680d WHIRLPOOL b4b4730b6fd064c6f447ea2294d538a1e29f23853e7233fa0884f0be49f9bf3785b3f1b5c79709f0365a720a53425ab39f3bcd66c748f2fb879bf5db68f06125
 MISC metadata.xml 324 SHA256 98798fa8e84e321b7de3b6fec7d34a74b89fa152c1389baaed83c014c65b37a2 SHA512 13d1d8cbda324c897efaab25c346f2a1bb30267471b27a940c6d2b8f79315cb17a1a78fd2173825c27a5c404c7659c25d22749c59bb5325442fc0f276ee5503b WHIRLPOOL 88d253b3284735a616c3a2f5736a7079455b0cf7d50cd0b82833523729576bc43a643dd4bae9cf00f95b809831e5a4fd0227c620b08129cbcf674ae997561061
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJRY+oXAAoJEEdUh39IaPFNQ9wH/3N3hH5a8yJyRWm9Fc2m8kon
+CsGdhGuJE8GZy0U0zwa7a4O1knUqWSqlbzxxos23DFFyQWDp/Y+U7YcKt4RMupD5
+Rq2dOCbxMRQr9sJoYufUcohMNTCFbHcOeCGqETDCG/CMmtWrcKmMgdIESu0OkhgA
+sCVK36ucV6sid304xcLC+jdJYmp9xQ0tvmbVVSQyWihKE7plczNm+1sde9d+YBUn
+UrqdQStpP+XU1EJianwlWWO48cmGqzddp7Xd44pm0RXs//luFIR/eT1pkh0nU2xQ
+itBR8z/TZxRfZ0sdSPAVJQHrhEG9mTpsuzHlHM476pV0r2ZWE5+ynHuse9xPibk=
+=gH39
+-----END PGP SIGNATURE-----
diff --git a/app-crypt/truecrypt/truecrypt-7.1a.ebuild b/app-crypt/truecrypt/truecrypt-7.1a.ebuild
index 87eca808d266..e40c51bec8a2 100644
--- a/app-crypt/truecrypt/truecrypt-7.1a.ebuild
+++ b/app-crypt/truecrypt/truecrypt-7.1a.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-7.1a.ebuild,v 1.5 2012/12/22 00:10:44 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/truecrypt/truecrypt-7.1a.ebuild,v 1.6 2013/04/09 10:14:47 ssuominen Exp $
 
 EAPI="4"
 
@@ -17,7 +17,7 @@ KEYWORDS="-* ~amd64 ~ppc ~x86"
 IUSE="X +asm"
 RESTRICT="mirror fetch bindist"
 
-RDEPEND="|| ( >=sys-fs/lvm2-2.02.45 sys-fs/device-mapper )
+RDEPEND=">=sys-fs/lvm2-2.02.45
 	sys-fs/fuse
 	x11-libs/wxGTK:2.8[X?]
 	app-admin/sudo"