Sun Jun 9 00:50:45 PDT 2013

25 files changed, 685 insertions, 241 deletions

diff --git a/community/aiccu/01-fix-makefile.patch b/community/aiccu/01-fix-makefile.patch
deleted file mode 100644
index 211df7a6a..000000000
--- a/community/aiccu/01-fix-makefile.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/Makefile	2007-01-11 01:29:33.000000000 +0100
-+++ b/Makefile	2013-05-12 23:38:17.171000000 +0200
-@@ -17,9 +17,9 @@
- PROJECT_VERSION=$(shell grep "AICCU_VER" common/aiccu.h | head -n 1 | awk '{print $$3}' | tr -d \")
- 
- # Misc bins
--RM=@rm -f
--MAKE:=@${MAKE}
--CP=@echo [Copy]; cp
-+RM=rm -f
-+MAKE:=${MAKE}
-+CP=cp
- RPMBUILD=@echo [RPMBUILD]; rpmbuild
- RPMBUILD_SILENCE=>/dev/null 2>/dev/null
- 
-@@ -78,21 +78,11 @@
- 	@mkdir -p ${DESTDIR}${dirdoc}
- 	@echo "Configuration..."
- 	@mkdir -p ${DESTDIR}${diretc}
--ifeq ($(shell echo "A${RPM_BUILD_ROOT}"),A)
--	$(shell [ -f ${DESTDIR}${diretc}${PROJECT}.conf ] || cp -R doc/${PROJECT}.conf ${DESTDIR}${diretc}${PROJECT}.conf)
-+	@cp -R doc/${PROJECT}.conf ${DESTDIR}${diretc}${PROJECT}.conf
- 	@echo "Documentation..."
- 	@cp doc/README ${DESTDIR}${dirdoc}
--	@cp doc/LICENSE ${DESTDIR}${dirdoc}
-+	@cp doc/changelog ${DESTDIR}${dirdoc}
- 	@cp doc/HOWTO  ${DESTDIR}${dirdoc}
--	@echo "Installing Debian-style init.d"
--	@mkdir -p ${DESTDIR}${diretc}init.d
--	@cp doc/${PROJECT}.init.debian ${DESTDIR}${diretc}init.d/${PROJECT}
--else
--	@echo "Installing Redhat-style init.d"
--	@mkdir -p ${DESTDIR}${diretc}init.d
--	@cp doc/${PROJECT}.init.rpm ${DESTDIR}${diretc}init.d/${PROJECT}
--	@cp doc/${PROJECT}.conf ${DESTDIR}${diretc}${PROJECT}.conf
--endif
- 	@echo "Installation into ${DESTDIR}/ completed"
- 
- help:
diff --git a/community/aiccu/PKGBUILD b/community/aiccu/PKGBUILD
index 801c28866..989bd574f 100644
--- a/community/aiccu/PKGBUILD
+++ b/community/aiccu/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 90477 2013-05-12 21:46:51Z seblu $
+# $Id: PKGBUILD 92564 2013-06-08 18:07:25Z seblu $
 # Maintainer: Sébastien Luttringer
 
 pkgname=aiccu
 pkgver=20070115
-pkgrel=3
+pkgrel=4
 pkgdesc='SixXS Automatic IPv6 Connectivity Client Utility'
 arch=('i686' 'x86_64')
 url='http://www.sixxs.net/tools/aiccu/'
@@ -12,7 +12,6 @@ depends=('gnutls' 'iproute2')
 backup=('etc/aiccu.conf')
 source=("http://www.sixxs.net/archive/sixxs/aiccu/unix/${pkgname}_${pkgver}.tar.gz"
         'aiccu.service'
-        '01-fix-makefile.patch'
         '02-allow-tunnels.patch'
         '03-no-quiet-gcc.patch'
         '04-skip-strip.patch'
@@ -20,7 +19,6 @@ source=("http://www.sixxs.net/archive/sixxs/aiccu/unix/${pkgname}_${pkgver}.tar.
         '06-setup-script.patch')
 md5sums=('c9bcc83644ed788e22a7c3f3d4021350'
          '891b0fa527c1b847ce803dac047cf80d'
-         '7c7c563ecc6d3fa64a7766de28ba1927'
          'b9b2c0e7186f3f96366caaa39252dccc'
          'b38db1d95760cd9687330b7db5f4ea1d'
          '6dfa2df27bb4859c7511bfea91337925'
@@ -41,14 +39,14 @@ build() {
 }
 
 package() {
+  install -Dm644 aiccu.service "$pkgdir/usr/lib/systemd/system/aiccu.service"
   cd $pkgname
-  make DESTDIR="$pkgdir" dirsbin="/usr/bin/" install
-  # license
+  install -Dm755 unix-console/aiccu "$pkgdir/usr/bin/aiccu"
+  install -Dm640 doc/aiccu.conf "$pkgdir/etc/aiccu.conf"
+  install -Dm644 doc/aiccu.1 "$pkgdir/usr/share/man/man1/aiccu.1"
   install -Dm644 doc/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  # man
-  install -Dm644 doc/$pkgname.1 "$pkgdir/usr/share/man/man1/$pkgname.1"
-  # systemd
-  install -Dm644 "$srcdir/aiccu.service" "$pkgdir/usr/lib/systemd/system/aiccu.service"
+  install -dm755 "$pkgdir/usr/share/doc/$pkgname"
+  install -m644 doc/{README,HOWTO,changelog} "$pkgdir/usr/share/doc/$pkgname"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/cdemu-daemon/PKGBUILD b/community/cdemu-daemon/PKGBUILD
index 33839da24..13a14a71f 100644
--- a/community/cdemu-daemon/PKGBUILD
+++ b/community/cdemu-daemon/PKGBUILD
@@ -1,73 +1,54 @@
-# $Id: PKGBUILD 81966 2013-01-05 03:16:00Z heftig $
+# $Id: PKGBUILD 92546 2013-06-08 00:40:57Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Ray Rashif <schiv@archlinux.org>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Charles Lindsay <charles@chaoslizard.org>
 
 pkgname=cdemu-daemon
-pkgver=2.0.0
+pkgver=2.1.0
 pkgrel=1
 pkgdesc="CD/DVD-ROM device emulator daemon"
 arch=(i686 x86_64)
 url="http://cdemu.sourceforge.net/"
 license=(GPL)
-depends=(dbus "vhba-module>=20110915-5" libao "libmirage>=2.0.0")
+depends=(dbus "vhba-module>=20130607" libao "libmirage>=2.1.0")
 makedepends=(cmake)
 optdepends=('alsa-lib: to enable the ALSA audio driver'
             'pulseaudio: to enable the PA audio driver')
-backup=('etc/conf.d/cdemu-daemon'
-        'etc/dbus-1/system.d/cdemu-daemon-dbus.conf')
-install=$pkgname.install
+backup=(etc/conf.d/cdemu-daemon
+        etc/dbus-1/system.d/cdemu-daemon-dbus.conf)
+install=cdemu-daemon.install
 source=("http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2"
-        'cdemu-daemon.conf' 'system.patch' 'cdemu-daemon.service'
-        'cdemu-daemon-dbus.conf')
-md5sums=('8f6ad3a9f758938e1572046bccc30417'
-         '6f31ad7a64d320cf4d6820432184070b'
-         '60c41731d4dce7b67e1a30dc42d2f274'
-         '99f35b4640529d30ea40224386dd6f4f'
-         '55619a492de4ef06b0759b5e4358bcbb')
+        system-arch.patch)
+sha256sums=('8224a5d8d16cbd9a2294e9c7ab544d61059d9870023e48705699af7366846580'
+            '29507da7367983bdc5f541e9f9252f189412041076842b8d08a5c4dac29f23cd')
 
-build() {
+prepare() {
+  mkdir build
   cd $pkgname-$pkgver
 
-  mkdir build; cd build
-  cmake .. \
+  # Patch system daemon for Arch-friendlyness
+  # It's disabled by default. Should we even ship it?
+  patch -Np1 -i ../system-arch.patch
+}
+
+build() {
+  cd build
+  cmake ../$pkgname-$pkgver \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_INSTALL_LIBDIR=/usr/lib \
     -DCMAKE_INSTALL_SYSCONFDIR=/etc \
-    -DCMAKE_INSTALL_LIBEXECDIR=lib/$pkgname \
-    -DSYSTEM_BUS_SERVICE=on  # This is disabled by default. Should we even ship it?
+    -DCMAKE_INSTALL_LIBEXECDIR=lib/$pkgname
   make
 }
 
 package() {
-  cd $pkgname-$pkgver/build
+  cd build
   make DESTDIR="$pkgdir" install
 
   install -d "$pkgdir/usr/lib/modules-load.d"
   echo vhba > "$pkgdir/usr/lib/modules-load.d/cdemu.conf"
-
-  #
-  # All the following stuff concerns the system bus service
-  #
-
-  cd ../..
-
-  # make things Arch-friendly
-  patch "$pkgdir/usr/lib/cdemu-daemon/cdemu-daemon-system.sh" system.patch
-
-  # Custom dbus policy, tightening security to console and 'cdemu' group
-  install -m644 cdemu-daemon-dbus.conf \
-    "$pkgdir/etc/dbus-1/system.d/cdemu-daemon-dbus.conf"
-
-  # the system daemon configuration
-  install -Dm644 cdemu-daemon.conf "$pkgdir/etc/conf.d/cdemu-daemon"
-
-  # for systemd
-  install -Dm644 cdemu-daemon.service \
-    "$pkgdir/usr/lib/systemd/system/cdemu-daemon.service"
-  echo SystemdService=cdemu-daemon.service >> \
-    "$pkgdir/usr/share/dbus-1/system-services/net.sf.cdemu.CDEmuDaemon.service"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/cdemu-daemon/cdemu-daemon-dbus.conf b/community/cdemu-daemon/cdemu-daemon-dbus.conf
deleted file mode 100644
index ed14c6e39..000000000
--- a/community/cdemu-daemon/cdemu-daemon-dbus.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-<!DOCTYPE busconfig PUBLIC
-    "-//freedesktop//DTD D-BUS Bus Configuration 1.0//EN"
-    "http://www.freedesktop.org/standards/dbus/1.0/busconfig.dtd">
-
-<busconfig>
-    <!-- Only root can own the CDEmuDaemon service on bus -->
-    <policy user="root">
-        <allow own="net.sf.cdemu.CDEmuDaemon"/>
-    </policy>
-    <policy group="root">
-        <allow own="net.sf.cdemu.CDEmuDaemon"/>
-    </policy>
-    
-    <!-- Allow users at the console to invoke methods on the interface -->
-    <policy at_console="true">
-        <allow send_destination="net.sf.cdemu.CDEmuDaemon"/>
-    </policy>
-
-    <!-- Allow users in the 'cdemu' group to invoke methods on the interface -->
-    <policy group="cdemu">
-        <allow send_destination="net.sf.cdemu.CDEmuDaemon"/>
-    </policy>
-</busconfig>
-
diff --git a/community/cdemu-daemon/cdemu-daemon.conf b/community/cdemu-daemon/cdemu-daemon.conf
deleted file mode 100644
index 1d8c55fe6..000000000
--- a/community/cdemu-daemon/cdemu-daemon.conf
+++ /dev/null
@@ -1,8 +0,0 @@
-# how many optical drives to emulate
-NUM_DEVICES=2
-
-# audio backend (null, alsa or pulse)
-AUDIO_DRIVER=null
-
-# log file
-LOG_FILE=/var/log/cdemud.log
diff --git a/community/cdemu-daemon/cdemu-daemon.install b/community/cdemu-daemon/cdemu-daemon.install
index 7a2384b47..169ba6ec8 100644
--- a/community/cdemu-daemon/cdemu-daemon.install
+++ b/community/cdemu-daemon/cdemu-daemon.install
@@ -16,6 +16,8 @@ MSG
 
   post_upgrade $1 $1
 
+  modprobe vhba
+
   return 0
 }
 
diff --git a/community/cdemu-daemon/cdemu-daemon.service b/community/cdemu-daemon/cdemu-daemon.service
deleted file mode 100644
index ab4834f60..000000000
--- a/community/cdemu-daemon/cdemu-daemon.service
+++ /dev/null
@@ -1,10 +0,0 @@
-[Unit]
-Description=CDEmu Daemon
-
-[Service]
-Type=dbus
-BusName=net.sf.cdemu.CDEmuDaemon
-ExecStart=/usr/lib/cdemu-daemon/cdemu-daemon-system.sh
-
-[Install]
-WantedBy=multi-user.target
diff --git a/community/cdemu-daemon/system-arch.patch b/community/cdemu-daemon/system-arch.patch
new file mode 100644
index 000000000..54a08bd16
--- /dev/null
+++ b/community/cdemu-daemon/system-arch.patch
@@ -0,0 +1,121 @@
+diff -u -rN cdemu-daemon-2.1.0/CMakeLists.txt cdemu-daemon-2.1.0-arch/CMakeLists.txt
+--- cdemu-daemon-2.1.0/CMakeLists.txt	2013-06-07 21:33:53.000000000 +0200
++++ cdemu-daemon-2.1.0-arch/CMakeLists.txt	2013-06-08 02:20:15.948655947 +0200
+@@ -18,7 +18,7 @@
+ include (FileList)
+ 
+ # Options
+-option (SYSTEM_BUS_SERVICE "Install CDEmu daemon as D-Bus system bus service" off)
++option (SYSTEM_BUS_SERVICE "Install CDEmu daemon as D-Bus system bus service" on)
+ option (SESSION_BUS_SERVICE "Install CDEmu daemon as D-Bus session bus service" on)
+ 
+ # If install prefix is /usr, override the sysconf dir to be /etc instead of /usr/etc
+@@ -46,6 +46,10 @@
+     ${PROJECT_SOURCE_DIR}/system/net.sf.cdemu.CDEmuDaemon.service.in
+     ${PROJECT_BINARY_DIR}/system/net.sf.cdemu.CDEmuDaemon.service
+ )
++configure_file (
++    ${PROJECT_SOURCE_DIR}/system/cdemu-daemon.service.in
++    ${PROJECT_BINARY_DIR}/system/cdemu-daemon.service
++)
+ 
+ # Global definitions
+ add_definitions (-std=gnu99) #NOTE: Compilation bugs out on using signals and -std=c99
+@@ -104,6 +108,10 @@
+         DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}
+     )
+     install (
++        FILES ${PROJECT_BINARY_DIR}/system/cdemu-daemon.service
++        DESTINATION ${CMAKE_INSTALL_LIBDIR}/systemd/system/
++    )
++    install (
+         FILES ${PROJECT_BINARY_DIR}/system/net.sf.cdemu.CDEmuDaemon.service
+         DESTINATION ${CMAKE_INSTALL_DATADIR}/dbus-1/system-services/
+     )
+@@ -111,5 +119,10 @@
+         FILES system/cdemu-daemon-dbus.conf
+         DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/dbus-1/system.d
+     )
++    install (
++        FILES system/cdemu-daemon.conf
++        RENAME cdemu-daemon
++        DESTINATION ${CMAKE_INSTALL_SYSCONFDIR}/conf.d
++    )
+ endif ()
+ 
+diff -u -rN cdemu-daemon-2.1.0/system/cdemu-daemon.conf cdemu-daemon-2.1.0-arch/system/cdemu-daemon.conf
+--- cdemu-daemon-2.1.0/system/cdemu-daemon.conf	1970-01-01 01:00:00.000000000 +0100
++++ cdemu-daemon-2.1.0-arch/system/cdemu-daemon.conf	2013-06-08 02:12:19.032035389 +0200
+@@ -0,0 +1,8 @@
++# how many optical drives to emulate
++#NUM_DEVICES=1
++
++# audio backend (null, default, alsa, or pulse)
++#AUDIO_DRIVER=null
++
++# log file
++#LOG_FILE=/var/log/cdemu-daemon.log
+diff -u -rN cdemu-daemon-2.1.0/system/cdemu-daemon-dbus.conf cdemu-daemon-2.1.0-arch/system/cdemu-daemon-dbus.conf
+--- cdemu-daemon-2.1.0/system/cdemu-daemon-dbus.conf	2013-06-07 21:33:53.000000000 +0200
++++ cdemu-daemon-2.1.0-arch/system/cdemu-daemon-dbus.conf	2013-06-08 02:11:52.922220389 +0200
+@@ -11,8 +11,13 @@
+         <allow own="net.sf.cdemu.CDEmuDaemon"/>
+     </policy>
+ 
+-    <!-- Allow anyone to invoke methods on the interface -->
+-    <policy context="default">
++    <!-- Allow users at the console to invoke methods on the interface -->
++    <policy at_console="true">
++        <allow send_destination="net.sf.cdemu.CDEmuDaemon"/>
++    </policy>
++
++    <!-- Allow users in the 'cdemu' group to invoke methods on the interface -->
++    <policy group="cdemu">
+         <allow send_destination="net.sf.cdemu.CDEmuDaemon"/>
+     </policy>
+ </busconfig>
+diff -u -rN cdemu-daemon-2.1.0/system/cdemu-daemon.service.in cdemu-daemon-2.1.0-arch/system/cdemu-daemon.service.in
+--- cdemu-daemon-2.1.0/system/cdemu-daemon.service.in	1970-01-01 01:00:00.000000000 +0100
++++ cdemu-daemon-2.1.0-arch/system/cdemu-daemon.service.in	2013-06-08 02:13:08.331686074 +0200
+@@ -0,0 +1,10 @@
++[Unit]
++Description=CDEmu Daemon
++
++[Service]
++Type=dbus
++BusName=net.sf.cdemu.CDEmuDaemon
++ExecStart=@CMAKE_INSTALL_FULL_LIBEXECDIR@/cdemu-daemon-system.sh
++
++[Install]
++WantedBy=multi-user.target
+diff -u -rN cdemu-daemon-2.1.0/system/cdemu-daemon-system.sh cdemu-daemon-2.1.0-arch/system/cdemu-daemon-system.sh
+--- cdemu-daemon-2.1.0/system/cdemu-daemon-system.sh	2013-06-07 21:33:53.000000000 +0200
++++ cdemu-daemon-2.1.0-arch/system/cdemu-daemon-system.sh	2013-06-08 02:11:53.152218760 +0200
+@@ -1,15 +1,15 @@
+ #!/bin/sh
+ # Starts the CDEmu daemon instance on D-Bus *system* bus. Optional
+ # configuration (number of devices, audio driver, log file) are read
+-# from /etc/sysconfig/cdemu-daemon
++# from /etc/conf.d/cdemu-daemon
+ 
+ # Default settings
+ NUM_DEVICES=1
+ AUDIO_DRIVER=null
+-LOG_FILE=/tmp/cdemu-daemon.log
++LOG_FILE=/var/log/cdemu-daemon.log
+ 
+ # Read the settings
+-CONFIG_FILE=/etc/sysconfig/cdemu-daemon
++CONFIG_FILE=/etc/conf.d/cdemu-daemon
+ 
+ if [ -f ${CONFIG_FILE} ]; then
+     . ${CONFIG_FILE};
+diff -u -rN cdemu-daemon-2.1.0/system/net.sf.cdemu.CDEmuDaemon.service.in cdemu-daemon-2.1.0-arch/system/net.sf.cdemu.CDEmuDaemon.service.in
+--- cdemu-daemon-2.1.0/system/net.sf.cdemu.CDEmuDaemon.service.in	2013-06-07 21:33:53.000000000 +0200
++++ cdemu-daemon-2.1.0-arch/system/net.sf.cdemu.CDEmuDaemon.service.in	2013-06-08 02:14:26.824463231 +0200
+@@ -2,4 +2,4 @@
+ Name=net.sf.cdemu.CdemuDaemon
+ Exec=@CMAKE_INSTALL_FULL_LIBEXECDIR@/cdemu-daemon-system.sh
+ User=root
+-
++SystemdService=cdemu-daemon.service
diff --git a/community/cdemu-daemon/system.patch b/community/cdemu-daemon/system.patch
deleted file mode 100644
index 42812f6cf..000000000
--- a/community/cdemu-daemon/system.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -aur cdemu-daemon-1.5.0.orig/system/cdemu-daemon-system.sh cdemu-daemon-1.5.0/system/cdemu-daemon-system.sh
---- cdemu-daemon-1.5.0.orig/system/cdemu-daemon-system.sh	2012-03-25 16:35:40.581171312 +0800
-+++ cdemu-daemon-1.5.0/system/cdemu-daemon-system.sh	2012-03-25 16:36:48.810801678 +0800
-@@ -1,15 +1,15 @@
- #!/bin/sh
- # Starts the CDEmu daemon instance on D-Bus *system* bus. Optional
- # configuration (number of devices, audio driver, log file) are read
--# from /etc/sysconfig/cdemu-daemon
-+# from /etc/conf.d/cdemu-daemon
- 
- # Default settings
- NUM_DEVICES=2
- AUDIO_DRIVER=null
--LOG_FILE=/tmp/cdemu-daemon.log
-+LOG_FILE=/var/log/cdemu-daemon.log
- 
- # Read the settings
--CONFIG_FILE=/etc/sysconfig/cdemu-daemon
-+CONFIG_FILE=/etc/conf.d/cdemu-daemon
- 
- if [ -f ${CONFIG_FILE} ]; then
-     . ${CONFIG_FILE};
diff --git a/community/denemo/PKGBUILD b/community/denemo/PKGBUILD
index bd1162ece..c2b4d0ba0 100644
--- a/community/denemo/PKGBUILD
+++ b/community/denemo/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 88689 2013-04-21 22:17:06Z heftig $
+# $Id: PKGBUILD 92551 2013-06-08 11:18:47Z bpiotrowski $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Philipp Sandhaus <philipp.sandhaus@gmx.de>
 # Contributor: Robert Emil Berge <filoktetes@linuxophic.org>
@@ -6,7 +6,7 @@
 
 pkgname=denemo
 pkgver=1.0.0
-pkgrel=3
+pkgrel=5
 pkgdesc="A music score editor"
 arch=('i686' 'x86_64')
 url="http://www.denemo.org"
diff --git a/community/freetalk/PKGBUILD b/community/freetalk/PKGBUILD
index 1f0a93f26..3eadd052b 100644
--- a/community/freetalk/PKGBUILD
+++ b/community/freetalk/PKGBUILD
@@ -1,35 +1,36 @@
-# $Id: PKGBUILD 65202 2012-02-20 10:13:19Z spupykin $
+# $Id: PKGBUILD 92552 2013-06-08 11:18:48Z bpiotrowski $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=freetalk
 pkgver=3.2
-pkgrel=5
+pkgrel=6
 pkgdesc="A console based Jabber client"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/freetalk"
 license=('GPL')
-depends=('loudmouth' 'guile')
+depends=('loudmouth' 'guile1.8')
 install=freetalk.install
-source=(http://savannah.gnu.org/download/freetalk/freetalk-$pkgver.tar.gz)
-md5sums=('ab09bd07dde158551f151d281b14642c')
+source=(http://savannah.gnu.org/download/freetalk/freetalk-$pkgver.tar.gz
+        freetalk-3.2-glibc210.patch)
+md5sums=('ab09bd07dde158551f151d281b14642c'
+         '0da1d0a0f606d2b279fe676a80a3eb32')
 
-build() {
-  cd $srcdir/freetalk-$pkgver
-
-  ./configure --prefix=/usr
-
-  patch -p0 src/callbacks.cc <<EOF
-156c156,159
-< 	*strchr (from, '/') = '\0';
----
-> 	{
-> 	char *_tmp = (char*)strchr (from, '/');
-> 	*_tmp = '\0';
-> 	}
-EOF
+prepare(){
+  cd $pkgname-$pkgver
+  patch -Np1 -i ../freetalk-3.2-glibc210.patch
+}
 
+build() {
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --disable-rpath \
+    GUILE=/usr/bin/guile1.8 \
+    GUILE_CONFIG=/usr/bin/guile-config1.8
   make
-  make DESTDIR=$pkgdir install
-  rm $pkgdir/usr/share/info/dir
+}
+
+package() {
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  rm "$pkgdir/usr/share/info/dir"
 }
diff --git a/community/freetalk/freetalk-3.2-glibc210.patch b/community/freetalk/freetalk-3.2-glibc210.patch
new file mode 100644
index 000000000..3bdd0dc69
--- /dev/null
+++ b/community/freetalk/freetalk-3.2-glibc210.patch
@@ -0,0 +1,68 @@
+diff -urNp freetalk-3.2.orig/src/callbacks.cc freetalk-3.2/src/callbacks.cc
+--- freetalk-3.2.orig/src/callbacks.cc	2009-02-25 01:31:29.826691032 +0530
++++ freetalk-3.2/src/callbacks.cc	2009-02-25 02:56:04.323962193 +0530
+@@ -1,7 +1,7 @@
+ /*
+   callbacks.c: Callback functions
+   
+-  Copyright (c) 2005, 2006, 2007 Freetalk Core Team
++  Copyright (c) 2005, 2006, 2007, 2009 Freetalk Core Team
+   This file is part of GNU Freetalk.
+   
+   Freetalk is free software; you can redistribute it and/or modify
+@@ -20,6 +20,7 @@
+ */
+ 
+ #include <stdio.h>
++#include <string>
+ #include <string.h>
+ #include <stdlib.h>
+ #include <glib.h> 
+@@ -116,8 +117,9 @@ ft_msg_msg_handler (LmMessageHandler *ha
+ 		    LmMessage *msg, gpointer user_data)
+ {
+   LmMessageNode *root, *body, *x;
+-  const char *from, *msg_str, *type;
++  const char *msg_str, *type;
+   char *ts = NULL;
++  std::string from;
+ 
+   root = lm_message_get_node (msg);
+   body = lm_message_node_get_child (root, "body");
+@@ -152,11 +154,12 @@ ft_msg_msg_handler (LmMessageHandler *ha
+     set_hook_return (0);
+     /* TBD : make the below stripping of /Resource configurable */
+     if (1) {
+-      if (strchr (from, '/'))
+-	*strchr (from, '/') = '\0';
++      const size_t pos = from.find("/");
++      if (pos != std::string::npos)
++	from.replace(pos, from.size() - pos, "");
+     }
+     {
+-      FtRosterItem *item = ft_roster_lookup (from);
++      FtRosterItem *item = ft_roster_lookup (from.c_str());
+       char *nickname;
+       
+       if (!item)
+@@ -166,17 +169,17 @@ ft_msg_msg_handler (LmMessageHandler *ha
+       
+       scm_run_hook (ex_message_receive_hook,
+ 		    scm_list_n (ts ? scm_from_locale_string (ts) : scm_from_locale_string (""),
+-				scm_from_locale_string (from),
++				scm_from_locale_string (from.c_str()),
+ 				nickname ? scm_from_locale_string (nickname) : scm_from_locale_string (""),
+ 				scm_from_locale_string (msg_str),
+ 				SCM_UNDEFINED));
+     }
+     if (ts) g_free (ts);
+     
+-    if (get_hook_return () == 1)
++    if (get_hook_return () == 1) 
+       return LM_HANDLER_RESULT_REMOVE_MESSAGE;
+     
+-    PRINTF ("%s: %s", from, msg_str);
++    PRINTF ("%s: %s", from.c_str(), msg_str);
+   } else {
+     /* This logic should be looked into : FIXME */
+     ft_send_file_message_data (msg);
diff --git a/community/geda-gaf/PKGBUILD b/community/geda-gaf/PKGBUILD
index 1c10d075d..e51b3d8d7 100644
--- a/community/geda-gaf/PKGBUILD
+++ b/community/geda-gaf/PKGBUILD
@@ -4,7 +4,7 @@
 
 pkgname=geda-gaf
 pkgver=1.8.1
-pkgrel=1
+pkgrel=2
 pkgdesc="gEDA/gaf suite - Contains gschem, gnetlist, gsymcheck, gattrib, utilities and documentation from the gEDA project"
 arch=('i686' 'x86_64')
 url="http://www.gpleda.org"
diff --git a/community/gtkwave/PKGBUILD b/community/gtkwave/PKGBUILD
index ade697db8..de37afcb1 100644
--- a/community/gtkwave/PKGBUILD
+++ b/community/gtkwave/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 89164 2013-04-27 12:32:34Z kkeen $
+# $Id: PKGBUILD 92578 2013-06-08 21:06:37Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Jared Casper <jaredcasper@gmail.com>
 
 pkgname=gtkwave
-pkgver=3.3.45
+pkgver=3.3.47
 pkgrel=1
 pkgdesc='A wave viewer which reads LXT, LXT2, VZT, GHW and VCD/EVCD files'
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ depends=('bzip2' 'xz' 'gtk2')
 makedepends=('gperf')
 install='gtkwave.install'
 source=("http://gtkwave.sourceforge.net/gtkwave-${pkgver}.tar.gz")
-md5sums=('d746e1ce0584155e3af1d7ba5b0e56f0')
+md5sums=('fdb257ed42220a9a7526b70d1746054a')
 
 build() {
   cd "${srcdir}/gtkwave-${pkgver}"
@@ -36,3 +36,4 @@ package() {
   install -D -m644 "${srcdir}/gtkwave-${pkgver}/MIT.TXT" \
     "${pkgdir}/usr/share/licenses/gtkwave/MIT.TXT"
 }
+
diff --git a/community/kicad/PKGBUILD b/community/kicad/PKGBUILD
index fca285645..e7c2708ee 100644
--- a/community/kicad/PKGBUILD
+++ b/community/kicad/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 89177 2013-04-27 13:49:24Z kkeen $
+# $Id: PKGBUILD 92569 2013-06-08 18:17:35Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Marq Schneider <queueRAM@gmail.com>
 
 pkgname=kicad
-pkgver=20130331
+pkgver=20130518
 _pkgver=${pkgver:0:4}-${pkgver:4:2}-${pkgver:6:2}
-_pkgbzr=4008
+_pkgbzr=4017
 pkgrel=1
 pkgdesc="Electronic schematic and printed circuit board (PCB) design tools"
 arch=('i686' 'x86_64')
@@ -16,9 +16,9 @@ makedepends=('cmake' 'zlib' 'mesa')
 optdepends=('kicad-docs-bzr: for documentation' 
             'kicad-library-bzr: for footprints')
 install=kicad.install
-source=(http://iut-tice.ujf-grenoble.fr/cao/${pkgname}-sources_stable_${_pkgver}_BZR${_pkgbzr}.zip
+source=(http://iut-tice.ujf-grenoble.fr/cao/${pkgname}-sources-stable_${_pkgver}_BZR${_pkgbzr}.zip
         kicad-boost-polygon-declare-gtlsort-earlier.patch)
-md5sums=('9c88273a5b323b6622d1704a90ffa399'
+md5sums=('9e6aab0f2ad01a17c8ec96cd9162dc79'
          'a2c39704238946e74a5ed0c38326345f')
 
 build() {
diff --git a/community/libmirage/PKGBUILD b/community/libmirage/PKGBUILD
index e1ee19405..8bc37fc29 100644
--- a/community/libmirage/PKGBUILD
+++ b/community/libmirage/PKGBUILD
@@ -1,29 +1,29 @@
-# $Id: PKGBUILD 81967 2013-01-05 03:16:01Z heftig $
+# $Id: PKGBUILD 92550 2013-06-08 08:15:45Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Mateusz Herych <heniekk@gmail.com>
 # Contributor: Charles Lindsay <charles@chaoslizard.org>
 
 pkgname=libmirage
-pkgver=2.0.0
-pkgrel=1
-pkgdesc="CD-ROM image (B6T/CCD/CDI/CUE/ISO/MDS/NRG/TOC) access library"
+pkgver=2.1.0
+pkgrel=2
+pkgdesc="CD-ROM image (B6T/C2D/CCD/CDI/CIF/CUE/ISO/MDS/MDX/NRG/TOC) access library"
 arch=(i686 x86_64)
 url="http://cdemu.sourceforge.net/"
 license=(GPL)
-depends=(glib2 libsndfile zlib bzip2 shared-mime-info)
-makedepends=(bison flex gtk-doc cmake gobject-introspection)
+depends=(glib2 libsndfile libsamplerate zlib bzip2 xz shared-mime-info)
+makedepends=(gtk-doc gobject-introspection cmake)
 options=(!libtool)
 install=libmirage.install
-source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2
-        soname.diff)
-md5sums=('72007f3364cbf3aea782aaa1fdade238'
-         '72b5af3d5baf8e9b1ec6afa629373799')
+source=(http://downloads.sourceforge.net/cdemu/$pkgname-$pkgver.tar.bz2)
+sha256sums=('fb30eea15b8c1fc55e194e1af55127fa3b3860a79fec0b6c60588cf9ae8d1ca9')
+
+prepare() {
+  mkdir build
+}
 
 build() {
-  cd $pkgname-$pkgver
-  patch -Np2 -i ../soname.diff # Produce correct symlinks
-  mkdir build; cd build
-  cmake .. \
+  cd build
+  cmake ../$pkgname-$pkgver \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_INSTALL_LIBDIR=lib
@@ -31,6 +31,6 @@ build() {
 }
 
 package() {
-  cd $pkgname-$pkgver/build
+  cd build
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/libmirage/soname.diff b/community/libmirage/soname.diff
deleted file mode 100644
index 213f788ef..000000000
--- a/community/libmirage/soname.diff
+++ /dev/null
@@ -1,10 +0,0 @@
---- a/libmirage/CMakeLists.txt
-+++ b/libmirage/CMakeLists.txt
-@@ -112,7 +112,8 @@
-     COMPILE_DEFINITIONS "${mirage_DEFS}"
-     LINK_FLAGS ${mirage_LDFLAGS_STR}
-     LIBRARY_OUTPUT_NAME mirage
--    SOVERSION ${MIRAGE_SOVERSION}
-+    VERSION ${MIRAGE_SOVERSION}
-+    SOVERSION ${MIRAGE_LT_CURRENT}
- )
diff --git a/community/lightdm/PKGBUILD b/community/lightdm/PKGBUILD
index e6e550661..923c2efc5 100755
--- a/community/lightdm/PKGBUILD
+++ b/community/lightdm/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90481 2013-05-12 21:56:51Z alucryd $
+# $Id: PKGBUILD 92562 2013-06-08 15:00:39Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: Morfeo <morfeo89@hotmail.it>
 
 pkgbase=lightdm
 pkgname=('lightdm' 'liblightdm-qt4' 'liblightdm-qt5')
 pkgver=1.6.0
-pkgrel=3
+pkgrel=4
 epoch=1
 pkgdesc="A lightweight display manager"
 arch=('i686' 'x86_64')
@@ -22,6 +22,7 @@ source=("https://launchpad.net/lightdm/1.6/${pkgver}/+download/${pkgbase}-${pkgv
         'lightdm.rules'
         'lightdm-default-config.patch'
         'lightdm-lock-screen-before-switch.patch'
+        'lightdm-use-login1.patch'
         'xsession')
 sha256sums=('882ece568df0d81c0b6e399ff00b3f89eee6d50efc09ad1c52c61d8753efb419'
             '3daf2f7e1b751415eab9b2aa92d78d8e00c3447a77fa31f7e75863136286a86f'
@@ -31,6 +32,7 @@ sha256sums=('882ece568df0d81c0b6e399ff00b3f89eee6d50efc09ad1c52c61d8753efb419'
             'a89566307e1c81c24f037d854cbd472d2f94f8a4b759877a01563a332319f7d6'
             '6d5a754f41e9c7e52c51d2ff018b926ddaabb807e9a0b88c4a7bde1acffa3b1c'
             '4793eaee5915f5c519f569a4cd9158822d4c57c8b6e405895d2eddf82fa00822'
+            'bac646accb407c02c9cebf0b087b7a47f6353bc3829de4e82e10b2e4396a87e6'
             '7fb85a1b54406032a922e8fd6f45d869fcfe5681df630e74e8e50c040b786ee4')
 
 prepare() {
@@ -38,6 +40,7 @@ prepare() {
 
   patch -Np1 -i ../lightdm-default-config.patch
   patch -Np1 -i ../lightdm-lock-screen-before-switch.patch
+  patch -Np1 -i ../lightdm-use-login1.patch
   sed -i 's/MOC5 --qt=qt5/MOC5/' configure
 }
 
diff --git a/community/lightdm/lightdm-use-login1.patch b/community/lightdm/lightdm-use-login1.patch
new file mode 100755
index 000000000..e8e9a7c2a
--- /dev/null
+++ b/community/lightdm/lightdm-use-login1.patch
@@ -0,0 +1,371 @@
+diff -Naurp lightdm-1.6.0.orig/liblightdm-gobject/power.c lightdm-1.6.0/liblightdm-gobject/power.c
+--- lightdm-1.6.0.orig/liblightdm-gobject/power.c 2013-03-06 03:40:10.000000000 +0100
++++ lightdm-1.6.0/liblightdm-gobject/power.c  2013-06-08 00:45:07.411183727 +0200
+@@ -15,44 +15,67 @@
+ 
+ #include "lightdm/power.h"
+ 
+-static GDBusProxy *upower_proxy = NULL;
+-static GDBusProxy *ck_proxy = NULL;
++/* static GDBusProxy *upower_proxy = NULL;
++ static GDBusProxy *ck_proxy = NULL;
++ static GDBusProxy *login1_proxy = NULL;
++ */
++
++struct proxy_info {
++ /* proxy reference */
++ GDBusProxy *proxy;
++
++ /* arguments to g_dbus_proxy_new_for_bus_sync() */
++ const char *name;
++ const char *object_path;
++ const char *interface_name;
++
++};
++
++static struct proxy_info upower_proxy = {
++ .proxy = NULL,
++ .name = "org.freedesktop.UPower",
++ .object_path = "/org/freedesktop/UPower",
++ .interface_name = "org.freedesktop.UPower",
++};
++
++static struct proxy_info ck_proxy = {
++ .proxy = NULL,
++ .name = "org.freedesktop.ConsoleKit",
++ .object_path = "/org/freedesktop/ConsoleKit/Manager",
++ .interface_name = "org.freedesktop.ConsoleKit.Manager",
++};
++
++static struct proxy_info login1_proxy = {
++ .proxy = NULL,
++ .name = "org.freedesktop.login1",
++ .object_path = "/org/freedesktop/login1",
++ .interface_name = "org.freedesktop.login1.Manager",
++};
+ 
+-static gboolean
+-upower_call_function (const gchar *function, gboolean default_result, GError **error)
++static GVariant *
++do_call_function (const gchar *function, GVariant *parameters, GError **error, struct proxy_info *proxy)
+ {
+-    GVariant *result;
+-    gboolean function_result = FALSE;
+-
+-    if (!upower_proxy)
++    if (!proxy->proxy)
+     {
+-        upower_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
+-                                                      G_DBUS_PROXY_FLAGS_NONE,
+-                                                      NULL,
+-                                                      "org.freedesktop.UPower",
+-                                                      "/org/freedesktop/UPower",
+-                                                      "org.freedesktop.UPower",
+-                                                      NULL,
+-                                                      error);
+-        if (!upower_proxy)
+-            return FALSE;
+-    }
+-
+-    result = g_dbus_proxy_call_sync (upower_proxy,
+-                                     function,
+-                                     NULL,
+-                                     G_DBUS_CALL_FLAGS_NONE,
+-                                     -1,
+-                                     NULL,
+-                                     error);
+-    if (!result)
+-        return default_result;
+-
+-    if (g_variant_is_of_type (result, G_VARIANT_TYPE ("(b)")))
+-        g_variant_get (result, "(b)", &function_result);
++        proxy->proxy = g_dbus_proxy_new_for_bus_sync(G_BUS_TYPE_SYSTEM,
++                                                     G_DBUS_PROXY_FLAGS_NONE,
++                                                     NULL,
++                                                     proxy->name,
++                                                     proxy->object_path,
++                                                     proxy->interface_name,
++                                                     NULL,
++                                                     error);
++        if (!proxy->proxy)
++            return NULL;
++    }
+ 
+-    g_variant_unref (result);
+-    return function_result;
++    return g_dbus_proxy_call_sync(proxy->proxy,
++                                   function,
++          parameters,
++                                   G_DBUS_CALL_FLAGS_NONE,
++                                   -1,
++                                   NULL,
++                                   error);
+ }
+ 
+ /**
+@@ -65,7 +88,29 @@ upower_call_function (const gchar *funct
+ gboolean
+ lightdm_get_can_suspend (void)
+ {
+-    return upower_call_function ("SuspendAllowed", FALSE, NULL);
++    gboolean can_suspend = FALSE;
++    GVariant *r;
++
++    r = do_call_function ("CanSuspend", NULL, NULL, &login1_proxy);
++    if (r)
++    {
++        gchar *result;
++        if (g_variant_is_of_type (r, G_VARIANT_TYPE ("(s)")))
++        {
++            g_variant_get (r, "(&s)", &result);
++            can_suspend = g_strcmp0 (result, "yes") == 0;
++        }
++    }
++    else
++    {
++        r = do_call_function ("SuspendAllowed", NULL, NULL, &upower_proxy);
++        if (r && g_variant_is_of_type (r, G_VARIANT_TYPE ("(b)")))
++            g_variant_get (r, "(b)", &can_suspend);
++    }
++    if (r)
++        g_variant_unref (r);
++
++    return can_suspend;
+ }
+ 
+ /**
+@@ -73,13 +118,29 @@ lightdm_get_can_suspend (void)
+  * @error: return location for a #GError, or %NULL
+  *
+  * Triggers a system suspend.
+- * 
++ *
+  * Return value: #TRUE if suspend initiated.
+  **/
+ gboolean
+ lightdm_suspend (GError **error)
+ {
+-    return upower_call_function ("Suspend", TRUE, error);
++    GVariant *result;
++    gboolean suspended;
++
++    result = do_call_function ("Suspend", g_variant_new("(b)", FALSE), error, &login1_proxy);
++    if (!result)
++    {
++        if (error)
++            g_debug ("Can't suspend using logind; falling back to UPower: %s", (*error)->message);
++        g_clear_error (error);
++        result = do_call_function ("Suspend", NULL, error, &upower_proxy);
++    }
++
++    suspended = result != NULL;
++    if (result)
++        g_variant_unref (result);
++
++    return suspended;
+ }
+ 
+ /**
+@@ -92,7 +153,29 @@ lightdm_suspend (GError **error)
+ gboolean
+ lightdm_get_can_hibernate (void)
+ {
+-    return upower_call_function ("HibernateAllowed", FALSE, NULL);
++    gboolean can_hibernate = FALSE;
++    GVariant *r;
++
++    r = do_call_function ("CanHibernate", NULL, NULL, &login1_proxy);
++    if (r)
++    {
++        gchar *result;
++        if (g_variant_is_of_type (r, G_VARIANT_TYPE ("(s)")))
++        {
++            g_variant_get (r, "(&s)", &result);
++            can_hibernate = g_strcmp0 (result, "yes") == 0;
++        }
++    }
++    else
++    {
++        r = do_call_function ("HibernateAllowed", NULL, NULL, &upower_proxy);
++        if (r && g_variant_is_of_type (r, G_VARIANT_TYPE ("(b)")))
++            g_variant_get (r, "(b)", &can_hibernate);
++    }
++    if (r)
++        g_variant_unref (r);
++
++    return can_hibernate;
+ }
+ 
+ /**
+@@ -100,53 +183,32 @@ lightdm_get_can_hibernate (void)
+  * @error: return location for a #GError, or %NULL
+  *
+  * Triggers a system hibernate.
+- * 
++ *
+  * Return value: #TRUE if hibernate initiated.
+  **/
+ gboolean
+ lightdm_hibernate (GError **error)
+ {
+-    return upower_call_function ("Hibernate", TRUE, error);
+-}
+-
+-static gboolean
+-ck_call_function (const gchar *function, gboolean default_result, GError **error)
+-{
+     GVariant *result;
+-    gboolean function_result = FALSE;
+-
+-    if (!ck_proxy)
+-    {
+-        ck_proxy = g_dbus_proxy_new_for_bus_sync (G_BUS_TYPE_SYSTEM,
+-                                                  G_DBUS_PROXY_FLAGS_NONE,
+-                                                  NULL,
+-                                                  "org.freedesktop.ConsoleKit",
+-                                                  "/org/freedesktop/ConsoleKit/Manager",
+-                                                  "org.freedesktop.ConsoleKit.Manager",
+-                                                  NULL,
+-                                                  error);
+-        if (!ck_proxy)
+-            return FALSE;
+-    }
+-
+-    result = g_dbus_proxy_call_sync (ck_proxy,
+-                                     function,
+-                                     NULL,
+-                                     G_DBUS_CALL_FLAGS_NONE,
+-                                     -1,
+-                                     NULL,
+-                                     error);
++    gboolean hibernated;
+ 
++    result = do_call_function ("Hibernate", g_variant_new("(b)", FALSE), error, &login1_proxy);
+     if (!result)
+-        return default_result;
++    {
++        if (error)
++            g_debug ("Can't hibernate using logind; falling back to UPower: %s", (*error)->message);
++        g_clear_error (error);
++        result = do_call_function ("Hibernate", NULL, error, &upower_proxy);
++    }
+ 
+-    if (g_variant_is_of_type (result, G_VARIANT_TYPE ("(b)")))
+-        g_variant_get (result, "(b)", &function_result);
++    hibernated = result != NULL;
++    if (result)
++        g_variant_unref (result);
+ 
+-    g_variant_unref (result);
+-    return function_result;
++    return hibernated;
+ }
+ 
++
+ /**
+  * lightdm_get_can_restart:
+  *
+@@ -157,7 +219,29 @@ ck_call_function (const gchar *function,
+ gboolean
+ lightdm_get_can_restart (void)
+ {
+-    return ck_call_function ("CanRestart", FALSE, NULL);
++    gboolean can_restart = FALSE;
++    GVariant *r;
++
++    r = do_call_function ("CanReboot", NULL, NULL, &login1_proxy);
++    if (r)
++    {
++        gchar *result;
++        if (g_variant_is_of_type (r, G_VARIANT_TYPE ("(s)")))
++        {
++            g_variant_get (r, "(&s)", &result);
++            can_restart = g_strcmp0 (result, "yes") == 0;
++        }
++    }
++    else
++    {
++        r = do_call_function ("CanRestart", NULL, NULL, &ck_proxy);
++        if (r && g_variant_is_of_type (r, G_VARIANT_TYPE ("(b)")))
++            g_variant_get (r, "(b)", &can_restart);
++    }
++    if (r)
++        g_variant_unref (r);
++
++    return can_restart;
+ }
+ 
+ /**
+@@ -171,7 +255,20 @@ lightdm_get_can_restart (void)
+ gboolean
+ lightdm_restart (GError **error)
+ {
+-    return ck_call_function ("Restart", TRUE, error);
++    GVariant *r;
++    gboolean restarted;
++
++    r = do_call_function ("Reboot", g_variant_new("(b)", FALSE), error, &login1_proxy);
++    if (!r)
++    {
++        g_clear_error (error);
++        r = do_call_function ("Restart", NULL, error, &ck_proxy);
++    }
++    restarted = r != NULL;
++    if (r)
++        g_variant_unref (r);
++
++    return restarted;
+ }
+ 
+ /**
+@@ -184,7 +281,29 @@ lightdm_restart (GError **error)
+ gboolean
+ lightdm_get_can_shutdown (void)
+ {
+-    return ck_call_function ("CanStop", FALSE, NULL);
++    gboolean can_shutdown = FALSE;
++    GVariant *r;
++
++    r = do_call_function ("CanPowerOff", NULL, NULL, &login1_proxy);
++    if (r)
++    {
++        gchar *result;
++        if (g_variant_is_of_type (r, G_VARIANT_TYPE ("(s)")))
++        {
++            g_variant_get (r, "(&s)", &result);
++            can_shutdown = g_strcmp0 (result, "yes") == 0;
++        }
++    }
++    else
++    {
++        r = do_call_function ("CanStop", NULL, NULL, &ck_proxy);
++        if (r && g_variant_is_of_type (r, G_VARIANT_TYPE ("(b)")))
++            g_variant_get (r, "(b)", &can_shutdown);
++    }
++    if (r)
++        g_variant_unref (r);
++
++    return can_shutdown;
+ }
+ 
+ /**
+@@ -198,5 +317,18 @@ lightdm_get_can_shutdown (void)
+ gboolean
+ lightdm_shutdown (GError **error)
+ {
+-    return ck_call_function ("Stop", TRUE, error);
++    GVariant *r;
++    gboolean shutdown;
++
++    r = do_call_function ("PowerOff", g_variant_new("(b)", FALSE), error, &login1_proxy);
++    if (!r)
++    {
++        g_clear_error (error);
++        r = do_call_function ("Stop", NULL, error, &ck_proxy);
++    }
++    shutdown = r != NULL;
++    if (r)
++        g_variant_unref (r);
++
++    return shutdown;
+ }
diff --git a/community/lilypond/PKGBUILD b/community/lilypond/PKGBUILD
index 2a2529111..9502f54ef 100644
--- a/community/lilypond/PKGBUILD
+++ b/community/lilypond/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 82279 2013-01-14 09:20:59Z spupykin $
+# $Id: PKGBUILD 92554 2013-06-08 11:18:50Z bpiotrowski $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Geoffroy Carrier <geoffroy@archlinux.org>
 # Contributor: William Rea <sillywilly@gmail.com>
@@ -6,12 +6,12 @@
 
 pkgname=lilypond
 pkgver=2.16.2
-pkgrel=1
+pkgrel=3
 pkgdesc="An automated music engraving system"
 arch=('i686' 'x86_64')
 url="http://lilypond.org"
 license=('GPL')
-depends=('guile' 'python2' 'texlive-core' 'ghostscript' 'pango' 'fontconfig')
+depends=('guile1.8' 'python2' 'texlive-core' 'ghostscript' 'pango' 'fontconfig')
 makedepends=('flex' 'bison' 'gettext' 'mftrace' 'texinfo' 'fontforge' 't1utils'
 	     'gsfonts' 'texi2html')
 options=('emptydirs')
@@ -19,7 +19,7 @@ install=lilypond.install
 source=(http://download.linuxaudio.org/lilypond/sources/v2.16/$pkgname-$pkgver.tar.gz)
 md5sums=('6db27f17d47e4f66a3b0716c65db3041')
 
-build() {
+prepare() {
   cd "$srcdir/$pkgname-$pkgver"
 
   # python2 fix
@@ -28,9 +28,18 @@ build() {
     sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' $file
   done
 
+  sed -i 's|GUILE_CFLAGS=.*|GUILE_CFLAGS="`pkg-config --cflags guile-1.8`"|' configure
+  sed -i 's|GUILE_LDFLAGS=.*|GUILE_LDFLAGS="`pkg-config --libs guile-1.8`"|' configure
+
   rm -rf python/out/
+}
 
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  export PYTHON=/usr/bin/python2
+  export GUILE=/usr/bin/guile1.8
+  export GUILE_CONFIG=/usr/bin/guile-config1.8
+  ./configure --prefix=/usr --disable-documentation
   make
 }
 
diff --git a/community/mailutils/PKGBUILD b/community/mailutils/PKGBUILD
index 39eee461f..c1649d573 100644
--- a/community/mailutils/PKGBUILD
+++ b/community/mailutils/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 91917 2013-05-29 10:59:29Z spupykin $
+# $Id: PKGBUILD 92555 2013-06-08 11:18:51Z bpiotrowski $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=mailutils
 pkgver=2.2
-pkgrel=5
+pkgrel=7
 pkgdesc="MUA command line tool (mailx)"
 arch=(i686 x86_64)
 url="http://www.gnu.org/software/mailutils/"
 license=('GPL')
-depends=('libldap' 'pam' 'gnutls' 'guile')
+depends=('libldap' 'pam' 'gnutls')
 makedepends=('emacs')
 conflicts=('libsieve')
 install=mailutils.install
@@ -26,9 +26,10 @@ prepare() {
 
 build() {
   cd "$srcdir/mailutils-$pkgver"
-  [ -f Makefile ] || ./configure --prefix=/usr --with-gdbm --with-gnutls \
+  ./configure --prefix=/usr --with-gdbm --with-gnutls \
 	--libexecdir=/usr/lib/$pkgname --without-fribidi \
-	--without-tcp-wrappers --sbindir=/usr/bin
+	--without-tcp-wrappers --sbindir=/usr/bin \
+	--without-python --without-guile
   make -j1
 }
 
diff --git a/community/matchbox-window-manager/PKGBUILD b/community/matchbox-window-manager/PKGBUILD
index 888dc2d37..d9a3c002b 100644
--- a/community/matchbox-window-manager/PKGBUILD
+++ b/community/matchbox-window-manager/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 66232 2012-02-23 05:07:09Z spupykin $
+# $Id: PKGBUILD 92576 2013-06-08 20:30:59Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Henrique C. Alves <hcarvalhoalves@gmail.com>
 
 pkgname=matchbox-window-manager
 pkgver=1.2
-pkgrel=3
+pkgrel=4
 pkgdesc="A pretty much unique X window manager with a classic PDA management policy"
 arch=('i686' 'x86_64')
 license=('GPL')
 depends=('libmatchbox' 'startup-notification' 'libpng' 'libsm')
 url="http://matchbox-project.org/"
-source=(http://matchbox-project.org/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.bz2)
+source=(http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/$pkgver/$pkgname-$pkgver.tar.bz2)
 md5sums=('3e158dcf57823b55c926d95b245500fb')
 
 build() {
@@ -19,5 +19,9 @@ build() {
 	--enable-startup-notification --enable-session \
 	--enable-alt-input-wins --enable-expat
   make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/community/minetest/PKGBUILD b/community/minetest/PKGBUILD
index f4c634946..a4673ea18 100644
--- a/community/minetest/PKGBUILD
+++ b/community/minetest/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 92225 2013-06-03 00:36:30Z lcarlier $
+# $Id: PKGBUILD 92558 2013-06-08 12:13:58Z lcarlier $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Konsta Kokkinen <kray@tsundere.fi>
 
 pkgname=minetest
-pkgver=0.4.6
+pkgver=0.4.7
 pkgrel=1
 pkgdesc='An Infiniminer/Minecraft inspired game'
 arch=('i686' 'x86_64')
@@ -13,11 +13,9 @@ depends=('sqlite' 'libgl' 'libxxf86vm' 'openal' 'libvorbis' 'curl' 'hicolor-icon
 makedepends=('cmake' 'irrlicht' 'mesa')
 install=minetest.install
 source=(${pkgname}-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}/tarball/${pkgver}
-	${pkgname}_game-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}_game/tarball/${pkgver}
-        ${pkgname}_common-${pkgver}.tar.gz::https://github.com/minetest/common/tarball/${pkgver})
-md5sums=('a8cacba57659c397fb8098881eb0c5f9'
-         '1023ac25a83d1431c861d7947e962675'
-         '54a805066c509478f6983b359f2e91fc')
+	${pkgname}_game-${pkgver}.tar.gz::https://github.com/minetest/${pkgname}_game/tarball/${pkgver})
+md5sums=('232b87ef5c4300ddad7bc883f8f1a1c5'
+         '30a9965667470ebc785979de665d4df4')
 
 build() {
   cd "$srcdir"/minetest-minetest-*
@@ -32,8 +30,7 @@ package() {
   make DESTDIR="$pkgdir" install
 
   mv -v "$srcdir"/minetest-minetest_game-* "$pkgdir"/usr/share/minetest/games/minetest
-  mv -v "$srcdir"/minetest-common-* "$pkgdir"/usr/share/minetest/games/common
   
   # small cleanup
-  rm "$pkgdir"/usr/share/minetest/games/{minetest,common}/.gitignore
+  rm "$pkgdir"/usr/share/minetest/games/minetest/.gitignore
 }
diff --git a/community/qtractor/PKGBUILD b/community/qtractor/PKGBUILD
index 8df244ddb..4a64204a5 100644
--- a/community/qtractor/PKGBUILD
+++ b/community/qtractor/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 87090 2013-03-26 23:07:30Z schiv $
+# $Id: PKGBUILD 92566 2013-06-08 18:10:04Z schiv $
 # Maintainer: Ray Rashif <schiv@archlinux.org>
 # Contributor: Philipp Überbacher <hollunder at gmx dot at>
 
 pkgname=qtractor
-pkgver=0.5.8
+pkgver=0.5.9
 pkgrel=1
 pkgdesc="Audio/MIDI multitrack sequencer"
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ makedepends=('ladspa' 'dssi')
 [ "$CARCH" = "i686" ] && optdepends=('dssi-vst: win32 VST support')
 install=qtractor.install
 source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('22abf4de4d5736f794e174ef06fe3a3c')
+md5sums=('92e18a45e8a378761119440eb677a908')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
@@ -25,7 +25,7 @@ build() {
 }
 
 package () {
-	cd "$srcdir/$pkgname-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
 
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/xbindkeys/PKGBUILD b/community/xbindkeys/PKGBUILD
index 178cdc1bd..73adc63b4 100644
--- a/community/xbindkeys/PKGBUILD
+++ b/community/xbindkeys/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 82045 2013-01-06 10:49:31Z bluewind $
+# $Id: PKGBUILD 92556 2013-06-08 11:18:52Z bpiotrowski $
 # Maintainer: Florian Pritz <bluewind@xinu.at>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Thayer Williams <thayer@archlinux.org>
 
 pkgname=xbindkeys
 pkgver=1.8.5
-pkgrel=3
+pkgrel=4
 pkgdesc="Launch shell commands with your keyboard or your mouse under X"
 arch=('i686' 'x86_64')
 url="http://www.nongnu.org/xbindkeys/xbindkeys.html"