fix to allow to work with gpgme-1.1.0. See bug #110841

Package-Manager: portage-2.0.53_rc7

diff --git a/app-crypt/seahorse/ChangeLog b/app-crypt/seahorse/ChangeLog
index eb406f027a618daa8cecd9d957a9617ee664b2a1..746255ec6bf65d8aefa1da8f3f7f49a7a0299d37 100644 (file)
--- a/app-crypt/seahorse/ChangeLog
+++ b/app-crypt/seahorse/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-crypt/seahorse
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.46 2005/10/10 21:39:42 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.47 2005/11/06 21:20:22 dragonheart Exp $
+
+  06 Nov 2005; Daniel Black <dragonheart@gentoo.org>
+  +files/seahorse-0.7.9-gpgme-1.1.0.patch, seahorse-0.7.9.ebuild:
+  fix to allow to work with gpgme-1.1.0 thanks to Doug Goldstein for the bug
+  report and Daniel Schindler for the patch. See bug #110841
 
   10 Oct 2005; Daniel Black <dragonheart@gentoo.org> seahorse-0.7.6.ebuild,
   seahorse-0.7.8.ebuild, seahorse-0.7.9.ebuild:

diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index c2e6e8ef32a729c5681db51a0fc28cb1fd16fd5a..1aa5fd6d5d6a7e2d19bc9b57968e29abd6110426 100644 (file)
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 3140481f0d79926196ecd7c8376e2652 ChangeLog 6589
+MD5 aeac5cb249cf66b005962dff05cf1ab9 ChangeLog 6847
 MD5 052f1fee75fc120426817f6e7c0726f6 files/digest-seahorse-0.6.3-r1 66
 MD5 bea4522a079897b52604cc710d1a90c2 files/digest-seahorse-0.7.6 68
 MD5 0538ac585d34e29ee315dcfb6699e59d files/digest-seahorse-0.7.8 68
@@ -9,15 +9,16 @@ MD5 c4e4d29d4acc7978fb91980fbe4fe8e7 files/digest-seahorse-0.7.9 68
 MD5 1f02ad637af0dfe5012aa463ffb7fd1e files/seahorse-0.6.3-gpg1.4.patch 2572
 MD5 0a649fbc303b24897fc8f989c6b02c36 files/seahorse-0.7.6-gnome-2.10.patch 511
 MD5 e3a978f46c9d81a58770df145c61d794 files/seahorse-0.7.9-gedit-2.12.patch 743
+MD5 f1715246496bbb26d95db4b92c1dcb2d files/seahorse-0.7.9-gpgme-1.1.0.patch 790
 MD5 887271fc00711d11fb72536de7b1f7ec metadata.xml 1073
 MD5 d69dd9d58c3d148ed84b9658a11675ea seahorse-0.6.3-r1.ebuild 902
 MD5 e176c43be16b4e663bdcafa981f9adfd seahorse-0.7.6.ebuild 1445
 MD5 cbda1ade4d679c21070ecc63cac1e8e1 seahorse-0.7.8.ebuild 1359
-MD5 4a5a71c63f7b476469017b3ca1c31581 seahorse-0.7.9.ebuild 1596
+MD5 bd8a261f98738e2c09ec608df086b66d seahorse-0.7.9.ebuild 1639
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2-ecc0.1.6 (GNU/Linux)
 
-iD8DBQFDSuAomdTrptrqvGERAnvuAKCAnoKyHYyAiu+n+UxKmuUr9fIBFgCdFhlO
-F2FIdD3V9VEQPU1vDD0qIBQ=
-=R/Vg
+iD8DBQFDbnOimdTrptrqvGERAk4bAJoDLtd5ltf9E57v2J6ovDRrUcdaJgCfYTFM
+l3gt4/A2ZyVCG0RYJGuMkQk=
+=223p
 -----END PGP SIGNATURE-----

diff --git a/app-crypt/seahorse/files/seahorse-0.7.9-gpgme-1.1.0.patch b/app-crypt/seahorse/files/seahorse-0.7.9-gpgme-1.1.0.patch
new file mode 100644 (file)
index 0000000..84c5c2a
--- /dev/null
+++ b/app-crypt/seahorse/files/seahorse-0.7.9-gpgme-1.1.0.patch
@@ -0,0 +1,22 @@
+--- configure.in.orig  2005-07-02 23:34:41.000000000 +0200
++++ configure.in       2005-10-30 22:10:47.000000000 +0100
+@@ -97,7 +97,7 @@
+                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 "$minor" -ge "$req_minor"; then
+            if test "$micro" -ge "$req_micro"; then
+              ok="yes"
+            fi
+--- configure.orig     2005-07-28 02:46:24.000000000 +0200
++++ configure  2005-10-30 22:10:23.000000000 +0100
+@@ -19614,7 +19614,7 @@
+                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 "$minor" -ge "$req_minor"; then
+            if test "$micro" -ge "$req_micro"; then
+              ok="yes"
+            fi

diff --git a/app-crypt/seahorse/seahorse-0.7.9.ebuild b/app-crypt/seahorse/seahorse-0.7.9.ebuild
index 99563aeeed336d96325ea41c78ba93ffeb50be32..cb39272282a40ed5fe095a13e27445ddb506e57f 100644 (file)
--- a/app-crypt/seahorse/seahorse-0.7.9.ebuild
+++ b/app-crypt/seahorse/seahorse-0.7.9.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-0.7.9.ebuild,v 1.5 2005/10/10 21:41:46 dragonheart Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-0.7.9.ebuild,v 1.6 2005/11/06 21:20:22 dragonheart Exp $
 
 inherit gnome2 eutils autotools flag-o-matic
 
@@ -45,6 +45,7 @@ src_unpack() {
        # Apply patch to allow seahorse-0.7.9 to compile with
        # gedit-2.12. See bug #106133, <obz@gentoo.org>
        epatch ${FILESDIR}/${P}-gedit-2.12.patch
+       epatch ${FILESDIR}/${P}-gpgme-1.1.0.patch
        # Re-configure
        eautoconf