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

Conflicts:
	community/camlp5/PKGBUILD
	community/coq/PKGBUILD
	community/ldns/PKGBUILD
	community/luxrays/PKGBUILD
	community/luxrender/PKGBUILD
	community/nut/PKGBUILD
	community/root/PKGBUILD
	community/swi-prolog/PKGBUILD
	community/vtk/PKGBUILD
	community/wings3d/wings3d.sh
	core/sqlite3/PKGBUILD
	core/tzdata/PKGBUILD
	extra/cmus/PKGBUILD
	extra/dcron/PKGBUILD
	extra/farsight2/PKGBUILD
	extra/foomatic/PKGBUILD
	extra/fwbuilder/PKGBUILD
	extra/gnome-utils/PKGBUILD
	extra/ivtv-utils/PKGBUILD
	extra/kdebase-konsole/PKGBUILD
	extra/kdenetwork/PKGBUILD
	extra/kdesdk/PKGBUILD
	extra/koffice/PKGBUILD
	extra/libxfce4menu/PKGBUILD
	extra/openmpi/PKGBUILD
	extra/telepathy-butterfly/PKGBUILD
	extra/telepathy-farsight/PKGBUILD
	extra/telepathy-kde-presence-dataengine/PKGBUILD
	extra/telepathy-qt4/PKGBUILD
	extra/xfce-utils/PKGBUILD
	extra/xulrunner/PKGBUILD
	multilib/lib32-zlib/PKGBUILD
	staging/gimp-devel/gimp-devel.install
	testing/gtk3/PKGBUILD
	testing/php/PKGBUILD
	~xihh/couchdb-git/couchdb.install
	~xihh/couchdb-git/rc-script.patch
	~xihh/gmime24/PKGBUILD

5 files changed, 0 insertions, 174 deletions

diff --git a/community/root/PKGBUILD b/community/root/PKGBUILD
deleted file mode 100644
index c45456a91..000000000
--- a/community/root/PKGBUILD
+++ /dev/null
@@ -1,96 +0,0 @@
-# Maintainer: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Sebastian Voecking <voeck@web.de>
-
-pkgname=root
-pkgver=5.32.02
-pkgrel=2
-pkgdesc='C++ data analysis framework and interpreter from CERN.'
-arch=('i686' 'x86_64' 'mips64el')
-url='http://root.cern.ch'
-license=('LGPL2.1')
-depends=('avahi' 'desktop-file-utils' 'ftgl' 'giflib' 'glew' 'graphviz' 'gsl' 'libldap' 'libmysqlclient'
-         'libxft' 'postgresql-libs' 'python2' 'unixodbc' 'shared-mime-info' 'xmlrpc-c' 'xorg-fonts-75dpi' 'mesa' 'gcc-fortran' 'hicolor-icon-theme' 'gtk-update-icon-cache')
-makedepends=('fftw')
-install='root.install'
-options=('!emptydirs')
-source=("ftp://root.cern.ch/root/root_v${pkgver}.source.tar.gz"
-        'root.sh'
-        'rootd'
-        'root.xml')
-md5sums=('614a00632ab11fb33d2002800aabdcc7'
-         '0e883ad44f99da9bc7c23bc102800b62'
-         'efd06bfa230cc2194b38e0c8939e72af'
-         'e2cf69b204192b5889ceb5b4dedc66f7')
-
-build() {
-  cd root
-
-  if [ ${CARCH} == 'i686' ]; then
-    TARGET=linux;
-  else
-    TARGET=linuxx8664gcc;
-  fi
-
-  msg 'python2 switch'
-  find . -type f -exec sed -e 's_#!/usr/bin/env python_&2_' \
-                           -e 's/python -O/python2 -O/g' \
-                           -e 's/python -c/python2 -c/g' -i {} \;
-  sed \
-    -e 's/python 2/python2 2/g' \
-    -i configure
-  sed \
-    -e 's/python $(pkgpyexecdir)/python2 $(pkgpyexecdir)/g' \
-    -i cint/reflex/python/genreflex/Makefile.am
-  sed \
-    -e 's/python /python2 /' \
-    -i config/genreflex.in config/genreflex-rootcint.in
-
-  local sys_libs=""
-  for sys_lib in ftgl freetype glew pcre zlib lzma; do
-    sys_libs+="--disable-builtin-${sys_lib} "
-  done
-  # move from aur if possible
-  #--disable-builtin-afterimage \
-
-  ./configure \
-    ${TARGET} \
-    --prefix=/usr \
-    --enable-gdml \
-    --enable-gsl-shared \
-    --enable-minuit2 \
-    --enable-soversion \
-    --enable-roofit \
-    --enable-python \
-    --with-python-incdir=/usr/include/python2.7 \
-    --with-python-libdir=/usr/lib \
-    ${sys_libs}
-
-  make
-}
-
-package() {
-  cd root
-
-  make DESTDIR=${pkgdir} install
-
-  install -D ${srcdir}/root.sh \
-    ${pkgdir}/etc/profile.d/root.sh
-  install -D ${srcdir}/rootd \
-    ${pkgdir}/etc/rc.d/rootd
-  install -D -m644 ${srcdir}/root.xml \
-    ${pkgdir}/usr/share/mime/packages/root.xml
-
-  install -D -m644 ${srcdir}/root/build/package/debian/root-system-bin.desktop.in \
-    ${pkgdir}/usr/share/applications/root-system-bin.desktop
-  # replace @prefix@ with /usr for the desktop
-  sed -e 's_@prefix@_/usr_' -i ${pkgdir}/usr/share/applications/root-system-bin.desktop
-
-  install -D -m644 ${srcdir}/root/build/package/debian/root-system-bin.png \
-    ${pkgdir}/usr/share/icons/hicolor/48x48/apps/root-system-bin.png
-
-  # use a file that pacman can track instead of adding directly to ld.so.conf
-  install -d ${pkgdir}/etc/ld.so.conf.d
-  echo '/usr/lib/root' > ${pkgdir}/etc/ld.so.conf.d/root.conf
-
-  rm -rf ${pkgdir}/etc/root/daemons
-}
diff --git a/community/root/root.install b/community/root/root.install
deleted file mode 100644
index afabb7aea..000000000
--- a/community/root/root.install
+++ /dev/null
@@ -1,25 +0,0 @@
-post_install() {
-  update-desktop-database >/dev/null
-
-  update-mime-database /usr/share/mime >/dev/null
-
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-pre_remove() {
-  # leave for pre 5.30.03-3
-  if [[ $(vercmp $1 5.30.03-3) == -1 ]]; then
-    cat etc/ld.so.conf | grep -v '/usr/lib/root' >/tmp/.pacroot
-    mv /tmp/.pacroot etc/ld.so.conf
-    chmod 644 etc/ld.so.conf
-    sbin/ldconfig -r .
-  fi
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
diff --git a/community/root/root.sh b/community/root/root.sh
deleted file mode 100644
index 685e6036b..000000000
--- a/community/root/root.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-if [ $PYTHONPATH ]; then
-    export PYTHONPATH=$PYTHONPATH:/usr/lib/root;
-else
-    export PYTHONPATH=/usr/lib/root;
-fi
diff --git a/community/root/root.xml b/community/root/root.xml
deleted file mode 100644
index af8dd69c5..000000000
--- a/community/root/root.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<mime-info xmlns="http://www.freedesktop.org/standards/shared-mime-info">
-  <mime-type type="application/x-root">
-    <comment>ROOT file</comment>
-    <comment xml:lang="de">ROOT-Datei</comment>
-    <glob pattern="*.root"/>
-    <magic priority="80">
-      <match value="root" type="string" offset="0:64"/>
-    </magic>
-  </mime-type>
-</mime-info>
diff --git a/community/root/rootd b/community/root/rootd
deleted file mode 100755
index fb2c3388c..000000000
--- a/community/root/rootd
+++ /dev/null
@@ -1,37 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-PID=`pidof -o %PPID /usr/sbin/rootd`
-case "$1" in
-  start)
-  stat_busy "Starting ROOT file server daemon"
-    [ -z "$PID" ] && /usr/bin/rootd >>/var/log/root.log 2>&1
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      PID=`pidof -o %PPID /usr/sbin/rootd`
-      echo $PID >/var/run/rootd.pid
-      add_daemon rootd
-      stat_done
-    fi
-    ;;
-  stop)
-  stat_busy "Stopping ROOT file server daemon"
-    [ ! -z "$PID" ]  && kill $PID &>/dev/null
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon rootd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
-exit 0