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

Conflicts:
	community/cpuburn/PKGBUILD
	extra/ghex/PKGBUILD
	extra/gstreamer0.10-good/PKGBUILD

8 files changed, 91 insertions, 40 deletions

diff --git a/community/cpuburn/PKGBUILD b/community/cpuburn/PKGBUILD
index c3d806865..a6ab49089 100644
--- a/community/cpuburn/PKGBUILD
+++ b/community/cpuburn/PKGBUILD
@@ -4,27 +4,19 @@
 
 pkgname=cpuburn
 pkgver=1.4a
-pkgrel=1
+pkgrel=2
 pkgdesc="CPU testing utilities in optimized assembler for maximum loading of CPUs"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://pages.sbcglobal.net/redelm/"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/ubuntu/+source/cpuburn/"
 license=('GPL')
 depends=()
-makedepends=('tar') # needs to be extracted manually because of malformed source file name
-source=(http://pages.sbcglobal.net/redelm/cpuburn_${pkgver/./_}_tar.gz cpuburn.patch)
-noextract=($pkgname_${pkgver/./_}_tar.gz)
+source=(https://launchpad.net/ubuntu/+archive/primary/+files/cpuburn_$pkgver.orig.tar.gz
+	cpuburn.patch)
 md5sums=('a9e1df40c660324eb08e91847cbc41b9'
          'f3c77db7592ac02ee83958f07ceb8986')
 
 build() {
-  cd "$srcdir"
-
-  # Workaround for malformed source file name
-  mv cpuburn_${pkgver/./_}_tar.gz "$pkgname_$pkgver.tar.gz"
-  tar zxf "$pkgname_$pkgver.tar.gz"
-
-  cd "$pkgname-$pkgver"
-  # a patch from debian/ubuntu patchset
+  cd "$srcdir/$pkgname-$pkgver"
   patch -Np1 -i ../cpuburn.patch
   make
   install -Dm755 burnBX $pkgdir/usr/bin/burnBX
diff --git a/community/cwiid/PKGBUILD b/community/cwiid/PKGBUILD
new file mode 100644
index 000000000..8f928328a
--- /dev/null
+++ b/community/cwiid/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 53971 2011-08-10 19:27:06Z schiv $
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: Wieland Hoffmann <the_mineo@web.de>
+# Contributor: Birger Moellering <bmoellering@googlemail.com>
+
+pkgname=cwiid
+pkgver=0.6.00
+pkgrel=9
+pkgdesc="Linux Nintendo Wiimote interface"
+arch=('i686' 'x86_64')
+url="http://abstrakraft.org/cwiid"
+depends=('bluez' 'gtk2' 'python2')
+makedepends=('flex' 'bison')
+license=('GPL')
+install=cwiid.install
+source=("http://abstrakraft.org/cwiid/downloads/$pkgname-$pkgver.tgz"
+        'bluez4.patch')
+md5sums=('8d574afdeedc5e5309c87a72d744316a'
+         '19b288723d1f2b97a3e5288ab9de3313')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  # bluez v4 compatibility
+  patch -Np1 -i "$srcdir/bluez4.patch"
+
+  ./configure --prefix=/usr \
+              --sysconfdir=/etc \
+              --disable-ldconfig \
+              --with-python=python2
+
+  LDFLAGS+="$(pkg-config --libs bluez) -lrt -pthread" make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir" install
+
+  chmod 644 "$pkgdir/usr/lib/libcwiid.a"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/cwiid/bluez4.patch b/community/cwiid/bluez4.patch
new file mode 100644
index 000000000..dbbc790c5
--- /dev/null
+++ b/community/cwiid/bluez4.patch
@@ -0,0 +1,11 @@
+--- cwiid-0.6.00.orig/libcwiid/bluetooth.c.old	2008-09-30 16:52:55.000000000 -0500
++++ cwiid-0.6.00.orig/libcwiid/bluetooth.c	2008-09-30 16:53:19.000000000 -0500
+@@ -122,7 +122,7 @@
+ 		}
+ 
+ 		/* timeout (10000) in milliseconds */
+-		if (hci_remote_name(sock, &dev_list[i].bdaddr, BT_NAME_LEN,
++		if (hci_read_remote_name(sock, &dev_list[i].bdaddr, BT_NAME_LEN,
+ 		                    (*bdinfo)[bdinfo_count].name, 10000)) {
+ 			cwiid_err(NULL, "Bluetooth name read error");
+ 			err = 1;
diff --git a/community/cwiid/cwiid.install b/community/cwiid/cwiid.install
new file mode 100644
index 000000000..05e698be7
--- /dev/null
+++ b/community/cwiid/cwiid.install
@@ -0,0 +1,10 @@
+post_install() {
+  echo "==> In order to use wminput ensure you load the uinput kernel"
+  echo "==> module and have assigned correct access to /dev/uinput"
+}
+
+post_upgrade() {
+  post_install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/gnubiff-gtk/PKGBUILD b/community/gnubiff-gtk/PKGBUILD
index daef9fda2..10f6fa42f 100644
--- a/community/gnubiff-gtk/PKGBUILD
+++ b/community/gnubiff-gtk/PKGBUILD
@@ -1,33 +1,31 @@
-# $Id: PKGBUILD 14206 2010-04-02 08:59:16Z spupykin $
+# $Id: PKGBUILD 53956 2011-08-10 14:39:02Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Tom K <tomk@runbox.com>
 # Contributor: Todd Musall <tmusall@gmail.com>
 
 pkgname=gnubiff-gtk
 pkgver=2.2.13
-pkgrel=2
+pkgrel=3
 pkgdesc="Mail notification program that checks for mail and displays headers when new mail has arrived. GTK version."
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gnubiff.sourceforge.net/"
 license=("GPL")
 depends=('libglade' 'openssl' 'popt')
+makedepends=('intltool')
 conflicts=(gnubiff)
-source=(http://downloads.sourceforge.net/sourceforge/gnubiff/gnubiff-$pkgver.tar.gz \
+source=(http://downloads.sourceforge.net/sourceforge/gnubiff/gnubiff-$pkgver.tar.gz
 	build.patch)
 md5sums=('65423957eb027b94c9e661611c0e4271'
          '96fde605eb69e300f6014546d4339beb')
 
 build() {
-  cd $startdir/src/gnubiff-$pkgver
-
+  cd $srcdir/gnubiff-$pkgver
   patch -p1 <../build.patch
-
   export LDFLAGS=-lX11
-
-  ./configure --prefix=/usr --disable-gnome --disable-fam --with-password --with-password-string
-  make || return 1
-  make DESTDIR=$startdir/pkg install || return 1
-  rm -rf $startdir/pkg/usr/lib
-  rm -rf $startdir/pkg/usr/share/gnome-2.0
+  ./configure --prefix=/usr --disable-gnome --disable-fam --with-password --with-password-string="65423957eb027b94c9e661611c0e4271"
+  make
+  make DESTDIR=$pkgdir install
+  rm -rf $pkgdir/usr/lib
+  rm -rf $pkgdir/usr/share/gnome-2.0
   rm -rf ${pkgdir}/usr/share/info/dir
 }
diff --git a/community/gnubiff/PKGBUILD b/community/gnubiff/PKGBUILD
index 6bdb40527..65b80b55c 100644
--- a/community/gnubiff/PKGBUILD
+++ b/community/gnubiff/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 44789 2011-04-11 20:19:28Z spupykin $
+# $Id: PKGBUILD 53951 2011-08-10 14:38:08Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Tom K <tomk@runbox.com>
 # Contributor: Todd Musall <tmusall@gmail.com>
 
 pkgname=gnubiff
 pkgver=2.2.13
-pkgrel=1
+pkgrel=2
 pkgdesc="Mail notification program that checks for mail and displays headers when new mail has arrived"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gnubiff.sourceforge.net/"
 license=("GPL")
-depends=('gnome-panel')
-makedepends=('perlxml')
+depends=('libglade' 'gtk2' 'popt')
+makedepends=('perlxml' 'intltool')
 conflicts=(gnubiff-gtk)
 source=(http://downloads.sourceforge.net/gnubiff/gnubiff-$pkgver.tar.gz)
 md5sums=('65423957eb027b94c9e661611c0e4271')
@@ -46,11 +46,8 @@ diff -wbBur gnubiff-2.2.10/src/support.h gnubiff-2.2.10.my/src/support.h
  	}
 EOF
 
-  export LDFLAGS="$LDFLAGS -lgnomeui-2"
-  export CFLAGS="$CFLAGS -I/usr/include/libgnomeui-2.0"
-  export CPPFLAGS="$CPPFLAGS -I/usr/include/libgnomeui-2.0"
-  ./configure --prefix=/usr --with-password --with-password-string --disable-fam \
-	--disable-gnome
+  ./configure --prefix=/usr --with-password --with-password-string="65423957eb027b94c9e661611c0e4271" \
+	--disable-fam --disable-gnome
   make
   make DESTDIR=$startdir/pkg install
 
diff --git a/community/qbittorrent/PKGBUILD b/community/qbittorrent/PKGBUILD
index ec4711370..484e4dfe9 100644
--- a/community/qbittorrent/PKGBUILD
+++ b/community/qbittorrent/PKGBUILD
@@ -3,7 +3,7 @@
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 
 pkgname=qbittorrent
-pkgver=2.8.3
+pkgver=2.8.4
 pkgrel=1
 pkgdesc="A bittorrent client written in C++ / Qt4 using the good libtorrent library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ optdepends=('python2: needed for search'
 install='qbittorrent.install'
 source=("http://downloads.sourceforge.net/sourceforge/qbittorrent/qbittorrent-${pkgver}.tar.gz"
         'python2.patch')
-md5sums=('2e977ece476a83116beee5bf9df7a6c1'
+md5sums=('85bbc6fe250bf86e734e9891e7c06d6f'
          'db0d79fee8ce3470ad3741d36b02a94c')
 
 build() {
diff --git a/community/rsyslog/PKGBUILD b/community/rsyslog/PKGBUILD
index 28b8dc0ca..f447d8602 100644
--- a/community/rsyslog/PKGBUILD
+++ b/community/rsyslog/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 52620 2011-07-26 12:19:20Z spupykin $
+# $Id: PKGBUILD 53977 2011-08-10 20:52:33Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=rsyslog
-pkgver=5.8.3
+pkgver=5.8.4
 pkgrel=1
 pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability"
 url="http://www.rsyslog.com/"
@@ -22,7 +22,7 @@ source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz"
 	'rsyslog'
 	'rsyslog.logrotate'
 	'rsyslog.conf.d')
-md5sums=('b505c1558814335c000f15b59c4db562'
+md5sums=('a2c2a65ac84d9a895c52a754aff61986'
          'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da'
          '8065db4bef3061a4f000ba58779f6829'
          '1a0cd4530dd5d1439456d5ae230574d9')