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

Conflicts:
	community/bitcoin/PKGBUILD
	community/ecryptfs-utils/PKGBUILD
	community/erlang/PKGBUILD
	community/esmtp/PKGBUILD
	community/gmic/PKGBUILD
	community/ibus-sunpinyin/PKGBUILD
	community/libev/PKGBUILD
	community/libmirage/PKGBUILD
	community/libraw/PKGBUILD
	community/lilypond/PKGBUILD
	community/luajit/PKGBUILD
	community/matchbox-window-manager/PKGBUILD
	community/miniupnpc/PKGBUILD
	community/mplayer2/PKGBUILD
	community/mumble/PKGBUILD
	community/oss/PKGBUILD
	community/pidgin-lwqq/PKGBUILD
	community/postgis/PKGBUILD
	community/python2-pytables/PKGBUILD
	community/qmc2/PKGBUILD
	community/qtfm/PKGBUILD
	community/ruby-gtk3/PKGBUILD
	community/tea/PKGBUILD
	community/yacpi/PKGBUILD
	core/bridge-utils/PKGBUILD
	core/gcc/PKGBUILD
	core/libsasl/PKGBUILD
	core/lvm2/PKGBUILD
	core/net-tools/PKGBUILD
	core/ppp/PKGBUILD
	core/pptpclient/PKGBUILD
	core/sdparm/PKGBUILD
	core/systemd/PKGBUILD
	core/sysvinit-tools/PKGBUILD
	extra/aisleriot/PKGBUILD
	extra/arora/PKGBUILD
	extra/bluez-hcidump/PKGBUILD
	extra/bluez/PKGBUILD
	extra/cups/PKGBUILD
	extra/cyrus-sasl/PKGBUILD
	extra/dhcp/PKGBUILD
	extra/gnome-bluetooth/PKGBUILD
	extra/gnome-desktop/PKGBUILD
	extra/gnutls/PKGBUILD
	extra/gts/PKGBUILD
	extra/guile/PKGBUILD
	extra/harfbuzz/PKGBUILD
	extra/iptraf-ng/PKGBUILD
	extra/json-c/PKGBUILD
	extra/kdenetwork/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/kdesdk-kate/PKGBUILD
	extra/libatasmart/PKGBUILD
	extra/libbsd/PKGBUILD
	extra/libdmtx/PKGBUILD
	extra/libhangul/PKGBUILD
	extra/libindi/PKGBUILD
	extra/libpeas/PKGBUILD
	extra/libsmbios/PKGBUILD
	extra/libspiro/PKGBUILD
	extra/libsrtp/PKGBUILD
	extra/libxml2/PKGBUILD
	extra/libxrender/PKGBUILD
	extra/libxvmc/PKGBUILD
	extra/llvm/PKGBUILD
	extra/maxima/PKGBUILD
	extra/msmtp/PKGBUILD
	extra/ortp/PKGBUILD
	extra/perl-dbd-sqlite/PKGBUILD
	extra/perl-yaml-syck/PKGBUILD
	extra/php/PKGBUILD
	extra/pm-utils/PKGBUILD
	extra/pulseaudio/PKGBUILD
	extra/pyqt4/PKGBUILD
	extra/scim-anthy/PKGBUILD
	extra/scim-chewing/PKGBUILD
	extra/scim-m17n/PKGBUILD
	extra/scim/PKGBUILD
	extra/ssmtp/PKGBUILD
	extra/texmacs/PKGBUILD
	extra/v86d/PKGBUILD
	extra/vlc/PKGBUILD
	extra/webkitgtk/PKGBUILD
	extra/webkitgtk2/PKGBUILD
	extra/wireshark/PKGBUILD
	extra/zsh/PKGBUILD
	libre/bogofilter-libre/PKGBUILD
	libre/ecasound-libre/PKGBUILD
	libre/libretools/libretools.install
	libre/mc-libre/PKGBUILD

1 files changed, 22 insertions, 21 deletions

diff --git a/community/freetalk/PKGBUILD b/community/freetalk/PKGBUILD
index 26540364e..824785677 100644
--- a/community/freetalk/PKGBUILD
+++ b/community/freetalk/PKGBUILD
@@ -1,35 +1,36 @@
-# $Id: PKGBUILD 65202 2012-02-20 10:13:19Z spupykin $
+# $Id: PKGBUILD 92552 2013-06-08 11:18:48Z bpiotrowski $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=freetalk
 pkgver=3.2
-pkgrel=5
+pkgrel=6
 pkgdesc="A console based Jabber client"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/freetalk"
 license=('GPL')
-depends=('loudmouth' 'guile')
+depends=('loudmouth' 'guile1.8')
 install=freetalk.install
-source=(http://savannah.gnu.org/download/freetalk/freetalk-$pkgver.tar.gz)
-md5sums=('ab09bd07dde158551f151d281b14642c')
+source=(http://savannah.gnu.org/download/freetalk/freetalk-$pkgver.tar.gz
+        freetalk-3.2-glibc210.patch)
+md5sums=('ab09bd07dde158551f151d281b14642c'
+         '0da1d0a0f606d2b279fe676a80a3eb32')
 
-build() {
-  cd $srcdir/freetalk-$pkgver
-
-  ./configure --prefix=/usr
-
-  patch -p0 src/callbacks.cc <<EOF
-156c156,159
-< 	*strchr (from, '/') = '\0';
----
-> 	{
-> 	char *_tmp = (char*)strchr (from, '/');
-> 	*_tmp = '\0';
-> 	}
-EOF
+prepare(){
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../freetalk-3.2-glibc210.patch
+}
 
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --disable-rpath \
+    GUILE=/usr/bin/guile1.8 \
+    GUILE_CONFIG=/usr/bin/guile-config1.8
   make
-  make DESTDIR=$pkgdir install
-  rm $pkgdir/usr/share/info/dir
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  rm "$pkgdir/usr/share/info/dir"
 }