From 877eb491814ebe3a790bfedba949db8d6ef02d86 Mon Sep 17 00:00:00 2001
From: Samuli Suominen <ssuominen@gentoo.org>
Date: Thu, 17 Mar 2011 16:25:12 +0000
Subject: Fix dev-libs/popt USE static-libs depend.

(Portage version: 2.2.0_alpha27/cvs/Linux x86_64)
---
 sys-fs/cryptsetup/ChangeLog                  | 6 +++++-
 sys-fs/cryptsetup/cryptsetup-1.1.3-r3.ebuild | 3 ++-
 sys-fs/cryptsetup/cryptsetup-1.2.0-r1.ebuild | 5 +++--
 3 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'sys-fs/cryptsetup')

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/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]
 	)"
 
-- 
cgit v1.2.3-65-gdbad