summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobin H. Johnson <robbat2@gentoo.org>2012-02-27 08:31:00 +0000
committerRobin H. Johnson <robbat2@gentoo.org>2012-02-27 08:31:00 +0000
commit6650da12da5470e3b430c593ad8be02e436ae3fa (patch)
tree9458ab5981efc6f13eea2bdb7d2d9cd85f934ef5
parentRestricting pypy and jython (diff)
downloadgentoo-2-6650da12da5470e3b430c593ad8be02e436ae3fa.tar.gz
gentoo-2-6650da12da5470e3b430c593ad8be02e436ae3fa.tar.bz2
gentoo-2-6650da12da5470e3b430c593ad8be02e436ae3fa.zip
Stable version is bitten by the util-linux static-libs as well, per https://forums.gentoo.org/viewtopic-t-914468.html.
(Portage version: 2.2.0_alpha89/cvs/Linux x86_64)
-rw-r--r--sys-fs/cryptsetup/ChangeLog8
-rw-r--r--sys-fs/cryptsetup/cryptsetup-1.1.3-r3.ebuild8
2 files changed, 11 insertions, 5 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/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() {