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

Conflicts:
	multilib/lib32-libcups/PKGBUILD
	multilib/lib32-mesa/PKGBUILD
	multilib/lib32-qt/PKGBUILD
	multilib/wine_gecko/PKGBUILD
	staging/kdebase-runtime/PKGBUILD
	staging/kdegraphics-gwenview/PKGBUILD
	staging/libkexiv2/PKGBUILD
	testing/akonadi/PKGBUILD
	testing/k3b/PKGBUILD
	testing/kdebase-workspace/PKGBUILD
	testing/kdebindings-python/PKGBUILD
	testing/kdeedu-kig/PKGBUILD
	testing/kdeedu-rocs/PKGBUILD
	testing/openldap/PKGBUILD
	testing/openldap/slapd

9 files changed, 312 insertions, 34 deletions

diff --git a/community/dvtm/PKGBUILD b/community/dvtm/PKGBUILD
index f7962892f..8e2791853 100644
--- a/community/dvtm/PKGBUILD
+++ b/community/dvtm/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 64667 2012-02-17 15:34:11Z lfleischer $
+# $Id: PKGBUILD 74674 2012-08-01 19:22:27Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Giorgio Lando <patroclo7@gmail.com>
 # Contributor: bender02 at gmx dot com
 
 pkgname=dvtm
-pkgver=0.7
-pkgrel=2
+pkgver=0.8
+pkgrel=1
 pkgdesc='Dynamic virtual terminal manager.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.brain-dump.org/projects/dvtm/'
@@ -13,7 +13,7 @@ license=('MIT')
 depends=('ncurses')
 source=("http://www.brain-dump.org/projects/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'config.h')
-md5sums=('d8ef63bad5b48324ad040630c51a1c26'
+md5sums=('c565067557c9be4cdc63aecd0932452e'
          '50ae76c4b33864f0cf051417443cc422')
 
 build() {
diff --git a/community/incron/PKGBUILD b/community/incron/PKGBUILD
index e509458b5..6f526c274 100644
--- a/community/incron/PKGBUILD
+++ b/community/incron/PKGBUILD
@@ -1,22 +1,24 @@
-# $Id: PKGBUILD 74562 2012-07-30 14:14:51Z spupykin $
+# $Id: PKGBUILD 74646 2012-08-01 06:33:04Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Roberto Alsina <ralsina@kde.org>
 # Contributor: scj <scj(at)archlinux(dot)us>
 
 pkgname=incron
 pkgver=0.5.10
-pkgrel=2
+pkgrel=3
 pkgdesc="Like the regular cron but is driven by filesystem events instead of time periods"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://incron.aiken.cz/"
 license=('GPL')
 depends=('gcc-libs' 'bash')
 install=incron.install
-source=("http://inotify.aiken.cz/download/incron/$pkgname-$pkgver.tar.gz"
-    	'incron.init')
 options=('emptydirs')
+source=("http://inotify.aiken.cz/download/incron/$pkgname-$pkgver.tar.gz"
+	'incron.init'
+	'incrond.service')
 md5sums=('67f8b671db8169edccc8ef11c7d2c8be'
-         '648e1ca1a4b1e624401d9d71aa3756b3')
+         '648e1ca1a4b1e624401d9d71aa3756b3'
+         '859a90af9e4efe40db381ea07167a66a')
 
 build() {
   cd "${srcdir}"/$pkgname-$pkgver
@@ -38,4 +40,5 @@ package() {
     SYSDATADIR="${pkgdir}"/etc/incron.d install
 
   install -Dm0755 "${srcdir}"/incron.init "${pkgdir}"/etc/rc.d/incrond
+  install -Dm0644 "${srcdir}/incrond.service" "${pkgdir}/usr/lib/systemd/system/incrond.service"
 }
diff --git a/community/incron/incrond.service b/community/incron/incrond.service
new file mode 100644
index 000000000..54fcfa9d2
--- /dev/null
+++ b/community/incron/incrond.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Inotify System Scheduler
+
+[Service]
+Type=forking
+PIDFile=/run/incrond.pid
+ExecStart=/usr/sbin/incrond
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/intel-tbb/PKGBUILD b/community/intel-tbb/PKGBUILD
index f45e81d84..0220e4316 100644
--- a/community/intel-tbb/PKGBUILD
+++ b/community/intel-tbb/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 70971 2012-05-21 01:19:45Z stephane $
+# $Id: PKGBUILD 74680 2012-08-02 00:56:11Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Denis Martinez <deuns.martinez AT gmail.com>
 
 pkgname=intel-tbb
-pkgver=4.0_20120408
+pkgver=4.0_20120613
 pkgrel=1
 pkgdesc='High level abstract threading library'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.threadingbuildingblocks.org/'
 license=('GPL')
 depends=('gcc-libs')
-source=("http://threadingbuildingblocks.org/uploads/77/185/4.0%20update%204/tbb40_20120408oss_src.tgz")
-sha1sums=('04390147d40b86ae6291a9971a9c8afd327db718')
+source=("http://threadingbuildingblocks.org/uploads/77/187/4.0%20update%205/tbb${pkgver/\./}oss_src.tgz")
+sha1sums=('48569b88450a78e8f1e7251500fdd951bb197f1b')
 
 build() {
   cd "${srcdir}"/tbb${pkgver/\./}oss
diff --git a/community/python-gnutls/PKGBUILD b/community/python-gnutls/PKGBUILD
index ee1994319..463cc832a 100644
--- a/community/python-gnutls/PKGBUILD
+++ b/community/python-gnutls/PKGBUILD
@@ -1,20 +1,23 @@
-# $Id: PKGBUILD 72721 2012-06-21 11:07:34Z spupykin $
+# $Id: PKGBUILD 74656 2012-08-01 13:54:54Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Hugo Doria <hugo@archlinux.org>
 # Contributor: N3RD3X <n3rd3x@linuxmail.org>
 
 pkgname=python-gnutls
 pkgver=1.2.4
-pkgrel=1
+pkgrel=2
 pkgdesc="Python wrapper for the GNUTLS library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://cheeseshop.python.org/pypi/python-gnutls"
 depends=('python2' 'gnutls')
 license=('LGPL')
-source=(http://pypi.python.org/packages/source/p/${pkgname}/${pkgname}-${pkgver}.tar.gz)
-md5sums=('e3536c421291a791869d875a41dcb26a')
+source=(http://pypi.python.org/packages/source/p/${pkgname}/${pkgname}-${pkgver}.tar.gz
+	gnutls3.patch)
+md5sums=('e3536c421291a791869d875a41dcb26a'
+         '24bc95d9f5e71e9f5e180706cbb09248')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
+  patch -Np0 <$srcdir/gnutls3.patch
   python2 setup.py install --root=${pkgdir}
 }
diff --git a/community/python-gnutls/gnutls3.patch b/community/python-gnutls/gnutls3.patch
new file mode 100644
index 000000000..5110de2f2
--- /dev/null
+++ b/community/python-gnutls/gnutls3.patch
@@ -0,0 +1,271 @@
+diff -ru gnutls/library/functions.py gnutls.fixed/library/functions.py
+--- gnutls/library/functions.py	2011-08-19 04:48:14.000000000 +0100
++++ gnutls.fixed/library/functions.py	2012-08-01 11:56:43.450975419 +0100
+@@ -4,7 +4,7 @@
+ import sys
+ from ctypes import *
+ 
+-from gnutls.library import libgnutls, libgnutls_extra
++from gnutls.library import libgnutls
+ from gnutls.library.types import *
+ 
+ 
+@@ -121,14 +121,6 @@
+ gnutls_certificate_get_peers.argtypes = [gnutls_session_t, POINTER(c_uint)]
+ gnutls_certificate_get_peers.restype = POINTER(gnutls_datum_t)
+ 
+-gnutls_certificate_get_x509_cas = libgnutls.gnutls_certificate_get_x509_cas
+-gnutls_certificate_get_x509_cas.argtypes = [gnutls_certificate_credentials_t, POINTER(POINTER(gnutls_x509_crt_t)), POINTER(c_uint)]
+-gnutls_certificate_get_x509_cas.restype = None
+-
+-gnutls_certificate_get_x509_crls = libgnutls.gnutls_certificate_get_x509_crls
+-gnutls_certificate_get_x509_crls.argtypes = [gnutls_certificate_credentials_t, POINTER(POINTER(gnutls_x509_crl_t)), POINTER(c_uint)]
+-gnutls_certificate_get_x509_crls.restype = None
+-
+ gnutls_certificate_send_x509_rdn_sequence = libgnutls.gnutls_certificate_send_x509_rdn_sequence
+ gnutls_certificate_send_x509_rdn_sequence.argtypes = [gnutls_session_t, c_int]
+ gnutls_certificate_send_x509_rdn_sequence.restype = None
+@@ -221,10 +213,6 @@
+ gnutls_certificate_type_set_priority.argtypes = [gnutls_session_t, POINTER(c_int)]
+ gnutls_certificate_type_set_priority.restype = c_int
+ 
+-gnutls_certificate_verify_peers = libgnutls.gnutls_certificate_verify_peers
+-gnutls_certificate_verify_peers.argtypes = [gnutls_session_t]
+-gnutls_certificate_verify_peers.restype = c_int
+-
+ gnutls_certificate_verify_peers2 = libgnutls.gnutls_certificate_verify_peers2
+ gnutls_certificate_verify_peers2.argtypes = [gnutls_session_t, POINTER(c_uint)]
+ gnutls_certificate_verify_peers2.restype = c_int
+@@ -393,10 +381,6 @@
+ gnutls_error_to_alert.argtypes = [c_int, POINTER(c_int)]
+ gnutls_error_to_alert.restype = c_int
+ 
+-gnutls_extra_check_version = libgnutls_extra.gnutls_extra_check_version
+-gnutls_extra_check_version.argtypes = [c_char_p]
+-gnutls_extra_check_version.restype = c_char_p
+-
+ gnutls_fingerprint = libgnutls.gnutls_fingerprint
+ gnutls_fingerprint.argtypes = [gnutls_digest_algorithm_t, POINTER(gnutls_datum_t), c_void_p, POINTER(size_t)]
+ gnutls_fingerprint.restype = c_int
+@@ -409,10 +393,6 @@
+ gnutls_global_init.argtypes = []
+ gnutls_global_init.restype = c_int
+ 
+-gnutls_global_init_extra = libgnutls_extra.gnutls_global_init_extra
+-gnutls_global_init_extra.argtypes = []
+-gnutls_global_init_extra.restype = c_int
+-
+ gnutls_global_set_log_function = libgnutls.gnutls_global_set_log_function
+ gnutls_global_set_log_function.argtypes = [gnutls_log_func]
+ gnutls_global_set_log_function.restype = None
+@@ -461,86 +441,6 @@
+ gnutls_hex_encode.argtypes = [POINTER(gnutls_datum_t), c_char_p, POINTER(size_t)]
+ gnutls_hex_encode.restype = c_int
+ 
+-gnutls_ia_allocate_client_credentials = libgnutls_extra.gnutls_ia_allocate_client_credentials
+-gnutls_ia_allocate_client_credentials.argtypes = [POINTER(gnutls_ia_client_credentials_t)]
+-gnutls_ia_allocate_client_credentials.restype = c_int
+-
+-gnutls_ia_allocate_server_credentials = libgnutls_extra.gnutls_ia_allocate_server_credentials
+-gnutls_ia_allocate_server_credentials.argtypes = [POINTER(gnutls_ia_server_credentials_t)]
+-gnutls_ia_allocate_server_credentials.restype = c_int
+-
+-gnutls_ia_enable = libgnutls_extra.gnutls_ia_enable
+-gnutls_ia_enable.argtypes = [gnutls_session_t, c_int]
+-gnutls_ia_enable.restype = None
+-
+-gnutls_ia_endphase_send = libgnutls_extra.gnutls_ia_endphase_send
+-gnutls_ia_endphase_send.argtypes = [gnutls_session_t, c_int]
+-gnutls_ia_endphase_send.restype = c_int
+-
+-gnutls_ia_extract_inner_secret = libgnutls_extra.gnutls_ia_extract_inner_secret
+-gnutls_ia_extract_inner_secret.argtypes = [gnutls_session_t, c_char_p]
+-gnutls_ia_extract_inner_secret.restype = None
+-
+-gnutls_ia_free_client_credentials = libgnutls_extra.gnutls_ia_free_client_credentials
+-gnutls_ia_free_client_credentials.argtypes = [gnutls_ia_client_credentials_t]
+-gnutls_ia_free_client_credentials.restype = None
+-
+-gnutls_ia_free_server_credentials = libgnutls_extra.gnutls_ia_free_server_credentials
+-gnutls_ia_free_server_credentials.argtypes = [gnutls_ia_server_credentials_t]
+-gnutls_ia_free_server_credentials.restype = None
+-
+-gnutls_ia_generate_challenge = libgnutls_extra.gnutls_ia_generate_challenge
+-gnutls_ia_generate_challenge.argtypes = [gnutls_session_t, size_t, c_char_p]
+-gnutls_ia_generate_challenge.restype = c_int
+-
+-gnutls_ia_get_client_avp_ptr = libgnutls_extra.gnutls_ia_get_client_avp_ptr
+-gnutls_ia_get_client_avp_ptr.argtypes = [gnutls_ia_client_credentials_t]
+-gnutls_ia_get_client_avp_ptr.restype = c_void_p
+-
+-gnutls_ia_get_server_avp_ptr = libgnutls_extra.gnutls_ia_get_server_avp_ptr
+-gnutls_ia_get_server_avp_ptr.argtypes = [gnutls_ia_server_credentials_t]
+-gnutls_ia_get_server_avp_ptr.restype = c_void_p
+-
+-gnutls_ia_handshake = libgnutls_extra.gnutls_ia_handshake
+-gnutls_ia_handshake.argtypes = [gnutls_session_t]
+-gnutls_ia_handshake.restype = c_int
+-
+-gnutls_ia_handshake_p = libgnutls_extra.gnutls_ia_handshake_p
+-gnutls_ia_handshake_p.argtypes = [gnutls_session_t]
+-gnutls_ia_handshake_p.restype = c_int
+-
+-gnutls_ia_permute_inner_secret = libgnutls_extra.gnutls_ia_permute_inner_secret
+-gnutls_ia_permute_inner_secret.argtypes = [gnutls_session_t, size_t, c_char_p]
+-gnutls_ia_permute_inner_secret.restype = c_int
+-
+-gnutls_ia_recv = libgnutls_extra.gnutls_ia_recv
+-gnutls_ia_recv.argtypes = [gnutls_session_t, c_char_p, size_t]
+-gnutls_ia_recv.restype = ssize_t
+-
+-gnutls_ia_send = libgnutls_extra.gnutls_ia_send
+-gnutls_ia_send.argtypes = [gnutls_session_t, c_char_p, size_t]
+-gnutls_ia_send.restype = ssize_t
+-
+-gnutls_ia_set_client_avp_function = libgnutls_extra.gnutls_ia_set_client_avp_function
+-gnutls_ia_set_client_avp_function.argtypes = [gnutls_ia_client_credentials_t, gnutls_ia_avp_func]
+-gnutls_ia_set_client_avp_function.restype = None
+-
+-gnutls_ia_set_client_avp_ptr = libgnutls_extra.gnutls_ia_set_client_avp_ptr
+-gnutls_ia_set_client_avp_ptr.argtypes = [gnutls_ia_client_credentials_t, c_void_p]
+-gnutls_ia_set_client_avp_ptr.restype = None
+-
+-gnutls_ia_set_server_avp_function = libgnutls_extra.gnutls_ia_set_server_avp_function
+-gnutls_ia_set_server_avp_function.argtypes = [gnutls_ia_server_credentials_t, gnutls_ia_avp_func]
+-gnutls_ia_set_server_avp_function.restype = None
+-
+-gnutls_ia_set_server_avp_ptr = libgnutls_extra.gnutls_ia_set_server_avp_ptr
+-gnutls_ia_set_server_avp_ptr.argtypes = [gnutls_ia_server_credentials_t, c_void_p]
+-gnutls_ia_set_server_avp_ptr.restype = None
+-
+-gnutls_ia_verify_endphase = libgnutls_extra.gnutls_ia_verify_endphase
+-gnutls_ia_verify_endphase.argtypes = [gnutls_session_t, c_char_p]
+-gnutls_ia_verify_endphase.restype = c_int
+-
+ gnutls_init = libgnutls.gnutls_init
+ gnutls_init.argtypes = [POINTER(gnutls_session_t), gnutls_connection_end_t]
+ gnutls_init.restype = c_int
+@@ -733,10 +633,6 @@
+ gnutls_psk_free_server_credentials.argtypes = [gnutls_psk_server_credentials_t]
+ gnutls_psk_free_server_credentials.restype = None
+ 
+-gnutls_psk_netconf_derive_key = libgnutls.gnutls_psk_netconf_derive_key
+-gnutls_psk_netconf_derive_key.argtypes = [c_char_p, c_char_p, c_char_p, POINTER(gnutls_datum_t)]
+-gnutls_psk_netconf_derive_key.restype = c_int
+-
+ gnutls_psk_server_get_username = libgnutls.gnutls_psk_server_get_username
+ gnutls_psk_server_get_username.argtypes = [gnutls_session_t]
+ gnutls_psk_server_get_username.restype = c_char_p
+@@ -857,10 +753,6 @@
+ gnutls_session_enable_compatibility_mode.argtypes = [gnutls_session_t]
+ gnutls_session_enable_compatibility_mode.restype = None
+ 
+-gnutls_session_get_client_random = libgnutls.gnutls_session_get_client_random
+-gnutls_session_get_client_random.argtypes = [gnutls_session_t]
+-gnutls_session_get_client_random.restype = c_void_p
+-
+ gnutls_session_get_data = libgnutls.gnutls_session_get_data
+ gnutls_session_get_data.argtypes = [gnutls_session_t, c_void_p, POINTER(size_t)]
+ gnutls_session_get_data.restype = c_int
+@@ -873,18 +765,10 @@
+ gnutls_session_get_id.argtypes = [gnutls_session_t, c_void_p, POINTER(size_t)]
+ gnutls_session_get_id.restype = c_int
+ 
+-gnutls_session_get_master_secret = libgnutls.gnutls_session_get_master_secret
+-gnutls_session_get_master_secret.argtypes = [gnutls_session_t]
+-gnutls_session_get_master_secret.restype = c_void_p
+-
+ gnutls_session_get_ptr = libgnutls.gnutls_session_get_ptr
+ gnutls_session_get_ptr.argtypes = [gnutls_session_t]
+ gnutls_session_get_ptr.restype = c_void_p
+ 
+-gnutls_session_get_server_random = libgnutls.gnutls_session_get_server_random
+-gnutls_session_get_server_random.argtypes = [gnutls_session_t]
+-gnutls_session_get_server_random.restype = c_void_p
+-
+ gnutls_session_is_resumed = libgnutls.gnutls_session_is_resumed
+ gnutls_session_is_resumed.argtypes = [gnutls_session_t]
+ gnutls_session_is_resumed.restype = c_int
+@@ -905,10 +789,6 @@
+ gnutls_set_default_priority.argtypes = [gnutls_session_t]
+ gnutls_set_default_priority.restype = c_int
+ 
+-gnutls_sign_algorithm_get_name = libgnutls.gnutls_sign_algorithm_get_name
+-gnutls_sign_algorithm_get_name.argtypes = [gnutls_sign_algorithm_t]
+-gnutls_sign_algorithm_get_name.restype = c_char_p
+-
+ gnutls_sign_callback_get = libgnutls.gnutls_sign_callback_get
+ gnutls_sign_callback_get.argtypes = [gnutls_session_t, POINTER(c_void_p)]
+ gnutls_sign_callback_get.restype = gnutls_sign_func
+@@ -937,14 +817,6 @@
+ gnutls_transport_set_errno.argtypes = [gnutls_session_t, c_int]
+ gnutls_transport_set_errno.restype = None
+ 
+-gnutls_transport_set_global_errno = libgnutls.gnutls_transport_set_global_errno
+-gnutls_transport_set_global_errno.argtypes = [c_int]
+-gnutls_transport_set_global_errno.restype = None
+-
+-gnutls_transport_set_lowat = libgnutls.gnutls_transport_set_lowat
+-gnutls_transport_set_lowat.argtypes = [gnutls_session_t, c_int]
+-gnutls_transport_set_lowat.restype = None
+-
+ gnutls_transport_set_ptr = libgnutls.gnutls_transport_set_ptr
+ gnutls_transport_set_ptr.argtypes = [gnutls_session_t, gnutls_transport_ptr_t]
+ gnutls_transport_set_ptr.restype = None
+@@ -1501,10 +1373,6 @@
+ gnutls_x509_privkey_sign_hash.argtypes = [gnutls_x509_privkey_t, POINTER(gnutls_datum_t), POINTER(gnutls_datum_t)]
+ gnutls_x509_privkey_sign_hash.restype = c_int
+ 
+-gnutls_x509_privkey_verify_data = libgnutls.gnutls_x509_privkey_verify_data
+-gnutls_x509_privkey_verify_data.argtypes = [gnutls_x509_privkey_t, c_uint, POINTER(gnutls_datum_t), POINTER(gnutls_datum_t)]
+-gnutls_x509_privkey_verify_data.restype = c_int
+-
+ gnutls_x509_rdn_get = libgnutls.gnutls_x509_rdn_get
+ gnutls_x509_rdn_get.argtypes = [POINTER(gnutls_datum_t), c_char_p, POINTER(size_t)]
+ gnutls_x509_rdn_get.restype = c_int
+diff -ru gnutls/library/__init__.py gnutls.fixed/library/__init__.py
+--- gnutls/library/__init__.py	2011-11-11 17:23:49.000000000 +0000
++++ gnutls.fixed/library/__init__.py	2012-08-01 11:57:42.284290997 +0100
+@@ -53,6 +53,9 @@
+     else:
+         raise RuntimeError('cannot find lib%s on this system' % name)
+ 
++def do_nothing(*args, **kwargs):
++    pass
++
+ 
+ def initialize_gcrypt():
+     from ctypes import c_void_p
+@@ -104,7 +107,7 @@
+         libgcrypt = load_library(name='gcrypt', version=11)
+         gcry_control = libgcrypt.gcry_control
+     else:
+-        gcry_control = libgnutls.gcry_control
++        gcry_control = do_nothing
+ 
+     gcry_control(GCRYCTL_SET_THREAD_CBS, c_void_p(gcrypt_thread_callbacks_ptr))
+     if system == 'cygwin':
+@@ -117,12 +120,10 @@
+ 
+ 
+ 
+-libgnutls = load_library(name='gnutls', version=26)
+-libgnutls_extra = load_library(name='gnutls-extra', version=26)
++libgnutls = load_library(name='gnutls', version=28)
+ 
+ initialize_gcrypt()
+ libgnutls.gnutls_global_init()
+-libgnutls_extra.gnutls_global_init_extra()
+ 
+ 
+ from gnutls.library import constants
+@@ -136,9 +137,6 @@
+ if functions.gnutls_check_version(__need_version__) is None:
+     version = functions.gnutls_check_version(None)
+     raise RuntimeError("Found GNUTLS library version %s, but at least version %s is required" % (version, __need_version__))
+-if functions.gnutls_extra_check_version(__need_version__) is None:
+-    version = functions.gnutls_extra_check_version(None)
+-    raise RuntimeError("Found GNUTLS extra library version %s, but at least version %s is required" % (version, __need_version__))
+ 
+ 
+ del get_system_name, library_locations, load_library, initialize_gcrypt
diff --git a/community/python-pymongo/PKGBUILD b/community/python-pymongo/PKGBUILD
index 672ece806..9b212e8e2 100644
--- a/community/python-pymongo/PKGBUILD
+++ b/community/python-pymongo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 70698 2012-05-15 08:14:57Z arodseth $
+# $Id: PKGBUILD 74649 2012-08-01 07:21:31Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Thomas S Hatch <thatch45@gmail.com>
 
 pkgname=python-pymongo
-pkgver=2.2
+pkgver=2.2.1
 pkgrel=1
 pkgdesc="Python driver for MongoDB"
 arch=('x86_64' 'i686' 'mips64el')
@@ -12,12 +12,12 @@ url="http://pypi.python.org/pypi/pymongo/"
 depends=('python')
 makedepends=('python-distribute')
 source=("http://pypi.python.org/packages/source/p/pymongo/pymongo-$pkgver.tar.gz")
-sha256sums=('ac7952896ecfd5d9b4b9d8bb0077c95a0296ea21374df85e2ca32c237c0be57f')
+sha256sums=('0a6251742736dd3c80025e701ec97ea1540bc97df26ada7b3bf40ff01daa7032')
 
 package() {
   cd "$srcdir/pymongo-$pkgver"
 
-  LANG=en_US.UTF8 python setup.py install --root="$pkgdir" --optimize=1
+  python setup.py install --root="$pkgdir" --optimize=1
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/sage-mathematics/PKGBUILD b/community/sage-mathematics/PKGBUILD
index efa5f6f66..45c6dc52d 100644
--- a/community/sage-mathematics/PKGBUILD
+++ b/community/sage-mathematics/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 73902 2012-07-16 23:37:35Z dwallace $
+# $Id: PKGBUILD 74657 2012-08-01 15:35:10Z dwallace $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: Antonio Rojas < nqn1976 @ gmail.com >
 # Contributor: Thomas Dziedzic < gostrc at gmail >
@@ -8,7 +8,7 @@
 
 pkgname=sage-mathematics
 pkgver=5.1
-pkgrel=2
+pkgrel=3
 pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.'
 url='http://www.sagemath.org'
 arch=('i686' 'x86_64')
@@ -53,11 +53,6 @@ build() {
   # comment out if you're only building it for yourself
   export SAGE_FAT_BINARY='yes'
 
-  # set ATLAS_ARCH to provide the most compatibility. try fast or just leaving it black if
-  # compiling for yourself. http://trac.sagemath.org/sage_trac/ticket/10226
-  # export SAGE_ATLAS_ARCH=fast
-  export SAGE_ATLAS_ARCH=base
-
   # can't write to root in a clean chroot
   export DOT_SAGE='/build/src/'
 
diff --git a/community/tesseract/PKGBUILD b/community/tesseract/PKGBUILD
index eb69418ac..1ef985d0b 100644
--- a/community/tesseract/PKGBUILD
+++ b/community/tesseract/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 73535 2012-07-09 09:16:10Z spupykin $
+# $Id: PKGBUILD 74642 2012-08-01 04:56:09Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andreas Hauser <andy-aur@splashground.de>
 
@@ -9,21 +9,17 @@ kor ell rus por bul lav lit pol dan-frak deu dan ces cat eng chi_tra chi_sim)
 pkgbase=tesseract
 pkgname=(tesseract $(for l in ${_langs[@]}; do echo tesseract-data-${l}; done))
 pkgver=3.01
-pkgrel=2
+pkgrel=3
 pkgdesc="An OCR programm"
 arch=(x86_64 i686 'mips64el')
 url="http://code.google.com/p/tesseract-ocr"
 license=("APACHE")
 depends=(libpng libtiff libjpeg zlib giflib gcc-libs leptonica)
 source=(http://tesseract-ocr.googlecode.com/files/$pkgname-$pkgver.tar.gz
-        http://tesseract-ocr.googlecode.com/files/chi_sim.traineddata.gz
-        http://tesseract-ocr.googlecode.com/files/chi_tra.traineddata.gz
         $(for l in ${_langs[@]}; do
         echo http://tesseract-ocr.googlecode.com/files/${l}.traineddata.gz
         done))
 md5sums=('1ba496e51a42358fb9d3ffe781b2d20a'
-         '127e0b742b615d81c3b97a555acd8285'
-         '06fce5f5c0221286eab591819406d91e'
          'f4ae2e5668f693cc51c6e3c3f57a8f1d'
          '3787ff0fc1a07517203466830f6f868e'
          '7b50075692e7a07ac8f59e0cde51cfb9'