Version bump. Add a patch to fix compilation with debug disabled(already in gabble repo).

(Portage version: 2.1.2-r8)

5 files changed, 68 insertions, 6 deletions

diff --git a/net-voip/telepathy-gabble/ChangeLog b/net-voip/telepathy-gabble/ChangeLog
index 6f5cdf856742..23cddb7e2a68 100644
--- a/net-voip/telepathy-gabble/ChangeLog
+++ b/net-voip/telepathy-gabble/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for net-voip/telepathy-gabble
 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/ChangeLog,v 1.13 2007/01/31 18:50:18 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/ChangeLog,v 1.14 2007/02/07 13:35:59 peper Exp $
+
+*telepathy-gabble-0.5.2 (07 Feb 2007)
+
+  07 Feb 2007; Piotr Jaroszyński <peper@gentoo.org>
+  +files/telepathy-gabble-0.5.2-debug-fix.patch,
+  -telepathy-gabble-0.5.0.ebuild, +telepathy-gabble-0.5.2.ebuild:
+  Version bump. Add a patch to fix compilation with debug disabled(already in
+  gabble repo).
 
 *telepathy-gabble-0.5.1 (31 Jan 2007)
 
diff --git a/net-voip/telepathy-gabble/files/digest-telepathy-gabble-0.5.0 b/net-voip/telepathy-gabble/files/digest-telepathy-gabble-0.5.0
deleted file mode 100644
index 9b6e99e319fc..000000000000
--- a/net-voip/telepathy-gabble/files/digest-telepathy-gabble-0.5.0
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 687ce6a2afc2b426f1ccb518a68c8e8d telepathy-gabble-0.5.0.tar.gz 600731
-RMD160 0ad4fe04f1f32a549da4e2e61d2957a1e1d8bd01 telepathy-gabble-0.5.0.tar.gz 600731
-SHA256 630446a015c78ac4af36facedaa7644926911270de0f45787f012e1c3fc4baf0 telepathy-gabble-0.5.0.tar.gz 600731
diff --git a/net-voip/telepathy-gabble/files/digest-telepathy-gabble-0.5.2 b/net-voip/telepathy-gabble/files/digest-telepathy-gabble-0.5.2
new file mode 100644
index 000000000000..d2418e9658e3
--- /dev/null
+++ b/net-voip/telepathy-gabble/files/digest-telepathy-gabble-0.5.2
@@ -0,0 +1,3 @@
+MD5 713de31300452d2350d170bd7bd10eee telepathy-gabble-0.5.2.tar.gz 663033
+RMD160 86feaf7ca78d274c0acd243fc9c3795c06d0f192 telepathy-gabble-0.5.2.tar.gz 663033
+SHA256 b06d97aaf412646183319d78efb19a02d1558e42b6e7ac82767409455b1a6bd5 telepathy-gabble-0.5.2.tar.gz 663033
diff --git a/net-voip/telepathy-gabble/files/telepathy-gabble-0.5.2-debug-fix.patch b/net-voip/telepathy-gabble/files/telepathy-gabble-0.5.2-debug-fix.patch
new file mode 100644
index 000000000000..c4ebac4a76fc
--- /dev/null
+++ b/net-voip/telepathy-gabble/files/telepathy-gabble-0.5.2-debug-fix.patch
@@ -0,0 +1,44 @@
+Wed Feb  7 13:05:23 GMT 2007  Robert McQueen <robert.mcqueen@collabora.co.uk>
+  * fix debug headers putting G_BEGIN_DECLS inside #ifdef ENABLE_DEBUG, but G_END_DECLS outside
+diff -rN -u old-telepathy-gabble/lib/telepathy-glib/internal-debug.h new-telepathy-gabble/lib/telepathy-glib/internal-debug.h
+--- old-telepathy-gabble/lib/telepathy-glib/internal-debug.h	2007-02-07 13:22:06.972650000 +0000
++++ new-telepathy-gabble/lib/telepathy-glib/internal-debug.h	2007-02-07 13:22:07.304670750 +0000
+@@ -24,6 +24,8 @@
+ void _tp_debug (TpDebugFlags flag, const gchar *format, ...)
+     G_GNUC_PRINTF (2, 3);
+ 
++G_END_DECLS
++
+ #ifdef DEBUG_FLAG
+ 
+ #define DEBUG(format, ...) \
+@@ -47,6 +49,4 @@
+ 
+ #endif /* ENABLE_DEBUG */
+ 
+-G_END_DECLS
+-
+-#endif
++#endif /* __DEBUG_H__ */
+diff -rN -u old-telepathy-gabble/src/debug.h new-telepathy-gabble/src/debug.h
+--- old-telepathy-gabble/src/debug.h	2007-02-07 13:22:06.968649750 +0000
++++ new-telepathy-gabble/src/debug.h	2007-02-07 13:22:06.984650750 +0000
+@@ -32,6 +32,8 @@
+ void gabble_debug (GabbleDebugFlags flag, const gchar *format, ...)
+     G_GNUC_PRINTF (2, 3);
+ 
++G_END_DECLS
++
+ #ifdef DEBUG_FLAG
+ 
+ #define DEBUG(format, ...) \
+@@ -62,7 +64,5 @@
+ 
+ #endif /* ENABLE_DEBUG */
+ 
+-G_END_DECLS
+-
+-#endif
++#endif /* __DEBUG_H__ */
+ 
+
diff --git a/net-voip/telepathy-gabble/telepathy-gabble-0.5.0.ebuild b/net-voip/telepathy-gabble/telepathy-gabble-0.5.2.ebuild
index efb39403e3aa..eaf77f119205 100644
--- a/net-voip/telepathy-gabble/telepathy-gabble-0.5.0.ebuild
+++ b/net-voip/telepathy-gabble/telepathy-gabble-0.5.2.ebuild
@@ -1,6 +1,8 @@
-# Copyright 1999-2006 Gentoo Foundation
+# Copyright 1999-2007 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/telepathy-gabble-0.5.0.ebuild,v 1.1 2006/12/11 22:58:07 peper Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/telepathy-gabble-0.5.2.ebuild,v 1.1 2007/02/07 13:35:59 peper Exp $
+
+inherit eutils
 
 DESCRIPTION="A Jabber/XMPP connection manager, this handles single and multi user chats and voice calls."
 HOMEPAGE="http://telepathy.freedesktop.org"
@@ -17,6 +19,14 @@ DEPEND=">=dev-libs/glib-2.4
 	>=net-libs/loudmouth-1.1.1"
 RDEPEND="${DEPEND}"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	# Fix compilation with debug disabled(already in gabble repo)
+	epatch "${FILESDIR}/${P}-debug-fix.patch"
+}
+
 src_compile() {
 	econf \
 		$(use_enable debug) \