diff --git a/http/xxxterm/xxxterm-1.10.0.tgz.sig
b/http/xxxterm/xxxterm-1.10.0.tgz.sig
new file mode 100644
index 0000000..1921db8
Binary files /dev/null and b/http/xxxterm/xxxterm-1.10.0.tgz.sig differ
diff --git a/http/xxxterm/xxxterm-1.9.0.tgz.sig
b/http/xxxterm/xxxterm-1.9.0.tgz.sig
deleted file mode 100644
index aa1432d..0000000
Binary files a/http/xxxterm/xxxterm-1.9.0.tgz.sig and /dev/null differ
diff --git a/kde4/kde4-l10n/BUILD b/kde4/kde4-l10n/BUILD
index dbe1530..7ff3092 100755
--- a/kde4/kde4-l10n/BUILD
+++ b/kde4/kde4-l10n/BUILD
@@ -1,10 +1,13 @@
-QTDIR=$INSTALL_ROOT/usr &&
-PATH=$QTDIR/bin/qt4:$PATH &&
-
persistent_add KDE4DIR &&
-KDE4DIR=$INSTALL_ROOT/usr &&
+KDE4DIR=$INSTALL_ROOT/usr &&
PATH=$KDE4DIR/bin:$PATH &&
+
+# We need to be sure that the correct qmake is found first.
+# Do not push any paths before this!
+QTDIR=$INSTALL_ROOT/usr &&
+PATH=$QTDIR/bin/qt4:$PATH &&
+
LD_LIBRARY_PATH=$KDE4DIR/lib:$LD_LIBRARY_PATH &&
QT_PLUGIN_PATH=$KDE4DIR/lib/kde4/plugins &&
@@ -23,6 +26,7 @@ do
cd $BUILD_SUBDIRECTORY
&&
mkdir -p build &&
cd build &&
+ echo "PATH=$PATH" &&
cmake -DCMAKE_INSTALL_PREFIX=$KDE4DIR \
-DCMAKE_BUILD_TYPE=$KDE_DEBUG_OPTION \
../ &&
diff --git a/kde4/kde4-l10n/HISTORY b/kde4/kde4-l10n/HISTORY
index 830f0c3..fcdce18 100644
--- a/kde4/kde4-l10n/HISTORY
+++ b/kde4/kde4-l10n/HISTORY
@@ -1,3 +1,6 @@
+2012-01-07 Thomas Orgis <sobukus AT sourcemage.org>
+ * BUILD: make sure qt4 bin path is topmost (build finds wrong qmake)
+
2011-12-10 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: updated spell to 4.7.4
diff --git a/science/celestia/HISTORY b/science/celestia/HISTORY
index 9e2b7be..4db8c97 100644
--- a/science/celestia/HISTORY
+++ b/science/celestia/HISTORY
@@ -1,3 +1,7 @@
+2012-01-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * PRE_BUILD, celestia-1.6.1-gcc46.patch: added patch from gentoo
+ to fix build with gcc 4.6
+
2011-12-17 Vlad Glagolev <stealth AT sourcemage.org>
* DEPENDS: lua -> lua51
diff --git a/science/celestia/PRE_BUILD b/science/celestia/PRE_BUILD
new file mode 100755
index 0000000..3830113
--- /dev/null
+++ b/science/celestia/PRE_BUILD
@@ -0,0 +1,3 @@
+default_pre_build &&
+cd ${SOURCE_DIRECTORY} &&
+patch -p0 < ${SCRIPT_DIRECTORY}/celestia-1.6.1-gcc46.patch
diff --git a/science/celestia/celestia-1.6.1-gcc46.patch
b/science/celestia/celestia-1.6.1-gcc46.patch
new file mode 100644
index 0000000..ddf4036
--- /dev/null
+++ b/science/celestia/celestia-1.6.1-gcc46.patch
@@ -0,0 +1,13 @@
+http://bugs.gentoo.org/show_bug.cgi?id=366073
+
+Patch written by Nils Larsson <ni1s AT nerdshack.com>
+--- src/celengine/frametree.h
++++ src/celengine/frametree.h
+@@ -14,6 +14,7 @@
+ #define _CELENGINE_FRAMETREE_H_
+
+ #include <vector>
++#include <cstddef>
+
+ class Star;
+ class Body;
diff --git a/utils/razercfg/BUILD b/utils/razercfg/BUILD
new file mode 100755
index 0000000..e013b8d
--- /dev/null
+++ b/utils/razercfg/BUILD
@@ -0,0 +1 @@
+cmake_build
diff --git a/utils/razercfg/DEPENDS b/utils/razercfg/DEPENDS
new file mode 100755
index 0000000..42e00ca
--- /dev/null
+++ b/utils/razercfg/DEPENDS
@@ -0,0 +1,3 @@
+depends cmake &&
+depends libusb &&
+depends pyqt4
diff --git a/utils/razercfg/DETAILS b/utils/razercfg/DETAILS
new file mode 100755
index 0000000..0cc069e
--- /dev/null
+++ b/utils/razercfg/DETAILS
@@ -0,0 +1,21 @@
+ SPELL=razercfg
+ VERSION=0.17
+ SOURCE="${SPELL}-${VERSION}.tar.bz2"
+ SOURCE_URL[0]=http://bu3sch.de/${SPELL}/${SOURCE}
+
SOURCE_HASH=sha512:57a2e56e7253c8241a1ffdc01a9848677c75a48e029e2bb44f74fcdbe34a326f5e563c56c9e1ba96755a4de04ae79a2cf3a5888d544382efd727d9e87f778aec
+SOURCE_DIRECTORY="${BUILD_DIRECTORY}/${SPELL}-${VERSION}"
+
WEB_SITE="http://bu3sch.de/cms/index.php/${SPELL}-nextgen-config-tool"
+ LICENSE[0]=GPL
+ ENTERED=20120104
+ SHORT="Razer device configuration tool"
+cat << EOF
+This is the next generation Razer device configuration tool bringing the
+Razer gaming experience to the free OpenSource world.
+
+This utility is a replacement for the old deathaddercfg tool.
+
+The tool architecture is based on "razerd", which is a background daemon
doing
+all of the lowlevel privileged hardware accesses. The user interface tools
+are "razercfg", a commandline tool; and "qrazercfg", a QT4 based graphical
+device configuration tool
+EOF
diff --git a/utils/razercfg/FINAL b/utils/razercfg/FINAL
new file mode 100755
index 0000000..b95e037
--- /dev/null
+++ b/utils/razercfg/FINAL
@@ -0,0 +1,9 @@
+message "\n${MESSAGE_COLOR}If you don't have an xorg.conf, you don't have to
\
+do anything and it should work out-of-the-box.\n
+The X-server must _not_ be configured to a specific mouse device like \
+/dev/input/mouse0, because on configuration events razerd may have to \
+temporarly unregister the mouse from the system. This will confuse the \
+X-server, if it's configured to a specific device.\n
+Configure it to the generic /dev/input/mice device instead. This will enable
\
+the X-server to pick up the mouse again after a configuration event from \
+razerd.\n${DEFAULT_COLOR}"
diff --git a/utils/razercfg/HISTORY b/utils/razercfg/HISTORY
new file mode 100644
index 0000000..28c2dea
--- /dev/null
+++ b/utils/razercfg/HISTORY
@@ -0,0 +1,3 @@
+2012-01-04 Julien _kaze_ ROZO <julien AT rozo.org>
+ * BUILD, DEPENDS, DETAILS, FINAL, HISTORY, init.d/razerd: spell
created
+
diff --git a/utils/razercfg/init.d/razerd b/utils/razercfg/init.d/razerd
new file mode 100644
index 0000000..b495e0f
--- /dev/null
+++ b/utils/razercfg/init.d/razerd
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+PROGRAM=/usr/sbin/razerd
+RUNLEVEL=3
+NEEDS="udevd"
+PIDFILE="/var/run/razerd/razerd.pid"
+
+. /etc/init.d/smgl_init
+
+start() {
+ echo "Starting $NAME"
+ if [ -e $PIDFILE ] ; then
+ echo "$NAME already running";
+ else
+ $PROGRAM -f -B -P $PIDFILE
+ fi
+ evaluate_retval
+}
+
+stop() {
+ echo "Stopping $NAME"
+ if [ -e $PIDFILE ] ; then
+ PID=`cat $PIDFILE`
+ kill -9 $PID && rm -f $PIDFILE;
+ else
+ echo "$NAME not running";
+ fi
+ evaluate_retval
+}
diff --git a/video-libs/libmpeg2/CONFLICTS b/video-libs/libmpeg2/CONFLICTS
index 34f1450..7565348 100755
--- a/video-libs/libmpeg2/CONFLICTS
+++ b/video-libs/libmpeg2/CONFLICTS
@@ -1 +1,2 @@
-conflicts mpeg2dec y
+conflicts mpeg2dec y &&
+conflicts electricsheep y
diff --git a/video-libs/libmpeg2/HISTORY b/video-libs/libmpeg2/HISTORY
index 4d5e140..529020c 100644
--- a/video-libs/libmpeg2/HISTORY
+++ b/video-libs/libmpeg2/HISTORY
@@ -1,3 +1,7 @@
+2012-01-05 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
+ * CONFLICTS: added conflict with electricsheep since
+ libmpeg2 as well as electricsheep install mpeg2.h
+
2011-10-14 Bor Kraljič <pyrobor AT ver.si>
* DETAILS: fixed long description wrap (scripted)