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

Conflicts:
	community/bwbar/PKGBUILD
	community/directfb/PKGBUILD
	community/extremetuxracer/PKGBUILD
	community/freedroidrpg/PKGBUILD
	community/gnash/PKGBUILD
	community/guake/PKGBUILD
	community/pidgin-libnotify/PKGBUILD
	community/png2ico/PKGBUILD
	community/ruby-gtk2/PKGBUILD
	community/torcs/PKGBUILD
	community/virtualbox/PKGBUILD
	extra/abiword/PKGBUILD
	extra/alsaplayer/PKGBUILD
	extra/automoc4/PKGBUILD
	extra/cagibi/PKGBUILD
	extra/fltk/PKGBUILD
	extra/gnome-desktop2/PKGBUILD
	extra/gnome-python/PKGBUILD
	extra/gnome-sharp/PKGBUILD
	extra/gnugo/PKGBUILD
	extra/gstreamer0.10-good/PKGBUILD
	extra/gtk2/PKGBUILD
	extra/gtkmm/PKGBUILD
	extra/imlib2/PKGBUILD
	extra/koffice/PKGBUILD
	extra/lcms/PKGBUILD
	extra/libao/PKGBUILD
	extra/libcue/PKGBUILD
	extra/libdaemon/PKGBUILD
	extra/libgnome-media-profiles/PKGBUILD
	extra/libotf/PKGBUILD
	extra/libotr/PKGBUILD
	extra/libots/PKGBUILD
	extra/libreoffice/PKGBUILD
	extra/libtiff/PKGBUILD
	extra/libwebkit/PKGBUILD
	extra/libwmf/PKGBUILD
	extra/libxfcegui4/PKGBUILD
	extra/mjpegtools/PKGBUILD
	extra/netpbm/PKGBUILD
	extra/php/PKGBUILD
	extra/plotutils/PKGBUILD
	extra/poppler/PKGBUILD
	extra/qrencode/PKGBUILD
	extra/qt/PKGBUILD
	extra/qtiplot/PKGBUILD
	extra/rssh/PKGBUILD
	extra/scim-chewing/PKGBUILD
	extra/scim-m17n/PKGBUILD
	extra/scim-pinyin/PKGBUILD
	extra/scim-tables/PKGBUILD
	extra/scim-uim/PKGBUILD
	extra/tsocks/PKGBUILD
	extra/vigra/PKGBUILD
	extra/w3m/PKGBUILD
	extra/wv/PKGBUILD
	extra/xclip/PKGBUILD
	extra/xfce4-datetime-plugin/PKGBUILD
	extra/xfce4-notes-plugin/PKGBUILD
	extra/xfce4-quicklauncher-plugin/PKGBUILD
	extra/xfce4-sensors-plugin/PKGBUILD
	extra/xorg-font-util/PKGBUILD
	extra/xorg-setxkbmap/PKGBUILD
	extra/xorg-xev/PKGBUILD
	extra/xsane/PKGBUILD
	extra/yakuake/PKGBUILD
	extra/zvbi/PKGBUILD
	multilib/lib32-cairo/PKGBUILD
	multilib/lib32-gdk-pixbuf2/PKGBUILD
	multilib/lib32-libcanberra/PKGBUILD
	multilib/lib32-libcups/PKGBUILD
	multilib/lib32-libglade/PKGBUILD
	multilib/lib32-libpng/PKGBUILD
	multilib/lib32-libtiff/PKGBUILD
	multilib/lib32-pango/PKGBUILD
	multilib/lib32-qt/PKGBUILD
	multilib/lib32-sdl_image/PKGBUILD
	multilib/wine/PKGBUILD
	testing/vlc/PKGBUILD
	testing/xulrunner/PKGBUILD

2 files changed, 25 insertions, 5 deletions

diff --git a/extra/xbill/03_fix_ftbfs_binutils_gold.diff b/extra/xbill/03_fix_ftbfs_binutils_gold.diff
new file mode 100644
index 000000000..09436cd79
--- /dev/null
+++ b/extra/xbill/03_fix_ftbfs_binutils_gold.diff
@@ -0,0 +1,15 @@
+Description: Fix FTBFS with binutils-gold
+Author: Vincent Legout <vincent@legout.info>
+Bug-Debian: http://bugs.debian.org/556690
+Last-Update: 2009-12-08
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -21,7 +21,7 @@
+ VPATH = @srcdir@
+ 
+ ALL_CFLAGS =	$(CFLAGS) $(CPPFLAGS) -I$(srcdir)
+-ALL_LDFLAGS =	$(CFLAGS) $(LDFLAGS)
++ALL_LDFLAGS =	$(CFLAGS) $(LDFLAGS) -lXpm
+ IMAGE_DEFINES=-DIMAGES=\"${datadir}/xbill\"
+ SCORE_DEFINES=-DSCOREFILE=\"${localstatedir}/xbill.scores\"
+ 
diff --git a/extra/xbill/PKGBUILD b/extra/xbill/PKGBUILD
index 7b9503c78..0754ac6e4 100644
--- a/extra/xbill/PKGBUILD
+++ b/extra/xbill/PKGBUILD
@@ -1,21 +1,26 @@
-# $Id: PKGBUILD 122895 2011-05-07 05:36:47Z eric $
+# $Id: PKGBUILD 148662 2012-02-05 11:46:02Z ibiru $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=xbill
 pkgver=2.1
-pkgrel=7
+pkgrel=8
 pkgdesc="A game that tests your reflexes as you seek and destroy all forms of Bill"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.xbill.org/"
 license=('GPL')
-depends=('xaw3d')
+depends=('xaw3d>=1.6')
 makedepends=('libxaw')
 install=xbill.install
-source=(http://www.xbill.org/download/${pkgname}-${pkgver}.tar.gz)
-md5sums=('585e4866b15255a24203db9959407b2f')
+source=(http://www.xbill.org/download/${pkgname}-${pkgver}.tar.gz
+        03_fix_ftbfs_binutils_gold.diff)
+md5sums=('585e4866b15255a24203db9959407b2f'
+         'e260a6cd4f9af003d249961cb60e2d01')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+  # taken from Debian
+  patch -Np1 -i ${srcdir}/03_fix_ftbfs_binutils_gold.diff
+  autoconf -v -f
   ./configure --prefix=/usr --mandir=/usr/share/man --localstatedir=/var/games \
     --disable-motif  --enable-athena --disable-gtk
   make