summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPacho Ramos <pacho@gentoo.org>2010-10-02 16:53:07 +0000
committerPacho Ramos <pacho@gentoo.org>2010-10-02 16:53:07 +0000
commit4148a0b1acb59056483719d17a4fd6cd020544b2 (patch)
tree4d145657cd570715e31681334e9eef12dc172f0c
parentdrop mask for mutt-1.5.21, it's no longer in the tree, and a fixed -r1 exists (diff)
downloadgentoo-2-4148a0b1acb59056483719d17a4fd6cd020544b2.tar.gz
gentoo-2-4148a0b1acb59056483719d17a4fd6cd020544b2.tar.bz2
gentoo-2-4148a0b1acb59056483719d17a4fd6cd020544b2.zip
Version bump, remove old.
(Portage version: 2.1.8.3/cvs/Linux x86_64)
-rw-r--r--net-voip/telepathy-gabble/ChangeLog10
-rw-r--r--net-voip/telepathy-gabble/telepathy-gabble-0.10.2.ebuild (renamed from net-voip/telepathy-gabble/telepathy-gabble-0.8.5.ebuild)25
-rw-r--r--net-voip/telepathy-gabble/telepathy-gabble-0.8.8.ebuild59
3 files changed, 22 insertions, 72 deletions
diff --git a/net-voip/telepathy-gabble/ChangeLog b/net-voip/telepathy-gabble/ChangeLog
index d0beb95ea41b..9e7f06e345f3 100644
--- a/net-voip/telepathy-gabble/ChangeLog
+++ b/net-voip/telepathy-gabble/ChangeLog
@@ -1,6 +1,14 @@
# ChangeLog for net-voip/telepathy-gabble
# Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/ChangeLog,v 1.62 2010/09/11 09:03:50 nixnut Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/ChangeLog,v 1.63 2010/10/02 16:53:07 pacho Exp $
+
+*telepathy-gabble-0.10.2 (02 Oct 2010)
+
+ 02 Oct 2010; Pacho Ramos <pacho@gentoo.org>
+ -telepathy-gabble-0.8.5.ebuild, -telepathy-gabble-0.8.8.ebuild,
+ +telepathy-gabble-0.10.2.ebuild:
+ Version bump with lots of upstream fixes, also drop test restricting since
+ only twisted tests are failing now (upstream bug #30565). Remove old.
11 Sep 2010; <nixnut@gentoo.org> telepathy-gabble-0.8.14.ebuild:
ppc stable #321591
diff --git a/net-voip/telepathy-gabble/telepathy-gabble-0.8.5.ebuild b/net-voip/telepathy-gabble/telepathy-gabble-0.10.2.ebuild
index 0f587494a688..3aa718b42ccd 100644
--- a/net-voip/telepathy-gabble/telepathy-gabble-0.8.5.ebuild
+++ b/net-voip/telepathy-gabble/telepathy-gabble-0.10.2.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2010 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.8.5.ebuild,v 1.2 2009/12/27 08:10:20 josejx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/telepathy-gabble-0.10.2.ebuild,v 1.1 2010/10/02 16:53:07 pacho Exp $
EAPI="2"
@@ -15,13 +15,16 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="debug test"
-RDEPEND=">=dev-libs/glib-2.16
+RDEPEND=">=dev-libs/glib-2.24
>=sys-apps/dbus-1.1.0
- >=dev-libs/dbus-glib-0.78
- >=net-libs/telepathy-glib-0.7.34
- >=net-libs/loudmouth-1.3.2[ssl]
- net-libs/libsoup:2.4[ssl]"
-
+ >=dev-libs/dbus-glib-0.82
+ >=net-libs/telepathy-glib-0.11.16
+ net-libs/libsoup:2.4[ssl]
+ >=net-libs/libnice-0.0.11
+ >=net-libs/gnutls-2.10.2
+ dev-db/sqlite:3
+ dev-libs/libxml2
+ !<net-im/telepathy-mission-control-5.5.0"
DEPEND="${RDEPEND}
dev-libs/libxslt
>=dev-lang/python-2.5
@@ -29,9 +32,6 @@ DEPEND="${RDEPEND}
>=dev-python/twisted-words-0.8.2
>=dev-python/dbus-python-0.83 )"
-# 2 tests still fail :-(
-RESTRICT="test"
-
src_configure() {
econf \
--docdir=/usr/share/doc/${PF} \
@@ -40,7 +40,8 @@ src_configure() {
}
src_test() {
- emake -j1 check || die "Make check failed. See above for details."
+ # Twisted tests fail, upstream bug #30565
+ emake -C tests check-TESTS || die "tests failed"
}
src_install() {
diff --git a/net-voip/telepathy-gabble/telepathy-gabble-0.8.8.ebuild b/net-voip/telepathy-gabble/telepathy-gabble-0.8.8.ebuild
deleted file mode 100644
index 243565ba48e3..000000000000
--- a/net-voip/telepathy-gabble/telepathy-gabble-0.8.8.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2010 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.8.8.ebuild,v 1.4 2010/07/25 15:23:33 klausman Exp $
-
-EAPI="2"
-
-inherit 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"
-IUSE="debug test"
-
-RDEPEND=">=dev-libs/glib-2.16
- >=sys-apps/dbus-1.1.0
- >=dev-libs/dbus-glib-0.78
- >=net-libs/telepathy-glib-0.7.37
- >=net-libs/loudmouth-1.3.2[ssl]
- net-libs/libsoup:2.4[ssl]"
-
-DEPEND="${RDEPEND}
- dev-libs/libxslt
- >=dev-lang/python-2.5
- test? ( >=dev-python/twisted-0.8.2
- >=dev-python/twisted-words-0.8.2
- >=dev-python/dbus-python-0.83 )"
-
-src_prepare() {
- # first three fail with USE="-debug"
- # next two fail with USE="debug"
- # See upstream fdo bug #23168
- sed -e 's:tubes/accept-private-dbus-tube.py::' \
- -e 's:tubes/offer-private-stream-tube.py::' \
- -e 's:vcard/set-set-disconnect.py::' \
- -e 's:file-transfer/test-send-file-provide-immediately.py::' \
- -e 's:file-transfer/test-send-file-wait-to-provide.py::' \
- -i tests/twisted/Makefile.am tests/twisted/Makefile.in || die 'sed failed'
-}
-
-src_configure() {
- econf \
- --docdir=/usr/share/doc/${PF} \
- $(use_enable debug) \
- $(use_enable debug handle-leak-debug)
-}
-
-src_test() {
- unset DBUS_SESSION_BUS_ADDRESS
- emake -j1 check || die "Make check failed. See above for details."
-}
-
-src_install() {
- emake install DESTDIR="${D}" || die "emake install failed"
- dodoc AUTHORS NEWS ChangeLog README || die "dodoc failed"
-}