Version bump. Update to latest telepathy-spec, bug fixes. Clean up old revisions.

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

6 files changed, 150 insertions, 56 deletions

diff --git a/net-libs/telepathy-glib/ChangeLog b/net-libs/telepathy-glib/ChangeLog
index ab78d6c2ab2f..cfcb96663aa4 100644
--- a/net-libs/telepathy-glib/ChangeLog
+++ b/net-libs/telepathy-glib/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-libs/telepathy-glib
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/ChangeLog,v 1.30 2009/06/18 13:02:44 aballier Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/ChangeLog,v 1.31 2009/08/05 23:12:13 eva Exp $
+
+*telepathy-glib-0.7.33 (05 Aug 2009)
+
+  05 Aug 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -telepathy-glib-0.7.18.ebuild, -telepathy-glib-0.7.20.ebuild,
+  +telepathy-glib-0.7.33.ebuild,
+  +files/telepathy-glib-0.7.33-fix-test.patch,
+  +files/telepathy-glib-0.7.33-nobuildtest.patch:
+  Version bump. Update to latest telepathy-spec, bug fixes. Clean up old
+  revisions.
 
   18 Jun 2009; Alexis Ballier <aballier@gentoo.org>
   telepathy-glib-0.7.31.ebuild:
diff --git a/net-libs/telepathy-glib/Manifest b/net-libs/telepathy-glib/Manifest
index e8f57a070ba3..f5fdbb827b86 100644
--- a/net-libs/telepathy-glib/Manifest
+++ b/net-libs/telepathy-glib/Manifest
@@ -1,22 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST telepathy-glib-0.7.18.tar.gz 2099979 RMD160 531d551c38cc08eb3c3ab842e3541c0a547682d2 SHA1 929c22e88a1d126098b261089d0eafc1a5658810 SHA256 d485f795e1087f50e46f4c239f98d3d32e99243aa73df9c8fc8d538b00fc6c16
-DIST telepathy-glib-0.7.20.tar.gz 2167832 RMD160 6204e32c237d005fb4a112af42b098a611ee7e0d SHA1 b1de82a6bfdd3a698b609654f26d4ff078374992 SHA256 98ee18db07ca7d9191a013fe008acf48d087b6556a1c2728b4e6729952faeadc
+AUX telepathy-glib-0.7.33-fix-test.patch 1523 RMD160 dbb7055e71c843695dca75002fe0b7633227c8db SHA1 b6843114bef109bdf7eab35b2831db09dcaf5fac SHA256 268d1ed376d876ac22941a98a5cad11452bcd55eb774de0683210db8364abe6a
+AUX telepathy-glib-0.7.33-nobuildtest.patch 1371 RMD160 10c46938f88780ebe4c82dd664aa22bf5bea06fc SHA1 17ad35e6ab976fd97964fb27edde77228fe7f0f3 SHA256 c0808602f6fa8b3da3f85e908029f9f71fe388a235d20ff7aa50a4d5327ff9b9
 DIST telepathy-glib-0.7.25.tar.gz 2326926 RMD160 1d1bc7b17cd416118309306f9f8f603bf806cd25 SHA1 52b33a273a629e1e5a89fd005b6b4f82e3557ae8 SHA256 4a419f8f3d8ef154ec314231028247da721408c9aecdab23795bfb37d533d238
 DIST telepathy-glib-0.7.29.tar.gz 5009792 RMD160 bbdf7caf7d818a38ebda5b2a7967bd26d716e751 SHA1 5e39e8c33b4100e7145efc58b17369452c6684f6 SHA256 7bf25e050e8b8ceb983c1cad6b4e38892b052f6da82df3b7aec7b2ea50a8702e
 DIST telepathy-glib-0.7.31.tar.gz 2574808 RMD160 5cdf8afd109975eabe0e0aec92efda1b9a854ceb SHA1 a1b76753162e80b15deedeca5c5513e1f6e7c127 SHA256 8b344d944c36ed9022c1516e0972a8de697eba275e34ff3e59af310d2167ebd9
-EBUILD telepathy-glib-0.7.18.ebuild 1115 RMD160 82e38bd8cd46fb6324f409760a39575f287d0649 SHA1 c6af41eb106661c3a44a9d02d2c912a3dec62829 SHA256 34973500560607125132bc6a93a29c8fde2983ae43b38ea77e0400207b2d1afc
-EBUILD telepathy-glib-0.7.20.ebuild 1127 RMD160 420ab34b87ea6721b7499ca17cbef26dfcc4a65a SHA1 b96830799cf9169c1861ad3d993b3d55b37ad4d1 SHA256 a11e00a5ed56f9542a916f0fcdba5ea15bc7d440f8211579d208211480a43c8b
+DIST telepathy-glib-0.7.33.tar.gz 2717626 RMD160 f6c425e33516b98021de1c48df66bf608406d9b5 SHA1 1fed557912f42452aea48396d95ec1e91e3ea3b5 SHA256 4aaa57689d2b791f2713648470aaec57bebeff87114f2b28214e66437536aada
 EBUILD telepathy-glib-0.7.25.ebuild 1135 RMD160 bc990cf89c915d318173e6a3672a93e8de105739 SHA1 1cc563299ef525fdf40113b5b11647170ff8fdcd SHA256 6552bbfa8da3dfe004d1dfec5d6a173007c104d90aeb4b4de91a68ff0bf0133c
 EBUILD telepathy-glib-0.7.29.ebuild 1136 RMD160 2ddafca4aecec43e23c077f442cc87af65f5eaef SHA1 5f31997c8d3886af368a0412688c6d7885bec923 SHA256 287879d381ec65b7523b853e63e5e7b7d60a430e85375e3cdafac61ea064e675
 EBUILD telepathy-glib-0.7.31.ebuild 1276 RMD160 429f575d7f0ce42c44ec763001830cc796f0798f SHA1 5d2a72d31a986ed4efb039bec5afa623c290bcfd SHA256 a8545420142b3bc3ae147b1b124bc27d684bf324d6b997b3f83ec3ad281e2f9d
-MISC ChangeLog 4955 RMD160 3ed01ea3960d1629ebf046ce45f6f44358f9056b SHA1 1089f314c6252cf11178472cb1a4906bdd5bf769 SHA256 57b9cd6e5f081a807af0e09498d528db42bd6e916f1cb360b9030c7ad4db2ed4
+EBUILD telepathy-glib-0.7.33.ebuild 1453 RMD160 92721e0f242cf0d0416b8bffcf4b3bba1ebedd71 SHA1 f4312701d5dffbc21077bbbb617f4ef2b25fe978 SHA256 07feb7c8e55d477f9df56a3f42d537902f31445d584cd0fed82dd637afec20b5
+MISC ChangeLog 5323 RMD160 903756f70496e708bee197315d16399817bf2616 SHA1 c2872758b3fd488f6fe1e86d0e8302602ce3d5f5 SHA256 264f7de363f29a3e9b9f26ee865494d1c8e19ac7e925c93dec1df1f6701ea2f7
 MISC metadata.xml 305 RMD160 3cefb2764dc78feb295addb8303d83b7d71b1667 SHA1 16cd8bdf5dc735bf68dad2d62fe4132f08527087 SHA256 8067602a9c13faf07e0e9e40d41df3b348c6a6351e2787491c703288c44d1ff0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.11 (GNU/Linux)
 
-iEYEARECAAYFAko6OvoACgkQvFcC4BYPU0oN8wCgsiYfMnMTMJ1Dq9lL3Ogn6Uf3
-TiQAn0t0SPk/wwTiq/Ymmoae30I29+fl
-=oEZd
+iEYEARECAAYFAkp6EdMACgkQ1fmVwcYIWAbB7QCgkLa97XqwlOwvCLnHGVGA8Lc/
+AhgAnAzSOtHcFlDZTuoJD7Pymt85XZLy
+=NKlT
 -----END PGP SIGNATURE-----
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
new file mode 100644
index 000000000000..4b6eba262fb8
--- /dev/null
+++ b/net-libs/telepathy-glib/files/telepathy-glib-0.7.33-fix-test.patch
@@ -0,0 +1,55 @@
+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
new file mode 100644
index 000000000000..f9ea5a9dc998
--- /dev/null
+++ b/net-libs/telepathy-glib/files/telepathy-glib-0.7.33-nobuildtest.patch
@@ -0,0 +1,56 @@
+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/telepathy-glib-0.7.18.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.7.18.ebuild
deleted file mode 100644
index a0bd5aa7c6d5..000000000000
--- a/net-libs/telepathy-glib/telepathy-glib-0.7.18.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2008 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.7.18.ebuild,v 1.3 2008/12/24 10:03:16 bluebird Exp $
-
-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="~amd64 ~ppc64 ~sparc ~x86"
-IUSE="debug doc"
-
-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
-	doc? ( >=dev-util/gtk-doc-1.10 )"
-
-src_compile() {
-	econf \
-		$(use_enable doc gtk-doc) \
-		$(use_enable debug) \
-		$(use_enable debug backtrace) \
-		$(use_enable debug handle-leak-debug) \
-		|| die "econf failed"
-	emake || die "emake failed"
-}
-
-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
-}
diff --git a/net-libs/telepathy-glib/telepathy-glib-0.7.20.ebuild b/net-libs/telepathy-glib/telepathy-glib-0.7.33.ebuild
index 0f42ed0b85cb..47ab52c600c1 100644
--- a/net-libs/telepathy-glib/telepathy-glib-0.7.20.ebuild
+++ b/net-libs/telepathy-glib/telepathy-glib-0.7.33.ebuild
@@ -1,6 +1,10 @@
 # Copyright 1999-2009 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.7.20.ebuild,v 1.2 2009/01/07 16:57:33 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-libs/telepathy-glib/telepathy-glib-0.7.33.ebuild,v 1.1 2009/08/05 23:12:13 eva Exp $
+
+EAPI="2"
+
+inherit autotools eutils libtool
 
 DESCRIPTION="GLib bindings for the Telepathy D-Bus protocol."
 HOMEPAGE="http://telepathy.freedesktop.org"
@@ -8,7 +12,7 @@ SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-fbsd"
 IUSE="debug doc"
 
 RDEPEND=">=dev-libs/glib-2.16
@@ -18,16 +22,27 @@ RDEPEND=">=dev-libs/glib-2.16
 DEPEND="${RDEPEND}
 	dev-libs/libxslt
 	>=dev-util/pkgconfig-0.21
+	dev-util/gtk-doc-am
 	doc? ( >=dev-util/gtk-doc-1.10 )"
 
-src_compile() {
+src_prepare() {
+	# Make test suite pass, upstream bug #23164
+	epatch "${FILESDIR}/${P}-fix-test.patch"
+
+	# Do not build tests if not needed
+	epatch "${FILESDIR}/${P}-nobuildtest.patch"
+
+	#elibtoolize # for sane .so versionning on BSD
+	eautoreconf
+}
+
+src_configure() {
 	econf \
 		$(use_enable doc gtk-doc) \
 		$(use_enable debug) \
 		$(use_enable debug backtrace) \
 		$(use_enable debug handle-leak-debug) \
 		|| die "econf failed"
-	emake || die "emake failed"
 }
 
 src_test() {
@@ -38,5 +53,5 @@ src_test() {
 
 src_install() {
 	emake install DESTDIR="${D}" || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README
+	dodoc AUTHORS ChangeLog NEWS README || die "dodoc failed"
 }