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

Conflicts:
	community-testing/addresses/PKGBUILD
	community-testing/gcc-avr/PKGBUILD
	community-testing/gnumail/PKGBUILD
	community-testing/gnustep-back/PKGBUILD
	community-testing/gnustep-base/PKGBUILD
	community-testing/gnustep-gui/PKGBUILD
	community-testing/llvm/PKGBUILD
	community-testing/systemd/PKGBUILD
	community/llvm/PKGBUILD
	community/lua-yajl-git/PKGBUILD
	community/mingw32-gcc/PKGBUILD
	community/python-scipy/PKGBUILD
	community/virtualbox/PKGBUILD
	core/bin86/PKGBUILD
	core/cloog-ppl/PKGBUILD
	core/gcc/PKGBUILD
	core/mpfr/PKGBUILD
	extra/ilmbase/PKGBUILD
	extra/kdeedu/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/latex2html/PKGBUILD
	extra/libmad/PKGBUILD
	extra/postgresql/PKGBUILD
	multilib-testing/binutils-multilib/PKGBUILD
	multilib-testing/gcc-multilib/PKGBUILD
	multilib-testing/lib32-glibc/PKGBUILD
	multilib/gcc-multilib/PKGBUILD
	multilib/gcc-multilib/gcc-go.install
	testing/bin86/PKGBUILD
	testing/binutils/PKGBUILD
	testing/coreutils/PKGBUILD
	testing/glibc/PKGBUILD
	testing/gnome-control-center/PKGBUILD
	testing/less/PKGBUILD
	testing/linux-api-headers/PKGBUILD
	testing/mdadm/PKGBUILD
	testing/mpfr/PKGBUILD
	testing/udev/PKGBUILD

2 files changed, 17 insertions, 74 deletions

diff --git a/extra/slang/PKGBUILD b/extra/slang/PKGBUILD
index 846ff527d..12810e517 100644
--- a/extra/slang/PKGBUILD
+++ b/extra/slang/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 106236 2011-01-15 15:15:05Z giovanni $
+# $Id: PKGBUILD 120537 2011-04-25 07:37:13Z remy $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=slang
-pkgver=2.2.3
-pkgrel=2
+pkgver=2.2.4
+pkgrel=1
 pkgdesc="S-Lang is a powerful interpreted language"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.jedsoft.org/slang/"
@@ -12,17 +12,22 @@ license=('GPL')
 depends=('glibc' 'pcre' 'zlib')
 backup=('etc/slsh.rc')
 options=('!makeflags')
-source=(ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2
-        ${pkgname}-2.2.3-faster-baud-rates.patch)
-md5sums=('17e1864de999ae9535a9f7350a010427'
-         '4e22e58836100adfae34e824f5fbcb1c')
+source=(ftp://ftp.fu-berlin.de/pub/unix/misc/slang/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2)
+md5sums=('7fcfd447e378f07dd0c0bae671fe6487')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  patch -Np1 -i "${srcdir}"/${pkgname}-2.2.3-faster-baud-rates.patch || return 1
-
   ./configure --prefix=/usr \
-              --sysconfdir=/etc || return 1
-  make || return 1
-  make DESTDIR="${pkgdir}" install-all || return 1
+              --sysconfdir=/etc
+  make
+}
+
+check() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make check
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install-all
 }
diff --git a/extra/slang/slang-2.2.3-faster-baud-rates.patch b/extra/slang/slang-2.2.3-faster-baud-rates.patch
deleted file mode 100644
index b37b253f4..000000000
--- a/extra/slang/slang-2.2.3-faster-baud-rates.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-The baud rate constant list used for setting the SLang_TT_Baud_Rate
-variable contains baud rates only up to 230400; any faster baud rate is
-not properly detected, and SLang_TT_Baud_Rate is left as 0.  This caused
-problems at least with the Midnight Commander:
-
-  https://www.midnight-commander.org/ticket/2452
-
-(recent versions of rxvt-unicode set speed 4000000 for the pty (and
-there is no configurable option for this), and mc then considers such
-terminal as "slow" due to SLang_TT_Baud_Rate == 0 and turns off some
-useful UI options).
-
-This patch adds missing values to the Baud_Rates array in src/slutty.c,
-which fixes the baud rate detection problem.  It also brings this array
-in sync with Baudrate_Map in modules/termios-module.c, where those
-higher baud rates were already present for some time.
-
-
---- slang-2.2.3/src/slutty.c.alt-baud-rates	2010-12-15 13:56:48.000000000 +0300
-+++ slang-2.2.3/src/slutty.c	2011-01-09 22:34:59.911000008 +0300
-@@ -170,6 +170,42 @@ static Baud_Rate_Type Baud_Rates [] =
- #ifdef B230400
-      {B230400, 230400},
- #endif
-+#ifdef B460800
-+     {B460800, 460800},
-+#endif
-+#ifdef B500000
-+     {B500000, 500000},
-+#endif
-+#ifdef B576000
-+     {B576000, 576000},
-+#endif
-+#ifdef B921600
-+     {B921600, 921600},
-+#endif
-+#ifdef B1000000
-+     {B1000000, 1000000},
-+#endif
-+#ifdef B1152000
-+     {B1152000, 1152000},
-+#endif
-+#ifdef B1500000
-+     {B1500000, 1500000},
-+#endif
-+#ifdef B2000000
-+     {B2000000, 2000000},
-+#endif
-+#ifdef B2500000
-+     {B2500000, 2500000},
-+#endif
-+#ifdef B3000000
-+     {B3000000, 3000000},
-+#endif
-+#ifdef B3500000
-+     {B3500000, 3500000},
-+#endif
-+#ifdef B4000000
-+     {B4000000, 4000000},
-+#endif
-      {0, 0}
- };