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

14 files changed, 260 insertions, 46 deletions

diff --git a/libre/blender-libre/rePKGBUILD b/libre/blender-libre/rePKGBUILD
deleted file mode 100644
index 35aef2117..000000000
--- a/libre/blender-libre/rePKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# This is an example rePKGBUILD file. Use this as a start to creating your own,
-# and remove these comments. For more information, see 'man PKGBUILD'.
-# NOTE: Please fill out the license field for your package! If it is unknown,
-# then please put 'unknown'.
-
-# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
-# Maintainer: Márcio Silva <coadde@adinet.com.uy>
-source PKGBUILD
-unset build package md5sums source check
-_repo=community
-pkgname='blender-libre'
-options=(!strip)
-source=(PKGBUILD
-	http://mirrors.kernel.org/archlinux/${_repo}/os/$CARCH/${pkgbase}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
-	# files for pkg modifications
-    )
-
-build() {
-  cd "${srcdir}/"
-  rm -v .{INSTALL,PKGINFO} ${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT || true
-  # put actions for package modifications below this line
-}
-
-package_blender-libre() {
-    pkgdesc="A fully integrated 3D graphics creation suite without cuda-toolkit recommendation"
-    provides=("${pkgname}=${pkgver}")
-    replaces=("${pkgname}")
-    conflicts=("${pkgname}")
-    install=blender.install
-    depends=('libpng' 'libtiff' 'openexr' 'python' 'desktop-file-utils'
-             'shared-mime-info' 'hicolor-icon-theme' 'xdg-utils' 'glew'
-             'freetype2' 'openal' 'ffmpeg' 'fftw' 'boost-libs' 'opencollada'
-             'openimageio' 'libsndfile' 'jack')
-
-  find ${srcdir} -maxdepth 1 -type l -delete
-  cp -a ${srcdir}/* ${pkgdir}
-}
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 3875bbc3d..28b96bcdd 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -21,7 +21,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=iceweasel
 pkgname=iceweasel-libre
 pkgver=${_debver}.${_debrel}
-pkgrel=1
+pkgrel=2
 
 if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
 if $_pgo; then
@@ -58,7 +58,7 @@ md5sums=('e440446bb92dc1c0311346c68024590b'
          'eab149c1994ab14392e55af3abb08e80'
          'ac29b01c189f20abae2f3eef1618ffc0'
          'a485a2b5dc544a8a2bd40c985d2e5813'
-         '1c23b150a9c2eeb378f167a1dfa09d89'
+         'bd7d322d89001e39b1f11972507063c7'
          'e529742c0a425648087bc3ce537fe4c5'
          'f1c76e7e244257856a386ca2de69bdf0'
          '0d053487907de4376d67d8f499c5502b'
diff --git a/libre/iceweasel-libre/libre.patch b/libre/iceweasel-libre/libre.patch
index 7b4e6a395..88a06741e 100644
--- a/libre/iceweasel-libre/libre.patch
+++ b/libre/iceweasel-libre/libre.patch
@@ -228,3 +228,15 @@ diff -urN iceweasel-13.0.orig/browser/locales/generic/profile/bookmarks.html.in
 +        <DT><a href="http://www.gnu.org/software/gnuzilla/addons.html">Free addons</A>
      </DL><p>
  </DL><p>
+diff -urN iceweasel-13.0.orig/browser/base/content/abouthome/aboutHome.js iceweasel-13.0/browser/base/content/abouthome/aboutHome.js
+--- mozilla-release.orig/browser/base/content/abouthome/aboutHome.js	2012-06-01 09:03:47.000000000 -0300
++++ mozilla-release/browser/base/content/abouthome/aboutHome.js	2012-06-10 03:18:01.897259931 -0300
+@@ -143,7 +143,7 @@
+ // The <a/> part of the snippet will be linked to the corresponding url.
+ const DEFAULT_SNIPPETS_URLS = [
+   "http://www.mozilla.com/firefox/features/?WT.mc_ID=default1"
+-, "https://addons.mozilla.org/firefox/?src=snippet&WT.mc_ID=default2"
++, "http://www.gnu.org/software/gnuzilla/addons.html?src=snippet&WT.mc_ID=default2"
+ ];
+ 
+ const SNIPPETS_UPDATE_INTERVAL_MS = 86400000; // 1 Day.
diff --git a/libre/linux-libre-lts/PKGBUILD b/libre/linux-libre-lts/PKGBUILD
index 6ca3d1e8b..ac7ab36e8 100644
--- a/libre/linux-libre-lts/PKGBUILD
+++ b/libre/linux-libre-lts/PKGBUILD
@@ -9,7 +9,7 @@ pkgname=('linux-libre-lts' 'linux-libre-lts-headers') # Build stock -LIBRE kerne
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=-LIBRE-LTS
 _basekernel=3.0
-_sublevel=33
+_sublevel=34
 pkgver=${_basekernel}.${_sublevel}
 _lxopkgver=${_basekernel}.32 # nearly always the same as pkgver
 pkgrel=1
@@ -32,7 +32,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'ext4-options.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('5f64180fe7df4e574dac5911b78f5067'
-         '3076be33631914b638eb9f313dc17d08'
+         '627ea698f9e8613f5d239ac2e6622c4e'
          '9cfcf3807201ce44aa720571232a10ce'
          '8bb5c5aa217202c3ac3798ba7798e07d'
          'c072b17032e80debc6a8626299245d46'
diff --git a/libre/linux-libre-lts/linux-libre-lts.install b/libre/linux-libre-lts/linux-libre-lts.install
index b6a6f731c..55ed9e496 100644
--- a/libre/linux-libre-lts/linux-libre-lts.install
+++ b/libre/linux-libre-lts/linux-libre-lts.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-lts
-KERNEL_VERSION=3.0.33-1-LIBRE-LTS
+KERNEL_VERSION=3.0.34-1-LIBRE-LTS
 
 post_install () {
   # updating module dependencies
@@ -28,7 +28,7 @@ post_install () {
 post_upgrade() {
   pacman -Q grub &>/dev/null
   hasgrub=$?
-  pacman -Q grub2 &>/dev/null
+  pacman -Q grub2-common &>/dev/null
   hasgrub2=$?
   pacman -Q lilo &>/dev/null
   haslilo=$?
diff --git a/libre/linux-libre/PKGBUILD b/libre/linux-libre/PKGBUILD
index 219659c25..4f10a211a 100644
--- a/libre/linux-libre/PKGBUILD
+++ b/libre/linux-libre/PKGBUILD
@@ -12,7 +12,7 @@ pkgname=('linux-libre' 'linux-libre-headers' 'linux-libre-docs') # Build stock -
 # pkgname=linux-custom       # Build kernel with a different name
 _kernelname=-LIBRE
 _basekernel=3.4
-_sublevel=1
+_sublevel=2
 pkgver=${_basekernel}.${_sublevel}
 _lxopkgver=${_basekernel}.1 # nearly always the same as pkgver
 pkgrel=1
@@ -34,7 +34,7 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'i915-fix-ghost-tv-output.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('a5e128ca059cceb8b69148b41ff4ac6f'
-         '9b5bcbc2f77807f66a50d5e34d4ce42e'
+         'ea827952923c8a926c0831ad3f124190'
          '669c3f9d5c6a2109bad8e511287826c3'
          '454231e14419e56a5281eb7bc6fde83e'
          'e49ac236dfeef709f91a3d993ea7b62c'
diff --git a/libre/linux-libre/linux-libre.install b/libre/linux-libre/linux-libre.install
index 74143e1cd..584f0f645 100644
--- a/libre/linux-libre/linux-libre.install
+++ b/libre/linux-libre/linux-libre.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=
-KERNEL_VERSION=3.4.1-1-LIBRE
+KERNEL_VERSION=3.4.2-1-LIBRE
 
 post_install () {
   # updating module dependencies
diff --git a/pcr/kervala_libsquish-hg/PKGBUILD b/pcr/kervala_libsquish-hg/PKGBUILD
new file mode 100644
index 000000000..f75e1aba7
--- /dev/null
+++ b/pcr/kervala_libsquish-hg/PKGBUILD
@@ -0,0 +1,46 @@
+# Maintainer: Jorge Araya <jorgean@lavabit.com>
+
+pkgname=kervala_libsquish-hg
+pkgver=220
+pkgrel=1
+pkgdesc="Free Software DXT compression library, kervala's version"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/libsquish/"
+license=('MIT')
+makedepends=('mercurial' 'gcc-libs')
+provides=('libsquish')
+conflicts=('libsquish')
+source=()
+
+_hgroot="http://hg.kervala.net"
+_hgrepo="packaging"
+
+build() {
+  cd "$srcdir"
+  msg "Connecting to Mercurial server...."
+
+  if [[ -d "$_hgrepo" ]]; then
+    cd "$_hgrepo"
+    hg pull -u
+    msg "The local files are updated."
+  else
+    hg clone "${_hgroot}/${_hgrepo}"
+  fi
+
+  msg "Mercurial checkout done or server timeout"
+  msg "Starting build..."
+
+  rm -rf "$srcdir/$_hgrepo-build"
+  cp -r "$srcdir/$_hgrepo" "$srcdir/$_hgrepo-build"
+  cd "$srcdir/$_hgrepo-build/squish"
+  make
+}
+
+package() {
+  cd "$srcdir/$_hgrepo-build/squish"
+  mkdir -p ${pkgdir}/usr/local/include
+  mkdir -p ${pkgdir}/usr/local/lib
+  make -e INSTALL_DIR="$pkgdir/usr/local" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/social/gnuhealth/PKGBUILD b/social/gnuhealth/PKGBUILD
new file mode 100644
index 000000000..f1da528ff
--- /dev/null
+++ b/social/gnuhealth/PKGBUILD
@@ -0,0 +1,45 @@
+# Maintainer: SpepS <dreamspepser at yahoo dot it>
+
+pkgname=gnuhealth
+pkgver=1.6.1
+pkgrel=1
+pkgdesc="A free Health and Hospital Information System"
+arch=(any)
+url="http://health.gnu.org/"
+license=('GPL3')
+depends=('trytond')
+source=("http://ftp.gnu.org/gnu/health/$pkgname-$pkgver.tar.gz")
+md5sums=('fef8c811ca6de3fdd6e2430d644e13c9')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # python2 fixes
+  export PYTHON=python2
+  sed -i '/TRYTON_PATH/s/python/&2/' configure
+
+  # makefile fixes
+  sed -e '/install:/a\\tinstall -d $(DESTDIR)$(tryton_modules)/' \
+      -e 's/$(tryton/$(DESTDIR)&/' -i Makefile.in
+
+  # mv man file
+  mv health/man .
+
+  ./configure --prefix=/usr
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make MANTARGET="$pkgdir/usr/share/man/man1" \
+       DESTDIR="$pkgdir/" install
+
+  # man
+  install -Dm644 man/$pkgname.1 \
+    "$pkgdir/usr/share/man/man1/$pkgname.1"
+
+  # python2 fix
+  sed -i 's/env python/&2/' \
+    `grep -rl 'env python' "$pkgdir"`
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/social/python-relatorio/PKGBUILD b/social/python-relatorio/PKGBUILD
new file mode 100644
index 000000000..6255eeee5
--- /dev/null
+++ b/social/python-relatorio/PKGBUILD
@@ -0,0 +1,21 @@
+# Contributor: Florian Walch <florian.walch@gmx.at>
+# Maintainer: Thomas Bahn <Thomas-Bahn@gmx.net>
+pkgname=python-relatorio
+pkgver=0.5.6
+pkgrel=1
+pkgdesc="A templating library able to output odt and pdf files"
+arch=('i686' 'x86_64')
+url="http://relatorio.openhex.org"
+license=('GPL')
+depends=('python-genshi>=0.5' 'python-lxml>=1.3.6')
+makedepends=('python2-distribute')
+source=("http://pypi.python.org/packages/source/r/relatorio/relatorio-$pkgver.tar.gz")
+
+build() {
+  cd $srcdir/relatorio-$pkgver
+  chmod 644 relatorio.egg-info/*
+  python2 setup.py install --root=$pkgdir
+}
+
+
+md5sums=('944fb60fadaff451ab6ee8818de516ad')
diff --git a/social/python2-polib/PKGBUILD b/social/python2-polib/PKGBUILD
new file mode 100644
index 000000000..fc346ec97
--- /dev/null
+++ b/social/python2-polib/PKGBUILD
@@ -0,0 +1,25 @@
+# Maintainer: Esteban V. Carnevale <evcarnevale@gmail.com>
+
+pkgname=python2-polib
+_pkgname='polib'
+pkgver=0.7.0
+pkgrel=1
+pkgdesc='A library to manipulate gettext files'
+url='http://polib.readthedocs.org/en/latest/index.html'
+arch=('any')
+license=('MIT')
+depends=('python2')
+
+source=("https://bitbucket.org/izi/polib/downloads/polib-${pkgver}.tar.gz")
+md5sums=('958f8f81ade7d2484edc25b3989fe247')
+
+build() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  python2 setup.py build
+}
+
+package() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  python2 setup.py install --root="${pkgdir}" --optimize=1
+  install -Dm644 LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+}
diff --git a/social/trytond/PKGBUILD b/social/trytond/PKGBUILD
new file mode 100644
index 000000000..237c599f9
--- /dev/null
+++ b/social/trytond/PKGBUILD
@@ -0,0 +1,30 @@
+# Maintainer: Robin Baumgartner <robin@baumgartners.ch>
+pkgname=trytond
+pkgver=2.4.0
+_pkgdir=2.4
+pkgrel=1
+pkgdesc="A three-tiers high-level general purpose application platform (server application)"
+arch=('any')
+url="http://www.tryton.org/"
+license=('GPL3')
+depends=('python2>=2.4' 'python-lxml' 'python-egenix-mx-base' 'python-relatorio>=0.2.0' 'python-genshi>=0.5' 'python2-polib')
+optdepends=('python-psycopg2: support for PostgreSQL database'
+  'python-pywebdav: support for WebDAV feature'
+  'pydot: support for displaying workflow graphs'
+  'python-pytz: timezone support'
+  'pyopenssl: support for SSL connection')
+makedepends=('python2-distribute')
+install="trytond.install"
+source=("http://downloads.tryton.org/$_pkgdir/$pkgname-$pkgver.tar.gz"
+        'trytond.install'
+        'trytond.rc')
+md5sums=('ce0bbb8fcd0ef6a02c575823712e29e4'
+         '768e68c01cb5913e36ea89c67fc98038'
+         '3ca6aff9b30a52bcf159be7ca630fb6e')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  python2 setup.py install --root=$pkgdir
+  install -D -m644 etc/trytond.conf $pkgdir/etc/trytond.conf
+  install -D -m755 $srcdir/trytond.rc $pkgdir/etc/rc.d/trytond
+}
diff --git a/social/trytond/trytond.install b/social/trytond/trytond.install
new file mode 100644
index 000000000..46d6daaba
--- /dev/null
+++ b/social/trytond/trytond.install
@@ -0,0 +1,20 @@
+post_install() {
+  echo
+  echo "Adding tryton group... "
+  groupadd  tryton
+  echo
+  echo "Adding tryton user... "
+  useradd -c "Tryton Server Daemon" -g tryton -s /bin/false tryton
+
+  echo "Note:"
+  echo "==> Please don't forget to configure your PostgreSQL database for the program."
+}
+
+post_remove() {
+  echo "Removing tryton system user... "
+  userdel tryton && echo "trytond [done]"
+}
+
+op=$1
+shift
+[ "$(type -t "$op")" = "function" ] && $op "$@"
diff --git a/social/trytond/trytond.rc b/social/trytond/trytond.rc
new file mode 100644
index 000000000..a93172a58
--- /dev/null
+++ b/social/trytond/trytond.rc
@@ -0,0 +1,52 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/bin/python /usr/bin/trytond`
+case "$1" in
+    start)
+	stat_busy "Starting Tryton server"
+	# handling log file
+	if [ ! -e /var/log/trytond/trytond.log ]; then
+	    mkdir -p /var/log/trytond
+	    touch /var/log/trytond/trytond.log
+	    chown -R trytond:trytond /var/log/trytond
+	fi
+	# starting the daemon
+	if [ -z "$PID" ]; then
+            su - trytond -s /bin/bash -c "/usr/bin/python2 /usr/bin/trytond \
+	--logfile=/var/log/trytond/trytond.log &> /dev/null &"
+            if [ $? -gt 0 ]; then
+		stat_fail
+            else
+		add_daemon trytond
+		stat_done
+            fi
+	else
+            stat_fail
+	fi
+	;;
+    stop)
+	stat_busy "Stopping Tryton server"
+	if [ ! -z "$PID" ]; then
+	    if [ $? -gt 0 ]; then
+		stat_fail
+	    else
+		kill $PID &> /dev/null &
+		rm_daemon trytond
+		stat_done
+	    fi
+	else
+	    stat_fail
+	fi
+	;;
+    restart)
+	$0 stop
+	sleep 3
+	$0 start
+	;;
+    *)
+	echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0