Move libassuan to DEPEND per bug#179663

(Portage version: 2.1.2.9)

9 files changed, 23 insertions, 17 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index c40ec8dec293..bb5b4c7dfbc2 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.292 2007/06/07 18:25:47 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.293 2007/06/13 08:05:52 alonbl Exp $
+
+  13 Jun 2007; Alon Bar-Lev <alonbl@gentoo.org> gnupg-1.9.21.ebuild,
+  gnupg-1.9.21-r1.ebuild, gnupg-1.9.22.ebuild, gnupg-1.9.94.ebuild,
+  gnupg-2.0.2.ebuild, gnupg-2.0.3.ebuild, gnupg-2.0.3-r1.ebuild,
+  gnupg-2.0.4.ebuild:
+  Move libassuan to DEPEND per bug#179663
 
   07 Jun 2007; Raúl Porcel <armin76@gentoo.org> gnupg-1.4.7-r1.ebuild:
   alpha stable wrt #177747
diff --git a/app-crypt/gnupg/gnupg-1.9.21-r1.ebuild b/app-crypt/gnupg/gnupg-1.9.21-r1.ebuild
index 0b1d3136d7a2..5d4f24dc49bb 100644
--- a/app-crypt/gnupg/gnupg-1.9.21-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-1.9.21-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.21-r1.ebuild,v 1.6 2007/01/24 17:05:34 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.21-r1.ebuild,v 1.7 2007/06/13 08:05:52 alonbl Exp $
 
 WANT_AUTOMAKE='latest'
 
@@ -21,7 +21,6 @@ COMMON_DEPEND="
 	>=dev-libs/libgcrypt-1.1.94
 	>=dev-libs/libksba-0.9.15
 	>=dev-libs/libgpg-error-1.0
-	~dev-libs/libassuan-0.6.10
 	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
 	openct? ( >=dev-libs/openct-0.5.0 )
 	ldap? ( net-nds/openldap )"
@@ -29,6 +28,7 @@ COMMON_DEPEND="
 #	X? ( app-crypt/pinentry )
 
 DEPEND="${COMMON_DEPEND}
+	~dev-libs/libassuan-0.6.10
 	nls? ( sys-devel/gettext )"
 
 RDEPEND="${COMMON_DEPEND}
diff --git a/app-crypt/gnupg/gnupg-1.9.21.ebuild b/app-crypt/gnupg/gnupg-1.9.21.ebuild
index aadac0340920..9dbab9a52caa 100644
--- a/app-crypt/gnupg/gnupg-1.9.21.ebuild
+++ b/app-crypt/gnupg/gnupg-1.9.21.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.21.ebuild,v 1.15 2007/01/25 20:30:47 eroyf Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.21.ebuild,v 1.16 2007/06/13 08:05:52 alonbl Exp $
 
 WANT_AUTOMAKE='latest'
 
@@ -25,11 +25,11 @@ COMMON_DEPEND="
 	>=dev-libs/libgcrypt-1.1.94
 	>=dev-libs/libksba-0.9.15
 	>=dev-libs/libgpg-error-1.0
-	~dev-libs/libassuan-0.6.10
 	ldap? ( net-nds/openldap )"
 #	caps? ( sys-libs/libcap )"
 
 DEPEND="${COMMON_DEPEND}
+	~dev-libs/libassuan-0.6.10
 	nls? ( sys-devel/gettext )"
 
 RDEPEND="${COMMON_DEPEND}
diff --git a/app-crypt/gnupg/gnupg-1.9.22.ebuild b/app-crypt/gnupg/gnupg-1.9.22.ebuild
index 2f4dce6be132..23187d5c12d5 100644
--- a/app-crypt/gnupg/gnupg-1.9.22.ebuild
+++ b/app-crypt/gnupg/gnupg-1.9.22.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.22.ebuild,v 1.6 2007/01/24 17:05:34 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.22.ebuild,v 1.7 2007/06/13 08:05:52 alonbl Exp $
 
 WANT_AUTOMAKE='latest'
 
@@ -21,7 +21,6 @@ COMMON_DEPEND="
 	>=dev-libs/libgcrypt-1.1.94
 	>=dev-libs/libksba-0.9.15
 	>=dev-libs/libgpg-error-1.3
-	>=dev-libs/libassuan-0.9.2
 	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
 	openct? ( >=dev-libs/openct-0.5.0 )
 	ldap? ( net-nds/openldap )"
@@ -29,6 +28,7 @@ COMMON_DEPEND="
 #	X? ( app-crypt/pinentry )
 
 DEPEND="${COMMON_DEPEND}
+	>=dev-libs/libassuan-0.9.2
 	nls? ( sys-devel/gettext )
 	doc? ( sys-apps/texinfo )"
 
diff --git a/app-crypt/gnupg/gnupg-1.9.94.ebuild b/app-crypt/gnupg/gnupg-1.9.94.ebuild
index ca86314424f6..f91661d24a94 100644
--- a/app-crypt/gnupg/gnupg-1.9.94.ebuild
+++ b/app-crypt/gnupg/gnupg-1.9.94.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.94.ebuild,v 1.8 2007/01/24 17:05:34 genone Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-1.9.94.ebuild,v 1.9 2007/06/13 08:05:52 alonbl Exp $
 
 WANT_AUTOMAKE='latest'
 
@@ -21,7 +21,6 @@ COMMON_DEPEND="
 	>=dev-libs/libgcrypt-1.2.0
 	>=dev-libs/libksba-1.0.0
 	>=dev-libs/libgpg-error-1.4
-	>=dev-libs/libassuan-0.9.3
 	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
 	openct? ( >=dev-libs/openct-0.5.0 )
 	ldap? ( net-nds/openldap )"
@@ -29,6 +28,7 @@ COMMON_DEPEND="
 #	X? ( app-crypt/pinentry )
 
 DEPEND="${COMMON_DEPEND}
+	>=dev-libs/libassuan-0.9.3
 	nls? ( sys-devel/gettext )
 	doc? ( sys-apps/texinfo )"
 
diff --git a/app-crypt/gnupg/gnupg-2.0.2.ebuild b/app-crypt/gnupg/gnupg-2.0.2.ebuild
index 1bdf279f5311..7addf033767f 100644
--- a/app-crypt/gnupg/gnupg-2.0.2.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.2.ebuild,v 1.3 2007/02/08 15:29:59 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.2.ebuild,v 1.4 2007/06/13 08:05:52 alonbl Exp $
 
 inherit eutils flag-o-matic autotools
 
@@ -19,7 +19,6 @@ COMMON_DEPEND="
 	>=dev-libs/libgcrypt-1.2.0
 	>=dev-libs/libksba-1.0.0
 	>=dev-libs/libgpg-error-1.4
-	>=dev-libs/libassuan-1.0.1
 	>=net-misc/curl-7.7.2
 	bzip2? ( app-arch/bzip2 )
 	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
@@ -28,6 +27,7 @@ COMMON_DEPEND="
 	app-crypt/pinentry"
 
 DEPEND="${COMMON_DEPEND}
+	>=dev-libs/libassuan-1.0.1
 	nls? ( sys-devel/gettext )
 	doc? ( sys-apps/texinfo )"
 
diff --git a/app-crypt/gnupg/gnupg-2.0.3-r1.ebuild b/app-crypt/gnupg/gnupg-2.0.3-r1.ebuild
index abab798c1bc3..95f02dad7632 100644
--- a/app-crypt/gnupg/gnupg-2.0.3-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.3-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.3-r1.ebuild,v 1.1 2007/04/02 09:00:32 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.3-r1.ebuild,v 1.2 2007/06/13 08:05:52 alonbl Exp $
 
 inherit flag-o-matic
 
@@ -19,7 +19,6 @@ COMMON_DEPEND="
 	>=dev-libs/libgcrypt-1.2.0
 	>=dev-libs/libksba-1.0.0
 	>=dev-libs/libgpg-error-1.4
-	>=dev-libs/libassuan-1.0.1
 	>=net-misc/curl-7.7.2
 	bzip2? ( app-arch/bzip2 )
 	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
@@ -28,6 +27,7 @@ COMMON_DEPEND="
 	app-crypt/pinentry"
 
 DEPEND="${COMMON_DEPEND}
+	>=dev-libs/libassuan-1.0.1
 	nls? ( sys-devel/gettext )
 	doc? ( sys-apps/texinfo )"
 
diff --git a/app-crypt/gnupg/gnupg-2.0.3.ebuild b/app-crypt/gnupg/gnupg-2.0.3.ebuild
index a9712ead4e62..652f61293f5b 100644
--- a/app-crypt/gnupg/gnupg-2.0.3.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.3.ebuild,v 1.1 2007/03/08 17:17:17 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.3.ebuild,v 1.2 2007/06/13 08:05:52 alonbl Exp $
 
 inherit flag-o-matic
 
@@ -19,7 +19,6 @@ COMMON_DEPEND="
 	>=dev-libs/libgcrypt-1.2.0
 	>=dev-libs/libksba-1.0.0
 	>=dev-libs/libgpg-error-1.4
-	>=dev-libs/libassuan-1.0.1
 	>=net-misc/curl-7.7.2
 	bzip2? ( app-arch/bzip2 )
 	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
@@ -28,6 +27,7 @@ COMMON_DEPEND="
 	app-crypt/pinentry"
 
 DEPEND="${COMMON_DEPEND}
+	>=dev-libs/libassuan-1.0.1
 	nls? ( sys-devel/gettext )
 	doc? ( sys-apps/texinfo )"
 
diff --git a/app-crypt/gnupg/gnupg-2.0.4.ebuild b/app-crypt/gnupg/gnupg-2.0.4.ebuild
index 61d22d312ed7..a7ea3f5c8e83 100644
--- a/app-crypt/gnupg/gnupg-2.0.4.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.4.ebuild,v 1.1 2007/05/10 04:52:08 alonbl Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.4.ebuild,v 1.2 2007/06/13 08:05:52 alonbl Exp $
 
 inherit flag-o-matic
 
@@ -19,7 +19,6 @@ COMMON_DEPEND="
 	>=dev-libs/libgcrypt-1.2.0
 	>=dev-libs/libksba-1.0.0
 	>=dev-libs/libgpg-error-1.4
-	>=dev-libs/libassuan-1.0.1
 	>=net-misc/curl-7.7.2
 	bzip2? ( app-arch/bzip2 )
 	pcsc-lite? ( >=sys-apps/pcsc-lite-1.3.0 )
@@ -28,6 +27,7 @@ COMMON_DEPEND="
 	app-crypt/pinentry"
 
 DEPEND="${COMMON_DEPEND}
+	>=dev-libs/libassuan-1.0.1
 	nls? ( sys-devel/gettext )
 	doc? ( sys-apps/texinfo )"