Version bump with bugfixes and some new features, remove old.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

6 files changed, 25 insertions, 162 deletions

diff --git a/net-libs/telepathy-glib/ChangeLog b/net-libs/telepathy-glib/ChangeLog
index f9bf2d6fd8a9..d110f27441f3 100644
--- a/net-libs/telepathy-glib/ChangeLog
+++ b/net-libs/telepathy-glib/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-libs/telepathy-glib
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/ChangeLog,v 1.50 2010/09/21 21:22:28 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/ChangeLog,v 1.51 2010/09/29 11:29:52 pacho Exp $
+
+*telepathy-glib-0.12.0 (29 Sep 2010)
+
+  29 Sep 2010; Pacho Ramos <pacho@gentoo.org>
+  -files/telepathy-glib-0.7.33-fix-test.patch,
+  -files/telepathy-glib-0.7.33-nobuildtest.patch,
+  -telepathy-glib-0.8.0.ebuild, -telepathy-glib-0.8.1.ebuild,
+  +telepathy-glib-0.12.0.ebuild:
+  Version bump with bugfixes and some new features, remove old.
 
 *telepathy-glib-0.10.7 (21 Sep 2010)
 
diff --git a/net-libs/telepathy-glib/files/telepathy-glib-0.7.33-fix-test.patch b/net-libs/telepathy-glib/files/telepathy-glib-0.7.33-fix-test.patch
deleted file mode 100644
index 4b6eba262fb8..000000000000
--- a/net-libs/telepathy-glib/files/telepathy-glib-0.7.33-fix-test.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-From 082f6e61b611efd35fbbd437e5741729244773ca Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Thu, 6 Aug 2009 01:00:05 +0200
-Subject: [PATCH] Do not unref dbus message if it is NULL.
-
----
- telepathy-glib/dbus.c |   12 ++++++++----
- 1 files changed, 8 insertions(+), 4 deletions(-)
-
-diff --git a/telepathy-glib/dbus.c b/telepathy-glib/dbus.c
-index 60c9e37..28fba99 100644
---- a/telepathy-glib/dbus.c
-+++ b/telepathy-glib/dbus.c
-@@ -1014,7 +1014,8 @@ _tp_dbus_daemon_get_name_owner (TpDBusDaemon *self,
-   reply = dbus_connection_send_with_reply_and_block (dbc, message,
-       timeout_ms, &dbus_error);
- 
--  dbus_message_unref (message);
-+  if (message)
-+    dbus_message_unref (message);
- 
-   if (reply == NULL)
-     {
-@@ -1026,7 +1027,8 @@ _tp_dbus_daemon_get_name_owner (TpDBusDaemon *self,
-           "%s: %s", dbus_error.name, dbus_error.message);
- 
-       dbus_error_free (&dbus_error);
--      dbus_message_unref (reply);
-+      if (reply)
-+        dbus_message_unref (reply);
-       return FALSE;
-     }
- 
-@@ -1038,14 +1040,16 @@ _tp_dbus_daemon_get_name_owner (TpDBusDaemon *self,
-           "%s: %s", dbus_error.name, dbus_error.message);
- 
-       dbus_error_free (&dbus_error);
--      dbus_message_unref (reply);
-+      if (reply)
-+        dbus_message_unref (reply);
-       return FALSE;
-     }
- 
-   if (unique_name != NULL)
-     *unique_name = g_strdup (name_in_reply);
- 
--  dbus_message_unref (reply);
-+  if (reply)
-+    dbus_message_unref (reply);
- 
-   return TRUE;
- }
--- 
-1.6.3.3
-
diff --git a/net-libs/telepathy-glib/files/telepathy-glib-0.7.33-nobuildtest.patch b/net-libs/telepathy-glib/files/telepathy-glib-0.7.33-nobuildtest.patch
deleted file mode 100644
index f9ea5a9dc998..000000000000
--- a/net-libs/telepathy-glib/files/telepathy-glib-0.7.33-nobuildtest.patch
+++ /dev/null
@@ -1,56 +0,0 @@
-From c6d18bd6e7b7f578cc97fe38f40e917af2f9270a Mon Sep 17 00:00:00 2001
-From: Gilles Dartiguelongue <eva@gentoo.org>
-Date: Thu, 6 Aug 2009 00:25:18 +0200
-Subject: [PATCH] Compile test programs only when needed
-
----
- tests/Makefile.am      |    4 ++--
- tests/dbus/Makefile.am |    4 ++--
- 2 files changed, 4 insertions(+), 4 deletions(-)
-
-diff --git a/tests/Makefile.am b/tests/Makefile.am
-index 900c281..e65c01d 100644
---- a/tests/Makefile.am
-+++ b/tests/Makefile.am
-@@ -4,7 +4,7 @@ SUBDIRS = \
-     dbus \
-     tools
- 
--noinst_PROGRAMS = \
-+check_PROGRAMS = \
-     test-asv \
-     test-availability-cmp \
-     test-heap \
-@@ -12,7 +12,7 @@ noinst_PROGRAMS = \
-     test-intset \
-     test-util
- 
--TESTS = $(noinst_PROGRAMS) \
-+TESTS = $(check_PROGRAMS) \
-     all-errors-documented.py
- 
- TESTS_ENVIRONMENT = \
-diff --git a/tests/dbus/Makefile.am b/tests/dbus/Makefile.am
-index 442ddd1..1baeb3d 100644
---- a/tests/dbus/Makefile.am
-+++ b/tests/dbus/Makefile.am
-@@ -1,6 +1,6 @@
- include $(top_srcdir)/tools/shave.mk
- 
--noinst_PROGRAMS = \
-+check_PROGRAMS = \
-     test-account \
-     test-account-manager \
-     test-call-cancellation \
-@@ -39,7 +39,7 @@ noinst_PROGRAMS = \
-     test-text-respawn \
-     test-unsupported-interface
- 
--TESTS = $(noinst_PROGRAMS)
-+TESTS = $(check_PROGRAMS)
- 
- LDADD = \
-     $(top_builddir)/telepathy-glib/libtelepathy-glib.la \
--- 
-1.6.3.3
-
diff --git a/net-libs/telepathy-glib/metadata.xml b/net-libs/telepathy-glib/metadata.xml
index 9e6b252af301..f8f82209b104 100644
--- a/net-libs/telepathy-glib/metadata.xml
+++ b/net-libs/telepathy-glib/metadata.xml
@@ -8,5 +8,9 @@
 	</maintainer>
 	<longdescription lang="en">
 	</longdescription>
+	<use>
+		<flag name="introspection">Use <pkg>dev-libs/gobject-introspection</pkg>
+		for introspection</flag>
+	</use>
 </pkgmetadata>
 
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.8.0.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.12.0.ebuild
index b526b632ac21..57eb1464ba47 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.8.0.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.12.0.ebuild
@@ -1,34 +1,35 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/telepathy-glib-0.8.0.ebuild,v 1.1 2009/09/24 16:46:55 tester Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/telepathy-glib-0.12.0.ebuild,v 1.1 2010/09/29 11:29:52 pacho Exp $
 
 EAPI="2"
 
-inherit autotools eutils libtool
-
 DESCRIPTION="GLib bindings for the Telepathy D-Bus protocol."
 HOMEPAGE="http://telepathy.freedesktop.org"
 SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
-IUSE="debug"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
+IUSE="debug introspection"
 
-RDEPEND=">=dev-libs/glib-2.16
-	>=dev-libs/dbus-glib-0.73
-	>=dev-lang/python-2.3"
+RDEPEND=">=dev-libs/glib-2.24
+	>=dev-libs/dbus-glib-0.82
+	>=dev-lang/python-2.5
+	introspection? ( >=dev-libs/gobject-introspection-0.6.14 )"
 
 DEPEND="${RDEPEND}
 	dev-libs/libxslt
 	>=dev-util/pkgconfig-0.21"
 
 src_configure() {
+	# configure help says vala-bindings are experimental
 	econf \
 		$(use_enable debug) \
 		$(use_enable debug backtrace) \
 		$(use_enable debug handle-leak-debug) \
-		|| die "econf failed"
+		$(use_enable introspection) \
+		--disable-vala-bindings
 }
 
 src_test() {
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.8.1.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.8.1.ebuild
deleted file mode 100644
index 8ffbed0e19d4..000000000000
--- a/net-libs/telepathy-glib/telepathy-glib-0.8.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/telepathy-glib-0.8.1.ebuild,v 1.5 2010/06/27 12:25:24 nixnut Exp $
-
-EAPI="2"
-
-DESCRIPTION="GLib bindings for the Telepathy D-Bus protocol."
-HOMEPAGE="http://telepathy.freedesktop.org"
-SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ppc ~ppc64 ~sparc x86 ~x86-fbsd"
-IUSE="debug"
-
-RDEPEND=">=dev-libs/glib-2.16
-	>=dev-libs/dbus-glib-0.73
-	>=dev-lang/python-2.3"
-
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	>=dev-util/pkgconfig-0.21"
-
-src_configure() {
-	econf \
-		$(use_enable debug) \
-		$(use_enable debug backtrace) \
-		$(use_enable debug handle-leak-debug)
-}
-
-src_test() {
-	if ! dbus-launch emake -j1 check; then
-		die "Make check failed. See above for details."
-	fi
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
-}