Added arch directory for cmorrison

45 files changed, 3410 insertions, 0 deletions

diff --git a/arch/master/trinity-app-amarok/PKGBUILD b/arch/master/trinity-app-amarok/PKGBUILD
new file mode 100644
index 000000000..007ccbb58
--- /dev/null
+++ b/arch/master/trinity-app-amarok/PKGBUILD
@@ -0,0 +1,100 @@
+# $Id$
+# Maintainer: David C. Rankin <drankinatty@gmail.com>
+#
+# All modifications and uses of this file are licensed under
+# the software for which this file was made for, should the software
+# be under an Open Source License, at least version 1.9, defined
+# by the Open Source Initiative. In other cases, this file is automatically
+# released to the Public Domain.
+#
+
+pkgbase=trinity
+pkgname=trinity-app-amarok
+pkgver=1236712
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL')
+groups=('trinity')
+pkgdesc="Trinity - amarok"
+depends=('trinity-kdebase' 'libifp' 'libmtp' 'libnjb' 'python-daap')
+makedepends=('pkgconfig' 'cmake' 'autoconf' 'subversion' 'imake')
+provides=('trinity-app-amarok')
+conflicts=('trinity-app-amarok')
+replaces=('trinity-app-amarok')
+options=('libtool' '!strip')
+source=()
+
+_svnmod=amarok
+_svntrunk="svn://anonsvn.kde.org/home/kde/branches/trinity/applications/${_svnmod}"
+
+build() {
+
+  cd ${srcdir}
+
+  msg "Connecting to SVN server to update or checkout ${_svnmod}...."
+  if [ -d ${_svnmod}/.svn ]; then
+    (cd ${_svnmod} && svn up)
+    [[ $? -eq 0 ]] || _co_failed=1
+  else
+    (svn co $_svntrunk ${_svnmod})
+    [[ $? -eq 0 ]] || _co_failed=1
+  fi
+
+  # if update or checkout failed - bail...
+  if [[ $_co_failed -ne 1 ]]; then
+    msg "SVN checkout of revision $pkgver -- Complete."
+  else
+    msg "SVN checkout of revision $pkgver -- Failed or server timeout."
+    exit 1
+  fi
+
+  msg "Setting PATH, CMAKE and Trinity Environment variables"
+  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
+  export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:\
+/usr/include/dbus-1.0:\
+/opt/trinity/include
+  export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=:/opt/qt/lib/pkgconfig
+#   export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig
+# /opt/qt/include:\
+
+#   cd ${srcdir}/${_svnmod}
+
+  trinity_prefix="/opt/trinity"
+
+  cd $srcdir
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p build
+  cd build
+
+  # Baho additions
+  CFLAGS=${CFLAGS}" -fpermissive"
+  CXXFLAGS=${CXXFLAGS}" -fpermissive"
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_svnmod} \
+    -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DQT_VERSION=3 \
+    -DWITH_IFP=ON \
+    -DWITH_NJB=ON \
+    -DWITH_MTP=ON \
+    -DWITH_DAAP=ON \
+    -DBUILD_ALL=ON
+  make
+#     -DWITH_QT3=ON \
+#     -DQTDIR=/opt/qt \
+#     -DQT_DOCDIR=/opt/qt/man \
+#     -DQT_LIBRARY_DIRS=/opt/qt/lib \
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+#   cd ${srcdir}/${_svnmod}
+  cd ${srcdir}/build
+
+  make DESTDIR="$pkgdir/" install
+
+#   rm -r ${srcdir}/${_svnmod}
+}
diff --git a/arch/master/trinity-app-d3lphin/PKGBUILD b/arch/master/trinity-app-d3lphin/PKGBUILD
new file mode 100644
index 000000000..301d662e0
--- /dev/null
+++ b/arch/master/trinity-app-d3lphin/PKGBUILD
@@ -0,0 +1,91 @@
+# $Id$
+# Maintainer: David C. Rankin <drankinatty@gmail.com>
+#
+# All modifications and uses of this file are licensed under
+# the software for which this file was made for, should the software
+# be under an Open Source License, at least version 1.9, defined
+# by the Open Source Initiative. In other cases, this file is automatically
+# released to the Public Domain.
+#
+
+pkgbase=trinity
+pkgname=trinity-app-d3lphin
+pkgver=1229360
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL')
+groups=('trinity')
+pkgdesc="Trinity - d3lphin"
+depends=('trinity-kdebase')
+makedepends=('pkgconfig' 'cmake' 'autoconf' 'subversion' 'imake')
+provides=('trinity-app-d3lphin')
+conflicts=('trinity-app-d3lphin')
+replaces=('trinity-app-d3lphin')
+options=('libtool' '!strip')
+
+_svnmod=dolphin
+_svntrunk="svn://anonsvn.kde.org/home/kde/branches/trinity/applications/${_svnmod}"
+
+build() {
+
+  cd ${srcdir}
+
+  msg "Connecting to SVN server to update or checkout ${_svnmod}...."
+  if [ -d ${_svnmod}/.svn ]; then
+    (cd ${_svnmod} && svn up)
+    [[ $? -eq 0 ]] || _co_failed=1
+  else
+    (svn co $_svntrunk ${_svnmod})
+    [[ $? -eq 0 ]] || _co_failed=1
+  fi
+
+  # if update or checkout failed - bail...
+  if [[ $_co_failed -ne 1 ]]; then
+    msg "SVN checkout of revision $pkgver -- Complete."
+  else
+    msg "SVN checkout of revision $pkgver -- Failed or server timeout."
+    exit 1
+  fi
+
+  msg "Setting PATH, CMAKE and Trinity Environment variables"
+  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
+  export CMAKE_INCLUDE_PATH=/opt/qt/include:\
+/opt/qt/include/tqt:\
+/usr/include/dbus-1.0:\
+/opt/trinity/include:\
+/opt/trinity/include/libkrandr
+  export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig
+
+#   cd ${srcdir}/${_svnmod}
+
+  trinity_prefix="/opt/trinity"
+
+  cd $srcdir
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p build
+  cd build
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_svnmod} \
+    -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DQT_VERSION=3 \
+    -DWITH_QT3=ON \
+    -DQTDIR=/opt/qt \
+    -DQT_DOCDIR=/opt/qt/man \
+    -DQT_LIBRARY_DIRS=/opt/qt/lib \
+    -DBUILD_ALL=ON
+  make
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+#   cd ${srcdir}/${_svnmod}
+  cd ${srcdir}/build
+
+  make DESTDIR="$pkgdir/" install
+
+#   rm -r ${srcdir}/${_svnmod}
+}
diff --git a/arch/master/trinity-app-gtk-qt-engine/PKGBUILD b/arch/master/trinity-app-gtk-qt-engine/PKGBUILD
new file mode 100644
index 000000000..5395136da
--- /dev/null
+++ b/arch/master/trinity-app-gtk-qt-engine/PKGBUILD
@@ -0,0 +1,98 @@
+# $Id$
+# Maintainer: David C. Rankin <drankinatty@gmail.com>
+#
+# All modifications and uses of this file are licensed under
+# the software for which this file was made for, should the software
+# be under an Open Source License, at least version 1.9, defined
+# by the Open Source Initiative. In other cases, this file is automatically
+# released to the Public Domain.
+#
+
+pkgbase=trinity
+pkgname=trinity-app-gtk-qt-engine
+pkgver=1230499
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL')
+groups=('trinity')
+pkgdesc="Trinity - kdevelop"
+depends=('trinity-kdebase')
+makedepends=('pkgconfig' 'cmake' 'autoconf' 'subversion' 'imake')
+provides=('trinity-app-gtk-qt-engine')
+conflicts=('trinity-app-gtk-qt-engine')
+replaces=('trinity-app-gtk-qt-engine')
+options=('libtool' '!strip')
+# temporary constructor patch
+source=()
+# source=('gtk-qt-engine-const.patch')
+# md5sums=('38fa848299c86f6b986ab22262857db7')
+
+_svnmod=gtk-qt-engine
+_svntrunk="svn://anonsvn.kde.org/home/kde/branches/trinity/applications/${_svnmod}"
+
+build() {
+
+  cd ${srcdir}
+
+  msg "Connecting to SVN server to update or checkout ${_svnmod}...."
+  if [ -d ${_svnmod}/.svn ]; then
+    (cd ${_svnmod} && svn up)
+    [[ $? -eq 0 ]] || _co_failed=1
+  else
+    (svn co $_svntrunk ${_svnmod})
+    [[ $? -eq 0 ]] || _co_failed=1
+  fi
+
+  # if update or checkout failed - bail...
+  if [[ $_co_failed -ne 1 ]]; then
+    msg "SVN checkout of revision $pkgver -- Complete."
+  else
+    msg "SVN checkout of revision $pkgver -- Failed or server timeout."
+    exit 1
+  fi
+
+  msg "Setting PATH, CMAKE and Trinity Environment variables"
+  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
+  export CMAKE_INCLUDE_PATH=/opt/qt/include:\
+/opt/qt/include/tqt:\
+/usr/include/dbus-1.0:\
+/opt/trinity/include:\
+/opt/trinity/include/libkrandr
+  export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig
+
+#   cd ${srcdir}/${_svnmod}
+
+#   # temporary constructor patch
+#   patch -p0 -i ${srcdir}/gtk-qt-engine-const.patch || return 1
+
+  trinity_prefix="/opt/trinity"
+
+  cd $srcdir
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p build
+  cd build
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_svnmod} \
+    -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DQT_VERSION=3 \
+    -DWITH_QT3=ON \
+    -DQTDIR=/opt/qt \
+    -DQT_DOCDIR=/opt/qt/man \
+    -DQT_LIBRARY_DIRS=/opt/qt/lib \
+    -DBUILD_ALL=ON
+  make
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+#   cd ${srcdir}/${_svnmod}
+  cd ${srcdir}/build
+
+  make DESTDIR="$pkgdir/" install
+
+#   rm -r ${srcdir}/${_svnmod}
+}
diff --git a/arch/master/trinity-app-knetworkmanager/PKGBUILD b/arch/master/trinity-app-knetworkmanager/PKGBUILD
new file mode 100644
index 000000000..2f38c7e58
--- /dev/null
+++ b/arch/master/trinity-app-knetworkmanager/PKGBUILD
@@ -0,0 +1,92 @@
+# $Id$
+# Maintainer: David C. Rankin <drankinatty@gmail.com>
+#
+# All modifications and uses of this file are licensed under
+# the software for which this file was made for, should the software
+# be under an Open Source License, at least version 1.9, defined
+# by the Open Source Initiative. In other cases, this file is automatically
+# released to the Public Domain.
+#
+
+pkgbase=trinity
+pkgname=trinity-app-knetworkmanager
+pkgver=1228921
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL')
+groups=('trinity')
+pkgdesc="Trinity - knetworkmanager"
+depends=('trinity-kdebase')
+#         'trinity-dbus-1-qt3')
+makedepends=('pkgconfig' 'cmake' 'autoconf' 'subversion' 'imake')
+provides=('trinity-app-knetworkmanager')
+conflicts=('trinity-app-knetworkmanager')
+replaces=('trinity-app-knetworkmanager')
+options=('libtool' '!strip')
+
+_svnmod=knetworkmanager
+_svntrunk="svn://anonsvn.kde.org/home/kde/branches/trinity/applications/${_svnmod}"
+
+build() {
+
+  cd ${srcdir}
+
+  msg "Connecting to SVN server to update or checkout ${_svnmod}...."
+  if [ -d ${_svnmod}/.svn ]; then
+    (cd ${_svnmod} && svn up)
+    [[ $? -eq 0 ]] || _co_failed=1
+  else
+    (svn co $_svntrunk ${_svnmod})
+    [[ $? -eq 0 ]] || _co_failed=1
+  fi
+
+  # if update or checkout failed - bail...
+  if [[ $_co_failed -ne 1 ]]; then
+    msg "SVN checkout of revision $pkgver -- Complete."
+  else
+    msg "SVN checkout of revision $pkgver -- Failed or server timeout."
+    exit 1
+  fi
+
+  msg "Setting PATH, CMAKE and Trinity Environment variables"
+  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
+  export CMAKE_INCLUDE_PATH=/opt/qt/include:\
+/opt/qt/include/tqt:\
+/usr/include/dbus-1.0:\
+/opt/trinity/include:\
+/opt/trinity/include/libkrandr
+  export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:/usr/lib:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig
+
+#   cd ${srcdir}/${_svnmod}
+
+  trinity_prefix="/opt/trinity"
+
+  cd $srcdir
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p build
+  cd build
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_svnmod} \
+    -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DQT_VERSION=3 \
+    -DWITH_QT3=ON \
+    -DQTDIR=/opt/qt \
+    -DQT_DOCDIR=/opt/qt/man \
+    -DQT_LIBRARY_DIRS=/opt/qt/lib \
+    -DBUILD_ALL=ON
+  make
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+#   cd ${srcdir}/${_svnmod}
+  cd ${srcdir}/build
+
+  make DESTDIR="$pkgdir/" install
+
+#   rm -r ${srcdir}/${_svnmod}
+}
diff --git a/arch/master/trinity-app-kpowersave/PKGBUILD b/arch/master/trinity-app-kpowersave/PKGBUILD
new file mode 100644
index 000000000..e22be46af
--- /dev/null
+++ b/arch/master/trinity-app-kpowersave/PKGBUILD
@@ -0,0 +1,96 @@
+# $Id$
+# Maintainer: David C. Rankin <drankinatty@gmail.com>
+#
+# All modifications and uses of this file are licensed under
+# the software for which this file was made for, should the software
+# be under an Open Source License, at least version 1.9, defined
+# by the Open Source Initiative. In other cases, this file is automatically
+# released to the Public Domain.
+#
+
+pkgbase=trinity
+pkgname=trinity-app-kpowersave
+pkgver=1236712
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL')
+groups=('trinity')
+pkgdesc="Trinity - kpowersave"
+depends=('xscreensaver'
+        'libxss'
+        'trinity-kdebase')
+makedepends=('pkgconfig' 'cmake' 'autoconf' 'subversion' 'imake')
+provides=('trinity-app-kpowersave')
+conflicts=('trinity-app-kpowersave')
+replaces=('trinity-app-kpowersave')
+options=('libtool' '!strip')
+
+_svnmod=kpowersave
+_svntrunk="svn://anonsvn.kde.org/home/kde/branches/trinity/applications/${_svnmod}"
+
+build() {
+
+  cd ${srcdir}
+
+  msg "Connecting to SVN server to update or checkout ${_svnmod}...."
+  if [ -d ${_svnmod}/.svn ]; then
+    (cd ${_svnmod} && svn up)
+    [[ $? -eq 0 ]] || _co_failed=1
+  else
+    (svn co $_svntrunk ${_svnmod})
+    [[ $? -eq 0 ]] || _co_failed=1
+  fi
+
+  # if update or checkout failed - bail...
+  if [[ $_co_failed -ne 1 ]]; then
+    msg "SVN checkout of revision $pkgver -- Complete."
+  else
+    msg "SVN checkout of revision $pkgver -- Failed or server timeout."
+    exit 1
+  fi
+
+  msg "Setting PATH, CMAKE and Trinity Environment variables"
+  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
+  export CMAKE_INCLUDE_PATH=/opt/qt/include:\
+/opt/qt/include/tqt:\
+/usr/include/dbus-1.0:\
+/opt/trinity/include:\
+/opt/trinity/include/libkrandr
+  export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig
+
+#   cd ${srcdir}/${_svnmod}
+
+  # patch for inactivity.cpp
+#   patch -p0 -i ${srcdir}/kpowersave-app-inactivity.cpp.patch || return 1
+
+  trinity_prefix="/opt/trinity"
+
+  cd $srcdir
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p build
+  cd build
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_svnmod} \
+    -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DQT_VERSION=3 \
+    -DWITH_QT3=ON \
+    -DQTDIR=/opt/qt \
+    -DQT_DOCDIR=/opt/qt/man \
+    -DQT_LIBRARY_DIRS=/opt/qt/lib \
+    -DBUILD_ALL=ON
+  make
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+#   cd ${srcdir}/${_svnmod}
+  cd ${srcdir}/build
+
+  make DESTDIR="$pkgdir/" install
+
+#   rm -r ${srcdir}/${_svnmod}
+}
diff --git a/arch/master/trinity-app-kpowersave/kpowersave-inactivity.cpp.patch b/arch/master/trinity-app-kpowersave/kpowersave-inactivity.cpp.patch
new file mode 100644
index 000000000..08645af32
--- /dev/null
+++ b/arch/master/trinity-app-kpowersave/kpowersave-inactivity.cpp.patch
@@ -0,0 +1,11 @@
+--- kpowersave/src/inactivity.cpp
++++ kpowersave/src/inactivity.cpp	2011-03-12 18:40:52.000000000 -0600
+@@ -325,7 +325,7 @@
+ 		blacklisted_running = false;
+ 	} 
+ 	else {
+-		if (pids.contains(QRegExp::QRegExp("[0-9]"))) {
++		if (pids.contains(QRegExp("[0-9]"))) {
+ 			kdDebug() << "BLACKLISTED IS RUNNING" << endl;
+ 			blacklisted_running = true;
+ 			blacklisted_running_last = idleTime;
diff --git a/arch/master/trinity-app-style-qtcurve/PKGBUILD b/arch/master/trinity-app-style-qtcurve/PKGBUILD
new file mode 100644
index 000000000..8e3164dc8
--- /dev/null
+++ b/arch/master/trinity-app-style-qtcurve/PKGBUILD
@@ -0,0 +1,91 @@
+# $Id$
+# Maintainer: David C. Rankin <drankinatty@gmail.com>
+#
+# All modifications and uses of this file are licensed under
+# the software for which this file was made for, should the software
+# be under an Open Source License, at least version 1.9, defined
+# by the Open Source Initiative. In other cases, this file is automatically
+# released to the Public Domain.
+#
+
+pkgbase=trinity
+pkgname=trinity-app-style-qtcurve
+pkgver=1230758
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL')
+groups=('trinity')
+pkgdesc="Trinity - kde style qtcurve"
+depends=('trinity-kdebase')
+makedepends=('pkgconfig' 'cmake' 'autoconf' 'subversion' 'imake')
+provides=('trinity-app-style-qtcurve')
+conflicts=('trinity-app-style-qtcurve')
+replaces=('trinity-app-style-qtcurve')
+options=('libtool' '!strip')
+
+_svnmod=kde-style-qtcurve
+_svntrunk="svn://anonsvn.kde.org/home/kde/branches/trinity/applications/${_svnmod}"
+
+build() {
+
+  cd ${srcdir}
+
+  msg "Connecting to SVN server to update or checkout ${_svnmod}...."
+  if [ -d ${_svnmod}/.svn ]; then
+    (cd ${_svnmod} && svn up)
+    [[ $? -eq 0 ]] || _co_failed=1
+  else
+    (svn co $_svntrunk ${_svnmod})
+    [[ $? -eq 0 ]] || _co_failed=1
+  fi
+
+  # if update or checkout failed - bail...
+  if [[ $_co_failed -ne 1 ]]; then
+    msg "SVN checkout of revision $pkgver -- Complete."
+  else
+    msg "SVN checkout of revision $pkgver -- Failed or server timeout."
+    exit 1
+  fi
+
+  msg "Setting PATH, CMAKE and Trinity Environment variables"
+  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
+  export CMAKE_INCLUDE_PATH=/opt/qt/include:\
+/opt/qt/include/tqt:\
+/usr/include/dbus-1.0:\
+/opt/trinity/include:\
+/opt/trinity/include/libkrandr
+  export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig
+
+#   cd ${srcdir}/${_svnmod}
+
+  trinity_prefix="/opt/trinity"
+
+  cd $srcdir
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p build
+  cd build
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_svnmod} \
+    -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DQT_VERSION=3 \
+    -DWITH_QT3=ON \
+    -DQTDIR=/opt/qt \
+    -DQT_DOCDIR=/opt/qt/man \
+    -DQT_LIBRARY_DIRS=/opt/qt/lib \
+    -DBUILD_ALL=ON
+  make
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+#   cd ${srcdir}/${_svnmod}
+  cd ${srcdir}/build
+
+  make DESTDIR="$pkgdir/" install
+
+#   rm -r ${srcdir}/${_svnmod}
+}
diff --git a/arch/master/trinity-arts/PKGBUILD b/arch/master/trinity-arts/PKGBUILD
new file mode 100644
index 000000000..a88f7a822
--- /dev/null
+++ b/arch/master/trinity-arts/PKGBUILD
@@ -0,0 +1,105 @@
+# $Id$
+# Maintainer: David C. Rankin <drankinatty@gmail.com>
+#
+# All modifications and uses of this file are licensed under
+# the software for which this file was made for, should the software
+# be under an Open Source License, at least version 1.9, defined
+# by the Open Source Initiative. In other cases, this file is automatically
+# released to the Public Domain.
+#
+
+pkgbase=trinity
+pkgname=trinity-arts
+pkgver=1236201
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL')
+groups=('trinity')
+pkgdesc="Trinity - arts"
+depends=('audiofile'
+        'alsa-lib'
+        'libmad'
+	'libvorbis'
+	'trinity-tqtinterface')
+makedepends=('pkgconfig' 'cmake' 'autoconf')
+provides=('trinity-arts')
+conflicts=('trinity-arts')
+replaces=('trinity-arts')
+options=('libtool' '!strip')
+source=()
+
+_svnmod=arts
+_svntrunk="svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/${_svnmod}"
+
+# set Qt location (not needed if profile.d/q3.sh present, set prefix (not used)
+_qtdir=/opt/qt
+_prefix=${_qtdir}
+
+build() {
+
+  cd ${srcdir}
+
+  msg "Connecting to SVN server to update or checkout ${_svnmod}...."
+  if [ -d ${_svnmod}/.svn ]; then
+    (cd ${_svnmod} && svn up)
+    [[ $? -eq 0 ]] || _co_failed=1
+  else
+    (svn co $_svntrunk ${_svnmod})
+    [[ $? -eq 0 ]] || _co_failed=1
+  fi
+
+  cd ${srcdir}/${_svnmod}
+
+  # if update or checkout failed - bail...
+  if [[ $_co_failed -ne 1 ]]; then
+    msg "SVN checkout of revision $pkgver -- Complete."
+  else
+    msg "SVN checkout of revision $pkgver -- Failed or server timeout."
+    exit 1
+  fi
+
+#   cd ${srcdir}/${_svnmod}
+
+  msg "Setting PATH, CMAKE and Trinity Environment variables"
+  if [[ -r /etc/profile.d/qt3.sh ]]; then
+    . /etc/profile.d/qt3.sh
+    [[ -n $QTDIR ]] && _qtdir=$QTDIR
+  else
+    [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH
+  fi
+
+  # exports not required with /opt/qt/include in the right place
+#   export CMAKE_PREFIX_PATH=$QTDIR
+#   export CMAKE_INCLUDE_PATH=/opt/qt/include:/opt/qt/include/tqt
+
+  trinity_prefix="/opt/trinity"
+
+  cd $srcdir
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p build
+  cd build
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_svnmod} \
+    -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
+    -DQT_VERSION=3 || return 1
+
+#     -DQT_VERSION=3 \
+#     -DWITH_QT3=ON \
+#     -DQT_LIBRARY_DIRS=/opt/qt/lib
+
+  make VERBOSE=1
+
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+
+#   cd ${srcdir}/${_svnmod}
+  cd ${srcdir}/build
+
+  make DESTDIR="$pkgdir/" install
+
+#   rm -r ${srcdir}/${_svnmod}
+}
diff --git a/arch/master/trinity-dbus-1-qt3/PKGBUILD b/arch/master/trinity-dbus-1-qt3/PKGBUILD
new file mode 100644
index 000000000..543bada12
--- /dev/null
+++ b/arch/master/trinity-dbus-1-qt3/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id$
+# Maintainer: David C. Rankin <drankinatty@gmail.com>
+
+pkgbase=trinity
+pkgname=trinity-dbus-1-qt3
+pkgver=0.9
+pkgrel=8
+arch=('i686' 'x86_64')
+pkgdesc="DBUS/Qt3 bindings."
+url="http://www.freedesktop.org/wiki/Software/DBusBindings"
+license=('GPL')
+groups=('trinity')
+pkgdesc="Trinity - dbus-1-qt3"
+depends=('dbus' 'trinity-qt3' 'networkmanager')
+provides=('trinity-dbus-1-qt3' 'dbus-1-qt3')
+conflicts=('dbus-1-qt3')
+replaces=('dbus-1-qt3')
+options=('libtool' '!strip')
+source=(http://people.freedesktop.org/~krake/dbus-1-qt3/${pkgname#*trinity-}-${pkgver}.tar.gz)
+md5sums=('8ca3d13c372126aa9b0e16beb0a9d82d')
+
+build() {
+    cd $srcdir/${pkgname#*trinity-}-$pkgver
+
+    . /etc/profile.d/qt3.sh
+    ./configure --prefix=$QTDIR
+    make || return 1
+    make DESTDIR="$pkgdir/" install
+
+    # Libtool slay
+#     find $startdir/pkg -name *.la -exec rm {} \;
+}
diff --git a/arch/master/trinity-dbus-tqt-1/PKGBUILD b/arch/master/trinity-dbus-tqt-1/PKGBUILD
new file mode 100644
index 000000000..e2788dfb9
--- /dev/null
+++ b/arch/master/trinity-dbus-tqt-1/PKGBUILD
@@ -0,0 +1,86 @@
+pkgbase=trinity
+pkgname=trinity-dbus-tqt-1
+pkgver=177
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.trinitydesktop.org'
+license=('GPL')
+groups=('trinity')
+pkgdesc="Trinity - kdebase"
+depends=('trinity-tqtinterface')
+makedepends=('pkgconfig' 'cmake' 'subversion')
+provides=('trinity-dbus-tqt-1')
+conflicts=('trinity-dbus-tqt-1')
+replaces=('trinity-dbus-tqt-1')
+options=('libtool' '!strip')
+source=()
+
+_svnmod=dbus-tqt-1
+_svntrunk="http://svn.trinitydesktop.org/svn/trinity/main/dependencies/${_svnmod}"
+
+_qtdir=/opt/qt
+_prefix="/opt/trinity"
+
+
+build() {
+
+  cd ${srcdir}
+
+  msg "Connecting to SVN server to update or checkout ${_svnmod}...."
+  if [ -d ${_svnmod}/.svn ]; then
+    (cd ${_svnmod} && svn up)
+    [[ $? -eq 0 ]] || _co_failed=1
+  else
+    (svn co $_svntrunk ${_svnmod})
+    [[ $? -eq 0 ]] || _co_failed=1
+  fi
+
+  # if update or checkout failed - bail...
+  if [[ $_co_failed -ne 1 ]]; then
+    msg "SVN checkout of revision $pkgver -- Complete."
+  else
+    msg "SVN checkout of revision $pkgver -- Failed or server timeout."
+    exit 1
+  fi
+
+  msg "Setting PATH, CMAKE and Trinity Environment variables"
+  if [[ -r /etc/profile.d/qt3.sh ]]; then
+    . /etc/profile.d/qt3.sh
+    [[ -n $QTDIR ]] && _qtdir=$QTDIR
+  else
+    [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH
+  fi
+  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
+  export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:\
+/usr/include/dbus-1.0:\
+/opt/trinity/include:\
+/opt/trinity/include/libkrandr
+  export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig
+
+#   cd ${srcdir}/${_svnmod}
+
+  cd $srcdir
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p build
+  cd build
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_svnmod} \
+    -DCMAKE_INSTALL_PREFIX=${_prefix} \
+    -DCMAKE_VERBOSE_MAKEFILE=ON 
+  make
+#     -DWITH_QT3=ON \
+#     -DQTDIR=/opt/qt \
+#     -DQT_LIBRARY_DIRS=/opt/qt/lib \
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+#   cd ${srcdir}/${_svnmod}
+  cd ${srcdir}/build
+
+  make DESTDIR="$pkgdir/" install
+
+  cd ${startdir}
+}
\ No newline at end of file
diff --git a/arch/master/trinity-kdebase/PKGBUILD b/arch/master/trinity-kdebase/PKGBUILD
new file mode 100644
index 000000000..11eee6a3b
--- /dev/null
+++ b/arch/master/trinity-kdebase/PKGBUILD
@@ -0,0 +1,162 @@
+# $Id$
+# Maintainer: David C. Rankin <drankinatty@gmail.com>
+#
+# All modifications and uses of this file are licensed under
+# the software for which this file was made for, should the software
+# be under an Open Source License, at least version 1.9, defined
+# by the Open Source Initiative. In other cases, this file is automatically
+# released to the Public Domain.
+#
+
+pkgbase=trinity
+pkgname=trinity-kdebase
+pkgver=1240522
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.trinitydesktop.org'
+license=('GPL')
+groups=('trinity')
+pkgdesc="Trinity - kdebase"
+depends=('hal'
+        'trinity-dbus-1-qt3'
+        'trinity-kdelibs')
+makedepends=('pkgconfig'
+        'cmake'
+        'autoconf'
+        'imake'
+        'subversion'
+        'xorg-bdftopcf')
+optdepends=('desktop-file-utils: Command line utilities for working with desktop entries'
+        'pciutils: PCI bus configuration space access library and tools'
+        'xscreensaver: Screen saver and locker for the X Window System')
+provides=('trinity-kdebase')
+conflicts=('trinity-kdebase')
+replaces=('trinity-kdebase')
+options=('libtool' '!strip')
+source=()
+
+_svnmod=kdebase
+_svntrunk="svn://anonsvn.kde.org/home/kde/branches/trinity/${_svnmod}"
+
+_qtdir=/opt/qt
+_prefix="/opt/trinity"
+
+_tdesktop() {
+    # create/install desktop
+    install -d -m755 ${pkgdir}/etc/X11/sessions
+    echo '[Desktop Entry]' > ${pkgdir}/etc/X11/sessions/trinity.desktop
+    echo 'Encoding=UTF-8' >> ${pkgdir}/etc/X11/sessions/trinity.desktop
+    echo 'Type=XSession' >> ${pkgdir}/etc/X11/sessions/trinity.desktop
+    echo "Exec=${_prefix}/bin/startkde" >> ${pkgdir}/etc/X11/sessions/trinity.desktop
+    echo "TryExec=${_prefix}/bin/startkde" >> ${pkgdir}/etc/X11/sessions/trinity.desktop
+    echo 'Name=Trinity' >> ${pkgdir}/etc/X11/sessions/trinity.desktop
+    echo 'Comment=The Trinity Desktop Environment. A powerful Open Source graphical desktop environment' >> ${pkgdir}/etc/X11/sessions/trinity.desktop
+    chmod 0755 ${pkgdir}/etc/X11/sessions/trinity.desktop
+}
+
+build() {
+
+  cd ${srcdir}
+
+  msg "Connecting to SVN server to update or checkout ${_svnmod}...."
+  if [ -d ${_svnmod}/.svn ]; then
+    (cd ${_svnmod} && svn up)
+    [[ $? -eq 0 ]] || _co_failed=1
+  else
+    (svn co $_svntrunk ${_svnmod})
+    [[ $? -eq 0 ]] || _co_failed=1
+  fi
+
+  # if update or checkout failed - bail...
+  if [[ $_co_failed -ne 1 ]]; then
+    msg "SVN checkout of revision $pkgver -- Complete."
+  else
+    msg "SVN checkout of revision $pkgver -- Failed or server timeout."
+    exit 1
+  fi
+
+  msg "Setting PATH, CMAKE and Trinity Environment variables"
+  if [[ -r /etc/profile.d/qt3.sh ]]; then
+    . /etc/profile.d/qt3.sh
+    [[ -n $QTDIR ]] && _qtdir=$QTDIR
+  else
+    [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH
+  fi
+  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
+  export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:/opt/trinity/include/dbus-1.0:/opt/trinity/include/dbus-1.0/dbus:/opt/trinity/include:/opt/trinity/include/libkrandr
+  export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig
+
+#   cd ${srcdir}/${_svnmod}
+
+  cd $srcdir
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p build
+  cd build
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_svnmod} \
+    -DCMAKE_INSTALL_PREFIX=${_prefix} \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DQT_VERSION=3 \
+        -DSYSCONF_INSTALL_DIR=/etc \
+        -DWITH_XFIXES=ON \
+        -DWITH_HAL=ON \
+        -DWITH_ARTS=ON \
+        -DWITH_SASL=ON \
+        -DWITH_OPENEXR=ON \
+        -DWITH_XCOMPOSITE=ON \
+        -DWITH_XCURSOR=ON \
+        -DWITH_XRANDR=ON \
+        -DWITH_XRENDER=ON \
+        -DWITH_XDAMAGE=ON \
+        -DWITH_SHADOW=ON \
+        -DWITH_XDMCP=ON \
+        -DWITH_XINERAMA=ON \
+        -DWITH_XEXT=ON \
+    -DWITH_PAM=ON \
+    -DBUILD_ALL=ON \
+    -DCMAKE_INCLUDE_DIR=/opt/trinity/include/dbus-1.0:/opt/qt/include/tqt:/opt/trinity/include/dbus-1.0/dbus
+  
+  make
+#     -DWITH_QT3=ON \
+#     -DQTDIR=/opt/qt \
+#     -DQT_LIBRARY_DIRS=/opt/qt/lib \
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+#   cd ${srcdir}/${_svnmod}
+  cd ${srcdir}/build
+
+  make DESTDIR="$pkgdir/" install
+
+  cd ${startdir}
+
+  # install desktop and update kdmrc and Xsession
+#   [[ -f trinity.desktop ]] && {
+#     install -d -m755 ${pkgdir}/etc/X11/sessions
+#     install -m644 trinity.desktop ${pkgdir}/etc/X11/sessions
+#   }
+  _tdesktop
+  [[ -f ${pkgdir}/etc/X11/sessions/trinity.desktop ]] || msg "ERROR - Install Failure: ${pkgdir}/etc/X11/sessions/trinity.desktop"
+
+  # set kdm directory
+  _kdmdir=${_prefix}/share/config/kdm
+  [[ -d ${pkgdir}/${_kdmdir} ]] || install -d -m755 ${pkgdir}/${_kdmdir}
+
+  # install kdmrc
+  [[ -f kdmrc ]] && install -m644 kdmrc ${pkgdir}/${_kdmdir}
+
+  # update the Xsession file
+  [[ -f Xsession ]] && install -m755 Xsession ${pkgdir}/${_kdmdir}
+
+  # create the starttrinity link
+  [[ -d ${pkgdir}/usr/bin ]] || mkdir -p ${pkgdir}/usr/bin
+  cd ${pkgdir}/usr/bin
+  ln -sf /opt/trinity/bin/startkde starttrinity
+
+  cd ${startdir}
+
+#   rm -r ${srcdir}/${_svnmod}
+}
diff --git a/arch/master/trinity-kdebase/Xsession b/arch/master/trinity-kdebase/Xsession
new file mode 100755
index 000000000..29f2e092f
--- /dev/null
+++ b/arch/master/trinity-kdebase/Xsession
@@ -0,0 +1,73 @@
+#! /bin/sh
+# Xsession - run as user
+
+## Added Exports for kdm - see Trinity bug 421
+
+# export XDG_CONFIG_DIRS="/etc/xdg:/opt/trinity/etc/xdg"
+# export XDG_DATA_DIRS=/usr/share:/usr/local/share:/opt/trinity/share
+# export LD_LIBRARY_PATH="/opt/trinity/lib"
+# export PATH="/opt/tinity/bin:$PATH"
+
+session=$1
+
+# Note that the respective logout scripts are not sourced.
+case $SHELL in
+  */bash)
+    [ -z "$BASH" ] && exec $SHELL $0 "$@"
+    set +o posix
+    [ -f /etc/profile ] && . /etc/profile
+    if [ -f $HOME/.bash_profile ]; then
+      . $HOME/.bash_profile
+    elif [ -f $HOME/.bash_login ]; then
+      . $HOME/.bash_login
+    elif [ -f $HOME/.profile ]; then
+      . $HOME/.profile
+    fi
+    ;;
+  */zsh)
+    [ -z "$ZSH_NAME" ] && exec $SHELL $0 "$@"
+    emulate -R zsh
+    [ -d /etc/zsh ] && zdir=/etc/zsh || zdir=/etc
+    zhome=${ZDOTDIR:-$HOME}
+    # zshenv is always sourced automatically.
+    [ -f $zdir/zprofile ] && . $zdir/zprofile
+    [ -f $zhome/.zprofile ] && . $zhome/.zprofile
+    [ -f $zdir/zlogin ] && . $zdir/zlogin
+    [ -f $zhome/.zlogin ] && . $zhome/.zlogin
+    setopt shwordsplit noextendedglob
+    ;;
+  */csh|*/tcsh)
+    # [t]cshrc is always sourced automatically.
+    # Note that sourcing csh.login after .cshrc is non-standard.
+    xsess_tmp=`mktemp /tmp/xsess-env-XXXXXX`
+    $SHELL -c "if (-f /etc/csh.login) source /etc/csh.login; if (-f ~/.login) source ~/.login; /bin/sh -c export -p >! $xsess_tmp"
+    . $xsess_tmp
+    rm -f $xsess_tmp
+    ;;
+  *) # Plain sh, ksh, and anything we don't know.
+    [ -f /etc/profile ] && . /etc/profile
+    [ -f $HOME/.profile ] && . $HOME/.profile
+    ;;
+esac
+# invoke global X session script
+[ -f /etc/X11/Xsession ] && . /etc/X11/Xsession
+
+case $session in
+  "")
+    exec xmessage -center -buttons OK:0 -default OK "Sorry, $DESKTOP_SESSION is no valid session."
+    ;;
+  failsafe)
+    exec xterm -geometry 80x24-0-0
+    ;;
+  custom)
+    exec $HOME/.xsession
+    ;;
+  default)
+    exec /opt/trinity/bin/startkde
+    ;;
+  *)
+    eval exec "$session"
+    ;;
+esac
+exec xmessage -center -buttons OK:0 -default OK "Sorry, cannot execute $session. Check $DESKTOP_SESSION.desktop."
+
diff --git a/arch/master/trinity-kdebase/kdmrc b/arch/master/trinity-kdebase/kdmrc
new file mode 100644
index 000000000..82306e41c
--- /dev/null
+++ b/arch/master/trinity-kdebase/kdmrc
@@ -0,0 +1,530 @@
+# KDM master configuration file
+#
+# Please note: Settings in this file are sometimes ignored (overridden).
+# The default KDM startup script /etc/init.d/kdm looks in /etc/default/kdm.d
+# for theme-related settings which, if found, take precedence. The possibly
+# overridden settings are: UseBackground, BackgroundCfg, UseTheme, Theme.
+# See /usr/share/doc/kdm/README.Debian for details
+#
+# Definition: the greeter is the login dialog, i.e., the part of KDM
+# which the user sees.
+#
+# You can configure every X-display individually.
+# Every display has a display name, which consists of a host name
+# (which is empty for local displays specified in {Static|Reserve}Servers),
+# a colon, and a display number. Additionally, a display belongs to a
+# display class (which can be ignored in most cases; the control center
+# does not support this feature at all).
+# Sections with display-specific settings have the formal syntax
+# "[X-" host [":" number [ "_" class ]] "-" sub-section "]"
+# You can use the "*" wildcard for host, number, and class. You may omit
+# trailing components; they are assumed to be "*" then.
+# The host part may be a domain specification like ".inf.tu-dresden.de".
+# It may also be "+", which means non-empty, i.e. remote displays only.
+# From which section a setting is actually taken is determined by these
+# rules:
+# - an exact match takes precedence over a partial match (for the host part),
+#   which in turn takes precedence over a wildcard ("+" taking precedence
+#   over "*")
+# - precedence decreases from left to right for equally exact matches
+# Example: display name "myhost:0", class "dpy".
+# [X-myhost:0_dpy] precedes
+# [X-myhost:0_*] (same as [X-myhost:0]) precedes
+# [X-myhost:*_dpy] precedes
+# [X-myhost:*_*] (same as [X-myhost]) precedes
+# [X-+:0_dpy] precedes
+# [X-*:0_dpy] precedes
+# [X-*:0_*] (same as [X-*:0]) precedes
+# [X-*:*_*] (same as [X-*])
+# These sections do NOT match this display:
+# [X-hishost], [X-myhost:0_dec], [X-*:1], [X-:*]
+# If a setting is not found in any matching section, the default is used.
+#
+# Every comment applies to the following section or key. Note that all
+# comments will be lost if you change this file with the kcontrol frontend.
+# The defaults refer to KDM's built-in values, not anything set in this file.
+#
+# Special characters need to be backslash-escaped (leading and trailing
+# spaces (\s), tab (\t), linefeed (\n), carriage return (\r) and the
+# backslash itself (\\)).
+# In lists, fields are separated with commas without whitespace in between.
+# Some command strings are subject to simplified sh-style word splitting:
+# single quotes (') and double quotes (") have the usual meaning; the backslash
+# quotes everything (not only special characters). Note that the backslashes
+# need to be doubled because of the two levels of quoting.
+
+[General]
+# This option exists solely for the purpose of a clean automatic upgrade.
+# Do not even think about changing it!
+ConfigVersion=2.3
+# List of permanent displays. Displays with a hostname are foreign. A display
+# class may be specified separated by an underscore.
+# Default is ":0"
+StaticServers=:0
+# List of on-demand displays. See StaticServers for syntax.
+# Default is ""
+ReserveServers=:1,:2,:3
+# VTs to allocate to X-servers. A negative number means that the VT will be
+# used only if it is free. If all VTs in this list are used up, the next free
+# one greater than the last one in this list will be allocated.
+# Default is ""
+ServerVTs=-7
+# TTYs (without /dev/) to monitor for activity while in console mode.
+# Default is ""
+ConsoleTTYs=tty1,tty2,tty3,tty4,tty5,tty6
+# Where KDM should store its PID (do not store if empty).
+# Default is ""
+PidFile=/var/run/kdm.pid
+# Whether KDM should lock the PID file to prevent having multiple KDM
+# instances running at once. Do not change unless you are brave.
+# Default is true
+#LockPidFile=false
+# Where to store authorization files.
+# Default is "/var/run/xauth"
+#AuthDir=/tmp
+# Whether KDM should automatically re-read configuration files, if it
+# finds them having changed.
+# Default is true
+#AutoRescan=false
+# Additional environment variables KDM should pass on to all programs it runs.
+# LD_LIBRARY_PATH and XCURSOR_THEME are good candidates;
+# otherwise, it should not be necessary very often.
+# Default is ""
+#ExportList=LD_LIBRARY_PATH,ANOTHER_IMPORTANT_VAR
+# A character device KDM should read entropy from.
+# Empty means use the system's preferred entropy device.
+# Default is ""
+#RandomDevice=/dev/altrandom
+# Where the command FiFos should be created; make it empty to disable
+# them.
+# Default is "/var/run/xdmctl"
+#FifoDir=/tmp
+# The group to which the global command FiFo should belong;
+# can be either a name or a numerical ID.
+# Default is 0
+#FifoGroup=xdmctl
+# The directory in which KDM should store persistent working data.
+# Default is "/var/lib/kdm"
+#DataDir=
+# The directory in which KDM should store users' .dmrc files. This is only
+# needed if the home directories are not readable before actually logging in
+# (like with AFS).
+# Default is ""
+#DmrcDir=/nfs-shared/var/dmrcs
+
+[Shutdown]
+# The command (subject to word splitting) to run to halt the system.
+# Default is "/sbin/poweroff"
+#HaltCmd=
+# The command (subject to word splitting) to run to reboot the system.
+# Default is "/sbin/reboot"
+#RebootCmd=
+# Whether it is allowed to shut down the system via the global command FiFo.
+# Default is false
+#AllowFifo=true
+# Whether it is allowed to abort active sessions when shutting down the
+# system via the global command FiFo.
+# Default is true
+#AllowFifoNow=false
+# The boot manager KDM should use for offering boot options in the
+# shutdown dialog.
+# "None" - no boot manager
+# "Grub" - Grub boot manager
+# "Lilo" - Lilo boot manager (Linux on i386 &amp; x86-64 only)
+# Default is None
+#BootManager=Grub
+
+# Rough estimations about how many seconds KDM will spend at most on
+# - opening a connection to the X-server (OpenTime) if the attempt
+#   - times out: OpenTimeout
+#   - is refused: OpenRepeat * OpenDelay
+# - starting a local X-server (ServerTime):
+#   ServerAttempts * (ServerTimeout + OpenDelay)
+# - starting a display:
+#   - local display: ServerTime + OpenTime
+#   - foreign display: StartAttempts * OpenTime
+#   - XDMCP display: OpenTime (repeated indefinitely by client)
+
+# Core config for all displays
+[X-*-Core]
+# How long to wait before retrying to connect a display.
+# Default is 15
+#OpenDelay=15
+# How long to wait before timing out a display connection attempt.
+# Default is 120
+#OpenTimeout=120
+# How many connection attempts to make during a start attempt. Note that
+# a timeout aborts the entire start attempt.
+# Default is 5
+#OpenRepeat=5
+# Try at most that many times to start a display. If this fails, the display
+# is disabled.
+# Default is 4
+#StartAttempts=4
+# Ping remote display every that many minutes.
+# Default is 5
+#PingInterval=5
+# Wait for a Pong that many minutes.
+# Default is 5
+#PingTimeout=5
+# The name of this X-server's Xauth file.
+# If empty, a random name in the AuthDir directory will be used.
+# Default is ""
+#AuthFile=
+# Specify a file with X-resources for the greeter, chooser and background.
+# The KDE frontend does not use this file, so you do not need it unless you
+# use another background generator than krootimage.
+# Default is ""
+#Resources=
+# The xrdb program to use to read the above specified recources.
+# Subject to word splitting.
+# Default is "/usr/bin/xrdb"
+#Xrdb=
+# A program to run before the greeter is shown. Can be used to start an
+# xconsole or an alternative background generator. Subject to word splitting.
+# Default is ""
+Setup=/opt/trinity/share/config/kdm/Xsetup
+# A program to run before a user session starts. Subject to word splitting.
+# Default is ""
+Startup=/opt/trinity/share/config/kdm/Xstartup
+# A program to run after a user session exits. Subject to word splitting.
+# Default is ""
+Reset=/opt/trinity/share/config/kdm/Xreset
+# The program which is run as the user which logs in. It is supposed to
+# interpret the session argument (see SessionsDirs) and start an appropriate
+# session according to it. Subject to word splitting.
+# Default is "/usr/bin/xterm -ls -T"
+Session=/opt/trinity/share/config/kdm/Xsession
+# The program to run if Session fails.
+# Default is "/usr/bin/xterm"
+#FailsafeClient=
+# The PATH for the Session program.
+# Default is "/usr/local/bin:/opt/kde3/bin:/usr/bin:/bin:/opt/kde3/games:/usr/games"
+#UserPath=
+# The PATH for Setup, Startup and Reset, etc.
+# Default is "/usr/local/sbin:/usr/local/bin:/opt/kde3/sbin:/usr/sbin:/opt/kde3/bin:/usr/bin:/sbin:/bin"
+#SystemPath=
+# The default system shell.
+# Default is "/bin/sh"
+#SystemShell=/bin/bash
+# Where to put the user's X-server authorization file if ~/.Xauthority
+# cannot be created.
+# Default is "/tmp"
+#UserAuthDir=
+# Whether to automatically restart sessions after X-server crashes.
+# Note that enabling this makes circumventing screen lockers other than
+# KDE's built-in one possible!
+# Default is false
+#AutoReLogin=true
+# Allow root logins?
+# Default is true
+AllowRootLogin=false
+# Allow to log in, when user has set an empty password?
+# Default is true
+AllowNullPasswd=false
+# Who is allowed to shut down the system. This applies both to the
+# greeter and to the command FiFo.
+# "None" - no "Shutdown..." menu entry is shown at all
+# "Root" - the root password must be entered to shut down
+# "All" - everybody can shut down the machine
+# Default is All
+AllowShutdown=Root
+# Who is allowed to abort active sessions when shutting down.
+# "None" - no forced shutdown is allowed at all
+# "Root" - the root password must be entered to shut down forcibly
+# "All" - everybody can shut down the machine forcibly
+# Default is All
+#AllowSdForceNow=Root
+# The default choice for the shutdown condition/timing.
+# "Schedule" - shut down after all active sessions exit (possibly at once)
+# "TryNow" - shut down, if no active sessions are open; otherwise, do nothing
+# "ForceNow" - shut down unconditionally
+# Default is Schedule
+#DefaultSdMode=ForceNow
+# How to offer shutdown scheduling options:
+# "Never" - not at all
+# "Optional" - as a button in the simple shutdown dialogs
+# "Always" - instead of the simple shutdown dialogs
+# Default is Never
+#ScheduledSd=Optional
+# The directories containing session type definitions in .desktop format.
+# Default is "/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/kdm/sessions"
+#SessionsDirs=/usr/share/xsessions,/var/lib/menu-xdg/xsessions,/usr/share/apps/kdm/sessions
+SessionsDirs=/etc/X11/sessions
+# The file (relative to $HOME) to redirect the session output to. This is
+# a printf format string; one %s will be replaced with the display name.
+# Default is ".xsession-errors"
+ClientLogFile=.xsession-errors-%s
+# Whether KDM's built-in utmp/wtmp/lastlog registration should be used.
+# Default is false
+#UseSessReg=true
+
+# Greeter config for all displays
+[X-*-Greeter]
+# Widget style of the greeter. "" means the built-in default which currently
+# is "Plastik".
+# Default is ""
+#GUIStyle=Windows
+# Admin session
+# Default is false
+#UseAdminSession=true
+# Widget color scheme of the greeter. "" means the built-in default which
+# currently is yellowish grey with some light blue and yellow elements.
+# Default is ""
+#ColorScheme=Pumpkin
+# What should be shown in the greeter's logo are:
+# "None" - nothing
+# "Logo" - the image specified by LogoPixmap
+# "Clock" - a neat analog clock
+# Default is Clock
+LogoArea=Logo
+# The image to show when LogoArea=Logo.
+# Default is ""
+LogoPixmap=/opt/trinity/share/apps/kdm/pics/kdelogo.png
+# The relative coordinates (X,Y in percent) of the center of the greeter.
+# Default is "50,50"
+#GreeterPos=30,40
+# The screen the greeter should be displayed on in multi-headed and Xinerama
+# setups. The numbering starts with 0. For Xinerama, it corresponds to the
+# listing order in the active ServerLayout section of XF86Config; -1 means
+# to use the upper-left screen, -2 means to use the upper-right screen.
+# Default is 0
+#GreeterScreen=-1
+# The headline in the greeter. The following character pairs are replaced:
+# - %d -> current display
+# - %h -> host name, possibly with domain name
+# - %n -> node name, most probably the host name without domain name
+# - %s -> the operating system
+# - %r -> the operating system's version
+# - %m -> the machine (hardware) type
+# - %% -> a single %
+# Default is "Welcome to Trinity at %n"
+#GreetString=Welcome to Trinity at %n
+# Whether the fonts used in the greeter should be antialiased.
+# Default is true
+AntiAliasing=true
+# The font for the greeter headline.
+# Default is "Serif,20,bold"
+#GreetFont=Sans Serif,22,5,0,50,0
+# The normal font used in the greeter.
+# Default is "Sans Serif,10"
+#StdFont=Sans Serif,10,5,0,50,0
+# The font used for the "Login Failed" message.
+# Default is "Sans Serif,10,bold"
+#FailFont=Sans Serif,10,5,0,75,0
+# What to do with the Num Lock modifier for the time the greeter is running:
+# "Off" - turn off
+# "On" - turn on
+# "Keep" - do not change the state
+# Default is Keep
+#NumLock=Off
+# Language and locale to use in the greeter, encoded like $LC_LANG.
+# Default is "en_US"
+#Language=de_DE
+# Enable autocompletion in the username line edit.
+# Default is false
+#UserCompletion=true
+# Enable user list (names along with images) in the greeter.
+# Default is true
+#UserList=false
+# User selection for UserCompletion and UserList:
+# "NotHidden" - all users except those listed in HiddenUsers
+# "Selected" - only the users listed in SelectedUsers
+# Default is NotHidden
+#ShowUsers=Selected
+# For ShowUsers=Selected. @<group> means all users in that group.
+# Default is ""
+#SelectedUsers=root,johndoe
+# For ShowUsers=NotHidden. @<group> means all users in that group.
+# Default is ""
+#HiddenUsers=root
+# Special case of HiddenUsers: users with a non-zero UID less than this number
+# will not be shown as well.
+# Default is 0
+MinShowUID=500
+# Complement to MinShowUID: users with a UID greater than this number will
+# not be shown as well.
+# Default is 65535
+MaxShowUID=65000
+# If false, the users are listed in the order they appear in /etc/passwd.
+# If true, they are sorted alphabetically.
+# Default is true
+#SortUsers=false
+# Specify, where the users' pictures should be taken from.
+# "AdminOnly" - from <FaceDir>/$USER.face[.icon]
+# "PreferAdmin" - prefer <FaceDir>, fallback on $HOME
+# "PreferUser" - ... and the other way round
+# "UserOnly" - from the user's $HOME/.face[.icon]
+# Default is AdminOnly
+#FaceSource=PreferUser
+# The directory containing the user images if FaceSource is not UserOnly.
+# Default is "/opt/trinity/share/apps/kdm/faces"
+#FaceDir=/usr/share/faces
+# Specify, if/which user should be preselected for log in.
+# "None" - do not preselect any user
+# "Previous" - the user which successfully logged in last time
+# "Default" - the user specified in the DefaultUser option
+# Default is None
+#PreselectUser=Previous
+# If this is true, the password input line is focused automatically if
+# a user is preselected.
+# Default is false
+#FocusPasswd=true
+# The password input fields cloak the typed in text. Specify, how to do it:
+# "OneStar" - <literal>*</literal> is shown for every typed letter
+# "ThreeStars" - <literal>***</literal> is shown for every typed letter
+# "NoEcho" - nothing is shown at all, the cursor does not move
+# Default is OneStar
+#EchoMode=NoEcho
+# If true, krootimage will be automatically started by KDM; otherwise, the
+# Setup script should be used to setup the background.
+# Default is true
+#UseBackground=false
+# The configuration file to be used by krootimage.
+# Default is "/opt/trinity/share/config/kdm/backgroundrc"
+BackgroundCfg=/opt/trinity/share/config/kdm/backgroundrc
+# Hold the X-server grabbed the whole time the greeter is visible. This
+# may be more secure, but it will disable any background and other
+# X-clients started from the Setup script.
+# Default is false
+#GrabServer=true
+# How many seconds to wait for grab to succeed.
+# Default is 3
+#GrabTimeout=3
+# Warn, if display has no X-authorization (local auth cannot be created,
+# XDMCP display wants no auth, or display is foreign from StaticServers).
+# Default is true
+#AuthComplain=false
+# Random seed for forging saved session types, etc. of unknown users.
+# This value should be random but constant across the login domain.
+# Default is 0
+#ForgingSeed=0
+# Specify conversation plugins for the login dialog. Each plugin can be
+# specified as a base name (which expands to $kde_modulesdir/kgreet_$base)
+# or as a full pathname.
+# Default is "classic"
+#PluginsLogin=sign
+# Same as PluginsLogin, but for the shutdown dialog.
+# Default is "classic"
+#PluginsShutdown=modern
+# A list of options of the form Key=Value. The conversation plugins can query
+# these settings; it is up to them what possible keys are.
+# Default is ""
+#PluginOptions=SomeKey=randomvalue,Foo=bar
+# Show the "Console Login" action in the greeter (if ServerTTY/ConsoleTTYs
+# is configured).
+# Default is true
+#AllowConsole=false
+# A program to run while the greeter is visible. It is supposed to preload
+# as much as possible of the session that is going to be started (most
+# probably).
+# Default is ""
+Preloader=/opt/trinity/bin/preloadkde
+# Whether the greeter should be themed.
+# Default is true
+UseTheme=true
+# The theme to use for the greeter. Can point to either a directory or an XML
+# file.
+# Default is "/opt/trinity/share/apps/kdm/themes/o2_enterprise"
+Theme=/opt/trinity/share/apps/kdm/themes/o2_enterprise
+
+# Core config for local displays
+[X-:*-Core]
+# How often to try to run the X-server. Running includes executing it and
+# waiting for it to come up.
+# Default is 1
+#ServerAttempts=1
+# How long to wait for a local X-server to come up.
+# Default is 15
+#ServerTimeout=15
+# The command line to start the X-server, without display number and VT spec.
+# This string is subject to word splitting.
+# Default is "/usr/bin/X -br"
+ServerCmd=/usr/bin/X -br
+# Additional arguments for the X-servers for local sessions.
+# This string is subject to word splitting.
+# Default is ""
+ServerArgsLocal=-nolisten tcp
+# Additional arguments for the X-servers for remote sessions.
+# This string is subject to word splitting.
+# Default is ""
+#ServerArgsRemote=
+# Restart instead of resetting the local X-server after session exit.
+# Use it if the server leaks memory etc.
+# Default is false
+TerminateServer=true
+# The signal needed to reset the local X-server.
+# Default is 1 (SIGHUP)
+#ResetSignal=1
+# The signal needed to terminate the local X-server.
+# Default is 15 (SIGTERM)
+#TermSignal=15
+# Create X-authorizations for local displays.
+# Default is true
+#Authorize=false
+# Which X-authorization mechanisms should be used.
+# Default is "MIT-MAGIC-COOKIE-1"
+#AuthNames=
+# Need to reset the X-server to make it read initial Xauth file.
+# Default is false
+#ResetForAuth=true
+# See above
+AllowNullPasswd=true
+# See above
+AllowShutdown=All
+# Enable password-less logins on this display. USE WITH EXTREME CARE!
+# Default is false
+#NoPassEnable=true
+# The users that do not need to provide a password to log in. NEVER list root!
+# "*" means all non-root users. @<group> means all users in that group.
+# Default is ""
+#NoPassUsers=fred,ethel
+
+# Greeter config for local displays
+[X-:*-Greeter]
+# See above
+PreselectUser=Previous
+# See above
+FocusPasswd=true
+# Show the "Restart X Server"/"Close Connection" action in the greeter.
+# Default is true
+AllowClose=true
+
+# Core config for 1st local display
+[X-:0-Core]
+# The VT the X-server should run on; auto-assign if zero, don't assign if -1.
+# Better leave it zero and use ServerVTs.
+# Default is 0
+#ServerVT=7
+# Enable automatic login. USE WITH EXTREME CARE!
+# Default is false
+#AutoLoginEnable=true
+# If true, auto-login after logout. If false, auto-login is performed only
+# when a display session starts up.
+# Default is false
+#AutoLoginAgain=true
+# The delay in seconds before automatic login kicks in.
+# Default is 0
+#AutoLoginDelay=10
+# The user to log in automatically. NEVER specify root!
+# Default is ""
+#AutoLoginUser=fred
+# The password for the user to log in automatically. This is NOT required
+# unless the user is logged into a NIS or Kerberos domain. If you use this
+# option, you should "chmod 600 kdmrc" for obvious reasons.
+# Default is ""
+#AutoLoginPass=secret!
+# Immediately lock the automatically started session. This works only with
+# KDE sessions.
+# Default is false
+#AutoLoginLocked=true
+# See above
+ClientLogFile=.xsession-errors
+
+# Greeter config for 1st local display
+[X-:0-Greeter]
+# See above
+#PreselectUser=Default
+# The user to preselect if PreselectUser=Default.
+# Default is ""
+#DefaultUser=johndoe
diff --git a/arch/master/trinity-kdebase/trinity.desktop b/arch/master/trinity-kdebase/trinity.desktop
new file mode 100644
index 000000000..30c209f5d
--- /dev/null
+++ b/arch/master/trinity-kdebase/trinity.desktop
@@ -0,0 +1,8 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=XSession
+Exec=/opt/trinity/bin/startkde
+TryExec=/opt/trinity/bin/startkde
+Name=Trinity
+Comment=The Trinity Desktop Environment. A powerful Open Source graphical desktop environment
+
diff --git a/arch/master/trinity-kdegraphics/GSmartPointer.h.patch b/arch/master/trinity-kdegraphics/GSmartPointer.h.patch
new file mode 100644
index 000000000..4634f8ca0
--- /dev/null
+++ b/arch/master/trinity-kdegraphics/GSmartPointer.h.patch
@@ -0,0 +1,10 @@
+--- kdegraphics/kviewshell/plugins/djvu/libdjvu/GSmartPointer.h
++++ kdegraphics/kviewshell/plugins/djvu/libdjvu/GSmartPointer.h	2011-05-08 11:47:20.000000000 -0500
+@@ -56,6 +56,7 @@
+ 
+ #ifndef _GSMARTPOINTER_H_
+ #define _GSMARTPOINTER_H_
++#include <cstddef>
+ #ifdef HAVE_CONFIG_H
+ #include "config.h"
+ #endif
diff --git a/arch/master/trinity-kdegraphics/PKGBUILD b/arch/master/trinity-kdegraphics/PKGBUILD
new file mode 100644
index 000000000..db280ce3e
--- /dev/null
+++ b/arch/master/trinity-kdegraphics/PKGBUILD
@@ -0,0 +1,124 @@
+# $Id$
+# Maintainer: David C. Rankin <drankinatty@gmail.com>
+#
+# All modifications and uses of this file are licensed under
+# the software for which this file was made for, should the software
+# be under an Open Source License, at least version 1.9, defined
+# by the Open Source Initiative. In other cases, this file is automatically
+# released to the Public Domain.
+#
+
+pkgbase=trinity
+pkgname=trinity-kdegraphics
+pkgver=12345
+pkgrel=1.0
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL')
+groups=('trinity')
+pkgdesc="Trinity - kdegraphics"
+depends=('trinity-kdebase' 'libart-lgpl' 'libgphoto2' 'libtiff' 'openexr' 't1lib')
+makedepends=('pkgconfig' 'cmake' 'autoconf' 'subversion' 'imake' 'fribidi')
+# 'poppler-qt'
+optdepends=('xscreensaver: Screen saver and locker for the X Window System')
+provides=('trinity-kdegraphics')
+conflicts=('trinity-kdegraphics')
+replaces=('trinity-kdegraphics')
+options=('libtool' '!strip')
+source=('GSmartPointer.h.patch')
+md5sums=('7b93c9bdf1208df453c9838519fab109')
+
+_svnmod=kdegraphics
+_svntrunk="svn://anonsvn.kde.org/home/kde/branches/trinity/${_svnmod}"
+
+trinity_prefix="/opt/trinity"
+
+build() {
+
+  cd ${srcdir}
+
+  msg "Connecting to SVN server to update or checkout ${_svnmod}...."
+  if [ -d ${_svnmod}/.svn ]; then
+    (cd ${_svnmod} && svn up)
+    [[ $? -eq 0 ]] || _co_failed=1
+  else
+    (svn co $_svntrunk ${_svnmod})
+    [[ $? -eq 0 ]] || _co_failed=1
+  fi
+
+  # if update or checkout failed - bail...
+  if [[ $_co_failed -ne 1 ]]; then
+    msg "SVN checkout of revision $pkgver -- Complete."
+  else
+    msg "SVN checkout of revision $pkgver -- Failed or server timeout."
+    exit 1
+  fi
+
+  # patch for gcc-4.6
+  if grep -q cstddef  ${srcdir}/kdegraphics/kviewshell/plugins/djvu/libdjvu/GSmartPointer.h; then
+    msg "Patch for GCC 4.6 - Previously Applied"
+  else
+    msg "Applying Patch for GCC 4.6"
+    patch -p0 -i ${srcdir}/GSmartPointer.h.patch || return 1
+  fi
+
+  msg "Setting PATH, CMAKE and Trinity Environment variables"
+  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
+  if [[ -r /etc/profile.d/qt3.sh ]]; then
+    . /etc/profile.d/qt3.sh
+    [[ -n $QTDIR ]] && _qtdir=$QTDIR
+  else
+    [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH
+  fi
+
+#   export CMAKE_INCLUDE_PATH=/opt/qt/include:\
+# /opt/qt/include/tqt:\
+# /usr/include/dbus-1.0:\
+# /opt/trinity/include:\
+# /opt/trinity/include/libkrandr:\
+# /usr/include
+#   export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
+#   export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig
+
+#   cd ${srcdir}/${_svnmod}
+
+  cd $srcdir
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p build
+  cd build
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_svnmod} \
+    -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DQT_VERSION=3 \
+    -DCMAKE_CXX_FLAGS="-fpermissive" \
+    -DWITH_T1LIB=ON \
+    -DWITH_LIBPAPER=ON \
+    -DWITH_TIFF=ON \
+    -DWITH_OPENEXR=ON \
+    -DWITH_PAM=ON \
+    -DBUILD_ALL=ON
+  make
+
+#     -DWITH_PDF=ON \ (waiting on poppler-qt3)
+
+#     -DWITH_QT3=ON \
+#     -DQTDIR=/opt/qt \
+#     -DQT_LIBRARY_DIRS=/opt/qt/lib \
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+#   cd ${srcdir}/${_svnmod}
+  cd ${srcdir}/build
+
+  make DESTDIR="$pkgdir/" install
+
+  cd ${startdir}
+
+#
+#   cd ${startdir}
+
+#   rm -r ${srcdir}/${_svnmod}
+}
diff --git a/arch/master/trinity-kdelibs/PKGBUILD b/arch/master/trinity-kdelibs/PKGBUILD
new file mode 100644
index 000000000..9038bb501
--- /dev/null
+++ b/arch/master/trinity-kdelibs/PKGBUILD
@@ -0,0 +1,105 @@
+# $Id$
+# Maintainer: David C. Rankin <drankinatty@gmail.com>
+#
+# All modifications and uses of this file are licensed under
+# the software for which this file was made for, should the software
+# be under an Open Source License, at least version 1.9, defined
+# by the Open Source Initiative. In other cases, this file is automatically
+# released to the Public Domain.
+#
+
+pkgbase=trinity
+pkgname=trinity-kdelibs
+pkgver=1237322
+pkgrel=1
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL')
+groups=('trinity')
+pkgdesc="Trinity - kdelibs"
+depends=('libical'
+        'libxslt'
+        'avahi'
+        'pam-krb5'
+        'taglib'
+        'trinity-arts')
+makedepends=('pkgconfig' 'cmake' 'autoconf' 'subversion')
+provides=('trinity-kdelibs' 'kdelibs3')
+conflicts=('trinity-kdelibs' 'kdelibs3')
+replaces=('trinity-kdelibs')
+options=('libtool' '!strip')
+source=()
+
+_svnmod=kdelibs
+_svntrunk="svn://anonsvn.kde.org/home/kde/branches/trinity/${_svnmod}"
+
+_qtdir=/opt/qt
+trinity_prefix="/opt/trinity"
+
+build() {
+
+  cd ${srcdir}
+
+  msg "Connecting to SVN server to update or checkout ${_svnmod}...."
+  if [ -d ${_svnmod}/.svn ]; then
+    (cd ${_svnmod} && svn up)
+    [[ $? -eq 0 ]] || _co_failed=1
+  else
+    (svn co $_svntrunk ${_svnmod})
+    [[ $? -eq 0 ]] || _co_failed=1
+  fi
+
+  # if update or checkout failed - bail...
+  if [[ $_co_failed -ne 1 ]]; then
+    msg "SVN checkout of revision $pkgver -- Complete."
+  else
+    msg "SVN checkout of revision $pkgver -- Failed or server timeout."
+    exit 1
+  fi
+
+  msg "Setting PATH, CMAKE and Trinity Environment variables"
+  if [[ -r /etc/profile.d/qt3.sh ]]; then
+    . /etc/profile.d/qt3.sh
+    [[ -n $QTDIR ]] && _qtdir=$QTDIR
+  else
+    [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH
+  fi
+  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
+  export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/bin
+  export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
+
+#   cd ${srcdir}/${_svnmod}
+
+  cd $srcdir
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p build
+  cd build
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_svnmod} \
+    -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DQT_VERSION=3 \
+    -DWITH_QT3=ON \
+    -DQTDIR=/opt/qt \
+    -DQT_LIBRARY_DIRS=/opt/qt/lib \
+    -DWITH_PAM=ON \
+    -DBUILD_ALL=ON
+  make
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+#   cd ${srcdir}/${_svnmod}
+  cd ${srcdir}/build
+
+  make DESTDIR="$pkgdir/" install
+
+  install -d -m755 ${pkgdir}/etc/ld.so.conf.d/
+  echo "${trinity_prefix}/lib" > ${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf
+
+  install -d -m755 ${pkgdir}/etc/profile.d/
+  install -m644 ${startdir}/trinity.sh ${pkgdir}/etc/profile.d/
+
+#   rm -r ${srcdir}/${_svnmod}
+}
diff --git a/arch/master/trinity-kdelibs/trinity-kdelibs.install b/arch/master/trinity-kdelibs/trinity-kdelibs.install
new file mode 100644
index 000000000..e2db661ac
--- /dev/null
+++ b/arch/master/trinity-kdelibs/trinity-kdelibs.install
@@ -0,0 +1,11 @@
+post_install() {
+        ldconfig &> /dev/null
+}
+
+post_upgrade() {
+        post_install
+}
+
+post_remove() {
+        post_install
+}
diff --git a/arch/master/trinity-kdelibs/trinity.sh b/arch/master/trinity-kdelibs/trinity.sh
new file mode 100644
index 000000000..cd28e88c4
--- /dev/null
+++ b/arch/master/trinity-kdelibs/trinity.sh
@@ -0,0 +1,14 @@
+export KDEDIR=/opt/trinity
+export KDEDIRS=$KDEDIR:/usr
+export PATH=$KDEDIR/bin:$PATH
+export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$KDEDIR/lib/pkgconfig
+if [ ! -z $XDG_DATA_DIRS ]; then
+  export XDG_DATA_DIRS=$XDG_DATA_DIRS:$KDEDIR/share
+else
+  export XDG_DATA_DIRS=$KDEDIR/share
+fi
+if [ ! -z $XDG_CONFIG_DIRS ]; then
+  export XDG_CONFIG_DIRS=$XDG_CONFIG_DIRS:$KDEDIR/etc/xdg
+else
+  export XDG_CONFIG_DIRS=$KDEDIR/etc/xdg
+fi
diff --git a/arch/master/trinity-kdepim/PKGBUILD b/arch/master/trinity-kdepim/PKGBUILD
new file mode 100644
index 000000000..85da31fce
--- /dev/null
+++ b/arch/master/trinity-kdepim/PKGBUILD
@@ -0,0 +1,99 @@
+# $Id$
+# Maintainer: David C. Rankin <drankinatty@gmail.com>
+#
+# All modifications and uses of this file are licensed under
+# the software for which this file was made for, should the software
+# be under an Open Source License, at least version 1.9, defined
+# by the Open Source Initiative. In other cases, this file is automatically
+# released to the Public Domain.
+#
+
+pkgbase=trinity
+pkgname=trinity-kdepim
+pkgver=12345
+pkgrel=1.0
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL')
+groups=('trinity')
+pkgdesc="Trinity - kdepim"
+depends=('gpgme'
+        'trinity-kdebase')
+makedepends=('pkgconfig' 'cmake' 'autoconf' 'subversion' 'imake')
+optdepends=('xscreensaver: Screen saver and locker for the X Window System')
+provides=('trinity-kdepim')
+conflicts=('trinity-kdepim')
+replaces=('trinity-kdepim')
+options=('libtool' '!strip')
+source=()
+
+_svnmod=kdepim
+_svntrunk="svn://anonsvn.kde.org/home/kde/branches/trinity/${_svnmod}"
+
+trinity_prefix="/opt/trinity"
+
+build() {
+
+  cd ${srcdir}
+
+  msg "Connecting to SVN server to update or checkout ${_svnmod}...."
+  if [ -d ${_svnmod}/.svn ]; then
+    (cd ${_svnmod} && svn up)
+    [[ $? -eq 0 ]] || _co_failed=1
+  else
+    (svn co $_svntrunk ${_svnmod})
+    [[ $? -eq 0 ]] || _co_failed=1
+  fi
+
+  # if update or checkout failed - bail...
+  if [[ $_co_failed -ne 1 ]]; then
+    msg "SVN checkout of revision $pkgver -- Complete."
+  else
+    msg "SVN checkout of revision $pkgver -- Failed or server timeout."
+    exit 1
+  fi
+
+  msg "Setting PATH, CMAKE and Trinity Environment variables"
+  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
+  export CMAKE_INCLUDE_PATH=/opt/qt/include:\
+/opt/qt/include/tqt:\
+/usr/include/dbus-1.0:\
+/opt/trinity/include:\
+/opt/trinity/include/libkrandr
+  export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig
+
+#   cd ${srcdir}/${_svnmod}
+
+  cd $srcdir
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p build
+  cd build
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_svnmod} \
+    -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DQT_VERSION=3 \
+    -DWITH_QT3=ON \
+    -DQTDIR=/opt/qt \
+    -DQT_LIBRARY_DIRS=/opt/qt/lib \
+    -DWITH_PAM=ON \
+    -DBUILD_ALL=ON
+  make
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+#   cd ${srcdir}/${_svnmod}
+  cd ${srcdir}/build
+
+  make DESTDIR="$pkgdir/" install
+
+  cd ${startdir}
+
+#
+#   cd ${startdir}
+
+#   rm -r ${srcdir}/${_svnmod}
+}
diff --git a/arch/master/trinity-kdevelop/PKGBUILD b/arch/master/trinity-kdevelop/PKGBUILD
new file mode 100644
index 000000000..c1d532d99
--- /dev/null
+++ b/arch/master/trinity-kdevelop/PKGBUILD
@@ -0,0 +1,89 @@
+# $Id$
+# Maintainer: David C. Rankin <drankinatty@gmail.com>
+#
+# All modifications and uses of this file are licensed under
+# the software for which this file was made for, should the software
+# be under an Open Source License, at least version 1.9, defined
+# by the Open Source Initiative. In other cases, this file is automatically
+# released to the Public Domain.
+#
+
+pkgbase=trinity
+pkgname=trinity-kdevelop
+pkgver=12345
+pkgrel=1.0
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL')
+groups=('trinity')
+pkgdesc="Trinity - kdevelop"
+depends=('trinity-kdebase')
+#         'xorg'
+makedepends=('pkgconfig' 'cmake' 'autoconf' 'subversion' 'imake')
+provides=('trinity-kdevelop')
+conflicts=('trinity-kdevelop')
+replaces=('trinity-kdevelop')
+options=('libtool' '!strip')
+source=()
+
+_svnmod=kdevelop
+_svntrunk="svn://anonsvn.kde.org/home/kde/branches/trinity/${_svnmod}"
+
+build() {
+
+  cd ${srcdir}
+
+  msg "Connecting to SVN server to update or checkout ${_svnmod}...."
+  if [ -d ${_svnmod}/.svn ]; then
+    (cd ${_svnmod} && svn up)
+    [[ $? -eq 0 ]] || _co_failed=1
+  else
+    (svn co $_svntrunk ${_svnmod})
+    [[ $? -eq 0 ]] || _co_failed=1
+  fi
+
+  # if update or checkout failed - bail...
+  if [[ $_co_failed -ne 1 ]]; then
+    msg "SVN checkout of revision $pkgver -- Complete."
+  else
+    msg "SVN checkout of revision $pkgver -- Failed or server timeout."
+    exit 1
+  fi
+
+  msg "Setting PATH, CMAKE and Trinity Environment variables"
+  export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
+  CMAKE_INCLUDE_PATH=/opt/qt/include:/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include:/opt/trinity/include/libkrandr
+  export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig
+
+#   cd ${srcdir}/${_svnmod}
+
+  trinity_prefix="/opt/trinity"
+
+  cd $srcdir
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p build
+  cd build
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_svnmod} \
+    -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DQT_VERSION=3 \
+    -DWITH_QT3=ON \
+    -DQTDIR=/opt/qt \
+    -DQT_DOCDIR=/opt/qt/man \
+    -DQT_LIBRARY_DIRS=/opt/qt/lib \
+    -DBUILD_ALL=ON
+  make
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+#   cd ${srcdir}/${_svnmod}
+  cd ${srcdir}/build
+
+  make DESTDIR="$pkgdir/" install
+
+#   rm -r ${srcdir}/${_svnmod}
+}
diff --git a/arch/master/trinity-kdewebdev/PKGBUILD b/arch/master/trinity-kdewebdev/PKGBUILD
new file mode 100644
index 000000000..55f74e699
--- /dev/null
+++ b/arch/master/trinity-kdewebdev/PKGBUILD
@@ -0,0 +1,92 @@
+# $Id$
+# Maintainer: David C. Rankin <drankinatty@gmail.com>
+#
+# All modifications and uses of this file are licensed under
+# the software for which this file was made for, should the software
+# be under an Open Source License, at least version 1.9, defined
+# by the Open Source Initiative. In other cases, this file is automatically
+# released to the Public Domain.
+#
+
+pkgbase=trinity
+pkgname=trinity-kdewebdev
+pkgver=12345
+pkgrel=1.0
+arch=('i686' 'x86_64')
+url='http://www.kde.org'
+license=('GPL')
+groups=('trinity')
+pkgdesc="Trinity - kdewebdev"
+depends=('hal'
+        'gnupg'
+        'tidyhtml'
+        'trinity-kdevelop')
+#         'xorg'
+makedepends=('pkgconfig' 'cmake' 'autoconf' 'subversion' 'imake')
+provides=('trinity-kdewebdev')
+conflicts=('trinity-kdewebdev')
+replaces=('trinity-kdewebdev')
+options=('libtool' '!strip')
+source=()
+
+_svnmod=kdewebdev
+_svntrunk="svn://anonsvn.kde.org/home/kde/branches/trinity/${_svnmod}"
+
+build() {
+
+  cd ${srcdir}
+
+  msg "Connecting to SVN server to update or checkout ${_svnmod}...."
+  if [ -d ${_svnmod}/.svn ]; then
+    (cd ${_svnmod} && svn up)
+    [[ $? -eq 0 ]] || _co_failed=1
+  else
+    (svn co $_svntrunk ${_svnmod})
+    [[ $? -eq 0 ]] || _co_failed=1
+  fi
+
+  # if update or checkout failed - bail...
+  if [[ $_co_failed -ne 1 ]]; then
+    msg "SVN checkout of revision $pkgver -- Complete."
+  else
+    msg "SVN checkout of revision $pkgver -- Failed or server timeout."
+    exit 1
+  fi
+
+#   msg "Setting PATH, CMAKE and Trinity Environment variables"
+#   export CMAKE_PREFIX_PATH=/opt/qt:/opt/trinity
+#   CMAKE_INCLUDE_PATH=/opt/qt/include:/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/include:/opt/trinity/include/libkrandr
+#   export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
+#   export PKG_CONFIG_PATH=:/opt/trinity/lib/pkgconfig:/opt/qt/lib/pkgconfig
+
+#   cd ${srcdir}/${_svnmod}
+
+  trinity_prefix="/opt/trinity"
+
+  cd $srcdir
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p build
+  cd build
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_svnmod} \
+    -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
+    -DCMAKE_VERBOSE_MAKEFILE=ON \
+    -DQT_VERSION=3 \
+    -DBUILD_ALL=ON
+  make
+#     -DWITH_QT3=ON \
+#     -DQTDIR=/opt/qt \
+#     -DQT_DOCDIR=/opt/qt/man \
+#     -DQT_LIBRARY_DIRS=/opt/qt/lib \
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+#   cd ${srcdir}/${_svnmod}
+  cd ${srcdir}/build
+
+  make DESTDIR="$pkgdir/" install
+
+#   rm -r ${srcdir}/${_svnmod}
+}
diff --git a/arch/master/trinity-libcaldav/Changelog.patch b/arch/master/trinity-libcaldav/Changelog.patch
new file mode 100644
index 000000000..db579b99b
--- /dev/null
+++ b/arch/master/trinity-libcaldav/Changelog.patch
@@ -0,0 +1,12 @@
+--- libcaldav-0.6.5/ChangeLog
++++ libcaldav-0.6.5/ChangeLog	2011-05-08 00:56:11.000000000 -0500
+@@ -1,3 +1,9 @@
++libcaldav (0.6.5)
++  * Fix bug to be able to integrate the debian libcaldav
++    source with Arch PKGBUILD Patch provided by Timothy Pearson
++
++-- David Rankin <drankinatty@gmail.com>  Sun, 8 May 2011 22:51:03 +0100
++
+ libcaldav (0.6.2)
+   * Fix bug to be able to handle HTTP HEADER lines split
+     over multiple lines. Patch provided by Timothy Pearson
diff --git a/arch/master/trinity-libcaldav/Makefile.am.patch b/arch/master/trinity-libcaldav/Makefile.am.patch
new file mode 100644
index 000000000..37a673219
--- /dev/null
+++ b/arch/master/trinity-libcaldav/Makefile.am.patch
@@ -0,0 +1,11 @@
+--- libcaldav-0.6.5/src/Makefile.am
++++ libcaldav-0.6.5/src/Makefile.am	2011-05-08 01:16:47.000000000 -0500
+@@ -37,7 +37,7 @@
+ 			get-freebusy-report.c \
+ 			get-freebusy-report.h
+ 
+-libcaldav_includedir=$(includedir)/libcaldav-@VERSION@
++libcaldav_includedir=$(includedir)/libcaldav
+ libcaldav_include_HEADERS = caldav.h
+ 
+ noinst_HEADERS = \
diff --git a/arch/master/trinity-libcaldav/Makefile.in.patch b/arch/master/trinity-libcaldav/Makefile.in.patch
new file mode 100644
index 000000000..cb0ad466a
--- /dev/null
+++ b/arch/master/trinity-libcaldav/Makefile.in.patch
@@ -0,0 +1,11 @@
+--- libcaldav-0.6.5/src/Makefile.in
++++ libcaldav-0.6.5/src/Makefile.in	2011-05-08 01:16:15.000000000 -0500
+@@ -284,7 +284,7 @@
+ 			get-freebusy-report.c \
+ 			get-freebusy-report.h
+ 
+-libcaldav_includedir = $(includedir)/libcaldav-@VERSION@
++libcaldav_includedir = $(includedir)/libcaldav
+ libcaldav_include_HEADERS = caldav.h
+ noinst_HEADERS = \
+ 			add-caldav-object.h \
diff --git a/arch/master/trinity-libcaldav/PKGBUILD b/arch/master/trinity-libcaldav/PKGBUILD
new file mode 100644
index 000000000..4e609d12e
--- /dev/null
+++ b/arch/master/trinity-libcaldav/PKGBUILD
@@ -0,0 +1,46 @@
+# $Id$
+# Maintainer: David C. Rankin <drankinatty@gmail.com>
+#
+
+pkgname=trinity-libcaldav
+pkgver=0.6.5
+_pkgsuffix=2debian2
+pkgrel=1
+pkgdesc="A client library adding support for the CalDAV protocol"
+arch=('i686' 'x86_64')
+url="http://www.riverbankcomputing.com/software/pyqt/intro"
+groups=('trinity-bld')
+depends=('doxygen' 'curl')
+license=('GPL')
+provides=('trinity-libcaldav' 'libcaldav')
+conflicts=('libcaldav')
+replaces=('trinity-libcaldav')
+source=("http://quickbuild.pearsoncomputing.net:58080/2055979/libcaldav_0.6.5-2debian2.tar.gz" "Changelog.patch" "Makefile.am.patch" "Makefile.in.patch")
+md5sums=('fba66a6c605a6d7be67a638cd29667b6'
+         '184818aedf65459ad3f9c0741462f85a'
+         '5ce5bd3c1ed4d5004a864130a971f737'
+         'c136e14af1923c2cf6dc5beb93da2ba4')
+
+_prefix=/usr
+
+build() {
+
+  # patch for Changelog version
+  patch -p0 -i ${srcdir}/Changelog.patch || return 1
+  patch -p0 -i ${srcdir}/Makefile.am.patch || return 1
+  patch -p0 -i ${srcdir}/Makefile.in.patch || return 1
+
+  cd ${srcdir}/libcaldav-${pkgver}
+  msg "Running ./autogen.sh for autoreconf"
+  ./autogen.sh --prefix=${_prefix}
+#    --includedir=/usr/include
+#   msg "Running configure"
+#   ./configure --prefix=${_prefix}
+
+  make || return 1
+}
+
+package() {
+  cd ${srcdir}/libcaldav-${pkgver}
+  make DESTDIR=${pkgdir} install
+}
diff --git a/arch/master/trinity-libcarddav/PKGBUILD b/arch/master/trinity-libcarddav/PKGBUILD
new file mode 100644
index 000000000..433f33457
--- /dev/null
+++ b/arch/master/trinity-libcarddav/PKGBUILD
@@ -0,0 +1,45 @@
+# $Id$
+# Maintainer: David C. Rankin <drankinatty@gmail.com>
+#
+
+pkgname=trinity-libcarddav
+pkgver=0.6.2
+_pkgsuffix=2debian2
+pkgrel=1
+pkgdesc="A client library adding support for the CardDAV protocol"
+arch=('i686' 'x86_64')
+url="http://www.trinitydesktop.org/"
+groups=('trinity-bld')
+depends=('curl')
+license=('GPL')
+provides=('trinity-libcarddav' 'libcarddav')
+conflicts=('libcarddav')
+replaces=('trinity-libcarddav')
+# http://quickbuild.pearsoncomputing.net:58080/2056019/libcarddav_0.6.2-2debian2.tar.gz
+source=("http://quickbuild.pearsoncomputing.net:58080/2056019/libcarddav_${pkgver}-${_pkgsuffix}.tar.gz" "libcarddav.patch")
+md5sums=('42a0fe57ba4c639aad53024f6c8d5614'
+         '0b3729a3332aa6101d3ad1dfaa51c630')
+
+_prefix=/usr
+
+build() {
+
+  cd ${srcdir}
+
+  # apply libcarddav patch
+  msg "Applying Patch: libcarddav.patch"
+  patch -uNp2 -i ${srcdir}/libcarddav.patch || return 1
+
+  cd ${srcdir}/libcarddav-${pkgver}
+  msg "Running ./autogen.sh for autoreconf"
+  ./autogen.sh --prefix=${_prefix}
+#   msg "Running configure"
+#   ./configure --prefix=${_prefix}
+
+  make || return 1
+}
+
+package() {
+  cd ${srcdir}/libcarddav-${pkgver}
+  make DESTDIR=${pkgdir} install
+}
diff --git a/arch/master/trinity-libcarddav/libcarddav.patch b/arch/master/trinity-libcarddav/libcarddav.patch
new file mode 100644
index 000000000..6add74e63
--- /dev/null
+++ b/arch/master/trinity-libcarddav/libcarddav.patch
@@ -0,0 +1,37 @@
+diff -Naur trinity-libcarddav-orig//src/libcarddav-0.6.2/ChangeLog trinity-libcarddav//src/libcarddav-0.6.2/ChangeLog
+--- trinity-libcarddav-orig//src/libcarddav-0.6.2/ChangeLog	2010-07-21 02:57:45.000000000 -0500
++++ trinity-libcarddav//src/libcarddav-0.6.2/ChangeLog	2011-05-08 14:08:07.000000000 -0500
+@@ -1,3 +1,9 @@
++libcarddav (0.6.2)
++  * Update Changelog to correct version. Includes patch
++    provided by Timothy Pearson
++
++-- David Rankin <drankinatty@gmail.com>  Sun, 8 May 2011 22:51:03 +0100
++
+ libcarddav (0.6.1)
+   * Fix redirection bug to fully support Zimbra server. Patch
+     provided by Timothy Pearson
+diff -Naur trinity-libcarddav-orig//src/libcarddav-0.6.2/src/Makefile.am trinity-libcarddav//src/libcarddav-0.6.2/src/Makefile.am
+--- trinity-libcarddav-orig//src/libcarddav-0.6.2/src/Makefile.am	2010-07-21 02:57:45.000000000 -0500
++++ trinity-libcarddav//src/libcarddav-0.6.2/src/Makefile.am	2011-05-08 14:08:37.000000000 -0500
+@@ -35,7 +35,7 @@
+ 			lock-carddav-object.c \
+ 			lock-carddav-object.h
+ 
+-libcarddav_includedir=$(includedir)/libcarddav-@VERSION@
++libcarddav_includedir=$(includedir)/libcarddav
+ libcarddav_include_HEADERS = carddav.h
+ 
+ noinst_HEADERS = \
+diff -Naur trinity-libcarddav-orig//src/libcarddav-0.6.2/src/Makefile.in trinity-libcarddav//src/libcarddav-0.6.2/src/Makefile.in
+--- trinity-libcarddav-orig//src/libcarddav-0.6.2/src/Makefile.in	2010-07-21 02:57:45.000000000 -0500
++++ trinity-libcarddav//src/libcarddav-0.6.2/src/Makefile.in	2011-05-08 14:09:05.000000000 -0500
+@@ -278,7 +278,7 @@
+ 			lock-carddav-object.c \
+ 			lock-carddav-object.h
+ 
+-libcarddav_includedir = $(includedir)/libcarddav-@VERSION@
++libcarddav_includedir = $(includedir)/libcarddav
+ libcarddav_include_HEADERS = carddav.h
+ noinst_HEADERS = \
+ 			add-carddav-object.h \
diff --git a/arch/master/trinity-poppler-qt3/PKGBUILD b/arch/master/trinity-poppler-qt3/PKGBUILD
new file mode 100644
index 000000000..30863e299
--- /dev/null
+++ b/arch/master/trinity-poppler-qt3/PKGBUILD
@@ -0,0 +1,65 @@
+# Maintainer: Peter Lewis <plewis@aur.archlinux.org>
+# Contributor: Jan de Groot <jgc@archlinux.org>
+# 2010-03-11  Modified by catweazle for poppler 0.12.4
+# 2010-06-23  Modified by catweazle for poppler 0.14.0
+# 2010-10-16  Modified by rankin for poppler 0.14.4
+# 2010-10-16  Modified by rankin for poppler 0.14.5
+
+pkgbase=trinity
+pkgname=trinity-poppler-qt3
+pkgver=0.16.4
+pkgrel=3
+pkgdesc="Trinity - Poppler Qt3 bindings"
+arch=(i686 x86_64)
+license=('GPL')
+depends=('trinity-qt3' "poppler>=${pkgver}")
+makedepends=('pkgconfig')
+provides=('trinity-poppler-qt3' 'poppler-qt3')
+conflicts=('poppler-qt3')
+replaces=('poppler-qt3')
+options=('libtool' '!strip')
+url="http://poppler.freedesktop.org/"
+source=(http://poppler.freedesktop.org/poppler-${pkgver/trinity-/}.tar.gz
+	poppler-bindings.patch)
+sha256sums=('0e48e54d6e6d7269f049cf9d060e3ed078cad69808bda8a6da285a7b41c3a2a6'
+            '0f9fa33dca271c6c0e31d66cce1847099b63c1443a002aa9bde99a8cb20ad770')
+
+build() {
+
+  # set default Qt dir
+  _qtdir=/opt/qt
+
+  # source qt3 profile.d/qt3.sh
+  if [[ -r /etc/profile.d/qt3.sh ]]; then
+    . /etc/profile.d/qt3.sh
+    [[ -n $QTDIR ]] && _qtdir=$QTDIR
+  else
+    [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH
+  fi
+
+  cd "${srcdir}/poppler-${pkgver}"
+
+  patch -Np2 -i ../poppler-bindings.patch
+
+  libtoolize --force --copy
+  AT_M4DIR="m4" autoreconf -i
+  ./configure --prefix=${_qtdir} --sysconfdir=/etc \
+              --localstatedir=/var --disable-static \
+              --enable-zlib \
+              --enable-libjpeg \
+              --enable-cairo-output \
+              --enable-poppler-qt \
+              --disable-poppler-glib \
+              --disable-gtk-test \
+              --disable-poppler-qt4
+  sed -i -e 's|^LDFLAGS =|LDFLAGS = -L${_qtdir}/lib -lqt-mt|' qt/Makefile
+  pushd poppler
+  make libpoppler-cairo.la
+  popd
+  make
+}
+
+package() {
+  cd "${srcdir}/poppler-${pkgver}"
+ make DESTDIR="${pkgdir}" install
+}
diff --git a/arch/master/trinity-poppler-qt3/poppler-bindings.patch b/arch/master/trinity-poppler-qt3/poppler-bindings.patch
new file mode 100644
index 000000000..475418332
--- /dev/null
+++ b/arch/master/trinity-poppler-qt3/poppler-bindings.patch
@@ -0,0 +1,176 @@
+--- src/poppler-0.14.0//Makefile.am	2010-03-15 15:25:51.000000000 -0400
++++ patch/Makefile.am	2010-06-23 22:07:12.000000000 -0400
+@@ -34,7 +34,7 @@
+ utils_subdir = utils
+ endif
+ 
+-SUBDIRS = goo fofi $(splash_subdir) poppler $(utils_subdir) $(glib_subdir) $(qt_subdir) test $(qt4_subdir) $(cpp_subdir)
++SUBDIRS = $(glib_subdir) $(qt_subdir) $(qt4_subdir)
+ 
+ EXTRA_DIST =					\
+ 	README-XPDF				\
+@@ -46,13 +46,9 @@
+ 
+ pkgconfigdir = $(libdir)/pkgconfig
+ pkgconfig_DATA =				\
+-	poppler.pc				\
+-	$(cairo_pc_file)			\
+-	$(splash_pc_file)			\
+ 	$(glib_pc_file)				\
+ 	$(qt_pc_file)                           \
+-	$(qt4_pc_file)				\
+-	$(cpp_pc_file)
++	$(qt4_pc_file)
+ 
+ # Add CMake buildsystem files here so they get added on make dist
+ EXTRA_DIST +=							\
+--- src/poppler-0.14.0//glib/Makefile.am	2010-06-08 15:18:44.000000000 -0400
++++ patch/glib_Makefile.am	2010-06-23 22:01:39.000000000 -0400
+@@ -67,7 +67,7 @@
+ 	poppler-private.h
+ 
+ libpoppler_glib_la_LIBADD =				\
+-	$(top_builddir)/poppler/libpoppler.la		\
++	-lpoppler                                       \
+ 	$(top_builddir)/poppler/libpoppler-cairo.la	\
+ 	$(POPPLER_GLIB_LIBS)				\
+ 	$(GDK_LIBS)					\
+@@ -83,7 +83,7 @@
+        test-poppler-glib.cc
+ 
+ test_poppler_glib_LDADD =			\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler                               \
+ 	libpoppler-glib.la			\
+ 	$(POPPLER_GLIB_LIBS)			\
+ 	$(GDK_LIBS)				\
+--- src/poppler-0.14.0//glib/demo/Makefile.am	2010-02-16 17:11:06.000000000 -0500
++++ patch/glib_demo_Makefile.am	2010-06-23 21:52:33.000000000 -0400
+@@ -49,5 +49,5 @@
+ 
+ LDADD =						\
+ 	$(top_builddir)/glib/libpoppler-glib.la	\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler                               \
+ 	$(GTK_TEST_LIBS)
+--- src/poppler-0.14.0//glib/reference/Makefile.am	2010-01-16 18:43:07.000000000 -0500
++++ patch/glib_reference_Makefile.am	2010-06-23 21:53:36.000000000 -0400
+@@ -73,7 +73,7 @@
+ 	$(GDK_CFLAGS)					\
+ 	$(FREETYPE_CFLAGS)
+ 
+-GTKDOC_LIBS=$(top_builddir)/poppler/libpoppler.la	\
++GTKDOC_LIBS=-lpoppler                               	\
+ 	$(top_builddir)/glib/libpoppler-glib.la		\
+ 	$(POPPLER_GLIB_LIBS)				\
+ 	$(FREETYPE_LIBS)				\
+--- src/poppler-0.14.0//qt/Makefile.am	2010-03-27 09:08:46.000000000 -0400
++++ patch/qt_Makefile.am	2010-06-23 21:54:50.000000000 -0400
+@@ -25,7 +25,7 @@
+ 	poppler-private.h
+ 
+ libpoppler_qt_la_LIBADD = 			\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler                         	\
+ 	$(POPPLER_QT_LIBS)			\
+ 	$(FREETYPE_LIBS)			\
+ 	$(FONTCONFIG_LIBS)
+@@ -42,7 +42,7 @@
+        test-poppler-qt.cpp
+ 
+ test_poppler_qt_LDADD =				\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler                           	\
+ 	libpoppler-qt.la			\
+ 	$(libqt3_LIBS)				\
+ 	$(FREETYPE_LIBS)
+--- src/poppler-0.14.0//qt4/demos/Makefile.am	2010-01-16 18:43:07.000000000 -0500
++++ patch/qt4_demos_Makefile.am	2010-06-23 21:55:38.000000000 -0400
+@@ -7,7 +7,7 @@
+ 	$(POPPLER_QT4_CFLAGS)
+ 
+ LDADDS =					\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler                           	\
+ 	$(top_builddir)/qt4/src/libpoppler-qt4.la	\
+ 	$(FONTCONFIG_LIBS)				\
+ 	$(POPPLER_QT4_LIBS)
+--- src/poppler-0.14.0//qt4/src/Makefile.am	2010-06-08 15:28:43.000000000 -0400
++++ patch/qt4_src_Makefile.am	2010-06-23 21:56:14.000000000 -0400
+@@ -52,7 +52,7 @@
+ 	poppler-page-transition-private.h
+ 
+ libpoppler_qt4_la_LIBADD = 			\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler                          	\
+ 	$(top_builddir)/poppler/libpoppler-arthur.la	\
+ 	$(FONTCONFIG_LIBS)				\
+ 	$(POPPLER_QT4_LIBS)
+--- src/poppler-0.14.0//qt4/tests/Makefile.am	2010-01-16 18:43:07.000000000 -0500
++++ patch/qt4_tests_Makefile.am	2010-06-23 21:57:00.000000000 -0400
+@@ -7,7 +7,7 @@
+ 	$(POPPLER_QT4_CFLAGS)
+ 
+ LDADDS =					\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler                           	\
+ 	$(top_builddir)/qt4/src/libpoppler-qt4.la	\
+ 	$(FONTCONFIG_LIBS)				\
+ 	$(POPPLER_QT4_LIBS)
+--- src/poppler-0.14.0//test/Makefile.am	2010-01-16 18:43:07.000000000 -0500
++++ patch/test_Makefile.am	2010-06-23 21:58:59.000000000 -0400
+@@ -53,14 +53,14 @@
+        gtk-splash-test.cc
+ 
+ gtk_splash_test_LDADD =				\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler                          	\
+ 	$(GTK_TEST_LIBS)
+ 
+ gtk_cairo_test_SOURCES =			\
+        gtk-cairo-test.cc
+ 
+ gtk_cairo_test_LDADD =					\
+-	$(top_builddir)/poppler/libpoppler.la		\
++	-lpoppler                         		\
+ 	$(top_builddir)/glib/libpoppler-glib.la		\
+ 	$(CAIRO_LIBS)					\
+ 	$(GTK_TEST_LIBS)				\
+@@ -71,7 +71,7 @@
+ 
+ pdf_inspector_LDADD =					\
+ 	$(top_builddir)/poppler/libpoppler-cairo.la	\
+-	$(top_builddir)/poppler/libpoppler.la		\
++	-lpoppler                             		\
+ 	$(CAIRO_LIBS)					\
+ 	$(FREETYPE_LIBS)				\
+ 	$(GTK_TEST_LIBS)				\
+@@ -82,7 +82,7 @@
+        perf-test-preview-dummy.cc
+ 
+ perf_test_LDADD =				\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler                         	\
+ 	$(FREETYPE_LIBS)					\
+ 	$(X_EXTRA_LIBS)
+ 
+@@ -90,7 +90,7 @@
+ 	pdf-fullrewrite.cc
+ 
+ pdf_fullrewrite_LDADD = \
+-	$(top_builddir)/poppler/libpoppler.la
++	-lpoppler
+ 
+ EXTRA_DIST =					\
+ 	pdf-operators.c				\
+--- src/poppler-0.14.0//utils/Makefile.am	2010-01-16 18:43:07.000000000 -0500
++++ patch/utils_Makefile.am	2010-06-23 21:59:28.000000000 -0400
+@@ -20,7 +20,7 @@
+ 	$(ABIWORD_CFLAGS)
+ 
+ LDADD =						\
+-	$(top_builddir)/poppler/libpoppler.la	\
++	-lpoppler                         	\
+ 	$(UTILS_LIBS)				\
+ 	$(FONTCONFIG_LIBS)
+ 
diff --git a/arch/master/trinity-pyqt3/PKGBUILD b/arch/master/trinity-pyqt3/PKGBUILD
new file mode 100644
index 000000000..209bcd25f
--- /dev/null
+++ b/arch/master/trinity-pyqt3/PKGBUILD
@@ -0,0 +1,41 @@
+# $Id$
+# Maintainer: David C. Rankin <drankinatty@gmail.com>
+#
+# All modifications and uses of this file are licensed under
+# the software for which this file was made for, should the software
+# be under an Open Source License, at least version 1.9, defined
+# by the Open Source Initiative. In other cases, this file is automatically
+# released to the Public Domain.
+#
+
+pkgname=trinity-pyqt3
+pkgver=3.18.1
+pkgrel=10
+pkgdesc="A set of Python bindings for the Qt3 toolkit"
+arch=('i686' 'x86_64')
+url="http://www.riverbankcomputing.com/software/pyqt/intro"
+groups=('trinity-bld')
+depends=('python2-sip' 'qscintilla-qt3' 'trinity-qt3')
+license=('GPL')
+provides=('trinity-pyqt3' 'pyqt3')
+conflicts=('pyqt3')
+replaces=('trinity-pyqt3')
+source=("http://www.riverbankcomputing.com/static/Downloads/PyQt3/PyQt-x11-gpl-${pkgver}.tar.gz")
+md5sums=('f1d120495d1aaf393819e988c0a7bb7e')
+
+build() {
+  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
+
+  . /etc/profile.d/qt3.sh
+
+  echo yes | python2 configure.py -b /usr/bin \
+    -d /usr/lib/python2.7/site-packages \
+    -v /usr/share/sip
+
+  make
+}
+
+package() {
+  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
+  make DESTDIR=${pkgdir} install
+}
diff --git a/arch/master/trinity-qt3/PKGBUILD b/arch/master/trinity-qt3/PKGBUILD
new file mode 100644
index 000000000..58d8acd9f
--- /dev/null
+++ b/arch/master/trinity-qt3/PKGBUILD
@@ -0,0 +1,276 @@
+# $Id$
+# Maintainer: David C. Rankin <drankinatty@gmail.com>
+#
+# All modifications and uses of this file are licensed under
+# the software for which this file was made for, should the software
+# be under an Open Source License, at least version 1.9, defined
+# by the Open Source Initiative. In other cases, this file is automatically
+# released to the Public Domain.
+#
+
+pkgname=trinity-qt3
+pkgver=3.3.8b
+pkgrel=1
+pkgdesc="The Qt3 gui toolkit - with Trinity patch."
+_prefix="/opt/qt"
+_patchver=3.3.8c
+arch=(i686 x86_64)
+license=('GPL')
+url="http://www.trolltech.com/products/qt/index.html"
+pkgfqn=qt-x11-free-${pkgver}
+# install=qt.install
+groups=('trinity-bld')
+depends=('libjpeg-turbo'
+	'libmng'
+        'libmysqlclient'
+        'libpng'
+        'libxmu'
+        'libxcursor'
+        'libxinerama'
+	'libxft'
+	'libxrandr'
+        'mesa'
+        'postgresql-libs'
+	'unixodbc')
+makedepends=('cups' 'libxi' 'mysql' 'postgresql' 'unixodbc' 'sqlite3')
+optdepends=()
+# optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc')
+provides=('trinity-qt3' 'qt3')
+conflicts=('qt3' 'qt3-enhanced')
+replaces=('trinity-qt3')
+# 'ftp://ftp.trolltech.com/qt/source/${pkgfqn}.tar.gz'
+# ftp://ftp.trolltech.com/qt/source/qt-x11-free-3.3.8b.tar.gz
+source=(ftp://ftp.trolltech.com/qt/source/${pkgfqn}.tar.gz
+        qt3-png14.patch
+	qt-patches.tar.bz2
+	qt3-png14.patch
+	eastern_asian_languagues.diff
+	qt-odbc.patch
+        gcc46-arch.diff
+	qt3_3.3.8c.arch.diff)
+# 	'qt.profile'
+# 	'qt-copy-kde-patches.tar.bz2'
+# 	'utf8-bug-qt3.diff'
+# 	'mysql.patch'
+# 	'qt-font-default-subst.diff'
+options=(!libtool)
+md5sums=('9f05b4125cfe477cc52c9742c3c09009'
+         '1dc671df42b9030dbdf68bb61cd3375e'
+         '2f00e5c0c1e2c2a23dddc982cd79f3e0'
+         '1dc671df42b9030dbdf68bb61cd3375e'
+         '616f1f3029cf8375256ad6a406de3549'
+         '2178ca88dfd75a230918593b30eb0dbe'
+         '445d6937ad197fa31e1a8e4668d3caa6'
+         'd763bdc087786a45e5e5eec84f5c9896')
+
+#         gcc46.diff
+#          'e77192301879b05a4b8ebc35d5c5702b'
+
+# qt-copy-kde-patches come from http://websvn.kde.org/trunk/qt-copy/patches/
+# other qt-patches come from fedora and gentoo
+
+build() {
+  unset QMAKESPEC
+  export QTDIR=${srcdir}/$pkgfqn
+  export PATH=${QTDIR}/bin:${PATH}
+  export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
+  export QMAKESPEC=$QTDIR/mkspecs/linux-g++
+  export CPATH=/usr/include/postgresql/server:/usr/include/mysql
+
+  cd ${QTDIR}
+#   cd ${srcdir}/$pkgfqn
+
+  # apply other qt patches and one security fix from debian/gentoo
+  for i in ../qt-patches/*; do
+    patch -Np1 -i $i || return 1
+  done
+  # fix CJK font/chars select error (FS#11245)
+  patch -p1 -i ${srcdir}/eastern_asian_languagues.diff || return 1
+  # fix build problem against new unixODBC
+  patch -p1 -i ${srcdir}/qt-odbc.patch || return 1
+  patch -p0 -i ${srcdir}/qt3-png14.patch || return 1
+
+  # patch for gcc 4.6
+  patch -p1 -i ${srcdir}/gcc46-arch.diff || return 1
+
+  # patch for qt3_3.3.8c
+  patch -p0 -i ${srcdir}/qt3_3.3.8c.arch.diff || return 1
+
+  # start compiling qt
+  # baho additions
+# 	# remove runtime library search not needed when installed into /usr
+# 	sed -i '/QMAKE_RPATH/d' mkspecs/linux*/qmake.conf
+  sed -i 's|-cp -P -f|-cp -L -f|' qmake/Makefile.unix
+  rm -rf doc/html examples tutorial
+  sed -i "s|sub-tutorial sub-examples||" Makefile
+  sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++/qmake.conf
+  sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-32/qmake.conf
+  sed -i "s|-O2|$CXXFLAGS|" mkspecs/linux-g++-64/qmake.conf
+  sed -i "s|-I. |$CXXFLAGS -I. |" qmake/Makefile.unix
+  sed -i "s|read acceptance|acceptance=yes|" configure
+
+ # remove unwanted mkspecs
+  rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*}
+
+  # set arch if x86_64 build
+  if [ "$CARCH" = "x86_64" ]; then
+      export ARCH="-64"
+    else unset ARCH
+  fi
+
+#   ./configure -prefix /opt/qt -platform linux-g++$ARCH \
+#     -system-zlib -qt-gif -release -shared -sm -nis -thread -stl \
+#     -system-lib{png,jpeg,mng} \
+#     -no-g++-exceptions -plugin-sql-{mysql,psql,sqlite,odbc}
+
+  msg "Starting configure..."
+  ./configure 	-prefix ${_prefix} \
+		-sysconfdir /etc/qt \
+		-qt-gif \
+		-system-zlib \
+		-system-libjpeg \
+		-plugin-imgfmt-jpeg \
+		-system-libmng \
+		-plugin-imgfmt-mng \
+		-system-libpng \
+		-plugin-imgfmt-png \
+		-plugin-sql-mysql \
+		-plugin-sql-psql \
+		-plugin-sql-sqlite \
+		-plugin-sql-odbc \
+		-no-exceptions \
+		-thread \
+		-no-tablet
+		#-platform linux-g++ \
+
+## remove custom locations from Baho's /usr install experiment
+# 		-docdir ${_prefix}/share/doc/qt \
+# 		-headerdir ${_prefix}/include/qt \
+# 		-plugindir ${_prefix}/lib/qt/plugins \
+# 		-datadir ${_prefix}/share/qt \
+# 		-translationdir ${_prefix}/share/qt/translations \
+
+  # fix /opt/qt/lib path
+  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/src/Makefile
+  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/designer/designer/Makefile
+  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/designer/editor/Makefile
+  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/assistant/lib/Makefile
+  [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${QTDIR}/tools/designer/uilib/Makefile
+
+#  bahoo make
+#   make sub-tools
+
+  cd ${QTDIR}
+  make -C qmake || return 1
+  cd ${QTDIR}/plugins/src/sqldrivers/mysql
+  ${QTDIR}/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro
+  cd ${QTDIR}/plugins/src/sqldrivers/psql
+  ${QTDIR}/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro
+
+  cd ${QTDIR}
+  # fix the broken makefiles
+  #sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile
+  make || return 1
+
+}
+
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${QTDIR}
+  pkgver=${_patchver}
+  make INSTALL_ROOT=${pkgdir} install
+
+  ## Original Qt Build
+  rm -rf ${pkgdir}${_prefix}/{phrasebooks,templates,translations}
+  sed -i "s|-L${QTDIR}/lib ||g" ${pkgdir}${_prefix}/lib/*.prl
+  install -D -m755 qmake/qmake ${pkgdir}${_prefix}/bin/qmake
+
+  # Build and install qt.profile
+  echo "export QTDIR=${_prefix}" > ${srcdir}/qt.profile
+  echo "export QT_XFT=true" >> ${srcdir}/qt.profile
+  echo 'export PATH=$PATH:$QTDIR/bin' >> ${srcdir}/qt.profile
+  echo 'export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$QTDIR/pkgconfig' >> ${srcdir}/qt.profile
+  install -D -m755 ${srcdir}/qt.profile ${pkgdir}/etc/profile.d/qt3.sh
+
+  ln -sf ${_prefix}/bin/qtconfig ${pkgdir}${_prefix}/bin/qt3config
+  rm -f ${pkgdir}${_prefix}/mkspecs/linux-g++$ARCH/linux-g++$ARCH
+
+  # install man pages
+  mkdir -p ${pkgdir}${_prefix}/man
+  cp -r ${QTDIR}/doc/man/{man1,man3} ${pkgdir}${_prefix}/man/
+
+  # Uncomment to install examples
+#   cp -v -r ${QTDIR}/examples ${pkgdir}${_prefix}/share/doc/qt
+
+  install -d -m755 ${pkgdir}/etc/ld.so.conf.d/
+  echo "${_prefix}/lib" > ${pkgdir}/etc/ld.so.conf.d/qt3.conf
+
+}
+
+  ## Baho Additions
+
+# 	ln -v -sf libqt-mt.so ${pkgdir}${_prefix}/lib/libqt.so
+# 	ln -v -snf ../../bin ${pkgdir}${_prefix}/share/qt/bin
+# 	ln -v -snf ../../include/qt ${pkgdir}${_prefix}/share/qt/include
+# 	ln -v -snf ../../lib ${pkgdir}${_prefix}/share/qt/lib
+# 	rm ${pkgdir}${_prefix}/share/qt/mkspecs/linux-g++/linux-g++
+# 	ln -v -snf ../linux-g++ ${pkgdir}${_prefix}/share/qt/mkspecs/linux-g++/linux-g++
+# 	cp -v -r doc/man ${pkgdir}${_prefix}/share
+# 	#	Don't do examples
+# 	cp -v -r examples ${pkgdir}${_prefix}/share/doc/qt
+# 	#	Build qt.profile
+# 	echo "export QTDIR=${_prefix}" > ${srcdir}/qt.profile
+# 	echo "export QT_XFT=true" >> ${srcdir}/qt.profile
+# 	echo 'export PATH=$PATH:$QTDIR/bin' >> ${srcdir}/qt.profile
+# 	echo 'export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:$QTDIR/pkgconfig' >> ${srcdir}/qt.profile
+#
+# 	install -D -m755 ${srcdir}/qt.profile ${pkgdir}/etc/profile.d/qt3.sh
+# 	ln -sf ${_prefix}/bin/qtconfig ${pkgdir}${_prefix}/bin/qt3config
+
+
+## scraps
+  # apply qt patches from kde.org
+#   for i in ../qt-copy-kde-patches/*; do
+#     patch -Np0 -i $i || return 1
+#   done
+  # fix utf8 bug
+#   patch -Np0 -i ../utf8-bug-qt3.diff || return 1
+  # fix asia fonts
+#   patch -Np0 -i ../qt-font-default-subst.diff || return 1
+  # fix segfaults on exit when using mysql DB driver
+#   patch -Np0 -i ../mysql.patch || return 1
+
+#   # fix /opt/qt/lib path
+#   [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${srcdir}/$pkgfqn/src/Makefile
+#   [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${srcdir}/$pkgfqn/tools/designer/designer/Makefile
+#   [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${srcdir}/$pkgfqn/tools/designer/editor/Makefile
+#   [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${srcdir}/$pkgfqn/tools/assistant/lib/Makefile
+#   [ "$CARCH" = "x86_64" ] && sed -i "s|/opt/qt/lib64|/opt/qt/lib|g" ${srcdir}/$pkgfqn/tools/designer/uilib/Makefile
+#
+#   cd ${srcdir}/$pkgfqn
+#   make -C qmake || return 1
+#   cd ${srcdir}/$pkgfqn/plugins/src/sqldrivers/mysql
+#   ${srcdir}/$pkgfqn/bin/qmake -o Makefile "INCPATH+=/usr/include/mysql" "LIBS+=-L/usr/lib/mysql -lmysqlclient" mysql.pro
+#   cd ${srcdir}/$pkgfqn/plugins/src/sqldrivers/psql
+#   ${srcdir}/$pkgfqn/bin/qmake -o Makefile "INCPATH+=/usr/src/include /usr/include/postgresql/server" "LIBS+=-L/usr/lib -lpq" psql.pro
+#
+#   cd ${srcdir}/$pkgfqn
+#   # fix the broken makefiles
+#   #sed -i 's|[[:space:]]*strip.*doc/html.*$|#|g' src/Makefile
+#   make || return 1
+#   make INSTALL_ROOT=${pkgdir} install
+#   rm -rf ${pkgdir}/opt/qt/{phrasebooks,templates,translations}
+#   sed -i "s|-L${srcdir}/$pkgfqn/lib ||g" ${pkgdir}/opt/qt/lib/*.prl
+#   install -D -m755 qmake/qmake ${pkgdir}/opt/qt/bin/qmake
+#   install -D -m755 ${srcdir}/qt.profile ${pkgdir}/etc/profile.d/qt3.sh
+#   ln -sf /opt/qt/bin/qtconfig ${pkgdir}/opt/qt/bin/qt3config
+#   rm -f ${pkgdir}/opt/qt/mkspecs/linux-g++$ARCH/linux-g++$ARCH
+#
+#   # install man pages
+#   mkdir -p ${pkgdir}/opt/qt/man
+#   cp -r ${srcdir}/$pkgfqn/doc/man/{man1,man3} ${pkgdir}/opt/qt/man/
+#
+#   install -d -m755 ${pkgdir}/etc/ld.so.conf.d/
+#   echo '/opt/qt/lib' > ${pkgdir}/etc/ld.so.conf.d/qt3.conf
+# }
\ No newline at end of file
diff --git a/arch/master/trinity-qt3/eastern_asian_languagues.diff b/arch/master/trinity-qt3/eastern_asian_languagues.diff
new file mode 100644
index 000000000..7c25eef7d
--- /dev/null
+++ b/arch/master/trinity-qt3/eastern_asian_languagues.diff
@@ -0,0 +1,39 @@
+--- qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp	2008-01-15 21:09:13.000000000 +0200
++++ qt-x11-free-3.3.8b/src/kernel/qfontdatabase.cpp	2008-03-10 11:34:22.000000000 +0200
+@@ -966,20 +966,22 @@
+ 
+ #ifdef Q_WS_X11
+     if (script == QFont::Han) {
+-	// modify script according to locale
+-	static QFont::Script defaultHan = QFont::UnknownScript;
+-	if (defaultHan == QFont::UnknownScript) {
+-	    QCString locale = setlocale(LC_ALL, NULL);
+-	    if (locale.contains("ko"))
+-		defaultHan = QFont::Han_Korean;
+-	    else if (locale.contains("zh_TW") || locale.contains("zh_HK"))
+-		defaultHan = QFont::Han_TraditionalChinese;
+-	    else if (locale.contains("zh"))
+-		defaultHan = QFont::Han_SimplifiedChinese;
+-	    else
+-		defaultHan = QFont::Han_Japanese;
+-	}
+-	script = defaultHan;
++        // modify script according to locale
++        static QFont::Script defaultHan;
++        QCString locale = setlocale(LC_ALL, NULL);
++
++        if (locale.contains("ko"))
++            defaultHan = QFont::Han_Korean;
++        else if (locale.contains("zh_TW") || locale.contains("zh_HK"))
++            defaultHan = QFont::Han_TraditionalChinese;
++        else if (locale.contains("zh"))
++            defaultHan = QFont::Han_SimplifiedChinese;
++        else if (locale.contains("ja"))
++            defaultHan = QFont::Han_Japanese;
++        else
++            defaultHan = QFont::Han; // don't change
++
++        script = defaultHan;
+     }
+ #endif
+ 
diff --git a/arch/master/trinity-qt3/gcc46-arch.diff b/arch/master/trinity-qt3/gcc46-arch.diff
new file mode 100644
index 000000000..caa9bfc44
--- /dev/null
+++ b/arch/master/trinity-qt3/gcc46-arch.diff
@@ -0,0 +1,61 @@
+diff -Naur --label qt-x11-free-3.3.8b qt-x11-free-3.3.8b qt-x11-free-3.3.8b/src/tools/qmap.h
+--- qt-x11-free-3.3.8b
++++ qt-x11-free-3.3.8b/src/tools/qmap.h	2011-05-10 08:47:27.000000000 -0500
+@@ -50,6 +50,7 @@
+ #endif // QT_H
+ 
+ #ifndef QT_NO_STL
++#include <cstddef>
+ #include <iterator>
+ #include <map>
+ #endif
+@@ -107,7 +108,7 @@
+ #endif
+     typedef T          value_type;
+ #ifndef QT_NO_STL
+-    typedef ptrdiff_t  difference_type;
++    typedef std::ptrdiff_t  difference_type;
+ #else
+     typedef int difference_type;
+ #endif
+@@ -223,7 +224,7 @@
+ #endif
+     typedef T          value_type;
+ #ifndef QT_NO_STL
+-    typedef ptrdiff_t  difference_type;
++    typedef std::ptrdiff_t  difference_type;
+ #else
+     typedef int difference_type;
+ #endif
+@@ -604,7 +605,7 @@
+     typedef value_type& reference;
+     typedef const value_type& const_reference;
+ #ifndef QT_NO_STL
+-    typedef ptrdiff_t  difference_type;
++    typedef std::ptrdiff_t  difference_type;
+ #else
+     typedef int difference_type;
+ #endif
+diff -Naur --label qt-x11-free-3.3.8b qt-x11-free-3.3.8b qt-x11-free-3.3.8b/src/tools/qvaluelist.h
+--- qt-x11-free-3.3.8b
++++ qt-x11-free-3.3.8b/src/tools/qvaluelist.h	2011-05-10 08:46:46.000000000 -0500
+@@ -50,6 +50,7 @@
+ #ifndef QT_NO_STL
+ #include <iterator>
+ #include <list>
++#include <cstddef>
+ #endif
+ 
+ //#define QT_CHECK_VALUELIST_RANGE
+diff -Naur --label qt-x11-free-3.3.8b qt-x11-free-3.3.8b qt-x11-free-3.3.8b/src/tools/qvaluevector.h
+--- qt-x11-free-3.3.8b
++++ qt-x11-free-3.3.8b/src/tools/qvaluevector.h	2011-05-10 08:46:46.000000000 -0500
+@@ -244,7 +244,7 @@
+     typedef const value_type& const_reference;
+     typedef size_t size_type;
+ #ifndef QT_NO_STL
+-    typedef ptrdiff_t difference_type;
++    typedef std::ptrdiff_t difference_type;
+ #else
+     typedef int difference_type;
+ #endif
diff --git a/arch/master/trinity-qt3/mysql.patch b/arch/master/trinity-qt3/mysql.patch
new file mode 100644
index 000000000..5f61edc67
--- /dev/null
+++ b/arch/master/trinity-qt3/mysql.patch
@@ -0,0 +1,47 @@
+--- src/sql/drivers/mysql/qsql_mysql.cpp
++++ src/sql/drivers/mysql/qsql_mysql.cpp
+@@ -37,7 +37,6 @@
+ #include "qsql_mysql.h"
+ #include <private/qsqlextension_p.h>
+ 
+-#include <qapplication.h>
+ #include <qdatetime.h>
+ #include <qvaluevector.h>
+ #include <qsqlrecord.h>
+@@ -341,14 +340,6 @@ int QMYSQLResult::numRowsAffected()
+ }
+ 
+ /////////////////////////////////////////////////////////
+-static void qServerEnd()
+-{
+-#ifndef Q_NO_MYSQL_EMBEDDED
+-# if MYSQL_VERSION_ID >= 40000
+-    mysql_server_end();
+-# endif // MYSQL_VERSION_ID
+-#endif // Q_NO_MYSQL_EMBEDDED
+-}
+ 
+ static void qServerInit()
+ {
+@@ -366,9 +357,7 @@ static void qServerInit()
+ 	qWarning( "QMYSQLDriver::qServerInit: unable to start server." );
+ #  endif
+     }
+-    qAddPostRoutine(qServerEnd);
+     init = TRUE;    
+-    
+ # endif // MYSQL_VERSION_ID
+ #endif // Q_NO_MYSQL_EMBEDDED
+ }
+@@ -411,6 +400,11 @@ QMYSQLDriver::~QMYSQLDriver()
+ 	QSqlOpenExtension *ext = qSqlOpenExtDict()->take( this );
+ 	delete ext;
+     }
++#ifndef Q_NO_MYSQL_EMBEDDED
++# if MYSQL_VERSION_ID > 40000
++    mysql_server_end();
++# endif
++#endif
+ }
+ 
+ bool QMYSQLDriver::hasFeature( DriverFeature f ) const
diff --git a/arch/master/trinity-qt3/qt-copy-kde-patches.tar.bz2 b/arch/master/trinity-qt3/qt-copy-kde-patches.tar.bz2
new file mode 100644
index 000000000..19d899963
--- /dev/null
+++ b/arch/master/trinity-qt3/qt-copy-kde-patches.tar.bz2
diff --git a/arch/master/trinity-qt3/qt-font-default-subst.diff b/arch/master/trinity-qt3/qt-font-default-subst.diff
new file mode 100644
index 000000000..3e286f74e
--- /dev/null
+++ b/arch/master/trinity-qt3/qt-font-default-subst.diff
@@ -0,0 +1,77 @@
+--- src/kernel/qfontdatabase_x11.cpp
++++ src/kernel/qfontdatabase_x11.cpp
+@@ -1589,15 +1589,6 @@ QFontEngine *loadEngine( QFont::Script s
+ 	    if (script == QFont::Latin)
+ 		// add Euro character
+ 		FcCharSetAddChar(cs, 0x20ac);
+-	    if (script == QFont::Han_SimplifiedChinese)
+-		FcCharSetAddChar(cs, 0x3400);
+-	    if (script == QFont::Han_TraditionalChinese){
+-		FcCharSetAddChar(cs, 0x3435);
+-		FcCharSetAddChar(cs, 0xE000);
+-		FcCharSetAddChar(cs, 0xF6B1);
+-	    }
+-	    if (script == QFont::MiscellaneousSymbols)
+-		FcCharSetAddChar(cs, 0x2714);
+ 	    FcPatternAddCharSet(pattern, FC_CHARSET, cs);
+ 	    FcCharSetDestroy(cs);
+ 	}
+@@ -1813,7 +1804,11 @@ static QFontEngine *loadFontConfigFont(c
+     FcPatternPrint(pattern);
+ #endif
+ 
++    // XftFontMatch calls the right ConfigSubstitute variants, but as we use
++    // FcFontMatch/Sort here we have to do it manually.
+     FcConfigSubstitute(0, pattern, FcMatchPattern);
++    XftDefaultSubstitute(QPaintDevice::x11AppDisplay(), QPaintDevice::x11AppScreen(), pattern);
++
+ //     qDebug("1: pattern contains:");
+ //     FcPatternPrint(pattern);
+ 
+@@ -1847,10 +1842,6 @@ static QFontEngine *loadFontConfigFont(c
+ 	    value.u.s = (const FcChar8 *)cs.data();
+ 	    FcPatternAddWeak(pattern, FC_FAMILY, value, FcTrue);
+ 	}
+-#ifdef FONT_MATCH_DEBUG
+-	printf("final pattern contains:\n");
+-	FcPatternPrint(pattern);
+-#endif
+     }
+ 
+     if (script != QFont::Unicode) {
+@@ -1860,19 +1851,15 @@ static QFontEngine *loadFontConfigFont(c
+         if (script == QFont::Latin)
+             // add Euro character
+             FcCharSetAddChar(cs, 0x20ac);
+-	if (script == QFont::Han_SimplifiedChinese)
+-	    FcCharSetAddChar(cs, 0x3400);
+-	if (script == QFont::Han_TraditionalChinese) {
+-	    FcCharSetAddChar(cs, 0x3435);
+-	    FcCharSetAddChar(cs, 0xE000);
+-	    FcCharSetAddChar(cs, 0xF6B1);
+-	}
+-	if (script == QFont::MiscellaneousSymbols)
+-	    FcCharSetAddChar(cs, 0x2714);
+         FcPatternAddCharSet(pattern, FC_CHARSET, cs);
+         FcCharSetDestroy(cs);
+     }
+ 
++#ifdef FONT_MATCH_DEBUG
++	printf("final pattern contains:\n");
++	FcPatternPrint(pattern);
++#endif
++
+     QFontEngine *fe = 0;
+ 
+     for( int jj = (FcGetVersion() >= 20392 ? 0 : 1); jj < 2; ++jj ) {
+--- src/kernel/qfontdatabase.cpp
++++ src/kernel/qfontdatabase.cpp
+@@ -554,7 +554,7 @@ static const unsigned short sample_chars
+     // GeometricSymbols,
+     { 0x2500, 0x0 },
+     // MiscellaneousSymbols,
+-    { 0x2640, 0x0 },
++    { 0x2640, 0x2714, 0x0 },
+     // EnclosedAndSquare,
+     { 0x2460, 0x0 },
+     // Braille,
diff --git a/arch/master/trinity-qt3/qt-odbc.patch b/arch/master/trinity-qt3/qt-odbc.patch
new file mode 100644
index 000000000..6f21e3cf1
--- /dev/null
+++ b/arch/master/trinity-qt3/qt-odbc.patch
@@ -0,0 +1,19 @@
+diff -up qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp
+--- qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp.orig	2009-02-24 11:32:27.000000000 +0100
++++ qt-x11-free-3.3.8/src/sql/drivers/odbc/qsql_odbc.cpp	2009-02-24 11:33:43.000000000 +0100
+@@ -57,13 +57,13 @@
+ #endif
+ 
+ // newer platform SDKs use SQLLEN instead of SQLINTEGER
+-#ifdef SQLLEN
++#if defined(SQLLEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
+ # define QSQLLEN SQLLEN
+ #else
+ # define QSQLLEN SQLINTEGER
+ #endif
+ 
+-#ifdef SQLULEN
++#if defined(SQLULEN) || defined(Q_OS_WIN64) || defined(Q_OS_UNIX)
+ # define QSQLULEN SQLULEN
+ #else
+ # define QSQLULEN SQLUINTEGER
diff --git a/arch/master/trinity-qt3/qt-patches.tar.bz2 b/arch/master/trinity-qt3/qt-patches.tar.bz2
new file mode 100644
index 000000000..3f4aee171
--- /dev/null
+++ b/arch/master/trinity-qt3/qt-patches.tar.bz2
diff --git a/arch/master/trinity-qt3/qt.install b/arch/master/trinity-qt3/qt.install
new file mode 100644
index 000000000..6d042daae
--- /dev/null
+++ b/arch/master/trinity-qt3/qt.install
@@ -0,0 +1,12 @@
+post_install() {
+	post_remove
+}
+
+post_upgrade() {
+	post_remove
+}
+
+post_remove() {
+	# this can be removed in future versions
+	sed  -e '/\/opt\/qt\/lib/d' -i etc/ld.so.conf
+}
diff --git a/arch/master/trinity-qt3/qt.profile b/arch/master/trinity-qt3/qt.profile
new file mode 100644
index 000000000..ed4d232ae
--- /dev/null
+++ b/arch/master/trinity-qt3/qt.profile
@@ -0,0 +1,4 @@
+export QTDIR=/opt/qt
+export QT_XFT=true
+export PATH=$PATH:$QTDIR/bin
+export PKG_CONFIG_PATH=$PKG_CONFIG_PATH:/opt/qt/lib/pkgconfig
diff --git a/arch/master/trinity-qt3/qt3-png14.patch b/arch/master/trinity-qt3/qt3-png14.patch
new file mode 100644
index 000000000..e8a194529
--- /dev/null
+++ b/arch/master/trinity-qt3/qt3-png14.patch
@@ -0,0 +1,33 @@
+--- src/kernel/qpngio.cpp.orig	2010-01-16 22:02:41.000000000 +0100
++++ src/kernel/qpngio.cpp	2010-01-16 22:03:56.000000000 +0100
+@@ -159,7 +159,7 @@
+ 		image.setColor( i, qRgba(c,c,c,0xff) );
+ 	    }
+ 	    if ( png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS) ) {
+-		const int g = info_ptr->trans_values.gray;
++		const int g = info_ptr->trans_color.gray;
+ 		if (g < ncols) {
+ 		    image.setAlphaBuffer(TRUE);
+ 		    image.setColor(g, image.color(g) & RGB_MASK);
+@@ -187,7 +187,7 @@
+ 		    info_ptr->palette[i].red,
+ 		    info_ptr->palette[i].green,
+ 		    info_ptr->palette[i].blue,
+-		    info_ptr->trans[i]
++		    info_ptr->trans_alpha[i]
+ 		    )
+ 		);
+ 		i++;
+@@ -321,9 +321,9 @@
+ png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)
+     if (image.depth()==32 && png_get_valid(png_ptr, info_ptr, PNG_INFO_tRNS)) {
+ 	QRgb trans = 0xFF000000 | qRgb(
+-	      (info_ptr->trans_values.red << 8 >> bit_depth)&0xff,
+-	      (info_ptr->trans_values.green << 8 >> bit_depth)&0xff,
+-	      (info_ptr->trans_values.blue << 8 >> bit_depth)&0xff);
++	      (info_ptr->trans_color.red << 8 >> bit_depth)&0xff,
++	      (info_ptr->trans_color.green << 8 >> bit_depth)&0xff,
++	      (info_ptr->trans_color.blue << 8 >> bit_depth)&0xff);
+ 	for (uint y=0; y<height; y++) {
+ 	    for (uint x=0; x<info_ptr->width; x++) {
+ 		if (((uint**)jt)[y][x] == trans) {
diff --git a/arch/master/trinity-qt3/qt3_3.3.8c.arch.diff b/arch/master/trinity-qt3/qt3_3.3.8c.arch.diff
new file mode 100644
index 000000000..39c751a71
--- /dev/null
+++ b/arch/master/trinity-qt3/qt3_3.3.8c.arch.diff
@@ -0,0 +1,72 @@
+--- include/qobject.h	2008-01-15 13:09:13.000000000 -0600
++++ include/qobject.h	2011-01-01 18:33:19.715656496 -0600
+@@ -101,8 +101,11 @@
+
+     QObject           *child( const char *objName, const char *inheritsClass = 0, bool recursiveSearch = TRUE ); //### const in 4.0
+     const QObjectList *children() const { return childObjects; }
++    QObjectList childrenListObject();
++    const QObjectList childrenListObject() const;
+
+     static const QObjectList *objectTrees();
++    static const QObjectList objectTreesListObject();
+
+     QObjectList	      *queryList( const char *inheritsClass = 0,
+ 				  const char *objName = 0,
+--- src/kernel/qobject.cpp	2008-01-15 13:09:13.000000000 -0600
++++ src/kernel/qobject.cpp	2011-01-01 18:28:16.191270264 -0600
+@@ -360,6 +360,30 @@
+     }
+ }
+
++/*! \internal
++    TQt compatibility function
++*/
++QObjectList QObject::childrenListObject() {
++	if (children()) return *(children());
++	else return QObjectList();
++}
++
++/*! \internal
++    TQt compatibility function
++*/
++const QObjectList QObject::childrenListObject() const {
++	if (children()) return *(children());
++	else return QObjectList();
++}
++
++/*! \internal
++    TQt compatibility function
++*/
++const QObjectList QObject::objectTreesListObject() {
++	if (objectTrees()) return *(objectTrees());
++	else return QObjectList();
++}
++
+
+ /*****************************************************************************
+   QObject member functions
+--- src/kernel/qobject.h	2008-01-15 13:09:13.000000000 -0600
++++ src/kernel/qobject.h	2011-01-01 18:33:19.715656496 -0600
+@@ -101,8 +101,11 @@
+
+     QObject           *child( const char *objName, const char *inheritsClass = 0, bool recursiveSearch = TRUE ); //### const in 4.0
+     const QObjectList *children() const { return childObjects; }
++    QObjectList childrenListObject();
++    const QObjectList childrenListObject() const;
+
+     static const QObjectList *objectTrees();
++    static const QObjectList objectTreesListObject();
+
+     QObjectList	      *queryList( const char *inheritsClass = 0,
+ 				  const char *objName = 0,
+--- src/tools/qglobal.h	2008-01-15 21:09:13.000000000 +0200
++++ src/tools/qglobal.h	2011-03-15 00:28:11.221711757 +0200
+@@ -41,7 +41,7 @@
+ #ifndef QGLOBAL_H
+ #define QGLOBAL_H
+
+-#define QT_VERSION_STR   "3.3.8b"
++#define QT_VERSION_STR   "3.3.8c"
+ /*
+    QT_VERSION is (major << 16) + (minor << 8) + patch.
+  */
diff --git a/arch/master/trinity-qt3/utf8-bug-qt3.diff b/arch/master/trinity-qt3/utf8-bug-qt3.diff
new file mode 100644
index 000000000..43e84a99f
--- /dev/null
+++ b/arch/master/trinity-qt3/utf8-bug-qt3.diff
@@ -0,0 +1,101 @@
+--- src/codecs/qutfcodec.cpp
++++ src/codecs/qutfcodec.cpp
+@@ -154,6 +154,7 @@
+ 
+ class QUtf8Decoder : public QTextDecoder {
+     uint uc;
++    uint min_uc;
+     int need;
+     bool headerDone;
+ public:
+@@ -167,8 +168,9 @@
+ 	result.setLength( len ); // worst case
+ 	QChar *qch = (QChar *)result.unicode();
+ 	uchar ch;
++        int error = -1;
+ 	for (int i=0; i<len; i++) {
+-	    ch = *chars++;
++	    ch = chars[i];
+ 	    if (need) {
+ 		if ( (ch&0xc0) == 0x80 ) {
+ 		    uc = (uc << 6) | (ch & 0x3f);
+@@ -182,6 +184,8 @@
+ 			    *qch++ = QChar(high);
+ 			    *qch++ = QChar(low);
+ 			    headerDone = TRUE;
++			} else if ((uc < min_uc) || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
++                            *qch++ = QChar::replacement;
+ 			} else {
+ 			    if (headerDone || QChar(uc) != QChar::byteOrderMark)
+ 				*qch++ = uc;
+@@ -190,6 +194,7 @@
+ 		    }
+ 		} else {
+ 		    // error
++                    i = error;
+ 		    *qch++ = QChar::replacement;
+ 		    need = 0;
+ 		}
+@@ -200,12 +205,21 @@
+ 		} else if ((ch & 0xe0) == 0xc0) {
+ 		    uc = ch & 0x1f;
+ 		    need = 1;
++                    error = i;
++		    min_uc = 0x80;
+ 		} else if ((ch & 0xf0) == 0xe0) {
+ 		    uc = ch & 0x0f;
+ 		    need = 2;
++                    error = i;
++		    min_uc = 0x800;
+ 		} else if ((ch&0xf8) == 0xf0) {
+ 		    uc = ch & 0x07;
+ 		    need = 3;
++                    error = i;
++                    min_uc = 0x10000;
++                } else {
++                    // error
++                    *qch++ = QChar::replacement;
+ 		}
+ 	    }
+ 	}
+--- src/tools/qstring.cpp
++++ src/tools/qstring.cpp
+@@ -5805,6 +5805,7 @@
+     result.setLength( len ); // worst case
+     QChar *qch = (QChar *)result.unicode();
+     uint uc = 0;
++    uint min_uc = 0;
+     int need = 0;
+     int error = -1;
+     uchar ch;
+@@ -5822,6 +5823,12 @@
+ 			unsigned short low = uc%0x400 + 0xdc00;
+ 			*qch++ = QChar(high);
+ 			*qch++ = QChar(low);
++		    } else if (uc < min_uc || (uc >= 0xd800 && uc <= 0xdfff) || (uc >= 0xfffe)) {
++			// overlong seqence, UTF16 surrogate or BOM
++                        i = error;
++                        qch = addOne(qch, result);
++                        *qch++ = QChar(0xdbff);
++                        *qch++ = QChar(0xde00+((uchar)utf8[i]));
+ 		    } else {
+ 			*qch++ = uc;
+ 		    }
+@@ -5844,14 +5851,17 @@
+ 		uc = ch & 0x1f;
+ 		need = 1;
+ 		error = i;
++		min_uc = 0x80;
+ 	    } else if ((ch & 0xf0) == 0xe0) {
+ 		uc = ch & 0x0f;
+ 		need = 2;
+ 		error = i;
++		min_uc = 0x800;
+ 	    } else if ((ch&0xf8) == 0xf0) {
+ 		uc = ch & 0x07;
+ 		need = 3;
+ 		error = i;
++		min_uc = 0x10000;
+ 	    } else {
+ 	        // Error
+                 qch = addOne(qch, result);
diff --git a/arch/master/trinity-tqtinterface/PKGBUILD b/arch/master/trinity-tqtinterface/PKGBUILD
new file mode 100644
index 000000000..62720a752
--- /dev/null
+++ b/arch/master/trinity-tqtinterface/PKGBUILD
@@ -0,0 +1,106 @@
+# $Id$
+# Maintainer: David C. Rankin <drankinatty@gmail.com>
+#
+# All modifications and uses of this file are licensed under
+# the software for which this file was made for, should the software
+# be under an Open Source License, at least version 1.9, defined
+# by the Open Source Initiative. In other cases, this file is automatically
+# released to the Public Domain.
+#
+
+pkgbase=trinity
+pkgname=trinity-tqtinterface
+pkgver=1237311
+pkgrel=1
+arch=('i686' 'x86_64')
+url="http://trinity.pearsoncomputing.net"
+license=('GPL2')
+groups=('trinity-bld')
+pkgdesc="Trinity - tqtinterface"
+depends=('python2-sip'
+	'trinity-qt3'
+	'trinity-pyqt3')
+makedepends=('subversion'
+             'pkgconfig'
+             'cmake'
+             'autoconf'
+             'libxi'
+             'libxft'
+             'libxrandr'
+             'libxcursor'
+             'libxinerama'
+             'mesa')
+provides=('trinity-tqtinterface')
+conflicts=('trinity-tqtinterface')
+replaces=('trinity-tqtinterface')
+source=()
+
+_svntrunk="svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/tqtinterface"
+_svnmod=tqtinterface
+
+_qtdir=/opt/qt
+_prefix=${_qtdir}
+
+build() {
+
+  cd ${srcdir}
+
+  msg "Connecting to SVN server to update or checkout ${_svnmod}...."
+  if [ -d ${_svnmod}/.svn ]; then
+    (cd ${_svnmod} && svn up)
+    [[ $? -eq 0 ]] || _co_failed=1
+  else
+    (svn co $_svntrunk ${_svnmod})
+    [[ $? -eq 0 ]] || _co_failed=1
+  fi
+
+  # if update or checkout failed - bail...
+  if [[ $_co_failed -ne 1 ]]; then
+    msg "SVN checkout of revision $pkgver -- Complete."
+  else
+    msg "SVN checkout of revision $pkgver -- Failed or server timeout."
+    exit 1
+  fi
+
+  msg "Setting PATH, CMAKE and Trinity Environment variables"
+  if [[ -r /etc/profile.d/qt3.sh ]]; then
+    . /etc/profile.d/qt3.sh
+  else
+    [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH
+  fi
+
+#   cd ${srcdir}/${_svnmod}
+
+  cd $srcdir
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p build
+  cd build
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_svnmod} \
+    -DCMAKE_INSTALL_PREFIX=${_prefix} \
+    -DQT_INCLUDE_DIR=/opt/qt/include \
+    -DQT_VERSION=3 || return 1
+
+#     -DQT_INCLUDE_DIR=${_prefix}/include/tqt/Qt
+#     -DWITH_QT3=ON \
+#     -DQT_LIBRARY_DIRS=/opt/qt/lib \
+#     -DCMAKE_SKIP_RPATH=ON || return 1
+  make
+}
+
+package() {
+
+  msg "Packaging - $pkgname-$pkgver"
+
+#   cd ${_svnmod}
+  cd ${srcdir}/build
+  make DESTDIR="$pkgdir/" install
+
+  # include uic-tqt in package
+#   cd ${srcdir}
+#   mkdir -p ${pkgdir}/usr/bin
+#   cp -Rp ${srcdir}/${_svnmod}/qtinterface/uic-tqt ${pkgdir}/usr/bin
+
+#   rm -r ${srcdir}/${_svnmod}
+}