Version bump, remove old.

(Portage version: 2.1.9.50/cvs/Linux x86_64)

4 files changed, 24 insertions, 71 deletions

diff --git a/net-voip/telepathy-sofiasip/ChangeLog b/net-voip/telepathy-sofiasip/ChangeLog
index f9d94fd123e4..effd0282c868 100644
--- a/net-voip/telepathy-sofiasip/ChangeLog
+++ b/net-voip/telepathy-sofiasip/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-voip/telepathy-sofiasip
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-sofiasip/ChangeLog,v 1.23 2011/03/22 20:11:31 ranger Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-sofiasip/ChangeLog,v 1.24 2011/06/15 19:38:21 pacho Exp $
+
+*telepathy-sofiasip-0.6.8 (15 Jun 2011)
+
+  15 Jun 2011; Pacho Ramos <pacho@gentoo.org> -telepathy-sofiasip-0.6.2.ebuild,
+  -telepathy-sofiasip-0.6.4.ebuild, -telepathy-sofiasip-0.6.4-r1.ebuild,
+  +telepathy-sofiasip-0.6.8.ebuild:
+  Version bump, remove old.
 
   22 Mar 2011; Brent Baude <ranger@gentoo.org>
   telepathy-sofiasip-0.6.6.ebuild:
diff --git a/net-voip/telepathy-sofiasip/telepathy-sofiasip-0.6.2.ebuild b/net-voip/telepathy-sofiasip/telepathy-sofiasip-0.6.2.ebuild
deleted file mode 100644
index 95d9a6525574..000000000000
--- a/net-voip/telepathy-sofiasip/telepathy-sofiasip-0.6.2.ebuild
+++ /dev/null
@@ -1,30 +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-sofiasip/telepathy-sofiasip-0.6.2.ebuild,v 1.8 2010/08/07 16:53:55 armin76 Exp $
-
-inherit autotools
-
-DESCRIPTION="A SIP connection manager for Telepathy based around the Sofia-SIP library."
-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 sparc x86"
-IUSE="test"
-
-RDEPEND=">=net-libs/sofia-sip-1.12.10
-	>=net-libs/telepathy-glib-0.8.0
-	>=dev-libs/glib-2.16
-	sys-apps/dbus
-	dev-libs/dbus-glib"
-
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	dev-lang/python
-	test? ( dev-python/twisted )"
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
-}
diff --git a/net-voip/telepathy-sofiasip/telepathy-sofiasip-0.6.4.ebuild b/net-voip/telepathy-sofiasip/telepathy-sofiasip-0.6.4.ebuild
deleted file mode 100644
index e5ad7d39fc5a..000000000000
--- a/net-voip/telepathy-sofiasip/telepathy-sofiasip-0.6.4.ebuild
+++ /dev/null
@@ -1,34 +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-sofiasip/telepathy-sofiasip-0.6.4.ebuild,v 1.1 2010/09/29 18:52:11 pacho Exp $
-
-EAPI="2"
-
-DESCRIPTION="A SIP connection manager for Telepathy based around the Sofia-SIP library."
-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 ~sparc ~x86"
-IUSE="debug test"
-
-RDEPEND=">=net-libs/sofia-sip-1.12.10
-	>=net-libs/telepathy-glib-0.8.0
-	>=dev-libs/glib-2.16
-	sys-apps/dbus
-	dev-libs/dbus-glib"
-
-DEPEND="${RDEPEND}
-	dev-libs/libxslt
-	dev-lang/python
-	test? ( dev-python/twisted )"
-
-src_configure() {
-	econf $(use_enable debug)
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO || die
-}
diff --git a/net-voip/telepathy-sofiasip/telepathy-sofiasip-0.6.4-r1.ebuild b/net-voip/telepathy-sofiasip/telepathy-sofiasip-0.6.8.ebuild
index 527bfc223ce2..2ea87d19516a 100644
--- a/net-voip/telepathy-sofiasip/telepathy-sofiasip-0.6.4-r1.ebuild
+++ b/net-voip/telepathy-sofiasip/telepathy-sofiasip-0.6.8.ebuild
@@ -1,8 +1,11 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-sofiasip/telepathy-sofiasip-0.6.4-r1.ebuild,v 1.1 2010/11/03 21:18:56 ford_prefect Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-sofiasip/telepathy-sofiasip-0.6.8.ebuild,v 1.1 2011/06/15 19:38:21 pacho Exp $
 
-EAPI="2"
+EAPI="3"
+PYTHON_DEPEND="2"
+
+inherit python
 
 DESCRIPTION="A SIP connection manager for Telepathy based around the Sofia-SIP library."
 HOMEPAGE="http://telepathy.freedesktop.org/"
@@ -13,17 +16,24 @@ SLOT="0"
 KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE="test"
 
-RDEPEND=">=net-libs/sofia-sip-1.12.10
+RDEPEND=">=net-libs/sofia-sip-1.12.11
 	>=net-libs/telepathy-glib-0.8.0
-	>=dev-libs/glib-2.16
+	>=dev-libs/glib-2.16:2
 	sys-apps/dbus
 	dev-libs/dbus-glib"
 
 DEPEND="${RDEPEND}
 	dev-libs/libxslt
-	dev-lang/python
 	test? ( dev-python/twisted )"
 
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	python_convert_shebangs -r 2 .
+}
+
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
 	dodoc AUTHORS ChangeLog NEWS README TODO || die