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

Conflicts:
	community-staging/mlt/PKGBUILD
	community-testing/acetoneiso2/PKGBUILD
	community-testing/paraview/PKGBUILD
	community-testing/qbittorrent/PKGBUILD
	community-testing/virtualbox/PKGBUILD
	community-testing/virtualbox/virtualbox.install
	community/chmsee/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/kdeutils/PKGBUILD
	extra/libmpdclient/PKGBUILD
	extra/xf86-video-ati/PKGBUILD
	extra/xfce4-session/PKGBUILD
	extra/xfce4-smartbookmark-plugin/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	multilib/lib32-libdrm/PKGBUILD
	multilib/lib32-readline/PKGBUILD

2 files changed, 100 insertions, 10 deletions

diff --git a/community/gtypist/PKGBUILD b/community/gtypist/PKGBUILD
index 74851f851..84c32cba4 100644
--- a/community/gtypist/PKGBUILD
+++ b/community/gtypist/PKGBUILD
@@ -1,24 +1,28 @@
-# $Id: PKGBUILD 44710 2011-04-11 12:22:30Z spupykin $
+# $Id: PKGBUILD 57751 2011-11-02 08:47:29Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Ben Mazer <blm@groknil.org>
 # Contributor: Mike Douglas <code_monkey@gooeylinux.org>
 
 pkgname=gtypist
-pkgver=2.8.5
+pkgver=2.9
 pkgrel=1
 pkgdesc="universal typing tutor"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/gtypist/gtypist.html"
 license=("GPL")
-depends=('ncurses>=5.2' 'perl')
+depends=('ncurses' 'perl')
+makedepends=('emacs')
 install=gtypist.install
-source=(ftp://ftp.gnu.org/gnu/gtypist/$pkgname-$pkgver.tar.gz)
-md5sums=('49ea1bb5ac51c74a9c75c0dd6d890463')
+source=(ftp://ftp.gnu.org/gnu/gtypist/$pkgname-$pkgver.tar.gz
+	ncurses.patch)
+md5sums=('4500940fb1cde36899afd957d64236bb'
+         '17b3a69119e3bd791f0941e0f93fb8b3')
 
 build() {
- cd $srcdir/$pkgname-$pkgver
- ./configure --prefix=/usr
- make
- make prefix=$pkgdir/usr install
- rm -f $pkgdir/usr/share/info/dir
+  cd $srcdir/$pkgname-$pkgver
+  patch -p1 <$srcdir/ncurses.patch
+  ./configure --prefix=/usr
+  make
+  make prefix=$pkgdir/usr install
+  rm -f $pkgdir/usr/share/info/dir
 }
diff --git a/community/gtypist/ncurses.patch b/community/gtypist/ncurses.patch
new file mode 100644
index 000000000..ae17733fb
--- /dev/null
+++ b/community/gtypist/ncurses.patch
@@ -0,0 +1,86 @@
+diff -wbBur gtypist-2.9/configure gtypist-2.9.my/configure
+--- gtypist-2.9/configure	2011-11-01 01:31:47.000000000 +0400
++++ gtypist-2.9.my/configure	2011-11-02 12:31:42.000000000 +0400
+@@ -4478,8 +4478,8 @@
+ 
+ 
+ #AC_CHECK_HEADER(curses.h, HAVE_CURSES_H=1)
+-ac_fn_c_check_header_mongrel "$LINENO" "ncursesw/ncurses.h" "ac_cv_header_ncursesw_ncurses_h" "$ac_includes_default"
+-if test "x$ac_cv_header_ncursesw_ncurses_h" = xyes; then :
++ac_fn_c_check_header_mongrel "$LINENO" "ncurses.h" "ac_cv_header_ncurses_h" "$ac_includes_default"
++if test "x$ac_cv_header_ncurses_h" = xyes; then :
+   HAVE_NCURSESW_H=1
+ fi
+ 
+diff -wbBur gtypist-2.9/configure.ac gtypist-2.9.my/configure.ac
+--- gtypist-2.9/configure.ac	2011-10-30 19:26:40.000000000 +0400
++++ gtypist-2.9.my/configure.ac	2011-11-02 12:30:18.000000000 +0400
+@@ -40,7 +40,7 @@
+ AC_CHECK_HEADERS([unistd.h alloca.h argz.h errno.h fcntl.h langinfo.h libintl.h limits.h locale.h malloc.h stddef.h stdio_ext.h stdlib.h string.h strings.h sys/param.h unistd.h])
+ 
+ #AC_CHECK_HEADER(curses.h, HAVE_CURSES_H=1)
+-AC_CHECK_HEADER(ncursesw/ncurses.h, HAVE_NCURSESW_H=1)
++AC_CHECK_HEADER(ncurses.h, HAVE_NCURSESW_H=1)
+ 
+ # We prefer ncurses to curses if both are found.
+ dnl if test -n "$HAVE_NCURSES_H" -a -n "$HAVE_LIBNCURSES";  then
+diff -wbBur gtypist-2.9/src/cursmenu.c gtypist-2.9.my/src/cursmenu.c
+--- gtypist-2.9/src/cursmenu.c	2011-10-31 01:35:20.000000000 +0400
++++ gtypist-2.9.my/src/cursmenu.c	2011-11-02 12:30:27.000000000 +0400
+@@ -24,7 +24,7 @@
+ #ifdef HAVE_PDCURSES
+ #include <curses.h>
+ #else
+-#include <ncursesw/ncurses.h>
++#include <ncurses.h>
+ #endif
+ 
+ #include "error.h"
+diff -wbBur gtypist-2.9/src/error.c gtypist-2.9.my/src/error.c
+--- gtypist-2.9/src/error.c	2011-09-26 15:35:03.000000000 +0400
++++ gtypist-2.9.my/src/error.c	2011-11-02 12:30:30.000000000 +0400
+@@ -25,7 +25,7 @@
+ #ifdef HAVE_PDCURSES
+ #include <curses.h>
+ #else
+-#include <ncursesw/ncurses.h>
++#include <ncurses.h>
+ #endif
+ 
+ #include <stdlib.h>
+diff -wbBur gtypist-2.9/src/gtypist.c gtypist-2.9.my/src/gtypist.c
+--- gtypist-2.9/src/gtypist.c	2011-10-31 03:24:25.000000000 +0400
++++ gtypist-2.9.my/src/gtypist.c	2011-11-02 12:30:24.000000000 +0400
+@@ -31,7 +31,7 @@
+ #ifdef HAVE_PDCURSES
+ #include <curses.h>
+ #else
+-#include <ncursesw/ncurses.h>
++#include <ncurses.h>
+ #endif
+ 
+ #include <time.h>
+diff -wbBur gtypist-2.9/src/script.c gtypist-2.9.my/src/script.c
+--- gtypist-2.9/src/script.c	2011-10-26 12:51:57.000000000 +0400
++++ gtypist-2.9.my/src/script.c	2011-11-02 12:30:37.000000000 +0400
+@@ -24,7 +24,7 @@
+ #ifdef HAVE_PDCURSES
+ #include <curses.h>
+ #else
+-#include <ncursesw/ncurses.h>
++#include <ncurses.h>
+ #endif
+ 
+ #include "error.h"
+diff -wbBur gtypist-2.9/src/utf8.c gtypist-2.9.my/src/utf8.c
+--- gtypist-2.9/src/utf8.c	2011-10-31 03:11:27.000000000 +0400
++++ gtypist-2.9.my/src/utf8.c	2011-11-02 12:30:43.000000000 +0400
+@@ -23,7 +23,7 @@
+ #ifdef HAVE_PDCURSES
+ #include <curses.h>
+ #else
+-#include <ncursesw/ncurses.h>
++#include <ncurses.h>
+ #endif
+ 
+ #include <stdlib.h>