Require new dev-libs/libgcrypt[static-libs] too #351810.

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

4 files changed, 23 insertions, 11 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/Manifest b/sys-fs/cryptsetup/Manifest
index bfc08a4fa604..cbf32204d713 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -16,14 +16,14 @@ DIST cryptsetup-1.1.3.tar.bz2 499276 RMD160 bf2e724779174a3cd6ce9d592e17c70979f2
 DIST cryptsetup-1.2.0.tar.bz2 523859 RMD160 8f1ce6d72a056e9c98996be85041569e96abff24 SHA1 fa9383eda40655311f2dfe751e061b0111c73908 SHA256 411129817ff29e6a957bcbdcd9a2c4c953c1539acd8af912c383262ba901b5ea
 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 3149 RMD160 cc0f623d0e0e9f8a0f03790410374950ce4d1e87 SHA1 c640988703966d2d406abb4cfa53f8d630894d43 SHA256 ab314f0503db7d5b34a3f6c7b6836c2d3d94e7afbae2aaa23a8947f8e9d741fd
-EBUILD cryptsetup-1.2.0-r1.ebuild 3438 RMD160 a3ac59cc4944e1c44e3ba7ce585295951deaef53 SHA1 114e54a62bbfcc1afa67687b938fd5a294418619 SHA256 597b8f0aacf67f50ef61b5d6cf2e4c4574df3094244a43bcad757ee4cd78e595
-MISC ChangeLog 15957 RMD160 23beb10e7392341145bdfccf50486dd7e10650de SHA1 4fd5c2c91ab2ee250359630392b7eb499f743d65 SHA256 8854bba57023fbe33a0955d9890af734815e9a449625c69c554ef72958464210
+EBUILD cryptsetup-1.1.3-r3.ebuild 3299 RMD160 404de2c14ef6aa0941180501e0253a67809fc7ae SHA1 9479c1d55c3c37c9e879ab78e55d2025f4052b6a SHA256 c49e916171c84b7c22df7c68ceccec175b754b77d0a04a3505447a30d4bce8ab
+EBUILD cryptsetup-1.2.0-r1.ebuild 3475 RMD160 07da1846e263590d4a4f2b9c69e8b5329c99e9d5 SHA1 1f5044776dc9d33df37a39130f87334dbf6c951d SHA256 2eac3faba9339ae689d4e06186c9018ffa3e69399e86932e82d16bbb97d50f2a
+MISC ChangeLog 16125 RMD160 e7367b10eff710466cedb4b4a53846b8dd200d27 SHA1 6539c1f7aff249502fbc01dcf0aecc6bcb088441 SHA256 cd3ff556af343df0dbe015c368c935222ad14139324416c36aefcbbdb14dce62
 MISC metadata.xml 239 RMD160 81512c49e64b6e70c7b746ba09d3e6fce4c7bc89 SHA1 c4085a72e46fe6bcea5bdff780007791eae6db4b SHA256 aebd5282fb892100f348eba1ed27edd27e7296356897c6f5314674f8abb4b51a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAk0yMXQACgkQaC/OocHi7JaeFwEAjb1zXGTLGW08TM6WXsH9kMRQ
-IY1ubB/2LvuC8X9lcAoA/3zvajGjJuaXPbGeYPmwH8qLgNdruZ1aDuA8aSxHL27y
-=aFUo
+iF4EAREIAAYFAk00ngEACgkQaC/OocHi7Ja54QEAnm+VlGVyClsa3SlHvL9N85Iy
+urdp4rRReeNO7HFdgQsA/0ovWR4lylpHF9sa+HuUzdMUEXSDJv8We+cQqh4VUGL8
+=IAdA
 -----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 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"