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

Package-Manager: portage-2.2_rc22/cvs/Linux 2.6.31-gentoo x86_64

4 files changed, 116 insertions, 12 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/Manifest b/gnome-base/gnome-keyring/Manifest
index 94fe4d9f6110..5865b3505745 100644
--- a/gnome-base/gnome-keyring/Manifest
+++ b/gnome-base/gnome-keyring/Manifest
@@ -1,6 +1,4 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
+AUX gnome-keyring-2.22.3-headers-fix-for-cxx.patch 1290 RMD160 69d63503e30007ba8d98020d0caa20247765eea3 SHA1 d7073ddd68226bcde23e58955f5b2a2f768156be SHA256 ccd1870ffc38e3c6ced1006d0e04444a2aac3ea46368704c1d786ab551d5a21a
 AUX gnome-keyring-2.22.3-pkg-libtasn1.patch 1079 RMD160 8ddeb815ef69fd3a32b256fc144883c5ab9ca6f8 SHA1 84d93848fac4141aea4ddd5f221b5a3431a6774f SHA256 14332fdb39ab870bab747e148d2098f339758af5105504b9fc83c0582394303c
 AUX gnome-keyring-2.22.3-warnings.patch 780 RMD160 3f3e04754189b67720f2f1e7eebb5e24b9612cd2 SHA1 95077ed5efcc493e35b64b943548c569eef1cfff SHA256 03206a46f86675ed1d2773740a23b02eaa1221c8dbbd3caea0a30a42c82a7d82
 AUX gnome-keyring-2.26.1-dlopen.patch 1273 RMD160 a0e181e8d2ccfd9c32a163dfb0c18863f1858081 SHA1 5aebfbdc2d558092c97a396e56ede6a4766af3de SHA256 161bae39b70239383e26481cbb563fae3f30367cbe64ef48ad02b518855a2c2e
@@ -11,15 +9,9 @@ DIST gnome-keyring-2.24.1.tar.bz2 1125993 RMD160 17c6701ef7b35902780b6c72b79a3f0
 DIST gnome-keyring-2.26.1.tar.bz2 2738687 RMD160 0975197ae8e58a8d98a2ff11c062ec6c9cf74a79 SHA1 3ff24987392b3f51109709b2c020af3557155ef8 SHA256 47a79a7963652c19d9f566289fdb49ca286bfb1bef32b7e1032eb36c49bf7926
 DIST gnome-keyring-2.26.3.tar.bz2 2692915 RMD160 323cf0fe5f11260573e0d20998c879380f4c2122 SHA1 c07136f0757937a7fe6989cbdf3bf8103da55364 SHA256 319eef68f9c82225dcce06d2f6cfda9196da66a799459b8a00da9bb490529539
 EBUILD gnome-keyring-2.22.3-r1.ebuild 1424 RMD160 7d90a3169597875d794be8ca88c6484f77937563 SHA1 c974e49b6acc76feb73488ecf85483a229c75620 SHA256 be8918229399ac8783576131b19a922dcf206b934bc879dcd0540e755b92ec2a
+EBUILD gnome-keyring-2.22.3-r2.ebuild 1570 RMD160 9839cc1da9b795f1c822b413302f32e7a48fb8a7 SHA1 0990cef420bd6e43abd639f04f26b6e8dd974758 SHA256 137f12c77d015dc894a22df25de038a61c50057a8acd72253ec0d735c5bef298
 EBUILD gnome-keyring-2.24.1.ebuild 1470 RMD160 631eb138f3f1e46b4e5e23c4711061d020c530f4 SHA1 adc78bfc15dfc76829e49a7a4ae543c95a2c65aa SHA256 bcdc993a032b069f0221621f2bb95c032b63b7cb248bd33cab5d439b19daba3c
 EBUILD gnome-keyring-2.26.1-r1.ebuild 1894 RMD160 e48b041f0ab0c017e949802c33c7b9c901ea0e1a SHA1 ea0a4d81390f512d95c8505cddc09216c27cb9e0 SHA256 168527a046c095a6314ce510971ce193150cbdc7fd0e803a727a4555a8ff1508
 EBUILD gnome-keyring-2.26.3.ebuild 2039 RMD160 5e434319ed9dd08baa048ea3b30aed2aa89e6e67 SHA1 5b278208366eefd31827d30ad6fc3044e278e6ab SHA256 54ab5fb21206503df66864cb94d3a3a8c2e247dd43a204430fa995ff24ca47a0
-MISC ChangeLog 19819 RMD160 a45f9c1ae95f8c41e7d8a5f2c72c2637c2c53484 SHA1 c1284af2373caa6aaf2842081e0d67ebd11edd5b SHA256 b7afbf0db7406082f3002da8b3653f0677e07ae0887d768db86468e0e5a5be11
+MISC ChangeLog 20066 RMD160 2bddfdc2967694fed2336245c64061d3fb502d5a SHA1 79375f911ab51444bf5e79ba750ac723724e0947 SHA256 f8e8f6182f5b3ae9279dee36a7d1fc836568d1d7edfa470aacd4fcbdd2550357
 MISC metadata.xml 158 RMD160 c0e2bae8e91bb6be8922bac5e4f597302e06587e SHA1 38f78e9790bcd4382b4a49aa226aa6dda1d3a3d7 SHA256 3a7dbca0fdc557de69783e0663e2d76ddab129ea8a19b2d0ef6d3e5d1b947ce1
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
-
-iEYEARECAAYFAkqtZzYACgkQ1fmVwcYIWAbPEgCglXLIfPxFPUDN0nzjTRMKpZXR
-z6IAmgP4+GJFsT6zYCz3cjkchQqqn0Xo
-=he2/
------END PGP SIGNATURE-----
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
+}