Fix USE=jingle confusing file-transfer with voip, switch to EAPI=5 and python-any-r1. Make tls backend configurable, bug #456250.

Package-Manager: portage-2.2.0_alpha161/cvs/Linux x86_64
Manifest-Sign-Key: 0xC6085806

4 files changed, 39 insertions, 82 deletions

diff --git a/net-voip/telepathy-gabble/ChangeLog b/net-voip/telepathy-gabble/ChangeLog
index 916dcb4c19f5..edc6743f7b38 100644
--- a/net-voip/telepathy-gabble/ChangeLog
+++ b/net-voip/telepathy-gabble/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-voip/telepathy-gabble
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/ChangeLog,v 1.107 2013/02/02 23:07:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/ChangeLog,v 1.108 2013/02/10 12:14:37 eva Exp $
+
+  10 Feb 2013; Gilles Dartiguelongue <eva@gentoo.org>
+  -telepathy-gabble-0.16.3.ebuild, telepathy-gabble-0.16.4.ebuild:
+  Fix USE=jingle confusing file-transfer with voip, switch to EAPI=5 and
+  python-any-r1. Make tls backend configurable, bug #456250.
 
   02 Feb 2013; Agostino Sarubbo <ago@gentoo.org> telepathy-gabble-0.16.4.ebuild:
   Add ~arm, wrt bug #449220
diff --git a/net-voip/telepathy-gabble/Manifest b/net-voip/telepathy-gabble/Manifest
index a1132a93f931..2f8571ee2d88 100644
--- a/net-voip/telepathy-gabble/Manifest
+++ b/net-voip/telepathy-gabble/Manifest
@@ -1,8 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 DIST telepathy-gabble-0.16.1.tar.gz 2644994 SHA256 77536d0ca6c040f1b1bd46c6f5914d0677a6dc6ecf1e858816c24fcf07e3f310 SHA512 5497953d6332678d78357ebb1a1e308361b947f35c130301f8c839ae31acf2ccebecef5df44bdf59b1690f97f9cad122b0811cf7bc27ec68fb959cfa1a42d09a WHIRLPOOL eab35682350360d08c659adaf26cca60fca4d68e0c5cce7fa559b563240a48eb473d2d5976148b01048cedc0b498a90ed9de1875f0c547fed285d8c9b5910ef4
-DIST telepathy-gabble-0.16.3.tar.gz 2645932 SHA256 b19b94d7e3daf82fc2ac6a0e9d8c849efaafb18a9d9e10d2c02df26d150adc60 SHA512 dfd1de67c7ed7fead6a8cb7be225ac9c1a5c2a4f73517f0c8cdf44725535ba621e57a4b9e202012e8b813af3e5823cf92183cf16faf8711419591ba48963c5a1 WHIRLPOOL ec2d5135b614b985bec7457da6cdc229ad4fca2ad692a8fb0f9567f10d25fd2b9c03e5aa2b5f148e95313f45242146007a0de82671b2d8807d7f99a087520702
 DIST telepathy-gabble-0.16.4.tar.gz 2634499 SHA256 e5321c1589db9bc306acfcff3f6e4f75a3b58351e68c772d3616ccf6f3c8d213 SHA512 0715103b4be1f5080950d85825f2de14d3e88908e1b276ba85408daee70f269230ffae401bd6fe039ec899fa0d6f418f80eda3ba78a817278ef45e4ca2ea7070 WHIRLPOOL 7424c1cc9ed2c019692448e851464e1d63ebb39ceeb2319cf4c446f810f4fc5034ddee58e339a9b171f2c84e367fa7e8c629c4cbb745e1fc7d2a98f4f7d19eeb
 EBUILD telepathy-gabble-0.16.1.ebuild 1510 SHA256 3ff76e93c078a960417aad61fa7a207b8e4898399159554c2f67a5ddf3ff9047 SHA512 8afe1579960c31e6c0dd2c20c56ed8f83a9e9f5c03a821e10c9ce0be7199fbe4b3b7f92074db9ad8a336913a688f1b938e8954793ccc5046c6e08cfeddcb3400 WHIRLPOOL 244670156735b08c0aa3e63d3cef51692e0ab2724a081dd671e92b4aa33c91d1ad3e7ded02acbc35748cd5bcf368fafbfdf6cade1dd0c9561ccb1d5a3392ac7a
-EBUILD telepathy-gabble-0.16.3.ebuild 1514 SHA256 f53411f64cd28a0e509add92acb69f107e2a79e33f3c150002b15d2af58fe094 SHA512 ff9ce41ed3e143b0843f6ee62814bfeea00b77314c396e5848922fc78863c8ef1747224178291e9b682b466b96f0794e5b457fed8913b0d2b4c6a17da738d80e WHIRLPOOL c7d8cc61198bd3dec34208aecdf81e85859e892e677930a49a53fb6e54ddf022fed201e073f85ec60b987c19faac7315f4b5fbef8743eaf1368a4eca2e608888
-EBUILD telepathy-gabble-0.16.4.ebuild 1520 SHA256 abc2a52a8d093baf7e436932f995dc5f3e2738c9469329c65e2eab57f8d279ad SHA512 5018f32594eb58b93ba7dd203c27bab01f50498833888b550481be92d5137c7a6414ebc79dea7a44aec0c30cf85d65cdee58fb2a7be5fdc5e92f764c4ca55b02 WHIRLPOOL 878d506af351180426725520c2f6a370efe5c0bc734d08b478445bfb764ef7fdcf0ba8ff861c31a61ffb706259acdbfe045ec25704e749c6c022ffd2235ed1b6
-MISC ChangeLog 18380 SHA256 701e6d96eb28c163b436fd321b4e4b30142e5a6afb7c23314192b73967319485 SHA512 7c95d5ee996e4c16d4ef7762d1b68c5ee78b923f06b7d52930b9b5903cd5e50c2f4df1d47fdd25a5694e6883eee2979e067e1fbcb1243e65a2c7d72337d1ac4b WHIRLPOOL 8131b2832b0794c191f923d4d3f06deca50e08b3f3857741822a13f14a871a417702a0583d62c9f37755ec82578a9c70c306e780fc5df7d72aa7370c2329f6ec
+EBUILD telepathy-gabble-0.16.4.ebuild 1816 SHA256 169c2cde6a6af0e59eea689346decc8d9caead6d3c43f0d4b3178f3a5680b8eb SHA512 5921836720547ed53e0f4b4488e4ef8a88188a86d190f5a6b324f993c0247f9e922d198d178938c2c5551339023230e9fd8c58e5f1a5b6a1d43b1e1d114c0acd WHIRLPOOL 595414373e8576be2713ce070f045423768b5d6df1f2c3598a3bb502d3f9e960a9bbb6cc41cfa6e28aea7df73a07b1cd373ae1344ac79246544750f2e7092dc0
+MISC ChangeLog 18636 SHA256 ac5e34869bbedf611edd1630ed64511cd0f297f08b0695340262065aa8098fa1 SHA512 05d628d66197183b631c4d5b7d85491e2f9eb538af461ad3c1370383ffaa68d2ba306f4d6ba3bf77ae67d6839bd8d822942ee836bb48029bc76847f0268ed6cc WHIRLPOOL 847e6c524a43bd5608a27210bd5a18ebfc7e27fda7a526305ad5720951a3ce37ce41881f2558a9d8b5ef9258b2f255afe1cd49630a8133173d6bc2e431f89dd4
 MISC metadata.xml 325 SHA256 ff2e73c08bb9d36afaab8b340aec6d62b22a1f2470953444c2ca101d652380c0 SHA512 40b693eb958f6d44040e96e09e3d34ee7f2cf5ffe2271c95baf1005e7d0cd52c01d43f87a04c313b8cce94b9bcee971d82eba0be6cf4f21f35b8b9586be8652b WHIRLPOOL fbe47a1f5fc725481c50c2f2d312e1469930d59d2dc4af965a7a80ce5dd55476dc7c4e299f0dbb0115d83d20231b5d302866ac09a5056648d60f2bd2bbe02a6f
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iEYEAREIAAYFAlEXjy4ACgkQ1fmVwcYIWAYF0gCeOZJF2DwSbSU50vrdaA1aSi/Y
+sKMAoL+ESjaFa8lv/TWNOAlcH/7/IVZb
+=2Gfz
+-----END PGP SIGNATURE-----
diff --git a/net-voip/telepathy-gabble/telepathy-gabble-0.16.3.ebuild b/net-voip/telepathy-gabble/telepathy-gabble-0.16.3.ebuild
deleted file mode 100644
index bb2805beb03e..000000000000
--- a/net-voip/telepathy-gabble/telepathy-gabble-0.16.3.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2012 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.16.3.ebuild,v 1.1 2012/09/15 08:03:49 pacho Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2:2.5"
-
-inherit python eutils
-
-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 ~x86-linux"
-IUSE="+jingle test"
-
-RDEPEND=">=dev-libs/glib-2.30:2
-	>=sys-apps/dbus-1.1.0
-	>=dev-libs/dbus-glib-0.82
-	>=net-libs/telepathy-glib-0.18
-	>=net-libs/libnice-0.0.11
-	>=net-libs/gnutls-2.10.2
-
-	dev-db/sqlite:3
-	dev-libs/libxml2
-
-	jingle? ( || ( 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="${EPREFIX}/usr/share/doc/${PF}" \
-		--disable-coding-style-checks \
-		--disable-Werror \
-		$(use_enable jingle file-transfer)
-}
-
-src_test() {
-	# Twisted tests fail, upstream bug #30565
-	emake -C tests check-TESTS
-}
-
-src_install() {
-	default
-	prune_libtool_files
-}
diff --git a/net-voip/telepathy-gabble/telepathy-gabble-0.16.4.ebuild b/net-voip/telepathy-gabble/telepathy-gabble-0.16.4.ebuild
index ba4739336fdf..4e21fa5c6602 100644
--- a/net-voip/telepathy-gabble/telepathy-gabble-0.16.4.ebuild
+++ b/net-voip/telepathy-gabble/telepathy-gabble-0.16.4.ebuild
@@ -1,11 +1,11 @@
 # Copyright 1999-2013 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.16.4.ebuild,v 1.2 2013/02/02 23:07:48 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/telepathy-gabble-0.16.4.ebuild,v 1.3 2013/02/10 12:14:37 eva Exp $
 
-EAPI="4"
-PYTHON_DEPEND="2:2.5"
+EAPI="5"
+PYTHON_COMPAT=( python2_{5,6,7} )
 
-inherit python eutils
+inherit eutils python-any-r1
 
 DESCRIPTION="A Jabber/XMPP connection manager, with handling of single and multi user chats and voice calls"
 HOMEPAGE="http://telepathy.freedesktop.org"
@@ -14,43 +14,51 @@ 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-linux"
-IUSE="+jingle test"
+IUSE="gnutls +jingle test"
 
+# FIXME: missing sasl-2 for tests ? (automagic)
+# missing libiphb for wocky ?
 RDEPEND=">=dev-libs/glib-2.30:2
 	>=sys-apps/dbus-1.1.0
 	>=dev-libs/dbus-glib-0.82
 	>=net-libs/telepathy-glib-0.18
-	>=net-libs/libnice-0.0.11
-	>=net-libs/gnutls-2.10.2
 
 	dev-db/sqlite:3
 	dev-libs/libxml2
 
+	gnutls? ( >=net-libs/gnutls-2.10.2 )
+	!gnutls? ( >=dev-libs/openssl-0.9.8g )
 	jingle? ( || ( net-libs/libsoup:2.4[ssl]
-		 >=net-libs/libsoup-2.33.1 ) )
+		>=net-libs/libsoup-2.33.1 )
+		>=net-libs/libnice-0.0.11 )
 
 	!<net-im/telepathy-mission-control-5.5.0"
 DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	>=dev-util/gtk-doc-am-1.17
 	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
+	python-any-r1_pkg_setup
 }
 
 src_prepare() {
-	python_convert_shebangs -r 2 .
+	_python_rewrite_shebangs .
 }
 
 src_configure() {
 	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
 		--disable-coding-style-checks \
+		--disable-static \
 		--disable-Werror \
-		$(use_enable jingle file-transfer)
+		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
+		--enable-file-transfer \
+		$(use_enable jingle voip) \
+		$(use_enable jingle google-relay) \
+		--with-tls=$(usex gnutls gnutls openssl)
 }
 
 src_test() {