Added gnupg-1.4 support as per bug #74931.

4 files changed, 102 insertions, 8 deletions

diff --git a/app-crypt/seahorse/ChangeLog b/app-crypt/seahorse/ChangeLog
index d221f763fdc3..689a7d9139e8 100644
--- a/app-crypt/seahorse/ChangeLog
+++ b/app-crypt/seahorse/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/seahorse
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.29 2004/12/19 13:13:44 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.30 2004/12/19 20:42:48 dragonheart Exp $
+
+  20 Dec 2004; Daniel Black <dragonheart@gentoo.org>
+  +files/seahorse-0.6.3-gpg1.4.patch, seahorse-0.6.3-r1.ebuild:
+  Added gnupg-1.4 support as per bug #74931.
 
   19 Dec 2004; Daniel Black <dragonheart@gentoo.org>
   +files/seahorse-0.7.5-gpg1.4.patch, seahorse-0.6.3-r1.ebuild,
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index 79ad43e268c2..4800be9454bd 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,17 +1,18 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 fbe67c169b3dfe46c0ac5e75962ca07e ChangeLog 4119
+MD5 39fbbf63cfceabcc89d22c72674665cd ChangeLog 4282
 MD5 887271fc00711d11fb72536de7b1f7ec metadata.xml 1073
-MD5 d590f30824faa32ba65691531d2d1e7a seahorse-0.6.3-r1.ebuild 807
+MD5 936581cebee2fc00083e958a1398fba0 seahorse-0.6.3-r1.ebuild 931
 MD5 61d80374f9e6c008a561a6640b91731e seahorse-0.7.5.ebuild 1284
 MD5 052f1fee75fc120426817f6e7c0726f6 files/digest-seahorse-0.6.3-r1 66
 MD5 ddd1af247311013096cded4265d69eaf files/digest-seahorse-0.7.5 67
 MD5 e1227c1335c22fcf8db3af76856b8053 files/seahorse-0.7.5-gpg1.4.patch 2576
+MD5 1f02ad637af0dfe5012aa463ffb7fd1e files/seahorse-0.6.3-gpg1.4.patch 2572
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.0 (GNU/Linux)
 
-iD8DBQFBxX6OmdTrptrqvGERAohEAJ4kh2yoTJStIxwE2sDWeMkgF4y1UACfZHMA
-vWOG/UznqVDbjO5aw7Ekp5s=
-=6Qn6
+iD8DBQFBxefOmdTrptrqvGERAtEVAJsGtJ4/5Kup3/9sj49C6q+CYKwdkQCgk8pu
+k5fjOApRK2eYLZ8QP6T7upw=
+=9cj2
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/seahorse/files/seahorse-0.6.3-gpg1.4.patch b/app-crypt/seahorse/files/seahorse-0.6.3-gpg1.4.patch
new file mode 100644
index 000000000000..2c412ec51bd4
--- /dev/null
+++ b/app-crypt/seahorse/files/seahorse-0.6.3-gpg1.4.patch
@@ -0,0 +1,82 @@
+--- configure.in.orig	2004-12-19 20:51:41.771221552 +0930
++++ configure.in	2004-12-19 21:02:59.005777288 +0930
+@@ -42,13 +42,17 @@
+ 	micro=`echo $gnupg_version | \
+ 		sed 's/^gpg (GnuPG) \([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
+ 
+-	  if test "$major" -eq "$req_major"; then
+-	     if test "$minor" -eq "$req_minor"; then
+-	  	if test "$micro" -ge "$req_micro"; then
+-		       ok="yes"
+-	        fi
++	if test "$major" -gt "$req_major"; then
++           ok="yes"
++        elif test "$major" -eq "$req_major"; then
++	   if test "$minor" -gt "$req_minor"; then
++               ok="yes"
++	   elif test "$minor" -eq "$req_minor"; then
++	     if test "$micro" -ge "$req_micro"; then
++	       ok="yes"
+ 	     fi
+-	  fi
++	   fi
++	fi
+   fi
+   
+   if test "$ok" = "yes"; then
+@@ -83,8 +87,12 @@
+       micro=`echo $gpgme_config_version | \
+ 		 sed 's/\([[0-9]]*\)\.\([[0-9]]*\)\.\([[0-9]]*\).*/\3/'`
+ 
+-	if test "$major" -eq "$req_major"; then
+-	   if test "$minor" -eq "$req_minor"; then
++	if test "$major" -gt "$req_major"; then
++           ok="yes"
++        elif test "$major" -eq "$req_major"; then
++	   if test "$minor" -gt "$req_minor"; then
++               ok="yes"
++	   elif test "$minor" -eq "$req_minor"; then
+ 	     if test "$micro" -ge "$req_micro"; then
+ 	       ok="yes"
+ 	     fi
+--- configure.orig	2004-12-19 22:26:34.407687640 +0930
++++ configure	2004-12-19 22:27:24.973368792 +0930
+@@ -7881,13 +8124,17 @@
+ 	micro=`echo $gnupg_version | \
+ 		sed 's/^gpg (GnuPG) \([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'`
+ 
+-	  if test "$major" -eq "$req_major"; then
+-	     if test "$minor" -eq "$req_minor"; then
+-	  	if test "$micro" -ge "$req_micro"; then
+-		       ok="yes"
+-	        fi
++	if test "$major" -gt "$req_major"; then
++           ok="yes"
++        elif test "$major" -eq "$req_major"; then
++	   if test "$minor" -gt "$req_minor"; then
++               ok="yes"
++	   elif test "$minor" -eq "$req_minor"; then
++	     if test "$micro" -ge "$req_micro"; then
++	       ok="yes"
+ 	     fi
+-	  fi
++	   fi
++	fi
+   fi
+ 
+   if test "$ok" = "yes"; then
+@@ -7962,8 +8209,12 @@
+       micro=`echo $gpgme_config_version | \
+ 		 sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/'`
+ 
+-	if test "$major" -eq "$req_major"; then
+-	   if test "$minor" -eq "$req_minor"; then
++	if test "$major" -gt "$req_major"; then
++           ok="yes"
++        elif test "$major" -eq "$req_major"; then
++	   if test "$minor" -gt "$req_minor"; then
++               ok="yes"
++	   elif test "$minor" -eq "$req_minor"; then
+ 	     if test "$micro" -ge "$req_micro"; then
+ 	       ok="yes"
+ 	     fi
diff --git a/app-crypt/seahorse/seahorse-0.6.3-r1.ebuild b/app-crypt/seahorse/seahorse-0.6.3-r1.ebuild
index e2f21b4c463e..75cb8188b134 100644
--- a/app-crypt/seahorse/seahorse-0.6.3-r1.ebuild
+++ b/app-crypt/seahorse/seahorse-0.6.3-r1.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-0.6.3-r1.ebuild,v 1.7 2004/10/31 15:27:12 tgall Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-0.6.3-r1.ebuild,v 1.8 2004/12/19 20:42:48 dragonheart Exp $
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="gnome front end to gnupg"
 HOMEPAGE="http://seahorse.sourceforge.net/"
@@ -11,6 +11,7 @@ SRC_URI="mirror://sourceforge/seahorse/${P}.tar.gz"
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="x86 ppc sparc ~amd64 ~alpha ppc64"
+IUSE="doc"
 
 RDEPEND="virtual/x11
 	>=app-crypt/gnupg-1.2.0
@@ -24,6 +25,12 @@ DEPEND="${RDEPEND}
 
 DOCS="AUTHORS ChangeLog NEWS README TODO THANKS"
 
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	epatch ${FILESDIR}/${P}-gpg1.4.patch || die "patch failed"
+}
+
 src_compile() {
 	export GPGME_CONFIG=${ROOT}/usr/bin/gpgme3-config
 	gnome2_src_configure