Fix buils of seahorse against gpgme with LFS. Bug #275445

Package-Manager: portage-2.1.6.13/cvs/Linux x86_64

4 files changed, 52 insertions, 15 deletions

diff --git a/app-crypt/seahorse/ChangeLog b/app-crypt/seahorse/ChangeLog
index 6bce1f6fb216..e5dff4ad5e64 100644
--- a/app-crypt/seahorse/ChangeLog
+++ b/app-crypt/seahorse/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-crypt/seahorse
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.116 2009/05/23 20:21:23 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/ChangeLog,v 1.117 2009/07/10 14:02:18 dang Exp $
+
+  10 Jul 2009; Daniel Gryniewicz <dang@gentoo.org> seahorse-2.26.2.ebuild,
+  +files/seahorse-2.26.2-gpgme-lfs.patch:
+  Fix buils of seahorse against gpgme with LFS. Bug #275445
 
 *seahorse-2.26.2 (23 May 2009)
 
diff --git a/app-crypt/seahorse/Manifest b/app-crypt/seahorse/Manifest
index 61739b640240..7a28a08f78c7 100644
--- a/app-crypt/seahorse/Manifest
+++ b/app-crypt/seahorse/Manifest
@@ -1,9 +1,7 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 AUX 70-seahorse-agent 241 RMD160 d28490016ed259ef29416cb101ccddd76e195ed5 SHA1 2b40525f543741dc0a453a8241e3b7c83f45da6f SHA256 2e70cbb034fde8ddd5c69baf97570ad706bec2e04bd7dd2c86f462b9a594e3c6
 AUX seahorse-0.9.10-update-mime.patch 545 RMD160 f7531dcd900f46b0208226cd1e3806a7bc75231b SHA1 57f486c216b922d5d52cc24ba5925bd854a15518 SHA256 ffa4324d3ec4c4019839f2663758dacd1bb97396582398fdfc241e24dfff549a
 AUX seahorse-2.22.2-fbsd.patch 305 RMD160 e6d12d63383007b8b2b5064cc317e3b0d491908b SHA1 8440145139ace9b98cf7d16bb329395c5ba5479f SHA256 fd3e7be3c5af9b7e4c831ca6590b68582f671f4033693d1c2253f220dc6c57b2
+AUX seahorse-2.26.2-gpgme-lfs.patch 1210 RMD160 7aaa3cae7c31154331cd9eb92a6643d7bd6a00a9 SHA1 8ffe6667fe7d33f440a3e154a1cbd320963b5beb SHA256 a0cd874dc4e2a79559eb4a4a65349c88e4c9925871493041d662e33b6a53a57d
 DIST seahorse-2.22.3.tar.bz2 2121204 RMD160 63acdec4f689734bcf36bd0ef4a9fbc09fcba12a SHA1 11a5c4a641e3419e022f3c8e733b49a1139a52ed SHA256 245ff3752f72d14615937ef03d5a5e6f1a3abdf12a907af775ce31aa337e95d1
 DIST seahorse-2.24.1.tar.bz2 2197087 RMD160 0cf99ed7de4eeb7100f0de346dc82a8d74b3ff36 SHA1 66a993a5a24e2e2637db6964c39c0a6cc432e0ec SHA256 b86c045fe1d8cf7a3fd56e078175e32cd94154eb77f9fe2a4a4e1f1aa13a5d04
 DIST seahorse-2.26.1.tar.bz2 2197974 RMD160 75e58a0c5cced19aefa3290bf39df5f8a88329d8 SHA1 b1d6a94797895690c034ba0016930a56694877d5 SHA256 2e42d760a241ca764dddd3f3ec3b023edf57f024c8d728e7b3a3f8d06e1a5011
@@ -11,13 +9,6 @@ DIST seahorse-2.26.2.tar.bz2 2196810 RMD160 9193e5c14244f1a1463c6479bf31bb7d20a1
 EBUILD seahorse-2.22.3.ebuild 3208 RMD160 6c72f9c5d1b2664082cd940f005369efd6c922fd SHA1 f478d1294da78ebb4cfe75b3d3527f29038783a7 SHA256 6d80aaa09e1703ffabfdcf953848917f477b93d0bcb30ad3dc5c4a5f30a7c016
 EBUILD seahorse-2.24.1.ebuild 1568 RMD160 2d1063c548012047ab82df5c84a3ef072b2c9015 SHA1 c9023c6b4f7e071c4f6d9bfd88c377c375aad718 SHA256 55ab70f36ab79d15378d86fce413479060a2d691b119cc6be7da6acd05ebc0f4
 EBUILD seahorse-2.26.1.ebuild 1904 RMD160 5e70cc78c1acb08a25cd3160295ed273067522a2 SHA1 c90ef0eae4c2ee0684926a069e0fa2d64aa1dac2 SHA256 8d82544e346d087106841a0c475cd154b2e2ed85fa251f3373d3638f7e11e2d9
-EBUILD seahorse-2.26.2.ebuild 1800 RMD160 0a76aee9862a6d7d4aa13c8a6e2a302954774e32 SHA1 406abc754254124288662ec748b08ad70d48a3ec SHA256 b7be68a2d430c368dad453a365febc19cb4490a72c122302140c8cb6c4bc1fa0
-MISC ChangeLog 17033 RMD160 96baed691a146e3a6359d5b860d44f3a8798f536 SHA1 3f73c566082ec3eb01d57afc0740ea1a526d0e33 SHA256 a5d6a2a3628c16954344f0a72d5befe20856e6104e79cd174a196035bd680027
+EBUILD seahorse-2.26.2.ebuild 1901 RMD160 435f658012c714f5e32c2bba721ac1969444a20e SHA1 ef6c9703942cdcf1e7eb751e4a7a74ace4908786 SHA256 f1301664b580d5340127461dd517cc67a5a2926898a0d798645ba0a9ede19040
+MISC ChangeLog 17212 RMD160 da44bdb0aa8e3a82cc7cb8e43ca01ce8e9e287c9 SHA1 ef0c21abba6bf15f334823012856ac1d43a52c1c SHA256 149374f175487849887a371d038071310bc295c06db6a671b5fe91f1ccb3708a
 MISC metadata.xml 1350 RMD160 e23a60042c52e9e0003640c72792ec1db5d18d69 SHA1 13acdf926fb2fe87157d5ea1e5d5db124f14ad05 SHA256 b51ea5d45e0689c5c8670a5949f58b412adf02f70d814073c6ea942b87903e0e
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkoYWskACgkQ1fmVwcYIWAY2RgCgw0d4ckiNNVN3KFd+qg/6r8YU
-wQgAn3rTr5Zk/lA0DGpDY+0c3Vs/HkSU
-=F9B1
------END PGP SIGNATURE-----
diff --git a/app-crypt/seahorse/files/seahorse-2.26.2-gpgme-lfs.patch b/app-crypt/seahorse/files/seahorse-2.26.2-gpgme-lfs.patch
new file mode 100644
index 000000000000..1c72b39d7dae
--- /dev/null
+++ b/app-crypt/seahorse/files/seahorse-2.26.2-gpgme-lfs.patch
@@ -0,0 +1,39 @@
+diff --exclude-from=/opt/home/dang/.scripts/diffrc -up -ruN seahorse-2.26.2.orig/pgp/seahorse-gpg-op.c seahorse-2.26.2/pgp/seahorse-gpg-op.c
+--- seahorse-2.26.2.orig/pgp/seahorse-gpg-op.c	2009-04-20 11:35:00.000000000 -0400
++++ seahorse-2.26.2/pgp/seahorse-gpg-op.c	2009-07-10 09:43:31.550476889 -0400
+@@ -18,7 +18,9 @@
+  * 59 Temple Place, Suite 330,
+  * Boston, MA 02111-1307, USA.
+  */
+- 
++
++#include "config.h"
++
+ #include <glib.h>
+ #include <gpgme.h>
+ #include <string.h>
+diff --exclude-from=/opt/home/dang/.scripts/diffrc -up -ruN seahorse-2.26.2.orig/pgp/seahorse-gpg-options.c seahorse-2.26.2/pgp/seahorse-gpg-options.c
+--- seahorse-2.26.2.orig/pgp/seahorse-gpg-options.c	2009-04-20 11:35:00.000000000 -0400
++++ seahorse-2.26.2/pgp/seahorse-gpg-options.c	2009-07-10 09:36:16.012409729 -0400
+@@ -19,6 +19,11 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ 
++#include "config.h"
++
++#include "seahorse-util.h"
++#include "seahorse-context.h"
++
+ #include <sys/param.h>
+ #include <sys/wait.h>
+ #include <sys/file.h>
+@@ -31,9 +36,6 @@
+ #include <unistd.h>
+ #include <sys/stat.h>
+ 
+-#include "seahorse-util.h"
+-#include "seahorse-context.h"
+-
+ #include "pgp/seahorse-gpgme.h"
+ #include "pgp/seahorse-gpg-options.h"
+ 
diff --git a/app-crypt/seahorse/seahorse-2.26.2.ebuild b/app-crypt/seahorse/seahorse-2.26.2.ebuild
index 2e4710f6786e..f2cef20b7daf 100644
--- a/app-crypt/seahorse/seahorse-2.26.2.ebuild
+++ b/app-crypt/seahorse/seahorse-2.26.2.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-2.26.2.ebuild,v 1.1 2009/05/23 20:21:23 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse/seahorse-2.26.2.ebuild,v 1.2 2009/07/10 14:02:18 dang Exp $
 
 EAPI="2"
 
-inherit gnome2
+inherit gnome2 eutils
 
 DESCRIPTION="A GNOME application for managing encryption keys"
 HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
@@ -62,6 +62,9 @@ src_prepare() {
 
 	# Fix intltoolize broken file, see upstream #577133
 	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
+
+	# fix building with gpgme with lfs  Bug #275445
+	epatch "${FILESDIR}"/${P}-gpgme-lfs.patch
 }
 
 pkg_postinst() {