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

(Portage version: 2.1.6.13/cvs/Linux i686)

3 files changed, 12 insertions, 50 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/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"