[patch] evolution-gnupg-2.0-support.patch

evolution-gnupg-2.0-support.patch (text/plain), 3.52 KB, created by Robin Johnson on 2007-01-05 11:17:53 UTC

Index: evolution-2.6.2-r1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.6.2-r1.ebuild,v
retrieving revision 1.10
diff -u -3 -p -w -b -B -r1.10 evolution-2.6.2-r1.ebuild
--- evolution-2.6.2-r1.ebuild	21 Nov 2006 01:40:57 -0000	1.10
+++ evolution-2.6.2-r1.ebuild	5 Jan 2007 19:14:04 -0000
@@ -45,7 +45,7 @@ RDEPEND=">=x11-themes/gnome-icon-theme-1
 		>=app-pda/gnome-pilot-2
 		>=app-pda/gnome-pilot-conduits-2 )
 	spell? ( >=app-text/gnome-spell-1.0.5 )
-	crypt? ( >=app-crypt/gnupg-1.2.2 )
+ 	crypt? ( || ( =app-crypt/gnupg-1.4* >=app-crypt/gnupg-2.0.1-r2  ) )
 	ssl? ( >=dev-libs/nspr-4.6.1
 		   >=dev-libs/nss-3.11 )
 	ldap? ( >=net-nds/openldap-2 )
@@ -87,6 +87,12 @@ pkg_setup() {
 		$(use_with ldap openldap)        \
 		$(use_with kerberos krb5 /usr)"
 
+	if use crypt && has_version '>=app-crypt/gnupg-2.0.1-r2'; then
+		if ! built_with_use app-crypt/pinentry gtk || ! built_with_use app-crypt/pinentry qt3; then
+			die "You must build app-crypt/pinentry with GTK or QT support"
+		fi
+	fi
+
 	if use krb4 && ! built_with_use virtual/krb5 krb4; then
 		ewarn
 		ewarn "In order to add kerberos 4 support, you have to emerge"
Index: evolution-2.8.1.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.8.1.1.ebuild,v
retrieving revision 1.3
diff -u -3 -p -w -b -B -r1.3 evolution-2.8.1.1.ebuild
--- evolution-2.8.1.1.ebuild	21 Nov 2006 01:40:57 -0000	1.3
+++ evolution-2.8.1.1.ebuild	5 Jan 2007 19:14:04 -0000
@@ -42,7 +42,7 @@ RDEPEND=">=x11-themes/gnome-icon-theme-1
 		>=app-pda/gnome-pilot-2
 		>=app-pda/gnome-pilot-conduits-2 )
 	spell? ( >=app-text/gnome-spell-1.0.5 )
-	crypt? ( >=app-crypt/gnupg-1.2.2 )
+	crypt? ( || ( =app-crypt/gnupg-1.4* >=app-crypt/gnupg-2.0.1-r2  ) )
 	ssl? (
 		>=dev-libs/nspr-4.6.1
 		>=dev-libs/nss-3.11 )
@@ -85,6 +85,12 @@ pkg_setup() {
 		$(use_with ldap openldap)        \
 		$(use_with kerberos krb5 /usr)"
 
+	if use crypt && has_version '>=app-crypt/gnupg-2.0.1-r2'; then
+		if ! built_with_use app-crypt/pinentry gtk || ! built_with_use app-crypt/pinentry qt3; then
+			die "You must build app-crypt/pinentry with GTK or QT support"
+		fi
+	fi
+
 	if use krb4 && ! built_with_use virtual/krb5 krb4; then
 		ewarn
 		ewarn "In order to add kerberos 4 support, you have to emerge"
Index: evolution-2.8.2.1.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/mail-client/evolution/evolution-2.8.2.1.ebuild,v
retrieving revision 1.6
diff -u -3 -p -w -b -B -r1.6 evolution-2.8.2.1.ebuild
--- evolution-2.8.2.1.ebuild	21 Dec 2006 13:12:22 -0000	1.6
+++ evolution-2.8.2.1.ebuild	5 Jan 2007 19:14:04 -0000
@@ -42,7 +42,7 @@ RDEPEND=">=x11-themes/gnome-icon-theme-1
 		>=app-pda/gnome-pilot-2
 		>=app-pda/gnome-pilot-conduits-2 )
 	spell? ( >=app-text/gnome-spell-1.0.5 )
-	crypt? ( >=app-crypt/gnupg-1.2.2 )
+	crypt? ( || ( =app-crypt/gnupg-1.4* >=app-crypt/gnupg-2.0.1-r2  ) )
 	ssl? (
 		>=dev-libs/nspr-4.6.1
 		>=dev-libs/nss-3.11 )
@@ -85,6 +85,12 @@ pkg_setup() {
 		$(use_with ldap openldap)        \
 		$(use_with kerberos krb5 /usr)"
 
+	if use crypt && has_version '>=app-crypt/gnupg-2.0.1-r2'; then
+		if ! built_with_use app-crypt/pinentry gtk || ! built_with_use app-crypt/pinentry qt3; then
+			die "You must build app-crypt/pinentry with GTK or QT support"
+		fi
+	fi
+
 	if use krb4 && ! built_with_use virtual/krb5 krb4; then
 		ewarn
 		ewarn "In order to add kerberos 4 support, you have to emerge"