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

Conflicts:
	community/codeblocks/PKGBUILD
	community/gnash/PKGBUILD
	community/i3lock/PKGBUILD
	community/instead/PKGBUILD
	extra/asio/PKGBUILD
	extra/cups/PKGBUILD
	extra/libdrm/PKGBUILD
	extra/liborigin2/PKGBUILD
	extra/mesa/PKGBUILD
	extra/mkvtoolnix/PKGBUILD
	extra/ocrad/PKGBUILD
	extra/qtiplot/PKGBUILD
	extra/scribus/PKGBUILD
	extra/xdg-user-dirs/PKGBUILD

9 files changed, 208 insertions, 115 deletions

diff --git a/pcr/miniupnpd/PKGBUILD b/pcr/miniupnpd/PKGBUILD
index 57a04c290..da6f373c9 100644
--- a/pcr/miniupnpd/PKGBUILD
+++ b/pcr/miniupnpd/PKGBUILD
@@ -41,3 +41,5 @@ package() {
         cd "$pkgdir"
         mv usr/sbin usr/bin
 }
+md5sums=('484dbda7c428b2d5f3768500a48d3375'
+         'f862f79b673359adc80faf0be914394f')
diff --git a/pcr/rfc5766-turn-server/PKGBUILD b/pcr/rfc5766-turn-server/PKGBUILD
index 81eb3d14d..e85f98bb8 100644
--- a/pcr/rfc5766-turn-server/PKGBUILD
+++ b/pcr/rfc5766-turn-server/PKGBUILD
@@ -3,20 +3,21 @@
 pkgname=rfc5766-turn-server
 _portname=turnserver
 pkgver=1.8.6.0
-pkgrel=1
+pkgrel=2
 epoch=
 pkgdesc="Free open source implementation of TURN and STUN Server"
-arch=('i686' 'x86_64')
+arch=('i686' 'x86_64' 'mips64el')
 url="http://code.google.com/p/rfc5766-turn-server/"
 license=('custom:BSDNew')
-makedepends=('gcc>=3.4.4' 'make')
+makedepends=('gcc>=3.4.4' 'make' 'hiredis' 'postgresql-libs' 'libmariadbclient')
 depends=('libevent')
-#no redis headers in redi package
-optdepends=('postgresql-client: to use postgresql' 'libmysqlclient')
+optdepends=('postgresql-client: to use postgresql'
+            'mariadb: mariadb backend'
+            'redis: redis backend')
 backup=("etc/turnserver.conf" "etc/turnuserdb.conf")
 changelog=ChangeLog
-source=(https://${pkgname}.googlecode.com/files/${_portname}-$pkgver.tar.gz)
-sha1sums=('155990b95d399542db1bb497f1746c1b9bb290d2')
+source=(https://${pkgname}.googlecode.com/files/${_portname}-$pkgver.tar.gz
+        turn.service stun.service)
 
 build() {
   cd "${srcdir}/$_portname-${pkgver}"
@@ -51,11 +52,20 @@ package() {
     install
   
   
-  install -D "$pkgdir/usr/share/$pkgname/examples/etc/turnserver.conf" "$pkgdir/etc/turnserver.conf"
-  install -D "$pkgdir/usr/share/$pkgname/examples/etc/turnuserdb.conf" "$pkgdir/etc/turnuserdb.conf"
+  install -D "$pkgdir/usr/share/$pkgname/examples/etc/turnserver.conf" \
+             "$pkgdir/etc/turnserver.conf"
+  install -D "$pkgdir/usr/share/$pkgname/examples/etc/turnuserdb.conf" \
+             "$pkgdir/etc/turnuserdb.conf"
+  install -D "$srcdir/stun.service" \
+             "$pkgdir/usr/lib/systemd/system/stun.service"
+  install -D "$srcdir/turn.service" \
+             "$pkgdir/usr/lib/systemd/system/turn.service"
   rm -r "$pkgdir/usr/etc"
 
   chmod 644 "$pkgdir/usr/lib/libturnclient.a"
 
   install -Dm 644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
+md5sums=('def4cc2ea6239795edab12b5eee5f8ed'
+         '1da26c3a1fe29a8961e6b9d73f9048d3'
+         '83670d79026c67c7701481ee9d39f100')
diff --git a/pcr/rfc5766-turn-server/stun.service b/pcr/rfc5766-turn-server/stun.service
new file mode 100644
index 000000000..bddb6168a
--- /dev/null
+++ b/pcr/rfc5766-turn-server/stun.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=STUN Server
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/turnserver --stun-only
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/rfc5766-turn-server/turn.service b/pcr/rfc5766-turn-server/turn.service
new file mode 100644
index 000000000..54cc5f01a
--- /dev/null
+++ b/pcr/rfc5766-turn-server/turn.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=TURN Server
+After=network.target
+
+[Service]
+Type=simple
+ExecStart=/usr/bin/turnserver
+
+[Install]
+WantedBy=multi-user.target
diff --git a/pcr/ryzom-hg-client/PKGBUILD b/pcr/ryzom-hg-client/PKGBUILD
new file mode 100644
index 000000000..294e28024
--- /dev/null
+++ b/pcr/ryzom-hg-client/PKGBUILD
@@ -0,0 +1,37 @@
+# $Id: pkgbuild-mode.el,v 1.23 2007/10/20 16:02:14 juergen Exp $
+# Maintainer: Jorge Araya Navarro <jorge@abril>
+pkgname=ryzom-hg-client
+pkgver=20130706
+pkgrel=2
+pkgdesc="An awesome free software 3D MMORPG game, Game client."
+arch=('i686' 'x86_64')
+url="http://www.ryzom.com/"
+license=('AGPL')
+groups=("ryzom-hg")
+depends=('ryzom-hg-nel' 'expat')
+makedepends=('cpptest' 'cmake' 'bison' 'ryzom-hg-nel')
+provides=("ryzom-hg-client")
+conflicts=("ryzom-hg-client")
+replaces=("ryzom-hg-client")
+source=("http://repo.parabolagnulinux.org/other/ryzom-$pkgver-$pkgrel-any.src.tar.gz")
+sha256sums=('03ddd23d0b2e92c419dcdebe264890b5b1c906992ae93225be43869739f9f475')
+mksource=("ryzom-$pkgver-${pkgrel}::hg+https://bitbucket.org/ryzomcore")
+_CMAKE_COMMON_ARGS=('-DWITH_STATIC=ON' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_LUA51=ON'  '-DWITH_NEL_SAMPLES=OFF' '-DWITH_RYZOM_TOOLS=ON') # cmake arguments for server and client
+
+_CMAKE_CLIENT_ARGS=( '-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=ON' '-DWITH_NEL=OFF') # cmake args for building client
+
+build() {
+  mkdir -p "$srcdir/build-client"
+  cd "$srcdir/build-client"
+  cmake -b -Wno-dev "$srcdir/code" ${_CMAKE_COMMON_ARGS[*]} ${_CMAKE_CLIENT_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin
+
+  make
+}
+
+package() {
+  cd "$srcdir/build-client"
+  make DESTDIR="$pkgdir" install
+  install -Dm 644 "$srcdir/ryzom.desktop" "$pkgdir/usr/share/applications/"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/pcr/ryzom-hg-nel/PKGBUILD b/pcr/ryzom-hg-nel/PKGBUILD
new file mode 100644
index 000000000..c66aaf567
--- /dev/null
+++ b/pcr/ryzom-hg-nel/PKGBUILD
@@ -0,0 +1,42 @@
+# $Id: pkgbuild-mode.el,v 1.23 2007/10/20 16:02:14 juergen Exp $
+# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
+pkgname=ryzom-hg-nel
+pkgver=20130706
+pkgrel=5
+pkgdesc="An awesome free software 3D MMORPG game, Game client."
+arch=('i686' 'x86_64')
+url="http://www.ryzom.com/"
+license=('AGPL')
+groups=("ryzom-hg")
+depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost'  'luabind' 'libsquish' 'lua51' 'lua51-sql-mysql')
+makedepends=('cpptest' 'cmake' 'bison')
+provides=("ryzom-hg-nel")
+conflicts=("ryzom-hg-nel")
+replaces=("ryzom-hg-nel")
+
+source=("http://repo.parabolagnulinux.org/other/ryzom-$pkgver-2-any.src.tar.gz")
+sha256sums=('03ddd23d0b2e92c419dcdebe264890b5b1c906992ae93225be43869739f9f475')
+
+mksource=("$pkgname-$pkgver-${pkgrel}::hg+https://bitbucket.org/ryzomcore")
+
+_CMAKE_COMMON_ARGS=('-DWITH_STATIC=OFF' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_NEL_SAMPLES=OFF' '-DWITH_RYZOM_TOOLS=OFF') # cmake arguments for server and client
+
+_CMAKE_LIB_ARGS=('-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=OFF' '-DWITH_NEL=ON')
+
+build() {
+  mkdir -p "$srcdir/build-nel"
+  cd "$srcdir/build-nel"
+  cmake -b -Wno-dev "$srcdir/code" ${_CMAKE_COMMON_ARGS[*]} ${_CMAKE_LIB_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin
+  
+  make
+}
+
+package() {
+  cd "$srcdir/build-nel"
+  make DESTDIR="$pkgdir" install
+  # WWWInit.h is in /usr/include/w3c-libwww according to libwww package!
+  sed -ie 's/WWWInit\.h/w3c-libwww\/WWWInit.h/' ${pkgdir}/usr/include/nel/gui/group_html.h
+}
+
+# vim:set ts=2 sw=2 et:
+
diff --git a/pcr/ryzom-hg/PKGBUILD b/pcr/ryzom-hg/PKGBUILD
index 8bc928115..8277ccf17 100644
--- a/pcr/ryzom-hg/PKGBUILD
+++ b/pcr/ryzom-hg/PKGBUILD
@@ -1,100 +1,64 @@
-# Maintainer:Bjoern Bidar <theodorstormgrade@gmail.com
-#_gui_toolkit=qt # qt or gtk
-_build_server=false # set true to build server (default:false)
-_build_client=true  # set false to don't build client (default:true)
-_CMAKE_COMMON_ARGS=('-DWITH_STATIC=OFF' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_LUA51=ON'  '-DWITH_NEL_SAMPLES=OFF' '-DWITH_RYZOM_TOOLS=OFF'.) # cmake arguments for server and client
-_CMAKE_SERVER_ARGS=('-DWITH_RYZOM_SERVER=ON' '-DWITH_RYZOM_CLIENT=OFF' '-DWITH_DRIVER_OPENGL=OFF' '-DWITH_DRIVER_OPENAL=OFF' ) # cmake args for building server
-_CMAKE_CLIENT_ARGS=( '-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=ON' ) # cmake args for building client
-if [ $_build_client = true ] ; then
-  true && pkgname=( 'ryzom-client-hg'  )
-fi
+# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
+# Maintainer (aur): Bjoern Bidar <theodorstormgrade@gmail.com>
 
-if [ $_build_server = true ] ; then
-  true && pkgname=( 'ryzom-client-hg' 'ryzom-server-hg')
-fi 
-pkgbase=ryzom-hg
-pkgname=ryzom-hg
-pkgver=20130331
-pkgrel=1
-pkgdesc="Ryzom is a Free to Play MMORPG . This version is for playing on an official server or launch a server"
+pkgname=('ryzom-hg-nel' 'ryzom-hg-client')
+pkgbase="ryzom-hg"
+pkgver=20130706
+pkgrel=2
+pkgdesc="An awesome free software 3D MMORPG game"
 arch=('i686' 'x86_64')
 url="http://www.ryzom.com/"
 license=('AGPL3')
-depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2'  'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost'  'luabind' 'libsquish' 'lua51'  'lua51-sql-mysql') 
-conflicts=('ryzom-client-latest-hg')
-groups=('ryzom')
+groups=('ryzom-hg')
+depends=('curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'libpng' 'libjpeg' 'rrdtool' 'libwww' 'boost'  'luabind' 'libsquish' 'lua51' 'lua51-sql-mysql')
 makedepends=('mercurial' 'cpptest' 'cmake' 'bison')
-provides=('ryzom')
-source=( 'ryzom.sh' 'ryzom.desktop' )
-md5sums=('a5ca7dfae7b9073f78cd1b0b7380755f'
-         '71d5136d40ec4e76c2ac2b0c9e506aef')
+# ryzom-20130706-2-any.src.tar.gz
+source=("http://repo.parabolagnulinux.org/other/ryzom-20130706-2-any.src.tar.gz"
+  'ryzom.sh'
+  'ryzom.desktop')
+sha256sums=('03ddd23d0b2e92c419dcdebe264890b5b1c906992ae93225be43869739f9f475'
+            'd3d8286f5b60a63cbda83795cbe1a1d6e1442f33116502cc6563f8db86e458b6'
+            '722c60ceb198214620b11a0866f458578e1128d39e63274ea8b43c1ed96ff196')
 
+mksource=("$pkgname-$pkgver-${pkgrel}::hg+https://bitbucket.org/ryzomcore")
 
+_CMAKE_COMMON_ARGS=('-DWITH_STATIC=OFF' '-DWITH_NEL_TOOLS=OFF' '-DWITH_NEL_TESTS=OFF' '-DWITH_LUA51=ON'  '-DWITH_NEL_SAMPLES=OFF' '-DWITH_RYZOM_TOOLS=OFF') # cmake arguments for server and client
 
+_CMAKE_LIB_ARGS=('-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=OFF' '-DWITH_DRIVER_OPENGL=OFF' '-DWITH_DRIVER_OPENAL=OFF' '-DWITH_NEL=ON')
 
-case $_gui_toolkit in
-  qt) _CMAKE_COMMON_ARGS=( ${_CMAKE_COMMON_ARGS_ARGS[*]} '-DWITH_QT=ON' ) ;;
-  gtk) _CMAKE_COMMON_ARGS=( ${_CMAKE_COMMON_ARGS_ARGS[*]} '-DWITH_GTK=ON' ) ;;
-esac 
+_CMAKE_CLIENT_ARGS=( '-DWITH_RYZOM_SERVER=OFF' '-DWITH_RYZOM_CLIENT=ON' '-DWITH_NEL=OFF') # cmake args for building client
 
+package_ryzom-hg-nel() {
+  # options and directives that can be overridden
+  #pkgver=20130706
+  #pkgrel=0
+  pkgdesc="An awesome free software 3D MMORPG game. NeL library."
+  #depends=()
+  
+  provides=('ryzom-hg-nel')
+  conflicts=('ryzom-hg-nel')
+  replaces=('ryzom-hg-nel')
 
-_hg_root='https://bitbucket.org/ryzom/ryzomcore'
-_hg_name='ryzomcore' 
+  mkdir -p "$srcdir/build-nel"
+  cd "$srcdir/build-nel"
 
-prepare() {
-    if [ -d "$_hg_name" ] ; then # fetch sources
-	cd "$_hg_name"
-	hg pull && hg update
-	cd ..
-    else
-	hg clone "$_hg_root"
-    fi
-    
-    msg2 "hg clone done or server timeout"
+  cmake -b -Wno-dev "$srcdir/code" ${_CMAKE_COMMON_ARGS[*]} ${_CMAKE_LIB_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin
+  make
+  make DESTDIR="$pkgdir" install
 }
-build() {
-    cd $_hg_name
-    
-    if [ $_build_client = true ] ; then	
-	mkdir -p "$srcdir/build-client"
-	cd "$srcdir/build-client"
-	msg "client is $_build_client, building client"
-	cmake -b "$srcdir/$_hg_name/code"  ${_CMAKE_COMMON_ARGS_ARGS[*]} ${_CMAKE_CLIENT_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin
-	msg "Starting make, to build client"
-	make
-	
-    fi
-   
-    if [ $_build_server = true ] ; then
-	mkdir -p "$srcdir/build-server"
-	cd "$srcdir/build-server"
-	msg "client is $_build_server, building server"
-	cmake -b "$srcdir/$_hg_name/code"  ${_CMAKE_COMMON_ARGS_ARGS[*]} ${_CMAKE_SERVER_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin
-	msg "Starting make, to build server"   
-	make	
-    fi
-}
-
-if [ $_build_client = true ] ; then
-    
-    package_ryzom-client-hg() {
-	pkgdesc="Ryzom is a Free to Play MMORPG . This version is for playing on an official server"
-	depends=( 'curl' 'freetype2' 'libx11' 'mesa' 'libxxf86vm' 'openal' 'freealut' 'libogg' 'libvorbis' 'libxml2' 'cmake' 'libpng' 'libjpeg' 'rrdtool' 'bison' 'libwww' 'boost' 'cpptest' 'luabind' 'libsquish' 'lua51'  'lua51-sql-mysql' 'ryzom-data' )
-	cd "$srcdir/build-client"
-	make DESTDIR="$pkgdir/" install
-	install -Dm 644 ${srcdir}/ryzom.desktop ${pkgdir}/usr/share/applications
-	sed -ie 's/\/usr\/bin\/ryzom_client/ryzom/' ${pkgdir}/usr/share/applications/ryzom.desktop # replace ryzom_client with our script
-	install -Dm755  ${srcdir}/ryzom.sh  ${pkgdir}/usr/bin/ryzom	
-    }
-fi
 
-if [ $_build_server = true ] ; then
-    
-    package_ryzom-server-hg() {
-	pkgdesc="Ryzom is a Free to Play MMORPG . This is the version to run a server"
-	cd "$srcdir/build-server"
-	make DESTDIR="$pkgdir/" install	
-    }
-fi
+package_ryzom-hg-client() {
+  # options and directives overrides
+  pkgdesc="An awesome free software 3D MMORPG game. Game client."
+  provides=('ryzom-hg-client')
+  conflicts=('ryzom-hg-client')
+  replaces=('ryzom-hg-client')
+  depends=('ryzom-hg-nel')
 
+  mkdir -p "$srcdir/build-client"
+  cd "$srcdir/build-client"
 
+  cmake -b -Wno-dev "$srcdir/code" ${_CMAKE_COMMON_ARGS[*]} ${_CMAKE_CLIENT_ARGS[*]} -DCMAKE_INSTALL_PREFIX=/usr -DRYZOM_ETC_PREFIX=/etc/ryzom -DRYZOM_SHARE_PREFIX=/usr/share/ryzom -DRYZOM_BIN_PREFIX=/usr/bin -DRYZOM_GAMES_PREFIX=/usr/bin
+  make
+  make DESTDIR="$pkgdir" install
+}
diff --git a/pcr/ryzom-hg/SRCBUILD b/pcr/ryzom-hg/SRCBUILD
new file mode 100644
index 000000000..a04662b0d
--- /dev/null
+++ b/pcr/ryzom-hg/SRCBUILD
@@ -0,0 +1,40 @@
+# Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
+pkgname=("ryzom-hg")
+pkgver=20130708
+pkgrel=3
+pkgdesc="An awesome free software 3D MMORPG game"
+arch=(any)
+url="https://www.ryzom.com/"
+license=('AGPL3')
+makedepends=('mercurial')
+
+source=("ryzom.sh"
+  "ryzom.desktop")
+
+_hgroot='https://bitbucket.org/ryzom/ryzomcore'
+_hgrepo='ryzomcore'
+
+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"
+}
+
+package() {
+  PKGEXT=${SRCEXT}
+  PKGDEST=${SRCDEST}
+  cp ${srcdir}/ryzom.sh ${pkgdir}/
+  cp ${srcdir}/ryzom.desktop ${pkgdir}/
+  cp -a ${srcdir}/ryzomcore/code ${pkgdir}/
+}
+sha256sums=('d3d8286f5b60a63cbda83795cbe1a1d6e1442f33116502cc6563f8db86e458b6'
+            '722c60ceb198214620b11a0866f458578e1128d39e63274ea8b43c1ed96ff196')
diff --git a/pcr/smtube/PKGBUILD b/pcr/smtube/PKGBUILD
deleted file mode 100644
index d54983bb0..000000000
--- a/pcr/smtube/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Guest One <theguestone at gmail dot com>
-pkgname=smtube
-pkgver=1.7
-pkgrel=1
-pkgdesc="Search and download videos from YouTube"
-arch=('i686' 'x86_64')
-url="http://smplayer.sourceforge.net"
-license=('GPL')
-depends=('qt4' 'smplayer')
-source=(http://downloads.sourceforge.net/smplayer/$pkgname-$pkgver.tar.bz2)
-
-md5sums=('d9a954e1b337f0c850dcfc6063255056')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make QMAKE=qmake-qt4 LRELEASE=lrelease-qt4 PREFIX="/usr"
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make QMAKE=qmake-qt4 LRELEASE=lrelease-qt4 PREFIX="/usr" DESTDIR="$pkgdir" install
-}
\ No newline at end of file