[gentoo-commits] dev/hwoarang:master commit in: net-im/emesene/

[Markos Chandras]

commit:     186b2250666d631fbb0c54fc5c603b1c9a8e2c28
Author:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
AuthorDate: Fri May 27 19:15:56 2011 +0000
Commit:     Markos Chandras <hwoarang <AT> gentoo <DOT> org>
CommitDate: Fri May 27 19:15:56 2011 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=dev/hwoarang.git;a=commit;h=186b2250

Fix paths so it can be installed along with emesene-1

---
 net-im/emesene/Manifest              |    2 +-
 net-im/emesene/emesene-2.11.4.ebuild |   17 +++++++++++++++--
 2 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/net-im/emesene/Manifest b/net-im/emesene/Manifest
index 1a6787d..cb058c2 100644
--- a/net-im/emesene/Manifest
+++ b/net-im/emesene/Manifest
@@ -1,2 +1,2 @@
 DIST emesene-2.11.4.tar.gz 9389693 RMD160 e1778cce2b3c617944c408275696bca6d2741db3 SHA1 e4d0cc45f9751b9b071d66295183cfa24f4c50dd SHA256 c517e63d32b55d4e87e87a5b002336865b92d7dc4881f9d0b0bc25ebca25f0da
-EBUILD emesene-2.11.4.ebuild 868 RMD160 e9e6863eb207a11cf3119a477a799db0efecdb1b SHA1 ba86a1609b02b07094f3e16604bec871089f3b1d SHA256 3cbc5dc2246ba7e8878a5e6ecbf833eee255eecc70e55adcb76e91f0b2172872
+EBUILD emesene-2.11.4.ebuild 1353 RMD160 555f6953e27861809a15846f0d6862690daeefd2 SHA1 48826da036dc2f603d43ec5b8a3a56e75720627a SHA256 92b01cd6a09e74d9ed40c0ebc228255274ab0db287930624a3919ca2788709f6

diff --git a/net-im/emesene/emesene-2.11.4.ebuild b/net-im/emesene/emesene-2.11.4.ebuild
index 1bcbb5d..960b343 100644
--- a/net-im/emesene/emesene-2.11.4.ebuild
+++ b/net-im/emesene/emesene-2.11.4.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="http://www.emesene.org"
 SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
 
 LICENSE="|| ( GPL-2 GPL-3i LGPL-3 )"
-SLOT="0"
+SLOT="2"
 KEYWORDS="~amd64 ~x86"
 IUSE="jabber"
 
@@ -26,13 +26,26 @@ RDEPEND="dev-python/pygtk:2
 src_prepare() {
 	# do not import dummy session
 	sed -i -e  "/import e3dummy/d" ${PN}.py
+	# fix .desktop icon to look for emesene-2 executable
+	sed -i -e "s:${PN}:${PN}-2:g" \
+		${PN}/data/share/applications/${PN}.desktop
 	distutils_src_prepare
 }
 
 src_install() {
 	mysymlink(){
-		dosym  $(python_get_sitedir)/${PN}/${PN} /usr/bin/${PN} || die
+		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
 }