Fix dev-libs/popt USE static-libs depend.

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

4 files changed, 13 insertions, 7 deletions

diff --git a/sys-fs/cryptsetup/ChangeLog b/sys-fs/cryptsetup/ChangeLog
index e735f7dadf6f..294d42c641c7 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.114 2011/01/22 21:28:15 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/ChangeLog,v 1.115 2011/03/17 16:25:12 ssuominen Exp $
+
+  17 Mar 2011; Samuli Suominen <ssuominen@gentoo.org>
+  cryptsetup-1.1.3-r3.ebuild, cryptsetup-1.2.0-r1.ebuild:
+  Fix dev-libs/popt USE static-libs depend.
 
   22 Jan 2011; Raúl Porcel <armin76@gentoo.org> cryptsetup-1.1.3-r3.ebuild:
   alpha/ia64/s390/sh/sparc stable wrt #350044
diff --git a/sys-fs/cryptsetup/Manifest b/sys-fs/cryptsetup/Manifest
index 308cbf6914fc..7bc83ee762a2 100644
--- a/sys-fs/cryptsetup/Manifest
+++ b/sys-fs/cryptsetup/Manifest
@@ -13,7 +13,7 @@ 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 3293 RMD160 c095aedd7be46ffa3790a5fb43d827abe592f09a SHA1 1a651539fb1c5420ce8b509e63c6b2acf9ac1934 SHA256 addcc2a265a66b33e7fe8be0b47c7da0593c16ff15026145913697134c7146e5
-EBUILD cryptsetup-1.2.0-r1.ebuild 3475 RMD160 07da1846e263590d4a4f2b9c69e8b5329c99e9d5 SHA1 1f5044776dc9d33df37a39130f87334dbf6c951d SHA256 2eac3faba9339ae689d4e06186c9018ffa3e69399e86932e82d16bbb97d50f2a
-MISC ChangeLog 16670 RMD160 d82748346df7d3faf9da87c86bab35cea0aa9c1f SHA1 92672b2eeb532cf37cac38a9b236debd589fec7b SHA256 f70ce6c1aab1e1c210b083208c982e8f863d018ac435d8b8c9765c20c43fe1b2
+EBUILD cryptsetup-1.1.3-r3.ebuild 3364 RMD160 a4e497ae62cc974350460446b173fb3d092afc28 SHA1 e640b856ab39e456ed194da62fe0cf0dc11d76ab SHA256 54733ac01c0e2ec02c02ec6f13e50a24452cf1d7c93135a5bf8141129687ab52
+EBUILD cryptsetup-1.2.0-r1.ebuild 3560 RMD160 0af07b44221e647356a263b0726063cabefd7f37 SHA1 afdbe2633f6abd3098847a5079f0c531c640f36e SHA256 dac8cedcbde475b3cd275b8f01468e679caaa0955dc5217dc71b72f8a651bafa
+MISC ChangeLog 16829 RMD160 c956ad97c6d97595a64c856054c8690806bf2de0 SHA1 e539557419fc7f944fe9e45829b0e81bbbb404c6 SHA256 12e84253deb1051c8f438a6d5236ec82bceeff5ed8429a142c4a7aba7cd498a5
 MISC metadata.xml 239 RMD160 81512c49e64b6e70c7b746ba09d3e6fce4c7bc89 SHA1 c4085a72e46fe6bcea5bdff780007791eae6db4b SHA256 aebd5282fb892100f348eba1ed27edd27e7296356897c6f5314674f8abb4b51a
diff --git a/sys-fs/cryptsetup/cryptsetup-1.1.3-r3.ebuild b/sys-fs/cryptsetup/cryptsetup-1.1.3-r3.ebuild
index 0d4e900b3b90..37485f7a82e7 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.5 2011/01/22 21:28:15 armin76 Exp $
+# $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 $
 
 EAPI="2"
 
@@ -29,6 +29,7 @@ RDEPEND=">=sys-fs/lvm2-2.02.64
 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]
 	)"
 
diff --git a/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild b/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild
index f943d4129b73..c75e40fd93a2 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.5 2011/01/17 19:51:48 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild,v 1.6 2011/03/17 16:25:12 ssuominen Exp $
 
 EAPI="2"
 
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 RDEPEND=">=sys-fs/lvm2-2.02.64
 	>=dev-libs/libgcrypt-1.1.42
 	!static? ( dev-libs/libgpg-error )
-	>=dev-libs/popt-1.7
+	!static? ( >=dev-libs/popt-1.7 )
 	>=sys-fs/udev-124
 	|| ( >=sys-libs/e2fsprogs-libs-1.41 <sys-fs/e2fsprogs-1.41 )
 	selinux? ( sys-libs/libselinux )
@@ -29,6 +29,7 @@ RDEPEND=">=sys-fs/lvm2-2.02.64
 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/libgcrypt[static-libs]
 	)"