Merge branch 'master' of ssh://vparabola/home/parabola/abslibre-pre-mips64el

Conflicts:
	libre/abs-libre/PKGBUILD
	libre/icecat/PKGBUILD
	libre/libretools/PKGBUILD
	libre/linux-libre/PKGBUILD
	libre/mplayer-libre/PKGBUILD
	libre/pacman/0001-makepkg-fix-removing-symbolic-link.patch
	libre/pacman/PKGBUILD
	libre/python2-libre/PKGBUILD

4 files changed, 65 insertions, 52 deletions

diff --git a/~fauno/notmuch/PKGBUILD b/~fauno/notmuch/PKGBUILD
index 985df1189..138325de4 100644
--- a/~fauno/notmuch/PKGBUILD
+++ b/~fauno/notmuch/PKGBUILD
@@ -4,24 +4,30 @@
 
 pkgname=notmuch
 pkgver=0.7
-pkgrel=1
+pkgrel=2
 pkgdesc="Notmuch is not much of an email program"
 arch=(i686 x86_64 mips64el)
 url="http://notmuchmail.org/"
 license=('GPL3')
 depends=('xapian-core' 'gmime')
-makedepends=('talloc' 'python2' 'emacs-nox' 'gnupg')
+makedepends=('talloc' 'python2' 'emacs-nox' 'gnupg' 'ruby')
 optdepends=('emacs: for using the emacs interface'
             'vim: for using the vim interface'
             'python2: for using the python bindings'
+            'ruby: for using the ruby bindings'
             'gnupg: for email encryption')
 source=("http://notmuchmail.org/releases/${pkgname}-${pkgver}.tar.gz")
+md5sums=('475197e505255b9603eedb53a68aa32d')
 
 build() {
   cd "$srcdir/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr --sysconfdir=/etc
   make 
+
+  cd bindings/ruby
+  ruby extconf.rb
+  make
 }
 
 check() {
@@ -46,8 +52,12 @@ package(){
   find "." -name '*.py' -print0 |xargs -0 \
       sed -i -e 's,^#!/usr/bin/env python$,#!/usr/bin/env python2,' \
       -e 's,^#!/usr/bin/python$,#!/usr/bin/python2,'
-  ln -s ../../lib/libnotmuch.so.1 libnotmuch.so.1
+#  ln -s ../../lib/libnotmuch.so.1 libnotmuch.so.1
   env LD_LIBRARY_PATH="." python2 setup.py build
   env LD_LIBRARY_PATH="." python2 setup.py install --prefix=/usr --root=$pkgdir
+
+# Install ruby bindings
+  cd "$srcdir/${pkgname}-${pkgver}/bindings/ruby"
+  sed -i -e 's,/site_ruby,,g' Makefile
+  make prefix=${pkgdir}/usr install
 }
-md5sums=('475197e505255b9603eedb53a68aa32d')
diff --git a/~fauno/transmission-remote-cli-git/PKGBUILD b/~fauno/transmission-remote-cli-git/PKGBUILD
deleted file mode 100644
index 3e513edd7..000000000
--- a/~fauno/transmission-remote-cli-git/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# Maintainer: fauno <fauno@kiwwwi.com.ar>
-pkgname=transmission-remote-cli-git
-pkgver=20110623
-pkgrel=1
-pkgdesc="Curses interface for the daemon of the BitTorrent client Transmission"
-arch=('any')
-url="http://github.com/fagga/transmission-remote-cli"
-license=('GPL3')
-depends=('python2')
-optdepends=('adns-python: Resolve IPs to host names'
-            'python-geoip: Guess which country peers come from')
-makedepends=('git')
-provides=('transmission-remote-cli')
-conflicts=('transmission-remote-cli')
-install=
-source=(python2.patch)
-
-_gitroot="http://github.com/fagga/transmission-remote-cli.git"
-_gitname="transmission-remote-cli"
-
-build() {
-    cd "$srcdir"
-    msg "Connecting to the GIT repository..."
-
-    if [ -d "$srcdir/$_gitname" ] ; then
-        cd $_gitname && git pull origin
-        msg "The local files are updated."
-    else
-        git clone $_gitroot
-    fi
-
-  rm -rf "$srcdir/$_gitname-build"
-  git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
-  cd "$srcdir/$_gitname-build"
-
-    msg "GIT checkout done or server timeout"
-    msg "Starting make..."
-
-    cd $srcdir/$_gitname-build
-
-    patch -Np1 -i ${srcdir}/python2.patch
-
-	install -d $pkgdir/usr/bin/
-	install -D transmission-remote-cli.py $pkgdir/usr/bin/transmission-remote-cli
-
-}
-
-md5sums=('6273609fb3a7294328aeaa526b76411c')
diff --git a/~fauno/transmission-remote-cli/PKGBUILD b/~fauno/transmission-remote-cli/PKGBUILD
new file mode 100644
index 000000000..9a93c431f
--- /dev/null
+++ b/~fauno/transmission-remote-cli/PKGBUILD
@@ -0,0 +1,51 @@
+# Maintainer: fauno <fauno@kiwwwi.com.ar>
+pkgname=transmission-remote-cli
+pkgver=20110901
+pkgrel=2
+pkgdesc="Curses interface for the daemon of the BitTorrent client Transmission"
+arch=('any')
+url="http://github.com/fagga/transmission-remote-cli"
+license=('GPL3')
+depends=('python2')
+optdepends=('adns-python: Resolve IPs to host names'
+            'python-geoip: Guess which country peers come from')
+makedepends=('git')
+conflicts=('transmission-remote-cli-git')
+replaces=('transmission-remote-cli-git')
+source=(http://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.gz
+        python2.patch)
+md5sums=('1a087e384b413577f9d49917fd8eaab5'
+         '6273609fb3a7294328aeaa526b76411c')
+
+_gitroot="http://github.com/fagga/transmission-remote-cli.git"
+_gitname="transmission-remote-cli"
+
+mksource() {
+    echo "Connecting to the GIT repository..."
+
+    if [ -d "$_gitname" ] ; then
+        pushd $_gitname && git pull origin
+        echo "The local files are updated."
+        popd
+    else
+        git clone $_gitroot
+    fi
+
+    echo "GIT checkout done or server timeout"
+
+    tar czf ${pkgname}-$(date +%Y%m%d).tar.gz ${_gitname}/
+}
+
+build() {
+    cd "${srcdir}/${_gitname}"
+    msg "Starting make..."
+
+    patch -Np1 -i ${srcdir}/python2.patch
+
+	install -d $pkgdir/usr/bin/
+	install -D transmission-remote-cli.py $pkgdir/usr/bin/transmission-remote-cli
+
+}
+
+md5sums=('df3cdde879275fbffb1af17872e9c860'
+         '6273609fb3a7294328aeaa526b76411c')
diff --git a/~fauno/transmission-remote-cli-git/python2.patch b/~fauno/transmission-remote-cli/python2.patch
index 256b676f0..256b676f0 100644
--- a/~fauno/transmission-remote-cli-git/python2.patch
+++ b/~fauno/transmission-remote-cli/python2.patch