Merge branch 'master' of ssh://gparabola/srv/git/abslibre

51 files changed, 170 insertions, 62 deletions

diff --git a/~fauno/afew/LICENSE b/~fauno/afew/LICENSE
index aab8c3624..aab8c3624 100644..100755
--- a/~fauno/afew/LICENSE
+++ b/~fauno/afew/LICENSE
diff --git a/~fauno/afew/PKGBUILD b/~fauno/afew/PKGBUILD
index c03ccc7c8..1256ad4d3 100644..100755
--- a/~fauno/afew/PKGBUILD
+++ b/~fauno/afew/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Kazuo Teramoto <kaz.rag at gmail.com>
 pkgname=afew
-pkgver=2011.12.1
-_gitver=20111222
+pkgver=2012.07.11
+_gitver=20120711
 pkgrel=1
 pkgdesc="afew is an initial tagging script for notmuch mail"
 arch=(any)
@@ -25,5 +25,5 @@ package() {
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('e99de6dc7390e22701fa60cfed1a52b8'
+md5sums=('99e501fb8f99ec58eccf8c08d572dab2'
          '295b245540aa61538f9a3556c4be846c')
diff --git a/~fauno/afew/SRCBUILD b/~fauno/afew/SRCBUILD
index eea293021..0ac3b5d75 100644..100755
--- a/~fauno/afew/SRCBUILD
+++ b/~fauno/afew/SRCBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Kazuo Teramoto <kaz.rag at gmail.com>
 pkgname=afew
-pkgver=20111222
+pkgver=20120711
 pkgrel=1
 pkgdesc="afew is an initial tagging script for notmuch mail"
 arch=(any)
diff --git a/~fauno/bibutils-dynamic/PKGBUILD b/~fauno/bibutils-dynamic/PKGBUILD
index cc8f371a6..cc8f371a6 100644..100755
--- a/~fauno/bibutils-dynamic/PKGBUILD
+++ b/~fauno/bibutils-dynamic/PKGBUILD
diff --git a/~fauno/dbacl/PKGBUILD b/~fauno/dbacl/PKGBUILD
index a92679444..a92679444 100644..100755
--- a/~fauno/dbacl/PKGBUILD
+++ b/~fauno/dbacl/PKGBUILD
diff --git a/~fauno/distccd-zeroconf/PKGBUILD b/~fauno/distccd-zeroconf/PKGBUILD
index 2faf6acb3..2faf6acb3 100644..100755
--- a/~fauno/distccd-zeroconf/PKGBUILD
+++ b/~fauno/distccd-zeroconf/PKGBUILD
diff --git a/~fauno/distccd-zeroconf/distccd.conf.d b/~fauno/distccd-zeroconf/distccd.conf.d
index 8f90cb503..8f90cb503 100644..100755
--- a/~fauno/distccd-zeroconf/distccd.conf.d
+++ b/~fauno/distccd-zeroconf/distccd.conf.d
diff --git a/~fauno/emerillon/PKGBUILD b/~fauno/emerillon/PKGBUILD
index 621ed04bb..621ed04bb 100644..100755
--- a/~fauno/emerillon/PKGBUILD
+++ b/~fauno/emerillon/PKGBUILD
diff --git a/~fauno/emerillon/emerillon.install b/~fauno/emerillon/emerillon.install
index 77c7018ea..77c7018ea 100644..100755
--- a/~fauno/emerillon/emerillon.install
+++ b/~fauno/emerillon/emerillon.install
diff --git a/~fauno/ethos/PKGBUILD b/~fauno/ethos/PKGBUILD
index f05c8fa8b..f05c8fa8b 100644..100755
--- a/~fauno/ethos/PKGBUILD
+++ b/~fauno/ethos/PKGBUILD
diff --git a/~fauno/geoclue/PKGBUILD b/~fauno/geoclue/PKGBUILD
index e370197c7..e370197c7 100644..100755
--- a/~fauno/geoclue/PKGBUILD
+++ b/~fauno/geoclue/PKGBUILD
diff --git a/~fauno/haskell-base64-bytestring/PKGBUILD b/~fauno/haskell-base64-bytestring/PKGBUILD
index 9943e7e15..9943e7e15 100644..100755
--- a/~fauno/haskell-base64-bytestring/PKGBUILD
+++ b/~fauno/haskell-base64-bytestring/PKGBUILD
diff --git a/~fauno/haskell-base64-bytestring/haskell-base64-bytestring.install b/~fauno/haskell-base64-bytestring/haskell-base64-bytestring.install
index 55a35b6d2..55a35b6d2 100644..100755
--- a/~fauno/haskell-base64-bytestring/haskell-base64-bytestring.install
+++ b/~fauno/haskell-base64-bytestring/haskell-base64-bytestring.install
diff --git a/~fauno/haskell-citeproc-hs/PKGBUILD b/~fauno/haskell-citeproc-hs/PKGBUILD
index 32f06094b..32f06094b 100644..100755
--- a/~fauno/haskell-citeproc-hs/PKGBUILD
+++ b/~fauno/haskell-citeproc-hs/PKGBUILD
diff --git a/~fauno/haskell-citeproc-hs/haskell-citeproc-hs.install b/~fauno/haskell-citeproc-hs/haskell-citeproc-hs.install
index 6bf4872f1..6bf4872f1 100644..100755
--- a/~fauno/haskell-citeproc-hs/haskell-citeproc-hs.install
+++ b/~fauno/haskell-citeproc-hs/haskell-citeproc-hs.install
diff --git a/~fauno/haskell-digest/PKGBUILD b/~fauno/haskell-digest/PKGBUILD
index 724a600af..724a600af 100644..100755
--- a/~fauno/haskell-digest/PKGBUILD
+++ b/~fauno/haskell-digest/PKGBUILD
diff --git a/~fauno/haskell-digest/haskell-digest.install b/~fauno/haskell-digest/haskell-digest.install
index 7aa8e0003..7aa8e0003 100644..100755
--- a/~fauno/haskell-digest/haskell-digest.install
+++ b/~fauno/haskell-digest/haskell-digest.install
diff --git a/~fauno/haskell-dlist/PKGBUILD b/~fauno/haskell-dlist/PKGBUILD
index 6b68c97c3..6b68c97c3 100644..100755
--- a/~fauno/haskell-dlist/PKGBUILD
+++ b/~fauno/haskell-dlist/PKGBUILD
diff --git a/~fauno/haskell-dlist/haskell-dlist.install b/~fauno/haskell-dlist/haskell-dlist.install
index f20fb2952..f20fb2952 100644..100755
--- a/~fauno/haskell-dlist/haskell-dlist.install
+++ b/~fauno/haskell-dlist/haskell-dlist.install
diff --git a/~fauno/haskell-hs-bibutils/PKGBUILD b/~fauno/haskell-hs-bibutils/PKGBUILD
index 46816e9c2..46816e9c2 100644..100755
--- a/~fauno/haskell-hs-bibutils/PKGBUILD
+++ b/~fauno/haskell-hs-bibutils/PKGBUILD
diff --git a/~fauno/haskell-hs-bibutils/haskell-hs-bibutils.install b/~fauno/haskell-hs-bibutils/haskell-hs-bibutils.install
index 454c6ff37..454c6ff37 100644..100755
--- a/~fauno/haskell-hs-bibutils/haskell-hs-bibutils.install
+++ b/~fauno/haskell-hs-bibutils/haskell-hs-bibutils.install
diff --git a/~fauno/haskell-json/PKGBUILD b/~fauno/haskell-json/PKGBUILD
index 2a1da8a47..2a1da8a47 100644..100755
--- a/~fauno/haskell-json/PKGBUILD
+++ b/~fauno/haskell-json/PKGBUILD
diff --git a/~fauno/haskell-json/haskell-json.install b/~fauno/haskell-json/haskell-json.install
index 10d6b7279..10d6b7279 100644..100755
--- a/~fauno/haskell-json/haskell-json.install
+++ b/~fauno/haskell-json/haskell-json.install
diff --git a/~fauno/haskell-pandoc-types/PKGBUILD b/~fauno/haskell-pandoc-types/PKGBUILD
index 954514ebe..954514ebe 100644..100755
--- a/~fauno/haskell-pandoc-types/PKGBUILD
+++ b/~fauno/haskell-pandoc-types/PKGBUILD
diff --git a/~fauno/haskell-pandoc-types/haskell-pandoc-types.install b/~fauno/haskell-pandoc-types/haskell-pandoc-types.install
index 34622807c..34622807c 100644..100755
--- a/~fauno/haskell-pandoc-types/haskell-pandoc-types.install
+++ b/~fauno/haskell-pandoc-types/haskell-pandoc-types.install
diff --git a/~fauno/haskell-tagsoup/PKGBUILD b/~fauno/haskell-tagsoup/PKGBUILD
index 0de1f165b..0de1f165b 100644..100755
--- a/~fauno/haskell-tagsoup/PKGBUILD
+++ b/~fauno/haskell-tagsoup/PKGBUILD
diff --git a/~fauno/haskell-tagsoup/haskell-tagsoup.install b/~fauno/haskell-tagsoup/haskell-tagsoup.install
index dc61b4049..dc61b4049 100644..100755
--- a/~fauno/haskell-tagsoup/haskell-tagsoup.install
+++ b/~fauno/haskell-tagsoup/haskell-tagsoup.install
diff --git a/~fauno/haskell-texmath/PKGBUILD b/~fauno/haskell-texmath/PKGBUILD
index 95e88912a..95e88912a 100644..100755
--- a/~fauno/haskell-texmath/PKGBUILD
+++ b/~fauno/haskell-texmath/PKGBUILD
diff --git a/~fauno/haskell-texmath/haskell-texmath.install b/~fauno/haskell-texmath/haskell-texmath.install
index b95fd0d9f..b95fd0d9f 100644..100755
--- a/~fauno/haskell-texmath/haskell-texmath.install
+++ b/~fauno/haskell-texmath/haskell-texmath.install
diff --git a/~fauno/haskell-xml/PKGBUILD b/~fauno/haskell-xml/PKGBUILD
index fc42941b3..fc42941b3 100644..100755
--- a/~fauno/haskell-xml/PKGBUILD
+++ b/~fauno/haskell-xml/PKGBUILD
diff --git a/~fauno/haskell-xml/haskell-xml.install b/~fauno/haskell-xml/haskell-xml.install
index 741ef9ee0..741ef9ee0 100644..100755
--- a/~fauno/haskell-xml/haskell-xml.install
+++ b/~fauno/haskell-xml/haskell-xml.install
diff --git a/~fauno/haskell-zip-archive/PKGBUILD b/~fauno/haskell-zip-archive/PKGBUILD
index ace343317..0d0d91a11 100644..100755
--- a/~fauno/haskell-zip-archive/PKGBUILD
+++ b/~fauno/haskell-zip-archive/PKGBUILD
@@ -5,27 +5,19 @@ _licensefile=LICENSE
 # PKGBUILD options/directives
 pkgname=haskell-zip-archive
 pkgver=0.1.1.7
-pkgrel=18
+pkgrel=20
 pkgdesc="Library for creating and modifying zip archives."
 url="http://github.com/jgm/zip-archive"
 license=("GPL")
 arch=('i686' 'x86_64')
 makedepends=()
 depends=("ghc=7.0.3-2"
-         "sh"
-         "haskell-array=0.3.0.2"
-         "haskell-binary=0.5.0.2"
-         "haskell-bytestring=0.9.1.10"
-         "haskell-containers=0.4.0.0"
-         "haskell-digest=0.0.0.9"
-         "haskell-directory=1.1.0.0"
-         "haskell-filepath=1.2.0.0"
-         "haskell-mtl=2.0.1.0"
-         "haskell-old-time=1.0.0.6"
-         "haskell-pretty=1.0.1.2"
-         "haskell-unix=2.4.2.0"
-         "haskell-utf8-string=0.3.6"
-         "haskell-zlib=0.5.3.1")
+         "haskell-binary=0.5.0.2-8"
+         "haskell-digest=0.0.1.0-1"
+         "haskell-mtl=2.0.1.0-3.1"
+         "haskell-unix=2.4.2.0-2"
+         "haskell-utf8-string=0.3.6-7.2"
+         "haskell-zlib=0.5.3.1-2.1")
 options=('strip')
 source=("http://hackage.haskell.org/packages/archive/${_hkgname}/${pkgver}/${_hkgname}-${pkgver}.tar.gz")
 install="${pkgname}.install"
diff --git a/~fauno/haskell-zip-archive/haskell-zip-archive.install b/~fauno/haskell-zip-archive/haskell-zip-archive.install
index c19836db7..c19836db7 100644..100755
--- a/~fauno/haskell-zip-archive/haskell-zip-archive.install
+++ b/~fauno/haskell-zip-archive/haskell-zip-archive.install
diff --git a/~fauno/ldapscripts/PKGBUILD b/~fauno/ldapscripts/PKGBUILD
new file mode 100755
index 000000000..59080b1cf
--- /dev/null
+++ b/~fauno/ldapscripts/PKGBUILD
@@ -0,0 +1,20 @@
+pkgname=ldapscripts
+pkgver=2.0.1
+pkgrel=1
+pkgdesc="Shell scripts that allow to manage POSIX accounts (users, groups, machines) in an LDAP directory"
+arch=('any')
+url="http://contribs.martymac.org/"
+license=('GPL')
+depends=('sharutils')
+source=(http://contribs.martymac.org/ldapscripts/${pkgname}-${pkgver}.tgz)
+md5sums=('212a62b3e808faf8d347429ccd2cef09')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}" \
+       ETCDIR=/etc/ldapscripts \
+       MANDIR=/usr/share/man \
+       LIBDIR=/usr/share/ldapscripts \
+       PREFIX=/usr install
+}
diff --git a/~fauno/librest/PKGBUILD b/~fauno/librest/PKGBUILD
index a66c4559e..a66c4559e 100644..100755
--- a/~fauno/librest/PKGBUILD
+++ b/~fauno/librest/PKGBUILD
diff --git a/~fauno/localepurge/PKGBUILD b/~fauno/localepurge/PKGBUILD
index 61386db71..263776a01 100644..100755
--- a/~fauno/localepurge/PKGBUILD
+++ b/~fauno/localepurge/PKGBUILD
@@ -2,33 +2,32 @@
 # Contributor: Dincer Celik <dincer@bornovali.com>
 
 pkgname=localepurge
-pkgver=0.6.2+nmu2
-pkgrel=3
+pkgver=0.6.3
+pkgrel=2
 pkgdesc="Script to remove disk space wasted for unneeded localizations."
 arch=('any')
 url="http://packages.debian.org/source/sid/localepurge"
 license=('GPL')
 backup=('etc/locale.nopurge')
 source=("http://ftp.de.debian.org/debian/pool/main/l/localepurge/${pkgname}_${pkgver}.tar.gz"
-        "http://fgr.bitbucket.org/im/${pkgname}.patch"
-        "http://fgr.bitbucket.org/im/${pkgname}.8.patch"
-        "http://fgr.bitbucket.org/im/${pkgname}.config.patch"
-        "http://fgr.bitbucket.org/im/locale.nopurge")
-sha1sums=('a23f77bc770483b3d6f45d1d7caffad8c0891655'
-          '6e2165f3bb8cf2c463816849a973ea088398605f'
-          '3ac6c0a3e30395e6ca1c1fd8cc530fdd84e2c98e'
-          'ec56640d9bf1a908bac4884aa7a2ecde0ee33c8a'
-          'ab47efc3f07d7224382e95d3a5b25355058869b4')
+        "http://fgr.bitbucket.org/im/localepurge-arch/${pkgname}.patch"
+        "http://fgr.bitbucket.org/im/localepurge-arch/${pkgname}.8.patch"
+        "http://fgr.bitbucket.org/im/localepurge-arch/${pkgname}.config.patch"
+        "http://fgr.bitbucket.org/im/localepurge-arch/locale.nopurge")
+sha256sums=('02f7e4a8b5919221a736abb3a937dffc48ffd275f0968e56612d518e1e69c30b'
+            '3958818b2d54c9ca32a1974d757c3303b6e8e1b81d4302dfaec8b8a7af54d17d'
+            '3d45b1da93a0fc30dd3ae28d4ef7b319340c5ebaa302f4e375793934262e61fc'
+            '1cf4c0e9651589502f953ae25654e5b5347de18995055adfb7a6d183a1c4c912'
+            'b9c28be93fa47d4f0315972159e501d9eef28bbab7ffe6e8e7c4a13c359f35e8')
 
 build()
 {
-  #cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -uN ${srcdir}/${pkgname}-${pkgver}/usr/sbin/localepurge < ${srcdir}/localepurge.patch
-  patch -uN ${srcdir}/${pkgname}-${pkgver}/debian/localepurge.8 < ${srcdir}/localepurge.8.patch
-  patch -uN ${srcdir}/${pkgname}-${pkgver}/debian/localepurge.config < ${srcdir}/localepurge.config.patch
-  install -D -m755 ${srcdir}/${pkgname}-${pkgver}/usr/sbin/localepurge ${pkgdir}/usr/sbin/localepurge
-  install -D -m644 ${srcdir}/${pkgname}-${pkgver}/debian/localepurge.8 ${pkgdir}/usr/share/man/man8/localepurge.8
-  install -D -m755 ${srcdir}/${pkgname}-${pkgver}/debian/localepurge.config ${pkgdir}/usr/sbin/localepurge.config
+  patch -uN ${srcdir}/${pkgname}/usr/sbin/localepurge < ${srcdir}/localepurge.patch
+  patch -uN ${srcdir}/${pkgname}/debian/localepurge.8 < ${srcdir}/localepurge.8.patch
+  patch -uN ${srcdir}/${pkgname}/debian/localepurge.config < ${srcdir}/localepurge.config.patch
+  install -D -m755 ${srcdir}/${pkgname}/usr/sbin/localepurge ${pkgdir}/usr/sbin/localepurge
+  install -D -m644 ${srcdir}/${pkgname}/debian/localepurge.8 ${pkgdir}/usr/share/man/man8/localepurge.8
+  install -D -m755 ${srcdir}/${pkgname}/debian/localepurge.config ${pkgdir}/usr/sbin/localepurge.config
   install -D -m644 locale.nopurge ${pkgdir}/etc/locale.nopurge
   if [ ! -e /var/cache/localepurge/localelist ]; then
     find /usr/share/locale -maxdepth 1 -type d -name "*" -printf "%f\n" | grep "^[a-z]" | cut -d" " -f1 | sort -u > ${srcdir}/localelist
diff --git a/~fauno/mips64el-unknown-linux-gnu-binutils/PKGBUILD b/~fauno/mips64el-unknown-linux-gnu-binutils/PKGBUILD
index 6fc5b1f16..6fc5b1f16 100644..100755
--- a/~fauno/mips64el-unknown-linux-gnu-binutils/PKGBUILD
+++ b/~fauno/mips64el-unknown-linux-gnu-binutils/PKGBUILD
diff --git a/~fauno/mips64el-unknown-linux-gnu-gcc-base/PKGBUILD b/~fauno/mips64el-unknown-linux-gnu-gcc-base/PKGBUILD
index becc02cfe..becc02cfe 100644..100755
--- a/~fauno/mips64el-unknown-linux-gnu-gcc-base/PKGBUILD
+++ b/~fauno/mips64el-unknown-linux-gnu-gcc-base/PKGBUILD
diff --git a/~fauno/notmuch/PKGBUILD b/~fauno/notmuch/PKGBUILD
index a2cf261a2..b3ff31567 100644..100755
--- a/~fauno/notmuch/PKGBUILD
+++ b/~fauno/notmuch/PKGBUILD
@@ -3,7 +3,7 @@
 # Maintainer: Richard Murri <admin@richardmurri.com>
 
 pkgname=notmuch
-pkgver=0.13.1
+pkgver=0.14
 pkgrel=1
 pkgdesc="Notmuch is not much of an email program"
 arch=(i686 x86_64 mips64el)
@@ -65,4 +65,4 @@ package(){
 # Remove conflicting zsh completion
   rm -r ${pkgdir}/usr/share/zsh
 }
-md5sums=('1380d4b010e4321288a48ef09edf9de2')
+md5sums=('5eb3f225d3eb37862932f6baa5780d15')
diff --git a/~fauno/notmuch/SRCBUILD b/~fauno/notmuch/SRCBUILD
index 29a3a945f..29a3a945f 100644..100755
--- a/~fauno/notmuch/SRCBUILD
+++ b/~fauno/notmuch/SRCBUILD
diff --git a/~fauno/pandoc/PKGBUILD b/~fauno/pandoc/PKGBUILD
index 56b9567f8..3d7d1fa9f 100644..100755
--- a/~fauno/pandoc/PKGBUILD
+++ b/~fauno/pandoc/PKGBUILD
@@ -4,19 +4,20 @@
 # Run `makepkg -srp SRCBUILD` if you want to update the source tarball
 
 pkgname=pandoc
-pkgver=1.9.3
-pkgrel=1
+pkgver=1.9.4.2
+pkgrel=2
 pkgdesc='Conversion between markup formats (no Haskell libs)'
 url='http://johnmacfarlane.net/pandoc/'
 license=('GPL')
 arch=('i686' 'x86_64')
 makedepends=('ghc' 'sh' 'cabal-install')
-options=('strip')
-source=(https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}-${pkgrel}-any.src.tar.xz{,.sig} SRCBUILD)
-md5sums=('944f2b32803b0335345853cd2b1c1ad7'
-         '0ee3190fd7d43bcfebdb282ff12584f2'
-         'ecc040d30c6e4fb77c32d598dd03729d')
+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() {
@@ -27,7 +28,7 @@ build() {
         pushd ${srcdir}/${pkgname}-${pkgver}/${_hkpkg}
 
         HOME=${srcdir}/${pkgname}-${pkgver} \
-        cabal install --prefix=${srcdir}/build/usr
+        cabal install --flags="embed_data_files" --prefix=${srcdir}/build/usr
 
         popd
     done
@@ -35,7 +36,7 @@ build() {
     cd ${srcdir}/${pkgname}-${pkgver}/${pkgname}-${pkgver}
 
    HOME=${srcdir}/${pkgname}-${pkgver} \
-   cabal configure --prefix=/usr --libdir=${srcdir}/build/usr/lib --flags="-library"
+   cabal configure --prefix=/usr --libdir=${srcdir}/build/usr/lib --flags="-library embed_data_files"
    HOME=${srcdir}/${pkgname}-${pkgver} \
    cabal build
 
@@ -47,6 +48,10 @@ package() {
 
    runghc Setup.hs copy --destdir=${pkgdir}/
 
+# 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 \
diff --git a/~fauno/pandoc/SRCBUILD b/~fauno/pandoc/SRCBUILD
index 5ef2b9dc1..29c5f25ae 100644..100755
--- a/~fauno/pandoc/SRCBUILD
+++ b/~fauno/pandoc/SRCBUILD
@@ -2,8 +2,8 @@
 # Based on haskell-pandoc
 
 pkgname=pandoc
-pkgver=1.9.3
-pkgrel=1
+pkgver=1.9.4.2
+pkgrel=2
 pkgdesc='Conversion between markup formats (no Haskell libs)'
 url='http://johnmacfarlane.net/pandoc/'
 license=('GPL')
@@ -20,12 +20,12 @@ build() {
     cabal --verbose=3 update
 
     HOME=${srcdir}/${pkgname}-${pkgver} \
-    cabal --verbose=3 fetch ${pkgname}-${pkgver}
+    cabal --verbose=3 fetch file-embed ${pkgname}-${pkgver}
 
     msg2 "Getting the dependency build order"
 # Ignore the cabal messages
     HOME=${srcdir}/${pkgname}-${pkgver} \
-    cabal install --dry-run ${pkgname}-${pkgver} | tail -n+3 > BUILDORDER
+    cabal install --dry-run file-embed ${pkgname}-${pkgver} | tail -n+3 >> BUILDORDER
 }
 
 package() {
diff --git a/~fauno/ruby-mustache/PKGBUILD b/~fauno/ruby-mustache/PKGBUILD
index 7b396434c..8c8d924c1 100644..100755
--- a/~fauno/ruby-mustache/PKGBUILD
+++ b/~fauno/ruby-mustache/PKGBUILD
@@ -1,29 +1,30 @@
 # Maintainer: David Campbell <davekong@archlinux.us>
 pkgname=ruby-mustache
 pkgver=0.99.4
-pkgrel=1
+pkgrel=2
 pkgdesc="A framework-agnostic way to render logic-free views."
 arch=('any')
 url="http://github.com/defunkt/mustache"
 license=(MIT)
 depends=('ruby')
 makedepends=('rubygems')
-source=("http://gems.rubyforge.org/gems/mustache-${pkgver}.gem")
+source=("http://gems.rubyforge.org/gems/mustache-${pkgver}.gem"
+        "https://raw.github.com/defunkt/mustache/master/LICENSE")
+md5sums=('650194ec2c166feb087377647414b9dc'
+         'fbbd010314b3f1554733123ecde55a52')
 noextract=("mustache-${pkgver}.gem")
 
 build() {
   cd $srcdir
   local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
-  gem install --ignore-dependencies -i "$pkgdir$_gemdir" mustache-$pkgver.gem \
-  -n "$pkgdir/usr/bin"
+  gem install \
+      --ignore-dependencies \
+      -i "$pkgdir$_gemdir" mustache-$pkgver.gem \
+      -n "$pkgdir/usr/bin"
 
-  install -Dm644 $pkgdir/usr/lib/ruby/gems/1.9.1/gems/mustache-$pkgver/LICENSE \
+  install -Dm644 $srcdir/LICENSE \
                  $pkgdir/usr/share/licenses/$pkgname/LICENSE
-  install -Dm644 $pkgdir/usr/lib/ruby/gems/1.9.1/gems/mustache-$pkgver/man/mustache.1 \
-                 $pkgdir/usr/share/man/man1/mustache.1
-  install -Dm644 $pkgdir/usr/lib/ruby/gems/1.9.1/gems/mustache-$pkgver/man/mustache.5 \
-                 $pkgdir/usr/share/man/man5/mustache.5
+
 }
 
 # vim:set ts=2 sw=2 et:
-md5sums=('650194ec2c166feb087377647414b9dc')
diff --git a/~fauno/sphinx/PKGBUILD b/~fauno/sphinx/PKGBUILD
new file mode 100644
index 000000000..fa5a7935e
--- /dev/null
+++ b/~fauno/sphinx/PKGBUILD
@@ -0,0 +1,42 @@
+# Maintainer: dryes <joswiseman@gmail>
+# Contributor: Dan Serban
+# Contributor: Vishnevsky Roman <aka dot x0x01 at gmail dot com>
+# Contributor: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
+pkgname='sphinx'
+pkgver=2.0.5
+pkgrel=2
+pkgdesc='Free open-source SQL full-text search engine.'
+arch=('i686' 'x86_64')
+url='http://www.sphinxsearch.com/'
+license=('GPL')
+depends=('unixodbc' 'expat' 'libmysqlclient' 'postgresql-libs')
+optdepends=('postgresql')
+backup=('etc/conf.d/sphinx')
+source=("http://sphinxsearch.com/files/${pkgname}-${pkgver}-release.tar.gz" 'sphinx.conf.d' 'sphinx.rc.d')
+
+build() {
+  sed -i '15199,15199 s/x00/x21/' "${srcdir}/${pkgname}-${pkgver}-release/src/searchd.cpp"
+
+  cd "${srcdir}/${pkgname}-${pkgver}-release"
+  ./configure --prefix=/usr --exec-prefix=/usr --localstatedir=/var/lib/sphinx \
+    --sysconfdir=/etc/sphinx --with-pgsql --enable-id64
+
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}-release"
+
+  make DESTDIR="${pkgdir}" install
+
+  for _f in "${pkgdir}/usr/bin/"*; do
+    ln -s "/usr/bin/${_f##*/}" "${pkgdir}/usr/bin/sphinx-${_f##*/}"
+  done
+
+  install -Dm755 "${srcdir}/sphinx.rc.d" "${pkgdir}/etc/rc.d/sphinx"
+  install -Dm644 "${srcdir}/sphinx.conf.d" "${pkgdir}/etc/conf.d/sphinx"
+}
+
+md5sums=('e71fdb5b0c2911247d48fb30550b9584'
+         '48e3e1857919d26d5104a48caffb531b'
+         'd886222593c6bba891fd3ce982c90c00')
diff --git a/~fauno/sphinx/sphinx.conf.d b/~fauno/sphinx/sphinx.conf.d
new file mode 100644
index 000000000..c809e56fa
--- /dev/null
+++ b/~fauno/sphinx/sphinx.conf.d
@@ -0,0 +1,5 @@
+#
+# Arguments to be passed to the sphinx daemon
+#
+
+SPHINX_ARGS=""
diff --git a/~fauno/sphinx/sphinx.rc.d b/~fauno/sphinx/sphinx.rc.d
new file mode 100644
index 000000000..64c8f01e7
--- /dev/null
+++ b/~fauno/sphinx/sphinx.rc.d
@@ -0,0 +1,44 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/sphinx
+
+PID=$(pidof -o %PPID /usr/bin/sphinx-searchd)
+case $1 in
+start)
+        stat_busy "Starting Sphinx Daemon"
+
+        if [[ -z $PID ]] && /usr/bin/sphinx-searchd $SPHINX_ARGS; then
+
+                PID=$(pidof -o %PPID /usr/bin/sphinx-searchd)
+                echo "$PID" > /var/run/sphinx-searchd.pid
+                add_daemon sphinx
+                stat_done
+        else
+                stat_fail
+                exit 1
+        fi
+        ;;
+
+stop)
+        stat_busy "Stopping Sphinx Daemon"
+        if [[ ! -z $PID ]]  && kill "$PID" &>/dev/null; then
+                rm_daemon sphinx
+                stat_done
+        else
+                stat_fail
+                exit 1
+        fi
+        ;;
+
+restart)
+        $0 stop
+        $0 start
+        ;;
+
+*)
+        echo "Usage: $0 {start|stop|restart}" >&2
+        exit 1
+
+esac
diff --git a/~fauno/transmission-remote-cli/PKGBUILD b/~fauno/transmission-remote-cli/PKGBUILD
index 5e3699bce..5e3699bce 100644..100755
--- a/~fauno/transmission-remote-cli/PKGBUILD
+++ b/~fauno/transmission-remote-cli/PKGBUILD
diff --git a/~fauno/transmission-remote-cli/python2.patch b/~fauno/transmission-remote-cli/python2.patch
index 256b676f0..256b676f0 100644..100755
--- a/~fauno/transmission-remote-cli/python2.patch
+++ b/~fauno/transmission-remote-cli/python2.patch
diff --git a/~fauno/vala-notmuch/PKGBUILD b/~fauno/vala-notmuch/PKGBUILD
index 0e97683a4..0e97683a4 100644..100755
--- a/~fauno/vala-notmuch/PKGBUILD
+++ b/~fauno/vala-notmuch/PKGBUILD
diff --git a/~fauno/vala-notmuch/SRCBUILD b/~fauno/vala-notmuch/SRCBUILD
index 89b6c67ba..89b6c67ba 100644..100755
--- a/~fauno/vala-notmuch/SRCBUILD
+++ b/~fauno/vala-notmuch/SRCBUILD
diff --git a/~fauno/vala-notmuch/vala-notmuch.install b/~fauno/vala-notmuch/vala-notmuch.install
index d1ce89da6..d1ce89da6 100644..100755
--- a/~fauno/vala-notmuch/vala-notmuch.install
+++ b/~fauno/vala-notmuch/vala-notmuch.install