Fix dependencies to accept app-crypt/pinentry-qt.

(Portage version: 2.2_rc88/cvs/Linux x86_64)

8 files changed, 20 insertions, 15 deletions

diff --git a/app-crypt/gnupg/ChangeLog b/app-crypt/gnupg/ChangeLog
index 9b98c4e90dfd..f729401a4929 100644
--- a/app-crypt/gnupg/ChangeLog
+++ b/app-crypt/gnupg/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/gnupg
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.390 2010/09/11 15:18:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/ChangeLog,v 1.391 2010/09/30 18:56:21 ssuominen Exp $
+
+  30 Sep 2010; Samuli Suominen <ssuominen@gentoo.org> gnupg-2.0.11.ebuild,
+  gnupg-2.0.12.ebuild, gnupg-2.0.13.ebuild, gnupg-2.0.14.ebuild,
+  gnupg-2.0.15.ebuild, gnupg-2.0.16.ebuild, gnupg-2.0.16-r1.ebuild:
+  Fix dependencies to accept app-crypt/pinentry-qt.
 
   11 Sep 2010; Raúl Porcel <armin76@gentoo.org> gnupg-2.0.16-r1.ebuild:
   ia64/s390/sh/sparc stable wrt #329583
diff --git a/app-crypt/gnupg/gnupg-2.0.11.ebuild b/app-crypt/gnupg/gnupg-2.0.11.ebuild
index 7b7e455fdb64..41622f379429 100644
--- a/app-crypt/gnupg/gnupg-2.0.11.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.11.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.11.ebuild,v 1.9 2010/01/11 18:52:08 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.11.ebuild,v 1.10 2010/09/30 18:56:21 ssuominen Exp $
 
 inherit flag-o-matic toolchain-funcs
 
@@ -24,7 +24,7 @@ COMMON_DEPEND_LIBS="
 	openct? ( >=dev-libs/openct-0.5.0 )
 	smartcard? ( =virtual/libusb-0* )
 	ldap? ( net-nds/openldap )"
-COMMON_DEPEND_BINS="app-crypt/pinentry"
+COMMON_DEPEND_BINS="|| ( app-crypt/pinentry app-crypt/pinentry-qt )"
 
 # existence of bins are checked during configure
 DEPEND="${COMMON_DEPEND_LIBS}
diff --git a/app-crypt/gnupg/gnupg-2.0.12.ebuild b/app-crypt/gnupg/gnupg-2.0.12.ebuild
index e469ee1ddee2..badde28a1218 100644
--- a/app-crypt/gnupg/gnupg-2.0.12.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.12.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.12.ebuild,v 1.3 2010/01/11 18:52:08 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.12.ebuild,v 1.4 2010/09/30 18:56:21 ssuominen Exp $
 
 EAPI="2"
 
@@ -27,7 +27,7 @@ COMMON_DEPEND_LIBS="
 	openct? ( >=dev-libs/openct-0.5.0 )
 	smartcard? ( =virtual/libusb-0* )
 	ldap? ( net-nds/openldap )"
-COMMON_DEPEND_BINS="app-crypt/pinentry"
+COMMON_DEPEND_BINS="|| ( app-crypt/pinentry app-crypt/pinentry-qt )"
 
 # existence of bins are checked during configure
 DEPEND="${COMMON_DEPEND_LIBS}
diff --git a/app-crypt/gnupg/gnupg-2.0.13.ebuild b/app-crypt/gnupg/gnupg-2.0.13.ebuild
index 462fd1572f32..f914a75f0279 100644
--- a/app-crypt/gnupg/gnupg-2.0.13.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.13.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.13.ebuild,v 1.4 2010/01/11 18:52:08 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.13.ebuild,v 1.5 2010/09/30 18:56:21 ssuominen Exp $
 
 EAPI="2"
 
@@ -28,7 +28,7 @@ COMMON_DEPEND_LIBS="
 	openct? ( >=dev-libs/openct-0.5.0 )
 	smartcard? ( =virtual/libusb-0* )
 	ldap? ( net-nds/openldap )"
-COMMON_DEPEND_BINS="app-crypt/pinentry"
+COMMON_DEPEND_BINS="|| ( app-crypt/pinentry app-crypt/pinentry-qt )"
 
 # existence of bins are checked during configure
 DEPEND="${COMMON_DEPEND_LIBS}
diff --git a/app-crypt/gnupg/gnupg-2.0.14.ebuild b/app-crypt/gnupg/gnupg-2.0.14.ebuild
index b7b4a0d87048..012a528f502f 100644
--- a/app-crypt/gnupg/gnupg-2.0.14.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.14.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.14.ebuild,v 1.9 2010/04/01 21:28:21 abcd Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.14.ebuild,v 1.10 2010/09/30 18:56:21 ssuominen Exp $
 
 EAPI="3"
 
@@ -28,7 +28,7 @@ COMMON_DEPEND_LIBS="
 	openct? ( >=dev-libs/openct-0.5.0 )
 	smartcard? ( =virtual/libusb-0* )
 	ldap? ( net-nds/openldap )"
-COMMON_DEPEND_BINS="app-crypt/pinentry"
+COMMON_DEPEND_BINS="|| ( app-crypt/pinentry app-crypt/pinentry-qt )"
 
 # existence of bins are checked during configure
 DEPEND="${COMMON_DEPEND_LIBS}
diff --git a/app-crypt/gnupg/gnupg-2.0.15.ebuild b/app-crypt/gnupg/gnupg-2.0.15.ebuild
index 23cf971bae8a..ce4fd1230274 100644
--- a/app-crypt/gnupg/gnupg-2.0.15.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.15.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.15.ebuild,v 1.13 2010/08/30 14:01:18 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.15.ebuild,v 1.14 2010/09/30 18:56:21 ssuominen Exp $
 
 EAPI="3"
 
@@ -29,7 +29,7 @@ COMMON_DEPEND_LIBS="
 	openct? ( >=dev-libs/openct-0.5.0 )
 	smartcard? ( =virtual/libusb-0* )
 	ldap? ( net-nds/openldap )"
-COMMON_DEPEND_BINS="app-crypt/pinentry"
+COMMON_DEPEND_BINS="|| ( app-crypt/pinentry app-crypt/pinentry-qt )"
 
 # existence of bins are checked during configure
 DEPEND="${COMMON_DEPEND_LIBS}
diff --git a/app-crypt/gnupg/gnupg-2.0.16-r1.ebuild b/app-crypt/gnupg/gnupg-2.0.16-r1.ebuild
index 5cadce0fa07a..d43d1f637bfc 100644
--- a/app-crypt/gnupg/gnupg-2.0.16-r1.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.16-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.16-r1.ebuild,v 1.10 2010/09/11 15:18:01 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.16-r1.ebuild,v 1.11 2010/09/30 18:56:21 ssuominen Exp $
 
 EAPI="3"
 
@@ -29,7 +29,7 @@ COMMON_DEPEND_LIBS="
 	openct? ( >=dev-libs/openct-0.5.0 )
 	smartcard? ( =virtual/libusb-0* )
 	ldap? ( net-nds/openldap )"
-COMMON_DEPEND_BINS="app-crypt/pinentry"
+COMMON_DEPEND_BINS="|| ( app-crypt/pinentry app-crypt/pinentry-qt )"
 
 # existence of bins are checked during configure
 DEPEND="${COMMON_DEPEND_LIBS}
diff --git a/app-crypt/gnupg/gnupg-2.0.16.ebuild b/app-crypt/gnupg/gnupg-2.0.16.ebuild
index 4b57e91ba3c1..6bacabaf1813 100644
--- a/app-crypt/gnupg/gnupg-2.0.16.ebuild
+++ b/app-crypt/gnupg/gnupg-2.0.16.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.16.ebuild,v 1.1 2010/07/19 17:04:07 arfrever Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/gnupg/gnupg-2.0.16.ebuild,v 1.2 2010/09/30 18:56:21 ssuominen Exp $
 
 EAPI="3"
 
@@ -29,7 +29,7 @@ COMMON_DEPEND_LIBS="
 	openct? ( >=dev-libs/openct-0.5.0 )
 	smartcard? ( =virtual/libusb-0* )
 	ldap? ( net-nds/openldap )"
-COMMON_DEPEND_BINS="app-crypt/pinentry"
+COMMON_DEPEND_BINS="|| ( app-crypt/pinentry app-crypt/pinentry-qt )"
 
 # existence of bins are checked during configure
 DEPEND="${COMMON_DEPEND_LIBS}