Fri Nov 16 01:34:04 PST 2012

author: root <root@rshg054.dnsready.net> 2012-11-16 01:35:29 -0800
committer: root <root@rshg054.dnsready.net> 2012-11-16 01:35:29 -0800
commit: 73cd7952c96190212616ca90d5afe1ce5cb2c9ce (patch)
tree: 274972d0d967441e136af716dd87f3cee0cee7f2
parent: 130aa30d45bf33a5ce926be8697a0e0c077cdc22 (diff)
66 files changed, 1810 insertions, 186 deletions
diff --git a/community/audit/PKGBUILD b/community/audit/PKGBUILD
index 9584020fc..340cf8faf 100644
--- a/community/audit/PKGBUILD
+++ b/community/audit/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 78779 2012-10-24 13:52:59Z mtorromeo $
+# $Id: PKGBUILD 79970 2012-11-15 08:39:27Z mtorromeo $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 # Contributor: Connor Behan <connor.behan@gmail.com>
 # Contributor: henning mueller <henning@orgizm.net>
 
 pkgname=audit
 pkgver=2.2.1
-pkgrel=3
+pkgrel=4
 pkgdesc='User space utilities for storing and searching the audit records generated by the audit subsystem in the Linux kernel.'
 url=http://people.redhat.com/sgrubb/$pkgname
 arch=(i686 x86_64)
@@ -55,9 +55,11 @@ package() {
 	install -m755 "$srcdir/auditd.rc" etc/rc.d/auditd
 	install -d var/log/audit
 	rm -rf etc/rc.d/init.d etc/sysconfig
+
+	sed -ri 's| /sbin| /usr/sbin|' etc/audit/*.conf etc/audisp/plugins.d/*.conf
 }
 
 sha256sums=('9865ca89f5b975ccf25441ddf45a874448f2bba944005aa8cd5e3c3148713a63'
-            '42c0a4f6ebbd185f783320fd552541d15eb91029b83add21d1e0289ac2dda7ba'
+            '1e374ff164667b6a11f84c825a39996b449dc712d573996907cd47f063bf0dd5'
             '3c7179f40216b594675f26bb73884406c8ac91577b609dd1ab9837f889954007'
             'e60c031c6354f41938447c439eadee77127307687a2c487a54fab884eeafd9c2')
diff --git a/community/audit/auditd.rc b/community/audit/auditd.rc
index 69764aa73..13976341c 100755
--- a/community/audit/auditd.rc
+++ b/community/audit/auditd.rc
@@ -9,8 +9,8 @@ case "$1" in
 	start)
 		stat_busy "Starting auditd"
 		[ -z "$PID" ] && {
-			/sbin/auditctl -R /etc/audit/audit.rules >/dev/null || stat_die
-			/sbin/auditd || stat_die
+			/usr/sbin/auditctl -R /etc/audit/audit.rules >/dev/null || stat_die
+			/usr/sbin/auditd || stat_die
 		}
 		add_daemon auditd
 		stat_done
diff --git a/community/awn-extras-applets/PKGBUILD b/community/awn-extras-applets/PKGBUILD
new file mode 100644
index 000000000..59fd1bcdd
--- /dev/null
+++ b/community/awn-extras-applets/PKGBUILD
@@ -0,0 +1,86 @@
+# Maintainer: György Balló <ballogy@freestart.hu>
+# Contributor: Biru Ionut <ionut@archlinux.ro>
+# Contributor: Jonathan Liu <net147@hotmail.com>
+# Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
+
+pkgname=awn-extras-applets
+_pkgname=awn-extras
+pkgver=0.4.0
+pkgrel=14
+pkgdesc="Collection of applets for avant-window-navigator"
+arch=('i686' 'x86_64')
+url="https://launchpad.net/awn-extras"
+license=('GPL')
+depends=('avant-window-navigator' 'python2-notify' 'vte' 'gnome-menus' 'gnome-menus2' 'webkitgtk2')
+makedepends=('intltool' 'vala')
+optdepends=('python2-feedparser: comics, feeds, mail applets'
+            'python2-rsvg: comics, cairo-clock, hardware-sensors applets'
+            'gstreamer0.10-python: media-player, volume-control applets'
+            'python2-dateutil: cairo-clock (optional), calendar applets'
+            'python2-gdata: calendar applet'
+            'python2-vobject: calendar applet'
+            'python2-pyinotify: thinkhdaps applet (optional)'
+            'python2-libgnome: stacks applet'
+            'python2-gnomedesktop: stacks applet'
+            'python2-wnck: slickswitcher applet'
+            'fortune-mod: animal-farm applet'
+            'upower: battery applet'
+            'gnome-applets: cpufreq applet'
+            'hddtemp: hardware-sensors applet (optional)'
+            'lm_sensors: hardware-sensors applet (optional)')
+options=('!libtool')
+install=$pkgname.install
+source=(http://launchpad.net/$_pkgname/0.4/$pkgver/+download/$_pkgname-$pkgver.tar.gz
+        awn-extras-libnotify0.7.patch
+        remove-settings-menu.patch
+        add-battery-upower-support.patch
+        fix-shinyswitcher-scrolling.patch
+        fix-weather-applet.patch
+        awn-extras-glib2.32.patch
+        check-dependencies.patch)
+md5sums=('b559d68cd6ad295c961c20fcc5d9f9c0'
+         '2df8dfd8f0f1d458c09b56983c7d049f'
+         '52f8ce6a4eca862b0740e29a84db8ae5'
+         '26b56106b63b14ba3c99f1a2e96da05d'
+         '755c57dfbb65a314f247277918ec95ac'
+         'bc22bb3e81aca0f651ae8acee1ce2f00'
+         '1cfcd1e5dc92c4c7c306472d42a21c2d'
+         '8f920c7dde987d66eef7d3739df1051d')
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  patch -Np1 -i "$srcdir/awn-extras-libnotify0.7.patch"
+  patch -Np1 -i "$srcdir/remove-settings-menu.patch"
+  patch -Np0 -i "$srcdir/add-battery-upower-support.patch"
+  patch -Np0 -i "$srcdir/fix-shinyswitcher-scrolling.patch"
+  patch -Np1 -i "$srcdir/fix-weather-applet.patch"
+  patch -Np0 -i "$srcdir/awn-extras-glib2.32.patch"
+  patch -Np1 -i "$srcdir/check-dependencies.patch"
+
+  # Python2 fix
+  find . -type f -name *.py | xargs sed -i 's@^#.*python$@#!/usr/bin/python2@'
+  sed -i 's/async(\"python \"/async(\"python2 \"/' applets/maintained/shiny-switcher/shinyswitcherapplet.c
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --disable-static \
+              --disable-pymod-checks \
+              --with-webkit \
+              PYTHON=/usr/bin/python2
+  make
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  make GCONF_DISABLE_MAKEFILE_SCHEMA_INSTALL=1 DESTDIR="$pkgdir" install
+
+  mkdir -p "$pkgdir/usr/share/gconf/schemas"
+  gconf-merge-schema "$pkgdir/usr/share/gconf/schemas/awn-extras.schemas" "$pkgdir"/etc/gconf/schemas/*.schemas
+  rm -r "$pkgdir"/etc
+
+  # Remove bandwidth-monitor applet, because it's not compatible with latest netstat
+  rm -R "$pkgdir"/usr/share/avant-window-navigator/applets/bandwidth-monitor*
+
+  # Remove pandora applet, because gtkmozembed is not available
+  rm -R "$pkgdir"/usr/share/avant-window-navigator/applets/pandora*
+}
diff --git a/community/awn-extras-applets/add-battery-upower-support.patch b/community/awn-extras-applets/add-battery-upower-support.patch
new file mode 100644
index 000000000..0548df758
--- /dev/null
+++ b/community/awn-extras-applets/add-battery-upower-support.patch
@@ -0,0 +1,200 @@
+=== modified file 'applets/maintained/battery/battery.py'
+--- applets/maintained/battery/battery.py	2010-08-12 19:00:37 +0000
++++ applets/maintained/battery/battery.py	2010-09-12 22:24:21 +0000
+@@ -1,6 +1,6 @@
+ #!/usr/bin/python
+ # Copyright (c) 2007 - 2008  Randal Barlow <im.tehk at gmail.com>
+-#                      2008 - 2009  onox <denkpadje@gmail.com>
++#               2008 - 2010  onox <denkpadje@gmail.com>
+ #
+ # This library is free software; you can redistribute it and/or
+ # modify it under the terms of the GNU Lesser General Public
+@@ -223,11 +223,11 @@
+             return
+ 
+         charge_percentage = self.backend.get_capacity_percentage()
+-
+-        charge_message = "Computer running on %s power" % ("AC", "battery")[self.backend.is_discharging()]
++        power_type = "AC" if self.backend.is_on_ac_power() else "battery"
++        charge_message = "Computer running on %s power" % power_type
+ 
+         if self.backend.is_charged():
+-            charge_message += "\nBattery charged"
++            charge_message += "\n" + "Battery charged"
+             icon = os.path.join(themes_dir, self.settings["theme"], "battery-charged.svg")
+         else:
+             is_charging = self.backend.is_charging()
+@@ -343,6 +343,148 @@
+         return self.get_remaining_capacity() <= self.get_warning_capacity()
+ 
+ 
++class UPowerBackend(AbstractBackend):
++
++    """Backend that uses UPower via DBus.
++
++    Reference: http://upower.freedesktop.org/docs/Device.html
++
++    """
++
++    device_iface_name = "org.freedesktop.UPower.Device"
++
++    devices = None
++
++    def __init__(self):
++        self.__system_bus = dbus.SystemBus()
++
++        self.udi = UPowerBackend.get_batteries().keys()[0]
++        self.__set_dbus_interface(self.udi)
++
++    @staticmethod
++    def backend_useable():
++        return dbus is not None and len(UPowerBackend.get_batteries()) > 0
++
++    @staticmethod
++    def get_batteries():
++        udi_models = {}
++
++        try:
++            system_bus = dbus.SystemBus()
++
++            proxy = system_bus.get_object("org.freedesktop.UPower", "/org/freedesktop/UPower")
++            interface = dbus.Interface(proxy, "org.freedesktop.UPower")
++
++            UPowerBackend.devices = list(interface.EnumerateDevices())
++
++            for udi in UPowerBackend.devices:
++                device_iface = UPowerBackend.__get_dbus_interface(system_bus, udi)
++
++                # Type 2 is battery (1 is AC, 3 is UPS)
++                device_type = int(UPowerBackend.__get_property(device_iface, "Type"))
++                is_present = bool(UPowerBackend.__get_property(device_iface, "IsPresent"))
++
++                if device_type == 2 and is_present:
++                    udi_models[str(udi)] = str(UPowerBackend.__get_property(device_iface, "Model"))
++        except dbus.DBusException, e:
++            print e.message
++        finally:
++            return udi_models
++
++    def set_active_udi(self, udi):
++        udi_models = UPowerBackend.get_batteries()
++
++        assert udi in udi_models
++
++        self.udi = udi
++        self.__set_dbus_interface(udi)
++
++    @staticmethod
++    def __get_dbus_interface(system_bus, udi):
++        proxy = system_bus.get_object("org.freedesktop.UPower", udi)
++        return dbus.Interface(proxy, "org.freedesktop.DBus.Properties")
++
++    def __set_dbus_interface(self, udi):
++        self.__battery = UPowerBackend.__get_dbus_interface(self.__system_bus, udi)
++    
++    @staticmethod
++    def __get_property(interface, property_name):
++        return interface.Get(UPowerBackend.device_iface_name, property_name)
++
++    def get_active_udi(self):
++        return self.udi
++
++    def is_present(self):
++        return bool(UPowerBackend.__get_property(self.__battery, "IsPresent"))
++
++    def is_charging(self):
++        # State 1 is charging
++        return int(UPowerBackend.__get_property(self.__battery, "State")) == 1
++
++    def is_discharging(self):
++        # State 2 is discharging
++        return int(UPowerBackend.__get_property(self.__battery, "State")) == 2
++
++    def get_last_full_capacity(self):
++        # Measured in Wh
++        return int(UPowerBackend.__get_property(self.__battery, "EnergyFull"))
++
++    def get_remaining_capacity(self):
++        # Measured in Wh
++        return int(UPowerBackend.__get_property(self.__battery, "Energy"))
++
++    def get_charge_rate(self):
++        # Measured in W. Original value positive if being discharged, negative if being charged
++        return abs(int(UPowerBackend.__get_property(self.__battery, "EnergyRate")))
++
++    def get_capacity_percentage(self):
++        # Percentage in range 0 .. 100
++        return int(UPowerBackend.__get_property(self.__battery, "Percentage"))
++
++    def get_warning_capacity(self):
++        # Measured in Wh
++        return int(int(UPowerBackend.__get_property(self.__battery, "EnergyFullDesign")) * (warning_percentage / 100.))
++
++    def get_charge_time(self):
++        assert self.is_charging()
++
++        # Charge time in seconds
++        time = int(UPowerBackend.__get_property(self.__battery, "TimeToFull"))
++
++        if time == 0:
++            return super(UPowerBackend, self).get_charge_time()
++
++        hours = time / 3600
++        seconds = time % 3600
++        return (hours, int(round(seconds / 60.0)))
++
++    def get_remaining_time(self):
++        assert self.is_discharging()
++
++        # Discharge time in seconds
++        time = int(UPowerBackend.__get_property(self.__battery, "TimeToEmpty"))
++
++        if time == 0:
++            return super(UPowerBackend, self).get_discharge_time()
++
++        hours = time / 3600
++        seconds = time % 3600
++        return (hours, int(round(seconds / 60.0)))
++
++    def is_charged(self):
++        # State 4 is fully charged
++        return int(UPowerBackend.__get_property(self.__battery, "State")) == 4
++
++    def is_on_ac_power(self):
++        for udi in UPowerBackend.devices:
++            device_iface = UPowerBackend.__get_dbus_interface(self.__system_bus, udi)
++
++            # Property "Online" only has a value for AC power device
++            if bool(UPowerBackend.__get_property(device_iface, "Online")):
++                return True
++        return False
++
++
+ class HalBackend(AbstractBackend):
+ 
+     """Backend that uses HAL via DBus.
+@@ -372,7 +514,7 @@
+             return udi_models
+         except dbus.DBusException, e:
+             print e.message
+-            return {}
++            return udi_models
+ 
+     def set_active_udi(self, udi):
+         udi_models = HalBackend.get_batteries()
+@@ -416,8 +558,12 @@
+         except dbus.DBusException:
+             return int(int(self.__hal_battery.GetProperty("battery.charge_level.design")) * (warning_percentage / 100.))
+ 
+-
+-backends = [HalBackend]
++    def is_on_ac_power(self):
++        # TODO Should check that _all_ batteries are not discharging
++        return not self.is_discharging()
++
++
++backends = [UPowerBackend, HalBackend]
+ 
+ 
+ if __name__ == "__main__":
+
diff --git a/community/awn-extras-applets/awn-extras-applets.install b/community/awn-extras-applets/awn-extras-applets.install
new file mode 100644
index 000000000..9f04bf6a2
--- /dev/null
+++ b/community/awn-extras-applets/awn-extras-applets.install
@@ -0,0 +1,23 @@
+pkgname=awn-extras
+
+post_install() {
+  gconfpkg --install $pkgname
+  xdg-icon-resource forceupdate
+}
+
+pre_upgrade() {
+  pre_remove $1
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+
+pre_remove() {
+  gconfpkg --uninstall $pkgname
+}
+
+post_remove() {
+  xdg-icon-resource forceupdate
+}
diff --git a/community/awn-extras-applets/awn-extras-glib2.32.patch b/community/awn-extras-applets/awn-extras-glib2.32.patch
new file mode 100644
index 000000000..563d73b56
--- /dev/null
+++ b/community/awn-extras-applets/awn-extras-glib2.32.patch
@@ -0,0 +1,226 @@
+=== modified file 'applets/maintained/awnterm/keybinder.h'
+--- applets/maintained/awnterm/keybinder.h	2009-12-04 15:32:54 +0000
++++ applets/maintained/awnterm/keybinder.h	2012-04-28 13:17:10 +0000
+@@ -24,7 +24,7 @@
+ #ifndef __AWN_KEY_BINDER_H__
+ #define __AWN_KEY_BINDER_H__
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ 
+ G_BEGIN_DECLS
+ 
+
+=== modified file 'applets/maintained/notification-daemon/daemon.h'
+--- applets/maintained/notification-daemon/daemon.h	2009-11-18 20:13:53 +0000
++++ applets/maintained/notification-daemon/daemon.h	2012-04-28 13:17:10 +0000
+@@ -31,8 +31,6 @@
+ 
+ #include <libawn/awn-applet.h>
+ #include <libawn/awn-applet-simple.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
+ 
+ #include <libawn/awn-dialog.h>
+ #include <libawn/awn-cairo-utils.h>
+
+=== modified file 'applets/maintained/notification-daemon/engines.c'
+--- applets/maintained/notification-daemon/engines.c	2010-04-10 17:06:17 +0000
++++ applets/maintained/notification-daemon/engines.c	2012-04-28 13:17:10 +0000
+@@ -38,8 +38,7 @@
+ 
+ 
+ #include <libawn/awn-applet.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
++#include <glib.h>
+ 
+ #include <libawn/awn-dialog.h>
+ #include <libawn/awn-applet-simple.h>
+@@ -50,7 +49,6 @@
+ 
+ #include <string.h>
+ #include <gtk/gtk.h>
+-#include <glib.h>
+ #ifndef HAVE_GTK_URL_LABEL
+ #include <libsexy/sexy-url-label.h>
+ #endif
+
+=== modified file 'applets/unmaintained/awnsystemmonitor/awnsystemmonitor.h'
+--- applets/unmaintained/awnsystemmonitor/awnsystemmonitor.h	2009-04-22 03:44:36 +0000
++++ applets/unmaintained/awnsystemmonitor/awnsystemmonitor.h	2012-04-28 13:17:10 +0000
+@@ -25,7 +25,7 @@
+ //#include <libawn/awn-title.h>
+ #include <libawn/awn-tooltip.h>
+ 
+-#include <glib/gtypes.h>
++#include <glib.h>
+ #include <glibtop/cpu.h>
+ #include <gconf/gconf-client.h>
+ 
+
+=== modified file 'applets/unmaintained/awnsystemmonitor/awntop_cairo_component.c'
+--- applets/unmaintained/awnsystemmonitor/awntop_cairo_component.c	2010-04-01 14:25:40 +0000
++++ applets/unmaintained/awnsystemmonitor/awntop_cairo_component.c	2012-04-28 13:17:10 +0000
+@@ -43,13 +43,11 @@
+ 
+ 
+ #include <libawn/awn-applet.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include <gconf/gconf-value.h>
+ 
+ #include <libawn/awn-dialog.h>
+ #include <libawn/awn-applet-simple.h>
+-#include <glib.h>
+ #include <gtk/gtk.h>
+ 
+ 
+
+=== modified file 'applets/unmaintained/awnsystemmonitor/cpu_component.c'
+--- applets/unmaintained/awnsystemmonitor/cpu_component.c	2009-08-27 20:20:33 +0000
++++ applets/unmaintained/awnsystemmonitor/cpu_component.c	2012-04-28 13:17:10 +0000
+@@ -18,13 +18,11 @@
+  */
+ 
+ #include <libawn/awn-applet.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include <gconf/gconf-value.h>
+ 
+ #include <libawn/awn-dialog.h>
+ #include <libawn/awn-applet-simple.h>
+-#include <glib.h>
+ #include <gtk/gtk.h>
+ #include <gdk/gdk.h>
+ #include <string.h>
+
+=== modified file 'applets/unmaintained/awnsystemmonitor/cpumetergconf.c'
+--- applets/unmaintained/awnsystemmonitor/cpumetergconf.c	2009-04-22 03:44:36 +0000
++++ applets/unmaintained/awnsystemmonitor/cpumetergconf.c	2012-04-28 13:17:10 +0000
+@@ -20,13 +20,10 @@
+  * Boston, MA 02111-1307, USA.
+  */
+ #include <string.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include <gconf/gconf-value.h>
+ 
+ #include <libawn/awn-applet.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
+ #include <gconf/gconf-value.h>
+ 
+ #include "cairo-utils.h"
+
+=== modified file 'applets/unmaintained/awnsystemmonitor/dashboard.h'
+--- applets/unmaintained/awnsystemmonitor/dashboard.h	2009-04-22 03:44:36 +0000
++++ applets/unmaintained/awnsystemmonitor/dashboard.h	2012-04-28 13:17:10 +0000
+@@ -23,13 +23,11 @@
+ 
+ 
+ #include <libawn/awn-applet.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include <gconf/gconf-value.h>
+ 
+ #include <libawn/awn-dialog.h>
+ #include <libawn/awn-applet-simple.h>
+-#include <glib.h>
+ #include <gtk/gtk.h>
+ 
+ #include <glibtop/mem.h>
+
+=== modified file 'applets/unmaintained/awnsystemmonitor/date_time_component.c'
+--- applets/unmaintained/awnsystemmonitor/date_time_component.c	2009-07-07 20:10:17 +0000
++++ applets/unmaintained/awnsystemmonitor/date_time_component.c	2012-04-28 13:17:10 +0000
+@@ -19,13 +19,11 @@
+ 
+ 
+ #include <libawn/awn-applet.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include <gconf/gconf-value.h>
+ 
+ #include <libawn/awn-dialog.h>
+ #include <libawn/awn-applet-simple.h>
+-#include <glib.h>
+ #include <gtk/gtk.h>
+ #include <gdk/gdk.h>
+ #include <string.h>
+
+=== modified file 'applets/unmaintained/awnsystemmonitor/loadavg_component.c'
+--- applets/unmaintained/awnsystemmonitor/loadavg_component.c	2009-07-07 20:10:17 +0000
++++ applets/unmaintained/awnsystemmonitor/loadavg_component.c	2012-04-28 13:17:10 +0000
+@@ -19,13 +19,11 @@
+ 
+ #include <glibtop/loadavg.h>
+ #include <libawn/awn-applet.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include <gconf/gconf-value.h>
+ 
+ #include <libawn/awn-dialog.h>
+ #include <libawn/awn-applet-simple.h>
+-#include <glib.h>
+ #include <gtk/gtk.h>
+ #include <gdk/gdk.h>
+ #include <string.h>
+
+=== modified file 'applets/unmaintained/awnsystemmonitor/sysmem_component.c'
+--- applets/unmaintained/awnsystemmonitor/sysmem_component.c	2009-08-27 20:20:33 +0000
++++ applets/unmaintained/awnsystemmonitor/sysmem_component.c	2012-04-28 13:17:10 +0000
+@@ -19,13 +19,11 @@
+ 
+ #include <glibtop/mem.h>
+ #include <libawn/awn-applet.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include <gconf/gconf-value.h>
+ 
+ #include <libawn/awn-dialog.h>
+ #include <libawn/awn-applet-simple.h>
+-#include <glib.h>
+ #include <gtk/gtk.h>
+ #include <gdk/gdk.h>
+ #include <string.h>
+
+=== modified file 'applets/unmaintained/awnsystemmonitor/uptime_component.c'
+--- applets/unmaintained/awnsystemmonitor/uptime_component.c	2009-07-07 20:10:17 +0000
++++ applets/unmaintained/awnsystemmonitor/uptime_component.c	2012-04-28 13:17:10 +0000
+@@ -1,12 +1,10 @@
+ 
+ #include <libawn/awn-applet.h>
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include <gconf/gconf-value.h>
+ 
+ #include <libawn/awn-dialog.h>
+ #include <libawn/awn-applet-simple.h>
+-#include <glib.h>
+ 
+ #include <glibtop/uptime.h>
+ #include <glibtop/cpu.h>
+
+=== modified file 'applets/unmaintained/main-menu/applet.c'
+--- applets/unmaintained/main-menu/applet.c	2011-12-28 11:09:45 +0000
++++ applets/unmaintained/main-menu/applet.c	2012-04-28 13:17:10 +0000
+@@ -23,8 +23,7 @@
+ 
+ #include <string.h>
+ 
+-#include <glib/gmacros.h>
+-#include <glib/gerror.h>
++#include <glib.h>
+ #include <glib/gi18n.h>
+ #include <gtk/gtk.h>
+ #include <libdesktop-agnostic/fdo.h>
+
diff --git a/community/awn-extras-applets/awn-extras-libnotify0.7.patch b/community/awn-extras-applets/awn-extras-libnotify0.7.patch
new file mode 100644
index 000000000..c552e26f2
--- /dev/null
+++ b/community/awn-extras-applets/awn-extras-libnotify0.7.patch
@@ -0,0 +1,12 @@
+diff -Naur awn-extras-0.4.0.orig/applets/maintained/notification-daemon/daemon.c awn-extras-0.4.0/applets/maintained/notification-daemon/daemon.c
+--- awn-extras-0.4.0.orig/applets/maintained/notification-daemon/daemon.c	2010-04-10 01:26:20.000000000 +0200
++++ awn-extras-0.4.0/applets/maintained/notification-daemon/daemon.c	2011-12-16 00:23:45.488215715 +0100
+@@ -1487,7 +1487,7 @@
+   if (fork() == 0)
+   {
+     notify_init("notify-send");
+-    notify = notify_notification_new(summary, body, icon_str, NULL);
++    notify = notify_notification_new(summary, body, icon_str);
+     notify_notification_set_category(notify, type);
+     notify_notification_set_urgency(notify, urgency);
+     notify_notification_set_timeout(notify, expire_timeout);
diff --git a/community/awn-extras-applets/check-dependencies.patch b/community/awn-extras-applets/check-dependencies.patch
new file mode 100644
index 000000000..959d3a113
--- /dev/null
+++ b/community/awn-extras-applets/check-dependencies.patch
@@ -0,0 +1,71 @@
+diff -Naur awn-extras-0.4.0.orig/applets/maintained/comics/comics.py awn-extras-0.4.0/applets/maintained/comics/comics.py
+--- awn-extras-0.4.0.orig/applets/maintained/comics/comics.py	2010-03-26 17:14:53.000000000 +0100
++++ awn-extras-0.4.0/applets/maintained/comics/comics.py	2012-11-15 17:28:52.045595715 +0100
+@@ -30,7 +30,7 @@
+ from awn.extras import _
+ 
+ # Import Comics! modules, but check dependencies first
+-awn.check_dependencies(globals(), 'feedparser', 'pynotify')
++awn.check_dependencies(globals(), 'feedparser', 'pynotify', 'rsvg')
+ from pynotify import init as notify_init, Notification
+ 
+ import comics_manage
+diff -Naur awn-extras-0.4.0.orig/applets/maintained/media-player/media_player.py awn-extras-0.4.0/applets/maintained/media-player/media_player.py
+--- awn-extras-0.4.0.orig/applets/maintained/media-player/media_player.py	2010-01-06 00:01:33.000000000 +0100
++++ awn-extras-0.4.0/applets/maintained/media-player/media_player.py	2012-11-15 17:28:54.925659573 +0100
+@@ -17,13 +17,15 @@
+ import os
+ import sys
+ 
++import awn
++awn.check_dependencies(globals(), 'pygst')
++
+ import pygst
+ pygst.require("0.10")
+ import gst
+ import gtk
+ import gobject
+ 
+-import awn
+ from desktopagnostic import config
+ 
+ 
+diff -Naur awn-extras-0.4.0.orig/applets/maintained/slickswitcher/slickswitcher.py awn-extras-0.4.0/applets/maintained/slickswitcher/slickswitcher.py
+--- awn-extras-0.4.0.orig/applets/maintained/slickswitcher/slickswitcher.py	2010-04-08 14:31:25.000000000 +0200
++++ awn-extras-0.4.0/applets/maintained/slickswitcher/slickswitcher.py	2012-11-15 17:31:32.025809983 +0100
+@@ -25,6 +25,9 @@
+ import gobject
+ 
+ import cairo
++
++awn.check_dependencies(globals(), 'wnck')
++
+ import drawing, switch, settings
+ from os.path import exists, isdir
+ import os
+diff -Naur awn-extras-0.4.0.orig/applets/maintained/volume-control/volume-control.py awn-extras-0.4.0/applets/maintained/volume-control/volume-control.py
+--- awn-extras-0.4.0.orig/applets/maintained/volume-control/volume-control.py	2010-01-06 00:01:34.000000000 +0100
++++ awn-extras-0.4.0/applets/maintained/volume-control/volume-control.py	2012-11-15 17:28:26.368359913 +0100
+@@ -30,6 +30,9 @@
+ 
+ from awn.extras import awnlib, __version__
+ 
++import awn
++awn.check_dependencies(globals(), 'pygst')
++
+ import pygst
+ pygst.require("0.10")
+ import gst
+diff -Naur awn-extras-0.4.0.orig/applets/unmaintained/stacks/stacks_applet.py awn-extras-0.4.0/applets/unmaintained/stacks/stacks_applet.py
+--- awn-extras-0.4.0.orig/applets/unmaintained/stacks/stacks_applet.py	2009-11-16 00:31:16.000000000 +0100
++++ awn-extras-0.4.0/applets/unmaintained/stacks/stacks_applet.py	2012-11-15 17:28:41.778701431 +0100
+@@ -25,6 +25,9 @@
+ import pango
+ import awn
+ import cairo
++
++awn.check_dependencies(globals(), 'gnome.ui', 'gnomedesktop')
++
+ import gnome.ui
+ import gnomedesktop
+ import time
diff --git a/community/awn-extras-applets/fix-shinyswitcher-scrolling.patch b/community/awn-extras-applets/fix-shinyswitcher-scrolling.patch
new file mode 100644
index 000000000..69dcae9c1
--- /dev/null
+++ b/community/awn-extras-applets/fix-shinyswitcher-scrolling.patch
@@ -0,0 +1,96 @@
+=== modified file 'applets/maintained/shiny-switcher/shinyswitcherapplet.c'
+--- applets/maintained/shiny-switcher/shinyswitcherapplet.c	2010-09-12 16:15:07 +0000
++++ applets/maintained/shiny-switcher/shinyswitcherapplet.c	2010-11-02 13:52:43 +0000
+@@ -769,7 +769,7 @@
+ 
+ 
+ static gboolean 
+-_scroll_event(GtkWidget *widget, GdkEventMotion *event, AwnShinySwitcher *shinyswitcher)
++_scroll_event(GtkWidget *widget, GdkEventScroll *event, AwnShinySwitcher *shinyswitcher)
+ {
+   AwnShinySwitcherPrivate * priv = GET_PRIVATE (shinyswitcher);
+   WnckWorkspace *cur_space = wnck_screen_get_active_workspace(priv->wnck_screen);
+@@ -779,7 +779,7 @@
+   {
+     if (event->type == GDK_SCROLL)
+     {
+-      WnckMotionDirection direction1, direction2;
++      WnckMotionDirection left, right, up, down;
+ 
+       switch (priv->mousewheel)
+       {
+@@ -787,8 +787,10 @@
+         case 1:
+ 
+         case 3:
+-          direction1 =  WNCK_MOTION_LEFT;
+-          direction2 =  WNCK_MOTION_RIGHT;
++          left =  WNCK_MOTION_LEFT;
++          right =  WNCK_MOTION_RIGHT;
++          up = WNCK_MOTION_UP;
++          down = WNCK_MOTION_DOWN;
+           break;
+ 
+         case 2:
+@@ -796,22 +798,52 @@
+         case 4:
+ 
+         default:
+-          direction1 =  WNCK_MOTION_RIGHT;
+-          direction2 =  WNCK_MOTION_LEFT;
+-
++          left =  WNCK_MOTION_RIGHT;
++          right =  WNCK_MOTION_LEFT;
++          up = WNCK_MOTION_DOWN;
++          down = WNCK_MOTION_UP;
+       }
+ 
+-      if (event->state & GDK_SHIFT_MASK)
++      if ( (event->direction == GDK_SCROLL_UP) ||
++            (event->direction == GDK_SCROLL_LEFT) )
+       {
+-        new_space = wnck_workspace_get_neighbor(cur_space, WNCK_MOTION_RIGHT);
++        new_space = wnck_workspace_get_neighbor(cur_space, left);
++        if (new_space == NULL)
++        {
++          new_space = wnck_workspace_get_neighbor(cur_space, up);
++          if (new_space)
++          {
++            for (cur_space = new_space; cur_space; )
++            {
++              cur_space = wnck_workspace_get_neighbor(cur_space, right);
++              if (cur_space)
++              {
++                new_space = cur_space;
++              }
++            }
++          }
++        }
+       }
+       else
+       {
+-        new_space = wnck_workspace_get_neighbor(cur_space, WNCK_MOTION_LEFT);
+-
++        new_space = wnck_workspace_get_neighbor(cur_space, right);
++        if (!new_space)
++        {
++          new_space = wnck_workspace_get_neighbor(cur_space, down);
++          if (new_space)
++          {
++            for (cur_space = new_space; cur_space; )
++            {
++              cur_space = wnck_workspace_get_neighbor(cur_space, left);
++              if (cur_space)
++              {
++                new_space = cur_space;
++              }
++            }
++          }
++        }
+       }
+     }
+-
+     if (new_space)
+     {
+       wnck_workspace_activate(new_space, event->time); /* FIXME */
+
diff --git a/community/awn-extras-applets/fix-weather-applet.patch b/community/awn-extras-applets/fix-weather-applet.patch
new file mode 100644
index 000000000..889c0f641
--- /dev/null
+++ b/community/awn-extras-applets/fix-weather-applet.patch
@@ -0,0 +1,48 @@
+diff -Naur awn-extras-0.4.0.orig/applets/maintained/weather/weather.py awn-extras-0.4.0/applets/maintained/weather/weather.py
+--- awn-extras-0.4.0.orig/applets/maintained/weather/weather.py	2012-03-07 00:20:03.094411287 +0100
++++ awn-extras-0.4.0/applets/maintained/weather/weather.py	2010-03-21 13:58:03.000000000 +0100
+@@ -570,7 +570,7 @@
+ 
+     class NetworkHandler(ThreadQueue):
+ 
+-        __ws_key = "&prod=xoap&par=1048871467&key=12daac2f3a67cb39&link=xoap"
++        __ws_key = "&prod=xml&par=1287722164&key=e11ec82daa20d876"
+ 
+         def dict_from_xml(self, rootNode, keys, paths):
+             """Given an XML node, iterate over keys and paths, grabbing the
+@@ -590,7 +590,7 @@
+         @async_method
+         @network_exception
+         def get_locations(self, text):
+-            url = "http://xoap.weather.com/search/search?where=" + urllib2.quote(text)
++            url = "http://xml.weather.com/search/search?where=" + urllib2.quote(text)
+             with closing(urllib2.urlopen(url)) as usock:
+                 with unlink_xml(usock) as xmldoc:
+                     locations_list = []
+@@ -604,7 +604,7 @@
+         @with_overlays
+         @network_exception
+         def get_conditions(self, location_code):
+-            url = "http://xoap.weather.com/weather/local/" + location_code + "?cc=*" + self.__ws_key
++            url = "http://xml.weather.com/weather/local/" + location_code + "?cc=*" + self.__ws_key
+             with closing(urllib2.urlopen(url)) as usock:
+                 with unlink_xml(usock) as xmldoc:
+                     names = ['CITY', 'SUNRISE', 'SUNSET', 'DESCRIPTION', 'CODE', 'TEMP', 'FEELSLIKE', 'BAR', 'BARDESC', 'WINDSPEED', 'WINDGUST', 'WINDDIR', 'HUMIDITY', 'MOONPHASE']
+@@ -619,7 +619,7 @@
+         def get_weather_map(self, location_code):
+             map_url = "http://www.weather.com/outlook/travel/businesstraveler/map/%s" % location_code
+             with closing(urllib2.urlopen(map_url)) as usock:
+-                mapExp = """<IMG NAME="mapImg" SRC="([^\"]+)" WIDTH=([0-9]+) HEIGHT=([0-9]+) BORDER"""
++                mapExp = """<img name="mapImg" src="([^\"]+)" width="([0-9]+)" height="([0-9]+)" border"""
+                 result = re.findall(mapExp, usock.read())
+                 if not result or len(result) != 1:
+                     raise NetworkException("Couldn't parse weather map")
+@@ -635,7 +635,7 @@
+         @with_overlays
+         @network_exception
+         def get_forecast(self, location_code):
+-            url = "http://xoap.weather.com/weather/local/" + location_code + "?dayf=5" + self.__ws_key
++            url = "http://xml.weather.com/weather/local/" + location_code + "?dayf=5" + self.__ws_key
+             with closing(urllib2.urlopen(url)) as usock:
+                 with unlink_xml(usock) as xmldoc:
+                     try:
diff --git a/community/awn-extras-applets/remove-settings-menu.patch b/community/awn-extras-applets/remove-settings-menu.patch
new file mode 100644
index 000000000..60eeda1d5
--- /dev/null
+++ b/community/awn-extras-applets/remove-settings-menu.patch
@@ -0,0 +1,229 @@
+diff -Naur awn-extras-0.4.0.orig/applets/maintained/cairo-menu/gnome-menu-builder.c awn-extras-0.4.0/applets/maintained/cairo-menu/gnome-menu-builder.c
+--- awn-extras-0.4.0.orig/applets/maintained/cairo-menu/gnome-menu-builder.c	2010-04-10 01:26:19.000000000 +0200
++++ awn-extras-0.4.0/applets/maintained/cairo-menu/gnome-menu-builder.c	2011-12-16 20:34:22.612913317 +0100
+@@ -34,7 +34,6 @@
+ #include "cairo-menu-applet.h"
+ 
+ GMenuTree *  main_menu_tree = NULL;
+-GMenuTree *  settings_menu_tree = NULL;    
+ 
+ GtkWidget *  menu_build (MenuInstance * instance);
+ static GtkWidget * submenu_build (MenuInstance * instance);
+@@ -749,19 +748,10 @@
+   gmenu_tree_remove_monitor (main_menu_tree,(GMenuTreeChangedFunc)_submenu_modified_cb,instance);
+ }
+ 
+-static void 
+-_remove_settings_submenu_cb(MenuInstance * instance,GObject *where_the_object_was)
+-{
+-  g_debug ("%s",__func__);  
+-  GMenuTreeDirectory *main_root;
+-  gmenu_tree_remove_monitor (settings_menu_tree,(GMenuTreeChangedFunc)_submenu_modified_cb,instance);
+-}
+-
+ static GtkWidget *
+ submenu_build (MenuInstance * instance)
+ {
+   GMenuTreeDirectory *main_root;
+-  GMenuTreeDirectory *settings_root;
+   GtkWidget * menu = NULL;
+   /*
+    if the menu is set then clear any menu items (except for places or recent)
+@@ -771,10 +761,6 @@
+   {
+     main_menu_tree = gmenu_tree_lookup("applications.menu", GMENU_TREE_FLAGS_NONE);
+   }
+-  if (!settings_menu_tree)
+-  {
+-    settings_menu_tree = gmenu_tree_lookup("settings.menu", GMENU_TREE_FLAGS_NONE);
+-  }
+   g_assert (main_menu_tree);
+   /*
+    get_places_menu() and get_recent_menu() are 
+@@ -808,7 +794,6 @@
+     main_root = gmenu_tree_get_root_directory(main_menu_tree);
+     g_assert (gmenu_tree_item_get_type( (GMenuTreeItem*)main_root) == GMENU_TREE_ITEM_DIRECTORY);
+     g_assert (main_root);
+-    settings_root = gmenu_tree_get_root_directory(settings_menu_tree);
+     if ( menu_dir = find_menu_dir (instance,main_root) )
+     {
+       /* if instance->menu then we're refreshing in a monitor callback*/
+@@ -817,22 +802,11 @@
+       menu = fill_er_up(instance,menu_dir,instance->menu);
+       g_object_weak_ref (G_OBJECT(menu), (GWeakNotify)_remove_main_submenu_cb,instance);
+     }
+-    else if ( settings_root && (menu_dir = find_menu_dir (instance,settings_root)) )
+-    {
+-      gmenu_tree_remove_monitor (main_menu_tree,(GMenuTreeChangedFunc)_submenu_modified_cb,instance);
+-      gmenu_tree_add_monitor (main_menu_tree,(GMenuTreeChangedFunc)_submenu_modified_cb,instance);
+-      menu = fill_er_up(instance,menu_dir,instance->menu);
+-      g_object_weak_ref (G_OBJECT(menu), (GWeakNotify)_remove_settings_submenu_cb,instance);
+-    }
+     if (menu_dir)
+     {      
+       gmenu_tree_item_unref(menu_dir);
+     }
+     gmenu_tree_item_unref(main_root);
+-    if (settings_root)
+-    {
+-      gmenu_tree_item_unref(settings_root);
+-    }
+   }
+   return instance->menu = menu;
+ }
+@@ -862,10 +836,6 @@
+   {
+     main_menu_tree = gmenu_tree_lookup("applications.menu", GMENU_TREE_FLAGS_NONE);
+   }
+-  if (!settings_menu_tree)
+-  {
+-    settings_menu_tree = gmenu_tree_lookup("settings.menu", GMENU_TREE_FLAGS_NONE);
+-  }
+ 
+   if (main_menu_tree)
+   {
+@@ -884,44 +854,6 @@
+       menu_item = gtk_separator_menu_item_new ();
+       gtk_menu_shell_append(GTK_MENU_SHELL(instance->menu),menu_item);  
+   }
+-  if (settings_menu_tree)
+-  {
+-    root = gmenu_tree_get_root_directory(settings_menu_tree);
+-    gmenu_tree_remove_monitor (settings_menu_tree,(GMenuTreeChangedFunc)_menu_modified_cb,instance);
+-    gmenu_tree_add_monitor (settings_menu_tree,(GMenuTreeChangedFunc)_menu_modified_cb,instance);
+-    if (!instance->menu)
+-    {
+-      g_debug ("%s:  No applications menu????",__func__);
+-      instance->menu = fill_er_up(instance,root,instance->menu);
+-    }
+-    else
+-    {
+-      sub_menu = fill_er_up (instance, root,instance->menu);
+-#if 0      
+-      sub_menu = fill_er_up(instance,root,NULL);
+-      c = g_malloc0 (sizeof(CallbackContainer));        
+-      c->icon_name = g_strdup(gmenu_tree_directory_get_icon (root));
+-      image = get_gtk_image (c->icon_name);
+-      txt = gmenu_tree_entry_get_name((GMenuTreeEntry*)root);        
+-      menu_item = cairo_menu_item_new_with_label (txt?txt:"unknown");        
+-      gtk_menu_item_set_submenu (GTK_MENU_ITEM(menu_item),sub_menu);
+-      if (image)
+-      {
+-        gtk_image_menu_item_set_image (GTK_IMAGE_MENU_ITEM (menu_item),image);
+-      }        
+-      gtk_menu_shell_append(GTK_MENU_SHELL(instance->menu),menu_item);
+-      c->file_path = g_strdup(gmenu_tree_directory_get_desktop_file_path (root));
+-      c->display_name = g_strdup ("Settings");
+-      drop_data = g_strdup_printf("cairo_menu_item_dir:///@@@%s@@@%s@@@%s\n",c->file_path,c->display_name,c->icon_name);
+-      cairo_menu_item_set_source (AWN_CAIRO_MENU_ITEM(menu_item),drop_data);
+-      g_free (drop_data);
+-      c->instance = instance;
+-      g_signal_connect (menu_item, "button-press-event",G_CALLBACK(_button_press_dir),c);
+-      g_object_weak_ref (G_OBJECT(menu_item),(GWeakNotify)_free_callback_container,c);
+-#endif
+-    }
+-    gmenu_tree_item_unref(root);    
+-  }
+     
+     /*TODO Check to make sure it is needed. Should not be displayed if 
+       all flags are of the NO persuasion.*/
+diff -Naur awn-extras-0.4.0.orig/applets/maintained/yama/yama.py awn-extras-0.4.0/applets/maintained/yama/yama.py
+--- awn-extras-0.4.0.orig/applets/maintained/yama/yama.py	2010-03-31 16:21:24.000000000 +0200
++++ awn-extras-0.4.0/applets/maintained/yama/yama.py	2011-12-16 20:37:48.243326388 +0100
+@@ -113,7 +113,6 @@
+ 
+     def build_menu(self):
+         self.applications_items = []
+-        self.settings_items = []
+         self.session_items = []
+ 
+         """ Applications """
+@@ -126,11 +125,6 @@
+         """ Places """
+         self.create_places_submenu(self.menu)
+ 
+-        """ System """
+-        tree = gmenu.lookup_tree("settings.menu")
+-        self.append_directory(tree.root, self.menu, item_list=self.settings_items)
+-        tree.add_monitor(self.menu_changed_cb, self.settings_items)
+-
+         """ Session actions """
+         if dbus is not None:
+             self.append_session_actions(self.menu)
+@@ -227,7 +221,7 @@
+                 for i in xrange(len(items)):
+                     items.pop().destroy()
+ 
+-                index = len(self.applications_items) + 2 if items is self.settings_items else 0  # + 2 = separator + Places
++                index = len(self.applications_items) + 0
+                 self.append_directory(tree.root, self.menu, index=index, item_list=items)
+                 # Refresh menu to re-initialize the widget
+                 self.menu.show_all()
+diff -Naur awn-extras-0.4.0.orig/applets/unmaintained/main-menu/applet.c awn-extras-0.4.0/applets/unmaintained/main-menu/applet.c
+--- awn-extras-0.4.0.orig/applets/unmaintained/main-menu/applet.c	2009-10-27 20:45:03.000000000 +0100
++++ awn-extras-0.4.0/applets/unmaintained/main-menu/applet.c	2011-12-16 20:27:28.792248015 +0100
+@@ -43,7 +43,6 @@
+   GMenuTree *tree;
+   GMenuTreeDirectory *root;
+   GMenuTreeDirectory *apps;
+-  GMenuTreeDirectory *settings;
+ 
+ } Menu;
+ 
+@@ -243,8 +242,6 @@
+ {
+   GMenuTreeDirectory *temp= menu->root;
+   menu->root = gmenu_tree_item_get_parent (GMENU_TREE_ITEM (temp));
+-  if (menu->root == menu->settings)
+-    menu->root = gmenu_tree_get_root_directory (menu->tree); 
+   populate (menu);
+ }
+ 
+@@ -299,8 +296,6 @@
+   if (app->root == GMENU_TREE_DIRECTORY(gmenu_tree_get_root_directory ((GMenuTree*)app->apps)))
+   {
+     list = g_slist_copy (apps);
+-    sets = g_slist_copy (gmenu_tree_directory_get_contents (app->settings));
+-    list = g_slist_concat (list, sets);
+     list = g_slist_sort (list, (GCompareFunc)_compare);
+   }
+   else
+@@ -419,13 +414,6 @@
+     g_warning ("Unable to find applications.menu");
+     return FALSE;
+   }
+-  app->settings = gmenu_tree_get_root_directory (
+-                  gmenu_tree_lookup ("settings.menu", GMENU_TREE_FLAGS_NONE));
+-  if (!app->settings)
+-  {
+-    g_warning ("Unable to find settings.menu");
+-    return FALSE;
+-  }
+   app->tree =  (GMenuTree*)app->apps;
+ 
+   app->menu = awn_applet_create_default_menu (app->applet);
+diff -Naur awn-extras-0.4.0.orig/applets/unmaintained/MiMenu/menus.py awn-extras-0.4.0/applets/unmaintained/MiMenu/menus.py
+--- awn-extras-0.4.0.orig/applets/unmaintained/MiMenu/menus.py	2009-08-14 14:29:59.000000000 +0200
++++ awn-extras-0.4.0/applets/unmaintained/MiMenu/menus.py	2011-12-16 20:30:42.060104523 +0100
+@@ -12,8 +12,6 @@
+ class MenuDateStore:
+     MENUCORE = gmenu.lookup_tree('applications.menu')
+     MENUROOT = MENUCORE.get_root_directory()
+-    SYSTEMMENUCORE = gmenu.lookup_tree('settings.menu')
+-    SYSTEMMENUROOT = SYSTEMMENUCORE.get_root_directory()
+     PATH = []
+ 
+ 
+diff -Naur awn-extras-0.4.0.orig/applets/unmaintained/MiMenu/mimenu.py awn-extras-0.4.0/applets/unmaintained/MiMenu/mimenu.py
+--- awn-extras-0.4.0.orig/applets/unmaintained/MiMenu/mimenu.py	2009-10-27 20:45:47.000000000 +0100
++++ awn-extras-0.4.0/applets/unmaintained/MiMenu/mimenu.py	2011-12-16 20:30:35.897158422 +0100
+@@ -69,8 +69,7 @@
+         tree1.set_headers_visible (0)
+         tree1.append_column(column1)
+         tree1.append_column(column2)
+-        lst1,self.objlist1 = menus.get_menus(menus.data.MENUROOT,
+-                                             root2=menus.data.SYSTEMMENUROOT)
++        lst1,self.objlist1 = menus.get_menus(menus.data.MENUROOT)
+         model = menus.set_model(tree1,lst1,self.theme,self.location_icon)
+         tree1.connect('cursor_changed', self.treeclick,
+                       tree1,self.objlist1,False)
diff --git a/community/cgit/PKGBUILD b/community/cgit/PKGBUILD
index b1479a41f..deb501fa5 100644
--- a/community/cgit/PKGBUILD
+++ b/community/cgit/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 71264 2012-05-26 07:35:52Z spupykin $
+# $Id: PKGBUILD 80035 2012-11-15 15:53:42Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Current Maintainer:  Patrick Palka <patrick@parcs.ath.cx>
 # Previous Maintainer:  Loui Chang <louipc.ist at gmail com>
@@ -6,7 +6,7 @@
 # Development: http://closure.ath.cx/aur-dev
 
 pkgname=cgit
-pkgver=0.9.0.3
+pkgver=0.9.1
 _gitver=1.7.4
 pkgrel=1
 pkgdesc="A web interface for git written in plain C"
@@ -16,12 +16,11 @@ license=('GPL')
 depends=('openssl')
 makedepends=('git' 'zlib' 'curl' 'asciidoc')
 install=cgit.install
-#	"http://www.kernel.org/pub/software/scm/git/git-${_gitver}.tar.bz2"
-source=("http://hjemli.net/git/cgit/snapshot/$pkgname-$pkgver.tar.bz2"
-	"http://arch.p5n.pp.ru/~sergej/dl/2011/git-${_gitver}.tar.bz2"
+source=("http://git.zx2c4.com/cgit/snapshot/cgit-$pkgver.tar.xz"
+	"git-${_gitver}.tar.gz::https://github.com/git/git/archive/v${_gitver}.tar.gz"
 	"apache.example.conf")
-md5sums=('3d5481bf8a507694108f0996b8bde235'
-         'fa24dc1ef0b663327ea0fe1981365b39'
+md5sums=('ed1a1ccccdcbf55ddd6a9de29bca6edf'
+         'c63cc7ca8a4bbf97c8802f354511223e'
          'bd5696bea0654bfcf98f249b1a36737d')
 
 build() {
diff --git a/community/cgminer/PKGBUILD b/community/cgminer/PKGBUILD
index f1bcc82c3..4cd780f39 100644
--- a/community/cgminer/PKGBUILD
+++ b/community/cgminer/PKGBUILD
@@ -6,16 +6,15 @@
 pkgname=cgminer
 pkgver=2.9.3
 _build=
-pkgrel=1
+pkgrel=3
 pkgdesc="Multi-threaded multi-pool CPU and GPU miner for bitcoin, forked from cpuminer."
 url='http://forum.bitcoin.org/index.php?topic=28402.0'
 license=('GPL3')
 arch=('i686' 'x86_64')
 depends=('curl' 'libcl')
 makedepends=('opencl-headers')
-optdepends=('opencl-nvidia: OpenCL implementation for NVIDIA'   \
-            'intel-opencl-sdk: OpenCL implementation for Intel' \
-            'amdstream: OpenCL implementation for AMD')
+optdepends=('opencl-nvidia: OpenCL implementation for NVIDIA'
+            'opencl-catalyst: OpenCL implementation for AMD')
 source=("http://ck.kolivas.org/apps/cgminer/$pkgname-$pkgver.tar.bz2"
         "$pkgname.conf.d"
         "$pkgname"
diff --git a/community/ejabberd/PKGBUILD b/community/ejabberd/PKGBUILD
index 6fefbdeb8..8d4269da2 100644
--- a/community/ejabberd/PKGBUILD
+++ b/community/ejabberd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 79033 2012-10-29 09:21:18Z spupykin $
+# $Id: PKGBUILD 80020 2012-11-15 13:56:56Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jeff 'codemac' Mickey <jeff@archlinux.org>
 # Contributor: Alexander Rødseth <rodseth@gmail.com>
 
 pkgname=ejabberd
 pkgver=2.1.11
-pkgrel=6
+pkgrel=7
 pkgdesc="Jabber server written in Erlang"
 arch=('x86_64' 'i686')
 url="http://www.ejabberd.im/"
@@ -22,7 +22,7 @@ source=("http://www.process-one.net/downloads/ejabberd/${pkgver/_/-}/ejabberd-${
 md5sums=('a70b040c4e7602f47718c8afe8780d50'
          'f97c8a96160f30e0aecc9526c12e6606'
          '2338a6230ce5f9f60be6dddcfa39bc7e'
-         'bc4552b833e1927fce52acdbc6d76fb2')
+         'bd18cb1034df9ef1b699214f0e3b4567')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver/src"
diff --git a/community/ejabberd/ejabberd.service b/community/ejabberd/ejabberd.service
index 47e5f2e27..e7cef53b2 100644
--- a/community/ejabberd/ejabberd.service
+++ b/community/ejabberd/ejabberd.service
@@ -3,18 +3,12 @@ Description=A distributed, fault-tolerant Jabber/XMPP server
 After=network.target
 
 [Service]
-Type=oneshot
+Type=forking
 User=ejabberd
 Group=jabber
 LimitNOFILE=16000
 RestartSec=5
-ExecStart=/usr/sbin/ejabberdctl \
-		--config /etc/ejabberd/ejabberd.cfg \
-		--ctl-config /etc/ejabberd/ejabberdctl.cfg \
-		--logs "/var/log/ejabberd" \
-		--spool "/var/lib/ejabberd" start
-ExecStop=/usr/sbin/ejabberdctl stop
-RemainAfterExit=yes
+ExecStart=/usr/bin/erl -pa /usr/lib/ejabberd/ebin -sname ejabberd -s ejabberd -ejabberd config \"/etc/ejabberd/ejabberd.cfg\" log_path \"/var/log/ejabberd/ejabberd.log\" -sasl sasl_error_logger \{file,\"/var/log/ejabberd/sasl.log\"\} -mnesia dir \"/var/lib/ejabberd\" -detached -kernel inetrc \"/etc/ejabberd/inetrc\"
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/erlang-cl/PKGBUILD b/community/erlang-cl/PKGBUILD
new file mode 100644
index 000000000..b1d4c62c1
--- /dev/null
+++ b/community/erlang-cl/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id: PKGBUILD 61589 2012-01-03 23:37:49Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: kappa <kappacurve@gmail.com>
+
+pkgname=erlang-cl
+pkgver=1.0
+pkgrel=1
+arch=('x86_64' 'i686')
+pkgdesc='OpenCL binding for Erlang'
+url="http://github.com/tonyrog/cl"
+license=('custom:unknown')
+depends=('erlang' 'libcl' 'bash')
+replaces=('cl')
+makedepends=('opencl-headers')
+source=("$pkgname-$pkgver.tar.gz::https://nodeload.github.com/tonyrog/cl/tar.gz/master")
+sha256sums=('e2cb407489ebe1d8e8f287283eb5c715d559ce95255f6bbcac137cb84c500be6')
+_dirname='cl-master'
+if [ "$CARCH" = "x86_64" ]
+then
+  _wordsize=64
+else
+  _wordsize=32
+fi
+
+build() {
+  cd "$srcdir/$_dirname/c_src"
+
+  make configure
+  ./configure --with-wordsize=$_wordsize --prefix=/usr
+  make all$_wordsize
+  rm config.*
+}
+
+package() {
+  cd "$srcdir/$_dirname"
+
+  mkdir -p "$pkgdir/usr/lib/erlang/lib/cl-$pkgver"
+  cp -r * "$pkgdir/usr/lib/erlang/lib/cl-$pkgver"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/erlang-sdl/PKGBUILD b/community/erlang-sdl/PKGBUILD
new file mode 100644
index 000000000..6b914718e
--- /dev/null
+++ b/community/erlang-sdl/PKGBUILD
@@ -0,0 +1,39 @@
+# $Id: PKGBUILD 79997 2012-11-15 11:48:24Z arodseth $
+# Maintainer: Alexander Rødseth <rodseth@gmail.com>
+# Contributor: kappa <kappacurve@gmail.com>
+
+pkgname=erlang-sdl
+pkgver=1.2
+pkgrel=1
+arch=('x86_64' 'i686')
+pkgdesc='SDL and OpenGL bindings for Erlang (r15b-driver-compat branch)'
+url='http://esdl.sourceforge.net/'
+license=('custom')
+depends=('erlang' 'sdl' 'glu')
+replaces=('esdl')
+source=("$pkgname-$pkgver.tar.gz::https://nodeload.github.com/dgud/esdl/tar.gz/dgud/r15b-driver-compat")
+sha256sums=('a14d695229b93401a304b773874e87c02c5b304d4b5b66f35cba75e140672086')
+_dirname='esdl-dgud-r15b-driver-compat'
+
+build() {
+  cd "$srcdir/$_dirname"
+
+  find -type f -print0 | xargs -0 chmod 644
+  make
+}
+
+package() {
+  cd "$srcdir/$_dirname"
+
+  make INSTALLDIR="$pkgdir/usr/lib/erlang/lib/esdl-$pkgver" install
+
+  ## An attempt to make wings3d compile with esdl 1.2
+  #ln -s /usr/lib/erlang/lib/wx-0.99/include/glu.hrl \
+  #  "$pkgdir/usr/lib/erlang/lib/esdl-$pkgver/include/glu.hrl"
+  #ln -s /usr/lib/erlang/lib/wx-0.99/include/gl.hrl \
+  #  "$pkgdir/usr/lib/erlang/lib/esdl-$pkgver/include/gl.hrl"
+
+  install -Dm644 license.terms "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/fcitx-m17n/PKGBUILD b/community/fcitx-m17n/PKGBUILD
new file mode 100644
index 000000000..e571815a7
--- /dev/null
+++ b/community/fcitx-m17n/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id$
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+
+pkgname=fcitx-m17n
+pkgver=0.1.3
+pkgrel=1
+pkgdesc="Fcitx Wrapper for m17n."
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/fcitx"
+license=('GPL')
+depends=('fcitx>=4.2.1' 'm17n-lib')
+makedepends=('cmake' 'intltool')
+source=(http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz)
+
+build() {
+    cd "$srcdir/${pkgname}-${pkgver}"
+    rm -rf build
+    mkdir build
+    cd build
+    
+    cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
+    make
+}
+
+package() {
+    cd "$srcdir/${pkgname}-${pkgver}/build"
+    make DESTDIR="${pkgdir}" install
+}
+md5sums=('a0df4dc1bf2e15fcfef63605dbeb9bba')
diff --git a/community/fcitx-unikey/PKGBUILD b/community/fcitx-unikey/PKGBUILD
new file mode 100644
index 000000000..b2cd0abf7
--- /dev/null
+++ b/community/fcitx-unikey/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 80099 2012-11-16 03:00:26Z fyan $
+# Maintainer: Felix Yan <felixonmars@gmail.com>
+
+pkgname=fcitx-unikey
+pkgver=0.1.1
+pkgrel=2
+pkgdesc="Fcitx Wrapper for unikey"
+arch=('i686' 'x86_64')
+url="http://code.google.com/p/fcitx"
+license=('GPL')
+depends=('fcitx>=4.2.3')
+optdepends=('qt: To run the fcitx unikey macro editor')
+makedepends=('cmake' 'intltool' 'qt')
+source=(http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz)
+install='fcitx-unikey.install'
+
+build(){
+    cd "$srcdir/${pkgname}-${pkgver}"
+    rm -rf build
+    mkdir build
+    cd build
+    
+    cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Release ..
+    make
+}
+
+package ()
+{
+    cd "$srcdir/${pkgname}-${pkgver}/build"
+    make DESTDIR="${pkgdir}" install
+}
+md5sums=('91dc7bd6991df3c975a0b51a246836bf')
diff --git a/community/fcitx-unikey/fcitx-unikey.install b/community/fcitx-unikey/fcitx-unikey.install
new file mode 100644
index 000000000..c0797237a
--- /dev/null
+++ b/community/fcitx-unikey/fcitx-unikey.install
@@ -0,0 +1,11 @@
+post_install() {
+    xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+    post_install
+}
+
+post_remove() {
+    post_install
+}
diff --git a/community/gnome-menus2/PKGBUILD b/community/gnome-menus2/PKGBUILD
new file mode 100644
index 000000000..0744e080d
--- /dev/null
+++ b/community/gnome-menus2/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 80041 2012-11-15 18:34:49Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+# Contributor: Jan de Groot <jan@archlinux.org>
+
+pkgname=gnome-menus2
+_pkgname=gnome-menus
+pkgver=3.0.1
+pkgrel=2
+pkgdesc="Library for the Desktop Menu Specification (legacy version)"
+arch=('i686' 'x86_64')
+depends=('glib2' 'python2')
+makedepends=('intltool' 'gobject-introspection')
+options=('!libtool')
+license=('LGPL')
+url="http://www.gnome.org/"
+source=(http://ftp.gnome.org/pub/gnome/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.bz2)
+sha256sums=('579c119c26f37781f66708e867ea45b3c37589b3b69e5b32d33e9bdb944165f0')
+
+build() {
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+              --disable-static \
+              PYTHON=/usr/bin/python2
+  make
+}
+
+package(){
+  cd "$srcdir/$_pkgname-$pkgver"
+
+  make -C libmenu DESTDIR="$pkgdir" install
+  make -C python DESTDIR="$pkgdir" install
+}
diff --git a/community/gtk-engine-unico/PKGBUILD b/community/gtk-engine-unico/PKGBUILD
index 41cf27d09..23412fb48 100644
--- a/community/gtk-engine-unico/PKGBUILD
+++ b/community/gtk-engine-unico/PKGBUILD
@@ -1,19 +1,19 @@
-# $Id: PKGBUILD 79137 2012-10-31 01:06:06Z heftig $
+# $Id: PKGBUILD 79966 2012-11-15 05:43:40Z bpiotrowski $
 # Maintainer:  Bartlomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Hilinus <itahilinus[at]hotmail[dot]it>
 
 pkgname=gtk-engine-unico
 pkgver=1.0.2
 pkgrel=3
-pkgdesc="Unico GTK3 theme engine"
+pkgdesc='Unico GTK3 theme engine'
 arch=('i686' 'x86_64')
-url="https://launchpad.net/unico"
+url='https://launchpad.net/unico'
 license=('GPL')
-depends=("gtk3")
-makedepends=("gnome-common")
+depends=('gtk3')
+makedepends=('gnome-common')
 options=(!libtool)
-source=(gtk-engine-unico-139.tar.gz::http://bazaar.launchpad.net/~unico-team/unico/trunk/tarball/139)
-md5sums=('01a8fcde727bbbdfcbd1572f118d1616')
+source=(ftp://ftp.archlinux.org/other/community/$pkgname/$pkgname-139.tar.xz)
+md5sums=('a451cf9e3d6b092a2fbeb424d0436dd3')
 
 build() {
   cd "~unico-team/unico/trunk"
diff --git a/community/libfm/PKGBUILD b/community/libfm/PKGBUILD
index 3046d605d..d6f1237d9 100644
--- a/community/libfm/PKGBUILD
+++ b/community/libfm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 79276 2012-11-02 10:03:48Z bpiotrowski $
+# $Id: PKGBUILD 80049 2012-11-15 19:06:07Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: Unknown47 <unknown47r@gmail.com>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
@@ -6,9 +6,9 @@
 
 pkgname=libfm
 pkgver=1.1.0
-pkgrel=2
-pkgdesc="A library for file management"
-url="http://pcmanfm.sourceforge.net/"
+pkgrel=3
+pkgdesc='Library for file management'
+url='http://pcmanfm.sourceforge.net/'
 arch=('i686' 'x86_64')
 license=('GPL')
 groups=('lxde')
diff --git a/community/luasql/PKGBUILD b/community/luasql/PKGBUILD
new file mode 100644
index 000000000..54aff4c20
--- /dev/null
+++ b/community/luasql/PKGBUILD
@@ -0,0 +1,22 @@
+# $Id: PKGBUILD 61380 2011-12-29 16:34:45Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Anders Bergh <anders1@gmail.com>
+
+pkgname=luasql-mysql
+pkgver=2.2.0
+pkgrel=1
+pkgdesc="MySQL module for Lua"
+arch=('i686' 'x86_64')
+url="http://www.keplerproject.org/luasql/"
+license=('MIT')
+depends=('lua' 'libmysqlclient')
+source=(https://github.com/downloads/keplerproject/luasql/luasql-$pkgver.tar.gz)
+md5sums=('59d72db444c6369c936d4f03694db6b7')
+
+build() {
+  cd "$srcdir/luasql-$pkgver"
+  make T=mysql PREFIX=/usr DRIVER_LIBS="$(mysql_config --libs)" \
+	DRIVER_INCS="$(mysql_config --include) -fPIC"
+  install -Dm644 src/mysql.so $pkgdir/usr/lib/lua/5.1/luasql/mysql.so
+  install -Dm644 doc/us/license.html $pkgdir/usr/share/licenses/$pkgname/license.html
+}
diff --git a/community/lxc/PKGBUILD b/community/lxc/PKGBUILD
index fa045d9a2..d891e2d6d 100644
--- a/community/lxc/PKGBUILD
+++ b/community/lxc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 79773 2012-11-12 09:05:42Z spupykin $
+# $Id: PKGBUILD 80003 2012-11-15 11:55:57Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andrea Zucchelli <zukka77@gmail.com>
 # Contributor: Jonathan Liu <net147@gmail.com>
@@ -6,7 +6,8 @@
 
 pkgname=lxc
 pkgver=0.8.0
-pkgrel=1
+epoch=1
+pkgrel=2
 pkgdesc="Linux Containers"
 arch=('i686' 'x86_64')
 url="http://lxc.sourceforge.net/"
diff --git a/community/lxlauncher/PKGBUILD b/community/lxlauncher/PKGBUILD
index 743a83d99..a3db8405c 100644
--- a/community/lxlauncher/PKGBUILD
+++ b/community/lxlauncher/PKGBUILD
@@ -1,27 +1,28 @@
-#$Id: PKGBUILD 52832 2011-07-28 23:39:16Z angvp $
-# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> 
-# Maintainer: Geoffroy Carrier <geoffroy.carrier@koon.fr>
+# $Id: PKGBUILD 80054 2012-11-15 19:13:49Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> 
+# Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
+
 pkgname=lxlauncher
 pkgver=0.2.2
-pkgrel=1
-pkgdesc="Launcher for Asus EeePC (part of LXDE)"
+pkgrel=2
+pkgdesc='Open source clone of the Asus launcher for EeePC'
 arch=('i686' 'x86_64')
 license=('GPL2')
-url="http://lxde.org/"
+url='http://lxde.org/'
 groups=('lxde')
 depends=('gtk2' 'startup-notification' 'gnome-menus' 'menu-cache' 'intltool')
 makedepends=('pkgconfig')
-source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz)
+source=(http://downloads.sourceforge.net/sourceforge/lxde/$pkgname-$pkgver.tar.gz)
 md5sums=('16df627447838b170a72cc3a9ee21497')
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
-    autoreconf  
-    ./configure --sysconfdir=/etc --prefix=/usr 
-	make 
+  cd $srcdir/$pkgname-$pkgver
+  ./configure --sysconfdir=/etc --prefix=/usr 
+  make 
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install 
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install 
 }
diff --git a/community/lxpanel/PKGBUILD b/community/lxpanel/PKGBUILD
index 47eccccde..0f67e0bd8 100644
--- a/community/lxpanel/PKGBUILD
+++ b/community/lxpanel/PKGBUILD
@@ -1,30 +1,30 @@
-# $Id: PKGBUILD 72336 2012-06-12 05:13:20Z bpiotrowski $
-# Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
+# $Id: PKGBUILD 80057 2012-11-15 19:23:02Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 
 pkgname=lxpanel
 pkgver=0.5.10
-pkgrel=1
-pkgdesc="Panel of the LXDE Desktop"
+pkgrel=2
+pkgdesc='Lightweight X11 desktop panel for LXDE'
 arch=('i686' 'x86_64')
 license=('GPL2')
-url="http://lxde.org/"
+url='http://lxde.org/'
 groups=('lxde')
 depends=('gtk2' 'alsa-lib' 'menu-cache' 'lxmenu-data' 'libwnck')
 makedepends=('wireless_tools')
 optdepends=('wireless_tools: netstat plugin')
-source=(http://ftp.de.debian.org/debian/pool/main/l/$pkgname/${pkgname}_${pkgver}.orig.tar.xz)
-md5sums=('86a87723ec15274d4c0fe191e8a2fa52')
+source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz)
+md5sums=('1bf3cce2a2d01c211f6897c42e8dd0bc')
 
 build() {
-	cd "$srcdir/$pkgname-$pkgver"
+  cd $srcdir/$pkgname-$pkgver
 
-	CFLAGS+=" -lgmodule-2.0" ./configure --sysconfdir=/etc --prefix=/usr 
-	make
+  CFLAGS+=' -lgmodule-2.0' ./configure --sysconfdir=/etc --prefix=/usr 
+  make
 }
 
 package() {
-	cd "$srcdir/$pkgname-$pkgver"
-	make DESTDIR="$pkgdir" install
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
 }
diff --git a/community/mediaproxy/PKGBUILD b/community/mediaproxy/PKGBUILD
index 907cb531f..5c278c044 100644
--- a/community/mediaproxy/PKGBUILD
+++ b/community/mediaproxy/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 78383 2012-10-17 15:54:17Z spupykin $
+# $Id: PKGBUILD 80024 2012-11-15 14:41:33Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Colin Pitrat <colin.pitrat@gmail.com>
 
 pkgname=mediaproxy
 pkgver=2.5.2
-pkgrel=3
+pkgrel=4
 pkgdesc="Open-source media proxy for OpenSER"
 url="http://mediaproxy.ag-projects.com/"
 arch=('i686' 'x86_64')
@@ -25,8 +25,12 @@ md5sums=('840de8f52e656991be728c15ec30bb5e'
 
 build() {
   cd $srcdir/mediaproxy-$pkgver
-  install -D -m0755 $srcdir/mediaproxy.init $pkgdir/etc/rc.d/mediaproxy
+
+  sed -i "s|libraries = get_link_libraries(),|libraries = ['netfilter_conntrack', 'ip4tc'],|g" setup.py
+
   python2 setup.py install --root=$pkgdir
+
+  install -D -m0755 $srcdir/mediaproxy.init $pkgdir/etc/rc.d/mediaproxy
   install -Dm0644 $srcdir/$pkgname-dispatcher.service $pkgdir/usr/lib/systemd/system/$pkgname-dispatcher.service
   install -Dm0644 $srcdir/$pkgname-relay.service $pkgdir/usr/lib/systemd/system/$pkgname-relay.service
   install -Dm0644 $srcdir/$pkgname.tmpfiles $pkgdir/usr/lib/tmpfiles.d/$pkgname.conf
diff --git a/community/menu-cache/PKGBUILD b/community/menu-cache/PKGBUILD
index 9de781b25..bf77c8e12 100644
--- a/community/menu-cache/PKGBUILD
+++ b/community/menu-cache/PKGBUILD
@@ -1,30 +1,36 @@
-# $Id: PKGBUILD 71029 2012-05-22 05:52:34Z bpiotrowski $
+# $Id: PKGBUILD 80045 2012-11-15 18:59:35Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Juergen Hoetzel <juergen@archlinux.org>
 
 pkgname=menu-cache
-pkgver=0.3.3
+pkgver=0.4.0
 pkgrel=1
 pkgdesc='Caching mechanism for freedesktop.org compliant menus'
 arch=('i686' 'x86_64')
 license=('GPL2')
-url="http://lxde.org/"
+url='http://lxde.org/'
 groups=('lxde')
 depends=('intltool' 'glib2')
 options=('!libtool')
 makedepends=('pkgconfig')
-source=(http://downloads.sourceforge.net/lxde/${pkgname}-${pkgver}.tar.gz)
-md5sums=('a14b0b162cd64d56c16bf6af16f3a47f')
+source=(http://downloads.sourceforge.net/lxde/$pkgname-$pkgver.tar.gz
+        menu-cache-gen.h)
+md5sums=('c63029a6c65e370ed5d9409f30265950'
+         '4edc9545b9640ee7698324d3f9683dc7')
 
 build() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure --prefix=/usr --sysconfdir=/etc \
-	  --libexecdir=/usr/lib/menu-cache --disable-static
-	make
+  cd $srcdir/$pkgname-$pkgver
+
+  install -m644 $srcdir/menu-cache-gen.h menu-cache-gen/
+
+  ./configure --prefix=/usr --sysconfdir=/etc \
+              --libexecdir=/usr/lib/menu-cache \
+              --disable-static
+  make
 }
 
 package() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	make DESTDIR="${pkgdir}" install
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
 }
diff --git a/community/menu-cache/menu-cache-gen.h b/community/menu-cache/menu-cache-gen.h
new file mode 100644
index 000000000..7d9be4207
--- /dev/null
+++ b/community/menu-cache/menu-cache-gen.h
@@ -0,0 +1,8 @@
+#ifndef __MENU_CACHE_GEN_H__
+#define __MENU_CACHE_GEN_H__ 1
+G_BEGIN_DECLS
+
+guint32 menu_cache_get_de_flag (const char* de_name);
+
+G_END_DECLS
+#endif
+\ No newline at end of file
diff --git a/community/ncmpcpp/PKGBUILD b/community/ncmpcpp/PKGBUILD
index 167e0160c..47ff37d8e 100644
--- a/community/ncmpcpp/PKGBUILD
+++ b/community/ncmpcpp/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 74221 2012-07-23 03:07:58Z allan $
+# $Id: PKGBUILD 79964 2012-11-15 05:43:00Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski
 # Contributor:  Mateusz Herych <heniekk@gmail.com>
 # Contributor: Army <uli[dot]armbruster[at]gmail[dot]com>
@@ -6,17 +6,17 @@
 pkgname=ncmpcpp
 pkgver=0.5.10
 pkgrel=2
-pkgdesc="An almost exact clone of ncmpc with some new features."
+pkgdesc='Almost exact clone of ncmpc with some new features'
 arch=('i686' 'x86_64')
-url="http://unkart.ovh.org/ncmpcpp/"
+url='http://ncmpcpp.rybczak.net/'
 license=('GPL')
 depends=('curl' 'libmpdclient' 'taglib' 'ncurses')
 install=ncmpcpp.install
-source=(http://unkart.ovh.org/ncmpcpp/${pkgname}-${pkgver}.tar.bz2)
+source=(http://ncmpcpp.rybczak.net/stable/$pkgname-$pkgver.tar.bz2)
 md5sums=('298ed66325bcfe358e37e186c7ea4861')
 
 build() {
-  cd "$srcdir/${pkgname}-${pkgver}"
+  cd $srcdir/$pkgname-$pkgver
   ./configure --prefix=/usr    \
               --enable-unicode \
               --enable-clock   \
@@ -27,7 +27,6 @@ build() {
 }
 
 package() {
-  cd "$srcdir/${pkgname}-${pkgver}"
-
-  make DESTDIR="$pkgdir" install
+  cd $srcdir/$pkgname-$pkgver
+  make DESTDIR=$pkgdir install
 }
diff --git a/community/pdns-recursor/PKGBUILD b/community/pdns-recursor/PKGBUILD
index 4953c40fe..f404607e9 100644
--- a/community/pdns-recursor/PKGBUILD
+++ b/community/pdns-recursor/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 79612 2012-11-08 22:16:52Z arodseth $
+# $Id: PKGBUILD 80083 2012-11-15 22:19:08Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=pdns-recursor
 pkgver=3.3
-pkgrel=3
+pkgrel=4
 pkgdesc='PowerDNS recursor'
 url='http://www.powerdns.com'
 license=('GPL')
 arch=('x86_64' 'i686')
-depends=('gcc-libs' 'lua')
+depends=('gcc-libs') # 'lua')
 makedepends=('boost')
 backup=('etc/powerdns/recursor.conf')
 source=("http://downloads.powerdns.com/releases/$pkgname-$pkgver.tar.bz2"
@@ -22,7 +22,9 @@ sha256sums=('7b62d97f2bb02bb0ba366dabb5e504338b949a572b9062ec2198012fc3b525bc'
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  LUA=1 LUA_CPPFLAGS_CONFIG= LUA_LIBS_CONFIG=-llua make
+  # Disabled Lua while waiting for upstream support for lua 5.2
+  #LUA=1 LUA_CPPFLAGS_CONFIG= LUA_LIBS_CONFIG=-llua make
+  LUA=0 make
 }
 
 package() {
diff --git a/community/polipo/PKGBUILD b/community/polipo/PKGBUILD
index 82746a2ca..19a681a81 100644
--- a/community/polipo/PKGBUILD
+++ b/community/polipo/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 75176 2012-08-14 19:38:14Z ttopper $
+# $Id: PKGBUILD 80058 2012-11-15 19:30:39Z ttoepper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor: Jelle van der Waa <jelle vdwaa nl>
 # Contributor: Thomas Holmquist <thomas@vorget.com>
@@ -7,7 +7,7 @@
 
 pkgname=polipo
 pkgver=1.0.4.1
-pkgrel=7
+pkgrel=8
 pkgdesc="A small and fast caching web proxy."
 arch=('i686' 'x86_64')
 url="http://www.pps.jussieu.fr/~jch/software/polipo/"
@@ -16,12 +16,11 @@ depends=('bash')
 makedepends=('texinfo')
 install=polipo.install
 source=("http://freehaven.net/~chrisd/polipo/polipo-$pkgver.tar.gz"
-        "polipo.cron" "polipo.rc.d" "polipo.conf.d" "polipo.service")
+        "polipo.rc.d" "polipo.conf.d" "polipo.service")
 md5sums=('bfc5c85289519658280e093a270d6703'
-         'bac0e1a871964c931eb5f7a369b3243c'
          '7406aad26807fb3a4e5f7b01ecb97a59'
          '685aa0c6070dee11c701932d23afcc6a'
-         'e96b164de3488afc7ab28b2edbe90fd1')
+         'a7cf48637a8ec8fe8d88754c399380c0')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -34,9 +33,9 @@ package() {
   make 	PREFIX="$pkgdir/usr" \
         MANDIR="$pkgdir/usr/share/man" \
         INFODIR="$pkgdir/usr/share/info" \
-	LOCAL_ROOT="$pkgdir/usr/share/polipo/www" \
-	DISK_CACHE_ROOT="$pkgdir/var/cache/polipo" \
-  install 
+        LOCAL_ROOT="$pkgdir/usr/share/polipo/www" \
+        DISK_CACHE_ROOT="$pkgdir/var/cache/polipo" \
+        install 
 
 
   # install config files
@@ -48,7 +47,6 @@ package() {
 
   # install daemon scripts / cron
   install -Dm 755  $srcdir/polipo.rc.d $pkgdir/etc/rc.d/polipo
-  install -Dm 755  $srcdir/polipo.cron $pkgdir/usr/share/polipo/polipo.cron
   install -Dm 644  $srcdir/polipo.service $pkgdir/usr/lib/systemd/system/polipo.service
   install -Dm 644  $srcdir/polipo.conf.d $pkgdir/etc/conf.d/polipo.conf
 }
diff --git a/community/python-matplotlib/PKGBUILD b/community/python-matplotlib/PKGBUILD
index 8f6b37ea6..7e90764c9 100644
--- a/community/python-matplotlib/PKGBUILD
+++ b/community/python-matplotlib/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 79647 2012-11-10 00:59:34Z stephane $
+# $Id: PKGBUILD 80031 2012-11-15 15:02:41Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
@@ -7,12 +7,11 @@
 pkgbase=python-matplotlib
 pkgname=('python2-matplotlib' 'python-matplotlib')
 pkgver=1.2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="A python plotting library, making publication quality plots"
 arch=('i686' 'x86_64')
 url="http://matplotlib.sourceforge.net/"
 license=('custom')
-backup=(usr/lib/python2.7/site-packages/matplotlib/mpl-data/matplotlibrc)
 makedepends=('python2-pytz' 'python2-numpy' 'python2-pyqt'
              'python-pytz' 'python-numpy' 'pyqt')
 source=("https://github.com/downloads/matplotlib/matplotlib/matplotlib-${pkgver}.tar.gz"
diff --git a/community/ripperx/PKGBUILD b/community/ripperx/PKGBUILD
index ca5a1e3cf..2c9b0cfa8 100644
--- a/community/ripperx/PKGBUILD
+++ b/community/ripperx/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 65503 2012-02-21 06:43:37Z spupykin $
+# $Id: PKGBUILD 80016 2012-11-15 13:29:30Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: dorphell <dorphell@archlinux.org>
 
 pkgname=ripperx
 pkgver=2.7.3
-pkgrel=2
+pkgrel=3
 pkgdesc="GTK program to rip and encode mp3 files"
 arch=(i686 x86_64)
 url="http://ripperx.sourceforge.net/"
@@ -16,6 +16,13 @@ md5sums=('f07c55edf08a1cd57537f1b9379b4e4d')
 build() {
   cd $srcdir/ripperX-$pkgver
   LDFLAGS=-lm ./configure --prefix=/usr
+  sed -i 's|Icon=.*|Icon=ripperX.xpm|g' ripperX.desktop
   make
+}
+
+package() {
+  cd $srcdir/ripperX-$pkgver
   make DESTDIR=$pkgdir install
+  install -Dm0644 ripperX.desktop $pkgdir/usr/share/applications/ripperX.desktop
+  install -Dm0644 ripperX.xpm $pkgdir/usr/share/icons/ripperX.xpm
 }
diff --git a/community/sshguard/PKGBUILD b/community/sshguard/PKGBUILD
index e930bb220..ef71cd6d2 100644
--- a/community/sshguard/PKGBUILD
+++ b/community/sshguard/PKGBUILD
@@ -1,12 +1,11 @@
-# $Id: PKGBUILD 78777 2012-10-24 13:36:34Z mtorromeo $
+# $Id: PKGBUILD 79972 2012-11-15 09:06:26Z mtorromeo $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
-# Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=sshguard
 pkgver=1.5
-pkgrel=7
-pkgdesc="brute force detector for SSH, Exim, VSFTPD and more. Blocks by ip with iptables"
+pkgrel=8
+pkgdesc="Brute force detector for SSH, Exim, VSFTPD and more. Blocks by ip with iptables"
 arch=('i686' 'x86_64')
 #url="http://sourceforge.net/projects/sshguard/"
 url="http://www.sshguard.net/"
@@ -23,7 +22,7 @@ sha256sums=('b537f8765455fdf8424f87d4bd695e5b675b88e5d164865452137947093e7e19'
             'a810da878e40be8616a93c9984e7dbd3700367d665b78b8aa2498228bb33cb6e'
             '66f28e2cc81e5686f8fd5c0d5a5015d7feecbe018a259f4032cfbacf6fe8d1c3'
             '12e576713f7ed9c87cc36417fd8bb8dd613b9d27f06cae9dd0a1aae9ca65acd7'
-            'b1ebc5dd10374a790c7d06419694143bffa019a7c65c8a7b2541487aecec574d')
+            '9491c4cd23d789dd04af551e16dc123f1517ca02ad3539f25715bbeec70ee21e')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/sshguard/sshguard-journalctl b/community/sshguard/sshguard-journalctl
index c919b4434..13afd6f33 100644
--- a/community/sshguard/sshguard-journalctl
+++ b/community/sshguard/sshguard-journalctl
@@ -1,2 +1,2 @@
 #!/bin/sh
-/usr/bin/journalctl -afbp info -n0 SYSLOG_FACILITY=4 SYSLOG_FACILITY=10 | /usr/sbin/sshguard -l- "$@"
+/usr/bin/journalctl -afbp info -n1 SYSLOG_FACILITY=4 SYSLOG_FACILITY=10 | /usr/sbin/sshguard -l- "$@"
diff --git a/community/usb_modeswitch/PKGBUILD b/community/usb_modeswitch/PKGBUILD
index 3458739e9..606b24cb6 100644
--- a/community/usb_modeswitch/PKGBUILD
+++ b/community/usb_modeswitch/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 75530 2012-08-26 20:12:19Z spupykin $
+# $Id: PKGBUILD 80001 2012-11-15 11:55:13Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=usb_modeswitch
-pkgver=1.2.4
+pkgver=1.2.5
 pkgrel=1
-_pkgdata=20120815
+_pkgdata=20121109
 pkgdesc="Activating switchable USB devices on Linux."
 arch=('i686' 'x86_64')
 url="http://www.draisberghof.de/usb_modeswitch/"
@@ -15,9 +15,9 @@ backup=("etc/$pkgname.conf")
 source=("http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-${pkgver}.tar.bz2"
 	"http://www.draisberghof.de/usb_modeswitch/usb-modeswitch-data-${_pkgdata}.tar.bz2"
 	"usb-modeswitch-${pkgver}-device_reference.txt::http://www.draisberghof.de/usb_modeswitch/device_reference.txt")
-md5sums=('dbd4ce7966d7b4a5a0604a8280f7164d'
-         '12d7de3210e45ad6f48791d12bbdbf61'
-         '3588e76bf08f6c9ed51a1de4d086795e')
+md5sums=('c393603908eceab95444c5bde790f6f0'
+         'a7d23a03157871013a0d708ab2b1b6df'
+         '9918bbdc0f68873410688604c80d25c4')
 
 build() {
   cd $srcdir/usb-modeswitch-$pkgver/
diff --git a/community/wings3d/PKGBUILD b/community/wings3d/PKGBUILD
index 3fa7ea7a3..6f3bdb0d2 100644
--- a/community/wings3d/PKGBUILD
+++ b/community/wings3d/PKGBUILD
@@ -1,28 +1,27 @@
-# $Id: PKGBUILD 61589 2012-01-03 23:37:49Z arodseth $
+# $Id: PKGBUILD 80086 2012-11-15 22:26:35Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: kappa <kappacurve@gmail.com>
 
 pkgname=wings3d
 _pkgname=wings
 pkgver=1.4.1
-pkgrel=8
-pkgdesc="3D modeling program"
+pkgrel=9
+pkgdesc='3D modeling program'
 arch=('x86_64' 'i686')
-url="http://www.wings3d.com/"
+url='http://www.wings3d.com/'
 license=('GPL')
-depends=('esdl' 'bash' 'desktop-file-utils' 'cl')
+depends=('erlang-sdl' 'erlang-cl' 'bash' 'desktop-file-utils')
 makedepends=('setconf' 'gendesk')
 optdepends=('povray: rendering support via POV-Ray')
-replaces=('wings' 'wings-devel')
 install=$pkgname.install
-source=("$pkgname-$pkgver.tar.gz::https://nodeload.github.com/dgud/wings/tarball/dgud/r15b-driver-compat"
+source=("$pkgname-$pkgver.tar.gz::https://nodeload.github.com/dgud/wings/tar.gz/dgud/r15b-driver-compat"
         "$pkgname.sh"
         "$pkgname.png::http://img299.imageshack.us/img299/2538/wingsiconblackshiningew5.png")
-sha256sums=('cbe917601b31b7d469c2f9ed0de1b016be86f14f9e757860990d9489a84585dd'
+sha256sums=('b89aca41937d4d07424ccc0447eb5a6c3755350428201d7d7644e467dcd20fdf'
             '46513cd05f8b6e778120af4a87b239c5250799c17b591592893d98cbf082359e'
             '6658977cc3bc8db2c9358edf3a2d6cb6bb8084c9a1d96ca573a83dd4e8781f1a')
 _genericname=('3D Modeler')
-_dirname='dgud-wings-4f3a3ff'
+_dirname="$_pkgname-dgud-r15b-driver-compat"
 
 build() {
   cd "$srcdir"
diff --git a/core/binutils/PKGBUILD b/core/binutils/PKGBUILD
index 15e6d444d..a4d28398e 100644
--- a/core/binutils/PKGBUILD
+++ b/core/binutils/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 169770 2012-10-28 11:11:44Z allan $
+# $Id: PKGBUILD 171025 2012-11-15 12:26:41Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
 
 pkgname=binutils
-pkgver=2.23
+pkgver=2.23.1
 pkgrel=1
 pkgdesc="A set of programs to assemble and manipulate binary and object files"
 arch=('i686' 'x86_64')
@@ -15,9 +15,9 @@ depends=('glibc>=2.16' 'zlib')
 checkdepends=('dejagnu' 'bc')
 options=('!libtool' '!distcc' '!ccache')
 install=binutils.install
-source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.gz{,.sig})
-md5sums=('ed58f50d8920c3f1d9cb110d5c972c27'
-         '5293d43d444852f71f7c96c6295ba66d')
+source=(ftp://ftp.gnu.org/gnu/binutils/binutils-${pkgver}.tar.bz2{,.sig})
+md5sums=('33adb18c3048d057ac58d07a3f1adb38'
+         '1869b37216e7d7eff7e335a69e0882fd')
 
 build() {
   cd ${srcdir}
@@ -76,6 +76,9 @@ package() {
   # Remove Windows/Novell specific man pages
   rm ${pkgdir}/usr/share/man/man1/{dlltool,nlmconv,windres,windmc}*
 
+  # why are these distributed with binutils?
+  rm ${pkgdir}/usr/share/info/{configure,standards}.info
+
   # Remove these symlinks, they are not ABI stable.
   # Programs should compile static to the .a file.
   rm ${pkgdir}/usr/lib/lib{bfd,opcodes}.so
diff --git a/core/binutils/binutils.install b/core/binutils/binutils.install
index 8bf9f3a47..9de0533ee 100644
--- a/core/binutils/binutils.install
+++ b/core/binutils/binutils.install
@@ -1,5 +1,5 @@
 infodir=usr/share/info
-filelist=(as.info bfd.info binutils.info configure.info gprof.info ld.info standards.info)
+filelist=(as.info bfd.info binutils.info gprof.info ld.info)
 
 post_upgrade() {
   [ -x usr/bin/install-info ] || return 0
diff --git a/core/rfkill/PKGBUILD b/core/rfkill/PKGBUILD
index bf87f9627..8cdc5726d 100644
--- a/core/rfkill/PKGBUILD
+++ b/core/rfkill/PKGBUILD
@@ -1,23 +1,25 @@
-# $Id: PKGBUILD 165479 2012-08-20 14:46:54Z bisson $
+# $Id: PKGBUILD 171055 2012-11-16 01:20:16Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Thomas Bächler <thomas@archlinux.org>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=rfkill
 pkgver=0.4
-pkgrel=5
+pkgrel=6
 pkgdesc='Tool for enabling and disabling wireless devices'
 url='http://linuxwireless.org/en/users/Documentation/rfkill'
 license=('custom')
 arch=('i686' 'x86_64')
 source=("http://wireless.kernel.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+        'service.unblock'
+        'service.block'
         'rules.d'
-        'service'
         'conf.d'
         'rc.d')
 sha1sums=('fccabf5a272ac2891f24dc35449dc6f4c45ff44b'
+          '8b4f0effcad564e929cf65c50773881d1209e54b'
+          '10febfa26656bc395aeca477d4d44a1e0482375c'
           '6390eaa793b473098aaa11b13c5254d611a4c13a'
-          'cadc563f967c5ac680e7cdfd764718b412201f8a'
           'd969fe927a9fb2926af43a311a7c1fa126fe59a9'
           '380af0b002f51543557306ed68a27f0059fd5a6f')
 
@@ -33,7 +35,8 @@ package() {
 	make DESTDIR="${pkgdir}" install
 	install -Dm644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 	install -Dm644 ../rules.d "${pkgdir}/usr/lib/udev/rules.d/60-rfkill.rules"
-	install -Dm644 ../service "${pkgdir}/usr/lib/systemd/system/rfkill.service"
+	install -Dm644 ../service.block "${pkgdir}/usr/lib/systemd/system/rfkill-block@.service"
+	install -Dm644 ../service.unblock "${pkgdir}/usr/lib/systemd/system/rfkill-unblock@.service"
 	install -Dm644 ../conf.d "${pkgdir}/etc/conf.d/rfkill"
 	install -Dm755 ../rc.d "${pkgdir}/etc/rc.d/rfkill"
 }
diff --git a/core/rfkill/service.block b/core/rfkill/service.block
new file mode 100644
index 000000000..443c62526
--- /dev/null
+++ b/core/rfkill/service.block
@@ -0,0 +1,11 @@
+[Unit]
+Description=RFKill-Block %I
+After=rfkill-unblock@all.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/sbin/rfkill block %I
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/core/rfkill/service.unblock b/core/rfkill/service.unblock
new file mode 100644
index 000000000..fb8776653
--- /dev/null
+++ b/core/rfkill/service.unblock
@@ -0,0 +1,11 @@
+[Unit]
+Description=RFKill-Unblock %I
+After=rfkill-block@all.service
+
+[Service]
+Type=oneshot
+ExecStart=/usr/sbin/rfkill unblock %I
+RemainAfterExit=yes
+
+[Install]
+WantedBy=multi-user.target
diff --git a/extra/baobab/PKGBUILD b/extra/baobab/PKGBUILD
index 7572dd9ec..01a39bed9 100644
--- a/extra/baobab/PKGBUILD
+++ b/extra/baobab/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 169850 2012-10-30 22:24:03Z heftig $
+# $Id: PKGBUILD 171029 2012-11-15 14:16:00Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=baobab
-pkgver=3.6.2
+pkgver=3.6.3
 pkgrel=1
 pkgdesc="A graphical directory tree analyzer"
 arch=(i686 x86_64)
@@ -13,7 +13,7 @@ makedepends=('intltool' 'itstool' 'vala' 'gobject-introspection')
 groups=('gnome-extra')
 install=$pkgname.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('8ffef397f11fb1e7105d1429be828e88b9ceb5746984f0bb978e66e87faf047a')
+sha256sums=('24ec516b12da234f1bd7bff3ccb2be9a46dff0b1fb0fa6cd79ff50549a295eb1')
 
 build() {
   cd "$pkgname-$pkgver"
@@ -24,6 +24,9 @@ build() {
 package() {
   cd "$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
+
+  # https://bugs.archlinux.org/task/31861
+  sed -i '/MimeType/d' "$pkgdir/usr/share/applications/baobab.desktop"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/extra/di/PKGBUILD b/extra/di/PKGBUILD
index 33ca6f2b3..284d613c1 100644
--- a/extra/di/PKGBUILD
+++ b/extra/di/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 169510 2012-10-22 19:36:13Z eric $
+# $Id: PKGBUILD 171054 2012-11-15 23:33:28Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=di
-pkgver=4.32
+pkgver=4.33
 pkgrel=1
 pkgdesc="A disk information utility, displaying everything (and more) that your df command does"
 arch=('i686' 'x86_64')
@@ -10,7 +10,7 @@ url="http://www.gentoo.com/di/"
 license=('ZLIB')
 depends=('glibc')
 source=(http://www.gentoo.com/di/${pkgname}-${pkgver}.tar.gz)
-sha1sums=('b819e877e1135f34f362ba2f72d1e694c1878249')
+sha1sums=('c6f754c3a93845deef7255682fbecd1882a3ddf2')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gdm/PKGBUILD b/extra/gdm/PKGBUILD
index 75feca3b0..4ca035881 100644
--- a/extra/gdm/PKGBUILD
+++ b/extra/gdm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 170142 2012-11-03 17:25:25Z heftig $
+# $Id: PKGBUILD 171020 2012-11-15 06:19:11Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gdm
-pkgver=3.6.1
-pkgrel=2
+pkgver=3.6.2
+pkgrel=1
 pkgdesc="Gnome Display Manager"
 arch=(i686 x86_64)
 license=(GPL)
@@ -14,14 +14,14 @@ backup=(etc/pam.d/gdm-autologin etc/pam.d/gdm-fingerprint etc/pam.d/gdm-launch-e
 groups=(gnome)
 options=('!libtool')
 depends=(libcanberra gnome-session gnome-settings-daemon metacity upower accountsservice systemd
-         xorg-xrdb nss polkit-gnome xorg-server)
+         xorg-xrdb nss polkit-gnome xorg-server gnome-icon-theme)
 makedepends=(itstool intltool gnome-doc-utils gobject-introspection)
 optdepends=('gnome-shell: new login interface'
             'fprintd: fingerprint authentication')
 install=gdm.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
         fix_external_program_directories.patch)
-sha256sums=('aff69dde55e11b540145002c95cf966cd16376910283b385520431ced10c5031'
+sha256sums=('fbf41bd68299eccdcf456c0869771999f75d3d9bf0f57ce1038db08b54e8cbb9'
             'a878680734e35c1d66252cbcfe678c3961b5ff0fa16302f8796a5e7e65ffe4a2')
 
 build() {
diff --git a/extra/gnome-bluetooth/PKGBUILD b/extra/gnome-bluetooth/PKGBUILD
index 52884e0d6..3a1bb3828 100644
--- a/extra/gnome-bluetooth/PKGBUILD
+++ b/extra/gnome-bluetooth/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 169888 2012-10-30 22:33:39Z heftig $
+# $Id: PKGBUILD 171034 2012-11-15 17:49:18Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
 
 pkgname=gnome-bluetooth
-pkgver=3.6.0
-pkgrel=2
+pkgver=3.6.1
+pkgrel=1
 pkgdesc="The GNOME Bluetooth Subsystem"
 arch=('i686' 'x86_64')
 url="http://live.gnome.org/GnomeBluetooth"
@@ -15,7 +15,7 @@ options=('!libtool' '!emptydirs')
 install=gnome-bluetooth.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
         61-gnome-bluetooth-rfkill.rules)
-sha256sums=('021d9711d76e6d195812b1804ff39b5936ce978c25f900bc92e4bffd7045d306'
+sha256sums=('71d72a4637916450987f69c71d374c5bc1102be6dd9d9d7f923aa924659f768a'
             '8dd2d3637f380a89e72f65e6c8021e994ccbdc645f1a1b1dbffe74ac9f061f53')
 
 build() {
diff --git a/extra/telepathy-idle/PKGBUILD b/extra/telepathy-idle/PKGBUILD
index 1c8ebc5be..11aa6e63c 100644
--- a/extra/telepathy-idle/PKGBUILD
+++ b/extra/telepathy-idle/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 165358 2012-08-16 11:39:38Z ibiru $
+# $Id: PKGBUILD 171036 2012-11-15 17:58:32Z ibiru $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Bjorn Lindeijer <bjorn lindeijer nl>
 # Contributor: Samuel Mendes <heka.lok@gmail.com>
 
 pkgname=telepathy-idle
-pkgver=0.1.12
+pkgver=0.1.13
 pkgrel=1
 pkgdesc="An IRC connection manager for Telepathy"
 arch=('i686' 'x86_64')
@@ -16,7 +16,7 @@ makedepends=('libxslt' 'python2')
 install=telepathy-idle.install
 options=(!makeflags)
 source=(http://telepathy.freedesktop.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
-md5sums=('e77e5b84cc8f77cf12d15727c30df366')
+md5sums=('a82a6f15bf12e21285e6a36256c2bde0')
 
 build() {
     cd $pkgname-$pkgver
diff --git a/kernels/linux-libre-lts-rt/PKGBUILD b/kernels/linux-libre-lts-rt/PKGBUILD
index daf2d1c16..976b2995c 100644
--- a/kernels/linux-libre-lts-rt/PKGBUILD
+++ b/kernels/linux-libre-lts-rt/PKGBUILD
@@ -11,12 +11,12 @@
 pkgbase=linux-libre-lts-rt  # Build stock -LIBRE-LTS-RT kernel
 #pkgbase=linux-libre-custom # Build kernel with a different name
 _basekernel=3.0
-_releasever=43
-_rtpatchver=rt65
+_releasever=51
+_rtpatchver=rt75
 _pkgver=${_basekernel}.${_releasever}
 pkgver=${_basekernel}.${_releasever}_${_rtpatchver}
 pkgrel=1
-_lxopkgver=${_basekernel}.43 # nearly always the same as pkgver
+_lxopkgver=${_basekernel}.50 # nearly always the same as pkgver
 arch=('i686' 'x86_64' 'mips64el')
 url="http://linux-libre.fsfla.org/"
 license=('GPL2')
@@ -35,10 +35,12 @@ source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/${_basekernel}-gn
         'change-default-console-loglevel.patch'
         'i915-fix-ghost-tv-output.patch'
         'ext4-options.patch'
+        'module-symbol-waiting-3.0.patch'
+        'module-init-wait-3.0.patch'
         "http://www.linux-libre.fsfla.org/pub/linux-libre/lemote/gnewsense/pool/debuginfo/linux-patches-${_lxopkgver}-gnu_0loongsonlibre_mipsel.tar.bz2")
 md5sums=('5f64180fe7df4e574dac5911b78f5067'
-         'c4b4e6d908e70fc6f991a1789a3ac620'
-         'bcca49907b1c1e74f6ff6afced5ff959'
+         'fb3c742b1f8b01131534a22348cfa712'
+         '904669e437a0bb19e95022964430ad4a'
          '7266f5e7af09cc6e4b15d7a952e3b350'
          '5387f0cf51652c071190789569adf9c7'
          '85f04a9555bdc295f7c387a6564f0c81'
@@ -47,8 +49,10 @@ md5sums=('5f64180fe7df4e574dac5911b78f5067'
          '04b21c79df0a952c22d681dd4f4562df'
          '9d3c56a4b999c8bfbd4018089a62f662'
          '263725f20c0b9eb9c353040792d644e5'
-         'c8299cf750a84e12d60b372c8ca7e1e8'
-         '2c4870ef22f87ef885f3be392d1aaa90')
+         'f36222e7ce20c8e4dc27376f9be60f6c'
+         '670931649c60fcb3ef2e0119ed532bd4'
+         '8a71abc4224f575008f974a099b5cf6f'
+         'e2cc9f33fb26b254b6b65f8981aebf13')
 if [ "$CARCH" != "mips64el" ]; then
     # Don't use the Loongson-specific patches on non-mips64el arches.
     unset source[${#source[@]}-1]
@@ -90,6 +94,11 @@ build() {
   # https://bugs.archlinux.org/task/28653
   patch -Np1 -i "${srcdir}/ext4-options.patch"
 
+  # fix module initialisation
+  # https://bugs.archlinux.org/task/32122
+  patch -Np1 -i "${srcdir}/module-symbol-waiting-3.0.patch"
+  patch -Np1 -i "${srcdir}/module-init-wait-3.0.patch"
+
   if [ "$CARCH" == "mips64el" ]; then
     sed -i "s|^EXTRAVERSION.*|EXTRAVERSION =-libre-lts-rt|" Makefile
     sed -r "s|^( SUBLEVEL = ).*|\1$_sublevel|" \
@@ -102,7 +111,7 @@ build() {
 # https://git.kernel.org/?p=linux/hotplug/udev.git;a=blob_plain;f=README
 # and make USB storage support builtin (e.g. for booting from USB
 # disks without slowly loading an initramfs)
-    sed -ri -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
+    sed -ri \
         -e "s|CONFIG_MIPS32_N32=.*|CONFIG_MIPS32_N32=y|g" \
         -e "s|CONFIG_UEVENT_HELPER_PATH=.*|CONFIG_UEVENT_HELPER_PATH=\"\"|g" \
         -e "s|CONFIG_LOCALVERSION=.*|CONFIG_LOCALVERSION=\"${_localversionname}\"|g" \
diff --git a/kernels/linux-libre-lts-rt/ext4-options.patch b/kernels/linux-libre-lts-rt/ext4-options.patch
index 812b05f04..ef1b2417d 100644
--- a/kernels/linux-libre-lts-rt/ext4-options.patch
+++ b/kernels/linux-libre-lts-rt/ext4-options.patch
@@ -46,4 +46,4 @@ index 502c61f..30de9cd 100644
 +#endif
  		default:
  			ext4_msg(sb, KERN_ERR,
- 			       "Unrecognized mount option \"%s\" "
-\ No newline at end of file
+ 			       "Unrecognized mount option \"%s\" "
diff --git a/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install b/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install
index d2f0ae05a..5f31cc3d4 100644
--- a/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install
+++ b/kernels/linux-libre-lts-rt/linux-libre-lts-rt.install
@@ -2,7 +2,7 @@
 # arg 2:  the old package version
 
 KERNEL_NAME=-lts-rt
-KERNEL_VERSION=3.0.43-1-rt65-LIBRE-LTS-RT
+KERNEL_VERSION=3.0.51-1-rt75-LIBRE-LTS-RT
 
 # set a sane PATH to ensure that critical utils like depmod will be found
 export PATH='/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin'
diff --git a/kernels/linux-libre-lts-rt/module-init-wait-3.0.patch b/kernels/linux-libre-lts-rt/module-init-wait-3.0.patch
new file mode 100644
index 000000000..1bcfd2491
--- /dev/null
+++ b/kernels/linux-libre-lts-rt/module-init-wait-3.0.patch
@@ -0,0 +1,77 @@
+From: Rusty Russell <rusty@rustcorp.com.au>
+Date: Fri, 28 Sep 2012 05:01:03 +0000 (+0930)
+Subject: module: wait when loading a module which is currently initializing.
+X-Git-Tag: v3.7-rc1~2^2~32
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=9bb9c3be568346538
+
+module: wait when loading a module which is currently initializing.
+
+The original module-init-tools module loader used a fnctl lock on the
+.ko file to avoid attempts to simultaneously load a module.
+Unfortunately, you can't get an exclusive fcntl lock on a read-only
+fd, making this not work for read-only mounted filesystems.
+module-init-tools has a hacky sleep-and-loop for this now.
+
+It's not that hard to wait in the kernel, and only return -EEXIST once
+the first module has finished loading (or continue loading the module
+if the first one failed to initialize for some reason).  It's also
+consistent with what we do for dependent modules which are still loading.
+
+Suggested-by: Lucas De Marchi <lucas.demarchi@profusion.mobi>
+Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
+---
+
+diff --git a/kernel/module.c b/kernel/module.c
+index 63cf6e7..74bc195 100644
+--- a/kernel/module.c
++++ b/kernel/module.c
+@@ -2845,6 +2845,20 @@ static int post_relocation(struct module *mod, const struct load_info *info)
+ 	return module_finalize(info->hdr, info->sechdrs, mod);
+ }
+ 
++/* Is this module of this name done loading?  No locks held. */
++static bool finished_loading(const char *name)
++{
++	struct module *mod;
++	bool ret;
++
++	mutex_lock(&module_mutex);
++	mod = find_module(name);
++	ret = !mod || mod->state != MODULE_STATE_COMING;
++	mutex_unlock(&module_mutex);
++
++	return ret;
++}
++
+ /* Allocate and load the module: note that size of section 0 is always
+    zero, and we rely on this for optional sections. */
+ static struct module *load_module(void __user *umod,
+@@ -2852,7 +2866,7 @@ static struct module *load_module(void __user *umod,
+ 				  const char __user *uargs)
+ {
+ 	struct load_info info = { NULL, };
+-	struct module *mod;
++	struct module *mod, *old;
+ 	long err;
+ 
+ 	pr_debug("load_module: umod=%p, len=%lu, uargs=%p\n",
+@@ -2918,8 +2932,18 @@ static struct module *load_module(void __user *umod,
+ 	 * function to insert in a way safe to concurrent readers.
+ 	 * The mutex protects against concurrent writers.
+ 	 */
++again:
+ 	mutex_lock(&module_mutex);
+-	if (find_module(mod->name)) {
++	if ((old = find_module(mod->name)) != NULL) {
++		if (old->state == MODULE_STATE_COMING) {
++			/* Wait in case it fails to load. */
++			mutex_unlock(&module_mutex);
++			err = wait_event_interruptible(module_wq,
++					       finished_loading(mod->name));
++			if (err)
++				goto free_arch_cleanup;
++			goto again;
++		}
+ 		err = -EEXIST;
+ 		goto unlock;
+ 	}
diff --git a/kernels/linux-libre-lts-rt/module-symbol-waiting-3.0.patch b/kernels/linux-libre-lts-rt/module-symbol-waiting-3.0.patch
new file mode 100644
index 000000000..b87a38ff5
--- /dev/null
+++ b/kernels/linux-libre-lts-rt/module-symbol-waiting-3.0.patch
@@ -0,0 +1,66 @@
+From: Rusty Russell <rusty@rustcorp.com.au>
+Date: Fri, 28 Sep 2012 05:01:03 +0000 (+0930)
+Subject: module: fix symbol waiting when module fails before init
+X-Git-Tag: v3.7-rc1~2^2~33
+X-Git-Url: http://git.kernel.org/?p=linux%2Fkernel%2Fgit%2Ftorvalds%2Flinux-2.6.git;a=commitdiff_plain;h=6f13909f4fe9652f1
+
+module: fix symbol waiting when module fails before init
+
+We use resolve_symbol_wait(), which blocks if the module containing
+the symbol is still loading.  However:
+
+1) The module_wq we use is only woken after calling the modules' init
+   function, but there are other failure paths after the module is
+   placed in the linked list where we need to do the same thing.
+
+2) wake_up() only wakes one waiter, and our waitqueue is shared by all
+   modules, so we need to wake them all.
+
+3) wake_up_all() doesn't imply a memory barrier: I feel happier calling
+   it after we've grabbed and dropped the module_mutex, not just after
+   the state assignment.
+
+Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
+---
+
+diff --git a/kernel/module.c b/kernel/module.c
+index 7f2ee45f..63cf6e7 100644
+--- a/kernel/module.c
++++ b/kernel/module.c
+@@ -2959,7 +2959,7 @@ static struct module *load_module(void __user *umod,
+ 	/* Unlink carefully: kallsyms could be walking list. */
+ 	list_del_rcu(&mod->list);
+ 	module_bug_cleanup(mod);
+-
++	wake_up_all(&module_wq);
+  ddebug:
+ 	dynamic_debug_remove(info.debug);
+  unlock:
+@@ -3034,7 +3034,7 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
+ 		blocking_notifier_call_chain(&module_notify_list,
+ 					     MODULE_STATE_GOING, mod);
+ 		free_module(mod);
+-		wake_up(&module_wq);
++		wake_up_all(&module_wq);
+ 		return ret;
+ 	}
+ 	if (ret > 0) {
+@@ -3046,9 +3046,8 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
+ 		dump_stack();
+ 	}
+ 
+-	/* Now it's a first class citizen!  Wake up anyone waiting for it. */
++	/* Now it's a first class citizen! */
+ 	mod->state = MODULE_STATE_LIVE;
+-	wake_up(&module_wq);
+ 	blocking_notifier_call_chain(&module_notify_list,
+ 				     MODULE_STATE_LIVE, mod);
+ 
+@@ -3071,6 +3070,7 @@ SYSCALL_DEFINE3(init_module, void __user *, umod,
+ 	mod->init_ro_size = 0;
+ 	mod->init_text_size = 0;
+ 	mutex_unlock(&module_mutex);
++	wake_up_all(&module_wq);
+ 
+ 	return 0;
+ }
diff --git a/libre/parabolaweb-utils/PKGBUILD b/libre/parabolaweb-utils/PKGBUILD
index e0b70ba1a..5fdd12bdb 100644
--- a/libre/parabolaweb-utils/PKGBUILD
+++ b/libre/parabolaweb-utils/PKGBUILD
@@ -8,7 +8,7 @@
 
 pkgname=parabolaweb-utils
 pkgver=`_get_pkgver`
-pkgrel=5
+pkgrel=8
 pkgdesc="Utils for the Parabola website"
 arch=('any')
 url="https://projects.parabolagnulinux.org/parabolaweb.git/"
@@ -17,13 +17,15 @@ depends=(
     'python2'      # duh
     'python2-flup' # for fcgi
     'postgresql'   # for database
-    'git'          # used in parabolaweb-update
-    'libretools'   # used in parabolaweb-update
+    'git'          # used in parabolaweb-download
+    'libretools'   # used in parabolaweb-{download,update} (libremessages)
     `_get_depends`)
 backup=('etc/conf.d/parabolaweb')
 
 export pkgver
 
+makedepends=(makepkg-git)
+
 source=(git://parabolagnulinux.org/parabolaweb.git
 	parabolaweb-download
 	parabolaweb-update
@@ -47,9 +49,9 @@ package() {
 }
 
 md5sums=('SKIP'
-         '01bed679a4fd768e720bfd0f3c7d6694'
-         'a73063b14746720b77fdbab851f5c161'
+         'f162c2ce49b4cafe0a14bd4767dfea04'
+         '7c212024c134fdd0d0318b52a5448ddb'
          'd5294495f42df29d29519ebd0a8f6093'
          'cc15e153f99fba82e7bb032896f655c2'
          'a468016a7155b5da46521dcfc6428384'
-         '9b565ef07e44d395bf7a0e484e3d19d1')
+         'ffd37a19b1a72fbac2c58504aa17b355')
diff --git a/libre/parabolaweb-utils/parabolaweb-download b/libre/parabolaweb-utils/parabolaweb-download
index 823a18811..e124295d4 100644
--- a/libre/parabolaweb-utils/parabolaweb-download
+++ b/libre/parabolaweb-utils/parabolaweb-download
@@ -4,8 +4,8 @@
 . /usr/bin/libremessages
 
 dir=$WEBDIR
-repo=git://parabolagnulinux.org/parabolaweb.git
-ref=master
+repo=$GITURL
+ref=$GITREF
 
 cd_safe() {
 	if ! cd "$1"; then
@@ -26,11 +26,11 @@ download_git() {
 	else
 		cd_safe "$dir"
 		# Make sure we are fetching the right repo
-		# if [[ "$repo" != "$(git config --get remote.origin.url)"  ]] ; then
-		# 	error "$(gettext "%s is not a clone of %s")" "$dir" "$repo"
-		# 	plain "$(gettext "Aborting...")"
-		# 	exit 1
-		# fi
+		if [[ "$repo" != "$(git config --get remote.origin.url)"  ]] ; then
+			error "$(gettext "%s is not a clone of %s")" "$dir" "$repo"
+			plain "$(gettext "Aborting...")"
+			exit 1
+		fi
 		msg2 "$(gettext "Updating %s %s repo...")" "${repo}" "git"
 		if ! git pull origin "$ref"; then
 			# only warn on failure to allow offline builds
diff --git a/libre/parabolaweb-utils/parabolaweb-update b/libre/parabolaweb-utils/parabolaweb-update
index 45e17c4f2..2da9eea8a 100644
--- a/libre/parabolaweb-utils/parabolaweb-update
+++ b/libre/parabolaweb-utils/parabolaweb-update
@@ -15,17 +15,18 @@ find_makefiles() {
 }
 
 clean() {
-	msg "Purging old .pyc files...."
 	cd "$WEBDIR"
+	msg "Purging old .pyc files..."
 	find . -name '*.pyc' -delete
+	msg "Purging old GNU Make generated files..."
 	for dir in `find_makefiles`; do
 		make -C "$WEBDIR/$dir" clean
 	done
 }
 
 configure() {
-	msg "Checking configuration...."
 	cd "$WEBDIR"
+	msg "Checking configuration..."
 	if [[ ! -f local_settings.py ]]; then
 		msg2 "Configuration file missing, opening editor..."
 		cp local_settings.py.example local_settings.tmp.$$.py
@@ -36,7 +37,7 @@ configure() {
 			msg "Failed to configure, exiting"
 			exit 1
 		fi
-		msg2 "Creating database...."
+		msg2 "Creating database..."
 		./manage.py syncdb
 	else
 		msg2 "Current configuration checks out"
@@ -44,11 +45,15 @@ configure() {
 }
 
 update-database() {
-	msg "Updating database...."
 	cd "$WEBDIR"
-	msg2 "Running migrations...."
+	msg "Updating database..."
+	msg2 "Running migrations..."
 	./manage.py migrate
-	msg2 "Loading fixtures...."
+	if [[ -f devel/management/commands/update_types_permissions.py ]]; then
+		msg2 "Updating permissions..."
+		./manage.py update_types_permissions
+	fi
+	msg2 "Loading fixtures..."
 	./manage.py loaddata */fixtures/*.json
 }
 
@@ -69,10 +74,11 @@ main() {
 		exit 1
 	fi
 
+	if [[ -d "$WEBDIR" ]]; then
+		clean
+	fi
 	parabolaweb-download
-	clean
 	configure
-	clean
 	update-database
 	update-filesystem
 }
diff --git a/libre/parabolaweb-utils/parabolaweb.conf b/libre/parabolaweb-utils/parabolaweb.conf
index 467e62e2c..5363479b3 100644
--- a/libre/parabolaweb-utils/parabolaweb.conf
+++ b/libre/parabolaweb-utils/parabolaweb.conf
@@ -2,3 +2,5 @@ HOST=127.0.0.1
 PORT=8090 # 80 is nginx
 WEBDIR=/srv/http/web
 WEBUSER=nobody
+GITURL=git://parabolagnulinux.org/parabolaweb.git
+GITREF=master
diff --git a/libre/python-pgpdump/PKGBUILD b/libre/python-pgpdump/PKGBUILD
new file mode 100644
index 000000000..e65f60dfa
--- /dev/null
+++ b/libre/python-pgpdump/PKGBUILD
@@ -0,0 +1,27 @@
+# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
+
+_pkgname=pgpdump
+pkgname=(python-pgpdump python2-pgpdump)
+pkgver=1.4
+pkgdesc=" a Python library for parsing PGP packets"
+url="https://github.com/toofishes/python-pgpdump"
+license=('custom:BSD3')
+
+pkgrel=1
+arch=(any)
+makedepends=(python python2)
+provides=(python2-pgpdump)
+source=(http://pypi.python.org/packages/source/p/$_pkgname/$_pkgname-$pkgver.tar.gz)
+md5sums=(b437c28ff9d6a6257a0062c0bbe2a9ec)
+
+package_python-pgpdump() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  python setup.py install --root="$pkgdir/" --optimize=1
+  install -Dm644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
+
+package_python2-pgpdump() {
+  cd "$srcdir/$_pkgname-$pkgver"
+  python2 setup.py install --root="$pkgdir/" --optimize=1
+  install -Dm644 COPYRIGHT "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
diff --git a/pcr/pysheng/PKGBUILD b/pcr/pysheng/PKGBUILD
new file mode 100644
index 000000000..4cbdf5d38
--- /dev/null
+++ b/pcr/pysheng/PKGBUILD
@@ -0,0 +1,24 @@
+# Contributor: mutlu_inek@yahoo.de
+# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
+
+pkgname=pysheng
+pkgver=0.1
+pkgrel=1
+pkgdesc="CLI and GUI program to download pages from Google Books as PNG images"
+arch=(i686 x86_64)
+url="https://code.google.com/p/pysheng/"
+license=('GPL')
+depends=('python2')
+makedepends=()
+optdepends=('python2-reportlab: GUI')
+provides=()
+conflicts=()
+replaces=()
+options=()
+source=(http://pysheng.googlecode.com/files/$pkgname-$pkgver.tgz)
+
+package() {
+   cd $pkgname-$pkgver
+   python2 setup.py install --root="$pkgdir/" --optimize=1
+}
+
diff --git a/pcr/theide/PKGBUILD b/pcr/theide/PKGBUILD
new file mode 100644
index 000000000..26dc34f0f
--- /dev/null
+++ b/pcr/theide/PKGBUILD
@@ -0,0 +1,54 @@
+# Contributor: Jan Dolinar <dolik.rce@gmail.com>
+# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
+
+pkgname=theide
+pkgver=5485
+pkgrel=1
+pkgdesc="Modern IDE designed for developping large U++/C++ applications"
+arch=('i686' 'x86_64')
+url="http://www.ultimatepp.org"
+license=('BSD')
+groups=()
+depends=('gtk2' 'libnotify' 'desktop-file-utils')
+makedepends=()
+provides=('theide')
+conflicts=('theide')
+replaces=()
+backup=()
+options=(!makeflags emptydirs)
+install='theide.install'
+source=('http://downloads.sourceforge.net/project/upp/upp/'$pkgver'/upp-x11-src-'$pkgver'.tar.gz'
+        'http://upp-mirror.googlecode.com/svn-history/r'$pkgver'/trunk/uppbox/lpbuild2/mkfile'
+        'http://upp-mirror.googlecode.com/svn-history/r'$pkgver'/trunk/uppbox/lpbuild2/theide.1'
+        'http://upp-mirror.googlecode.com/svn-history/r'$pkgver'/trunk/uppbox/lpbuild2/umk.1'
+        'license.txt')
+noextract=()
+
+build() {
+  cd "$srcdir/upp-x11-src-$pkgver"
+  #build
+  echo "#define IDE_VERSION \"$pkgver-Arch-$(uname -m)\"" > "uppsrc/ide/version.h"
+  msg2 "Building $pkgname..."
+  make -f "$srcdir/mkfile" PKG=umk FLAGS="GCC" NESTS="uppsrc" TIME= COLOR=0 USEMAINCFG=0 JOBS=5 ECHO=0 TARGET="$srcdir/umk"
+  make -f "$srcdir/mkfile" PKG=ide FLAGS="GCC GUI" NESTS="uppsrc" TIME= COLOR=0 USEMAINCFG=0 JOBS=5 ECHO=0 TARGET="$srcdir/theide"
+}
+
+package(){
+  #license
+  install -D "$srcdir/license.txt" "$pkgdir/usr/share/licenses/$pkgname/license.txt"
+  #man pagess
+  install -D "$srcdir/theide.1" "$pkgdir/usr/share/man/man1/theide.1"
+  install -D "$srcdir/umk.1" "$pkgdir/usr/share/man/man1/umk.1"
+  #desktop entry
+  install -D "$srcdir/upp-x11-src-$pkgver/uppsrc/ide/theide.desktop" "$pkgdir/usr/share/applications/theide.desktop"
+  #icon
+  install -D "$srcdir/upp-x11-src-$pkgver/uppsrc/ide/theide-48.png" "$pkgdir/usr/share/pixmaps/theide.png"
+  #fix permissions
+  find "$pkgdir/usr/" -print0 | xargs -0 chown root:root
+  find "$pkgdir/usr/" -type f -print0 | xargs -0 chmod 644
+  find "$pkgdir/usr/" -type d -print0 | xargs -0 chmod 755
+  #install applications
+  install -D "$srcdir/umk" "$pkgdir/usr/bin/umk"
+  install -D "$srcdir/theide" "$pkgdir/usr/bin/theide"
+}
+
diff --git a/pcr/theide/license.txt b/pcr/theide/license.txt
new file mode 100644
index 000000000..6cea058a6
--- /dev/null
+++ b/pcr/theide/license.txt
@@ -0,0 +1,9 @@
+Copyright (C) 2010 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+ 
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ 
+The above copyright notice and this permission notice shall be included in all copies of the Software and its Copyright notices. In addition publicly documented acknowledgment must be given that this software has been used if no source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing documents or any documentation provided with any product containing this software. This License does not apply to any software that links to the libraries provided by this software (statically or dynamically), but only to
+the software provided.
+ 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff --git a/pcr/theide/theide.install b/pcr/theide/theide.install
new file mode 100644
index 000000000..5e16c038a
--- /dev/null
+++ b/pcr/theide/theide.install
@@ -0,0 +1,3 @@
+post_install() {
+   update-desktop-database -q
+}
diff --git a/pcr/upp-svn/GCC.bm b/pcr/upp-svn/GCC.bm
new file mode 100644
index 000000000..bfcb09c1d
--- /dev/null
+++ b/pcr/upp-svn/GCC.bm
@@ -0,0 +1,23 @@
+BUILDER = "GCC";
+COMPILER = "";
+DEBUG_INFO = "2";
+DEBUG_BLITZ = "1";
+DEBUG_LINKMODE = "1";
+DEBUG_OPTIONS = "-O0";
+DEBUG_FLAGS = "";
+DEBUG_LINK = "";
+RELEASE_BLITZ = "0";
+RELEASE_LINKMODE = "1";
+RELEASE_OPTIONS = "-O3 -ffunction-sections -fdata-sections";
+RELEASE_SIZE_OPTIONS = "-Os -finline-limit=20 -ffunction-sections -fdata-sections";
+RELEASE_FLAGS = "";
+RELEASE_LINK = "-Wl,--gc-sections";
+DEBUGGER = "gdb";
+PATH = "";
+INCLUDE = "/usr/include/freetype2;/usr/include/gtk-2.0;/usr/include/glib-2.0;/usr/lib/glib-2.0/include;/usr/lib/gtk-2.0/include;/usr/include/cairo;/usr/include/pango-1.0;/usr/include/atk-1.0;/usr/X11R6/include;/usr/X11R6/include/freetype2;/usr/X11R6/include/gtk-2.0;/usr/X11R6/include/glib-2.0;/usr/X11R6/lib/glib-2.0/include;/usr/X11R6/lib/gtk-2.0/include;/usr/X11R6/include/cairo;/usr/X11R6/include/pango-1.0;/usr/X11R6/include/atk-1.0;/usr/include/c++/4.5.0;/usr/include/c++/4.5.0/i686-pc-linux-gnu;/usr/include/webkit-1.0;/usr/include/libsoup-2.4;/usr/include/libxml2";
+LIB = "/usr/X11R6/lib;/usr/lib;/usr/local/lib";
+REMOTE_HOST = "";
+REMOTE_OS = "";
+REMOTE_TRANSFER = "";
+REMOTE_MAP = "";
+LINKMODE_LOCK = "0";
diff --git a/pcr/upp-svn/PKGBUILD b/pcr/upp-svn/PKGBUILD
new file mode 100644
index 000000000..1a5a50d4b
--- /dev/null
+++ b/pcr/upp-svn/PKGBUILD
@@ -0,0 +1,67 @@
+# Contributor: Jan Dolinar <dolik.rce@gmail.com>
+# Maintainer : Parabola GNU / Linux-libre Aurelien Desbrieres <aurelien@cwb.io>
+
+pkgname=upp-svn
+pkgver=5554
+pkgrel=1
+pkgdesc="Radical and innovative multiplatform C++ framework (known as U++)"
+arch=('any')
+url="http://www.ultimatepp.org"
+license=('BSD')
+groups=()
+depends=('gcc-libs' 'libpng' 'libxft' 'theide')
+makedepends=('subversion')
+optdepends=('libnotify: Enables compiling gtk-styled apps')
+provides=('upp')
+conflicts=('upp')
+replaces=()
+backup=()
+options=(emptydirs !strip)
+install=
+source=('GCC.bm' 'license.txt')
+noextract=()
+
+_svntrunk="http://upp-mirror.googlecode.com/svn/trunk/"
+# many users have already working copy of U++ on their system, so they
+# can use it for building (e.g. to save network traffic or to speed up
+# things) by setting $UPPSVN environment variable
+if [ "x$UPPSVN" != "x" ]
+then
+  _svnmod=$UPPSVN
+else
+  _svnmod="$srcdir/uppsvn"
+fi
+
+build() {
+  cd "$srcdir"
+  #get sources
+  msg "Downloading sources from svn..."
+  for n in bazaar reference examples tutorial uppsrc
+  do
+    msg2 "$n"
+    if [ -d $_svnmod/.svn ]; then
+      (cd $_svnmod/$n && svn up -r $pkgver)
+    else
+      svn co $_svntrunk$n/ --config-dir ./ -r $pkgver $_svnmod/$n
+    fi
+  done
+  msg "SVN checkout done (or server timeout)"
+}
+
+package() {
+  #copy source files
+  mkdir -p "$pkgdir/usr/share/upp"
+  msg2 "Copying the source codes..."
+  cp -r "$_svnmod/"{bazaar,examples,reference,tutorial,uppsrc} "$pkgdir/usr/share/upp/"
+  echo "#define IDE_VERSION \"$pkgver-Arch-$(uname -m)\"" > "$pkgdir/usr/share/upp/uppsrc/ide/version.h"
+  msg2 "Removing the .svn directories..."
+  find "$pkgdir/" -type d -name ".svn" -exec rm -rf {} \; -prune
+  #license
+  mkdir -p "$pkgdir/usr/share/licenses/upp-svn"
+  cp "$srcdir/license.txt" "$pkgdir/usr/share/licenses/upp-svn"
+  #build method
+  cp "$srcdir/GCC.bm" "$pkgdir/usr/share/upp"
+  #fix permissions
+  msg2 "Setting permissions..."
+  find "$pkgdir/usr/" -type f -exec chown root:root {} \; -exec chmod 644 {} \;
+}
diff --git a/pcr/upp-svn/license.txt b/pcr/upp-svn/license.txt
new file mode 100644
index 000000000..6cea058a6
--- /dev/null
+++ b/pcr/upp-svn/license.txt
@@ -0,0 +1,9 @@
+Copyright (C) 2010 Mirek Fidler, Tomas Rylek and various contributors (see AUTHORS)
+ 
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+ 
+The above copyright notice and this permission notice shall be included in all copies of the Software and its Copyright notices. In addition publicly documented acknowledgment must be given that this software has been used if no source code of this software is made available publicly. This includes
+acknowledgments in either Copyright notices, Manuals, Publicity and Marketing documents or any documentation provided with any product containing this software. This License does not apply to any software that links to the libraries provided by this software (statically or dynamically), but only to
+the software provided.
+ 
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
author	root <root@rshg054.dnsready.net>	2012-11-16 01:35:29 -0800
committer	root <root@rshg054.dnsready.net>	2012-11-16 01:35:29 -0800
commit	73cd7952c96190212616ca90d5afe1ce5cb2c9ce (patch)
tree	274972d0d967441e136af716dd87f3cee0cee7f2
parent	130aa30d45bf33a5ce926be8697a0e0c077cdc22 (diff)