diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-09-07 04:02:54 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-09-07 04:02:54 +0000 |
| commit | bf1bc35ab4bd2319a1b7613f1d371032721fe606 (patch) | |
| tree | c7b916bad6c98b12410490a8e30984b929f7454b /sys-fs/cryptsetup | |
| parent | Clear DISTRO env var #381311 by Nick Bowler. (diff) | |
| download | gentoo-2-bf1bc35ab4bd2319a1b7613f1d371032721fe606.tar.gz gentoo-2-bf1bc35ab4bd2319a1b7613f1d371032721fe606.tar.bz2 gentoo-2-bf1bc35ab4bd2319a1b7613f1d371032721fe606.zip | |
Pull in util-linux for uuid and require static/static-libs properly #381197 by Vasileios Lourdas, and drop older deps that are no longer in the tree.
(Portage version: 2.2.0_alpha51/cvs/Linux x86_64)
Diffstat (limited to 'sys-fs/cryptsetup')
| -rw-r--r-- | sys-fs/cryptsetup/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild | 8 |
2 files changed, 10 insertions, 4 deletions
diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog index f60c90f1a4f3..ca3ebdb0b9c8 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.116 2011/08/07 23:41:05 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.117 2011/09/07 04:02:54 vapier Exp $ + + 07 Sep 2011; Mike Frysinger <vapier@gentoo.org> cryptsetup-1.2.0-r1.ebuild: + Pull in util-linux for uuid and require static/static-libs properly #381197 + by Vasileios Lourdas, and drop older deps that are no longer in the tree. 07 Aug 2011; Mike Frysinger <vapier@gentoo.org> files/1.1.3-dm-crypt-start.sh: diff --git a/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild index 44be3f83267a..a29a8f6a0275 100644 --- a/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild +++ b/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild,v 1.7 2011/03/17 16:32:10 ssuominen Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild,v 1.8 2011/09/07 04:02:54 vapier Exp $ EAPI="2" @@ -23,6 +23,7 @@ RDEPEND=">=sys-fs/lvm2-2.02.64 !static? ( dev-libs/libgpg-error >=dev-libs/popt-1.7 + >=sys-apps/util-linux-2.17.2 ) >=sys-fs/udev-124 || ( >=sys-libs/e2fsprogs-libs-1.41 <sys-fs/e2fsprogs-1.41 ) @@ -30,8 +31,9 @@ RDEPEND=">=sys-fs/lvm2-2.02.64 !sys-fs/cryptsetup-luks" DEPEND="${RDEPEND} static? ( - || ( >=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/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[static-libs] )" |