Version bump, old didn't work with new telepathy-python

Package-Manager: portage-2.1.6.13/cvs/Linux i686

4 files changed, 25 insertions, 55 deletions

diff --git a/net-voip/telepathy-butterfly/ChangeLog b/net-voip/telepathy-butterfly/ChangeLog
index 53b771609ea0..f7d1c8fdf3be 100644
--- a/net-voip/telepathy-butterfly/ChangeLog
+++ b/net-voip/telepathy-butterfly/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-voip/telepathy-butterfly
 # Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-butterfly/ChangeLog,v 1.12 2009/01/07 17:11:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-butterfly/ChangeLog,v 1.13 2009/08/28 19:41:22 tester Exp $
+
+*telepathy-butterfly-0.5.0 (28 Aug 2009)
+
+  28 Aug 2009; Olivier Crête <tester@gentoo.org>
+  -telepathy-butterfly-0.3.1.ebuild, -telepathy-butterfly-0.3.2.ebuild,
+  +telepathy-butterfly-0.5.0.ebuild:
+  Version bump, old didn't work with new telepathy-python
 
   07 Jan 2009; Raúl Porcel <armin76@gentoo.org>
   telepathy-butterfly-0.3.2.ebuild:
diff --git a/net-voip/telepathy-butterfly/Manifest b/net-voip/telepathy-butterfly/Manifest
index a31d06743147..bd4e18f72b91 100644
--- a/net-voip/telepathy-butterfly/Manifest
+++ b/net-voip/telepathy-butterfly/Manifest
@@ -1,6 +1,14 @@
-DIST telepathy-butterfly-0.3.1.tar.gz 122795 RMD160 b8c22183e549cec256b8b24327b3ec970d0dd97f SHA1 0238cdcdbf6931f4e70150af45f29f25ca2328a2 SHA256 d8185e611983a77aaa8debccce00149af66694be4e08cea2040253ef3924603b
-DIST telepathy-butterfly-0.3.2.tar.gz 121806 RMD160 9cece6ff464c0fbde87e8fef0aae7704334cd77a SHA1 e2718a28d06c8b4e307dffd4c33d8d5ff2c190ce SHA256 b1f70a6e980479572359acd9deac7833e5c8f1a2e60b5a22dacc92b13bd1f819
-EBUILD telepathy-butterfly-0.3.1.ebuild 1071 RMD160 5d8245660a0c69c1b96931f9a5c07e47f6113e12 SHA1 2aff493f5761d76cdeaf8855739514d753328b94 SHA256 a990deff58401f7a5d3920fe824b9d14b48d78713d70abc15c5bec11b01ece71
-EBUILD telepathy-butterfly-0.3.2.ebuild 1168 RMD160 aa786a98e4ebe08e6b4728a5c92b39d6fd65e904 SHA1 fee2a9f418c4cb61651b0f5e831da4b7e46e9585 SHA256 5e2f1d9d43895859498f353ac5257574cb6fff7e7dea618586eb4e5547727b66
-MISC ChangeLog 1821 RMD160 0807acafa9b81541af7099a8079269de26c41d7e SHA1 c8fe107f4b62e415888ec849344a7a74ee50c608 SHA256 c985acbe73d8f4077bdd88169a4a3a518e6856f91b300b2ae6786b9061862d9a
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+DIST telepathy-butterfly-0.5.0.tar.gz 126828 RMD160 b7a26ccbdcbf64b0fc53922e11281755261dee19 SHA1 39a1937abaa4c5e0ac4be9b80bbc386cc55540bb SHA256 2abcf64b5142aa53651eb49523fc36eaccc57c8a31685bc31460350aab0ed447
+EBUILD telepathy-butterfly-0.5.0.ebuild 1150 RMD160 fe0de5133e89e965fedaacae7e364c89c2aab675 SHA1 2f1e9a1a2a3e642c2a968796b1b4535bbc684cce SHA256 e37987ee6d37c4ad4aff7cd30d93f2d32ab8001b04673ac28094a3970df6826a
+MISC ChangeLog 2080 RMD160 14f476c72e2b5b27689fccf261dc468f2f43540c SHA1 c729739b1311348f67dda1f603052192b0ae52ad SHA256 b0d933ca0357bb8b20a99be0e30e7b479dd8f82c091d971c5c63e253fd819b4a
 MISC metadata.xml 345 RMD160 56901eb09660c9f9bc547d217cab9be94c885923 SHA1 003c05a26ec4ef5650ea07ab79ac49187bc0bf1b SHA256 9654fd71abe521c86064fb21595ff2c595148cf207caad8f9f9e4e1c9e45c542
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkqYMugACgkQmOfEJZHYOKcGRwCg0cafOM3PngdGeb4R7t5ulh40
+6cEAnAhFc1Con5zR1SxH/puQfNlJNNb6
+=LJuE
+-----END PGP SIGNATURE-----
diff --git a/net-voip/telepathy-butterfly/telepathy-butterfly-0.3.1.ebuild b/net-voip/telepathy-butterfly/telepathy-butterfly-0.3.1.ebuild
deleted file mode 100644
index 71def8af9bf1..000000000000
--- a/net-voip/telepathy-butterfly/telepathy-butterfly-0.3.1.ebuild
+++ /dev/null
@@ -1,45 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-butterfly/telepathy-butterfly-0.3.1.ebuild,v 1.3 2008/05/29 17:48:54 hawking Exp $
-
-NEED_PYTHON="2.4"
-
-inherit python multilib
-
-DESCRIPTION="An MSN connection manager for Telepathy"
-HOMEPAGE="http://telepathy.freedesktop.org/releases/telepathy-butterfly/"
-SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-RDEPEND="dev-python/telepathy-python
-	>=dev-python/pymsn-0.3.1"
-
-DOCS="AUTHORS NEWS"
-
-src_compile() {
-	./waf --prefix=/usr \
-		configure || die "./waf configure failed"
-	./waf ${MAKEOPTS} build || die "./waf configure failed"
-}
-
-src_install() {
-	./waf \
-		--destdir="${D}" \
-		install || die "./waf install failed"
-	rm -f $(find "${D}" -name *.py[co])
-	dodoc ${DOCS}
-}
-
-pkg_postinst() {
-	python_version
-	python_mod_optimize \
-		/usr/$(get_libdir)/python${PYVER}/site-packages/butterfly
-}
-
-pkg_postrm() {
-	python_mod_cleanup
-}
diff --git a/net-voip/telepathy-butterfly/telepathy-butterfly-0.3.2.ebuild b/net-voip/telepathy-butterfly/telepathy-butterfly-0.5.0.ebuild
index 318aad67ff9b..bf77ec9ddba4 100644
--- a/net-voip/telepathy-butterfly/telepathy-butterfly-0.3.2.ebuild
+++ b/net-voip/telepathy-butterfly/telepathy-butterfly-0.5.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-butterfly/telepathy-butterfly-0.3.2.ebuild,v 1.4 2009/01/07 17:11:23 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-butterfly/telepathy-butterfly-0.5.0.ebuild,v 1.1 2009/08/28 19:41:22 tester Exp $
 
 NEED_PYTHON="2.4"
 
@@ -12,11 +12,11 @@ SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~sparc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE=""
 
-RDEPEND="dev-python/telepathy-python
-	>=dev-python/pymsn-0.3.1"
+RDEPEND=">=dev-python/telepathy-python-0.15.10
+	dev-python/papyon"
 
 DOCS="AUTHORS NEWS"