Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts: community-staging/gource/PKGBUILD community-staging/performous/PKGBUILD community-staging/wt/PKGBUILD extra/cups/PKGBUILD extra/libwacom/PKGBUILD extra/python-urwid/PKGBUILD multilib/lib32-dbus-core/PKGBUILD multilib/lib32-glib2/PKGBUILD multilib/lib32-gtk2/PKGBUILD multilib/lib32-mpg123/PKGBUILD multilib/lib32-readline/PKGBUILD staging/hugin/PKGBUILD testing/cups/PKGBUILD testing/cups/cups-no-gzip-man.patch testing/cups/cups-systemd-socket.patch testing/cups/cups.install testing/systemd/PKGBUILD
author: Michał Masłowski <mtjm@mtjm.eu> 2012-07-30 14:59:24 +0200
committer: Michał Masłowski <mtjm@mtjm.eu> 2012-07-30 14:59:24 +0200
commit: 09dd4a97fccc4bcabe341c4e4490004385283e53 (patch)
tree: d00a22a0304969ff70ecc680f3e89b5fab1ecce6
parent: 3a3f329b736af639fdd3c9621816bad627b96903 (diff)
parent: 4982c269b318734d01ad30c6592fbb73565ceb12 (diff)
143 files changed, 2493 insertions, 5045 deletions
diff --git a/community-staging/cdfs/PKGBUILD b/community-staging/cdfs/PKGBUILD
deleted file mode 100644
index 4ac07ebdd..000000000
--- a/community-staging/cdfs/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 74197 2012-07-22 19:49:11Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar>
-
-pkgname=cdfs
-pkgver=2.6.27
-pkgrel=25
-pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files."
-arch=(i686 x86_64)
-url="http://www.elis.UGent.be/~ronsse/cdfs/"
-license=('GPL')
-makedepends=('linux-headers')
-install=cdfs.install
-source=("http://www.elis.UGent.be/~ronsse/cdfs/download/$pkgname-$pkgver.tar.bz2"
-	"cdfs-3.0.patch"
-	"cdfs-3.2.patch"
-	"cdfs-3.4.patch")
-md5sums=('ac64c014a90e3c488394832ea29605b3'
-         'aba7da94a9dcbb8a93ea423cb6958fef'
-         'e934407b3460257a301822ffc4ab3933'
-         '9215e7bdac728bd2f889fb525e543454')
-
-build() {
-  _kernver=`pacman -Q linux | cut -d . -f 2 | cut -f 1 -d -`
-  depends=("linux>=3.${_kernver}" "linux<3.`expr ${_kernver} + 1`")
-  _kernverfull=`cat /usr/lib/modules/extramodules-3.${_kernver}-ARCH/version`
-
-  cd $srcdir/$pkgname-$pkgver
-  patch -p1 <$srcdir/cdfs-3.0.patch
-  patch -p1 <$srcdir/cdfs-3.2.patch
-  patch -p1 <$srcdir/cdfs-3.4.patch
-  make KDIR=/usr/lib/modules/${_kernverfull}/build
-  install -Dm0644 cdfs.ko $pkgdir/usr/lib/modules/extramodules-3.${_kernver}-ARCH/cdfs.ko
-  sed -i "s|extramodules-.*-ARCH|extramodules-3.${_kernver}-ARCH|" $startdir/cdfs.install
-}
diff --git a/community-staging/cdfs/cdfs-3.0.patch b/community-staging/cdfs/cdfs-3.0.patch
deleted file mode 100644
index 20194b848..000000000
--- a/community-staging/cdfs/cdfs-3.0.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-diff -wbBur cdfs-2.6.27/cddata.c cdfs-2.6.27.my/cddata.c
---- cdfs-2.6.27/cddata.c	2009-12-21 17:04:03.000000000 +0300
-+++ cdfs-2.6.27.my/cddata.c	2011-07-24 21:18:44.000000000 +0400
-@@ -83,7 +83,7 @@
- #else
-   .mmap             = generic_file_readonly_mmap,
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
--  .sendfile         = generic_file_sendfile
-+//  .sendfile         = generic_file_sendfile
- #else
-   .splice_read      = generic_file_splice_read
- #endif
-diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c
---- cdfs-2.6.27/root.c	2009-12-21 16:38:31.000000000 +0300
-+++ cdfs-2.6.27.my/root.c	2011-07-25 13:16:59.000000000 +0400
-@@ -32,19 +30,14 @@
-  *	Added code to transform /proc/cdfs into a sequential synthetic file.  *
-  *++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
- 
--
- #include <linux/seq_file.h>
--
--#ifndef OLD_KERNEL
- #include <linux/statfs.h>
--#endif
-+#include <linux/sched.h>
- 
- extern struct seq_operations cdfs_operations;
- extern struct _track_info *dummy_track_p;
- 
--#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24) 
- struct inode *cdfs_iget(struct super_block *sp, unsigned long ino); 
--#endif
- /*============================================================================*
-  *  cdfs_open()                                                               *
-  *	Description:                                                          *
-@@ -115,15 +108,8 @@
- 
- /********************************************************************/
- 
--#ifdef OLD_KERNEL
--static struct super_block * cdfs_mount(struct super_block *sb, void *data, int silent){
--  kdev_t dev = sb->s_dev;
--  int i, j, t;
--  struct cdrom_tochdr  hdr;
--#else
- static int cdfs_fill_super(struct super_block *sb, void *data, int silent){
-   int i, t;
--#endif
-   struct cdrom_tocentry   entry;   
-   int no_audio=0, no_data=0;
-   cd * this_cd;
-@@ -131,24 +117,13 @@
- 
-   PRINT("cdfs_mount\n");
- 
--#ifdef OLD_KERNEL
--  MOD_INC_USE_COUNT;
--
--  set_blocksize(dev, CD_FRAMESIZE);  // voor bread met ide-cd
--#else
-   sb_set_blocksize(sb, CD_FRAMESIZE);  // voor bread met ide-cd
--#endif
- 
-   sb->s_blocksize = CD_FRAMESIZE;
-   sb->s_blocksize_bits = 11;
- 
-   if (!(this_cd = cdfs_info(sb) = kmalloc(sizeof(cd), GFP_KERNEL))){
--#ifdef OLD_KERNEL
--    MOD_DEC_USE_COUNT;     
--    return NULL;
--#else
-     return -ENOMEM;
--#endif
-   }
- 
-   this_cd->mode           = MODE;
-@@ -160,13 +135,8 @@
- 
-   // Initialize cache for maximum sector size
-   if (!(this_cd->cache = kmalloc(CD_FRAMESIZE_RAWER*CACHE_SIZE, GFP_KERNEL))) {
--#ifdef OLD_KERNEL
--    MOD_DEC_USE_COUNT;
--    return NULL;
--#else
-     kfree(cdfs_info(sb));
-     return -ENOMEM;
--#endif
-   }
- 
-   // Cache is still invalid
-@@ -183,23 +153,13 @@
-   if (this_cd->toc_scsi){
-     if (cdfs_toc_read_full(sb)){
-       printk("TOC read failed\n");
--#ifdef OLD_KERNEL
--      MOD_DEC_USE_COUNT;
--      return NULL;
--#else
-       goto invalid;
--#endif
-     }
-   } else {
-     //if (cdfs_ioctl(sb, CDROMREADTOCHDR, (unsigned long)&hdr)){
-     if (cdfs_toc_read(sb)){
-       printk("cdfs_toc_read failed\n");
--#ifdef OLD_KERNEL
--      MOD_DEC_USE_COUNT;
--      return NULL;
--#else
-       goto invalid;
--#endif
-     }
-   }
- 
-@@ -365,11 +325,7 @@
-   sb->s_flags |= MS_RDONLY;
-   sb->s_op     = &cdfs_ops;
-   /* always get inode status */
--#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24)
-   retinode=cdfs_iget(sb, 0);
--#else
--  retinode=iget(sb, 0);
--#endif
-   if ( IS_ERR(retinode) )
-     return PTR_ERR(retinode);
- 
-@@ -379,16 +335,12 @@
- 
-   cdfs_proc_cd = this_cd;
- 
--#ifdef OLD_KERNEL
--  return sb;
--#else
-   return 0;
- 
- invalid:
-   kfree(this_cd->cache);
-   kfree(cdfs_info(sb));
-   return -EINVAL;
--#endif
- }
- 
- /************************************************************************/
-@@ -410,27 +362,12 @@
-   // Remove /proc entry
-   cdfs_proc_cd = NULL; 
-   kfree(cdfs_info(sb));
--
--#ifdef OLD_KERNEL
--  MOD_DEC_USE_COUNT;
--#endif
--
- }
- 
- /************************************************************************/
- 
--#ifdef OLD_KERNEL
--static int cdfs_statfs(struct super_block *sb, struct statfs *buf) {
--  cd * this_cd = cdfs_info(sb);
--#else
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
- static int cdfs_statfs(struct dentry *d, struct kstatfs *buf) {
-   cd * this_cd = cdfs_info(d->d_sb);
--#else
--static int cdfs_statfs(struct super_block *sb, struct kstatfs *buf) {
--  cd * this_cd = cdfs_info(sb);
--#endif
--#endif
-   PRINT("rmfs_statfs\n");
- 
-   buf->f_type    = CDFS_MAGIC;
-@@ -460,11 +397,7 @@
- 
- /************************************************************************/
- 
--#ifdef OLD_KERNEL
--static struct dentry * cdfs_lookup(struct inode *dir, struct dentry *dentry){
--#else
- static struct dentry * cdfs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd){
--#endif
-   struct inode * inode;
-   int i;
-   cd * this_cd = cdfs_info(dir->i_sb);
-@@ -480,15 +413,9 @@
- /* Use goto and read inode with iget()/cdfs_iget() */
- /* Thanks to David Howells for patch and Master class in his mail */
- found:
--#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24)
- inode = cdfs_iget(dir->i_sb, i);
- if (IS_ERR(inode))
-   return ERR_CAST(inode);
--#else
--  inode = iget(dir->i_sb, i);
--  if (!inode)
--    return ERR_PTR(-ENOMEM);
--#endif
- d_add(dentry, inode);
- return NULL;
- }
-@@ -529,12 +456,8 @@
-     i->i_fop   = &cdfs_dir_operations;
-   } else {                                          /* file */
-     i->i_size  = this_cd->track[i->i_ino].size;
--#ifdef OLD_KERNEL
--    i->i_mtime = i->i_atime = i->i_ctime = this_cd->track[i->i_ino].time;
--#else
-     i->i_mtime.tv_sec = i->i_atime.tv_sec = i->i_ctime.tv_sec = this_cd->track[i->i_ino].time;
-     i->i_mtime.tv_nsec = i->i_atime.tv_nsec = i->i_ctime.tv_nsec = 0;
--#endif
-     i->i_mode  = this_cd->mode;
-     if ((this_cd->track[i->i_ino].type==DATA) && this_cd->track[i->i_ino].iso_size) {
-       i->i_fop          = &cdfs_cddata_file_operations; 
-@@ -587,33 +510,21 @@
- /******************************************************************/
- 
- static struct super_operations cdfs_ops = {
--#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
--  .read_inode = cdfs_read_inode,
--#endif
-   .put_super  = cdfs_umount,
-   .statfs     = cdfs_statfs
- };
- 
--#ifdef OLD_KERNEL
--static DECLARE_FSTYPE_DEV(cdfs_fs_type, FSNAME, cdfs_mount);
--#else
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
--static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) {
--  return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super, mnt);
--#else
--static struct super_block *cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) {
--  return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super);
--#endif
--}
-+//static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) {
-+//  return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super, mnt);
-+//}
- 
- static struct file_system_type cdfs_fs_type = {
-   .owner    = THIS_MODULE,
-   .name     = "cdfs",
--  .get_sb   = cdfs_get_sb,
-+//  .get_sb   = cdfs_get_sb,
-   .kill_sb  = kill_block_super,
-   .fs_flags = FS_REQUIRES_DEV
- };
--#endif
- 
- /******************************************************/
- 
-@@ -621,10 +532,6 @@
- MODULE_DESCRIPTION("CDfs: a CD filesystem");
- MODULE_LICENSE("GPL"); 
- 
--#ifdef OLD_KERNEL
--EXPORT_NO_SYMBOLS;
--#endif
--
- /******************************************************************/
- 
- static int __init cdfs_init(void) {
-@@ -676,11 +583,7 @@
-   
-   if (!options) return;
-   
--#ifdef OLD_KERNEL
--  for (this_char = strtok(options,","); this_char; this_char = strtok(NULL,",")) {
--#else
-   while ((this_char = strsep(&options,",")) != NULL) {
--#endif
-     
-     if (!strcmp(this_char,"single")) 
-       this_cd->single=TRUE;
diff --git a/community-staging/cdfs/cdfs-3.2.patch b/community-staging/cdfs/cdfs-3.2.patch
deleted file mode 100644
index d3300bdbc..000000000
--- a/community-staging/cdfs/cdfs-3.2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c
---- cdfs-2.6.27/root.c	2009-12-21 16:38:31.000000000 +0300
-+++ cdfs-2.6.27.my/root.c	2012-01-18 11:23:03.000000000 +0400
-@@ -517,7 +517,7 @@
-   
-   i->i_uid        = this_cd->uid;
-   i->i_gid        = this_cd->gid;
--  i->i_nlink      = 1;
-+  i->__i_nlink      = 1;
-   i->i_op         = &cdfs_inode_operations;
-   i->i_fop        = NULL;
-   i->i_data.a_ops = NULL;
diff --git a/community-staging/cdfs/cdfs-3.4.patch b/community-staging/cdfs/cdfs-3.4.patch
deleted file mode 100644
index 5c2cb9b24..000000000
--- a/community-staging/cdfs/cdfs-3.4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c
---- cdfs-2.6.27/root.c	2009-12-21 16:38:31.000000000 +0300
-+++ cdfs-2.6.27.my/root.c	2012-06-15 17:09:27.000000000 +0400
-@@ -375,7 +375,7 @@
- 
-   PRINT("retinode = %ld\n", retinode->i_ino);
- 
--  sb->s_root   = d_alloc_root(retinode);
-+  sb->s_root   = d_make_root(retinode);
- 
-   cdfs_proc_cd = this_cd;
- 
diff --git a/community-staging/cdfs/cdfs.install b/community-staging/cdfs/cdfs.install
deleted file mode 100644
index 6be46f6d5..000000000
--- a/community-staging/cdfs/cdfs.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  EXTRAMODULES='extramodules-3.4-ARCH'
-  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_upgrade() {
-  EXTRAMODULES='extramodules-3.4-ARCH'
-  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_remove() {
-  EXTRAMODULES='extramodules-3.4-ARCH'
-  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
diff --git a/community-staging/couchdb/PKGBUILD b/community-staging/couchdb/PKGBUILD
deleted file mode 100644
index abd01c86d..000000000
--- a/community-staging/couchdb/PKGBUILD
+++ /dev/null
@@ -1,45 +0,0 @@
-# $Id: PKGBUILD 74205 2012-07-22 21:09:13Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Vitaliy Berdinskikh ur6lad[at]i.ua
-# Contributor: Michael Fellinger <m.fellinger@gmail.com>
-
-pkgname=couchdb
-pkgver=1.2.0
-pkgrel=4
-pkgdesc="A document-oriented database that can be queried and indexed in a MapReduce fashion using JSON"
-arch=('i686' 'x86_64')
-url="http://couchdb.apache.org"
-license=('APACHE')
-depends=('icu' 'erlang' 'js' 'openssl' 'curl')
-install=couchdb.install
-options=('!libtool')
-backup=('etc/couchdb/local.ini'
-	'etc/conf.d/couchdb'
-	'etc/logrotate.d/couchdb')
-source=("http://www.apache.org/dist/couchdb/releases/${pkgver}/apache-${pkgname}-${pkgver}.tar.gz"{,.asc}
-        "rc-script.patch")
-md5sums=('a5cbbcaac288831b3d8a08b725657f10'
-         '890a85b22219ea113a4901a289c442f8'
-         '8a3b1a1ff98a6411827ad991db7a355b')
-
-build() {
-  cd "$srcdir/apache-$pkgname-$pkgver"
-
-  ./configure --prefix=/usr \
-    --sysconfdir=/etc \
-    --localstatedir=/var
-  make
-  
-  patch -R etc/init/couchdb <$srcdir/rc-script.patch
-}
-
-package() {
-  cd "$srcdir/apache-$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 etc/default/couchdb $pkgdir/etc/conf.d/couchdb
-  sed -i 's|\(CONFIGURATION_FILE=/etc/\)default\(/couchdb\)|\1conf.d\2|' $pkgdir/etc/rc.d/couchdb
-  sed -i 's|\(COUCHDB_OPTIONS=\)|\1"-p /var/run/couchdb/couchdb.pid"|' $pkgdir/etc/conf.d/couchdb
-
-  rm -rf $pkgdir/etc/default/ $pkgdir/var/run
-}
diff --git a/community-staging/couchdb/couchdb.install b/community-staging/couchdb/couchdb.install
deleted file mode 100644
index 5eff459c7..000000000
--- a/community-staging/couchdb/couchdb.install
+++ /dev/null
@@ -1,22 +0,0 @@
-post_install() {
-	id couchdb &>/dev/null || \
-		useradd -r -c "CouchDB daemon" -g daemon -d /var/lib/couchdb -s /bin/false couchdb
-	mkdir -p /var/run/couchdb
-	chown -R couchdb.daemon /etc/couchdb
-	chown -R couchdb.daemon /var/{lib,log,run}/couchdb
-}
-
-pre_upgrade() {
-	id couchdb &>/dev/null || \
-		useradd -r -c "CouchDB daemon" -g daemon -d /var/lib/couchdb -s /bin/false couchdb
-}
-
-post_upgrade() {
-	mkdir -p $pkgdir/var/run/couchdb
-	chown -R couchdb.daemon /etc/couchdb
-	chown -R couchdb.daemon /var/{lib,log,run}/couchdb
-}
-
-post_remove() {
-	userdel couchdb &>/dev/null
-}
diff --git a/community-staging/couchdb/rc-script.patch b/community-staging/couchdb/rc-script.patch
deleted file mode 100644
index 1dd723ffc..000000000
--- a/community-staging/couchdb/rc-script.patch
+++ /dev/null
@@ -1,57 +0,0 @@
---- couchdb	2011-12-27 01:21:59.000000000 +0400
-+++ couchdb.my	2011-12-27 01:21:18.000000000 +0400
-@@ -1,6 +1,4 @@
--#!/bin/bash
--. /etc/rc.conf
--. /etc/rc.d/functions
-+#!/bin/sh -e
- 
- # Licensed under the Apache License, Version 2.0 (the "License"); you may not
- # use this file except in compliance with the License. You may obtain a copy of
-@@ -31,7 +29,7 @@
- NAME=couchdb
- SCRIPT_NAME=`basename $0`
- COUCHDB=/usr/bin/couchdb
--CONFIGURATION_FILE=/etc/conf.d/couchdb
-+CONFIGURATION_FILE=/etc/default/couchdb
- RUN_DIR=/var/run/couchdb
- LSB_LIBRARY=/lib/lsb/init-functions
- 
-@@ -44,14 +42,16 @@
- fi
- 
- log_daemon_msg () {
--    stat_busy $@
-+    # Dummy function to be replaced by LSB library.
-+
-+    echo $@
- }
- 
- log_end_msg () {
-+    # Dummy function to be replaced by LSB library.
-+
-     if test "$1" != "0"; then
--      stat_fail
--    else
--      stat_done
-+      echo "Error with $DESCRIPTION: $NAME"
-     fi
-     return $1
- }
-@@ -66,7 +66,7 @@
-         command="$command $COUCHDB_OPTIONS"
-     fi
-     if test -n "$COUCHDB_USER"; then
--        if su $COUCHDB_USER -s /bin/bash -c "$command"; then
-+        if su $COUCHDB_USER -c "$command"; then
-             return $SCRIPT_OK
-         else
-             return $SCRIPT_ERROR
-@@ -84,7 +84,6 @@
-     # Start Apache CouchDB as a background process.
- 
-     mkdir -p "$RUN_DIR"
--    chown -R $COUCHDB_USER "$RUN_DIR"
-     command="$COUCHDB -b"
-     if test -n "$COUCHDB_STDOUT_FILE"; then
-         command="$command -o $COUCHDB_STDOUT_FILE"
diff --git a/community-staging/fatrat/PKGBUILD b/community-staging/fatrat/PKGBUILD
deleted file mode 100644
index 195e8644a..000000000
--- a/community-staging/fatrat/PKGBUILD
+++ /dev/null
@@ -1,35 +0,0 @@
-# $Id: PKGBUILD 73722 2012-07-14 15:53:10Z stativ $
-# Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
-pkgname=fatrat
-pkgver=1.2.0_beta2
-pkgrel=1
-pkgdesc="QT4 based download manager with support for HTTP, FTP, SFTP, BitTorrent, rapidshare and more"
-arch=('i686' 'x86_64')
-url="http://fatrat.dolezel.info/"
-license=('GPL')
-depends=('gloox' 'qt' 'libtorrent-rasterbar' 'pion-net' 'qtwebkit')
-optdepends=('geoip: GeoIP support')
-makedepends=('boost' 'cmake' 'java-environment')
-source=(http://www.dolezel.info/download/data/fatrat/fatrat-$pkgver.tar.xz)
-md5sums=('ad823d2a81f0583316ece815b928c71b')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  . /etc/profile.d/jre.sh
-  . /etc/profile.d/jdk.sh
-
-  cmake \
-    -DWITH_EVERYTHING=ON \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    .
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/community-staging/freemat/ChangeLog b/community-staging/freemat/ChangeLog
deleted file mode 100644
index dba4cf7ec..000000000
--- a/community-staging/freemat/ChangeLog
+++ /dev/null
@@ -1,3 +0,0 @@
-2007-06-27 tardo <tardo@nagi-fanboi.net>
-* Built for x86_64
-
diff --git a/community-staging/freemat/PKGBUILD b/community-staging/freemat/PKGBUILD
deleted file mode 100644
index 75d39befd..000000000
--- a/community-staging/freemat/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 74207 2012-07-22 21:10:13Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=freemat
-pkgver=4.1
-pkgrel=4
-pkgdesc="A free environment for rapid engineering, scientific prototyping and data processing"
-arch=('i686' 'x86_64')
-url="http://freemat.sourceforge.net"
-license=('GPL')
-depends=('qt' 'ffcall' 'fftw' 'mesa' 'portaudio' 'libffi')
-makedepends=('arpack' 'lapack' 'umfpack' 'blas' 'libmatio' 'cmake' 'python2')
-install=freemat.install
-source=(http://downloads.sourceforge.net/project/freemat/FreeMat4/FreeMat-$pkgver-Source.tar.gz
-	build-fix.patch)
-md5sums=('929d31e2310feaff5d380fc2f7b4d1a2'
-         '2d11a28aa2a7df89c4618ed1c4be5973')
-
-build() {
-  cd $srcdir/FreeMat-$pkgver-Source
-
-  rm -f CMakeCache.txt
-  find . -type f -name '*.moc.cpp' -exec rm -f {} \;
-  find . -type f -name 'add.so' -exec rm -f {} \;
-  patch -p1 <$srcdir/build-fix.patch
-  echo >libs/libMatC/CJitFuncClang.hpp
-  echo >libs/libMatC/CJitFuncClang.cpp
-
-  cmake \
-	-DCMAKE_INSTALL_PREFIX=/usr \
-	-DUSE_LLVM=OFF \
-	-DFFI_INCLUDE_DIR=/usr/lib/libffi-`pacman -Q libffi | cut -f2 -d\ |cut -f1 -d-`/include/ \
-	-DPYTHON_EXECUTABLE=/usr/bin/python2 \
-	.
-  make
-}
-package() {
-  cd $srcdir/FreeMat-$pkgver-Source
-
-  make DESTDIR=$pkgdir install
-  sed -i "s|/FreeMat-.*/|/FreeMat-$pkgver/|g" $startdir/freemat.install
-  rm $pkgdir/usr/bin/blas.ini
-}
diff --git a/community-staging/freemat/build-fix.patch b/community-staging/freemat/build-fix.patch
deleted file mode 100644
index c1ea63088..000000000
--- a/community-staging/freemat/build-fix.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -wbBur FreeMat-4.1-Source/libs/libGraphics/GLRenderEngine.cpp FreeMat-4.1-Source.my/libs/libGraphics/GLRenderEngine.cpp
---- FreeMat-4.1-Source/libs/libGraphics/GLRenderEngine.cpp	2011-11-27 04:27:43.000000000 +0400
-+++ FreeMat-4.1-Source.my/libs/libGraphics/GLRenderEngine.cpp	2012-01-20 19:07:48.000000000 +0400
-@@ -20,6 +20,7 @@
- #include <qimage.h>
- #include <qpainter.h>
- #include <QtOpenGL>
-+#include <GL/glu.h>
- #include <math.h>
- #include "IEEEFP.hpp"
- 
diff --git a/community-staging/freemat/freemat.install b/community-staging/freemat/freemat.install
deleted file mode 100644
index 051cca866..000000000
--- a/community-staging/freemat/freemat.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-  echo "-- Use FreeMat -i /usr/share/FreeMat-4.1/ to adjust docs location"
-}
-
-post_upgrade() {
-  echo "-- Use FreeMat -i /usr/share/FreeMat-4.1/ to adjust docs location"
-}
diff --git a/community-staging/hedgewars/PKGBUILD b/community-staging/hedgewars/PKGBUILD
deleted file mode 100644
index 5259b435e..000000000
--- a/community-staging/hedgewars/PKGBUILD
+++ /dev/null
@@ -1,48 +0,0 @@
-# $Id: PKGBUILD 74209 2012-07-22 21:11:50Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-
-pkgname=hedgewars
-pkgver=0.9.17
-pkgrel=4
-pkgdesc="Free Worms-like turn based strategy game"
-arch=('i686' 'x86_64')
-url="http://hedgewars.org"
-license=('GPL' 'custom')
-depends=('qt' 'sdl' 'sdl_mixer' 'sdl_image' 'sdl_net' 'sdl_ttf' 'lua')
-makedepends=('fpc' 'cmake'
-             # haskell specific
-             'ghc=7.4.2-1'
-	     'haskell-network=2.3.0.14-1' 'haskell-bytestring-show=0.3.5.1-3'
-	     'haskell-utf8-string=0.3.7-2' 'haskell-dataenc=0.14.0.3-2' 
-	     'haskell-hslogger=1.1.5-7')
-source=(http://download.gna.org/hedgewars/hedgewars-src-$pkgver.tar.bz2
-	hedgewars.desktop
-	hedgewars.png)
-md5sums=('77c0bc4bc664604adbba67fab606d8f1'
-         '48c66a3204d4fa0a69e9aa46f7c31e0c'
-         'eeb14d50df39063549ac5eca9dbc65d1')
-
-build() {
-  cd $pkgname-src-$pkgver
-
-#  sed -i 's|.*misc/liblua.*||' CMakeLists.txt
-
-  cmake \
-	-DCMAKE_INSTALL_PREFIX=/usr \
-	-DDATA_INSTALL_DIR=/usr/share \
-	-DQT_QMAKE_EXECUTABLE=/usr/bin/qmake \
-	-DQT_MOC_EXECUTABLE=/usr/bin/moc \
-	-DWITH_SERVER=1 .
-
-  make
-}
-
-package() {
-  cd $pkgname-src-$pkgver
-
-  make DESTDIR=$pkgdir install
-
-  install -D -m644 Fonts_LICENSE.txt $pkgdir/usr/share/licenses/$pkgname/Fonts_LICENSE.txt
-  install -D -m644 $srcdir/hedgewars.png $pkgdir/usr/share/pixmaps/hedgewars.png
-  install -D -m644 $srcdir/hedgewars.desktop $pkgdir/usr/share/applications/hedgewars.desktop
-}
diff --git a/community-staging/hedgewars/hedgewars.desktop b/community-staging/hedgewars/hedgewars.desktop
deleted file mode 100644
index 9d74ed3f1..000000000
--- a/community-staging/hedgewars/hedgewars.desktop
+++ /dev/null
@@ -1,8 +0,0 @@
-[Desktop Entry]
-Type=Application
-Name=Hedgewars
-GenericName=Platform Game
-Comment=Worms style game
-Exec=hedgewars
-Icon=hedgewars
-Categories=Game;ArcadeGame;
-\ No newline at end of file
diff --git a/community-staging/hedgewars/hedgewars.png b/community-staging/hedgewars/hedgewars.png
deleted file mode 100644
index 60ae66199..000000000
--- a/community-staging/hedgewars/hedgewars.png
+++ /dev/null
diff --git a/community-staging/smc/PKGBUILD b/community-staging/smc/PKGBUILD
deleted file mode 100644
index e91975d83..000000000
--- a/community-staging/smc/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 73645 2012-07-12 13:48:41Z stativ $
-# Maintainer:
-# Contributor: Juergen Hoetzel <juergen@archlinux.org>
-# Contributor: Kritoke <typeolinux@yahoo.com>
-
-pkgname=smc
-pkgver=1.9
-pkgrel=16
-pkgdesc="Secret Maryo Chronicles"
-arch=('i686' 'x86_64')
-url="http://www.secretmaryo.org/"
-license=('GPL3')
-depends=('sdl_image' 'sdl_ttf' 'sdl_mixer' 'cegui' 'boost-libs' 'smc-data')
-makedepends=('autoconf' 'automake' 'boost')
-source=(http://downloads.sourceforge.net/smclone/$pkgname-$pkgver.tar.bz2
-        smc-for-cegui-v0-7.diff
-        boost_filesystem3.diff
-        smc.desktop
-        smc.png)
-md5sums=('75ab7826303c49aec25b052a8b90287f'
-         '51dfea21b741ad19df14e738df52f1cf'
-         '309a5a6d4b3c0b3dc5e1b7f4de84086f'
-         '80fe208132ff41dd7677a53ee429ecdb'
-         'efca7580e28748625eb676c9d24ee122')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # to remove when smc will be compatible with cegui-0.7.x
-  patch -Np1 -i "${srcdir}/smc-for-cegui-v0-7.diff"
-  # fix compilation
-  export CXXFLAGS="${CXXFLAGS} -fpermissive"
-  # fix for boost >= 1.50
-  patch -Np1 -i "${srcdir}/boost_filesystem3.diff"
-
-  ./autogen.sh
-  LIBS+="-lX11 -lboost_system" ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make install DESTDIR="$pkgdir"
-  # install some freedesktop.org compatibility
-  install -Dm644 "$srcdir/$pkgname.desktop" "$pkgdir/usr/share/applications/$pkgname.desktop"
-  install -Dm644 "$srcdir/$pkgname.png" "$pkgdir/usr/share/pixmaps/$pkgname.png"
-
-  rm -rf "$pkgdir/usr/share/smc/"
-}
diff --git a/community-staging/smc/boost_filesystem3.diff b/community-staging/smc/boost_filesystem3.diff
deleted file mode 100644
index 6786b98f5..000000000
--- a/community-staging/smc/boost_filesystem3.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-diff -rup smc-1.9/src/core/filesystem/filesystem.cpp smc-1.9.new/src/core/filesystem/filesystem.cpp
---- smc-1.9/src/core/filesystem/filesystem.cpp	2009-07-04 12:11:18.000000000 +0200
-+++ smc-1.9.new/src/core/filesystem/filesystem.cpp	2012-07-12 15:36:31.361941069 +0200
-@@ -142,27 +142,27 @@ vector<std::string> Get_Directory_Files(
- 			if( fs::is_directory( *dir_itr ) )
- 			{
- 				// ignore hidden directories
--				if( dir_itr->path().leaf().find( "." ) == 0 )
-+				if( dir_itr->path().filename().string().find( "." ) == 0 )
- 				{
- 					continue;
- 				}
- 
- 				if( with_directories )
- 				{
--					valid_files.push_back( dir + "/" + dir_itr->path().leaf() );
-+					valid_files.push_back( dir + "/" + dir_itr->path().filename().string() );
- 				}
- 
- 				// load all items from the sub-directory
- 				if( search_in_sub_directories )
- 				{
--					vector<std::string> new_valid_files = Get_Directory_Files( dir + "/" + dir_itr->path().leaf(), file_type, with_directories );
-+					vector<std::string> new_valid_files = Get_Directory_Files( dir + "/" + dir_itr->path().filename().string(), file_type, with_directories );
- 					valid_files.insert( valid_files.end(), new_valid_files.begin(), new_valid_files.end() );
- 				}
- 			}
- 			// valid file
--			else if( file_type.empty() || dir_itr->path().leaf().rfind( file_type ) != std::string::npos )
-+			else if( file_type.empty() || dir_itr->path().filename().string().rfind( file_type ) != std::string::npos )
- 			{
--				valid_files.push_back( dir + "/" + dir_itr->path().leaf() );
-+				valid_files.push_back( dir + "/" + dir_itr->path().filename().string() );
- 			}
- 		}
- 		catch( const std::exception &ex )
-diff -rup smc-1.9/src/overworld/world_manager.cpp smc-1.9.new/src/overworld/world_manager.cpp
---- smc-1.9/src/overworld/world_manager.cpp	2009-08-16 18:44:52.000000000 +0200
-+++ smc-1.9.new/src/overworld/world_manager.cpp	2012-07-12 15:37:13.564660591 +0200
-@@ -118,7 +118,7 @@ void cOverworld_Manager :: Load_Dir( con
- 	{
- 		try
- 		{
--			std::string current_dir = dir_itr->path().leaf();
-+			std::string current_dir = dir_itr->path().filename().string();
- 
- 			// only directories with an existing description
- 			if( fs::is_directory( *dir_itr ) && File_Exists( dir + "/" + current_dir + "/description.xml" ) )
diff --git a/community-staging/smc/smc-for-cegui-v0-7.diff b/community-staging/smc/smc-for-cegui-v0-7.diff
deleted file mode 100644
index a99cbce6c..000000000
--- a/community-staging/smc/smc-for-cegui-v0-7.diff
+++ /dev/null
@@ -1,437 +0,0 @@
-diff -ur smc-1.9/configure.ac smc-1.9-b/configure.ac
---- smc-1.9/configure.ac	2009-08-17 15:59:00.000000000 +0200
-+++ smc-1.9-b/configure.ac	2011-01-19 00:43:37.809884881 +0100
-@@ -53,7 +53,7 @@
- 	AC_MSG_ERROR([SDL_ttf library not found]))
- 
- # Check for the CEGUI library
--PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.5.0)
-+PKG_CHECK_MODULES(CEGUI, CEGUI-OPENGL >= 0.7.0)
- CPPFLAGS="$CPPFLAGS $CEGUI_CFLAGS"
- LIBS="$LIBS $CEGUI_LIBS"
- 
-diff -ur smc-1.9/src/core/editor.cpp smc-1.9-b/src/core/editor.cpp
---- smc-1.9/src/core/editor.cpp	2009-08-13 17:11:42.000000000 +0200
-+++ smc-1.9-b/src/core/editor.cpp	2011-01-19 00:44:46.734328121 +0100
-@@ -118,16 +118,10 @@
- 	return tmp;
- }
- 
--void cEditor_Item_Object :: draw( const CEGUI::Vector3 &position, float alpha, const CEGUI::Rect &clipper ) const
-+void cEditor_Item_Object :: draw( CEGUI::GeometryBuffer &buffer, const CEGUI::Rect &targetRect, float alpha, const CEGUI::Rect *clipper ) const
- {
- 	// draw text
--	list_text->draw( position, alpha, clipper );
--}
--
--void cEditor_Item_Object :: draw( CEGUI::RenderCache &cache, const CEGUI::Rect &targetRect, float zBase, float alpha, const CEGUI::Rect *clipper ) const
--{
--	// draw text
--	list_text->draw( cache, targetRect, zBase, alpha, clipper );
-+	list_text->draw( buffer, targetRect, alpha, clipper );
- }
- 
- void cEditor_Item_Object :: Draw_Image( void )
-@@ -533,12 +527,12 @@
- 	if( editor_window->getXPosition().asRelative( 1 ) >= 0 )
- 	{
- 		// Listbox dimension
--		float list_posy = listbox_items->getUnclippedPixelRect().d_top * global_downscaley;
--		float list_height = listbox_items->getUnclippedPixelRect().getHeight() * global_downscaley;
-+		float list_posy = listbox_items->getUnclippedOuterRect().d_top * global_downscaley;
-+		float list_height = listbox_items->getUnclippedOuterRect().getHeight() * global_downscaley;
- 		// Vertical ScrollBar Position
- 		float scroll_pos = listbox_items->getVertScrollbar()->getScrollPosition() * global_downscaley;
- 		// font height
--		float font_height = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" )->getFontHeight() * global_downscaley;
-+		float font_height = CEGUI::FontManager::getSingleton().get( "bluebold_medium" ).getFontHeight() * global_downscaley;
- 
- 		// draw items
- 		for( unsigned int i = 0; i < listbox_items->getItemCount(); i++ )
-diff -ur smc-1.9/src/core/editor.h smc-1.9-b/src/core/editor.h
---- smc-1.9/src/core/editor.h	2009-02-18 05:21:30.000000000 +0100
-+++ smc-1.9-b/src/core/editor.h	2011-01-19 00:43:37.809884881 +0100
-@@ -62,8 +62,7 @@
- 	*/
- 	virtual	CEGUI::Size getPixelSize( void ) const;
- 	// draw
--	void draw( const CEGUI::Vector3 &position, float alpha, const CEGUI::Rect &clipper ) const;
--	void draw( CEGUI::RenderCache &cache, const CEGUI::Rect &targetRect, float zBase, float alpha, const CEGUI::Rect *clipper) const;
-+	void draw(CEGUI::GeometryBuffer& buffer, const CEGUI::Rect& targetRect, float alpha, const CEGUI::Rect* clipper) const;
- 	// draw image
- 	void Draw_Image( void );
- 
-diff -ur smc-1.9/src/core/game_core.cpp smc-1.9-b/src/core/game_core.cpp
---- smc-1.9/src/core/game_core.cpp	2009-08-16 18:44:42.000000000 +0200
-+++ smc-1.9-b/src/core/game_core.cpp	2011-01-19 00:59:02.668958883 +0100
-@@ -265,7 +265,7 @@
- 
- 
- 	// align text
--	CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
-+	CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
- 	// fixme : Can't handle multiple lines of text
- 	float text_width = font->getTextExtent( text ) * global_downscalex;
- 
-@@ -1182,7 +1182,7 @@
- 	text_default->setText( gui_text );
- 
- 	// align text
--	CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
-+	CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
- 	float text_width = font->getTextExtent( gui_text ) * global_downscalex;
- 
- 	text_default->setWidth( CEGUI::UDim( 0, ( text_width + 15 ) * global_upscalex ) );
-@@ -1190,7 +1190,7 @@
- 	text_default->moveToFront();
- 
- 	// set window height
--	text_default->setHeight( CEGUI::UDim( 0, font->getFontHeight() * font->getFormattedLineCount( gui_text, text_default->getUnclippedInnerRect(), CEGUI::LeftAligned ) + ( 12 * global_upscaley ) ) );
-+	text_default->setHeight( CEGUI::UDim( 0, font->getFontHeight() + ( 12 * global_upscaley ) ) );
- 
- 	while( draw )
- 	{
-diff -ur smc-1.9/src/core/main.cpp smc-1.9-b/src/core/main.cpp
---- smc-1.9/src/core/main.cpp	2009-05-12 10:36:04.000000000 +0200
-+++ smc-1.9-b/src/core/main.cpp	2011-01-19 00:43:37.809884881 +0100
-@@ -444,13 +444,15 @@
- 
- 	if( pGuiSystem )
- 	{
--		delete pGuiSystem;
-+		CEGUI::ResourceProvider* rp = pGuiSystem->getResourceProvider();
-+		pGuiSystem->destroy();
- 		pGuiSystem = NULL;
-+		delete rp;
- 	}
- 
- 	if( pGuiRenderer )
- 	{
--		delete pGuiRenderer;
-+		pGuiRenderer->destroy( *pGuiRenderer );
- 		pGuiRenderer = NULL;
- 	}
- 
-@@ -507,7 +509,7 @@
- 		}
- 		case SDL_VIDEORESIZE:
- 		{
--			pGuiRenderer->setDisplaySize( CEGUI::Size( static_cast<float>(ev->resize.w), static_cast<float>(ev->resize.h) ) );
-+			pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast<float>(ev->resize.w), static_cast<float>(ev->resize.h) ) );
- 			break;
- 		}
- 		case SDL_KEYDOWN:
-diff -ur smc-1.9/src/gui/hud.cpp smc-1.9-b/src/gui/hud.cpp
---- smc-1.9/src/gui/hud.cpp	2009-05-01 15:00:16.000000000 +0200
-+++ smc-1.9-b/src/gui/hud.cpp	2011-01-19 00:43:37.816550365 +0100
-@@ -946,7 +946,7 @@
- 		m_text_debug_text->setVisible( 1 );
- 
- 		// update position
--		CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
-+		CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
- 		float text_width = font->getTextExtent( gui_text ) * global_downscalex;
- 
- 		if( text_width > 800.0f )
-diff -ur smc-1.9/src/input/mouse.cpp smc-1.9-b/src/input/mouse.cpp
---- smc-1.9/src/input/mouse.cpp	2009-04-24 21:16:58.000000000 +0200
-+++ smc-1.9-b/src/input/mouse.cpp	2011-01-19 00:43:37.813217623 +0100
-@@ -432,17 +432,12 @@
- 
- void cMouseCursor :: Render( void ) const
- {
--	if( !m_active )
--	{
-+	CEGUI::MouseCursor *mouse = CEGUI::MouseCursor::getSingletonPtr();
-+
-+	if ( m_active == mouse->isVisible() )
- 		return;
--	}
- 
--	// Render CEGUI Mouse
--	pGuiRenderer->setQueueingEnabled( 0 );
--	CEGUI::MouseCursor *mouse = CEGUI::MouseCursor::getSingletonPtr();
--	mouse->setVisible( 1 );
--	mouse->draw();
--	mouse->setVisible( 0 );
-+	mouse->setVisible( m_active );
- }
- 
- void cMouseCursor :: Update_Position( void )
-diff -ur smc-1.9/src/level/level_settings.cpp smc-1.9-b/src/level/level_settings.cpp
---- smc-1.9/src/level/level_settings.cpp	2009-08-07 03:04:28.000000000 +0200
-+++ smc-1.9-b/src/level/level_settings.cpp	2011-01-19 01:06:59.064259070 +0100
-@@ -163,8 +163,8 @@
- 	editbox->setText( int_to_string( bg_color_2.blue ).c_str() );
- 	// preview window
- 	CEGUI::Window *window_background_preview = CEGUI::WindowManager::getSingleton().getWindow( "window_background_preview" );
--	background_preview->Set_Pos_X( window_background_preview->getUnclippedPixelRect().d_left * global_downscalex, 1 );
--	background_preview->Set_Pos_Y( window_background_preview->getUnclippedPixelRect().d_top * global_downscaley, 1 );
-+	background_preview->Set_Pos_X( window_background_preview->getUnclippedOuterRect().d_left * global_downscalex, 1 );
-+	background_preview->Set_Pos_Y( window_background_preview->getUnclippedOuterRect().d_top * global_downscaley, 1 );
- 
- 	Update_BG_Colors( CEGUI::EventArgs() );
- 
-@@ -555,8 +555,8 @@
- 
- 	// set default rect
- 	CEGUI::Window *window_background_preview = CEGUI::WindowManager::getSingleton().getWindow( "window_background_preview" );
--	background_preview->m_rect.m_w = window_background_preview->getUnclippedPixelRect().getWidth() * global_downscalex;
--	background_preview->m_rect.m_h = window_background_preview->getUnclippedPixelRect().getHeight() * global_downscaley;
-+	background_preview->m_rect.m_w = window_background_preview->getUnclippedOuterRect().getWidth() * global_downscalex;
-+	background_preview->m_rect.m_h = window_background_preview->getUnclippedOuterRect().getHeight() * global_downscaley;
- 
- 	if( !File_Exists( filename ) )
- 	{
-diff -ur smc-1.9/src/objects/sprite.cpp smc-1.9-b/src/objects/sprite.cpp
---- smc-1.9/src/objects/sprite.cpp	2009-04-18 09:55:06.000000000 +0200
-+++ smc-1.9-b/src/objects/sprite.cpp	2011-01-19 00:43:37.813217623 +0100
-@@ -1663,7 +1663,7 @@
- 	window_name->setText( name );
- 	window_name->setTooltipText( tooltip );
- 	// get text width
--	CEGUI::Font *font = CEGUI::FontManager::getSingleton().getFont( "bluebold_medium" );
-+	CEGUI::Font *font = &CEGUI::FontManager::getSingleton().get( "bluebold_medium" );
- 	float text_width = 12 + font->getTextExtent( name ) * global_downscalex;
- 	// all names should have the same width
- 	if( text_width > m_editor_window_name_width )
-diff -ur smc-1.9/src/video/video.cpp smc-1.9-b/src/video/video.cpp
---- smc-1.9/src/video/video.cpp	2009-07-04 11:46:56.000000000 +0200
-+++ smc-1.9-b/src/video/video.cpp	2011-01-19 01:22:45.338524592 +0100
-@@ -103,15 +103,15 @@
- 
- /* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */
- 
--cFake_Renderer :: cFake_Renderer( void )
--{
--	d_identifierString = "Fake Renderer";
--}
-+//cFake_Renderer :: cFake_Renderer( void )
-+//{
-+//	d_identifierString = "Fake Renderer";
-+//}
- 
--cFake_Renderer :: ~cFake_Renderer( void )
--{
-+//cFake_Renderer :: ~cFake_Renderer( void )
-+//{
- 
--}
-+//}
- 
- /* *** *** *** *** *** *** *** Video class *** *** *** *** *** *** *** *** *** *** */
- 
-@@ -158,7 +158,7 @@
- 	std::string log_dump_dir = "/dev/null";
- #endif
- 	// create fake system and renderer
--	pGuiSystem = new CEGUI::System( new cFake_Renderer(), rp, NULL, NULL, "", log_dump_dir );
-+	pGuiSystem = &CEGUI::System::create( *new cFake_Renderer(), rp, NULL, NULL, NULL, "", log_dump_dir );
- }
- 
- void cVideo :: Delete_CEGUI_Fake( void ) const
-@@ -166,7 +166,7 @@
- 	CEGUI::ResourceProvider *rp = pGuiSystem->getResourceProvider();
- 	CEGUI::Renderer *renderer = pGuiSystem->getRenderer();
- 
--	delete pGuiSystem;
-+	pGuiSystem->destroy();
- 	pGuiSystem = NULL;
- 	delete renderer;
- 	delete rp;
-@@ -177,7 +177,7 @@
- 	// create renderer
- 	try
- 	{
--		pGuiRenderer = new CEGUI::OpenGLRenderer( 0, screen->w, screen->h );
-+		pGuiRenderer = &CEGUI::OpenGLRenderer::create( CEGUI::Size( screen->w, screen->h ) );
- 	}
- 	// catch CEGUI Exceptions
- 	catch( CEGUI::Exception &ex )
-@@ -186,10 +186,10 @@
- 		exit( EXIT_FAILURE );
- 	}
- 
--	/* create Resource Provider
--	 * no need to destroy it later since it is handled by the CEGUI renderer
--	*/
--	CEGUI::DefaultResourceProvider *rp = static_cast<CEGUI::DefaultResourceProvider *>(pGuiRenderer->createResourceProvider());
-+	pGuiRenderer->enableExtraStateSettings(true);
-+
-+	// create Resource Provider
-+	CEGUI::DefaultResourceProvider *rp = new CEGUI::DefaultResourceProvider;
- 
- 	// set Resource Provider directories
- 	rp->setResourceGroupDirectory( "schemes", DATA_DIR "/" GUI_SCHEME_DIR "/" );
-@@ -215,7 +215,7 @@
- 	// create system
- 	try
- 	{
--		pGuiSystem = new CEGUI::System( pGuiRenderer, rp, NULL, NULL, "", pResource_Manager->user_data_dir + "cegui.log" );
-+		pGuiSystem = &CEGUI::System::create( *pGuiRenderer, rp, NULL, NULL, NULL, "", pResource_Manager->user_data_dir + "cegui.log" );
- 	}
- 	// catch CEGUI Exceptions
- 	catch( CEGUI::Exception &ex )
-@@ -242,7 +242,7 @@
- 	// load the scheme file, which auto-loads the imageset
- 	try
- 	{
--		CEGUI::SchemeManager::getSingleton().loadScheme( "TaharezLook.scheme" );
-+		CEGUI::SchemeManager::getSingleton().create( "TaharezLook.scheme" );
- 	}
- 	// catch CEGUI Exceptions
- 	catch( CEGUI::Exception &ex )
-@@ -254,9 +254,7 @@
- 	// default mouse cursor
- 	pGuiSystem->setDefaultMouseCursor( "TaharezLook", "MouseArrow" );
- 	// force new mouse image
--	CEGUI::MouseCursor::getSingleton().setImage( &CEGUI::ImagesetManager::getSingleton().getImageset( "TaharezLook" )->getImage( "MouseArrow" ) );
--	// hide CEGUI mouse always because we render it manually
--	CEGUI::MouseCursor::getSingleton().hide();
-+	CEGUI::MouseCursor::getSingleton().setImage( &CEGUI::ImagesetManager::getSingleton().get( "TaharezLook" ).getImage( "MouseArrow" ) );
- 	// default tooltip
- 	pGuiSystem->setDefaultTooltip( "TaharezLook/Tooltip" );
- 	// create default root window
-@@ -553,7 +551,7 @@
- 		pFont->Restore_Textures();
- 
- 		// send new size to CEGUI
--		pGuiRenderer->setDisplaySize( CEGUI::Size( static_cast<float>(screen_w), static_cast<float>(screen_h) ) );
-+		pGuiSystem->notifyDisplaySizeChanged( CEGUI::Size( static_cast<float>(screen_w), static_cast<float>(screen_h) ) );
- 
- 		// check if CEGUI is initialized
- 		bool cegui_initialized = pGuiSystem->getGUISheet() != NULL;
-diff -ur smc-1.9/src/video/video.h smc-1.9-b/src/video/video.h
---- smc-1.9/src/video/video.h	2009-07-04 10:49:50.000000000 +0200
-+++ smc-1.9-b/src/video/video.h	2011-01-19 01:16:42.791283379 +0100
-@@ -23,7 +23,7 @@
- #include "SDL_opengl.h"
- // CEGUI
- #include "CEGUI.h"
--#include "RendererModules/OpenGLGUIRenderer/openglrenderer.h"
-+#include <RendererModules/OpenGL/CEGUIOpenGLRenderer.h>
- 
- namespace SMC
- {
-@@ -129,31 +129,100 @@
- 	EFFECT_IN_AMOUNT
- };
- 
--/* *** *** *** *** *** *** *** CEGUI renderer fake class *** *** *** *** *** *** *** *** *** *** */
-+/* *** *** *** *** *** *** *** CEGUI renderer fake classes *** *** *** *** *** *** *** *** *** *** */
-+// CEGUI 0.7.x requires more 'fake' classes than the 0.6.x version did...
-+class cFake_GeometryBuffer : public CEGUI::GeometryBuffer
-+{
-+	void draw() const {}
-+	void setTranslation(const CEGUI::Vector3&) {}
-+	void setRotation(const CEGUI::Vector3&) {}
-+	void setPivot(const CEGUI::Vector3&) {}
-+	void setClippingRegion(const CEGUI::Rect&) {}
-+	void appendVertex(const CEGUI::Vertex&) {}
-+	void appendGeometry(const CEGUI::Vertex* const, CEGUI::uint) {}
-+	void setActiveTexture(CEGUI::Texture*) {}
-+	void reset() {}
-+	CEGUI::Texture* getActiveTexture() const { return 0; }
-+	CEGUI::uint getVertexCount() const { return 0; }
-+	CEGUI::uint getBatchCount() const { return 0; }
-+	void setRenderEffect(CEGUI::RenderEffect*) {}
-+	CEGUI::RenderEffect* getRenderEffect() { return 0; }
-+};
- 
--class cFake_Renderer : public CEGUI::Renderer
-+class cFake_Texture : public CEGUI::Texture
-+{
-+public:
-+	cFake_Texture() :
-+	  m_size(1, 1),
-+	  m_scaling(1, 1) {}
-+
-+	const CEGUI::Size& getSize() const { return m_size; }
-+	const CEGUI::Size& getOriginalDataSize() const { return m_size; }
-+	const CEGUI::Vector2& getTexelScaling() const { return m_scaling; }
-+	void loadFromFile(const CEGUI::String&, const CEGUI::String&) {}
-+	void loadFromMemory(const void*, const CEGUI::Size&, CEGUI::Texture::PixelFormat) {}
-+	void saveToMemory(void*) {}
-+
-+private:
-+	CEGUI::Size m_size;
-+	CEGUI::Vector2 m_scaling;
-+};
-+
-+class cFake_RenderTarget : public CEGUI::RenderTarget
- {
- public:
--	cFake_Renderer( void );
--	virtual ~cFake_Renderer( void );
-+	cFake_RenderTarget() : m_area(0, 0, 0, 0) {}
-+	void draw(const CEGUI::GeometryBuffer&) {}
-+	void draw(const CEGUI::RenderQueue&) {}
-+	void setArea(const CEGUI::Rect&) {}
-+	const CEGUI::Rect& getArea() const { return m_area; }
-+	bool isImageryCache() const { return false; }
-+	void activate() {}
-+	void deactivate() {}
-+	void unprojectPoint(const CEGUI::GeometryBuffer&, const CEGUI::Vector2&, CEGUI::Vector2&) const {}
-+
-+private:
-+	CEGUI::Rect m_area;
-+};
- 
--	virtual	void addQuad(const CEGUI::Rect& dest_rect, float z, const CEGUI::Texture* tex, const CEGUI::Rect& texture_rect, const CEGUI::ColourRect& colours, CEGUI::QuadSplitMode quad_split_mode) {};
--	virtual	void doRender(void) {};
--	virtual	void clearRenderList(void) {};
--	virtual void setQueueingEnabled(bool setting) {};
--	virtual	CEGUI::Texture *createTexture(void) { return NULL; };
--	virtual	CEGUI::Texture *createTexture(const CEGUI::String& filename, const CEGUI::String& resourceGroup) { return NULL; };
--	virtual	CEGUI::Texture *createTexture(float size) { return NULL; };
--	virtual	void destroyTexture(CEGUI::Texture* texture) {};
--	virtual void destroyAllTextures(void) {};
--	virtual bool isQueueingEnabled(void) const { return 0; };
--	virtual float getWidth(void) const { return 0; };
--	virtual float getHeight(void) const { return 0; };
--	virtual CEGUI::Size getSize(void) const { return CEGUI::Size();};
--	virtual CEGUI::Rect getRect(void) const { return CEGUI::Rect();};
--	virtual	unsigned int getMaxTextureSize(void) const { return 0; };
--	virtual	unsigned int getHorzScreenDPI(void) const { return 0; };
--	virtual	unsigned int getVertScreenDPI(void) const { return 0; };
-+class cFake_Renderer : public CEGUI::Renderer
-+{
-+public:
-+	cFake_Renderer( void ) :
-+	  m_size(0, 0),
-+	  m_dpi(0, 0),
-+	  m_identifierString("Fake Renderer"),
-+	  m_root(m_target) {}
-+	~cFake_Renderer( void ) {}
-+
-+	CEGUI::RenderingRoot& getDefaultRenderingRoot() { return m_root; }
-+	CEGUI::GeometryBuffer& createGeometryBuffer() { return m_geometry; }
-+	void destroyGeometryBuffer(const CEGUI::GeometryBuffer&) {}
-+	void destroyAllGeometryBuffers() {}
-+	CEGUI::TextureTarget* createTextureTarget() { return 0; }
-+	void destroyTextureTarget(CEGUI::TextureTarget*) {}
-+	void destroyAllTextureTargets() {}
-+	CEGUI::Texture& createTexture() { return m_texture; }
-+	CEGUI::Texture& createTexture(const CEGUI::String&, const CEGUI::String&) { return m_texture; }
-+	CEGUI::Texture& createTexture(const CEGUI::Size&) { return m_texture; }
-+	void destroyTexture(CEGUI::Texture&) {}
-+	void destroyAllTextures() {}
-+	void beginRendering() {}
-+	void endRendering() {}
-+	void setDisplaySize(const CEGUI::Size&) {}
-+	const CEGUI::Size& getDisplaySize() const { return m_size; }
-+	const CEGUI::Vector2& getDisplayDPI() const {return m_dpi; }
-+	CEGUI::uint getMaxTextureSize() const { return 0; }
-+	const CEGUI::String& getIdentifierString() const { return m_identifierString; }
-+
-+private:
-+	CEGUI::Size m_size;
-+	CEGUI::Vector2 m_dpi;
-+	CEGUI::String m_identifierString;
-+	cFake_GeometryBuffer m_geometry;
-+	cFake_Texture m_texture;
-+	cFake_RenderTarget m_target;
-+	CEGUI::RenderingRoot m_root;
- };
- 
- /* *** *** *** *** *** *** *** Video class *** *** *** *** *** *** *** *** *** *** */
diff --git a/community-staging/smc/smc.desktop b/community-staging/smc/smc.desktop
deleted file mode 100644
index 6cfe5b018..000000000
--- a/community-staging/smc/smc.desktop
+++ /dev/null
@@ -1,9 +0,0 @@
-[Desktop Entry]
-Name=Secret Maryo Chronicles
-GenericName=Arcade Game
-Exec=smc
-Icon=smc.png
-Terminal=false
-Type=Application
-Categories=Game;ArcadeGame;KidsGame;
-StartupNotify=false
-\ No newline at end of file
diff --git a/community-staging/smc/smc.png b/community-staging/smc/smc.png
deleted file mode 100644
index f02af1bfc..000000000
--- a/community-staging/smc/smc.png
+++ /dev/null
diff --git a/community-staging/spring/PKGBUILD b/community-staging/spring/PKGBUILD
deleted file mode 100644
index 654885736..000000000
--- a/community-staging/spring/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 73670 2012-07-13 06:44:56Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Arkham <arkham at archlinux dot us>
-# Contributor: Christoph Zeiler <archNOSPAM_at_moonblade.dot.org>
-
-pkgname=spring
-pkgver=0.89.0
-_pkgver=89.0
-pkgrel=1
-pkgdesc='A free 3D real-time-strategy (RTS) game engine'
-arch=('i686' 'x86_64')
-url="http://springrts.com/"
-license=('GPL')
-depends=('openal' 'glew' 'boost-libs' 'freetype2' 'devil' 'libvorbis' 'sdl'
-         'libxcursor')
-makedepends=('boost' 'cmake' 'zip' 'xz' 'p7zip' 'python2' 'java-environment')
-optdepends=('python2: python-based bots'
-            'java-runtime: java-based bots')
-source=(http://downloads.sourceforge.net/sourceforge/springrts/${pkgname}_${_pkgver}_src.tar.lzma
-        boost-1.50.patch)
-md5sums=('36fc266e925bc3790a68bf1bc7ebb315'
-         'a3c3b4a53eeb499090b027fd6b3cf848')
-
-build() {
-  bsdtar -xf ${pkgname}_${_pkgver}_src.tar.lzma
-  
-  cd spring_${_pkgver}
-
-  sed "s/TIME_UTC/TIME_UTC_/g" -i AI/Skirmish/E323AI/CScopedTimer.h
-  patch -Np1 < $srcdir/boost-1.50.patch
- 
-  cmake	. \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-	-DDATADIR=share/spring
-  make
-}
-
-package() {
-  cd spring_${_pkgver}
-
-  make DESTDIR=$pkgdir install
-
-  install -d $pkgdir/etc/spring
-  echo '$HOME/.spring' > $pkgdir/etc/spring/datadir
-}
-
-# vim sw=2:ts=2 et:
diff --git a/community-staging/spring/boost-1.50.patch b/community-staging/spring/boost-1.50.patch
deleted file mode 100644
index f8a8b5695..000000000
--- a/community-staging/spring/boost-1.50.patch
+++ /dev/null
@@ -1,2539 +0,0 @@
-diff -ru spring_89.0/rts/Game/Camera/CameraController.cpp /home/svenstaro/src/spring/rts/Game/Camera/CameraController.cpp
---- spring_89.0/rts/Game/Camera/CameraController.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/Camera/CameraController.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -59,7 +59,7 @@
- bool CCameraController::GetUseDistToGroundForIcons() {
- 
- 	const float3& dir     = GetDir().UnsafeNormalize();
--	const float dot       = std::min(1.0f, std::max(0.0f, fabs(dir.dot(UpVector))));
-+	const float dot       = std::min(1.0f, std::max(0.0f, math::fabs(dir.dot(UpVector))));
- 
- 	if (dot < switchVal) {
- 		// flat angle (typical for first person camera)
-diff -ru spring_89.0/rts/Game/Camera/FPSController.cpp /home/svenstaro/src/spring/rts/Game/Camera/FPSController.cpp
---- spring_89.0/rts/Game/Camera/FPSController.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/Camera/FPSController.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -80,9 +80,9 @@
- 		oldHeight = pos.y - gndHeight;
- 	}
- 
--	dir.x = (float)(cos(camera->rot.x) * sin(camera->rot.y));
--	dir.z = (float)(cos(camera->rot.x) * cos(camera->rot.y));
--	dir.y = (float)(sin(camera->rot.x));
-+	dir.x = (float)(math::cos(camera->rot.x) * math::sin(camera->rot.y));
-+	dir.z = (float)(math::cos(camera->rot.x) * math::cos(camera->rot.y));
-+	dir.y = (float)(math::sin(camera->rot.x));
- 	dir.ANormalize();
- }
- 
-diff -ru spring_89.0/rts/Game/Camera/FreeController.cpp /home/svenstaro/src/spring/rts/Game/Camera/FreeController.cpp
---- spring_89.0/rts/Game/Camera/FreeController.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/Camera/FreeController.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -51,9 +51,9 @@
- 	dir = float3(0.0f, -2.0f, -1.0f);
- 	dir.ANormalize();
- 	if (camera) {
--		const float hDist = sqrt((dir.x * dir.x) + (dir.z * dir.z));
--		camera->rot.y = atan2(dir.x, dir.z);
--		camera->rot.x = atan2(dir.y, hDist);
-+		const float hDist = math::sqrt((dir.x * dir.x) + (dir.z * dir.z));
-+		camera->rot.y = math::atan2(dir.x, dir.z);
-+		camera->rot.x = math::atan2(dir.y, hDist);
- 	}
- 	pos -= (dir * 1000.0f);
- 
-@@ -84,14 +84,14 @@
- 
- 	// lock the view direction to the target
- 	const float3 diff(trackPos - pos);
--	const float rads = atan2(diff.x, diff.z);
-+	const float rads = math::atan2(diff.x, diff.z);
- 	camera->rot.y = rads;
- 
- 	const float len2D = diff.Length2D();
--	if (fabs(len2D) <= 0.001f) {
-+	if (math::fabs(len2D) <= 0.001f) {
- 		camera->rot.x = 0.0f;
- 	} else {
--		camera->rot.x = atan2((trackPos.y - pos.y), len2D);
-+		camera->rot.x = math::atan2((trackPos.y - pos.y), len2D);
- 	}
- 
- 	camera->UpdateForward();
-@@ -130,11 +130,11 @@
- 		if (pos.y < (gndHeight + gndOffset + 1.0f)) {
- 			float3 hDir;
- 			hDir.y = 0.0f;
--			hDir.x = (float)sin(camera->rot.y);
--			hDir.z = (float)cos(camera->rot.y);
-+			hDir.x = (float)math::sin(camera->rot.y);
-+			hDir.z = (float)math::cos(camera->rot.y);
- 			const float3 gndNormal = ground->GetSmoothNormal(pos.x, pos.z, false);
- 			const float dot = gndNormal.dot(hDir);
--			const float gndRotX = (float)acos(dot) - (PI * 0.5f);
-+			const float gndRotX = (float)math::acos(dot) - (PI * 0.5f);
- 			const float rotXdiff = (gndRotX - camera->rot.x);
- 			autoTiltVel = (autoTilt * rotXdiff);
- 		}
-@@ -214,8 +214,8 @@
- 		// convert the angular velocity into its positional change
- 		const float3 diff2 = (pos - trackPos);
- 		const float deltaRad = (avel.y * ft);
--		const float cos_val = cos(deltaRad);
--		const float sin_val = sin(deltaRad);
-+		const float cos_val = math::cos(deltaRad);
-+		const float sin_val = math::sin(deltaRad);
- 		pos.x = trackPos.x + ((cos_val * diff2.x) + (sin_val * diff2.z));
- 		pos.z = trackPos.z + ((cos_val * diff2.z) - (sin_val * diff2.x));
- 	}
-@@ -246,7 +246,7 @@
- 		if (pos.y < minHeight) {
- 			pos.y = minHeight;
- 			if (gndLock) {
--				vel.y = min(fabs(scrollSpeed), ((minHeight - prevPos.y) / ft));
-+				vel.y = min(math::fabs(scrollSpeed), ((minHeight - prevPos.y) / ft));
- 			} else {
- 				vel.y = 0.0f;
- 			}
-@@ -263,7 +263,7 @@
- 		camera->rot.x = -xRotLimit;
- 		avel.x = 0.0f;
- 	}
--	camera->rot.y = fmod(camera->rot.y, PI * 2.0f);
-+	camera->rot.y = math::fmod(camera->rot.y, PI * 2.0f);
- 
- 	// setup for the next loop
- 	prevVel  = vel;
-@@ -277,9 +277,9 @@
- float3 CFreeController::GetDir() const
- {
- 	float3 dir;
--	dir.x = (float)(sin(camera->rot.y) * cos(camera->rot.x));
--	dir.z = (float)(cos(camera->rot.y) * cos(camera->rot.x));
--	dir.y = (float)(sin(camera->rot.x));
-+	dir.x = (float)(math::sin(camera->rot.y) * math::cos(camera->rot.x));
-+	dir.z = (float)(math::cos(camera->rot.y) * math::cos(camera->rot.x));
-+	dir.y = (float)(math::sin(camera->rot.x));
- 	dir.ANormalize();
- 	return dir;
- }
-@@ -373,7 +373,7 @@
- 	if ((yDiff * dir.y) >= 0.0f) {
- 		pos = float3(newPos.x, h, newPos.z);
- 	} else {
--		pos = target - (dir * fabs(yDiff / dir.y));
-+		pos = target - (dir * math::fabs(yDiff / dir.y));
- 	} // FIXME
- /*
- 	const float oldPosY = pos.y;
-diff -ru spring_89.0/rts/Game/Camera/OrbitController.cpp /home/svenstaro/src/spring/rts/Game/Camera/OrbitController.cpp
---- spring_89.0/rts/Game/Camera/OrbitController.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/Camera/OrbitController.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -51,8 +51,8 @@
- 	const float3 w = (v / v.Length()); // do not normalize v in-place
- 
- 	const float d = v.Length();
--	const float e = RAD2DEG(acos(v.Length2D() / d));
--	const float r = RAD2DEG(acos(w.x));
-+	const float e = RAD2DEG(math::acos(v.Length2D() / d));
-+	const float r = RAD2DEG(math::acos(w.x));
- 
- 	distance  = cDistance = d;
- 	elevation = cElevation = e;
-@@ -251,12 +251,12 @@
- 	float tx = cx;
- 
- 	tx = cx;
--	cx = cx * cos(beta) + cy * sin(beta);
--	cy = tx * sin(beta) + cy * cos(beta);
-+	cx = cx * math::cos(beta) + cy * math::sin(beta);
-+	cy = tx * math::sin(beta) + cy * math::cos(beta);
- 
- 	tx = cx;
--	cx = cx * cos(gamma) - cz * sin(gamma);
--	cz = tx * sin(gamma) + cz * cos(gamma);
-+	cx = cx * math::cos(gamma) - cz * math::sin(gamma);
-+	cz = tx * math::sin(gamma) + cz * math::cos(gamma);
- 
- 	return float3(cx, cy, cz);
- }
-diff -ru spring_89.0/rts/Game/Camera/OverheadController.cpp /home/svenstaro/src/spring/rts/Game/Camera/OverheadController.cpp
---- spring_89.0/rts/Game/Camera/OverheadController.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/Camera/OverheadController.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -52,7 +52,7 @@
- 		move.x = -move.x;
- 		move.y = -move.y;
- 	}
--	move *= sqrt(move.z) * 200;
-+	move *= math::sqrt(move.z) * 200;
- 
- 	pos.x += move.x * pixelSize * 2.0f * scrollSpeed;
- 	pos.z -= move.y * pixelSize * 2.0f * scrollSpeed;
-diff -ru spring_89.0/rts/Game/Camera/RotOverheadController.cpp /home/svenstaro/src/spring/rts/Game/Camera/RotOverheadController.cpp
---- spring_89.0/rts/Game/Camera/RotOverheadController.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/Camera/RotOverheadController.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -29,7 +29,7 @@
- 
- void CRotOverheadController::KeyMove(float3 move)
- {
--	move *= sqrt(move.z) * 400;
-+	move *= math::sqrt(move.z) * 400;
- 
- 	float3 flatForward = camera->forward;
- 	if(camera->forward.y < -0.9f)
-@@ -68,9 +68,9 @@
- 
- void CRotOverheadController::UpdateVectors()
- {
--	dir.x=(float)(sin(camera->rot.y) * cos(camera->rot.x));
--	dir.y=(float)(sin(camera->rot.x));
--	dir.z=(float)(cos(camera->rot.y) * cos(camera->rot.x));
-+	dir.x=(float)(math::sin(camera->rot.y) * math::cos(camera->rot.x));
-+	dir.y=(float)(math::sin(camera->rot.x));
-+	dir.z=(float)(math::cos(camera->rot.y) * math::cos(camera->rot.x));
- 	dir.ANormalize();
- 
- 	pos.x = Clamp(pos.x, 0.01f, gs->mapx * SQUARE_SIZE - 0.01f);
-diff -ru spring_89.0/rts/Game/Camera/SmoothController.cpp /home/svenstaro/src/spring/rts/Game/Camera/SmoothController.cpp
---- spring_89.0/rts/Game/Camera/SmoothController.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/Camera/SmoothController.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -55,7 +55,7 @@
- 		move.y = -move.y;
- 	}
- 
--	move *= sqrt(move.z) * 200.0f;
-+	move *= math::sqrt(move.z) * 200.0f;
- 
- 	const float3 thisMove(move.x * pixelSize * 2.0f * scrollSpeed, 0.0f, -move.y * pixelSize * 2.0f * scrollSpeed);
- 
-@@ -103,7 +103,7 @@
- 		move.x = -move.x;
- 		move.y = -move.y;
- 	}
--	move *= sqrt(move.z) * 200.0f;
-+	move *= math::sqrt(move.z) * 200.0f;
- 
- 	const float3 thisMove(move.x * pixelSize * 2.0f * scrollSpeed, 0.0f, -move.y * pixelSize * 2.0f * scrollSpeed);
- 
-diff -ru spring_89.0/rts/Game/Camera/TWController.cpp /home/svenstaro/src/spring/rts/Game/Camera/TWController.cpp
---- spring_89.0/rts/Game/Camera/TWController.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/Camera/TWController.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -35,7 +35,7 @@
- 	flatForward.y=0;
- 	flatForward.ANormalize();
- 
--	move *= sqrt(move.z) * 200;
-+	move *= math::sqrt(move.z) * 200;
- 	pos  += (camera->right * move.x + flatForward * move.y) * scrollSpeed;
- 	UpdateVectors();
- }
-@@ -79,9 +79,9 @@
- 
- 	camera->rot.x = Clamp(camera->rot.x, -PI * 0.4f, -0.1f);
- 
--	dir.x = sin(camera->rot.y) * cos(camera->rot.x);
--	dir.y = sin(camera->rot.x);
--	dir.z = cos(camera->rot.y) * cos(camera->rot.x);
-+	dir.x = math::sin(camera->rot.y) * math::cos(camera->rot.x);
-+	dir.y = math::sin(camera->rot.x);
-+	dir.z = math::cos(camera->rot.y) * math::cos(camera->rot.x);
- 	dir.ANormalize();
- }
- 
-diff -ru spring_89.0/rts/Game/Camera.cpp /home/svenstaro/src/spring/rts/Game/Camera.cpp
---- spring_89.0/rts/Game/Camera.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/Camera.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -89,7 +89,7 @@
- 	up.UnsafeANormalize();
- 
- 	const float aspect = globalRendering->aspectRatio;
--	const float viewx = tan(aspect * halfFov);
-+	const float viewx = math::tan(aspect * halfFov);
- 	const float viewy = tanHalfFov;
- 
- 	if (globalRendering->viewSizeY <= 0) {
-@@ -218,9 +218,9 @@
- 
- void CCamera::UpdateForward()
- {
--	forward.z = cos(rot.y) * cos(rot.x);
--	forward.x = sin(rot.y) * cos(rot.x);
--	forward.y = sin(rot.x);
-+	forward.z = math::cos(rot.y) * math::cos(rot.x);
-+	forward.x = math::sin(rot.y) * math::cos(rot.x);
-+	forward.y = math::sin(rot.x);
- 	forward.Normalize();
- }
- 
-@@ -229,7 +229,7 @@
- {
- 	fov = myfov;
- 	halfFov = (fov * 0.5f) * (PI / 180.f);
--	tanHalfFov = tan(halfFov);
-+	tanHalfFov = math::tan(halfFov);
- }
- 
- 
-@@ -330,7 +330,7 @@
- 	float3 pInt;
- 
- 	// prevent DIV0 when calculating line.dir
--	if (fabs(xdir.z) < 0.001f)
-+	if (math::fabs(xdir.z) < 0.001f)
- 		xdir.z = 0.001f;
- 
- 	if (ydir.y != 0.0f) {
-diff -ru spring_89.0/rts/Game/CameraHandler.cpp /home/svenstaro/src/spring/rts/Game/CameraHandler.cpp
---- spring_89.0/rts/Game/CameraHandler.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/CameraHandler.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -139,7 +139,7 @@
- 		cameraTimeLeft = std::max(0.0f, (cameraTimeLeft - globalRendering->lastFrameTime));
- 		const float nextTime = cameraTimeLeft;
- 		const float exp = cameraTimeExponent;
--		const float ratio = 1.0f - (float)pow((nextTime / currTime), exp);
-+		const float ratio = 1.0f - (float)math::pow((nextTime / currTime), exp);
- 
- 		const float  deltaFOV = wantedCamFOV - camera->GetFov();
- 		const float3 deltaPos = wantedCamPos - camera->pos;
-diff -ru spring_89.0/rts/Game/GameServer.cpp /home/svenstaro/src/spring/rts/Game/GameServer.cpp
---- spring_89.0/rts/Game/GameServer.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/GameServer.cpp	2012-07-13 06:34:42.936060485 +0200
-@@ -253,7 +253,7 @@
- 	// Something in CGameServer::CGameServer borks the FPU control word
- 	// maybe the threading, or something in CNet::InitServer() ??
- 	// Set single precision floating point math.
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- #endif
- }
- 
-diff -ru spring_89.0/rts/Game/SelectedUnitsAI.cpp /home/svenstaro/src/spring/rts/Game/SelectedUnitsAI.cpp
---- spring_89.0/rts/Game/SelectedUnitsAI.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/SelectedUnitsAI.cpp	2012-07-13 06:34:43.086060494 +0200
-@@ -179,7 +179,7 @@
- 		const float3 sideDir = frontdir.cross(UpVector);
- 
- 		// calculate so that the units form in an aproximate square
--		float length = 100.0f + (sqrt((float)nbrOfSelectedUnits) * 32.0f);
-+		float length = 100.0f + (math::sqrt((float)nbrOfSelectedUnits) * 32.0f);
- 
- 		// push back some extra params so it confer with a front move
- 		c.params.push_back(pos.x + (sideDir.x * length));
-diff -ru spring_89.0/rts/Game/TraceRay.cpp /home/svenstaro/src/spring/rts/Game/TraceRay.cpp
---- spring_89.0/rts/Game/TraceRay.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/TraceRay.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -75,7 +75,7 @@
- 	if (closeFlatLength > length)
- 		closeFlatLength = length;
- 
--	if (fabs(linear - quadratic * closeFlatLength) < 0.15f) {
-+	if (math::fabs(linear - quadratic * closeFlatLength) < 0.15f) {
- 		// relatively flat region -> use approximation
- 		dif.y -= (linear + quadratic * closeFlatLength) * closeFlatLength;
- 
-diff -ru spring_89.0/rts/Game/UI/EndGameBox.cpp /home/svenstaro/src/spring/rts/Game/UI/EndGameBox.cpp
---- spring_89.0/rts/Game/UI/EndGameBox.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/UI/EndGameBox.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -29,11 +29,11 @@
- 
- 	if (num == 0) {
- 		sprintf(c, "0");
--	} else if (fabs(num) < 10 * mul) {
-+	} else if (math::fabs(num) < 10 * mul) {
- 		sprintf(c, "%.1f",  num);
--	} else if (fabs(num) < 10000 * mul) {
-+	} else if (math::fabs(num) < 10000 * mul) {
- 		sprintf(c, "%.0f",  num);
--	} else if (fabs(num) < 10000000 * mul) {
-+	} else if (math::fabs(num) < 10000000 * mul) {
- 		sprintf(c, "%.0fk", num / 1000);
- 	} else {
- 		sprintf(c, "%.0fM", num / 1000000);
-@@ -165,7 +165,7 @@
- 	if (dispMode > 0 ) {
- 		if ((mx > (box.x1 + 0.01f)) && (mx < (box.x1 + 0.12f)) &&
- 		    (my < (box.y1 + 0.57f)) && (my > (box.y1 + 0.571f - stats.size()*0.02f))) {
--			int sel = (int) floor(-(my - box.y1 - 0.57f) * 50);
-+			int sel = (int) math::floor(-(my - box.y1 - 0.57f) * 50);
- 
- 			if (button == 1) {
- 				stat1 = sel;
-@@ -341,7 +341,7 @@
- 
- 		if ((mx > box.x1 + 0.01f) && (mx < box.x1 + 0.12f) &&
- 		    (my < box.y1 + 0.57f) && (my > box.y1 + 0.571f - (stats.size() * 0.02f))) {
--			const int sel = (int) floor(50 * -(my - box.y1 - 0.57f));
-+			const int sel = (int) math::floor(50 * -(my - box.y1 - 0.57f));
- 
- 			glColor4f(0.7f, 0.2f, 0.2f, guiAlpha);
- 			glDisable(GL_TEXTURE_2D);
-diff -ru spring_89.0/rts/Game/UI/EndGameBox.h /home/svenstaro/src/spring/rts/Game/UI/EndGameBox.h
---- spring_89.0/rts/Game/UI/EndGameBox.h	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/UI/EndGameBox.h	2012-07-13 06:34:43.066060493 +0200
-@@ -60,8 +60,8 @@
- 			if (team >= 0 && static_cast<size_t>(team) >= values.size()) {
- 				values.resize(team + 1);
- 			}
--			if (values[team].size() > 0 && fabs(value-values[team].back()) > maxdif) {
--				maxdif = fabs(value-values[team].back());
-+			if (values[team].size() > 0 && math::fabs(value-values[team].back()) > maxdif) {
-+				maxdif = math::fabs(value-values[team].back());
- 			}
- 
- 			values[team].push_back(value);
-diff -ru spring_89.0/rts/Game/UI/MouseCursor.cpp /home/svenstaro/src/spring/rts/Game/UI/MouseCursor.cpp
---- spring_89.0/rts/Game/UI/MouseCursor.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/UI/MouseCursor.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -355,7 +355,7 @@
- 		return;
- 	}
- 
--	animTime = fmod(animTime + globalRendering->lastFrameTime, animPeriod);
-+	animTime = math::fmod(animTime + globalRendering->lastFrameTime, animPeriod);
- 
- 	if (animTime < frames[currentFrame].startTime) {
- 		currentFrame = 0;
-diff -ru spring_89.0/rts/Game/UI/ResourceBar.cpp /home/svenstaro/src/spring/rts/Game/UI/ResourceBar.cpp
---- spring_89.0/rts/Game/UI/ResourceBar.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/UI/ResourceBar.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -48,11 +48,11 @@
- 
- 	if (num == 0)
- 		sprintf(c, "0");
--	if (       fabs(num) < (10       * mul)) {
-+	if (       math::fabs(num) < (10       * mul)) {
- 		sprintf(c, "%.1f",  num);
--	} else if (fabs(num) < (10000    * mul)) {
-+	} else if (math::fabs(num) < (10000    * mul)) {
- 		sprintf(c, "%.0f",  num);
--	} else if (fabs(num) < (10000000 * mul)) {
-+	} else if (math::fabs(num) < (10000000 * mul)) {
- 		sprintf(c, "%.0fk", num / 1000);
- 	} else {
- 		sprintf(c, "%.0fM", num / 1000000);
-@@ -180,11 +180,11 @@
- 
- 	smallFont->SetTextColor(1.0f, 0.3f, 0.3f, 1.0f); // Expenses
- 	smallFont->glFormat(metalx  + 0.044f, box.y1, labelsFontSize, FONT_DESCENDER | fontOptions, "-%s(-%s)",
--			FloatToSmallString(fabs(myTeam->prevMetalPull)).c_str(),
--			FloatToSmallString(fabs(myTeam->metalSent)).c_str());
-+			FloatToSmallString(math::fabs(myTeam->prevMetalPull)).c_str(),
-+			FloatToSmallString(math::fabs(myTeam->metalSent)).c_str());
- 	smallFont->glFormat(energyx + 0.044f, box.y1, labelsFontSize, FONT_DESCENDER | fontOptions, "-%s(-%s)",
--			FloatToSmallString(fabs(myTeam->prevEnergyPull)).c_str(),
--			FloatToSmallString(fabs(myTeam->energySent)).c_str());
-+			FloatToSmallString(math::fabs(myTeam->prevEnergyPull)).c_str(),
-+			FloatToSmallString(math::fabs(myTeam->energySent)).c_str());
- 
- 	smallFont->SetTextColor(0.4f, 1.0f, 0.4f, 0.95f); // Income
- 	smallFont->glFormat(metalx  + 0.044f, box.y2 - 2*globalRendering->pixelY, labelsFontSize, FONT_ASCENDER | fontOptions, "+%s",
-diff -ru spring_89.0/rts/Game/UI/SelectionKeyHandler.cpp /home/svenstaro/src/spring/rts/Game/UI/SelectionKeyHandler.cpp
---- spring_89.0/rts/Game/UI/SelectionKeyHandler.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/UI/SelectionKeyHandler.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -367,9 +367,9 @@
- 				camera->rot.x=-1;
- 
- 			float3 wantedCamDir;
--			wantedCamDir.x=(float)(sin(camera->rot.y)*cos(camera->rot.x));
--			wantedCamDir.y=(float)(sin(camera->rot.x));
--			wantedCamDir.z=(float)(cos(camera->rot.y)*cos(camera->rot.x));
-+			wantedCamDir.x=(float)(math::sin(camera->rot.y)*math::cos(camera->rot.x));
-+			wantedCamDir.y=(float)(math::sin(camera->rot.x));
-+			wantedCamDir.z=(float)(math::cos(camera->rot.y)*math::cos(camera->rot.x));
- 			wantedCamDir.ANormalize();
- 
- 			camHandler->GetCurrentController().SetPos(sel->pos - wantedCamDir*800);
-diff -ru spring_89.0/rts/Game/UI/UnitTracker.cpp /home/svenstaro/src/spring/rts/Game/UI/UnitTracker.cpp
---- spring_89.0/rts/Game/UI/UnitTracker.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Game/UI/UnitTracker.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -297,8 +297,8 @@
-   			modPlanePos.y = minHeight;
- 		}
- 
--		trackPos += (modPlanePos - trackPos) * (1 - pow(0.95f, deltaTime));
--		trackDir += (u->frontdir - trackDir) * (1 - pow(0.90f, deltaTime));
-+		trackPos += (modPlanePos - trackPos) * (1 - math::pow(0.95f, deltaTime));
-+		trackDir += (u->frontdir - trackDir) * (1 - math::pow(0.90f, deltaTime));
- 		trackDir.ANormalize();
- 
- 		camera->pos = trackPos;
-diff -ru spring_89.0/rts/lib/gml/gmlsrv.h /home/svenstaro/src/spring/rts/lib/gml/gmlsrv.h
---- spring_89.0/rts/lib/gml/gmlsrv.h	2012-07-10 00:10:09.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/lib/gml/gmlsrv.h	2012-07-13 06:34:43.209393834 +0200
-@@ -361,7 +361,7 @@
- 		if (gmlShareLists) {
- 			ogc[thr]->WorkerThreadPost();
- 		}
--		streflop_init<streflop::Simple>();
-+		streflop::streflop_init<streflop::Simple>();
- 		while(dorun) {
- 			gmlClientSub();
- 		}
-@@ -452,7 +452,7 @@
- 		Threading::SetThreadName("sim");
- 		Watchdog::RegisterThread(WDT_SIM, true);
- 		set_threadnum(GML_SIM_THREAD_NUM);
--		streflop_init<streflop::Simple>();
-+		streflop::streflop_init<streflop::Simple>();
- 		while(dorun) {
- 			gmlClientAuxSub();
- 		}
-diff -ru spring_89.0/rts/lib/headlessStubs/sdlstub_cppbit.cpp /home/svenstaro/src/spring/rts/lib/headlessStubs/sdlstub_cppbit.cpp
---- spring_89.0/rts/lib/headlessStubs/sdlstub_cppbit.cpp	2012-07-10 00:10:09.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/lib/headlessStubs/sdlstub_cppbit.cpp	2012-07-13 06:35:00.626061514 +0200
-@@ -12,10 +12,16 @@
- extern "C" {
- #endif
- 
-+#if (BOOST_VERSION >= 105000) //boost 1.50 renamed TIME_UTC to TIME_UTC_
-+	#define SPRING_UTCTIME boost::TIME_UTC_
-+#else
-+	#define SPRING_UTCTIME boost::TIME_UTC
-+#endif
-+
- int stub_sdl_getSystemMilliSeconds() {
- 
- 	boost::xtime t;
--	boost::xtime_get(&t, boost::TIME_UTC);
-+	boost::xtime_get(&t, SPRING_UTCTIME);
- 	const int milliSeconds = t.sec * 1000 + (t.nsec / 1000000);   
- 	return milliSeconds;
- }
-@@ -23,7 +29,7 @@
- void stub_sdl_sleepMilliSeconds(int milliSeconds) {
- 
- 	boost::xtime t;
--	boost::xtime_get(&t, boost::TIME_UTC);
-+	boost::xtime_get(&t, SPRING_UTCTIME);
- 	t.nsec += 1000000 * milliSeconds;
- 	boost::thread::sleep(t);
- }
-diff -ru spring_89.0/rts/lib/streflop/streflopC.cpp /home/svenstaro/src/spring/rts/lib/streflop/streflopC.cpp
---- spring_89.0/rts/lib/streflop/streflopC.cpp	2012-07-10 00:10:10.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/lib/streflop/streflopC.cpp	2012-07-13 06:34:42.939393819 +0200
-@@ -9,16 +9,16 @@
- #endif
- 
- void streflop_init_Simple() {
--	streflop_init<Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- }
- 
- void streflop_init_Double() {
--	streflop_init<Double>();
-+	streflop::streflop_init<streflop::Double>();
- }
- 
- #if defined(Extended)
- void streflop_init_Extended() {
--	streflop_init<Extended>();
-+	streflop::streflop_init<streflop::Extended>();
- }
- #endif // defined(Extended)
- 
-diff -ru spring_89.0/rts/lib/streflop/streflop_cond.h /home/svenstaro/src/spring/rts/lib/streflop/streflop_cond.h
---- spring_89.0/rts/lib/streflop/streflop_cond.h	2012-07-10 00:10:10.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/lib/streflop/streflop_cond.h	2012-07-13 06:34:42.906060483 +0200
-@@ -11,8 +11,6 @@
- 
- #if defined(STREFLOP_X87) || defined(STREFLOP_SSE) || defined(STREFLOP_SOFT)
- #include "streflop.h"
--using namespace streflop;
--
- namespace math {
- 	using namespace streflop;
- }
-@@ -20,6 +18,7 @@
- #include <cmath>
- namespace math {
- 	using std::fabs;
-+	// We are using fastmath::sqrt_sse instead!
- 	// using std::sqrt;
- 	using std::sin;
- 	using std::cos;
-diff -ru spring_89.0/rts/Map/BasicMapDamage.cpp /home/svenstaro/src/spring/rts/Map/BasicMapDamage.cpp
---- spring_89.0/rts/Map/BasicMapDamage.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Map/BasicMapDamage.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -33,7 +33,7 @@
- 
- 	for (int a = 0; a <= CRATER_TABLE_SIZE; ++a) {
- 		const float r = a / float(CRATER_TABLE_SIZE);
--		const float d = cos((r - 0.1f) * (PI + 0.3f)) * (1 - r) * (0.5f + 0.5f * cos(std::max(0.0f, r * 3 - 2) * PI));
-+		const float d = math::cos((r - 0.1f) * (PI + 0.3f)) * (1 - r) * (0.5f + 0.5f * math::cos(std::max(0.0f, r * 3 - 2) * PI));
- 		craterTable[a] = d;
- 	}
- 
-@@ -83,7 +83,7 @@
- 	const float* curHeightMap = readmap->GetCornerHeightMapSynced();
- 	const float* orgHeightMap = readmap->GetOriginalHeightMapSynced();
- 	const unsigned char* typeMap = readmap->GetTypeMapSynced();
--	const float baseStrength = -pow(strength, 0.6f) * 3 / mapHardness;
-+	const float baseStrength = -math::pow(strength, 0.6f) * 3 / mapHardness;
- 	const float invRadius = 1.0f / radius;
- 
- 	for (int y = e->y1; y <= e->y2; ++y) {
-@@ -111,7 +111,7 @@
- 				orgHeightMap[y * gs->mapxp1 + x];
- 
- 			if (prevDif * dif > 0.0f) {
--				dif /= fabs(prevDif) * 0.1f + 1;
-+				dif /= math::fabs(prevDif) * 0.1f + 1;
- 			}
- 
- 			e->squares.push_back(dif);
-@@ -148,7 +148,7 @@
- 						orgHeightMap[z * gs->mapxp1 + x];
- 
- 				if (prevDif * dif > 0.0f) {
--					dif /= fabs(prevDif) * 0.1f + 1;
-+					dif /= math::fabs(prevDif) * 0.1f + 1;
- 				}
- 
- 				totalDif += dif;
-diff -ru spring_89.0/rts/Map/Ground.cpp /home/svenstaro/src/spring/rts/Map/Ground.cpp
---- spring_89.0/rts/Map/Ground.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Map/Ground.cpp	2012-07-13 06:34:43.086060494 +0200
-@@ -433,8 +433,8 @@
- 
- float3 CGround::GetSmoothNormal(float x, float y, bool synced) const
- {
--	int sx = (int) floor(x / SQUARE_SIZE);
--	int sy = (int) floor(y / SQUARE_SIZE);
-+	int sx = (int) math::floor(x / SQUARE_SIZE);
-+	int sy = (int) math::floor(y / SQUARE_SIZE);
- 
- 	if (sy < 1)
- 		sy = 1;
-diff -ru spring_89.0/rts/Map/SM3/Plane.cpp /home/svenstaro/src/spring/rts/Map/SM3/Plane.cpp
---- spring_89.0/rts/Map/SM3/Plane.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Map/SM3/Plane.cpp	2012-07-13 06:34:43.066060493 +0200
-@@ -15,7 +15,7 @@
- 	a = ry1*rz2 - ry2*rz1;
- 	b = rz1*rx2 - rz2*rx1;
- 	c = rx1*ry2 - rx2*ry1;
--	float len = (float)sqrt(a*a + b*b + c*c);
-+	float len = (float)math::sqrt(a*a + b*b + c*c);
- 	a /= len;
- 	b /= len;
- 	c /= len;
-@@ -37,10 +37,10 @@
- bool Plane::EpsilonCompare(const Plane& pln, float epsilon)
- {
- 	Plane t;
--	t.a = fabs(a - pln.a);
--	t.b = fabs(b - pln.b);
--	t.c = fabs(c - pln.c);
--	t.d = fabs(d - pln.d);
-+	t.a = math::fabs(a - pln.a);
-+	t.b = math::fabs(b - pln.b);
-+	t.c = math::fabs(c - pln.c);
-+	t.d = math::fabs(d - pln.d);
- 	if (t.a > epsilon || t.b > epsilon || t.c > epsilon || t.d > epsilon) {
- 		return false;
- 	}
-diff -ru spring_89.0/rts/Map/SM3/terrain/Lightcalc.cpp /home/svenstaro/src/spring/rts/Map/SM3/terrain/Lightcalc.cpp
---- spring_89.0/rts/Map/SM3/terrain/Lightcalc.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Map/SM3/terrain/Lightcalc.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -197,7 +197,7 @@
- 					continue;
- 			}
- 
--			float len = sqrt(dx*dx + dy*dy);
-+			float len = math::sqrt(dx*dx + dy*dy);
- 			const float step = 5.0f;
- 			float invLength2d = step / len;
- 			dx *= invLength2d;
-diff -ru spring_89.0/rts/Map/SM3/terrain/Textures.cpp /home/svenstaro/src/spring/rts/Map/SM3/terrain/Textures.cpp
---- spring_89.0/rts/Map/SM3/terrain/Textures.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Map/SM3/terrain/Textures.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -248,7 +248,7 @@
- 				}
- 
- 				// flatness=dotproduct of surface normal with up vector
--				float slope = 1.0f - fabs(norm_y);
-+				float slope = 1.0f - math::fabs(norm_y);
- 
- 				if (slope < gi->minSlope - gi->minSlopeFuzzy) {
- 					bm->at(x,y) = 0.0f;
-@@ -307,7 +307,7 @@
- 				Vector3 n;
- 
- 				if (sx*sx + sy*sy < 32*32) {
--					const int sz = (int)sqrt(static_cast<float>(32 * 32 - sx*sx - sy*sy));
-+					const int sz = (int)math::sqrt(static_cast<float>(32 * 32 - sx*sx - sy*sy));
- 					n = Vector3(sx, sy, sz);
- 					n.ANormalize();
- 				}
-diff -ru spring_89.0/rts/Map/SMF/Legacy/LegacyMeshDrawer.cpp /home/svenstaro/src/spring/rts/Map/SMF/Legacy/LegacyMeshDrawer.cpp
---- spring_89.0/rts/Map/SMF/Legacy/LegacyMeshDrawer.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Map/SMF/Legacy/LegacyMeshDrawer.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -99,7 +99,7 @@
- 	const int minz =  bty * smfReadMap->bigTexSize;
- 	const int maxz = minz + smfReadMap->bigTexSize;
- 	const float miny = readmap->currMinHeight;
--	const float maxy = fabs(cam->pos.y);
-+	const float maxy = math::fabs(cam->pos.y);
- 
- 	const float3 mins(                   0, miny, minz);
- 	const float3 maxs(smfReadMap->mapSizeX, maxy, maxz);
-diff -ru spring_89.0/rts/Map/SMF/ROAM/Patch.cpp /home/svenstaro/src/spring/rts/Map/SMF/ROAM/Patch.cpp
---- spring_89.0/rts/Map/SMF/ROAM/Patch.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Map/SMF/ROAM/Patch.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -405,7 +405,7 @@
- 
- 	// Variance of this triangle is the actual height at it's hypotenuse midpoint minus the interpolated height.
- 	// Use values passed on the stack instead of re-accessing the Height Field.
--	float myVariance = fabs(centerZ - ((leftZ + rightZ) / 2));
-+	float myVariance = math::fabs(centerZ - ((leftZ + rightZ) / 2));
- 	
- 	if (leftZ*rightZ<0 || leftZ*centerZ<0 || rightZ*centerZ<0)
- 		myVariance = std::max(myVariance * 1.5f, 20.0f); //shore lines get more variance for higher accuracy
-diff -ru spring_89.0/rts/Map/SMF/SMFRenderState.cpp /home/svenstaro/src/spring/rts/Map/SMF/SMFRenderState.cpp
---- spring_89.0/rts/Map/SMF/SMFRenderState.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Map/SMF/SMFRenderState.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -385,7 +385,7 @@
- 	smfShaderCurrARB->SetUniformTarget(GL_VERTEX_PROGRAM_ARB);
- 	smfShaderCurrARB->SetUniform4f(10, 1.0f / (gs->pwr2mapx * SQUARE_SIZE), 1.0f / (gs->pwr2mapy * SQUARE_SIZE), 0, 1);
- 	smfShaderCurrARB->SetUniform4f(12, 1.0f / smfMap->bigTexSize, 1.0f / smfMap->bigTexSize, 0, 1);
--	smfShaderCurrARB->SetUniform4f(13, -floor(camera->pos.x * 0.02f), -floor(camera->pos.z * 0.02f), 0, 0);
-+	smfShaderCurrARB->SetUniform4f(13, -math::floor(camera->pos.x * 0.02f), -math::floor(camera->pos.z * 0.02f), 0, 0);
- 	smfShaderCurrARB->SetUniform4f(14, 0.02f, 0.02f, 0, 1);
- 	smfShaderCurrARB->SetUniformTarget(GL_FRAGMENT_PROGRAM_ARB);
- 	smfShaderCurrARB->SetUniform4f(10, ambientColor.x, ambientColor.y, ambientColor.z, 1);
-diff -ru spring_89.0/rts/Rendering/Env/AdvSky.cpp /home/svenstaro/src/spring/rts/Rendering/Env/AdvSky.cpp
---- spring_89.0/rts/Rendering/Env/AdvSky.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Env/AdvSky.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -65,8 +65,8 @@
- 	memset(thicknessTransform, 0, 1024);
- 	memset(covers, 0, 4 * 32 * sizeof(float));
- 
--	domeheight = cos(PI / 16) * 1.01f;
--	domeWidth = sin(2 * PI / 32) * 400 * 1.7f;
-+	domeheight = math::cos(PI / 16) * 1.01f;
-+	domeWidth = math::sin(2 * PI / 32) * 400 * 1.7f;
- 
- 	UpdateSkyDir();
- 	InitSun();
-@@ -383,7 +383,7 @@
- 	case 0: {
- 		for(int a=0; a<CLOUD_DETAIL; a++) {
- 			float fade = gs->frameNum / (70.0f * (2<<(CLOUD_DETAIL-1-a)));
--			fade -= floor(fade/2)*2;
-+			fade -= math::floor(fade/2)*2;
- 			if(fade>1) {
- 				fade = 2 - fade;
- 				if(!cloudDown[a]) {
-@@ -417,11 +417,11 @@
- 		int qcda=(4<<CLOUD_DETAIL)>>a;
- 		int *pkernel=kernel;
- 		for(int y=0; y<cs4a; ++y, pkernel+=CLOUD_SIZE/4) {
--			float ydist=fabs(1.0f+y-cs8a)/cs8a;
-+			float ydist=math::fabs(1.0f+y-cs8a)/cs8a;
- 			ydist=ydist*ydist*(3-2*ydist);
- 			int *pkrn=pkernel;
- 			for(int x=0; x<cs4a; ++x) {
--				float xdist=fabs(1.0f+x-cs8a)/cs8a;
-+				float xdist=math::fabs(1.0f+x-cs8a)/cs8a;
- 				xdist=xdist*xdist*(3-2*xdist);
- 
- 				float contrib=(1-xdist)*(1-ydist);
-@@ -533,7 +533,7 @@
- 	unsigned char *tt=thicknessTransform;
- 	for(int a=0;a<1024;++a){
- 		float f=(1023.0f-(a+cloudDensity*1024-512))/1023.0f;
--		float alpha=pow(f*2,3);
-+		float alpha=math::pow(f*2,3);
- 		if(alpha>1)
- 			alpha=1;
- 		*at=(int) (alpha*255);
-@@ -560,11 +560,11 @@
- 
- 	float ymod=(sunTexCoordY-0.5f)*domeWidth*0.025f*256;
- 	float fy=ymod+modCamera.z*CLOUD_SIZE*0.000025f;
--	int baseY=int(floor(fy))&CLOUD_MASK;
--	fy-=floor(fy);
-+	int baseY=int(math::floor(fy))&CLOUD_MASK;
-+	fy-=math::floor(fy);
- 	float fx=gs->frameNum*0.00005f*CLOUD_SIZE+modCamera.x*CLOUD_SIZE*0.000025f;
--	int baseX=int(floor(fx))&CLOUD_MASK;
--	fx-=floor(fx);
-+	int baseX=int(math::floor(fx))&CLOUD_MASK;
-+	fx-=math::floor(fx);
- 
- 	float *cvs=(float *)covers[0], *cvs1=(float *)covers[1], *cvs2=(float *)covers[2], *cvs3=(float *)covers[3];
- 	if(baseX!=oldCoverBaseX || baseY!=oldCoverBaseY){
-@@ -622,8 +622,8 @@
- 	glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ONE);
- 	glBegin(GL_TRIANGLE_STRIP);
- 	for(int x=0;x<257;++x){
--		float dx = sin(x*2*PI/256.0f);
--		float dy = cos(x*2*PI/256.0f);
-+		float dx = math::sin(x*2*PI/256.0f);
-+		float dy = math::cos(x*2*PI/256.0f);
- 
- 		glTexCoord2f(x/256.0f,0.125f);
- 		glVertexf3(modSunDir*5+ldir*dx*0.0014f+udir*dy*0.0014f);
-@@ -646,7 +646,7 @@
- 			mem[(y*128+x)*4+0]=255;
- 			mem[(y*128+x)*4+1]=255;
- 			mem[(y*128+x)*4+2]=255;
--			float dist=sqrt((float)(y-64)*(y-64)+(x-64)*(x-64));
-+			float dist=math::sqrt((float)(y-64)*(y-64)+(x-64)*(x-64));
- 			if(dist>60)
- 				mem[(y*128+x)*4+3]=0;
- 			else
-@@ -749,7 +749,7 @@
- 
- 	for(int a=0;a<5;++a){
- 		float fade = gs->frameNum / float(30<<a);
--		fade -= floor(fade/2)*2;
-+		fade -= math::floor(fade/2)*2;
- 		int size = std::min(32,256>>a);
- 
- 		if(fade>1){
-@@ -770,7 +770,7 @@
- 
- 		}
- 		float tSize = std::max(1,8>>a);
--		float c = pow(2.0f,a)*6/255.0f;
-+		float c = math::pow(2.0f,a)*6/255.0f;
- 		CVertexArray* va = GetVertexArray();
- 		va->Initialize();
- 		va->CheckInitSize(4*VA_SIZE_T);
-@@ -867,10 +867,10 @@
- 
- 	const float hdist = math::sqrt(dir.x * dir.x + dir.z * dir.z);
- 	const float ang = GetRadFromXY(dir.x, dir.z) + skyAngle;
--	const float fy = asin(hdist / 400);
-+	const float fy = math::asin(hdist / 400);
- 
--	dir.x = hdist * cos(ang);
--	dir.z = hdist * sin(ang);
-+	dir.x = hdist * math::cos(ang);
-+	dir.z = hdist * math::sin(ang);
- 	dir.y = (fastmath::cos(fy) - domeheight) * 400;
- 
- 	dir.ANormalize();
-@@ -903,7 +903,7 @@
- 	const float3& dir = GetDirFromTexCoord(x / 256.0f, (255.0f - y) / 256.0f);
- 
- 	const float sunInt = skyLight->GetLightIntensity();
--	const float sunDist = acos(dir.dot(skyLight->GetLightDir())) * 50;
-+	const float sunDist = math::acos(dir.dot(skyLight->GetLightDir())) * 50;
- 	const float sunMod = sunInt * (0.3f / math::sqrt(sunDist) + 3.0f / (1 + sunDist));
- 
- 	const float green = std::min(1.0f, (0.55f + sunMod));
-@@ -918,7 +918,7 @@
- void CAdvSky::UpdateTexPart(int x, int y, unsigned char (*texp)[4]) {
- 	const float3& dir = GetDirFromTexCoord(x / 512.0f, (511.0f - y) / 512.0f);
- 
--	const float sunDist = acos(dir.dot(skyLight->GetLightDir())) * 70;
-+	const float sunDist = math::acos(dir.dot(skyLight->GetLightDir())) * 70;
- 	const float sunMod = skyLight->GetLightIntensity() * 12.0f / (12 + sunDist);
- 
- 	const float red   = std::min(skyColor.x + sunMod * sunColor.x, 1.0f);
-diff -ru spring_89.0/rts/Rendering/Env/AdvTreeDrawer.cpp /home/svenstaro/src/spring/rts/Rendering/Env/AdvTreeDrawer.cpp
---- spring_89.0/rts/Rendering/Env/AdvTreeDrawer.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Env/AdvTreeDrawer.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -229,7 +229,7 @@
- 			std::list<FallingTree>::iterator prev = fti++;
- 			fallingTrees.erase(prev);
- 		} else {
--			fti->speed += (sin(fti->fallPos) * 0.04f);
-+			fti->speed += (math::sin(fti->fallPos) * 0.04f);
- 			++fti;
- 		}
- 	}
-@@ -616,7 +616,7 @@
- 			if (camera->InView(pos + float3(0.0f, MAX_TREE_HEIGHT / 2, 0.0f), MAX_TREE_HEIGHT / 2.0f)) {
- 				const float ang = fti->fallPos * PI;
- 
--				const float3 yvec(fti->dir.x * sin(ang), cos(ang), fti->dir.z * sin(ang));
-+				const float3 yvec(fti->dir.x * math::sin(ang), math::cos(ang), fti->dir.z * math::sin(ang));
- 				const float3 zvec((yvec.cross(float3(-1.0f, 0.0f, 0.0f))).ANormalize());
- 				const float3 xvec(yvec.cross(zvec));
- 
-@@ -957,7 +957,7 @@
- 			if (camera->InView(pos + float3(0, MAX_TREE_HEIGHT / 2, 0), MAX_TREE_HEIGHT / 2)) {
- 				const float ang = fti->fallPos * PI;
- 
--				const float3 yvec(fti->dir.x * sin(ang), cos(ang), fti->dir.z * sin(ang));
-+				const float3 yvec(fti->dir.x * math::sin(ang), math::cos(ang), fti->dir.z * math::sin(ang));
- 				const float3 zvec((yvec.cross(float3(1.0f, 0.0f, 0.0f))).ANormalize());
- 				const float3 xvec(zvec.cross(yvec));
- 
-diff -ru spring_89.0/rts/Rendering/Env/AdvTreeGenerator.cpp /home/svenstaro/src/spring/rts/Rendering/Env/AdvTreeGenerator.cpp
---- spring_89.0/rts/Rendering/Env/AdvTreeGenerator.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Env/AdvTreeGenerator.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -159,9 +159,9 @@
- 	int numIter=(int)max(3.0f,size*10);
- 	for(int a=0;a<=numIter;a++){
- 		float angle=a/(float)numIter*2*PI;
--		float col=0.4f+(((orto1*sin(angle)+orto2*cos(angle)).dot(flatSun)))*0.3f;
--		barkva->AddVertexTN(start+orto1*sin(angle)*size+orto2*cos(angle)*size,angle/PI*0.125f*0.5f,0,float3(0,0,col));
--		barkva->AddVertexTN(end+orto1*sin(angle)*size*0.2f+orto2*cos(angle)*size*0.2f,angle/PI*0.125f*0.5f,3,float3(0,0,col));
-+		float col=0.4f+(((orto1*math::sin(angle)+orto2*math::cos(angle)).dot(flatSun)))*0.3f;
-+		barkva->AddVertexTN(start+orto1*math::sin(angle)*size+orto2*math::cos(angle)*size,angle/PI*0.125f*0.5f,0,float3(0,0,col));
-+		barkva->AddVertexTN(end+orto1*math::sin(angle)*size*0.2f+orto2*math::cos(angle)*size*0.2f,angle/PI*0.125f*0.5f,3,float3(0,0,col));
- 	}
- 	barkva->EndStrip();
- }
-@@ -176,18 +176,18 @@
- 
- 	for (int a = 0; a < numBranch; ++a) {
- 		const float angle = baseAngle + (a * 3.88f) + fRand(0.5f);
--		float3 dir = orto1 * sin(angle) + orto2 * cos(angle);
-+		float3 dir = orto1 * math::sin(angle) + orto2 * math::cos(angle);
- 			dir.y = 0.3f + fRand(0.4f);
- 			dir.ANormalize();
- 		const float3 start(0, (a + 5) * height / (numBranch + 5), 0);
--		const float length = (height * (0.4f + fRand(0.1f))) * sqrt(float(numBranch - a) / numBranch);
-+		const float length = (height * (0.4f + fRand(0.1f))) * math::sqrt(float(numBranch - a) / numBranch);
- 
- 		TrunkIterator(start, dir, length, length * 0.05f, 1);
- 	}
- 
- 	for (int a = 0; a < 3; ++a) {
- 		const float angle = (a * 3.88f) + fRand(0.5f);
--		float3 dir = orto1*sin(angle)+orto2*cos(angle);
-+		float3 dir = orto1*math::sin(angle)+orto2*math::cos(angle);
- 			dir.y = 0.8f;
- 			dir.ANormalize();
- 		const float3 start(0, height - 0.3f, 0);
-@@ -225,7 +225,7 @@
- 		const float newLength = length * (float(numTrunks - a) / (numTrunks + 1));
- 
- 		float3 newbase = start + dir * length * (float(a + 1) / (numTrunks + 1));
--		float3 newDir = dir + orto1 * cos(angle) * dirDif + orto2 * sin(angle) * dirDif;
-+		float3 newDir = dir + orto1 * math::cos(angle) * dirDif + orto2 * math::sin(angle) * dirDif;
- 		newDir.ANormalize();
- 
- 		TrunkIterator(newbase, newDir, newLength, newLength * 0.05f, depth - 1);
-@@ -245,8 +245,8 @@
- 
- 		float3 pos = start + dir * length * (0.7f + fRand(0.3f));
- 		pos +=
--			(orto1 * sin(angle) + orto2 * cos(angle)) *
--			(sqrt((float) a + 1) * 0.6f + fRand(0.4f)) *
-+			(orto1 * math::sin(angle) + orto2 * math::cos(angle)) *
-+			(math::sqrt((float) a + 1) * 0.6f + fRand(0.4f)) *
- 			0.1f * MAX_TREE_HEIGHT;
- 
- 		if (pos.y < 0.2f * MAX_TREE_HEIGHT)
-@@ -538,12 +538,12 @@
- 	float baseAngle=fRand(2*PI);
- 	for(int a=0;a<numBranch;++a){
- 		float sh = 0.2f + fRand(0.2f);
--		float h  = height * pow(sh + float(a)/numBranch * (1-sh), (float)0.7f);
-+		float h  = height * math::pow(sh + float(a)/numBranch * (1-sh), (float)0.7f);
- 		float angle = baseAngle + (a * 0.618f + fRand(0.1f)) * 2 * PI;
--		float3 dir(orto1 * sin(angle) + orto2 * cos(angle));
-+		float3 dir(orto1 * math::sin(angle) + orto2 * math::cos(angle));
- 		dir.y = (a - numBranch) * 0.01f - (0.2f + fRand(0.2f));
- 		dir.ANormalize();
--		float size = sqrt((float)numBranch - a + 5) * 0.08f * MAX_TREE_HEIGHT;
-+		float size = math::sqrt((float)numBranch - a + 5) * 0.08f * MAX_TREE_HEIGHT;
- 		DrawPineBranch(float3(0,h,0),dir,size);
- 	}
- 	//create the top
-@@ -569,16 +569,16 @@
- 	for(int a=0;a<numIter;a++){
- 		float angle=a/(float)numIter*2*PI;
- 		float angle2=(a+1)/(float)numIter*2*PI;
--		float col=0.45f+(((orto1*sin(angle)+orto2*cos(angle)).dot(flatSun)))*0.3f;
--		float col2=0.45f+(((orto1*sin(angle2)+orto2*cos(angle2)).dot(flatSun)))*0.3f;
-+		float col=0.45f+(((orto1*math::sin(angle)+orto2*math::cos(angle)).dot(flatSun)))*0.3f;
-+		float col2=0.45f+(((orto1*math::sin(angle2)+orto2*math::cos(angle2)).dot(flatSun)))*0.3f;
- 
--		va->AddVertexTN(start+orto1*sin(angle)*size+orto2*cos(angle)*size,           angle/PI*0.125f*0.5f+0.5f,  0, float3(0,0,col));
--		va->AddVertexTN(end+orto1*sin(angle)*size*0.1f+orto2*cos(angle)*size*0.1f,   angle/PI*0.125f*0.5f+0.5f,  3, float3(0,0,col));
--		va->AddVertexTN(start+orto1*sin(angle2)*size+orto2*cos(angle2)*size,         angle2/PI*0.125f*0.5f+0.5f, 0, float3(0,0,col2));
--
--		va->AddVertexTN(start+orto1*sin(angle2)*size+orto2*cos(angle2)*size,         angle2/PI*0.125f*0.5f+0.5f, 0, float3(0,0,col2));
--		va->AddVertexTN(end+orto1*sin(angle)*size*0.1f+orto2*cos(angle)*size*0.1f,   angle/PI*0.125f*0.5f+0.5f,  3, float3(0,0,col));
--		va->AddVertexTN(end+orto1*sin(angle2)*size*0.1f+orto2*cos(angle2)*size*0.1f, angle2/PI*0.125f*0.5f+0.5f, 3, float3(0,0,col2));
-+		va->AddVertexTN(start+orto1*math::sin(angle)*size+orto2*math::cos(angle)*size,           angle/PI*0.125f*0.5f+0.5f,  0, float3(0,0,col));
-+		va->AddVertexTN(end+orto1*math::sin(angle)*size*0.1f+orto2*math::cos(angle)*size*0.1f,   angle/PI*0.125f*0.5f+0.5f,  3, float3(0,0,col));
-+		va->AddVertexTN(start+orto1*math::sin(angle2)*size+orto2*math::cos(angle2)*size,         angle2/PI*0.125f*0.5f+0.5f, 0, float3(0,0,col2));
-+
-+		va->AddVertexTN(start+orto1*math::sin(angle2)*size+orto2*math::cos(angle2)*size,         angle2/PI*0.125f*0.5f+0.5f, 0, float3(0,0,col2));
-+		va->AddVertexTN(end+orto1*math::sin(angle)*size*0.1f+orto2*math::cos(angle)*size*0.1f,   angle/PI*0.125f*0.5f+0.5f,  3, float3(0,0,col));
-+		va->AddVertexTN(end+orto1*math::sin(angle2)*size*0.1f+orto2*math::cos(angle2)*size*0.1f, angle2/PI*0.125f*0.5f+0.5f, 3, float3(0,0,col2));
- 	}
- }
- 
-diff -ru spring_89.0/rts/Rendering/Env/AdvWater.cpp /home/svenstaro/src/spring/rts/Rendering/Env/AdvWater.cpp
---- spring_89.0/rts/Rendering/Env/AdvWater.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Env/AdvWater.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -48,7 +48,7 @@
- 	for (int y = 0; y < 64; ++y) {
- 		for (int x = 0; x < 64; ++x) {
- 			scrap[(y*64 + x)*4 + 0] = 128;
--			scrap[(y*64 + x)*4 + 1] = (unsigned char)(sin(y*PI*2.0f/64.0f)*128 + 128);
-+			scrap[(y*64 + x)*4 + 1] = (unsigned char)(math::sin(y*PI*2.0f/64.0f)*128 + 128);
- 			scrap[(y*64 + x)*4 + 2] = 0;
- 			scrap[(y*64 + x)*4 + 3] = 255;
- 		}
-@@ -62,8 +62,8 @@
- 		for (int x = 0; x < 64; ++x) {
- 			const float ang = 26.5f*PI/180.0f;
- 			const float pos = y*2+x;
--			scrap[(y*64 + x)*4 + 0] = (unsigned char)((sin(pos*PI*2.0f/64.0f))*128*sin(ang)) + 128;
--			scrap[(y*64 + x)*4 + 1] = (unsigned char)((sin(pos*PI*2.0f/64.0f))*128*cos(ang)) + 128;
-+			scrap[(y*64 + x)*4 + 0] = (unsigned char)((math::sin(pos*PI*2.0f/64.0f))*128*math::sin(ang)) + 128;
-+			scrap[(y*64 + x)*4 + 1] = (unsigned char)((math::sin(pos*PI*2.0f/64.0f))*128*math::cos(ang)) + 128;
- 		}
- 	}
- 	glBindTexture(GL_TEXTURE_2D, rawBumpTexture[1]);
-@@ -75,8 +75,8 @@
- 		for (int x = 0; x < 64; ++x) {
- 			const float ang = -19*PI/180.0f;
- 			const float pos = 3*y - x;
--			scrap[(y*64 + x)*4 + 0] = (unsigned char)((sin(pos*PI*2.0f/64.0f))*128*sin(ang)) + 128;
--			scrap[(y*64 + x)*4 + 1] = (unsigned char)((sin(pos*PI*2.0f/64.0f))*128*cos(ang)) + 128;
-+			scrap[(y*64 + x)*4 + 0] = (unsigned char)((math::sin(pos*PI*2.0f/64.0f))*128*math::sin(ang)) + 128;
-+			scrap[(y*64 + x)*4 + 1] = (unsigned char)((math::sin(pos*PI*2.0f/64.0f))*128*math::cos(ang)) + 128;
- 		}
- 	}
- 	glBindTexture(GL_TEXTURE_2D, rawBumpTexture[2]);
-@@ -192,14 +192,14 @@
- 				dir = xbase + dv;
- 				dir.ANormalize();
- 				zpos = camera->pos + dir*(camera->pos.y / -dir.y);
--				zpos.y = sin(zpos.z*0.1f + gs->frameNum*0.06f)*0.06f + 0.05f;
-+				zpos.y = math::sin(zpos.z*0.1f + gs->frameNum*0.06f)*0.06f + 0.05f;
- 				col[3] = (unsigned char)((0.8f + 0.7f*dir.y)*255);
- 				va->AddVertexQTC(zpos, x*(1.0f/numDivs), screenY - yInc, col);
- 
- 				dir = xbase;
- 				dir.ANormalize();
- 				zpos = camera->pos + dir*(camera->pos.y / -dir.y);
--				zpos.y = sin(zpos.z*0.1f + gs->frameNum*0.06f)*0.06f + 0.05f;
-+				zpos.y = math::sin(zpos.z*0.1f + gs->frameNum*0.06f)*0.06f + 0.05f;
- 				col[3] = (unsigned char)((0.8f + 0.7f*dir.y)*255);
- 				va->AddVertexQTC(zpos, x*(1.0f/numDivs), screenY, col);
- 
-diff -ru spring_89.0/rts/Rendering/Env/BasicSky.cpp /home/svenstaro/src/spring/rts/Rendering/Env/BasicSky.cpp
---- spring_89.0/rts/Rendering/Env/BasicSky.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Env/BasicSky.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -67,8 +67,8 @@
- 	rawClouds=newmat2<int>(CLOUD_SIZE,CLOUD_SIZE);
- 	blendMatrix=newmat3<int>(CLOUD_DETAIL,32,32);
- 
--	domeheight=cos(PI/16)*1.01f;
--	domeWidth=sin(PI/16)*400*1.7f;
-+	domeheight=math::cos(PI/16)*1.01f;
-+	domeWidth=math::sin(PI/16)*400*1.7f;
- 
- 	UpdateSkyDir();
- 	InitSun();
-@@ -369,7 +369,7 @@
- 	case 0: {
- 		for(int a=0; a<CLOUD_DETAIL; a++) {
- 			float fade = gs->frameNum / (70.0f * (2<<(CLOUD_DETAIL-1-a)));
--			fade -= floor(fade/2)*2;
-+			fade -= math::floor(fade/2)*2;
- 			if(fade>1) {
- 				fade = 2 - fade;
- 				if(!cloudDown[a]) {
-@@ -403,11 +403,11 @@
- 		int qcda=(4<<CLOUD_DETAIL)>>a;
- 		int *pkernel=kernel;
- 		for(int y=0; y<cs4a; ++y, pkernel+=CLOUD_SIZE/4) {
--			float ydist=fabs(1.0f+y-cs8a)/cs8a;
-+			float ydist=math::fabs(1.0f+y-cs8a)/cs8a;
- 			ydist=ydist*ydist*(3-2*ydist);
- 			int *pkrn=pkernel;
- 			for(int x=0; x<cs4a; ++x) {
--				float xdist=fabs(1.0f+x-cs8a)/cs8a;
-+				float xdist=math::fabs(1.0f+x-cs8a)/cs8a;
- 				xdist=xdist*xdist*(3-2*xdist);
- 
- 				float contrib=(1-xdist)*(1-ydist);
-@@ -506,7 +506,7 @@
- 	unsigned char *tt=thicknessTransform;
- 	for(int a=0;a<1024;++a){
- 		float f=(1023.0f-(a+cloudDensity*1024-512))/1023.0f;
--		float alpha=pow(f*2,3);
-+		float alpha=math::pow(f*2,3);
- 		if(alpha>1)
- 			alpha=1;
- 		*at=(unsigned char)(alpha*255);
-@@ -533,11 +533,11 @@
- 
- 	float ymod=(sunTexCoordY-0.5f)*domeWidth*0.025f*256;
- 	float fy=ymod+modCamera.z*CLOUD_SIZE*0.000025f;
--	int baseY=int(floor(fy))&CLOUD_MASK;
--	fy-=floor(fy);
-+	int baseY=int(math::floor(fy))&CLOUD_MASK;
-+	fy-=math::floor(fy);
- 	float fx=gs->frameNum*0.00005f*CLOUD_SIZE+modCamera.x*CLOUD_SIZE*0.000025f;
--	int baseX=int(floor(fx))&CLOUD_MASK;
--	fx-=floor(fx);
-+	int baseX=int(math::floor(fx))&CLOUD_MASK;
-+	fx-=math::floor(fx);
- 
- 	float *cvs=(float *)covers[0], *cvs1=(float *)covers[1], *cvs2=(float *)covers[2], *cvs3=(float *)covers[3];
- 	if(baseX!=oldCoverBaseX || baseY!=oldCoverBaseY){
-@@ -589,8 +589,8 @@
- 		glBlendFunc(GL_ONE_MINUS_DST_COLOR,GL_ONE);
- 		glBegin(GL_TRIANGLE_STRIP);
- 		for(int x=0;x<257;++x){
--			float dx=sin(x*2*PI/256.0f);
--			float dy=cos(x*2*PI/256.0f);
-+			float dx=math::sin(x*2*PI/256.0f);
-+			float dy=math::cos(x*2*PI/256.0f);
- 
- 			glTexCoord2f(x/256.0f,0.25f);
- 			glVertexf3(modSunDir*5+ldir*dx*0.0014f+udir*dy*0.0014f);
-@@ -613,7 +613,7 @@
- 			mem[(y*128+x)*4+0]=255;
- 			mem[(y*128+x)*4+1]=255;
- 			mem[(y*128+x)*4+2]=255;
--			float dist=sqrt((float)(y-64)*(y-64)+(x-64)*(x-64));
-+			float dist=math::sqrt((float)(y-64)*(y-64)+(x-64)*(x-64));
- 			if(dist>60)
- 				mem[(y*128+x)*4+3]=0;
- 			else
-@@ -764,10 +764,10 @@
- 
- 	const float hdist = math::sqrt(dir.x * dir.x + dir.z * dir.z);
- 	const float ang = GetRadFromXY(dir.x, dir.z) + skyAngle;
--	const float fy = asin(hdist / 400);
-+	const float fy = math::asin(hdist / 400);
- 
--	dir.x = hdist * cos(ang);
--	dir.z = hdist * sin(ang);
-+	dir.x = hdist * math::cos(ang);
-+	dir.z = hdist * math::sin(ang);
- 	dir.y = (fastmath::cos(fy) - domeheight) * 400;
- 
- 	dir.ANormalize();
-@@ -800,7 +800,7 @@
- 	const float3& dir = GetDirFromTexCoord(x / 256.0f, (255.0f - y) / 256.0f);
- 
- 	const float sunInt = skyLight->GetLightIntensity();
--	const float sunDist = acos(dir.dot(skyLight->GetLightDir())) * 50;
-+	const float sunDist = math::acos(dir.dot(skyLight->GetLightDir())) * 50;
- 	const float sunMod = sunInt * (0.3f / math::sqrt(sunDist) + 2.0f / sunDist);
- 
- 	const float green = std::min(1.0f, (0.55f + sunMod));
-@@ -814,7 +814,7 @@
- void CBasicSky::UpdateTexPart(int x, int y, unsigned char (*texp)[4]) {
- 	const float3& dir = GetDirFromTexCoord(x / 512.0f, (511.0f - y) / 512.0f);
- 
--	const float sunDist = acos(dir.dot(skyLight->GetLightDir())) * 70;
-+	const float sunDist = math::acos(dir.dot(skyLight->GetLightDir())) * 70;
- 	const float sunMod = skyLight->GetLightIntensity() * 12.0f / (12 + sunDist);
- 
- 	const float red   = std::min(skyColor.x + sunMod * sunColor.x, 1.0f);
-diff -ru spring_89.0/rts/Rendering/Env/CubeMapHandler.cpp /home/svenstaro/src/spring/rts/Rendering/Env/CubeMapHandler.cpp
---- spring_89.0/rts/Rendering/Env/CubeMapHandler.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Env/CubeMapHandler.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -269,7 +269,7 @@
- 	for (int x = 0; x < size; ++x) {
- 		const float3 dir = (cdir + (xdif * (x + 0.5f)) / size + (ydif * (y + 0.5f)) / size).Normalize();
- 		const float dot  = std::max(0.0f, dir.dot(sky->GetLight()->GetLightDir()));
--		const float spec = std::min(1.0f, pow(dot, mapInfo->light.specularExponent) + pow(dot, 3.0f) * 0.25f);
-+		const float spec = std::min(1.0f, math::pow(dot, mapInfo->light.specularExponent) + math::pow(dot, 3.0f) * 0.25f);
- 
- 		buf[x * 4 + 0] = (mapInfo->light.unitSpecularColor.x * spec * 255);
- 		buf[x * 4 + 1] = (mapInfo->light.unitSpecularColor.y * spec * 255);
-diff -ru spring_89.0/rts/Rendering/Env/DynWater.cpp /home/svenstaro/src/spring/rts/Rendering/Env/DynWater.cpp
---- spring_89.0/rts/Rendering/Env/DynWater.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Env/DynWater.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -88,9 +88,9 @@
- 
- 	for (int y = 0; y < 64; ++y) {
- 		for (int x = 0; x < 64; ++x) {
--			temp[(y*64 + x)*4 + 0] = sin(x*PI*2.0f/64.0f) + ((x < 32) ? -1 : 1)*0.3f;
-+			temp[(y*64 + x)*4 + 0] = math::sin(x*PI*2.0f/64.0f) + ((x < 32) ? -1 : 1)*0.3f;
- 			temp[(y*64 + x)*4 + 1] = temp[(y*64 + x)*4 + 0];
--			temp[(y*64 + x)*4 + 2] = cos(x*PI*2.0f/64.0f) + ((x < 32) ? (16 - x) : (x - 48))/16.0f*0.3f;
-+			temp[(y*64 + x)*4 + 2] = math::cos(x*PI*2.0f/64.0f) + ((x < 32) ? (16 - x) : (x - 48))/16.0f*0.3f;
- 			temp[(y*64 + x)*4 + 3] = 0;
- 		}
- 	}
-@@ -197,7 +197,7 @@
- 		const float dy = y - 31.5f;
- 		for (int x = 0; x < 64; ++x) {
- 			const float dx = x-31.5f;
--			const float dist = sqrt(dx*dx + dy*dy);
-+			const float dist = math::sqrt(dx*dx + dy*dy);
- 			temp[(y*64 + x)*4 + 0] = std::max(0.0f, 1 - dist/30.f) * std::max(0.0f, 1 - dist/30.f);
- 			temp[(y*64 + x)*4 + 1] = std::max(0.0f, 1 - dist/30.f);
- 			temp[(y*64 + x)*4 + 2] = std::max(0.0f, 1 - dist/30.f) * std::max(0.0f, 1 - dist/30.f);
-@@ -425,8 +425,8 @@
- 
- 	oldCamPosBig = camPosBig;
- 
--	camPosBig.x = floor(std::max((float)WH_SIZE, std::min((float)gs->mapx*SQUARE_SIZE-WH_SIZE, (float)camera->pos.x))/(W_SIZE*16))*(W_SIZE*16);
--	camPosBig.z = floor(std::max((float)WH_SIZE, std::min((float)gs->mapy*SQUARE_SIZE-WH_SIZE, (float)camera->pos.z))/(W_SIZE*16))*(W_SIZE*16);
-+	camPosBig.x = math::floor(std::max((float)WH_SIZE, std::min((float)gs->mapx*SQUARE_SIZE-WH_SIZE, (float)camera->pos.x))/(W_SIZE*16))*(W_SIZE*16);
-+	camPosBig.z = math::floor(std::max((float)WH_SIZE, std::min((float)gs->mapy*SQUARE_SIZE-WH_SIZE, (float)camera->pos.z))/(W_SIZE*16))*(W_SIZE*16);
- 
- 	glDisable(GL_DEPTH_TEST);
- 	glDepthMask(0);
-@@ -835,8 +835,8 @@
- 	va = GetVertexArray();
- 	va->Initialize();
- 
--	camPosBig2.x = floor(std::max((float)WH_SIZE, std::min((float)gs->mapx*SQUARE_SIZE - WH_SIZE, (float)camera->pos.x))/(W_SIZE*16))*(W_SIZE*16);
--	camPosBig2.z = floor(std::max((float)WH_SIZE, std::min((float)gs->mapy*SQUARE_SIZE - WH_SIZE, (float)camera->pos.z))/(W_SIZE*16))*(W_SIZE*16);
-+	camPosBig2.x = math::floor(std::max((float)WH_SIZE, std::min((float)gs->mapx*SQUARE_SIZE - WH_SIZE, (float)camera->pos.x))/(W_SIZE*16))*(W_SIZE*16);
-+	camPosBig2.z = math::floor(std::max((float)WH_SIZE, std::min((float)gs->mapy*SQUARE_SIZE - WH_SIZE, (float)camera->pos.z))/(W_SIZE*16))*(W_SIZE*16);
- 
- 	// FIXME:
- 	//     1. DynWater::UpdateCamRestraints was never called ==> <this->left> and <this->right> were always empty
-@@ -1132,8 +1132,8 @@
- 				// hovercraft
- 				const float3& pos = unit->pos;
- 
--				if ((fabs(pos.x - camPosBig.x) > (WH_SIZE - 50)) ||
--					(fabs(pos.z - camPosBig.z) > (WH_SIZE - 50)))
-+				if ((math::fabs(pos.x - camPosBig.x) > (WH_SIZE - 50)) ||
-+					(math::fabs(pos.z - camPosBig.z) > (WH_SIZE - 50)))
- 				{
- 					continue;
- 				}
-@@ -1144,7 +1144,7 @@
- 				if ((pos.y > -4.0f) && (pos.y < 4.0f)) {
- 					const float3 frontAdd = unit->frontdir * unit->radius * 0.75f;
- 					const float3 sideAdd = unit->rightdir * unit->radius * 0.75f;
--					const float depth = sqrt(sqrt(unit->mass)) * 0.4f;
-+					const float depth = math::sqrt(math::sqrt(unit->mass)) * 0.4f;
- 					const float3 n(depth, 0.05f * depth, depth);
- 
- 					va2->AddVertexQTN(pos + frontAdd + sideAdd, 0, 0, n);
-@@ -1156,8 +1156,8 @@
- 				// surface ship
- 				const float3& pos = unit->pos;
- 
--				if ((fabs(pos.x - camPosBig.x) > (WH_SIZE - 50)) ||
--					(fabs(pos.z - camPosBig.z) > (WH_SIZE - 50)))
-+				if ((math::fabs(pos.x - camPosBig.x) > (WH_SIZE - 50)) ||
-+					(math::fabs(pos.z - camPosBig.z) > (WH_SIZE - 50)))
- 				{
- 					continue;
- 				}
-@@ -1171,7 +1171,7 @@
- 
- 				const float3 frontAdd = unit->frontdir * unit->radius * 0.75f;
- 				const float3 sideAdd = unit->rightdir * unit->radius * 0.18f;
--				const float depth = sqrt(sqrt(unit->mass));
-+				const float depth = math::sqrt(math::sqrt(unit->mass));
- 				const float3 n(depth, 0.04f * unit->speed.Length2D() * depth, depth);
- 
- 				va->AddVertexQTN(pos + frontAdd + sideAdd, 0, 0, n);
-@@ -1249,8 +1249,8 @@
- 	for (std::vector<Explosion>::iterator ei = explosions.begin(); ei != explosions.end(); ++ei) {
- 		Explosion& explo = *ei;
- 		float3 pos = explo.pos;
--		if ((fabs(pos.x - camPosBig.x) > (WH_SIZE - 50))
--				|| (fabs(pos.z - camPosBig.z) > (WH_SIZE - 50)))
-+		if ((math::fabs(pos.x - camPosBig.x) > (WH_SIZE - 50))
-+				|| (math::fabs(pos.z - camPosBig.z) > (WH_SIZE - 50)))
- 		{
- 			continue;
- 		}
-diff -ru spring_89.0/rts/Rendering/Env/GrassDrawer.cpp /home/svenstaro/src/spring/rts/Rendering/Env/GrassDrawer.cpp
---- spring_89.0/rts/Rendering/Env/GrassDrawer.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Env/GrassDrawer.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -75,11 +75,11 @@
- 	}
- 
- 	// TODO: get rid of the magic constants
--	maxGrassDist = 800 + sqrt((float) detail) * 240;
-+	maxGrassDist = 800 + math::sqrt((float) detail) * 240;
- 	maxDetailedDist = 146 + detail * 24;
- 	detailedBlocks = int((maxDetailedDist - 24) / bMSsq) + 1;
- 	numTurfs = 3 + int(detail * 0.5f);
--	strawPerTurf = 50 + int(sqrt((float) detail) * 10);
-+	strawPerTurf = 50 + int(math::sqrt((float) detail) * 10);
- 
- 	blocksX = gs->mapx / grassSquareSize  /grassBlockSize;
- 	blocksY = gs->mapy / grassSquareSize / grassBlockSize;
-@@ -641,7 +641,7 @@
- 		const float3 billboardDirX = (billboardDirZ.cross(UpVector)).ANormalize();
- 		const float3 billboardDirY = billboardDirX.cross(billboardDirZ);
- 
--		const float ang = acos(billboardDirZ.y);
-+		const float ang = math::acos(billboardDirZ.y);
- 		const int texPart = std::min(15, int(std::max(0, int((ang + PI / 16 - PI / 2) / PI * 30))));
- 
- 		if (globalRendering->haveGLSL) {
-@@ -673,7 +673,7 @@
- 			const float3 billboardDirX = (billboardDirZ.cross(UpVector)).ANormalize();
- 			const float3 billboardDirY = billboardDirX.cross(billboardDirZ);
- 
--			const float ang = acos(billboardDirZ.y);
-+			const float ang = math::acos(billboardDirZ.y);
- 			const int texPart = std::min(15, int(std::max(0, int((ang + PI / 16 - PI / 2) / PI * 30))));
- 
- 			if (globalRendering->haveGLSL) {
-@@ -820,7 +820,7 @@
- 		float3 forwardVect = sideVect.cross(UpVector);
- 		sideVect *= mapInfo->grass.bladeWidth;
- 
--		const float3 cornerPos = (UpVector * cos(maxAng) + forwardVect * sin(maxAng)) * length;
-+		const float3 cornerPos = (UpVector * math::cos(maxAng) + forwardVect * math::sin(maxAng)) * length;
- 		float3 basePos(30.0f, 0.0f, 30.0f);
- 
- 		while (basePos.SqLength2D() > (turfSize * turfSize / 4)) {
-@@ -837,10 +837,10 @@
- 
- 			const float3 edgePosL =
- 				-sideVect * (1 - h) +
--				(UpVector * cos(ang) + forwardVect * sin(ang)) * length * h;
-+				(UpVector * math::cos(ang) + forwardVect * math::sin(ang)) * length * h;
- 			const float3 edgePosR =
- 				sideVect * (1.0f - h) +
--				(UpVector * cos(ang) + forwardVect * sin(ang)) * length * h;
-+				(UpVector * math::cos(ang) + forwardVect * math::sin(ang)) * length * h;
- 
- 			if (b == 0) {
- 				va->AddVertexT(basePos + (edgePosR - float3(0.0f, 0.1f, 0.0f)), xtexBase + xtexOffset, h);
-diff -ru spring_89.0/rts/Rendering/Env/SkyLight.cpp /home/svenstaro/src/spring/rts/Rendering/Env/SkyLight.cpp
---- spring_89.0/rts/Rendering/Env/SkyLight.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Env/SkyLight.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -72,7 +72,7 @@
- bool DynamicSkyLight::SetLightDir(const float4& newLightDir) {
- 	if (newLightDir != lightDir) {
- 		static float4 lastUpdate = ZeroVector;
--		static const float minCosAngle = cos(1.5f * (PI/180.f));
-+		static const float minCosAngle = math::cos(1.5f * (PI/180.f));
- 
- 		if (lastUpdate.dot(newLightDir) < minCosAngle) {
- 			lastUpdate   = newLightDir;
-@@ -92,7 +92,7 @@
- 	const float angularVelocity = 2.0f * PI / sunOrbitTime;
- 
- 	const float sunAng  = startAngle - initialSunAngle - angularVelocity * gameSeconds;
--	const float4 sunPos = sunRotation.Mul(float3(sunOrbitRad * cos(sunAng), sunOrbitHeight, sunOrbitRad * sin(sunAng)));
-+	const float4 sunPos = sunRotation.Mul(float3(sunOrbitRad * math::cos(sunAng), sunOrbitHeight, sunOrbitRad * math::sin(sunAng)));
- 
- 	return sunPos;
- }
-@@ -108,18 +108,18 @@
- 	if (newLightDir.w == FLT_MAX) {
- 		// old: newLightDir is position where sun reaches highest altitude
- 		const float sunLen = newLightDir.Length2D();
--		const float sunAzimuth = (sunLen <= 0.001f) ? PI / 2.0f : atan(newLightDir.y / sunLen);
--		const float sunHeight = tan(sunAzimuth - 0.001f);
-+		const float sunAzimuth = (sunLen <= 0.001f) ? PI / 2.0f : math::atan(newLightDir.y / sunLen);
-+		const float sunHeight = math::tan(sunAzimuth - 0.001f);
- 
--		float3 v1(cos(initialSunAngle), sunHeight, sin(initialSunAngle));
-+		float3 v1(math::cos(initialSunAngle), sunHeight, math::sin(initialSunAngle));
- 		v1.ANormalize();
- 
- 		if (v1.y <= orbitMinSunHeight) {
- 			newLightDir = UpVector;
- 			sunOrbitHeight = v1.y;
--			sunOrbitRad = sqrt(1.0f - sunOrbitHeight * sunOrbitHeight);
-+			sunOrbitRad = math::sqrt(1.0f - sunOrbitHeight * sunOrbitHeight);
- 		} else {
--			float3 v2(cos(initialSunAngle + PI), orbitMinSunHeight, sin(initialSunAngle + PI));
-+			float3 v2(math::cos(initialSunAngle + PI), orbitMinSunHeight, math::sin(initialSunAngle + PI));
- 			v2.ANormalize();
- 			float3 v3 = v2 - v1;
- 			sunOrbitRad = v3.Length() / 2.0f;
-@@ -137,7 +137,7 @@
- 	} else {
- 		// new: newLightDir is center position of orbit, and newLightDir.w is orbit height
- 		sunOrbitHeight = std::max(-1.0f, std::min(newLightDir.w, 1.0f));
--		sunOrbitRad = sqrt(1.0f - sunOrbitHeight * sunOrbitHeight);
-+		sunOrbitRad = math::sqrt(1.0f - sunOrbitHeight * sunOrbitHeight);
- 	}
- 
- 	sunRotation.LoadIdentity();
-diff -ru spring_89.0/rts/Rendering/GL/glExtra.cpp /home/svenstaro/src/spring/rts/Rendering/GL/glExtra.cpp
---- spring_89.0/rts/Rendering/GL/glExtra.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/GL/glExtra.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -83,7 +83,7 @@
- 		float adjustment = rad/2;
- 		float ydiff = 0;
- 		int j;
--		for(j = 0; j < 50 && fabs(adjRadius - rad) + ydiff > .01*rad; j++){
-+		for(j = 0; j < 50 && math::fabs(adjRadius - rad) + ydiff > .01*rad; j++){
- 			if(adjRadius > rad) {
- 				rad += adjustment;
- 			} else {
-@@ -93,7 +93,7 @@
- 			pos.x = center.x + (sinR * rad);
- 			pos.z = center.z + (cosR * rad);
- 			float newY = ground->GetHeightAboveWater(pos.x, pos.z, false);
--			ydiff = fabs(pos.y - newY);
-+			ydiff = math::fabs(pos.y - newY);
- 			pos.y = newY;
- 			heightDiff = (pos.y - center.y);
- 			adjRadius = weapon ? weapon->GetRange2D(heightDiff*weapon->heightMod) : rad;
-diff -ru spring_89.0/rts/Rendering/GroundDecalHandler.cpp /home/svenstaro/src/spring/rts/Rendering/GroundDecalHandler.cpp
---- spring_89.0/rts/Rendering/GroundDecalHandler.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/GroundDecalHandler.cpp	2012-07-13 06:34:43.082727161 +0200
-@@ -963,7 +963,7 @@
- 		radius = damage * 0.25f;
- 
- 	if (damage > 400)
--		damage = 400 + sqrt(damage - 399);
-+		damage = 400 + math::sqrt(damage - 399);
- 
- 	pos.ClampInBounds();
- 
-diff -ru spring_89.0/rts/Rendering/InMapDrawView.cpp /home/svenstaro/src/spring/rts/Rendering/InMapDrawView.cpp
---- spring_89.0/rts/Rendering/InMapDrawView.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/InMapDrawView.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -38,7 +38,7 @@
- 	for (int y = 0; y < 64; y++) {
- 		// circular thingy
- 		for (int x = 0; x < 64; x++) {
--			float dist = sqrt((float)(x - 32) * (x - 32) + (y - 32) * (y - 32));
-+			float dist = math::sqrt((float)(x - 32) * (x - 32) + (y - 32) * (y - 32));
- 			if (dist > 31.0f) {
- 				// do nothing - leave transparent
- 			} else if (dist > 30.0f) {
-diff -ru spring_89.0/rts/Rendering/LineDrawer.cpp /home/svenstaro/src/spring/rts/Rendering/LineDrawer.cpp
---- spring_89.0/rts/Rendering/LineDrawer.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/LineDrawer.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -29,7 +29,7 @@
- void CLineDrawer::UpdateLineStipple()
- {
- 	stippleTimer += (globalRendering->lastFrameTime * cmdColors.StippleSpeed());
--	stippleTimer = fmod(stippleTimer, (16.0f / 20.0f));
-+	stippleTimer = math::fmod(stippleTimer, (16.0f / 20.0f));
- }
- 
- 
-diff -ru spring_89.0/rts/Rendering/Models/S3OParser.cpp /home/svenstaro/src/spring/rts/Rendering/Models/S3OParser.cpp
---- spring_89.0/rts/Rendering/Models/S3OParser.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Rendering/Models/S3OParser.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -319,7 +319,7 @@
- 		float3& t = tTangents[vrtIdx];
- 		int h = 1;
- 
--		if (isnan(n.x) || isnan(n.y) || isnan(n.z)) {
-+		if (math::isnan(n.x) || math::isnan(n.y) || math::isnan(n.z)) {
- 			n = float3(0.0f, 0.0f, 1.0f);
- 		}
- 		if (s == ZeroVector) { s = float3(1.0f, 0.0f, 0.0f); }
-diff -ru spring_89.0/rts/Sim/Misc/LosMap.cpp /home/svenstaro/src/spring/rts/Sim/Misc/LosMap.cpp
---- spring_89.0/rts/Sim/Misc/LosMap.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Misc/LosMap.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -182,7 +182,7 @@
- 
- 		y = (int)i;
- 		x = 1;
--		y = (int) (sqrt((float)r2 - 1) + 0.5f);
-+		y = (int) (math::sqrt((float)r2 - 1) + 0.5f);
- 		while (x < y) {
- 			if(!PaintTable[x+y*Radius]) {
- 				DrawLine(PaintTable, x, y, Radius);
-@@ -198,7 +198,7 @@
- 			}
- 
- 			x += 1;
--			y = (int) (sqrt((float)r2 - x*x) + 0.5f);
-+			y = (int) (math::sqrt((float)r2 - x*x) + 0.5f);
- 		}
- 		if (x == y) {
- 			if(!PaintTable[x+y*Radius]) {
-diff -ru spring_89.0/rts/Sim/Misc/QuadField.cpp /home/svenstaro/src/spring/rts/Sim/Misc/QuadField.cpp
---- spring_89.0/rts/Sim/Misc/QuadField.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Misc/QuadField.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -329,12 +329,12 @@
- 	float zp = start.z;
- 	const float invQuadSize = 1.0f / QUAD_SIZE;
- 
--	if ((floor(start.x * invQuadSize) == floor(to.x * invQuadSize)) &&
--		(floor(start.z * invQuadSize) == floor(to.z * invQuadSize)))
-+	if ((math::floor(start.x * invQuadSize) == math::floor(to.x * invQuadSize)) &&
-+		(math::floor(start.z * invQuadSize) == math::floor(to.z * invQuadSize)))
- 	{
- 		*endQuad = ((int(start.x * invQuadSize)) + (int(start.z * invQuadSize)) * numQuadsX);
- 		++endQuad;
--	} else if (floor(start.x * invQuadSize) == floor(to.x * invQuadSize)) {
-+	} else if (math::floor(start.x * invQuadSize) == math::floor(to.x * invQuadSize)) {
- 		const int first = (int)(start.x * invQuadSize) + ((int)(start.z * invQuadSize) * numQuadsX);
- 		const int last  = (int)(to.x    * invQuadSize) + ((int)(to.z    * invQuadSize) * numQuadsX);
- 
-@@ -347,7 +347,7 @@
- 				*endQuad = a; ++endQuad;
- 			}
- 		}
--	} else if (floor(start.z * invQuadSize) == floor(to.z * invQuadSize)) {
-+	} else if (math::floor(start.z * invQuadSize) == math::floor(to.z * invQuadSize)) {
- 		const int first = (int)(start.x * invQuadSize) + ((int)(start.z * invQuadSize) * numQuadsX);
- 		const int last  = (int)(to.x    * invQuadSize) + ((int)(to.z    * invQuadSize) * numQuadsX);
- 
-@@ -369,14 +369,14 @@
- 			++endQuad;
- 
- 			if (dx > 0) {
--				xn = (floor(xp * invQuadSize) * QUAD_SIZE + QUAD_SIZE - xp) / dx;
-+				xn = (math::floor(xp * invQuadSize) * QUAD_SIZE + QUAD_SIZE - xp) / dx;
- 			} else {
--				xn = (floor(xp * invQuadSize) * QUAD_SIZE - xp) / dx;
-+				xn = (math::floor(xp * invQuadSize) * QUAD_SIZE - xp) / dx;
- 			}
- 			if (dz > 0) {
--				zn = (floor(zp * invQuadSize) * QUAD_SIZE + QUAD_SIZE - zp) / dz;
-+				zn = (math::floor(zp * invQuadSize) * QUAD_SIZE + QUAD_SIZE - zp) / dz;
- 			} else {
--				zn = (floor(zp * invQuadSize) * QUAD_SIZE - zp) / dz;
-+				zn = (math::floor(zp * invQuadSize) * QUAD_SIZE - zp) / dz;
- 			}
- 
- 			if (xn < zn) {
-@@ -388,8 +388,8 @@
- 			}
- 
- 			keepgoing =
--				(fabs(xp - start.x) < fabs(to.x - start.x)) &&
--				(fabs(zp - start.z) < fabs(to.z - start.z));
-+				(math::fabs(xp - start.x) < math::fabs(to.x - start.x)) &&
-+				(math::fabs(zp - start.z) < math::fabs(to.z - start.z));
- 		}
- 	}
- 
-diff -ru spring_89.0/rts/Sim/MoveTypes/ClassicGroundMoveType.cpp /home/svenstaro/src/spring/rts/Sim/MoveTypes/ClassicGroundMoveType.cpp
---- spring_89.0/rts/Sim/MoveTypes/ClassicGroundMoveType.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/MoveTypes/ClassicGroundMoveType.cpp	2012-07-13 06:34:43.256060504 +0200
-@@ -386,7 +386,7 @@
- 
- 	const float dif = wSpeed - currentSpeed;
- 
--	if (fabs(dif) < 0.05f) {
-+	if (math::fabs(dif) < 0.05f) {
- 		deltaSpeed = dif * 0.125f;
- 		nextDeltaSpeedUpdate = gs->frameNum + 8;
- 	} else if (dif > 0.0f) {
-@@ -529,7 +529,7 @@
- 			skidRotSpeed = 0.0f;
- 			owner->physicalState = oldPhysState;
- 			owner->moveType->useHeading = true;
--			float rp = floor(skidRotPos2 + skidRotSpeed2 + 0.5f);
-+			float rp = math::floor(skidRotPos2 + skidRotSpeed2 + 0.5f);
- 			skidRotSpeed2 = (rp - skidRotPos2) * 0.5f;
- 			ChangeHeading(owner->heading);
- 		} else {
-@@ -545,10 +545,10 @@
- 			}
- 
- 			float remTime=speedf/speedReduction-1;
--			float rp=floor(skidRotPos2+skidRotSpeed2*remTime+0.5f);
-+			float rp=math::floor(skidRotPos2+skidRotSpeed2*remTime+0.5f);
- 			skidRotSpeed2=(remTime+1 == 0 ) ? 0 : (rp-skidRotPos2)/(remTime+1);
- 
--			if(floor(skidRotPos2)!=floor(skidRotPos2+skidRotSpeed2)){
-+			if(math::floor(skidRotPos2)!=math::floor(skidRotPos2+skidRotSpeed2)){
- 				skidRotPos2=0;
- 				skidRotSpeed2=0;
- 			}
-@@ -571,7 +571,7 @@
- 				speed*=0.95f;
- 			}
- 			else {
--				speed += (normal*(fabs(speed.dot(normal)) + .1))*1.9f;
-+				speed += (normal*(math::fabs(speed.dot(normal)) + .1))*1.9f;
- 				speed*=.8;
- 			}
- 		}
-@@ -625,7 +625,7 @@
- 		float totRad = owner->radius + u->radius;
- 
- 		if (sqDist < totRad * totRad && sqDist != 0) {
--			float dist = sqrt(sqDist);
-+			float dist = math::sqrt(sqDist);
- 			float3 dif = midPos - u->midPos;
- 			dif /= std::max(dist, 1.f);
- 
-@@ -682,7 +682,7 @@
- 		float sqDist=(midPos-u->midPos).SqLength();
- 		float totRad=owner->radius+u->radius;
- 		if(sqDist<totRad*totRad && sqDist!=0){
--			float dist=sqrt(sqDist);
-+			float dist=math::sqrt(sqDist);
- 			float3 dif=midPos-u->midPos;
- 			dif/=std::max(dist, 1.f);
- 			float impactSpeed = -owner->speed.dot(dif);
-@@ -721,8 +721,8 @@
- 
- 	skidRotPos2 += skidRotSpeed2;
- 
--	float cosp = cos(skidRotPos2 * PI * 2.0f);
--	float sinp = sin(skidRotPos2 * PI * 2.0f);
-+	float cosp = math::cos(skidRotPos2 * PI * 2.0f);
-+	float sinp = math::sin(skidRotPos2 * PI * 2.0f);
- 
- 	float3 f1 = skidRotVector * skidRotVector.dot(owner->frontdir);
- 	float3 f2 = owner->frontdir - f1;
-@@ -812,7 +812,7 @@
- 						float objectDistToAvoidDirCenter = objectToUnit.dot(rightOfAvoid);
- 
- 						if (objectToUnit.dot(avoidanceDir) < radiusSum &&
--							fabs(objectDistToAvoidDirCenter) < radiusSum &&
-+							math::fabs(objectDistToAvoidDirCenter) < radiusSum &&
- 							(o->moveDef || Distance2D(owner, o) >= 0)) {
- 
- 							if (objectDistToAvoidDirCenter > 0.0f) {
-@@ -824,7 +824,7 @@
- 								rightOfAvoid = avoidanceDir.cross(float3(0.0f, 1.0f, 0.0f));
- 							} else {
- 								avoidLeft +=
--									(radiusSum - fabs(objectDistToAvoidDirCenter)) *
-+									(radiusSum - math::fabs(objectDistToAvoidDirCenter)) *
- 									AVOIDANCE_STRENGTH * fastmath::isqrt2(distanceToObjectSq);
- 								avoidanceDir -= (rightOfAvoid * avoidLeft);
- 								avoidanceDir.Normalize();
-@@ -952,7 +952,7 @@
- 	if (!decRate) {
- 		return 0.0f;
- 	}
--	return fabs(speed*speed / decRate);
-+	return math::fabs(speed*speed / decRate);
- }
- 
- float3 CClassicGroundMoveType::Here()
-@@ -1043,7 +1043,7 @@
- 			const float zmove = (owner->mapPos.y + owner->zsize / 2) * SQUARE_SIZE;
- 			const float xmove = (owner->mapPos.x + owner->xsize / 2) * SQUARE_SIZE;
- 
--			if (fabs(owner->frontdir.x) > fabs(owner->frontdir.z)) {
-+			if (math::fabs(owner->frontdir.x) > math::fabs(owner->frontdir.z)) {
- 				if (newmp.y < owner->mapPos.y) {
- 					haveCollided |= CheckColV(newmp.y, newmp.x, newmp.x + owner->xsize - 1,  zmove - 3.99f, owner->mapPos.y);
- 					newmp = owner->GetMapPos();
-@@ -1261,20 +1261,20 @@
- 			float xp = start.x;
- 			float zp = start.z;
- 
--			if (floor(start.x) == floor(to.x)) {
-+			if (math::floor(start.x) == math::floor(to.x)) {
- 				if (dz > 0.0f) {
--					for (int a = 1; a < floor(to.z); ++a)
-+					for (int a = 1; a < math::floor(to.z); ++a)
- 						lineTable[yt][xt].push_back(int2(0, a));
- 				} else {
--					for (int a = -1; a > floor(to.z); --a)
-+					for (int a = -1; a > math::floor(to.z); --a)
- 						lineTable[yt][xt].push_back(int2(0, a));
- 				}
--			} else if (floor(start.z) == floor(to.z)) {
-+			} else if (math::floor(start.z) == math::floor(to.z)) {
- 				if (dx > 0.0f) {
--					for (int a = 1; a < floor(to.x); ++a)
-+					for (int a = 1; a < math::floor(to.x); ++a)
- 						lineTable[yt][xt].push_back(int2(a, 0));
- 				} else {
--					for (int a = -1; a > floor(to.x); --a)
-+					for (int a = -1; a > math::floor(to.x); --a)
- 						lineTable[yt][xt].push_back(int2(a, 0));
- 				}
- 			} else {
-@@ -1283,14 +1283,14 @@
- 
- 				while (keepgoing) {
- 					if (dx > 0.0f) {
--						xn = (floor(xp) + 1.0f - xp) / dx;
-+						xn = (math::floor(xp) + 1.0f - xp) / dx;
- 					} else {
--						xn = (floor(xp)        - xp) / dx;
-+						xn = (math::floor(xp)        - xp) / dx;
- 					}
- 					if (dz > 0.0f) {
--						zn = (floor(zp) + 1.0f - zp) / dz;
-+						zn = (math::floor(zp) + 1.0f - zp) / dz;
- 					} else {
--						zn = (floor(zp)        - zp) / dz;
-+						zn = (math::floor(zp)        - zp) / dz;
- 					}
- 
- 					if (xn < zn) {
-@@ -1302,10 +1302,10 @@
- 					}
- 
- 					keepgoing =
--						fabs(xp - start.x) < fabs(to.x - start.x) &&
--						fabs(zp - start.z) < fabs(to.z - start.z);
-+						math::fabs(xp - start.x) < math::fabs(to.x - start.x) &&
-+						math::fabs(zp - start.z) < math::fabs(to.z - start.z);
- 
--					lineTable[yt][xt].push_back( int2(int(floor(xp)), int(floor(zp))) );
-+					lineTable[yt][xt].push_back( int2(int(math::floor(xp)), int(math::floor(zp))) );
- 				}
- 
- 				lineTable[yt][xt].pop_back();
-@@ -1335,7 +1335,7 @@
- 		const MoveDef& md = *(owner->unitDef->moveDef);
- 		const float cmod = movemath->GetPosSpeedMod(md, moveSquareX * 2, moveSquareY * 2);
- 
--		if (fabs(owner->frontdir.x) < fabs(owner->frontdir.z)) {
-+		if (math::fabs(owner->frontdir.x) < math::fabs(owner->frontdir.z)) {
- 			if (newMoveSquareX > moveSquareX) {
- 				const float nmod = movemath->GetPosSpeedMod(md, newMoveSquareX * 2, newMoveSquareY * 2);
- 				if (cmod > 0.01f && nmod <= 0.01f) {
-diff -ru spring_89.0/rts/Sim/MoveTypes/GroundMoveType.cpp /home/svenstaro/src/spring/rts/Sim/MoveTypes/GroundMoveType.cpp
---- spring_89.0/rts/Sim/MoveTypes/GroundMoveType.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/MoveTypes/GroundMoveType.cpp	2012-07-13 06:34:43.249393836 +0200
-@@ -1808,20 +1808,20 @@
- 			float xp = start.x;
- 			float zp = start.z;
- 
--			if (floor(start.x) == floor(to.x)) {
-+			if (math::floor(start.x) == math::floor(to.x)) {
- 				if (dz > 0.0f) {
--					for (int a = 1; a <= floor(to.z); ++a)
-+					for (int a = 1; a <= math::floor(to.z); ++a)
- 						lineTable[yt][xt].push_back(int2(0, a));
- 				} else {
--					for (int a = -1; a >= floor(to.z); --a)
-+					for (int a = -1; a >= math::floor(to.z); --a)
- 						lineTable[yt][xt].push_back(int2(0, a));
- 				}
--			} else if (floor(start.z) == floor(to.z)) {
-+			} else if (math::floor(start.z) == math::floor(to.z)) {
- 				if (dx > 0.0f) {
--					for (int a = 1; a <= floor(to.x); ++a)
-+					for (int a = 1; a <= math::floor(to.x); ++a)
- 						lineTable[yt][xt].push_back(int2(a, 0));
- 				} else {
--					for (int a = -1; a >= floor(to.x); --a)
-+					for (int a = -1; a >= math::floor(to.x); --a)
- 						lineTable[yt][xt].push_back(int2(a, 0));
- 				}
- 			} else {
-@@ -1830,14 +1830,14 @@
- 
- 				while (keepgoing) {
- 					if (dx > 0.0f) {
--						xn = (floor(xp) + 1.0f - xp) / dx;
-+						xn = (math::floor(xp) + 1.0f - xp) / dx;
- 					} else {
--						xn = (floor(xp)        - xp) / dx;
-+						xn = (math::floor(xp)        - xp) / dx;
- 					}
- 					if (dz > 0.0f) {
--						zn = (floor(zp) + 1.0f - zp) / dz;
-+						zn = (math::floor(zp) + 1.0f - zp) / dz;
- 					} else {
--						zn = (floor(zp)        - zp) / dz;
-+						zn = (math::floor(zp)        - zp) / dz;
- 					}
- 
- 					if (xn < zn) {
-@@ -1851,7 +1851,7 @@
- 					keepgoing =
- 						math::fabs(xp - start.x) <= math::fabs(to.x - start.x) &&
- 						math::fabs(zp - start.z) <= math::fabs(to.z - start.z);
--					int2 pt(int(floor(xp)), int(floor(zp)));
-+					int2 pt(int(math::floor(xp)), int(math::floor(zp)));
- 
- 					static const int MIN_IDX = -int(LINETABLE_SIZE / 2);
- 					static const int MAX_IDX = -MIN_IDX;
-diff -ru spring_89.0/rts/Sim/MoveTypes/HoverAirMoveType.cpp /home/svenstaro/src/spring/rts/Sim/MoveTypes/HoverAirMoveType.cpp
---- spring_89.0/rts/Sim/MoveTypes/HoverAirMoveType.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/MoveTypes/HoverAirMoveType.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -325,7 +325,7 @@
- {
- 	#define NOZERO(x) std::max(x, 0.0001f)
- 
--	const float driftSpeed = fabs(owner->unitDef->dlHoverFactor);
-+	const float driftSpeed = math::fabs(owner->unitDef->dlHoverFactor);
- 	float3 deltaVec = goalPos - owner->pos;
- 	float3 deltaDir = float3(deltaVec.x, 0.0f, deltaVec.z);
- 	float l = NOZERO(deltaDir.Length2D());
-@@ -342,7 +342,7 @@
- 	deltaDir -= owner->speed;
- 	l = deltaDir.SqLength2D();
- 	if (l > (maxSpeed * maxSpeed)) {
--		deltaDir *= maxSpeed / NOZERO(sqrt(l));
-+		deltaDir *= maxSpeed / NOZERO(math::sqrt(l));
- 	}
- 	wantedSpeed = owner->speed + deltaDir;
- 
-diff -ru spring_89.0/rts/Sim/MoveTypes/StrafeAirMoveType.cpp /home/svenstaro/src/spring/rts/Sim/MoveTypes/StrafeAirMoveType.cpp
---- spring_89.0/rts/Sim/MoveTypes/StrafeAirMoveType.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/MoveTypes/StrafeAirMoveType.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -412,7 +412,7 @@
- 				}
- 			}
- 
--			if (fabs(owner->rightdir.y) < maxAileron * 3.0f * speedf || owner->updir.y < 0.0f) {
-+			if (math::fabs(owner->rightdir.y) < maxAileron * 3.0f * speedf || owner->updir.y < 0.0f) {
- 				elevator = 1;
- 			}
- 			UpdateAirPhysics(0, aileron, elevator, 1, owner->frontdir);
-@@ -528,13 +528,13 @@
- 	if (goalDir.dot(frontdir) < -0.2f + inefficientAttackTime * 0.002f && frontdir.y > -0.2f && speedf > 2.0f && gs->randFloat() > 0.996f)
- 		maneuver = 1;
- 
--	if (goalDir.dot(frontdir) < -0.2f + inefficientAttackTime * 0.002f && fabs(frontdir.y) < 0.2f && gs->randFloat() > 0.996f && gHeightAW + 400 < pos.y) {
-+	if (goalDir.dot(frontdir) < -0.2f + inefficientAttackTime * 0.002f && math::fabs(frontdir.y) < 0.2f && gs->randFloat() > 0.996f && gHeightAW + 400 < pos.y) {
- 		maneuver = 2;
- 		maneuverSubState = 0;
- 	}
- 
- 	// roll
--	if (speedf > 0.45f && pos.y + owner->speed.y * 60 * fabs(frontdir.y) + std::min(0.0f, float(updir.y)) * 150 > gHeightAW + 60 + fabs(rightdir.y) * 150) {
-+	if (speedf > 0.45f && pos.y + owner->speed.y * 60 * math::fabs(frontdir.y) + std::min(0.0f, float(updir.y)) * 150 > gHeightAW + 60 + math::fabs(rightdir.y) * 150) {
- 		const float goalBankDif = goalDotRight + rightdir.y * 0.2f;
- 		if (goalBankDif > maxAileron * speedf * 4.0f) {
- 			aileron = 1;
-@@ -706,7 +706,7 @@
- 		} else if (goalBankDif < -maxAileron * speedf * 4 && rightdir.y < maxBank) {
- 			aileron = -1;
- 		} else {
--			if (fabs(rightdir.y) < maxBank) {
-+			if (math::fabs(rightdir.y) < maxBank) {
- 				aileron = goalBankDif / (maxAileron * speedf * 4);
- 			} else {
- 				if (rightdir.y < 0.0f && goalBankDif < 0.0f) {
-@@ -762,7 +762,7 @@
- 			} else if (hdif > (maxElevator * speedf * speedf * 20) && frontdir.y < maxPitch) {
- 				elevator = 1;
- 			} else {
--				if (fabs(frontdir.y) < maxPitch)
-+				if (math::fabs(frontdir.y) < maxPitch)
- 					elevator = hdif / (maxElevator * speedf * speedf * 20);
- 			}
- 		}
-diff -ru spring_89.0/rts/Sim/Path/Default/PathEstimator.cpp /home/svenstaro/src/spring/rts/Sim/Path/Default/PathEstimator.cpp
---- spring_89.0/rts/Sim/Path/Default/PathEstimator.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Path/Default/PathEstimator.cpp	2012-07-13 06:34:42.939393819 +0200
-@@ -201,7 +201,7 @@
- 
- void CPathEstimator::CalcOffsetsAndPathCosts(int thread) {
- 	//! reset FPU state for synced computations
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- 
- 	// NOTE: EstimatePathCosts() [B] is temporally dependent on CalculateBlockOffsets() [A],
- 	// A must be completely finished before B_i can be safely called. This means we cannot
-diff -ru spring_89.0/rts/Sim/Path/QTPFS/PathManager.cpp /home/svenstaro/src/spring/rts/Sim/Path/QTPFS/PathManager.cpp
---- spring_89.0/rts/Sim/Path/QTPFS/PathManager.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Path/QTPFS/PathManager.cpp	2012-07-13 06:34:43.016060490 +0200
-@@ -251,7 +251,7 @@
- 
- 
- void QTPFS::PathManager::InitNodeLayersThreaded(const SRectangle& rect) {
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- 
- 	char loadMsg[512] = {'\0'};
- 	const char* fmtString = "[PathManager::%s] using %u threads for %u node-layers (cached? %s)";
-@@ -310,7 +310,7 @@
- 	}
- 	#endif
- 
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- }
- 
- void QTPFS::PathManager::InitNodeLayersThread(
-@@ -360,7 +360,7 @@
- 
- 
- void QTPFS::PathManager::UpdateNodeLayersThreaded(const SRectangle& rect) {
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- 
- 	#ifdef QTPFS_OPENMP_ENABLED
- 	{
-@@ -375,7 +375,7 @@
- 	}
- 	#endif
- 
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- }
- 
- void QTPFS::PathManager::UpdateNodeLayersThread(
-@@ -569,7 +569,7 @@
- 	SCOPED_TIMER("PathManager::Update");
- 
- 	#ifdef QTPFS_ENABLE_THREADED_UPDATE
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- 
- 	// allow ThreadUpdate to run one iteration
- 	condThreadUpdate->notify_one();
-@@ -579,7 +579,7 @@
- 	// wait for the ThreadUpdate iteration to finish
- 	condThreadUpdated->wait(lock);
- 
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- 	#else
- 	ThreadUpdate();
- 	#endif
-diff -ru spring_89.0/rts/Sim/Projectiles/ExplosionGenerator.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/ExplosionGenerator.cpp
---- spring_89.0/rts/Sim/Projectiles/ExplosionGenerator.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/ExplosionGenerator.cpp	2012-07-13 06:34:43.082727161 +0200
-@@ -262,7 +262,7 @@
- 	damage *= gfxMod;
- 	damage = std::max(damage, 0.0f);
- 
--	const float sqrtDmg = sqrt(damage);
-+	const float sqrtDmg = math::sqrt(damage);
- 	const float camLength = camVect.Length();
- 	float moveLength = radius * 0.03f;
- 
-@@ -283,7 +283,7 @@
- 		if (airExplosion || waterExplosion) { smokeDamage *= 0.6f; }
- 
- 		if (smokeDamage > 0.01f) {
--			smokeDamageSQRT = sqrt(smokeDamage);
-+			smokeDamageSQRT = math::sqrt(smokeDamage);
- 			smokeDamageISQRT = 1.0f / (smokeDamageSQRT * 0.35f);
- 		}
- 
-@@ -507,17 +507,17 @@
- 			}
- 			case OP_SAWTOOTH: {
- 				// this translates to modulo except it works with floats
--				val -= (*(float*) code) * floor(val / (*(float*) code));
-+				val -= (*(float*) code) * math::floor(val / (*(float*) code));
- 				code += 4;
- 				break;
- 			}
- 			case OP_DISCRETE: {
--				val = (*(float*) code) * floor(val / (*(float*) code));
-+				val = (*(float*) code) * math::floor(val / (*(float*) code));
- 				code += 4;
- 				break;
- 			}
- 			case OP_SINE: {
--				val = (*(float*) code) * sin(val);
-+				val = (*(float*) code) * math::sin(val);
- 				code += 4;
- 				break;
- 			}
-@@ -538,12 +538,12 @@
- 				break;
- 			}
- 			case OP_POW: {
--				val = pow(val, (*(float*) code));
-+				val = math::pow(val, (*(float*) code));
- 				code += 4;
- 				break;
- 			}
- 			case OP_POWBUFF: {
--				val = pow(val, buffer[(*(int*) code)]);
-+				val = math::pow(val, buffer[(*(int*) code)]);
- 				code += 4;
- 				break;
- 			}
-diff -ru spring_89.0/rts/Sim/Projectiles/PieceProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/PieceProjectile.cpp
---- spring_89.0/rts/Sim/Projectiles/PieceProjectile.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/PieceProjectile.cpp	2012-07-13 06:34:43.069393827 +0200
-@@ -111,7 +111,7 @@
- 	oldSmokeDir.Normalize();
- 	const float3 camDir = (pos - camera->pos).Normalize();
- 
--	if (camera->pos.distance(pos) + (1 - fabs(camDir.dot(oldSmokeDir))) * 3000 < 200) {
-+	if (camera->pos.distance(pos) + (1 - math::fabs(camDir.dot(oldSmokeDir))) * 3000 < 200) {
- 		drawTrail = false;
- 	}
- 
-@@ -334,7 +334,7 @@
- 
- 			if (!drawTrail) {
- 				float3 camDir = (pos - camera->pos).Normalize();
--				if (camera->pos.distance(pos) + (1 - fabs(camDir.dot(dir))) * 3000 > 300) {
-+				if (camera->pos.distance(pos) + (1 - math::fabs(camDir.dot(dir))) * 3000 > 300) {
- 					drawTrail = true;
- 				}
- 			}
-@@ -373,7 +373,7 @@
- 				const float3 dif2 = (oldSmokePos - camera->pos).Normalize();
- 				const float3 dir2 = (dif2.cross(oldSmokeDir)).Normalize();
- 
--				float a1 = ((1 - 0.0f / (Smoke_Time)) * 255) * (0.7f + fabs(dif.dot(dir)));
-+				float a1 = ((1 - 0.0f / (Smoke_Time)) * 255) * (0.7f + math::fabs(dif.dot(dir)));
- 				float alpha = std::min(255.0f, std::max(0.f, a1));
- 				col[0] = (unsigned char) (color * alpha);
- 				col[1] = (unsigned char) (color * alpha);
-@@ -381,7 +381,7 @@
- 				col[3] = (unsigned char) (alpha);
- 
- 				unsigned char col2[4];
--				float a2 = ((1 - float(age2) / (Smoke_Time)) * 255) * (0.7f + fabs(dif2.dot(oldSmokeDir)));
-+				float a2 = ((1 - float(age2) / (Smoke_Time)) * 255) * (0.7f + math::fabs(dif2.dot(oldSmokeDir)));
- 
- 				if (age < 8)
- 					a2 = 0;
-diff -ru spring_89.0/rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.cpp
---- spring_89.0/rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SimpleParticleSystem.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -188,7 +188,7 @@
- 		particles[i].size = particleSize + gu->usRandFloat()*particleSizeSpread;
- 		particles[i].pos = pos;
- 
--		particles[i].speed = ((up * emitMul.y) * cos(ay) - ((right * emitMul.x) * cos(az) - (forward * emitMul.z) * sin(az)) * sin(ay)) * (particleSpeed + (gu->usRandFloat() * particleSpeedSpread));
-+		particles[i].speed = ((up * emitMul.y) * math::cos(ay) - ((right * emitMul.x) * math::cos(az) - (forward * emitMul.z) * math::sin(az)) * math::sin(ay)) * (particleSpeed + (gu->usRandFloat() * particleSpeedSpread));
- 	}
- 
- 	drawRadius = (particleSpeed + particleSpeedSpread) * (particleLife * particleLifeSpread);
-@@ -232,7 +232,7 @@
- 		const float az = gu->usRandFloat() * 2 * PI;
- 		const float ay = (emitRot + emitRotSpread*gu->usRandFloat()) * (PI / 180.0);
- 
--		float3 pspeed = ((up * emitMul.y) * cos(ay) - ((right * emitMul.x) * cos(az) - (forward * emitMul.z) * sin(az)) * sin(ay)) * (particleSpeed + (gu->usRandFloat() * particleSpeedSpread));
-+		float3 pspeed = ((up * emitMul.y) * math::cos(ay) - ((right * emitMul.x) * math::cos(az) - (forward * emitMul.z) * math::sin(az)) * math::sin(ay)) * (particleSpeed + (gu->usRandFloat() * particleSpeedSpread));
- 
- 		CGenericParticleProjectile* particle = new CGenericParticleProjectile(pos + explosionPos, pspeed, owner);
- 
-diff -ru spring_89.0/rts/Sim/Projectiles/Unsynced/SmokeTrailProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SmokeTrailProjectile.cpp
---- spring_89.0/rts/Sim/Projectiles/Unsynced/SmokeTrailProjectile.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SmokeTrailProjectile.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -124,7 +124,7 @@
- 		if (lastSegment) {
- 			a1 = 0;
- 		}
--		a1 *= 0.7f + fabs(dif1.dot(dir1));
-+		a1 *= 0.7f + math::fabs(dif1.dot(dir1));
- 		float alpha = std::min(255.f, std::max(0.f, a1));
- 		col[0] = (unsigned char) (color * alpha);
- 		col[1] = (unsigned char) (color * alpha);
-@@ -136,7 +136,7 @@
- 		if (firstSegment) {
- 			a2 = 0;
- 		}
--		a2 *= 0.7f + fabs(dif2.dot(dir2));
-+		a2 *= 0.7f + math::fabs(dif2.dot(dir2));
- 		alpha = std::min(255.f, std::max(0.0f, a2));
- 		col2[0] = (unsigned char) (color * alpha);
- 		col2[1] = (unsigned char) (color * alpha);
-@@ -153,7 +153,7 @@
- 
- 			unsigned char col3[4];
- 			float a2 = (1 - (float)(age + 4) / lifeTime) * 255;
--			a2 *= 0.7f + fabs(dif3.dot(middir));
-+			a2 *= 0.7f + math::fabs(dif3.dot(middir));
- 			alpha = std::min(255.0f, std::max(0.0f, a2));
- 			col3[0] = (unsigned char) (color * alpha);
- 			col3[1] = (unsigned char) (color * alpha);
-diff -ru spring_89.0/rts/Sim/Projectiles/Unsynced/SpherePartProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SpherePartProjectile.cpp
---- spring_89.0/rts/Sim/Projectiles/Unsynced/SpherePartProjectile.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/SpherePartProjectile.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -49,7 +49,7 @@
- 		const float yp = (y + ypart) / 16.0f*PI - PI/2;
- 		for (int x = 0; x < 5; ++x) {
- 			float xp = (x + xpart) / 32.0f*2*PI;
--			vectors[y*5 + x] = float3(sin(xp)*cos(yp), sin(yp), cos(xp)*cos(yp));
-+			vectors[y*5 + x] = float3(math::sin(xp)*math::cos(yp), math::sin(yp), math::cos(xp)*math::cos(yp));
- 		}
- 	}
- 	pos = centerPos+vectors[12] * sphereSize;
-@@ -86,7 +86,7 @@
- 			float alpha =
- 				baseAlpha *
- 				(1.0f - min(1.0f, float(age + globalRendering->timeOffset) / (float) ttl)) *
--				(1.0f - fabs(y + ybase - 8.0f) / 8.0f * 1.0f);
-+				(1.0f - math::fabs(y + ybase - 8.0f) / 8.0f * 1.0f);
- 
- 			col[0] = (unsigned char) (color.x * 255.0f * alpha);
- 			col[1] = (unsigned char) (color.y * 255.0f * alpha);
-@@ -94,7 +94,7 @@
- 			col[3] = ((unsigned char) (40 * alpha)) + 1;
- 			va->AddVertexQTC(centerPos + vectors[y*5 + x]     * interSize, texx, texy, col);
- 			va->AddVertexQTC(centerPos + vectors[y*5 + x + 1] * interSize, texx, texy, col);
--			alpha = baseAlpha * (1.0f - min(1.0f, (float)(age + globalRendering->timeOffset) / (float) ttl)) * (1 - fabs(y + 1 + ybase - 8.0f) / 8.0f*1.0f);
-+			alpha = baseAlpha * (1.0f - min(1.0f, (float)(age + globalRendering->timeOffset) / (float) ttl)) * (1 - math::fabs(y + 1 + ybase - 8.0f) / 8.0f*1.0f);
- 
- 			col[0] = (unsigned char) (color.x * 255.0f * alpha);
- 			col[1] = (unsigned char) (color.y * 255.0f * alpha);
-diff -ru spring_89.0/rts/Sim/Projectiles/Unsynced/WakeProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/WakeProjectile.cpp
---- spring_89.0/rts/Sim/Projectiles/Unsynced/WakeProjectile.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/Unsynced/WakeProjectile.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -79,7 +79,7 @@
- 	float interSize = size + sizeExpansion * globalRendering->timeOffset;
- 	float interRot = rotation + rotSpeed * globalRendering->timeOffset;
- 
--	const float3 dir1 = float3(cos(interRot), 0, sin(interRot)) * interSize;
-+	const float3 dir1 = float3(math::cos(interRot), 0, math::sin(interRot)) * interSize;
- 	const float3 dir2 = dir1.cross(UpVector);
- 
- 	#define wt projectileDrawer->waketex
-diff -ru spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp
---- spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/MissileProjectile.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -96,7 +96,7 @@
- 	drawRadius = radius + maxSpeed * 8;
- 
- 	float3 camDir = (pos - camera->pos).ANormalize();
--	if ((camera->pos.distance(pos) * 0.2f + (1 - fabs(camDir.dot(dir))) * 3000) < 200) {
-+	if ((camera->pos.distance(pos) * 0.2f + (1 - math::fabs(camDir.dot(dir))) * 3000) < 200) {
- 		drawTrail = false;
- 	}
- 
-@@ -229,8 +229,8 @@
- 					// is too close or height difference too large)
- 					const float horDiff = (targPos - pos).Length2D() + 0.01f;
- 					const float verDiff = (targPos.y - pos.y) + 0.01f;
--					const float dirDiff = fabs(targetDir.y - dir.y);
--					const float ratio = fabs(verDiff / horDiff);
-+					const float dirDiff = math::fabs(targetDir.y - dir.y);
-+					const float ratio = math::fabs(verDiff / horDiff);
- 
- 					dir.y -= (dirDiff * ratio);
- 				} else {
-@@ -295,7 +295,7 @@
- 		if (!drawTrail) {
- 			const float3 camDir = (pos - camera->pos).ANormalize();
- 
--			if ((camera->pos.distance(pos) * 0.2f + (1 - fabs(camDir.dot(dir))) * 3000) > 300) {
-+			if ((camera->pos.distance(pos) * 0.2f + (1 - math::fabs(camDir.dot(dir))) * 3000) > 300) {
- 				drawTrail = true;
- 			}
- 		}
-@@ -343,7 +343,7 @@
- 			dir2.ANormalize();
- 
- 			float a1 = (1.0f / (SMOKE_TIME)) * 255;
--			a1 *= 0.7f + fabs(dif.dot(dir));
-+			a1 *= 0.7f + math::fabs(dif.dot(dir));
- 			const float alpha1 = std::min(255.0f, std::max(0.0f, a1));
- 			col[0] = (unsigned char) (color * alpha1);
- 			col[1] = (unsigned char) (color * alpha1);
-@@ -357,7 +357,7 @@
- 				a2 = 0;
- 			}
- 
--			a2 *= 0.7f + fabs(dif2.dot(oldDir));
-+			a2 *= 0.7f + math::fabs(dif2.dot(oldDir));
- 			const float alpha2 = std::min(255.0f, std::max(0.0f, a2));
- 			col2[0] = (unsigned char) (color * alpha2);
- 			col2[1] = (unsigned char) (color * alpha2);
-diff -ru spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp
---- spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/StarburstProjectile.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -90,13 +90,13 @@
- 		}
- 	}
- 
--	maxGoodDif = cos(tracking * 0.6f);
-+	maxGoodDif = math::cos(tracking * 0.6f);
- 	curSpeed = speed.Length();
- 	dir = speed / curSpeed;
- 	oldSmokeDir = dir;
- 
- 	const float3 camDir = (pos - camera->pos).ANormalize();
--	const float camDist = (camera->pos.distance(pos) * 0.2f) + ((1.0f - fabs(camDir.dot(dir))) * 3000);
-+	const float camDist = (camera->pos.distance(pos) * 0.2f) + ((1.0f - math::fabs(camDir.dot(dir))) * 3000);
- 
- 	drawTrail = (camDist >= 200.0f);
- 	drawRadius = maxSpeed * 8.0f;
-@@ -304,7 +304,7 @@
- 
- 		if (!drawTrail) {
- 			const float3 camDir = (pos - camera->pos).ANormalize();
--			const float camDist = (camera->pos.distance(pos) * 0.2f + (1 - fabs(camDir.dot(dir))) * 3000);
-+			const float camDist = (camera->pos.distance(pos) * 0.2f + (1 - math::fabs(camDir.dot(dir))) * 3000);
- 
- 			drawTrail = (camDist > 300.0f);
- 		}
-@@ -335,11 +335,11 @@
- 
- 			const float a1 =
- 				((1.0f - (0.0f / SMOKE_TIME)) * 255) *
--				(0.7f + fabs(dif1.dot(dir)));
-+				(0.7f + math::fabs(dif1.dot(dir)));
- 			const float a2 =
- 				(age < 8)? 0.0f:
- 				((1.0f - (age2 / SMOKE_TIME)) * 255) *
--				(0.7f + fabs(dif2.dot(oldSmokeDir)));
-+				(0.7f + math::fabs(dif2.dot(oldSmokeDir)));
- 			const int alpha1 = std::min(255, (int) std::max(0.0f, a1));
- 			const int alpha2 = std::min(255, (int) std::max(0.0f, a2));
- 
-diff -ru spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp
---- spring_89.0/rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp	2012-07-10 00:10:07.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Projectiles/WeaponProjectiles/WeaponProjectile.cpp	2012-07-13 06:34:43.249393836 +0200
-@@ -252,8 +252,8 @@
- 				const float dot = speed.dot(normal);
- 
- 				pos -= speed;
--				speed -= (speed + normal * fabs(dot)) * (1 - weaponDef->bounceSlip);
--				speed += (normal * (fabs(dot))) * (1 + weaponDef->bounceRebound);
-+				speed -= (speed + normal * math::fabs(dot)) * (1 - weaponDef->bounceSlip);
-+				speed += (normal * (math::fabs(dot))) * (1 + weaponDef->bounceRebound);
- 				pos += speed;
- 
- 				if (weaponDef->bounceExplosionGenerator) {
-diff -ru spring_89.0/rts/Sim/Units/CommandAI/MobileCAI.cpp /home/svenstaro/src/spring/rts/Sim/Units/CommandAI/MobileCAI.cpp
---- spring_89.0/rts/Sim/Units/CommandAI/MobileCAI.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Units/CommandAI/MobileCAI.cpp	2012-07-13 06:34:43.079393827 +0200
-@@ -770,7 +770,7 @@
- 			b2 = w->TryTargetRotate(orderTarget, c.GetID() == CMD_MANUALFIRE);
- 			b3 = Square(w->range - (w->relWeaponPos).Length()) > (orderTarget->pos.SqDistance(owner->pos));
- 			b4 = w->TryTargetHeading(GetHeadingFromVector(-diff.x, -diff.z), orderTarget->pos, orderTarget != NULL, orderTarget);
--			edgeFactor = fabs(w->targetBorder);
-+			edgeFactor = math::fabs(w->targetBorder);
- 		}
- 
- 		const float diffLength2D = diff.Length2D();
-diff -ru spring_89.0/rts/Sim/Units/CommandAI/TransportCAI.cpp /home/svenstaro/src/spring/rts/Sim/Units/CommandAI/TransportCAI.cpp
---- spring_89.0/rts/Sim/Units/CommandAI/TransportCAI.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Units/CommandAI/TransportCAI.cpp	2012-07-13 06:34:43.079393827 +0200
-@@ -349,7 +349,7 @@
- 			if (rx <= spread)
- 				continue;
- 
--			rx = sqrt(rx);
-+			rx = math::sqrt(rx);
- 	
- 			const float minx = std::max(                               spread,  center.x - rx);
- 			const float maxx = std::min(float(gs->mapx * SQUARE_SIZE - spread), center.x + rx);
-@@ -676,7 +676,7 @@
- 				am->ForceHeading(unloadHeading);
- 				am->maxDrift = 1;
- 				if ((owner->pos.SqDistance(pos) < 64) &&
--						(owner->updir.dot(UpVector) > 0.99f) && fabs(owner->heading - unloadHeading) < AIRTRANSPORT_DOCKING_ANGLE) {
-+						(owner->updir.dot(UpVector) > 0.99f) && math::fabs(owner->heading - unloadHeading) < AIRTRANSPORT_DOCKING_ANGLE) {
- 					if (!SpotIsClearIgnoreSelf(pos, unit)) {
- 						// chosen spot is no longer clear to land, choose a new one
- 						// if a new spot cannot be found, don't unload at all
-diff -ru spring_89.0/rts/Sim/Units/UnitDef.cpp /home/svenstaro/src/spring/rts/Sim/Units/UnitDef.cpp
---- spring_89.0/rts/Sim/Units/UnitDef.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Units/UnitDef.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -399,9 +399,9 @@
- 	selfDCountdown = udTable.GetInt("selfDestructCountdown", 5);
- 
- 	speed  = udTable.GetFloat("maxVelocity", 0.0f) * GAME_SPEED;
--	speed  = fabs(speed);
-+	speed  = math::fabs(speed);
- 	rSpeed = udTable.GetFloat("maxReverseVelocity", 0.0f) * GAME_SPEED;
--	rSpeed = fabs(rSpeed);
-+	rSpeed = math::fabs(rSpeed);
- 
- 	fireState = udTable.GetInt("fireState", canFireControl? FIRESTATE_NONE: FIRESTATE_FIREATWILL);
- 	fireState = std::min(fireState, int(FIRESTATE_FIREATWILL));
-@@ -462,8 +462,8 @@
- 	useSmoothMesh  = udTable.GetBool("useSmoothMesh", true);
- 
- 
--	maxAcc = fabs(udTable.GetFloat("acceleration", 0.5f)); // no negative values
--	maxDec = fabs(udTable.GetFloat("brakeRate", 3.0f * maxAcc)) * (canfly? 0.1f: 1.0f); // no negative values
-+	maxAcc = math::fabs(udTable.GetFloat("acceleration", 0.5f)); // no negative values
-+	maxDec = math::fabs(udTable.GetFloat("brakeRate", 3.0f * maxAcc)) * (canfly? 0.1f: 1.0f); // no negative values
- 
- 	turnRate    = udTable.GetFloat("turnRate", 0.0f);
- 	turnInPlace = udTable.GetBool("turnInPlace", true);
-@@ -709,7 +709,7 @@
- 	seismicSignature = udTable.GetFloat("seismicSignature", -1.0f);
- 	if (seismicSignature == -1.0f) {
- 		if (!canFloat && !canHover && !canfly) {
--			seismicSignature = sqrt(mass / 100.0f);
-+			seismicSignature = math::sqrt(mass / 100.0f);
- 		} else {
- 			seismicSignature = 0.0f;
- 		}
-diff -ru spring_89.0/rts/Sim/Units/UnitHandler.cpp /home/svenstaro/src/spring/rts/Sim/Units/UnitHandler.cpp
---- spring_89.0/rts/Sim/Units/UnitHandler.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Units/UnitHandler.cpp	2012-07-13 06:34:43.076060493 +0200
-@@ -419,8 +419,8 @@
- 		// look for a nearby geothermal feature if we need one
- 		for (std::vector<CFeature*>::const_iterator fi = features.begin(); fi != features.end(); ++fi) {
- 			if ((*fi)->def->geoThermal
--				&& fabs((*fi)->pos.x - pos.x) < (xsize * 4 - 4)
--				&& fabs((*fi)->pos.z - pos.z) < (zsize * 4 - 4)) {
-+				&& math::fabs((*fi)->pos.x - pos.x) < (xsize * 4 - 4)
-+				&& math::fabs((*fi)->pos.z - pos.z) < (zsize * 4 - 4)) {
- 				canBuild = BUILDSQUARE_OPEN;
- 				break;
- 			}
-@@ -589,7 +589,7 @@
- 				BuildInfo bi(cmd);
- 				tempF1 = pos + dir * ((bi.pos.y - pos.y) / dir.y) - bi.pos;
- 
--				if (bi.def && (bi.GetXSize() / 2) * SQUARE_SIZE > fabs(tempF1.x) && (bi.GetZSize() / 2) * SQUARE_SIZE > fabs(tempF1.z)) {
-+				if (bi.def && (bi.GetXSize() / 2) * SQUARE_SIZE > math::fabs(tempF1.x) && (bi.GetZSize() / 2) * SQUARE_SIZE > math::fabs(tempF1.z)) {
- 					return cmd;
- 				}
- 			}
-diff -ru spring_89.0/rts/Sim/Weapons/BombDropper.cpp /home/svenstaro/src/spring/rts/Sim/Weapons/BombDropper.cpp
---- spring_89.0/rts/Sim/Weapons/BombDropper.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Weapons/BombDropper.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -62,7 +62,7 @@
- 			const float s = -owner->speed.y;
- 			const float sq = (s - 2*d) / -((weaponDef->myGravity == 0) ? mapInfo->map.gravity : -(weaponDef->myGravity));
- 			if (sq > 0) {
--				predict = s / ((weaponDef->myGravity == 0) ? mapInfo->map.gravity : -(weaponDef->myGravity)) + sqrt(sq);
-+				predict = s / ((weaponDef->myGravity == 0) ? mapInfo->map.gravity : -(weaponDef->myGravity)) + math::sqrt(sq);
- 			} else {
- 				predict = 0;
- 			}
-diff -ru spring_89.0/rts/Sim/Weapons/Cannon.cpp /home/svenstaro/src/spring/rts/Sim/Weapons/Cannon.cpp
---- spring_89.0/rts/Sim/Weapons/Cannon.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Weapons/Cannon.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -169,7 +169,7 @@
- 
- 	int ttl = 0;
- 	float sqSpeed2D = dir.SqLength2D() * projectileSpeed * projectileSpeed;
--	int predict = (int)ceil((sqSpeed2D == 0) ? (-2 * projectileSpeed * dir.y / gravity)
-+	int predict = (int)math::ceil((sqSpeed2D == 0) ? (-2 * projectileSpeed * dir.y / gravity)
- 			: math::sqrt(diff.SqLength2D() / sqSpeed2D));
- 	if(weaponDef->flighttime > 0) {
- 		ttl = weaponDef->flighttime;
-@@ -216,9 +216,9 @@
- 	// try to cache results, sacrifice some (not much too much even for a pewee) accuracy
- 	// it saves a dozen or two expensive calculations per second when 5 guardians
- 	// are shooting at several slow- and fast-moving targets
--	if (fabs(diff.x - lastDiff.x) < (SQUARE_SIZE / 4.0f) &&
--		fabs(diff.y - lastDiff.y) < (SQUARE_SIZE / 4.0f) &&
--		fabs(diff.z - lastDiff.z) < (SQUARE_SIZE / 4.0f)) {
-+	if (math::fabs(diff.x - lastDiff.x) < (SQUARE_SIZE / 4.0f) &&
-+		math::fabs(diff.y - lastDiff.y) < (SQUARE_SIZE / 4.0f) &&
-+		math::fabs(diff.z - lastDiff.z) < (SQUARE_SIZE / 4.0f)) {
- 		return lastDir;
- 	}
- 
-@@ -237,7 +237,7 @@
- 		// FIXME: temporary safeguards against FP overflow
- 		// (introduced by extreme off-map unit positions; the term
- 		// DFsq * Dsq * ... * dy should never even approach 1e38)
--		if (Dsq < 1e12f && fabs(dy) < 1e6f) {
-+		if (Dsq < 1e12f && math::fabs(dy) < 1e6f) {
- 			const float root1 = v*v*v*v + 2.0f*v*v*g*dy - g*g*DFsq;
- 
- 			if (root1 >= 0.0f) {
-diff -ru spring_89.0/rts/Sim/Weapons/WeaponDefHandler.cpp /home/svenstaro/src/spring/rts/Sim/Weapons/WeaponDefHandler.cpp
---- spring_89.0/rts/Sim/Weapons/WeaponDefHandler.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/Sim/Weapons/WeaponDefHandler.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -126,9 +126,9 @@
- 
- 	// should really be tan but TA seem to cap it somehow
- 	// should also be 7fff or ffff theoretically but neither seems good
--	wd.accuracy       = sin((accuracy)       * PI / 0xafff);
--	wd.sprayAngle     = sin((sprayAngle)     * PI / 0xafff);
--	wd.movingAccuracy = sin((movingAccuracy) * PI / 0xafff);
-+	wd.accuracy       = math::sin((accuracy)       * PI / 0xafff);
-+	wd.sprayAngle     = math::sin((sprayAngle)     * PI / 0xafff);
-+	wd.movingAccuracy = math::sin((movingAccuracy) * PI / 0xafff);
- 
- 	wd.targetMoveError = wdTable.GetFloat("targetMoveError", 0.0f);
- 	wd.leadLimit = wdTable.GetFloat("leadLimit", -1.0f);
-@@ -375,7 +375,7 @@
- 
- 
- 	const float gd = max(30.0f, wd.damages[0] / 20.0f);
--	const float defExpSpeed = (8.0f + (gd * 2.5f)) / (9.0f + (sqrt(gd) * 0.7f)) * 0.5f;
-+	const float defExpSpeed = (8.0f + (gd * 2.5f)) / (9.0f + (math::sqrt(gd) * 0.7f)) * 0.5f;
- 	wd.explosionSpeed = wdTable.GetFloat("explosionSpeed", defExpSpeed);
- 
- 	// Dynamic Damage
-@@ -461,7 +461,7 @@
- 			wd.hitSound.setVolume(0, 5.0f);
- 			wd.hitSound.setVolume(1, 5.0f);
- 		} else {
--			float fireSoundVolume = sqrt(wd.damages[0] * 0.5f);
-+			float fireSoundVolume = math::sqrt(wd.damages[0] * 0.5f);
- 
- 			if (wd.type == "LaserCannon") {
- 				fireSoundVolume *= 0.5f;
-@@ -472,7 +472,7 @@
- 			if ((fireSoundVolume > 100.0f) &&
- 			    ((wd.type == "MissileLauncher") ||
- 			     (wd.type == "StarburstLauncher"))) {
--				fireSoundVolume = 10.0f * sqrt(hitSoundVolume);
-+				fireSoundVolume = 10.0f * math::sqrt(hitSoundVolume);
- 			}
- 
- 			if (wd.damageAreaOfEffect > 8.0f) {
-@@ -564,7 +564,7 @@
- 
- 	if (inverted == true) {
- 		for(int i = 0; i < damageArrayHandler->GetNumTypes(); ++i) {
--			dynDamages[i] = damages[i] - (1 - pow(1 / range * travDist, exp)) * damages[i];
-+			dynDamages[i] = damages[i] - (1 - math::pow(1 / range * travDist, exp)) * damages[i];
- 
- 			if (damageMin > 0)
- 				dynDamages[i] = max(damages[i] * ddmod, dynDamages[i]);
-@@ -577,7 +577,7 @@
- 	}
- 	else {
- 		for(int i = 0; i < damageArrayHandler->GetNumTypes(); ++i) {
--			dynDamages[i] = (1 - pow(1 / range * travDist, exp)) * damages[i];
-+			dynDamages[i] = (1 - math::pow(1 / range * travDist, exp)) * damages[i];
- 
- 			if (damageMin > 0)
- 				dynDamages[i] = max(damages[i] * ddmod, dynDamages[i]);
-diff -ru spring_89.0/rts/System/Matrix44f.cpp /home/svenstaro/src/spring/rts/System/Matrix44f.cpp
---- spring_89.0/rts/System/Matrix44f.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/System/Matrix44f.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -72,8 +72,8 @@
- 
- 	*this=Mul(rm);
- */
--	const float sr = sin(rad);
--	const float cr = cos(rad);
-+	const float sr = math::sin(rad);
-+	const float cr = math::cos(rad);
- 
- 	float a=m[4];
- 	m[4] = cr*a - sr*m[8];
-@@ -107,8 +107,8 @@
- 
- 	*this = Mul(rm);
- */
--	const float sr = sin(rad);
--	const float cr = cos(rad);
-+	const float sr = math::sin(rad);
-+	const float cr = math::cos(rad);
- 
- 	float a=m[0];
- 	m[0] =  cr*a + sr*m[8];
-@@ -142,8 +142,8 @@
- 
- 	*this = Mul(rm);
- */
--	const float sr = sin(rad);
--	const float cr = cos(rad);
-+	const float sr = math::sin(rad);
-+	const float cr = math::cos(rad);
- 
- 	float a=m[0];
- 	m[0] = cr*a - sr*m[4];
-@@ -165,8 +165,8 @@
- 
- void CMatrix44f::Rotate(float rad, const float3& axis)
- {
--	const float sr = sin(rad);
--	const float cr = cos(rad);
-+	const float sr = math::sin(rad);
-+	const float cr = math::cos(rad);
- 
- 	for(int a=0;a<3;++a){
- 		float3 v(m[a*4],m[a*4+1],m[a*4+2]);
-diff -ru spring_89.0/rts/System/myMath.cpp /home/svenstaro/src/spring/rts/System/myMath.cpp
---- spring_89.0/rts/System/myMath.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/System/myMath.cpp	2012-07-13 06:34:43.072727160 +0200
-@@ -44,7 +44,7 @@
- 	}
- 
- 	// Set single precision floating point math.
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- #if defined(__SUPPORT_SNAN__) && !defined(USE_GML)
- 	streflop::feraiseexcept(streflop::FPU_Exceptions(FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW));
- #endif
-@@ -58,7 +58,7 @@
- 	#pragma omp parallel
- 	{
- 		//good_fpu_control_registers("OMP-Init");
--		streflop_init<streflop::Simple>();
-+		streflop::streflop_init<streflop::Simple>();
- 	#if defined(__SUPPORT_SNAN__) && !defined(USE_GML)
- 		streflop::feraiseexcept(streflop::FPU_Exceptions(FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW));
- 	#endif
-@@ -77,8 +77,8 @@
- 	for (int a = 0; a < NUM_HEADINGS; ++a) {
- 		float ang = (a - (NUM_HEADINGS / 2)) * 2 * PI / NUM_HEADINGS;
- 		float2 v;
--			v.x = sin(ang);
--			v.y = cos(ang);
-+			v.x = math::sin(ang);
-+			v.y = math::cos(ang);
- 		headingToVectorTable[a] = v;
- 	}
- 
-@@ -107,9 +107,9 @@
- 	float3 ret;
- 	float h = heading * TAANG2RAD;
- 	float p = pitch * TAANG2RAD;
--	ret.x = sin(h) * cos(p);
--	ret.y = sin(p);
--	ret.z = cos(h) * cos(p);
-+	ret.x = math::sin(h) * math::cos(p);
-+	ret.y = math::sin(p);
-+	ret.z = math::cos(h) * math::cos(p);
- 	return ret;
- }
- 
-@@ -138,7 +138,7 @@
- 	float3 dir(l2-l1);
- 	float3 pdir(p-l1);
- 	float length = dir.Length();
--	if (fabs(length) < 1e-4f)
-+	if (math::fabs(length) < 1e-4f)
- 		return l1;
- 	float c = dir.dot(pdir) / length;
- 	if (c < 0) c = 0;
-diff -ru spring_89.0/rts/System/Net/Socket.cpp /home/svenstaro/src/spring/rts/System/Net/Socket.cpp
---- spring_89.0/rts/System/Net/Socket.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/System/Net/Socket.cpp	2012-07-13 06:34:42.939393819 +0200
-@@ -73,7 +73,7 @@
- 	//! (date of note: 08/05/10)
- 	//! something in from_string() is invalidating the FPU flags
- 	//! tested on win2k and linux (not happening there)
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- #endif
- 
- 	return addr;
-@@ -94,7 +94,7 @@
- #ifdef STREFLOP_H
- 	//! (date of note: 08/22/10)
- 	//! something in resolve() is invalidating the FPU flags
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- #endif
- 
- 	return resolveIt;
-diff -ru spring_89.0/rts/System/OffscreenGLContext.cpp /home/svenstaro/src/spring/rts/System/OffscreenGLContext.cpp
---- spring_89.0/rts/System/OffscreenGLContext.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/System/OffscreenGLContext.cpp	2012-07-13 06:34:42.939393819 +0200
-@@ -259,7 +259,7 @@
- #ifdef STREFLOP_H
- 	// init streflop to make it available for synced computations, too
- 	// redundant? threads copy the FPU state of their parent.
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- #endif
- 
- 	try {
-diff -ru spring_89.0/rts/System/Sound/SoundSource.h /home/svenstaro/src/spring/rts/System/Sound/SoundSource.h
---- spring_89.0/rts/System/Sound/SoundSource.h	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/System/Sound/SoundSource.h	2012-07-13 06:34:42.836060480 +0200
-@@ -7,7 +7,6 @@
- 
- #include <al.h>
- #include <boost/noncopyable.hpp>
--#include <boost/thread/recursive_mutex.hpp>
- 
- class IAudioChannel;
- class float3;
-diff -ru spring_89.0/rts/System/SpringApp.cpp /home/svenstaro/src/spring/rts/System/SpringApp.cpp
---- spring_89.0/rts/System/SpringApp.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/System/SpringApp.cpp	2012-07-13 06:34:42.982727155 +0200
-@@ -385,7 +385,7 @@
- #ifdef STREFLOP_H
- 	//! Something in SDL_SetVideoMode (OpenGL drivers?) messes with the FPU control word.
- 	//! Set single precision floating point math.
--	streflop_init<streflop::Simple>();
-+	streflop::streflop_init<streflop::Simple>();
- #endif
- 
- 	//! setup GL smoothing
-@@ -1009,7 +1009,7 @@
- 			SDL_Event event;
- 
- 			while (SDL_PollEvent(&event)) {
--				streflop_init<streflop::Simple>(); // SDL_PollEvent may modify FPU flags
-+				streflop::streflop_init<streflop::Simple>(); // SDL_PollEvent may modify FPU flags
- 				input.PushEvent(event);
- 			}
- 		}
-diff -ru spring_89.0/rts/System/Sync/FPUCheck.cpp /home/svenstaro/src/spring/rts/System/Sync/FPUCheck.cpp
---- spring_89.0/rts/System/Sync/FPUCheck.cpp	2012-07-10 00:10:08.000000000 +0200
-+++ /home/svenstaro/src/spring/rts/System/Sync/FPUCheck.cpp	2012-07-13 06:34:42.939393819 +0200
-@@ -85,7 +85,7 @@
- 		LOG_L(L_WARNING, "[%s] Sync warning: (env.x87_mode) FPUCW 0x%04X instead of 0x%04X or 0x%04X (\"%s\")", __FUNCTION__, fenv.x87_mode, x87_a, x87_b, text);
- 
- 		// Set single precision floating point math.
--		streflop_init<streflop::Simple>();
-+		streflop::streflop_init<streflop::Simple>();
- 	#if defined(__SUPPORT_SNAN__) && !defined(USE_GML)
- 		streflop::feraiseexcept(streflop::FPU_Exceptions(FE_INVALID | FE_DIVBYZERO | FE_OVERFLOW));
- 	#endif
diff --git a/community-staging/wxgtk2.9/PKGBUILD b/community-staging/wxgtk2.9/PKGBUILD
deleted file mode 100644
index 96150f277..000000000
--- a/community-staging/wxgtk2.9/PKGBUILD
+++ /dev/null
@@ -1,33 +0,0 @@
-# $Id: PKGBUILD 74020 2012-07-18 03:42:17Z ebelanger $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-
-pkgname=wxgtk2.9
-pkgver=2.9.4
-pkgrel=1
-pkgdesc="GTK+ implementation of wxWidgets API for GUI"
-arch=('i686' 'x86_64')
-url="http://wxwidgets.org"
-license=('custom:wxWindows')
-depends=('gtk2' 'gstreamer0.10-base' 'libgl' 'libxxf86vm' 'libsm')
-makedepends=('gstreamer0.10-base-plugins' 'gconf' 'mesa')
-source=(http://downloads.sourceforge.net/wxwindows/wxWidgets-${pkgver}.tar.bz2 wxGTK-2.9.4-collision.patch)
-sha1sums=('5a34ddf19d37c741f74652ee847df9568a8b81e1'
-          'a76ccca4c2fad246c9aafbcc5a9697ebf35f33a3')
-
-build() {
-  cd "${srcdir}/wxWidgets-${pkgver}"
-  patch -p1 -i ../wxGTK-2.9.4-collision.patch
-  ./configure --prefix=/usr --libdir=/usr/lib --with-gtk=2 --with-opengl --enable-unicode \
-    --enable-graphics_ctx --enable-mediactrl --with-regex=builtin \
-    --with-libpng=sys --with-libxpm=sys --with-libjpeg=sys --with-libtiff=sys \
-    --disable-precomp-headers
-  make
-  make -C locale allmo
-}
-
-package() {
-  cd "${srcdir}/wxWidgets-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  rm "${pkgdir}/usr/share/locale/it/LC_MESSAGES/wxmsw.mo"
-  install -D -m644 docs/licence.txt "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/community-staging/wxgtk2.9/wxGTK-2.9.4-collision.patch b/community-staging/wxgtk2.9/wxGTK-2.9.4-collision.patch
deleted file mode 100644
index 4b1fb395e..000000000
--- a/community-staging/wxgtk2.9/wxGTK-2.9.4-collision.patch
+++ /dev/null
@@ -1,77 +0,0 @@
-Prevent file collisions between multiple installed SLOTs.
-
-  - Don't install wxwin.m4.  It is installed with app-admin/eselect-wxwidgets.
-  - Version the bakefile preset filenames.  Unversioned symlinks to these files
-    are handled by eselect.
-  - Version wx-config and wxrc.  The unversioned forms are wrapper scripts
-    installed with eselect-wxwidgets.
-  - Version wxstd.mo and modify AddStdCatalog to use it.
-
---- a/Makefile.in
-+++ b/Makefile.in
-@@ -14076,10 +14076,10 @@ COND_wxUSE_REGEX_builtin___LIB_REGEX_p = \
- all: $(__wxregex___depname) $(__wxzlib___depname) $(__wxpng___depname) $(__wxjpeg___depname) $(__wxtiff___depname) $(__wxexpat___depname) $(__wxscintilla___depname) $(__monodll___depname) $(__monolib___depname) $(__basedll___depname) $(__baselib___depname) $(__netdll___depname) $(__netlib___depname) $(__coredll___depname) $(__corelib___depname) $(__advdll___depname) $(__advlib___depname) $(__mediadll___depname) $(__medialib___depname) $(__htmldll___depname) $(__htmllib___depname) $(__webviewdll___depname) $(__webviewlib___depname) $(__qadll___depname) $(__qalib___depname) $(__xmldll___depname) $(__xmllib___depname) $(__xrcdll___depname) $(__xrclib___depname) $(__auidll___depname) $(__auilib___depname) $(__ribbondll___depname) $(__ribbonlib___depname) $(__propgriddll___depname) $(__propgridlib___depname) $(__richtextdll___depname) $(__richtextlib___depname) $(__stcdll___depname) $(__stclib___depname) $(__gldll___depname) $(__gllib___depname) $(__sound_sdl___depname) $(__wxrc___depname) $(__cocoa_res___depname)
- 
- install: $(__install_wxregex___depname) $(__install_wxzlib___depname) $(__install_wxpng___depname) $(__install_wxjpeg___depname) $(__install_wxtiff___depname) $(__install_wxexpat___depname) $(__install_wxscintilla___depname) $(__install_monodll___depname) $(__install_monolib___depname) $(__install_basedll___depname) $(__install_baselib___depname) $(__install_netdll___depname) $(__install_netlib___depname) $(__install_coredll___depname) $(__install_corelib___depname) $(__install_advdll___depname) $(__install_advlib___depname) $(__install_mediadll___depname) $(__install_medialib___depname) $(__install_htmldll___depname) $(__install_htmllib___depname) $(__install_webviewdll___depname) $(__install_webviewlib___depname) $(__install_qadll___depname) $(__install_qalib___depname) $(__install_xmldll___depname) $(__install_xmllib___depname) $(__install_xrcdll___depname) $(__install_xrclib___depname) $(__install_auidll___depname) $(__install_auilib___depname) $(__install_ribbondll___depname) $(__install_ribbonlib___depname) $(__install_propgriddll___depname) $(__install_propgridlib___depname) $(__install_richtextdll___depname) $(__install_richtextlib___depname) $(__install_stcdll___depname) $(__install_stclib___depname) $(__install_gldll___depname) $(__install_gllib___depname) $(__install_sound_sdl___depname) $(__install_wxrc___depname) install-wxconfig locale_install locale_msw_install $(__cocoa_res_install___depname)
--	$(INSTALL_DIR) $(DESTDIR)$(datadir)/aclocal
--	(cd $(srcdir) ; $(INSTALL_DATA)  wxwin.m4 $(DESTDIR)$(datadir)/aclocal)
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/bakefile/presets
--	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; $(INSTALL_DATA)  wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py $(DESTDIR)$(datadir)/bakefile/presets)
-+	(cd $(srcdir)/build/bakefiles/wxpresets/presets ; \
-+	for i in wx.bkl wx_unix.bkl wx_win32.bkl wx_xrc.bkl wx_presets.py ; do \
-+	$(INSTALL_DATA) $$i $(DESTDIR)$(datadir)/bakefile/presets/wx$(WX_RELEASE_NODOT)$${i##wx} ; done)
- 	$(DYLIB_RPATH_INSTALL)
- 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/include/$(TOOLCHAIN_FULLNAME)/wx
- 	for f in setup.h $(RCDEFS_H); do \
-@@ -14964,15 +14964,16 @@ install-wxconfig:
- 	$(INSTALL_DIR) $(DESTDIR)$(bindir)
- 	$(INSTALL_DIR) $(DESTDIR)$(libdir)/wx/config
- 	$(INSTALL_PROGRAM) lib/wx/config/$(TOOLCHAIN_FULLNAME) $(DESTDIR)$(libdir)/wx/config
--	(cd $(DESTDIR)$(bindir) && rm -f wx-config && $(LN_S) $(DESTDIR)$(libdir)/wx/config/$(TOOLCHAIN_FULLNAME) wx-config)
--
-+	(cd $(DESTDIR)$(bindir) && rm -f wx-config-$(WX_RELEASE) \
-+	&& $(LN_S) ../lib/wx/config/$(TOOLCHAIN_FULLNAME) wx-config-$(WX_RELEASE))
- locale_install: 
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale
- 	for l in $(LOCALE_LINGUAS) ; do \
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l ; \
- 	$(INSTALL_DIR) $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES ; \
- 	if test -f $(srcdir)/locale/$$l.mo ; then \
--	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo $(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd.mo ; \
-+	$(INSTALL_DATA) $(srcdir)/locale/$$l.mo \
-+	$(DESTDIR)$(datadir)/locale/$$l/LC_MESSAGES/wxstd$(WX_RELEASE_NODOT).mo ; \
- 	fi ; \
- 	done
- 
---- a/build/bakefiles/wx.bkl
-+++ b/build/bakefiles/wx.bkl
-@@ -138,7 +138,7 @@
-         <using module="gettext"/>
-         <gettext-catalogs id="locale">
-             <srcdir>$(SRCDIR)/locale</srcdir>
--            <catalog-name>wxstd</catalog-name>
-+            <catalog-name>wxstd$(WX_RELEASE_NODOT)</catalog-name>
-             <linguas>
-                 ca cs da de el es fi fr hu id it ja nl pl ru sl sv tr uk
-                 zh zh_CN zh_TW
---- a/src/common/translation.cpp
-+++ b/src/common/translation.cpp
-@@ -1302,7 +1302,7 @@ wxArrayString wxTranslations::GetAvailableTranslations(const wxString& domain) c
- 
- bool wxTranslations::AddStdCatalog()
- {
--    if ( !AddCatalog(wxS("wxstd")) )
-+    if ( !AddCatalog(wxS("wxstd" wxSTRINGIZE(wxMAJOR_VERSION) wxSTRINGIZE(wxMINOR_VERSION))) )
-         return false;
- 
-     // there may be a catalog with toolkit specific overrides, it is not
---- a/utils/wxrc/Makefile.in
-+++ b/utils/wxrc/Makefile.in
-@@ -124,7 +124,6 @@ distclean: clean
- @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
- @COND_USE_XRC_1@	$(INSTALL_PROGRAM) wxrc$(EXEEXT) $(DESTDIR)$(bindir)
- @COND_USE_XRC_1@	mv -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT) $(DESTDIR)$(bindir)/wxrc-$(WX_RELEASE)
--@COND_USE_XRC_1@	(cd $(DESTDIR)$(bindir) && $(LN_S) wxrc-$(WX_RELEASE) wxrc$(EXEEXT))
- 
- @COND_USE_XRC_1@uninstall_wxrc: 
- @COND_USE_XRC_1@	rm -f $(DESTDIR)$(bindir)/wxrc$(EXEEXT)
diff --git a/community-testing/mashup/PKGBUILD b/community-testing/mashup/PKGBUILD
deleted file mode 100644
index d1d1bacd0..000000000
--- a/community-testing/mashup/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-# Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
-
-pkgname=mashup
-pkgver=3.5
-pkgrel=3
-pkgdesc="Adjusting images on a sheet of paper for printing"
-url="http://kornelix.squarespace.com/$pkgname"
-arch=('i686' 'x86_64')
-license=('GPL3')
-depends=('gtk3')
-replaces=('printoxx')
-source=("http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz")
-md5sums=('454b08e5589f93b3bdd4577c2578ae36')
-
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  sed -i 's+xdg-deskto+#xdg-deskto+' Makefile
-  sed -i 's/--libs gtk+-3.0/--libs gtk+-3.0 gthread-2.0/' Makefile
-  make PREFIX=/usr
-}
-
-package() {
-  cd $srcdir/$pkgname-$pkgver
-  install -Dm644 desktop $pkgdir/usr/share/applications/$pkgname.desktop
-  make DESTDIR=$pkgdir install
-  rm $pkgdir/usr/share/applications/kornelix-$pkgname.desktop
-  rm $pkgdir/usr/share/doc/$pkgname/$pkgname.man
-}
-
diff --git a/community-testing/sage-mathematics/PKGBUILD b/community-testing/sage-mathematics/PKGBUILD
deleted file mode 100644
index 24300f2e9..000000000
--- a/community-testing/sage-mathematics/PKGBUILD
+++ /dev/null
@@ -1,103 +0,0 @@
-# $Id: PKGBUILD 74291 2012-07-23 15:07:41Z dwallace $
-# Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
-# Contributor: Antonio Rojas < nqn1976 @ gmail.com >
-# Contributor: Thomas Dziedzic < gostrc at gmail >
-# Contributor: Osman Ugus <ugus11@yahoo.com>
-# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
-# Special thanks to Nareto for moving the compile from the .install to the PKGBUILD
-
-pkgname=sage-mathematics
-pkgver=5.1
-pkgrel=3
-pkgdesc='SAGE: Open Source Mathematics Software, a viable free alternative to Magma, Maple, Mathematica, and Matlab.'
-url='http://www.sagemath.org'
-arch=('i686' 'x86_64')
-license=('GPL')
-#depends=('readline')
-makedepends=('gcc-fortran' 'desktop-file-utils')
-optdepends=('imagemagick: some plotting functionality benefits from it'
-            'texlive-core: some plotting functionality benefits from it, also to use SageTeX'
-            'openssh: to use the notebook in secure mode'
-            'ffmpeg: to show animations'
-            'jsmath-fonts: native TeX fonts for the notebook')
-options=('!makeflags')
-install="${pkgname}.install"
-source=("http://sage.math.washington.edu/home/release/sage-${pkgver}/sage-${pkgver}.tar"
-        'SAGE-notebook.desktop')
-
-build() {
-  cd sage-${pkgver}
-
-  # fix "missing sage.all error" during build
-  unset CFLAGS
-  unset CXXFLAGS
-
-  # fix build errors
-  unset LDFLAGS
-
-  # don't build GCC
-  export SAGE_INSTALL_GCC='no'
-
-  # enable multiple threads while building, is this really needed? check if uses MAKEFLAGS
-  export SAGE_BUILD_THREADS=$(lscpu | awk '/^CPU\(s\):/ { print $2 }')
-  export MAKE="make -j${SAGE_BUILD_THREADS}"
-
-  # use archlinux's fortran rather then the one that ships with sage to compile sage's fortran
-  export SAGE_FORTRAN='/usr/bin/gfortran'
-  export SAGE_FORTRAN_LIB='/usr/lib/libgfortran.so'
-
-  # disable building with debugging support
-  export SAGE_DEBUG='no'
-
-  # enable fat binaries (disables processor specific optimizations)
-  # comment out if you're only building it for yourself
-  export SAGE_FAT_BINARY='yes'
-
-  # can't write to root in a clean chroot
-  export DOT_SAGE='/build/src/'
-
-  # only build sage, no documents
-  #make build
-  make
-}
-
-<< COMMENT
-check() {
-  cd sage-${pkgver}
-
-  # uncomment if we want to run all the tests (warning: very long)
-  #make ptestlong
-}
-COMMENT
-
-package() {
-  cd sage-${pkgver}
-
-  # cp because make install is experimental and will corrupt the install
-  install -d ${pkgdir}/opt/sage
-  cp -dpr --no-preserve=ownership * ${pkgdir}/opt/sage
-
-  # move SageTeX files to more appropriate directory
-  install -d ${pkgdir}/usr/share
-  mv ${pkgdir}/opt/sage/local/share/texmf \
-    ${pkgdir}/usr/share
-
-  desktop-file-install ${srcdir}/SAGE-notebook.desktop \
-    --dir ${pkgdir}/usr/share/applications 
-
-  # create link to main binary
-  install -d ${pkgdir}/usr/bin
-  ln -s /opt/sage/sage ${pkgdir}/usr/bin/sage
-
-  # remove build logs
-  rm -f ${pkgdir}/opt/sage/*.log
-  rm -rf ${pkgdir}/opt/sage/spkg/logs
-
-  # remove source packages, since they are rarely needed, they are 300mb in size (compressed)
-  rm -f ${pkgdir}/opt/sage/spkg/base/*spkg
-  rm -f ${pkgdir}/opt/sage/spkg/standard/*spkg
-}
-
-# vim :set ts=2 sw=2 et:
-md5sums=('fa612f36387218d07b84f76995914c93'
-         'dc391f12b7d17dd37326343ec0e99bbd')
diff --git a/community-testing/sage-mathematics/SAGE-notebook.desktop b/community-testing/sage-mathematics/SAGE-notebook.desktop
deleted file mode 100644
index 26a35d3ac..000000000
--- a/community-testing/sage-mathematics/SAGE-notebook.desktop
+++ /dev/null
@@ -1,19 +0,0 @@
-[Desktop Entry]
-Version=1.0
-Name=SAGE
-Comment=SAGE NOTEBOOK
-Comment[en_US]=SAGE NOTEBOOK
-Exec=/opt/sage/sage -notebook
-GenericName=
-GenericName[de]=
-Icon=/opt/sage/data/extcode/notebook/images/sageicon.png
-MimeType=
-Name[de]=SAGE
-StartupNotify=true
-Terminal=true
-Type=Application
-Categories=Science;Math;
-X-DCOP-ServiceType=
-X-KDE-SubstituteUID=false
-X-KDE-Username=
-GenericName[en_US]=
diff --git a/community-testing/sage-mathematics/sage-mathematics.install b/community-testing/sage-mathematics/sage-mathematics.install
deleted file mode 100644
index 6caa5299e..000000000
--- a/community-testing/sage-mathematics/sage-mathematics.install
+++ /dev/null
@@ -1,56 +0,0 @@
-post_install() {
-  cd /opt/sage
-
-  # set HOME because when sage updates its sage_root (after being moved) it will write files to ~/.sage with root ownership
-  # the files it writes to ~/.sage can be safely ignored
-  HOME=/tmp ./sage -c
-
-  # add sagemath user for the daemon
-  useradd -r -c 'Sage daemon' -d /opt/sage -s /bin/false sagemath
-
-  # Update LaTeX db to point to SageTeX
-  if [ -f /usr/bin/texhash ]; then
-    /usr/bin/texhash /usr/share/texmf
-  else
-    echo 'Warning: could not find /usr/bin/texhash'
-    echo 'SageTeX has been installed but you need to run:'
-    echo '# texhash /usr/share/texmf'
-    echo 'So that LaTeX will be able to find it.'
-  fi
-
-echo '
- ___                       
-/ (_)        o            |
-\__   _  _      __        |
-/    / |/ |  | /  \_|   | |
-\___/  |  |_/|/\__/  \_/|/o
-            /|         /|  
-            \|         \|  
- ________________________________ 
-< sage-mathematics, I mean, MOO! >
- -------------------------------- 
-        \   ^__^
-         \  (oo)\_______
-            (__)\       )\/\
-                ||----w |
-                ||     ||
-'
-
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  # Update LaTeX db to remove SageTeX entries
-  if [ -f /usr/bin/texhash ]; then
-    /usr/bin/texhash /usr/share/texmf
-  fi
-
-  # remove the sagemath daemon user
-  userdel sagemath
-
-  # clean up left overs
-  rm -rf /opt/sage
-}
diff --git a/community-testing/tp_smapi/PKGBUILD b/community-testing/tp_smapi/PKGBUILD
deleted file mode 100644
index 071d7edab..000000000
--- a/community-testing/tp_smapi/PKGBUILD
+++ /dev/null
@@ -1,58 +0,0 @@
-# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
-# Contributor: xduugu
-# Contributor: nh2
-# Contributor: Steven Davidovitz <steviedizzle ð gmail đ com>
-# Contributor: Nick B <Shirakawasuna ð gmail đ com>
-# Contributor: Christof Musik <christof ð senfdax đ de>
-# Contributor: Stefan Rupp <archlinux ð stefanrupp đ de>
-# Contributor: Ignas Anikevicius <anikevicius ð gmail đ com>
-
-pkgname=tp_smapi
-pkgver=0.41
-pkgrel=4
-pkgdesc="Modules for ThinkPad's SMAPI functionality"
-arch=('i686' 'x86_64')
-url='https://github.com/evgeni/tp_smapi'
-license=('GPL')
-depends=('linux>=3.5' 'linux<3.6')
-makedepends=('linux-headers>=3.5' 'linux-headers<3.6')
-install="${pkgname}.install"
-source=("https://github.com/downloads/evgeni/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('63c683415c764568f6bf17c7eabe4752')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-
-  _kernver=${_kernver:-$(uname -r)}
-  _extramodules=$(readlink -f "/usr/lib/modules/${_kernver}/extramodules" || true)
-  _kernver=$(< "${_extramodules}/version")
-
-  sed -ri -e "s/^(KVER\s*:=).*$/\1 ${_kernver}/" \
-	  -e "s#^(KBASE\s*:=).*\$#\1 ${_extramodules%/*}/${_kernver}#" Makefile
-
-  make HDAPS=1
-}
-
-package() {
-  _kernver=${_kernver:-$(uname -r)}
-  _extramodules=$(readlink -f "/usr/lib/modules/${_kernver}/extramodules" || true)
-  _kernver=$(< "${_extramodules}/version")
-
-  make -C "${_extramodules%/*}/${_kernver}/build" \
-    INSTALL_MOD_PATH="${pkgdir}/${_extramodules%%/lib/*}" \
-    M="${srcdir}/${pkgname}-${pkgver}" modules_install
-
-  cd "${pkgdir}/${_extramodules%/*}"
-  mv "${_kernver}/extra" "${_extramodules##*/}"
-  rmdir "${_kernver}"
-
-  # compress kernel modules
-  find "${pkgdir}" -name "*.ko" -exec gzip -9 {} +
-
-  # load module on startup
-  echo tp_smapi > "${srcdir}/${pkgname}.conf"
-  install -Dm644 "${srcdir}/${pkgname}.conf" "${pkgdir}/usr/lib/modules-load.d/${pkgname}.conf"
-
-  # update kernel version in install file
-  sed -ri "s#^(extramodules=).*\$#\1${_extramodules}#" "${startdir}/${pkgname}.install"
-}
diff --git a/community-testing/tp_smapi/tp_smapi.install b/community-testing/tp_smapi/tp_smapi.install
deleted file mode 100644
index 5fe1bab90..000000000
--- a/community-testing/tp_smapi/tp_smapi.install
+++ /dev/null
@@ -1,13 +0,0 @@
-extramodules=/usr/lib/modules/extramodules-3.5-ARCH
-
-post_install() {
-  depmod -v $(< "$extramodules/version") &>/dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/community/atop/PKGBUILD b/community/atop/PKGBUILD
index 909c10bd3..2e0a1b5c0 100644
--- a/community/atop/PKGBUILD
+++ b/community/atop/PKGBUILD
@@ -1,25 +1,25 @@
-# $Id: PKGBUILD 57413 2011-10-27 08:43:14Z spupykin $
+# $Id: PKGBUILD 74387 2012-07-26 08:51:10Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: John Gerritse <john.gerritse@gmail.com>
 
 pkgname=atop
-pkgver=1.26
-pkgrel=2
+pkgver=1.27_3
+pkgrel=1
 pkgdesc="A system and process level monitor."
 arch=(i686 x86_64 'mips64el')
 url="http://www.atoptool.nl/"
 license=('GPL')
 depends=('ncurses' 'sh' 'zlib')
-source=(http://www.atoptool.nl/download/atop-$pkgver.tar.gz)
-md5sums=('9a72baf4c8f330973f1e2703f5a6c041')
+source=(http://www.atoptool.nl/download/atop-${pkgver/_/-}.tar.gz)
+md5sums=('4a4e896ed6ec6979f80898d37938b8d9')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $srcdir/$pkgname-${pkgver/_/-}
   sed -i 's#root ##' atop.cron
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $srcdir/$pkgname-${pkgver/_/-}
   make DESTDIR=$pkgdir INIPATH=/etc/rc.d install
 }
diff --git a/community/dos2unix/PKGBUILD b/community/dos2unix/PKGBUILD
index d23448fdc..11fd41739 100644
--- a/community/dos2unix/PKGBUILD
+++ b/community/dos2unix/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 70487 2012-05-09 15:02:28Z bpiotrowski $
+# $Id: PKGBUILD 74381 2012-07-26 05:04:12Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski
 # Contributor: Renato Garcia <fgar.renatoATgmailDOTcom>
 # Contributor: Gerson E. Ruotolo <gersonruotolo@globo.com>
 
 pkgname=dos2unix
-pkgver=6.0
+pkgver=6.0.1
 pkgrel=1
 pkgdesc='Text file format converter'
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('glibc')
 makedepends=('perl')
 conflicts=('hd2u')
 source=("http://waterlan.home.xs4all.nl/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('2fc8d6ebe9f1a519b15ebe0850e9aabd')
+md5sums=('1070432514a0f2ee8abe6ebe502a4bf7')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/fox/PKGBUILD b/community/fox/PKGBUILD
index c3139a5d3..ad657268e 100644
--- a/community/fox/PKGBUILD
+++ b/community/fox/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 70277 2012-05-03 15:59:36Z spupykin $
+# $Id: PKGBUILD 74419 2012-07-27 14:49:42Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Ben <ben@benmazer.net>
 
 pkgname=fox
-pkgver=1.6.45
+pkgver=1.6.46
 pkgrel=1
 pkgdesc="Free Objects for X: GUI Toolkit for C++"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('bzip2' 'libxcursor' 'libxft' 'libxrandr' 'mesa' 'libxi' 'libpng' 'libt
 optdepends=('perl')
 options=('!libtool')
 source=(http://ftp.fox-toolkit.org/pub/fox-$pkgver.tar.gz)
-md5sums=('57bef430c3d01463508d76a88f61d763')
+md5sums=('da2c5cf36eff32a0c49cfcd9494fe6b7')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/community/hdapsd/PKGBUILD b/community/hdapsd/PKGBUILD
new file mode 100644
index 000000000..74aa528f0
--- /dev/null
+++ b/community/hdapsd/PKGBUILD
@@ -0,0 +1,42 @@
+# Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
+# Contributor: Emil Renner Berthing <esmil@mailme.dk>
+# Contributor: Xiao-Long Chen <chenxiaolong@cxl.epac.to>
+
+pkgname=hdapsd
+pkgver=20090401
+pkgrel=5
+pkgdesc='HDAPS userspace hard drive protection daemon'
+arch=('i686' 'x86_64')
+url='http://sourceforge.net/projects/hdaps/'
+license=('GPL')
+depends=('glibc')
+backup=('etc/conf.d/hdapsd')
+source=("http://downloads.sourceforge.net/hdaps/hdapsd-${pkgver}.tar.gz"
+        'hdapsd.conf.d'
+        'hdapsd.rc.d'
+        'hdapsd.systemd'
+        'hdapsd.wrapper')
+md5sums=('897cee8b0192febd127470f3e9506aeb'
+         '07fc036c8717bf5a38bbc269ed38ad19'
+         '9ab70348da9751810a2bbac51e18ac75'
+         '4b1378d43dc9431982f6605265c24f3b'
+         '11270661f3a543268786a68bbe74a6bb')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  ./configure --prefix=/usr --sysconfdir=/etc
+  make ${MAKEFLAGS}
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+
+  make DESTDIR="${pkgdir}/" install
+
+  # install rc script and its configuration file
+  install -Dm0644 "${srcdir}/hdapsd.conf.d" "${pkgdir}/etc/conf.d/hdapsd"
+  install -Dm0755 "${srcdir}/hdapsd.rc.d" "${pkgdir}/etc/rc.d/hdapsd"
+  install -Dm0644 "${srcdir}/hdapsd.systemd" "${pkgdir}/usr/lib/systemd/system/hdapsd.service"
+  install -Dm0755 "${srcdir}/hdapsd.wrapper" "${pkgdir}/usr/sbin/hdapsd-wrapper"
+}
diff --git a/community/hdapsd/hdapsd.conf.d b/community/hdapsd/hdapsd.conf.d
new file mode 100644
index 000000000..eb99fdc2c
--- /dev/null
+++ b/community/hdapsd/hdapsd.conf.d
@@ -0,0 +1,22 @@
+# DEVICE specifies the device to monitor, defaults to "sda".
+#DEVICE='sda'
+
+# If an ultrabay hard drive is inserted, the following can be used:
+#DEVICE=('sda' 'sdb')
+
+# SENSITIVITY is self explanatory, defaults to "15".
+#SENSITIVITY='15'
+
+# Set ADAPTIVE to "yes" to enable adaptive threshold (automatically increase
+# when the built-in keyboard/mouse is used).
+#ADAPTIVE='yes'
+
+# Set SYSLOG to "yes" to have the daemon report errors to syslog (instead of
+# stderr/stdout).
+SYSLOG='yes'
+
+# Set FORCE to "yes" to force the kernel to use the unload heads feature on
+# some old hard drives for which support cannot be autodetected (don't use this
+# unless you're absolutely sure your hard drive really supports unloading
+# heads).
+#FORCE='yes'
diff --git a/community/hdapsd/hdapsd.rc.d b/community/hdapsd/hdapsd.rc.d
new file mode 100644
index 000000000..f4e8a6b99
--- /dev/null
+++ b/community/hdapsd/hdapsd.rc.d
@@ -0,0 +1,60 @@
+#!/bin/bash
+
+[ -f /etc/conf.d/hdapsd ] && . /etc/conf.d/hdapsd
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PIDFILE=/var/run/hdapsd.pid
+PID=`cat ${PIDFILE} 2> /dev/null`
+	
+case "$1" in
+  start)
+    stat_busy "Starting hdapsd"
+
+    ## The daemon will try to autoload the kernel module
+    #if [ ! -d /sys/devices/platform/hdaps ]; then
+    #    stat_fail
+    #    echo "You need to load the hdaps kernel module."
+    #    exit 1
+    #fi
+
+    ## Set up options to the hdapsd daemon
+    HDAPSD_OPTS="-bp"
+    if [ -z "${DEVICE}" ]; then
+      HDAPSD_OPTS="${HDAPSD_OPTS} -d sda"
+    else
+      for i in ${DEVICE[@]}; do
+        HDAPSD_OPTS="${HDAPSD_OPTS} -d ${i}"
+      done
+    fi
+    [ ! -z "${SENSITIVITY}" ] && HDAPSD_OPTS="${HDAPSD_OPTS} -s ${SENSITIVITY}"
+    [ "${ADAPTIVE}" = "yes" ] && HDAPSD_OPTS="${HDAPSD_OPTS} -a"
+    [ "${SYSLOG}" = "yes" ]   && HDAPSD_OPTS="${HDAPSD_OPTS} -l"
+    [ "${FORCE}" = "yes" ]    && HDAPSD_OPTS="${HDAPSD_OPTS} -f"
+    [ -z "${PID}" ] && /usr/sbin/hdapsd ${HDAPSD_OPTS}
+    if [ ${?} -gt 0 ]; then
+      stat_fail 
+    else
+      add_daemon hdapsd 
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping hdapsd"
+    [ ! -z "${PID}" ] && kill $PID &> /dev/null
+    if [ ${?} -gt 0 ]; then
+      stat_fail
+    else
+      rm_daemon hdapsd 
+      stat_done
+    fi
+    ;;
+  restart)
+    ${0} stop
+    sleep 1
+    ${0} start
+    ;;
+  *)
+    echo "usage: ${0} {start|stop|restart}"  
+esac
diff --git a/community/hdapsd/hdapsd.systemd b/community/hdapsd/hdapsd.systemd
new file mode 100644
index 000000000..328699bc7
--- /dev/null
+++ b/community/hdapsd/hdapsd.systemd
@@ -0,0 +1,12 @@
+[Unit]
+Description=HDAPS userspace hard drive protection daemon
+After=syslog.target
+
+[Service]
+Type=forking
+PIDFile=/var/run/hdapsd.pid
+ExecStart=/usr/sbin/hdapsd-wrapper
+ExecReload=/bin/kill -HUP ${MAINPID}
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/hdapsd/hdapsd.wrapper b/community/hdapsd/hdapsd.wrapper
new file mode 100644
index 000000000..d74fd272d
--- /dev/null
+++ b/community/hdapsd/hdapsd.wrapper
@@ -0,0 +1,20 @@
+#!/bin/bash
+
+[ -f /etc/conf.d/hdapsd ] && source /etc/conf.d/hdapsd
+
+OPTS="-bp"
+
+if [ -z "${DEVICE}" ]; then
+  OPTS="${OPTS} -d sda"
+else
+  for i in ${DEVICE[@]}; do
+    OPTS="${OPTS} -d ${i}"
+  done
+fi
+
+[ ! -z "${SENSITIVITY}" ] && OPTS="${OPTS} -s ${SENSITIVITY}"
+[ "${ADAPTIVE}" == "yes" ] && OPTS="${OPTS} -a"
+[ "${SYSLOG}" == "yes" ] && OPTS="${OPTS} -l"
+[ "${FORCE}" == "yes" ] && OPTS="${OPTS} -f"
+
+/usr/sbin/hdapsd ${OPTS}
diff --git a/community/intellij-idea-libs/PKGBUILD b/community/intellij-idea-libs/PKGBUILD
index 10b0f1561..ad9ab0ade 100644
--- a/community/intellij-idea-libs/PKGBUILD
+++ b/community/intellij-idea-libs/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 70885 2012-05-18 16:05:18Z stativ $
+# $Id: PKGBUILD 74411 2012-07-27 08:27:33Z stativ $
 # Maintainer: Lukas Jirkovsky <l.jirkovsky@gmail.com>
 pkgname=intellij-idea-libs
-pkgver=11.1.2
-_pkgver=117.418
+pkgver=11.1.3
+_pkgver=117.798
 pkgrel=1
 pkgdesc="Architecture dependend libraries needed by the Intellij Idea IDE"
 arch=('i686' 'x86_64' 'mips64el')
@@ -10,7 +10,7 @@ url="http://www.jetbrains.org/"
 license=('apache')
 depends=('glibc')
 source=(http://download.jetbrains.com/idea/ideaIC-$pkgver.tar.gz)
-md5sums=('eae2d36d088677e1d5670986da311f85')
+md5sums=('b8ae865e3645cfd0a8d16dac481fd25c')
 
 build() {
   cd "$srcdir"
diff --git a/community/leptonica/PKGBUILD b/community/leptonica/PKGBUILD
index 62ee0d991..1fd44405c 100644
--- a/community/leptonica/PKGBUILD
+++ b/community/leptonica/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 73623 2012-07-12 09:07:57Z spupykin $
+# $Id: PKGBUILD 74425 2012-07-28 07:40:25Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Christoph Drexler <chrdr at gmx dot at>
 
 pkgname=leptonica
 pkgver=1.69
-pkgrel=2
+pkgrel=3
 pkgdesc="Software that is broadly useful for image processing and image analysis applications"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.leptonica.com/"
diff --git a/community/lxc/PKGBUILD b/community/lxc/PKGBUILD
index 0ac23a62f..acb86e5ae 100644
--- a/community/lxc/PKGBUILD
+++ b/community/lxc/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 73154 2012-07-02 12:50:42Z spupykin $
+# $Id: PKGBUILD 74427 2012-07-28 09:35:36Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andrea Zucchelli <zukka77@gmail.com>
 # Contributor: Jonathan Liu <net147@gmail.com>
 # Maintainer: Jon Nordby <jononor@gmail.com>
 
 pkgname=lxc
-pkgver=0.8.0_rc1
+pkgver=0.8.0_rc2
 pkgrel=1
 pkgdesc="Linux Containers"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ url="http://lxc.sourceforge.net/"
 depends=('bash' 'perl')
 license=('LGPL')
 source=("http://lxc.sourceforge.net/download/lxc/$pkgname-${pkgver/_/-}.tar.gz")
-md5sums=('06ceecf4dbe1be988fc903ad8dd34d29')
+md5sums=('9bd6988542fd7dd198d056ef3a2db9f6')
 
 build() {
   cd "$srcdir/$pkgname-${pkgver/_/-}"
diff --git a/community/nsd/PKGBUILD b/community/nsd/PKGBUILD
index 994a2591d..01f0e6550 100644
--- a/community/nsd/PKGBUILD
+++ b/community/nsd/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 74075 2012-07-19 14:27:58Z bisson $
-# Maintainer: Kaiting Chen <kaitocracy@gmail.com>
+# $Id: PKGBUILD 74423 2012-07-28 07:26:34Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
+# Contributor: Kaiting Chen <kaitocracy@gmail.com>
 # Contributor: Roberto Alsina <ralsina@kde.org>
 
 pkgname=nsd
-pkgver=3.2.12
-pkgrel=1
+pkgver=3.2.13
+pkgrel=2
 pkgdesc='Authoritative only, high performance and simple DNS server'
 url='http://www.nlnetlabs.nl/nsd/'
 license=('BSD')
@@ -14,8 +14,8 @@ makedepends=('flex')
 arch=('i686' 'x86_64' 'mips64el')
 source=("http://www.nlnetlabs.nl/downloads/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'service')
-sha1sums=('dd8606a05525f6a493dfacb7ddfa7e1fa3c6a85b'
-          '29a74ce922b3991dd65ae5254bafa0a308d915e9')
+sha1sums=('2cb44f75e9686fd73c7ee9765857a36a8fe5bca9'
+          '1cfa2d7254139be50f11753d4e07281ed2af36eb')
 
 install=install
 
diff --git a/community/nsd/service b/community/nsd/service
index 2caa9585c..28bb1c5b7 100644
--- a/community/nsd/service
+++ b/community/nsd/service
@@ -5,9 +5,9 @@ After=network.target
 [Service]
 Type=forking
 PIDFile=/run/nsd.pid
-ExecStart=/usr/sbin/nsd start
-ExecReload=/usr/sbin/nsd reload
-ExecStop=/usr/sbin/nsd stop
+ExecStart=/usr/sbin/nsdc start
+ExecReload=/usr/sbin/nsdc reload
+ExecStop=/usr/sbin/nsdc stop
 
 [Install]
 WantedBy=multi-user.target
diff --git a/community/ocaml-findlib/PKGBUILD b/community/ocaml-findlib/PKGBUILD
index 63334910f..aa9e065a8 100644
--- a/community/ocaml-findlib/PKGBUILD
+++ b/community/ocaml-findlib/PKGBUILD
@@ -5,7 +5,7 @@
 # Contributor: scj <scj archlinux us>
 
 pkgname=ocaml-findlib
-pkgver=1.2.8
+pkgver=1.3.3
 pkgrel=1
 license=('MIT')
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,8 +13,8 @@ pkgdesc='Objective Caml (OCaml) package manager'
 url='http://projects.camlcity.org/projects/findlib.html'
 depends=('ocaml')
 source=("http://download.camlcity.org/download/findlib-$pkgver.tar.gz")
-md5sums=('a1da0fddf589ae62fa9b50799cd04c17')
 options=('!strip' 'zipman') # otherwise the bytecode gets broken
+md5sums=('a4c22ad5e0d38367a73cf58a25fcbebd')
 
 build() {
   cd "$srcdir/findlib-$pkgver"
diff --git a/community/pd/PKGBUILD b/community/pd/PKGBUILD
new file mode 100644
index 000000000..18449382a
--- /dev/null
+++ b/community/pd/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 74397 2012-07-26 14:58:32Z speps $
+# Maintainer : speps <speps at aur dot archlinux dot org>
+# Contributor:  TDY <tdy@gmx.com>
+# Contributor: Shinlun Hsieh <yngwiexx@yahoo.com.tw>
+# Contributor: Andrea Scarpino <bash.lnx@gmail.com>
+
+pkgname=pd
+pkgver=0.43.3
+_ver=${pkgver%.*}-${pkgver##*.}
+pkgrel=1
+pkgdesc="The Pure Data real-time music and multimedia environment"
+arch=('i686' 'x86_64')
+url="http://crca.ucsd.edu/~msp/software.html"
+license=('custom:BSD')
+depends=('jack' 'fftw' 'tk')
+provides=('puredata')
+source=("http://crca.ucsd.edu/~msp/Software/pd-$_ver.src.tar.gz")
+md5sums=('c0a565d3be92844780a86524598a5137')
+
+build() {
+  cd "$srcdir/pd-$_ver/src"
+  ./configure --prefix=/usr \
+              --enable-alsa \
+              --enable-jack \
+              --enable-fftw
+  make
+}
+
+package() {
+  cd "$srcdir/pd-$_ver/src"
+  make DESTDIR="$pkgdir" install
+
+  # license
+  install -Dm644 ../LICENSE.txt \
+    "$pkgdir/usr/share/licenses/pd/LICENSE"
+}
diff --git a/community/percona-server/PKGBUILD b/community/percona-server/PKGBUILD
index 5bf9e12dc..953f2e0d1 100644
--- a/community/percona-server/PKGBUILD
+++ b/community/percona-server/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 73668 2012-07-13 06:40:20Z spupykin $
+# $Id: PKGBUILD 74393 2012-07-26 13:12:10Z mtorromeo $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 
 pkgname=percona-server
-pkgver=5.5.24_rel26.0
-pkgrel=3
+pkgver=5.5.25a_rel27.1
+pkgrel=1
 pkgdesc="A backwards-compatible drop-in replacement for MySQL that provides improved performance, diagnostics and instrumentation, and manageability of the server"
 arch=('i686' 'x86_64' 'mips64el')
 
@@ -106,7 +106,7 @@ package() {
 	install -Dm755 "$srcdir/mysqld-post" "$pkgdir/usr/bin/mysqld-post"
 }
 
-md5sums=('76f835e98ad3c71fcaa33794ee187630'
+md5sums=('c6d08224a37f545d55af7657f24bd2c8'
          '243864805611764a7e5883c1dba7afd8'
          '1c949c0dbea5206af0db14942d9927b6'
          '5143dadeaac15f1ff88ea16716588554'
diff --git a/community/tinyproxy/PKGBUILD b/community/tinyproxy/PKGBUILD
index 981881aa0..a6d782dca 100644
--- a/community/tinyproxy/PKGBUILD
+++ b/community/tinyproxy/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 64182 2012-02-09 20:42:45Z lfleischer $
+# $Id: PKGBUILD 74395 2012-07-26 13:54:21Z lfleischer $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Andrea Zucchelli <zukka77@gmail.com>
 
 pkgname=tinyproxy
 pkgver=1.8.3
-pkgrel=4
+pkgrel=5
 pkgdesc='A light-weight HTTP proxy daemon for POSIX operating systems.'
 arch=('i686' 'x86_64' 'mips64el')
 url='https://banu.com/tinyproxy/'
@@ -14,10 +14,12 @@ install="${pkgname}.install"
 backup=('etc/tinyproxy/tinyproxy.conf')
 source=("https://banu.com/pub/${pkgname}/1.8/${pkgname}-${pkgver}.tar.bz2"
         'tinyproxy'
-        'tinyproxy.tmpfiles.conf')
+        'tinyproxy.tmpfiles.conf'
+        'tinyproxy.service')
 md5sums=('292ac51da8ad6ae883d4ebf56908400d'
          '90eb2b3371e56d5a784fd826d4a6e5f8'
-         '3c2764578f26581346fe312da0519a3e')
+         '3c2764578f26581346fe312da0519a3e'
+         '8e97b05cc8c87f7efefbf957e77c7f18')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -37,4 +39,7 @@ package() {
 
   # Provide sane defaults
   sed -i '/^#Listen/a\Listen 127.0.0.1' "${pkgdir}/etc/tinyproxy/tinyproxy.conf"
+
+  install -Dm0644 "${srcdir}/tinyproxy.service" \
+    "${pkgdir}/usr/lib/systemd/system/tinyproxy.service"
 }
diff --git a/community/tinyproxy/tinyproxy.service b/community/tinyproxy/tinyproxy.service
new file mode 100644
index 000000000..aea1d32fe
--- /dev/null
+++ b/community/tinyproxy/tinyproxy.service
@@ -0,0 +1,10 @@
+[Unit]
+Description=Tinyproxy Web Proxy Server
+After=network.target
+
+[Service]
+Type=forking
+ExecStart=/usr/sbin/tinyproxy -c /etc/tinyproxy/tinyproxy.conf
+
+[Install]
+WantedBy=multi-user.target
diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD
index 23e10a7b9..29babe5bc 100644
--- a/community/wt/PKGBUILD
+++ b/community/wt/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 74015 2012-07-18 01:09:31Z ibiru $
+# $Id: PKGBUILD 74389 2012-07-26 08:51:55Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Denis Martinez <deuns.martinez@gmail.com>
 
 pkgname=wt
-pkgver=3.2.2rc2
-_pkgver=3.2.2-rc2
+pkgver=3.2.2
+_pkgver=3.2.2
 pkgrel=1
 pkgdesc="a C++ library and application server for developing and deploying web applications"
 arch=('i686' 'x86_64' 'mips64el')
@@ -26,7 +26,7 @@ optdepends=('openssl: for SSL support in built-in webserver'
 	    'qt: for the Wt/Qt interopability example (wtwithqt)')
 backup=('etc/wt/wt_config.xml')
 source=(http://downloads.sourceforge.net/witty/$pkgname-${_pkgver}.tar.gz)
-md5sums=('015ab2b8c6bada0f801057e3f126e365')
+md5sums=('86e1eac9baa7a061fd3dd9b53dd77baa')
 
 build() {
   cd ${srcdir}/${pkgname}-${_pkgver}
diff --git a/community/xlockmore/PKGBUILD b/community/xlockmore/PKGBUILD
index 9862de929..15a7d3643 100644
--- a/community/xlockmore/PKGBUILD
+++ b/community/xlockmore/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 64132 2012-02-09 01:00:06Z spupykin $
+# $Id: PKGBUILD 74407 2012-07-27 05:34:52Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: dorphell <dorphell@archlinux.org>
 
 pkgname=xlockmore
-pkgver=5.38
+pkgver=5.40
 pkgrel=1
 pkgdesc="screen saver / locker for the X Window System"
 arch=(i686 x86_64 'mips64el')
@@ -13,7 +13,7 @@ url="http://www.tux.org/~bagleyd/xlockmore.html"
 options=('!makeflags')
 source=(http://www.tux.org/~bagleyd/xlock/xlockmore-$pkgver/xlockmore-$pkgver.tar.bz2
 	LICENSE)
-md5sums=('da08b39ea92d2f0b95564b1314f57a42'
+md5sums=('47a8e16c485da7b0ebfa3f3e43300189'
          'a64afab4283f53972a6702c2e59850d7')
 
 build() {
diff --git a/testing/btrfs-progs/70-btrfs.rules b/core/btrfs-progs/70-btrfs.rules
index c0e8c776c..c0e8c776c 100644
--- a/testing/btrfs-progs/70-btrfs.rules
+++ b/core/btrfs-progs/70-btrfs.rules
diff --git a/core/btrfs-progs/PKGBUILD b/core/btrfs-progs/PKGBUILD
index 7524acca6..766fe7eed 100644
--- a/core/btrfs-progs/PKGBUILD
+++ b/core/btrfs-progs/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 160394 2012-06-01 13:21:40Z dreisner $
+# $Id: PKGBUILD 164224 2012-07-27 20:04:40Z dreisner $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Tobias Powalowski <tpowa@archlinux.org>
 pkgname=btrfs-progs
 pkgver=0.19.20120328
-pkgrel=3
+pkgrel=4
 pkgdesc="btrfs filesystem utilities"
 arch=(i686 x86_64 mips64el)
 depends=('glibc' 'e2fsprogs')
@@ -13,11 +13,13 @@ conflicts=('btrfs-progs-unstable')
 provides=('btrfs-progs-unstable')
 license=('GPL2')
 source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz
+        70-btrfs.rules
         initcpio-install-btrfs
         initcpio-hook-btrfs)
 md5sums=('f4504e73cf9254779b78d5b2318ac570'
-         '3eae9bf1541e297fa72aa40ebf7320c6'
-         'b09688a915a0ec8f40e2f5aacbabc9ad')
+         '345c62c8b267082361729ca5b647518f'
+         'e5186ec3fe8a809b7473470128d1c4ab'
+         '9fb35142755b477a96cb7292f3d64839')
 
 build() {
    cd $srcdir/$pkgname-$pkgver
@@ -33,6 +35,9 @@ package() {
    mkdir -p ${pkgdir}/sbin
    ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs
 
+   # add udev rule
+   install -Dm644 "$srcdir/70-btrfs.rules" "$pkgdir/usr/lib/udev/rules.d/70-btrfs.rules"
+
    # install mkinitcpio hooks
    install -Dm644 "$srcdir/initcpio-install-btrfs" \
      "$pkgdir/usr/lib/initcpio/install/btrfs"
diff --git a/core/btrfs-progs/initcpio-hook-btrfs b/core/btrfs-progs/initcpio-hook-btrfs
index 7965d0a8a..913cec528 100644
--- a/core/btrfs-progs/initcpio-hook-btrfs
+++ b/core/btrfs-progs/initcpio-hook-btrfs
@@ -1,7 +1,10 @@
 #!/usr/bin/ash
 
 run_hook() {
-    btrfs device scan
+    # if udevd is running, this is done async by add/change events
+    if [ "$udevd_running" -ne 1 ]; then
+        btrfs device scan
+    fi
 }
 
 # vim: set ft=sh ts=4 sw=4 et:
diff --git a/core/btrfs-progs/initcpio-install-btrfs b/core/btrfs-progs/initcpio-install-btrfs
index a70a324ed..aad263378 100644
--- a/core/btrfs-progs/initcpio-install-btrfs
+++ b/core/btrfs-progs/initcpio-install-btrfs
@@ -1,9 +1,11 @@
 #!/bin/bash
 
 build() {
-    add_all_modules btrfs
+    add_module btrfs
     add_binary btrfs
     add_runscript
+
+    add_file /usr/lib/udev/rules.d/70-btrfs.rules
 }
 
 help() {
diff --git a/core/dnsutils/PKGBUILD b/core/dnsutils/PKGBUILD
index 23d22ad07..42f938f26 100644
--- a/core/dnsutils/PKGBUILD
+++ b/core/dnsutils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 161356 2012-06-10 08:42:42Z bisson $
+# $Id: PKGBUILD 164066 2012-07-26 15:21:23Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: kevin <kevin@archlinux.org>
 # Contributor: mario <mario_vazq@hotmail.com>
@@ -6,8 +6,8 @@
 pkgname=dnsutils
 
 # Use a period and not a hyphen before the patch level for proper versioning.
-pkgver=9.9.1.P1
-_pkgver=9.9.1-P1
+pkgver=9.9.1.P2
+_pkgver=9.9.1-P2
 pkgrel=1
 
 pkgdesc='DNS utilities: dig host nslookup'
@@ -18,7 +18,7 @@ options=('!makeflags')
 depends=('openssl' 'krb5' 'idnkit' 'dnssec-anchors')
 source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
         'remove-bind.patch')
-sha1sums=('a2263b96ccd8a143ea54b39958142c542bf605a8'
+sha1sums=('449b12c32682b5bef64c7b53cd0fc0c6b731c8a7'
           'b465ef6160b004838f04de9978fe1be8422af777')
 
 replaces=('bind-tools' 'host')
diff --git a/core/iptables/PKGBUILD b/core/iptables/PKGBUILD
index 06814a4ed..490886f6e 100644
--- a/core/iptables/PKGBUILD
+++ b/core/iptables/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 162152 2012-06-22 12:55:41Z dreisner $
+# $Id: PKGBUILD 164210 2012-07-27 14:54:09Z ibiru $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 
 pkgname=iptables
 pkgver=1.4.14
-pkgrel=2
+pkgrel=3
 pkgdesc='Linux kernel packet control tool'
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL2')
@@ -23,10 +23,11 @@ source=("http://www.iptables.org/projects/iptables/files/${pkgname}-${pkgver}.ta
         empty-nat.rules
         empty-raw.rules
         empty-security.rules
-	0503-extension_cppflags.patch
-	iptables.service
-	ip6tables.service
-	iptables-flush)
+        0503-extension_cppflags.patch
+        iptables-1.4.12-fixresore.patch
+        iptables.service
+        ip6tables.service
+        iptables-flush)
 backup=(etc/conf.d/iptables)
 sha1sums=('daf2972b81e52f562a644798013e946c88319ea3'
           '5bb6fa526665cdd728c26f0f282f5a51f220cf88'
@@ -40,6 +41,7 @@ sha1sums=('daf2972b81e52f562a644798013e946c88319ea3'
           '7db53bb882f62f6c677cc8559cff83d8bae2ef73'
           'ebbd1424a1564fd45f455a81c61ce348f0a14c2e'
           '44626980a52e49f345a0b1e1ca03060f3a35763c'
+          '7c018d48445ae41c0b9f345747e54b94cb0997b3'
           '5c4eb4ea88c302e8ff98f435a11dd59b00f4d8b9'
           'f1f16f44c6a5547b6f251d13007fe6585761e8b0'
           'e7abda09c61142121b6695928d3b71ccd8fdf73a')
@@ -52,6 +54,11 @@ build() {
 
   patch -Np1 -i ${srcdir}/0503-extension_cppflags.patch
 
+  # Fix scope issue exposed by gcc 4.7 (patch by fryasu)
+  # http://bugzilla.netfilter.org/show_bug.cgi?id=774
+  # (This will most likely be fixed in iptables 1.4.15)
+  patch -Np1 -i ${srcdir}/iptables-1.4.12-fixresore.patch
+
  ./configure --prefix=/usr \
      --libexecdir=/usr/lib/iptables --sysconfdir=/etc \
      --with-xtlibdir=/usr/lib/iptables \
diff --git a/testing/iptables/iptables-1.4.12-fixresore.patch b/core/iptables/iptables-1.4.12-fixresore.patch
index 94358f779..94358f779 100644
--- a/testing/iptables/iptables-1.4.12-fixresore.patch
+++ b/core/iptables/iptables-1.4.12-fixresore.patch
diff --git a/core/iw/PKGBUILD b/core/iw/PKGBUILD
index dabdf3cca..7e4587bf3 100644
--- a/core/iw/PKGBUILD
+++ b/core/iw/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 159175 2012-05-17 10:12:16Z thomas $
+# $Id: PKGBUILD 164233 2012-07-28 01:51:21Z eric $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=iw
@@ -9,7 +9,7 @@ arch=("i686" "x86_64" 'mips64el')
 url="http://wireless.kernel.org/en/users/Documentation/iw"
 license=("GPL")
 depends=("libnl")
-makedepends=("kernel-headers")
+makedepends=("linux-api-headers")
 source=(http://wireless.kernel.org/download/$pkgname/$pkgname-$pkgver.tar.bz2)
 sha256sums=('989b5677588e32de6eda97bf978810b366a7620f78f26f9cc61c15bdb434218a')
 
diff --git a/core/systemd/PKGBUILD b/core/systemd/PKGBUILD
index 3a9ed02b9..40cd149bf 100644
--- a/core/systemd/PKGBUILD
+++ b/core/systemd/PKGBUILD
@@ -3,7 +3,7 @@
 
 pkgbase=systemd
 pkgname=('systemd' 'libsystemd' 'systemd-tools' 'systemd-sysvcompat')
-pkgver=186
+pkgver=187
 pkgrel=2
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.freedesktop.org/wiki/Software/systemd"
@@ -17,7 +17,7 @@ source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
         'initcpio-install-timestamp'
         '0001-Reinstate-TIMEOUT-handling.patch'
         'locale.sh')
-md5sums=('17eff1d31e6e49bf82e129fe57efd59b'
+md5sums=('26606e3c84448800ef0b3ffd57e6e8b6'
          'e99e9189aa2f6084ac28b8ddf605aeb8'
          '59e91c4d7a69b7bf12c86a9982e37ced'
          'df69615503ad293c9ddf9d8b7755282d'
@@ -52,10 +52,10 @@ package_systemd() {
   pkgdesc="system and service manager"
   depends=('acl' 'dbus-core' "libsystemd=$pkgver" 'kmod' 'libcap' 'pam'
            "systemd-tools=$pkgver" 'util-linux' 'xz')
-  optdepends=('python-dbus: systemd-analyze'
-              'initscripts: legacy support for hostname and vconsole setup'
+  optdepends=('initscripts: legacy support for hostname and vconsole setup'
               'initscripts-systemd: legacy generator for initialization scripts'
-              'python-cairo: systemd-analyze'
+              'python2-cairo: systemd-analyze'
+              'python2-dbus: systemd-analyze'
               'systemd-arch-units: collection of native unit files for Arch daemon/init scripts'
               'systemd-sysvcompat: symlink package to provide sysvinit binaries')
   backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
@@ -87,6 +87,10 @@ package_systemd() {
   rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service"
   rmdir "$pkgdir/etc/systemd/system/getty.target.wants"
 
+  # fix systemd-analyze for python2. the 'plot' verb does not work
+  # with py3k due to a bug in python-cairo
+  sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
+
   ### split off libsystemd (libs, includes, pkgconfig, man3)
   rm -rf "$srcdir/_libsystemd"
   install -dm755 "$srcdir"/_libsystemd/usr/{include,lib/pkgconfig}
@@ -137,7 +141,7 @@ package_systemd() {
   mv "$pkgdir"/usr/share/man/man8/{systemd-{tmpfiles,udevd},udevadm}.8 usr/share/man/man8
   mv "$pkgdir"/usr/share/man/man1/systemd-{ask-password,delta,detect-virt,machine-id-setup}.1 usr/share/man/man1
   mv "$pkgdir"/usr/share/man/man5/{binfmt,modules-load,sysctl,tmpfiles}.d.5 usr/share/man/man5
-  mv "$pkgdir"/usr/share/man/man5/{hostname,{vconsole,locale}.conf}.5 usr/share/man/man5
+  mv "$pkgdir"/usr/share/man/man5/{hostname,{vconsole,locale}.conf,crypttab}.5 usr/share/man/man5
   mv "$pkgdir"/usr/bin/systemd-{ask-password,delta,detect-virt,tmpfiles,tty-ask-password-agent} usr/bin
   mv "$pkgdir"/usr/lib/systemd/systemd-{ac-power,binfmt,cryptsetup,modules-load,random-seed,remount-fs,reply-password,sysctl,timestamp,vconsole-setup} usr/lib/systemd
 }
diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD
index f88d2b1e3..d00a37027 100644
--- a/extra/audacious/PKGBUILD
+++ b/extra/audacious/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 162785 2012-06-30 13:48:37Z bisson $
+# $Id: PKGBUILD 164181 2012-07-27 00:15:23Z bisson $
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=audacious
-pkgver=3.2.4
+pkgver=3.3
 pkgrel=1
 pkgdesc='Lightweight, advanced audio player focused on audio quality'
 url='http://audacious-media-player.org/'
@@ -14,7 +14,7 @@ depends=('gtk3' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins'
          'hicolor-icon-theme' 'gtk-update-icon-cache' 'desktop-file-utils')
 optdepends=('unzip-libre: zipped skins support')
 source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('24aa75e0a15d2327641c81c6ec7ea153a8df1ae0')
+sha1sums=('3c006676f1dbc2376c098855b93606da0f58f7ea')
 
 provides=('audacious-player')
 replaces=('audacious-player')
@@ -22,7 +22,7 @@ install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	./configure --prefix=/usr
+	./configure --prefix=/usr --with-buildstamp='Arch Linux'
 	make
 }
 
diff --git a/extra/bind/PKGBUILD b/extra/bind/PKGBUILD
index b7b6d159c..868f8529b 100644
--- a/extra/bind/PKGBUILD
+++ b/extra/bind/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 162157 2012-06-22 12:58:04Z dreisner $
+# $Id: PKGBUILD 164067 2012-07-26 15:21:52Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 # Contributor: Mario Vazquez <mario_vazq@hotmail.com>
@@ -6,9 +6,9 @@
 pkgname=bind
 
 # Use a period and not a hyphen before the patch level for proper versioning.
-pkgver=9.9.1.P1
-_pkgver=9.9.1-P1
-pkgrel=2
+pkgver=9.9.1.P2
+_pkgver=9.9.1-P2
+pkgrel=1
 
 pkgdesc='Berkeley Internet Name Daemon is the reference implementation of the DNS protocols'
 url='http://www.isc.org/software/bind/'
@@ -26,7 +26,7 @@ source=("http://ftp.isc.org/isc/bind9/${_pkgver}/bind-${_pkgver}.tar.gz"
         'named.logrotate'
         'localhost.zone'
         '127.0.0.zone')
-sha1sums=('a2263b96ccd8a143ea54b39958142c542bf605a8'
+sha1sums=('449b12c32682b5bef64c7b53cd0fc0c6b731c8a7'
           'cbdecd1ea8e7b612b33b63d66bc57273795d1f54'
           '18f477f510df31e6c6f547ee2d5fc46e973479bf'
           '46232e9db243c6c05e170a1781d7a7f413be5d03'
diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD
index 81d2bf0ed..4572d53c6 100644
--- a/extra/calligra/PKGBUILD
+++ b/extra/calligra/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 162542 2012-06-27 12:21:57Z andrea $
+# $Id: PKGBUILD 164230 2012-07-28 01:31:18Z eric $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
@@ -31,7 +31,7 @@ makedepends=('cmake' 'automoc4' 'boost ' 'eigen2'
              'kdepimlibs' 'libpqxx' 'freetds' 'xbase'
              'kdegraphics-okular' 'gsl' 'kdeedu-marble'
              'libwpd' 'libwpg' 'pstoedit' 'glew'
-             'fftw' 'opengtl' 'lcms2' 'libkdcraw' 'wv2')
+             'fftw' 'opengtl' 'lcms2' 'libkdcraw')
 groups=('calligra')
 source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.bz2")
 md5sums=('469d639f17e3d6a186baabd899147e39')
diff --git a/extra/cups/PKGBUILD b/extra/cups/PKGBUILD
index acb8b9998..7b4633aef 100644
--- a/extra/cups/PKGBUILD
+++ b/extra/cups/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 163972 2012-07-23 03:04:02Z allan $
+# $Id: PKGBUILD 164175 2012-07-26 17:37:45Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
-pkgver=1.5.3
-pkgrel=6
+pkgver=1.5.4
+pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.cups.org/"
@@ -22,7 +22,7 @@ source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
         cups-systemd-socket.patch
         cups cups.logrotate cups.pam)
 #options=('!emptydirs')
-md5sums=('e1ad15257aa6f162414ea3beae0c5df8'
+md5sums=('de3006e5cf1ee78a9c6145ce62c4e982'
          '12c8af5bcd3b8f84240280b3dfaf9e89'
          'cdc1322c8014297ae349e2db78a03c5a'
          '1a5112f63958643f2888abc9418dbcac'
diff --git a/extra/cups/PKGBUILD.16 b/extra/cups/PKGBUILD.16
index 01faba047..eb8e26473 100644
--- a/extra/cups/PKGBUILD.16
+++ b/extra/cups/PKGBUILD.16
@@ -3,23 +3,23 @@
 
 pkgbase="cups"
 pkgname=('libcups' 'cups')
-pkgver=1.6b1
+pkgver=1.6.0
 pkgrel=1
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.cups.org/"
-makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc' 'colord'
-             'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus-core' 'avahi'  'hicolor-icon-theme')
+makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc'
+             'colord' 'xinetd' 'gzip' 'autoconf' 'libusb' 'dbus-core' 'avahi'  'hicolor-icon-theme')
 source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
         cups-no-export-ssllibs.patch
         cups-no-gcrypt.patch
         cups-no-gzip-man.patch
         cups cups.logrotate cups.pam)
 #options=('!emptydirs')
-md5sums=('468a40755a872d84be89111ce97a69d1'
+md5sums=('07157b243dd11e90e3f654c4d62e7c8a'
          '9b8467a1e51d360096b70e2c3c081e6c'
          '3733c23e77eb503bd94cc368e02830dc'
-         '90c30380d4c8cd48a908cfdadae1ea24'
+         'c9159ba1233902ba6ddbbe6885a46b72'
          '9657daa21760bb0b5fa3d8b51d5e01a1'
          'f861b18f4446c43918c8643dcbbd7f6d'
          '96f82c38f3f540b53f3e5144900acf17')
@@ -40,6 +40,7 @@ build() {
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
      --libdir=/usr/lib \
+     --with-systemdsystemunitdir=/usr/lib/systemd/system \
      --with-logdir=/var/log/cups \
      --with-docdir=/usr/share/cups/doc \
      --with-cups-user=daemon \
diff --git a/extra/libktorrent/PKGBUILD b/extra/libktorrent/PKGBUILD
index 5b9f23a37..e585b022a 100644
--- a/extra/libktorrent/PKGBUILD
+++ b/extra/libktorrent/PKGBUILD
@@ -1,21 +1,28 @@
-# $Id: PKGBUILD 161992 2012-06-18 07:10:44Z ronald $
+# $Id: PKGBUILD 164220 2012-07-27 18:35:04Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=libktorrent
 pkgver=1.2.1
-pkgrel=1
+pkgrel=2
 pkgdesc="A BitTorrent protocol implementation"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://ktorrent.org/"
 license=('GPL2')
 depends=('kdelibs')
 makedepends=('automoc4' 'cmake' 'boost' 'doxygen')
-source=("http://ktorrent.org/downloads/4.2.1/${pkgname}-${pkgver}-2.tar.bz2")
-sha1sums=('857e4227c4bba685755d66581d881f893f6311ae')
+source=("http://ktorrent.org/downloads/4.2.1/${pkgname}-${pkgver}-2.tar.bz2"
+	"magnet.patch")
+sha1sums=('857e4227c4bba685755d66581d881f893f6311ae'
+          'f0156489364e5590b0b539cfe2abc929c1922ef8')
 
 build() {
   cd "${srcdir}"
+
+  pushd ${pkgname}-${pkgver}-2
+  patch -Np1 -i ${srcdir}/magnet.patch
+  popd
+
   mkdir build
   cd build
   cmake ../${pkgname}-${pkgver}-2 \
diff --git a/extra/libktorrent/magnet.patch b/extra/libktorrent/magnet.patch
new file mode 100644
index 000000000..5db76c101
--- /dev/null
+++ b/extra/libktorrent/magnet.patch
@@ -0,0 +1,226 @@
+commit 5107e4b7a050d7533f44801f5f5f5694203fd3b5
+Author: Joris Guisson <joris.guisson@gmail.com>
+Date:   Wed Jul 11 20:16:43 2012 +0200
+
+    Make sure all trackers are used of a magnet link
+    
+    BUG: 302997
+    BUG: 303269
+
+diff --git a/src/magnet/magnetlink.cpp b/src/magnet/magnetlink.cpp
+index 525bfa5..43168dc 100644
+--- a/src/magnet/magnetlink.cpp
++++ b/src/magnet/magnetlink.cpp
+@@ -19,13 +19,14 @@
+  ***************************************************************************/
+ 
+ #include "magnetlink.h"
++#include <QUrl>
+ #include <QStringList>
+ #include <util/log.h>
+ #include <util/error.h>
+ 
+ namespace bt
+ {
+-	
++
+ 	MagnetLink::MagnetLink()
+ 	{
+ 	}
+@@ -44,7 +45,7 @@ namespace bt
+ 	{
+ 		parse(mlink);
+ 	}
+-	
++
+ 	MagnetLink::~MagnetLink()
+ 	{
+ 	}
+@@ -64,83 +65,114 @@ namespace bt
+ 	{
+ 		return info_hash == mlink.infoHash();
+ 	}
+-	
++
++	static KUrl::List GetTrackers(const KUrl & url)
++	{
++		KUrl::List result;
++		const QString encoded_query = QString::fromLatin1(url.encodedQuery());
++		const QString item = QLatin1String("tr=");
++		if(encoded_query.length() <= 1)
++			return result;
++
++		const QStringList items = encoded_query.split(QString(QLatin1Char('&')), QString::SkipEmptyParts);
++		const int len = item.length();
++		for(QStringList::ConstIterator it = items.begin(); it != items.end(); ++it)
++		{
++			if((*it).startsWith(item))
++			{
++				if((*it).length() > len)
++				{
++					QString str = (*it).mid(len);
++					str.replace(QLatin1Char('+'), QLatin1Char(' '));   // + in queries means space.
++					result.push_back(QUrl::fromPercentEncoding(str.toLatin1()));
++				}
++			}
++		}
++
++		return result;
++	}
++
+ 	void MagnetLink::parse(const QString& mlink)
+ 	{
+ 		KUrl url(mlink);
+-		if (url.protocol() != "magnet")
++		if(url.protocol() != "magnet")
+ 		{
+-			Out(SYS_GEN|LOG_NOTICE) << "Invalid protocol of magnet link "
+-				<< mlink << endl;
++			Out(SYS_GEN | LOG_NOTICE) << "Invalid protocol of magnet link "
++			                          << mlink << endl;
+ 			return;
+ 		}
+-		
++
+ 		torrent_url = url.queryItem("to");
+ 		//magnet://description-of-content.btih.HASH(-HASH)*.dht/path/file?x.pt=&x.to=
+ 
+ 		// TODO automatically select these files and prefetches from here
+ 		path = url.queryItem("pt");
+-		if ( path.isEmpty() && url.hasPath() && url.path() != "/" ) {
++		if(path.isEmpty() && url.hasPath() && url.path() != "/")
++		{
+ 			// TODO find out why RemoveTrailingSlash does not work
+ 			path = url.path(KUrl::RemoveTrailingSlash).remove(QRegExp("^/"));
+ 		}
+ 
+ 		QString xt = url.queryItem("xt");
+-		if ( xt.isEmpty()
+-		     || !xt.startsWith("urn:btih:") ) {
++		if(xt.isEmpty()
++		        || !xt.startsWith("urn:btih:"))
++		{
+ 			QRegExp btihHash("([^\\.]+).btih");
+-			if ( btihHash.indexIn(url.host()) != -1 ) {
++			if(btihHash.indexIn(url.host()) != -1)
++			{
+ 				QString primaryHash = btihHash.cap(1).split("-")[0];
+-				xt = "urn:btih:"+primaryHash;
+-			} else {
+-				Out(SYS_GEN|LOG_NOTICE) << "No hash found in magnet link "
+-					<< mlink << endl;
++				xt = "urn:btih:" + primaryHash;
++			}
++			else
++			{
++				Out(SYS_GEN | LOG_NOTICE) << "No hash found in magnet link "
++				                          << mlink << endl;
+ 				return;
+ 			}
+ 		}
+-		
++
+ 		QString ih = xt.mid(9);
+-		if (ih.length() != 40 && ih.length() != 32)
++		if(ih.length() != 40 && ih.length() != 32)
+ 		{
+-			Out(SYS_GEN|LOG_NOTICE) << "Hash has not valid length in magnet link "
+-				<< mlink << endl;
++			Out(SYS_GEN | LOG_NOTICE) << "Hash has not valid length in magnet link "
++			                          << mlink << endl;
+ 			return;
+ 		}
+-		
++
+ 		try
+ 		{
+-			if (ih.length() == 32)
++			if(ih.length() == 32)
+ 				ih = base32ToHexString(ih);
+ 
+ 			Uint8 hash[20];
+-			memset(hash,0,20);
+-			for (int i = 0;i < 20;i++)
++			memset(hash, 0, 20);
++			for(int i = 0; i < 20; i++)
+ 			{
+-				Uint8 low = charToHex(ih[2*i + 1]);
+-				Uint8 high = charToHex(ih[2*i]);
++				Uint8 low = charToHex(ih[2 * i + 1]);
++				Uint8 high = charToHex(ih[2 * i]);
+ 				hash[i] = (high << 4) | low;
+ 			}
+-			
++
+ 			info_hash = SHA1Hash(hash);
+-			tracker_urls = url.queryItem("tr").split(",");
++			tracker_urls = GetTrackers(url);
+ 			name = url.queryItem("dn");
+ 			magnet_string = mlink;
+ 		}
+-		catch (...)
++		catch(...)
+ 		{
+-			Out(SYS_GEN|LOG_NOTICE) << "Invalid magnet link " << mlink << endl;
++			Out(SYS_GEN | LOG_NOTICE) << "Invalid magnet link " << mlink << endl;
+ 		}
+ 	}
+-	
++
+ 	Uint8 MagnetLink::charToHex(const QChar& ch)
+ 	{
+-		if (ch.isDigit())
++		if(ch.isDigit())
+ 			return ch.digitValue();
+-		
+-		if (!ch.isLetter())
++
++		if(!ch.isLetter())
+ 			throw bt::Error("Invalid char");
+-		
+-		if (ch.isLower())
++
++		if(ch.isLower())
+ 			return 10 + ch.toAscii() - 'a';
+ 		else
+ 			return 10 + ch.toAscii() - 'A';
+@@ -155,28 +187,28 @@ namespace bt
+ 		QString str = s.toUpper();
+ 		// 32 base32 chars -> 40 hex chars
+ 		// 4 base32 chars -> 5 hex chars
+-		for (int i = 0; i < 8; i++)
++		for(int i = 0; i < 8; i++)
+ 		{
+ 			part = 0;
+-			for (int j = 0; j < 4; j++)
++			for(int j = 0; j < 4; j++)
+ 			{
+-				ch = str[i*4 + j];
+-				if (ch.isDigit() && (ch.digitValue() < 2 || ch.digitValue() > 7))
++				ch = str[i * 4 + j];
++				if(ch.isDigit() && (ch.digitValue() < 2 || ch.digitValue() > 7))
+ 					throw bt::Error("Invalid char");
+ 
+-				if (ch.isDigit())
+-					 tmp = ch.digitValue() + 24;
++				if(ch.isDigit())
++					tmp = ch.digitValue() + 24;
+ 				else
+ 					tmp = ch.toAscii() - 'A';
+-				part = part + (tmp << 5*(3-j));
++				part = part + (tmp << 5 * (3 - j));
+ 			}
+ 
+ 			// part is a Uint32 with 20 bits (5 hex)
+-			for (int j = 0; j < 5; j++)
++			for(int j = 0; j < 5; j++)
+ 			{
+-				tmp = (part >> 4*(4-j)) & 0xf;
+-				if (tmp >= 10)
+-					ret.append(QChar((tmp-10) + 'a'));
++				tmp = (part >> 4 * (4 - j)) & 0xf;
++				if(tmp >= 10)
++					ret.append(QChar((tmp - 10) + 'a'));
+ 				else
+ 					ret.append(QChar(tmp + '0'));
+ 			}
diff --git a/extra/libwacom/PKGBUILD b/extra/libwacom/PKGBUILD
index c535d1998..332c26613 100644
--- a/extra/libwacom/PKGBUILD
+++ b/extra/libwacom/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 156922 2012-04-23 09:09:07Z ibiru $
+# $Id: PKGBUILD 164253 2012-07-28 20:26:26Z eric $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=libwacom
-pkgver=0.4
+pkgver=0.6
 pkgrel=1
 pkgdesc="Library to identify Wacom tablets and their features"
 arch=('x86_64' 'i686' 'mips64el')
-depends=('glib2' 'udev')
-license=('LGPL')
+url="http://sourceforge.net/apps/mediawiki/linuxwacom/index.php?title=Libwacom"
+license=('MIT')
+depends=('glib2' 'systemd-tools')
 options=('!libtool')
-source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver:0:3}/$pkgname-$pkgver.tar.xz)
-url="http://www.gnome.org"
-sha256sums=('13a7989572126b7f9013f8289b7e59707e23690fbd5eaa7f033b88245fa12367')
+source=(http://sourceforge.net/projects/linuxwacom/files/libwacom/$pkgname-$pkgver.tar.bz2)
+sha256sums=('7115690698edc87deec482f0b2526567b858475d2135b5f8ccc946e5e76ec01d')
 
 build() {
   cd $pkgname-$pkgver
@@ -19,7 +19,13 @@ build() {
   make
 }
 
+check() {
+  cd $pkgname-$pkgver
+  make check
+}
+
 package() {
   cd $pkgname-$pkgver
   make DESTDIR="$pkgdir" install
+  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index e4b9e80c0..ba7a8357d 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 163810 2012-07-20 10:44:25Z giovanni $
+# $Id: PKGBUILD 164191 2012-07-27 09:30:54Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2012.07.18
+pkgver=2012.07.26
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('71e6624ed5114b8f9199500c01bef569')
+md5sums=('18374e9f6681f62ab7c987ca0029d494')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/mpg123/PKGBUILD b/extra/mpg123/PKGBUILD
index 660f9bb1c..9b914ab5d 100644
--- a/extra/mpg123/PKGBUILD
+++ b/extra/mpg123/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 163205 2012-07-09 20:33:57Z eric $
+# $Id: PKGBUILD 164185 2012-07-27 04:44:49Z eric $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=mpg123
-pkgver=1.14.3
+pkgver=1.14.4
 pkgrel=1
 pkgdesc="A console based real time MPEG Audio Player for Layer 1, 2 and 3"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,8 +17,8 @@ conflicts=('mpg321')
 provides=('mpg321')
 options=('!libtool')
 source=(http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2{,.sig})
-sha1sums=('c3cd800121bccf15d8fc31a30575a5dce8aaa5d5'
-          '32f4a507aed62c038b1620c938c8001b3a9b04b5')
+sha1sums=('9f53e27bb40b8df3d3b6df25f5f9a8a83b1fccfe'
+          '28ab232dd9bcec8bbb00026cc60960b719d14fed')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/python-numpy/PKGBUILD b/extra/python-numpy/PKGBUILD
index f981fe205..d6c41b055 100755
--- a/extra/python-numpy/PKGBUILD
+++ b/extra/python-numpy/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 138131 2011-09-17 03:10:10Z allan $
+# $Id: PKGBUILD 164237 2012-07-28 03:14:33Z stephane $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve> 
 
 pkgbase=python-numpy
 pkgname=('python2-numpy' 'python-numpy')
-pkgver=1.6.1
+pkgver=1.6.2
 pkgrel=1
 pkgdesc="Scientific tools for Python"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('custom')
 url="http://numpy.scipy.org/"
 makedepends=('lapack' 'python' 'python2' 'python-distribute' 'python2-distribute' 'gcc-fortran' 'python-nose')
 source=(http://downloads.sourceforge.net/numpy/numpy-${pkgver}.tar.gz)
-md5sums=('2bce18c08fc4fce461656f0f4dd9103e')
+md5sums=('95ed6c9dcc94af1fc1642ea2a33c1bba')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/python-urwid/PKGBUILD b/extra/python-urwid/PKGBUILD
index 08fec228f..cfb2eb890 100644
--- a/extra/python-urwid/PKGBUILD
+++ b/extra/python-urwid/PKGBUILD
@@ -4,23 +4,23 @@
 # Maintainer: Douglas Soares de Andrade <dsandrade@gmail.com>
 
 pkgname=('python-urwid' 'python2-urwid')
-pkgver=1.0.1
+pkgver=1.0.2
 pkgrel=1
 pkgdesc="Urwid is a curses-based user interface library."
-license=('GPL')
+license=('LGPL')
 arch=('i686' 'x86_64' 'mips64el')
 makedepends=('python2-distribute' 'python-distribute')
 url="http://excess.org/urwid/"
 source=(http://excess.org/urwid/urwid-$pkgver.tar.gz)
-md5sums=('828f7144b94920205e755c249d2e297f')
+md5sums=('00542bbd15fae7ea60b02a7570edee2b')
 
 build() {
   cp -r urwid-$pkgver python2-urwid-$pkgver
 
-  cd $srcdir/urwid-$pkgver
+  cd "$srcdir/urwid-$pkgver"
   python setup.py build
 
-  cd $srcdir/python2-urwid-$pkgver
+  cd "$srcdir/python2-urwid-$pkgver"
   sed -i 's#bin/python#bin/python2#' urwid/*.py
   
   python2 setup.py build
@@ -29,14 +29,14 @@ build() {
 package_python-urwid() {
   depends=('python')
 
-  cd $srcdir/urwid-$pkgver
-  python setup.py install --prefix=/usr --root=$pkgdir --optimize=1
+  cd "$srcdir/urwid-$pkgver"
+  python setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
 }
 
 package_python2-urwid() {
   depends=('python2')
  
-  cd $srcdir/python2-urwid-$pkgver
-  python2 setup.py install --prefix=/usr --root=$pkgdir --optimize=1
+  cd "$srcdir/python2-urwid-$pkgver"
+  python2 setup.py install --prefix=/usr --root="$pkgdir" --optimize=1
 }
 
diff --git a/extra/telepathy-kde-accounts-kcm/PKGBUILD b/extra/telepathy-kde-accounts-kcm/PKGBUILD
index dfcd8d912..9b2dc021f 100644
--- a/extra/telepathy-kde-accounts-kcm/PKGBUILD
+++ b/extra/telepathy-kde-accounts-kcm/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 161459 2012-06-11 18:14:33Z andrea $
+# $Id: PKGBUILD 164200 2012-07-27 14:43:53Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-accounts-kcm
 _pkgname=ktp-accounts-kcm
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=1
 pkgdesc="KCM Module for configuring Telepathy Instant Messaging Accounts"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ groups=('kde-telepathy')
 conflicts=('telepathy-kde-accounts-kcm-plugins')
 replaces=('telepathy-kde-accounts-kcm-plugins')
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('fa48134361f955704700d211fdd3489ca58dc9c5')
+sha1sums=('e549047634dfd6366def2be143b06e01bee8c159')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-kde-approver/PKGBUILD b/extra/telepathy-kde-approver/PKGBUILD
index 0b0c98177..7fcd47904 100644
--- a/extra/telepathy-kde-approver/PKGBUILD
+++ b/extra/telepathy-kde-approver/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 161460 2012-06-11 18:15:04Z andrea $
+# $Id: PKGBUILD 164201 2012-07-27 14:44:27Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-approver
 _pkgname=ktp-approver
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=1
 pkgdesc="KDE Channel Approver for Telepathy"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('telepathy-kde-common-internals' 'telepathy-kde-contact-list')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('d672826fac18817ec115aa0c52831e2c7761cade')
+sha1sums=('04563bda017dacfb8a1e2c8f0e39adb47269fd47')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-kde-auth-handler/PKGBUILD b/extra/telepathy-kde-auth-handler/PKGBUILD
index 31a84d65a..47b2a3cb2 100644
--- a/extra/telepathy-kde-auth-handler/PKGBUILD
+++ b/extra/telepathy-kde-auth-handler/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 161461 2012-06-11 18:15:34Z andrea $
+# $Id: PKGBUILD 164202 2012-07-27 14:45:01Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-auth-handler
 _pkgname=ktp-auth-handler
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=1
 pkgdesc="Provide UI/KWallet Integration For Passwords and SSL Errors on Account Connect"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals' 'qjson')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('a0158322f96a1f0356fdb9f1713af19ac4e45b8e')
+sha1sums=('534ac05deacac0e9fb8a281813d6316b08ce8933')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-kde-call-ui/PKGBUILD b/extra/telepathy-kde-call-ui/PKGBUILD
index a06c1d5a9..b241ad374 100644
--- a/extra/telepathy-kde-call-ui/PKGBUILD
+++ b/extra/telepathy-kde-call-ui/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 161457 2012-06-11 18:11:28Z andrea $
+# $Id: PKGBUILD 164203 2012-07-27 14:45:34Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-call-ui
 _pkgname=ktp-call-ui
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=1
 pkgdesc="Voice/Video Call UI for Telepathy"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals' 'qt-gstreamer')
 makedepends=('cmake' 'automoc4' 'boost')
 groups=('kde-telepathy')
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('be6bcaecde4091cad41520f203c559b614416bc6')
+sha1sums=('e6cadf3bb6820ff015e49801a3b0196827dd9ab3')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-kde-common-internals/PKGBUILD b/extra/telepathy-kde-common-internals/PKGBUILD
index 6d8b20248..4d3afb092 100644
--- a/extra/telepathy-kde-common-internals/PKGBUILD
+++ b/extra/telepathy-kde-common-internals/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 161462 2012-06-11 18:16:00Z andrea $
+# $Id: PKGBUILD 164213 2012-07-27 14:57:48Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-common-internals
 _pkgname=ktp-common-internals
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=1
 pkgdesc="Common components for KDE-Telepathy"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('db3bdbd93a27c77a1e593e84252cf2950ca773e6')
+sha1sums=('9acb65efa371ba4f23063bc83ea7a488ac73e4b7')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-kde-contact-applet/PKGBUILD b/extra/telepathy-kde-contact-applet/PKGBUILD
index 418a56092..d19c04914 100644
--- a/extra/telepathy-kde-contact-applet/PKGBUILD
+++ b/extra/telepathy-kde-contact-applet/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 161463 2012-06-11 18:16:32Z andrea $
+# $Id: PKGBUILD 164204 2012-07-27 14:46:08Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-contact-applet
 _pkgname=ktp-contact-applet
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=1
 pkgdesc="The KDE-Telepathy contact plasmoid"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals' 'kdebase-workspace')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('bffa7ed930519c574d25a59917219fa1735b6a2e')
+sha1sums=('7cb95c4a9dd3a8b5ebe8775f3d846d4d4a31af60')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-kde-contact-list/PKGBUILD b/extra/telepathy-kde-contact-list/PKGBUILD
index 77ec4af2f..2f207c97d 100644
--- a/extra/telepathy-kde-contact-list/PKGBUILD
+++ b/extra/telepathy-kde-contact-list/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 161464 2012-06-11 18:17:00Z andrea $
+# $Id: PKGBUILD 164205 2012-07-27 14:46:38Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-contact-list
 _pkgname=ktp-contact-list
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=1
 pkgdesc="Telepathy contact list application"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('a9f059f434adec33f57e2a77444d704ae8563bc2')
+sha1sums=('d9d062316f9eaff49f2fcad1ba2bbdf59dc8cc07')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-kde-contact-runner/PKGBUILD b/extra/telepathy-kde-contact-runner/PKGBUILD
index 357964a1a..c91123612 100644
--- a/extra/telepathy-kde-contact-runner/PKGBUILD
+++ b/extra/telepathy-kde-contact-runner/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 161458 2012-06-11 18:12:10Z andrea $
+# $Id: PKGBUILD 164206 2012-07-27 14:47:49Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-contact-runner
 _pkgname=ktp-contact-runner
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=1
 pkgdesc="KRunner plugin for KDE Telepathy"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('fe7f7d37740b732f8618b1e6129d4e7f30998b43')
+sha1sums=('388ebb2933114b7e0844bf6a8e71e5b7fdab3680')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-kde-filetransfer-handler/PKGBUILD b/extra/telepathy-kde-filetransfer-handler/PKGBUILD
index 01fad98b2..304b50994 100644
--- a/extra/telepathy-kde-filetransfer-handler/PKGBUILD
+++ b/extra/telepathy-kde-filetransfer-handler/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 161465 2012-06-11 18:17:36Z andrea $
+# $Id: PKGBUILD 164207 2012-07-27 14:49:01Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-filetransfer-handler
 _pkgname=ktp-filetransfer-handler
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=1
 pkgdesc="Telepathy file transfer handler"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('f318849c4e8a171bff97defc19b7a94f2ee13512')
+sha1sums=('bb618e3fc36b321bfe5aaa7a0f8531b4c7fe25c2')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-kde-integration-module/PKGBUILD b/extra/telepathy-kde-integration-module/PKGBUILD
index c75398e04..b7e4eeb6e 100644
--- a/extra/telepathy-kde-integration-module/PKGBUILD
+++ b/extra/telepathy-kde-integration-module/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 161466 2012-06-11 18:18:05Z andrea $
+# $Id: PKGBUILD 164208 2012-07-27 14:50:11Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-integration-module
 _pkgname=ktp-kded-integration-module
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=1
 pkgdesc="Sits in KDED and takes care of various bits of system integration like setting user to auto-away or handling connection errors"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ depends=('telepathy-kde-common-internals')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('552d02b237ac167aef4707fd599dfb69cd944a72')
+sha1sums=('a4bfe983db21ea7d56436d0426138215eb77b279')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-kde-presence-applet/PKGBUILD b/extra/telepathy-kde-presence-applet/PKGBUILD
index 65cfd11d2..5bf965bc6 100644
--- a/extra/telepathy-kde-presence-applet/PKGBUILD
+++ b/extra/telepathy-kde-presence-applet/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 161467 2012-06-11 18:18:34Z andrea $
+# $Id: PKGBUILD 164209 2012-07-27 14:52:00Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-presence-applet
 _pkgname=ktp-presence-applet
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=1
 pkgdesc="Plasma applet for managing your Telepathy account presence"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('telepathy-kde-contact-list')
 makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('beb12d534492da288cdda1826b43ba5bcd549fee')
+sha1sums=('392758b5ced3eea0f315c9dabacc1f3e421a8171')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-kde-send-file/PKGBUILD b/extra/telepathy-kde-send-file/PKGBUILD
index 2cb5721f3..7ee67f097 100644
--- a/extra/telepathy-kde-send-file/PKGBUILD
+++ b/extra/telepathy-kde-send-file/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 161468 2012-06-11 18:19:00Z andrea $
+# $Id: PKGBUILD 164216 2012-07-27 15:10:20Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=telepathy-kde-send-file
 _pkgname=ktp-send-file
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=1
 pkgdesc="A File manager plugin to launch a file transfer job with a specified contact"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ makedepends=('cmake' 'automoc4')
 groups=('kde-telepathy')
 install=${pkgname}.install
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('c72f5a9e26ba24b6558a8dab6d0ec2694aa55afc')
+sha1sums=('23aa731d15dff440da587dec359e7298ec0a0895')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/telepathy-kde-text-ui/PKGBUILD b/extra/telepathy-kde-text-ui/PKGBUILD
index a378f5b4d..f88943991 100644
--- a/extra/telepathy-kde-text-ui/PKGBUILD
+++ b/extra/telepathy-kde-text-ui/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 161470 2012-06-11 18:19:34Z andrea $
+# $Id: PKGBUILD 164212 2012-07-27 14:57:33Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Laurent Carlier <lordheavym@gmail.com>
 
 pkgname=telepathy-kde-text-ui
 _pkgname=ktp-text-ui
-pkgver=0.4.0
+pkgver=0.4.1
 pkgrel=1
 pkgdesc="Telepathy handler for Text Chats"
 arch=('i686' 'x86_64' 'mips64el')
@@ -14,7 +14,7 @@ depends=('telepathy-kde-contact-list' 'telepathy-logger-qt')
 makedepends=('cmake' 'automoc4' 'boost')
 groups=('kde-telepathy')
 source=("http://download.kde.org/unstable/kde-telepathy/${pkgver}/src/${_pkgname}-${pkgver}.tar.bz2")
-sha1sums=('4ddf762b928d7e5f1139cdcced27a866c5369312')
+sha1sums=('8e32e8708d7283714ad6e999caf07388472bba38')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/valgrind/PKGBUILD b/extra/valgrind/PKGBUILD
index bf8d65e97..ad9b7dc46 100644
--- a/extra/valgrind/PKGBUILD
+++ b/extra/valgrind/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 163013 2012-07-05 13:49:57Z allan $
+# $Id: PKGBUILD 164063 2012-07-26 04:17:07Z allan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 pkgname=valgrind
 pkgver=3.7.0
-pkgrel=3
+pkgrel=4
 pkgdesc="A tool to help find memory-management problems in programs"
 arch=('i686' 'x86_64')
 license=('GPL')
@@ -13,14 +13,17 @@ depends=('glibc>=2.16' 'glibc<2.17' 'perl')
 makedepends=('gdb')
 options=('!emptydirs')
 source=(http://valgrind.org/downloads/${pkgname}-${pkgver}.tar.bz2
-        valgrind-3.7.0-glibc-2.16.patch)
+        valgrind-3.7.0-glibc-2.16.patch
+        valgrind-3.7.0-supp.patch)
 md5sums=('a855fda56edf05614f099dca316d1775'
-         '8362c9c10b8d7d08d1be628a717cfba7')
+         '8362c9c10b8d7d08d1be628a717cfba7'
+         '6cf8d3ace0cdc4c7fd69d61ca0692577')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
   
   patch -Np1 -i ${srcdir}/valgrind-3.7.0-glibc-2.16.patch
+  patch -Np1 -i ${srcdir}/valgrind-3.7.0-supp.patch
 
   if [ "${CARCH}" = "x86_64" ]; then
     ./configure --prefix=/usr --mandir=/usr/share/man --enable-only64bit
diff --git a/extra/valgrind/valgrind-3.7.0-supp.patch b/extra/valgrind/valgrind-3.7.0-supp.patch
new file mode 100644
index 000000000..63a71de0e
--- /dev/null
+++ b/extra/valgrind/valgrind-3.7.0-supp.patch
@@ -0,0 +1,253 @@
+--- valgrind-orig/exp-sgcheck.supp	2011-10-27 07:24:45.000000000 +1000
++++ valgrind-new/exp-sgcheck.supp	2012-07-12 21:49:58.290123661 +1000
+@@ -1,8 +1,8 @@
+ {
+    ld-2.X possibly applying relocations
+    exp-sgcheck:SorG
+-   obj:/*lib*/ld-2.*so*
+-   obj:/*lib*/ld-2.*so*
++   obj:*/*lib*/ld-2.*so*
++   obj:*/*lib*/ld-2.*so*
+ }
+ 
+ # I'm pretty sure this is a false positive caused by the sg_ stuff
+--- valgrind-orig/glibc-2.34567-NPTL-helgrind.supp	2011-10-27 07:24:45.000000000 +1000
++++ valgrind-new/glibc-2.34567-NPTL-helgrind.supp	2012-07-12 21:50:03.663270525 +1000
+@@ -27,7 +27,7 @@
+ #{
+ #   helgrind-glibc2X-001
+ #   Helgrind:Race
+-#   obj:/lib*/ld-2.*so*
++#   obj:*/lib*/ld-2.*so*
+ #}
+ 
+ # helgrind-glibc2X-002 was merged into helgrind-glibc2X-001
+@@ -37,13 +37,13 @@
+ {
+    helgrind-glibc2X-004
+    Helgrind:Race
+-   obj:/lib*/libc-2.*so*
++   obj:*/lib*/libc-2.*so*
+ }
+ 
+ {
+    helgrind-glibc2X-005
+    Helgrind:Race
+-   obj:/lib*/libpthread-2.*so*
++   obj:*/lib*/libpthread-2.*so*
+ }
+ 
+ # helgrind-glibc2X-006 was merged into helgrind-glibc2X-005
+@@ -78,14 +78,14 @@
+ {
+    helgrind-glibc2X-101
+    Helgrind:Race
+-   obj:/lib*/libpthread-2.*so*
++   obj:*/lib*/libpthread-2.*so*
+    fun:pthread_*
+ }
+ {
+    helgrind-glibc2X-102
+    Helgrind:Race
+    fun:mythread_wrapper
+-   obj:/lib*/libpthread-2.*so*
++   obj:*/lib*/libpthread-2.*so*
+ }
+ {
+    helgrind-glibc2X-103
+@@ -110,7 +110,7 @@
+ {
+    helgrind-glibc2X-107
+    Helgrind:Race
+-   obj:/lib*/libpthread-2.*so*
++   obj:*/lib*/libpthread-2.*so*
+    fun:sem_*
+ }
+ {
+@@ -126,7 +126,7 @@
+ {
+    helgrind-glibc2X-110
+    Helgrind:Race
+-   obj:/lib*/libc-2.*so*
++   obj:*/lib*/libc-2.*so*
+    fun:pthread_*
+ }
+ {
+--- valgrind-orig/glibc-2.X.supp.in	2011-10-27 07:24:45.000000000 +1000
++++ valgrind-new/glibc-2.X.supp.in	2012-07-12 21:49:57.323490407 +1000
+@@ -39,74 +39,74 @@
+ {
+    dl-hack3-cond-1
+    Memcheck:Cond
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+ }
+ {
+    dl-hack3-cond-2
+    Memcheck:Cond
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:/lib*/libc-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
++   obj:*/lib*/libc-@GLIBC_VERSION@*.so*
+ }
+ {
+    dl-hack3-cond-3
+    Memcheck:Cond
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:/lib*/libc-@GLIBC_VERSION@*.so*
+-   obj:/lib*/libc-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
++   obj:*/lib*/libc-@GLIBC_VERSION@*.so*
++   obj:*/lib*/libc-@GLIBC_VERSION@*.so*
+ }
+ {
+    dl-hack3-cond-4
+    Memcheck:Cond
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:/lib*/libdl-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
++   obj:*/lib*/libdl-@GLIBC_VERSION@*.so*
+ }
+ 
+ {
+    dl-hack4-64bit-addr-1
+    Memcheck:Addr8
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
+ }
+ {
+    dl-hack4-64bit-addr-2
+    Memcheck:Addr8
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:/lib*/libc-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
++   obj:*/lib*/libc-@GLIBC_VERSION@*.so*
+ }
+ {
+    dl-hack4-64bit-addr-3
+    Memcheck:Addr8
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so*
+-   obj:/lib*/libdl-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so*
++   obj:*/lib*/libdl-@GLIBC_VERSION@*.so*
+ }
+ 
+ {
+    dl-hack5-32bit-addr-1
+    Memcheck:Addr4
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so
+ }
+ {
+    dl-hack5-32bit-addr-3
+    Memcheck:Addr4
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so
+-   obj:/lib*/libdl-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so
++   obj:*/lib*/libdl-@GLIBC_VERSION@*.so*
+ }
+ {
+    dl-hack5-32bit-addr-4
+    Memcheck:Addr4
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so
+-   obj:/lib*/libdl-@GLIBC_VERSION@*.so*
+-   obj:/lib*/ld-@GLIBC_VERSION@*.so
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so
++   obj:*/lib*/libdl-@GLIBC_VERSION@*.so*
++   obj:*/lib*/ld-@GLIBC_VERSION@*.so
+ }
+ 
+ 
+@@ -149,9 +149,9 @@
+ {
+    glibc-@GLIBC_VERSION@-on-SUSE-10.3-(x86)
+    Memcheck:Addr4
+-   obj:/lib/ld-@GLIBC_VERSION@*.so
+-   obj:/lib/ld-@GLIBC_VERSION@*.so
+-   obj:/lib/ld-@GLIBC_VERSION@*.so
++   obj:*/lib/ld-@GLIBC_VERSION@*.so
++   obj:*/lib/ld-@GLIBC_VERSION@*.so
++   obj:*/lib/ld-@GLIBC_VERSION@*.so
+ }
+ 
+ {
+@@ -225,7 +225,7 @@
+    MVL-401-linuxthreads-pthread_create
+    Memcheck:Param
+    write(buf)
+-   obj:/lib/libpthread-0.10.so
++   obj:*/lib/libpthread-0.10.so
+    fun:pthread_create
+ }
+ 
+--- valgrind-orig/glibc-2.X-drd.supp	2011-10-27 07:24:45.000000000 +1000
++++ valgrind-new/glibc-2.X-drd.supp	2012-07-12 21:49:57.323490407 +1000
+@@ -6,7 +6,7 @@
+ {
+    drd-ld
+    drd:ConflictingAccess
+-   obj:/lib*/ld-*.so
++   obj:*/lib*/ld-*.so
+ }
+ 
+ #
+@@ -22,13 +22,19 @@
+ {
+    drd-libc-stdio
+    drd:ConflictingAccess
+-   obj:/lib*/libc-*
++   obj:*/lib*/libc-*
+ }
+ {
+    drd-libc-thread-cancellation-test
+    drd:ConflictingAccess
+    fun:write
+ }
++{
++   drd-libc-random
++   drd:ConflictingAccess
++   fun:random_r
++   fun:random
++}
+ 
+ #
+ # Suppression patterns for libstdc++, the implementation of the standard C++
+@@ -128,7 +134,7 @@
+ {
+    drd-libpthread-?
+    drd:ConflictingAccess
+-   obj:/lib/libgcc_s.so.1
++   obj:*/lib/libgcc_s.so.1
+ }
+ {
+    drd-libpthread-nanosleep
+@@ -171,6 +177,7 @@
+ {
+    drd-libxcb-xcb_wait_for_reply
+    drd:CondErr
++   ...
+    fun:pthread_cond_destroy*
+    fun:xcb_wait_for_reply
+ }
diff --git a/extra/vpnc/PKGBUILD b/extra/vpnc/PKGBUILD
index 3f5b56b2c..3cb20ae21 100644
--- a/extra/vpnc/PKGBUILD
+++ b/extra/vpnc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 158810 2012-05-10 18:37:11Z dreisner $
+# $Id: PKGBUILD 164259 2012-07-29 01:13:10Z dreisner $
 # Maintainer: Dave Reisner <dreisner@archlinux.org>
 # Contributor: Thomas Baechler <thomas@archlinux.org>
 
@@ -6,7 +6,7 @@ pkgname=vpnc
 _vpncver=0.5.3
 _git=1b65c39e3cdebb89ce5c75f05d44a0519a67ede6
 pkgver=$_vpncver.svn516
-pkgrel=2
+pkgrel=3
 pkgdesc="VPN client for cisco3000 VPN Concentrators"
 url="http://www.unix-ag.uni-kl.de/~massar/vpnc/"
 license=('GPL')
@@ -44,7 +44,7 @@ build() {
   sed -i 's|^#OPENSSL|OPENSSL|g' Makefile
 
   # fix resolvconf location for community/openresolv
-  sed -i 's|/sbin/resolvconf|/usr&|g' vpnc-script
+  sed -i 's|/sbin/resolvconf|/usr&|g' "$srcdir/vpnc-script"
 
   make
 }
diff --git a/extra/xf86-input-mouse/PKGBUILD b/extra/xf86-input-mouse/PKGBUILD
index 4fd8b64d8..ecac89959 100644
--- a/extra/xf86-input-mouse/PKGBUILD
+++ b/extra/xf86-input-mouse/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 153613 2012-03-16 17:12:24Z andyrtr $
+# $Id: PKGBUILD 164195 2012-07-27 14:22:36Z andyrtr $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-input-mouse
-pkgver=1.7.2
+pkgver=1.8.0
 pkgrel=1
 pkgdesc="X.org mouse input driver"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ conflicts=('xorg-server<1.11.99.902')
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/releases/individual/driver/${pkgname}-${pkgver}.tar.bz2)
-sha1sums=('0da6390c6f3d7d636110a52f08193739929ae4ae')
+sha256sums=('075fdc392e69b7aefae9f032785bb28e74fa45e865d2cfd67cdd6482580e3fdf')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/xf86-video-intel/PKGBUILD b/extra/xf86-video-intel/PKGBUILD
index 342454cfc..caade620d 100644
--- a/extra/xf86-video-intel/PKGBUILD
+++ b/extra/xf86-video-intel/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 164055 2012-07-25 15:11:19Z andyrtr $
+# $Id: PKGBUILD 164223 2012-07-27 19:15:17Z andyrtr $
 # Maintainer: AndyRTR <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=xf86-video-intel
-pkgver=2.20.1
-pkgrel=3
+pkgver=2.20.2
+pkgrel=2
 arch=(i686 x86_64)
 url="http://xorg.freedesktop.org/"
 license=('custom')
@@ -18,17 +18,13 @@ conflicts=('xf86-video-intel-sna' 'xf86-video-intel-uxa' 'xorg-server<1.12.0' 'x
 options=('!libtool')
 groups=('xorg-drivers' 'xorg')
 source=(${url}/archive/individual/driver/${pkgname}-${pkgver}.tar.bz2
-        gmux_backlight.diff
-        sna_backlight_fixes.diff)
-sha256sums=('de340a527dfa26bba6f79b423c2fe2b1d70657e46fa3fb468613c047443ff424'
-            '87383122dae69512f86039e9d72110bd6bf4cf717756a31b34862c200277b31b'
-            'a4a6bc1c4a6b79c80c56764eed8ab318a587ed554d5d9a381cc7238ab884ec04')
+        fix_gen4.diff)
+sha256sums=('4c30cce0b5f7b427d76898c439f2c9fd31a8b45babd8ef82ec4c0004ae0a26a9'
+            '0c5b98e4980c8108aee12b1e46a78c23029034439dcd277f8ae1264ca3fff8a4')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  # https://bugs.freedesktop.org/show_bug.cgi?id=52423
-  patch -Np1 -i ${srcdir}/gmux_backlight.diff
-  patch -Np1 -i ${srcdir}/sna_backlight_fixes.diff
+  patch -Np1 -i ${srcdir}/fix_gen4.diff
   ./configure --prefix=/usr \
     --enable-dri
   make
diff --git a/extra/xf86-video-intel/fix_gen4.diff b/extra/xf86-video-intel/fix_gen4.diff
new file mode 100644
index 000000000..87a2fa8db
--- /dev/null
+++ b/extra/xf86-video-intel/fix_gen4.diff
@@ -0,0 +1,142 @@
+From 73ddd8b0decee444a57f10a11f05deebba686649 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri, 27 Jul 2012 11:43:00 +0000
+Subject: sna/gen4: Further refinement to the GT allocation
+
+Still hunting for why gen4 fails utterly.
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c
+index 25229e1..1a860bd 100644
+--- a/src/sna/gen4_render.c
++++ b/src/sna/gen4_render.c
+@@ -79,8 +79,8 @@
+ #define URB_CS_ENTRY_SIZE     1
+ #define URB_CS_ENTRIES	      0
+ 
+-#define URB_VS_ENTRY_SIZE     1	// each 512-bit row
+-#define URB_VS_ENTRIES	      32	// we needs at least 8 entries
++#define URB_VS_ENTRY_SIZE     1
++#define URB_VS_ENTRIES	      32
+ 
+ #define URB_GS_ENTRY_SIZE     0
+ #define URB_GS_ENTRIES	      0
+@@ -89,25 +89,24 @@
+ #define URB_CLIP_ENTRIES      0
+ 
+ #define URB_SF_ENTRY_SIZE     2
+-#define URB_SF_ENTRIES	      8
++#define URB_SF_ENTRIES	      64
+ 
+ /*
+  * this program computes dA/dx and dA/dy for the texture coordinates along
+  * with the base texture coordinate. It was extracted from the Mesa driver
+  */
+ 
+-#define SF_KERNEL_NUM_GRF  16
+-
+-#define PS_KERNEL_NUM_GRF   32
++#define SF_KERNEL_NUM_GRF 16
++#define PS_KERNEL_NUM_GRF 32
+ 
+ static const struct gt_info {
+ 	uint32_t max_sf_threads;
+ 	uint32_t max_wm_threads;
+ 	uint32_t urb_size;
+ } gen4_gt_info = {
+-	16, 32, 256,
++	24, 32, 256,
+ }, g4x_gt_info = {
+-	32, 50, 384,
++	24, 50, 384,
+ };
+ 
+ static const uint32_t sf_kernel[][4] = {
+@@ -1455,10 +1454,10 @@ gen4_emit_state(struct sna *sna,
+ 		const struct sna_composite_op *op,
+ 		uint16_t wm_binding_table)
+ {
++	gen4_emit_drawing_rectangle(sna, op);
+ 	gen4_emit_binding_table(sna, wm_binding_table);
+ 	gen4_emit_pipelined_pointers(sna, op, op->op, op->u.gen4.wm_kernel);
+ 	gen4_emit_vertex_elements(sna, op);
+-	gen4_emit_drawing_rectangle(sna, op);
+ 
+ 	if (kgem_bo_is_dirty(op->src.bo) || kgem_bo_is_dirty(op->mask.bo)) {
+ 		DBG(("%s: flushing dirty (%d, %d)\n", __FUNCTION__,
+--
+cgit v0.9.0.2-2-gbebe
+From fb385745a2347f8966765567e78229d67ddc8d60 Mon Sep 17 00:00:00 2001
+From: Chris Wilson <chris@chris-wilson.co.uk>
+Date: Fri, 27 Jul 2012 12:24:04 +0000
+Subject: sna/gen4: Move the common vertex_offset==0 check into the flush()
+
+Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
+---
+diff --git a/src/sna/gen4_render.c b/src/sna/gen4_render.c
+index 1a860bd..58d4422 100644
+--- a/src/sna/gen4_render.c
++++ b/src/sna/gen4_render.c
+@@ -338,7 +338,8 @@ static void gen4_magic_ca_pass(struct sna *sna,
+ 
+ static void gen4_vertex_flush(struct sna *sna)
+ {
+-	assert(sna->render_state.gen4.vertex_offset);
++	if (sna->render_state.gen4.vertex_offset == 0)
++		return;
+ 
+ 	DBG(("%s[%x] = %d\n", __FUNCTION__,
+ 	     4*sna->render_state.gen4.vertex_offset,
+@@ -359,8 +360,7 @@ static int gen4_vertex_finish(struct sna *sna)
+ 
+ 	bo = sna->render.vbo;
+ 	if (bo) {
+-		if (sna->render_state.gen4.vertex_offset)
+-			gen4_vertex_flush(sna);
++		gen4_vertex_flush(sna);
+ 
+ 		for (i = 0; i < ARRAY_SIZE(sna->render.vertex_reloc); i++) {
+ 			if (sna->render.vertex_reloc[i]) {
+@@ -1783,8 +1783,7 @@ gen4_render_video(struct sna *sna,
+ 	}
+ 	priv->clear = false;
+ 
+-	if (sna->render_state.gen4.vertex_offset)
+-		gen4_vertex_flush(sna);
++	gen4_vertex_flush(sna);
+ 	return true;
+ }
+ 
+@@ -2693,8 +2692,7 @@ fastcall static void
+ gen4_render_composite_spans_done(struct sna *sna,
+ 				 const struct sna_composite_spans_op *op)
+ {
+-	if (sna->render_state.gen4.vertex_offset)
+-		gen4_vertex_flush(sna);
++	gen4_vertex_flush(sna);
+ 
+ 	DBG(("%s()\n", __FUNCTION__));
+ 
+@@ -3072,8 +3070,7 @@ gen4_render_copy_blt(struct sna *sna,
+ static void
+ gen4_render_copy_done(struct sna *sna, const struct sna_copy_op *op)
+ {
+-	if (sna->render_state.gen4.vertex_offset)
+-		gen4_vertex_flush(sna);
++	gen4_vertex_flush(sna);
+ }
+ 
+ static bool
+@@ -3366,8 +3363,7 @@ gen4_render_fill_op_boxes(struct sna *sna,
+ static void
+ gen4_render_fill_op_done(struct sna *sna, const struct sna_fill_op *op)
+ {
+-	if (sna->render_state.gen4.vertex_offset)
+-		gen4_vertex_flush(sna);
++	gen4_vertex_flush(sna);
+ 	kgem_bo_destroy(&sna->kgem, op->base.src.bo);
+ }
+ 
+--
+cgit v0.9.0.2-2-gbebe
diff --git a/gis/libfreexl/PKGBUILD b/gis/libfreexl/PKGBUILD
new file mode 100644
index 000000000..533071120
--- /dev/null
+++ b/gis/libfreexl/PKGBUILD
@@ -0,0 +1,21 @@
+# Maintainer: Bruno Gola <brunogola at gmail dot com>
+pkgname=libfreexl
+pkgver=1.0.0b
+pkgrel=1
+pkgdesc="Library to extract valid data from within an Excel (.xls) spreadsheet."
+arch=('i686' 'x86_64')
+url="https://www.gaia-gis.it/fossil/freexl/index"
+license=('MPL')
+source=("http://www.gaia-gis.it/gaia-sins/freexl-sources/freexl-1.0.0b.tar.gz")
+md5sums=('e2e1c59eb2883d825782dfe8fe244207')
+
+build() {
+    cd "$srcdir/freexl-$pkgver"
+    ./configure --prefix=/usr
+    make
+}
+
+package() {
+    cd "$srcdir/freexl-$pkgver"
+    make DESTDIR="$pkgdir/" install
+}
diff --git a/gis/libspatialite/PKGBUILD b/gis/libspatialite/PKGBUILD
new file mode 100644
index 000000000..13e2b8335
--- /dev/null
+++ b/gis/libspatialite/PKGBUILD
@@ -0,0 +1,24 @@
+# Maintainer: Brian Galey <bkgaley at gmail dot com>
+# Contributor: Pietro Zambelli <peter.zamb at gmail dot com>
+pkgname=libspatialite
+pkgver=3.0.1
+pkgrel=2
+pkgdesc="SQLite extension to support spatial data types and operations"
+arch=('i686' 'x86_64')
+url="https://www.gaia-gis.it/fossil/libspatialite/index"
+license=('MPL')
+depends=('geos' 'proj' 'sqlite3' 'libfreexl')
+options=('!libtool')
+source=("http://www.gaia-gis.it/gaia-sins/libspatialite-3.0.1.tar.gz")
+md5sums=('450d1a0d9da1bd9f770b7db3f2509f69')
+
+build() {
+    cd "$srcdir/$pkgname-$pkgver"
+    ./configure --prefix=/usr
+    make
+}
+
+package() {
+    cd "$srcdir/$pkgname-$pkgver"
+    make DESTDIR="$pkgdir/" install
+}
diff --git a/gis/qgis/PKGBUILD b/gis/qgis/PKGBUILD
index 7c348fd1e..cb06ed0a6 100644
--- a/gis/qgis/PKGBUILD
+++ b/gis/qgis/PKGBUILD
@@ -5,53 +5,47 @@
 # Contributor: Eric Forgeot < http://esclinux.tk >
 
 pkgname=qgis
-pkgver=1.7.4
-pkgrel=4
+pkgver=1.8.0
+pkgrel=2
 pkgdesc='Quantum GIS is a Geographic Information System (GIS) that supports vector, raster & database formats'
 url='http://qgis.org/'
 license=('GPL')
 arch=('i686' 'x86_64')
 # update to http://www.qgis.org/wiki/Building_QGIS_from_Source#Overview
-depends=('libmysqlclient' 'postgresql-libs' 'sqlite3' 'jasper' 'curl' 'qt' 'python2' 'python2-qt' 'giflib' 'xerces-c' 'cfitsio' 'qwt5' 'gdal' 'flex' 'bison')
-makedepends=('cmake' 'grass' 'gsl' 'postgis' 'netcdf' 'fcgi' 'python2-sip' 'txt2tags')
+depends=('libmysqlclient' 'postgresql-libs' 'sqlite3' 'jasper' 'curl' 'qt' 'python2' 'python2-qt' 'giflib'  'cfitsio' 'qwt' 'gdal' 'flex' 'bison' 'libspatialite' 'spatialindex')
+makedepends=('cmake' 'grass' 'gsl' 'postgis' 'netcdf' 'fcgi' 'python2-sip')
 optdepends=('postgis: postgis support and SPIT plugin'
             'fcgi: qgis mapserver'
             'python2-sip: python-support'
             'grass: grass plugin'
-            'gsl: georeferencer  ')
+            'gsl: georeferencer')
 options=('!makeflags')
 source=("http://qgis.org/downloads/qgis-${pkgver}.tar.bz2"
-        'qgis.desktop'
-        'qgis_1.7.4_gcc4.7.patch')
+        'qgis.desktop')
+
+md5sums=('1d60520f81d7763c026d0af887ac9a05'
+         '8ab66039f2aba519b92f52272ec3c13e')
 
-md5sums=('ad6e2bd8c5eb0c486939c420af5d8c44'
-         '8ab66039f2aba519b92f52272ec3c13e'
-         '0a978eac520b3df8736603074b1072b0')
-         
 build() {
   # Fix insecure RPATH is weird, but just works ;)
   # echo "os.system(\"sed -i '/^LFLAGS/s|-Wl,-rpath,.\+ ||g' gui/Makefile core/Makefile\")" >> python/configure.py.in
   #cd qgis-${pkgver}
-  
-  #apply patch to be able to build qgis with GCC 4.7
-  patch -p0 < ${srcdir}/qgis_1.7.4_gcc4.7.patch
 
   rm -rf build
   mkdir build
   cd build
 
   cmake ../qgis-${pkgver} \
+    -DENABLE_TESTS=OFF \
     -DCMAKE_BUILD_TYPE=Release \
     -DCMAKE_SKIP_RPATH=ON \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DGRASS_PREFIX=/opt/grass \
     -DQGIS_MANUAL_SUBDIR=share/man \
-    -DQWT_INCLUDE_DIR=/usr/include/qwt5 \
-    -DQWT_LIBRARY=/usr/lib/libqwt5.so \
     -DPYTHON_LIBRARY=/usr/lib/libpython2.7.so \
-	-DPYTHON_EXECUTABLE=/usr/bin/python2 \
-	-DPYTHON_SITE_PACKAGES_DIR=/usr/lib/python2.7/site-packages \
-	-DPYTHON_INCLUDE_PATH=/usr/include/python2.7/ 
+    -DPYTHON_EXECUTABLE=/usr/bin/python2 \
+    -DPYTHON_SITE_PACKAGES_DIR=/usr/lib/python2.7/site-packages \
+    -DPYTHON_INCLUDE_PATH=/usr/include/python2.7/
 
   make
 }
diff --git a/gis/spatialindex/PKGBUILD b/gis/spatialindex/PKGBUILD
new file mode 100644
index 000000000..e0787808e
--- /dev/null
+++ b/gis/spatialindex/PKGBUILD
@@ -0,0 +1,31 @@
+# Maintainer: Lantald  <lantald at Gmx dot com>
+pkgname=spatialindex
+pkgver=1.7.1
+pkgrel=1
+pkgdesc="An extensible framework that supports robust spatial indexing methods and sophisticated spatial queries."
+arch=('i686' 'x86_64')
+url="http://libspatialindex.github.com/"
+license=('(L)GPL')
+depends=(gcc-libs)
+provides=(spatialindex)
+conflicts=(libspatialindex-git)
+source=(http://download.osgeo.org/libspatialindex/$pkgname-src-$pkgver.tar.gz)
+md5sums=('8599243d5d8204f0f8d92cd55ab120f5')
+
+build() {
+  cd "$srcdir/$pkgname-src-$pkgver/"
+  ./configure --prefix=/usr
+  make
+}
+
+check() {
+  cd "$srcdir/$pkgname-src-$pkgver/"
+  make -k check
+}
+
+package() {
+  cd "$srcdir/$pkgname-src-$pkgver/"
+  make DESTDIR="$pkgdir/" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/libre/filesystem/PKGBUILD b/libre/filesystem/PKGBUILD
index 215001c4e..add2fa659 100644
--- a/libre/filesystem/PKGBUILD
+++ b/libre/filesystem/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 162111 2012-06-20 09:33:31Z tomegun $
+# $Id: PKGBUILD 163827 2012-07-20 23:47:38Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Maintainer (Parabola): Nicolás Reynolds <fauno@kiwwwi.com.ar>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
 pkgname=filesystem
-pkgver=2012.6
-pkgrel=4
+pkgver=2012.7
+pkgrel=1
 pkgdesc='Base filesystem for Parabola'
 arch=('any')
 license=('GPL')
@@ -87,7 +87,7 @@ md5sums=('45940618da782cc391c59f88ab3333c3'
          '8a9042a2cedf6b6b47eb8973f14289cb'
          'b8355d9d2782f424f4cedcf682651be0'
          'ca716f853860199c1286e7939b2f2666'
-         'e5d8323a4dbee7a6d0d2a19cbf4b819f'
+         '1745349eb24ed21b4cfaa6f423bddb76'
          '7bc65f234dfb6abf24e7c3b03e86f4ff'
          'd41d8cd98f00b204e9800998ecf8427e'
          '0e145e18fea8fd190b30d45764f5707c'
diff --git a/libre/filesystem/crypttab b/libre/filesystem/crypttab
index dd6994b5a..195945a74 100644
--- a/libre/filesystem/crypttab
+++ b/libre/filesystem/crypttab
@@ -1,33 +1,17 @@
-# crypttab: Mappings for encrypted partitions
+# crypttab: mappings for encrypted partitions
 #
 # Each mapped device will be created in /dev/mapper, so your /etc/fstab
-# should use the /dev/mapper/{NAME} paths for encrypted devices.
+# should use the /dev/mapper/<name> paths for encrypted devices.
 #
-# Each PASSWORD field can be an absolute pathname to a key file (starting
-# with a slash, recommended) or a literal string that will be used as
-# a passphrase. To use special characters in the passphrase, surround it
-# by quotes, the usual bash quoting rules apply.
-# There are two special keywords that cannot be used as passphrases:
-#   - ASK  ask for a passphrase on boot
-#   - SWAP use a random key and create a swapspace afterwards
-# WARNING: use the SWAP keyword carefully, as it overwrites the data
-#          on the specified partition
-# 
-# To create a key file:
-#    hashalot -n 32 ripemd160 >/etc/crytfs.key
-# or
-#    dd if=/dev/urandom of=/etc/cryptfs.key bs=256 count=1
-#
-# To pass additional options to cryptsetup for non-LUKS partitions, use the
-# fourth column.
+# The Arch specific syntax has been deprecated, see crypttab(5) for the
+# new supported syntax.
 #
 # NOTE: Do not list your root (/) partition here, it must be set up
 #       beforehand by the initramfs (/etc/mkinitcpio.conf).
 
-
-# NAME		SOURCE DEVICE		PASSWORD		OPTIONS
-#home		/dev/hda4		mypassword
-#data1		/dev/hda3		"my \"password\""
-#data2		/dev/hda5		/etc/cryptfs.key
-#swap		/dev/hdx4		SWAP			-c aes-cbc-essiv:sha256 -s 256
-#vol		/dev/hdb7		ASK
+# <name>       <device>         <password>              <options>
+# home         /dev/hda4        /etc/mypassword1
+# data1        /dev/hda3        /etc/mypassword2
+# data2        /dev/hda5        /etc/cryptfs.key
+# swap         /dev/hdx4        /dev/urandom            swap,cipher=aes-cbc-essiv:sha256,size=256
+# vol          /dev/hdb7        none
diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD
index cc509fdd3..a209713b3 100644
--- a/libre/initscripts/PKGBUILD
+++ b/libre/initscripts/PKGBUILD
@@ -1,39 +1,30 @@
-# $Id: PKGBUILD 160065 2012-05-29 18:46:25Z tomegun $
+# $Id: PKGBUILD 164178 2012-07-26 23:40:45Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Thomas Bächler <thomas@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 # Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
 
 pkgname=initscripts
-pkgver=2012.07.14
+pkgver=2012.07.29
 pkgrel=1
 pkgdesc="System initialization/bootup scripts (Parabola branding)"
 arch=('any')
 url="https://parabolagnulinux.org"
 license=('GPL2')
 groups=('base')
-backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown etc/conf.d/wireless)
+backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown)
 depends=('glibc' 'bash' 'coreutils' 'systemd-tools' 'iproute2' 'ncurses' 'findutils' 'sysvinit')
-optdepends=('bridge-utils: Network bridging support'
-            'dhcpcd: DHCP network configuration'
-            'net-tools: legacy network support'
-            'wireless_tools: Wireless networking')
+optdepends=('dhcpcd: DHCP network configuration'
+            'bridge-utils: Legacy network bridging support'
+            'net-tools: Legacy network support'
+            'wireless_tools: Legacy wireless networking')
 makedepends=(asciidoc)
 install=initscripts.install
-source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz"
-        0001-remove-run-nologin-before-leaving-rc.multi.patch
-        'wireless.conf.d')
-
-build() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-#  patch -Np1 <"$srcdir/0001-remove-run-nologin-before-leaving-rc.multi.patch"
-}
+source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz"{,.sig})
 
 package() {
   cd ${srcdir}/${pkgname}-${pkgver}
   make DESTDIR=${pkgdir} install
-  install -D -m644 ${srcdir}/wireless.conf.d ${pkgdir}/etc/conf.d/wireless
 }
-md5sums=('15e2f373be03b25b0033fd4fb4820d30'
-         'ba32b9d723c20b38487669fb3c00d3d5'
-         '027576534885b8d5dded9be546057b12')
+md5sums=('0fc663f1ad8e7512f5907d498e09be21'
+         '372f08fcb40e31c0e88a9715354e3b19')
diff --git a/libre/luxrays-libre/PKGBUILD b/libre/luxrays-libre/PKGBUILD
index 3a5654396..c8ea75082 100644
--- a/libre/luxrays-libre/PKGBUILD
+++ b/libre/luxrays-libre/PKGBUILD
@@ -5,7 +5,7 @@ _pkgname=luxrays
 pkgname=luxrays-libre
 pkgver=1.0rc2
 _pkgver=8707be9e6dc9
-pkgrel=1
+pkgrel=2
 epoch=0
 pkgdesc="Accelerate the ray intersection process by using CPUs (without OpenCL)"
 arch=('i686' 'x86_64' 'mips64el')
diff --git a/libre/luxrender-libre/PKGBUILD b/libre/luxrender-libre/PKGBUILD
index 1430ae826..122a87207 100644
--- a/libre/luxrender-libre/PKGBUILD
+++ b/libre/luxrender-libre/PKGBUILD
@@ -6,7 +6,7 @@
 pkgname=luxrender-libre
 pkgver=1.0rc2
 _pkgver=008805644181
-pkgrel=2
+pkgrel=3
 pkgdesc="Rendering system for physically correct, unbiased image synthesis (without OpenCL)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.luxrender.net/"
diff --git a/pcr/ryzom-client/PKGBUILD b/pcr/ryzom-client/PKGBUILD
index 371137029..74d999d29 100644
--- a/pcr/ryzom-client/PKGBUILD
+++ b/pcr/ryzom-client/PKGBUILD
@@ -1,7 +1,7 @@
 # Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
 pkgname=('ryzom-client')
 pkgver=0.8.0
-pkgrel=1
+pkgrel=6
 arch=('x86_64' 'i686')
 url="http://www.ryzom.com"
 license=('AGPL3')
@@ -9,13 +9,13 @@ pkgdesc="An awesome free software 3D MMORPG game"
 depends=('ryzom-data' 'ryzom-nel' 'luabind')
 conflicts=('ryzom-client')
 groups=('ryzom')
-options=(!strip)
-makedepends=('kervala_libsquish-hg' 'cmake' 'bison'  
+
+makedepends=('kervalasquish-hg' 'cmake' 'bison'  
              'lua' 'luabind' 'curl' 'libpng' 'libwww'
              'boost' 'ryzom-nel')
 
 auser="shackra"
-achangeset="1af2b43d7297"
+achangeset="56d1642e24ac"
 
 source=("https://bitbucket.org/$auser/ryzom/get/$achangeset.tar.gz")
 
@@ -39,4 +39,4 @@ package() {
   make DESTDIR="$pkgdir" install
 }
 
-sha256sums=('1e2c3f9675b5193029945bb7e4941b3ff82e3c5a03cd32cb8049c8f79348099d')
+sha256sums=('0abcf7daa01dab27a3b9a9276e521369693963be3a25624b3195023495212bc2')
+\ No newline at end of file
diff --git a/pcr/ryzom-nel/PKGBUILD b/pcr/ryzom-nel/PKGBUILD
index 001e00dd2..f7dd7c580 100644
--- a/pcr/ryzom-nel/PKGBUILD
+++ b/pcr/ryzom-nel/PKGBUILD
@@ -1,11 +1,11 @@
 # Maintainer: Jorge Araya Navarro <jorgean@lavabit.com>
 pkgname='ryzom-nel'
 pkgver=0.8.0
-pkgrel=8
+pkgrel=10
 arch=('x86_64' 'i686')
 conflicts=('ryzom-nel')
 groups=('ryzom')
-options=(!strip)
+
 pkgdesc="An awesome free software 3D MMORPG game, NeL engine"
 url="http://www.ryzom.com"
 license=('AGPL3')
@@ -23,7 +23,7 @@ depends=('freetype2'
 makedepends=('cmake' 'bison' 'kervalasquish-hg')
 
 auser="shackra"
-achangeset="1af2b43d7297"
+achangeset="56d1642e24ac"
 
 source=("https://bitbucket.org/$auser/ryzom/get/$achangeset.tar.gz")
 
@@ -40,7 +40,7 @@ build() {
   cd $pkgname
 
   #CMAKE_USE_RELATIVE_PATHS=true
-  cmake .. -Wno-dev -DWITH_LIBWWW_STATIC=ON -DWITH_RYZOM=OFF -DWITH_RYZOM_TOOLS=OFF -DWITH_NEL_TESTS=OFF -DWITH_NEL=ON -DCMAKE_INSTALL_PREFIX=/usr -DNL_ETC_PREFIX=/etc/nel -DNL_DRIVER_PREFIX=/usr/lib/nel -DNL_SHARE_PREFIX=/usr/share/nel -DNL_BIN_PREFIX=/usr/bin -DNL_SBIN_PREFIX=/usr/sbin -DNL_LIB_PREFIX=/usr/lib/nel -DNL_DRIVER_PREFIX=/usr/lib/nel -DWITH_SYMBOLS=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON
+  cmake .. -Wno-dev -DWITH_RYZOM=OFF -DWITH_NEL_TESTS=OFF -DWITH_NEL=ON -DCMAKE_INSTALL_PREFIX=/usr -DNL_ETC_PREFIX=/etc/nel -DNL_DRIVER_PREFIX=/usr/lib/nel -DNL_SHARE_PREFIX=/usr/share/nel -DNL_BIN_PREFIX=/usr/bin -DNL_SBIN_PREFIX=/usr/sbin -DNL_LIB_PREFIX=/usr/lib/nel -DNL_DRIVER_PREFIX=/usr/lib/nel -DWITH_SYMBOLS=ON -DWITH_DRIVER_OPENGL=ON -DWITH_DRIVER_OPENAL=ON
 
   make -j3
 }
@@ -49,3 +49,5 @@ package() {
   cd "$srcdir/$auser-ryzom-$achangeset/code/$pkgname"
   make DESTDIR="$pkgdir" install
 }
+
+sha256sums=('0abcf7daa01dab27a3b9a9276e521369693963be3a25624b3195023495212bc2')
diff --git a/staging/libimobiledevice/PKGBUILD b/staging/libimobiledevice/PKGBUILD
deleted file mode 100644
index 46ae8c1e2..000000000
--- a/staging/libimobiledevice/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 163816 2012-07-20 15:09:08Z tomegun $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Gabriel Martinez < reitaka at gmail dot com >
-
-pkgname=libimobiledevice
-pkgver=1.1.4
-pkgrel=1
-pkgdesc="Is a software library that talks the protocols to support iPhone and iPod Touch devices on Linux"
-url="http://libimobiledevice.org/"
-arch=('i686' 'x86_64')
-license=('GPL2' 'LGPL2.1')
-depends=('usbmuxd' 'gnutls' 'libgcrypt')
-options=('!libtool')
-source=(http://libimobiledevice.org/downloads/$pkgname-$pkgver.tar.bz2)
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$pkgname-$pkgver"
-  make DESTDIR="$pkgdir" install
-}
-md5sums=('3f28cbc6a2e30d34685049c0abde5183')
diff --git a/staging/libimobiledevice/swig-version-check.patch b/staging/libimobiledevice/swig-version-check.patch
deleted file mode 100644
index c56b095db..000000000
--- a/staging/libimobiledevice/swig-version-check.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -Nur libimobiledevice-1.0.3.old/configure libimobiledevice-1.0.3/configure
---- libimobiledevice-1.0.3.old/configure	2010-10-04 07:38:37.000000000 -0700
-+++ libimobiledevice-1.0.3/configure	2010-10-08 05:43:05.466686656 -0700
-@@ -3477,9 +3477,7 @@
-                         if test -z "$available_patch" ; then
-                                 available_patch=0
-                         fi
--                        if test $available_major -ne $required_major \
--                                -o $available_minor -ne $required_minor \
--                                -o $available_patch -lt $required_patch ; then
-+                        if test $available_major -lt $required_major ; then
-                                 { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: SWIG version >= 1.3.21 is required.  You have $swig_version.  You should look at http://www.swig.org" >&5
- $as_echo "$as_me: WARNING: SWIG version >= 1.3.21 is required.  You have $swig_version.  You should look at http://www.swig.org" >&2;}
-                                 SWIG=false
diff --git a/staging/pork/PKGBUILD b/staging/pork/PKGBUILD
deleted file mode 100644
index f927a6f45..000000000
--- a/staging/pork/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# $Id: PKGBUILD 71194 2012-05-24 17:29:40Z jlichtblau $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: William Rea <sillywilly@gmail.com>
-
-pkgname=pork
-pkgver=0.99.8.1
-pkgrel=6
-pkgdesc="Console-based AOL Instant Messenger & IRC client"
-arch=('i686' 'x86_64')
-url="http://dev.ojnk.net/"
-license=('GPL')
-depends=('ncurses' 'perl')
-source=(http://downloads.sourceforge.net/sourceforge/ojnk/$pkgname-$pkgver.tar.gz)
-sha256sums=('f0d4cad21017fd75b3c200342c54dd56d9ff7bc38d1e9b3c8ba686ba53d585ed')
-
-build() {
-  cd $pkgname-$pkgver
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd $pkgname-$pkgver
-
-  make DESTDIR=${pkgdir} install
-}
diff --git a/staging/tellico/PKGBUILD b/staging/tellico/PKGBUILD
deleted file mode 100644
index c0945ceb4..000000000
--- a/staging/tellico/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 70650 2012-05-13 20:07:17Z jlichtblau $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
-# Contributor: Maintainer: Ray Rashif <schiv@archlinux.org
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Douglas Soares de Andrade <dsa@aur.archlinux.org>
-
-pkgname=tellico
-pkgver=2.3.5
-pkgrel=2
-pkgdesc="A collection manager for KDE"
-arch=('i686' 'x86_64')
-url="http://tellico-project.org/"
-license=('GPL')
-depends=('kdebase-workspace' 'yaz' 'exempi' 'libksane' 'taglib' 'kdemultimedia-kioslave' 'poppler-qt' 'qjson')
-makedepends=('automoc4' 'cmake')
-install=$pkgname.install
-source=(http://tellico-project.org/files/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('b31db35589cae7f9af56a17e6589f8c5de68e36d9fc5fbaea4154e8238bf041c')
-
-build() {
-  cd ${srcdir}
-
-  mkdir build
-  cd build
-  cmake ../${pkgname}-${pkgver} \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_INSTALL_PREFIX=/usr
-  make
-}
-
-package() {
-  cd ${srcdir}/build
-
-  make DESTDIR=${pkgdir} install
-
-# fix python 2.7 path
-  find ${pkgdir} -iname "*.py" | xargs sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|'
-}
diff --git a/staging/tellico/tellico.install b/staging/tellico/tellico.install
deleted file mode 100644
index 3b3aff7d9..000000000
--- a/staging/tellico/tellico.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-  update-mime-database usr/share/mime &> /dev/null
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
diff --git a/staging/usbmuxd/85-usbmuxd.rules b/staging/usbmuxd/85-usbmuxd.rules
deleted file mode 100644
index ec9f72501..000000000
--- a/staging/usbmuxd/85-usbmuxd.rules
+++ /dev/null
@@ -1,9 +0,0 @@
-# usbmuxd ("Apple Mobile Device" muxer listening on /var/run/usbmuxd)
-
-# Forces iDevices to the last USB configuration and runs usbmuxd
-TEST=="/sys/fs/cgroup/systemd", ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", OWNER="usbmux", TAG+="systemd", ENV{SYSTEMD_WANTS}="usbmuxd.service", GOTO="usbmuxd_systemd_end"
-ACTION=="add", SUBSYSTEM=="usb", ATTR{idVendor}=="05ac", ATTR{idProduct}=="12[9a][0-9a-f]", ENV{USBMUX_SUPPORTED}="1", ATTR{bConfigurationValue}!="$attr{bNumConfigurations}", ATTR{bConfigurationValue}="$attr{bNumConfigurations}", OWNER="usbmux", RUN+="/usr/sbin/usbmuxd -u -U usbmux"
-LABEL="usbmuxd_systemd_end"
-
-# Exit usbmuxd when the last device is removed
-ACTION=="remove", SUBSYSTEM=="usb", ENV{PRODUCT}=="5ac/12[9a][0-9a-f]/*", ENV{INTERFACE}=="255/*", RUN+="/usr/sbin/usbmuxd -x"
diff --git a/staging/usbmuxd/PKGBUILD b/staging/usbmuxd/PKGBUILD
deleted file mode 100644
index 0b8e9b84b..000000000
--- a/staging/usbmuxd/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 163814 2012-07-20 13:59:21Z tomegun $
-# Maintainer : Ionut Biru <ibiru@archlinux.org>
-# Contributor: Gabriel Martinez < reitaka at gmail dot com >
-
-pkgname=usbmuxd
-pkgver=1.0.8
-pkgrel=1
-pkgdesc="USB Multiplex Daemon"
-url="http://marcansoft.com/blog/iphonelinux/usbmuxd/"
-arch=('i686' 'x86_64')
-license=('GPL2' 'GPL3' 'LGPL2.1')
-depends=('libusb' 'libplist')
-makedepends=('cmake')
-install=usbmuxd.install
-source=("http://cgit.sukimashita.com/${pkgname}.git/snapshot/${pkgname}-${pkgver}.tar.bz2"
-	'usbmuxd.service'
-	'85-usbmuxd.rules')
-
-build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  echo "${pkgver}" > version.tag
-  mkdir build
-  cd build
-  cmake ../ -DCMAKE_INSTALL_PREFIX:PATH=/usr -DLIB_SUFFIX=""
-  make
-}
-
-package() {
-  cd "${srcdir}/${pkgname}-${pkgver}/build"
-  make DESTDIR="${pkgdir}" install
-
-  # fix udev dir being hardcoded
-  mv "${pkgdir}/lib/udev" "${pkgdir}/usr/lib/"
-  rmdir "${pkgdir}/lib"
-  # install systemd service file
-  install -D -m644 ${srcdir}/usbmuxd.service ${pkgdir}/usr/lib/systemd/system/usbmuxd.service
-  # use udev rule that works with systemd
-  install -m644 ${srcdir}/85-usbmuxd.rules ${pkgdir}/usr/lib/udev/rules.d/
-}
-md5sums=('87fd27773a84e97ac6e2dc28b08d682e'
-         'dae0660f972510a6483992b5b81e1b5a'
-         'dc4b2893651149eccbf7b2c8467cd288')
diff --git a/staging/usbmuxd/usbmuxd.install b/staging/usbmuxd/usbmuxd.install
deleted file mode 100644
index 1a4859674..000000000
--- a/staging/usbmuxd/usbmuxd.install
+++ /dev/null
@@ -1,19 +0,0 @@
-post_install() {
-    groupadd -g 140 usbmux &>/dev/null
-    useradd -c 'usbmux user' -u 140 -g usbmux -d / -s /sbin/nologin usbmux &>/dev/null
-    passwd -l usbmux &>/dev/null
-}
-
-post_upgrade() {
-    getent group usbmux >/dev/null 2>&1 || groupadd -g 140 usbmux &>/dev/null
-    getent passwd usbmux >/dev/null 2>&1 || useradd -c 'usbmux user' -u 140 -g usbmux -d / -s /sbin/nologin usbmux &>/dev/null
-}
-
-post_remove() {
-    if getent passwd usbmux >/dev/null 2>&1; then
-        userdel usbmux
-    fi
-    if getent group usbmux >/dev/null 2>&1; then
-        groupdel usbmux
-    fi
-}
diff --git a/staging/usbmuxd/usbmuxd.service b/staging/usbmuxd/usbmuxd.service
deleted file mode 100644
index fbebf65b9..000000000
--- a/staging/usbmuxd/usbmuxd.service
+++ /dev/null
@@ -1,5 +0,0 @@
-[Unit]
-Description=iOS USB Muxer
-
-[Service]
-ExecStart=/usr/sbin/usbmuxd -u -f -U usbmux
diff --git a/testing/btrfs-progs/PKGBUILD b/testing/btrfs-progs/PKGBUILD
deleted file mode 100644
index e7252b7ec..000000000
--- a/testing/btrfs-progs/PKGBUILD
+++ /dev/null
@@ -1,46 +0,0 @@
-# $Id: PKGBUILD 164015 2012-07-24 01:22:05Z dreisner $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-pkgname=btrfs-progs
-pkgver=0.19.20120328
-pkgrel=4
-pkgdesc="btrfs filesystem utilities"
-arch=(i686 x86_64)
-depends=('glibc' 'e2fsprogs')
-url="http://btrfs.wiki.kernel.org/"
-replaces=('btrfs-progs-unstable')
-conflicts=('btrfs-progs-unstable')
-provides=('btrfs-progs-unstable')
-license=('GPL2')
-source=(ftp://ftp.archlinux.org/other/$pkgname/$pkgname-$pkgver.tar.xz
-        70-btrfs.rules
-        initcpio-install-btrfs
-        initcpio-hook-btrfs)
-md5sums=('f4504e73cf9254779b78d5b2318ac570'
-         '345c62c8b267082361729ca5b647518f'
-         'e5186ec3fe8a809b7473470128d1c4ab'
-         '9fb35142755b477a96cb7292f3d64839')
-
-build() {
-   cd $srcdir/$pkgname-$pkgver
-   make CFLAGS="$CFLAGS"
-}
-
-package() {
-   cd $srcdir/$pkgname-$pkgver
-   make prefix=$pkgdir/usr install
-   # fix manpage
-   mkdir -p $pkgdir/usr/share/
-   mv $pkgdir/usr/man $pkgdir/usr/share/man
-   mkdir -p ${pkgdir}/sbin
-   ln -sf /usr/bin/btrfs ${pkgdir}/sbin/btrfs
-
-   # add udev rule
-   install -Dm644 "$srcdir/70-btrfs.rules" "$pkgdir/usr/lib/udev/rules.d/70-btrfs.rules"
-
-   # install mkinitcpio hooks
-   install -Dm644 "$srcdir/initcpio-install-btrfs" \
-     "$pkgdir/usr/lib/initcpio/install/btrfs"
-   install -Dm644 "$srcdir/initcpio-hook-btrfs" \
-     "$pkgdir/usr/lib/initcpio/hooks/btrfs"
-}
diff --git a/testing/btrfs-progs/initcpio-hook-btrfs b/testing/btrfs-progs/initcpio-hook-btrfs
deleted file mode 100644
index 913cec528..000000000
--- a/testing/btrfs-progs/initcpio-hook-btrfs
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/ash
-
-run_hook() {
-    # if udevd is running, this is done async by add/change events
-    if [ "$udevd_running" -ne 1 ]; then
-        btrfs device scan
-    fi
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/testing/btrfs-progs/initcpio-install-btrfs b/testing/btrfs-progs/initcpio-install-btrfs
deleted file mode 100644
index aad263378..000000000
--- a/testing/btrfs-progs/initcpio-install-btrfs
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_module btrfs
-    add_binary btrfs
-    add_runscript
-
-    add_file /usr/lib/udev/rules.d/70-btrfs.rules
-}
-
-help() {
-    cat <<HELPEOF
-This hook provides support for multi-device btrfs volumes.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/testing/ddrescue/PKGBUILD b/testing/ddrescue/PKGBUILD
deleted file mode 100644
index 13824ccab..000000000
--- a/testing/ddrescue/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 163956 2012-07-22 18:33:26Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Pierre Schmitz <pierre@archlinux.de>
-# Contributor: Paul Mattal <paul@archlinux.org>
-
-pkgname=ddrescue
-pkgver=1.16
-pkgrel=2
-pkgdesc="GNU data recovery tool"
-arch=('i686' 'x86_64')
-url="http://www.gnu.org/software/ddrescue/ddrescue.html"
-license=('GPL3')
-depends=('gcc-libs')
-install=$pkgname.install
-source=("http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz"
-        "http://ftp.gnu.org/gnu/$pkgname/$pkgname-$pkgver.tar.gz.sig")
-md5sums=('57b67407e882c6418531d48a2f20d16b'
-         'bf072280587665d82829be15eb6fc9ad')
-
-build() {
-  cd "$srcdir"/$pkgname-$pkgver
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir"/$pkgname-$pkgver
-  make DESTDIR="$pkgdir" install install-man
-  rm "$pkgdir"/usr/share/info/dir
-}
diff --git a/testing/ddrescue/ddrescue.install b/testing/ddrescue/ddrescue.install
deleted file mode 100644
index 9e2afa74e..000000000
--- a/testing/ddrescue/ddrescue.install
+++ /dev/null
@@ -1,22 +0,0 @@
-infodir=/usr/share/info
-filelist=(ddrescue.info)
-
-post_install() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-pre_remove() {
-  [ -x usr/bin/install-info ] || return 0
-  for file in ${filelist[@]}; do
-    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
-  done
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/iptables/0503-extension_cppflags.patch b/testing/iptables/0503-extension_cppflags.patch
deleted file mode 100644
index 0eb645731..000000000
--- a/testing/iptables/0503-extension_cppflags.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: b/extensions/GNUmakefile.in
-===================================================================
---- a/extensions/GNUmakefile.in	2012-03-27 12:14:05.000000000 -0400
-+++ b/extensions/GNUmakefile.in	2012-03-27 16:03:48.378790221 -0400
-@@ -21,7 +21,7 @@
- kinclude_CPPFLAGS  = @kinclude_CPPFLAGS@
- 
- AM_CFLAGS       = ${regular_CFLAGS}
--AM_CPPFLAGS     = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS}
-+AM_CPPFLAGS     = ${CPPFLAGS} ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_builddir} -I${top_srcdir}/include ${kinclude_CPPFLAGS}
- AM_DEPFLAGS     = -Wp,-MMD,$(@D)/.$(@F).d,-MT,$@
- AM_LDFLAGS      = @noundef_LDFLAGS@
- 
diff --git a/testing/iptables/ip6tables.service b/testing/iptables/ip6tables.service
deleted file mode 100644
index 9a695f31e..000000000
--- a/testing/iptables/ip6tables.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=IPv6 Packet Filtering Framework
-
-[Service]
-Type=oneshot
-ExecStart=/usr/sbin/ip6tables-restore /etc/iptables/ip6tables.rules
-ExecStop=/usr/lib/systemd/scripts/iptables-flush 6
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/iptables/iptables-flush b/testing/iptables/iptables-flush
deleted file mode 100755
index e6fafe950..000000000
--- a/testing/iptables/iptables-flush
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-#
-# Usage: iptables-flush [6]
-#
-
-iptables=ip$1tables
-if ! type -p "$iptables"; then
-  echo "error: invalid argument"
-  exit 1
-fi
-
-while read -r table; do
-  tables+=("/var/lib/$iptables/empty-$table.rules")
-done <"/proc/net/ip$1_tables_names"
-
-if (( ${#tables[*]} )); then
-  cat "${tables[@]}" | "$iptables-restore"
-fi
diff --git a/testing/iptables/iptables.service b/testing/iptables/iptables.service
deleted file mode 100644
index 3084f53b7..000000000
--- a/testing/iptables/iptables.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=Packet Filtering Framework
-
-[Service]
-Type=oneshot
-ExecStart=/usr/sbin/iptables-restore /etc/iptables/iptables.rules
-ExecStop=/usr/lib/systemd/scripts/iptables-flush
-RemainAfterExit=yes
-
-[Install]
-WantedBy=multi-user.target
diff --git a/testing/libwacom/PKGBUILD b/testing/libwacom/PKGBUILD
deleted file mode 100644
index 5080168da..000000000
--- a/testing/libwacom/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 164040 2012-07-24 23:12:01Z eric $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-
-pkgname=libwacom
-pkgver=0.6
-pkgrel=1
-pkgdesc="Library to identify Wacom tablets and their features"
-arch=('x86_64' 'i686')
-url="http://sourceforge.net/apps/mediawiki/linuxwacom/index.php?title=Libwacom"
-license=('MIT')
-depends=('glib2' 'systemd-tools')
-options=('!libtool')
-source=(http://sourceforge.net/projects/linuxwacom/files/libwacom/$pkgname-$pkgver.tar.bz2)
-sha256sums=('7115690698edc87deec482f0b2526567b858475d2135b5f8ccc946e5e76ec01d')
-
-build() {
-  cd $pkgname-$pkgver
-  ./configure --prefix=/usr --disable-static
-  make
-}
-
-check() {
-  cd $pkgname-$pkgver
-  make check
-}
-
-package() {
-  cd $pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-  install -D -m644 COPYING "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-}
diff --git a/testing/qjackctl/PKGBUILD b/testing/qjackctl/PKGBUILD
deleted file mode 100644
index 0884a6587..000000000
--- a/testing/qjackctl/PKGBUILD
+++ /dev/null
@@ -1,31 +0,0 @@
-# $Id: PKGBUILD 163957 2012-07-22 18:36:11Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Tobias Kieslich <tobias@archlinux.org>
-
-pkgname=qjackctl
-pkgver=0.3.9
-pkgrel=2
-pkgdesc="A Qt front-end for the JACK low-latency audio server"
-url="http://qjackctl.sourceforge.net/"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('jack' 'qt')
-options=('!makeflags')
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.gz")
-md5sums=('f932c916f43ba3251d3a9ed62a448e43')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  ./configure --prefix=/usr
-
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/rosegarden/PKGBUILD b/testing/rosegarden/PKGBUILD
deleted file mode 100644
index 3fefe02e1..000000000
--- a/testing/rosegarden/PKGBUILD
+++ /dev/null
@@ -1,43 +0,0 @@
-# $Id: PKGBUILD 163958 2012-07-22 18:37:45Z schiv $
-# Maintainer: Ray Rashif <schiv@archlinux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-# Contributor: damir <damir@archlinux.org>
-# Contributor: Robert Emil Berge <robert@rebi.no>
-
-pkgname=rosegarden
-pkgver=12.04
-pkgrel=2
-pkgdesc="MIDI/audio sequencer and notation editor"
-arch=('i686' 'x86_64')
-url="http://www.rosegardenmusic.com/"
-license=('GPL')
-depends=('liblrdf' 'dssi' 'fftw' 'lirc-utils'
-         'perl' 'qt' 'shared-mime-info')
-makedepends=('imake')
-optdepends=('lilypond: notation display'
-            'cups: printing support'
-            'okular: print preview, or any other PDF viewer'
-            'timidity++: MIDI playback, or any other softsynth'
-            'flac'
-            'wavpack')
-[ "$CARCH" = "i686" ] && optdepends+=('dssi-vst: win32 VST support')
-install=$pkgname.install
-source=("http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2")
-md5sums=('b11f4fcad69df45365d2125181524559')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  # lrdf + raptor2 compatibility
-  export lrdf_CFLAGS="$(pkg-config --cflags raptor2)"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/testing/rosegarden/rosegarden.install b/testing/rosegarden/rosegarden.install
deleted file mode 100644
index 5119faec2..000000000
--- a/testing/rosegarden/rosegarden.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-  update-mime-database usr/share/mime &> /dev/null
-}
-
-post_upgrade() {
-  post_install
-}
-
-post_remove() {
-  post_install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/~lukeshu/codeanalyst/PKGBUILD b/~lukeshu/codeanalyst/PKGBUILD
new file mode 100644
index 000000000..5cbab45dc
--- /dev/null
+++ b/~lukeshu/codeanalyst/PKGBUILD
@@ -0,0 +1,67 @@
+# Maintainer (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
+# Maintainer (AUR): Felipe Bugno <capent@yahoo.com>
+
+# A note about the oprofile fork:
+# The docs claim that the fork is just for adding support for
+# processors that aren't upstream yet (at the time, they are now that
+# 0.9.7 is out). So, shouldn't we just link against 0.9.7? Well:
+#  * AMD also added a bunch of CodeAnalyst-specific code. Also some of
+#    the external.
+#  * Several external variables/types have different names; the API is
+#    incompatible.
+#  * [extra]/oprofile-0.9.7-3 only includes about half of the headers.
+
+pkgbase=CodeAnalyst
+pkgname=codeanalyst
+pkgver=3.3.18.0361
+_pkgver="${pkgver//./_}"
+pkgrel=4.1
+pkgdesc="AMD performance profiler. Includes a fork of oprofile."
+url="http://developer.amd.com/tools/${pkgbase}/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gcc' 'sudo' 'qt>=4.1' 'oprofile' 'libdwarf')
+makedepends=('linux-headers' 'elfutils' 'findutils' 'file')
+provides=('oprofile=0.9.6cvs')
+conflicts=('oprofile')
+options=('!strip')
+install=codeanalyst.install
+source=("http://download2-developer.amd.com/amd/${pkgbase}/${pkgbase}${_pkgver}Public.tar.gz"
+	'gcc47.patch'
+	'skipSetup.patch'
+        'codeanalyst.sudo'
+        'codeanalyst.desktop'
+	'codeanalyst.svg')
+
+build() {
+  cd "${srcdir}/${pkgbase}-${_pkgver}-Public"
+  patch -Np1 -i "${srcdir}/gcc47.patch"
+  patch -Np1 -i "${srcdir}/skipSetup.patch"
+  rm -rf src/dwarf-* # easiest way to ensure using the system install
+
+  ./autogen.sh
+  ./configure --prefix=/usr \
+    --with-libdwarf-includes=/usr/include/libdwarf \
+    --with-libdwarf-libraries=/usr/lib
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgbase}-${_pkgver}-Public"
+  make DESTDIR="${pkgdir}" install
+  rm -f "${pkgdir}/usr/sbin/ca_user_manager" # either codeanalyst.install does this, or it is trivial
+
+  find "${pkgdir}"/usr/{bin,sbin} -type f -exec file '{}' +|sed -n 's/:\s*ELF .*//p'|xargs strip
+
+  cd "${srcdir}"
+  install -D -m644 codeanalyst.sudo "${pkgdir}/etc/sudoers.d/codeanalyst"
+  install -D -m644 codeanalyst.svg "${pkgdir}/usr/share/icons/hicolor/scalable/apps/codeanalyst.svg"
+  install -D -m644 codeanalyst.desktop "${pkgdir}/usr/share/applications/codeanalyst.desktop"
+}
+
+md5sums=('f1e29bc7c7da259df228ce59281ee1d7'
+         '063d0fc9680641a92ce5e310ffe1c9c0'
+         'ce549e59c4a5916fd19e8d085e863627'
+         '3cc8f64fe84c5a886d0172ee8d99f690'
+         '3a18d3f7fb01f199a8ed5ae2908c18e4'
+         '1822a4157b82904b82e72fc1e9bcbd42')
diff --git a/~lukeshu/codeanalyst/codeanalyst.desktop b/~lukeshu/codeanalyst/codeanalyst.desktop
new file mode 100644
index 000000000..56d54f884
--- /dev/null
+++ b/~lukeshu/codeanalyst/codeanalyst.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=AMD CodeAnalyst
+Comment=AMD profiler and performance analyzer
+Exec=/usr/bin/CodeAnalyst
+Icon=codeanalyst
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Development;
diff --git a/~lukeshu/codeanalyst/codeanalyst.install b/~lukeshu/codeanalyst/codeanalyst.install
new file mode 100755
index 000000000..8edb4adc2
--- /dev/null
+++ b/~lukeshu/codeanalyst/codeanalyst.install
@@ -0,0 +1,32 @@
+post_install() {
+  getent group amdca &>/dev/null || /usr/bin/groupadd amdca &>/dev/null
+  echo " ==> To use CodeAnalyst as non-root, you must be in the 'amdca' group"
+  echo "     ie: gpasswd -a USERNAME amdca"
+
+  chown root:amdca /usr/bin/calog_report
+  chown root:amdca /usr/bin/capackage.sh
+  chown root:amdca /usr/bin/careport.sh
+  chown root:amdca /usr/bin/cgreport
+  chown root:amdca /usr/bin/CodeAnalyst
+  chown root:amdca /usr/bin/opannotate
+  chown root:amdca /usr/bin/oparchive
+  chown root:amdca /usr/bin/opcontrol
+  chown root:amdca /usr/bin/opgprof
+  chown root:amdca /usr/bin/ophelp
+  chown root:amdca /usr/bin/opimport
+  chown root:amdca /usr/bin/opjitconv
+  chown root:amdca /usr/bin/opreport
+  chown root:amdca /usr/bin/oprofiled
+  chown root:amdca /usr/sbin/ca_oprofile_controller
+  #chown root:amdca /usr/sbin/ca_user_manager
+
+  update-desktop-database -q
+}
+
+post_remove() {
+  if getent group amdca &>/dev/null; then
+    groupdel amdca
+  fi
+
+  update-desktop-database -q
+}
diff --git a/~lukeshu/codeanalyst/codeanalyst.sudo b/~lukeshu/codeanalyst/codeanalyst.sudo
new file mode 100644
index 000000000..1c3173bdb
--- /dev/null
+++ b/~lukeshu/codeanalyst/codeanalyst.sudo
@@ -0,0 +1 @@
+%amdca ALL= NOPASSWD: /usr/sbin/ca_oprofile_controller
diff --git a/~lukeshu/codeanalyst/codeanalyst.svg b/~lukeshu/codeanalyst/codeanalyst.svg
new file mode 100644
index 000000000..8febf725b
--- /dev/null
+++ b/~lukeshu/codeanalyst/codeanalyst.svg
@@ -0,0 +1,59 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 12.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   width="286.95001"
+   height="286.95001"
+   viewBox="0 0 286.95063 286.95"
+   overflow="visible"
+   enable-background="new 0 0 1368.987 286.954"
+   xml:space="preserve"
+   inkscape:version="0.48.3.1 r9886"
+   sodipodi:docname="AMD_Logo.svg"
+   style="overflow:visible"><metadata
+   id="metadata17"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs15" /><sodipodi:namedview
+   pagecolor="#ffffff"
+   bordercolor="#666666"
+   borderopacity="1"
+   objecttolerance="10"
+   gridtolerance="10"
+   guidetolerance="10"
+   inkscape:pageopacity="0"
+   inkscape:pageshadow="2"
+   inkscape:window-width="1920"
+   inkscape:window-height="1028"
+   id="namedview13"
+   showgrid="false"
+   inkscape:zoom="2.11"
+   inkscape:cx="163.32315"
+   inkscape:cy="145.21584"
+   inkscape:window-x="-4"
+   inkscape:window-y="-3"
+   inkscape:window-maximized="1"
+   inkscape:current-layer="Layer_1" />
+<polyline
+   points="1165.47,92.779 1165.39,203.495 1281.63,203.513 1198.44,286.826 1081.79,286.954 1080.38,176.065 1165.47,92.779"
+   id="polyline3"
+   style="fill:#009a66"
+   transform="translate(-1082.0371,1.8496035e-4)" />
+<polyline
+   points="1165.39,84.082 1285.07,83.854 1284.83,202.972 1368.99,286.954 1368.75,0.12 1081.79,0 1165.39,84.082"
+   id="polyline5"
+   style="fill:#009a66"
+   transform="translate(-1082.0371,1.8496035e-4)" />
+
+
+
+</svg>
+\ No newline at end of file
diff --git a/~lukeshu/codeanalyst/gcc47.patch b/~lukeshu/codeanalyst/gcc47.patch
new file mode 100644
index 000000000..dfec4a0c4
--- /dev/null
+++ b/~lukeshu/codeanalyst/gcc47.patch
@@ -0,0 +1,72 @@
+diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/cg/Makefile.am CodeAnalyst-3_3_18_0361-Public/src/ca/cg/Makefile.am
+*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/cg/Makefile.am	2012-04-13 02:41:43.000000000 -0300
+--- CodeAnalyst-3_3_18_0361-Public/src/ca/cg/Makefile.am	2012-04-22 17:55:01.227439003 -0300
+***************
+*** 25,31 ****
+  	cgcvt.cpp
+  
+  
+! cgreport_LDFLAGS = -Wl -fPIC @QT_LDFLAGS@
+  
+  AM_CPPFLAGS= $(INCLUDES) $(more_flags) \
+  			 $(FLAG64) -Wno-unused -Wno-parentheses \
+--- 25,31 ----
+  	cgcvt.cpp
+  
+  
+! cgreport_LDFLAGS = -fPIC @QT_LDFLAGS@
+  
+  AM_CPPFLAGS= $(INCLUDES) $(more_flags) \
+  			 $(FLAG64) -Wno-unused -Wno-parentheses \
+diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/gui/MonitorDockView.cpp CodeAnalyst-3_3_18_0361-Public/src/ca/gui/MonitorDockView.cpp
+*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/gui/MonitorDockView.cpp	2012-04-13 02:41:43.000000000 -0300
+--- CodeAnalyst-3_3_18_0361-Public/src/ca/gui/MonitorDockView.cpp	2012-04-22 17:38:14.884058192 -0300
+***************
+*** 17,22 ****
+--- 17,23 ----
+  */
+  
+  #include <qtooltip.h>
++ #include <unistd.h>
+  
+  #include "MonitorDockView.h"
+  
+diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/libs/libca/dwarfengine.cpp CodeAnalyst-3_3_18_0361-Public/src/ca/libs/libca/dwarfengine.cpp
+*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/libs/libca/dwarfengine.cpp	2012-04-13 02:41:43.000000000 -0300
+--- CodeAnalyst-3_3_18_0361-Public/src/ca/libs/libca/dwarfengine.cpp	2012-04-22 17:34:45.670714989 -0300
+***************
+*** 21,26 ****
+--- 21,27 ----
+  #include <sys/types.h>
+  #include <sys/stat.h>
+  #include <fcntl.h>
++ #include <unistd.h>
+  
+  #include "dwarfengine.h"
+  #define DWARF_DEBUG		0
+diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/libs/libopdata/opdata_handler.cpp CodeAnalyst-3_3_18_0361-Public/src/ca/libs/libopdata/opdata_handler.cpp
+*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/libs/libopdata/opdata_handler.cpp	2012-04-13 02:41:43.000000000 -0300
+--- CodeAnalyst-3_3_18_0361-Public/src/ca/libs/libopdata/opdata_handler.cpp	2012-04-22 17:32:30.780708624 -0300
+***************
+*** 29,34 ****
+--- 29,35 ----
+  #include <sys/stat.h>
+  #include <fcntl.h>
+  #include <time.h>
++ #include <unistd.h>
+  
+  // CodeAnalyst headers
+  #include "CaProfileWriter.h"
+diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca_agent/libCAagent/slock.cpp CodeAnalyst-3_3_18_0361-Public/src/ca_agent/libCAagent/slock.cpp
+*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca_agent/libCAagent/slock.cpp	2012-04-13 02:41:43.000000000 -0300
+--- CodeAnalyst-3_3_18_0361-Public/src/ca_agent/libCAagent/slock.cpp	2012-04-22 17:26:58.424026278 -0300
+***************
+*** 13,18 ****
+--- 13,19 ----
+  #include <sys/ipc.h>
+  #include <sys/sem.h>
+  #include <sys/stat.h>
++ #include <unistd.h>
+  
+  #include "slock.h"
+  #include "smm.h"
diff --git a/~lukeshu/codeanalyst/skipSetup.patch b/~lukeshu/codeanalyst/skipSetup.patch
new file mode 100644
index 000000000..fdc9bf42f
--- /dev/null
+++ b/~lukeshu/codeanalyst/skipSetup.patch
@@ -0,0 +1,68 @@
+diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca/Makefile.am CodeAnalyst-3_3_18_0361-Public/src/ca/Makefile.am
+*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca/Makefile.am	2012-04-13 02:41:43.000000000 -0300
+--- CodeAnalyst-3_3_18_0361-Public/src/ca/Makefile.am	2012-04-22 20:44:07.437917684 -0300
+***************
+*** 8,19 ****
+  # FIXME	[3.0] diffgui \
+  #    $(CA_RELEASE_TYPE)
+  
+! install-exec-hook:
+! 	@if test -e "scripts/Setup.sh"; then \
+! 		scripts/Setup.sh $(DESTDIR)$(prefix); \
+! 	fi
+  
+! uninstall-hook:
+! 	@if test -e "scripts/Uninstall.sh"; then \
+! 		scripts/Uninstall.sh $(DESTDIR)$(prefix);\
+! 	fi
+--- 8,19 ----
+  # FIXME	[3.0] diffgui \
+  #    $(CA_RELEASE_TYPE)
+  
+! #install-exec-hook:
+! #	@if test -e "scripts/Setup.sh"; then \
+! #		scripts/Setup.sh $(DESTDIR)$(prefix); \
+! #	fi
+  
+! #uninstall-hook:
+! #	@if test -e "scripts/Uninstall.sh"; then \
+! #		scripts/Uninstall.sh $(DESTDIR)$(prefix);\
+! #	fi
+diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/ca_agent/jvmpi/Makefile.am CodeAnalyst-3_3_18_0361-Public/src/ca_agent/jvmpi/Makefile.am
+*** CodeAnalyst-3_3_18_0361-Public.orig/src/ca_agent/jvmpi/Makefile.am	2012-04-13 02:41:43.000000000 -0300
+--- CodeAnalyst-3_3_18_0361-Public/src/ca_agent/jvmpi/Makefile.am	2012-04-22 20:47:21.604593511 -0300
+***************
+*** 15,20 ****
+  libCAJVMPIA_so_SOURCES = \
+      jpa.cpp 
+      
+! install-exec-hook:
+! 	@/sbin/ldconfig
+  
+--- 15,20 ----
+  libCAJVMPIA_so_SOURCES = \
+      jpa.cpp 
+      
+! #install-exec-hook:
+! #	@/sbin/ldconfig
+  
+diff -crB CodeAnalyst-3_3_18_0361-Public.orig/src/Makefile.am CodeAnalyst-3_3_18_0361-Public/src/Makefile.am
+*** CodeAnalyst-3_3_18_0361-Public.orig/src/Makefile.am	2012-04-13 02:41:43.000000000 -0300
+--- CodeAnalyst-3_3_18_0361-Public/src/Makefile.am	2012-04-22 20:44:57.674586720 -0300
+***************
+*** 8,21 ****
+  install-exec-hook:
+  	@if test -e "${LIBDWARF_DIR}libdwarf.so"; then \
+  		install -pD -m 755 ${LIBDWARF_DIR}libdwarf.so $(DESTDIR)$(prefix)/lib/libdwarf.so ; \
+- 		/sbin/ldconfig ;\
+  	fi
+  
+  uninstall-hook:
+  	@if test -e "${LIBDWARF_DIR}libdwarf.so"; then \
+  		if test -e "$(DESTDIR)$(prefix)/lib/libdwarf.so"; then \
+  			rm -f $(DESTDIR)$(prefix)/lib/libdwarf.so ; \
+- 			/sbin/ldconfig ; \
+  		fi ; \
+  	fi
+  
+--- 8,19 ----
diff --git a/~lukeshu/emacs-lucid/PKGBUILD b/~lukeshu/emacs-lucid/PKGBUILD
new file mode 100644
index 000000000..af8e755c4
--- /dev/null
+++ b/~lukeshu/emacs-lucid/PKGBUILD
@@ -0,0 +1,53 @@
+# $Id: PKGBUILD 161437 2012-06-11 15:10:57Z juergen $
+# Maintainer: Juergen Hoetzel <juergen@archlinux.org>
+# Contributor: Renchi Raju <renchi@green.tam.uiuc.edu>
+
+_pkgname=emacs
+pkgname=emacs-lucid
+pkgver=24.1
+pkgrel=2
+pkgdesc="emacs, with the lucid toolkit rather than GTK2"
+
+provides=("$_pkgname=$pkgver")
+conflicts=("$_pkgname")
+
+arch=('i686' 'x86_64')
+url="http://www.gnu.org/software/emacs/emacs.html"
+license=('GPL3')
+depends=('librsvg' 'gpm' 'giflib' 'libxpm' 'gtk-update-icon-cache' 'libxaw' 'hicolor-icon-theme' 'gconf' 'desktop-file-utils' 'alsa-lib' 'imagemagick')
+install=emacs.install
+source=(ftp://ftp.gnu.org/gnu/emacs/$_pkgname-$pkgver.tar.bz2{,.sig} gnulib.patch)
+
+build() {
+  cd "$srcdir"/$_pkgname-$pkgver
+
+  # This is from Gentoo, to deal with a newer version of gnulib
+  patch -p1 -i "$srcdir/gnulib.patch"
+  # This is to deal with a newer version of autoconf
+  autoreconf -i -I m4
+
+  ./configure --prefix=/usr --sysconfdir=/etc --libexecdir=/usr/lib \
+    --localstatedir=/var --with-x-toolkit=lucid --with-xft
+  make
+}
+
+package() {
+  cd "$srcdir"/$_pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+
+  # remove conflict with ctags package
+  mv "$pkgdir"/usr/bin/{ctags,ctags.emacs}
+  mv "$pkgdir"/usr/share/man/man1/{ctags.1.gz,ctags.emacs.1}
+  # fix all the 777 perms on directories
+  find "$pkgdir"/usr/share/emacs -type d -exec chmod 755 {} \;
+  # fix user/root permissions on usr/share files
+  find "$pkgdir"/usr/share/emacs -exec chown root:root {} \;
+  # fix perms on /var/games
+  chmod 775 "$pkgdir"/var/games
+  chmod 775 "$pkgdir"/var/games/emacs
+  chmod 664 "$pkgdir"/var/games/emacs/*
+  chown -R root:games "$pkgdir"/var/games
+}
+md5sums=('8ba0932c498bc8fb10d7ddba52227e5b'
+         'c303d5c0bd0f7ea28acd14c9738faff4'
+         'f9192850960902d90504150f08be4a81')
diff --git a/~lukeshu/emacs-lucid/emacs.install b/~lukeshu/emacs-lucid/emacs.install
new file mode 100644
index 000000000..d84f1de14
--- /dev/null
+++ b/~lukeshu/emacs-lucid/emacs.install
@@ -0,0 +1,32 @@
+ICON_PATH=usr/share/icons/hicolor
+INFO_DIR=usr/share/info
+
+INFO_FILES=(ada-mode auth autotype calc ccmode cl dbus dired-x ebrowse
+ede ediff edt efaq eieio eintr elisp emacs emacs-mime epa erc eshell eudc flymake
+forms gnus idlwave info mairix-el message mh-e newsticker nxml-mode
+org pcl-cvs pgg rcirc reftex remember sasl sc semantic ses sieve smtpmail
+speedbar tramp url vip viper widget woman)
+
+post_install() {
+  gtk-update-icon-cache -q -t -f ${ICON_PATH}
+  update-desktop-database -q
+
+  [[ -x usr/bin/install-info ]] || return 0
+  for f in ${INFO_FILES[@]}; do
+    install-info ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  gtk-update-icon-cache -q -t -f ${ICON_PATH}
+  update-desktop-database -q
+
+  [[ -x usr/bin/install-info ]] || return 0
+  for f in ${INFO_FILES[@]}; do
+    install-info --delete ${INFO_DIR}/$f.gz ${INFO_DIR}/dir 2> /dev/null
+  done
+}
diff --git a/~lukeshu/emacs-lucid/gnulib.patch b/~lukeshu/emacs-lucid/gnulib.patch
new file mode 100644
index 000000000..2fd685c80
--- /dev/null
+++ b/~lukeshu/emacs-lucid/gnulib.patch
@@ -0,0 +1,105 @@
+Fix compilation with glibc-2.16.
+https://bugs.gentoo.org/424755
+
+Patch backported from gnulib upstream:
+
+From 66712c23388e93e5c518ebc8515140fa0c807348 Mon Sep 17 00:00:00 2001
+From: Eric Blake <eblake@redhat.com>
+Date: Thu, 29 Mar 2012 13:30:41 -0600
+Subject: [PATCH 1/1] stdio: don't assume gets any more
+
+Gnulib intentionally does not have a gets module, and now that C11
+and glibc have dropped it, we should be more proactive about warning
+any user on a platform that still has a declaration of this dangerous
+interface.
+
+--- emacs-24.1-orig/lib/gnulib.mk
++++ emacs-24.1/lib/gnulib.mk
+@@ -599,7 +624,6 @@
+ 	      -e 's/@''GNULIB_GETCHAR''@/$(GNULIB_GETCHAR)/g' \
+ 	      -e 's/@''GNULIB_GETDELIM''@/$(GNULIB_GETDELIM)/g' \
+ 	      -e 's/@''GNULIB_GETLINE''@/$(GNULIB_GETLINE)/g' \
+-	      -e 's/@''GNULIB_GETS''@/$(GNULIB_GETS)/g' \
+ 	      -e 's/@''GNULIB_OBSTACK_PRINTF''@/$(GNULIB_OBSTACK_PRINTF)/g' \
+ 	      -e 's/@''GNULIB_OBSTACK_PRINTF_POSIX''@/$(GNULIB_OBSTACK_PRINTF_POSIX)/g' \
+ 	      -e 's/@''GNULIB_PCLOSE''@/$(GNULIB_PCLOSE)/g' \
+--- emacs-24.1-orig/lib/stdio.in.h
++++ emacs-24.1/lib/stdio.in.h
+@@ -699,22 +699,11 @@
+ # endif
+ #endif
+ 
+-#if @GNULIB_GETS@
+-# if @REPLACE_STDIO_READ_FUNCS@ && @GNULIB_STDIO_H_NONBLOCKING@
+-#  if !(defined __cplusplus && defined GNULIB_NAMESPACE)
+-#   undef gets
+-#   define gets rpl_gets
+-#  endif
+-_GL_FUNCDECL_RPL (gets, char *, (char *s) _GL_ARG_NONNULL ((1)));
+-_GL_CXXALIAS_RPL (gets, char *, (char *s));
+-# else
+-_GL_CXXALIAS_SYS (gets, char *, (char *s));
+-#  undef gets
+-# endif
+-_GL_CXXALIASWARN (gets);
+ /* It is very rare that the developer ever has full control of stdin,
+-   so any use of gets warrants an unconditional warning.  Assume it is
+-   always declared, since it is required by C89.  */
++   so any use of gets warrants an unconditional warning; besides, C11
++   removed it.  */
++#undef gets
++#if HAVE_RAW_DECL_GETS
+ _GL_WARN_ON_USE (gets, "gets is a security hole - use fgets instead");
+ #endif
+ 
+@@ -1054,9 +1043,9 @@
+ # endif
+ #endif
+ 
+-/* Some people would argue that sprintf should be handled like gets
+-   (for example, OpenBSD issues a link warning for both functions),
+-   since both can cause security holes due to buffer overruns.
++/* Some people would argue that all sprintf uses should be warned about
++   (for example, OpenBSD issues a link warning for it),
++   since it can cause security holes due to buffer overruns.
+    However, we believe that sprintf can be used safely, and is more
+    efficient than snprintf in those safe cases; and as proof of our
+    belief, we use sprintf in several gnulib modules.  So this header
+--- emacs-24.1-orig/m4/stdio_h.m4
++++ emacs-24.1/m4/stdio_h.m4
+@@ -1,4 +1,4 @@
+-# stdio_h.m4 serial 40
++# stdio_h.m4 serial 41
+ dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
+ dnl This file is free software; the Free Software Foundation
+ dnl gives unlimited permission to copy and/or distribute it,
+@@ -18,7 +18,6 @@
+   GNULIB_GETC=1
+   GNULIB_GETCHAR=1
+   GNULIB_FGETS=1
+-  GNULIB_GETS=1
+   GNULIB_FREAD=1
+   dnl This ifdef is necessary to avoid an error "missing file lib/stdio-read.c"
+   dnl "expected source file, required through AC_LIBSOURCES, not found". It is
+@@ -72,10 +71,10 @@
+ 
+   dnl Check for declarations of anything we want to poison if the
+   dnl corresponding gnulib module is not in use, and which is not
+-  dnl guaranteed by C89.
++  dnl guaranteed by both C89 and C11.
+   gl_WARN_ON_USE_PREPARE([[#include <stdio.h>
+-    ]], [dprintf fpurge fseeko ftello getdelim getline pclose popen renameat
+-    snprintf tmpfile vdprintf vsnprintf])
++    ]], [dprintf fpurge fseeko ftello getdelim getline gets pclose popen
++    renameat snprintf tmpfile vdprintf vsnprintf])
+ ])
+ 
+ AC_DEFUN([gl_STDIO_MODULE_INDICATOR],
+@@ -113,7 +112,6 @@
+   GNULIB_GETCHAR=0;              AC_SUBST([GNULIB_GETCHAR])
+   GNULIB_GETDELIM=0;             AC_SUBST([GNULIB_GETDELIM])
+   GNULIB_GETLINE=0;              AC_SUBST([GNULIB_GETLINE])
+-  GNULIB_GETS=0;                 AC_SUBST([GNULIB_GETS])
+   GNULIB_OBSTACK_PRINTF=0;       AC_SUBST([GNULIB_OBSTACK_PRINTF])
+   GNULIB_OBSTACK_PRINTF_POSIX=0; AC_SUBST([GNULIB_OBSTACK_PRINTF_POSIX])
+   GNULIB_PCLOSE=0;               AC_SUBST([GNULIB_PCLOSE])
diff --git a/~lukeshu/libdwarf/PKGBUILD b/~lukeshu/libdwarf/PKGBUILD
new file mode 100644
index 000000000..591b92633
--- /dev/null
+++ b/~lukeshu/libdwarf/PKGBUILD
@@ -0,0 +1,44 @@
+# Maintainer: Marti Raudsepp <marti@juffo.org>
+
+pkgname=libdwarf
+pkgver=20111214
+pkgrel=1
+pkgdesc="Static library for handling DWARF Debugging Information Format"
+arch=(i686 x86_64)
+license=('GPL' 'LGPL')
+url="http://reality.sgiweb.org/davea/dwarf.html"
+depends=('elfutils' 'gcc-libs')
+makedepends=('libelf')
+source=(http://reality.sgiweb.org/davea/$pkgname-$pkgver.tar.gz)
+
+build() {
+  cd $srcdir/dwarf-$pkgver/libdwarf
+  ./configure
+  make
+
+  # dwarfdump
+  cd $srcdir/dwarf-$pkgver/dwarfdump2
+  ./configure --prefix=/usr CFLAGS=-I../libdwarf CXXFLAGS=-I../libdwarf LDFLAGS=-L../libdwarf
+  # disable parallelization; -j5 build fails ~20% of the time on my machine
+  make -j1
+}
+
+package() {
+  cd $srcdir/dwarf-$pkgver/libdwarf
+
+  install -d $pkgdir/usr/lib
+  install -m 644 libdwarf.a $pkgdir/usr/lib
+
+  install -d $pkgdir/usr/include/libdwarf
+  install dwarf.h libdwarf.h $pkgdir/usr/include/libdwarf
+
+  install -dm 755 $pkgdir/usr/share/doc/$pkgname
+  install README NEWS *.pdf $pkgdir/usr/share/doc/$pkgname
+
+  # dwarfdump
+  cd $srcdir/dwarf-$pkgver/dwarfdump2
+  install -Dm755 dwarfdump $pkgdir/usr/bin/dwarfdump
+  install -Dm644 dwarfdump.1 $pkgdir/usr/share/man/man1/dwarfdump.1
+  install -Dm644 dwarfdump.conf $pkgdir/usr/lib/dwarfdump.conf
+}
+md5sums=('573b49b94e38a0e65ff337768f003d33')
diff --git a/~mtjm/cups-usblp/PKGBUILD b/~mtjm/cups-usblp/PKGBUILD
index 5f1c62325..62b12072a 100644
--- a/~mtjm/cups-usblp/PKGBUILD
+++ b/~mtjm/cups-usblp/PKGBUILD
@@ -1,31 +1,25 @@
-# $Id: PKGBUILD 149429 2012-02-07 16:59:12Z andyrtr $
+# $Id: PKGBUILD 164175 2012-07-26 17:37:45Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 
 _pkgname="cups"
 pkgname="cups-usblp"
-pkgver=1.5.2
+pkgver=1.5.4
 pkgrel=1
 pkgdesc="The CUPS Printing System - daemon package with usblp backend"
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.cups.org/"
-depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'poppler>=0.12.3' 'dbus-core' 'hicolor-icon-theme')
-makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'poppler>=0.12.3'
-             'xinetd' 'gzip' 'autoconf' 'php' 'dbus-core' 'avahi'  'hicolor-icon-theme')
+depends=('acl' 'openslp' 'pam' "libcups>=${pkgver}" 'cups-filters' 'bc' 'libusb' 'dbus-core' 'libsystemd' 'hicolor-icon-theme')
+makedepends=('libtiff>=4.0.0' 'libpng>=1.5.7' 'acl' 'openslp' 'pam' 'xdg-utils' 'krb5' 'gnutls>=2.8.3' 'cups-filters' 'bc'
+             'xinetd' 'gzip' 'autoconf' 'php' 'libusb' 'dbus-core' 'avahi'  'hicolor-icon-theme' 'systemd')
 optdepends=('php: for included phpcups.so module'
-            'ghostscript: for non-PostScript printers to print with CUPS to convert PostScript to raster images'
-	    'foomatic-db: drivers use Ghostscript to convert PostScript to a printable form directly'
-	    'foomatic-db-engine: drivers use Ghostscript to convert PostScript to a printable form directly'
 	    'xdg-utils: xdg .desktop file support')
 provides=("cups=${pkgver}")
 conflicts=("cups" "cups-libre")
 backup=(etc/cups/cupsd.conf
-        etc/cups/mime.convs
-        etc/cups/mime.types
         etc/cups/snmp.conf
         etc/cups/printers.conf
         etc/cups/classes.conf
-        etc/cups/client.conf
         etc/cups/subscriptions.conf
         etc/dbus-1/system.d/cups.conf
         etc/logrotate.d/cups
@@ -40,22 +34,24 @@ source=(ftp://ftp.easysw.com/pub/cups/${pkgver}/cups-${pkgver}-source.tar.bz2
         cups-avahi-5-services.patch
         cups-no-export-ssllibs.patch
         cups-no-gcrypt.patch
+        cups-no-gzip-man.patch
+        cups-systemd-socket.patch
         cups cups.logrotate cups.pam)
 #options=('!emptydirs')
-md5sums=('9471d2a7c920cfbb17133c32d2e6866f'
-         '8496c48a7ab5918ce546cfb72472def3'
-         '7df4c2e0a69bf072d7b7e96523df9dce'
-         '9a207c5d5189b1c2fc55907b7ed09372'
-         '5da4ba0837f9a685f146797fcfcd455e'
-         'fe782a8fd4351741120d485d476abe8a'
+md5sums=('de3006e5cf1ee78a9c6145ce62c4e982'
+         '12c8af5bcd3b8f84240280b3dfaf9e89'
+         'cdc1322c8014297ae349e2db78a03c5a'
+         '1a5112f63958643f2888abc9418dbcac'
+         'c37d1bf1bb76acc3fe93362c80d91b7c'
+         '5d302860559960042f3b47a91b97c5fe'
          '9b8467a1e51d360096b70e2c3c081e6c'
          '3733c23e77eb503bd94cc368e02830dc'
+         'c9159ba1233902ba6ddbbe6885a46b72'
+         '4505b8b2c57a7c28ea79e08388bbbbb9'
          '9657daa21760bb0b5fa3d8b51d5e01a1'
          'f861b18f4446c43918c8643dcbbd7f6d'
          '96f82c38f3f540b53f3e5144900acf17')
 
-# move client.conf man page for next update to the client pkg.
-
 build() {
   cd ${srcdir}/${_pkgname}-${pkgver}
   # http://www.cups.org/str.php?L3066
@@ -66,10 +62,15 @@ build() {
   patch -Np1 -i ${srcdir}/cups-avahi-4-poll.patch
   patch -Np1 -i ${srcdir}/cups-avahi-5-services.patch
 
+  # add systemd socket support - Fedora patch, also used in Gentoo
+  patch -Np1 -i ${srcdir}/cups-systemd-socket.patch
+  
   # Do not export SSL libs in cups-config
   patch -Np1 -i "${srcdir}/cups-no-export-ssllibs.patch"
 
   patch -Np1 -i "${srcdir}/cups-no-gcrypt.patch"
+  # don't zip man pages in make install, let makepkg do that / Fedora
+  patch -Np1 -i ${srcdir}/cups-no-gzip-man.patch
   
   # Rebuild configure script for --enable-avahi.
   aclocal -I config-scripts
@@ -77,6 +78,7 @@ build() {
 
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
      --libdir=/usr/lib \
+     --with-systemdsystemunitdir=/usr/lib/systemd/system \
      --with-logdir=/var/log/cups \
      --with-docdir=/usr/share/cups/doc \
      --with-cups-user=daemon \
@@ -121,27 +123,32 @@ package() {
   chmod 755 ${pkgdir}/var/spool
   chmod 755 ${pkgdir}/etc
   
-  # serial backend needs to run as root (http://bugs.archlinux.org/task/20396)
-  chmod 700 ${pkgdir}/usr/lib/cups/backend/serial
-
   # install ssl directory where to store the certs, solves some samba issues
   install -dm700 -g lp ${pkgdir}/etc/cups/ssl
   # remove directory from package, we create it in cups rc.d file
   rm -rf ${pkgdir}/var/run
-#  install -dm511 -g lp ${pkgdir}/var/run/cups/certs 
 
   # install some more configuration files that will get filled by cupsd
   touch ${pkgdir}/etc/cups/printers.conf
   touch ${pkgdir}/etc/cups/classes.conf
-  touch ${pkgdir}/etc/cups/client.conf
-  echo "# see 'man client.conf'" >> ${pkgdir}/etc/cups/client.conf
-  echo "ServerName /var/run/cups/cups.sock #  alternative: ServerName hostname-or-ip-address[:port] of a remote server" >> ${pkgdir}/etc/cups/client.conf
   touch ${pkgdir}/etc/cups/subscriptions.conf 
-  chgrp lp ${pkgdir}/etc/cups/{printers.conf,classes.conf,client.conf,subscriptions.conf}
+  chgrp lp ${pkgdir}/etc/cups/{printers.conf,classes.conf,subscriptions.conf}
   
   # fix .desktop file
   sed -i 's|^Exec=htmlview http://localhost:631/|Exec=xdg-open http://localhost:631/|g' ${pkgdir}/usr/share/applications/cups.desktop
   
   # compress some driver files, adopted from Fedora
   find ${pkgdir}/usr/share/cups/model -name "*.ppd" | xargs gzip -n9f
+  
+  # remove client.conf man page
+  rm -f ${pkgdir}/usr/share/man/man5/client.conf.5
+  
+  # remove files now part of cups-filters - check cups-filters INSTALL for packagers instructions
+  rm -v ${pkgdir}/usr/lib/cups/backend/{parallel,serial}
+  rm -v ${pkgdir}/usr/lib/cups/filter/{bannertops,commandtoescpx,commandtopclx,imagetops,imagetoraster,pdftops,rastertoescpx,rastertopclx,texttops}
+  rm -v ${pkgdir}/usr/share/cups/banners/*
+  rm -v ${pkgdir}/usr/share/cups/data/{testprint,psglyphs}
+  rm -v ${pkgdir}/usr/share/cups/fonts/*
+  # comment out all conversion rules which use any of the removed filters
+  perl -p -i -e 's:^(.*\s+(pdftops|texttops|imagetops|bannertops|imagetoraster)\s*)$:#\1:' ${pkgdir}/usr/share/cups/mime/mime.convs
 }
diff --git a/~mtjm/cups-usblp/cups-avahi-1-config.patch b/~mtjm/cups-usblp/cups-avahi-1-config.patch
index 663eb39df..304cd2607 100644
--- a/~mtjm/cups-usblp/cups-avahi-1-config.patch
+++ b/~mtjm/cups-usblp/cups-avahi-1-config.patch
@@ -1,6 +1,6 @@
-diff -up cups-1.5.0/config.h.in.avahi-1-config cups-1.5.0/config.h.in
---- cups-1.5.0/config.h.in.avahi-1-config	2011-06-16 21:12:16.000000000 +0100
-+++ cups-1.5.0/config.h.in	2011-08-05 15:04:09.535759988 +0100
+diff -up cups-1.5.2/config.h.in.avahi-1-config cups-1.5.2/config.h.in
+--- cups-1.5.2/config.h.in.avahi-1-config	2011-06-16 21:12:16.000000000 +0100
++++ cups-1.5.2/config.h.in	2012-03-14 15:04:51.365347165 +0000
 @@ -390,6 +390,13 @@
  
  
@@ -15,9 +15,9 @@ diff -up cups-1.5.0/config.h.in.avahi-1-config cups-1.5.0/config.h.in
   * Do we have <sys/ioctl.h>?
   */
  
-diff -up cups-1.5.0/config-scripts/cups-dnssd.m4.avahi-1-config cups-1.5.0/config-scripts/cups-dnssd.m4
---- cups-1.5.0/config-scripts/cups-dnssd.m4.avahi-1-config	2011-05-12 06:21:56.000000000 +0100
-+++ cups-1.5.0/config-scripts/cups-dnssd.m4	2011-08-05 15:04:09.525760307 +0100
+diff -up cups-1.5.2/config-scripts/cups-dnssd.m4.avahi-1-config cups-1.5.2/config-scripts/cups-dnssd.m4
+--- cups-1.5.2/config-scripts/cups-dnssd.m4.avahi-1-config	2011-05-12 06:21:56.000000000 +0100
++++ cups-1.5.2/config-scripts/cups-dnssd.m4	2012-03-14 15:04:51.365347165 +0000
 @@ -23,6 +23,21 @@ AC_ARG_WITH(dnssd-includes, [  --with-dn
  DNSSDLIBS=""
  DNSSD_BACKEND=""
@@ -39,4 +39,4 @@ diff -up cups-1.5.0/config-scripts/cups-dnssd.m4.avahi-1-config cups-1.5.0/confi
 +
  if test x$enable_dnssd != xno; then
  	AC_CHECK_HEADER(dns_sd.h, [
- 		case "$uname" in
+ 		case "$uname" in
+\ No newline at end of file
diff --git a/~mtjm/cups-usblp/cups-avahi-2-backend.patch b/~mtjm/cups-usblp/cups-avahi-2-backend.patch
index 4c0d4989b..00e12a0a3 100644
--- a/~mtjm/cups-usblp/cups-avahi-2-backend.patch
+++ b/~mtjm/cups-usblp/cups-avahi-2-backend.patch
@@ -1,6 +1,6 @@
-diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c
---- cups-1.5.2/backend/dnssd.c.avahi-2-backend	2012-02-06 11:09:08.318644741 +0100
-+++ cups-1.5.2/backend/dnssd.c	2012-02-06 11:09:08.326644641 +0100
+diff -up cups-1.5.3/backend/dnssd.c.avahi-2-backend cups-1.5.3/backend/dnssd.c
+--- cups-1.5.3/backend/dnssd.c.avahi-2-backend	2012-05-15 16:53:18.164774446 +0200
++++ cups-1.5.3/backend/dnssd.c	2012-05-15 17:09:07.684155704 +0200
 @@ -15,14 +15,21 @@
   *
   * Contents:
@@ -85,23 +85,24 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c
  static void		browse_callback(DNSServiceRef sdRef,
  			                DNSServiceFlags flags,
  				        uint32_t interfaceIndex,
-@@ -93,12 +131,6 @@ static void		browse_local_callback(DNSSe
- 					      const char *regtype,
+@@ -95,13 +133,6 @@ static void		browse_local_callback(DNSSe
  					      const char *replyDomain,
- 					      void *context);
+ 					      void *context)
+ 					      __attribute__((nonnull(1,5,6,7,8)));
 -static int		compare_devices(cups_device_t *a, cups_device_t *b);
 -static void		exec_backend(char **argv);
 -static cups_device_t	*get_device(cups_array_t *devices,
 -			            const char *serviceName,
 -			            const char *regtype,
--				    const char *replyDomain);
+-				    const char *replyDomain)
+-				    __attribute__((nonnull(1,2,3,4)));
  static void		query_callback(DNSServiceRef sdRef,
  			               DNSServiceFlags flags,
  				       uint32_t interfaceIndex,
-@@ -107,9 +139,118 @@ static void		query_callback(DNSServiceRe
- 				       uint16_t rrclass, uint16_t rdlen,
+@@ -111,10 +142,119 @@ static void		query_callback(DNSServiceRe
  				       const void *rdata, uint32_t ttl,
- 				       void *context);
+ 				       void *context)
+ 				       __attribute__((nonnull(1,5,9,11)));
 +#endif /* HAVE_DNSSD */
 +#ifdef HAVE_AVAHI
 +static void		avahi_client_callback (AvahiClient *client,
@@ -117,7 +118,6 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c
 +					       AvahiLookupResultFlags flags,
 +					       void *context);
 +#endif /* HAVE_AVAHI */
-+
 +static cups_device_t *	find_device (cups_array_t *devices,
 +				     cups_txt_records_t *txt,
 +				     cups_device_t *dkey);
@@ -126,9 +126,11 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c
 +static cups_device_t	*get_device(cups_array_t *devices,
 +			            const char *serviceName,
 +			            const char *regtype,
-+				    const char *replyDomain);
++				    const char *replyDomain)
++				    __attribute__((nonnull(1,2,3,4)));
  static void		sigterm_handler(int sig);
- static void		unquote(char *dst, const char *src, size_t dstsize);
+ static void		unquote(char *dst, const char *src, size_t dstsize)
+ 			    __attribute__((nonnull(1,2)));
  
 +#ifdef HAVE_AVAHI
 +static AvahiSimplePoll *simple_poll = NULL;
@@ -174,7 +176,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c
 +  */
 +
 +  datalen = *data++;
-+  if (!datalen || (data + datalen) >= txt->dataend)
++  if (!datalen || (data + datalen) > txt->dataend)
 +    return NULL;
 +  txt->datanext = data + datalen;
 +
@@ -217,7 +219,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c
  
  /*
   * 'main()' - Browse for printers.
-@@ -120,6 +261,13 @@ main(int  argc,				/* I - Number of comm
+@@ -125,6 +265,13 @@ main(int  argc,				/* I - Number of comm
       char *argv[])			/* I - Command-line arguments */
  {
    const char	*name;			/* Backend name */
@@ -231,7 +233,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c
    DNSServiceRef	main_ref,		/* Main service reference */
  		fax_ipp_ref,		/* IPP fax service reference */
  		ipp_ref,		/* IPP service reference */
-@@ -133,12 +281,11 @@ main(int  argc,				/* I - Number of comm
+@@ -138,12 +285,11 @@ main(int  argc,				/* I - Number of comm
  		pdl_datastream_ref,	/* AppSocket service reference */
  		printer_ref,		/* LPD service reference */
  		riousbprint_ref;	/* Remote IO service reference */
@@ -249,7 +251,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c
  #if defined(HAVE_SIGACTION) && !defined(HAVE_SIGSET)
    struct sigaction action;		/* Actions for POSIX signals */
  #endif /* HAVE_SIGACTION && !HAVE_SIGSET */
-@@ -198,6 +345,49 @@ main(int  argc,				/* I - Number of comm
+@@ -203,6 +349,49 @@ main(int  argc,				/* I - Number of comm
    * Browse for different kinds of printers...
    */
  
@@ -299,7 +301,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c
    if (DNSServiceCreateConnection(&main_ref) != kDNSServiceErr_NoError)
    {
      perror("ERROR: Unable to create service connection");
-@@ -258,6 +448,7 @@ main(int  argc,				/* I - Number of comm
+@@ -263,6 +452,7 @@ main(int  argc,				/* I - Number of comm
    riousbprint_ref = main_ref;
    DNSServiceBrowse(&riousbprint_ref, kDNSServiceFlagsShareConnection, 0,
                     "_riousbprint._tcp", NULL, browse_callback, devices);
@@ -307,7 +309,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c
  
   /*
    * Loop until we are killed...
-@@ -265,6 +456,9 @@ main(int  argc,				/* I - Number of comm
+@@ -270,6 +460,9 @@ main(int  argc,				/* I - Number of comm
  
    while (!job_canceled)
    {
@@ -317,7 +319,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c
      FD_ZERO(&input);
      FD_SET(fd, &input);
  
-@@ -284,11 +478,35 @@ main(int  argc,				/* I - Number of comm
+@@ -289,11 +482,35 @@ main(int  argc,				/* I - Number of comm
      }
      else
      {
@@ -353,7 +355,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c
        cups_device_t *best;		/* Best matching device */
        char	device_uri[1024];	/* Device URI */
        int	count;			/* Number of queries */
-@@ -302,6 +520,7 @@ main(int  argc,				/* I - Number of comm
+@@ -307,6 +524,7 @@ main(int  argc,				/* I - Number of comm
          if (device->sent)
  	  sent ++;
  
@@ -361,7 +363,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c
          if (device->ref)
  	  count ++;
  
-@@ -333,14 +552,23 @@ main(int  argc,				/* I - Number of comm
+@@ -338,14 +556,23 @@ main(int  argc,				/* I - Number of comm
  	      count ++;
            }
  	}
@@ -386,7 +388,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c
  
            if (!best)
  	    best = device;
-@@ -401,6 +629,7 @@ main(int  argc,				/* I - Number of comm
+@@ -406,6 +633,7 @@ main(int  argc,				/* I - Number of comm
  }
  
  
@@ -394,7 +396,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c
  /*
   * 'browse_callback()' - Browse devices.
   */
-@@ -489,6 +718,7 @@ browse_local_callback(
+@@ -494,6 +722,7 @@ browse_local_callback(
  	  device->fullName);
    device->sent = 1;
  }
@@ -402,7 +404,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c
  
  
  /*
-@@ -569,6 +799,41 @@ exec_backend(char **argv)		/* I - Comman
+@@ -574,6 +803,41 @@ exec_backend(char **argv)		/* I - Comman
  
  
  /*
@@ -444,7 +446,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c
   * 'get_device()' - Create or update a device.
   */
  
-@@ -589,20 +854,7 @@ get_device(cups_array_t *devices,	/* I -
+@@ -594,20 +858,7 @@ get_device(cups_array_t *devices,	/* I -
    */
  
    key.name = (char *)serviceName;
@@ -466,7 +468,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c
  
    for (device = cupsArrayFind(devices, &key);
         device;
-@@ -622,8 +874,14 @@ get_device(cups_array_t *devices,	/* I -
+@@ -627,8 +878,14 @@ get_device(cups_array_t *devices,	/* I -
          free(device->domain);
  	device->domain = strdup(replyDomain);
  
@@ -481,7 +483,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c
  	free(device->fullName);
  	device->fullName = strdup(fullName);
        }
-@@ -643,6 +901,9 @@ get_device(cups_array_t *devices,	/* I -
+@@ -648,6 +905,9 @@ get_device(cups_array_t *devices,	/* I -
    device->domain   = strdup(replyDomain);
    device->type     = key.type;
    device->priority = 50;
@@ -491,7 +493,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c
  
    cupsArrayAdd(devices, device);
  
-@@ -650,13 +911,20 @@ get_device(cups_array_t *devices,	/* I -
+@@ -655,13 +915,20 @@ get_device(cups_array_t *devices,	/* I -
    * Set the "full name" of this service, which is used for queries...
    */
  
@@ -512,7 +514,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c
  /*
   * 'query_callback()' - Process query data.
   */
-@@ -680,7 +948,7 @@ query_callback(
+@@ -685,7 +952,7 @@ query_callback(
  		*ptr;			/* Pointer into string */
    cups_device_t	dkey,			/* Search key */
  		*device;		/* Device */
@@ -521,7 +523,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c
  
    fprintf(stderr, "DEBUG2: query_callback(sdRef=%p, flags=%x, "
                    "interfaceIndex=%d, errorCode=%d, fullName=\"%s\", "
-@@ -714,94 +982,233 @@ query_callback(
+@@ -719,94 +986,233 @@ query_callback(
    if ((ptr = strstr(name, "._")) != NULL)
      *ptr = '\0';
  
@@ -638,7 +640,8 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c
    else
 -    dkey.type = CUPS_DEVICE_RIOUSBPRINT;
 +    fprintf (stderr, "DEBUG: Ignoring TXT record for \"%s\"...\n", name);
-+
+ 
+-  for (device = cupsArrayFind(devices, &dkey);
 +  avahi_service_resolver_free (resolver);
 +}
 +
@@ -713,8 +716,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c
 +}
 +#endif /* HAVE_AVAHI */
 +
- 
--  for (device = cupsArrayFind(devices, &dkey);
++
 +/*
 + * 'find_device()' - Find a device from its name and domain.
 + */
@@ -817,7 +819,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c
  	{
  	 /*
  	  * Add USB device ID information...
-@@ -856,6 +1263,10 @@ query_callback(
+@@ -861,6 +1267,10 @@ query_callback(
  	  if (device->type == CUPS_DEVICE_PRINTER)
  	    device->sent = 1;
  	}
@@ -828,7 +830,7 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c
        }
  
        if (device->device_id)
-@@ -912,11 +1323,9 @@ query_callback(
+@@ -917,11 +1327,9 @@ query_callback(
      }
    }
  
@@ -841,9 +843,9 @@ diff -up cups-1.5.2/backend/dnssd.c.avahi-2-backend cups-1.5.2/backend/dnssd.c
  /*
   * 'sigterm_handler()' - Handle termination signals...
   */
-diff -up cups-1.5.2/cups/http-support.c.avahi-2-backend cups-1.5.2/cups/http-support.c
---- cups-1.5.2/cups/http-support.c.avahi-2-backend	2011-09-26 20:46:46.000000000 +0200
-+++ cups-1.5.2/cups/http-support.c	2012-02-06 11:09:08.327644629 +0100
+diff -up cups-1.5.3/cups/http-support.c.avahi-2-backend cups-1.5.3/cups/http-support.c
+--- cups-1.5.3/cups/http-support.c.avahi-2-backend	2012-02-15 02:06:12.000000000 +0100
++++ cups-1.5.3/cups/http-support.c	2012-05-15 17:04:51.045944634 +0200
 @@ -43,6 +43,10 @@
   *   http_copy_decode()   - Copy and decode a URI.
   *   http_copy_encode()   - Copy and encode a URI.
@@ -892,7 +894,7 @@ diff -up cups-1.5.2/cups/http-support.c.avahi-2-backend cups-1.5.2/cups/http-sup
  
  /*
   * 'httpAssembleURI()' - Assemble a uniform resource identifier from its
-@@ -1431,6 +1458,9 @@ _httpResolveURI(
+@@ -1434,6 +1461,9 @@ _httpResolveURI(
  
    if (strstr(hostname, "._tcp"))
    {
@@ -902,7 +904,7 @@ diff -up cups-1.5.2/cups/http-support.c.avahi-2-backend cups-1.5.2/cups/http-sup
  #ifdef HAVE_DNSSD
  #  ifdef WIN32
  #    pragma comment(lib, "dnssd.lib")
-@@ -1449,6 +1479,17 @@ _httpResolveURI(
+@@ -1452,6 +1482,17 @@ _httpResolveURI(
      fd_set		input_set;	/* Input set for select() */
      struct timeval	stimeout;	/* Timeout value for select() */
  #endif /* HAVE_POLL */
@@ -920,7 +922,7 @@ diff -up cups-1.5.2/cups/http-support.c.avahi-2-backend cups-1.5.2/cups/http-sup
  
      if (options & _HTTP_RESOLVE_STDERR)
        fprintf(stderr, "DEBUG: Resolving \"%s\"...\n", hostname);
-@@ -1485,9 +1526,16 @@ _httpResolveURI(
+@@ -1488,9 +1529,16 @@ _httpResolveURI(
      if (domain)
        *domain++ = '\0';
  
@@ -937,7 +939,7 @@ diff -up cups-1.5.2/cups/http-support.c.avahi-2-backend cups-1.5.2/cups/http-sup
      resolved_uri[0] = '\0';
  
      DEBUG_printf(("6_httpResolveURI: Resolving hostname=\"%s\", regtype=\"%s\", "
-@@ -1501,6 +1549,7 @@ _httpResolveURI(
+@@ -1504,6 +1552,7 @@ _httpResolveURI(
  
      uri = NULL;
  
@@ -945,7 +947,7 @@ diff -up cups-1.5.2/cups/http-support.c.avahi-2-backend cups-1.5.2/cups/http-sup
      if (DNSServiceCreateConnection(&ref) == kDNSServiceErr_NoError)
      {
        localref = ref;
-@@ -1608,6 +1657,36 @@ _httpResolveURI(
+@@ -1611,6 +1660,36 @@ _httpResolveURI(
  
        DNSServiceRefDeallocate(ref);
      }
@@ -982,7 +984,7 @@ diff -up cups-1.5.2/cups/http-support.c.avahi-2-backend cups-1.5.2/cups/http-sup
  
      if (options & _HTTP_RESOLVE_STDERR)
      {
-@@ -1619,13 +1698,13 @@ _httpResolveURI(
+@@ -1622,13 +1701,13 @@ _httpResolveURI(
        fputs("STATE: -connecting-to-device,offline-report\n", stderr);
      }
  
@@ -998,10 +1000,10 @@ diff -up cups-1.5.2/cups/http-support.c.avahi-2-backend cups-1.5.2/cups/http-sup
  
      if ((options & _HTTP_RESOLVE_STDERR) && !uri)
        _cupsLangPrintFilter(stderr, "ERROR", _("Unable to find printer."));
-@@ -1914,6 +1993,116 @@ http_resolve_cb(
+@@ -1916,6 +1995,115 @@ http_resolve_cb(
+ }
  #endif /* HAVE_DNSSD */
  
- 
 +#ifdef HAVE_AVAHI
 +/*
 + * 'avahi_resolve_uri_client_cb()' - Avahi client callback for resolving URI.
@@ -1111,7 +1113,6 @@ diff -up cups-1.5.2/cups/http-support.c.avahi-2-backend cups-1.5.2/cups/http-sup
 +}
 +#endif /* HAVE_AVAHI */
 +
-+
+ 
  /*
-  * End of "$Id: http-support.c 10017 2011-09-26 18:46:46Z mike $".
-  */
+  * End of "$Id: http-support.c 10284 2012-02-15 01:06:12Z mike $".
+\ No newline at end of file
diff --git a/~mtjm/cups-usblp/cups-avahi-3-timeouts.patch b/~mtjm/cups-usblp/cups-avahi-3-timeouts.patch
index 1c547c042..daf852a0f 100644
--- a/~mtjm/cups-usblp/cups-avahi-3-timeouts.patch
+++ b/~mtjm/cups-usblp/cups-avahi-3-timeouts.patch
@@ -1,6 +1,6 @@
-diff -up cups-1.5.0/scheduler/cupsd.h.avahi-3-timeouts cups-1.5.0/scheduler/cupsd.h
---- cups-1.5.0/scheduler/cupsd.h.avahi-3-timeouts	2011-05-11 23:17:34.000000000 +0100
-+++ cups-1.5.0/scheduler/cupsd.h	2011-10-07 13:20:41.522867324 +0100
+diff -up cups-1.5.2/scheduler/cupsd.h.avahi-3-timeouts cups-1.5.2/scheduler/cupsd.h
+--- cups-1.5.2/scheduler/cupsd.h.avahi-3-timeouts	2011-05-11 23:17:34.000000000 +0100
++++ cups-1.5.2/scheduler/cupsd.h	2012-03-14 15:06:36.509476983 +0000
 @@ -140,6 +140,15 @@ extern const char *cups_hstrerror(int);
  
  typedef void (*cupsd_selfunc_t)(void *data);
@@ -50,9 +50,9 @@ diff -up cups-1.5.0/scheduler/cupsd.h.avahi-3-timeouts cups-1.5.0/scheduler/cups
  
  /*
   * End of "$Id: cupsd.h 9766 2011-05-11 22:17:34Z mike $".
-diff -up cups-1.5.0/scheduler/main.c.avahi-3-timeouts cups-1.5.0/scheduler/main.c
---- cups-1.5.0/scheduler/main.c.avahi-3-timeouts	2011-10-07 13:20:36.875954675 +0100
-+++ cups-1.5.0/scheduler/main.c	2011-10-07 13:20:41.524867282 +0100
+diff -up cups-1.5.2/scheduler/main.c.avahi-3-timeouts cups-1.5.2/scheduler/main.c
+--- cups-1.5.2/scheduler/main.c.avahi-3-timeouts	2012-03-14 15:04:17.655305548 +0000
++++ cups-1.5.2/scheduler/main.c	2012-03-14 15:06:36.511476986 +0000
 @@ -146,6 +146,10 @@ main(int  argc,				/* I - Number of comm
    int			launchd_idle_exit;
  					/* Idle exit on select timeout? */
@@ -116,8 +116,8 @@ diff -up cups-1.5.0/scheduler/main.c.avahi-3-timeouts cups-1.5.0/scheduler/main.
 +  * See if there are any scheduled timed callbacks to run.
 +  */
 +
-+  tmo = cupsdNextTimeout (&tmo_delay);
-+  if (tmo)
++  if ((tmo = cupsdNextTimeout(&tmo_delay)) != NULL &&
++      (now + tmo_delay) < timeout)
 +  {
 +    timeout = tmo_delay;
 +    why = "run a timed callback";
@@ -127,9 +127,9 @@ diff -up cups-1.5.0/scheduler/main.c.avahi-3-timeouts cups-1.5.0/scheduler/main.
   /*
    * Check whether we are accepting new connections...
    */
-diff -up cups-1.5.0/scheduler/Makefile.avahi-3-timeouts cups-1.5.0/scheduler/Makefile
---- cups-1.5.0/scheduler/Makefile.avahi-3-timeouts	2011-10-07 13:20:36.955953170 +0100
-+++ cups-1.5.0/scheduler/Makefile	2011-10-07 13:20:41.521867343 +0100
+diff -up cups-1.5.2/scheduler/Makefile.avahi-3-timeouts cups-1.5.2/scheduler/Makefile
+--- cups-1.5.2/scheduler/Makefile.avahi-3-timeouts	2012-03-14 15:04:17.685305586 +0000
++++ cups-1.5.2/scheduler/Makefile	2012-03-14 15:06:36.508476980 +0000
 @@ -39,7 +39,8 @@ CUPSDOBJS =	\
  		server.o \
  		statbuf.o \
@@ -140,9 +140,9 @@ diff -up cups-1.5.0/scheduler/Makefile.avahi-3-timeouts cups-1.5.0/scheduler/Mak
  LIBOBJS =	\
  		filter.o \
  		mime.o \
-diff -up cups-1.5.0/scheduler/timeout.c.avahi-3-timeouts cups-1.5.0/scheduler/timeout.c
---- cups-1.5.0/scheduler/timeout.c.avahi-3-timeouts	2011-10-07 13:20:41.525867259 +0100
-+++ cups-1.5.0/scheduler/timeout.c	2011-10-07 13:20:41.525867259 +0100
+diff -up cups-1.5.2/scheduler/timeout.c.avahi-3-timeouts cups-1.5.2/scheduler/timeout.c
+--- cups-1.5.2/scheduler/timeout.c.avahi-3-timeouts	2012-03-14 15:06:36.552477037 +0000
++++ cups-1.5.2/scheduler/timeout.c	2012-03-14 15:06:36.552477037 +0000
 @@ -0,0 +1,235 @@
 +/*
 + * "$Id$"
diff --git a/~mtjm/cups-usblp/cups-avahi-4-poll.patch b/~mtjm/cups-usblp/cups-avahi-4-poll.patch
index 189e83da6..d7fa5fd56 100644
--- a/~mtjm/cups-usblp/cups-avahi-4-poll.patch
+++ b/~mtjm/cups-usblp/cups-avahi-4-poll.patch
@@ -1,6 +1,6 @@
-diff -up cups-1.5.0/scheduler/avahi.c.avahi-4-poll cups-1.5.0/scheduler/avahi.c
---- cups-1.5.0/scheduler/avahi.c.avahi-4-poll	2011-10-11 10:56:50.102288037 +0100
-+++ cups-1.5.0/scheduler/avahi.c	2011-10-11 10:56:50.102288037 +0100
+diff -up cups-1.5.2/scheduler/avahi.c.avahi-4-poll cups-1.5.2/scheduler/avahi.c
+--- cups-1.5.2/scheduler/avahi.c.avahi-4-poll	2012-03-14 15:07:29.477542381 +0000
++++ cups-1.5.2/scheduler/avahi.c	2012-03-14 15:07:29.477542381 +0000
 @@ -0,0 +1,441 @@
 +/*
 + * "$Id$"
@@ -443,9 +443,9 @@ diff -up cups-1.5.0/scheduler/avahi.c.avahi-4-poll cups-1.5.0/scheduler/avahi.c
 +/*
 + * End of "$Id$".
 + */
-diff -up cups-1.5.0/scheduler/avahi.h.avahi-4-poll cups-1.5.0/scheduler/avahi.h
---- cups-1.5.0/scheduler/avahi.h.avahi-4-poll	2011-10-11 10:56:50.102288037 +0100
-+++ cups-1.5.0/scheduler/avahi.h	2011-10-11 10:56:50.119287724 +0100
+diff -up cups-1.5.2/scheduler/avahi.h.avahi-4-poll cups-1.5.2/scheduler/avahi.h
+--- cups-1.5.2/scheduler/avahi.h.avahi-4-poll	2012-03-14 15:07:29.477542381 +0000
++++ cups-1.5.2/scheduler/avahi.h	2012-03-14 15:07:29.477542381 +0000
 @@ -0,0 +1,69 @@
 +/*
 + * "$Id$"
@@ -516,9 +516,9 @@ diff -up cups-1.5.0/scheduler/avahi.h.avahi-4-poll cups-1.5.0/scheduler/avahi.h
 +/*
 + * End of "$Id$".
 + */
-diff -up cups-1.5.0/scheduler/Makefile.avahi-4-poll cups-1.5.0/scheduler/Makefile
---- cups-1.5.0/scheduler/Makefile.avahi-4-poll	2011-10-11 10:56:45.868365861 +0100
-+++ cups-1.5.0/scheduler/Makefile	2011-10-11 10:56:50.101288055 +0100
+diff -up cups-1.5.2/scheduler/Makefile.avahi-4-poll cups-1.5.2/scheduler/Makefile
+--- cups-1.5.2/scheduler/Makefile.avahi-4-poll	2012-03-14 15:06:36.508476980 +0000
++++ cups-1.5.2/scheduler/Makefile	2012-03-14 15:07:29.476542380 +0000
 @@ -17,6 +17,7 @@ include ../Makedefs
  
  CUPSDOBJS =	\
diff --git a/~mtjm/cups-usblp/cups-avahi-5-services.patch b/~mtjm/cups-usblp/cups-avahi-5-services.patch
index 9713bbc53..820b3c32b 100644
--- a/~mtjm/cups-usblp/cups-avahi-5-services.patch
+++ b/~mtjm/cups-usblp/cups-avahi-5-services.patch
@@ -1,6 +1,6 @@
-diff -up cups-1.5.0/cgi-bin/admin.c.avahi-5-services cups-1.5.0/cgi-bin/admin.c
---- cups-1.5.0/cgi-bin/admin.c.avahi-5-services	2011-05-20 04:49:49.000000000 +0100
-+++ cups-1.5.0/cgi-bin/admin.c	2011-10-19 11:53:32.123177998 +0100
+diff -up cups-1.5.2/cgi-bin/admin.c.avahi-5-services cups-1.5.2/cgi-bin/admin.c
+--- cups-1.5.2/cgi-bin/admin.c.avahi-5-services	2011-08-17 22:01:53.000000000 +0100
++++ cups-1.5.2/cgi-bin/admin.c	2012-03-14 15:08:25.701611799 +0000
 @@ -1643,7 +1643,7 @@ do_config_server(http_t *http)		/* I - H
        else
  	local_protocols[0] = '\0';
@@ -31,10 +31,75 @@ diff -up cups-1.5.0/cgi-bin/admin.c.avahi-5-services cups-1.5.0/cgi-bin/admin.c
  
  #ifdef HAVE_LDAP
    cgiSetVariable("HAVE_LDAP", "1");
-diff -up cups-1.5.0/scheduler/client.c.avahi-5-services cups-1.5.0/scheduler/client.c
---- cups-1.5.0/scheduler/client.c.avahi-5-services	2011-06-10 22:16:18.000000000 +0100
-+++ cups-1.5.0/scheduler/client.c	2011-10-19 11:53:32.127177926 +0100
-@@ -4987,7 +4987,7 @@ valid_host(cupsd_client_t *con)		/* I -
+diff -up cups-1.5.2/scheduler/avahi.h.avahi-5-services cups-1.5.2/scheduler/avahi.h
+--- cups-1.5.2/scheduler/avahi.h.avahi-5-services	2012-03-14 15:07:29.477542381 +0000
++++ cups-1.5.2/scheduler/avahi.h	2012-03-14 15:08:25.701611799 +0000
+@@ -3,7 +3,7 @@
+  *
+  *   Avahi poll implementation for the CUPS scheduler.
+  *
+- *   Copyright (C) 2010, 2011 Red Hat, Inc.
++ *   Copyright (C) 2010, 2011, 2012 Red Hat, Inc.
+  *   Authors:
+  *    Tim Waugh <twaugh@redhat.com>
+  *
+@@ -32,37 +32,40 @@
+  *   OF THE POSSIBILITY OF SUCH DAMAGE.
+  */
+ 
+-#include <config.h>
++#ifndef _CUPS_AVAHI_H_
++#  define _CUPS_AVAHI_H_
+ 
+-#ifdef HAVE_AVAHI
+-#  include <avahi-client/client.h>
+-#  include <avahi-client/publish.h>
+-#endif /* HAVE_AVAHI */
++/*
++ * Include necessary headers...
++ */
+ 
+-#ifdef HAVE_AUTHORIZATION_H
+-#  include <Security/Authorization.h>
+-#endif /* HAVE_AUTHORIZATION_H */
++#  include <config.h>
+ 
++#  ifdef HAVE_AVAHI
++#    include <avahi-client/client.h>
++#    include <avahi-client/publish.h>
++#  endif /* HAVE_AVAHI */
+ 
+-#ifdef HAVE_AVAHI
++#  ifdef HAVE_AVAHI
+ typedef struct
+ {
+     AvahiPoll api;
+     cups_array_t *watched_fds;
+     cups_array_t *timeouts;
+ } AvahiCupsPoll;
+-#endif /* HAVE_AVAHI */
++#  endif /* HAVE_AVAHI */
+ 
+ /*
+  * Prototypes...
+  */
+ 
+-#ifdef HAVE_AVAHI
++#  ifdef HAVE_AVAHI
+ extern AvahiCupsPoll *	avahi_cups_poll_new(void);
+ extern void		avahi_cups_poll_free(AvahiCupsPoll *cups_poll);
+ extern const AvahiPoll *avahi_cups_poll_get(AvahiCupsPoll *cups_poll);
+-#endif /* HAVE_AVAHI */
++#  endif /* HAVE_AVAHI */
+ 
++#endif /* !_CUPS_AVAHI_H_ */
+ 
+ /*
+  * End of "$Id$".
+diff -up cups-1.5.2/scheduler/client.c.avahi-5-services cups-1.5.2/scheduler/client.c
+--- cups-1.5.2/scheduler/client.c.avahi-5-services	2012-01-13 23:00:22.000000000 +0000
++++ cups-1.5.2/scheduler/client.c	2012-03-14 15:08:25.703611797 +0000
+@@ -4989,7 +4989,7 @@ valid_host(cupsd_client_t *con)		/* I -
  	    !strncmp(host, "[::1]:", 6));
    }
  
@@ -43,7 +108,7 @@ diff -up cups-1.5.0/scheduler/client.c.avahi-5-services cups-1.5.0/scheduler/cli
   /*
    * Check if the hostname is something.local (Bonjour); if so, allow it.
    */
-@@ -4996,7 +4996,7 @@ valid_host(cupsd_client_t *con)		/* I -
+@@ -4998,7 +4998,7 @@ valid_host(cupsd_client_t *con)		/* I -
        (!_cups_strcasecmp(end, ".local") || !_cups_strncasecmp(end, ".local:", 7) ||
         !_cups_strcasecmp(end, ".local.") || !_cups_strncasecmp(end, ".local.:", 8)))
      return (1);
@@ -52,10 +117,10 @@ diff -up cups-1.5.0/scheduler/client.c.avahi-5-services cups-1.5.0/scheduler/cli
  
   /*
    * Check if the hostname is an IP address...
-diff -up cups-1.5.0/scheduler/conf.c.avahi-5-services cups-1.5.0/scheduler/conf.c
---- cups-1.5.0/scheduler/conf.c.avahi-5-services	2011-10-19 11:53:31.895182225 +0100
-+++ cups-1.5.0/scheduler/conf.c	2011-10-19 11:53:32.131177850 +0100
-@@ -651,7 +651,7 @@ cupsdReadConfiguration(void)
+diff -up cups-1.5.2/scheduler/conf.c.avahi-5-services cups-1.5.2/scheduler/conf.c
+--- cups-1.5.2/scheduler/conf.c.avahi-5-services	2012-03-14 15:04:17.636305526 +0000
++++ cups-1.5.2/scheduler/conf.c	2012-03-14 15:08:25.706611803 +0000
+@@ -652,7 +652,7 @@ cupsdReadConfiguration(void)
    Browsing                 = CUPS_DEFAULT_BROWSING;
    DefaultShared            = CUPS_DEFAULT_DEFAULT_SHARED;
  
@@ -64,9 +129,9 @@ diff -up cups-1.5.0/scheduler/conf.c.avahi-5-services cups-1.5.0/scheduler/conf.
    cupsdSetString(&DNSSDRegType, "_ipp._tcp,_cups");
  #endif /* HAVE_DNSSD */
  
-diff -up cups-1.5.0/scheduler/dirsvc.c.avahi-5-services cups-1.5.0/scheduler/dirsvc.c
---- cups-1.5.0/scheduler/dirsvc.c.avahi-5-services	2011-10-19 11:53:32.011180075 +0100
-+++ cups-1.5.0/scheduler/dirsvc.c	2011-10-19 11:53:58.916681461 +0100
+diff -up cups-1.5.2/scheduler/dirsvc.c.avahi-5-services cups-1.5.2/scheduler/dirsvc.c
+--- cups-1.5.2/scheduler/dirsvc.c.avahi-5-services	2012-03-14 15:04:17.674305572 +0000
++++ cups-1.5.2/scheduler/dirsvc.c	2012-03-14 15:08:25.709611806 +0000
 @@ -27,6 +27,7 @@
   *   ldap_connect()             - Start new LDAP connection
   *   ldap_reconnect()           - Reconnect to LDAP Server
@@ -799,15 +864,31 @@ diff -up cups-1.5.0/scheduler/dirsvc.c.avahi-5-services cups-1.5.0/scheduler/dir
  
   /*
    * De-register the individual printers
-@@ -2906,6 +3292,7 @@ dnssdStop(void)
-        p = (cupsd_printer_t *)cupsArrayNext(Printers))
-     dnssdDeregisterPrinter(p);
- 
-+#ifdef HAVE_DNSSD
-  /*
+@@ -2910,12 +3296,23 @@ dnssdStop(void)
    * Shutdown the rest of the service refs...
    */
-@@ -2926,14 +3313,17 @@ dnssdStop(void)
+ 
++#ifdef HAVE_DNSSD
+   if (WebIFRef)
+   {
+     DNSServiceRefDeallocate(WebIFRef);
+     WebIFRef = NULL;
+   }
++#endif /* HAVE_DNSSD */
++#ifdef HAVE_AVAHI
++  if (AvahiWebIFGroup)
++  {
++    avahi_entry_group_reset (AvahiWebIFGroup);
++    avahi_entry_group_free (AvahiWebIFGroup);
++    AvahiWebIFGroup = NULL;
++  }
++#endif /* HAVE_AVAHI */
+ 
++#ifdef HAVE_DNSSD
+   if (RemoteRef)
+   {
+     DNSServiceRefDeallocate(RemoteRef);
+@@ -2926,14 +3323,17 @@ dnssdStop(void)
  
    DNSServiceRefDeallocate(DNSSDRef);
    DNSSDRef = NULL;
@@ -825,7 +906,7 @@ diff -up cups-1.5.0/scheduler/dirsvc.c.avahi-5-services cups-1.5.0/scheduler/dir
  /*
   * 'dnssdUpdate()' - Handle DNS-SD queries.
   */
-@@ -2955,6 +3345,153 @@ dnssdUpdate(void)
+@@ -2955,6 +3355,153 @@ dnssdUpdate(void)
  #endif /* HAVE_DNSSD */
  
  
@@ -979,9 +1060,9 @@ diff -up cups-1.5.0/scheduler/dirsvc.c.avahi-5-services cups-1.5.0/scheduler/dir
  /*
   * 'get_auth_info_required()' - Get the auth-info-required value to advertise.
   */
-diff -up cups-1.5.0/scheduler/dirsvc.h.avahi-5-services cups-1.5.0/scheduler/dirsvc.h
---- cups-1.5.0/scheduler/dirsvc.h.avahi-5-services	2011-03-21 02:12:14.000000000 +0000
-+++ cups-1.5.0/scheduler/dirsvc.h	2011-10-19 11:53:32.138177721 +0100
+diff -up cups-1.5.2/scheduler/dirsvc.h.avahi-5-services cups-1.5.2/scheduler/dirsvc.h
+--- cups-1.5.2/scheduler/dirsvc.h.avahi-5-services	2011-03-21 02:12:14.000000000 +0000
++++ cups-1.5.2/scheduler/dirsvc.h	2012-03-14 15:08:25.711611808 +0000
 @@ -31,6 +31,10 @@
  #  endif /* HAVE_LDAP_SSL_H */
  #endif /* HAVE_LDAP */
@@ -1054,10 +1135,10 @@ diff -up cups-1.5.0/scheduler/dirsvc.h.avahi-5-services cups-1.5.0/scheduler/dir
  #ifdef HAVE_LDAP
  extern void	cupsdUpdateLDAPBrowse(void);
  #endif /* HAVE_LDAP */
-diff -up cups-1.5.0/scheduler/ipp.c.avahi-5-services cups-1.5.0/scheduler/ipp.c
---- cups-1.5.0/scheduler/ipp.c.avahi-5-services	2011-10-19 11:53:31.978180686 +0100
-+++ cups-1.5.0/scheduler/ipp.c	2011-10-19 11:53:32.147177555 +0100
-@@ -6096,7 +6096,7 @@ copy_printer_attrs(
+diff -up cups-1.5.2/scheduler/ipp.c.avahi-5-services cups-1.5.2/scheduler/ipp.c
+--- cups-1.5.2/scheduler/ipp.c.avahi-5-services	2012-03-14 15:04:17.665305560 +0000
++++ cups-1.5.2/scheduler/ipp.c	2012-03-14 15:08:25.715611813 +0000
+@@ -6099,7 +6099,7 @@ copy_printer_attrs(
      ippAddDate(con->response, IPP_TAG_PRINTER, "printer-current-time",
                 ippTimeToDate(curtime));
  
@@ -1066,7 +1147,7 @@ diff -up cups-1.5.0/scheduler/ipp.c.avahi-5-services cups-1.5.0/scheduler/ipp.c
    if (!ra || cupsArrayFind(ra, "printer-dns-sd-name"))
    {
      if (printer->reg_name)
-@@ -6106,7 +6106,7 @@ copy_printer_attrs(
+@@ -6109,7 +6109,7 @@ copy_printer_attrs(
        ippAddInteger(con->response, IPP_TAG_PRINTER, IPP_TAG_NOVALUE,
                     "printer-dns-sd-name", 0);
    }
@@ -1075,9 +1156,9 @@ diff -up cups-1.5.0/scheduler/ipp.c.avahi-5-services cups-1.5.0/scheduler/ipp.c
  
    if (!ra || cupsArrayFind(ra, "printer-error-policy"))
      ippAddString(con->response, IPP_TAG_PRINTER, IPP_TAG_NAME,
-diff -up cups-1.5.0/scheduler/main.c.avahi-5-services cups-1.5.0/scheduler/main.c
---- cups-1.5.0/scheduler/main.c.avahi-5-services	2011-10-19 11:53:32.101178406 +0100
-+++ cups-1.5.0/scheduler/main.c	2011-10-19 11:53:32.151177479 +0100
+diff -up cups-1.5.2/scheduler/main.c.avahi-5-services cups-1.5.2/scheduler/main.c
+--- cups-1.5.2/scheduler/main.c.avahi-5-services	2012-03-14 15:06:36.511476986 +0000
++++ cups-1.5.2/scheduler/main.c	2012-03-14 15:08:25.718611817 +0000
 @@ -120,6 +120,10 @@ main(int  argc,				/* I - Number of comm
    cupsd_listener_t	*lis;		/* Current listener */
    time_t		current_time,	/* Current time */
@@ -1116,9 +1197,9 @@ diff -up cups-1.5.0/scheduler/main.c.avahi-5-services cups-1.5.0/scheduler/main.
  #endif /* HAVE_AVAHI */
  
  #ifndef __APPLE__
-diff -up cups-1.5.0/scheduler/printers.c.avahi-5-services cups-1.5.0/scheduler/printers.c
---- cups-1.5.0/scheduler/printers.c.avahi-5-services	2011-10-19 11:53:31.916181835 +0100
-+++ cups-1.5.0/scheduler/printers.c	2011-10-19 11:53:32.156177388 +0100
+diff -up cups-1.5.2/scheduler/printers.c.avahi-5-services cups-1.5.2/scheduler/printers.c
+--- cups-1.5.2/scheduler/printers.c.avahi-5-services	2012-03-14 15:04:17.646305537 +0000
++++ cups-1.5.2/scheduler/printers.c	2012-03-14 15:08:25.720611819 +0000
 @@ -883,9 +883,9 @@ cupsdDeletePrinter(
    cupsdClearString(&p->alert);
    cupsdClearString(&p->alert_description);
@@ -1149,9 +1230,9 @@ diff -up cups-1.5.0/scheduler/printers.c.avahi-5-services cups-1.5.0/scheduler/p
  }
  
  
-diff -up cups-1.5.0/scheduler/printers.h.avahi-5-services cups-1.5.0/scheduler/printers.h
---- cups-1.5.0/scheduler/printers.h.avahi-5-services	2011-03-18 18:42:46.000000000 +0000
-+++ cups-1.5.0/scheduler/printers.h	2011-10-19 11:53:32.157177369 +0100
+diff -up cups-1.5.2/scheduler/printers.h.avahi-5-services cups-1.5.2/scheduler/printers.h
+--- cups-1.5.2/scheduler/printers.h.avahi-5-services	2011-03-18 18:42:46.000000000 +0000
++++ cups-1.5.2/scheduler/printers.h	2012-03-14 15:08:25.721611820 +0000
 @@ -16,6 +16,9 @@
  #ifdef HAVE_DNSSD
  #  include <dns_sd.h>
diff --git a/~mtjm/cups-usblp/cups-no-gzip-man.patch b/~mtjm/cups-usblp/cups-no-gzip-man.patch
new file mode 100644
index 000000000..6786c4430
--- /dev/null
+++ b/~mtjm/cups-usblp/cups-no-gzip-man.patch
@@ -0,0 +1,18 @@
+diff -up cups-1.5b1/config-scripts/cups-manpages.m4.no-gzip-man cups-1.5b1/config-scripts/cups-manpages.m4
+--- cups-1.5b1/config-scripts/cups-manpages.m4.no-gzip-man	2011-05-12 07:21:56.000000000 +0200
++++ cups-1.5b1/config-scripts/cups-manpages.m4	2011-05-23 17:25:50.000000000 +0200
+@@ -69,10 +69,10 @@ case "$uname" in
+ 		;;
+ 	Linux* | GNU* | Darwin*)
+ 		# Linux, GNU Hurd, and Mac OS X
+-		MAN1EXT=1.gz
+-		MAN5EXT=5.gz
+-		MAN7EXT=7.gz
+-		MAN8EXT=8.gz
++		MAN1EXT=1
++		MAN5EXT=5
++		MAN7EXT=7
++		MAN8EXT=8
+ 		MAN8DIR=8
+ 		;;
+ 	*)
diff --git a/~mtjm/cups-usblp/cups-systemd-socket.patch b/~mtjm/cups-usblp/cups-systemd-socket.patch
new file mode 100644
index 000000000..09d17d415
--- /dev/null
+++ b/~mtjm/cups-usblp/cups-systemd-socket.patch
@@ -0,0 +1,527 @@
+diff -up cups-1.5.2/config.h.in.systemd-socket cups-1.5.2/config.h.in
+--- cups-1.5.2/config.h.in.systemd-socket	2012-03-16 14:50:57.089449755 +0000
++++ cups-1.5.2/config.h.in	2012-03-16 14:50:57.146449787 +0000
+@@ -503,6 +503,13 @@
+ 
+ 
+ /*
++ * Do we have systemd support?
++ */
++
++#undef HAVE_SYSTEMD
++
++
++/*
+  * Various scripting languages...
+  */
+ 
+diff -up cups-1.5.2/config-scripts/cups-systemd.m4.systemd-socket cups-1.5.2/config-scripts/cups-systemd.m4
+--- cups-1.5.2/config-scripts/cups-systemd.m4.systemd-socket	2012-03-16 14:50:57.146449787 +0000
++++ cups-1.5.2/config-scripts/cups-systemd.m4	2012-03-16 14:50:57.146449787 +0000
+@@ -0,0 +1,36 @@
++dnl
++dnl "$Id$"
++dnl
++dnl   systemd stuff for CUPS.
++
++dnl Find whether systemd is available
++
++SDLIBS=""
++AC_ARG_WITH([systemdsystemunitdir],
++        AS_HELP_STRING([--with-systemdsystemunitdir=DIR], [Directory for systemd service files]),
++        [], [with_systemdsystemunitdir=$($PKGCONFIG --variable=systemdsystemunitdir systemd)])
++if test "x$with_systemdsystemunitdir" != xno; then
++        AC_MSG_CHECKING(for libsystemd-daemon)
++        if $PKGCONFIG --exists libsystemd-daemon; then
++		AC_MSG_RESULT(yes)
++        	SDCFLAGS=`$PKGCONFIG --cflags libsystemd-daemon`
++        	SDLIBS=`$PKGCONFIG --libs libsystemd-daemon`
++		AC_SUBST([systemdsystemunitdir], [$with_systemdsystemunitdir])
++		AC_DEFINE(HAVE_SYSTEMD)
++	else
++		AC_MSG_RESULT(no)
++	fi
++fi
++
++if test -n "$with_systemdsystemunitdir" -a "x$with_systemdsystemunitdir" != xno ; then
++        SYSTEMD_UNITS="cups.service cups.socket cups.path"
++else
++        SYSTEMD_UNITS=""
++fi
++
++AC_SUBST(SYSTEMD_UNITS)
++AC_SUBST(SDLIBS)
++
++dnl
++dnl "$Id$"
++dnl
+diff -up cups-1.5.2/configure.in.systemd-socket cups-1.5.2/configure.in
+--- cups-1.5.2/configure.in.systemd-socket	2011-08-31 02:36:33.000000000 +0100
++++ cups-1.5.2/configure.in	2012-03-16 14:50:57.146449787 +0000
+@@ -37,6 +37,7 @@ sinclude(config-scripts/cups-pam.m4)
+ sinclude(config-scripts/cups-largefile.m4)
+ sinclude(config-scripts/cups-dnssd.m4)
+ sinclude(config-scripts/cups-launchd.m4)
++sinclude(config-scripts/cups-systemd.m4)
+ sinclude(config-scripts/cups-defaults.m4)
+ sinclude(config-scripts/cups-pdf.m4)
+ sinclude(config-scripts/cups-scripting.m4)
+@@ -71,6 +72,9 @@ AC_OUTPUT(Makedefs
+ 	  conf/snmp.conf
+ 	  cups-config
+ 	  data/testprint
++          data/cups.service
++          data/cups.socket
++          data/cups.path
+ 	  desktop/cups.desktop
+ 	  doc/help/ref-cupsd-conf.html
+ 	  doc/help/standard.html
+diff -up cups-1.5.2/cups/usersys.c.systemd-socket cups-1.5.2/cups/usersys.c
+--- cups-1.5.2/cups/usersys.c.systemd-socket	2012-03-16 14:50:57.054449734 +0000
++++ cups-1.5.2/cups/usersys.c	2012-03-16 14:50:57.148449788 +0000
+@@ -778,7 +778,7 @@ cups_read_client_conf(
+     struct stat	sockinfo;		/* Domain socket information */
+ 
+     if (!stat(CUPS_DEFAULT_DOMAINSOCKET, &sockinfo) &&
+-	(sockinfo.st_mode & S_IRWXO) == S_IRWXO)
++	(sockinfo.st_mode & (S_IROTH | S_IWOTH)) == (S_IROTH | S_IWOTH))
+       cups_server = CUPS_DEFAULT_DOMAINSOCKET;
+     else
+ #endif /* CUPS_DEFAULT_DOMAINSOCKET */
+diff -up cups-1.5.2/data/cups.path.in.systemd-socket cups-1.5.2/data/cups.path.in
+--- cups-1.5.2/data/cups.path.in.systemd-socket	2012-03-16 14:50:57.148449788 +0000
++++ cups-1.5.2/data/cups.path.in	2012-03-16 14:50:57.148449788 +0000
+@@ -0,0 +1,8 @@
++[Unit]
++Description=CUPS Printer Service Spool
++
++[Path]
++PathExistsGlob=@CUPS_REQUESTS@/d*
++
++[Install]
++WantedBy=multi-user.target
+diff -up cups-1.5.2/data/cups.service.in.systemd-socket cups-1.5.2/data/cups.service.in
+--- cups-1.5.2/data/cups.service.in.systemd-socket	2012-03-16 14:50:57.149449788 +0000
++++ cups-1.5.2/data/cups.service.in	2012-03-16 14:50:57.149449788 +0000
+@@ -0,0 +1,10 @@
++[Unit]
++Description=CUPS Printing Service
++
++[Service]
++ExecStart=@sbindir@/cupsd -f
++PrivateTmp=true
++
++[Install]
++Also=cups.socket cups.path
++WantedBy=printer.target
+diff -up cups-1.5.2/data/cups.socket.in.systemd-socket cups-1.5.2/data/cups.socket.in
+--- cups-1.5.2/data/cups.socket.in.systemd-socket	2012-03-16 14:50:57.150449788 +0000
++++ cups-1.5.2/data/cups.socket.in	2012-03-16 14:50:57.150449788 +0000
+@@ -0,0 +1,11 @@
++[Unit]
++Description=CUPS Printing Service Sockets
++
++[Socket]
++ListenStream=@CUPS_DEFAULT_DOMAINSOCKET@
++ListenStream=631
++ListenDatagram=0.0.0.0:631
++BindIPv6Only=ipv6-only
++
++[Install]
++WantedBy=sockets.target
+diff -up cups-1.5.2/data/Makefile.systemd-socket cups-1.5.2/data/Makefile
+--- cups-1.5.2/data/Makefile.systemd-socket	2011-05-12 06:21:56.000000000 +0100
++++ cups-1.5.2/data/Makefile	2012-03-16 14:50:57.151449789 +0000
+@@ -112,6 +112,12 @@ install-data:
+ 		$(INSTALL_DATA) $$file $(DATADIR)/ppdc; \
+ 	done
+ 	$(INSTALL_DIR) -m 755 $(DATADIR)/profiles
++	if test "x$(SYSTEMD_UNITS)" != "x" ; then \
++		$(INSTALL_DIR) -m 755 $(SYSTEMDUNITDIR); \
++		for file in $(SYSTEMD_UNITS); do \
++			$(INSTALL_DATA) $$file $(SYSTEMDUNITDIR); \
++		done; \
++	fi
+ 
+ 
+ #
+@@ -159,6 +165,9 @@ uninstall:
+ 	-$(RMDIR) $(DATADIR)/charsets
+ 	-$(RMDIR) $(DATADIR)/banners
+ 	-$(RMDIR) $(DATADIR)
++	for file in $(SYSTEMD_UNITS); do \
++		$(RM) $(SYSTEMDUNITDIR)/$$file; \
++	done
+ 
+ 
+ #
+diff -up cups-1.5.2/Makedefs.in.systemd-socket cups-1.5.2/Makedefs.in
+--- cups-1.5.2/Makedefs.in.systemd-socket	2012-03-16 14:50:57.081449751 +0000
++++ cups-1.5.2/Makedefs.in	2012-03-16 14:50:57.152449790 +0000
+@@ -143,6 +143,7 @@ CXXFLAGS	=	@CPPFLAGS@ @CXXFLAGS@
+ CXXLIBS		=	@CXXLIBS@
+ DBUS_NOTIFIER	=	@DBUS_NOTIFIER@
+ DBUS_NOTIFIERLIBS =	@DBUS_NOTIFIERLIBS@
++SYSTEMD_UNITS   =       @SYSTEMD_UNITS@
+ DNSSD_BACKEND	=	@DNSSD_BACKEND@
+ DSOFLAGS	=	-L../cups @DSOFLAGS@
+ DSOLIBS		=	@DSOLIBS@ $(COMMONLIBS)
+@@ -151,6 +152,7 @@ FONTS		=	@FONTS@
+ IMGLIBS		=	@IMGLIBS@
+ IMGFILTERS	=	@IMGFILTERS@
+ LAUNCHDLIBS	=	@LAUNCHDLIBS@
++SDLIBS		=	@SDLIBS@
+ LDFLAGS		=	-L../cgi-bin -L../cups -L../filter -L../ppdc \
+ 			-L../scheduler @LDARCHFLAGS@ \
+ 			@LDFLAGS@ @RELROFLAGS@ @PIEFLAGS@ $(OPTIM)
+@@ -267,6 +269,7 @@ PAMFILE		=	@PAMFILE@
+ 
+ DEFAULT_LAUNCHD_CONF =	@DEFAULT_LAUNCHD_CONF@
+ DBUSDIR		=	@DBUSDIR@
++SYSTEMDUNITDIR  =       $(BUILDROOT)@systemdsystemunitdir@
+ 
+ 
+ #
+diff -up cups-1.5.2/scheduler/client.h.systemd-socket cups-1.5.2/scheduler/client.h
+--- cups-1.5.2/scheduler/client.h.systemd-socket	2011-03-25 21:25:38.000000000 +0000
++++ cups-1.5.2/scheduler/client.h	2012-03-16 14:50:57.153449791 +0000
+@@ -75,6 +75,9 @@ typedef struct
+   int			fd;		/* File descriptor for this server */
+   http_addr_t		address;	/* Bind address of socket */
+   http_encryption_t	encryption;	/* To encrypt or not to encrypt... */
++#ifdef HAVE_SYSTEMD
++  int			is_systemd;	/* Is this a systemd socket? */
++#endif /* HAVE_SYSTEMD */
+ } cupsd_listener_t;
+ 
+ 
+diff -up cups-1.5.2/scheduler/dirsvc.c.systemd-socket cups-1.5.2/scheduler/dirsvc.c
+--- cups-1.5.2/scheduler/dirsvc.c.systemd-socket	2012-03-16 14:50:57.112449768 +0000
++++ cups-1.5.2/scheduler/dirsvc.c	2012-03-16 14:50:57.155449792 +0000
+@@ -1512,7 +1512,7 @@ cupsdStartBrowsing(void)
+       }
+     }
+ 
+-    if (BrowseSocket >= 0)
++    if (BrowseSocket >= 0 && !BrowseSocketIsSystemd)
+     {
+      /*
+       * Bind the socket to browse port...
+@@ -1556,13 +1556,17 @@ cupsdStartBrowsing(void)
+ 	cupsdLogMessage(CUPSD_LOG_ERROR, "Unable to set broadcast mode - %s.",
+ 			strerror(errno));
+ 
++	if (!BrowseSocketIsSystemd)
++	{
+ #ifdef WIN32
+-	closesocket(BrowseSocket);
++	  closesocket(BrowseSocket);
+ #else
+-	close(BrowseSocket);
++	  close(BrowseSocket);
+ #endif /* WIN32 */
+ 
+-	BrowseSocket = -1;
++	  BrowseSocket = -1;
++	}
++
+ 	BrowseLocalProtocols &= ~BROWSE_CUPS;
+ 	BrowseRemoteProtocols &= ~BROWSE_CUPS;
+ 
+@@ -1885,15 +1889,22 @@ cupsdStopBrowsing(void)
+   if (((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_CUPS) &&
+       BrowseSocket >= 0)
+   {
+-   /*
+-    * Close the socket and remove it from the input selection set.
+-    */
++    if (!BrowseSocketIsSystemd)
++    {
++     /*
++      * Close the socket.
++      */
+ 
+ #ifdef WIN32
+-    closesocket(BrowseSocket);
++      closesocket(BrowseSocket);
+ #else
+-    close(BrowseSocket);
++      close(BrowseSocket);
+ #endif /* WIN32 */
++    }
++
++   /*
++    * Remove it from the input selection set.
++    */
+ 
+     cupsdRemoveSelect(BrowseSocket);
+     BrowseSocket = -1;
+@@ -5693,11 +5704,14 @@ update_cups_browse(void)
+                       strerror(errno));
+       cupsdLogMessage(CUPSD_LOG_ERROR, "CUPS browsing turned off.");
+ 
++      if (!BrowseSocketIsSystemd)
++      {
+ #ifdef WIN32
+-      closesocket(BrowseSocket);
++	closesocket(BrowseSocket);
+ #else
+-      close(BrowseSocket);
++	close(BrowseSocket);
+ #endif /* WIN32 */
++      }
+ 
+       cupsdRemoveSelect(BrowseSocket);
+       BrowseSocket = -1;
+diff -up cups-1.5.2/scheduler/dirsvc.h.systemd-socket cups-1.5.2/scheduler/dirsvc.h
+--- cups-1.5.2/scheduler/dirsvc.h.systemd-socket	2012-03-16 14:50:57.113449769 +0000
++++ cups-1.5.2/scheduler/dirsvc.h	2012-03-16 14:50:57.157449792 +0000
+@@ -100,6 +100,8 @@ VAR int			Browsing	VALUE(TRUE),
+ 					/* Short names for remote printers? */
+ 			BrowseSocket	VALUE(-1),
+ 					/* Socket for browsing */
++			BrowseSocketIsSystemd	VALUE(0),
++					/* BrowseSocket is systemd-provided? */
+ 			BrowsePort	VALUE(IPP_PORT),
+ 					/* Port number for broadcasts */
+ 			BrowseInterval	VALUE(DEFAULT_INTERVAL),
+diff -up cups-1.5.2/scheduler/listen.c.systemd-socket cups-1.5.2/scheduler/listen.c
+--- cups-1.5.2/scheduler/listen.c.systemd-socket	2011-04-16 00:38:13.000000000 +0100
++++ cups-1.5.2/scheduler/listen.c	2012-03-16 14:50:57.158449792 +0000
+@@ -401,7 +401,11 @@ cupsdStopListening(void)
+        lis;
+        lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
+   {
+-    if (lis->fd != -1)
++    if (lis->fd != -1
++#ifdef HAVE_SYSTEMD
++        && !lis->is_systemd
++#endif /* HAVE_SYSTEMD */
++        )
+     {
+ #ifdef WIN32
+       closesocket(lis->fd);
+diff -up cups-1.5.2/scheduler/main.c.systemd-socket cups-1.5.2/scheduler/main.c
+--- cups-1.5.2/scheduler/main.c.systemd-socket	2012-03-16 14:50:57.121449773 +0000
++++ cups-1.5.2/scheduler/main.c	2012-03-16 14:51:55.409483636 +0000
+@@ -26,6 +26,8 @@
+  *   launchd_checkin()     - Check-in with launchd and collect the listening
+  *                           fds.
+  *   launchd_checkout()    - Update the launchd KeepAlive file as needed.
++ *   systemd_checkin()     - Check-in with systemd and collect the
++ *                           listening fds.
+  *   parent_handler()      - Catch USR1/CHLD signals...
+  *   process_children()    - Process all dead children...
+  *   select_timeout()      - Calculate the select timeout value.
+@@ -62,6 +64,10 @@
+ #  endif /* !LAUNCH_JOBKEY_SERVICEIPC */
+ #endif /* HAVE_LAUNCH_H */
+ 
++#ifdef HAVE_SYSTEMD
++#include <systemd/sd-daemon.h>
++#endif /* HAVE_SYSTEMD */
++
+ #if defined(HAVE_MALLOC_H) && defined(HAVE_MALLINFO)
+ #  include <malloc.h>
+ #endif /* HAVE_MALLOC_H && HAVE_MALLINFO */
+@@ -78,6 +84,9 @@
+ static void		launchd_checkin(void);
+ static void		launchd_checkout(void);
+ #endif /* HAVE_LAUNCHD */
++#ifdef HAVE_SYSTEMD
++static void		systemd_checkin(void);
++#endif /* HAVE_SYSTEMD */
+ static void		parent_handler(int sig);
+ static void		process_children(void);
+ static void		sigchld_handler(int sig);
+@@ -537,6 +546,13 @@ main(int  argc,				/* I - Number of comm
+   }
+ #endif /* HAVE_LAUNCHD */
+ 
++#ifdef HAVE_SYSTEMD
++ /*
++  * If we were started by systemd get the listen sockets file descriptors...
++  */
++  systemd_checkin();
++#endif /* HAVE_SYSTEMD */
++
+  /*
+   * Startup the server...
+   */
+@@ -759,6 +775,15 @@ main(int  argc,				/* I - Number of comm
+ 	}
+ #endif /* HAVE_LAUNCHD */
+ 
++#ifdef HAVE_SYSTEMD
++       /*
++	* If we were started by systemd get the listen sockets file
++	* descriptors...
++        */
++
++        systemd_checkin();
++#endif /* HAVE_SYSTEMD */
++
+        /*
+         * Startup the server...
+         */
+@@ -1584,6 +1609,139 @@ launchd_checkout(void)
+ }
+ #endif /* HAVE_LAUNCHD */
+ 
++#ifdef HAVE_SYSTEMD
++static void
++systemd_checkin(void)
++{
++  int n, fd;
++
++  n = sd_listen_fds(0);
++  if (n < 0)
++  {
++    cupsdLogMessage(CUPSD_LOG_ERROR,
++           "systemd_checkin: Failed to acquire sockets from systemd - %s",
++           strerror(-n));
++    exit(EXIT_FAILURE);
++    return;
++  }
++
++  if (n == 0)
++    return;
++
++  for (fd = SD_LISTEN_FDS_START; fd < SD_LISTEN_FDS_START + n; fd ++)
++  {
++    http_addr_t addr;
++    socklen_t addrlen = sizeof (addr);
++    int r;
++    cupsd_listener_t *lis;
++    char s[256];
++
++    r = sd_is_socket(fd, AF_UNSPEC, SOCK_STREAM, 1);
++    if (r < 0)
++    {
++      cupsdLogMessage(CUPSD_LOG_ERROR,
++             "systemd_checkin: Unable to verify socket type - %s",
++             strerror(-r));
++      continue;
++    }
++
++    if (!r)
++    {
++      if (Browsing &&
++	  ((BrowseLocalProtocols | BrowseRemoteProtocols) & BROWSE_CUPS))
++      {
++	r = sd_is_socket(fd, AF_UNSPEC, SOCK_DGRAM, 0);
++	if (r < 0)
++	{
++	  cupsdLogMessage(CUPSD_LOG_ERROR,
++			  "systemd_checkin: Unable to verify socket type - %s",
++			  strerror(-r));
++	  continue;
++	}
++
++	if (r)
++	{
++	 /*
++	  * This is the browse socket.
++	  */
++
++	  char addrstr[256];
++	  if (getsockname(fd, (struct sockaddr*) &addr, &addrlen))
++	  {
++	    cupsdLogMessage(CUPSD_LOG_ERROR,
++			    "systemd_checkin: Unable to get local address - %s",
++			    strerror(errno));
++	    continue;
++	  }
++
++	  httpAddrString (&addr, addrstr, sizeof (addrstr));
++	  BrowseSocket = fd;
++	  BrowseSocketIsSystemd = 1;
++	  cupsdLogMessage(CUPSD_LOG_DEBUG,
++			  "systemd_checkin: Matched browse (port %d) with fd %d:%s...",
++			  BrowsePort, fd, addrstr);
++	  continue;
++	}
++
++      }
++      cupsdLogMessage(CUPSD_LOG_ERROR,
++             "systemd_checkin: Socket not of the right type");
++      continue;
++    }
++
++    if (getsockname(fd, (struct sockaddr*) &addr, &addrlen))
++    {
++      cupsdLogMessage(CUPSD_LOG_ERROR,
++             "systemd_checkin: Unable to get local address - %s",
++             strerror(errno));
++      continue;
++    }
++
++   /*
++    * Try to match the systemd socket address to one of the listeners...
++    */
++
++    for (lis = (cupsd_listener_t *)cupsArrayFirst(Listeners);
++       lis;
++       lis = (cupsd_listener_t *)cupsArrayNext(Listeners))
++      if (httpAddrEqual(&lis->address, &addr))
++	break;
++
++    if (lis)
++    {
++      cupsdLogMessage(CUPSD_LOG_DEBUG,
++                      "systemd_checkin: Matched existing listener %s with fd %d...",
++                      httpAddrString(&(lis->address), s, sizeof(s)), fd);
++    }
++    else
++    {
++      cupsdLogMessage(CUPSD_LOG_DEBUG,
++                      "systemd_checkin: Adding new listener %s with fd %d...",
++                      httpAddrString(&addr, s, sizeof(s)), fd);
++
++      if ((lis = calloc(1, sizeof(cupsd_listener_t))) == NULL)
++      {
++        cupsdLogMessage(CUPSD_LOG_ERROR,
++                        "systemd_checkin: Unable to allocate listener - "
++                        "%s.", strerror(errno));
++        exit(EXIT_FAILURE);
++      }
++
++      cupsArrayAdd(Listeners, lis);
++
++      memcpy(&lis->address, &addr, sizeof(lis->address));
++    }
++
++    lis->fd = fd;
++    lis->is_systemd = 1;
++
++#  ifdef HAVE_SSL
++    if (_httpAddrPort(&(lis->address)) == 443)
++      lis->encryption = HTTP_ENCRYPT_ALWAYS;
++#  endif /* HAVE_SSL */
++  }
++}
++#endif /* HAVE_SYSTEMD */
+ 
+ /*
+  * 'parent_handler()' - Catch USR1/CHLD signals...
+diff -up cups-1.5.2/scheduler/Makefile.systemd-socket cups-1.5.2/scheduler/Makefile
+--- cups-1.5.2/scheduler/Makefile.systemd-socket	2012-03-16 14:50:57.130449778 +0000
++++ cups-1.5.2/scheduler/Makefile	2012-03-16 14:50:57.160449794 +0000
+@@ -382,7 +382,7 @@ cupsd:	$(CUPSDOBJS) $(LIBCUPSMIME) ../cu
+ 	$(CC) $(LDFLAGS) -o cupsd $(CUPSDOBJS) -L. -lcupsmime \
+ 		$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
+ 		$(LIBPAPER) $(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBS) \
+-		$(LIBGSSAPI) $(LIBWRAP)
++		$(LIBGSSAPI) $(LIBWRAP) $(SDLIBS)
+ 
+ cupsd-static:	$(CUPSDOBJS) libcupsmime.a ../cups/$(LIBCUPSSTATIC)
+ 	echo Linking $@...
+@@ -390,7 +390,7 @@ cupsd-static:	$(CUPSDOBJS) libcupsmime.a
+ 		$(LIBZ) $(SSLLIBS) $(LIBSLP) $(LIBLDAP) $(PAMLIBS) \
+ 		../cups/$(LIBCUPSSTATIC) $(COMMONLIBS) $(LIBZ) $(LIBPAPER) \
+ 		$(LIBMALLOC) $(SERVERLIBS) $(DNSSDLIBS) $(LIBGSSAPI) \
+-		$(LIBWRAP)
++		$(LIBWRAP) $(SDLIBS)
+ 
+ 
+ #
author	Michał Masłowski <mtjm@mtjm.eu>	2012-07-30 14:59:24 +0200
committer	Michał Masłowski <mtjm@mtjm.eu>	2012-07-30 14:59:24 +0200
commit	09dd4a97fccc4bcabe341c4e4490004385283e53 (patch)
tree	d00a22a0304969ff70ecc680f3e89b5fab1ecce6
parent	3a3f329b736af639fdd3c9621816bad627b96903 (diff)
parent	4982c269b318734d01ad30c6592fbb73565ceb12 (diff)