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

5 files changed, 107 insertions, 11 deletions

diff --git a/~fauno/pandoc/PKGBUILD b/~fauno/pandoc/PKGBUILD
index 410a3dd2b..3d7d1fa9f 100644
--- a/~fauno/pandoc/PKGBUILD
+++ b/~fauno/pandoc/PKGBUILD
@@ -5,15 +5,19 @@
 
 pkgname=pandoc
 pkgver=1.9.4.2
-pkgrel=1
+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)
+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() {
@@ -24,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
@@ -32,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
 
@@ -44,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 \
@@ -57,6 +65,3 @@ package() {
     find ${pkgdir}/usr/share -type f -exec chmod 644 {} \;
     find ${pkgdir}/usr/share -type d -exec chmod 755 {} \;
 }
-md5sums=('3a9191e729a4547370f756ba831cad77'
-         'a8da851ee560ce54c7c5044dfb5042f0'
-         '8dab4575128cf33941a577bfb500c417')
diff --git a/~fauno/pandoc/SRCBUILD b/~fauno/pandoc/SRCBUILD
index 68939a103..29c5f25ae 100644
--- a/~fauno/pandoc/SRCBUILD
+++ b/~fauno/pandoc/SRCBUILD
@@ -3,7 +3,7 @@
 
 pkgname=pandoc
 pkgver=1.9.4.2
-pkgrel=1
+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/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