Merge branch 'testing' of ssh://cesman@linhes.org/mount/repository/linhes_pkgbuild into testing

Conflicts:
	abs/core/tzdata/PKGBUILD

2 files changed, 51 insertions, 37 deletions

diff --git a/abs/extra/boost/PKGBUILD b/abs/extra/boost/PKGBUILD
index c9d7fcf..37bb2de 100644
--- a/abs/extra/boost/PKGBUILD
+++ b/abs/extra/boost/PKGBUILD
@@ -1,74 +1,81 @@
-# $Id: PKGBUILD 89256 2010-08-30 13:49:46Z remy $
+# $Id$
 # Maintainer: kevin <kevin@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# TU: Kritoke <kritoke@gamebox.net>
+# Contributor: Kritoke <kritoke@gamebox.net>
 # Contributor: Luca Roccia <little_rock@users.sourceforge.net>
 
 pkgbase=boost
 pkgname=('boost-libs' 'boost')
-pkgver=1.44.0
-_boostver=1_44_0
+pkgver=1.47.0
+_boostver=${pkgver//./_}
 pkgrel=1
 arch=('i686' 'x86_64')
 url="http://www.boost.org/"
-makedepends=('python2' 'bzip2' 'zlib')
+makedepends=('icu' 'python2' 'bzip2' 'zlib' 'openmpi')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}_${_boostver}.tar.gz)
 license=('custom')
-options=('!ccache')
 
 _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 : 2.6 : /usr/bin/python2 ;" >> build/v2/user-config.jam
+  #echo "using python : 3.2 : /usr/bin/python : /usr/include/python3.2mu : /usr/lib ;" >> build/v2/user-config.jam
+  echo "using mpi ;" >> build/v2/user-config.jam
 
   # build bjam
-  cd "${srcdir}/${pkgbase}_${_boostver}/tools/jam/src"
-  ./build.sh cc || return 1
+  cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine"
+  ./build.sh cc
 
   _bindir="bin.linuxx86"
   [ "${CARCH}" = "x86_64" ] && _bindir="bin.linuxx86_64"
 
-  install -m755 -d "${_stagedir}"/usr/bin
-  install -m755 ${_bindir}/bjam "${_stagedir}"/usr/bin/bjam || return 1
+  install -d "${_stagedir}"/usr/bin
+  install ${_bindir}/bjam "${_stagedir}"/usr/bin/bjam
 
-  # build bcp
-  cd "${srcdir}/${pkgbase}_${_boostver}/tools/bcp"
-  ../jam/src/${_bindir}/bjam --toolset=gcc || return 1
-  install -m755 "${srcdir}/${pkgbase}_${_boostver}/dist/bin/bcp" \
-                ${_stagedir}/usr/bin/bcp || return 1
+  # 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=multi"
+  # 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
 
-  ./tools/jam/src/${_bindir}/bjam \
-            release debug-symbols=off threading=single,multi \
-            runtime-link=shared link=shared,static \
-            cflags=-fno-strict-aliasing \
-            toolset=gcc \
-            --prefix="${_stagedir}" \
-            -sTOOLS=gcc \
-            --layout=tagged \
-            install || return 1
-
-  # build pyste
-  cd "${srcdir}/${pkgbase}_${_boostver}/libs/python/pyste/install"
-  python2 setup.py install --root=${_stagedir} || return 1
+  "${_stagedir}"/usr/bin/bjam \
+      release debug-symbols=off threading=multi \
+      runtime-link=shared link=shared,static \
+      cflags=-fno-strict-aliasing \
+      toolset=gcc \
+      --prefix="${_stagedir}" \
+      -sTOOLS=gcc \
+      --layout=system \
+      ${MAKEFLAGS} \
+      install
 }
 
 package_boost() {
     pkgdesc="Free peer-reviewed portable C++ source libraries - Development"
     depends=("boost-libs=${pkgver}")
-    optdepends=('python2: for python bindings')
+    optdepends=('python2: for python2 bindings')
 
-    install -dm 755 "${pkgdir}"/usr/{include,lib}
+    install -d "${pkgdir}"/usr/{include,lib,share}
     # headers/source files
     cp -r "${_stagedir}"/include/ "${pkgdir}"/usr/
 
@@ -78,21 +85,25 @@ package_boost() {
     # utilities (bjam, bcp, pyste)
     cp -r "${_stagedir}"/usr/* "${pkgdir}"/usr/
 
+    #boostbook
+    cp -r "${_stagedir}"/share/* "${pkgdir}"/usr/share
+
     # license
     install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \
-        "${pkgdir}"/usr/share/licenses/boost/LICENSE_1_0.txt || return 1
+        "${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')
+    depends=('gcc-libs' 'bzip2' 'zlib' 'icu')
+    optdepends=('openmpi: for mpi support')
 
-    install -dm 755 "${pkgdir}/usr/lib"
+    install -d "${pkgdir}/usr/lib"
     #shared libs
     cp -r "${_stagedir}"/lib/*.so{,.*} "${pkgdir}/usr/lib/"
 
     # license
     install -D -m644 "${srcdir}/${pkgbase}_${_boostver}/LICENSE_1_0.txt" \
-        "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt || return 1
+        "${pkgdir}"/usr/share/licenses/boost-libs/LICENSE_1_0.txt
 }
-md5sums=('085fce4ff2089375105d72475d730e15')
+md5sums=('ff180a5276bec773a7625cac7e2288e8')
diff --git a/abs/extra/boost/__changelog b/abs/extra/boost/__changelog
new file mode 100644
index 0000000..f0c532d
--- /dev/null
+++ b/abs/extra/boost/__changelog
@@ -0,0 +1,3 @@
+* remove 'python' dep (aka python3)
+* change python 2.7 refrence to 2.6
+* remove python optdep for the libs package