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

Conflicts:
	community/collectd/PKGBUILD
	community/erlang/PKGBUILD
	community/fcitx-mozc/PKGBUILD
	community/libgexiv2/PKGBUILD
	community/monica/PKGBUILD
	community/neatx/PKGBUILD
	community/qstardict/PKGBUILD
	community/shell-fm/PKGBUILD
	core/isl/PKGBUILD
	extra/kdeadmin/PKGBUILD
	extra/kdenetwork/PKGBUILD
	extra/kdesdk/PKGBUILD
	extra/kdetoys/PKGBUILD
	extra/pkgfile/PKGBUILD
	extra/pyqt4/PKGBUILD
	extra/sip/PKGBUILD
	extra/sqlite/PKGBUILD

68 files changed, 478 insertions, 1088 deletions

diff --git a/extra/accountsservice/PKGBUILD b/extra/accountsservice/PKGBUILD
index 2e2054f7e..ab7f8f246 100644
--- a/extra/accountsservice/PKGBUILD
+++ b/extra/accountsservice/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 189848 2013-07-09 13:13:14Z heftig $
+# $Id: PKGBUILD 193628 2013-08-26 09:59:39Z jgc $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=accountsservice
 pkgver=0.6.34
-pkgrel=1
+pkgrel=2
 pkgdesc="D-Bus interface for user account query and manipulation"
 arch=(i686 x86_64 'mips64el')
 url="http://www.freedesktop.org/software/accountsservice/"
@@ -11,13 +11,18 @@ license=('GPL3')
 depends=('glib2' 'polkit' 'systemd')
 makedepends=('intltool' 'gobject-introspection' 'vala')
 options=('!libtool')
-source=($url/$pkgname-$pkgver.tar.xz more-exclusions.patch)
+source=($url/$pkgname-$pkgver.tar.xz more-exclusions.patch git-fixes.patch)
 md5sums=('dbf4323b688a314b4bf76890ad6d5279'
-         '45ef529fb38d32ec7a1d03005dd20ced')
+         '45ef529fb38d32ec7a1d03005dd20ced'
+         '5082c3ba917c520b70f3c5089cb02c9c')
 
-build() {
+prepare() {
   cd $pkgname-$pkgver
+  patch -Np1 -i ../git-fixes.patch
   patch -Np1 -i ../more-exclusions.patch
+}
+build() {
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr --sysconfdir=/etc \
     --libexecdir=/usr/lib/accountsservice \
     --with-systemdsystemunitdir=/usr/lib/systemd/system \
diff --git a/extra/accountsservice/git-fixes.patch b/extra/accountsservice/git-fixes.patch
new file mode 100644
index 000000000..b0c3c4019
--- /dev/null
+++ b/extra/accountsservice/git-fixes.patch
@@ -0,0 +1,245 @@
+diff --git a/src/daemon.c b/src/daemon.c
+index ec5cc82..f85050a 100644
+--- a/src/daemon.c
++++ b/src/daemon.c
+@@ -256,6 +256,13 @@ typedef struct {
+         GHashTable *logout_hash;
+ } WTmpGeneratorState;
+ 
++static void
++user_previous_login_free (UserPreviousLogin *previous_login)
++{
++        g_free (previous_login->id);
++        g_free (previous_login);
++}
++
+ static struct passwd *
+ entry_generator_wtmp (GHashTable *users,
+                       gpointer   *state)
+@@ -365,11 +372,7 @@ entry_generator_wtmp (GHashTable *users,
+ 
+                 user = g_hash_table_lookup (users, key);
+                 if (user == NULL) {
+-                        for (l = accounting->previous_logins; l != NULL; l = l->next) {
+-                                previous_login = l->data;
+-                                g_free (previous_login->id);
+-                        }
+-                        g_list_free (accounting->previous_logins);
++                        g_list_free_full (accounting->previous_logins, (GDestroyNotify) user_previous_login_free);
+                         continue;
+                 }
+ 
+@@ -384,11 +387,10 @@ entry_generator_wtmp (GHashTable *users,
+                         g_variant_builder_add (builder2, "{sv}", "type", g_variant_new_string (previous_login->id));
+                         g_variant_builder_add (builder, "(xxa{sv})", previous_login->login_time, previous_login->logout_time, builder2);
+                         g_variant_builder_unref (builder2);
+-                        g_free (previous_login->id);
+                 }
+                 g_object_set (user, "login-history", g_variant_new ("a(xxa{sv})", builder), NULL);
+                 g_variant_builder_unref (builder);
+-                g_list_free (accounting->previous_logins);
++                g_list_free_full (accounting->previous_logins, (GDestroyNotify) user_previous_login_free);
+ 
+                 user_changed (user);
+         }
+@@ -491,7 +493,7 @@ entry_generator_cachedir (GHashTable *users,
+                 key_file = g_key_file_new ();
+                 if (g_key_file_load_from_file (key_file, filename, 0, NULL))
+                         user_update_from_keyfile (user, key_file);
+-                g_key_file_free (key_file);
++                g_key_file_unref (key_file);
+                 g_free (filename);
+         }
+ 
+diff --git a/src/libaccountsservice/act-user-manager.c b/src/libaccountsservice/act-user-manager.c
+index fd660e5..cf2cbfa 100644
+--- a/src/libaccountsservice/act-user-manager.c
++++ b/src/libaccountsservice/act-user-manager.c
+@@ -1178,6 +1178,28 @@ get_current_session_id (ActUserManager *manager)
+                 return;
+         }
+ #endif
++
++        if (manager->priv->ck_manager_proxy == NULL) {
++                GError *error = NULL;
++
++                manager->priv->ck_manager_proxy = console_kit_manager_proxy_new_sync (manager->priv->connection,
++                                                                                      G_DBUS_PROXY_FLAGS_NONE,
++                                                                                      CK_NAME,
++                                                                                      CK_MANAGER_PATH,
++                                                                                      NULL,
++                                                                                      &error);
++                if (manager->priv->ck_manager_proxy == NULL) {
++                        if (error != NULL) {
++                                g_warning ("Failed to create ConsoleKit proxy: %s", error->message);
++                                g_error_free (error);
++                        } else {
++                                g_warning ("Failed to create_ConsoleKit_proxy");
++                        }
++                        unload_seat (manager);
++                        return;
++                }
++        }
++
+         console_kit_manager_call_get_current_session (manager->priv->ck_manager_proxy, NULL,
+                                                       on_get_current_session_finished,
+                                                       g_object_ref (manager));
+@@ -1933,12 +1955,13 @@ reload_systemd_sessions (ActUserManager *manager)
+ }
+ 
+ #endif
+-static void
++static gboolean
+ on_session_monitor_event (GPollableInputStream *stream,
+                           ActUserManager       *manager)
+ {
+         sd_login_monitor_flush (manager->priv->seat.session_monitor);
+         reload_systemd_sessions (manager);
++        return TRUE;
+ }
+ 
+ static void
+@@ -2535,9 +2558,13 @@ load_seat_incrementally (ActUserManager *manager)
+ static gboolean
+ load_idle (ActUserManager *manager)
+ {
++        /* The order below is important: load_seat_incrementally might
++           set "is-loaded" immediately and we thus need to call
++           load_users before it.
++        */
++        load_users (manager);
+         manager->priv->seat.state = ACT_USER_MANAGER_SEAT_STATE_UNLOADED + 1;
+         load_seat_incrementally (manager);
+-        load_users (manager);
+         manager->priv->load_id = 0;
+ 
+         return FALSE;
+@@ -2805,22 +2832,6 @@ act_user_manager_init (ActUserManager *manager)
+                           G_CALLBACK (on_user_removed_in_accounts_service),
+                           manager);
+ 
+-        manager->priv->ck_manager_proxy = console_kit_manager_proxy_new_sync (manager->priv->connection,
+-                                                                              G_DBUS_PROXY_FLAGS_NONE,
+-                                                                              CK_NAME,
+-                                                                              CK_MANAGER_PATH,
+-                                                                              NULL,
+-                                                                              &error);
+-        if (manager->priv->ck_manager_proxy == NULL) {
+-                if (error != NULL) {
+-                        g_warning ("Failed to create ConsoleKit proxy: %s", error->message);
+-                        g_error_free (error);
+-                } else {
+-                        g_warning ("Failed to create_ConsoleKit_proxy");
+-                }
+-                return;
+-        }
+-
+         manager->priv->seat.state = ACT_USER_MANAGER_SEAT_STATE_UNLOADED;
+ }
+ 
+diff --git a/src/libaccountsservice/act-user.h b/src/libaccountsservice/act-user.h
+index 31b2cc6..e2966f4 100644
+--- a/src/libaccountsservice/act-user.h
++++ b/src/libaccountsservice/act-user.h
+@@ -64,7 +64,9 @@ const char    *act_user_get_shell                 (ActUser   *user);
+ const char    *act_user_get_email                 (ActUser   *user);
+ const char    *act_user_get_location              (ActUser   *user);
+ guint          act_user_get_num_sessions          (ActUser   *user);
++guint          act_user_get_num_sessions_anywhere (ActUser   *user);
+ gboolean       act_user_is_logged_in              (ActUser   *user);
++gboolean       act_user_is_logged_in_anywhere     (ActUser   *user);
+ int            act_user_get_login_frequency       (ActUser   *user);
+ gint64         act_user_get_login_time            (ActUser   *user);
+ const GVariant*act_user_get_login_history         (ActUser   *user);
+diff --git a/src/user.c b/src/user.c
+index 5271b63..661067a 100644
+--- a/src/user.c
++++ b/src/user.c
+@@ -78,6 +78,8 @@ struct User {
+ 
+         Daemon       *daemon;
+ 
++        GKeyFile     *keyfile;
++
+         uid_t         uid;
+         gid_t         gid;
+         gchar        *user_name;
+@@ -360,6 +362,9 @@ user_update_from_keyfile (User     *user,
+             }
+         }
+ 
++        g_clear_pointer (&user->keyfile, g_key_file_unref);
++        user->keyfile = g_key_file_ref (keyfile);
++
+         g_object_thaw_notify (G_OBJECT (user));
+ }
+ 
+@@ -387,6 +392,8 @@ static void
+ user_save_to_keyfile (User     *user,
+                       GKeyFile *keyfile)
+ {
++        g_key_file_remove_group (keyfile, "User", NULL);
++
+         if (user->email)
+                 g_key_file_set_string (keyfile, "User", "Email", user->email);
+ 
+@@ -412,15 +419,13 @@ static void
+ save_extra_data (User *user)
+ {
+         gchar *filename;
+-        GKeyFile *keyfile;
+         gchar *data;
+         GError *error;
+ 
+-        keyfile = g_key_file_new ();
+-        user_save_to_keyfile (user, keyfile);
++        user_save_to_keyfile (user, user->keyfile);
+ 
+         error = NULL;
+-        data = g_key_file_to_data (keyfile, NULL, &error);
++        data = g_key_file_to_data (user->keyfile, NULL, &error);
+         if (error == NULL) {
+                 filename = g_build_filename (USERDIR,
+                                              user->user_name,
+@@ -433,7 +438,6 @@ save_extra_data (User *user)
+                            user->user_name, error->message);
+                 g_error_free (error);
+         }
+-        g_key_file_free (keyfile);
+ }
+ 
+ static void
+@@ -1816,6 +1820,8 @@ user_finalize (GObject *object)
+ 
+         user = USER (object);
+ 
++        g_clear_pointer (&user->keyfile, g_key_file_unref);
++
+         g_free (user->object_path);
+         g_free (user->user_name);
+         g_free (user->real_name);
+@@ -1829,6 +1835,9 @@ user_finalize (GObject *object)
+         g_free (user->location);
+         g_free (user->password_hint);
+ 
++	if (user->login_history)
++		g_variant_unref (user->login_history);
++
+         if (G_OBJECT_CLASS (user_parent_class)->finalize)
+                 (*G_OBJECT_CLASS (user_parent_class)->finalize) (object);
+ }
+@@ -1861,6 +1870,8 @@ user_set_property (GObject      *object,
+                 user->login_time = g_value_get_int64 (value);
+                 break;
+         case PROP_LOGIN_HISTORY:
++                if (user->login_history)
++                        g_variant_unref (user->login_history);
+                 user->login_history = g_variant_ref (g_value_get_variant (value));
+                 break;
+         case PROP_AUTOMATIC_LOGIN:
+@@ -2031,4 +2042,5 @@ user_init (User *user)
+         user->automatic_login = FALSE;
+         user->system_account = FALSE;
+         user->login_history = NULL;
++        user->keyfile = g_key_file_new ();
+ }
diff --git a/extra/doxygen/PKGBUILD b/extra/doxygen/PKGBUILD
index c8803a2eb..5128e8878 100644
--- a/extra/doxygen/PKGBUILD
+++ b/extra/doxygen/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185936 2013-05-19 21:23:57Z dan $
+# $Id: PKGBUILD 193586 2013-08-24 16:53:45Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgbase=doxygen
 pkgname=('doxygen' 'doxygen-docs')
-pkgver=1.8.4
+pkgver=1.8.5
 pkgrel=1
 license=('GPL')
 arch=(i686 x86_64 'mips64el')
@@ -11,8 +11,8 @@ url="http://www.doxygen.org/"
 makedepends=('gcc-libs' 'flex' 'qt4' 'texlive-core' 'ghostscript'
              'texlive-latexextra' 'graphviz')
 source=(http://ftp.stack.nl/pub/users/dimitri/${pkgname}-${pkgver}.src.tar.gz)
-md5sums=('5f460b91c0d8c34a76173cf22015c2fc')
-sha1sums=('a363811b932e44d479addbadffcc8257cde60b44')
+md5sums=('db51274568755e2c75c2657e30a78a55')
+sha1sums=('1fc5ceec21122fe5037edee4c308ac94b59ee33e')
 
 build() {
   export PATH=$PATH:/usr/lib/qt4/bin
diff --git a/extra/e_dbus/PKGBUILD b/extra/e_dbus/PKGBUILD
index b68b66126..4501c3f87 100644
--- a/extra/e_dbus/PKGBUILD
+++ b/extra/e_dbus/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185677 2013-05-16 20:58:57Z ronald $
+# $Id: PKGBUILD 193666 2013-08-26 20:17:24Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=e_dbus
-pkgver=1.7.7
+pkgver=1.7.8
 pkgrel=1
 pkgdesc="D-Bus integration with Ecore"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('BSD')
 depends=('ecore' 'dbus-core')
 options=('!libtool' '!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('f13e9c3bcd4823920cdf3bacbd2c03a1935399a1')
+sha1sums=('726b2c4259e8818921ce0c27a3d452d414255975')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -50,3 +50,4 @@ package(){
   install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
         $pkgdir/usr/share/licenses/$pkgname/COPYING
 }
+
diff --git a/extra/ecore/PKGBUILD b/extra/ecore/PKGBUILD
index aa807856f..810132ac2 100644
--- a/extra/ecore/PKGBUILD
+++ b/extra/ecore/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185669 2013-05-16 20:56:13Z ronald $
+# $Id: PKGBUILD 193658 2013-08-26 20:14:53Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=ecore
-pkgver=1.7.7
+pkgver=1.7.8
 pkgrel=1
 pkgdesc="OS abstraction layer for e17"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('eina' 'evas' 'glib2' 'libxp' 'curl' 'libxss' 'libxtst'
 makedepends=('subversion')
 options=('!libtool' '!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('8ee61a186f2a41477415d78af4475e8a05132920')
+sha1sums=('8b8c88a211cb80bb19284560d8d481979ae0c111')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -94,3 +94,4 @@ package(){
   install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
         $pkgdir/usr/share/licenses/$pkgname/COPYING
 }
+
diff --git a/extra/edje/PKGBUILD b/extra/edje/PKGBUILD
index 6719ebf8c..a2c20b2cf 100644
--- a/extra/edje/PKGBUILD
+++ b/extra/edje/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185673 2013-05-16 20:57:24Z ronald $
+# $Id: PKGBUILD 193662 2013-08-26 20:16:08Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=edje
-pkgver=1.7.7
+pkgver=1.7.8
 pkgrel=1
 pkgdesc="A graphical design and layout library based on Evas"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ optdepends=('python2: inkscape2edc')
 install=edje.install
 options=('!libtool' '!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('cad21ed849b09d1436bebe3742e058177bc26a8b')
+sha1sums=('3fbff1d0b8473a0498ccee44745cf6609d73005e')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -50,3 +50,4 @@ package(){
   install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
         $pkgdir/usr/share/licenses/$pkgname/COPYING
 }
+
diff --git a/extra/eet/PKGBUILD b/extra/eet/PKGBUILD
index 267b98676..0d8042cc9 100644
--- a/extra/eet/PKGBUILD
+++ b/extra/eet/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185666 2013-05-16 20:55:11Z ronald $
+# $Id: PKGBUILD 193655 2013-08-26 20:13:56Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=eet
-pkgver=1.7.7
+pkgver=1.7.8
 pkgrel=1
 pkgdesc="A data storage and compression library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('BSD')
 depends=('libjpeg>=7' 'openssl' 'eina')
 options=(!libtool)
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('d3f756321147b26c89b69ece8c6115ba0f68490e')
+sha1sums=('d68e17fb155954c7d524cdba98244c09ae511513')
 
 build() {
    cd $srcdir/$pkgname-$pkgver
@@ -38,3 +38,4 @@ package(){
         $pkgdir/usr/share/licenses/$pkgname/COPYING
 }
 
+
diff --git a/extra/eeze/PKGBUILD b/extra/eeze/PKGBUILD
index 606513462..99dc2bbc4 100644
--- a/extra/eeze/PKGBUILD
+++ b/extra/eeze/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185671 2013-05-16 20:56:53Z ronald $
+# $Id: PKGBUILD 193660 2013-08-26 20:15:37Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=eeze
-pkgver=1.7.7
+pkgver=1.7.8
 pkgrel=1
 pkgdesc="Manipulate devices using udev and sysfs"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('BSD')
 depends=('ecore' 'eina' 'udev')
 options=('!libtool' '!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('45b2920b059baa80a2ccf93320751139045e6a72')
+sha1sums=('86a552cbdbbb7e8d968083b2c2429e0df60a6a68')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -37,3 +37,4 @@ package(){
   install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
         $pkgdir/usr/share/licenses/$pkgname/COPYING
 }
+
diff --git a/extra/efreet/PKGBUILD b/extra/efreet/PKGBUILD
index f61d36291..63a0ab43e 100644
--- a/extra/efreet/PKGBUILD
+++ b/extra/efreet/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185676 2013-05-16 20:58:32Z ronald $
+# $Id: PKGBUILD 193665 2013-08-26 20:17:07Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=efreet
-pkgver=1.7.7
+pkgver=1.7.8
 pkgrel=1
 pkgdesc="FreeDesktop.Org specifications for e17"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('BSD')
 depends=('eina' 'ecore' 'e_dbus')
 options=('!libtool' '!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('df466e60825b24d9c0eb1dbac5f688f884e58404')
+sha1sums=('5981bf49149366b15618050af3a65d6cf145c827')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -41,3 +41,4 @@ package(){
 }
 
 
+
diff --git a/extra/eina/PKGBUILD b/extra/eina/PKGBUILD
index e7296c4db..c3f3288ae 100644
--- a/extra/eina/PKGBUILD
+++ b/extra/eina/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185665 2013-05-16 20:54:50Z ronald $
+# $Id: PKGBUILD 193654 2013-08-26 20:13:37Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=eina
-pkgver=1.7.7
+pkgver=1.7.8
 pkgrel=1
 pkgdesc="A core data structure and common utility library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('LGPL2.1')
 depends=('glibc')
 options=('!libtool' '!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('74260d239cdf1f7da1f0ab106fb144fa23d74a87')
+sha1sums=('f655b2691d3976fdc2cfe116166e790c1b8bc90d')
 
 build() {
    cd $srcdir/$pkgname-$pkgver
@@ -48,3 +48,4 @@ package(){
   cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }
+
diff --git a/extra/eio/PKGBUILD b/extra/eio/PKGBUILD
index 19ae2f149..5c1c387c6 100644
--- a/extra/eio/PKGBUILD
+++ b/extra/eio/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185670 2013-05-16 20:56:37Z ronald $
+# $Id: PKGBUILD 193659 2013-08-26 20:15:22Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=eio
-pkgver=1.7.7
+pkgver=1.7.8
 pkgrel=1
 pkgdesc="Async IO library using Ecore"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('BSD')
 depends=('ecore')
 options=('!libtool' '!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('1c1bf133496de65c35a19319988796c9913d1d42')
+sha1sums=('75425d2ddd6ddc7a7f668e4f92c43e9d72d057ed')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -40,3 +40,4 @@ package(){
   install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
   	$pkgdir/usr/share/licenses/$pkgname/COPYING
 }
+
diff --git a/extra/elementary/PKGBUILD b/extra/elementary/PKGBUILD
index fa079c039..a7cddd47f 100644
--- a/extra/elementary/PKGBUILD
+++ b/extra/elementary/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185678 2013-05-16 20:59:24Z ronald $
+# $Id: PKGBUILD 193667 2013-08-26 20:17:40Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=elementary
-pkgver=1.7.7
+pkgver=1.7.8
 pkgrel=1
 pkgdesc="Enlightenment's widget set"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('BSD')
 depends=('edje' 'e_dbus' 'efreet' 'ethumb' 'eio')
 options=('!libtool' '!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('1a4dbc727780eff95c102cd8ecf9533c07a3631d')
+sha1sums=('5cae29bd8310691fbf459ce9132264dcef8338ed')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -51,3 +51,4 @@ package(){
   install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
         $pkgdir/usr/share/licenses/$pkgname/COPYING
 }
+
diff --git a/extra/embryo/PKGBUILD b/extra/embryo/PKGBUILD
index 4051e860d..84aa31786 100644
--- a/extra/embryo/PKGBUILD
+++ b/extra/embryo/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185672 2013-05-16 20:57:07Z ronald $
+# $Id: PKGBUILD 193661 2013-08-26 20:15:52Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=embryo
-pkgver=1.7.7
+pkgver=1.7.8
 pkgrel=1
 pkgdesc="implementation of a C like scripting language for e17"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('BSD')
 depends=('glibc' 'eina')
 options=('!libtool')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('204fa38463b64d3b97e4c598942e9389dc89216e')
+sha1sums=('879c0dd75de6c402707da4981716a2b7c1dab618')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -35,3 +35,4 @@ package(){
   install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
         $pkgdir/usr/share/licenses/$pkgname/COPYING
 }
+
diff --git a/extra/emotion/PKGBUILD b/extra/emotion/PKGBUILD
index 5fe2807a6..d7bad45d8 100644
--- a/extra/emotion/PKGBUILD
+++ b/extra/emotion/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185674 2013-05-16 20:57:59Z ronald $
+# $Id: PKGBUILD 193663 2013-08-26 20:16:34Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=emotion
-pkgver=1.7.7
+pkgver=1.7.8
 pkgrel=1
 pkgdesc="Library to easily integrate media playback into EFL applications"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('BSD')
 depends=('gstreamer0.10' 'edje' 'eeze')
 options=('!libtool' '!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('e42b73a268afaa022efb179966991cfb3865168b')
+sha1sums=('a0f9ddbd6b26a69de2fc6958327da1497bd2f420')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -41,3 +41,4 @@ package(){
   install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
         $pkgdir/usr/share/licenses/$pkgname/COPYING
 }
+
diff --git a/extra/enlightenment17/PKGBUILD b/extra/enlightenment17/PKGBUILD
index 06edaadd8..d3444ca5c 100644
--- a/extra/enlightenment17/PKGBUILD
+++ b/extra/enlightenment17/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 185679 2013-05-16 21:02:06Z ronald $
+# $Id: PKGBUILD 193669 2013-08-26 20:20:21Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=enlightenment17
 _pkgname=enlightenment
-pkgver=0.17.3
+pkgver=0.17.4
 pkgrel=1
 pkgdesc="Enlightenment window manager DR17 (aka e17)"
 arch=('i686' 'x86_64' 'mips64el')
@@ -20,7 +20,7 @@ options=('!libtool' '!emptydirs')
 install=enlightenment17.install
 source=(http://download.enlightenment.org/releases/$_pkgname-$pkgver.tar.gz
   'e-applications.menu' 'quickstart.patch' 'sysactions_systemd.patch')
-sha1sums=('998a5ada3861028ffd65f994270e5f7f8e9baf9b'
+sha1sums=('29f5f4c10bcc7b32f79013ccbc7257abeea78faf'
           'e08cc63cb8a188a06705b42d03e032b9fcfa7ee5'
           '3f53931ae86de8fe99e386aeb097521aac0decd8'
           '86f1c5e36dc274c3101362532378be034e89c593')
diff --git a/extra/ethumb/PKGBUILD b/extra/ethumb/PKGBUILD
index 0a8017308..88c758ca8 100644
--- a/extra/ethumb/PKGBUILD
+++ b/extra/ethumb/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 185675 2013-05-16 20:58:16Z ronald $
+# $Id: PKGBUILD 193664 2013-08-26 20:16:51Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=ethumb
-pkgver=1.7.7
+pkgver=1.7.8
 pkgrel=1
 pkgdesc="Thumbnailing library and D-Bus service using EFL"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('BSD')
 depends=('libexif' 'e_dbus'  'emotion')
 options=('!libtool' '!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('37d173fea2ce68ee1cedd379f235663c1211d20d')
+sha1sums=('c19b5d8abbf79aa4df1c5523829ece751dc3c268')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
@@ -42,3 +42,4 @@ package(){
   install -Dm644 $srcdir/$pkgname-$pkgver/COPYING \
         $pkgdir/usr/share/licenses/$pkgname/COPYING
 }
+
diff --git a/extra/evas/PKGBUILD b/extra/evas/PKGBUILD
index 4c12a00a0..3bffdbe40 100644
--- a/extra/evas/PKGBUILD
+++ b/extra/evas/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 191915 2013-08-01 06:59:44Z bpiotrowski $
+# $Id: PKGBUILD 193657 2013-08-26 20:14:26Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=evas
-pkgver=1.7.7
-pkgrel=2
+pkgver=1.7.8
+pkgrel=1
 pkgdesc="A hardware-accelerated canvas API for X-Windows"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.enlightenment.org"
@@ -12,15 +12,9 @@ license=('BSD')
 depends=('eet' 'giflib' 'libpng' 'libjpeg' 'libxrender' 'mesa'
   'fribidi' 'fontconfig' 'freetype2' 'harfbuzz' 'evas_generic_loaders')
 options=('!libtool' '!emptydirs')
-source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz
-        evas-1.7.5-giflib5.patch)
-sha1sums=('0b37848127872be7250d1c3bdff622d78cb7f3af'
-          'ec40d3aff6240dc0e33e648c76393f62b985628a')
+source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
+sha1sums=('ce71de058896e80c8f1822d967a6dcee01a1c9ac')
 
-prepare() {
-  cd $pkgname-$pkgver
-  patch -Np1 -i ../evas-1.7.5-giflib5.patch
-}
 build() {
   cd $pkgname-$pkgver
 
@@ -69,3 +63,5 @@ package() {
   install -Dm644 "$srcdir/$pkgname-$pkgver/COPYING" \
         "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
+
+
diff --git a/extra/evas/evas-1.7.5-giflib5.patch b/extra/evas/evas-1.7.5-giflib5.patch
deleted file mode 100644
index 48d1834c5..000000000
--- a/extra/evas/evas-1.7.5-giflib5.patch
+++ /dev/null
@@ -1,93 +0,0 @@
-diff --git a/src/modules/loaders/gif/evas_image_load_gif.c b/src/modules/loaders/gif/evas_image_load_gif.c
-index 18a6e23..e8cc562 100644
---- a/src/modules/loaders/gif/evas_image_load_gif.c
-+++ b/src/modules/loaders/gif/evas_image_load_gif.c
-@@ -684,7 +684,9 @@ evas_image_load_file_head_gif(Image_Entry *ie, const char *file, const char *key
-    int                 h;
-    int                 alpha;
-    int                 loop_count = -1;
--
-+#if GIFLIB_MAJOR >= 5
-+   int                 err;
-+#endif
-    w = 0;
-    h = 0;
-    alpha = -1;
-@@ -700,7 +702,11 @@ evas_image_load_file_head_gif(Image_Entry *ie, const char *file, const char *key
-         return EINA_FALSE;
-      }
- 
-+#if GIFLIB_MAJOR >= 5
-+   gif = DGifOpenFileHandle(fd, &err);
-+#else
-    gif = DGifOpenFileHandle(fd);
-+#endif
-    if (!gif)
-      {
-         if (fd) close(fd);
-@@ -826,6 +832,9 @@ evas_image_load_specific_frame(Image_Entry *ie, const char *file, int frame_inde
-    GifFileType       *gif;
-    Image_Entry_Frame *frame = NULL;
-    Gif_Frame         *gif_frame = NULL;
-+#if GIFLIB_MAJOR >= 5
-+   int                err;
-+#endif
- 
- #ifndef __EMX__
-    fd = open(file, O_RDONLY);
-@@ -838,7 +847,11 @@ evas_image_load_specific_frame(Image_Entry *ie, const char *file, int frame_inde
-         return EINA_FALSE;
-      }
- 
-+#if GIFLIB_MAJOR >= 5
-+   gif = DGifOpenFileHandle(fd, &err);
-+#else
-    gif = DGifOpenFileHandle(fd);
-+#endif
-    if (!gif)
-      {
-         if (fd) close(fd);
-@@ -915,6 +928,9 @@ evas_image_load_file_data_gif(Image_Entry *ie, const char *file, const char *key
-           {
-              int           fd;
-              GifFileType  *gif;
-+#if GIFLIB_MAJOR >= 5
-+             int           err;
-+#endif
- 
- #ifndef __EMX__
-              fd = open(file, O_RDONLY);
-@@ -927,7 +943,11 @@ evas_image_load_file_data_gif(Image_Entry *ie, const char *file, const char *key
-                   return EINA_FALSE;
-                }
- 
-+#if GIFLIB_MAJOR >= 5
-+             gif = DGifOpenFileHandle(fd, &err);
-+#else
-              gif = DGifOpenFileHandle(fd);
-+#endif
-              if (!gif)
-                {
-                   if (fd) close(fd);
-@@ -984,6 +1004,9 @@ evas_image_load_frame_duration_gif(Image_Entry *ie, const char *file, const int
-    int                 remain_frames = frame_num;
-    double              duration = 0;
-    int                 frame_count = 0;
-+#if GIFLIB_MAJOR >= 5
-+   int                 err;
-+#endif
- 
-    frame_count = ie->frame_count;
- 
-@@ -1000,7 +1023,11 @@ evas_image_load_frame_duration_gif(Image_Entry *ie, const char *file, const int
- #endif
-    if (fd < 0) return -1;
- 
-+#if GIFLIB_MAJOR >= 5
-+   gif = DGifOpenFileHandle(fd, &err);
-+#else
-    gif = DGifOpenFileHandle(fd);
-+#endif
-    if (!gif)
-      {
-         if (fd) close(fd);
diff --git a/extra/evas_generic_loaders/PKGBUILD b/extra/evas_generic_loaders/PKGBUILD
index ca5461359..6bfe01592 100644
--- a/extra/evas_generic_loaders/PKGBUILD
+++ b/extra/evas_generic_loaders/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 192061 2013-08-05 14:17:30Z andyrtr $
+# $Id: PKGBUILD 193656 2013-08-26 20:14:12Z ronald $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Gustavo Sverzut Barbieri <barbieri@gmail.com>
 
 pkgname=evas_generic_loaders
-pkgver=1.7.7
-pkgrel=4
+pkgver=1.7.8
+pkgrel=1
 pkgdesc="Additional generic loaders for Evas"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.enlightenment.org"
@@ -12,7 +12,7 @@ license=('BSD')
 depends=('librsvg' 'gstreamer0.10-base' 'poppler' 'libraw' 'libspectre' 'eina')
 options=('!libtool' '!emptydirs')
 source=(http://download.enlightenment.org/releases/$pkgname-$pkgver.tar.gz)
-sha1sums=('f4c753e995a7adb5e18535f41446e222f19227c2')
+sha1sums=('fe08848b794621e6695cd0df86b465412b0037fa')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -41,3 +41,4 @@ package() {
   install -Dm644 "$srcdir/$pkgname-$pkgver/COPYING" \
         "$pkgdir/usr/share/licenses/$pkgname/COPYING"
 }
+
diff --git a/extra/gcin/PKGBUILD b/extra/gcin/PKGBUILD
index 1bf0cec55..cce616b56 100644
--- a/extra/gcin/PKGBUILD
+++ b/extra/gcin/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 178956 2013-03-01 10:20:17Z andrea $
+# $Id: PKGBUILD 193564 2013-08-24 05:33:50Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=gcin
-pkgver=2.8.0
-pkgrel=2
+pkgver=2.8.1
+pkgrel=1
 pkgdesc='Input method server supporting various input methods'
 url='http://hyperrate.com/dir.php?eid=67'
 license=('LGPL')
@@ -17,21 +17,22 @@ optdepends=('qt4: support for qt4 input method'
             'anthy: support for anthy input method'
             'libchewing: support for chewing input method')
 source=("http://www.csie.nctu.edu.tw/~cp76/gcin/download/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('69fe604939bc013f043ff0b4baa63b7951b26c95')
+sha1sums=('fc7323f1e0558675a94e91de2166c484c72d464d')
 
 install=install
 
-build() {
+prepare() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-
-	source /etc/profile.d/qt4.sh
 	sed 's/lib64/lib/g' -i configure
 	sed '/include suffixes-rule/a \
 		CFLAGS+='"${CFLAGS}"' \
 		LDFLAGS+='"${LDFLAGS}"' \
 		OPTFLAGS=' \
 		-i Makefile
+}
 
+build() {
+	cd "${srcdir}/${pkgname}-${pkgver}"
 	./configure --prefix=/usr --use_i18n=Y
 	make
 }
diff --git a/extra/git/PKGBUILD b/extra/git/PKGBUILD
index 74a7cbe7d..11f677f4c 100644
--- a/extra/git/PKGBUILD
+++ b/extra/git/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 191563 2013-07-25 14:47:59Z dan $
+# $Id: PKGBUILD 193588 2013-08-24 16:58:24Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=git
-pkgver=1.8.3.4
+pkgver=1.8.4
 pkgrel=1
 pkgdesc="the fast distributed version control system"
 arch=(i686 x86_64 'mips64el')
@@ -90,13 +90,13 @@ package() {
   cp -a ./contrib/* $pkgdir/usr/share/git/
 
   # scripts are for python 2.x
-  sed -i 's|#![ ]*/usr/bin/env python|#!/usr/bin/env python2|' \
+  sed -i 's|#![ ]*/usr/bin/env python$|#!/usr/bin/env python2|' \
     $(find "$pkgdir" -name '*.py') \
     "$pkgdir"/usr/lib/git-core/git-p4 \
     "$pkgdir"/usr/share/git/gitview/gitview \
     "$pkgdir"/usr/share/git/remote-helpers/git-remote-bzr \
     "$pkgdir"/usr/share/git/remote-helpers/git-remote-hg
-  sed -i 's|#![ ]*/usr/bin/python|#!/usr/bin/python2|' \
+  sed -i 's|#![ ]*/usr/bin/python$|#!/usr/bin/python2|' \
     "$pkgdir"/usr/share/git/svn-fe/svnrdump_sim.py
 
 
@@ -115,7 +115,7 @@ package() {
   install -D -m 644 "$srcdir"/git-daemon.socket "$pkgdir"/usr/lib/systemd/system/git-daemon.socket
 }
 
-md5sums=('80eec3201a5d012913d287b85adaee8e'
-         '86fd812754d25201fd72c7476045dfec'
+md5sums=('355768a1c70d0cb4fedf4b598ac1375b'
+         'e3720f56e18a5ab8ee1871ac9c72ca7c'
          '042524f942785772d7bd52a1f02fe5ae'
          'f67869315c2cc112e076f0c73f248002')
diff --git a/extra/glsof/PKGBUILD b/extra/glsof/PKGBUILD
index 3dca99e8e..0a7733c79 100644
--- a/extra/glsof/PKGBUILD
+++ b/extra/glsof/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 174150 2013-01-03 05:50:14Z eric $
+# $Id: PKGBUILD 193595 2013-08-24 22:19:33Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=glsof
-pkgver=2.2.0
-_fmver=2.2.0
+pkgver=2.4.0
+_fmver=2.4.0
 _qver=1.0.0
 pkgrel=1
 pkgdesc="Two separate GUI utilities (Queries and Filemonitor) to the lsof command line utility"
@@ -15,17 +15,19 @@ source=(http://downloads.sourceforge.net/sourceforge/glsof/filemonitor-${_fmver}
         http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux32.tar.gz \
         http://downloads.sourceforge.net/sourceforge/glsof/queries-${_qver}/queries_linux64.tar.gz \
         glsof-filemonitor glsof-queries)
-sha1sums=('01697febfacc466b1cf0d7932c83ffd24b6e6784'
+sha1sums=('a605167063492da724ae75fab0492b9cc44fa93f'
           'd5a17d66dd02cd78bad5ffdda0b936c7848e4890'
           'c5dd12e9b2860f1c427ed7cd482e898978051d2c'
-          '197b58f40880995d6442fd42a58fa1f4594fd19d'
+          '9c3097119aa98723c5c59196e6089226829cf09d'
           '2797c326904af16a254c3e39b8c529ea14ef37e5')
 
 package() {
   cd "${srcdir}"
   install -D -m755 glsof-filemonitor "${pkgdir}/usr/bin/glsof-filemonitor"
   install -D -m755 glsof-queries "${pkgdir}/usr/bin/glsof-queries"
-  install -D -m644 filemonitor/filemonitor.jar "${pkgdir}/usr/share/java/glsof/filemonitor.jar"
+  install -d "${pkgdir}/usr/share/java/glsof"
+  install -D -m644 filemonitor/*.jar "${pkgdir}/usr/share/java/glsof"
+  install -D -m644 filemonitor/*.txt "${pkgdir}/usr/share/java/glsof"
   if [ "$CARCH" = "i686" ]; then
     install -D -m644 queries_linux32/queries.jar "${pkgdir}/usr/share/java/glsof/queries.jar"
     install -D -m644 queries_linux32/queries.pdf "${pkgdir}/usr/share/doc/glsof/queries.pdf"
diff --git a/extra/glsof/glsof-filemonitor b/extra/glsof/glsof-filemonitor
index 616e23ac7..9dff4c0e7 100644
--- a/extra/glsof/glsof-filemonitor
+++ b/extra/glsof/glsof-filemonitor
@@ -1,2 +1,2 @@
 #!/bin/sh
-java -jar /usr/share/java/glsof/filemonitor.jar
+java -Djava.security.policy=/usr/share/java/glsof/security-client.txt -jar /usr/share/java/glsof/filemonitor.jar
diff --git a/extra/gnumeric/PKGBUILD b/extra/gnumeric/PKGBUILD
index 0eff0e9d2..cf56d7b7c 100644
--- a/extra/gnumeric/PKGBUILD
+++ b/extra/gnumeric/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 190849 2013-07-18 20:27:30Z jgc $
+# $Id: PKGBUILD 193620 2013-08-26 07:59:33Z jgc $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 # Contributor: Kritoke <typeolinux@yahoo.com>
 
 pkgname=gnumeric
-pkgver=1.12.4
+pkgver=1.12.5
 pkgrel=1
 pkgdesc="A GNOME Spreadsheet Program"
 arch=('i686' 'x86_64' 'mips64el')
@@ -20,7 +20,7 @@ install=gnumeric.install
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
         revert-warnings.patch)
-sha256sums=('562e17d8b56f4587e33f54adff89a65ede6e6e0c57bcd561589453d8edae80bd'
+sha256sums=('7ff36dff134157ce6919c4cebc1a419192e529b00e42c52d9cebbd15e8dd5871'
             'bcafca016b809000c2a5bf911e2e3dfa4de28f9e541d9964574cac5c7ce09e53')
 
 prepare() {
diff --git a/extra/grilo-plugins/PKGBUILD b/extra/grilo-plugins/PKGBUILD
index f6d7e0c2c..178d3ea4e 100644
--- a/extra/grilo-plugins/PKGBUILD
+++ b/extra/grilo-plugins/PKGBUILD
@@ -1,29 +1,28 @@
-# $Id: PKGBUILD 191285 2013-07-23 10:02:47Z jgc $
+# $Id: PKGBUILD 193611 2013-08-26 07:04:31Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=grilo-plugins
-pkgver=0.2.8
-pkgrel=2
+pkgver=0.2.9
+pkgrel=1
 pkgdesc="Plugins for Grilo"
 url="http://www.gnome.org"
 arch=('i686' 'x86_64' 'mips64el')
 license=(LGPL)
 depends=(grilo sqlite libgcrypt)
-makedepends=(gupnp-av libgdata libquvi gmime rest libtracker-sparql totem-plparser libdmapsharing
+makedepends=(gupnp-av libgdata gmime rest libtracker-sparql totem-plparser libdmapsharing
              json-glib intltool)
 optdepends=('gupnp-av: uPnP plugin'
             'libgdata: Youtube plugin'
-            'libquvi: Youtube plugin, Vimeo plugin'
             'gmime: Podcasts plugin'
             'rest: Blip.tv plugin'
             'libtracker-sparql: Tracker plugin'
-            'totem-plparser: Optical media plugin'
+            'totem-plparser: Youtube plugin, Vimeo plugin, Optical media plugin'
             'libdmapsharing: DMAP sharing plugin'
             'json-glib: TMDb plugin')
 options=('!libtool' '!emptydirs')
 groups=('gnome')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('28f83fd701b33aed7b843e5e3850d7d961310c7cb33ffebcb652160fff8ccd80')
+sha256sums=('902b839bd1cdc27613d9e44af2afe00d1ef3b7471ae72c66c622560007e1023e')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/kdeadmin/PKGBUILD b/extra/kdeadmin/PKGBUILD
deleted file mode 100644
index 9e224d891..000000000
--- a/extra/kdeadmin/PKGBUILD
+++ /dev/null
@@ -1,65 +0,0 @@
-# $Id: PKGBUILD 189522 2013-07-03 17:01:18Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdeadmin
-pkgname=('kdeadmin-kcron'
-         'kdeadmin-ksystemlog'
-         'kdeadmin-kuser')
-pkgver=4.10.5
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdeadmin')
-makedepends=('cmake' 'automoc4' 'kdelibs' 'kdebase-runtime' 'kdepimlibs')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
-        'syslog-path.patch')
-sha1sums=('0b809772effe249d1ec581902fcecb73e7761134'
-          '20095ce6e0f3e5b6800a7c6e52de6fddba62c031')
-
-prepare() {
-	cd ${pkgbase}-${pkgver}
-	patch -p1 -i ${srcdir}/syslog-path.patch
-}
-
-build() {
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DKDE4_BUILD_TESTS=OFF \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DBUILD_strigi-analyzer=OFF
-	make
-}
-
-package_kdeadmin-kcron() {
-	pkgdesc='Configure and schedule tasks'
-    url='http://userbase.kde.org/KCron'
-	depends=('kdelibs')
-	cd $srcdir/build/kcron
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kcron/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeadmin-ksystemlog() {
-	pkgdesc='System log viewer tool'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/system/ksystemlog/"
-	cd $srcdir/build/ksystemlog
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/ksystemlog/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdeadmin-kuser() {
-	pkgdesc='User Manager'
-	depends=('kdebase-runtime' 'kdepimlibs')
-	url="http://kde.org/applications/system/kuser/"
-	install='kdeadmin.install'
-	cd $srcdir/build/kuser
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kuser/doc
-	make DESTDIR=$pkgdir install
-}
diff --git a/extra/kdeadmin/kdeadmin.install b/extra/kdeadmin/kdeadmin.install
deleted file mode 100644
index e70c054ec..000000000
--- a/extra/kdeadmin/kdeadmin.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/extra/kdeadmin/syslog-path.patch b/extra/kdeadmin/syslog-path.patch
deleted file mode 100644
index 8a9142bf6..000000000
--- a/extra/kdeadmin/syslog-path.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h~	2011-01-27 14:24:29.840000005 +0100
-+++ kdeadmin-4.6.0/ksystemlog/src/modes/system/systemConfiguration.h	2011-01-27 14:24:53.803333335 +0100
-@@ -39,7 +39,7 @@
- 		SystemConfiguration() :
- 			GenericLogModeConfiguration(
- 					QLatin1String( SYSTEM_LOG_MODE_ID ),
--					QStringList() << QLatin1String( "/var/log/syslog" ),
-+					QStringList() << QLatin1String( "/var/log/messages.log" ),
- 					QList<int>() << INFORMATION_LOG_LEVEL_ID
- 			) {
- 
diff --git a/extra/kdenetwork/PKGBUILD b/extra/kdenetwork/PKGBUILD
deleted file mode 100644
index 5848026bc..000000000
--- a/extra/kdenetwork/PKGBUILD
+++ /dev/null
@@ -1,109 +0,0 @@
-# $Id: PKGBUILD 191923 2013-08-01 06:59:53Z bpiotrowski $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdenetwork
-pkgname=('kdenetwork-filesharing'
-         'kdenetwork-kdnssd'
-         'kdenetwork-kget'
-         'kdenetwork-kppp'
-         'kdenetwork-krdc'
-         'kdenetwork-krfb')
-pkgver=4.10.5
-pkgrel=2
-arch=('i686' 'x86_64' 'mips64el')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdenetwork')
-makedepends=('cmake' 'automoc4' 'boost' 'speex' 'libotr3' 'ppp'
-	'qca-ossl' 'kdebase-workspace' 'kdebase-lib' 'libvncserver'
-    'v4l-utils' 'libidn' 'qimageblitz' 'libxdamage' 'libgadu' 'libmsn'
-    'libktorrent' 'libmms' 'telepathy-qt')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
-        'use-libotr3.patch'
-        'giflib5.patch')
-sha1sums=('3ee86a1a227593e9f37881da3c1db1a3c384b2e4'
-          '9c3b0ee15538fbfa36aa0a4748b1f6b5a7905384'
-          '388319373e96e6f44446ea1132c35ae9f660e01c')
-
-prepare() {
-    cd ${pkgbase}-${pkgver}
-    patch -p1 -i "${srcdir}"/use-libotr3.patch
-    cd kopete
-    patch -p1 -i "${srcdir}"/giflib5.patch
-}
-
-build() {
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DKDE4_BUILD_TESTS=OFF \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr \
-		-DMOZPLUGIN_INSTALL_DIR=/usr/lib/mozilla/plugins/ \
-		-DWITH_Xmms=OFF \
-		-DWITH_LibMeanwhile=OFF \
-		-DWITH_qq=OFF
-	make
-}
-
-package_kdenetwork-filesharing() {
-	pkgdesc='Konqueror properties dialog plugin to share a directory with the local network'
-	depends=('kdelibs' 'smbclient')
-	install='kdenetwork.install'
-	cd $srcdir/build/kdenetwork-filesharing
-	make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-kdnssd() {
-	pkgdesc='Monitors the network for DNS-SD services'
-	depends=('kdelibs')
-	cd $srcdir/build/kdnssd
-	make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-kget() {
-	pkgdesc='Download Manager'
-	depends=('kdebase-workspace' 'kdebase-lib' 'libktorrent' 'libmms')
-	url="http://kde.org/applications/internet/kget/"
-	install='kdenetwork-kget.install'
-	cd $srcdir/build/kget
-	make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-kppp() {
-	pkgdesc='Internet Dial-Up Tool'
-	depends=('kdebase-runtime' 'ppp')
-	url="http://kde.org/applications/internet/kppp/"
-	install='kdenetwork-kppp.install'
-	cd $srcdir/build/kppp
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/kppp/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-krdc() {
-	pkgdesc='Remote Desktop Client'
-	depends=('kdebase-runtime' 'telepathy-qt')
-    optdepends=('libvncserver: VNC support'
-                'rdesktop: RDP support'
-                'kdebase-keditbookmarks: to edit bookmarks')
-	url="http://kde.org/applications/internet/krdc/"
-	cd $srcdir/build/krdc
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/krdc/doc
-	make DESTDIR=$pkgdir install
-}
-
-package_kdenetwork-krfb() {
-	pkgdesc='Desktop Sharing'
-	# note on libxdamage:
-	#       not detected by namcap because libgl depends on it
-	#       but nvidia providing libgl does not depend on libxdamage
-	depends=('kdebase-runtime' 'libvncserver' 'libxdamage' 'telepathy-qt')
-	cd $srcdir/build/krfb
-	make DESTDIR=$pkgdir install
-	cd $srcdir/build/krfb/doc
-	make DESTDIR=$pkgdir install
-}
diff --git a/extra/kdenetwork/giflib5.patch b/extra/kdenetwork/giflib5.patch
deleted file mode 100644
index 231aefbc2..000000000
--- a/extra/kdenetwork/giflib5.patch
+++ /dev/null
@@ -1,67 +0,0 @@
-From: Raymond Wooninck <tittiatcoke@gmail.com>
-Date: Sun, 17 Mar 2013 12:24:09 +0000
-Subject: Enable building with giflib v5
-X-Git-Tag: v4.10.80
-X-Git-Url: http://quickgit.kde.org/?p=kopete.git&a=commitdiff&h=47ceec53aa5ee6b84a753fdbf735e44558513fe2
----
-Enable building with giflib v5
-
-REVIEW: 7066
-
-svn path=/trunk/KDE/kdenetwork/kopete/; revision=1344846
----
-
-
---- a/protocols/wlm/wlmchatsession.cpp
-+++ b/protocols/wlm/wlmchatsession.cpp
-@@ -65,6 +65,10 @@
- #include "wlmchatsessioninkaction.h"
- #ifdef HAVE_GIFLIB
- #include <gif_lib.h>
-+/* old giflib has no GIFLIB_MAJOR, define to avoid cpp warnings */
-+#ifndef GIFLIB_MAJOR
-+#define GIFLIB_MAJOR 4
-+#endif
- #endif
- 
- WlmChatSession::WlmChatSession (Kopete::Protocol * protocol,
-@@ -467,11 +471,15 @@
- {
- #ifdef HAVE_GIFLIB
- #ifdef HAVE_GIF_ERROR_STRING // giflib 4.2.0+
-+#if GIFLIB_MAJOR >= 5
-+        fprintf(stderr, "GIF-LIB error (exact reporting not implemented)\n");
-+#else
-         const char * errorString = GifErrorString();
-         if (errorString)
-             fprintf(stderr, "GIF-LIB error: %s\n", errorString);
-         else
-             fprintf(stderr, "GIF-LIB undefined error: %d\n", GifError());
-+#endif
- #else // older giflib versions, libungif
-         PrintGifError();
- #endif // HAVE_GIF_ERROR_STRING
-@@ -483,6 +491,10 @@
- WlmChatSession::convertToGif( const QPixmap & ink, QString filename)
- {
- #ifdef HAVE_GIFLIB
-+#if GIFLIB_MAJOR >= 5
-+#define FreeMapObject  GifFreeMapObject
-+#define MakeMapObject  GifMakeMapObject
-+#endif
-     int i, status;
-     GifFileType *GifFile;
-     ColorMapObject *screenColourmap;
-@@ -525,7 +537,11 @@
-         }
-     }
- 
-+#if GIFLIB_MAJOR >= 5
-+    GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0, NULL);
-+#else
-     GifFile= EGifOpenFileName(QFile::encodeName(filename).constData(), 0);
-+#endif
-     if (!GifFile) {
-         FreeMapObject(imageColourmap);
-         FreeMapObject(screenColourmap);
-
diff --git a/extra/kdenetwork/kdenetwork-kget.install b/extra/kdenetwork/kdenetwork-kget.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/extra/kdenetwork/kdenetwork-kget.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/extra/kdenetwork/kdenetwork-kopete.install b/extra/kdenetwork/kdenetwork-kopete.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/extra/kdenetwork/kdenetwork-kopete.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/extra/kdenetwork/kdenetwork-kppp.install b/extra/kdenetwork/kdenetwork-kppp.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/extra/kdenetwork/kdenetwork-kppp.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/extra/kdenetwork/kdenetwork.install b/extra/kdenetwork/kdenetwork.install
deleted file mode 100644
index e70c054ec..000000000
--- a/extra/kdenetwork/kdenetwork.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/extra/kdenetwork/use-libotr3.patch b/extra/kdenetwork/use-libotr3.patch
deleted file mode 100644
index 1e96c98d6..000000000
--- a/extra/kdenetwork/use-libotr3.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-diff -urN a/kopete/cmake/modules/FindLibOTR.cmake b/kopete/cmake/modules/FindLibOTR.cmake
---- a/kopete/cmake/modules/FindLibOTR.cmake	2012-08-12 18:08:59.000000000 -0600
-+++ b/kopete/cmake/modules/FindLibOTR.cmake	2012-11-09 12:14:24.251450904 -0700
-@@ -13,13 +13,13 @@
-     SET(LIBOTR_FIND_QUIETLY TRUE)
- ENDIF (LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY)
- 
--FIND_PATH(LIBOTR_INCLUDE_DIR libotr/version.h)
-+FIND_PATH(LIBOTR_INCLUDE_DIR libotr3/version.h)
- 
--FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr libotr)
-+FIND_LIBRARY(LIBOTR_LIBRARY NAMES otr3 libotr3)
- 
--# Determine version information from libotr/version.h
-+# Determine version information from libotr3/version.h
- IF( LIBOTR_INCLUDE_DIR AND LIBOTR_LIBRARY )
--  EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr/version.h" OUTPUT_VARIABLE output)
-+  EXECUTE_PROCESS(COMMAND grep "OTRL_VERSION" "${LIBOTR_INCLUDE_DIR}/libotr3/version.h" OUTPUT_VARIABLE output)
-   STRING(REGEX MATCH "OTRL_VERSION \"[0-9]+\\.[0-9]+\\.[0-9]+" LIBOTR_VERSION "${output}")
-   STRING(REGEX REPLACE "^OTRL_VERSION \"" "" LIBOTR_VERSION "${LIBOTR_VERSION}")
-   # Check if version is at least 3.2.0
-diff -urN a/kopete/plugins/otr/authenticationwizard.h b/kopete/plugins/otr/authenticationwizard.h
---- a/kopete/plugins/otr/authenticationwizard.h	2012-08-12 18:09:00.000000000 -0600
-+++ b/kopete/plugins/otr/authenticationwizard.h	2012-11-09 12:15:11.181265336 -0700
-@@ -26,7 +26,7 @@
-   */
- 
- extern "C"{
--#include "libotr/proto.h"
-+#include "libotr3/proto.h"
- }
- 
- #include "kopetechatsession.h"
-diff -urN a/kopete/plugins/otr/otrlchatinterface.h b/kopete/plugins/otr/otrlchatinterface.h
---- a/kopete/plugins/otr/otrlchatinterface.h	2012-08-12 18:09:00.000000000 -0600
-+++ b/kopete/plugins/otr/otrlchatinterface.h	2012-11-09 12:16:10.141032744 -0700
-@@ -36,10 +36,10 @@
- #include "authenticationwizard.h"
- 
- extern "C" {
--#include <libotr/privkey.h>
--#include <libotr/proto.h>
--#include <libotr/message.h>
--#include <libotr/userstate.h>
-+#include <libotr3/privkey.h>
-+#include <libotr3/proto.h>
-+#include <libotr3/message.h>
-+#include <libotr3/userstate.h>
- }
- 
- 
-diff -urN a/kopete/plugins/otr/otrlconfinterface.h b/kopete/plugins/otr/otrlconfinterface.h
---- a/kopete/plugins/otr/otrlconfinterface.h	2012-08-12 18:09:00.000000000 -0600
-+++ b/kopete/plugins/otr/otrlconfinterface.h	2012-11-09 12:15:56.961084991 -0700
-@@ -32,11 +32,11 @@
- #include <kopetechatsession.h>
- 
- extern "C" {
--#include <libotr/privkey.h>
--#include <libotr/proto.h>
--#include <libotr/message.h>
--#include <libotr/userstate.h>
--#include <libotr/context.h>
-+#include <libotr3/privkey.h>
-+#include <libotr3/proto.h>
-+#include <libotr3/message.h>
-+#include <libotr3/userstate.h>
-+#include <libotr3/context.h>
- }
- 
- class KOPETE_OTR_SHARED_EXPORT OtrlConfInterface : public QObject
diff --git a/extra/kdesdk/PKGBUILD b/extra/kdesdk/PKGBUILD
deleted file mode 100644
index c0e4d4663..000000000
--- a/extra/kdesdk/PKGBUILD
+++ /dev/null
@@ -1,199 +0,0 @@
-# $Id: PKGBUILD 189610 2013-07-03 17:03:51Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdesdk
-pkgname=('kdesdk-cervisia'
-         'kdesdk-dolphin-plugins'
-         'kdesdk-dev-utils'
-         'kdesdk-dev-scripts'
-         'kdesdk-kapptemplate'
-         'kdesdk-kcachegrind'
-         'kdesdk-kioslaves'
-         'kdesdk-kompare'
-         'kdesdk-lokalize'
-         'kdesdk-okteta'
-         'kdesdk-poxml'
-         'kdesdk-strigi-analyzers'
-         'kdesdk-umbrello')
-pkgver=4.10.5
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdesdk')
-makedepends=('cmake' 'automoc4' 'boost' 'subversion' 'antlr2' 'kdepimlibs'
-             'kdebase-lib')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
-        'fix-python2-path.patch')
-sha1sums=('e14780cfd63f14cc4b5ec2f769af6a5e9b416940'
-          '07db42bbcae402c292eebf002e549b04162621c5')
-
-prepare() {
-	cd ${pkgbase}-${pkgver}
-
-	# Fix hardcoded python2 cmd
-	patch -Np1 -i ${srcdir}/fix-python2-path.patch
-}
-
-build() {
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DKDE4_BUILD_TESTS=OFF \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdesdk-cervisia() {
-	pkgdesc='CVS Frontend'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/development/cervisia/"
-	install='kdesdk-cervisia.install'
-	cd $srcdir/build/cervisia
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-dev-utils() {
-    pkgdesc='Small utilities for developers using KDE/Qt libs/frameworks'
-    url="https://projects.kde.org/projects/kde/kdesdk/kde-dev-utils"
-    depends=('kdebase-runtime')
-    conflicts=('kdesdk-kmtrace' 'kdesdk-kpartloader' 'kdesdk-kprofilemethod'
-              'kdesdk-kstartperf' 'kdesdk-kuiviewer')
-    replaces=('kdesdk-kmtrace' 'kdesdk-kpartloader' 'kdesdk-kprofilemethod'
-              'kdesdk-kstartperf' 'kdesdk-kuiviewer')
-    install='kdesdk-dev-utils.install'
-    cd $srcdir/build/kde-dev-utils
-    make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-dolphin-plugins() {
-	pkgdesc='Extra Dolphin plugins'
-    url="https://projects.kde.org/projects/kde/kdesdk/dolphin-plugins"
-	depends=('kdebase-dolphin')
-    optdepends=('bzr: bazaar support'
-                'git: git support'
-                'mercurial: hg support'
-                'subversion: svn support')
-	install='kdesdk.install'
-    cd $srcdir/build/dolphin-plugins
-  	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kapptemplate() {
-	pkgdesc='KDE Template Generator'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/development/kapptemplate/"
-	install='kdesdk.install'
-	cd $srcdir/build/kapptemplate
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kcachegrind() {
-	pkgdesc='Visualization of Performance Profiling Data'
-	depends=('kdebase-runtime' 'python2')
-	optdepends=('php: PHP support')
-	url="http://kde.org/applications/development/kcachegrind/"
-	install='kdesdk-kcachegrind.install'
-	cd $srcdir/build/kcachegrind
-	make DESTDIR=$pkgdir install
-
-    # Fix python 2 path
-    sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-      "${pkgdir}"/usr/bin/hotshot2calltree
-}
-
-package_kdesdk-kioslaves() {
-	pkgdesc='KIO-Slaves'
-    url="https://projects.kde.org/projects/kde/kdesdk/kdesdk-kioslaves"
-	depends=('kdebase-runtime' 'subversion')
-    install='kdesdk.install'
-    replaces=('kdesdk-kioslave')
-    conflicts=('kdesdk-kioslave')
-	cd $srcdir/build/kdesdk-kioslaves
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-kompare() {
-	pkgdesc='Diff/Patch Frontend'
-	depends=('kdebase-runtime')
-	url="http://kde.org/applications/development/kompare/"
-	install='kdesdk-kompare.install'
-	cd $srcdir/build/kompare
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-lokalize() {
-	pkgdesc='Computer-Aided Translation System'
-	depends=('kdebase-runtime' 'kdebindings-python2' 'kdesdk-strigi-analyzers')
-	url="http://kde.org/applications/development/lokalize/"
-	optdepends=('translate-toolkit: enable extra python script')
-	install='kdesdk-lokalize.install'
-	cd $srcdir/build/lokalize
-	make DESTDIR=$pkgdir install
-
-    # Fix python 2 path
-    sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-      "${pkgdir}"/usr/share/apps/lokalize/scripts/odf/xliffmerge.py
-}
-
-package_kdesdk-okteta() {
-	pkgdesc='Hex Editor'
-	depends=('kdebase-runtime')
-	replaces=('kdeutils-okteta')
-	conflicts=('kdeutils-okteta')
-	url="http://kde.org/applications/utilities/okteta/"
-	install='kdesdk-okteta.install'
-	cd $srcdir/build/okteta
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-poxml() {
-	pkgdesc='Translates DocBook XML files using gettext po files'
-    url="https://projects.kde.org/projects/kde/kdesdk/poxml"
-	depends=('qt4')
-    optdepends=('antlr2: required for po2xml and swappo tool')
-	cd $srcdir/build/poxml
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-dev-scripts() {
-	pkgdesc='Scripts and setting files useful during development of KDE software'
-    url="https://projects.kde.org/projects/kde/kdesdk/kde-dev-scripts"
-	depends=('python2')
-    replaces=('kdesdk-scripts')
-    conflicts=('kdesdk-scripts')
-	cd $srcdir/build/kde-dev-scripts
-	make DESTDIR=$pkgdir install
-
-    # Fix python 2 path
-    sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-      "${pkgdir}"/usr/bin/{zonetab2pot,kde-systemsettings-tree}.py
-    sed -i 's|#! /usr/bin/env python|#!/usr/bin/env python2|' \
-      "${pkgdir}"/usr/bin/{kdelnk2desktop.py,kde_generate_export_header}
-}
-
-package_kdesdk-strigi-analyzers() {
-	pkgdesc='Analyzer plugins for strigi'
-    url="https://projects.kde.org/projects/kde/kdesdk/kdesdk-strigi-analyzers"
-	depends=('kdelibs')
-    conflicts=('kdesdk-strigi-analyzer')
-    replaces=('kdesdk-strigi-analyzer')
-	cd $srcdir/build/kdesdk-strigi-analyzers
-	make DESTDIR=$pkgdir install
-}
-
-package_kdesdk-umbrello() {
-	pkgdesc='UML Modeller'
-	depends=('kdebase-runtime')
-    optdepends=('ruby')
-	url="http://kde.org/applications/development/umbrello/"
-	install='kdesdk-umbrello.install'
-	cd $srcdir/build/umbrello
-	make DESTDIR=$pkgdir install
-    
-    # Fix python 2 path
-    sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-      "${pkgdir}"/usr/share/apps/umbrello/headings/heading.py
-}
diff --git a/extra/kdesdk/fix-python2-path.patch b/extra/kdesdk/fix-python2-path.patch
deleted file mode 100644
index 9e9a442c0..000000000
--- a/extra/kdesdk/fix-python2-path.patch
+++ /dev/null
@@ -1,22 +0,0 @@
---- kdesdk-4.5.80/lokalize/scripts/msgmerge.py~	2010-11-24 11:22:42.120000002 +0100
-+++ kdesdk-4.5.80/lokalize/scripts/msgmerge.py	2010-11-24 11:22:42.146666670 +0100
-@@ -114,7 +114,7 @@
-         print >>sys.stderr, "Execution failed:", e
- 
-     cmd='%s/odf/xliffmerge.py -i %s -t %s -o %s' % (ourPath,xliffpathname,xlifftemplatepathname,xliffpathname)
--    if os.name!='nt': cmd='python '+cmd
-+    if os.name!='nt': cmd='python2 '+cmd
-     else: cmd=cmd.replace('/','\\')
-     os.system(cmd)
-
---- kdesdk-4.5.80/lokalize/scripts/xliff2odf.py~	2010-11-24 11:24:10.853333336 +0100
-+++ kdesdk-4.5.80/lokalize/scripts/xliff2odf.py	2010-11-24 11:24:10.883333336 +0100
-@@ -42,7 +42,7 @@
-     xliff2odf.convertxliff(xliffinput, translatedodfpathname, odf)
- 
-     ourpath=([p for p in sys.path if os.path.exists(p+'/xliff2odf.py')]+[''])[0]
--    os.system('python "'+ourpath+'/xliff2odf-standalone.py" "%s" "%s" &'%(translatedodfpathname, Editor.currentEntryId()))
-+    os.system('python2 "'+ourpath+'/xliff2odf-standalone.py" "%s" "%s" &'%(translatedodfpathname, Editor.currentEntryId()))
- 
- try: convert()
- except: print 'error occured'
diff --git a/extra/kdesdk/kdesdk-cervisia.install b/extra/kdesdk/kdesdk-cervisia.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/extra/kdesdk/kdesdk-cervisia.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/extra/kdesdk/kdesdk-dev-utils.install b/extra/kdesdk/kdesdk-dev-utils.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/extra/kdesdk/kdesdk-dev-utils.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/extra/kdesdk/kdesdk-kcachegrind.install b/extra/kdesdk/kdesdk-kcachegrind.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/extra/kdesdk/kdesdk-kcachegrind.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/extra/kdesdk/kdesdk-kompare.install b/extra/kdesdk/kdesdk-kompare.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/extra/kdesdk/kdesdk-kompare.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/extra/kdesdk/kdesdk-lokalize.install b/extra/kdesdk/kdesdk-lokalize.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/extra/kdesdk/kdesdk-lokalize.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/extra/kdesdk/kdesdk-okteta.install b/extra/kdesdk/kdesdk-okteta.install
deleted file mode 100644
index 3f06b8deb..000000000
--- a/extra/kdesdk/kdesdk-okteta.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/extra/kdesdk/kdesdk-umbrello.install b/extra/kdesdk/kdesdk-umbrello.install
deleted file mode 100644
index 5495fb1b5..000000000
--- a/extra/kdesdk/kdesdk-umbrello.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-    update-desktop-database -q
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/extra/kdesdk/kdesdk.install b/extra/kdesdk/kdesdk.install
deleted file mode 100644
index e70c054ec..000000000
--- a/extra/kdesdk/kdesdk.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/extra/kdetoys/PKGBUILD b/extra/kdetoys/PKGBUILD
deleted file mode 100644
index 08b5c89eb..000000000
--- a/extra/kdetoys/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 189611 2013-07-03 17:03:53Z andrea $
-# Maintainer: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-
-pkgbase=kdetoys
-pkgname=('kdetoys-amor'
-         'kdetoys-kteatime'
-         'kdetoys-ktux')
-pkgver=4.10.5
-pkgrel=1
-arch=('i686' 'x86_64' 'mips64el')
-url='http://www.kde.org'
-license=('GPL' 'LGPL' 'FDL')
-groups=('kde' 'kdetoys')
-makedepends=('cmake' 'automoc4' 'kdebase-workspace')
-source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz")
-sha1sums=('acecc68284addf327b70a72c787befd2cc0f28d2')
-
-build() {
-	cd $srcdir
-	mkdir build
-	cd build
-	cmake ../${pkgbase}-${pkgver} \
-		-DCMAKE_BUILD_TYPE=Release \
-		-DKDE4_BUILD_TESTS=OFF \
-		-DCMAKE_SKIP_RPATH=ON \
-		-DCMAKE_INSTALL_PREFIX=/usr
-	make
-}
-
-package_kdetoys-amor() {
-	pkgdesc='On-Screen Creature'
-	depends=('kdebase-runtime')
-	install='kdetoys.install'
-	cd $srcdir/build/amor
-	make DESTDIR=$pkgdir install
-}
-
-package_kdetoys-kteatime() {
-	pkgdesc='Tea Cooker'
-	depends=('kdebase-runtime')
-	install='kdetoys.install'
-	cd $srcdir/build/kteatime
-	make DESTDIR=$pkgdir install
-}
-
-package_kdetoys-ktux() {
-	pkgdesc='KTux'
-	depends=('kdebase-workspace' )
-	install='kdetoys.install'
-	cd $srcdir/build/ktux
-	make DESTDIR=$pkgdir install
-}
diff --git a/extra/kdetoys/kdetoys.install b/extra/kdetoys/kdetoys.install
deleted file mode 100644
index e70c054ec..000000000
--- a/extra/kdetoys/kdetoys.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/extra/lftp/PKGBUILD b/extra/lftp/PKGBUILD
index 5cb642dd3..3a61e5a17 100644
--- a/extra/lftp/PKGBUILD
+++ b/extra/lftp/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 186572 2013-05-29 15:13:14Z andyrtr $
+# $Id: PKGBUILD 193566 2013-08-24 08:12:15Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=lftp
-pkgver=4.4.8
+pkgver=4.4.9
 pkgrel=1
 pkgdesc="Sophisticated command line based FTP client"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ optdepends=('perl: needed for convert-netscape-cookies and verify-file')
 url="http://lftp.yar.ru/"
 backup=('etc/lftp.conf')
 source=(http://ftp.yars.free.net/pub/source/lftp/${pkgname}-${pkgver}.tar.bz2 )
-md5sums=('7140263fbe12f17f74183cf065a7d381')
+md5sums=('f942d632d71b7bf35dca2e75a8432b83')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/libbsd/PKGBUILD b/extra/libbsd/PKGBUILD
index 703d14ace..89e029458 100644
--- a/extra/libbsd/PKGBUILD
+++ b/extra/libbsd/PKGBUILD
@@ -1,29 +1,19 @@
-# $Id: PKGBUILD 188690 2013-06-18 01:22:22Z heftig $
+# $Id: PKGBUILD 193609 2013-08-25 22:20:49Z allan $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Gerardo Exequiel Pozzi <vmlinuz386@yahoo.com.ar>
 
 pkgname=libbsd
-pkgver=0.5.2
-pkgrel=2
+pkgver=0.6.0
+pkgrel=1
 pkgdesc="Provides useful functions commonly found on BSD systems like strlcpy()"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libbsd.freedesktop.org"
 license=('custom')
 depends=('glibc')
 options=('!libtool')
-source=(http://libbsd.freedesktop.org/releases/$pkgname-$pkgver.tar.xz{,.asc}
-        spt.patch)
-md5sums=('be8b2e0dc4614699834c49693574fd1a'
-         'SKIP'
-         '56236fb72c8ec6cbdbd0daa5f404bccb')
-
-prepare() {
-  cd $pkgname-$pkgver
-
-  # Paper over a firefox crash
-  # http://lists.freedesktop.org/archives/libbsd/2013-June/000085.html
-  patch -Np1 -i ../spt.patch
-}
+source=(http://libbsd.freedesktop.org/releases/$pkgname-$pkgver.tar.xz{,.asc})
+md5sums=('f6c75f0a9818e323a589bcbd560a0eb4'
+         'SKIP')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/extra/libgsf/PKGBUILD b/extra/libgsf/PKGBUILD
index 1ea74c633..30a01ffdd 100644
--- a/extra/libgsf/PKGBUILD
+++ b/extra/libgsf/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 188871 2013-06-23 17:47:47Z heftig $
+# $Id: PKGBUILD 193624 2013-08-26 08:14:46Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 
 pkgname=libgsf
-pkgver=1.14.27
+pkgver=1.14.28
 pkgrel=1
 arch=(i686 x86_64 mips64el)
 pkgdesc="The GNOME Structured File Library is a utility library for reading and writing structured file formats"
@@ -13,7 +13,7 @@ options=('!libtool')
 depends=('libxml2' 'gdk-pixbuf2' 'bzip2')
 makedepends=('intltool' 'gobject-introspection')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.14/$pkgname-$pkgver.tar.xz)
-sha256sums=('a012e63bedd6003cea9ae8fa78944516b50c334767163b88527c6b2332bc3e6c')
+sha256sums=('ea94914f1fdaa5d4eb49149f0228ae6e41a54bdeb8caf52a7dd8acaa329fcbe4')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/libreoffice/PKGBUILD b/extra/libreoffice/PKGBUILD
index 6ba2ea184..1e3205aaa 100644
--- a/extra/libreoffice/PKGBUILD
+++ b/extra/libreoffice/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 192063 2013-08-05 14:17:33Z andyrtr $
+# $Id: PKGBUILD 193556 2013-08-23 16:48:04Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgbase="libreoffice"
@@ -19,9 +19,9 @@ pkgname=('libreoffice-common'
 	'libreoffice-extension-report-builder'
 	'libreoffice-extension-wiki-publisher'
 	'libreoffice-extension-nlpsolver') # svn up -r 142692 (last one with all extensions built)
-_LOver=4.0.4.2
-pkgver=4.0.4
-pkgrel=2
+_LOver=4.0.5.2
+pkgver=4.0.5
+pkgrel=1
 arch=('i686' 'x86_64')
 license=('LGPL3')
 url="http://www.libreoffice.org/"
@@ -76,9 +76,8 @@ source=(${_mirror}/${pkgbase}{,-help,-translations}-${_LOver}.tar.xz
 	${_additional_source_url2}/185d60944ea767075d27247c3162b3bc-unowinreg.dll
 	${_additional_source_url}/libcdr-0.0.14.tar.bz2
 	${_additional_source_url}/libmspub-0.0.6.tar.bz2
-	${_additional_source_url}/libvisio-0.0.28.tar.bz2
+	${_additional_source_url}/libvisio-0.0.30.tar.bz2
 	make-pyuno-work-with-system-wide-module-install.diff
-	poppler_buildfix.diff
 	libreoffice-common.sh libreoffice-common.csh)
 noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 	185d60944ea767075d27247c3162b3bc-unowinreg.dll
@@ -111,10 +110,10 @@ noextract=(f02578f5218f217a9f20e9c30e119c6a-boost_1_44_0.tar.bz2
 	17410483b5b5f267aa18b7e00b65e6e0-hsqldb_1_8_0.zip
 	libcdr-0.0.14.tar.bz2
 	libmspub-0.0.6.tar.bz2
-	libvisio-0.0.28.tar.bz2)
-md5sums=('19462798bbf6e1dc75a8b12bd1775ea2'
-         'a4d5e6504a3251b7a7fbe17216f8d6e7'
-         '0ba553eea7284abe1370157bb35bd355'
+	libvisio-0.0.30.tar.bz2)
+md5sums=('6cb30bf61cc264f0593a11fffa5cd7ee'
+         'a9ddcbde6d7b1148c8fdb626b26c0c69'
+         '914c5ea3f433643387593cb96d6c119b'
          'f02578f5218f217a9f20e9c30e119c6a'
          '1f24ab1d39f4a51faf22244c94a6203f'
          '35c94d2df8893241173de1d16b6034c0'
@@ -146,9 +145,8 @@ md5sums=('19462798bbf6e1dc75a8b12bd1775ea2'
          '185d60944ea767075d27247c3162b3bc'
          'd88f9b94df880d2c05be943b000ca112'
          '1120705cd0f0d9bd5506360bf57b6c2e'
-         '05574c2ec54dd0c29d75cacdf9419f44'
+         '9d9eb3ae6bee763c161228b2b12e25f8'
          '07d2bf5ad839a394cca008b3ec6e7bb1'
-         '092939d16adbb006780c68040192f8ce'
          '4195735a80876ae812fca5736b50192a'
          'e7e4b3e70e99e5cba8f8dfcacf3b0d87')
 
@@ -167,9 +165,6 @@ prepare() {
 	done
 	popd
 	
-	# fix build with poppler 0.24.0
-	patch -Np1 -i ${srcdir}/poppler_buildfix.diff
-   
     # fix not upstreamable pyuno paths - patch taken from Debian
     patch -Np1 -i ${srcdir}/make-pyuno-work-with-system-wide-module-install.diff
     
diff --git a/extra/libreoffice/poppler_buildfix.diff b/extra/libreoffice/poppler_buildfix.diff
deleted file mode 100644
index ae11d8b1f..000000000
--- a/extra/libreoffice/poppler_buildfix.diff
+++ /dev/null
@@ -1,50 +0,0 @@
-From a7688eff345133147984507c35bf444131cc3d63 Mon Sep 17 00:00:00 2001
-From: Petr Mladek <pmladek@suse.cz>
-Date: Tue, 16 Jul 2013 14:45:31 +0000
-Subject: fix build with system poppler-0.23.0
-
-XRef *xref parameter has been added to the OutputDev::startPage method, see
-http://cgit.freedesktop.org/poppler/poppler/commit/?id=8eb489c355d734a72e140ce7e32470d048362499
-
-Change-Id: I7ad875bf58f6998e639c740f0dac3795738cd1db
-Reviewed-on: https://gerrit.libreoffice.org/4940
-Reviewed-by: Andras Timar <atimar@suse.com>
-Tested-by: Andras Timar <atimar@suse.com>
----
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-index 03adf89..53a77d3 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.cxx
-@@ -481,7 +481,11 @@ PDFOutDev::PDFOutDev( PDFDoc* pDoc ) :
- {
- }
- 
--void PDFOutDev::startPage(int /*pageNum*/, GfxState* state)
-+void PDFOutDev::startPage(int /*pageNum*/, GfxState* state
-+#if POPPLER_CHECK_VERSION(0, 23, 0)
-+                          , XRef* /*xref*/
-+#endif
-+)
- {
-     assert(state);
-     printf("startPage %f %f\n",
-diff --git a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-index c0977cb7..4f3d3a9 100644
---- a/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-+++ b/sdext/source/pdfimport/xpdfwrapper/pdfioutdev_gpl.hxx
-@@ -181,7 +181,11 @@ namespace pdfi
-         virtual void setDefaultCTM(double *ctm) SAL_OVERRIDE;
- 
-         // Start a page.
--        virtual void startPage(int pageNum, GfxState *state) SAL_OVERRIDE;
-+        virtual void startPage(int pageNum, GfxState *state
-+#if POPPLER_CHECK_VERSION(0, 23, 0)
-+                               , XRef *xref
-+#endif
-+        ) SAL_OVERRIDE;
- 
-         // End a page.
-         virtual void endPage() SAL_OVERRIDE;
---
-cgit v0.9.0.2-2-gbebe
-
diff --git a/extra/librsvg/PKGBUILD b/extra/librsvg/PKGBUILD
index d0b9a8f08..086f4c6e2 100644
--- a/extra/librsvg/PKGBUILD
+++ b/extra/librsvg/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 184408 2013-05-06 19:38:35Z foutrelis $
+# $Id: PKGBUILD 193630 2013-08-26 12:12:13Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=librsvg
 pkgver=2.37.0
-pkgrel=2
+pkgrel=1
+epoch=1
 pkgdesc="A SVG viewing library"
 arch=(i686 x86_64 'mips64el')
 license=('LGPL')
diff --git a/extra/libtiff/PKGBUILD b/extra/libtiff/PKGBUILD
index cf529d757..bca83965b 100644
--- a/extra/libtiff/PKGBUILD
+++ b/extra/libtiff/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 186503 2013-05-28 01:47:37Z eric $
+# $Id: PKGBUILD 193540 2013-08-22 21:13:54Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=libtiff
 pkgver=4.0.3
-pkgrel=2
+pkgrel=3
 pkgdesc="Library for manipulation of TIFF images"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.remotesensing.org/libtiff/"
@@ -18,14 +18,18 @@ source=(ftp://ftp.remotesensing.org/pub/libtiff/tiff-${pkgver}.tar.gz
 	tiff-4.0.3-CVE-2013-1960.patch
 	tiff-4.0.3-CVE-2013-1961.patch
 	tiff-4.0.3-libjpeg-turbo.patch
-	tiff-4.0.3-tiff2pdf-colors.patch)
+	tiff-4.0.3-tiff2pdf-colors.patch
+	tiff-4.0.3-CVE-2013-4231.patch
+	tiff-4.0.3-CVE-2013-4232.patch)
 sha1sums=('652e97b78f1444237a82cbcfe014310e776eb6f0'
           '41be661638282dae0d07bd2788414cb6650f8981'
           '6cb3d480908132335c05c769b5a51f951413725d'
           '5903355afdd0bb27ea3746339e2196720f9fac9d'
           '29a91870cca5d4cd9ca1c464f8074088eddc3fb8'
           '02d57835df50d3f84587571ec52b36f5af838de2'
-          '23443ad0bc130d70860b6cc6d19b69584ae7a6cc')
+          '23443ad0bc130d70860b6cc6d19b69584ae7a6cc'
+          '969f588e9da5991e7f17dddf69ae59424b05fa16'
+          '2a23c55d081bed74ac8dd99541a93d312cc72b64')
 
 prepare() {
   cd tiff-${pkgver}
@@ -35,6 +39,9 @@ prepare() {
   patch -p1 -i "${srcdir}/tiff-4.0.3-CVE-2013-1960.patch"
   patch -p1 -i "${srcdir}/tiff-4.0.3-CVE-2013-1961.patch"
   patch -p1 -i "${srcdir}/tiff-4.0.3-libjpeg-turbo.patch"
+  cd tools
+  patch -p0 -i "${srcdir}/tiff-4.0.3-CVE-2013-4231.patch"
+  patch -p0 -i "${srcdir}/tiff-4.0.3-CVE-2013-4232.patch"
 }
 
 build() {
diff --git a/extra/libtiff/tiff-4.0.3-CVE-2013-4231.patch b/extra/libtiff/tiff-4.0.3-CVE-2013-4231.patch
new file mode 100644
index 000000000..3c2171829
--- /dev/null
+++ b/extra/libtiff/tiff-4.0.3-CVE-2013-4231.patch
@@ -0,0 +1,18 @@
+Index: gif2tiff.c
+===================================================================
+RCS file: /cvs/maptools/cvsroot/libtiff/tools/gif2tiff.c,v
+retrieving revision 1.12
+diff -u -r1.12 gif2tiff.c
+--- gif2tiff.c	15 Dec 2010 00:22:44 -0000	1.12
++++ gif2tiff.c	13 Aug 2013 08:25:38 -0000
+@@ -333,6 +333,10 @@
+     int status = 1;
+ 
+     datasize = getc(infile);
++
++    if (datasize > 12)
++        return 0;
++
+     clear = 1 << datasize;
+     eoi = clear + 1;
+     avail = clear + 2;
diff --git a/extra/libtiff/tiff-4.0.3-CVE-2013-4232.patch b/extra/libtiff/tiff-4.0.3-CVE-2013-4232.patch
new file mode 100644
index 000000000..87673d91b
--- /dev/null
+++ b/extra/libtiff/tiff-4.0.3-CVE-2013-4232.patch
@@ -0,0 +1,15 @@
+Index: tiff2pdf.c
+===================================================================
+RCS file: /cvs/maptools/cvsroot/libtiff/tools/tiff2pdf.c,v
+retrieving revision 1.71
+diff -u -r1.71 tiff2pdf.c
+--- tiff2pdf.c	2 May 2013 14:54:08 -0000	1.71
++++ tiff2pdf.c	13 Aug 2013 04:45:40 -0000
+@@ -2462,6 +2462,7 @@
+ 					TIFFFileName(input));
+ 				t2p->t2p_error = T2P_ERR_ERROR;
+ 			  _TIFFfree(buffer);
++                          return(0);
+ 			} else {
+ 				buffer=samplebuffer;
+ 				t2p->tiff_datasize *= t2p->tiff_samplesperpixel;
diff --git a/extra/libwpd/PKGBUILD b/extra/libwpd/PKGBUILD
index 785d92ef6..0d1efbf9b 100644
--- a/extra/libwpd/PKGBUILD
+++ b/extra/libwpd/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183192 2013-04-18 16:39:00Z andyrtr $
+# $Id: PKGBUILD 193569 2013-08-24 08:25:38Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 
 pkgname=libwpd
-pkgver=0.9.6
+pkgver=0.9.9
 pkgrel=1
 pkgdesc="Library for importing WordPerfect (tm) documents"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('gcc-libs' 'zlib')
 makedepends=('libgsf>=1.14.26')
 options=('!libtool' '!emptydirs')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz)
-md5sums=('63f476b892bf783072854b98d2fc4fa2')
+md5sums=('6b74a863c957563924546e16cc833591')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/php/PKGBUILD b/extra/php/PKGBUILD
index 9f6ac8428..b1f89e3b8 100644
--- a/extra/php/PKGBUILD
+++ b/extra/php/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 193137 2013-08-17 08:22:16Z pierre $
+# $Id: PKGBUILD 193545 2013-08-23 06:57:45Z pierre $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgbase=php
@@ -21,7 +21,7 @@ pkgname=('php'
          'php-sqlite'
          'php-tidy'
          'php-xsl')
-pkgver=5.5.2
+pkgver=5.5.3
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('PHP')
@@ -30,10 +30,10 @@ makedepends=('apache' 'imap' 'postgresql-libs' 'libldap' 'postfix' 'libvpx'
              'sqlite' 'unixodbc' 'net-snmp' 'libzip' 'enchant' 'file' 'freetds'
              'libmcrypt' 'tidyhtml' 'aspell' 'libltdl' 'libpng' 'libjpeg' 'icu'
              'curl' 'libxslt' 'openssl' 'bzip2' 'db' 'gmp' 'freetype2' 'systemd')
-source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.bz2"
+source=("http://www.php.net/distributions/${pkgbase}-${pkgver}.tar.xz"
         'php.ini.patch' 'apache.conf' 'php-fpm.conf.in.patch'
         'logrotate.d.php-fpm' 'php-fpm.service' 'php-fpm.tmpfiles')
-md5sums=('caf7f4d86514a568fb3c8021b096a9f0'
+md5sums=('437e98144ef014dfab0922a9eed36853'
          'f9ee638591aaf1526767db7976d95847'
          'dec2cbaad64e3abf4f0ec70e1de4e8e9'
          '880afea327bb00c47082d22c507e6bfc'
diff --git a/extra/pkgfile/PKGBUILD b/extra/pkgfile/PKGBUILD
index 179b54d38..cc69461ab 100644
--- a/extra/pkgfile/PKGBUILD
+++ b/extra/pkgfile/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 179110 2013-03-03 17:28:37Z dreisner $
+# $Id: PKGBUILD 193608 2013-08-25 20:10:57Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 
 pkgname=pkgfile
-pkgver=8
-pkgrel=2.1
+pkgver=9
+pkgrel=1
 pkgdesc="a pacman .files metadata explorer"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://github.com/falconindy/pkgfile"
@@ -12,8 +12,8 @@ depends=('libarchive' 'curl' 'pcre' 'pacman')
 conflicts=('pkgtools<24-2')
 source=("http://code.falconindy.com/archive/$pkgname/$pkgname-$pkgver.tar.xz"{,.sig})
 install=pkgfile.install
-md5sums=('772d02872ddf112c5e24d6ad40e5623d'
-         '712c546c0291975e646a1d2170034e10')
+md5sums=('7e27e9c15da6d59ae04f32d5dc977485'
+         'SKIP')
 
 options=(!strip)
 
diff --git a/extra/pyqt4/PKGBUILD b/extra/pyqt4/PKGBUILD
index 8fba5379f..de6ee8423 100644
--- a/extra/pyqt4/PKGBUILD
+++ b/extra/pyqt4/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 188683 2013-06-17 19:05:53Z andrea $
+# $Id: PKGBUILD 193533 2013-08-22 14:50:14Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com> Ben <ben@benmazer.net>
 
 pkgbase=pyqt4
 pkgname=('pyqt4-common' 'python-pyqt4' 'python2-pyqt4')
-pkgver=4.10.2
-pkgrel=2
+pkgver=4.10.3
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
-url="http://riverbankcomputing.co.uk/software/pyqt/intro"
+url='http://www.riverbankcomputing.com/software/pyqt/intro'
 license=('GPL')
 makedepends=('python-sip' 'python-dbus' 'python2-sip' 'phonon' 'mesa'
              'python2-opengl' 'qt-assistant-compat' 'qtwebkit' 'python2-dbus')
 source=("http://downloads.sourceforge.net/pyqt/PyQt-x11-gpl-${pkgver}.tar.gz")
-md5sums=('9257e12fec9b1b21e5a0d76d455d1691')
+md5sums=('8b13d2ab64e4d2fd0037b81b7e78c15c')
 
 build() {
   cp -r PyQt-x11-gpl-${pkgver} Py2Qt-x11-gpl-${pkgver}
diff --git a/extra/qscintilla/PKGBUILD b/extra/qscintilla/PKGBUILD
index aa335c293..99e8cfb6d 100644
--- a/extra/qscintilla/PKGBUILD
+++ b/extra/qscintilla/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 188708 2013-06-18 12:21:58Z andrea $
+# $Id: PKGBUILD 193634 2013-08-26 13:32:44Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 
@@ -6,7 +6,7 @@ pkgbase=qscintilla
 pkgname=('qscintilla' 'python-qscintilla' 'python2-qscintilla'
          'python-qscintilla-common')
 pkgver=2.7.2
-pkgrel=2
+pkgrel=3
 license=('GPL')
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.riverbankcomputing.co.uk/software/qscintilla/intro"
diff --git a/extra/refind-efi/PKGBUILD b/extra/refind-efi/PKGBUILD
index 1954b0992..1b919070b 100644
--- a/extra/refind-efi/PKGBUILD
+++ b/extra/refind-efi/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 192314 2013-08-10 05:37:22Z tpowa $
+# $Id: PKGBUILD 193534 2013-08-22 15:56:50Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 
@@ -17,7 +17,7 @@ _COMPILER="GCC46"
 
 pkgname="refind-efi"
 pkgver="0.7.3"
-pkgrel="1"
+pkgrel="2"
 pkgdesc="Rod Smith's fork of rEFIt UEFI Boot Manager - built with Tianocore UDK libs"
 url="http://www.rodsbooks.com/refind/index.html"
 arch=('x86_64' 'i686')
diff --git a/extra/sip/PKGBUILD b/extra/sip/PKGBUILD
index 75950afcd..541758fe9 100644
--- a/extra/sip/PKGBUILD
+++ b/extra/sip/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 188678 2013-06-17 18:06:55Z andrea $
+# $Id: PKGBUILD 193580 2013-08-24 12:37:03Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Contributor: riai <riai@bigfoot.com>, Ben <ben@benmazer.net>
 
 pkgbase=sip
 pkgname=('sip' 'python-sip' 'python2-sip')
-pkgver=4.14.7
+pkgver=4.15.1
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.riverbankcomputing.com/software/sip/"
+url='http://www.riverbankcomputing.com/software/sip/intro'
 license=('custom:"sip"')
 makedepends=('python' 'python2')
 source=("http://downloads.sourceforge.net/pyqt/${pkgbase}-${pkgver}.tar.gz")
-md5sums=('f5c8001f16ecffd711708de0e07d542f')
+md5sums=('ec1ce361ac3618fe05359ec6f5368463')
 
 build() {
   cp -r ${pkgbase}-${pkgver} python2-${pkgbase}-${pkgver}
diff --git a/extra/sqlite/PKGBUILD b/extra/sqlite/PKGBUILD
index 4a0017af7..0eac5ad0c 100644
--- a/extra/sqlite/PKGBUILD
+++ b/extra/sqlite/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 193396 2013-08-19 16:20:40Z andyrtr $
+# $Id: PKGBUILD 193636 2013-08-26 14:58:30Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgbase="sqlite"
 pkgname=('sqlite' 'sqlite-tcl') 
-_amalgamationver=3071700
+_amalgamationver=3080000
 _docver=${_amalgamationver}
-#_docver=3071601
-pkgver=3.7.17
-pkgrel=2
+#_docver=3080001
+pkgver=3.8.0
+pkgrel=1
 pkgdesc="A C library that implements an SQL database engine"
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom:Public Domain')
@@ -18,7 +18,7 @@ source=( # tarball containing the amalgamation for SQLite >= 3.7.5 together with
 	http://www.sqlite.org/2013/sqlite-autoconf-$_amalgamationver.tar.gz
 	license.txt)
 options=('!libtool' '!emptydirs')
-sha1sums=('e31958e56b1d7bef9433b1ff2e875c8c290d37f4'
+sha1sums=('610d01764c2fc6c6220ab88a57ac4de86515ebc8'
           'f34f6daa4ab3073d74e774aad21d66878cf26853')
 
 build() {
diff --git a/extra/suil/PKGBUILD b/extra/suil/PKGBUILD
index 91c6d1670..6aaa1f6f6 100644
--- a/extra/suil/PKGBUILD
+++ b/extra/suil/PKGBUILD
@@ -4,12 +4,12 @@
 
 pkgname=suil
 pkgver=0.6.14
-pkgrel=1
+pkgrel=2
 pkgdesc="A lightweight C library for loading and wrapping LV2 plugin UIs"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://drobilla.net/software/suil/"
 license=('custom:ISC')
-depends=('lv2')
+depends=('lv2>=1.6.0')
 makedepends=('python2' 'qt4' 'gtk2')
 optdepends=('qt4: Qt 4.x UI wrapping support'
             'gtk2: GTK+ 2.x UI wrapping support')
@@ -23,7 +23,7 @@ build() {
   sed -i "/ldconfig/d" wscript
 
   python2 waf configure --prefix=/usr
-  python2 waf
+  python2 waf build $MAKEFLAGS
 }
 
 package() {
diff --git a/extra/telepathy-kde-auth-handler/PKGBUILD b/extra/telepathy-kde-auth-handler/PKGBUILD
index 1909ea3d0..163b5dc50 100644
--- a/extra/telepathy-kde-auth-handler/PKGBUILD
+++ b/extra/telepathy-kde-auth-handler/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 192368 2013-08-10 11:00:07Z andrea $
+# $Id: PKGBUILD 193542 2013-08-22 21:22:10Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-auth-handler
 _pkgname=ktp-auth-handler
 pkgver=0.6.3
-pkgrel=1
+pkgrel=2
 pkgdesc="Provide UI/KWallet Integration For Passwords and SSL Errors on Account Connect"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://community.kde.org/Real-Time_Communication_and_Collaboration"
 license=('GPL')
-depends=('telepathy-kde-common-internals' 'qjson')
+depends=('telepathy-kde-common-internals' 'qjson' 'qca-ossl')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 source=("http://download.kde.org/stable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD
index 962feec51..f7f2d4f4b 100644
--- a/extra/xf86-video-intel/PKGBUILD
+++ b/extra/xf86-video-intel/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 192403 2013-08-10 17:30:29Z lcarlier $
+# $Id: PKGBUILD 193567 2013-08-24 08:12:29Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-intel
-pkgver=2.21.14
-pkgrel=2
+pkgver=2.21.15
+pkgrel=1
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
 install=$pkgname.install
 pkgdesc="X.org Intel i810/i830/i915/945G/G965+ video drivers"
-depends=('intel-dri' 'libxvmc' 'xcb-util>=0.3.9' 'systemd')
+depends=('intel-dri' 'libxvmc' 'pixman' 'xcb-util>=0.3.9')
 makedepends=('xorg-server-devel' 'X-ABI-VIDEODRV_VERSION=14' 'resourceproto' 'scrnsaverproto' 'libx11' 'libxrender')
 replaces=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
 provides=('xf86-video-intel-uxa' 'xf86-video-intel-sna')
@@ -19,7 +19,7 @@ conflicts=('xorg-server<1.14.0' 'X-ABI-VIDEODRV_VERSION<14' 'X-ABI-VIDEODRV_VERS
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('cc74d482dfd1f6b87773233a6d5c36118039b42fe7f8d99ee28bda7b78aa3b49')
+sha256sums=('7d5a140f82a72fd1cbc8a664d66c3d4eca47ee240ca4927b8a98d7af6f65d6fc')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-video-intel/xf86-video-intel.install b/extra/xf86-video-intel/xf86-video-intel.install
index b03eea8aa..661387906 100644
--- a/extra/xf86-video-intel/xf86-video-intel.install
+++ b/extra/xf86-video-intel/xf86-video-intel.install
@@ -1,12 +1,19 @@
 post_upgrade() {
-  post_install
+  if (( $(vercmp $2 2.21.15) < 0 )); then
+    post_install
+  fi
 }
 
 post_install() {
-  echo ">>> This driver now uses sna as the default"
-  echo ">>> acceleration methods."
-  echo ">>> You can use uxa method if you run into trouble."
-  echo ">>> Add to the device section in /etc/X11/xorg.conf"
-  echo ">>>   Option \"AccelMethod\" \"uxa\""
+  cat <<MSG
+>>> This driver now uses SNA as the default acceleration method. You can
+    still fall back to UXA if you run into trouble. To do so, save a file
+    with the following content as /etc/X11/xorg.conf.d/20-intel.conf :
+      Section "Device"
+        Identifier  "Intel Graphics"
+        Driver      "intel"
+        Option      "AccelMethod"  "uxa"
+      EndSection
+MSG
 }