Python fixes, use eapi3, remove old.

(Portage version: 2.1.9.40/cvs/Linux x86_64)

3 files changed, 18 insertions, 44 deletions

diff --git a/net-im/telepathy-mission-control/ChangeLog b/net-im/telepathy-mission-control/ChangeLog
index 3b23cd665d5d..781226956362 100644
--- a/net-im/telepathy-mission-control/ChangeLog
+++ b/net-im/telepathy-mission-control/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/telepathy-mission-control
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-mission-control/ChangeLog,v 1.37 2011/02/07 19:54:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-mission-control/ChangeLog,v 1.38 2011/02/19 11:34:07 pacho Exp $
+
+  19 Feb 2011; Pacho Ramos <pacho@gentoo.org>
+  -telepathy-mission-control-5.6.0.ebuild,
+  telepathy-mission-control-5.6.1.ebuild:
+  Python fixes, use eapi3, 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-im/telepathy-mission-control/telepathy-mission-control-5.6.0.ebuild b/net-im/telepathy-mission-control/telepathy-mission-control-5.6.0.ebuild
deleted file mode 100644
index 77de012449c4..000000000000
--- a/net-im/telepathy-mission-control/telepathy-mission-control-5.6.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-mission-control/telepathy-mission-control-5.6.0.ebuild,v 1.2 2010/09/29 19:30:56 mr_bones_ Exp $
-
-EAPI="2"
-
-inherit eutils
-
-DESCRIPTION="Telepathy Mission Control"
-HOMEPAGE="http://telepathy.freedesktop.org"
-SRC_URI="http://telepathy.freedesktop.org/releases/telepathy-mission-control/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-IUSE="gnome-keyring test"
-
-RDEPEND=">=net-libs/telepathy-glib-0.11.9
-	>=dev-libs/dbus-glib-0.82
-	>=gnome-base/gconf-2
-	gnome-keyring? ( || ( gnome-base/libgnome-keyring <gnome-base/gnome-keyring-2.29.4 ) )"
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	dev-libs/libxslt
-	test? ( >=virtual/python-2.5
-		dev-python/twisted-words )"
-
-# Tests are broken, see upstream bug #29334
-RESTRICT="test"
-
-src_configure() {
-	# creds is not available and no support mcd-plugins for now
-	econf	$(use_enable gnome-keyring) \
-		--disable-mcd-plugins
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS ChangeLog || die
-}
diff --git a/net-im/telepathy-mission-control/telepathy-mission-control-5.6.1.ebuild b/net-im/telepathy-mission-control/telepathy-mission-control-5.6.1.ebuild
index eafe530fdee9..2cc1b7818591 100644
--- a/net-im/telepathy-mission-control/telepathy-mission-control-5.6.1.ebuild
+++ b/net-im/telepathy-mission-control/telepathy-mission-control-5.6.1.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-mission-control/telepathy-mission-control-5.6.1.ebuild,v 1.1 2011/01/29 22:44:48 nirbheek Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/telepathy-mission-control/telepathy-mission-control-5.6.1.ebuild,v 1.2 2011/02/19 11:34:07 pacho Exp $
 
-EAPI="2"
+EAPI="3"
+PYTHON_DEPEND="2"
 
-inherit eutils
+inherit eutils python
 
 DESCRIPTION="Telepathy Mission Control"
 HOMEPAGE="http://telepathy.freedesktop.org"
@@ -28,6 +29,14 @@ DEPEND="${RDEPEND}
 # Tests are broken, see upstream bug #29334
 RESTRICT="test"
 
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	python_convert_shebangs -r 2 .
+}
+
 src_configure() {
 	# creds is not available and no support mcd-plugins for now
 	econf	$(use_enable gnome-keyring) \