From 38c332ae5fea44df57acd61fe3685417febcee0c Mon Sep 17 00:00:00 2001
From: "Pawel \"l0ner\" Soltys" <pwslts@gmail.com>
Date: Sun, 29 Jan 2012 15:53:36 +0100
Subject: kdelibs: removed profile.d file installation, minor fixes

---
 arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD
index 052575fa5..f84063545 100644
--- a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD
@@ -9,11 +9,9 @@ url='http://www.trinitydesktop.org'
 license=('GPL')
 groups=('trinity-base')
 pkgdesc="Trinity DE core libraries"
-depends=('trinity-arts' 'trinity-tqtinterface'
-         'libxslt' 'libidn' 
+depends=('trinity-arts'
+         'libxslt' 'libidn' 'libart-lgpl' 'jasper' 
          'libxcomposite' 'libcups' 
-         'libart-lgpl' 
-         'jasper' 
          'openexr' 'aspell' 'hspell') 
          # taglib
          # libical
@@ -22,6 +20,7 @@ depends=('trinity-arts' 'trinity-tqtinterface'
          # avahi
          # libtiff
          # openssl
+         # libutempter - needs to be installed from aur
 makedepends=('pkgconfig' 'cmake')
 provides=('kdelibs3')
 conflicts=('kdemod3-kdelibs' 'kdelibs3')
@@ -38,8 +37,10 @@ _prefix="/opt/trinity"
 
 build() {
    msg "Setting PATH, CMAKE and Trinity Environment variables"
-    . /etc/profile.d/qt3.sh
+   . /etc/profile.d/qt3.sh
+   . /etc/profile.d/trinity.sh
 
+   # compiles without exporting this, since we have profiles
    #export CMAKE_PREFIX_PATH=${QTDIR}:${_prefix}
    #export PATH=$PATH:${_prefix}/bin
    #export CMAKE_INCLUDE_PATH=/usr/include/dbus-1.0:${_prefix}/bin
@@ -81,11 +82,12 @@ package() {
    cd ${srcdir}/build
 
    make DESTDIR="$pkgdir" install
+   
+   # we do this in arts package
+   #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/ld.so.conf.d/
-   echo "${_prefix}/lib" > ${pkgdir}/etc/ld.so.conf.d/${pkgname}.conf
-
-   install -d -m755 ${pkgdir}/etc/profile.d/
-   install -m644 ${srcdir}/trinity.sh ${pkgdir}/etc/profile.d/
+   #install -d -m755 ${pkgdir}/etc/profile.d/
+   #install -m644 ${srcdir}/trinity.sh ${pkgdir}/etc/profile.d/
 
 }
-- 
cgit v1.2.3