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

(Portage version: 2.1.9.49/cvs/Linux x86_64)

4 files changed, 101 insertions, 6 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/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"]),