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

Conflicts:
	community/apvlv/PKGBUILD
	community/i3-wm/PKGBUILD
	community/jack2/PKGBUILD
	community/perl-list-moreutils/PKGBUILD
	community/qc-usb-messenger/PKGBUILD
	community/sword/PKGBUILD
	community/virtualbox/PKGBUILD
	community/vuze/PKGBUILD
	extra/archboot/PKGBUILD
	extra/ardour/PKGBUILD
	extra/boost/PKGBUILD
	extra/digikam/PKGBUILD
	extra/jack/PKGBUILD
	extra/kdebase-konsole/PKGBUILD
	extra/kdebase-runtime/PKGBUILD
	extra/kdebindings-kimono/PKGBUILD
	extra/kdebindings-korundum/PKGBUILD
	extra/kdebindings-kross/PKGBUILD
	extra/kdebindings-perlkde/PKGBUILD
	extra/kdebindings-perlqt/PKGBUILD
	extra/kdebindings-python/PKGBUILD
	extra/kdebindings-qtruby/PKGBUILD
	extra/kdebindings-qyoto/PKGBUILD
	extra/kdebindings-smokegen/PKGBUILD
	extra/kdebindings-smokekde/PKGBUILD
	extra/kdebindings-smokeqt/PKGBUILD
	extra/kdebindings/PKGBUILD
	extra/kdeedu-blinken/PKGBUILD
	extra/kdeedu-blinken/kdeedu-blinken.install
	extra/kdeedu-cantor/PKGBUILD
	extra/kdeedu-cantor/kdeedu-cantor.install
	extra/kdeedu-kalgebra/PKGBUILD
	extra/kdeedu-kalgebra/kdeedu-kalgebra.install
	extra/kdeedu-kalzium/PKGBUILD
	extra/kdeedu-kalzium/kdeedu-kalzium.install
	extra/kdeedu-kanagram/PKGBUILD
	extra/kdeedu-kanagram/kdeedu-kanagram.install
	extra/kdeedu-kbruch/PKGBUILD
	extra/kdeedu-kbruch/kdeedu-kbruch.install
	extra/kdeedu-kgeography/PKGBUILD
	extra/kdeedu-kgeography/kdeedu-kgeography.install
	extra/kdeedu-khangman/PKGBUILD
	extra/kdeedu-khangman/kdeedu-khangman.install
	extra/kdeedu-kig/PKGBUILD
	extra/kdeedu-kig/kdeedu-kig.install
	extra/kdeedu-kiten/PKGBUILD
	extra/kdeedu-kiten/kdeedu-kiten.install
	extra/kdeedu-klettres/PKGBUILD
	extra/kdeedu-klettres/kdeedu-klettres.install
	extra/kdeedu-kmplot/PKGBUILD
	extra/kdeedu-kmplot/kdeedu-kmplot.install
	extra/kdeedu-kstars/PKGBUILD
	extra/kdeedu-kstars/kdeedu-kstars.install
	extra/kdeedu-ktouch/PKGBUILD
	extra/kdeedu-ktouch/kdeedu-ktouch.install
	extra/kdeedu-kturtle/PKGBUILD
	extra/kdeedu-kturtle/kdeedu-kturtle.install
	extra/kdeedu-kwordquiz/PKGBUILD
	extra/kdeedu-kwordquiz/kdeedu-kwordquiz.install
	extra/kdeedu-marble/PKGBUILD
	extra/kdeedu-marble/gpsd-2.96.patch
	extra/kdeedu-marble/kdeedu-marble.install
	extra/kdeedu-parley/PKGBUILD
	extra/kdeedu-parley/kdeedu-parley.install
	extra/kdeedu-rocs/PKGBUILD
	extra/kdeedu-step/PKGBUILD
	extra/kdeedu-step/kdeedu-step.install
	extra/kdegraphics-gwenview/PKGBUILD
	extra/kdegraphics-gwenview/kdegraphics-gwenview.install
	extra/kdegraphics-kamera/PKGBUILD
	extra/kdegraphics-kcolorchooser/PKGBUILD
	extra/kdegraphics-kcolorchooser/kdegraphics-kcolorchooser.install
	extra/kdegraphics-kgamma/PKGBUILD
	extra/kdegraphics-kolourpaint/PKGBUILD
	extra/kdegraphics-kolourpaint/kdegraphics-kolourpaint.install
	extra/kdegraphics-kruler/PKGBUILD
	extra/kdegraphics-kruler/kdegraphics-kruler.install
	extra/kdegraphics-ksaneplugin/PKGBUILD
	extra/kdegraphics-ksnapshot/PKGBUILD
	extra/kdegraphics-ksnapshot/kdegraphics-ksnapshot.install
	extra/kdegraphics-okular/PKGBUILD
	extra/kdegraphics-okular/kdegraphics-okular.install
	extra/kdegraphics-strigi-analyzer/PKGBUILD
	extra/kdegraphics-svgpart/PKGBUILD
	extra/kdegraphics-thumbnailers/PKGBUILD
	extra/kdegraphics/PKGBUILD
	extra/kdelibs/PKGBUILD
	extra/kdemultimedia/PKGBUILD
	extra/kdepim-runtime/PKGBUILD
	extra/kdeplasma-addons/PKGBUILD
	extra/kdesdk-kate/PKGBUILD
	extra/kdesdk-kate/kdebase-kwrite.install
	extra/kdesdk-kate/kdesdk-kate.install
	extra/kdesdk-kate/pkgbuild-syntax-highlight.patch
	extra/kdeutils/PKGBUILD
	extra/kipi-plugins/PKGBUILD
	extra/koffice/PKGBUILD
	extra/konq-plugins/PKGBUILD
	extra/libkdcraw/PKGBUILD
	extra/libkdcraw/libkdcraw.install
	extra/libkdeedu/PKGBUILD
	extra/libkdeedu/libkdeedu.install
	extra/libkexiv2/PKGBUILD
	extra/libkipi/PKGBUILD
	extra/libkipi/libkipi.install
	extra/libksane/PKGBUILD
	extra/libksane/libksane.install
	extra/liblrdf/PKGBUILD
	extra/maxima/PKGBUILD
	extra/mysql/PKGBUILD
	extra/partitionmanager/PKGBUILD
	extra/pygobject/PKGBUILD
	extra/samba/PKGBUILD
	extra/sbcl/PKGBUILD
	extra/texlive-bin/PKGBUILD
	kde-unstable/kdebase-workspace/PKGBUILD
	multilib-testing/lib32-mesa/PKGBUILD
	multilib/lib32-freetype2/PKGBUILD
	multilib/lib32-jack/PKGBUILD
	multilib/lib32-libsndfile/PKGBUILD
	testing/mesa/PKGBUILD
	~fauno/notmuch/PKGBUILD

3 files changed, 6 insertions, 94 deletions

diff --git a/extra/boost/4994-compile-fix-for-Python32-v2.patch b/extra/boost/4994-compile-fix-for-Python32-v2.patch
deleted file mode 100644
index 22613b3f2..000000000
--- a/extra/boost/4994-compile-fix-for-Python32-v2.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Index: libs/python/src/converter/builtin_converters.cpp
-===================================================================
---- libs/python/src/converter/builtin_converters.cpp	(revision 67279)
-+++ libs/python/src/converter/builtin_converters.cpp	(working copy)
-@@ -431,7 +431,11 @@
-           if (!result.empty())
-           {
-               int err = PyUnicode_AsWideChar(
-+#if PY_VERSION_HEX >= 0x03020000
-+                  intermediate
-+#else
-                   (PyUnicodeObject *)intermediate
-+#endif
-                 , &result[0]
-                 , result.size());
- 
diff --git a/extra/boost/PKGBUILD b/extra/boost/PKGBUILD
index 37a46a5b5..2ff1dbce0 100644
--- a/extra/boost/PKGBUILD
+++ b/extra/boost/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 126799 2011-06-07 11:40:27Z ibiru $
+# $Id: PKGBUILD 132748 2011-07-25 19:08:12Z ibiru $
 # Maintainer: kevin <kevin@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Kritoke <kritoke@gamebox.net>
@@ -6,19 +6,15 @@
 
 pkgbase=boost
 pkgname=('boost-libs' 'boost')
-pkgver=1.46.1
+pkgver=1.47.0
 _boostver=${pkgver//./_}
-pkgrel=3
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.boost.org/"
 makedepends=('icu' 'python' 'python2' 'bzip2' 'zlib' 'openmpi')
-source=(http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}_${_boostver}.tar.gz
-        4994-compile-fix-for-Python32-v2.patch
-        boost-1.46.0-spirit.patch)
+source=(http://downloads.sourceforge.net/sourceforge/${pkgbase}/${pkgbase}_${_boostver}.tar.gz)
 license=('custom')
-md5sums=('341e5d993b19d099bf1a548495ea91ec'
-         'cb59e8adbf2a45ef9264a2f4ab92b849'
-         '9d6e2f13fef23bf27d7bdddc104e182a')
+md5sums=('ff180a5276bec773a7625cac7e2288e8')
 
 _stagedir="${srcdir}/stagedir"
 
@@ -30,7 +26,7 @@ build() {
   echo "using mpi ;" >> build/v2/user-config.jam
 
   # build bjam
-  cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine/src"
+  cd "${srcdir}/${pkgbase}_${_boostver}/tools/build/v2/engine"
   ./build.sh cc
 
   _bindir="bin.linuxx86"
@@ -56,10 +52,6 @@ build() {
 
   # build libs
   cd "${srcdir}/${pkgbase}_${_boostver}"
-  #python 3.2 support
-  #https://svn.boost.org/trac/boost/ticket/4994
-  patch -Np0 -i "${srcdir}/4994-compile-fix-for-Python32-v2.patch"
-  patch -Np0 -i "${srcdir}/boost-1.46.0-spirit.patch"
 
   # default "minimal" install: "release link=shared,static
   # runtime-link=shared threading=single,multi"
@@ -78,11 +70,6 @@ build() {
       --layout=system \
       ${MAKEFLAGS} \
       install
-
-  # pyste is unmaintained: http://www.boost.org/doc/libs/1_46_0/libs/python/doc/index.html
-  # build pyste
-  #cd "${srcdir}/${pkgbase}_${_boostver}/libs/python/pyste/install"
-  #python2 setup.py install --root=${_stagedir} --optimize=1
 }
 
 package_boost() {
diff --git a/extra/boost/boost-1.46.0-spirit.patch b/extra/boost/boost-1.46.0-spirit.patch
deleted file mode 100644
index 6fae331ee..000000000
--- a/extra/boost/boost-1.46.0-spirit.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-Index: boost/spirit/home/qi/nonterminal/detail/parameterized.hpp
-===================================================================
---- boost/spirit/home/qi/nonterminal/detail/parameterized.hpp	(revision 68724)
-+++ boost/spirit/home/qi/nonterminal/detail/parameterized.hpp	(revision 68725)
-@@ -14,6 +14,7 @@
- 
- #include <boost/ref.hpp>
- 
-+#include <boost/spirit/home/support/handles_container.hpp>
- #include <boost/spirit/home/qi/parser.hpp>
- 
- namespace boost { namespace spirit { namespace qi
-@@ -59,4 +60,16 @@ namespace boost { namespace spirit { nam
-     };
- }}}
- 
-+namespace boost { namespace spirit { namespace traits
-+{
-+    ///////////////////////////////////////////////////////////////////////////
-+    template <typename Subject, typename Params, typename Attribute
-+      , typename Context, typename Iterator>
-+    struct handles_container<qi::parameterized_nonterminal<Subject, Params>
-+          , Attribute, Context, Iterator>
-+      : handles_container<typename remove_const<Subject>::type
-+        , Attribute, Context, Iterator> 
-+    {};
-+}}}
-+
- #endif
-Index: boost/spirit/home/karma/nonterminal/detail/parameterized.hpp
-===================================================================
---- boost/spirit/home/karma/nonterminal/detail/parameterized.hpp	(revision 68724)
-+++ boost/spirit/home/karma/nonterminal/detail/parameterized.hpp	(revision 68725)
-@@ -14,6 +14,7 @@
- 
- #include <boost/ref.hpp>
- 
-+#include <boost/spirit/home/support/handles_container.hpp>
- #include <boost/spirit/home/karma/generator.hpp>
- 
- namespace boost { namespace spirit { namespace karma
-@@ -60,4 +61,17 @@ namespace boost { namespace spirit { nam
-     };
- }}}
- 
-+
-+namespace boost { namespace spirit { namespace traits
-+{
-+    ///////////////////////////////////////////////////////////////////////////
-+    template <typename Subject, typename Params, typename Attribute
-+      , typename Context, typename Iterator>
-+    struct handles_container<karma::parameterized_nonterminal<Subject, Params>
-+          , Attribute, Context, Iterator>
-+      : handles_container<typename remove_const<Subject>::type
-+        , Attribute, Context, Iterator> 
-+    {};
-+}}}
-+
- #endif