Stable on amd64 wrt bug #427634. Remove old

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

4 files changed, 23 insertions, 76 deletions

diff --git a/net-im/emesene/ChangeLog b/net-im/emesene/ChangeLog
index e22e8cc68185..92ccfaa63a35 100644
--- a/net-im/emesene/ChangeLog
+++ b/net-im/emesene/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-im/emesene
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/emesene/ChangeLog,v 1.29 2012/07/23 06:04:35 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/emesene/ChangeLog,v 1.30 2012/07/24 21:11:57 hwoarang Exp $
+
+  24 Jul 2012; Markos Chandras <hwoarang@gentoo.org> -emesene-2.12.3.ebuild,
+  emesene-2.12.5.ebuild:
+  Stable on amd64 wrt bug #427634. Remove old
 
   23 Jul 2012; Jeff Horelick <jdhore@gentoo.org> emesene-2.12.5.ebuild:
   marked x86 per bug 427634
@@ -121,4 +125,3 @@
 
   emesene-2.11.4: Bug #256747. Thanks to everyone who contributed various
   ebuilds
-
diff --git a/net-im/emesene/Manifest b/net-im/emesene/Manifest
index 99eca59ae4ae..7f5a36bbf576 100644
--- a/net-im/emesene/Manifest
+++ b/net-im/emesene/Manifest
@@ -1,22 +1,26 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX emesene-1.6.3-update-servers.patch 10778 SHA256 9976008ab04f49136a001899b9aeafaf77d5f176f8d8451ac8e9c5589f1616e5 SHA512 234e188467b78f22463a1c774d4c96dab500df60fb5ca45d81b5735e3c7a1a59eb804f3d919643676362cd9b39ddee414c0a632e1bec226c258e3628a60769b7 WHIRLPOOL e9ee680889942b2a363b273a3ecdf215ff46d2b4445f7733e6805f73c43a2ec66dc33c310240997e3fdd957eb6bc6985f367790c092f15990f8a166bedfbd7b7
-DIST emesene-2.12.3.tar.gz 10468503 SHA256 c0d7d9340e5b1e0d742e025a4260b4623e76bd5bb697892de73c5536514e9c40
 DIST emesene-2.12.5.tar.gz 11426686 SHA256 d00446ff6e80b30e97f2e5b48d538ccb16f6031af954b42856b8bd0a64ae64c0 SHA512 1170572e9e61a4fee865a84642586291a96e9f18b730d62fa0557efd65f00f8d1a9033dc1dea2b38a366271ada4c5988cb0d8aebce0c0c7418d5212583573852 WHIRLPOOL f8240b7dd826cf76c09dfa50758c01976732146e30ac6c3f45d6acc5a68e23dfb85fbde1b1727c00ea1de7b5bd0ab4c1705d70cc4682c6fb10e3fc5330344818
-EBUILD emesene-2.12.3.ebuild 1714 SHA256 bbc6895218459376196a856f1a1ab6bc76bace58074c718f6148ef34a4f4061c SHA512 937d679cd48b2f810ae31c3bb05ed4b2718dd2a00c727e9871360d4c43063321f4ee5303fb6691426ee7b380f0921925962584e625eaf1afd8d244c113ee0a60 WHIRLPOOL 878b47a4b9e9b6aeca9f21df478b0119d687c9e387dd0263463748cf56520d64f9d794ffcadd85d6a9f043174a30d2ccace5ae3290291566371a180f74efa4b9
-EBUILD emesene-2.12.5.ebuild 1718 SHA256 aca5d502edd5a5182aa439755080f10248322db49895da8a69c0c47fdbd231cd SHA512 947b752d09cbdcb3eb53e1b34865355675a8398f5f8bfb07a2c174e89d5c482558595b00dd4e2b3d24d94a0ba42f50cd074149a41201c48b24fb81e9e855effc WHIRLPOOL 18601c99547b8bc5f0e27b1548bb1dd8fcdf2e10e9e005677787bc12ccd932c8af8ecf52f3ff5d463a60f8cf273aa1ee2a8a46a2888972a511ab7c012fad3ca1
+EBUILD emesene-2.12.5.ebuild 1719 SHA256 9ebf3ae1128b838d1a8ad5f7fe6f78f4d062b074dfc8c26cc9bd6793704c6c54 SHA512 5c172f95c01ea527207faef6c950e8b9dc3d9bc631251964bdd279d05cffeab9ba56e7b6844c3072cb0bdf97a8293327ee66e20b2988a35e30ccf1aaf50ed157 WHIRLPOOL effc2267eebcead1d6b7066ceecab6f179904019ea1b8854214d571a17dd847db11974dc5d4ab14e1199c7535e86110101f338dbdeaf6321681465f77b4afd9b
 EBUILD emesene-9999.ebuild 1921 SHA256 e7928a86f7cda26e6ad02da4e6d002d98a66f782a2d8a7c6c8d9e68886beb2a8 SHA512 c66c674266828b39fbc693385a8360a6b2d9c9c6088ee86ba7db913a67b35c5d5dd274c97af239834b6ab0d6ec9ac4fc50fcb18bedea81fb4b13014d6664d8e7 WHIRLPOOL 7b301ae22b7ef2556f302039209ab7db83a5103e588709df2698b0e90033f819d56d4de36b1f814cbe565733b238df408c8f1bdc0ddf434c623240341b5448b9
-MISC ChangeLog 4239 SHA256 a352d0b2c3a95b0f317a02e275bd9df7987ca404a97b820e6332071ffbfbc355 SHA512 2e9cbe500529d84613496170c7e6a9d7cd40f21667f649726db5de25f6ccc61f10b89ccd728f7f221490e001e64e0f1618e835eb4e0ffc4015d937f46c981465 WHIRLPOOL 2dccb759ba45f415c94e8e3ce085f248215d5ca4a6abe302129063ac8ce45f421bb320388fedc26c3072aa0d8b69d2aa54153647a391ec1fe5555653f5ec779f
+MISC ChangeLog 4389 SHA256 e284ac98a39f7aed4e392245e97329ce987bd96c8eb1925915aed62fd8645092 SHA512 f2c230559c4b2478489888d38c21bc6c84340a688e00913f4b4e42e443284e73525015027579866736c25c14a986287fd4a146b6fbfa8c6d644ebe3d308d8e8c WHIRLPOOL ce9faedb8496e11be45fc8f20f1052a448dcd67f882bb95c3d454312507e1c64199ae6bd2c7d5f5b5e821e17a3392236a4f5ee539ed0f8a9cee93be0fcdb444e
 MISC metadata.xml 278 SHA256 07a0afc4dfc12865b213ef6815169e0524357989b213ac40bc9436dea94c3160 SHA512 c47ad7b85f6516eec5bc86f26785d8731544436f25fce07093a7c51de184ddfeca02253022c54fb88c1b75645350d8d23de7fc1d8c62e8050e1288b4d6ebaba6 WHIRLPOOL 5fc748443c6e622808acfb4f906cc41bac88b04718771a678462d1079185b74de2840d3dfe1c0949ad96c5b8d2a278f7587af8b1381cddf72c92b9b3099b40c8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQEcBAEBCgAGBQJQDOl5AAoJEPUd7O0j6ekAA8YIALf0dU+0XVDZLZeMOXVJN2+z
-+p1HoH5O5ZLF0zT9G/8OeobTRs96yfDuQm+P/TAVn5H/mG6ukxF7s2Q/TLqPy0Vt
-GRSQio5d+SoHtDLLYIXvKuuBRzQjX8oMGAq7tqCbhdMHxiNx+HVOCdGKufWAW8Ju
-xkLlQ2PjEtOJg+QFsszaFvOQvxTKokCWSQrmAJSVuLhuR9NcMjKvR+9IYDLemWOd
-XLoZlBEIzNNK9MHCV2vGp9hNb/ZwOSgxEPH24Cxpl3d43NC7rlhmkVfRMppm1bqn
-ScCehGfpZlRLYWvtrjOQUnKg3bSvJu2K0JPgB+N6Tskhl3INQfNykRLJzdH/NqE=
-=GRnM
+iQIcBAEBCAAGBQJQDw+iAAoJEPqDWhW0r/LCiT4QAKkD4J5Ex1mZyDrxGrbjhmjM
+/opjmgvDLoeprU6RH17qjA1i1mkrORSRqifGWDL6syXw4qIO7ucVsYXrFHN2WS2E
+kKnF2CYmbVVFxYDIbWFy8F1Dbbxnvv2xajhBGaA6IlpRjDSp5VZmrs931XDLfzSk
+ew1+hVSiYQmkp6LEmFMReMQ2ru4aFamBvr1cZdY5jN7FX0U1v683YjlzP0n+BX38
+94UYBxOQrH2cUBcGnd8+ke/pWuiJVnqfByby0rsnTqZ22QuNbDj3abrzfidd6uLw
+w/fw7bOZxhRuOTR+fuxmDZir1W0mHhMmYSqf8L9j7k24urIaFeW3TstaPoQppfMq
+KJU2Lrbu4t5CGIxdkKVdGuoAqjwkf62wf5HN8GHrfnRnIS+e4b6q0yVu1vpx7mFl
+WoZI3tWAVb6H9zmWN/t3y/byZT4YihaFZJ9FVn8neSiW+3WWNxlBGOukxr4c/Cod
+VmRbreYqmKqvmgEbkRmjMI3Cn7e33LCE+nYodZrGqQHuGP4Z2I4i/pDnpMCeunkU
+r9v7eMBKOMlE+kLIVH5dAEIOa9swvXnBERZPgFxXtGx1R1TWp96B8RGNVQt1uBgn
+DTRcDwZzRsgq0SbFawCGa4qC9Wwn0UD6g2Prr8J907yy+ZxQ5cygsQyXMeHJvKKw
+1lxPKaf7m0FyoWHxYv4z
+=Dtdj
 -----END PGP SIGNATURE-----
diff --git a/net-im/emesene/emesene-2.12.3.ebuild b/net-im/emesene/emesene-2.12.3.ebuild
deleted file mode 100644
index bc011f7ccbf1..000000000000
--- a/net-im/emesene/emesene-2.12.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/emesene/emesene-2.12.3.ebuild,v 1.3 2012/05/21 21:14:58 ago Exp $
-
-EAPI="4"
-PYTHON_DEPEND="2"
-PYTHON_USE_WITH="sqlite"
-SUPPORT_PYTHON_ABIS="1"
-RESTRICT_PYTHON_ABIS="3.*"
-
-inherit distutils eutils
-
-DESCRIPTION="Platform independent MSN Messenger 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="2"
-KEYWORDS="amd64 x86"
-IUSE="jabber"
-
-RDEPEND="dev-python/pygtk:2
-	dev-python/papyon
-	dev-python/notify-python
-	jabber? ( dev-python/xmpppy )"
-
-GIT_SHA="e604df2"
-S="${WORKDIR}/${PN}-${PN}-${GIT_SHA}"
-
-src_prepare() {
-	# do not import dummy session
-	sed -i -e  "/import e3dummy/d" ${PN}/${PN}.py || die
-	# fix .desktop icon to look for emesene-2 executable
-	sed -i -e "s:${PN}:${PN}-2:g" \
-		${PN}/data/share/applications/${PN}.desktop || die
-	# Use a better meny entry
-	sed -i -e "/^Name/s:${PN}-2:Emesene v2:" \
-		${PN}/data/share/applications/${PN}.desktop || die
-
-	python_convert_shebangs -r 2 .
-	distutils_src_prepare
-}
-
-src_install() {
-	mysymlink(){
-		dosym  $(python_get_sitedir)/${PN}/${PN} /usr/bin/${PN}-2 || die
-	}
-	distutils_src_install
-	# fix names
-	mv "${D}"/usr/share/applications/${PN}.desktop \
-		"${D}"/usr/share/applications/${PN}-2.desktop
-	mv "${D}"/usr/share/pixmaps/${PN}.png \
-		"${D}"/usr/share/pixmaps/${PN}-2.png
-	mv "${D}"/usr/share/pixmaps/${PN}.xpm \
-		"${D}"/usr/share/pixmaps/${PN}-2.xpm
-	mv "${D}"/usr/share/man/man1/${PN}.1 \
-		"${D}"/usr/share/man/man1/${PN}-2.1
-
-	python_execute_function -q mysymlink
-}
diff --git a/net-im/emesene/emesene-2.12.5.ebuild b/net-im/emesene/emesene-2.12.5.ebuild
index 1284259ebdf2..131dff8715e0 100644
--- a/net-im/emesene/emesene-2.12.5.ebuild
+++ b/net-im/emesene/emesene-2.12.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/emesene/emesene-2.12.5.ebuild,v 1.2 2012/07/23 06:04:35 jdhore Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/emesene/emesene-2.12.5.ebuild,v 1.3 2012/07/24 21:11:57 hwoarang Exp $
 
 EAPI="4"
 PYTHON_DEPEND="2"
@@ -16,7 +16,7 @@ SRC_URI="http://github.com/emesene/emesene/tarball/v${PV} -> ${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 GPL-3 LGPL-3 )"
 SLOT="2"
-KEYWORDS="~amd64 x86"
+KEYWORDS="amd64 x86"
 IUSE="jabber"
 
 RDEPEND="dev-python/pygtk:2