Version bump, remove old.

Package-Manager: portage-2.1.9.50/cvs/Linux x86_64

5 files changed, 37 insertions, 77 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/Manifest b/net-voip/telepathy-sofiasip/Manifest
index 47146d126c4c..418ad08daaa3 100644
--- a/net-voip/telepathy-sofiasip/Manifest
+++ b/net-voip/telepathy-sofiasip/Manifest
@@ -1,9 +1,16 @@
-DIST telepathy-sofiasip-0.6.2.tar.gz 597457 RMD160 272d6721952a35c36c151e1bfe1fb3fcdf1e3f3d SHA1 32db02de67e8e01ea8a0615fd518dbd949c6efed SHA256 f50f987b74acc1959c185c32c80ace98379abb6dbdf7802161408f2cf4cb8096
-DIST telepathy-sofiasip-0.6.4.tar.gz 597482 RMD160 a87c632b2cb03442b988907a5cc3f5998b572a3a SHA1 4d9804359790711c8503f5d21b183297f7755c95 SHA256 fbbeaada6d15e6fc3cd13631f05b3235e1864331c3bc42e44cbe2604a4ff4617
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST telepathy-sofiasip-0.6.6.tar.gz 599115 RMD160 7f31605a3a49d2d07732eabb54c6f854b83118bb SHA1 124a86e077d66a28b766a0ed39d475b6d9c6e226 SHA256 c76df2761bdb3fe2eb709bfa0ca0d0821fd9ea531f1970679407d6431a7d89a7
-EBUILD telepathy-sofiasip-0.6.2.ebuild 886 RMD160 1063543ecd088d3ecdb6dbdd65839f5801250dba SHA1 ec1d10f3db4c58cd0609356330e502bc3940f75b SHA256 9af97d449d4f7bc75a0dfa22dcfe45a5d5b550840f5a68c56aa9fe66f873402c
-EBUILD telepathy-sofiasip-0.6.4-r1.ebuild 898 RMD160 cbf46e9e607ea62c66530cfda61cb86cf9fb7ed4 SHA1 b44efb216a047f85247719140ad0f74b3c5b7048 SHA256 c0584cbdb0eb33ab8e959f9e344ba6a018969cff862f00f6b1fc2fa9a6905681
-EBUILD telepathy-sofiasip-0.6.4.ebuild 942 RMD160 e59730a5e9db7f23d305e86f30411be4944b8754 SHA1 a4b6304fd629532d932ee4d5e4f760ab4f0b33af SHA256 22b043157e642210ea904d375959bb21cf585fd3254c90c2373f79eb913f6629
+DIST telepathy-sofiasip-0.6.8.tar.gz 601490 RMD160 da5cec2d281625a862910b1e0240811d1b58675a SHA1 d33ae7e0ccdde876f216b4643e51217affc94b1b SHA256 4bcc46222d4a86b430cd89fde64ba868635ebd4e71afae034d5239e30de4053e
 EBUILD telepathy-sofiasip-0.6.6.ebuild 997 RMD160 f7091becfa356360eb051b4fcb511684fb54e6c1 SHA1 8ae357bcce8c59250567effebd4f1513b537c5da SHA256 cfa00c6e3410ab5999b47cb3293bfc3521cc0870e1e8f3a9dace0c393307a414
-MISC ChangeLog 3760 RMD160 71e450ec4257af789efe32834543564a208de2be SHA1 f8d119bbceb977394c7600943e9caded2629605c SHA256 390f50089c65ee240285900d40e8d01d380f5837ce7461535db30f8dbef22115
+EBUILD telepathy-sofiasip-0.6.8.ebuild 1004 RMD160 24aa22844c9bdb53a63c7e2de6e00c0ade164dc6 SHA1 3fdcecd34f669222d00feaa1f0eaaf4ae5dbc617 SHA256 84bba0f4b83a2e0425082477c683e33d6fc3315a3f579c804a6c171e96fd7193
+MISC ChangeLog 4018 RMD160 f90448edd8389349b4bbc93b34f2cf0c92e57a6b SHA1 4a6d452c8a9d95217a7f2dbf5d738d1e60638c95 SHA256 d073248f2644dd1b161dac3494aebada95f36a2d7f80f1da0fe081961df637f4
 MISC metadata.xml 238 RMD160 70d18106573d9e9f01aaa6627d05cf7775966efc SHA1 3acbc3715c9cd5abcdfb67c3c525b0971c04305f SHA256 4513444659fd050b539f00bffe31a5a12feff2813041aef386371235daabc34b
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.17 (GNU/Linux)
+
+iEYEARECAAYFAk35CjMACgkQCaWpQKGI+9SkLgCfZ5TLty7ulR7nfqV1h988FTf0
+1B8An1YHr8fOzVxvYTXGwPb0K5oIZ9JO
+=xYv+
+-----END PGP SIGNATURE-----
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