Fix build with gpgme built with lfs support enabled, bug #275445. Clean up old revision.

Package-Manager: portage-2.2_rc40/cvs/Linux x86_64

5 files changed, 65 insertions, 91 deletions

diff --git a/app-crypt/seahorse-plugins/ChangeLog b/app-crypt/seahorse-plugins/ChangeLog
index 134bce58a675..3ddbe2b2714d 100644
--- a/app-crypt/seahorse-plugins/ChangeLog
+++ b/app-crypt/seahorse-plugins/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-crypt/seahorse-plugins
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse-plugins/ChangeLog,v 1.3 2009/05/23 20:22:45 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse-plugins/ChangeLog,v 1.4 2009/08/31 20:50:06 eva Exp $
+
+  31 Aug 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -seahorse-plugins-2.26.1.ebuild, seahorse-plugins-2.26.2.ebuild,
+  +files/seahorse-plugins-2.26.2-gpgme-lfs.patch:
+  Fix build with gpgme built with lfs support enabled, bug #275445. Clean up
+  old revision.
 
 *seahorse-plugins-2.26.2 (23 May 2009)
 
diff --git a/app-crypt/seahorse-plugins/Manifest b/app-crypt/seahorse-plugins/Manifest
index ddc0be79b58e..e93738bbdaec 100644
--- a/app-crypt/seahorse-plugins/Manifest
+++ b/app-crypt/seahorse-plugins/Manifest
@@ -2,18 +2,17 @@
 Hash: SHA1
 
 AUX 70-seahorse-agent 241 RMD160 d28490016ed259ef29416cb101ccddd76e195ed5 SHA1 2b40525f543741dc0a453a8241e3b7c83f45da6f SHA256 2e70cbb034fde8ddd5c69baf97570ad706bec2e04bd7dd2c86f462b9a594e3c6
+AUX seahorse-plugins-2.26.2-gpgme-lfs.patch 1242 RMD160 b4f34f654629110855c750452d7bf91ccffe1e8f SHA1 7df11de75c2557da8b899d25c5f54c910b3be175 SHA256 c757c40d705174df3e01b572b64a97fe0599555b943658adbc4278eedf79e807
 DIST seahorse-plugins-2.24.1.tar.bz2 1843996 RMD160 6f47438b98ba957550cf34f5ee163c28b6e061a6 SHA1 88a144999f55e82d5fe8eee3c251371589e82ed9 SHA256 0a9ee63adc7ad01e9c3d9a3432d467a4df24889b7bd41b065e89bec74ccd7676
-DIST seahorse-plugins-2.26.1.tar.bz2 1311443 RMD160 c7244d626874beb1e54ecb4037e052b69998ac49 SHA1 881655b46da21efd755f81b0449ec776ceb3f710 SHA256 898acf0009beff402875378483460436d64104c11235ed3a3c3ff43b5229b752
 DIST seahorse-plugins-2.26.2.tar.bz2 1318153 RMD160 99659c47d880a02b5ab25289f1d459c7d1472c51 SHA1 df5cae9c19cd106fafc65d95b8d0d57bbd6a12db SHA256 c98fd6c0cf35b1628fa758d31da3f4f53d8861ec41ddee361256ff27f7b2cdb0
 EBUILD seahorse-plugins-2.24.1.ebuild 1857 RMD160 0eb506c375ceec39af0a1c66a167662b413c08c4 SHA1 82cf26fa08c8918865d5f4840416fd50a3242a3b SHA256 9259e7fdff86f0b0cd19a5bccfa8f9eeb66f125a3f122f5d7419370f08f02e3c
-EBUILD seahorse-plugins-2.26.1.ebuild 2107 RMD160 4688a77d000e38c0af30f893abe5f21138c1e958 SHA1 cd0f7f8a42c01f3ee53807921eee23a21a45d76c SHA256 d63458ac8141ae3d5dea32765eaa82cb8fc4eb433eb5190b1250515770ca85d8
-EBUILD seahorse-plugins-2.26.2.ebuild 2013 RMD160 c23b281fa1a06da8b8fa753610e86248cafdd6ad SHA1 a4e20f32db5f99240395352731b33890f6db8485 SHA256 ceddb479aa0be65df81b3c377552ffc54ec10902610dc3526d0e0ee7c9ee2ede
-MISC ChangeLog 895 RMD160 e2759a4370c381e6a18142b6d17b43a5cc3c6382 SHA1 ef7e6f09b68bf59dcfb23c784040b17c86f3f24f SHA256 1fbf5ce655b195315461a1d42143d8de3779ed0a0d92b4ed8247bc77e9723a43
+EBUILD seahorse-plugins-2.26.2.ebuild 2136 RMD160 28098ebd354319de1854063efdaa601e6d1ca5ef SHA1 533f67410e139d4503f005b22ef769d401b45843 SHA256 b05302c7fd460c94f871408f25a0de3a3b65e8ee86ed0abba09dc1cec3873fd0
+MISC ChangeLog 1160 RMD160 e3b6296872c7fcb1798b09941265c02e731260ab SHA1 7e1833313d64dc519542729cd5e3f78d69d82a63 SHA256 1f3dc6864941517fad4deb9b39a9455383147f3370d476fbb223d323145e7760
 MISC metadata.xml 635 RMD160 9e4ce86f6c12e7c519fcea74ed7dfd646b7458ca SHA1 2a6ec6e8f12bb2e887ebf8c9c38b105012f0a2af SHA256 3e1c53ae9351ecbdcbf7bf930f12d4eb9176acc408094f222babba1ed7b95aa5
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAkoYWxsACgkQ1fmVwcYIWAYnlQCdE9UEtnzVOnr7iois5YH6kRPT
-Yk4AnizK1siJcQX0vZyEnkxRBaBj07/q
-=Tm5g
+iEYEARECAAYFAkqcN4QACgkQ1fmVwcYIWAaAsgCeOvBTFr9liAaX17OwXd08g1gJ
+D5IAoOjoctoZZCtIA7x8LNNa55RMocNK
+=JV4/
 -----END PGP SIGNATURE-----
diff --git a/app-crypt/seahorse-plugins/files/seahorse-plugins-2.26.2-gpgme-lfs.patch b/app-crypt/seahorse-plugins/files/seahorse-plugins-2.26.2-gpgme-lfs.patch
new file mode 100644
index 000000000000..d301d34f7886
--- /dev/null
+++ b/app-crypt/seahorse-plugins/files/seahorse-plugins-2.26.2-gpgme-lfs.patch
@@ -0,0 +1,47 @@
+# Fix compilation with gpgme + lfs support
+# Gentoo: https://bugs.gentoo.org/show_bug.cgi?id=275445
+# Patch taken from LFS, thanks to Thierry Massenaux for pointing it out.
+--- a/libseahorse/seahorse-gpg-options.c	2009-04-22 18:28:45 +0000
++++ b/libseahorse/seahorse-gpg-options.c	2009-07-24 11:52:49 +0000
+@@ -19,6 +19,9 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ 
++#include <config.h>
++#include "seahorse-util.h"
++
+ #include <sys/param.h>
+ #include <sys/wait.h>
+ #include <sys/file.h>
+@@ -32,7 +35,6 @@
+ #include <sys/stat.h>
+ 
+ #include "seahorse-gpgmex.h"
+-#include "seahorse-util.h"
+ #include "seahorse-gpg-options.h"
+ 
+ #define  GPG_CONF_HEADER    "# FILE CREATED BY SEAHORSE\n\n"
+--- a/libseahorse/seahorse-gpgmex-op.c	2009-04-22 18:28:45 +0000
++++ b/libseahorse/seahorse-gpgmex-op.c	2009-07-24 11:54:16 +0000
+@@ -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>
+--- a/agent/seahorse-agent-prompt.c	2009-04-22 18:28:45 +0000
++++ b/agent/seahorse-agent-prompt.c	2009-07-24 11:58:57 +0000
+@@ -25,6 +25,8 @@
+  * Public License.
+  */
+ 
++#include <config.h>
++
+ #include <math.h>
+ #include <stdio.h>
+ #include <stdlib.h>
diff --git a/app-crypt/seahorse-plugins/seahorse-plugins-2.26.1.ebuild b/app-crypt/seahorse-plugins/seahorse-plugins-2.26.1.ebuild
deleted file mode 100644
index bcf6457d2c49..000000000000
--- a/app-crypt/seahorse-plugins/seahorse-plugins-2.26.1.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2009 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse-plugins/seahorse-plugins-2.26.1.ebuild,v 1.1 2009/05/14 09:18:18 nirbheek Exp $
-
-inherit gnome2
-
-DESCRIPTION="A GNOME application for managing encryption keys"
-HOMEPAGE="http://www.gnome.org/projects/seahorse/index.html"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="applet debug epiphany gedit libnotify nautilus test"
-
-RDEPEND="
-	>=gnome-base/libglade-2.0
-	>=gnome-base/gconf-2.0
-	>=x11-libs/gtk+-2.10
-	>=dev-libs/glib-2.16
-	>=dev-libs/dbus-glib-0.72
-	>=app-crypt/gpgme-1.0.0
-	>=app-crypt/seahorse-2.25
-	>=gnome-base/gnome-keyring-2.25
-	>=gnome-extra/evolution-data-server-1.8
-
-	|| (
-		=app-crypt/gnupg-1.4*
-		=app-crypt/gnupg-2.0* )
-
-	nautilus? ( >=gnome-base/nautilus-2.12 )
-	epiphany? (
-		>=www-client/epiphany-2.24
-		>=dev-libs/libxml2-2.6.0 )
-	gedit? ( >=app-editors/gedit-2.16 )
-	applet? ( >=gnome-base/gnome-panel-2.10 )
-	libnotify? ( >=x11-libs/libnotify-0.3.2 )"
-DEPEND="${RDEPEND}
-	sys-devel/gettext
-	>=app-text/gnome-doc-utils-0.3.2
-	>=app-text/scrollkeeper-0.3
-	>=dev-util/pkgconfig-0.20
-	>=dev-util/intltool-0.35"
-
-pkg_setup() {
-	if use epiphany ; then
-		if has_version '>=www-client/epiphany-2.24.3-r10'; then
-			G2CONF="${G2CONF} --with-gecko=libxul-unstable"
-		else
-			# Now, epiphany could be using xul-1.8, xul-1.9 or ff-2
-			# Let it auto-detect.
-			:
-		fi
-	fi
-
-	G2CONF="${G2CONF}
-		--enable-agent
-		--disable-update-mime-database
-		$(use_enable applet)
-		$(use_enable debug)
-		$(use_enable epiphany)
-		$(use_enable gedit)
-		$(use_enable libnotify)
-		$(use_enable nautilus)
-		$(use_enable test tests)"
-}
-
-src_unpack() {
-	gnome2_src_unpack
-
-	# Make it libtool-1 compatible
-	rm -v m4/lt* m4/libtool.m4 || die "removing libtool macros failed"
-
-	# Fix intltoolize broken file, see upstream #577133
-	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
-}
-
-src_install() {
-	gnome2_src_install
-
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}/70-seahorse-agent" || die "doexe failed"
-}
diff --git a/app-crypt/seahorse-plugins/seahorse-plugins-2.26.2.ebuild b/app-crypt/seahorse-plugins/seahorse-plugins-2.26.2.ebuild
index 11646efb6d40..abfd0e8e1470 100644
--- a/app-crypt/seahorse-plugins/seahorse-plugins-2.26.2.ebuild
+++ b/app-crypt/seahorse-plugins/seahorse-plugins-2.26.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse-plugins/seahorse-plugins-2.26.2.ebuild,v 1.1 2009/05/23 20:22:45 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-crypt/seahorse-plugins/seahorse-plugins-2.26.2.ebuild,v 1.2 2009/08/31 20:50:06 eva Exp $
 
 EAPI="2"
 
@@ -57,6 +57,7 @@ pkg_setup() {
 	G2CONF="${G2CONF}
 		--enable-agent
 		--disable-update-mime-database
+		--disable-static
 		$(use_enable applet)
 		$(use_enable debug)
 		$(use_enable epiphany)
@@ -71,6 +72,9 @@ src_prepare() {
 
 	# Fix intltoolize broken file, see upstream #577133
 	sed "s:'\^\$\$lang\$\$':\^\$\$lang\$\$:g" -i po/Makefile.in.in || die "sed failed"
+
+	# Fix build with gpgme built with lfs support, bug #275445
+	epatch "${FILESDIR}/${P}-gpgme-lfs.patch"
 }
 
 src_install() {