Patch for gnupg2 support. Patch needs to go to upstream.

Package-Manager: portage-2.1.2_rc4-r1

5 files changed, 199 insertions, 6 deletions

diff --git a/app-crypt/seahorse/ChangeLog b/app-crypt/seahorse/ChangeLog
index 06914498add9..5366d93edd21 100644
--- a/app-crypt/seahorse/ChangeLog
+++ b/app-crypt/seahorse/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/seahorse
-# Copyright 2002-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.63 2006/11/04 20:10:47 compnerd Exp $
+# Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.64 2007/01/03 13:42:24 robbat2 Exp $
+
+*seahorse-0.8.2-r1 (03 Jan 2007)
+
+  03 Jan 2007; Robin H. Johnson <robbat2@gentoo.org>
+  +files/seahorse-0.8.2-gpg2.0.patch, +seahorse-0.8.2-r1.ebuild:
+  Patch for gnupg2 support. Patch needs to go to upstream.
 
 *seahorse-0.8.2 (04 Nov 2006)
 
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index 8c391fb7d921..c4eb03f99ed6 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -6,6 +6,10 @@ AUX seahorse-0.7.9-gpgme-1.1.0.patch 790 RMD160 611263988148f43ce254cbfbe323f3ab
 MD5 f1715246496bbb26d95db4b92c1dcb2d files/seahorse-0.7.9-gpgme-1.1.0.patch 790
 RMD160 611263988148f43ce254cbfbe323f3ab9b9932d6 files/seahorse-0.7.9-gpgme-1.1.0.patch 790
 SHA256 13fb4d8cb556622526b3741aa618068b466c0c60fd875b84b3438e20dba838fa files/seahorse-0.7.9-gpgme-1.1.0.patch 790
+AUX seahorse-0.8.2-gpg2.0.patch 3653 RMD160 c09d7155c681b21e753214fc2c9fc9fab3865ff1 SHA1 4433dc5ca9f368d0086adc16e72fef9437058453 SHA256 d8feb6b08b5b2782e52353852456199b343f6302bfc033490a03d9468e414aad
+MD5 bc220351dc574bc032a290ba97c13752 files/seahorse-0.8.2-gpg2.0.patch 3653
+RMD160 c09d7155c681b21e753214fc2c9fc9fab3865ff1 files/seahorse-0.8.2-gpg2.0.patch 3653
+SHA256 d8feb6b08b5b2782e52353852456199b343f6302bfc033490a03d9468e414aad files/seahorse-0.8.2-gpg2.0.patch 3653
 DIST seahorse-0.6.3.tar.gz 638429 RMD160 1a75ac620456f9339f9c477544efd90abd247c0f SHA1 77082d18a9a4beeccac5171987939a435c079ebd SHA256 3bc78e12b42d1d5a54eb1870452f0efb56ac179a6452429bc6f6b5b82a281993
 DIST seahorse-0.8.1.tar.bz2 971378 RMD160 1442bf55617a08e7357d1b40e64f4d3d3c777bdc SHA1 43b91153c708e536e00ef38aa12f33eff524b0f7 SHA256 1aba14b58f2366beaf32324d95281a03799b4888ac1701f0ec788b43b4117e90
 DIST seahorse-0.8.2.tar.bz2 990284 RMD160 722f060a2d54ff028c7dfcf3e935153ca4996803 SHA1 d97db00a07f4e059a22e1d304e0cc2142ae4ec36 SHA256 350f1a1cc5010bb81f08c6c124a24f2560a9dffea16c8a5a62e9cdeebb03c68e
@@ -18,6 +22,10 @@ EBUILD seahorse-0.8.1.ebuild 1391 RMD160 5a44f437fba4783235afb4e834f3ef6b7a888e4
 MD5 34a92d780acfba3010d9e66767d7e74d seahorse-0.8.1.ebuild 1391
 RMD160 5a44f437fba4783235afb4e834f3ef6b7a888e4a seahorse-0.8.1.ebuild 1391
 SHA256 2a3b0a19f30fdf60623f8a9882eaa2ac57434ea85b63ba97be38df26949cbd8f seahorse-0.8.1.ebuild 1391
+EBUILD seahorse-0.8.2-r1.ebuild 1685 RMD160 bcc60b581965f507c1009ac80449d9fc622e1e7b SHA1 e4d9f8d3cc1c6e54eb469d757f35041ce5d5cf43 SHA256 a6abcbcac60879c0a80b7d7d283fcb9f1ac919f4f87514252f474b14b1271418
+MD5 0e215c74351787cca75572838a78cec2 seahorse-0.8.2-r1.ebuild 1685
+RMD160 bcc60b581965f507c1009ac80449d9fc622e1e7b seahorse-0.8.2-r1.ebuild 1685
+SHA256 a6abcbcac60879c0a80b7d7d283fcb9f1ac919f4f87514252f474b14b1271418 seahorse-0.8.2-r1.ebuild 1685
 EBUILD seahorse-0.8.2.ebuild 1568 RMD160 266b27f7054e5c73bee833de978ed8656054cc05 SHA1 ac4b167b9172d11445d8b5d767d231e37d5fb76e SHA256 082c40903ff14ddbc781132cc7ab7b947cf973dafdbfd4505affbbec06cf9b14
 MD5 7ec936e3f20e087445fc399b1d1b2e74 seahorse-0.8.2.ebuild 1568
 RMD160 266b27f7054e5c73bee833de978ed8656054cc05 seahorse-0.8.2.ebuild 1568
@@ -26,10 +34,10 @@ EBUILD seahorse-0.8.ebuild 1576 RMD160 86285dcfc7c7eacce86a3ba196fa942132cd3ef5
 MD5 6ea4597797cbb2fbf29072291b81d1f6 seahorse-0.8.ebuild 1576
 RMD160 86285dcfc7c7eacce86a3ba196fa942132cd3ef5 seahorse-0.8.ebuild 1576
 SHA256 3fdf04451acb1fbb37fbbcfd46b1f057b76ab26dc09e17013a747466154191da seahorse-0.8.ebuild 1576
-MISC ChangeLog 9131 RMD160 6a74fc6bdc71dc2964e0806b017814189884ee50 SHA1 2ae1c4cc3177bd489513052f59956ce61e5e96f8 SHA256 11db1a8896d410add900b517c3027d2374f961c0fd7863345258cdd0fd8e54e5
-MD5 5c53ea7cdef1e03bef07f9b6f195e51f ChangeLog 9131
-RMD160 6a74fc6bdc71dc2964e0806b017814189884ee50 ChangeLog 9131
-SHA256 11db1a8896d410add900b517c3027d2374f961c0fd7863345258cdd0fd8e54e5 ChangeLog 9131
+MISC ChangeLog 9342 RMD160 7395e261cfaf43456e8ed255ae79b7fde4b0b15f SHA1 3376be26fc6f1c887147faa8f710f5772431f1dc SHA256 54e270157d1537cc9c5bc76c8df5da7088c0eef29e951f81065e3570ef6ce6a4
+MD5 fd699d6acb98e588e842c59dc8f3322e ChangeLog 9342
+RMD160 7395e261cfaf43456e8ed255ae79b7fde4b0b15f ChangeLog 9342
+SHA256 54e270157d1537cc9c5bc76c8df5da7088c0eef29e951f81065e3570ef6ce6a4 ChangeLog 9342
 MISC metadata.xml 819 RMD160 52b6ce17ab123543f46c9c6cabd6c92d94b8b141 SHA1 fb1e7a380405170746723d09e3a2ba3681b8fe43 SHA256 e2996afc5197477906806c576023683f03b99574928333093784f7065e75a808
 MD5 3c196906d9f4d4d3e73e00c469d3cc6f metadata.xml 819
 RMD160 52b6ce17ab123543f46c9c6cabd6c92d94b8b141 metadata.xml 819
@@ -46,3 +54,6 @@ SHA256 84f7fcf984174ae0f4197c7b5565af91e4991c275b61d1611629bfd1a49c6d06 files/di
 MD5 91fa4ec99823483ae92a320a6c65c897 files/digest-seahorse-0.8.2 247
 RMD160 3d6bba0f8fd8b34092201715fedf7401b72a96ee files/digest-seahorse-0.8.2 247
 SHA256 836ecee89ee2b4d974b973447bd332b2cc126200e5eee2bf97aadeea59c41c27 files/digest-seahorse-0.8.2 247
+MD5 91fa4ec99823483ae92a320a6c65c897 files/digest-seahorse-0.8.2-r1 247
+RMD160 3d6bba0f8fd8b34092201715fedf7401b72a96ee files/digest-seahorse-0.8.2-r1 247
+SHA256 836ecee89ee2b4d974b973447bd332b2cc126200e5eee2bf97aadeea59c41c27 files/digest-seahorse-0.8.2-r1 247
diff --git a/app-crypt/seahorse/files/digest-seahorse-0.8.2-r1 b/app-crypt/seahorse/files/digest-seahorse-0.8.2-r1
new file mode 100644
index 000000000000..be2633249aaf
--- /dev/null
+++ b/app-crypt/seahorse/files/digest-seahorse-0.8.2-r1
@@ -0,0 +1,3 @@
+MD5 24d9a8c3564700d105847934020920bd seahorse-0.8.2.tar.bz2 990284
+RMD160 722f060a2d54ff028c7dfcf3e935153ca4996803 seahorse-0.8.2.tar.bz2 990284
+SHA256 350f1a1cc5010bb81f08c6c124a24f2560a9dffea16c8a5a62e9cdeebb03c68e seahorse-0.8.2.tar.bz2 990284
diff --git a/app-crypt/seahorse/files/seahorse-0.8.2-gpg2.0.patch b/app-crypt/seahorse/files/seahorse-0.8.2-gpg2.0.patch
new file mode 100644
index 000000000000..a0232b99be83
--- /dev/null
+++ b/app-crypt/seahorse/files/seahorse-0.8.2-gpg2.0.patch
@@ -0,0 +1,109 @@
+Subject: GnuPG 2.0 support for Seahorse
+From: Robin H. Johnson <robbat2@gentoo.org>
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+The following patch fixes the previous hardcoding of 1.4 and 1.2 versions of
+GnuPG to also allow the 2.0 series.
+
+diff -Nuar --exclude '*~' seahorse-0.8.2.orig/configure seahorse-0.8.2/configure
+--- seahorse-0.8.2.orig/configure	2006-07-10 10:41:43.000000000 -0700
++++ seahorse-0.8.2/configure	2007-01-02 17:14:27.474945791 -0800
+@@ -19569,8 +19569,7 @@
+ fi;
+ 
+ if test	"$DO_CHECK" = "yes"; then
+-  major_versions="1"
+-  minor_versions="2 4"
++  accept_versions="1.2 1.4 2.0"
+   # Extract the first word of "gpg", so it can be a program name with args.
+ set dummy gpg; ac_word=$2
+ echo "$as_me:$LINENO: checking for $ac_word" >&5
+@@ -19623,21 +19622,11 @@
+ 	micro=`echo $gnupg_version | \
+ 		sed 's/^gpg (GnuPG) \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'`
+ 
+-    for ver in $major_versions; do
+-      if test "$ver" = "$major"; then
+-
+-        # Check the minor version
+-        for ver2 in $minor_versions; do
+-          if test "$ver2" = "$minor"; then
+-
++	for ver in $accept_versions; do
++		if test "$ver" = "$major.$minor"; then
+             ok="yes"
+             break
+-
+-          fi
+-        done
+-        break
+-
+-      fi
++		fi
+     done
+ 
+   fi
+diff -Nuar --exclude '*~' seahorse-0.8.2.orig/configure.in seahorse-0.8.2/configure.in
+--- seahorse-0.8.2.orig/configure.in	2006-07-10 10:40:35.000000000 -0700
++++ seahorse-0.8.2/configure.in	2007-01-02 17:15:25.609655647 -0800
+@@ -59,8 +59,7 @@
+ 	DO_CHECK=$enableval, DO_CHECK=yes)
+ 	
+ if test	"$DO_CHECK" = "yes"; then
+-  major_versions="1"
+-  minor_versions="2 4"
++  accept_versions="1.2 1.4 2.0"
+   AC_PATH_PROG(GNUPG, gpg, no)
+   ok="no"
+   if test "$GNUPG" != "no"; then
+@@ -72,22 +71,12 @@
+ 		sed 's/^gpg (GnuPG) \([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\2/'`
+ 	micro=`echo $gnupg_version | \
+ 		sed 's/^gpg (GnuPG) \([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
+-    
+-    for ver in $major_versions; do
+-      if test "$ver" = "$major"; then
+-            
+-        # Check the minor version 
+-        for ver2 in $minor_versions; do
+-          if test "$ver2" = "$minor"; then
+-                    
++  
++	for ver in $accept_versions; do
++		if test "$ver" = "$major.$minor"; then
+             ok="yes"
+             break
+-                    
+-          fi
+-        done
+-        break
+-            
+-      fi
++		fi
+     done
+     
+   fi
+diff -Nuar --exclude '*~' seahorse-0.8.2.orig/libseahorse/seahorse-gpg-options.c seahorse-0.8.2/libseahorse/seahorse-gpg-options.c
+--- seahorse-0.8.2.orig/libseahorse/seahorse-gpg-options.c	2005-10-05 15:00:24.000000000 -0700
++++ seahorse-0.8.2/libseahorse/seahorse-gpg-options.c	2007-01-03 04:40:35.770386761 -0800
+@@ -32,7 +32,6 @@
+ #include "seahorse-gpg-options.h"
+ 
+ #define  GPG_CONF_HEADER    "# FILE CREATED BY SEAHORSE\n\n"
+-#define  GPG_VERSION_PREFIX   "1."
+ 
+ static gchar gpg_homedir[MAXPATHLEN];
+ static gboolean gpg_options_inited = FALSE;
+@@ -271,9 +270,11 @@
+         /* 
+          * Make sure it's the right version for us to be messing 
+          * around with the configuration file.
++		 * Both 1.* and 2.* are suitable.
+          */
+         g_return_val_if_fail (engine && engine->version && engine->file_name &&
+-                              g_str_has_prefix (engine->version, GPG_VERSION_PREFIX),
++                              (g_str_has_prefix (engine->version, "1.") ||
++                               g_str_has_prefix (engine->version, "2.")),
+                               (seahorse_util_gpgme_to_error
+                                (GPG_E (GPG_ERR_INV_ENGINE), err), FALSE));
+ 
diff --git a/app-crypt/seahorse/seahorse-0.8.2-r1.ebuild b/app-crypt/seahorse/seahorse-0.8.2-r1.ebuild
new file mode 100644
index 000000000000..13ce43f192cf
--- /dev/null
+++ b/app-crypt/seahorse/seahorse-0.8.2-r1.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-0.8.2-r1.ebuild,v 1.1 2007/01/03 13:42:24 robbat2 Exp $
+
+inherit gnome2 eutils autotools flag-o-matic
+
+DESCRIPTION="gnome front end to gnupg"
+HOMEPAGE="http://seahorse.sourceforge.net/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="debug gedit gnome ldap"
+
+RDEPEND=">=gnome-base/libgnomeui-2.0
+		 >=gnome-base/gnome-vfs-2.0
+		 >=gnome-base/libglade-2.0
+		 >=gnome-base/gconf-2.0
+		 >=x11-libs/gtk+-2.4
+		 >=dev-libs/glib-2.0
+		 || ( =app-crypt/gnupg-1.4* >=app-crypt/gnupg-2.0.1-r2 )
+		 >=app-crypt/gpgme-1.0.0
+		 >=net-libs/libsoup-2.2
+		   x11-misc/shared-mime-info
+		 gedit? ( >=app-editors/gedit-2.8.0 )
+		 gnome? (
+					>=gnome-base/nautilus-2.10
+					>=gnome-base/libbonobo-2
+					>=gnome-base/libbonoboui-2
+				)
+		 ldap? ( net-nds/openldap )"
+DEPEND="${RDEPEND}
+		sys-devel/gettext
+		>=dev-util/intltool-0.34
+		>=dev-util/pkgconfig-0.19
+		>=app-text/scrollkeeper-0.3"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO THANKS"
+
+pkg_setup() {
+	G2CONF="${G2CONF} --disable-update-mime-database \
+			$(use_enable debug) \
+			$(use_enable gedit) \
+			$(use_enable gnome nautilus) \
+			$(use_enable ldap)"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+	epatch ${FILESDIR}/${PN}-0.8.2-gpg2.0.patch
+}
+
+src_compile() {
+	append-ldflags $(bindnow-flags)
+	gnome2_src_compile
+}
+
+src_install() {
+	gnome2_src_install
+
+	# remove conflicts with x11-misc/shared-mime-info
+	rm -rf ${D}/usr/share/mime/application ${D}/usr/share/mime/magic \
+		   ${D}/usr/share/mime/globs ${D}/usr/share/mime/XMLnamespaces
+}