Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/bitcoin/PKGBUILD
	community/canorus/PKGBUILD
	community/celt-0.7/PKGBUILD
	community/djview4/PKGBUILD
	community/erlang-sdl/PKGBUILD
	community/erlang/PKGBUILD
	community/fcitx-mozc/PKGBUILD
	community/glitz/PKGBUILD
	community/gmerlin/PKGBUILD
	community/gmic/PKGBUILD
	community/goldendict/PKGBUILD
	community/google-gadgets/PKGBUILD
	community/highlight/PKGBUILD
	community/jack2/PKGBUILD
	community/kvirc/PKGBUILD
	community/launchy/PKGBUILD
	community/mplayer2/PKGBUILD
	community/mumble/PKGBUILD
	community/mupdf/PKGBUILD
	community/projectm/PKGBUILD
	community/psimedia/PKGBUILD
	community/pyqt3/PKGBUILD
	community/qps/PKGBUILD
	community/qstardict/PKGBUILD
	community/qsynergy/PKGBUILD
	community/synergy/PKGBUILD
	community/units/PKGBUILD
	community/yagf/PKGBUILD
	extra/automoc4/PKGBUILD
	extra/avahi/PKGBUILD
	extra/avidemux/PKGBUILD
	extra/bzflag/PKGBUILD
	extra/cagibi/PKGBUILD
	extra/cairo/PKGBUILD
	extra/calligra/PKGBUILD
	extra/cmake/PKGBUILD
	extra/dssi/PKGBUILD
	extra/ffmpeg/PKGBUILD
	extra/glu/PKGBUILD
	extra/graphviz/PKGBUILD
	extra/hylafax/PKGBUILD
	extra/kdesdk/PKGBUILD
	extra/libbluedevil/PKGBUILD
	extra/liblastfm/PKGBUILD
	extra/liborigin2/PKGBUILD
	extra/libpng/PKGBUILD
	extra/libqzeitgeist/PKGBUILD
	extra/libx11/PKGBUILD
	extra/mesa/PKGBUILD
	extra/mpg123/PKGBUILD
	extra/mtr/PKGBUILD
	extra/mysql/PKGBUILD
	extra/netpbm/PKGBUILD
	extra/nspr/PKGBUILD
	extra/polkit-qt/PKGBUILD
	extra/poppler/PKGBUILD
	extra/prison/PKGBUILD
	extra/pyqt/PKGBUILD
	extra/qimageblitz/PKGBUILD
	extra/qscintilla/PKGBUILD
	extra/qsynth/PKGBUILD
	extra/qt-assistant-compat/PKGBUILD
	extra/qt-gstreamer/PKGBUILD
	extra/qt/PKGBUILD
	extra/qtwebkit/PKGBUILD
	extra/qwt/PKGBUILD
	extra/samba/PKGBUILD
	extra/sane/PKGBUILD
	extra/smplayer/PKGBUILD
	extra/soprano/PKGBUILD
	extra/texmacs/PKGBUILD
	extra/tomcat-native/PKGBUILD
	extra/transmission/PKGBUILD
	extra/wpa_supplicant_gui/PKGBUILD
	libre/lame-libre/PKGBUILD
	libre/linux-libre/PKGBUILD
	libre/mesa-demos-libre/PKGBUILD

8 files changed, 153 insertions, 8 deletions

diff --git a/pcr/coin/PKGBUILD b/pcr/coin/PKGBUILD
new file mode 100644
index 000000000..c584949c9
--- /dev/null
+++ b/pcr/coin/PKGBUILD
@@ -0,0 +1,59 @@
+# Contributor: Christian Hesse <mail@eworm.de>
+# Contributor: Thomas Dziedzic < gostrc at gmail >
+# Contributor: mickele
+# Contributor: marcus fritzsch <fritschy@googlemail.com>
+# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrières <aurelien@cwb.IO>
+
+pkgname=coin
+pkgver=3.1.3
+pkgrel=9
+pkgdesc='A high-level 3D graphics toolkit on top of OpenGL'
+url='http://www.coin3d.org/'
+license=('GPL')
+arch=('i686' 'x86_64')
+depends=('mesa' 'expat')
+makedepends=('doxygen')
+optdepends=('openal: sound/dynamic linking support'
+            'fontconfig: dynamic linking support'
+            'zlib: dynamic linking support'
+            'freetype2: dynamic linking support'
+            'js: dynamic linking support'
+	    'simage: image format support')
+options=('!libtool')
+source=("https://bitbucket.org/Coin3D/coin/downloads/Coin-${pkgver}.tar.gz")
+
+build() {
+  cd Coin-${pkgver}
+
+  # fix http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=667139
+  sed -i "/#include <Inventor\/C\/basic.h>/i #include <Inventor/C/errors/debugerror.h>" include/Inventor/SbBasic.h
+
+  ./configure \
+    --prefix=/usr \
+    --mandir=/usr/share/man \
+    --enable-optimization \
+    --enable-3ds-import \
+    --enable-javascript-api \
+    --enable-threadsafe \
+    --enable-exceptions \
+    --enable-man \
+    --with-mesa \
+    --disable-debug \
+    --enable-shared \
+    --disable-maintainer-mode \
+    --disable-dependency-tracking \
+    --enable-system-expat
+
+  make
+}
+
+package() {
+  cd Coin-${pkgver}
+
+  make DESTDIR=${pkgdir} install
+
+  # final adjustments
+  for _FILE in threads deprecated errors events ; do
+    mv  "${pkgdir}/usr/share/man/man3/${_FILE}.3" "${pkgdir}/usr/share/man/man3/coin-${_FILE}.3"
+  done
+}
diff --git a/pcr/eigen3/PKGBUILD b/pcr/eigen3/PKGBUILD
new file mode 100644
index 000000000..a1e186325
--- /dev/null
+++ b/pcr/eigen3/PKGBUILD
@@ -0,0 +1,27 @@
+# Contributor: Chirantan Ekbote <chirantan.ekbote at gmail.com>
+# Contributor: Kringel
+# This PKGBUILD is a modified version of eigen 2.x in extra/eigen
+# Maintainer: Parabola GNU / Linux-libre Aurélien Desbrières <aurelien@cwb.IO>
+
+pkgname=eigen3
+pkgver=3.1.2
+pkgrel=1
+pkgdesc="Eigen is a lightweight C++ template library for vector and matrix math, a.k.a. linear algebra."
+arch=('any')
+url='http://eigen.tuxfamily.org'
+license=('MPL2')
+makedepends=('cmake' 'pkgconfig')
+source=("${pkgname}-${pkgver}.tar.bz2::http://bitbucket.org/eigen/eigen/get/${pkgver}.tar.bz2")
+
+build() {
+    mkdir -p "$srcdir"/build
+    cd "$srcdir"/build
+    cmake ../eigen-eigen-* \
+        -DCMAKE_BUILD_TYPE=Release \
+        -DCMAKE_INSTALL_PREFIX=/usr
+}
+
+package() {
+    cd "$srcdir"/build
+    make DESTDIR="$pkgdir" install
+}
diff --git a/pcr/nexuiz-data/PKGBUILD b/pcr/nexuiz-data/PKGBUILD
index edd338097..f6d3ba62c 100644
--- a/pcr/nexuiz-data/PKGBUILD
+++ b/pcr/nexuiz-data/PKGBUILD
@@ -9,11 +9,11 @@ pkgname=nexuiz-data
 _pkgsourcename=nexuiz
 pkgver=2.5.2
 _zipver=252
-pkgrel=1
+pkgrel=3
 arch=('any')
 pkgdesc="Nexuiz game data"
 conflicts=('nexuiz<2.5.1-3')
-url="http://www.nexuiz.com/"
+url="http://www.alientrap.org/games/nexuiz"
 license=("GPL")
 source=(http://downloads.sourceforge.net/${_pkgsourcename}/${_pkgsourcename}-${_zipver}.zip)
 md5sums=('d750bc328e58df8492f8d88bdcf818cb')
diff --git a/pcr/nexuiz/PKGBUILD b/pcr/nexuiz/PKGBUILD
index 5c3b50899..1e3fdfbeb 100644
--- a/pcr/nexuiz/PKGBUILD
+++ b/pcr/nexuiz/PKGBUILD
@@ -8,10 +8,10 @@
 pkgname=nexuiz
 pkgver=2.5.2
 _zipver=252
-pkgrel=2.2
+pkgrel=3
 arch=('i686' 'x86_64')
 pkgdesc="A free software first person shooter"
-url="http://www.alientrap.org/games/nexuiz/"
+url="http://www.alientrap.org/games/nexuiz"
 license=("GPL")
 depends=('alsa-lib' 'curl' 'libjpeg>=8' 'libmodplug' 'libvorbis' 'libxpm' 'libxxf86dga' 'libxxf86vm' 'sdl' 'nexuiz-data' 'libpng>=1.4.0')
 makedepends=('mesa')
diff --git a/pcr/skanlite/PKGBUILD b/pcr/skanlite/PKGBUILD
new file mode 100644
index 000000000..42a164785
--- /dev/null
+++ b/pcr/skanlite/PKGBUILD
@@ -0,0 +1,30 @@
+# Maintainer: birdflesh <antkoul at gmail dot com>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Pierre Schmitz <pierre@archlinux.de>
+
+pkgname=skanlite
+pkgver=1.0
+pkgrel=1
+pkgdesc="Image Scanning Application for KDE"
+arch=('i686' 'x86_64')
+url='http://www.kde.org/applications/graphics/skanlite'
+license=('GPL')
+depends=('kdebase-runtime' 'libksane')
+makedepends=('cmake' 'automoc4')
+source=("http://download.kde.org/stable/$pkgname/$pkgver/src/$pkgname-$pkgver.tar.bz2")
+md5sums=('e22b2719f134d2483591082026961bf5')
+
+build() {
+  cd "$srcdir"
+  mkdir build
+  cd build
+  cmake ../$pkgname-$pkgver \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/build"
+  make DESTDIR="$pkgdir" install
+}
diff --git a/pcr/swig1/PKGBUILD b/pcr/swig1/PKGBUILD
new file mode 100644
index 000000000..4cb83afd2
--- /dev/null
+++ b/pcr/swig1/PKGBUILD
@@ -0,0 +1,29 @@
+# Contributor: Hilton Medeiros <medeiros.hilton at gmail dot com>
+# Contributor: Jason Chu <jason@archlinux.org>
+# Contributor: Tom Newsom <Jeepster@gmx.co.uk>
+# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.IO>
+
+pkgname=swig1
+_pkgname=swig
+pkgver=1.3.40
+pkgrel=1
+pkgdesc="A compiler that integrates C and C++ code with scripting languages (legacy version)"
+arch=('i686' 'x86_64')
+url="http://www.swig.org/"
+license=('custom')
+depends=('gcc-libs' 'zlib')
+conflicts=('swig' 'swig-pantheon')
+provides=('swig')
+source=("http://downloads.sourceforge.net/${_pkgname}/${_pkgname}-${pkgver}.tar.gz")
+
+build() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${_pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
+}
diff --git a/pcr/yabause-git/PKGBUILD b/pcr/yabause-git/PKGBUILD
index d2b351b36..6de78f4eb 100644
--- a/pcr/yabause-git/PKGBUILD
+++ b/pcr/yabause-git/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Gustavo Alvarez <sl1pkn07@gmail.com>
 pkgname=yabause-git
-pkgver=20130213
+pkgver=20130301
 pkgrel=1
 pkgdesc="A Sega Saturn emulator (GIT version)"
 arch=('x86_64' 'i686')
@@ -15,7 +15,7 @@ makedepends=('git' 'cmake' 'mesa' 'glu')
 #_port=gtk
 _port=qt
 
-[ "${_port}" = "qt" ] && depends+=('qt')
+[ "${_port}" = "qt" ] && depends+=('qt4')
 [ "${_port}" = "gtk" ] && depends+=('gtkglext')
 
 _gitroot="git://github.com/Guillaumito/yabause.git"
diff --git a/pcr/yabause/PKGBUILD b/pcr/yabause/PKGBUILD
index 0b80f72f9..bf5aca5f3 100644
--- a/pcr/yabause/PKGBUILD
+++ b/pcr/yabause/PKGBUILD
@@ -5,13 +5,13 @@
 # Contributor: robb_force <robb_force@holybuffalo.net>
 pkgname=yabause
 pkgver=0.9.12
-pkgrel=1
+pkgrel=2
 pkgdesc='A Sega Saturn emulator.'
 url='http://yabause.org/'
 license=('GPL')
 arch=('i686' 'x86_64')
 makedepends=('cmake' 'mesa' 'glu')
-depends=('sdl' 'qt' 'openal' 'freeglut')
+depends=('sdl' 'qt4' 'openal' 'freeglut')
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 md5sums=('c7876c04489f8a1b59b3166598084cb8')