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

Conflicts:
	community/aspell-pl/PKGBUILD
	community/gloox/PKGBUILD
	community/libircclient/PKGBUILD
	community/mashup/PKGBUILD
	community/omniorb/PKGBUILD
	community/openbox/PKGBUILD
	community/patchutils/PKGBUILD
	community/rxvt-unicode/PKGBUILD
	extra/mesa/PKGBUILD
	extra/pygobject2/PKGBUILD
	extra/qt5/PKGBUILD
	extra/samba/PKGBUILD
	extra/tdb/PKGBUILD
	extra/transmission/PKGBUILD
	extra/vim/PKGBUILD
	pcr/python-sfml2/PKGBUILD
	pcr/python2-sfml2/PKGBUILD

1 files changed, 28 insertions, 18 deletions

diff --git a/community/mongodb/PKGBUILD b/community/mongodb/PKGBUILD
index c2314fb7a..dcd5fbad6 100644
--- a/community/mongodb/PKGBUILD
+++ b/community/mongodb/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92438 2013-06-05 11:16:09Z fyan $
+# $Id: PKGBUILD 93615 2013-07-07 11:23:57Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
@@ -6,21 +6,20 @@
 # Contributor: Alec Thomas
 
 pkgname=mongodb
-pkgver=2.4.4
+pkgver=2.4.5
 pkgrel=1
 pkgdesc='A high-performance, open source, schema-free document-oriented database'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.mongodb.org'
 license=('AGPL3')
-depends=('boost-libs')
-makedepends=('scons' 'boost' 'libpcap')
+depends=('boost-libs' 'pcre' 'snappy' 'openssl' 'gperftools') # 'v8') doesn't work
+makedepends=('scons' 'boost' 'readline' 'ncurses' 'libpcap') # 'cyrus-sasl') doesn't work
 checkdepends=('python2-pymongo')
 optdepends=('libpcap: needed for mongosniff')
 backup=('etc/mongodb.conf')
 install=mongodb.install
 source=("http://downloads.mongodb.org/src/mongodb-src-r${pkgver}.tar.gz"
-        'mongodb.conf' 'mongodb.service' 'SConscript.client.patch'
-        'removeWerror.patch')
+        'mongodb.conf' 'mongodb.service' 'removeWerror.patch')
 
 build() {
   # fucking mongo aint no fun to package
@@ -28,13 +27,18 @@ build() {
 
   cd mongodb-src-r${pkgver}
 
-  # fix https://jira.mongodb.org/browse/SERVER-5575
-  patch -Np1 -i ${srcdir}/SConscript.client.patch
-
   # failed to build with -Werror since 2.4.0
   patch -Np1 -i "$srcdir/removeWerror.patch"
 
-  scons all --use-system-boost # --sharedclient currently fails
+  scons all \
+    --use-system-boost \
+    --use-system-pcre \
+    --use-system-snappy \
+    --use-system-tcmalloc \
+    --ssl \
+    --sharedclient
+    # --use-sasl-client doesn't work
+    # --use-system-v8 doesn't work
 }
 
 <<COMMENT
@@ -52,21 +56,27 @@ package() {
 
   cd mongodb-src-r${pkgver}
 
-  scons install --use-system-boost --full --prefix=$pkgdir/usr # --sharedclient currently fails
+  scons install \
+    --use-system-boost \
+    --use-system-pcre \
+    --use-system-snappy \
+    --use-system-tcmalloc \
+    --ssl \
+    --sharedclient \
+    --full \
+    --prefix="$pkgdir/usr"
+    # --use-sasl-client doesn't work
+    # --use-system-v8 doesn't work
+
+  rm "$pkgdir/usr/lib/libmongoclient.a"
 
   install -Dm644 "$srcdir/mongodb.conf" "$pkgdir/etc/mongodb.conf"
-  [[ -f "$pkgdir/usr/lib" ]] && rm "$pkgdir/usr/lib" # wtf mongo
   install -Dm644 "$srcdir/mongodb.service" "$pkgdir/usr/lib/systemd/system/mongodb.service"
   install -dm700 "$pkgdir/var/lib/mongodb"
   install -dm755 "$pkgdir/var/log/mongodb"
-
-  # the earlier SConscript patch actually gives us some trouble on x86_64 so we need to hack it out again
-  mv ${pkgdir}/usr/lib64/libmongoclient.a ${pkgdir}/usr/lib/ || true
-  rm -r ${pkgdir}/usr/lib64 || true
 }
 
-sha512sums=('f72aee0a9c979756741902eb87775d154de45660596ec4507274a7719d376869510f192cf7777840821cb491cfe009beced8891e3f243c761ee758ab023a457d'
+sha512sums=('07a46770c5acc0e046750e0299e669b934f6093705f5979bc5fa8bb56e73761f9602a5bdbaaad688700e4dde32d1e5f48a6cf3763ffab4d80a47f0158d8fb89e'
             '05dead727d3ea5fe8af1a3c3888693f6b3e2b8cb7f197a5d793352e10d2c524e96c9a5c55ad2e88c1114643a9612ec0b26a2574b48a5260a9b51ec8941461f1c'
             '177251404b2e818ae2b546fe8b13cb76e348c99e85c7bef22a04b0f07b600fd515a309ede50214f4198594388a6d2b31f46e945b9dae84aabb4dfa13b1123bb9'
-            '2f7d0e9e35a043d9006fd429f36cd6b45ed4edd98ce653b35b237e0313d2d7ef39ae85dcd31713bae7ab68e40a38534bba5f7746653e9380f2106865a8b3b9a5'
             'e709f76fa71a10d6b72d2eeae65d715e0a0a7e6cb93704114f22db8662d7102de77bd1e6706049351beb159aaa04548cfe4b14fe6ee498a166c5ad54c8275f84')