Version bump with some fixes, handle debug configure option. Remove old.

(Portage version: 2.1.8.3/cvs/Linux x86_64)

3 files changed, 14 insertions, 63 deletions

diff --git a/net-voip/telepathy-sofiasip/ChangeLog b/net-voip/telepathy-sofiasip/ChangeLog
index f9a95e11e79b..ebfc70c488f0 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-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-sofiasip/ChangeLog,v 1.16 2010/08/07 16:53:55 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-sofiasip/ChangeLog,v 1.17 2010/09/29 18:52:11 pacho Exp $
+
+*telepathy-sofiasip-0.6.4 (29 Sep 2010)
+
+  29 Sep 2010; Pacho Ramos <pacho@gentoo.org>
+  -telepathy-sofiasip-0.5.17.ebuild, -telepathy-sofiasip-0.5.18.ebuild,
+  +telepathy-sofiasip-0.6.4.ebuild:
+  Version bump with some fixes, handle debug configure option. Remove old.
 
   07 Aug 2010; Raúl Porcel <armin76@gentoo.org>
   telepathy-sofiasip-0.6.2.ebuild:
diff --git a/net-voip/telepathy-sofiasip/telepathy-sofiasip-0.5.18.ebuild b/net-voip/telepathy-sofiasip/telepathy-sofiasip-0.5.18.ebuild
deleted file mode 100644
index 340e255dfaf8..000000000000
--- a/net-voip/telepathy-sofiasip/telepathy-sofiasip-0.5.18.ebuild
+++ /dev/null
@@ -1,45 +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.5.18.ebuild,v 1.4 2010/04/16 18:19:35 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="debug test"
-
-RDEPEND=">=net-libs/sofia-sip-1.12.10
-	>=net-libs/telepathy-glib-0.7.27
-	>=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_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	sed -i -e "s/python2.5/python2.6 python2.5/" configure.ac
-	rm ltmain.sh m4/libtool.m4 m4/lt*.m4
-	eautoreconf
-}
-
-src_compile() {
-	econf $(use_enable debug) || die "econf failed"
-
-	emake || die "emake failed"
-}
-
-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.5.17.ebuild b/net-voip/telepathy-sofiasip/telepathy-sofiasip-0.6.4.ebuild
index 76ceb9000cfd..e5ad7d39fc5a 100644
--- a/net-voip/telepathy-sofiasip/telepathy-sofiasip-0.5.17.ebuild
+++ b/net-voip/telepathy-sofiasip/telepathy-sofiasip-0.6.4.ebuild
@@ -1,8 +1,8 @@
 # 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.5.17.ebuild,v 1.9 2010/04/16 18:19:35 armin76 Exp $
+# $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 $
 
-inherit autotools
+EAPI="2"
 
 DESCRIPTION="A SIP connection manager for Telepathy based around the Sofia-SIP library."
 HOMEPAGE="http://telepathy.freedesktop.org/"
@@ -14,7 +14,7 @@ KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~sparc ~x86"
 IUSE="debug test"
 
 RDEPEND=">=net-libs/sofia-sip-1.12.10
-	>=net-libs/telepathy-glib-0.7.27
+	>=net-libs/telepathy-glib-0.8.0
 	>=dev-libs/glib-2.16
 	sys-apps/dbus
 	dev-libs/dbus-glib"
@@ -24,22 +24,11 @@ DEPEND="${RDEPEND}
 	dev-lang/python
 	test? ( dev-python/twisted )"
 
-src_unpack() {
-	unpack ${A}
-
-	cd "${S}"
-	sed -i -e "s/python2.5/python2.6 python2.5/" configure.ac
-	rm ltmain.sh m4/libtool.m4 m4/lt*.m4
-	eautoreconf
-}
-
-src_compile() {
-	econf $(use_enable debug) || die "econf failed"
-
-	emake || die "emake failed"
+src_configure() {
+	econf $(use_enable debug)
 }
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog NEWS README TODO
+	dodoc AUTHORS ChangeLog NEWS README TODO || die
 }