Version bump and initial commit of live ebuild. Add missing || die and minor fix on src_prepare as well

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

5 files changed, 119 insertions, 22 deletions

diff --git a/net-im/emesene/ChangeLog b/net-im/emesene/ChangeLog
index a63feae146e8..57a9b13b0116 100644
--- a/net-im/emesene/ChangeLog
+++ b/net-im/emesene/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-im/emesene
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/emesene/ChangeLog,v 1.1 2011/05/29 12:06:54 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/emesene/ChangeLog,v 1.2 2011/05/30 17:56:47 hwoarang Exp $
+
+*emesene-9999 (30 May 2011)
+*emesene-2.11.5 (30 May 2011)
+
+  30 May 2011; Markos Chandras <hwoarang@gentoo.org> -emesene-2.11.4.ebuild,
+  +emesene-2.11.5.ebuild, +files/emesene-2.11.5-svgfix.patch,
+  +emesene-9999.ebuild:
+  Version bump and initial commit of live ebuild. Add missing || die and minor
+  fix on src_prepare as well
 
 *emesene-2.11.4 (29 May 2011)
 *emesene-1.6.3 (29 May 2011)
diff --git a/net-im/emesene/Manifest b/net-im/emesene/Manifest
index c69c7d5862c1..d1cb0447048d 100644
--- a/net-im/emesene/Manifest
+++ b/net-im/emesene/Manifest
@@ -1,26 +1,28 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
+AUX emesene-2.11.5-svgfix.patch 799 RMD160 68149afc320668450e779f646cb9ea02c100bb2a SHA1 daa6c7ada5f9ad9f9b04603caa26d98f5cd2c614 SHA256 3c692608dcdf88832443799bfea6f7cb3c7d542f2ecd93a6dd8bbc86a12db8a4
 DIST emesene-1.6.3.tar.gz 3078128 RMD160 9037824c713401b33cd7f172ba38f659c7de5f67 SHA1 c4759efe180c8e1589bd966c6b84106aa7cd356e SHA256 9b088a17b4d9d3a2be72737a02dceb7a1a224b978a30b6490fa3354fb49b4bfa
-DIST emesene-2.11.4.tar.gz 9389693 RMD160 e1778cce2b3c617944c408275696bca6d2741db3 SHA1 e4d0cc45f9751b9b071d66295183cfa24f4c50dd SHA256 c517e63d32b55d4e87e87a5b002336865b92d7dc4881f9d0b0bc25ebca25f0da
+DIST emesene-emesene-v2.11.5-0-gb5c6aad.tar.gz 9532700 RMD160 fecc6fd503979860d16544d6924d81754c1bf466 SHA1 848dec2eb2763c4dab8804011173b6575dabc487 SHA256 74eb1c418a49d15a496892becbe449ec8d396699c3ac0ad8ab0afcf0dda661dd
 EBUILD emesene-1.6.3.ebuild 1623 RMD160 b41308bafb61531d789fbb945f503ece59a8d05f SHA1 d459c21e4e585e7f7031b679782faaaaa68c36d7 SHA256 3223f711cd8900dbe79090379fcda6490c7781e6143a248870996229d5e30645
-EBUILD emesene-2.11.4.ebuild 1594 RMD160 84502f287910d32979d733112eac65b71dff52ba SHA1 45c1672acaf16a7daf1cb795561fec23963b0e0c SHA256 392db786ca91b06e311755278d40bab032f32b546392092daf046c1c505bfb23
-MISC ChangeLog 608 RMD160 f6432aa2ff8df9c521558cb9f067a788bfe4aaf3 SHA1 47276d021e8a14ac510ca12846d961b4ce60d7c8 SHA256 1b86bcfcb6fafd9ffbb7638d02db8944f2f6d59f58346dd9b6739110cad22660
+EBUILD emesene-2.11.5.ebuild 1801 RMD160 dc7f25b828257fe25426bff1d594b206cd059f88 SHA1 d4bfb63384172368e451795d8050cfee199a4f29 SHA256 661abaf7c85b2f0056c6bb44077ec9480a70b5cb37e6070fb74b5149d236f39f
+EBUILD emesene-9999.ebuild 1893 RMD160 c8b62a287fd56d12968f08e74cb0d807197372aa SHA1 f77b4ef2780bee5396caa458fc8e9c85aa8348a5 SHA256 7a1be2f7fd4d5cde9caaf0ce33d026bf65b1901773aafcdea410b71aa1823c8a
+MISC ChangeLog 939 RMD160 7cef778b8088106864581b9fbaa01d092bd983c3 SHA1 0968616f574783af41c611df6f34f5515007e79d SHA256 f667e8c39d334c8c6d14812420e26cdae29c73a31ad522f587c517ac7054b49f
 MISC metadata.xml 366 RMD160 810ab3caa1c28bb7773397b41d688fe6a57dbe2a SHA1 0a26167020b53c9b59adf6c4bf7e0ac66b19e1a9 SHA256 fcd8ee7cf3c58799e7e53ebedbdfa0978bf067b14affd07688737a9eb10097f3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQIcBAEBCgAGBQJN4jbfAAoJEPqDWhW0r/LC9K8P/RTsrboT/8bqS6e8V0E7f2nU
-Rq9skOX+lUmMFJnvMtWL3yaxdh0UVDxMHMosMQ3Nizmcc4JGA43HRhzdJuELMOHP
-HTJT5Jibe02obrbXBusKUl/zWfNH/D0YXLIOBudtawIbYMCNNCBWDjeUgX4RAZue
-03fyQYgqat068FSs+3jcvs9dPmd/V+5/AY2ErAbwJ73L1bOSkYpvHQAKumEuYNVw
-OQUlKwGjkCpMyDwcGPsX888caUHnaFhElMWbda5OViBxLQkKRJL9ZiMKQgQiuJYz
-Wf6cQ0lbmn6WAV4fnPDiHyNgj6tdNALolFpLvh+Beh9YYEuhq459UcPjdvtAVh0S
-nKnKZlwCXCAFCIt5oYdH1hmeD26jmlHllnuCnUN/S9bMnNk4Cc3SnI6xKrnYbkdT
-BKKQFi5MqUcmYWZ+YDsbh/hq2HRyxqCaAdA81QVrSSo291Wpyrdd9IZvPlBdqiNR
-LYtO/+zSv9RA9+TLSlK6RcQDqXm0Z/lOKm/a+WXKhOQlq1/60j5Cp0HSpUJPJed/
-IDHUtPIblf0FSmJ5P8Uwgvleoy9KT3QYhFVbpd05FLdADpglLpZnjB0BDobnrv4A
-t13bPv50Qjb19WXTOyAyCe+5gKzTKyR8ETVJeEnE6xG4YaAU9OuqQXXuI+4tbN5n
-fJar4/lUXWPMSgSR3IzR
-=5qac
+iQIcBAEBCgAGBQJN49qBAAoJEPqDWhW0r/LCVX8P/0dRPZhfAmVoybNucqeYMfOW
+OQqL/mg71vS65Nr3IOmP2tslY259lTw8UY+bouTHk6NMm+4fZgCaQmUuudqPccOt
+uI+CHeP5jdiLt6zGyNeQUqdraiyBoA8hxcVhEv0pEDGJLiwEohP+WXShzGfWxR0d
+4D9LPUTTz5M+sDGgNFWaynhRxNP3Hhzz8Ab16TJ95vhCC+WEknMZkCxs+C7K1qVL
+TC/03STWUlkRqh7/Q0jYfies5Q6bephuj/x4v4giA2TgvhmMTCtBwCnqx01u5qrt
+DzfqjUzeaKXiJu6CA0rHV0tjfOB0FwDOtgULS6/FaU9NlI3hyJhy0qYMBRcfBBpD
+UqGIDSTyDfqmnmdEU/xBEnplgPXy7k0wEd1va2466gOk6/GEXZDe5r9/M+lzeYNZ
+q7FcztMzkUJ+PyERCbCrbrigRd4zLPWsxFkkv7HZrVjsVxlAeEC57oI8incPeTRR
+TKZITvmRH3Fk1hCLl18Lsrhiypgu4wgm3jvjwgm2O56OjCIcLhfTOfx2lezuOytt
+zbcBSKFdCOHrwUSiyaSjhXjoNqK3TQT3KDrpcwEDGux10xWsRAo+F4LK4VgETYON
+rjm5yROVJ8Vz+aPLJFLN2dCW80pqUAay4a/L5AKCNm9Nkd/Q/ZhtAGCTmTJ38wYP
+hLeFdJDrs2+qK8B0Fje3
+=i+8u
 -----END PGP SIGNATURE-----
diff --git a/net-im/emesene/emesene-2.11.4.ebuild b/net-im/emesene/emesene-2.11.5.ebuild
index a4805727f3fa..b753f06ea53c 100644
--- a/net-im/emesene/emesene-2.11.4.ebuild
+++ b/net-im/emesene/emesene-2.11.5.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-im/emesene/emesene-2.11.4.ebuild,v 1.1 2011/05/29 12:06:54 hwoarang Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-im/emesene/emesene-2.11.5.ebuild,v 1.1 2011/05/30 17:56:47 hwoarang Exp $
 
 EAPI="3"
 PYTHON_DEPEND="2"
@@ -8,11 +8,15 @@ PYTHON_USE_WITH="sqlite"
 SUPPORT_PYTHON_ABIS="1"
 RESTRICT_PYTHON_ABIS="3.*"
 
+EMESENE_COMMIT="5cf77b3"
+GIT_COMMIT="5c6aad"
+
+MY_P="${PN}-${PN}-v${PV}-0-gb${GIT_COMMIT}"
 inherit distutils eutils
 
 DESCRIPTION="Platform independent MSN Messenger client written in Python+GTK"
 HOMEPAGE="http://www.emesene.org"
-SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${P}.tar.gz"
+SRC_URI="http://dev.gentoo.org/~hwoarang/distfiles/${MY_P}.tar.gz"
 
 LICENSE="|| ( GPL-2 GPL-3 LGPL-3 )"
 SLOT="2"
@@ -24,15 +28,19 @@ RDEPEND="dev-python/pygtk:2
 	dev-python/notify-python
 	jabber? ( dev-python/xmpppy )"
 
+S="${WORKDIR}/${PN}-${PN}-${EMESENE_COMMIT}"
+
 src_prepare() {
 	# do not import dummy session
-	sed -i -e  "/import e3dummy/d" ${PN}.py
+	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
+		${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
+		${PN}/data/share/applications/${PN}.desktop || die
+	epatch "${FILESDIR}"/${P}-svgfix.patch
+
 	distutils_src_prepare
 }
 
diff --git a/net-im/emesene/emesene-9999.ebuild b/net-im/emesene/emesene-9999.ebuild
new file mode 100644
index 000000000000..e016e68c26aa
--- /dev/null
+++ b/net-im/emesene/emesene-9999.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2011 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.1 2011/05/30 17:56:47 hwoarang Exp $
+
+EAPI="3"
+PYTHON_DEPEND="2"
+PYTHON_USE_WITH="sqlite"
+SUPPORT_PYTHON_ABIS="1"
+RESTRICT_PYTHON_ABIS="3.*"
+EGIT_REPO_URI="git://github.com/emesene/emesene.git"
+
+inherit distutils eutils git
+
+DESCRIPTION="Platform independent MSN Messenger client written in Python+GTK"
+HOMEPAGE="http://www.emesene.org"
+
+LICENSE="|| ( GPL-2 GPL-3 LGPL-3 )"
+SLOT="2"
+KEYWORDS=""
+IUSE="jabber"
+
+RDEPEND="dev-python/pygtk:2
+	dev-python/papyon
+	dev-python/notify-python
+	jabber? ( dev-python/xmpppy )"
+
+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() {
+	ewarn
+	ewarn "${PN}-2 is on early stages of development."
+	ewarn "Please do not file bugs on Gentoo buzilla"
+	ewarn "unless you have problems with the ebuild."
+	ewarn "Use the upstram bug tracker to report bugs:"
+	ewarn
+	ewarn "https://github.com/emesene/emesene/issues"
+}
diff --git a/net-im/emesene/files/emesene-2.11.5-svgfix.patch b/net-im/emesene/files/emesene-2.11.5-svgfix.patch
new file mode 100644
index 000000000000..20a2a1e1da85
--- /dev/null
+++ b/net-im/emesene/files/emesene-2.11.5-svgfix.patch
@@ -0,0 +1,13 @@
+Index: emesene-emesene-5cf77b3/setup.py
+===================================================================
+--- emesene-emesene-5cf77b3.orig/setup.py
++++ emesene-emesene-5cf77b3/setup.py
+@@ -105,7 +105,7 @@ if os.name == "nt":
+ else:
+     # Data files to be installed to the system
+     _data_files = [
+-        ("share/icons/scalable/apps", ["emesene/data/icons/scalable/apps/emesene.svg"]),
++        ("share/icons/hicolor/scalable/apps", ["emesene/data/icons/hicolor/scalable/apps/emesene.svg"]),
+         ("share/icons/hicolor/16x16/apps", ["emesene/data/icons/hicolor/16x16/apps/emesene.png"]),
+         ("share/icons/hicolor/22x22/apps", ["emesene/data/icons/hicolor/22x22/apps/emesene.png"]),
+         ("share/icons/hicolor/24x24/apps", ["emesene/data/icons/hicolor/24x24/apps/emesene.png"]),