Bump to eapi3, use python2 for compiling.

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

3 files changed, 29 insertions, 15 deletions

diff --git a/net-voip/telepathy-haze/ChangeLog b/net-voip/telepathy-haze/ChangeLog
index e5de2e8aac29..852e031fcee0 100644
--- a/net-voip/telepathy-haze/ChangeLog
+++ b/net-voip/telepathy-haze/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for net-voip/telepathy-haze
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-haze/ChangeLog,v 1.18 2011/02/07 19:13:28 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-haze/ChangeLog,v 1.19 2011/02/22 18:29:27 pacho Exp $
+
+  22 Feb 2011; Pacho Ramos <pacho@gentoo.org> telepathy-haze-0.4.0-r1.ebuild:
+  Bump to eapi3, use python2 for compiling.
 
   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-haze/Manifest b/net-voip/telepathy-haze/Manifest
index e49d9fdf2a81..46b5c6e6e915 100644
--- a/net-voip/telepathy-haze/Manifest
+++ b/net-voip/telepathy-haze/Manifest
@@ -4,13 +4,13 @@ Hash: SHA1
 DIST telepathy-haze-0.3.2.tar.gz 365334 RMD160 e7b1713680517992b5e060f553c4d939775bc1e7 SHA1 ced2905ba43152d634e05efd3c3725bf4c020ec2 SHA256 2eccb2a86da192e756ba357c12c73ecab4f699c3d97ecec4d160851c1f243804
 DIST telepathy-haze-0.4.0.tar.gz 465716 RMD160 b7ce97b0f4e2a1c48f2258f121b014e1a9c72062 SHA1 322d2f3e78838fc5254f3c33010e78b7dd5c4513 SHA256 f699e4e127d710ab30ac34c60acfdb2b3b7fd19b9c7d4fa6970ac6fe45172353
 EBUILD telepathy-haze-0.3.2.ebuild 849 RMD160 9dfa5ef7b34e576e623b7495a96cb74a7b662878 SHA1 999e83b4f4fb2248a7ba44f42860093459168c9f SHA256 2d7f7654de3f8bb51e24fd597cbce969006b7472605cd540e0416e393dd00b94
-EBUILD telepathy-haze-0.4.0-r1.ebuild 1041 RMD160 07152da846431bf0055e0dd74b48120bfc236791 SHA1 6ee2946d25776ecccb43abb747e5bdd48ea510f7 SHA256 be17ae2eb56176608dcafa26fdc71a8c249cd94564ffc5b40412ce47fb7c0e1e
-MISC ChangeLog 2740 RMD160 4f482317c1e5f67907447a4d77dcb85b7b769c7f SHA1 7c974e451d8817d43909d981e299af8d703d51db SHA256 ad675adfcc09d8a201dc6d1712df2cd7ef0f1c98ae64fe920bdaa03b3f040a88
+EBUILD telepathy-haze-0.4.0-r1.ebuild 1169 RMD160 35d284ceb06d43e3fd29f9eb7473f271ae44b601 SHA1 05c8b6c541790b04a093d2324a4437bceabcd47b SHA256 8aaa7be6d075f58b38575564783d14e5b1f58712f99e40cee5791b957c87418f
+MISC ChangeLog 2863 RMD160 acb675039e06d4678be5c74aa260b737f6506bc9 SHA1 7f4f825674a9c67c880042dc13becca51a9b5366 SHA256 9c1c869e2b2ea0ec4c105b3f7a153d954ae6fbb5b832491cf82cb1987715eaa2
 MISC metadata.xml 322 RMD160 f050d9a137f8f4d5b3612659899b026a10ebb889 SHA1 0c47b987fc151d41d3756a889130b4086a62ec70 SHA256 0658eb62f074a6ca6adf1c572753ae025b4c1e9048d3d4c0529f98cf2cb6bfa3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iEYEARECAAYFAk1QRF0ACgkQCaWpQKGI+9Rw4ACfW4/x4EaMhiMRbUC9MfzLsZKG
-l4kAn2XDswO7+Flh7byxIfVEPwWFduZJ
-=nyug
+iEYEARECAAYFAk1kAI0ACgkQCaWpQKGI+9TRVQCaA3/sJzkplxoAoDqqZ9yrqV7j
+i20An2xdPFjaEuwHQklzkqdWgHSBfkMQ
+=qcRx
 -----END PGP SIGNATURE-----
diff --git a/net-voip/telepathy-haze/telepathy-haze-0.4.0-r1.ebuild b/net-voip/telepathy-haze/telepathy-haze-0.4.0-r1.ebuild
index 3425edcdb3ad..f60cc76c4b89 100644
--- a/net-voip/telepathy-haze/telepathy-haze-0.4.0-r1.ebuild
+++ b/net-voip/telepathy-haze/telepathy-haze-0.4.0-r1.ebuild
@@ -1,10 +1,14 @@
-# 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-haze/telepathy-haze-0.4.0-r1.ebuild,v 1.1 2010/09/30 08:23:17 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-haze/telepathy-haze-0.4.0-r1.ebuild,v 1.2 2011/02/22 18:29:27 pacho Exp $
 
-DESCRIPTION="Telepathy connection manager providing libpurple supported
-protocols."
-HOMEPAGE="http://developer.pidgin.im/wiki/Telepathy"
+EAPI="3"
+PYTHON_DEPEND="2:2.5"
+
+inherit python
+
+DESCRIPTION="Telepathy connection manager providing libpurple supported protocols."
+HOMEPAGE="http://developer.pidgin.im/wiki/TelepathyHaze"
 SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
@@ -14,13 +18,20 @@ IUSE="test"
 
 RDEPEND=">=net-im/pidgin-2.6
 	>=net-libs/telepathy-glib-0.9.2
-	>=dev-libs/glib-2.22
+	>=dev-libs/glib-2.22:2
 	>=dev-libs/dbus-glib-0.73"
 
 DEPEND="${RDEPEND}
 	dev-util/pkgconfig
-	test? ( dev-python/twisted-words
-		>=dev-lang/python-2.5 )"
+	test? ( dev-python/twisted-words )"
+
+pkg_setup() {
+	python_set_active_version 2
+}
+
+src_prepare() {
+	python_convert_shebangs -r 2 .
+}
 
 src_install() {
 	emake DESTDIR="${D}" install || die "emake install failed"
@@ -28,5 +39,5 @@ src_install() {
 
 	# Remove haze.manager (as Fedora and Debian are doing) to prevent
 	# connection problems reported in bug #331713
-	rm -f "${D}"/usr/share/telepathy/managers/haze.manager || die
+	rm -f "${ED}"/usr/share/telepathy/managers/haze.manager || die
 }