Version bump, remove old.

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

3 files changed, 25 insertions, 26 deletions

diff --git a/net-voip/telepathy-haze/ChangeLog b/net-voip/telepathy-haze/ChangeLog
index 9e3aa988272a..51d37c806c6f 100644
--- a/net-voip/telepathy-haze/ChangeLog
+++ b/net-voip/telepathy-haze/ChangeLog
@@ -1,6 +1,12 @@
 # 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.29 2011/10/30 17:32:42 armin76 Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-haze/ChangeLog,v 1.30 2012/04/23 10:09:54 pacho Exp $
+
+*telepathy-haze-0.6.0 (23 Apr 2012)
+
+  23 Apr 2012; Pacho Ramos <pacho@gentoo.org> +telepathy-haze-0.6.0.ebuild,
+  -telepathy-haze-0.4.0-r1.ebuild:
+  Version bump, remove old.
 
   30 Oct 2011; Raúl Porcel <armin76@gentoo.org> telepathy-haze-0.5.0.ebuild:
   alpha/ia64/sparc stable wrt #385699
diff --git a/net-voip/telepathy-haze/Manifest b/net-voip/telepathy-haze/Manifest
index 8393e28a9b51..121ce6f9e33c 100644
--- a/net-voip/telepathy-haze/Manifest
+++ b/net-voip/telepathy-haze/Manifest
@@ -1,16 +1,16 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-DIST telepathy-haze-0.4.0.tar.gz 465716 RMD160 b7ce97b0f4e2a1c48f2258f121b014e1a9c72062 SHA1 322d2f3e78838fc5254f3c33010e78b7dd5c4513 SHA256 f699e4e127d710ab30ac34c60acfdb2b3b7fd19b9c7d4fa6970ac6fe45172353
 DIST telepathy-haze-0.5.0.tar.gz 550866 RMD160 04c112eb246e8b14ed006e63fec454d30b635f00 SHA1 dde088aa48a72056e6f264d304dda85419bbf8a6 SHA256 768b5886fb6b45b7bb8b8c455eb5140c0b9bcc02a6e2e32227bd31751934077c
-EBUILD telepathy-haze-0.4.0-r1.ebuild 1246 RMD160 8f19aada1f732e7d181415cc0402bb16c3c9b858 SHA1 7743421dccb80700304781b5742947e310148bcd SHA256 2a97016c80e5a823dca2f303f3a61a4efb0d7164eab94d8b169da7ebd5c7f9e5
+DIST telepathy-haze-0.6.0.tar.gz 558413 RMD160 fa64408aa86213a23b40588e826813f2dca1772b SHA1 98dd2f2796ae04192533ff8df5af116c54a11e05 SHA256 e267c54aef8f85746899e365ae344fe9ec73c1aec04298bedad6a88732ab2fe3
 EBUILD telepathy-haze-0.5.0.ebuild 1078 RMD160 552cf0d092425ec1cc9a47854a1e75815e23ecc1 SHA1 012ceb6452df1687cc0e17596b570c1fb215de4b SHA256 49de2dae88d20338d3e21b4379117bec12f88893e9498f517d4a2ace8440c853
-MISC ChangeLog 4140 RMD160 b609f385093302c17c356263021a8e7540022d68 SHA1 888b064dc5b420cad2fe4c0c7193a06a61301b4b SHA256 18b1d83fc7ae7eb58c62391c23e9aa5c45867cc2e12666e0357d9fa310b03c56
+EBUILD telepathy-haze-0.6.0.ebuild 987 RMD160 74cd9f7c3dbc3a69742f6e9f60ce8060765809da SHA1 12e846f25fd4be7a6b10cb333d365588cd189bed SHA256 86b75880bee270425da3acb2dcba6d78d2f2726654b5a320ebd482f4b9d1cefd
+MISC ChangeLog 4315 RMD160 7d3e96ef77a3206f3fb85fe08dd0964439fee674 SHA1 b009b6ca106df104440bc98beeb730539769d11d SHA256 b979d76ec15cae4db62cac700df4f68a310915e996181740a5ea9f77a764eb5a
 MISC metadata.xml 322 RMD160 f050d9a137f8f4d5b3612659899b026a10ebb889 SHA1 0c47b987fc151d41d3756a889130b4086a62ec70 SHA256 0658eb62f074a6ca6adf1c572753ae025b4c1e9048d3d4c0529f98cf2cb6bfa3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk6tikAACgkQuQc30/atMkBZTQCguwaSll9F6HUUkCKSXkI0TwQo
-QaYAoJhTLZvuFdwTfENARUQHk7GcsiAq
-=iJH4
+iEYEARECAAYFAk+VKngACgkQCaWpQKGI+9SDPgCfVNm19hPDLbRzK72zdk7rkjNc
+tEYAn3ds11G6n4s8sMtz3ehT1D02muu6
+=7U11
 -----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.6.0.ebuild
index f668c71f0e82..a464f95e6118 100644
--- a/net-voip/telepathy-haze/telepathy-haze-0.4.0-r1.ebuild
+++ b/net-voip/telepathy-haze/telepathy-haze-0.6.0.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2012 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.7 2011/06/13 15:26:47 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-voip/telepathy-haze/telepathy-haze-0.6.0.ebuild,v 1.1 2012/04/23 10:09:54 pacho Exp $
 
-EAPI="3"
+EAPI="4"
 PYTHON_DEPEND="2:2.5"
 
 inherit python
@@ -13,34 +13,27 @@ SRC_URI="http://telepathy.freedesktop.org/releases/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="alpha amd64 ia64 ppc ~ppc64 sparc x86"
-IUSE="test"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+#IUSE="test"
+IUSE=""
 
 # Tests failing, see upstream: https://bugs.freedesktop.org/34577
 RESTRICT="test"
 
-RDEPEND=">=net-im/pidgin-2.6
-	>=net-libs/telepathy-glib-0.9.2
+RDEPEND=">=net-im/pidgin-2.7
+	>=net-libs/telepathy-glib-0.15.1
 	>=dev-libs/glib-2.22:2
 	>=dev-libs/dbus-glib-0.73"
 
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	test? ( dev-python/twisted-words )"
+	dev-util/pkgconfig"
+#	test? ( dev-python/twisted-words )"
 
 pkg_setup() {
 	python_set_active_version 2
+	python_pkg_setup
 }
 
 src_prepare() {
 	python_convert_shebangs -r 2 .
 }
-
-src_install() {
-	emake DESTDIR="${D}" install || die "emake install failed"
-	dodoc AUTHORS NEWS README || die
-
-	# Remove haze.manager (as Fedora and Debian are doing) to prevent
-	# connection problems reported in bug #331713
-	rm -f "${ED}"/usr/share/telepathy/managers/haze.manager || die
-}