Version bump: google jingle support can be enable/disabled via USE flag, making soup dependency optional; Gabble implements the new Room, Subject and RoomConfig interfaces, and no longer supports the old, crummy Telepathy.Properties interface; Gabble no longer supports the legacy Presence interace; require-encryption is now enabled by default; the plugin API has been extended, plugins for 0.12.x may need updating to compile and run with 0.14.x. Remove old.

(Portage version: 2.1.10.36/cvs/Linux x86_64)

4 files changed, 25 insertions, 134 deletions

diff --git a/net-voip/telepathy-gabble/ChangeLog b/net-voip/telepathy-gabble/ChangeLog
index 1167b9c94da1..fcc8bd5f5b83 100644
--- a/net-voip/telepathy-gabble/ChangeLog
+++ b/net-voip/telepathy-gabble/ChangeLog
@@ -1,6 +1,19 @@
 # ChangeLog for net-voip/telepathy-gabble
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/ChangeLog,v 1.90 2011/10/30 17:31:20 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/ChangeLog,v 1.91 2011/11/20 13:09:24 pacho Exp $
+
+*telepathy-gabble-0.14.0 (20 Nov 2011)
+
+  20 Nov 2011; Pacho Ramos <pacho@gentoo.org> -telepathy-gabble-0.10.5.ebuild,
+  -telepathy-gabble-0.12.1.ebuild, -telepathy-gabble-0.12.6.ebuild,
+  +telepathy-gabble-0.14.0.ebuild:
+  Version bump: google jingle support can be enable/disabled via USE flag,
+  making soup dependency optional; Gabble implements the new Room, Subject and
+  RoomConfig interfaces, and no longer supports the old, crummy
+  Telepathy.Properties interface; Gabble no longer supports the legacy Presence
+  interace; require-encryption is now enabled by default; the plugin API has
+  been extended, plugins for 0.12.x may need updating to compile and run with
+  0.14.x. Remove old.
 
   30 Oct 2011; Raúl Porcel <armin76@gentoo.org>
   telepathy-gabble-0.12.7.ebuild:
diff --git a/net-voip/telepathy-gabble/telepathy-gabble-0.10.5.ebuild b/net-voip/telepathy-gabble/telepathy-gabble-0.10.5.ebuild
deleted file mode 100644
index 294f0b9e27ba..000000000000
--- a/net-voip/telepathy-gabble/telepathy-gabble-0.10.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2011 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.10.5.ebuild,v 1.7 2011/03/22 20:10:03 ranger Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-
-inherit eutils python
-
-DESCRIPTION="A Jabber/XMPP connection manager, this handles single and multi user chats and voice calls."
-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 ia64 ppc ~ppc64 sparc x86"
-IUSE="debug test"
-
-RDEPEND=">=dev-libs/glib-2.24
-	>=sys-apps/dbus-1.1.0
-	>=dev-libs/dbus-glib-0.82
-	>=net-libs/telepathy-glib-0.11.16
-	>=net-libs/libnice-0.0.11
-	>=net-libs/gnutls-2.10.2
-
-	dev-db/sqlite:3
-	dev-libs/libxml2
-
-	|| ( net-libs/libsoup:2.4[ssl]
-		 >=net-libs/libsoup-2.33.1 )
-
-	!<net-im/telepathy-mission-control-5.5.0"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	test? ( >=dev-python/twisted-0.8.2
-		>=dev-python/twisted-words-0.8.2
-		>=dev-python/dbus-python-0.83 )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	python_convert_shebangs -r 2 .
-}
-
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable debug handle-leak-debug)
-}
-
-src_test() {
-	# Twisted tests fail, upstream bug #30565
-	emake -C tests check-TESTS || die "tests failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-	dodoc AUTHORS NEWS ChangeLog README || die "dodoc failed"
-}
diff --git a/net-voip/telepathy-gabble/telepathy-gabble-0.12.1.ebuild b/net-voip/telepathy-gabble/telepathy-gabble-0.12.1.ebuild
deleted file mode 100644
index ddf598eb62bf..000000000000
--- a/net-voip/telepathy-gabble/telepathy-gabble-0.12.1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2011 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.12.1.ebuild,v 1.5 2011/10/05 17:59:13 xarthisius Exp $
-
-EAPI="3"
-PYTHON_DEPEND="2:2.5"
-
-inherit eutils python
-
-DESCRIPTION="A Jabber/XMPP connection manager, this handles single and multi user chats and voice calls."
-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 ia64 ppc ~ppc64 sparc x86"
-IUSE="debug test"
-
-RDEPEND=">=dev-libs/glib-2.24:2
-	>=sys-apps/dbus-1.1.0
-	>=dev-libs/dbus-glib-0.82
-	>=net-libs/telepathy-glib-0.14.5
-	>=net-libs/libnice-0.0.11
-	>=net-libs/gnutls-2.10.2
-
-	dev-db/sqlite:3
-	dev-libs/libxml2
-
-	|| ( net-libs/libsoup:2.4[ssl]
-		 >=net-libs/libsoup-2.33.1 )
-
-	!<net-im/telepathy-mission-control-5.5.0"
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	test? ( >=dev-python/twisted-0.8.2
-		>=dev-python/twisted-words-0.8.2
-		>=dev-python/dbus-python-0.83 )"
-
-pkg_setup() {
-	python_set_active_version 2
-	python_pkg_setup
-}
-
-src_prepare() {
-	python_convert_shebangs -r 2 .
-}
-
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable debug handle-leak-debug)
-}
-
-src_test() {
-	# Twisted tests fail, upstream bug #30565
-	emake -C tests check-TESTS || die "tests failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-	dodoc AUTHORS NEWS ChangeLog README || die "dodoc failed"
-}
diff --git a/net-voip/telepathy-gabble/telepathy-gabble-0.12.6.ebuild b/net-voip/telepathy-gabble/telepathy-gabble-0.14.0.ebuild
index 1609af560c34..3010faa406e5 100644
--- a/net-voip/telepathy-gabble/telepathy-gabble-0.12.6.ebuild
+++ b/net-voip/telepathy-gabble/telepathy-gabble-0.14.0.ebuild
@@ -1,8 +1,8 @@
 # Copyright 1999-2011 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.12.6.ebuild,v 1.1 2011/08/28 19:26:00 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/telepathy-gabble-0.14.0.ebuild,v 1.1 2011/11/20 13:09:24 pacho Exp $
 
-EAPI="3"
+EAPI="4"
 PYTHON_DEPEND="2:2.5"
 
 inherit python
@@ -14,20 +14,20 @@ SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 LICENSE="LGPL-2.1"
 SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~x86-linux"
-IUSE="debug test"
+IUSE="debug +jingle test"
 
 RDEPEND=">=dev-libs/glib-2.24:2
 	>=sys-apps/dbus-1.1.0
 	>=dev-libs/dbus-glib-0.82
-	>=net-libs/telepathy-glib-0.14.5
+	>=net-libs/telepathy-glib-0.15.9
 	>=net-libs/libnice-0.0.11
 	>=net-libs/gnutls-2.10.2
 
 	dev-db/sqlite:3
 	dev-libs/libxml2
 
-	|| ( net-libs/libsoup:2.4[ssl]
-		 >=net-libs/libsoup-2.33.1 )
+	jingle? ( || ( net-libs/libsoup:2.4[ssl]
+		 >=net-libs/libsoup-2.33.1 ) )
 
 	!<net-im/telepathy-mission-control-5.5.0"
 DEPEND="${RDEPEND}
@@ -48,15 +48,17 @@ src_prepare() {
 src_configure() {
 	econf \
 		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		$(use_enable jingle google-relay) \
 		$(use_enable debug handle-leak-debug)
 }
 
 src_test() {
 	# Twisted tests fail, upstream bug #30565
-	emake -C tests check-TESTS || die "tests failed"
+	emake -C tests check-TESTS
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-	dodoc AUTHORS NEWS ChangeLog README || die "dodoc failed"
+	emake install DESTDIR="${D}"
+	dodoc AUTHORS NEWS ChangeLog README
+	find "${D}" -name '*.la' -exec rm -f {} +
 }