Drop jabber useflag and pull dev-python/xmpppy unconditionally now tha tMSN service is gone

Package-Manager: portage-2.1.11.57/cvs/Linux x86_64
Manifest-Sign-Key: 0xC2BA7F3C!

4 files changed, 34 insertions, 17 deletions

diff --git a/net-im/emesene/ChangeLog b/net-im/emesene/ChangeLog
index 6d72c3163d41..cdd99523adc7 100644
--- a/net-im/emesene/ChangeLog
+++ b/net-im/emesene/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-im/emesene
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/emesene/ChangeLog,v 1.43 2013/01/21 18:54:35 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/emesene/ChangeLog,v 1.44 2013/03/23 10:48:57 hwoarang Exp $
+
+  23 Mar 2013; Markos Chandras <hwoarang@gentoo.org> emesene-2.12.9.ebuild,
+  emesene-9999.ebuild:
+  Drop jabber useflag and pull dev-python/xmpppy unconditionally now tha tMSN
+  service is gone
 
   21 Jan 2013; Pacho Ramos <pacho@gentoo.org> -emesene-2.12.5.ebuild:
   Drop old version still needing papyon
diff --git a/net-im/emesene/Manifest b/net-im/emesene/Manifest
index bcda1b23a90e..812554eeac5c 100644
--- a/net-im/emesene/Manifest
+++ b/net-im/emesene/Manifest
@@ -3,14 +3,26 @@ Hash: SHA256
 
 AUX emesene-1.6.3-update-servers.patch 10778 SHA256 9976008ab04f49136a001899b9aeafaf77d5f176f8d8451ac8e9c5589f1616e5 SHA512 234e188467b78f22463a1c774d4c96dab500df60fb5ca45d81b5735e3c7a1a59eb804f3d919643676362cd9b39ddee414c0a632e1bec226c258e3628a60769b7 WHIRLPOOL e9ee680889942b2a363b273a3ecdf215ff46d2b4445f7733e6805f73c43a2ec66dc33c310240997e3fdd957eb6bc6985f367790c092f15990f8a166bedfbd7b7
 DIST emesene-2.12.9.tar.gz 11991146 SHA256 42fa4640e1629171205199a86232367c0c65a3c7e695650542146653d5f8de16 SHA512 b6d57a284ba7b914a7a3030d5133757c0e1186effac31c55957c011b44d27f47f593c9788aec8c1e2b9bbcfbc346e0b79283fed94cf334ba6e1274004362e0cc WHIRLPOOL dff73789a209820378f1cf7a160a18f2aa1885ec0a73be9dcc871b67c5c91da43c2c543170d48c107383a08634c6f4e9b4c2dd9fed15716e0ad5511f39e49a6c
-EBUILD emesene-2.12.9.ebuild 1765 SHA256 e27c2d24b186006a66bddab5bb698100ba74a6c14e8a46d7070dd83a729868ab SHA512 948541b5d1612d7a467be6bbbcc1a17d0b29a79e46e147035ef1c278d9a1af343c1e0c39557c3bd156e0ec6afac8c28c1a095dd6df8dcf5050e5d2ffcad953b5 WHIRLPOOL 6f13f9baab327710864e391f52720aac01fa314eeaffaadb6d5801ac4372e5d800d194193fbd996f8978143362ee13bb3f3a21716540d82b733f50f0d936778f
-EBUILD emesene-9999.ebuild 1482 SHA256 5821cf22f5b34c788ae9905fa67a2fa7dc24e55664d3a2c2ee0db53e96f1559f SHA512 8c0ed2b8da16e065d90c570aa412870f02a086711e3aba69e95616d6cbf6e5fea5f297eb826cb2bc350a50bccbd346d2aa5b56419a0af5c6823c69718c1cda50 WHIRLPOOL 5067a95bfc19781e9c0445b57c8abaee9014dc523df25742fe5681f42c6c15a60746fa9771b95c5d9e32c02851258099f5e71dc645c264d9cad3abb321fb2a3d
-MISC ChangeLog 6086 SHA256 5de1bc76911a32c0a6d3766d77f1f669cee2eafb5cc1c60edaeccc547d4a73da SHA512 619e1e04708c9b1dd992e11e3103b40b55f8e9da388dfee9de3c0b09d71d4ef11303309b167b843b838eae9c5aee8c87db9e21ff92843ba5992f5c342c39b8e2 WHIRLPOOL 46a59f61c87a9e2fbc159cd19f21afb6098ffb5f7d8ac44bfe4a97e349e4f34d92ad470900b5834c43675f7eadc89d8cc25387d28df1aadeb3c182174e0dbf84
+EBUILD emesene-2.12.9.ebuild 1738 SHA256 cb51122fe01e07add5d3127c4a76890a35d449629e94dab90498b8c62a18b33e SHA512 a4c3fe728a66ae86aee7bcf21a3e7a07387f15a85175fecaea15518916ec134b50128e09e3d465c793301328c7e2ecf4b77c7614db0018e8a99d4c8e4086c102 WHIRLPOOL 55ea5734951bf4f5db8de2ebead6be47c7ece66b2e9d76da709fce4a6ef9416cb4153f0f3df2bf9a1aff46d1129de24f4dd9b1945fd85986cf0fa1da517293c0
+EBUILD emesene-9999.ebuild 1453 SHA256 93c95cff0481797055356755ea3d1215f9accb779f2e691065e4619b836fd260 SHA512 e0c8ef6e052295836751f6720acb02bd1c23c3c32b1cf7cd5a05d208a99e21a98f495aa552543e65cf8313209ef23408c46ff18fc67560b02a91dee1d0b69402 WHIRLPOOL 9a0deffb64379340dd609085137b4d892b661f1460202e63a2f173a5a5c7f0e1ed517870b61727123013908c0634294b83621e7e7f470140e77651a4b0836f30
+MISC ChangeLog 6285 SHA256 068b860b5a9d6b15c6afba8a488ff89197a26cf44224caff3857891bd7734162 SHA512 88f73bb695a41b32869841e625549beab9d21637f4510c72c869a6b6fc5312e7711254a8618c477aa234530f15ce8abcd0643c96ed25154bb697c6c4c2f17517 WHIRLPOOL 565a12d0964e0b4705eefec29feafd02c39e3e501c9762e25fa4ade2a24ba5f21ce3de2ccdafa8d8d1caacd3d0e4d812e0ad5bc8854f6faeac0ca292e0c71734
 MISC metadata.xml 315 SHA256 6b64242231581bd8b47d7233121ddb5a093df64b0403e8da07ee16c73d362ade SHA512 df2e31c7ed0926208c2e5bf4325e946ad666ab8ebeeac3e32fbea2830ad568f6fb705b5eb63abc07bfca5deaf4c8139a74b4c306eb27c7cd80cc0be20be053df WHIRLPOOL bbab2ed1f608e37458412b0d5cd030d8e5fbeb690e549423e4823995ea97a3357086c03b828633e872976e23e4e6f7a759dda67eba7c9061c83b7be8326ab39e
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlD9juwACgkQCaWpQKGI+9QhtACfQACg+nWEz7LJxijUrL6Ken8o
-0GAAn2Ce1Yb8GWPzZVS2FpqMQiR9Vj+x
-=BH3X
+iQJ8BAEBCABmBQJRTYiZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQzNTVDNDczOUYzRjJEMTRGNDRGMzU2RkMw
+OUJGNEY1NEMyQkE3RjNDAAoJEAm/T1TCun88NmwP/RWpLWLQsO4xkVCLFG7TEoEK
+mj0NKr/RXrcXfnUfw9iiZPzAmDIrIeBFanCrMyPCii4xtQGdlIPT67KyGYcgBJuE
+1oAlVteCJgfU9VqEFfj/Y3OgSUO9BI98B3fRmIW8gFt5grCL47kQj3rfwNQf9g6j
+ZCwU8857v55MXV4ue2Hkwdo/Jv0C/vLWdj7TTSkdhf02VL83MOB2e40aWKnO7GSx
+t4QpqzI7udvzK/S3ZGHt/KhZDcmaObVdm/CBfouDbucdtxmzNTJvuDYttnIToXsJ
+PcwOMUu73oZ+lhIj8jKcZu48KcwT73y0dthDg1YRg/t88pEswpUfeRHClniCNHB1
+Ef7qU8uKTIuwSBz5B3MKgSiHlFumJ26YIfp6e/9J/Z5mtjWwywUlSzJrVePfx/eS
+DdLEFjcSM1dNx2OCG7m3IhvokSjLwMBHBms1jAY4DRtefhyA1bvoQd2qp4kRNZRB
+YN9hSbSwDRss7nIHzNt+4ufhVCiQB6QMAm/DqKS31Hko05dUNY1hyfm2tcx9lsP6
+2u3NfRXrUjuJh/0lDNIJ2sFvmeA6eas0S/PKy94B/y6SWpogF0EZ52KCmfEvv9ME
+ich/PicrPpG4YiJj6x8bF0BE7a0m+rxeD6OR4TVbwm2tltPM/FKR3T48tz9WTEBj
+LY1xFCJ2qIUiDkHq8149
+=7xiZ
 -----END PGP SIGNATURE-----
diff --git a/net-im/emesene/emesene-2.12.9.ebuild b/net-im/emesene/emesene-2.12.9.ebuild
index 87222f57c628..f54e8170dbdf 100644
--- a/net-im/emesene/emesene-2.12.9.ebuild
+++ b/net-im/emesene/emesene-2.12.9.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/emesene/emesene-2.12.9.ebuild,v 1.7 2012/12/26 19:36:23 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/emesene/emesene-2.12.9.ebuild,v 1.8 2013/03/23 10:48:57 hwoarang Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -10,21 +10,21 @@ RESTRICT_PYTHON_ABIS="3.*"
 
 inherit distutils eutils
 
-DESCRIPTION="Platform independent MSN Messenger client written in Python+GTK"
+DESCRIPTION="Platform independent IM client written in Python+GTK"
 HOMEPAGE="http://www.emesene.org"
 SRC_URI="http://github.com/emesene/emesene/tarball/v${PV} -> ${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 GPL-3 LGPL-3 )"
 SLOT="0"
 KEYWORDS="amd64 x86"
-IUSE="jabber"
+IUSE=""
 
 RDEPEND="dev-python/pygtk:2
 	dev-python/notify-python
 	dev-python/pycrypto
 	dev-python/pywebkitgtk
 	dev-python/pyopenssl
-	jabber? ( dev-python/xmpppy )"
+	dev-python/xmpppy"
 
 GIT_SHA="b89aa5e"
 S="${WORKDIR}/${PN}-${PN}-${GIT_SHA}"
diff --git a/net-im/emesene/emesene-9999.ebuild b/net-im/emesene/emesene-9999.ebuild
index 84899724cd41..0c0f997a52ec 100644
--- a/net-im/emesene/emesene-9999.ebuild
+++ b/net-im/emesene/emesene-9999.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/emesene/emesene-9999.ebuild,v 1.10 2012/11/11 20:38:57 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/emesene/emesene-9999.ebuild,v 1.11 2013/03/23 10:48:57 hwoarang Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -12,19 +12,19 @@ EGIT_REPO_URI="git://github.com/${PN}/${PN}.git
 
 inherit distutils eutils git-2
 
-DESCRIPTION="Platform independent MSN Messenger client written in Python+GTK"
+DESCRIPTION="Platform independent IM client written in Python+GTK"
 HOMEPAGE="http://www.emesene.org"
 
 LICENSE="|| ( GPL-2 GPL-3 LGPL-3 )"
 SLOT="0"
 KEYWORDS=""
-IUSE="jabber"
+IUSE=""
 
 RDEPEND="dev-python/pygtk:2
 	dev-python/notify-python
 	dev-python/pywebkitgtk
 	dev-python/pyopenssl
-	jabber? ( dev-python/xmpppy )"
+	dev-python/xmpppy"
 
 src_prepare() {
 	# do not import dummy session