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

Conflicts:
	community/yagf/PKGBUILD
	extra/antlr2/PKGBUILD
	gnome-unstable/baobab/PKGBUILD
	gnome-unstable/baobab/baobab.install
	testing/iputils/PKGBUILD
	testing/iputils/iputils.install

11 files changed, 390 insertions, 0 deletions

diff --git a/staging/konversation/PKGBUILD b/staging/konversation/PKGBUILD
new file mode 100644
index 000000000..e491f6801
--- /dev/null
+++ b/staging/konversation/PKGBUILD
@@ -0,0 +1,40 @@
+# $Id: PKGBUILD 167386 2012-10-01 19:44:28Z stephane $
+# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: James Rayner <iphitus@gmail.com>
+# Contributor: Sergio Jovani Guzman <moret@paretux.org>
+
+pkgname=konversation
+pkgver=1.4
+pkgrel=2
+pkgdesc="A user friendly IRC client for KDE"
+arch=('i686' 'x86_64')
+url="http://konversation.kde.org"
+depends=('kdebase-runtime' 'kdepimlibs' 'python')
+makedepends=('automoc4' 'cmake' 'pkgconfig' 'docbook-xml')
+license=('GPL2' 'FDL')
+install=${pkgname}.install
+options=('!makeflags')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+sha1sums=('90741721f68a02d4345b9006a8ae53bc49ef3777')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_SKIP_RPATH=ON \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}"/build
+  make DESTDIR="${pkgdir}" install
+  
+  # Remove a bunch of symlinks pointing to non-existant files
+  for lang in pt_BR uk sv et de en nl; do
+     rm  "${pkgdir}"/usr/share/doc/kde/html/${lang}/konversation/common
+  done
+}
diff --git a/staging/konversation/konversation.install b/staging/konversation/konversation.install
new file mode 100644
index 000000000..8834e059a
--- /dev/null
+++ b/staging/konversation/konversation.install
@@ -0,0 +1,12 @@
+post_install() {
+   xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+   update-desktop-database -q
+}
+
+post_upgrade() {
+   post_install
+}
+
+post_remove() {
+   post_install
+}
diff --git a/staging/pathological/PKGBUILD b/staging/pathological/PKGBUILD
new file mode 100644
index 000000000..acf263add
--- /dev/null
+++ b/staging/pathological/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 167400 2012-10-01 23:04:53Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
+pkgname=pathological
+pkgver=1.1.3
+pkgrel=8
+pkgdesc="A puzzle game with the same feel as frozen bubble"
+arch=('i686' 'x86_64')
+url="http://pathological.sourceforge.net/"
+license=('GPL')
+depends=('python2-pygame')
+makedepends=('netpbm')
+install=pathological.install
+source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz
+        pathological.desktop pygame_181.patch encoding.patch)
+sha1sums=('70b1c9e12704c7fd3b301aa90bceee2e8373b7b9'
+          '9b57f854ce9621542d810a21c61325de343950d7'
+          '6f0aa0f74a87bd53771f2db6d3117981c4f070d3'
+          '7dbaa9ced7da0094280425a68b4c8db3382f230a')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  patch -p0 < ../encoding.patch
+  patch -p1 < ../pygame_181.patch
+  sed -i 's|X11R6/include/X11|share|' Makefile
+  sed -i 's|usr/games|usr/bin|' Makefile
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  sed -i 's|#!/usr/bin/python|#!/usr/bin/python2|' "${pkgdir}/usr/share/games/pathological/pathological.py"
+  install -D -m644 ../pathological.desktop "${pkgdir}/usr/share/applications/pathological.desktop"
+  chown root:games "${pkgdir}/var/games"
+  chmod 775 "${pkgdir}/var/games"
+  rm "${pkgdir}/var/games/pathological_scores"
+}
diff --git a/staging/pathological/encoding.patch b/staging/pathological/encoding.patch
new file mode 100644
index 000000000..394875809
--- /dev/null
+++ b/staging/pathological/encoding.patch
@@ -0,0 +1,8 @@
+--- pathological.py.orig	2009-07-10 01:49:39.000000000 -0400
++++ pathological.py	2009-07-10 01:49:53.000000000 -0400
+@@ -1,4 +1,5 @@
+ #!/usr/bin/python
++# -*- coding: utf-8 -*-
+ """
+ Copyright (C) 2003  John-Paul Gignac
+ 
diff --git a/staging/pathological/pathological.desktop b/staging/pathological/pathological.desktop
new file mode 100644
index 000000000..54817684f
--- /dev/null
+++ b/staging/pathological/pathological.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Pathological
+Comment=A puzzle game involving paths and marbles
+Exec=pathological
+Icon=pathological.xpm
+Terminal=false
+Type=Application
+Categories=Application;Game;
diff --git a/staging/pathological/pathological.install b/staging/pathological/pathological.install
new file mode 100644
index 000000000..4bc716839
--- /dev/null
+++ b/staging/pathological/pathological.install
@@ -0,0 +1,29 @@
+post_install() {
+if [ ! -e var/games/pathological_scores ]; then
+    cat << _EOF > var/games/pathological_scores
+0 all-boards 1 John-Paul
+0 all-boards 1 Kim
+0 all-boards 1 Matths
+0 all-boards 1 Carrie
+0 all-boards 1 Mike
+0 all-boards 1 Dale
+0 all-boards 1 Alesh
+0 all-boards 1 Thanks to
+0 all-boards 1 everyone who
+0 all-boards 1 contributed!
+_EOF
+fi
+  chown root:games var/games/pathological_scores
+  chmod 664 var/games/pathological_scores
+}
+
+pre_upgrade() {
+  if [ -e usr/share/games/pathological/pathological_scores ]; then
+    mv usr/share/games/pathological/pathological_scores var/games/
+  fi
+}
+
+post_upgrade() {
+  chown root:games var/games/pathological_scores
+  chmod 664 var/games/pathological_scores
+}
diff --git a/staging/pathological/pygame_181.patch b/staging/pathological/pygame_181.patch
new file mode 100644
index 000000000..4789f1519
--- /dev/null
+++ b/staging/pathological/pygame_181.patch
@@ -0,0 +1,10 @@
+--- pathological-1.1.3.orig.orig/pathological.py	2009-04-15 10:50:11.000000000 -0400
++++ pathological-1.1.3.orig/pathological.py	2009-04-15 10:50:56.000000000 -0400
+@@ -169,6 +169,7 @@
+ 	if not pygame.mixer or not pygame.mixer.music:
+ 		print "Background music not available."
+ 		return
++	pygame.mixer.music.stop()
+ 	fullname = os.path.join('music', name)
+ 	try:
+ 		pygame.mixer.music.load(fullname)
diff --git a/staging/pyqt/PKGBUILD b/staging/pyqt/PKGBUILD
new file mode 100644
index 000000000..8fba65343
--- /dev/null
+++ b/staging/pyqt/PKGBUILD
@@ -0,0 +1,92 @@
+# $Id: PKGBUILD 167324 2012-10-01 06:53:33Z andrea $
+# Maintainer: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
+# Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
+
+pkgbase=pyqt
+pkgname=('pyqt-common' 'pyqt' 'python2-pyqt')
+pkgver=4.9.5
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://riverbankcomputing.co.uk/software/pyqt/intro"
+license=('GPL')
+makedepends=('qt' 'python-sip' 'python-dbus' 'python2-sip' 'phonon'
+             'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus')
+             source=("http://downloads.sourceforge.net/${pkgbase}/PyQt-x11-gpl-${pkgver}.tar.gz")
+md5sums=('e4cdd6619c63655f7510efb4df8462fb')
+
+build() {
+  cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
+
+  cd PyQt-x11-gpl-${pkgver}
+  python configure.py \
+    --confirm-license \
+    --qsci-api
+
+  # Thanks Gerardo for the rpath fix
+  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
+
+  make
+
+  ### Python2 version ###
+  cd ../Py2Qt-x11-gpl-${pkgver}
+  python2 configure.py \
+    --confirm-license \
+    -v /usr/share/sip \
+    --qsci-api
+
+  # Thanks Gerardo for the rpath fix
+  find -name 'Makefile' | xargs sed -i 's|-Wl,-rpath,/usr/lib||g;s|-Wl,-rpath,.* ||g'
+
+  make
+}
+
+package_pyqt-common(){
+  pkgdesc="Common PyQt files shared between pyqt and python2-pyqt"
+  
+  cd PyQt-x11-gpl-${pkgver}
+  make -C pyrcc DESTDIR="${pkgdir}" install
+  make -C pylupdate DESTDIR="${pkgdir}" install
+  make -C designer INSTALL_ROOT="${pkgdir}" install
+  
+  install -Dm644 PyQt4.api "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
+}
+
+package_pyqt(){
+  pkgdesc="A set of Python 3.x bindings for the Qt toolkit"
+  depends=('qtwebkit' 'python-sip' 'python-dbus' 'pyqt-common')
+  optdepends=('phonon: enable audio and video in PyQt applications'
+              'qscintilla: QScintilla API'
+              'qt-assistant-compat: add PyQt online help in Qt Assistant')
+
+  cd PyQt-x11-gpl-${pkgver}
+  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
+  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+  # Provided by pyqt-common
+  rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
+  rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so
+  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
+}
+
+package_python2-pyqt(){
+  pkgdesc="A set of Python 2.x bindings for the Qt toolkit"
+  depends=('qtwebkit' 'python2-sip' 'python2-dbus' 'pyqt-common')
+  optdepends=('phonon: enable audio and video in PyQt applications'
+              'python2-opengl: enable OpenGL 3D graphics in PyQt applications'
+              'qscintilla: QScintilla API'
+              'qt-assistant-compat: add PyQt online help in Qt Assistant')
+  provides=('python2-qt')
+
+  cd Py2Qt-x11-gpl-${pkgver}
+  # INSTALL_ROOT is needed for the QtDesigner module, the other Makefiles use DESTDIR
+  make DESTDIR="${pkgdir}" INSTALL_ROOT="${pkgdir}" install
+
+  # Fix conflicts with pyqt
+  mv "${pkgdir}"/usr/bin/{,python2-}pyuic4
+  
+  # Provided by pyqt-common
+  rm "${pkgdir}"/usr/bin/{pylupdate4,pyrcc4}
+  rm "${pkgdir}"/usr/lib/qt/plugins/designer/libpythonplugin.so
+  rm "${pkgdir}"/usr/share/qt/qsci/api/python/PyQt4.api
+}
diff --git a/staging/python-pygame/PKGBUILD b/staging/python-pygame/PKGBUILD
new file mode 100644
index 000000000..2cd71fc35
--- /dev/null
+++ b/staging/python-pygame/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 167394 2012-10-01 22:41:51Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
+pkgbase=python-pygame
+pkgname=python2-pygame
+pkgver=1.9.1
+pkgrel=6
+pkgdesc="Python game library"
+arch=('i686' 'x86_64')
+url="http://www.pygame.org/"
+license=('LGPL')
+depends=('sdl_mixer' 'sdl_ttf' 'sdl_image' 'python2' 'portmidi')
+source=(http://pygame.org/ftp/pygame-${pkgver}release.tar.gz \
+        config.patch pygame-v4l.patch)
+sha1sums=('a45aeb0623e36ae7a1707b5f41ee6274f72ca4fa'
+          '285815e28705d5a2aea53c9d952d35fddf10dd13'
+          '7e693fb2ef5ef636f9965ba1a4eb854f8b0b5070')
+
+build() {
+  cd "${srcdir}/pygame-${pkgver}release"
+  patch -Np0 -i "${srcdir}/config.patch"
+  patch -Np1 -i "${srcdir}/pygame-v4l.patch"
+}
+
+package_python2-pygame() {
+  cd "${srcdir}/pygame-${pkgver}release"
+  python2 config.py -auto
+  python2 setup.py install --root="${pkgdir}" --prefix=/usr
+
+# Copying the examples and tests
+  cp -R examples lib/* "${pkgdir}/usr/lib/python2.7/site-packages/pygame"
+  cp -R test/* "${pkgdir}/usr/lib/python2.7/site-packages/pygame/tests"
+
+  find "${pkgdir}" -type f -exec sed -i 's#/usr/bin/env python#/usr/bin/env python2#' {} +
+
+# Fixing permissions
+  chmod 644 "${pkgdir}"/usr/include/python2.7/pygame/*
+}
diff --git a/staging/python-pygame/config.patch b/staging/python-pygame/config.patch
new file mode 100644
index 000000000..b3dab162c
--- /dev/null
+++ b/staging/python-pygame/config.patch
@@ -0,0 +1,26 @@
+Index: config_unix.py
+===================================================================
+--- config_unix.py	(revision 2567)
++++ config_unix.py	(working copy)
+@@ -174,7 +174,7 @@
+ 
+     for d in DEPS[1:]:
+         if not d.found:
+-            if not confirm("""
++            if "-auto" not in sys.argv and not confirm("""
+ Warning, some of the pygame dependencies were not found. Pygame can still
+ compile and install, but games that depend on those missing dependencies
+ will not run. Would you like to continue the configuration?"""):
+Index: config_msys.py
+===================================================================
+--- config_msys.py	(revision 2567)
++++ config_msys.py	(working copy)
+@@ -283,7 +283,7 @@
+     
+     for d in DEPS[1:]:
+         if not d.found:
+-            if not confirm("""
++            if "-auto" not in sys.argv and not confirm("""
+ Warning, some of the pygame dependencies were not found. Pygame can still
+ compile and install, but games that depend on those missing dependencies
+ will not run. Would you like to continue the configuration?"""):
diff --git a/staging/python-pygame/pygame-v4l.patch b/staging/python-pygame/pygame-v4l.patch
new file mode 100644
index 000000000..3b5a2b9d2
--- /dev/null
+++ b/staging/python-pygame/pygame-v4l.patch
@@ -0,0 +1,88 @@
+diff -crB pygame-1.9.1release/Setup.in pygame-1.9.1release-v4lpatch//Setup.in
+*** pygame-1.9.1release/Setup.in	Thu Jul  2 06:41:56 2009
+--- pygame-1.9.1release-v4lpatch//Setup.in	Thu Mar 24 17:31:22 2011
+***************
+*** 34,40 ****
+  _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
+  movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
+  scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
+! _camera src/_camera.c src/camera_v4l2.c src/camera_v4l.c $(SDL) $(DEBUG)
+  pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
+  
+  GFX = src/SDL_gfx/SDL_gfxPrimitives.c 
+--- 34,40 ----
+  _numericsndarray src/_numericsndarray.c $(SDL) $(MIXER) $(DEBUG)
+  movie src/movie.c $(SDL) $(SMPEG) $(DEBUG)
+  scrap src/scrap.c $(SDL) $(SCRAP) $(DEBUG)
+! _camera src/_camera.c src/camera_v4l2.c $(SDL) $(DEBUG)
+  pypm src/pypm.c $(SDL) $(PORTMIDI) $(PORTTIME) $(DEBUG)
+  
+  GFX = src/SDL_gfx/SDL_gfxPrimitives.c 
+diff -crB pygame-1.9.1release/src/_camera.c pygame-1.9.1release-v4lpatch//src/_camera.c
+*** pygame-1.9.1release/src/_camera.c	Sun Mar 15 20:30:41 2009
+--- pygame-1.9.1release-v4lpatch//src/_camera.c	Thu Mar 24 16:58:18 2011
+***************
+*** 160,179 ****
+  {
+  #if defined(__unix__)
+      if (v4l2_open_device(self) == 0) {
+!         if (v4l_open_device(self) == 0) {
+!             v4l2_close_device(self);
+!             return NULL;
+!         } else {
+!             self->camera_type = CAM_V4L;
+!             if (v4l_init_device(self) == 0) {
+!                 v4l2_close_device(self);
+!                 return NULL;
+!             }
+!             if (v4l_start_capturing(self) == 0) {
+!                 v4l2_close_device(self);
+!                 return NULL;
+!             }
+!         }
+      } else {
+          self->camera_type = CAM_V4L2;
+          if (v4l2_init_device(self) == 0) {
+--- 160,167 ----
+  {
+  #if defined(__unix__)
+      if (v4l2_open_device(self) == 0) {
+! 	v4l2_close_device(self);
+!         return NULL;
+      } else {
+          self->camera_type = CAM_V4L2;
+          if (v4l2_init_device(self) == 0) {
+diff -crB pygame-1.9.1release/src/camera.h pygame-1.9.1release-v4lpatch//src/camera.h
+*** pygame-1.9.1release/src/camera.h	Fri Oct 10 04:37:10 2008
+--- pygame-1.9.1release-v4lpatch//src/camera.h	Thu Mar 24 16:44:32 2011
+***************
+*** 39,45 ****
+  
+      #include <asm/types.h>          /* for videodev2.h */
+  
+-     #include <linux/videodev.h>
+      #include <linux/videodev2.h>
+  #endif
+  
+--- 39,44 ----
+***************
+*** 51,57 ****
+  #define RGB_OUT 1
+  #define YUV_OUT 2
+  #define HSV_OUT 4
+- #define CAM_V4L 1
+  #define CAM_V4L2 2
+  
+  struct buffer 
+--- 50,55 ----
+***************
+*** 111,118 ****
+  int v4l2_close_device (PyCameraObject* self);
+  int v4l2_open_device (PyCameraObject* self);
+  
+- /* internal functions specific to v4l */
+- int v4l_open_device (PyCameraObject* self);
+- int v4l_init_device(PyCameraObject* self);
+- int v4l_start_capturing(PyCameraObject* self);
+  #endif
+--- 109,112 ----