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

(Portage version: 2.2_rc40/cvs/Linux x86_64)

4 files changed, 59 insertions, 84 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/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() {