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

Conflicts:
	community/erlang/PKGBUILD
	community/haskell-x11-xft/PKGBUILD
	community/libgdamm/PKGBUILD
	community/luasql/PKGBUILD
	community/myodbc/PKGBUILD
	community/python2-basemap/PKGBUILD
	community/ruby-cairo/PKGBUILD
	community/ruby-gtk2/PKGBUILD
	community/stardict/PKGBUILD
	core/diffutils/PKGBUILD
	core/libsasl/PKGBUILD
	core/systemd/PKGBUILD
	extra/anjuta/PKGBUILD
	extra/ardour/PKGBUILD
	extra/boost/PKGBUILD
	extra/calligra/PKGBUILD
	extra/gnokii/PKGBUILD
	extra/icu/PKGBUILD
	extra/libgda/PKGBUILD
	extra/libmtp/PKGBUILD
	extra/lighttpd/PKGBUILD
	extra/mariadb/PKGBUILD
	extra/mysql/PKGBUILD
	extra/php/PKGBUILD
	extra/qt3/PKGBUILD
	extra/qt4/PKGBUILD
	extra/qt5/PKGBUILD
	extra/tracker/PKGBUILD
	extra/vlc/PKGBUILD
	extra/webkitgtk/PKGBUILD
	libre/lilo/PKGBUILD
	libre/psi/PKGBUILD

2 files changed, 173 insertions, 85 deletions

diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD
index 05000c1f0..9fb33d90f 100644
--- a/extra/boost/PKGBUILD
+++ b/extra/boost/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 176283 2013-01-28 16:48:15Z stephane $
+# $Id: PKGBUILD 180862 2013-03-27 13:30:16Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
@@ -10,107 +10,99 @@ pkgbase=boost
 pkgname=('boost-libs' 'boost')
 pkgver=1.52.0
 _boostver=${pkgver//./_}
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
+pkgrel=3
 url="http://www.boost.org/"
-makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
-source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz)
+arch=('i686' 'x86_64' 'mips64el')
 license=('custom')
-sha1sums=('1120430030315b0a94b6d63fc04662960db2444c')
+makedepends=('icu>=51.1' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
+source=(http://downloads.sourceforge.net/${pkgbase}/${pkgbase}_${_boostver}.tar.gz
+        boost-1.52.0-python3.patch)
+sha1sums=('1120430030315b0a94b6d63fc04662960db2444c'
+          '34026072a7cb2534164f20e77bb71a5c75093307')
 
 _stagedir="${srcdir}/stagedir"
 
 build() {
-  # set python path for bjam
-  cd "${srcdir}/${pkgbase}_${_boostver}/tools"
-  echo "using python : 2.7 : /usr/bin/python2 ;" >> build/v2/user-config.jam
-  echo "using python : 3.3 : /usr/bin/python3 : /usr/include/python3.3m : /usr/lib ;" >> build/v2/user-config.jam
-  echo "using mpi ;" >> build/v2/user-config.jam
-
-  cd "${srcdir}"/${pkgbase}_${_boostver}
-
-  # build bjam
-  cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine"
-  ./build.sh cc
-
-  _bindir="bin.linuxx86"
-  [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64"
-  [ "${CARCH}" = "mips64el" ] && _bindir="bin.linuxmips"
-
-  install -d "${_stagedir}"/usr/bin
-  install ${_bindir}/bjam "${_stagedir}"/usr/bin/bjam
-
-  # build tools
-  cd "${srcdir}/${pkgbase}_${_boostver}/tools/"
-  "${_stagedir}"/usr/bin/bjam --toolset=gcc
-
-  # copy the tools
-  cd "${srcdir}/${pkgbase}_${_boostver}/dist/bin"
-  for i in *;do
-      install -m755 "${i}" "${_stagedir}/usr/bin/${i}"
-  done
-
-  #boostbook needed by quickbook
-  cd "${srcdir}/${pkgbase}_${_boostver}/dist/"
-  cp -r share "${_stagedir}"
-
-  # build libs
-  cd "${srcdir}/${pkgbase}_${_boostver}"
-
-  # default "minimal" install: "release link=shared,static
-  # runtime-link=shared threading=single,multi"
-  # --layout=tagged will add the "-mt" suffix for multithreaded libraries
-  # and installs includes in /usr/include/boost.
-  # --layout=system no longer adds the -mt suffix for multi-threaded libs.
-  # install to ${_stagedir} in preparation for split packaging
-
-  "${_stagedir}"/usr/bin/bjam \
-      release debug-symbols=off threading=multi \
-      runtime-link=shared link=shared,static \
-      cflags=-fno-strict-aliasing \
+   local JOBS="$(sed -e 's/.*\(-j *[0-9]\+\).*/\1/' <<< ${MAKEFLAGS})"
+
+   cd "${srcdir}/${pkgbase}_${_boostver}"
+
+   # Fix build errors with python 3
+   sed -i "/PYTHON_ROOT/s/print sys.prefix/print(sys.prefix)/g" bootstrap.sh
+   patch -Np1 -i ../boost-1.52.0-python3.patch
+
+   # Shut up strict aliasing warnings
+   echo "using gcc : : : <compileflags>-fno-strict-aliasing ;" >> ./tools/build/v2/user-config.jam
+   # Add an extra python version. This does not replace anything and python 2.x need to be the default.
+   echo "using python : 3.3 : /usr/bin/python3 : /usr/include/python3.3m : /usr/lib ;" >> ./tools/build/v2/user-config.jam
+   # Support for OpenMPI
+   echo "using mpi ;" >> ./tools/build/v2/user-config.jam
+
+   ./bootstrap.sh --with-toolset=gcc --with-icu --with-python=/usr/bin/python2
+
+   _bindir="bin.linuxx86"
+   [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64"
+   [ "${CARCH}" = "mips64el" ] && _bindir="bin.linuxmips"
+
+   install -d -m 755 "${_stagedir}"/bin
+   install "${srcdir}"/${pkgbase}_${_boostver}/tools/build/v2/engine/${_bindir}/bjam "${_stagedir}"/bin/bjam
+
+   pushd tools
+   for _tool in bcp inspect quickbook compiler_status process_jam_log wave; do
+      "${_stagedir}"/bin/bjam --toolset=gcc $_tool
+   done
+   "${_stagedir}"/bin/bjam --toolset=gcc cflags="-std=gnu++11" library_status
+   popd
+   cp -a dist/bin/* "${_stagedir}"/bin
+
+   #boostbook is needed by quickbook
+   install -d -m 755 "${_stagedir}"/share/boostbook
+   cp -a tools/boostbook/{xsl,dtd} "${_stagedir}"/share/boostbook/
+
+   # default "minimal" install: "release link=shared,static
+   # runtime-link=shared threading=single,multi"
+   # --layout=tagged will add the "-mt" suffix for multithreaded libraries
+   # and installs includes in /usr/include/boost.
+   # --layout=system no longer adds the -mt suffix for multi-threaded libs.
+   # install to ${_stagedir} in preparation for split packaging
+   "${_stagedir}"/bin/bjam \
+      variant=release \
+      debug-symbols=off \
+      threading=multi \
+      runtime-link=shared \
+      link=shared \
       toolset=gcc \
-      --prefix="${_stagedir}" \
-      -sTOOLS=gcc \
+      python=2.7 \
       --layout=system \
-      ${MAKEFLAGS} \
+      --prefix="${_stagedir}" \
+      ${JOBS} \
       install
+
+   find ${_stagedir} -name \*.a -exec rm -f {} \;
 }
 
 package_boost() {
-    pkgdesc="Free peer-reviewed portable C++ source libraries - Development"
-    depends=("boost-libs=${pkgver}")
-    optdepends=('python: for python3 bindings'
-                'python2: for python2 bindings'
-		'boost-build: to use boost jam for building your project.')
-
-    install -d "${pkgdir}"/usr/{include,lib,share}
-    # headers/source files
-    cp -r "${_stagedir}"/include/ "${pkgdir}"/usr/
-
-    # static libs
-    cp -r "${_stagedir}"/lib/*.a "${pkgdir}"/usr/lib/
-
-    # utilities (bjam, bcp, pyste)
-    cp -r "${_stagedir}"/usr/* "${pkgdir}"/usr/
+   pkgdesc="Free peer-reviewed portable C++ source libraries - Development"
+   depends=("boost-libs=${pkgver}")
+   optdepends=('python: for python bindings'
+               'python2: for python2 bindings'
+               'boost-build: to use boost jam for building your project.')
 
-    #boostbook
-    cp -r "${_stagedir}"/share/* "${pkgdir}"/usr/share
+   install -d -m 755 "${pkgdir}"/usr
+   cp -a "${_stagedir}"/{bin,include,share} "${pkgdir}"/usr
 
-    # license
-    install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \
-        "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt
+   install -D -m 644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \
+      "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt
 }
 
 package_boost-libs() {
-    pkgdesc="Free peer-reviewed portable C++ source libraries - Runtime"
-    depends=('gcc-libs' 'bzip2' 'zlib' 'icu')
-    optdepends=('openmpi: for mpi support')
+   pkgdesc="Free peer-reviewed portable C++ source libraries - Runtime"
+   depends=('bzip2' 'zlib' 'icu')
+   optdepends=('openmpi: for mpi support')
 
-    install -d "${pkgdir}/usr/lib"
-    #shared libs
-    cp -r "${_stagedir}"/lib/*.so{,.*} "${pkgdir}/usr/lib/"
+   install -d -m 755 "${pkgdir}"/usr
+   cp -a "${_stagedir}"/lib "${pkgdir}"/usr
 
-    # license
-    install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \
-        "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt
+   install -D -m 644 "${srcdir}/"${pkgbase}_${_boostver}/LICENSE_1_0.txt \
+      "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt
 }
diff --git a/extra/boost/boost-1.52.0-python3.patch b/extra/boost/boost-1.52.0-python3.patch
new file mode 100644
index 000000000..8d2f59269
--- /dev/null
+++ b/extra/boost/boost-1.52.0-python3.patch
@@ -0,0 +1,96 @@
+diff -Naur boost_1_53_0.ori/libs/mpi/src/python/datatypes.cpp boost_1_53_0/libs/mpi/src/python/datatypes.cpp
+--- boost_1_53_0.ori/libs/mpi/src/python/datatypes.cpp	2007-11-25 13:38:02.000000000 -0500
++++ boost_1_53_0/libs/mpi/src/python/datatypes.cpp	2013-03-11 20:59:57.171732691 -0400
+@@ -13,6 +13,10 @@
+ #include <boost/mpi/python/serialize.hpp>
+ #include <boost/mpi.hpp>
+ 
++#if PY_MAJOR_VERSION >= 3
++#define PyInt_Type PyLong_Type
++#endif
++
+ namespace boost { namespace mpi { namespace python {
+ 
+ void export_datatypes()
+diff -Naur boost_1_53_0.ori/libs/mpi/src/python/py_environment.cpp boost_1_53_0/libs/mpi/src/python/py_environment.cpp
+--- boost_1_53_0.ori/libs/mpi/src/python/py_environment.cpp	2007-11-25 13:38:02.000000000 -0500
++++ boost_1_53_0/libs/mpi/src/python/py_environment.cpp	2013-03-11 21:02:12.961737401 -0400
+@@ -11,6 +11,9 @@
+  *  This file reflects the Boost.MPI "environment" class into Python
+  *  methods at module level.
+  */
++
++#include <locale>
++#include <string>
+ #include <boost/python.hpp>
+ #include <boost/mpi.hpp>
+ 
+@@ -50,11 +53,65 @@
+ 
+   // If anything changed, convert C-style argc/argv into Python argv
+   if (mpi_argv != my_argv)
++  {
++#if PY_MAJOR_VERSION >= 3
++    // Code stolen from py3k/Modules/python.c.
++
++    wchar_t **argv_copy = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*mpi_argc);
++    /* We need a second copies, as Python might modify the first one. */
++    wchar_t **argv_copy2 = (wchar_t **)PyMem_Malloc(sizeof(wchar_t*)*mpi_argc);
++
++    if (!argv_copy || !argv_copy2) {
++      fprintf(stderr, "out of memory\n");
++      return false;
++    }
++
++    std::locale mylocale;
++    mbstate_t mystate;
++
++    const std::codecvt<char, wchar_t, mbstate_t>& myfacet =
++      std::use_facet<std::codecvt<char, wchar_t, mbstate_t> >(mylocale);
++
++    for (int i = 0; i < mpi_argc; i++) 
++    {
++      size_t length = strlen(mpi_argv[i]);
++
++      wchar_t *dest = (wchar_t *) PyMem_Malloc(sizeof(wchar_t) * (length + 1));
++
++      const char *from_next;
++      wchar_t *to_next;
++
++      std::codecvt<wchar_t,char,mbstate_t>::result myresult = 
++        myfacet.out(mystate,
++            mpi_argv[i], mpi_argv[i] + length + 1, from_next,
++            dest, dest+length+1, to_next);
++
++      if (myresult != std::codecvt<wchar_t,char,mbstate_t>::ok )
++      {
++        fprintf(stderr, "failure translating argv\n");
++        return 1;
++      }
++
++      argv_copy2[i] = argv_copy[i] = dest;
++      if (!argv_copy[i])
++          return false;
++    }
++
++    PySys_SetArgv(mpi_argc, argv_copy);
++
++    for (int i = 0; i < mpi_argc; i++) {
++        PyMem_Free(argv_copy2[i]);
++    }
++    PyMem_Free(argv_copy);
++    PyMem_Free(argv_copy2);
++#else
+     PySys_SetArgv(mpi_argc, mpi_argv);
++#endif
++  }
+ 
+-  for (int arg = 0; arg < my_argc; ++arg)
+-    free(my_argv[arg]);
+-  delete [] my_argv;
++  for (int arg = 0; arg < mpi_argc; ++arg)
++    free(mpi_argv[arg]);
++  delete [] mpi_argv;
+ 
+   return true;
+ }