little modifiactions to base components PKGBUILDs,

removed dropped things
added PKGBUILD templates
fixed kde-style-lipstik PKGBUILD

11 files changed, 338 insertions, 249 deletions

diff --git a/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD b/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD
index d8cff8a28..74b720fb5 100644
--- a/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD
@@ -3,45 +3,50 @@
 pkgname=trinity-arts
 pkgver=3513
 pkgrel=1
+
 arch=('i686' 'x86_64')
+
 url='http://www.trinitydesktop.com'
 license=('GPL')
 groups=('trinity-base')
 pkgdesc="Trinity - arts"
+
 depends=('audiofile'
-        'alsa-lib'
-        'libmad'
-	'libvorbis'
-	'trinity-tqtinterface')
-makedepends=('pkgconfig' 'cmake' 'autoconf')
+         'alsa-lib'
+         'libmad'
+         'libvorbis'
+         'trinity-tqtinterface')
+makedepends=('pkgconfig' 'cmake')
+
 provides=('trinity-arts')
 conflicts=('trinity-arts')
 replaces=('trinity-arts')
+
 options=('libtool' '!strip')
+
 source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/arts-3.5.13.tar.gz)
 md5sums=('109124dabb1aaa9d44eb32e43b549142')
 
 # set Qt location (not needed if profile.d/q3.sh present, set prefix (not used)
-_qtdir=/opt/qt
-_prefix=${_qtdir}
+#_qtdir=/opt/qt
+_builddir=build
+_prefix="/opt/trinity"
 
 build() {
 
 
   msg "Setting PATH, CMAKE and Trinity Environment variables"
-  if [[ -r /etc/profile.d/qt3.sh ]]; then
+  #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
+  #  [[ -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
@@ -49,13 +54,13 @@ build() {
 
   msg "Starting cmake..."
   cmake ${srcdir}/dependencies/arts/ \
-    -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
+    -DCMAKE_INSTALL_PREFIX=${_prefix} \
     -DQT_VERSION=3 || return 1
 
 #     -DQT_VERSION=3 \
 #     -DWITH_QT3=ON \
 #     -DQT_LIBRARY_DIRS=/opt/qt/lib
-
+  msg "Building $pkgname..."
   make VERBOSE=1
 
 }
diff --git a/arch/3.5.13/trinity-base/trinity-dbus-1-qt3/PKGBUILD b/arch/3.5.13/trinity-base/trinity-dbus-1-qt3/PKGBUILD
index e9831f187..eaa7f19fc 100644
--- a/arch/3.5.13/trinity-base/trinity-dbus-1-qt3/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-dbus-1-qt3/PKGBUILD
@@ -3,28 +3,40 @@
 pkgname=trinity-dbus-1-qt3
 pkgver=0.9
 pkgrel=8
+
 arch=('i686' 'x86_64')
-pkgdesc="Trinity D-Bus/Qt3 bindings."
+
 url="http://www.freedesktop.org/wiki/Software/DBusBindings"
 license=('GPL')
 groups=('trinity-base')
-pkgdesc="Trinity - dbus-1-qt3"
+pkgdesc="Trinity - D-Bus/Qt3 bindings."
+
 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
+   cd $srcdir/${pkgname#*trinity-}-$pkgver
+   msg "Setting enviroment variables..."
+   . /etc/profile.d/qt3.sh
+   msg "Starting configure..."
+   ./configure --prefix=$QTDIR
+   msg "Building #{pkgname}..."
+   make || return 1
 
-    . /etc/profile.d/qt3.sh
-    ./configure --prefix=$QTDIR
-    make || return 1
-    make DESTDIR="$pkgdir/" install
+   # Libtool slay
+   #     find $startdir/pkg -name *.la -exec rm {} \;
+}
 
-    # Libtool slay
-#     find $startdir/pkg -name *.la -exec rm {} \;
+package() {
+   msg "Packaging - $pkgname-$pkgver"
+   cd $srcdir/${pkgname#*trinity-}-$pkgver
+   make DESTDIR="${pkgdir}" install
 }
diff --git a/arch/3.5.13/trinity-base/trinity-dbus-tqt-1/PKGBUILD b/arch/3.5.13/trinity-base/trinity-dbus-tqt-1/PKGBUILD
index ecdc82ee0..671c5d90c 100644
--- a/arch/3.5.13/trinity-base/trinity-dbus-tqt-1/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-dbus-tqt-1/PKGBUILD
@@ -1,50 +1,57 @@
+# Maintainer: calvin Morrison <mutantturkey@gmail.com>
+
 pkgname=trinity-dbus-tqt-1
 pkgver=3513
 pkgrel=1
+
 arch=('i686' 'x86_64')
+
 url='http://www.trinitydesktop.org'
 license=('GPL')
 groups=('trinity-base')
 pkgdesc="Trinity - D-Bus TQtInterface Wrapper"
+
 depends=('trinity-tqtinterface' 'dbus')
+
 provides=('trinity-dbus-tqt-1' 'dbus-tqt-1' 'dbus-1-tqt' 'trinity-dbus-1-tqt')
 makedepends=('pkgconfig' 'cmake')
+
 options=('libtool' '!strip')
 source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/dbus-1-tqt-3.5.13.tar.gz)
 md5sums=('a7ba1071f4bf7b5930f805b4036f8a97')
-_svnmod=dependencies/dbus-1-tqt
 
-_qtdir=/opt/qt
+_svnmod=dependencies/dbus-1-tqt
+_builddir=build
 _prefix="/opt/trinity"
 
-
 build() {
 
   msg "Setting PATH, CMAKE and Trinity Environment variables"
-  if [[ -r /etc/profile.d/qt3.sh ]]; then
+  # 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
-
+  #  [[ -n $QTDIR ]] && _qtdir=$QTDIR
+  #else
+  #  [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH
+  #fi
+  export CMAKE_PREFIX_PATH=${QTDIR}:${_prefix}
+  export CMAKE_INCLUDE_PATH=${QTDIR}/include/tqt:\
+     /usr/include/dbus-1.0:\
+     ${_prefix}/include:\
+     ${_prefix}/include/libkrandr
+  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=:${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
 
   cd $srcdir
-  msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
-  cd build
+  msg "Creating out-of-source build directory: ${srcdir}/${_builddir}"
+  mkdir -p ${_builddir}
+  cd ${_builddir}
 
   msg "Starting cmake..."
   cmake ${srcdir}/${_svnmod} \
     -DCMAKE_INSTALL_PREFIX=${_prefix} \
     -DCMAKE_VERBOSE_MAKEFILE=ON 
+
+  msg "Building - $pkgname..."
   make
 #     -DWITH_QT3=ON \
 #     -DQTDIR=/opt/qt \
@@ -54,9 +61,6 @@ build() {
 package() {
   msg "Packaging - $pkgname-$pkgver"
 #   cd ${srcdir}/${_svnmod}
-  cd ${srcdir}/build
-
-  make DESTDIR="$pkgdir/" install
-
-  cd ${startdir}
+  cd ${srcdir}/${_builddir}
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD b/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD
index a5425bd21..adc2d5b83 100644
--- a/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD
@@ -3,65 +3,67 @@
 pkgname=trinity-dbus-tqt
 pkgver=3513
 pkgrel=1
+
 arch=('i686' 'x86_64')
+
 url='http://www.trinitydesktop.org'
 license=('GPL')
 groups=('trinity-base')
-pkgdesc="Trinity TQt Dbus wrapper"
+pkgdesc="Trinity TQt DBus wrapper"
+
 depends=('trinity-tqtinterface')
 makedepends=('pkgconfig' 'cmake')
+
 provides=('trinity-dbus-tqt')
 conflicts=('trinity-dbus-tqt')
 replaces=('trinity-dbus-tqt')
+
 options=('libtool' '!strip')
+
 source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/dbus-tqt-3.5.13.tar.gz)
 md5sums=('46ae165c068271485c827f6fc6687a9a')
 
-
 _svnmod=dependencies/dbus-tqt
-_qtdir=/opt/qt
+_builddir=build
 _prefix="/opt/trinity"
 
-
 build() {
 
   msg "Setting PATH, CMAKE and Trinity Environment variables"
-  if [[ -r /etc/profile.d/qt3.sh ]]; then
+  #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
-
+  #  [[ -n $QTDIR ]] && _qtdir=$QTDIR
+  #else
+  #  [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH
+  #fi
+  export CMAKE_PREFIX_PATH=${QTDIR}:${_prefix}
+  export CMAKE_INCLUDE_PATH=${QTDIR}/include/tqt:\
+     /usr/include/dbus-1.0:\
+     ${_prefix}/include:\
+     ${_prefix}/include/libkrandr
+  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
 
   cd $srcdir
-  msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
-  cd build
+  msg "Creating out-of-source build directory: ${srcdir}/${_builddir}"
+  mkdir -p ${_builddir}
+  cd ${_builddir}
 
   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 \
+
+  msg "Building - $pkgname..."
+  make
 }
 
 package() {
   msg "Packaging - $pkgname-$pkgver"
 #   cd ${srcdir}/${_svnmod}
-  cd ${srcdir}/build
-
-  make DESTDIR="$pkgdir/" install
-
-  cd ${startdir}
+  cd ${srcdir}/${_builddir}
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD
index e007b3107..b4b06cbc7 100644
--- a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD
@@ -35,7 +35,7 @@ options=('libtool' '!strip')
 source=('http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdebase-3.5.13.tar.gz' 'dbusfix.diff' 'kdm-trinity')
 md5sums=('d1f7e1f94eeb46b981fe1ba144179840'
          'c9ce810c281002440a6de8cfd8735d07'
-         '523838d16b38fc62445863ca762c17f8')
+         '376d85d213cf3c04cb0912e5cccd68bd')
 
 _qtdir=/opt/qt
 _prefix="/opt/trinity"
diff --git a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD
index 8a9a6f194..b5cc4977c 100644
--- a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD
@@ -3,74 +3,74 @@
 pkgname=trinity-kdelibs
 pkgver=3513
 pkgrel=2
+
 arch=('i686' 'x86_64')
+
 url='http://www.trinitydesktop.org'
 license=('GPL')
 groups=('trinity-base')
 pkgdesc="Trinity - kdelibs, core libraries"
-depends=('libical'
-         'libxslt'
-         'libltdl'
-         'avahi'
-         'pam-krb5'
-         'taglib'
-         'libxcomposite'
-         'trinity-arts')
+
+depends=('trinity-arts' 'trinity-qt3' 'trinity-tqtinterface' 'libical' 'libxslt' 'libltdl' 'avahi' 'pam-krb5' 'taglib' 'libxcomposite')
 makedepends=('pkgconfig' 'cmake' 'autoconf' )
+
 provides=('trinity-kdelibs' 'kdelibs3')
 conflicts=('trinity-kdelibs' 'kdelibs3')
 replaces=('trinity-kdelibs')
+
 options=('libtool' '!strip' '!makeflags')
+
 source=('http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdelibs-3.5.13.tar.gz' 'trinity.sh')
 md5sums=('f62eefb63b4ba2141b4c576f859806dd'
          '2de1886d632c8bc288befada5e1bc3b5')
 
-qtdir=/opt/qt
-trinity_prefix="/opt/trinity"
+_builddir=build
+_prefix="/opt/trinity"
 
 build() {
-
-  msg "Setting PATH, CMAKE and Trinity Environment variables"
-  if [[ -r /etc/profile.d/qt3.sh ]]; then
+   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 PATH=$PATH:$trinity_prefix/bin
-  export CMAKE_INCLUDE_PATH=/opt/qt/include/tqt:/usr/include/dbus-1.0:/opt/trinity/bin
-  export LD_LIBRARY_PATH=/opt/trinity/lib:/opt/qt/lib:/opt/trinity/lib/kde3:$LD_LIBRARY_PATH
-
-  cd $srcdir
-  msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
-  cd build
-
-  msg "Starting cmake..."
-  cmake ${srcdir}/kdelibs \
-    -DCMAKE_INSTALL_PREFIX=${trinity_prefix} \
+   # [[ -n $QTDIR ]] && _qtdir=$QTDIR
+   #else
+   # [[ ${PATH%%:*} =~ ${_qtdir}/bin ]] || export PATH=${_qtdir}/bin:$PATH
+   #fi
+   export CMAKE_PREFIX_PATH=${QTDIR}:${_prefix}
+   export PATH=$PATH:${_prefix}/bin
+   export CMAKE_INCLUDE_PATH=${QTDIR}/include/tqt:/usr/include/dbus-1.0:${_prefix}/bin
+   export LD_LIBRARY_PATH=${_prefix}/lib:${QTDIR}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+
+   cd $srcdir
+   msg "Creating out-of-source build directory: ${srcdir}/${_builddir}"
+   mkdir -p ${_builddir}
+   cd ${_builddir}
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/kdelibs \
+    -DCMAKE_INSTALL_PREFIX=${_prefix} \
     -DCMAKE_VERBOSE_MAKEFILE=OFF \
     -DQT_VERSION=3 \
     -DWITH_QT3=ON \
-    -DQTDIR=/opt/qt \
-    -DQT_LIBRARY_DIRS=/opt/qt/lib \
+    -DQTDIR=${QTDIR} \
+    -DQT_LIBRARY_DIRS=${QTDIR}/lib \
     -DWITH_PAM=ON \
     -DBUILD_ALL=ON
-  make
+
+   msg "Building - $pkgname..."
+   make
 }
 
 package() {
-  msg "Packaging - $pkgname-$pkgver"
-  cd ${srcdir}/build
+   msg "Packaging - $pkgname-$pkgver"
+   cd ${srcdir}/build
 
-  make DESTDIR="$pkgdir/" install
+   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/ld.so.conf.d/
+   echo "${_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/
+   install -d -m755 ${pkgdir}/etc/profile.d/
+   install -m644 ${startdir}/trinity.sh ${pkgdir}/etc/profile.d/
 
-#   rm -r ${srcdir}/${_svnmod}
+   #   rm -r ${srcdir}/${_svnmod}
 }
diff --git a/arch/3.5.13/trinity-base/trinity-pyqt3/PKGBUILD b/arch/3.5.13/trinity-base/trinity-pyqt3/PKGBUILD
index 47a82b01c..6524e1793 100644
--- a/arch/3.5.13/trinity-base/trinity-pyqt3/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-pyqt3/PKGBUILD
@@ -3,31 +3,43 @@
 pkgname=trinity-pyqt3
 pkgver=3.18.1
 pkgrel=1
-pkgdesc="A set of Python bindings for the Qt3 toolkit"
+
 arch=('i686' 'x86_64')
+
 url="http://www.riverbankcomputing.com/software/pyqt/intro"
+license=('GPL')
 groups=('trinity-base')
+pkgdesc="A set of Python bindings for the Qt3 toolkit"
+
 depends=('python2-sip' 'qscintilla-qt3' 'trinity-qt3')
-license=('GPL')
+#makedepends=()
+#optdepends=()
+
 provides=('trinity-pyqt3' 'pyqt3')
 conflicts=('pyqt3')
 replaces=('trinity-pyqt3')
+
+#options=()
+
 source=("http://www.riverbankcomputing.com/static/Downloads/PyQt3/PyQt-x11-gpl-${pkgver}.tar.gz")
 md5sums=('f1d120495d1aaf393819e988c0a7bb7e')
 
 build() {
-  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
+   cd ${srcdir}/PyQt-x11-gpl-${pkgver}
 
-  . /etc/profile.d/qt3.sh
+   msg "Starting configure..."
+   . /etc/profile.d/qt3.sh
 
-  export QMAKESPEC="/opt/qt/mkspecs/default"
+   export QMAKESPEC="/opt/qt/mkspecs/default"
 
-  echo yes | python2.7 configure.py -q /opt/qt/
+   echo yes | python2.7 configure.py -q /opt/qt/
 
-  make
+   msg "Building ${pkgname}..."
+   make
 }
 
 package() {
-  cd ${srcdir}/PyQt-x11-gpl-${pkgver}
-  make DESTDIR=${pkgdir} install
+   msg "Packaging - $pkgname-$pkgver"
+   cd ${srcdir}/PyQt-x11-gpl-${pkgver}
+   make DESTDIR=${pkgdir} install
 }
diff --git a/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD b/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD
index fc6f77062..e44cf4c0c 100644
--- a/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD
@@ -1,74 +1,84 @@
 # Maintainer: Calvin Morrison <MutantTurkey@gmail.com>
+
 pkgname=trinity-qt3
 pkgver=3884
 pkgrel=2
-pkgdesc="The Qt3 gui toolkit - with Trinity upstream"
-_prefix="/opt/qt"
+
 arch=('i686' 'x86_64')
-license=('GPL')
+
 url="http://trinitydesktop.org"
-# install=qt.install
+license=('GPL')
 groups=('trinity-base')
+pkgdesc="The Qt3 gui toolkit - with Trinity upstream"
+
 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')
-_prefix="opt/qt"
+
+options=(!libtool)
+
 source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/qt3-3.3.8.d.tar.gz)
 md5sums=('78dc675e84aed595375449818cbb589a')
-options=(!libtool)
+
+_prefix="/opt/qt"
+_builddir="qt3"
+# install=qt.install
 
 build() {
- export QTDIR="${srcdir}/qt3/" 
- export PATH=${QTDIR}/bin:${PATH}
- export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
- export QMAKESPEC=$QTDIR/mkspecs/linux-g++
- 
- if [ "$CARCH" = "x86_64" ]; then
+   msg "Setting enviroment variables..."
+   export QTDIR="${srcdir}/${_builddir}/" 
+   export PATH=${QTDIR}/bin:${PATH}
+   export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
+   export QMAKESPEC=$QTDIR/mkspecs/linux-g++
+
+   if [ "$CARCH" = "x86_64" ]; then
      export ARCH="-64"
      else unset ARCH
-fi
+   fi
 
-  cd "${srcdir}/qt3"
+   cd "${srcdir}/${_builddir}"
 
-  rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*}
+   rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*}
 
-  msg "Starting configure..."
-  #make -C qmake || return 1
- ./configure    -prefix ${_prefix} \
-                -fast \
-                -sysconfdir /etc/qt \
-                -thread \
-                -shared \
-                -system-zlib \
-                -platform linux-g++$ARCH \
-                -system-lib{png,jpeg,mng} 
-  make  
+   msg "Starting configure..."
+   #make -C qmake || return 1
+   ./configure \
+      -prefix ${_prefix} \
+      -fast \
+      -sysconfdir /etc/qt \
+      -thread \
+      -shared \
+      -system-zlib \
+      -platform linux-g++$ARCH \
+      -system-lib{png,jpeg,mng} \
+      -qt-gif \
+      -cups
 
+   msg "Building - $pkgname..."
+   make  
 }
 
-package() {
-  
-  cd "$srcdir/qt3"
-
-  # Build ld.so.conf file
-  echo "/${_prefix}" > ${srcdir}/libqt-mt.conf
-  echo "/${_prefix}/lib" >> ${srcdir}/libqt-mt.conf
-  echo "/opt/trinity/lib" >> ${srcdir}/libqt-mt.conf
-  install -d -m755 ${pkgdir}/etc/ld.so.conf.d/
-  install -D -m755 ${srcdir}/libqt-mt.conf  ${pkgdir}/etc/ld.so.conf.d/libqt-mt.conf
+package() {  
+   msg "Packaging - $pkgname-$pkgver"
+   cd "$srcdir/${_builddir}"
 
-  # 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
-  
+   # Build ld.so.conf file
+   echo "${_prefix}" > ${srcdir}/libqt-mt.conf
+   echo "${_prefix}/lib" >> ${srcdir}/libqt-mt.conf
+   echo "/opt/trinity/lib" >> ${srcdir}/libqt-mt.conf
+   # install -d -m755 ${pkgdir}/etc/ld.so.conf.d/
+   install -D -m755 ${srcdir}/libqt-mt.conf  ${pkgdir}/etc/ld.so.conf.d/libqt-mt.conf
 
-  make INSTALL_ROOT="$pkgdir/" install
+   # 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
 
+   make INSTALL_ROOT="$pkgdir" install
 } 
diff --git a/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD b/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD
index 8ab915341..2d6140af1 100644
--- a/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD
@@ -3,69 +3,62 @@
 pkgname=trinity-tqtinterface
 pkgver=3513
 pkgrel=1
+
 arch=('i686' 'x86_64')
+
 url="http://trinity.pearsoncomputing.net"
 license=('GPL2')
 groups=('trinity-base')
 pkgdesc="Trinity - tqtinterface"
-depends=('python2-sip'
-	'trinity-qt3'
-	'trinity-pyqt3')
-makedepends=(
-             'pkgconfig'
-             'cmake'
-             'autoconf'
-             'libxi'
-             'libxft'
-             'libxrandr'
-             'libxcursor'
-             'libxinerama'
-             'mesa')
-provides=('trinity-tqtinterface')
-conflicts=('trinity-tqtinterface')
-replaces=('trinity-tqtinterface')
+
+depends=('python2-sip' 'trinity-qt3' 'trinity-pyqt3')
+makedepends=('pkgconfig' 'cmake' 'libxi' 'libxft' 'libxrandr' 'libxcursor' 'libxinerama' 'mesa')
+# optdepends=()
+
+provides=($pkgname)
+#conflicts=()
+#replaces=()
+
 source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/tqtinterface-3.5.13.tar.gz)
 md5sums=('d54cc9fd0b35555298efd17c32471a2b')
 
-_qtdir=/opt/qt
 _prefix=/usr
+_builddir=build
 
 build() {
+   msg "Setting PATH, CMAKE and Trinity Environment variables"
+   . /etc/profile.d/qt3.sh
 
-  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
-
-  echo $PATH 
-  cd $srcdir
-  msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
-  cd build
+   cd $srcdir
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p build
+   cd build
 
-  msg "Starting cmake..."
-  cmake "../dependencies/tqtinterface" -DCMAKE_INSTALL_PREFIX=${_prefix} -DQT_PREFIX_DIR=/opt/qt/ -DQT_LIBRARY_DIRS=/opt/qt/lib -DQT_INCLUDE_DIR=/opt/qt/include -DQT_VERSION=3 -DMOC_EXECUTABLE=${_qtdir}/bin/moc || 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
+   msg "Starting cmake..."
+   cmake "../dependencies/tqtinterface" \
+     -DCMAKE_INSTALL_PREFIX=${_prefix} \
+     -DQT_PREFIX_DIR=${_qtdir} \
+     -DQT_INCLUDE_DIR=${_qtdir}/include \
+     -DQT_VERSION=3 \
+     -DMOC_EXECUTABLE=${_qtdir}/bin/moc || return 1
+   #     -DQT_INCLUDE_DIR=${_prefix}/include/tqt/Qt
+   #     -DQT_LIBRARY_DIRS=/opt/qt/lib \
+   #     -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}/${_builddir}
+   make DESTDIR="${pkgdir}" install
 
-  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
+   # 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}
+   #   rm -r ${srcdir}/${_svnmod}
 }
diff --git a/arch/3.5.13/trinity-extras/trinity-konversation/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-konversation/PKGBUILD
index 925f2e4fd..b4ea81676 100644
--- a/arch/3.5.13/trinity-extras/trinity-konversation/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-konversation/PKGBUILD
@@ -1,54 +1,54 @@
-# $Id$
 # Maintainer: Calvin Morrison <mutantturkey@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-konversation
 pkgver=3513
 pkgrel=1
+
 arch=('i686' 'x86_64')
+
 url='http://www.trinitydesktop.org'
 license=('GPL')
 groups=('trinity')
-pkgdesc="Trinity - Konversation IRC client"
-depends=('trinity-kdelibs' 'trinity-qt3' 'trinity-tqtinterface')
+pkgdesc="Trinity - pkgdesc"
+
+depends=('trinity-kdelibs')
 makedepends=('pkgconfig' 'autoconf' 'automake')
+
 options=('libtool' '!strip')
+
 source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/konversation-3.5.13.tar.gz)
 md5sums=('0f0e0415dad4c19bc885c9addadf4026')
 
-build() {
-
-  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
+_builddir=applications/konversation
+_prefix=/opt/trinity
 
-  export CFLAGS=-I/opt/triniy/include/tqt
-  export CXXFLAGS=-I/opt/trinity/include/tqt
-
-  trinity_prefix="/opt/trinity"
-  
-  msg "Starting cmake..."
+build() {
+  msg "Setting Trinity Environment variables"
+  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
   
-  cd "$srcdir/applications/konversation"
+  msg "Starting autoconf..."
+  cd "$srcdir/$cmpdir"
+  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
   make -f admin/Makefile.common
-  ./configure --with-qt-dir=/opt/qt/ --prefix=/opt/trinity
+
+  msg "Starting configure..."
+  ./configure \
+     --with-qt-dir=${QTDIR} \
+     --with-qt-inculdes=${QTDIR}/include \
+     --with-qt-libraries=${QTDIR}/lib \
+     --prefix=${_prefix} \
+     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
+     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+
+  msg "Building ${pkgname}..."
   make
 }
 
 package() {
   msg "Packaging - $pkgname-$pkgver"
-#   cd ${srcdir}/${_svnmod}
-  cd ${srcdir}/build
-
-  make DESTDIR="$pkgdir/" install
-
-#   rm -r ${srcdir}/${_svnmod}
+#  cd ${srcdir}/build
+  cd ${srcdir}/${_builddir}
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/arch/3.5.13/trinity-extras/trinity-lipstik/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-lipstik/PKGBUILD
new file mode 100644
index 000000000..6c652dcab
--- /dev/null
+++ b/arch/3.5.13/trinity-extras/trinity-lipstik/PKGBUILD
@@ -0,0 +1,51 @@
+# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
+
+pkgname=trinity-kde-style-lipstik
+pkgver=3513
+pkgrel=1
+
+arch=('i686' 'x86_64')
+
+url='http://www.trinitydesktop.org'
+license=('GPL')
+groups=('trinity')
+pkgdesc="Trinity - Lipstik style"
+
+depends=('trinity-kdelibs' 'trinity-kdebase')
+makedepends=('pkgconfig' 'autoconf' 'automake')
+
+options=('libtool' '!strip')
+
+source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/kde-style-lipstik-3.5.13.tar.gz)
+md5sums=('1585d4df7f0c68499fafa0b8ecb82dab')
+
+_builddir=applications/kde-style-lipstik
+_prefix=/opt/trinity
+
+build() {
+
+  msg "Setting Trinity Environment variables"
+  export LD_LIBRARY_PATH=${_prefix}/lib:${_prefix}/lib/trinity:$LD_LIBRARY_PATH
+  export PKG_CONFIG_PATH=${_prefix}/lib/pkgconfig:${QTDIR}/lib/pkgconfig
+
+  msg "Starting autoconf..."
+  cd "$srcdir/${_builddir}"
+  cp -f "/usr/share/aclocal/libtool.m4" "admin/libtool.m4.in"
+  cp -f "/usr/share/libtool/config/ltmain.sh" "admin/ltmain.sh"
+  make -f admin/Makefile.common
+
+  msg "Starting configure..."
+  ./configure --with-qt-dir=${QTDIR} \
+     --prefix=${_prefix} \
+     --with-extra-includes=${_prefix}/include:/usr/include/dbus-1.0:${_prefix}/include/libkrandr \
+     --with-extra-libs=${_prefix}/lib:${_prefix}/lib/trinity:${_prefix}/pkgconfig
+
+  msg "Building ${pkgname}..."
+  make
+}
+
+package() {
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/${_builddir}
+  make DESTDIR="${pkgdir}" install
+}