Mon Jun 13 19:04:06 UTC 2011

3 files changed, 34 insertions, 23 deletions

diff --git a/community/emesene/PKGBUILD b/community/emesene/PKGBUILD
index 38a900af3..469adf4b8 100755
--- a/community/emesene/PKGBUILD
+++ b/community/emesene/PKGBUILD
@@ -2,47 +2,57 @@
 # Contributor: Claudio Riva <firetux83@gmail.com>
 
 pkgname=emesene
-pkgver=1.6.3
-pkgrel=4
+pkgver=2.11.5
+pkgrel=1
 pkgdesc="A pygtk MSN Messenger client"
 url="http://www.emesene.org/"
 license=('custom:PSF' 'GPL' 'LGPL2.1')
 arch=('i686' 'x86_64') # libmimic is hardcoded, so no 'any' package
-depends=('python2' 'pygtk' 'hicolor-icon-theme' 'xdg-utils')
+#depends=('python2' 'pygtk' 'hicolor-icon-theme' 'xdg-utils')
+depends=('python2' 'pygtk' 'python-dnspython' 'pylint' 'python-notify' 'openssl' \
+'papyon' 'python-imaging' 'dbus-python' 'xdg-utils' 'hicolor-icon-theme')
+makedepends=('python2-distribute')
 optdepends=('gnome-python-extras: spell-check plugin'
 	'gtkspell: spell-check plugin'
 	'aspell: spell-check plugin (also need aspell dictionary)'
 	'gstreamer0.10-python: webcam support'
-	'gstreamer0.10-good-plugins: webcam support')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-$pkgver.tar.gz \
-	'emesene.run' 'setup.patch')
+	'gstreamer0.10-good-plugins: webcam support'
+	'pywebkitgtk: for alternative conversation window' 
+        'xmpppy: for gtalk and facebook chat support'
+	'pyqt: alternative qt4 interface (emesene -e main:qt4_main')
+source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.gz" \
+	'emesene.run')
 install=emesene.install
 options=('!libtool')
-sha1sums=('c4759efe180c8e1589bd966c6b84106aa7cd356e'
-          '46dcc89d089c0356d121356aa2ffff45e4468138'
-          '0195898a6cb609f4ad736e0687bf76641f6db537')
+sha1sums=('54e5fe81e99ddf5909b50c1c4f938480ed43f691'
+          '2d72b485875803d4675d1e1b36c90778e4475651')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
-  # python2 fix
-  sed -i 's_#!/usr/bin/env python_#!/usr/bin/env python2_' Controller.py
-
-  # enable installing in setup.py
-  patch -Np0 -i ${srcdir}/setup.patch
-
-  # install license files
-  install -Dm644 COPYING ${pkgdir}/usr/share/licenses/emesene/COPYING
-  install -Dm644 PSF ${pkgdir}/usr/share/licenses/emesene/PSF
+  # do not import dummy session
+  #  sed -i -e  "/import dummy/d" emesene/emesene.py
 
   # install files
+  export PYTHONPATH="${pkgdir}/usr/lib/python2.7/site-packages/"
+  install -d ${pkgdir}/usr/lib/python2.7/site-packages/
   python2 setup.py install --prefix=${pkgdir}/usr
+}
+
+package() {
+  cd ${pkgdir}
 
   # use /usr/share/emesene instead of /usr/lib/python2.5/site-packages
-  mv -f ${pkgdir}/usr/lib/python2.7/site-packages $pkgdir/usr/share/emesene
+  mv -f ${pkgdir}/usr/lib/python2.7/site-packages/emesene-2.0-py2.7.egg/share \
+        ${pkgdir}/usr
+  mv -f ${pkgdir}/usr/lib/python2.7/site-packages/emesene-2.0-py2.7.egg/emesene \
+        ${pkgdir}/usr/share
   rm -rf ${pkgdir}/usr/lib
 
-  # remove old executable and use our own because we use /usr/share/emesene
-  rm ${pkgdir}/usr/bin/emesene
+  # python -> python2 
+  find -name *.py -exec sed -i "s|/usr/bin/env python|/usr/bin/env python2|" {} \;
+
+  # create executable
   install -Dm755 ${srcdir}/emesene.run ${pkgdir}/usr/bin/emesene
 }
+
diff --git a/community/emesene/emesene.install b/community/emesene/emesene.install
index 309ea10a5..9ff2df7f8 100644
--- a/community/emesene/emesene.install
+++ b/community/emesene/emesene.install
@@ -1,5 +1,6 @@
 post_install() {
-        xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+  update-desktop-database -q
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
 }
 
 post_upgrade() {
diff --git a/community/emesene/emesene.run b/community/emesene/emesene.run
index 35d9dbfa3..3b0aacdf9 100644
--- a/community/emesene/emesene.run
+++ b/community/emesene/emesene.run
@@ -1,3 +1,3 @@
 #!/bin/bash
-python2 /usr/share/emesene/Controller.py $@
+python2 /usr/share/emesene/emesene.py $@