Stable version is bitten by the util-linux static-libs as well, per https://forums.gentoo.org/viewtopic-t-914468.html.

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

3 files changed, 13 insertions, 17 deletions

diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index 8a4edf25e9a3..65d8c5bf8833 100644
--- a/sys-fs/cryptsetup/ChangeLog
+++ b/sys-fs/cryptsetup/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-fs/cryptsetup
-# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.121 2011/11/20 23:32:22 vapier Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.122 2012/02/27 08:31:00 robbat2 Exp $
+
+  27 Feb 2012; Robin H. Johnson <robbat2@gentoo.org> cryptsetup-1.1.3-r3.ebuild:
+  Stable version is bitten by the util-linux static-libs as well, per
+  https://forums.gentoo.org/viewtopic-t-914468.html.
 
   20 Nov 2011; Mike Frysinger <vapier@gentoo.org> files/dmcrypt.rc:
   Drop dead prompt code.
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 275f8457c2ca..78ad5f20fcd7 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 RMD160 c74d4fffec325378bb008b28c4225b67577c1d1b SHA1 d7b18d4d4845540baecdde373942cc8966c3d5e3 SHA256 42015047c708aa73eae615559ff76c9c8948a5d01fba68f64c5432e30ec799a4
 AUX 1.0.5-dmcrypt.rc 601 RMD160 b6483b8f5d7726a4fb3ea39190af110eb5502453 SHA1 eaa6d125c83ddfcbd1806e12e2271e117928226a SHA256 0b58b18dc903d0d4a23e5e2df1e6f3c5db64c65b8884e24710e4b7528ea3f8dc
 AUX 1.0.6-dmcrypt.confd 3309 RMD160 23a1a91ae2b2fd4d743bf8e0427cf40e4b24ecd8 SHA1 a4bd74df103227c0aaa1cfcd75908f16c67f843a SHA256 0c30e081c0b8f879964ae49735f10b05a1d92f4f481042851958860945e13271
@@ -18,15 +15,8 @@ DIST cryptsetup-1.2.0.tar.bz2 523859 RMD160 8f1ce6d72a056e9c98996be85041569e96ab
 DIST cryptsetup-1.4.1.tar.bz2 772971 RMD160 4c8a7e1a3a7bd7f2d52591c1b8de21a31edeb780 SHA1 32608be5b146a7bd3999129b086bad8b66c085b9 SHA256 82b143328c2b427ef2b89fb76c701d311c95b54093c21bbf22342f7b393bddcb
 EBUILD cryptsetup-1.0.6-r2.ebuild 3150 RMD160 997496f32ffb972a4d21efb80cb0ccedf2a53197 SHA1 8cbe4f6a69a72faf4916f1992a4ee3febd04114e SHA256 cad92c053518bb11a2acd9e806e471117c462187c8a02f5258e933e093ab2a66
 EBUILD cryptsetup-1.1.2.ebuild 3382 RMD160 c737fb8fb63a11c15c1af86db25fafc8a32e152a SHA1 4cc2311e92c429d519d99c126434b4e2ca6375cf SHA256 6445f68c8a2f1497a771cc07466f0ee6a0b23cdeb257c7db2899a1f7b247d452
-EBUILD cryptsetup-1.1.3-r3.ebuild 3364 RMD160 a4e497ae62cc974350460446b173fb3d092afc28 SHA1 e640b856ab39e456ed194da62fe0cf0dc11d76ab SHA256 54733ac01c0e2ec02c02ec6f13e50a24452cf1d7c93135a5bf8141129687ab52
+EBUILD cryptsetup-1.1.3-r3.ebuild 3467 RMD160 5a95d64bff7d3dafe21ea0176456abea73319b51 SHA1 e60b7e828697ff8ec380f9b84e716e166a553ba5 SHA256 f8785d631199f73b31abeebc9a5dd335a07c124f1688557953b89be462d7b48e
 EBUILD cryptsetup-1.2.0-r1.ebuild 3628 RMD160 98044dce88847e72e1778482bef3ddcc600bae52 SHA1 60a007d06de6b05f78f03b9a4488ca9b463aa446 SHA256 0dff751d075bb47c26c9dd3426f86da7e8e717b08a5daa7dfd05affc509e0b6e
 EBUILD cryptsetup-1.4.1.ebuild 3338 RMD160 44b857d78826b355f15ad864c293530a075bd9ae SHA1 a861ee9e83966fba2df6bd0d6a0d4d3a128ba510 SHA256 8764688bdd4674d3a6adaff02e1acd70d719ba66a445c306da32eaa5836226dc
-MISC ChangeLog 17940 RMD160 17a937ad0de2bb18bea5861a0c310da606f61a65 SHA1 1f4bee329d94ace4267a4225d375b1972285397a SHA256 6d8d670a274fad3df4a1379c12da79e77b2f947f3424265b1a5bc75f426354f8
+MISC ChangeLog 18146 RMD160 0c223c5d78ba7127da5ac8d32682ba236d8a8e56 SHA1 e3edf2a7661ac6e4b539b7d0c57d00059a4cc9d8 SHA256 3a9720eddc0a4a9afe406ac0950332468f53651d5ec5959bfa73f7ec2d9eb172
 MISC metadata.xml 239 RMD160 81512c49e64b6e70c7b746ba09d3e6fce4c7bc89 SHA1 c4085a72e46fe6bcea5bdff780007791eae6db4b SHA256 aebd5282fb892100f348eba1ed27edd27e7296356897c6f5314674f8abb4b51a
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.18 (GNU/Linux)
-
-iF4EAREIAAYFAk7JjgwACgkQaC/OocHi7JYg4gEAjeEtcMu48HpJdImkcCu+6MeI
-i9ScDOcC3ieepJcaeHQA/2phACvxOfmnYrzlejmtEUxqGfgXYjHkYCQtyd3GaL7w
-=9NXx
------END PGP SIGNATURE-----
diff --git a/sys-fs/cryptsetup/cryptsetup-1.1.3-r3.ebuild b/sys-fs/cryptsetup/cryptsetup-1.1.3-r3.ebuild
index 37485f7a82e7..84c261679526 100644
--- a/sys-fs/cryptsetup/cryptsetup-1.1.3-r3.ebuild
+++ b/sys-fs/cryptsetup/cryptsetup-1.1.3-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.6 2011/03/17 16:25:12 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.1.3-r3.ebuild,v 1.7 2012/02/27 08:31:00 robbat2 Exp $
 
 EAPI="2"
 
@@ -25,12 +25,14 @@ RDEPEND=">=sys-fs/lvm2-2.02.64
 	>=sys-fs/udev-124
 	|| ( >=sys-libs/e2fsprogs-libs-1.41 <sys-fs/e2fsprogs-1.41 )
 	selinux? ( sys-libs/libselinux )
-	!sys-fs/cryptsetup-luks"
+	!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[static-libs]
+		|| ( >=sys-apps/util-linux-2.20[static-libs] <sys-apps/util-linux-2.20 )
 	)"
 
 pkg_setup() {