1 files changed, 18 insertions, 15 deletions
diff --git a/arch/tde-extra/tde-tdetoys/PKGBUILD b/arch/tde-extra/tde-tdetoys/PKGBUILD
index 9b2bbde2e..445bb144a 100644
--- a/arch/tde-extra/tde-tdetoys/PKGBUILD
+++ b/arch/tde-extra/tde-tdetoys/PKGBUILD
@@ -1,43 +1,46 @@
 # Contributor: e1z0 <justinas at eofnet dot lt>
 
-pkgname=tde-tdetoys
-pkgver=14.0.10
+_mod=tdetoys
+_cat=core/
+_kdemod="${_mod/tde/kde}"
+
+pkgname="tde-${_mod}"
+pkgver=14.0.11
 pkgrel=1
 arch=('i686' 'x86_64')
-url='https://scm.trinitydesktop.org/scm/git/tdetoys'
+url="https://scm.trinitydesktop.org/scm/git/${_mod}"
 license=('GPL')
 groups=('tde-extra')
 pkgdesc="Trinity Desktop Toys"
 depends=('tde-tdebase')
-makedepends=('pkgconfig' 'cmake')
-provides=('tdetoys')
-conflicts=('trinity-tdetoys' 'trinity-kdetoys')
-replaces=('trinity-tdetoys')
+makedepends=('tde-cmake-trinity')
+provides=("${_mod}")
+conflicts=("trinity-${_mod}" "trinity-${_kdemod}")
+replaces=("trinity-${_mod}")
 options=('staticlibs' 'libtool' '!strip')
-source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/core/tdetoys-trinity-${pkgver}.tar.xz")
-md5sums=('f91d22efed453b5053e2110782d85d93')
-# install=''
+source=("https://mirror.ppa.trinitydesktop.org/trinity/releases/R${pkgver}/main/${_cat}${_mod}-trinity-${pkgver}.tar.xz")
+md5sums=('2bb8f5d47d4e094e459597b5069b7a3d')
 
 [ -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_VERBOSE_MAKEFILE=ON \
       -DCMAKE_INSTALL_PREFIX=$TDEDIR \
       -DBUILD_ALL=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
 }