Bump fixing a crash and a security issue, remove old.

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

4 files changed, 20 insertions, 62 deletions

diff --git a/net-voip/telepathy-gabble/ChangeLog b/net-voip/telepathy-gabble/ChangeLog
index 1b41ce032208..102bdc180a33 100644
--- a/net-voip/telepathy-gabble/ChangeLog
+++ b/net-voip/telepathy-gabble/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-voip/telepathy-gabble
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/ChangeLog,v 1.67 2011/02/07 18:45:37 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/ChangeLog,v 1.68 2011/02/16 18:07:57 pacho Exp $
+
+*telepathy-gabble-0.10.5 (16 Feb 2011)
+
+  16 Feb 2011; Pacho Ramos <pacho@gentoo.org> -telepathy-gabble-0.10.2.ebuild,
+  -telepathy-gabble-0.10.4.ebuild, +telepathy-gabble-0.10.5.ebuild:
+  Bump fixing a crash and a security issue, remove old.
 
   07 Feb 2011; Pacho Ramos <pacho@gentoo.org> metadata.xml:
   Add gnome to metadata as talked between us since empathy relies on this.
diff --git a/net-voip/telepathy-gabble/Manifest b/net-voip/telepathy-gabble/Manifest
index 90254f2a3e95..a1d4dcee63f1 100644
--- a/net-voip/telepathy-gabble/Manifest
+++ b/net-voip/telepathy-gabble/Manifest
@@ -1,18 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST telepathy-gabble-0.10.2.tar.gz 2947844 RMD160 7cdf7d9b02131257a592474a47a9fbae5634720a SHA1 61547033c5c8af6e2365cbdc241a8bc943064146 SHA256 aa88957cf62f89446afa01eb9417a1a86ec3bebeee79213e0affc269b19c92df
-DIST telepathy-gabble-0.10.4.tar.gz 2936168 RMD160 d991aa9974447f98238a119851da054773239199 SHA1 4493fa8d2e537d91cea82a65b11af85406308a8b SHA256 abdf07e833b934fa7cd0c9e34894a11da037adf03a4fdde4dc7818ed990a662c
+DIST telepathy-gabble-0.10.5.tar.gz 2923925 RMD160 082b340ca92bf4ca3b7462cfa634654e4766db67 SHA1 0089217a71d64cfefd9b4e16d94967f9d8553fab SHA256 d18b6cdb0bd2baea53e0c101700e609bcdb39e22d4e6574244c89660c73f099b
 DIST telepathy-gabble-0.8.14.tar.gz 1519190 RMD160 85fd94905383c59f570860c44261881f1e899c2f SHA1 de60ff95278dbdb7fcaeed4e079096e3e7189c71 SHA256 71a1bb38478c8e5b831531036980ba46d157fc072226e11c8624e8c395a682d1
-EBUILD telepathy-gabble-0.10.2.ebuild 1401 RMD160 cf5621bf759311fd81690774d1192b98a04c11d7 SHA1 9a08c483f39fa36bc0c64ca810f090526c3f9e59 SHA256 13b39199fa6ac0fc16f1bbdc6207d6019971c1a030c53a6495de9a0ac9d605ae
-EBUILD telepathy-gabble-0.10.4.ebuild 1450 RMD160 9019d072a380aeaceeca2e73c2ba5bba5c7a2b4d SHA1 01064f2e93533f6db03dfbf8493162cba2aa1095 SHA256 ead7846a19a40aec994ddc478b2407b3d2e7d678ec3b494ec0cd543af57be237
+EBUILD telepathy-gabble-0.10.5.ebuild 1503 RMD160 09cb32305e2456e1e7b907d5377a7e24e1b9c58a SHA1 04cda703dd75c2a222d0490c695388de2a1dba9c SHA256 efd66e2574b3c34c7d4e8bdc528cba33c6a215b9fc2ff8b56d7e94091c637640
 EBUILD telepathy-gabble-0.8.14.ebuild 1370 RMD160 c961ca0a4c2ec9e7f45db5b1e7f62ccb6be50593 SHA1 d528c304cd07fe9bf0849aa68ca5cab7ea760dfd SHA256 62033f4003de24b5eb7310deaf6c851ec79307577a65d079534147abc2a106ad
-MISC ChangeLog 11990 RMD160 58a87b57d5f5fb601842f350e1c490a9b28c38d8 SHA1 0ed553cb0ec84c52ed969320f012c511d3fe2739 SHA256 499b3b8b94eee8b9bd5743e592a6fd517c546f0aae72bb8d3c36d8ff4834be23
+MISC ChangeLog 12234 RMD160 7ddd23c026aa6bdf1d31abd193b951b38a327187 SHA1 964fa85bf09b2463b1d4bd465370742d86d37097 SHA256 84c8a5a55da7c78b890aa831b6a17f29fa332670e8ef8e16da60d70abcdbf56c
 MISC metadata.xml 325 RMD160 7ca27b1de1278db5577b3bb57acf485db6725166 SHA1 21607b21a4d9bb781ec50cf44efc2c125febc807 SHA256 ff2e73c08bb9d36afaab8b340aec6d62b22a1f2470953444c2ca101d652380c0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk1QPdYACgkQCaWpQKGI+9TWHACfVH5dZXCyACz/eg2yfDxJaTVZ
-nDsAn1263O+zyJoyter44gjgS3vUnKTr
-=goiD
+iEYEARECAAYFAk1cEoIACgkQCaWpQKGI+9RTpQCeMeM09z5YZSbKh1Ts2Er/heVd
+lJUAn3dMPO5QUwSuM5gBuvdqSHtHepiZ
+=DoLo
 -----END PGP SIGNATURE-----
diff --git a/net-voip/telepathy-gabble/telepathy-gabble-0.10.2.ebuild b/net-voip/telepathy-gabble/telepathy-gabble-0.10.2.ebuild
deleted file mode 100644
index 3aa718b42ccd..000000000000
--- a/net-voip/telepathy-gabble/telepathy-gabble-0.10.2.ebuild
+++ /dev/null
@@ -1,50 +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.10.2.ebuild,v 1.1 2010/10/02 16:53:07 pacho 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.24
-	>=sys-apps/dbus-1.1.0
-	>=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
-	test? ( >=dev-python/twisted-0.8.2
-		>=dev-python/twisted-words-0.8.2
-		>=dev-python/dbus-python-0.83 )"
-
-src_configure() {
-	econf \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_enable debug) \
-		$(use_enable debug handle-leak-debug)
-}
-
-src_test() {
-	# Twisted tests fail, upstream bug #30565
-	emake -C tests check-TESTS || die "tests failed"
-}
-
-src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
-	dodoc AUTHORS NEWS ChangeLog README || die "dodoc failed"
-}
diff --git a/net-voip/telepathy-gabble/telepathy-gabble-0.10.4.ebuild b/net-voip/telepathy-gabble/telepathy-gabble-0.10.5.ebuild
index 378ea30aa832..5b6e633c0f97 100644
--- a/net-voip/telepathy-gabble/telepathy-gabble-0.10.4.ebuild
+++ b/net-voip/telepathy-gabble/telepathy-gabble-0.10.5.ebuild
@@ -1,8 +1,8 @@
-# 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-gabble/telepathy-gabble-0.10.4.ebuild,v 1.2 2010/11/22 19:42:59 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-gabble/telepathy-gabble-0.10.5.ebuild,v 1.1 2011/02/16 18:07:57 pacho Exp $
 
-EAPI="2"
+EAPI="3"
 PYTHON_DEPEND="2:2.5"
 
 inherit eutils python
@@ -37,6 +37,10 @@ pkg_setup() {
 	python_set_active_version 2
 }
 
+src_prepare() {
+	python_convert_shebangs -r 2 .
+}
+
 src_configure() {
 	econf \
 		--docdir=/usr/share/doc/${PF} \