ArchLinux: Update to R14.0.11

+ Add standalone package tde-cmake-trinity
+ Switch CMake builds to use Ninja
+ Switch some packages to CMake
+ Add tde-tqca and tde-akode
+ Add tde-i18n packages

Signed-off-by: Slávek Banko <slavek.banko@axis.cz>

14 files changed, 303 insertions, 196 deletions

diff --git a/arch/tde-core/tde-arts/PKGBUILD b/arch/tde-core/tde-arts/PKGBUILD
index e58281542..285e29f57 100644
--- a/arch/tde-core/tde-arts/PKGBUILD
+++ b/arch/tde-core/tde-arts/PKGBUILD
@@ -3,12 +3,16 @@
 # Contributor: Calvin Morrison <mutantturkey@gmail.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-arts
-pkgver=14.0.10
+_mod=arts
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
-pkgdesc="Trinity ARTS Sound System and libraries"
+pkgdesc="Trinity aRts Sound System and libraries"
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/arts'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-core')
 depends=('alsa-plugins'
@@ -21,39 +25,41 @@ depends=('alsa-plugins'
 	'libvorbis'
 	'pulseaudio-alsa'
 	'tde-tqtinterface')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
 optdepends=('audio-convert: A script with an easy to use interface to convert audio files: wav, mp3, ogg, flac, aac, mpc, ape and wma'
 	'lame: A high quality MPEG Audio Layer III (MP3) encoder'
 	'libmp3splt: Library for splitting mp3 and ogg files without decoding'
 	'mpd: Music daemon that plays MP3, FLAC, and Ogg Vorbis files'
 	'vorbis-tools: Extra tools for Ogg-Vorbis')
-provides=('arts')
-conflicts=('kdemod3-arts' 'arts')
-replaces=('trinity-arts')
+provides=("${_mod}")
+conflicts=("kdemod3-${_mod}" "${_mod}")
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!emptydirs')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/arts-trinity-${pkgver}.tar.xz")
-md5sums=('d9d719e824acd5397dda709ed5352feb')
-install='tde-arts.install'
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('8906e1030ed7caa3ce72e8c41288b320')
+install="tde-${_mod}.install"
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
 build() {
-   cd $srcdir
    msg "Creating out-of-source build directory: ${srcdir}/build"
-   mkdir -p build
-   cd build
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
 
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+      -GNinja \
       -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-      -DWITH_GCC_VISIBILITY=ON
+      -DWITH_ALL_OPTIONS=ON \
+      -DWITH_ESOUND=OFF \
+      -DWITH_JACK=OFF
 
    msg "Building $pkgname..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
    msg "Packaging - $pkgname-$pkgver"
    cd ${srcdir}/build
-   make -j1 DESTDIR="$pkgdir" install
+   DESTDIR="$pkgdir" ninja -j1 install
 }
diff --git a/arch/tde-core/tde-avahi-tqt/PKGBUILD b/arch/tde-core/tde-avahi-tqt/PKGBUILD
index 2df40dd16..737408364 100644
--- a/arch/tde-core/tde-avahi-tqt/PKGBUILD
+++ b/arch/tde-core/tde-avahi-tqt/PKGBUILD
@@ -1,42 +1,46 @@
 # Maintainer: Michael Manley <mmanley@nasutek.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-avahi-tqt
-pkgver=14.0.10
+_mod=avahi-tqt
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="Trinity Avahi-TQt"
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/avahi-tqt'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-core')
 depends=('tde-tqtinterface' 'avahi' 'nss-mdns')
 # nss-mdns should probably move to tdelibs depends
-makedepends=('pkgconfig' 'cmake')
-provides=('avahi-tqt')
-replaces=('trinity-avahi-tqt')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/avahi-tqt-trinity-${pkgver}.tar.xz")
-md5sums=('6cce8423a3030505bb56a8c73f6235d6')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('e9e31775dc7ad94159e9e8ea0edf028c')
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
 build() {
-   cd ${srcdir}
    msg "Creating out-of-source build directory: ${srcdir}/build"
-   mkdir -p build
-   cd build
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
 
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+      -GNinja \
       -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-      -DWITH_GCC_VISIBILITY=ON
+      -DWITH_ALL_OPTIONS=ON
 
    msg "Building - $pkgname..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
    msg "Packaging - $pkgname"
    cd ${srcdir}/build
-   make -j1 DESTDIR="$pkgdir" install
+   DESTDIR="$pkgdir" ninja -j1 install
 }
diff --git a/arch/tde-core/tde-cmake-trinity/PKGBUILD b/arch/tde-core/tde-cmake-trinity/PKGBUILD
new file mode 100644
index 000000000..acd236fec
--- /dev/null
+++ b/arch/tde-core/tde-cmake-trinity/PKGBUILD
@@ -0,0 +1,51 @@
+# Contributor: Slávek Banko <slavek.banko@axis.cz>
+
+_mod=cmake-trinity
+_cat=common/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
+pkgrel=1
+pkgdesc="TDE CMake modules"
+arch=('i686' 'x86_64')
+url="https://scm.trinitydesktop.org/scm/git/tde-common-cmake"
+license=('GPL')
+provides=("${_mod}")
+groups=('tde-core')
+depends=(
+  'cmake'
+  'perl'
+  'ninja'
+  'pkgconfig'
+)
+makedepends=()
+optdepends=()
+options=('staticlibs' 'libtool' '!strip')
+install=
+
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-${pkgver}.tar.xz")
+md5sums=('954185aabae978ef840c78efd940bee0')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+  msg "Creating out-of-source build directory: ${srcdir}/build"
+  mkdir -p "$srcdir/build"
+  cd "$srcdir/build"
+
+  msg "Starting cmake..."
+  cmake ${srcdir}/${_mod}-${pkgver} \
+    -GNinja \
+    -DCMAKE_VERBOSE_MAKEFILE=ON
+
+  msg "Building - ${pkgname}..."
+  ninja $NUMJOBS
+}
+
+package() {
+  msg "Packaging - ${pkgname}-${pkgver}"
+  cd "$srcdir/build"
+  DESTDIR="$pkgdir" ninja -j1 install
+}
diff --git a/arch/tde-core/tde-dbus-1-tqt/PKGBUILD b/arch/tde-core/tde-dbus-1-tqt/PKGBUILD
index 907060c9f..de0075656 100644
--- a/arch/tde-core/tde-dbus-1-tqt/PKGBUILD
+++ b/arch/tde-core/tde-dbus-1-tqt/PKGBUILD
@@ -3,43 +3,47 @@
 # Contributor: Calvin Morrison <mutantturkey@gmail.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-dbus-1-tqt
-pkgver=14.0.10
+_mod=dbus-1-tqt
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="Trinity D-Bus TQtInterface Wrapper - from TDE upstream GIT"
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/dbus-1-tqt'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-core' 'tde-base')
 depends=('tde-tqtinterface' 'dbus')
-makedepends=('pkgconfig' 'cmake')
-provides=('dbus-1-tqt')
-conflicts=('trinity-dbus-1-tqt')
-replaces=('trinity-dbus-1-tqt' 'trinity-dbus-1-qt3' 'dbus-1-qt3' 'tde-dbus-tqt-1')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}")
+replaces=("tde-${_mod}" "trinity-${_mod}" 'trinity-dbus-1-qt3' 'dbus-1-qt3')
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/dbus-1-tqt-trinity-${pkgver}.tar.xz")
-md5sums=('4954efb83544c72272ba803eb44b72ec')
-install='trinity-dbus-1-tqt.install'
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('c801be15308438c85043d5f52f28bcc9')
+install="trinity-${_mod}.install"
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
 build() {
-   cd $srcdir
    msg "Creating out-of-source build directory: ${srcdir}/${_builddir}"
-   mkdir -p build
-   cd build
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
 
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+      -GNinja \
       -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
-      -DWITH_GCC_VISIBILITY=ON
+      -DWITH_ALL_OPTIONS=ON
 
    msg "Building - $pkgname..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
    msg "Packaging - $pkgname-$pkgver"
    cd ${srcdir}/build
-   make -j1 DESTDIR="${pkgdir}" install
+   DESTDIR="${pkgdir}" ninja -j1 install
 }
diff --git a/arch/tde-core/tde-dbus-tqt/PKGBUILD b/arch/tde-core/tde-dbus-tqt/PKGBUILD
index 7e1c73d32..8c96c3944 100644
--- a/arch/tde-core/tde-dbus-tqt/PKGBUILD
+++ b/arch/tde-core/tde-dbus-tqt/PKGBUILD
@@ -3,41 +3,44 @@
 # Contributor: Calvin Morrison <mutantturkey@gmail.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-dbus-tqt
-pkgver=14.0.10
+_mod=dbus-tqt
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/dbus-tqt'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-core')
 pkgdesc="Trinity TQt DBus wrapper"
 depends=('tde-tqtinterface' 'dbus')
-makedepends=('pkgconfig' 'cmake')
-provides=('dbus-tqt')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/dbus-tqt-trinity-${pkgver}.tar.xz")
-md5sums=('5a3577b3f43b3cfeb4701bb4a4e0a951')
-install='trinity-dbus-tqt.install'
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('fd23c1a0f57d7ed08f443b3e2a2f98d6')
+install="trinity-${_mod}.install"
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
 build() {
-   cd $srcdir
    msg "Creating out-of-source build directory: ${srcdir}/build"
-   mkdir -p build
-   cd build
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
 
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
-      -DCMAKE_INSTALL_PREFIX=$TDEDIR \
-      -DWITH_GCC_VISIBILITY=ON
+      -GNinja \
+      -DCMAKE_INSTALL_PREFIX=$TDEDIR
 
    msg "Building - $pkgname..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
    msg "Packaging - $pkgname-$pkgver"
    cd ${srcdir}/build
-   make -j1 DESTDIR="${pkgdir}" install
+   DESTDIR="${pkgdir}" ninja -j1 install
 }
diff --git a/arch/tde-core/tde-libart-lgpl/PKGBUILD b/arch/tde-core/tde-libart-lgpl/PKGBUILD
index c6f03a951..6edf7368c 100644
--- a/arch/tde-core/tde-libart-lgpl/PKGBUILD
+++ b/arch/tde-core/tde-libart-lgpl/PKGBUILD
@@ -1,24 +1,28 @@
 # Maintainer: Michael Manley <mmanley@nasutek.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-libart-lgpl
-pkgver=14.0.10
+_mod=libart-lgpl
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="Trinity Desktop LGPL'd Component"
 arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/libart-lgpl"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('LGPL')
 groups=('tde-core')
 #depends=('')
-makedepends=('pkgconfig' 'cmake')
+makedepends=('tde-cmake-trinity')
 optdepends=()
-provides=('libart-lgpl')
+provides=("${_mod}")
 conflicts=()
 replaces=()
 options=('staticlibs' 'libtool' '!strip')
 install=
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/libart-lgpl-trinity-${pkgver}.tar.xz")
-md5sums=('e3cae1bd69671c21b27d10bd9b29bb8c')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('02e9f48e719c1a189638ddb1f932cea3')
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
@@ -30,15 +34,16 @@ build() {
 
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+      -GNinja \
       -DCMAKE_INSTALL_PREFIX=$TDEDIR \
       -DWITH_GCC_VISIBILITY=ON
 
    msg "Building - $pkgname..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
    msg "Packaging - $pkgname-$pkgver"
    cd ${srcdir}/build
-   make -j1 DESTDIR="${pkgdir}" install
+   DESTDIR="${pkgdir}" ninja -j1 install
 }
diff --git a/arch/tde-core/tde-tdebase/PKGBUILD b/arch/tde-core/tde-tdebase/PKGBUILD
index 85f569247..10a18556e 100644
--- a/arch/tde-core/tde-tdebase/PKGBUILD
+++ b/arch/tde-core/tde-tdebase/PKGBUILD
@@ -1,16 +1,19 @@
 # Maintainer: Michael Manley <mmanley@nasutek.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname='tde-tdebase'
-pkgver=14.0.10
-pkgrel=2
+_mod=tdebase
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
+pkgrel=1
 pkgdesc="Trinity Desktop Enviroment base components"
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdebase'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
-provides=('tdebase')
+provides=("${_mod}")
 groups=('tde-core')
-# depends=('hal'
 depends=('libraw1394'
          'libxtst'
          'libxss'
@@ -23,15 +26,12 @@ depends=('libraw1394'
          'xorg-xinit'
          'htdig'
          'openssl-1.0')
-makedepends=('autoconf'
-	     'cmake'
-	     'imake'
-	     'pkgconfig'
-	     'libxkbfile'
-	     'smbclient'
-             'rpcsvc-proto'
-	     'xorg-bdftopcf'
-             'xscreensaver')
+makedepends=('tde-cmake-trinity'
+         'libxkbfile'
+         'smbclient'
+         'rpcsvc-proto'
+         'xorg-bdftopcf'
+         'xscreensaver')
 optdepends=('desktop-file-utils: Command line utilities for working with desktop entries'
             'pciutils: PCI bus configuration space access library and tools'
             'samba: file sharing over SMB'
@@ -44,12 +44,12 @@ optdepends=('desktop-file-utils: Command line utilities for working with desktop
             'tde-tqca-tls: Trinity SSL/TLS plugin for TQt Cryptographic Architecture (TQCA)'
             'xorg-fonts-75dpi: X.org 75dpi fonts collection'
             'xscreensaver: Screen saver and locker for the X Window System')
-confilicts=('trinity-kdebase ''kdemod3-kdebase')
-replaces=('trinity-tdebase')
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
-install='trinity-tdebase.install'
+install="trinity-${_mod}.install"
 
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdebase-trinity-${pkgver}.tar.xz"
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz"
         'agent-shutdown.sh'
         'agent-startup.sh'
         'tdm-trinity'
@@ -57,7 +57,7 @@ source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/
         'tdm.service'
         'xsession.patch')
 
-md5sums=('bca895dfc2b88c4b74e307d5690108bf'
+md5sums=('38d71c4d3fa51219b4f734b9d862308e'
          '18e8d01124b19f7df2937c06e177bf7f'
          'c963ef6e37c9051119972a58c67f05fb'
          'bb4c25e560fa719e8e8f49ef80bd1c99'
@@ -68,16 +68,16 @@ md5sums=('bca895dfc2b88c4b74e307d5690108bf'
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
 build() {
-  cd $srcdir
   msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
-  cd build
+  mkdir -p ${srcdir}/build
+  cd ${srcdir}/build
 
   msg "Starting cmake..."
 
   export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig
 
   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+    -GNinja \
     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
     -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
     -DWITH_SASL=ON \
@@ -89,8 +89,6 @@ build() {
     -DWITH_XFIXES=ON \
     -DWITH_XRANDR=ON \
     -DWITH_XRENDER=ON \
-    -DWITH_XDAMAGE=ON \
-    -DWITH_XEXT=ON \
     -DWITH_XTEST=ON \
     -DWITH_OPENGL=ON \
     -DWITH_XSCREENSAVER=ON \
@@ -111,13 +109,13 @@ build() {
     -DTDM_PAM_SERVICE=tde \
     -DTDESCREENSAVER_PAM_SERVICE=tde-screensaver
 
-  make $NUMJOBS
+  ninja $NUMJOBS
 }
 
 package() {
   msg "Packaging - $pkgname-$pkgver"
   cd $srcdir/build
-  make -j1 DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" ninja -j1 install
 
   # install X11 session file /usr/share/xsessions (changed from /etc/X11 sessions)
   install -d -m755 ${pkgdir}/usr/share/xsessions
diff --git a/arch/tde-core/tde-tdelibs/PKGBUILD b/arch/tde-core/tde-tdelibs/PKGBUILD
index 759b18d6a..9e930a584 100644
--- a/arch/tde-core/tde-tdelibs/PKGBUILD
+++ b/arch/tde-core/tde-tdelibs/PKGBUILD
@@ -3,12 +3,16 @@
 # Contributor: Calvin Morrison <mutantturkey@gmail.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-tdelibs
-pkgver=14.0.10
-pkgrel=2
+_mod=tdelibs
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
+pkgrel=1
 pkgdesc="Trinity Desktop core libraries and applications"
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdelibs'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-core')
 depends=('aspell'
@@ -32,29 +36,28 @@ depends=('aspell'
 	'xorg-xprop'
 	'xorg-xset'
 	'xorg-xsetroot')
-makedepends=('pkgconfig' 'cmake')
-provides=('tdelibs')
-conflicts=('trinity-kdelibs' 'trinity-tdelibs' 'kdemod3-kdelibs' 'kdelibs3')
-replaces=('trinity-kdelibs' 'trinity-tdelibs')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "trinity-${_mod}" "kdemod3-${_kdemod}" "${_kdemod}")
+replaces=("trinity-${_kdemod}" "trinity-${_mod}")
 options=('staticlibs' 'libtool' '!makeflags' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdelibs-trinity-${pkgver}.tar.xz")
-
-md5sums=('cbb77407a886b588b4749524ae8e5edd')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('6a93917c4879d0a34764264f53e8519f')
 
-install='trinity-tdelibs.install'
+install="trinity-${_mod}.install"
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 
 build() {
-  cd $srcdir
   msg "Creating out-of-source build directory: ${srcdir}/build"
-  mkdir -p build
-  cd build
+  mkdir -p ${srcdir}/build
+  cd ${srcdir}/build
 
   export PKG_CONFIG_PATH=/usr/lib/openssl-1.0/pkgconfig
 
   msg "Starting cmake..."
   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+    -GNinja \
     -DCMAKE_INSTALL_PREFIX=${TDEDIR} \
     -DSYSCONF_INSTALL_DIR=${TDEDIR}/etc \
     -DCMAKE_VERBOSE_MAKEFILE=ON \
@@ -84,13 +87,13 @@ build() {
     -DWITH_HSPELL=ON
 
   msg "Building - $pkgname..."
-  make $NUMJOBS
+  ninja $NUMJOBS
 }
 
 package() {
   msg "Packaging - $pkgname-$pkgver"
   cd ${srcdir}/build
-  make -j1 DESTDIR="$pkgdir" install
+  DESTDIR="$pkgdir" ninja -j1 install
   msg "Removing conflicting images"
   rm ${pkgdir}/opt/trinity/share/mimelnk/application/x-mplayer2.desktop
 }
diff --git a/arch/tde-core/tde-tqca-tls/PKGBUILD b/arch/tde-core/tde-tqca-tls/PKGBUILD
index 52b19c726..36be28cd2 100644
--- a/arch/tde-core/tde-tqca-tls/PKGBUILD
+++ b/arch/tde-core/tde-tqca-tls/PKGBUILD
@@ -3,45 +3,51 @@
 # Contributor: Calvin Morrison <mutantturkey@gmail.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-tqca-tls
-pkgver=14.0.10
+_mod=tqca-tls
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="Trinity SSL/TLS plugin for TQt Cryptographic Architecture (TQCA)"
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tqca-tls'
+url="https://scm.trinitydesktop.org/scm/git/${_mod%-tls}"
 license=('GPL')
 groups=('tde-core')
 depends=('tde-tqtinterface' 'openssl-1.0')
-makedepends=('pkgconfig' 'cmake')
-provides=('tqca-tls')
-conflicts=('trinity-tqca-tls')
-replaces=('trinity-tqca-tls')
+makedepends=('tde-cmake-trinity')
+provides=(${_mod})
+conflicts=("trinity-${_mod}")
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/tqca-tls-trinity-${pkgver}.tar.xz")
-md5sums=('6347f50dd8b44cc1f7a35329bd578ba1')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod%-tls}-trinity-${pkgver}.tar.xz")
+md5sums=('2b149701a8ad80d4ea69f97f83089b8a')
 
 [ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
 [ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
 
 build() {
-   cd $srcdir
    msg "Creating out-of-source build directory: ${srcdir}/build"
-   mkdir -p build
-   cd build
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
 
    export PKG_CONFIG_PATH=${QTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
 
    msg "Starting cmake..."
-   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+   cmake ${srcdir}/${_mod%-tls}-trinity-${pkgver}/ \
+      -GNinja \
       -DCMAKE_INSTALL_PREFIX=$TDEDIR \
-      -DWITH_GCC_VISIBILITY=ON
+      -DBUILD_ALL=OFF \
+      -DBUILD_TQCA_TLS=ON \
+      -DWITH_ALL_OPTIONS=ON
 
    msg "Building - $pkgname..."
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
    msg "Packaging - $pkgname-$pkgver"
    cd ${srcdir}/build
-   make -j1 DESTDIR="${pkgdir}" install
+   DESTDIR="${pkgdir}" ninja -j1 install
 }
diff --git a/arch/tde-core/tde-tqca/PKGBUILD b/arch/tde-core/tde-tqca/PKGBUILD
new file mode 100644
index 000000000..7cfb78540
--- /dev/null
+++ b/arch/tde-core/tde-tqca/PKGBUILD
@@ -0,0 +1,54 @@
+# Maintainer: Michael Manley <mmanley@nasutek.com>
+# Contributor: Pawel 'l0ner' Soltys <pwslts@gmail.com>
+# Contributor: Calvin Morrison <mutantturkey@gmail.com>
+# Contributor: David C. Rankin <drankinatty at gmail dot com>
+# Contributor: Slávek Banko <slavek.banko@axis.cz>
+
+_mod=tqca
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
+pkgrel=1
+pkgdesc="Trinity SSL/TLS interface for TQt Cryptographic Architecture (TQCA)"
+arch=('i686' 'x86_64')
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
+license=('GPL')
+groups=('tde-core')
+depends=('tde-tqtinterface' 'openssl-1.0')
+makedepends=('tde-cmake-trinity')
+provides=(${_mod})
+conflicts=("trinity-${_mod}")
+replaces=("trinity-${_mod}")
+options=('staticlibs' 'libtool' '!strip')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('2b149701a8ad80d4ea69f97f83089b8a')
+
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
+
+build() {
+   msg "Creating out-of-source build directory: ${srcdir}/build"
+   mkdir -p ${srcdir}/build
+   cd ${srcdir}/build
+
+   export PKG_CONFIG_PATH=${QTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
+   msg "Starting cmake..."
+   cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+      -GNinja \
+      -DCMAKE_INSTALL_PREFIX=$QTDIR \
+      -DBUILD_ALL=OFF \
+      -DBUILD_TQCA=ON \
+      -DWITH_ALL_OPTIONS=ON
+
+   msg "Building - $pkgname..."
+   ninja $NUMJOBS
+}
+
+package() {
+   msg "Packaging - $pkgname-$pkgver"
+   cd ${srcdir}/build
+   DESTDIR="${pkgdir}" ninja -j1 install
+}
diff --git a/arch/tde-core/tde-tqt3/PKGBUILD b/arch/tde-core/tde-tqt3/PKGBUILD
index 0f56bd687..9fca983df 100644
--- a/arch/tde-core/tde-tqt3/PKGBUILD
+++ b/arch/tde-core/tde-tqt3/PKGBUILD
@@ -3,13 +3,17 @@
 # Contributor: Calvin Morrison <MutantTurkey@gmail.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgbase=tde-tqt3
+_mod=tqt3
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgbase="tde-${_mod}"
 pkgname=("$pkgbase" "${pkgbase}-docs")
-pkgver=14.0.10
+pkgver=14.0.11
 pkgrel=1
 pkgdesc="The TQt3 gui toolkit - based on TDE upstream Qt3"
 arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/tqt3"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-core')
 options=('staticlibs' 'libtool' '!emptydirs' '!strip')
@@ -22,19 +26,16 @@ makedepends=('libcups'
         'libmng'
         'xorg-xrandr'
         'libxft'
+        'libxmu'
         'glu')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/tqt3-trinity-${pkgver}.tar.xz"
-        'bp000-fix-build-key.diff')
-md5sums=('47d8495fcf444c5db2cf56843be3f746'
-         '950e3885135fd9844de856c770f19767')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('3923dc1a1460c556ef5d1fc296211f3a')
 
 _prefix="/opt/trinity/tqt3"
 
 build() {
 
-  cd ${srcdir}/tqt3-trinity-${pkgver}
-
-  patch -p1 < ${srcdir}/bp000-fix-build-key.diff
+  cd ${srcdir}/${_mod}-trinity-${pkgver}
 
   # These are probably arch-specific. They were present in old qt3
   # PKGBULD, they were present in kdemod3 PKGBUILD, they are present
@@ -54,7 +55,7 @@ build() {
   sed -i "s|read acceptance|acceptance=yes|" configure
 
   msg "Setting enviroment variables..."
-  export QTDIR="${srcdir}/tqt3-trinity-${pkgver}"
+  export QTDIR="${srcdir}/${_mod}-trinity-${pkgver}"
   export PATH=${QTDIR}/bin:${PATH}
   export LD_LIBRARY_PATH=${QTDIR}/lib:${LD_LIBRARY_PATH}
   export QMAKESPEC=$QTDIR/mkspecs/linux-g++
@@ -94,6 +95,7 @@ build() {
     -platform linux-g++${ARCH} \
     -no-exceptions \
     -thread \
+    -enable-opengl \
     -dlopen-opengl \
     -no-ipv6
 
@@ -146,8 +148,8 @@ package_tde-tqt3() {
 
    make INSTALL_ROOT="$pkgdir" install
 
-  ## remove doc as it is now in a split package tde-tqt3-doc
-  rm -r "${pkgdir}${_prefix}/doc"
+   ## remove doc as it is now in a split package tde-tqt3-doc
+   rm -r "${pkgdir}${_prefix}/doc"
 
    # install link the apps provided by qt3 so we don't collide with
    # qt4 and can run them.
diff --git a/arch/tde-core/tde-tqt3/bp000-fix-build-key.diff b/arch/tde-core/tde-tqt3/bp000-fix-build-key.diff
deleted file mode 100644
index a0a0aa42e..000000000
--- a/arch/tde-core/tde-tqt3/bp000-fix-build-key.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-commit 0d60417c83fd2bd8b6fccb6dd7171b113296860a
-Author: Slávek Banko <slavek.banko@axis.cz>
-Date:   Wed Sep 22 15:00:08 2021 +0200
-
-    Fix buildkey for GCC >= 7 if the version is listed including minor numbers.
-    
-    Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-
-diff --git a/configure b/configure
-index 92cec273..f021f563 100755
---- a/configure
-+++ b/configure
-@@ -2828,7 +2828,7 @@ g++*)
-     3.*)
- 	COMPILER_VERSION="3.*"
- 	;;
--    [1-9][0-9]|[7-9]|[4-6].*)
-+    [1-9][0-9]|[1-9][0-9].*|[7-9]|[4-9].*)
- 	COMPILER_VERSION="4.*"
- 	;;
-     *)
diff --git a/arch/tde-core/tde-tqtinterface/PKGBUILD b/arch/tde-core/tde-tqtinterface/PKGBUILD
index 43774f594..6d59ac7c7 100644
--- a/arch/tde-core/tde-tqtinterface/PKGBUILD
+++ b/arch/tde-core/tde-tqtinterface/PKGBUILD
@@ -3,34 +3,34 @@
 # Contributor: Calvin Morrison <mutantturkey@gmail.com>
 # Contributor: David C. Rankin <drankinatty at gmail dot com>
 
-pkgname=tde-tqtinterface
-pkgver=14.0.10
+_mod=tqtinterface
+_cat=dependencies/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 arch=('i686' 'x86_64')
-url="https://scm.trinitydesktop.org/scm/git/tqtinterface"
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL2')
 groups=('tde-core')
 pkgdesc="TQt interface for the TDE desktop"
 depends=('tde-tqt3' 'glu')
-makedepends=('pkgconfig' 'cmake')
-provides=('tqtinterface')
-conflicts=('kdemod3-tqtinterface' 'trinity-tqtinterface')
-replaces=('trinity-tqtinterface')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_kdemod}" "kdemod3-${_kdemod}")
+replaces=("trinity-${_mod}")
 # makeopts=('libtool' '!emptydirs' '!strip')
 options=('staticlibs' 'libtool' '!emptydirs' '!strip')
 
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/dependencies/tqtinterface-trinity-${pkgver}.tar.xz"
-        'tqtpc-location.patch')
-
-md5sums=('76b04fce54a40edf46a7421a5f3e176f'
-         'c15745c944d98cb7c4cb553f0ca421d4')
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('4f2001045468bce4483819d91fef113a')
 
-install='trinity-tqtinterface.install'
+install="trinity-${_mod}.install"
 
 _prefix=/usr
-_tdedir=/opt/trinity
-
-[ -n "$QTDIR" ] || QTDIR=${_tdedir}/tqt3
+[ -n "$TDEDIR" ] || TDEDIR=/opt/trinity
+[ -n "$QTDIR" ] || QTDIR=${TDEDIR}/tqt3
 
 build() {
    cd $srcdir
@@ -38,24 +38,27 @@ build() {
    mkdir -p build
    cd build
 
+   export PKG_CONFIG_PATH=${TDEDIR}/lib/pkgconfig:${QTDIR}/lib/pkgconfig:${PKG_CONFIG_PATH}
+
    msg "Starting cmake..."
    cmake ${srcdir}/${pkgname#*-}-trinity-${pkgver}/ \
+     -GNinja \
      -DCMAKE_INSTALL_PREFIX=${_prefix} \
      -DQT_PREFIX_DIR=${QTDIR} \
      -DQT_INCLUDE_DIR=${QTDIR}/include \
      -DMOC_EXECUTABLE=${QTDIR}/bin/moc \
      -DQT_VERSION=3
 
-   make $NUMJOBS
+   ninja $NUMJOBS
 }
 
 package() {
    msg "Packaging - $pkgname-$pkgver"
    cd ${srcdir}/build
-   make -j1 DESTDIR="${pkgdir}" install
+   DESTDIR="${pkgdir}" ninja -j1 install
 
    # Create and install ld.so.conf.d file
    install -d -m755 $pkgdir/etc/ld.so.conf.d/
-   echo ${_tdedir}/lib > $pkgdir/etc/ld.so.conf.d/trinity.conf
-   echo ${_tdedir}/lib/trinity >> $pkgdir/etc/ld.so.conf.d/trinity.conf
+   echo ${TDEDIR}/lib > $pkgdir/etc/ld.so.conf.d/trinity.conf
+   echo ${TDEDIR}/lib/trinity >> $pkgdir/etc/ld.so.conf.d/trinity.conf
 }
diff --git a/arch/tde-core/tde-tqtinterface/tqtpc-location.patch b/arch/tde-core/tde-tqtinterface/tqtpc-location.patch
deleted file mode 100644
index f256e925c..000000000
--- a/arch/tde-core/tde-tqtinterface/tqtpc-location.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dependencies/tqtinterface/CMakeLists.txt	2011-03-28 00:12:24.000000000 +0200
-+++ dependencies/tqtinterface/CMakeLists.txt.new	2012-01-29 12:15:16.000000000 +0100
-@@ -35,7 +35,7 @@
- tde_setup_install_path( BIN_INSTALL_DIR       "${EXEC_INSTALL_PREFIX}/bin"  )
- tde_setup_install_path( LIB_INSTALL_DIR       "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}" )
- tde_setup_install_path( INCLUDE_INSTALL_DIR   "${CMAKE_INSTALL_PREFIX}/include/tqt" )
--tde_setup_install_path( PKGCONFIG_INSTALL_DIR "/usr/lib${LIB_SUFFIX}/pkgconfig" )
-+tde_setup_install_path( PKGCONFIG_INSTALL_DIR "${EXEC_INSTALL_PREFIX}/lib${LIB_SUFFIX}/pkgconfig" )
- 
- 
- ##### tqtinterface sources ######################