[gentoo-commits] repo/gentoo:master commit in: net-voip/telepathy-haze/

2020-03-26 Thread Michał Górny
commit: 53a8f300c368ac43346862afae31382dfa802c40
Author: Michał Górny  gentoo  org>
AuthorDate: Thu Mar 26 17:29:43 2020 +
Commit: Michał Górny  gentoo  org>
CommitDate: Thu Mar 26 17:36:00 2020 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53a8f300

net-voip/telepathy-haze: Flatten twisted dep

Signed-off-by: Michał Górny  gentoo.org>

 net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild | 10 +++---
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild 
b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild
index 124ede37e15..3a90c52fe39 100644
--- a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild
+++ b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -30,10 +30,7 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
test? (
dev-python/pygobject:2
-   || (
-   $(python_gen_any_dep 
'dev-python/twisted[${PYTHON_USEDEP}]')
-   $(python_gen_any_dep 
'dev-python/twisted-words[${PYTHON_USEDEP}]')
-   )
+   $(python_gen_any_dep 'dev-python/twisted[${PYTHON_USEDEP}]')
)
 "
 
@@ -48,8 +45,7 @@ PATCHES=(
 
 python_check_deps() {
if use test ; then
-   has_version "dev-python/twisted[${PYTHON_USEDEP}]" \
-   || has_version 
"dev-python/twisted-words[${PYTHON_USEDEP}]"
+   has_version "dev-python/twisted[${PYTHON_USEDEP}]"
fi
 }
 



[gentoo-commits] repo/gentoo:master commit in: net-voip/telepathy-haze/

2019-10-20 Thread Mart Raudsepp
commit: 0b4d88d2956aeffc17875fccec18c6c57b76ddf9
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Sat Oct 19 20:35:24 2019 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Sun Oct 20 17:38:01 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b4d88d2

net-voip/telepathy-haze: remove old

Package-Manager: Portage-2.3.69, Repoman-2.3.12
Signed-off-by: Mart Raudsepp  gentoo.org>

 .../telepathy-haze/telepathy-haze-0.8.0-r1.ebuild  | 42 --
 1 file changed, 42 deletions(-)

diff --git a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild 
b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild
deleted file mode 100644
index ccf350d7d57..000
--- a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2018 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils python-single-r1
-
-DESCRIPTION="Telepathy connection manager providing libpurple supported 
protocols"
-HOMEPAGE="https://telepathy.freedesktop.org 
https://developer.pidgin.im/wiki/TelepathyHaze";
-SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-#IUSE="test"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Tests failing, see upstream: https://bugs.freedesktop.org/34577
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
-   >=net-im/pidgin-2.7
-   >=net-libs/telepathy-glib-0.15.1[${PYTHON_USEDEP}]
-   >=dev-libs/glib-2.30:2
-   >=dev-libs/dbus-glib-0.73
-"
-DEPEND="${RDEPEND}
-   dev-util/glib-utils
-   virtual/pkgconfig"
-#  test? ( dev-python/twisted-words )"
-
-src_prepare() {
-   # contact-list: Don't crash if a contact is already in the roster
-   # (fixed in next version)
-   epatch "${FILESDIR}"/${P}-crash.patch
-
-   # Fix compat with newer pidgin versions, bug #572296
-   epatch "${FILESDIR}"/${P}-pidgin-2.10.12-compat.patch
-}



[gentoo-commits] repo/gentoo:master commit in: net-voip/telepathy-haze/

2019-10-17 Thread Agostino Sarubbo
commit: 5601136cae9c074397fca25e9e3cc25adfa07661
Author: Agostino Sarubbo  gentoo  org>
AuthorDate: Thu Oct 17 10:31:24 2019 +
Commit: Agostino Sarubbo  gentoo  org>
CommitDate: Thu Oct 17 10:31:24 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=5601136c

net-voip/telepathy-haze: x86 stable wrt bug #697882

Package-Manager: Portage-2.3.76, Repoman-2.3.16
RepoMan-Options: --include-arches="x86"
Signed-off-by: Agostino Sarubbo  gentoo.org>

 net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild 
b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild
index eebef7eaf5b..b29a0717c19 100644
--- a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild
+++ b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc x86"
 IUSE="test"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-voip/telepathy-haze/

2019-10-16 Thread Joonas Niilola
commit: c0c7f9475c891ec2aafb071589408fabfaf0b0ea
Author: Joonas Niilola  gentoo  org>
AuthorDate: Wed Oct 16 13:13:35 2019 +
Commit: Joonas Niilola  gentoo  org>
CommitDate: Wed Oct 16 13:19:06 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c0c7f947

net-voip/telepathy-haze: add dev-python/pygobject:2 to test deps

Acked-by: Mart Raudsepp  gentoo.org>
Closes: https://bugs.gentoo.org/641742
Package-Manager: Portage-2.3.76, Repoman-2.3.17
Signed-off-by: Joonas Niilola  gentoo.org>

 net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild | 1 +
 1 file changed, 1 insertion(+)

diff --git a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild 
b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild
index 04e3191f428..eebef7eaf5b 100644
--- a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild
+++ b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild
@@ -28,6 +28,7 @@ DEPEND="${RDEPEND}
dev-util/glib-utils
virtual/pkgconfig
test? (
+   dev-python/pygobject:2
|| (
$(python_gen_any_dep 
'dev-python/twisted[${PYTHON_USEDEP}]')
$(python_gen_any_dep 
'dev-python/twisted-words[${PYTHON_USEDEP}]')



[gentoo-commits] repo/gentoo:master commit in: net-voip/telepathy-haze/

2019-07-28 Thread Aaron Bauman
commit: ce9448d4973727dae7b8cfa61cc0b27c1dbbff9f
Author: Aaron Bauman  gentoo  org>
AuthorDate: Sun Jul 28 16:51:20 2019 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sun Jul 28 17:01:59 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce9448d4

net-voip/telepathy-haze: arm64 stable

Signed-off-by: Aaron Bauman  gentoo.org>
Package-Manager: Portage-2.3.69, Repoman-2.3.16
RepoMan-Options: --include-arches="arm64"

 net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild 
b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild
index 3a83ae36de3..04e3191f428 100644
--- a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild
+++ b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-voip/telepathy-haze/

2019-02-19 Thread Andreas Sturmlechner
commit: 8baaac71a07c5ba4509b61fb5ed3ab8b38b5d16c
Author: Roy Bamford  gentoo  org>
AuthorDate: Sun Feb 17 22:05:50 2019 +
Commit: Andreas Sturmlechner  gentoo  org>
CommitDate: Tue Feb 19 18:04:44 2019 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8baaac71

net-voip/telepathy-haze: added ~arm64

Package-Manager: Portage-2.3.60, Repoman-2.3.12

Signed-off-by: Roy Bamford  gentoo.org>
Signed-off-by: Andreas Sturmlechner  gentoo.org>

 net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild 
b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild
index cd3ed1869a4..3a83ae36de3 100644
--- a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild
+++ b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Authors
+# Copyright 1999-2019 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -13,7 +13,7 @@ 
SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-voip/telepathy-haze/

2018-11-02 Thread Mart Raudsepp
commit: 3bc29b2b86f5da979c8f7a3f98cc6742724e8fc4
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Fri Nov  2 13:07:55 2018 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Fri Nov  2 13:09:55 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3bc29b2b

net-voip/telepathy-haze: add explicit build dep on glib-utils

Closes: https://bugs.gentoo.org/669986
Signed-off-by: Mart Raudsepp  gentoo.org>
Package-Manager: Portage-2.3.49, Repoman-2.3.11

 net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild | 3 ++-
 net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild 
b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild
index 1b9fe12ff1a..ccf350d7d57 100644
--- a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild
+++ b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -28,6 +28,7 @@ RDEPEND="${PYTHON_DEPS}
>=dev-libs/dbus-glib-0.73
 "
 DEPEND="${RDEPEND}
+   dev-util/glib-utils
virtual/pkgconfig"
 #  test? ( dev-python/twisted-words )"
 

diff --git a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild 
b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild
index 43d4b875b01..cd3ed1869a4 100644
--- a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild
+++ b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -25,6 +25,7 @@ RDEPEND="
 DEPEND="${RDEPEND}
${PYTHON_DEPS}
dev-libs/libxslt
+   dev-util/glib-utils
virtual/pkgconfig
test? (
|| (



[gentoo-commits] repo/gentoo:master commit in: net-voip/telepathy-haze/

2018-05-04 Thread Aaron Bauman
commit: 23af08dfe8e8eee5b07926a73d9b61ae1a6ef984
Author: Michael Mair-Keimberger  gmail  com>
AuthorDate: Fri Apr 27 13:24:48 2018 +
Commit: Aaron Bauman  gentoo  org>
CommitDate: Sat May  5 01:25:56 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=23af08df

net-voip/telepathy-haze: use HTTPS

 net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild | 4 ++--
 net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild 
b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild
index f1129cbc885..1b9fe12ff1a 100644
--- a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild
+++ b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit eutils python-single-r1
 
 DESCRIPTION="Telepathy connection manager providing libpurple supported 
protocols"
-HOMEPAGE="http://developer.pidgin.im/wiki/TelepathyHaze";
+HOMEPAGE="https://telepathy.freedesktop.org 
https://developer.pidgin.im/wiki/TelepathyHaze";
 SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz";
 
 LICENSE="GPL-2"

diff --git a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild 
b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild
index 2303a4580d8..43d4b875b01 100644
--- a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild
+++ b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -8,7 +8,7 @@ PYTHON_COMPAT=( python2_7 )
 inherit python-any-r1
 
 DESCRIPTION="Telepathy connection manager providing libpurple supported 
protocols"
-HOMEPAGE="https://telepathy.freedesktop.org/";
+HOMEPAGE="https://telepathy.freedesktop.org 
https://developer.pidgin.im/wiki/TelepathyHaze";
 SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz";
 
 LICENSE="GPL-2"



[gentoo-commits] repo/gentoo:master commit in: net-voip/telepathy-haze/

2017-12-21 Thread Mart Raudsepp
commit: 0063945812b3e4599a6507a61f14892f8b96
Author: Mart Raudsepp  gentoo  org>
AuthorDate: Thu Dec 21 23:10:24 2017 +
Commit: Mart Raudsepp  gentoo  org>
CommitDate: Thu Dec 21 23:31:02 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=00639458

net-voip/telepathy-haze: remove old

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 .../telepathy-haze/telepathy-haze-0.8.0.ebuild | 32 --
 1 file changed, 32 deletions(-)

diff --git a/net-voip/telepathy-haze/telepathy-haze-0.8.0.ebuild 
b/net-voip/telepathy-haze/telepathy-haze-0.8.0.ebuild
deleted file mode 100644
index 88570dc6ca7..000
--- a/net-voip/telepathy-haze/telepathy-haze-0.8.0.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1
-
-DESCRIPTION="Telepathy connection manager providing libpurple supported 
protocols"
-HOMEPAGE="http://developer.pidgin.im/wiki/TelepathyHaze";
-SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz";
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
-#IUSE="test"
-IUSE=""
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# Tests failing, see upstream: https://bugs.freedesktop.org/34577
-RESTRICT="test"
-
-RDEPEND="${PYTHON_DEPS}
-   >=net-im/pidgin-2.7
-   >=net-libs/telepathy-glib-0.15.1[${PYTHON_USEDEP}]
-   >=dev-libs/glib-2.30:2
-   >=dev-libs/dbus-glib-0.73
-"
-DEPEND="${RDEPEND}
-   virtual/pkgconfig"
-#  test? ( dev-python/twisted-words )"



[gentoo-commits] repo/gentoo:master commit in: net-voip/telepathy-haze/

2017-12-16 Thread Tobias Klausmann
commit: 39a945234807490b492909ce591f11e4c2533384
Author: Tobias Klausmann  gentoo  org>
AuthorDate: Sat Dec 16 14:02:41 2017 +
Commit: Tobias Klausmann  gentoo  org>
CommitDate: Sat Dec 16 14:03:45 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=39a94523

net-voip/telepathy-haze-0.8.0-r2: amd64 stable

Gentoo-Bug: http://bugs.gentoo.org/635938

 net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild 
b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild
index 73c85e8f10e..2303a4580d8 100644
--- a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild
+++ b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 
 RDEPEND="



[gentoo-commits] repo/gentoo:master commit in: net-voip/telepathy-haze/

2017-08-24 Thread Gilles Dartiguelongue
commit: 821692d22ef707100836b98f17c46e4846a3f5f4
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Thu Aug 24 22:06:18 2017 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Thu Aug 24 22:47:43 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=821692d2

net-voip/telepathy-haze: fix python_check_deps, bug #628492

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild | 7 ---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild 
b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild
index 838d5918129..73c85e8f10e 100644
--- a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild
+++ b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild
@@ -44,9 +44,10 @@ PATCHES=(
 )
 
 python_check_deps() {
-   use test \
-   && { has_version "dev-python/twisted[${PYTHON_USEDEP}]" \
-   || has_version 
"dev-python/twisted-words[${PYTHON_USEDEP}]"; }
+   if use test ; then
+   has_version "dev-python/twisted[${PYTHON_USEDEP}]" \
+   || has_version 
"dev-python/twisted-words[${PYTHON_USEDEP}]"
+   fi
 }
 
 src_prepare() {



[gentoo-commits] repo/gentoo:master commit in: net-voip/telepathy-haze/

2017-08-20 Thread Gilles Dartiguelongue
commit: 85883c7b3b9caed8bddaf2ce767ee1e4b8966113
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Sun Aug 20 22:46:13 2017 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Sun Aug 20 22:47:43 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=85883c7b

net-voip/telepathy-haze: fix indentation inconsistency

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 net-voip/telepathy-haze/metadata.xml | 16 
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/net-voip/telepathy-haze/metadata.xml 
b/net-voip/telepathy-haze/metadata.xml
index 25ebeafa862..ecb2f47e0c3 100644
--- a/net-voip/telepathy-haze/metadata.xml
+++ b/net-voip/telepathy-haze/metadata.xml
@@ -1,12 +1,12 @@
 
 http://www.gentoo.org/dtd/metadata.dtd";>
 
-  
-gn...@gentoo.org
-Gentoo GNOME Desktop
-  
-  
-   Telepathy connection manager for protocols supported by
-   libpurple (pidgin's core library).
-
+   
+   gn...@gentoo.org
+   Gentoo GNOME Desktop
+   
+   
+   Telepathy connection manager for protocols supported by
+   libpurple (pidgin's core library).
+   
 



[gentoo-commits] repo/gentoo:master commit in: net-voip/telepathy-haze/

2017-08-20 Thread Gilles Dartiguelongue
commit: 0b6c17dbf8ae8687d75da5c4db9e910bbeb67eb5
Author: Gilles Dartiguelongue  gentoo  org>
AuthorDate: Sun Aug 20 22:43:28 2017 +
Commit: Gilles Dartiguelongue  gentoo  org>
CommitDate: Sun Aug 20 22:47:42 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b6c17db

net-voip/telepathy-haze: port to unsplit twisted dependencies, bug #605112

Bump to EAPI=6. Fix python-*-r1 usage for unittests. Update homepage.
Re-enable unittests. Add missing dependency on pidgin with dbus
support enabled.

Package-Manager: Portage-2.3.8, Repoman-2.3.3

 .../telepathy-haze/telepathy-haze-0.8.0-r2.ebuild  | 56 ++
 1 file changed, 56 insertions(+)

diff --git a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild 
b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild
new file mode 100644
index 000..838d5918129
--- /dev/null
+++ b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r2.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+PYTHON_COMPAT=( python2_7 )
+
+inherit python-any-r1
+
+DESCRIPTION="Telepathy connection manager providing libpurple supported 
protocols"
+HOMEPAGE="https://telepathy.freedesktop.org/";
+SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+IUSE="test"
+
+RDEPEND="
+   >=net-im/pidgin-2.7[dbus]
+   >=net-libs/telepathy-glib-0.15.1
+   >=dev-libs/glib-2.30:2
+   >=dev-libs/dbus-glib-0.73
+"
+DEPEND="${RDEPEND}
+   ${PYTHON_DEPS}
+   dev-libs/libxslt
+   virtual/pkgconfig
+   test? (
+   || (
+   $(python_gen_any_dep 
'dev-python/twisted[${PYTHON_USEDEP}]')
+   $(python_gen_any_dep 
'dev-python/twisted-words[${PYTHON_USEDEP}]')
+   )
+   )
+"
+
+PATCHES=(
+   # contact-list: Don't crash if a contact is already in the roster
+   # (fixed in next version)
+   "${FILESDIR}"/${P}-crash.patch
+
+   # Fix compat with newer pidgin versions, bug #572296
+   "${FILESDIR}"/${P}-pidgin-2.10.12-compat.patch
+)
+
+python_check_deps() {
+   use test \
+   && { has_version "dev-python/twisted[${PYTHON_USEDEP}]" \
+   || has_version 
"dev-python/twisted-words[${PYTHON_USEDEP}]"; }
+}
+
+src_prepare() {
+   default
+   # Disable failing test
+   sed -i 's|simple-caps.py||' -i tests/twisted/Makefile.{am,in} || die
+}



[gentoo-commits] repo/gentoo:master commit in: net-voip/telepathy-haze/

2017-04-23 Thread David Seifert
commit: a7e7141334390ce95e6318556529863d585622cc
Author: David Seifert  gentoo  org>
AuthorDate: Sun Apr 23 20:32:53 2017 +
Commit: David Seifert  gentoo  org>
CommitDate: Sun Apr 23 21:00:17 2017 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7e71413

net-voip/telepathy-haze: [QA] Add missing python metadata variables

Package-Manager: Portage-2.3.5, Repoman-2.3.2

 net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild | 4 +++-
 net-voip/telepathy-haze/telepathy-haze-0.8.0.ebuild| 4 +++-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild 
b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild
index a2fa71931ca..f1129cbc885 100644
--- a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild
+++ b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
+
 PYTHON_COMPAT=( python2_7 )
 
 inherit eutils python-single-r1
@@ -15,6 +16,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 #IUSE="test"
 IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # Tests failing, see upstream: https://bugs.freedesktop.org/34577
 RESTRICT="test"

diff --git a/net-voip/telepathy-haze/telepathy-haze-0.8.0.ebuild 
b/net-voip/telepathy-haze/telepathy-haze-0.8.0.ebuild
index edd9822e2a0..88570dc6ca7 100644
--- a/net-voip/telepathy-haze/telepathy-haze-0.8.0.ebuild
+++ b/net-voip/telepathy-haze/telepathy-haze-0.8.0.ebuild
@@ -1,7 +1,8 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=5
+
 PYTHON_COMPAT=( python2_7 )
 
 inherit python-single-r1
@@ -15,6 +16,7 @@ SLOT="0"
 KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 #IUSE="test"
 IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
 # Tests failing, see upstream: https://bugs.freedesktop.org/34577
 RESTRICT="test"



[gentoo-commits] repo/gentoo:master commit in: net-voip/telepathy-haze/

2016-06-11 Thread Pacho Ramos
commit: 8d47c84968c70075bcbd07e3ea0efb98c57e3a4f
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Jun 11 12:17:42 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Jun 11 19:39:15 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8d47c849

net-voip/telepathy-haze: x86 stable, bug 584468

Package-Manager: portage-2.3.0_rc1
RepoMan-Options: --include-arches="x86"

 net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild 
b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild
index fd372d4..11134e1 100644
--- a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild
+++ b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild
@@ -13,7 +13,7 @@ 
SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc x86"
 #IUSE="test"
 IUSE=""
 



[gentoo-commits] repo/gentoo:master commit in: net-voip/telepathy-haze/

2016-06-11 Thread Pacho Ramos
commit: 33e1a9acfa68cc0381916d4c7242f2f761c10d43
Author: Pacho Ramos  gentoo  org>
AuthorDate: Sat Jun 11 11:57:44 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Sat Jun 11 12:05:40 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=33e1a9ac

net-voip/telepathy-haze: amd64 stable, bug 584468

Package-Manager: portage-2.3.0_rc1
RepoMan-Options: --include-arches="amd64"

 net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild 
b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild
index 884fdd5..fd372d4 100644
--- a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild
+++ b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2015 Gentoo Foundation
+# Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -13,7 +13,7 @@ 
SRC_URI="https://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz";
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
 #IUSE="test"
 IUSE=""
 



[gentoo-commits] repo/gentoo:master commit in: net-voip/telepathy-haze/files/, net-voip/telepathy-haze/

2016-03-14 Thread Pacho Ramos
commit: 4c7b33bdc0f216402e234df1800bd58784ffeec6
Author: Pacho Ramos  gentoo  org>
AuthorDate: Mon Mar 14 19:36:04 2016 +
Commit: Pacho Ramos  gentoo  org>
CommitDate: Mon Mar 14 19:36:38 2016 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4c7b33bd

net-voip/telepathy-haze: Upstream patch to fix a crash, fix compat with latest 
pidgin (#572296)

Package-Manager: portage-2.2.28

 .../files/telepathy-haze-0.8.0-crash.patch | 28 +++
 ...elepathy-haze-0.8.0-pidgin-2.10.12-compat.patch | 22 
 .../telepathy-haze/telepathy-haze-0.8.0-r1.ebuild  | 40 ++
 3 files changed, 90 insertions(+)

diff --git a/net-voip/telepathy-haze/files/telepathy-haze-0.8.0-crash.patch 
b/net-voip/telepathy-haze/files/telepathy-haze-0.8.0-crash.patch
new file mode 100644
index 000..2c480bb
--- /dev/null
+++ b/net-voip/telepathy-haze/files/telepathy-haze-0.8.0-crash.patch
@@ -0,0 +1,28 @@
+From 83589722731dde63118104f75c9ab89f66b21c21 Mon Sep 17 00:00:00 2001
+From: Debarshi Ray 
+Date: Tue, 28 Apr 2015 19:13:39 +0200
+Subject: [PATCH] contact-list: Don't crash if a contact is already in the
+ roster
+
+Bug: https://bugs.freedesktop.org/show_bug.cgi?id=47005
+---
+ src/contact-list.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/src/contact-list.c b/src/contact-list.c
+index fc46de8..710ed19 100644
+--- a/src/contact-list.c
 b/src/contact-list.c
+@@ -532,7 +532,8 @@ haze_contact_list_request_subscription (HazeContactList 
*self,
+   /* If the buddy already exists, then it should already be on the
+* subscribe list.
+*/
+-  g_assert (purple_find_buddy (account, bname) == NULL);
++  if (purple_find_buddy (account, bname) != NULL)
++return;
+ 
+   buddy = purple_buddy_new (account, bname, NULL);
+ 
+-- 
+2.1.0
+

diff --git 
a/net-voip/telepathy-haze/files/telepathy-haze-0.8.0-pidgin-2.10.12-compat.patch
 
b/net-voip/telepathy-haze/files/telepathy-haze-0.8.0-pidgin-2.10.12-compat.patch
new file mode 100644
index 000..9785deb
--- /dev/null
+++ 
b/net-voip/telepathy-haze/files/telepathy-haze-0.8.0-pidgin-2.10.12-compat.patch
@@ -0,0 +1,22 @@
+--- a/src/media-stream.c
 b/src/media-stream.c
+@@ -23,6 +23,7 @@
+ #include "config.h"
+ #include "media-stream.h"
+ 
++#include 
+ #include 
+ #include 
+ #include 
+@@ -1076,7 +1077,11 @@ haze_media_stream_new_native_candidate (
+   if (proto == TP_MEDIA_STREAM_BASE_PROTO_UDP)
+ protocol = PURPLE_MEDIA_NETWORK_PROTOCOL_UDP;
+   else if (proto == TP_MEDIA_STREAM_BASE_PROTO_TCP)
++#if PURPLE_VERSION_CHECK (2, 10, 12)
++protocol = PURPLE_MEDIA_NETWORK_PROTOCOL_TCP_PASSIVE;
++#else
+ protocol = PURPLE_MEDIA_NETWORK_PROTOCOL_TCP;
++#endif
+   else
+ DEBUG ("Unknown network protocol");
+ 

diff --git a/net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild 
b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild
new file mode 100644
index 000..4ac17da
--- /dev/null
+++ b/net-voip/telepathy-haze/telepathy-haze-0.8.0-r1.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit eutils python-single-r1
+
+DESCRIPTION="Telepathy connection manager providing libpurple supported 
protocols"
+HOMEPAGE="http://developer.pidgin.im/wiki/TelepathyHaze";
+SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz";
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+#IUSE="test"
+IUSE=""
+
+# Tests failing, see upstream: https://bugs.freedesktop.org/34577
+RESTRICT="test"
+
+RDEPEND="${PYTHON_DEPS}
+   >=net-im/pidgin-2.7
+   >=net-libs/telepathy-glib-0.15.1[${PYTHON_USEDEP}]
+   >=dev-libs/glib-2.30:2
+   >=dev-libs/dbus-glib-0.73
+"
+DEPEND="${RDEPEND}
+   virtual/pkgconfig"
+#  test? ( dev-python/twisted-words )"
+
+src_prepare() {
+   # contact-list: Don't crash if a contact is already in the roster
+   # (fixed in next version)
+   epatch "${FILESDIR}"/${P}-crash.patch
+
+   # Fix compat with newer pidgin versions, bug #572296
+   epatch "${FILESDIR}"/${P}-pidgin-2.10.12-compat.patch
+}