diff -Naur kde35-sources.orig/kde/KDE.options kde35-sources/kde/KDE.options
--- kde35-sources.orig/kde/KDE.options	2011-05-09 11:31:22.000000000 +0200
+++ kde35-sources/kde/KDE.options	2011-05-16 14:10:21.887996503 +0200
@@ -8,11 +8,11 @@
 fi
 
 if [ -z $ARCH ]; then
-  export ARCH=i486
+  export ARCH=x86_64
 fi
 
 if [ -z $BUILD ]; then
-  export BUILD=olo2
+  export BUILD=3ponce
 fi
 
 # Target arch should be set to i486 for any 32-bit x86, unless
diff -Naur kde35-sources.orig/kde/kdebindings/apply-patches.sh kde35-sources/kde/kdebindings/apply-patches.sh
--- kde35-sources.orig/kde/kdebindings/apply-patches.sh	2011-05-09 11:31:22.000000000 +0200
+++ kde35-sources/kde/kdebindings/apply-patches.sh	2011-05-16 13:32:28.825994520 +0200
@@ -8,3 +8,4 @@
 cat $CWD/Korundum_cpp.diff |patch -p3 || exit 1
 cat $CWD/kdehandlers_cpp.diff |patch -p3 || exit 1
 cat $CWD/python_and_automake.patch |patch -p0 || exit 1
+cat $CWD/python26.patch |patch -p1 || exit 1
diff -Naur kde35-sources.orig/kde/kdebindings/kdebindings.SlackBuild kde35-sources/kde/kdebindings/kdebindings.SlackBuild
--- kde35-sources.orig/kde/kdebindings/kdebindings.SlackBuild	2011-05-09 11:31:22.000000000 +0200
+++ kde35-sources/kde/kdebindings/kdebindings.SlackBuild	2011-05-16 14:10:58.288999676 +0200
@@ -17,12 +17,12 @@
 rm -rf $PKG
 mkdir -p $PKG/usr
 
-if [ ! -e /usr/lib/ruby/$RUBY_VER/i486-linux/ruby.h ]; then
-  ln -s /usr/include/ruby-$RUBY_VER/ruby.h /usr/lib/ruby/$RUBY_VER/i486-linux/
+if [ ! -e /usr/lib${LIBDIRSUFFIX}/ruby/$RUBY_VER/${ARCH}-linux/ruby.h ]; then
+  ln -s /usr/include/ruby-$RUBY_VER/ruby.h /usr/lib${LIBDIRSUFFIX}/ruby/$RUBY_VER/${ARCH}-linux/
 fi
 
-if [ ! -d /usr/lib/ruby/$RUBY_VER/i486-linux/ruby ]; then
-  ln -s /usr/include/ruby-$RUBY_VER/ruby /usr/lib/ruby/$RUBY_VER/i486-linux/
+if [ ! -d /usr/lib/ruby/$RUBY_VER/${ARCH}-linux/ruby ]; then
+  ln -s /usr/include/ruby-$RUBY_VER/ruby /usr/lib${LIBDIRSUFFIX}/ruby/$RUBY_VER/${ARCH}-linux/
 fi
 
 # Avoid a version number in .la files:
@@ -51,6 +51,7 @@
   --disable-debug \
   --program-prefix="" \
   --program-suffix="" \
+  --with-pythondir=/usr/lib${LIBDIRSUFFIX}/python$(python -c 'import sys; print sys.version[:3]') \
   --build=$TARGET-slackware-linux
 
 # Compile perl bindings first due to the vendor_perl:
@@ -60,14 +61,16 @@
 cd ..
 
 # Lately I've needed this big hammer.  I don't know why.
-make
+(
+make -j1
 if [ ! $? = 0 ]; then
   mkdir -p smoke/qt/generate.pl.tmpdir
   cp -a smoke/qt/* smoke/qt/generate.pl.tmpdir
   # Also, no use of $NUMJOBS on kdebindings, as it has caused
   # compiles to fail in the past...
-  make || exit 1
+  make -j1 || exit 1
 fi
+)
 
 ## This was the old failsafe.  But it's just safer not to play.
 #if [ ! $? = 0 ]; then
diff -Naur kde35-sources.orig/kde/kdebindings/python26.patch kde35-sources/kde/kdebindings/python26.patch
--- kde35-sources.orig/kde/kdebindings/python26.patch	1970-01-01 01:00:00.000000000 +0100
+++ kde35-sources/kde/kdebindings/python26.patch	2011-05-16 13:15:13.628000323 +0200
@@ -0,0 +1,28 @@
+--- kdebindings-3.5.10.orig/configure	2008-08-20 17:38:18.000000000 +0200
++++ kdebindings-3.5.10/configure	2011-05-16 13:14:08.781000686 +0200
+@@ -34765,10 +34765,10 @@
+ 
+ 
+ 
+-if test -z ""2.5""; then
++if test -z ""2.6""; then
+   version="1.5"
+ else
+-  version=""2.5""
++  version=""2.6""
+ fi
+ 
+ { echo "$as_me:$LINENO: checking for Python$version" >&5
+@@ -44806,10 +44806,10 @@
+ 
+ 
+ 
+-if test -z ""2.5""; then
++if test -z ""2.6""; then
+   version="1.5"
+ else
+-  version=""2.5""
++  version=""2.6""
+ fi
+ 
+ { echo "$as_me:$LINENO: checking for Python$version" >&5
diff -Naur kde35-sources.orig/kde/kdepim/local.options kde35-sources/kde/kdepim/local.options
--- kde35-sources.orig/kde/kdepim/local.options	2011-05-09 11:31:22.000000000 +0200
+++ kde35-sources/kde/kdepim/local.options	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-BUILD=olo3
\ No newline at end of file
diff -Naur kde35-sources.orig/kde/kdeutils/apply-patches.sh kde35-sources/kde/kdeutils/apply-patches.sh
--- kde35-sources.orig/kde/kdeutils/apply-patches.sh	2011-05-09 11:31:22.000000000 +0200
+++ kde35-sources/kde/kdeutils/apply-patches.sh	2011-05-13 13:08:23.923000083 +0200
@@ -1,3 +1,4 @@
 cat $CWD/kdeutils_svn.diff | patch -p4 --verbose || exit 1
 cat $CWD/kdeutils_ark_xz_lmza_support.diff | patch -p4 --verbose || exit 1
 cat $CWD/python_and_automake.patch | patch -p0 --verbose || exit 1
+cat $CWD/kdeutils_superkaramba.patch | patch -p0 --verbose || exit 1
diff -Naur kde35-sources.orig/kde/kdeutils/kdeutils_superkaramba.patch kde35-sources/kde/kdeutils/kdeutils_superkaramba.patch
--- kde35-sources.orig/kde/kdeutils/kdeutils_superkaramba.patch	1970-01-01 01:00:00.000000000 +0100
+++ kde35-sources/kde/kdeutils/kdeutils_superkaramba.patch	2011-05-13 13:07:39.770994589 +0200
@@ -0,0 +1,22 @@
+--- superkaramba/src/meter_python.cpp~	2005-11-19 11:02:55.000000000 +0100
++++ superkaramba/src/meter_python.cpp	2010-03-13 13:36:14.000000000 +0100
+@@ -12,7 +12,7 @@
+ #undef _XOPEN_SOURCE
+ #endif
+ 
+-#include <Python.h>
++#include <python2.6/Python.h>
+ #include <qobject.h>
+ #include "karamba.h"
+ #include "karambaapp.h"
+--- superkaramba/src/bar_python.cpp~	2006-01-19 17:49:35.000000000 +0100
++++ superkaramba/src/bar_python.cpp	2010-03-13 13:05:25.000000000 +0100
+@@ -24,7 +24,7 @@
+ #undef _XOPEN_SOURCE
+ #endif
+ 
+-#include <Python.h>
++#include <python2.6/Python.h>
+ #include <qobject.h>
+ #include "karamba.h"
+ #include "meter.h"
diff -Naur kde35-sources.orig/kde/kdeutils/local.options kde35-sources/kde/kdeutils/local.options
--- kde35-sources.orig/kde/kdeutils/local.options	2011-05-09 11:31:22.000000000 +0200
+++ kde35-sources/kde/kdeutils/local.options	1970-01-01 01:00:00.000000000 +0100
@@ -1 +0,0 @@
-BUILD=olo3
diff -Naur kde35-sources.orig/l/arts/arts.SlackBuild kde35-sources/l/arts/arts.SlackBuild
--- kde35-sources.orig/l/arts/arts.SlackBuild	2011-05-09 11:31:22.000000000 +0200
+++ kde35-sources/l/arts/arts.SlackBuild	2011-05-12 10:03:32.876002945 +0200
@@ -4,8 +4,9 @@
 PKG=$TMP/package-arts
 
 VERSION=${VERSION:-1.5.10}
-ARCH=${ARCH:-i486}
-BUILD=${BUILD:-olo2}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-2}
+TAG=${TAG:-ponce}
 
 rm -rf $PKG
 mkdir -p $PKG/usr
@@ -14,6 +15,9 @@
 if [ -d /opt/kde/lib/qt3 ]; then
   QTDIR=/opt/kde/lib/qt3
 fi
+if [ -d /opt/kde/lib64/qt3 ]; then
+  QTDIR=/opt/kde/lib64/qt3
+fi
 cd $TMP
 echo "Building arts-$VERSION.tar.bz2..."
 tar xvf $CWD/arts-$VERSION.tar.bz2
@@ -32,7 +36,7 @@
   --program-prefix="" \
   --program-suffix="" \
   --build=$ARCH-slackware-linux
-make -j3 || exit 1
+make -j2 || exit 1
 make install DESTDIR=$PKG
 mkdir -p $PKG/usr/doc/arts-$VERSION
 cp -a \
@@ -49,5 +53,5 @@
 fi
 
 cd $PKG
-makepkg -l y -c n ../arts-$VERSION-$ARCH-$BUILD.txz
+makepkg -l y -c n ../arts-$VERSION-$ARCH-$BUILD$TAG.txz
 
diff -Naur kde35-sources.orig/l/dbus-qt3/dbus-qt3.SlackBuild kde35-sources/l/dbus-qt3/dbus-qt3.SlackBuild
--- kde35-sources.orig/l/dbus-qt3/dbus-qt3.SlackBuild	2011-05-09 11:31:22.000000000 +0200
+++ kde35-sources/l/dbus-qt3/dbus-qt3.SlackBuild	2011-05-12 10:00:58.381001073 +0200
@@ -19,8 +19,10 @@
 
 PRGNAM=dbus-qt3
 VERSION=0.70
-ARCH=${ARCH:-i486}
-BUILD=${BUILD:-olo2}
+ARCH=${ARCH:-x86_64}
+BUILD=${BUILD:-2}
+TAG=${TAG:-ponce}
+NUMJOBS=${NUMJOBS:--j2}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -60,7 +62,7 @@
   --build=$ARCH-slackware-linux \
   --with-qt3-moc=/opt/kde/lib${LIBDIRSUFFIX}/qt3/bin/moc
 
-make -j3 || exit 1
+make $NUMJOBS || exit 1
 make install DESTDIR=$PKG
 
 ( cd $PKG
@@ -75,4 +77,4 @@
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.txz
diff -Naur kde35-sources.orig/l/poppler/poppler.SlackBuild kde35-sources/l/poppler/poppler.SlackBuild
--- kde35-sources.orig/l/poppler/poppler.SlackBuild	2011-05-09 11:31:22.000000000 +0200
+++ kde35-sources/l/poppler/poppler.SlackBuild	2011-05-12 09:55:56.693999981 +0200
@@ -23,7 +23,8 @@
 
 PKGNAM=poppler
 VERSION=${VERSION:-$(echo $PKGNAM-*.tar.?z* | rev | cut -f 3- -d . | cut -f 1 -d - | rev)}
-BUILD=${BUILD:-olo1}
+BUILD=${BUILD:-1}
+TAG=${TAG:-ponce}
 
 PKG_CONFIG_PATH=${PKG_CONFIG_PATH}:/opt/kde/lib${LIBDIRSUFFIX}/pkgconfig
 
@@ -37,7 +38,7 @@
   esac
 fi
 
-NUMJOBS=${NUMJOBS:-" -j3 "}
+NUMJOBS=${NUMJOBS:-" -j2 "}
 
 if [ "$ARCH" = "i486" ]; then
   SLKCFLAGS="-O2 -march=i486 -mtune=i686"
@@ -70,14 +71,16 @@
  \( -perm 666 -o -perm 664 -o -perm 600 -o -perm 444 -o -perm 440 -o -perm 400 \) \
  -exec chmod 644 {} \;
 
+#LDDFLAGS="-L/opt/kde/lib${LIBDIRSUFFIX} -L/usr/lib${LIBDIRSUFFIX}" \
+#CPPFLAGS="-I/opt/kde/lib${LIBDIRSUFFIX}/qt3/include" \
 CFLAGS="$SLKCFLAGS" \
 ./configure \
   --prefix=/usr \
   --libdir=/usr/lib${LIBDIRSUFFIX} \
   --sysconfdir=/etc \
   --enable-xpdf-headers \
-  --enable-poppler-qt4 \
   --enable-poppler-qt \
+  --enable-poppler-qt4 \
   --enable-cairo-output \
   --mandir=/usr/man \
   --disable-static \
@@ -122,5 +125,5 @@
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD$TAG.txz
 
diff -Naur kde35-sources.orig/l/qca-tls1/qca-tls1.SlackBuild kde35-sources/l/qca-tls1/qca-tls1.SlackBuild
--- kde35-sources.orig/l/qca-tls1/qca-tls1.SlackBuild	2011-05-09 11:31:22.000000000 +0200
+++ kde35-sources/l/qca-tls1/qca-tls1.SlackBuild	2011-05-09 16:46:47.923999929 +0200
@@ -23,13 +23,12 @@
 PKGNAM=qca-tls
 VERSION=1.0
 ARCH=${ARCH:-i486}
-BUILD=olo2
-
+BUILD=${BUILD:-1}
+TAG=${TAG:-ponce}
 
 CWD=`pwd`
-if [ "$TMP" = "" ]; then
-  TMP=/tmp
-fi
+TMP=/tmp
+OUTPUT=/tmp
 PKG=$TMP/package-${PKGNAM}
 rm -rf $PKG
 mkdir -p $PKG
@@ -128,5 +127,5 @@
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $TMP/package-${PKGNAM}
-makepkg -l y -c n ../qca-tls1-$VERSION-$ARCH-$BUILD.txz
+makepkg -l y -c n ../qca-tls1-$VERSION-$ARCH-$BUILD$TAG.txz
 
diff -Naur kde35-sources.orig/l/qca1/qca1.SlackBuild kde35-sources/l/qca1/qca1.SlackBuild
--- kde35-sources.orig/l/qca1/qca1.SlackBuild	2011-05-09 11:31:22.000000000 +0200
+++ kde35-sources/l/qca1/qca1.SlackBuild	2011-05-12 09:17:00.178002242 +0200
@@ -23,13 +23,13 @@
 PKGNAM=qca
 VERSION=1.0
 ARCH=${ARCH:-i486}
-BUILD=olo2
-
+BUILD=${BUILD:-1}
+TAG=${TAG:-ponce}
+NUMJOBS=${NUMJOBS:--j2}
 
 CWD=`pwd`
-if [ "$TMP" = "" ]; then
-  TMP=/tmp
-fi
+TMP=/tmp
+OUTPUT=/tmp
 PKG=$TMP/package-${PKGNAM}
 rm -rf $PKG
 mkdir -p $PKG
@@ -76,7 +76,7 @@
   --prefix=/opt/kde \
   --qtdir=/opt/kde/lib${LIBDIRSUFFIX}/qt3
 # Build and install:
-make -j3 || exit 1
+make $NUMJOBS || exit 1
 make install INSTALL_ROOT=$PKG || exit 1
 
 if [ "$LIBDIRSUFFIX" = "64" ]; then
@@ -85,6 +85,9 @@
   rmdir $PKG/opt/kde/lib
 fi
 
+mkdir -p $PKG/opt/kde/lib${LIBDIRSUFFIX}/qt3
+mv $PKG/opt/kde/include $PKG/opt/kde/lib${LIBDIRSUFFIX}/qt3/include
+
 # Strip binaries:
 ( cd $PKG
   find . | xargs file | grep "executable" | grep ELF | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null
@@ -124,5 +127,5 @@
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $TMP/package-${PKGNAM}
-makepkg -l y -c n ../qca1-$VERSION-$ARCH-$BUILD.txz
+makepkg -l y -c n $OUTPUT/qca1-$VERSION-$ARCH-$BUILD$TAG.txz
 
diff -Naur kde35-sources.orig/l/qt3/qt3.SlackBuild kde35-sources/l/qt3/qt3.SlackBuild
--- kde35-sources.orig/l/qt3/qt3.SlackBuild	2011-05-09 11:31:22.000000000 +0200
+++ kde35-sources/l/qt3/qt3.SlackBuild	2011-05-09 16:19:24.306000010 +0200
@@ -25,8 +25,9 @@
 PKGNAM=qt3
 VERSION=${VERSION:-3.3.8b}
 ARCH=${ARCH:-i486}
-NUMJOBS=${NUMJOBS:-" -j3 "}
-BUILD=${BUILD:-olo4}
+NUMJOBS=${NUMJOBS:-" -j2 "}
+BUILD=${BUILD:-1}
+TAG=${TAG:-ponce}
 
 CWD=$(pwd)
 TMP=${TMP:-/tmp}
@@ -204,5 +205,5 @@
 cat $CWD/slack-desc > $PKG/install/slack-desc
 
 cd $PKG
-/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD.txz
+/sbin/makepkg -l y -c n $TMP/${PKGNAM}-$VERSION-$ARCH-$BUILD$TAG.txz