Fix public headers to work with C++ code in the 2.22 series too

(Portage version: 2.2_rc22/cvs/Linux 2.6.31-gentoo x86_64)

3 files changed, 113 insertions, 1 deletions

diff --git a/gnome-base/gnome-keyring/ChangeLog b/gnome-base/gnome-keyring/ChangeLog
index e59ceab47689..1118349a828b 100644
--- a/gnome-base/gnome-keyring/ChangeLog
+++ b/gnome-base/gnome-keyring/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for gnome-base/gnome-keyring
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.152 2009/09/13 21:42:01 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/ChangeLog,v 1.153 2009/09/27 23:53:01 leio Exp $
+
+*gnome-keyring-2.22.3-r2 (27 Sep 2009)
+
+  27 Sep 2009; Mart Raudsepp <leio@gentoo.org>
+  +files/gnome-keyring-2.22.3-headers-fix-for-cxx.patch,
+  +gnome-keyring-2.22.3-r2.ebuild:
+  Fix public headers to work with C++ code in the 2.22 series too
 
   13 Sep 2009; Gilles Dartiguelongue <eva@gentoo.org>
   gnome-keyring-2.26.3.ebuild, +files/gnome-keyring-2.26.3-assert.patch:
diff --git a/gnome-base/gnome-keyring/files/gnome-keyring-2.22.3-headers-fix-for-cxx.patch b/gnome-base/gnome-keyring/files/gnome-keyring-2.22.3-headers-fix-for-cxx.patch
new file mode 100644
index 000000000000..58b382a26157
--- /dev/null
+++ b/gnome-base/gnome-keyring/files/gnome-keyring-2.22.3-headers-fix-for-cxx.patch
@@ -0,0 +1,49 @@
+commit 1fe0f7817e3eaa19103b70a09c4fb9d9837fbb93
+Author: Stefan Walter <stefw@src.gnome.org>
+Date:   Wed Feb 11 15:00:38 2009 +0000
+
+    Add G_BEGIN_DECLS/G_END_DECLS so the library can be used with a C++
+    compiler.
+    
+    svn path=/trunk/; revision=1554
+
+diff --git a/library/gnome-keyring-memory.h b/library/gnome-keyring-memory.h
+index babf958..64f988b 100644
+--- a/library/gnome-keyring-memory.h
++++ b/library/gnome-keyring-memory.h
+@@ -26,6 +26,8 @@
+ 
+ #include <glib.h>
+ 
++G_BEGIN_DECLS
++
+ /**
+  * gnome-keyring-memory:Short_Description:
+  * 
+@@ -59,4 +61,6 @@ gboolean  gnome_keyring_memory_is_secure      (gpointer p);
+ 
+ gchar*    gnome_keyring_memory_strdup         (const gchar* str);
+ 
++G_END_DECLS
++
+ #endif /* GNOME_KEYRING_MEMORY_H */
+diff --git a/library/gnome-keyring.h b/library/gnome-keyring.h
+index 628bf8e..dc19a4c 100644
+--- a/library/gnome-keyring.h
++++ b/library/gnome-keyring.h
+@@ -29,6 +29,8 @@
+ 
+ #include "gnome-keyring-result.h"
+ 
++G_BEGIN_DECLS
++
+ #define GNOME_KEYRING_SESSION   "session"
+ #define GNOME_KEYRING_DEFAULT   NULL
+ 
+@@ -516,4 +518,6 @@ GnomeKeyringResult    gnome_keyring_daemon_set_display_sync         (const char
+ 
+ GnomeKeyringResult    gnome_keyring_daemon_prepare_environment_sync (void);
+ 
++G_END_DECLS
++
+ #endif /* GNOME_KEYRING_H */
diff --git a/gnome-base/gnome-keyring/gnome-keyring-2.22.3-r2.ebuild b/gnome-base/gnome-keyring/gnome-keyring-2.22.3-r2.ebuild
new file mode 100644
index 000000000000..fb58382bff98
--- /dev/null
+++ b/gnome-base/gnome-keyring/gnome-keyring-2.22.3-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2009 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/gnome-base/gnome-keyring/gnome-keyring-2.22.3-r2.ebuild,v 1.1 2009/09/27 23:53:01 leio Exp $
+
+inherit gnome2 eutils pam autotools
+
+DESCRIPTION="Password and keyring managing daemon"
+HOMEPAGE="http://www.gnome.org/"
+
+LICENSE="GPL-2 LGPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86 ~x86-fbsd"
+IUSE="debug doc hal pam test"
+
+RDEPEND=">=dev-libs/glib-2.8
+	 >=x11-libs/gtk+-2.6
+	 gnome-base/gconf
+	 >=sys-apps/dbus-1.0
+	 hal? ( >=sys-apps/hal-0.5.7 )
+	 pam? ( virtual/pam )
+	 >=dev-libs/libgcrypt-1.2.2
+	 >=dev-libs/libtasn1-1"
+DEPEND="${RDEPEND}
+	sys-devel/gettext
+	>=dev-util/intltool-0.35
+	>=dev-util/pkgconfig-0.9
+	dev-util/gtk-doc-am
+	doc? ( dev-util/gtk-doc )"
+
+DOCS="AUTHORS ChangeLog NEWS README TODO"
+
+pkg_setup() {
+	G2CONF="${G2CONF}
+		$(use_enable debug)
+		$(use_enable hal)
+		$(use_enable test tests)
+		$(use_enable pam)
+		$(use_with pam pam-dir $(getpam_mod_dir))
+		--with-root-certs=/usr/share/ca-certificates/"
+}
+
+src_unpack() {
+	gnome2_src_unpack
+
+	# Backport from trunk for fixing upstream bug #511285, bug #238098
+	epatch "${FILESDIR}/${P}-warnings.patch"
+
+	# Fix configure with recent libtasn1, bug #266554
+	epatch "${FILESDIR}/${P}-pkg-libtasn1.patch"
+
+	# Makes the installed public headers includeable in C++ code, such as webkit-gtk
+	epatch "${FILESDIR}/${P}-headers-fix-for-cxx.patch"
+
+	intltoolize --force --copy --automake || die "inltoolize failed"
+	eautoreconf
+}