Merge branch 'master' of ssh://parabolagnulinux.org:1863/srv/git/abslibre

4 files changed, 45 insertions, 156 deletions

diff --git a/~fauno/notmuch/PKGBUILD b/~fauno/notmuch/PKGBUILD
deleted file mode 100755
index 58599073c..000000000
--- a/~fauno/notmuch/PKGBUILD
+++ /dev/null
@@ -1,76 +0,0 @@
-# Maintainer: fauno <fauno at kiwwwi.com.ar>
-# Maintainer: Olivier Ramonat <olivier at ramonat dot fr>
-# Maintainer: Richard Murri <admin@richardmurri.com>
-
-pkgname=notmuch
-pkgver=0.14
-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' 'talloc')
-makedepends=('python2' 'python' 'emacs' 'gnupg' 'ruby' 'pkgconfig')
-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')
-options=(!distcc !makeflags)
-
-source=("http://notmuchmail.org/releases/${pkgname}-${pkgver}.tar.gz")
-
-build() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-
-  ./configure --prefix=/usr --sysconfdir=/etc
-  make 
-
-  cd bindings/ruby
-  ruby extconf.rb
-  make
-
-  cp -r $srcdir/${pkgname}-${pkgver}/bindings/python{,2}
-
-  cd $srcdir/${pkgname}-${pkgver}/bindings/python
-  env LD_LIBRARY_PATH="." python setup.py build
-
-  cd $srcdir/${pkgname}-${pkgver}/bindings/python2
-  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,'
-  env LD_LIBRARY_PATH="." python2 setup.py build
-}
-
-check() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-  make test
-}
-
-package(){
-  cd "$srcdir/${pkgname}-${pkgver}"
-  make DESTDIR="$pkgdir/" LIBDIR_IN_LDCONFIG=0 install
-
-  install -D notmuch $pkgdir/usr/sbin/notmuch
-
-  mkdir -p $pkgdir/usr/share/vim/vimfiles/{plugin,syntax}
-
-  cd vim && make PREFIX="$pkgdir/usr/share/vim/vimfiles" install
-
-  # Install python bindings
-
-  cd $srcdir/${pkgname}-${pkgver}/bindings/python2
-  env LD_LIBRARY_PATH="." python2 setup.py install --prefix=/usr --root=$pkgdir
-
-  cd $srcdir/${pkgname}-${pkgver}/bindings/python
-  env LD_LIBRARY_PATH="." python 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
-
-# Remove conflicting zsh completion
-  rm -r ${pkgdir}/usr/share/zsh
-}
-md5sums=('5eb3f225d3eb37862932f6baa5780d15')
diff --git a/~fauno/notmuch/SRCBUILD b/~fauno/notmuch/SRCBUILD
deleted file mode 100755
index 29a3a945f..000000000
--- a/~fauno/notmuch/SRCBUILD
+++ /dev/null
@@ -1,39 +0,0 @@
-# Maintainer: Nicolás Reynolds <fauno@parabola.nu>
-
-pkgname=notmuch
-pkgver=0.11.1
-pkgrel=1
-pkgdesc="Notmuch is not much of an email program"
-arch=('any')
-url="http://notmuchmail.org/"
-license=('GPL3')
-makedepends=('git')
-
-_gitroot="git://notmuchmail.org/git/notmuch"
-_gitname="${pkgname}"
-
-build() {
-  cd "$srcdir"
-  msg 'Connecting to GIT server...'
-
-  if [ -d $_gitname ] ; then
-    cd $_gitname; git pull origin
-    msg 'The local files are updated.'
-  else
-    git clone $_gitroot $_gitname
-  fi
-
-  msg "GIT checkout done or server timeout"
-
-} 
-
-package() {
-    cd ${pkgdir}
-    export PKGDEST=${SRCDEST}
-    export PKGEXT=.src.tar.xz
-
-    git clone ${srcdir}/${pkgname} ${pkgname}-${pkgver}
-
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/~fauno/pandoc/PKGBUILD b/~fauno/pandoc/PKGBUILD
index 3d7d1fa9f..d3b88d3a0 100755
--- a/~fauno/pandoc/PKGBUILD
+++ b/~fauno/pandoc/PKGBUILD
@@ -4,8 +4,8 @@
 # Run `makepkg -srp SRCBUILD` if you want to update the source tarball
 
 pkgname=pandoc
-pkgver=1.9.4.2
-pkgrel=2
+pkgver=1.9.4.5
+pkgrel=3
 pkgdesc='Conversion between markup formats (no Haskell libs)'
 url='http://johnmacfarlane.net/pandoc/'
 license=('GPL')
@@ -15,53 +15,54 @@ options=(strip !makeflags !distcc)
 source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-$pkgrel-any.src.tar.xz{,.sig} SRCBUILD)
 conflicts=('haskell-pandoc')
 optdepends=('texlive-most: for pdf creation')
-md5sums=('15f522c6bd0e26c709579b0a0fcfdcea'
-         'e86da5aad2a7dfc6d53d2a2a0c562baa'
-         '415bbf263863c5cbc7c672ec1f497893')
 
 # PKGBUILD functions
 build() {
     mkdir -p ${srcdir}/{build,${pkgname}-${pkgver}}
     cd ${srcdir}/${pkgname}-${pkgver}
 
-    for _hkpkg in $(grep -v ${pkgname}-${pkgver} BUILDORDER); do
-        pushd ${srcdir}/${pkgname}-${pkgver}/${_hkpkg}
-
-        HOME=${srcdir}/${pkgname}-${pkgver} \
-        cabal install --flags="embed_data_files" --prefix=${srcdir}/build/usr
-
-        popd
-    done
-
-    cd ${srcdir}/${pkgname}-${pkgver}/${pkgname}-${pkgver}
-
-   HOME=${srcdir}/${pkgname}-${pkgver} \
-   cabal configure --prefix=/usr --libdir=${srcdir}/build/usr/lib --flags="-library embed_data_files"
-   HOME=${srcdir}/${pkgname}-${pkgver} \
-   cabal build
+   while read _hkpkg; do
+       pushd ${srcdir}/${pkgname}-${pkgver}/${_hkpkg} >/dev/null
+
+       extra="--prefix=${srcdir}/build/usr"
+       case $_hkpkg in
+        $pkgname-$pkgver)
+          extra="--flags=\"executable -library\" --prefix=/usr --libdir=${srcdir}/build/usr/lib -v" ;;
+        citeproc-hs-*)
+          extra="--flags=\"embed_data_files\" --prefix=${srcdir}/build/usr -v" ;;
+       esac
+
+       msg2 "Configuring $_hkpkg with $extra"
+       if [ "$_hkpkg" != "$pkgname-$pkgver" ]; then
+         HOME=${srcdir}/${pkgname}-${pkgver} \
+         cabal install $extra
+       else 
+         HOME=${srcdir}/${pkgname}-${pkgver} \
+         cabal configure $extra
+         HOME=${srcdir}/${pkgname}-${pkgver} \
+         cabal build
+       fi
+
+       popd >/dev/null
+   done <BUILDORDER
 
 }
 
 package() {
+  cd ${srcdir}/${pkgname}-${pkgver}/${pkgname}-${pkgver}
 
-   cd ${srcdir}/${pkgname}-${pkgver}/${pkgname}-${pkgver}
+  runghc Setup.hs copy --destdir=${pkgdir}/
 
-   runghc Setup.hs copy --destdir=${pkgdir}/
+  msg2 "Removing lib files..."
+  rm -rfv ${pkgdir}/build
 
 # EC is unfree and makes Parabola TeXLive cry
 # besides, it's unneeded
-   sed "/fontenc/d" -i ${pkgdir}/usr/share/${pkgname}-${pkgver}/templates/default.latex
-
-#   runghc Setup.hs configure --prefix=DIR --bindir=DIR --libdir=DIR \
-#   --datadir=DIR --libsubdir=DIR --datasubdir=DIR --docdir=DIR \
-#   --htmldir=DIR --program-prefix=PREFIX --program-suffix=SUFFIX \
-#   --mandir=DIR --flags=FLAGSPEC
-
-# Copy everything, but remove docs and haskell-libs
-#   rm -r ${pkgdir}/usr/{lib,share/*}
+  sed "/fontenc/d" -i ${pkgdir}/usr/share/${pkgname}-${pkgver}/templates/default.latex
 
-#   cp -a ${srcdir}/build/usr/share/man ${pkgdir}/usr/share/
-#   cp -a ${srcdir}/build/usr/share/doc ${pkgdir}/usr/share/
-    find ${pkgdir}/usr/share -type f -exec chmod 644 {} \;
-    find ${pkgdir}/usr/share -type d -exec chmod 755 {} \;
+  find ${pkgdir}/usr/share -type f -exec chmod 644 {} \;
+  find ${pkgdir}/usr/share -type d -exec chmod 755 {} \;
 }
+md5sums=('912abc4574aea3c5203eff1b02ceafa9'
+         '7ac798d62f253535a2e194af5aa1c3c3'
+         'e632f8c06be8284e17329a5d1c459e3b')
diff --git a/~fauno/pandoc/SRCBUILD b/~fauno/pandoc/SRCBUILD
index 29c5f25ae..ebe1a0552 100755
--- a/~fauno/pandoc/SRCBUILD
+++ b/~fauno/pandoc/SRCBUILD
@@ -2,14 +2,17 @@
 # Based on haskell-pandoc
 
 pkgname=pandoc
-pkgver=1.9.4.2
-pkgrel=2
+pkgver=1.9.4.5
+# 0.3.6 fails with embed_data_files
+_citeproc=0.3.5
+pkgrel=3
 pkgdesc='Conversion between markup formats (no Haskell libs)'
 url='http://johnmacfarlane.net/pandoc/'
 license=('GPL')
 arch=('any')
 makedepends=('ghc' 'sh' 'cabal-install')
 source=()
+options=(!strip)
 
 # PKGBUILD functions
 build() {
@@ -20,22 +23,22 @@ build() {
     cabal --verbose=3 update
 
     HOME=${srcdir}/${pkgname}-${pkgver} \
-    cabal --verbose=3 fetch file-embed ${pkgname}-${pkgver}
+    cabal --verbose=3 fetch file-embed citeproc-hs-${_citeproc} ${pkgname}-${pkgver}
 
     msg2 "Getting the dependency build order"
 # Ignore the cabal messages
     HOME=${srcdir}/${pkgname}-${pkgver} \
-    cabal install --dry-run file-embed ${pkgname}-${pkgver} | tail -n+3 >> BUILDORDER
+    cabal install --dry-run file-embed citeproc-hs-${_citeproc} ${pkgname}-${pkgver} | grep "\-[0-9]\+" >>BUILDORDER 
 }
 
 package() {
   export PKGEXT=.src.tar.xz
-  export PKGDEST=${startdir}
+  export PKGDEST=${SRCDEST}
 
   mkdir -p ${pkgdir}/${pkgname}-${pkgver}
   cd ${pkgdir}/${pkgname}-${pkgver}
 
-  find ${srcdir} -iname '*.tar.?z' -a \! -iname '00-index.tar.gz' -exec \
+  find ${srcdir}/${pkgname}-${pkgver} -iname '*.tar.?z' -a \! -iname '00-index.tar.gz' -exec \
       bsdtar xvf '{}' \;
 
   cp ${srcdir}/${pkgname}-${pkgver}/BUILDORDER .