3 files changed, 33 insertions, 47 deletions
diff --git a/abs/extra/mercurial/ChangeLog b/abs/extra/mercurial/ChangeLog
deleted file mode 100644
index cea6101..0000000
--- a/abs/extra/mercurial/ChangeLog
+++ /dev/null
@@ -1,21 +0,0 @@
-
-2009-03-05  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 1.2
-
-2009-01-03  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 1.1.2
-
-2008-12-02  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 1.1
-
-2008-08-17  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 1.0.2
-
-2008-07-10  Douglas Soares de Andrade  <douglas@archlinux.org>
-
-	* Updated for i686: 1.0.1
-
diff --git a/abs/extra/mercurial/PKGBUILD b/abs/extra/mercurial/PKGBUILD
index 08d38e3..0ce6012 100644
--- a/abs/extra/mercurial/PKGBUILD
+++ b/abs/extra/mercurial/PKGBUILD
@@ -1,35 +1,41 @@
-# $Id: PKGBUILD 29080 2009-03-05 10:10:06Z douglas $
-# Contributor: Jeff Mickey <jeff@archlinux.org>
-# Contributor: Giovanni Scafora <linuxmania@gmail.com>
-# Contributor: David 'SleepyDog' <goodluv@gmail.com>
-# Maintainer: Douglas Soares de Andrade <douglas@archlinux.org>
+# $Id: PKGBUILD 97863 2010-11-02 05:48:54Z giovanni $
+# Maintainer: Giovanni Scafora <giovanni@archlinux.org>
+# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=mercurial
-pkgver=1.2
+pkgver=1.7
 pkgrel=1
 pkgdesc="A scalable distributed SCM tool"
-url="http://www.selenic.com/mercurial"
-license=("GPL")
-depends=('python>=2.6')
-source=(http://www.selenic.com/mercurial/release/$pkgname-$pkgver.tar.gz)
 arch=('i686' 'x86_64')
+url="http://www.selenic.com/mercurial"
+license=('GPL')
+depends=('python2')
+optdepends=('tk: for the hgk GUI')
+source=(http://www.selenic.com/mercurial/release/${pkgname}-${pkgver}.tar.gz
+        mercurial.profile)
+md5sums=('698948ff128d265db55bee8149445556'
+         '43e1d36564d4c7fbe9a091d3ea370a44')
 
 build() {
-    cd $startdir/src/$pkgname-$pkgver
-    python setup.py install --root $startdir/pkg
-    
-    install -d $startdir/pkg/usr/share/man/{man1,man5}
-    install -m644 doc/hg.1 $startdir/pkg/usr/share/man/man1
-    install -m644 doc/{hgrc.5,hgignore.5} $startdir/pkg/usr/share/man/man5
-    install -m755 contrib/hgk $startdir/pkg/usr/bin
-    install -m644 -D contrib/zsh_completion $startdir/pkg/usr/share/zsh/site-functions/_hg
-    install -m644 -D contrib/bash_completion $startdir/pkg/etc/bash_completion.d/hg 
-    install -d $startdir/pkg/usr/share/emacs/site-lisp
-    install -m644 contrib/{mq.el,mercurial.el} $startdir/pkg/usr/share/emacs/site-lisp
-    install -m644 -D contrib/vim/HGAnnotate.vim $startdir/pkg/usr/share/vim/syntax/HGAnnotate.vim
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  python2 setup.py install --root="${pkgdir}/" --optimize=1 || return 1
+
+  #sed -i -e 's#env python#env python2#' \
+  #  "${pkgdir}"/usr/lib/python2.7/site-packages/mercurial/lsprof.py
+
+  install -d ${pkgdir}/usr/share/man/{man1,man5}
+  install -m644 doc/hg.1 "${pkgdir}/usr/share/man/man1" || return 1
+  install -m644 doc/{hgrc.5,hgignore.5} "${pkgdir}/usr/share/man/man5" || return 1
+  install -m755 contrib/hgk "${pkgdir}/usr/bin" || return 1
+  install -m644 -D contrib/zsh_completion "${pkgdir}/usr/share/zsh/site-functions/_hg" || return 1
+  install -m644 -D contrib/bash_completion "${pkgdir}/etc/bash_completion.d/hg" || return 1
+  install -d "${pkgdir}/usr/share/emacs/site-lisp"
+  install -m644 contrib/{mq.el,mercurial.el} "${pkgdir}/usr/share/emacs/site-lisp" || return 1
+
+  vimpath="${pkgdir}/usr/share/vim/vimfiles"
+  install -Dm644 contrib/vim/HGAnnotate.vim "${vimpath}/syntax/HGAnnotate.vim" || return 1
 
-    # Autoloading plugins to vim = no good.  
-    #  install -d $startdir/pkg/usr/share/vim/plugin
-    #  install -m644 contrib/vim/{hg-menu.vim,hgcommand.vim,patchreview.vim} $startdir/pkg/usr/share/vim/plugin
+  # set some variables
+  install -m755 -d ${pkgdir}/etc/profile.d
+  install -m755 ${srcdir}/mercurial.profile "${pkgdir}/etc/profile.d/mercurial.sh" || return 1
 }
-md5sums=('ac9d16b078f99f7a89d6865421570f05')
diff --git a/abs/extra/mercurial/mercurial.profile b/abs/extra/mercurial/mercurial.profile
new file mode 100644
index 0000000..fc96182
--- /dev/null
+++ b/abs/extra/mercurial/mercurial.profile
@@ -0,0 +1 @@
+export HG=/usr/bin/hg