emesene:0 is history so there is no need to rename all the bits in emesene:2

Package-Manager: portage-2.1.11.30/cvs/Linux x86_64
Manifest-Sign-Key: 0xB4AFF2C2

3 files changed, 21 insertions, 42 deletions

diff --git a/net-im/emesene/ChangeLog b/net-im/emesene/ChangeLog
index 5e9bed497b43..118a1d14cdb9 100644
--- a/net-im/emesene/ChangeLog
+++ b/net-im/emesene/ChangeLog
@@ -1,6 +1,9 @@
 # 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.33 2012/10/12 21:13:07 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/emesene/ChangeLog,v 1.34 2012/11/02 22:31:50 hwoarang Exp $
+
+  02 Nov 2012; Markos Chandras <hwoarang@gentoo.org> emesene-9999.ebuild:
+  emesene:0 is history so there is no need to rename all the bits in emesene:2
 
   12 Oct 2012; Markos Chandras <hwoarang@gentoo.org> emesene-2.12.9.ebuild:
   Drop dev-python/papyon as it is now included in the package. Bug #434690
diff --git a/net-im/emesene/Manifest b/net-im/emesene/Manifest
index 18db47cab82d..113be60d5810 100644
--- a/net-im/emesene/Manifest
+++ b/net-im/emesene/Manifest
@@ -6,23 +6,23 @@ DIST emesene-2.12.5.tar.gz 11426686 SHA256 d00446ff6e80b30e97f2e5b48d538ccb16f60
 DIST emesene-2.12.9.tar.gz 11991146 SHA256 42fa4640e1629171205199a86232367c0c65a3c7e695650542146653d5f8de16 SHA512 b6d57a284ba7b914a7a3030d5133757c0e1186effac31c55957c011b44d27f47f593c9788aec8c1e2b9bbcfbc346e0b79283fed94cf334ba6e1274004362e0cc WHIRLPOOL dff73789a209820378f1cf7a160a18f2aa1885ec0a73be9dcc871b67c5c91da43c2c543170d48c107383a08634c6f4e9b4c2dd9fed15716e0ad5511f39e49a6c
 EBUILD emesene-2.12.5.ebuild 1743 SHA256 14ef2169d0676384ddf4f0fb53569e4cc1e6161f34431f6832c152369c711a8f SHA512 0f9c2edfc2a97b6790f469740b46f6126cda55dcc6db5d9596b81817d33312ff1e71623ffcd99385b04f3583e88b6d6c0549dc471c158535249ae086fd1d75a5 WHIRLPOOL b6e0158a07dd3232d7a33cb7c03fa28ac56c23068699f02910d838413c5561e99e4e1377ea7448dfec7b6a295c5cf28d9fa8a0ba9c57d4bc0e8ad22f1c115faf
 EBUILD emesene-2.12.9.ebuild 1726 SHA256 30ea20ebcc31086dfdcc01b52018d9e1d7c8e57a5ae91b1502760f4397e6661a SHA512 412eac2c8daa7f900d83adf94d0fa6612b7e751c0f1a57e4daee85e3389a464a8dfc5440a4717e0b584f972136abe10f9f623b8ff99ed006024b6f7a39646d48 WHIRLPOOL 6c9ea8c02fc8275c0e0c629838726b70a8e9004ed421d043fbbf139e945ccd2ccb12ae7cfe8600e12ca81f85d05b23a03c80ff71e432d04e6489168a70be08f5
-EBUILD emesene-9999.ebuild 1945 SHA256 f653b7458d94cce34b845e05baa2981cd5d7937ea7934aee5a2ea6365957df24 SHA512 ff88ca1f7430db289c7177bf4ac607f8639f405a7670a85b2fd00ae8a6661232c8ba10bf0ef9f9fecb1855c7a667119a50d4763247b337702dcd389bed8ee634 WHIRLPOOL fcdb91f9548a1789b89007ff67ee4cf32ae67162a2259aeea87a43cbee86b57bb7d6757f420657bafe9fc22dd054f0b70bcb69cbae9d0f2b896cdcd7211fdf44
-MISC ChangeLog 4813 SHA256 8036bdb43edd6c1be591d4eedeec445bc04e169a9a3b4d59ff56fe4f8285eb18 SHA512 75f7f90f166b35154487c1063e7c25d5b91882a612d1f6168b92b9697143cab3f203de1ee4e53cfc983a3bf464adc498eb88df883541c9beb1b7953dc1d2f640 WHIRLPOOL 5600e00bd6d8d86ccfda5b04103a1ac147af0b7a1cd19b47b1509c7e5d77374e8e62593485852c21b43ce2a4dbca064ee16ee6269f14de73b1ff1381219ddfbd
+EBUILD emesene-9999.ebuild 1165 SHA256 86685785c8af9f9e63328b1acbaef9f94752dc940f006f532598e931b9a46d7d SHA512 fece4ff68f57685c65f3133b1622464616d3ac081a04e09aefd1ceb2bc49f28a60890c3d97c2b96e5e3a837e32f8b3dc48a77e1cc810d020297d407f5f17c1aa WHIRLPOOL 55b3bf4dd495a2502fc6a5ab6d919cf10a11818cb89b54b888b00852abd155a910b0b3dd7d62de6eeb7f9d882dc3e8878a4ee42625f67a8362ab548a4534174c
+MISC ChangeLog 4967 SHA256 c56097b4062252851f9f5036303ba1d1abd6e87a2bf63e97724ffec97ffa4bab SHA512 f149c50e67f7beb19aab99cf6f9b918c4366cc9e6dba9afe48f6b1a7485b4a363af4e513401c98597814027781c074c52b0e0fecec575b61eae2b1c5c7c978a7 WHIRLPOOL 62d0bb359fe9736ef9af62b3ebafa0b7701e8de95b15fc2e26d6a54460836c3f58b8e1b9efb3f267233a8b555fbad6f903db4053d24c4325cb8d52fc771a0f81
 MISC metadata.xml 278 SHA256 07a0afc4dfc12865b213ef6815169e0524357989b213ac40bc9436dea94c3160 SHA512 c47ad7b85f6516eec5bc86f26785d8731544436f25fce07093a7c51de184ddfeca02253022c54fb88c1b75645350d8d23de7fc1d8c62e8050e1288b4d6ebaba6 WHIRLPOOL 5fc748443c6e622808acfb4f906cc41bac88b04718771a678462d1079185b74de2840d3dfe1c0949ad96c5b8d2a278f7587af8b1381cddf72c92b9b3099b40c8
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJQeIfkAAoJEPqDWhW0r/LCVUUP/36bhHZmQvAVA7U8PkKfqB9T
-JmQVieQ/zPatSxvS/CX9yPR8ixKemHK4yXvJ1xyXr6pxSNihBozyjNXoyUss+tbg
-wk4Ig6Z0dfxnbThQWjknzHPZ/Jo1QOSJAfUqrg0vJD+juOMzdje/+xYo+wDGTDuM
-2ar3K1cA6NnylOW3p6l91qDCa6fHEryiQIlj7hf4GyAVjyemnkQhveTkSqz96iJE
-Dq6C9Lrj3t9NqtB3J9gFVnldv4rVt2ATEAka0ENrEYAGL8WBqizW/d35JkqZfr6n
-h/moHFYI+9OJltLlc/4lT4wKVqpNuFnG2WOVCWNnzcgtzbhjc8eWvscIsIfB+5Vd
-av5OlVDyYXI+qg5c51F8mf7VxHtpSHOac5z4+OxMKHIOfc9An16Xw39qiLmOpM4v
-MV5+tmIQ2ZPp4Mh0YAz+2Zn2fRZGlOl4N01+PytRsFrCw2yyUBOdju48cgRvefTQ
-X+Pm6cZqybfcXTtR7eBNXcMYAPNqN7i6gkzXE4ntwsm4QBde7gGezGWnd2kvjX8k
-fIep+u7W3m5AFjeD0BCSYUFtZQctV/LyAsvylH8b+eqVsVvEDzkpZuZrq/SW6v8S
-94bCsoZTQrQMmFMXN16qedbyEhSMoIEcGPN1p2Hs3fkqAJJ3KtqKLqaiWI5RoCVc
-F4avvqBz+KuAf/MClmX8
-=10Bc
+iQIcBAEBCAAGBQJQlEnWAAoJEPqDWhW0r/LC85UQAIJHf1A2Lx0QFNYA+dxhSI/I
+W0Hlefj46TBU9aRq7CpYcj2NWs/oBmMGK5uV9V2YuIsh/HVSbWKNynHwbsCVGJHG
+x1YOsWuMwOPT9v4v5GlGOgCFtQsT8Zf9h/83lVPNhHhmOXubK+muinSqvel15Zj2
+vcJi3+aPbeayhQG6q2N4oGa/am7hJNcm+p0iE+BLtGZl1kvKLf8+z54vBGVYs+k1
+jNvG3rXxn/12/p/KIRShw9sOGWBGej0+CwdsFWJPonnc3OXFrHTNxm8TdH2M9d9r
+IjfZ18Gntl4yt+h064nm2si5CHkVdxmyz5IawEuJoh91AqUydFrkEXWleg1vHWse
+FmENsdrjlCFbLzzeOAkCrRpy25thoGM3XPeNFIE6rw6w7v85CCo0orsfHXG27lnA
+S/IwB/LisTs+nm44mXJg8L3ZPevc3cKSjBRvCdtZ0v+gZgipvmJV7KF0CGbe3Cd0
+gAkeqvx/wTfw4krGXxGa6DoTmdksJJEQhRL9wzB7x4yAznah7xFtEhvEewCPPCil
+qcT0C9t3PKs1OhzmA5sDIAiFUm8OQ8WAWDyAyntzjQOfFbsS0GM5ZpuX24N7sl6Z
++STLZ+ydoCFXeVhRh0IQWBB+v1oHrcm9CaQohHStgyUWccZ98/NdpbAJO3eq+Z3K
+p18QHcJ3MRBunUP+nX29
+=HmA3
 -----END PGP SIGNATURE-----
diff --git a/net-im/emesene/emesene-9999.ebuild b/net-im/emesene/emesene-9999.ebuild
index 08924db5753d..23939e939b77 100644
--- a/net-im/emesene/emesene-9999.ebuild
+++ b/net-im/emesene/emesene-9999.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-9999.ebuild,v 1.5 2012/08/05 18:37:45 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/emesene/emesene-9999.ebuild,v 1.6 2012/11/02 22:31:50 hwoarang Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -29,36 +29,12 @@ RDEPEND="dev-python/pygtk:2
 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
 	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
-}
-
 pkg_postinst() {
 	elog
-	elog "${PN}-2 is on early stages of development."
+	elog "${PN} is on early stages of development."
 	elog "Please do not file bugs on Gentoo bugzilla"
 	elog "unless you have problems with this ebuild."
 	elog "Use the upstram bug tracker to report bugs:"