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

Conflicts:
	community/chmsee/PKGBUILD
	community/flumotion/PKGBUILD
	community/gnash/PKGBUILD
	community/kadu/PKGBUILD
	community/mythplugins/PKGBUILD
	community/performous/PKGBUILD
	community/sleuthkit/PKGBUILD
	community/virtualbox/PKGBUILD
	community/wbar/PKGBUILD
	core/attr/PKGBUILD
	core/binutils/PKGBUILD
	core/heimdal/PKGBUILD
	core/sqlite3/PKGBUILD
	extra/acpid/PKGBUILD
	extra/apache-ant/PKGBUILD
	extra/aria2/PKGBUILD
	extra/boost/PKGBUILD
	extra/bs/PKGBUILD
	extra/bzr/PKGBUILD
	extra/cvsps/PKGBUILD
	extra/dosbox/PKGBUILD
	extra/ettercap-gtk/PKGBUILD
	extra/fetchmail/PKGBUILD
	extra/gnome-desktop-sharp/PKGBUILD
	extra/gnome-panel/PKGBUILD
	extra/gptfdisk/PKGBUILD
	extra/gqmpeg/PKGBUILD
	extra/gstreamer0.10-base/PKGBUILD
	extra/gstreamer0.10-ugly/PKGBUILD
	extra/gtk-theme-switch2/PKGBUILD
	extra/icecast/PKGBUILD
	extra/kdeedu/PKGBUILD
	extra/kmldonkey/PKGBUILD
	extra/kmplayer/PKGBUILD
	extra/libbtctl/PKGBUILD
	extra/libftdi/PKGBUILD
	extra/liborigin2/PKGBUILD
	extra/libpst/PKGBUILD
	extra/libx86/PKGBUILD
	extra/lsdvd/PKGBUILD
	extra/mc/PKGBUILD
	extra/monotone/PKGBUILD
	extra/multitail/PKGBUILD
	extra/nbsmtp/PKGBUILD
	extra/nickle/PKGBUILD
	extra/nppangband/PKGBUILD
	extra/numlockx/PKGBUILD
	extra/pidgin/PKGBUILD
	extra/poppler/PKGBUILD
	extra/python-gtkglext/PKGBUILD
	extra/scim/PKGBUILD
	extra/socat/PKGBUILD
	extra/speedcrunch/PKGBUILD
	extra/transmission/PKGBUILD
	extra/vbetool/PKGBUILD
	extra/vlc/PKGBUILD
	extra/xchat-gnome/xchat-gnome.install
	libre/kernel26-libre/PKGBUILD
	libre/pacman/PKGBUILD
	libre/xchat-gnome-libre/PKGBUILD
	libre/xchat-gnome-libre/gtk2-2.20.patch
	libre/xchat-gnome-libre/xchat-gnome-0.26.1-deprecated-symbol.patch
	libre/xchat-gnome-libre/xchat-gnome.install
	multilib/nspluginwrapper/PKGBUILD
	testing/libgweather/libgweather.install
	testing/mesa/PKGBUILD

2 files changed, 4 insertions, 29 deletions

diff --git a/extra/telepathy-idle/PKGBUILD b/extra/telepathy-idle/PKGBUILD
index aff371792..7390c8b74 100644
--- a/extra/telepathy-idle/PKGBUILD
+++ b/extra/telepathy-idle/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 120807 2011-04-26 15:59:24Z ibiru $
+# $Id: PKGBUILD 123992 2011-05-15 17:48:59Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
 # Contributor: Samuel Mendes <heka.lok@gmail.com>
 pkgname=telepathy-idle
-pkgver=0.1.9
+pkgver=0.1.10
 pkgrel=1
 pkgdesc="An IRC connection manager for Telepathy"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,15 +13,11 @@ license=('LGPL')
 depends=('telepathy-glib' 'openssl')
 makedepends=('libxslt' 'python2')
 install=telepathy-idle.install
-source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz
-        python27.patch)
-md5sums=('423f2cc0481bdb32facb850eaf586ff2'
-         '03661efde8f768417e224720e1346d7b')
+source=(http://telepathy.freedesktop.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('570a431e3e28ca6ebf3f0c84198f0b9a')
 
 build() {
     cd "${srcdir}/${pkgname}-${pkgver}"
-    patch -Np1 -i "${srcdir}/python27.patch"
-    autoreconf -fi
     ./configure --prefix=/usr \
     	--libexecdir=/usr/lib/telepathy
     make
diff --git a/extra/telepathy-idle/python27.patch b/extra/telepathy-idle/python27.patch
deleted file mode 100644
index f8abffb57..000000000
--- a/extra/telepathy-idle/python27.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -Nur telepathy-idle-0.1.7.orig/configure.ac telepathy-idle-0.1.7/configure.ac
---- telepathy-idle-0.1.7.orig/configure.ac	2010-12-07 03:52:29.000000000 -0800
-+++ telepathy-idle-0.1.7/configure.ac	2010-12-07 09:41:21.179715253 -0800
-@@ -103,7 +103,7 @@
-   AC_MSG_ERROR([xsltproc (from the libxslt source package) is required])
- fi
- PYTHON=
--AC_CHECK_PROGS([PYTHON], [python2.3 python2.4 python2.5 python])
-+AC_CHECK_PROGS([PYTHON], [python2.3 python2.4 python2.5 python2.7 python])
- if test -z "$PYTHON"; then
-   AC_MSG_ERROR([Python is required to compile this package])
- fi
-@@ -111,7 +111,7 @@
- 
- dnl check for a version of python that can run the twisted tests
- AC_MSG_CHECKING([for Python with Twisted and IRC protocol support])
--for TEST_PYTHON in python2.5 python2.6 python; do
-+for TEST_PYTHON in python2.5 python2.6 python2.7 python; do
-   if $TEST_PYTHON -c "from sys import version_info; import dbus, dbus.mainloop.glib; raise SystemExit(version_info < (2, 5, 0, 'final', 0))" >/dev/null 2>&1; then
-     if $TEST_PYTHON -c "import twisted.words.protocols.irc, twisted.internet.reactor" >/dev/null 2>&1; then
-       AM_CONDITIONAL([WANT_TWISTED_TESTS], true)