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

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

5 files changed, 33 insertions, 74 deletions

diff --git a/net-voip/telepathy-butterfly/Manifest b/net-voip/telepathy-butterfly/Manifest
index 8b28c273e122..c1a98d0e9f14 100644
--- a/net-voip/telepathy-butterfly/Manifest
+++ b/net-voip/telepathy-butterfly/Manifest
@@ -4,14 +4,14 @@ Hash: SHA1
 AUX telepathy-butterfly-0.5.9-Disable-libproxy-support.patch 1673 RMD160 6924481831167403462244a9d78126838693b140 SHA1 196b460663bd7424d26fffb3748641028c199fba SHA256 29d28099ecf12e8f6e5182778284d0d02c962259711447c533b3d31825583b04
 DIST telepathy-butterfly-0.5.14.tar.gz 161312 RMD160 2e955ea7de870ff61da56c93c9c54f25b61ad94c SHA1 b3efa9596aad8858f4f87f3fe42d167e9a18db9e SHA256 dd38b5b3a8fb0305a9b4cf924132cd65f5463e4b28d470ebafaecffa8c213b9f
 DIST telepathy-butterfly-0.5.9.tar.gz 147491 RMD160 90ffd9a31ca7297e6684946d620253c4fcc7206c SHA1 95427d658a9ca2e3aae894fbdf9121d4efe09743 SHA256 add3d4d298e763175133e2632b99745b2974502587499ec88fde9d139343f136
-EBUILD telepathy-butterfly-0.5.14.ebuild 906 RMD160 47a8ac7fafa04aecefa58a5af14178757b95ef39 SHA1 0996cd0bdb624b3803119017494d29aea4b45469 SHA256 641378eaae64208d28d09a8cced8986b0dbb4f8f85f7747370e499c12b437e47
+EBUILD telepathy-butterfly-0.5.14.ebuild 884 RMD160 b7ca611cf99f0196b4aa2cc7058b82b319720d6a SHA1 2c384fa8b57fc89d3d12a5b154f245937146c2e4 SHA256 32a5e305c7d7a1463d222b1cf404e08a0af65b618e5ede9f6d984500907ed123
 EBUILD telepathy-butterfly-0.5.9.ebuild 1063 RMD160 d4ad71331179310c4a16a41a1f8105ce8f1e1889 SHA1 3ece17700f7457cf57fc53624e893e2dc93a5ccd SHA256 a3f2cfe3cf80a04b510e0003327685e9ff88a29c77a294ec767012a11789e8d1
-MISC ChangeLog 4231 RMD160 443aed81c3bfbf2e15be2abc6bf63b3e453d50c3 SHA1 b9de1221a289fb7061579afb5c2a41bd239d30f8 SHA256 a418721048e7e01bcc7c4af7fedfa19369fb9ac2be97dd6cce20858fdaa4d0ba
-MISC metadata.xml 368 RMD160 6161aa08276cda4458d7618cf69c1f8f2983f521 SHA1 551cf40263cab87ab4039ce02eb3596bb4f860b4 SHA256 c68b74681f9d7c337e06b63309bb54215bed8ac4abd689b5f586536a77ce5aba
+MISC ChangeLog 4415 RMD160 98d42096ee0ab4e33eb86052a67de7be490aa754 SHA1 84318daa8b282dd69dd006615e7470f592e05fdc SHA256 867c53cb1def4b421ba58f282cca0a97a47ea00ee756291dd2d9ab94b9d7669b
+MISC metadata.xml 253 RMD160 1545f8f08ff6a7cd2c36dbd87c80ccbfe6e222de SHA1 e30d4d9da9b0aeddadfef82930e8dfcb3c1ae6b5 SHA256 634a98614568bd5cc5f8ee82a405c9acd754248e9f234344d4b62830f42ba1a9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAkyjFckACgkQCaWpQKGI+9QDxACfVcrK035vqDkjnXoufQMD5uTP
-SXUAoIVBZhtP87D6A1vDguEjw60PNZJf
-=EEwv
+iEYEARECAAYFAkyji+oACgkQCaWpQKGI+9QBNQCeJ5fMpZHIg9YBHBtyPMuD6eiy
+AP4An2gzvPIQW/R6HRx0PkGZM9Ab0k8P
+=hkPp
 -----END PGP SIGNATURE-----
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/Manifest b/net-voip/telepathy-sofiasip/Manifest
index 98fe41d78da8..064d12f911aa 100644
--- a/net-voip/telepathy-sofiasip/Manifest
+++ b/net-voip/telepathy-sofiasip/Manifest
@@ -1,8 +1,16 @@
-DIST telepathy-sofiasip-0.5.17.tar.gz 556623 RMD160 d921aeb3ddda9b3584c1745920a5a30130526d3f SHA1 92b03092f63884cba5c7ae02570d0068bdce55e2 SHA256 470708751459c712fa75231934f763f3f58af1d59ce522561841161e2acc9b17
-DIST telepathy-sofiasip-0.5.18.tar.gz 558194 RMD160 23ea1eb9fa99093c8e9cf0b46c50401d1b798864 SHA1 ee5e34f6fc942847fbd682beea6b83300f62b1aa SHA256 e91b958d75bd6e18513d2ca8f68a64c9851c548dda5fe2c350b567ec3bfe1bc2
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 DIST telepathy-sofiasip-0.6.2.tar.gz 597457 RMD160 272d6721952a35c36c151e1bfe1fb3fcdf1e3f3d SHA1 32db02de67e8e01ea8a0615fd518dbd949c6efed SHA256 f50f987b74acc1959c185c32c80ace98379abb6dbdf7802161408f2cf4cb8096
-EBUILD telepathy-sofiasip-0.5.17.ebuild 1151 RMD160 aede66b46ca88a52e91b35459adc0ffe7af0ea55 SHA1 6db758c35651ae5fa25151b18c868ce0761fec61 SHA256 6fdb131d663243060f36eb1238626534dc4f54c0571867b926a6f2a6b6005efb
-EBUILD telepathy-sofiasip-0.5.18.ebuild 1151 RMD160 9e223230041aeced2f363c07000f29a908a1268b SHA1 7715f0c918f1d76d46b8633b1d2ce7a87789da9a SHA256 be38cf610b5ab9aab093aae10c5e0d0dc4a0434dbac638a9ff28c1403faf3833
+DIST telepathy-sofiasip-0.6.4.tar.gz 597482 RMD160 a87c632b2cb03442b988907a5cc3f5998b572a3a SHA1 4d9804359790711c8503f5d21b183297f7755c95 SHA256 fbbeaada6d15e6fc3cd13631f05b3235e1864331c3bc42e44cbe2604a4ff4617
 EBUILD telepathy-sofiasip-0.6.2.ebuild 886 RMD160 1063543ecd088d3ecdb6dbdd65839f5801250dba SHA1 ec1d10f3db4c58cd0609356330e502bc3940f75b SHA256 9af97d449d4f7bc75a0dfa22dcfe45a5d5b550840f5a68c56aa9fe66f873402c
-MISC ChangeLog 2396 RMD160 f07b8127114196901f85a3803e38380854c730d3 SHA1 1953c371fa1b1677a789258c78dbca9a8b3d59dd SHA256 40227299f14e6881d15fc1912810493c6440c4a4b3d55bb6bc3d864141141dc4
+EBUILD telepathy-sofiasip-0.6.4.ebuild 942 RMD160 e59730a5e9db7f23d305e86f30411be4944b8754 SHA1 a4b6304fd629532d932ee4d5e4f760ab4f0b33af SHA256 22b043157e642210ea904d375959bb21cf585fd3254c90c2373f79eb913f6629
+MISC ChangeLog 2665 RMD160 e1c9fa2eadbe5a5efb25cc0e9a60f0750f0bdc6a SHA1 bb9e47bbcc521f026d6829355d5f099f5d8d022f SHA256 40de3d38aa92a318f138416d9191e84baeae0543c6d6f3f545f33262590eac1f
 MISC metadata.xml 219 RMD160 6c3e1ef34addade6490705aff8e814aca4d1aa41 SHA1 8b21d80536b30aa3a634e57c34fdc7026d5ffe86 SHA256 f193ae54087dc1189e4a2e6a2cf6ffb5287085b576b545030b50389eaf0eb464
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.16 (GNU/Linux)
+
+iEYEARECAAYFAkyjiuMACgkQCaWpQKGI+9TFlwCfTHrfxktg+YTbU1arhE6Vi4dU
+A2AAnjWIqSZnitmZZ6nrJLqbRUOqipwi
+=iNCl
+-----END PGP SIGNATURE-----
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
 }