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

Conflicts:
	community/cantata/PKGBUILD
	community/gpsmanshp/PKGBUILD
	community/pigz/PKGBUILD
	extra/calligra/PKGBUILD
	extra/genius/PKGBUILD
	extra/gnumeric/PKGBUILD
	extra/goffice/PKGBUILD
	extra/graphicsmagick/PKGBUILD
	extra/libgphoto2/PKGBUILD
	extra/python-numpy/PKGBUILD

3 files changed, 4 insertions, 95 deletions

diff --git a/pcr/trisquel-themes/PKGBUILD b/pcr/trisquel-themes/PKGBUILD
index f65f5c92b..69aad1870 100644
--- a/pcr/trisquel-themes/PKGBUILD
+++ b/pcr/trisquel-themes/PKGBUILD
@@ -2,8 +2,8 @@
 
 pkgname=trisquel-themes
 pkgver=6.0
-_miniver="5.99-2"
-pkgrel=1
+_miniver="5.99-3"
+pkgrel=2
 pkgdesc="Themes from Trisquel, including GTK2, Metacity, XFWM and Openbox themes"
 arch=('any')
 url=http://trisquel.info
@@ -12,6 +12,8 @@ depends=()
 optdepends=('gtk-engine-equinox: for Trisquel GTK2 theme')
 source=(http://archive.trisquel.info/trisquel/pool/main/t/trisquel-gtk-theme/trisquel-gtk-theme_${pkgver}.tar.gz
 http://archive.trisquel.info/trisquel/pool/main/t/trisquel-mini-data/trisquel-mini-data_${_miniver}.tar.gz)
+md5sums=('8d81a535adade0e52a0c584c07f87a2a'
+         'e448057b6e2d933916511c2c3d3585e1')
 
 build() {
 	:
@@ -25,5 +27,3 @@ package() {
               ${pkgdir}/usr/share/themes/
     done
 }
-md5sums=('8d81a535adade0e52a0c584c07f87a2a'
-         'dd222c321374692f57e21c47aa70d402')
diff --git a/pcr/yabause-git/PKGBUILD b/pcr/yabause-git/PKGBUILD
deleted file mode 100644
index 6de78f4eb..000000000
--- a/pcr/yabause-git/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# Maintainer: Gustavo Alvarez <sl1pkn07@gmail.com>
-pkgname=yabause-git
-pkgver=20130301
-pkgrel=1
-pkgdesc="A Sega Saturn emulator (GIT version)"
-arch=('x86_64' 'i686')
-url="http://yabause.org/"
-license=('GPL')
-conflicts=('yabause')
-provides=('yabause')
-depends=('mini18n-git' 'openal' 'sdl' 'freeglut')
-makedepends=('git' 'cmake' 'mesa' 'glu')
-
-#Enable QT or GTK
-#_port=gtk
-_port=qt
-
-[ "${_port}" = "qt" ] && depends+=('qt4')
-[ "${_port}" = "gtk" ] && depends+=('gtkglext')
-
-_gitroot="git://github.com/Guillaumito/yabause.git"
-_gitname="yabause"
-
-build() {
-  cd "${srcdir}"
-  msg "Connecting to GIT server...."
-
-  if [ -d "${_gitname}" ]; then
-    cd "${_gitname}" && git pull
-    msg "The local files are updated."
-  else
-    git clone --depth=1 "${_gitroot}" "${_gitname}"
-  fi
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting build..."
-
-  rm -rf "${srcdir}/${_gitname}-build"
-  cp -R "${srcdir}/${_gitname}" "${srcdir}/${_gitname}-build"
-  cd "${srcdir}/${_gitname}-build/${_gitname}"
-
-  LDFLAGS+=",-z,noexecstack"
-  cmake . -DCMAKE_INSTALL_PREFIX=/usr -DYAB_PORTS="${_port}" -DYAB_NETWORK=ON -DYAB_OPTIMIZED_DMA=ON -DYAB_PERKEYNAME=ON
-  make
-}
-
-package() {
-  cd "${srcdir}/${_gitname}-build/${_gitname}"
-  make DESTDIR="${pkgdir}/" install
-}
diff --git a/pcr/yabause/PKGBUILD b/pcr/yabause/PKGBUILD
deleted file mode 100644
index c65bcbe2f..000000000
--- a/pcr/yabause/PKGBUILD
+++ /dev/null
@@ -1,41 +0,0 @@
-# Maintainer : Harley Laue <losinggeneration@gmail.com>
-# Contributor: Hyacinthe Cartiaux <hyacinthe.cartiaux@free.fr>
-# Contributor: Anton Shestakov <engored*ya.ru>
-# Contributor: Tiago Camargo <tcamargo@gmail.com>
-# Contributor: robb_force <robb_force@holybuffalo.net>
-pkgname=yabause
-pkgver=0.9.12
-pkgrel=3
-pkgdesc='A Sega Saturn emulator.'
-url='http://yabause.org/'
-license=('GPL')
-arch=('i686' 'x86_64')
-makedepends=('cmake' 'mesa' 'glu')
-depends=('sdl' 'qt4' 'openal' 'freeglut')
-source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('c7876c04489f8a1b59b3166598084cb8')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  [ -e build ] && rm -rf build
-  mkdir build
-  cd build
-  cmake \
-    -DCMAKE_BUILD_TYPE=RelWithDebInfo \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DQT_QMAKE_EXECUTABLE=/usr/bin/qmake-qt4 \
-    -DYAB_PORTS=qt \
-    -DYAB_MULTIBUILD=OFF \
-    -DYAB_NETWORK=ON \
-    -DYAB_OPTIMIZED_DMA=on \
-    -DYAB_PERKEYNAME=ON \
-    ..
-
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/build"
-  make DESTDIR="${pkgdir}" install
-}