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, 11 insertions, 11 deletions

diff --git a/extra/python-lxml/PKGBUILD b/extra/python-lxml/PKGBUILD
index 3985812b8..c8272f0d2 100644
--- a/extra/python-lxml/PKGBUILD
+++ b/extra/python-lxml/PKGBUILD
@@ -1,23 +1,24 @@
-# $Id: PKGBUILD 183648 2013-04-26 02:48:29Z angvp $
+# $Id: PKGBUILD 188212 2013-06-13 03:55:11Z angvp $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 
 pkgbase=python-lxml
 pkgname=('python-lxml' 'python2-lxml' 'python-lxml-docs')
-pkgver=3.1.2
+pkgver=3.2.1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('BSD' 'custom')
 url="http://lxml.de/"
-makedepends=('python2' 'python' 'libxslt')
+makedepends=('python2' 'python' 'libxslt' 'python-cssselect' 'python2-cssselect')
 source=(http://pypi.python.org/packages/source/l/lxml/lxml-${pkgver}.tar.gz{,.asc})
-md5sums=('6f2173f4fd5b13fbc9f8a5096d23d524'
+md5sums=('d183ccd6bbd5ca139e9db9e9a675787e'
          'SKIP')
 
-check() {
-  cd lxml-$pkgver
-  make PYTHON=python2 test
-  make PYTHON=python test
-}
+# Temporary commented due a conflict with devtools and lxml
+#check() {
+#  cd lxml-$pkgver
+#  make PYTHON=python2 test
+#  make PYTHON=python test
+#}
 
 package_python2-lxml() {
   pkgdesc="Python2 binding for the libxml2 and libxslt libraries"
@@ -39,8 +40,7 @@ package_python2-lxml() {
 package_python-lxml() {
   pkgdesc="Python3 binding for the libxml2 and libxslt libraries"
   depends=('python' 'libxslt')
-  optdepends=('python-cssselect'
-              'python-lxml-docs: offline docs')
+  optdepends=('python-lxml-docs: offline docs')
 
   cd lxml-$pkgver
   python setup.py install --root="${pkgdir}" --optimize=1