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

Conflicts:
	community-testing/addresses/PKGBUILD
	community-testing/gcc-avr/PKGBUILD
	community-testing/gnumail/PKGBUILD
	community-testing/gnustep-back/PKGBUILD
	community-testing/gnustep-base/PKGBUILD
	community-testing/gnustep-gui/PKGBUILD
	community-testing/llvm/PKGBUILD
	community-testing/systemd/PKGBUILD
	community/llvm/PKGBUILD
	community/lua-yajl-git/PKGBUILD
	community/mingw32-gcc/PKGBUILD
	community/python-scipy/PKGBUILD
	community/virtualbox/PKGBUILD
	core/bin86/PKGBUILD
	core/cloog-ppl/PKGBUILD
	core/gcc/PKGBUILD
	core/mpfr/PKGBUILD
	extra/ilmbase/PKGBUILD
	extra/kdeedu/PKGBUILD
	extra/kdepim/PKGBUILD
	extra/latex2html/PKGBUILD
	extra/libmad/PKGBUILD
	extra/postgresql/PKGBUILD
	multilib-testing/binutils-multilib/PKGBUILD
	multilib-testing/gcc-multilib/PKGBUILD
	multilib-testing/lib32-glibc/PKGBUILD
	multilib/gcc-multilib/PKGBUILD
	multilib/gcc-multilib/gcc-go.install
	testing/bin86/PKGBUILD
	testing/binutils/PKGBUILD
	testing/coreutils/PKGBUILD
	testing/glibc/PKGBUILD
	testing/gnome-control-center/PKGBUILD
	testing/less/PKGBUILD
	testing/linux-api-headers/PKGBUILD
	testing/mdadm/PKGBUILD
	testing/mpfr/PKGBUILD
	testing/udev/PKGBUILD

2 files changed, 6 insertions, 98 deletions

diff --git a/extra/kdepim/PKGBUILD b/extra/kdepim/PKGBUILD
index 65416c0df..a68675772 100644
--- a/extra/kdepim/PKGBUILD
+++ b/extra/kdepim/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 118254 2011-04-06 08:33:32Z andrea $
+# $Id: PKGBUILD 120278 2011-04-22 00:23:46Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -20,23 +20,18 @@ pkgname=('kdepim-akonadiconsole'
          'kdepim-ktimetracker'
          'kdepim-libkdepim'
          'kdepim-wizards')
-pkgver=4.4.10
-pkgrel=2
+pkgver=4.4.11.1
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdepim')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost' 'kdepim-runtime' 'libxss'
-	'pilot-link' 'kde-agent' 'docbook-xsl')
-source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2"
-        'asynchronous-start.patch')
-sha1sums=('b9c45e80dddc3bff201df6ddd76fdf4f1f18d5c3'
-          '3816d618026b85500a21753395712cd91de6e31b')
+             'pilot-link' 'kde-agent')
+source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/src/${pkgbase}-${pkgver}.tar.bz2")
+sha1sums=('49dd6cc8406b0ef4bb681bfc0de6ad9368b4b5b2')
 
 build() {
-	cd ${srcdir}/${pkgbase}-${pkgver}
-    patch -Np1 -i ${srcdir}/asynchronous-start.patch
-
     cd ${srcdir}
 	mkdir build
 	cd build
diff --git a/extra/kdepim/asynchronous-start.patch b/extra/kdepim/asynchronous-start.patch
deleted file mode 100644
index bc014116c..000000000
--- a/extra/kdepim/asynchronous-start.patch
+++ /dev/null
@@ -1,87 +0,0 @@
-commit cfa404b7188e4c26bddbc9579728f6d25f8cd214
-Author: Stephen Kelly <steveire@gmail.com>
-Date:   Tue Apr 5 11:09:43 2011 +0200
-
-    Start kdepim 4.4 asynchronously if built against 4.6.
-    
-    The synchronous mechanism doesn't have enough time to start
-    before it reports failure.
-
-diff --git a/kaddressbook/main.cpp b/kaddressbook/main.cpp
-index 4c8ca42..200f8ec 100644
---- a/kaddressbook/main.cpp
-+++ b/kaddressbook/main.cpp
-@@ -49,11 +49,13 @@ int main( int argc, char **argv )
-   MainWindow *window = new MainWindow;
-   window->show();
- 
-+#if !KDE_IS_VERSION(4,6,0)
-   if ( !Akonadi::Control::start( window ) ) {
-     //TODO: add message box after string freeze
-     kWarning() << "Unable to start Akonadi server, exit application";
-     return 1;
-   }
-+#endif
- 
-   return app.exec();
- }
-diff --git a/kmail/kmmainwidget.cpp b/kmail/kmmainwidget.cpp
-index a31973a..10b14e4 100644
---- a/kmail/kmmainwidget.cpp
-+++ b/kmail/kmmainwidget.cpp
-@@ -165,6 +165,9 @@ using KMail::TemplateParser;
- 
- #include <errno.h> // ugh
- 
-+#include <akonadi/control.h>
-+#include <akonadi/servermanager.h>
-+
- #include "kmmainwidget.moc"
- 
- K_GLOBAL_STATIC( KMMainWidget::PtrList, theMainWidgetList )
-@@ -186,6 +189,10 @@ KMMainWidget::KMMainWidget( QWidget *parent, KXMLGUIClient *aGUIClient,
-     mVacationIndicatorActive( false ),
-     mGoToFirstUnreadMessageInSelectedFolder( false )
- {
-+#if KDE_IS_VERSION(4,6,0)
-+  Akonadi::Control::widgetNeedsAkonadi(this);
-+  Akonadi::ServerManager::start();
-+#endif
-   // must be the first line of the constructor:
-   mStartupDone = false;
-   mWasEverShown = false;
-diff --git a/kmail/main.cpp b/kmail/main.cpp
-index f39ca5f..c2dd1c3 100644
---- a/kmail/main.cpp
-+++ b/kmail/main.cpp
-@@ -145,12 +145,14 @@ int main(int argc, char *argv[])
-   app.setEventLoopReached();
-   app.delayedInstanceCreation();
- 
-+#if !KDE_IS_VERSION(4,6,0)
-   // Start Akonadi
-   if ( !Akonadi::Control::start( kmkernel->getKMMainWidget() ) ) {
-     //TODO: add message box after string freeze
-     kWarning() << "Unable to start Akonadi server, exit application";
-     return 1;
-   }
-+#endif
- 
-   // Go!
-   int ret = qApp->exec();
-diff --git a/kontact/src/main.cpp b/kontact/src/main.cpp
-index 356aa57..cb4a235 100644
---- a/kontact/src/main.cpp
-+++ b/kontact/src/main.cpp
-@@ -199,9 +199,11 @@ int main( int argc, char **argv )
- 
-   KontactApp app;
- 
-+#if !KDE_IS_VERSION(4,6,0)
-   // KDE 4.4: do akonadi startup before creating any window, since creating
-   // the window loads kmail. In 4.5 we'll do this startup async instead.
-   Akonadi::Control::start( 0 );
-+#endif
- 
-   // Qt doesn't treat the system tray as a window, and therefore Qt would quit
-   // the event loop when an error message is clicked away while Kontact is in the