public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] gentoo-x86 commit in net-voip/telepathy-gabble: ChangeLog telepathy-gabble-0.16.4.ebuild telepathy-gabble-0.16.3.ebuild
@ 2013-02-10 12:14 Gilles Dartiguelongue (eva)
  0 siblings, 0 replies; only message in thread
From: Gilles Dartiguelongue (eva) @ 2013-02-10 12:14 UTC (permalink / raw
  To: gentoo-commits

eva         13/02/10 12:14:37

  Modified:             ChangeLog telepathy-gabble-0.16.4.ebuild
  Removed:              telepathy-gabble-0.16.3.ebuild
  Log:
  Fix USE=jingle confusing file-transfer with voip, switch to EAPI=5 and python-any-r1. Make tls backend configurable, bug #456250.
  
  (Portage version: 2.2.0_alpha161/cvs/Linux x86_64, signed Manifest commit with key C6085806)

Revision  Changes    Path
1.108                net-voip/telepathy-gabble/ChangeLog

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-voip/telepathy-gabble/ChangeLog?rev=1.108&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-voip/telepathy-gabble/ChangeLog?rev=1.108&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-voip/telepathy-gabble/ChangeLog?r1=1.107&r2=1.108

Index: ChangeLog
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/ChangeLog,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -r1.107 -r1.108
--- ChangeLog	2 Feb 2013 23:07:48 -0000	1.107
+++ ChangeLog	10 Feb 2013 12:14:37 -0000	1.108
@@ -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



1.3                  net-voip/telepathy-gabble/telepathy-gabble-0.16.4.ebuild

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-voip/telepathy-gabble/telepathy-gabble-0.16.4.ebuild?rev=1.3&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-voip/telepathy-gabble/telepathy-gabble-0.16.4.ebuild?rev=1.3&content-type=text/plain
diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/net-voip/telepathy-gabble/telepathy-gabble-0.16.4.ebuild?r1=1.2&r2=1.3

Index: telepathy-gabble-0.16.4.ebuild
===================================================================
RCS file: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/telepathy-gabble-0.16.4.ebuild,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- telepathy-gabble-0.16.4.ebuild	2 Feb 2013 23:07:48 -0000	1.2
+++ telepathy-gabble-0.16.4.ebuild	10 Feb 2013 12:14:37 -0000	1.3
@@ -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 @@
 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() {





^ permalink raw reply	[flat|nested] only message in thread

only message in thread, other threads:[~2013-02-10 12:14 UTC | newest]

Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-02-10 12:14 [gentoo-commits] gentoo-x86 commit in net-voip/telepathy-gabble: ChangeLog telepathy-gabble-0.16.4.ebuild telepathy-gabble-0.16.3.ebuild Gilles Dartiguelongue (eva)

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox