diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2011-01-17 19:51:48 +0000 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2011-01-17 19:51:48 +0000 |
| commit | 3034716520b49a26da7236a71611978be9725a3f (patch) | |
| tree | 31a7b2fdd2af51091ff16d14c6265cf0d8d6bda3 /sys-fs/cryptsetup | |
| parent | Revert previous commit and apply the patch in revision bump for 4.5.5 (diff) | |
| download | gentoo-2-3034716520b49a26da7236a71611978be9725a3f.tar.gz gentoo-2-3034716520b49a26da7236a71611978be9725a3f.tar.bz2 gentoo-2-3034716520b49a26da7236a71611978be9725a3f.zip | |
Require new dev-libs/libgcrypt[static-libs] too #351810.
(Portage version: 2.2.0_alpha13/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.1.3-r3.ebuild | 9 | ||||
| -rw-r--r-- | sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild | 7 |
3 files changed, 17 insertions, 5 deletions
diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog index 22b4cff7ecd0..28b0d75848aa 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.109 2011/01/15 23:44:17 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.110 2011/01/17 19:51:48 vapier Exp $ + + 17 Jan 2011; Mike Frysinger <vapier@gentoo.org> + cryptsetup-1.1.3-r3.ebuild, cryptsetup-1.2.0-r1.ebuild: + Require new dev-libs/libgcrypt[static-libs] too #351810. 15 Jan 2011; Mike Frysinger <vapier@gentoo.org> cryptsetup-1.2.0-r1.ebuild: diff --git a/sys-fs/cryptsetup/cryptsetup-1.1.3-r3.ebuild b/sys-fs/cryptsetup/cryptsetup-1.1.3-r3.ebuild index c74f8132407a..d45ef69d417c 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 # 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.1 2011/01/12 23:36:42 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.1.3-r3.ebuild,v 1.2 2011/01/17 19:51:48 vapier Exp $ EAPI="2" @@ -18,7 +18,7 @@ IUSE="dynamic nls selinux" S=${WORKDIR}/${MY_P} -DEPEND=">=sys-fs/lvm2-2.02.64 +RDEPEND=">=sys-fs/lvm2-2.02.64 >=dev-libs/libgcrypt-1.1.42 >=dev-libs/libgpg-error-1.0-r1 >=dev-libs/popt-1.7 @@ -26,6 +26,11 @@ DEPEND=">=sys-fs/lvm2-2.02.64 || ( >=sys-libs/e2fsprogs-libs-1.41 <sys-fs/e2fsprogs-1.41 ) selinux? ( sys-libs/libselinux ) !sys-fs/cryptsetup-luks" +DEPEND="${RDEPEND} + !dynamic? ( + || ( >=dev-libs/libgpg-error-1.10[static-libs] <dev-libs/libgpg-error-1.10 ) + dev-libs/libgcrypt[static-libs] + )" pkg_setup() { local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC" diff --git a/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild index 3c3e2add3304..f943d4129b73 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.4 2011/01/15 23:44:17 vapier Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild,v 1.5 2011/01/17 19:51:48 vapier Exp $ EAPI="2" @@ -27,7 +27,10 @@ RDEPEND=">=sys-fs/lvm2-2.02.64 selinux? ( sys-libs/libselinux ) !sys-fs/cryptsetup-luks" DEPEND="${RDEPEND} - static? ( || ( >=dev-libs/libgpg-error-1.10[static-libs] <dev-libs/libgpg-error-1.10 ) )" + static? ( + || ( >=dev-libs/libgpg-error-1.10[static-libs] <dev-libs/libgpg-error-1.10 ) + dev-libs/libgcrypt[static-libs] + )" pkg_setup() { local CONFIG_CHECK="~DM_CRYPT ~CRYPTO ~CRYPTO_CBC" |