Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/tde-packaging

43 files changed, 173 insertions, 108 deletions

diff --git a/arch/3.5.13/trinity-apps/trinity-amarok/PKGBUILD b/arch/3.5.13/trinity-apps/trinity-amarok/PKGBUILD
index 3774db145..01a010c99 100644
--- a/arch/3.5.13/trinity-apps/trinity-amarok/PKGBUILD
+++ b/arch/3.5.13/trinity-apps/trinity-amarok/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="Trinity Amarok music player and manager"
 depends=('trinity-kdebase' 'libifp' 'libmtp' 'libnjb' 'python-daap' 'ruby')
 makedepends=('pkgconfig' 'cmake' 'imake')
 options=('libtool' '!strip')
-source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/amarok-3.5.13.tar.gz)
+source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/applications/amarok-3.5.13.tar.gz)
 md5sums=('7145ebee38f104bef6cfaf56e7f81959')
 
 _svnmod=applications/amarok
diff --git a/arch/3.5.13/trinity-apps/trinity-digikam/PKGBUILD b/arch/3.5.13/trinity-apps/trinity-digikam/PKGBUILD
index c0d9cf43e..a011713d4 100644
--- a/arch/3.5.13/trinity-apps/trinity-digikam/PKGBUILD
+++ b/arch/3.5.13/trinity-apps/trinity-digikam/PKGBUILD
@@ -15,7 +15,7 @@ provides=($pkgname)
 conflicts=()
 replaces=()
 options=('libtool' '!strip')
-source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/digikam-3.5.13.tar.gz)
+source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/applications/digikam-3.5.13.tar.gz)
 md5sums=('81cfcd75dc9c067ba6761aa1147c31e7')
 
 _builddir=applications/digikam
diff --git a/arch/3.5.13/trinity-apps/trinity-dolphin/PKGBUILD b/arch/3.5.13/trinity-apps/trinity-dolphin/PKGBUILD
index be30cc009..9b820cab8 100644
--- a/arch/3.5.13/trinity-apps/trinity-dolphin/PKGBUILD
+++ b/arch/3.5.13/trinity-apps/trinity-dolphin/PKGBUILD
@@ -12,7 +12,7 @@ pkgdesc="Trinity Do3phin file manager"
 depends=('trinity-kdebase')
 makedepends=('pkgconfig' 'cmake' 'imake')
 options=('libtool' '!strip')
-source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/dolphin-3.5.13.tar.gz)
+source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/applications/dolphin-3.5.13.tar.gz)
 md5sums=('67040323c527d83978f58c76b47a91f6')
 
 _svnmod=applications/dolphin
diff --git a/arch/3.5.13/trinity-apps/trinity-fileligt/PKGBUILD b/arch/3.5.13/trinity-apps/trinity-fileligt/PKGBUILD
index 5cc80720e..b59688892 100644
--- a/arch/3.5.13/trinity-apps/trinity-fileligt/PKGBUILD
+++ b/arch/3.5.13/trinity-apps/trinity-fileligt/PKGBUILD
@@ -15,7 +15,7 @@ provides=($pkgname)
 conflicts=()
 replaces=()
 options=('libtool' '!strip')
-source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/filelight-3.5.13.tar.gz)
+source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/applications/filelight-3.5.13.tar.gz)
 md5sums=('b53cb6b46942e56aa247100cdb84d85f')
 
 _builddir=applications/filelight
diff --git a/arch/3.5.13/trinity-apps/trinity-gwenview/PKGBUILD b/arch/3.5.13/trinity-apps/trinity-gwenview/PKGBUILD
index 88241d6dc..69fc976e9 100644
--- a/arch/3.5.13/trinity-apps/trinity-gwenview/PKGBUILD
+++ b/arch/3.5.13/trinity-apps/trinity-gwenview/PKGBUILD
@@ -15,7 +15,7 @@ provides=($pkgname)
 conflicts=()
 replaces=()
 options=('libtool' '!strip')
-source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/gwenview-3.5.13.tar.gz)
+source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/applications/gwenview-3.5.13.tar.gz)
 md5sums=('3ff9b8c4049dc40f26f89b4be3c21b96')
 
 _builddir=applications/gwenview
diff --git a/arch/3.5.13/trinity-apps/trinity-k3b/PKGBUILD b/arch/3.5.13/trinity-apps/trinity-k3b/PKGBUILD
index 02298e96a..532def469 100644
--- a/arch/3.5.13/trinity-apps/trinity-k3b/PKGBUILD
+++ b/arch/3.5.13/trinity-apps/trinity-k3b/PKGBUILD
@@ -15,7 +15,7 @@ provides=($pkgname)
 conflicts=()
 replaces=()
 options=('libtool' '!strip')
-source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/k3b-3.5.13.tar.gz)
+source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/applications/k3b-3.5.13.tar.gz)
 md5sums=('f022338d361632223106ba444fe1e60e')
 
 _builddir=applications/k3b
diff --git a/arch/3.5.13/trinity-apps/trinity-kbfx/PKGBUILD b/arch/3.5.13/trinity-apps/trinity-kbfx/PKGBUILD
index f4b1623c2..f5fbba0a8 100644
--- a/arch/3.5.13/trinity-apps/trinity-kbfx/PKGBUILD
+++ b/arch/3.5.13/trinity-apps/trinity-kbfx/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="Trinity Kbfx KMenu replacement"
 depends=('trinity-kdebase')
 makedepends=('pkgconfig' 'cmake' 'imake')
 options=('libtool' '!strip')
-source=('http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/kbfx-3.5.13.tar.gz' 'kbfx.patch')
+source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/applications/kbfx-3.5.13.tar.gz' 'kbfx.patch')
 md5sums=('04921c66fe2dc26d6eab7143e5950446'
          '510638db000827e86f9d542662199064')
 
diff --git a/arch/3.5.13/trinity-apps/trinity-kdesvn/PKGBUILD b/arch/3.5.13/trinity-apps/trinity-kdesvn/PKGBUILD
index 2121d9839..f70e3731c 100644
--- a/arch/3.5.13/trinity-apps/trinity-kdesvn/PKGBUILD
+++ b/arch/3.5.13/trinity-apps/trinity-kdesvn/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="Trinity SVN frontend gui"
 depends=('trinity-kdebase' 'sqlite3' 'subversion')
 makedepends=('pkgconfig' 'cmake' 'imake')
 options=('libtool' '!strip')
-source=('http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/kdesvn-3.5.13.tar.gz' 'kdesvn.patch')
+source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/applications/kdesvn-3.5.13.tar.gz' 'kdesvn.patch')
 md5sums=('f65e86f0d2f7882b4f958f2e89fe0d34'
          '9def57c42b258c4caf2b5709eb25ba25')
 
diff --git a/arch/3.5.13/trinity-apps/trinity-konversation/PKGBUILD b/arch/3.5.13/trinity-apps/trinity-konversation/PKGBUILD
index 5cfbaab1a..197073ea1 100644
--- a/arch/3.5.13/trinity-apps/trinity-konversation/PKGBUILD
+++ b/arch/3.5.13/trinity-apps/trinity-konversation/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="Trinity Konversation IRC client"
 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)
+source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/applications/konversation-3.5.13.tar.gz)
 md5sums=('0f0e0415dad4c19bc885c9addadf4026')
 
 _builddir=applications/konversation
diff --git a/arch/3.5.13/trinity-apps/trinity-kpowersave/PKGBUILD b/arch/3.5.13/trinity-apps/trinity-kpowersave/PKGBUILD
index bdcecae9c..61fa5e46b 100644
--- a/arch/3.5.13/trinity-apps/trinity-kpowersave/PKGBUILD
+++ b/arch/3.5.13/trinity-apps/trinity-kpowersave/PKGBUILD
@@ -13,7 +13,7 @@ depends=('xscreensaver'
         'trinity-kdebase')
 makedepends=('pkgconfig' 'cmake' 'autoconf' 'imake')
 options=('libtool' '!strip')
-source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/kpowersave-3.5.13.tar.gz)
+source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/applications/kpowersave-3.5.13.tar.gz)
 md5sums=('c887eb282fd035655b370f133ce58664')
 
 _svnmod=applications/kpowersave
diff --git a/arch/3.5.13/trinity-apps/trinity-ktorrent/PKGBUILD b/arch/3.5.13/trinity-apps/trinity-ktorrent/PKGBUILD
index 935fdf677..5a1863c7c 100644
--- a/arch/3.5.13/trinity-apps/trinity-ktorrent/PKGBUILD
+++ b/arch/3.5.13/trinity-apps/trinity-ktorrent/PKGBUILD
@@ -11,7 +11,7 @@ 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/ktorrent-3.5.13.tar.gz)
+source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/applications/ktorrent-3.5.13.tar.gz)
 md5sums=('3bf211ec2a41f92d935e12ee8753fa06')
 
 _builddir=applications/ktorrent
diff --git a/arch/3.5.13/trinity-artwork/trinity-gtk-qt-engine/PKGBUILD b/arch/3.5.13/trinity-artwork/trinity-gtk-qt-engine/PKGBUILD
index 70e75a5f7..c72518ab3 100644
--- a/arch/3.5.13/trinity-artwork/trinity-gtk-qt-engine/PKGBUILD
+++ b/arch/3.5.13/trinity-artwork/trinity-gtk-qt-engine/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="Trinity - Qt wrapper for GTK, makes gtk2 apps look pretty under TDE"
 depends=('trinity-kdebase' 'gtk2')
 makedepends=('pkgconfig' 'cmake' 'imake')
 options=('libtool' '!strip')
-source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/gtk-qt-engine-3.5.13.tar.gz)
+source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/applications/gtk-qt-engine-3.5.13.tar.gz)
 md5sums=('96da675949ef8743d4fe91531f734030')
 
 _svnmod=applications/gtk-qt-engine
diff --git a/arch/3.5.13/trinity-artwork/trinity-style-lipstik/PKGBUILD b/arch/3.5.13/trinity-artwork/trinity-style-lipstik/PKGBUILD
index 46e5b1a7f..cb77e3fb9 100644
--- a/arch/3.5.13/trinity-artwork/trinity-style-lipstik/PKGBUILD
+++ b/arch/3.5.13/trinity-artwork/trinity-style-lipstik/PKGBUILD
@@ -11,7 +11,7 @@ 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)
+source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/applications/kde-style-lipstik-3.5.13.tar.gz)
 md5sums=('1585d4df7f0c68499fafa0b8ecb82dab')
 
 _builddir=applications/kde-style-lipstik
diff --git a/arch/3.5.13/trinity-artwork/trinity-style-qtcurve/PKGBUILD b/arch/3.5.13/trinity-artwork/trinity-style-qtcurve/PKGBUILD
index b1133c23d..37fc97422 100644
--- a/arch/3.5.13/trinity-artwork/trinity-style-qtcurve/PKGBUILD
+++ b/arch/3.5.13/trinity-artwork/trinity-style-qtcurve/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="Trinity - QtCurve style"
 depends=('trinity-kdebase')
 makedepends=('pkgconfig' 'cmake' 'imake')
 options=('libtool' '!strip')
-source=('http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/applications/kde-style-qtcurve-3.5.13.tar.gz')
+source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/applications/kde-style-qtcurve-3.5.13.tar.gz')
 
 _svnmod=applications/kde-style-qtcurve
 md5sums=('98133893b9c6736804d4dfc134a3a256')
diff --git a/arch/3.5.13/trinity-base/hal/PKGBUILD b/arch/3.5.13/trinity-base/hal/PKGBUILD
index 2de5f1047..4302f938e 100644
--- a/arch/3.5.13/trinity-base/hal/PKGBUILD
+++ b/arch/3.5.13/trinity-base/hal/PKGBUILD
@@ -1,5 +1,7 @@
+# Maintainer: Calvin Morisson <mutantturkey@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Link Dupont <link@subpop.net>
+# Contributor: Pawel "l0ner" Soltys <sh4dou@gmail.com>
 
 pkgname=hal
 pkgver=0.5.14
@@ -29,7 +31,7 @@ source=(http://hal.freedesktop.org/releases/${pkgname}-${pkgver}.tar.gz
 #        patches/hal-ignore-internal-dm-devices.patch
 
 md5sums=('e9163df591a6f38f59fdbfe33e73bf20'
-         '277e96ac130d7bfce0b30f0b80db8782'
+         '4cdfc673ad65ddb51919f5a757f62145'
          '185dd5d6ffc703ec8395b4eb3a1ae498')
 #         '4d4b6801a1cedca22b8bdd9db73b16fb'
 #         '6d87c3e63184ae3a69caafc846f538a3'
@@ -46,7 +48,7 @@ md5sums=('e9163df591a6f38f59fdbfe33e73bf20'
 
 build() {
    cd $srcdir
-  patch -Np1 -d ${srcdir} < videodev.patch
+  patch -Np1 -d ${srcdir} < hal.patch
   cd "${srcdir}/${pkgname}-${pkgver}"
 #  patch -Np1 -i "${srcdir}/hal-0.5.9-hide-diagnostic.patch"
 #  patch -Np1 -i "${srcdir}/hal-remove-dell-killswitch.patch"
diff --git a/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD b/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD
index 089f41bb7..2c925fccc 100644
--- a/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-arts/PKGBUILD
@@ -14,12 +14,10 @@ depends=('audiofile'
          '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)
-source=(http://anduin.linuxformscratch.org/sources/trinity/arts-3.5.13.tar.gz)
+source=(http://mirror.ets.kth.se/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)
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 c9afee5b0..45af8c626 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
@@ -2,13 +2,13 @@
 
 pkgname=trinity-dbus-1-qt3
 pkgver=0.9
-pkgrel=8
+pkgrel=9
 arch=('i686' 'x86_64')
 url="http://www.freedesktop.org/wiki/Software/DBusBindings"
 license=('GPL')
 groups=('trinity-base')
 pkgdesc="Trinity D-Bus/Qt3 bindings."
-depends=('dbus' 'trinity-qt3' 'networkmanager')
+depends=('trinity-qt3')
 provides=('trinity-dbus-1-qt3' 'dbus-1-qt3')
 conflicts=('dbus-1-qt3')
 replaces=('dbus-1-qt3')
@@ -22,11 +22,11 @@ build() {
    . /etc/profile.d/qt3.sh
    msg "Starting configure..."
    ./configure --prefix=$QTDIR
-   msg "Building #{pkgname}..."
+   msg "Building ${pkgname}..."
    make || return 1
 
    # Libtool slay
-   #     find $startdir/pkg -name *.la -exec rm {} \;
+   #     find $pkgdir -name *.la -exec rm {} \;
 }
 
 package() {
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 c3844ce33..eb51423d0 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
@@ -12,8 +12,7 @@ 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)
-source=(http://anduin.linuxfromscratch.org/sources/trinity/dbus-1-tqt-3.5.13.tar.gz)
+source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/dbus-1-tqt-3.5.13.tar.gz)
 md5sums=('a7ba1071f4bf7b5930f805b4036f8a97')
 
 _svnmod=dependencies/dbus-1-tqt
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 dca32c78e..63759a641 100644
--- a/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-dbus-tqt/PKGBUILD
@@ -1,4 +1,4 @@
-# Maintainer Calvin Morrison <mutantturkey@gmail.com>
+# Maintainer: Calvin Morrison <mutantturkey@gmail.com>
 
 pkgname=trinity-dbus-tqt
 pkgver=3513
@@ -10,12 +10,10 @@ groups=('trinity-base')
 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)
-source=(http://anduin.linuxfromscratch.org/sources/trinity/dbus-tqt-3.5.13.tar.gz)
+source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/dbus-tqt-3.5.13.tar.gz)
 md5sums=('46ae165c068271485c827f6fc6687a9a')
 
 _svnmod=dependencies/dbus-tqt
diff --git a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD
index 53eafbc42..6011214a0 100644
--- a/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-kdebase/PKGBUILD
@@ -32,8 +32,7 @@ optdepends=('desktop-file-utils: Command line utilities for working with desktop
         'pciutils: PCI bus configuration space access library and tools'
         'xscreensaver: Screen saver and locker for the X Window System')
 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')
-source=('http://anduin.linuxfromscratch.org/sources/trinity/kdebase-3.5.13.tar.gz' 'dbusfix.diff' 'kdm-trinity')
+source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdebase-3.5.13.tar.gz' 'dbusfix.diff' 'kdm-trinity')
 md5sums=('d1f7e1f94eeb46b981fe1ba144179840'
          'c9ce810c281002440a6de8cfd8735d07'
          '376d85d213cf3c04cb0912e5cccd68bd')
@@ -110,16 +109,9 @@ package() {
 #   cd ${srcdir}/${_svnmod}
   cd ${srcdir}/build
 
-  make DESTDIR="$pkgdir/" install
+  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
+  # install desktop 
   [[ -f ${pkgdir}/etc/X11/sessions/trinity.desktop ]] || msg "ERROR - Install Failure: ${pkgdir}/etc/X11/sessions/trinity.desktop"
 
   # set kdm directory
@@ -137,7 +129,7 @@ package() {
   cd ${pkgdir}/usr/bin
   ln -sf /opt/trinity/bin/startkde starttrinity
 
-  cd ${startdir}
-  install -D -m755 ./kdm-trinity "${pkgdir}"/etc/rc.d/kdm-trinity	
+  cd ${srcdir}
+  install -D -m755 kdm-trinity "${pkgdir}"/etc/rc.d/kdm-trinity	
 
 }
diff --git a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD
index ffb2108b0..acafc86b2 100644
--- a/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-kdelibs/PKGBUILD
@@ -1,23 +1,24 @@
 # Maintainer: Calvin Morrison <mutantturkey@gmail.com>
+# Contributor: Pawel 'l0ner' Soltys <pwslts@gmail.com>
 
 pkgname=trinity-kdelibs
 pkgver=3513
-pkgrel=2
+pkgrel=4
 arch=('i686' 'x86_64')
 url='http://www.trinitydesktop.org'
 license=('GPL')
 groups=('trinity-base')
 pkgdesc="Trinity DE core libraries"
-depends=('trinity-arts' 'trinity-qt3' 'trinity-tqtinterface' 'libical' 'libxslt' 'libltdl' 'avahi' 'pam-krb5' 'taglib' 'libxcomposite')
-makedepends=('pkgconfig' 'cmake' 'autoconf' )
+depends=('trinity-arts' 'trinity-qt3' 'trinity-tqtinterface' 'libical' 'libxslt' 'libltdl' 'avahi' 'pam-krb5' 'taglib' 'libxcomposite' 'libcups' 'alsa-lib' 'libart-lgpl' 'libidn' 'openssl' 'libtiff' 'jasper' 'openexr' 'aspell' 'hspell') 
+makedepends=('pkgconfig' 'cmake')
 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')
-source=('http://anduin.linuxfromscratch.org/sources/trinity/kdelibs-3.5.13.tar.gz' 'trinity.sh')
+source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdelibs-3.5.13.tar.gz' 'trinity.sh' 'docpath.patch')
 md5sums=('f62eefb63b4ba2141b4c576f859806dd'
-         '2de1886d632c8bc288befada5e1bc3b5')
+         '2de1886d632c8bc288befada5e1bc3b5'
+         'd20badec5a1a7f01f0c957db8b9b8def')
 
 _builddir=build
 _prefix="/opt/trinity"
@@ -35,6 +36,9 @@ build() {
    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
 
+   msg "Patching..."
+   patch -N -d ${srcdir} -p0 < ${srcdir}/docpath.patch
+
    cd $srcdir
    msg "Creating out-of-source build directory: ${srcdir}/${_builddir}"
    mkdir -p ${_builddir}
@@ -44,12 +48,28 @@ build() {
    cmake ${srcdir}/kdelibs \
     -DCMAKE_INSTALL_PREFIX=${_prefix} \
     -DCMAKE_VERBOSE_MAKEFILE=OFF \
-    -DQT_VERSION=3 \
-    -DWITH_QT3=ON \
-    -DQTDIR=${QTDIR} \
-    -DQT_LIBRARY_DIRS=${QTDIR}/lib \
-    -DWITH_PAM=ON \
-    -DBUILD_ALL=ON
+    -DWITH_ARTS=ON \
+    -DWITH_ALSA=ON \
+    -DWITH_LIBART=ON \
+    -DWITH_LIBIDN=ON \
+    -DWITH_SSL=ON \
+    -DWITH_CUPS=ON \
+    -DWITH_LUA=OFF \
+    -DWITH_TIFF=ON \
+    -DWITH_JASPER=ON \
+    -DWITH_OPENEXR=ON \
+    -DWITH_UTEMPTER=OFF \
+    -DWITH_AVAHI=ON \
+    -DWITH_ASPELL=ON \
+    -DWITH_HSPELL=ON
+
+# Not needed, CMake returns that those were not used
+#    -DQT_VERSION=3 \
+#    -DWITH_QT3=ON \
+#    -DQTDIR=${QTDIR} \
+#    -DQT_LIBRARY_DIRS=${QTDIR}/lib \
+#    -DWITH_PAM=ON \
+#    -DBUILD_ALL=ON
 
    msg "Building - $pkgname..."
    make
@@ -65,7 +85,7 @@ package() {
    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 -m644 ${srcdir}/trinity.sh ${pkgdir}/etc/profile.d/
 
    #   rm -r ${srcdir}/${_svnmod}
 }
diff --git a/arch/3.5.13/trinity-base/trinity-kdelibs/docpath.patch b/arch/3.5.13/trinity-base/trinity-kdelibs/docpath.patch
new file mode 100644
index 000000000..aeb5e95f1
--- /dev/null
+++ b/arch/3.5.13/trinity-base/trinity-kdelibs/docpath.patch
@@ -0,0 +1,36 @@
+diff -r -u kdelibs/admin/debianrules src/kdelibs/admin/debianrules
+--- kdelibs/admin/debianrules	2011-08-21 06:15:36.000000000 +0200
++++ src/kdelibs/admin/debianrules	2012-01-04 15:28:20.000000000 +0100
+@@ -16,7 +16,7 @@
+ 
+ $kde_cgidir	=	"$kde_prefix/lib/cgi-bin";
+ $kde_confdir	=	"$sysconfdir/trinity";
+-$kde_htmldir	=	"$kde_prefix/share/doc/kde/HTML";
++$kde_htmldir	=	"$kde_prefix/share/doc/HTML";
+ 
+ if (defined $ENV{DEB_BUILD_OPTIONS} &&
+     $ENV{DEB_BUILD_OPTIONS} =~ /\bnostrip\b/) {
+diff -r -u kdelibs/cmake/modules/TDESetupPaths.cmake src/kdelibs/cmake/modules/TDESetupPaths.cmake
+--- kdelibs/cmake/modules/TDESetupPaths.cmake	2011-08-21 06:15:37.000000000 +0200
++++ src/kdelibs/cmake/modules/TDESetupPaths.cmake	2012-01-04 15:28:49.000000000 +0100
+@@ -41,7 +41,7 @@
+   _tde_internal_setup_path( PLUGIN_INSTALL_DIR        "${LIB_INSTALL_DIR}/trinity"                     "The subdirectory relative to the install prefix where plugins will be installed (default is ${LIB_INSTALL_DIR}/trinity)" )
+   _tde_internal_setup_path( CONFIG_INSTALL_DIR        "${SHARE_INSTALL_PREFIX}/config"              "The config file install dir" )
+   _tde_internal_setup_path( DATA_INSTALL_DIR          "${SHARE_INSTALL_PREFIX}/apps"                "The parent directory where applications can install their data" )
+-  _tde_internal_setup_path( HTML_INSTALL_DIR          "${SHARE_INSTALL_PREFIX}/doc/kde/HTML"        "The HTML install dir for documentation" )
++  _tde_internal_setup_path( HTML_INSTALL_DIR          "${SHARE_INSTALL_PREFIX}/doc/HTML"        "The HTML install dir for documentation" )
+   _tde_internal_setup_path( ICON_INSTALL_DIR          "${SHARE_INSTALL_PREFIX}/icons"               "The icon install dir (default ${SHARE_INSTALL_PREFIX}/share/icons/)" )
+   _tde_internal_setup_path( KCFG_INSTALL_DIR          "${SHARE_INSTALL_PREFIX}/config.kcfg"         "The install dir for kconfig files" )
+   _tde_internal_setup_path( LOCALE_INSTALL_DIR        "${SHARE_INSTALL_PREFIX}/locale"              "The install dir for translations" )
+diff -r -u kdelibs/kdecore/kstandarddirs.cpp src/kdelibs/kdecore/kstandarddirs.cpp
+--- kdelibs/kdecore/kstandarddirs.cpp	2011-08-21 06:15:32.000000000 +0200
++++ src/kdelibs/kdecore/kstandarddirs.cpp	2012-01-04 15:30:24.000000000 +0100
+@@ -1030,7 +1030,7 @@
+     if (!strcmp(type, "html-bundle"))
+ 	return "share/doc-bundle/HTML/";
+     if (!strcmp(type, "html"))
+-	return "share/doc/kde/HTML/";
++	return "share/doc/HTML/";
+     if (!strcmp(type, "icon"))
+ 	return "share/icons/";
+     if (!strcmp(type, "config"))
diff --git a/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD b/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD
index ce4d7dc7a..0f803979d 100644
--- a/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-qt3/PKGBUILD
@@ -2,21 +2,19 @@
 
 pkgname=trinity-qt3
 pkgver=3884
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://trinitydesktop.org"
 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')
+depends=('libjpeg-turbo' 'libmng' 'libmysqlclient' 'libpng' 'libxmu'  'libxcursor' 'libxinerama' 'libxft' 'libxrandr' 'mesa' 'postgresql-libs')
 makedepends=('cups' 'libxi' 'mysql' 'postgresql' 'unixodbc' 'sqlite3')
-# optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc')
 provides=('trinity-qt3' 'qt3')
 conflicts=('qt3' 'qt3-enhanced')
 replaces=('trinity-qt3')
 options=(!libtool)
-#source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/qt3-3.3.8.d.tar.gz)
-source=(http://anduin.linuxfromscratch.org/sources/trinity/qt3-3.3.8.d.tar.gz)
+source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/qt3-3.3.8.d.tar.gz)
 md5sums=('78dc675e84aed595375449818cbb589a')
 
 _prefix="/opt/qt"
@@ -39,16 +37,17 @@ build() {
 
    rm -rf mkspecs/{*aix*,*bsd*,cygwin*,dgux*,darwin*,hpux*,hurd*,irix*,lynxos*,macx*,qnx*,reliant*,sco*,solaris*,tru64*,unixware*,win32*}
 
+   # auto license acceptance
+   sed -i "s|read acceptance|acceptance=yes|" configure
+
    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
diff --git a/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD b/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD
index 772464b44..70767907b 100644
--- a/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD
+++ b/arch/3.5.13/trinity-base/trinity-tqtinterface/PKGBUILD
@@ -14,8 +14,7 @@ makedepends=('pkgconfig' 'cmake' 'libxi' 'libxft' 'libxrandr' 'libxcursor' 'libx
 provides=($pkgname)
 #conflicts=()
 #replaces=()
-#source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/dependencies/tqtinterface-3.5.13.tar.gz)
-source=(http://anduin.linuxfromscratch.org/sources/trinity/tqtinterface-3.5.13.tar.gz)
+source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/dependencies/tqtinterface-3.5.13.tar.gz)
 md5sums=('d54cc9fd0b35555298efd17c32471a2b')
 
 _prefix=/usr
diff --git a/arch/3.5.13/trinity-extras/trinity-kde-i18n/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-i18n/PKGBUILD
index 6cf757c67..0a7a8e421 100644
--- a/arch/3.5.13/trinity-extras/trinity-kde-i18n/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-i18n/PKGBUILD
@@ -3,8 +3,9 @@
 pkgname=('trinity-i18n-af' 'trinity-i18n-ar' 'trinity-i18n-az' 
          'trinity-i18n-be' 'trinity-i18n-bg' 'trinity-i18n-bn' 
          'trinity-i18n-br' 'trinity-i18n-bs' 
-         'trinity-i18n-cs' 'trinity-i18n-csb' 'trinity-i18n-cy' 
-         'trinity-i18n-da' 'trinity-i18n-de' 'trinity-i18n-el' 
+         'trinity-i18n-csb' 'trinity-i18n-cy' 
+         'trinity-i18n-ca' 'trinity-i18n-cs' 'trinity-i18n-da'         
+         'trinity-i18n-de' 'trinity-i18n-el' 
          'trinity-i18n-en_gb' 'trinity-i18n-eo' 'trinity-i18n-es' 
          'trinity-i18n-et' 'trinity-i18n-eu' 'trinity-i18n-fa' 
          'trinity-i18n-fi' 'trinity-i18n-fr' 'trinity-i18n-fy' 
@@ -24,7 +25,7 @@ pkgname=('trinity-i18n-af' 'trinity-i18n-ar' 'trinity-i18n-az'
          'trinity-i18n-tr' 'trinity-i18n-uk' 'trinity-i18n-uz' 
          'trinity-i18n-uz-cyrillic' 'trinity-i18n-vi' 'trinity-i18n-wa' '
          trinity-i18n-zh_cn' 'trinity-i18n-zh_tw')
-#'trinity-i18n-ca' 
+
 
 pkgver=3513
 pkgrel=1
@@ -36,7 +37,7 @@ pkgdesc="Trinity Localizations collection"
 depends=('trinity-kdelibs' 'trinity-kdebase')
 makedepends=('pkgconfig' 'autoconf' 'automake')
 options=('libtool' '!strip')
-source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kde-i18n-3.5.13.tar.gz)
+source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kde-i18n-3.5.13.tar.gz)
 md5sums=('7c919c7cb85f454fed46767082a87773')
 
 _builddir=kde-i18n
@@ -50,23 +51,25 @@ build() {
   cd $srcdir/kde-i18n
   rm HOW.TO.BUILD TRINITY.RELEASE
 
-  for filename in *; do
-     
-     msg "Extracting $filename..."
-     tar xfj $filename
-     
-     dir=`echo "$filename" | cut -d'.' -f1-3`
-     cd $dir
+  for _filename in *.tar.bz2; do
+     _dir=`echo "$_filename" | cut -d'.' -f1-3`
+     _newname=`echo "$_dir" | cut -d'-' -f2-4`
+
+     if [ -d trinity-${newname} ]; then
+       msg "Extracting $_filename..."
+       tar xfj $_filename
+       mv $_dir trinity-${_newname}
+     fi
+
+     cd trinity-${_newname}
      
-     msg "Starting $dir configure..."
+     msg "Starting trinity-${_newname} configure..."
      ./configure --prefix=${_prefix} > /dev/null
      
-     msg "Building $dir..."
+     msg "Building trinity-${_newname}..."
      make > /dev/null
      
      cd ..
-     newname=`echo "$dir" | cut -d'-' -f2-4`
-     mv $dir trinity-${newname}
   done
 }
 
@@ -77,6 +80,7 @@ pkgdesc="Trinity Afrikaans localization"
   cd ${srcdir}/kde-i18n/$pkgname-3.5.10
   make DESTDIR="${pkgdir}" install
 }
+
 package_trinity-i18n-ar() {
 groups=('trinity-i18n')
 pkgdesc="Trinity Arabic localization"
@@ -84,6 +88,7 @@ pkgdesc="Trinity Arabic localization"
   cd ${srcdir}/kde-i18n/$pkgname-3.5.10
   make DESTDIR="${pkgdir}" install
 }
+
 package_trinity-i18n-az() {
 groups=('trinity-i18n')
 pkgdesc="Trinity Azerbaijani localization"
@@ -91,6 +96,7 @@ pkgdesc="Trinity Azerbaijani localization"
   cd ${srcdir}/kde-i18n/$pkgname-3.5.10
   make DESTDIR="${pkgdir}" install
 }
+
 package_trinity-i18n-be() {
 groups=('trinity-i18n')
 pkgdesc="Trinity Belgian localization"
@@ -98,6 +104,7 @@ pkgdesc="Trinity Belgian localization"
   cd ${srcdir}/kde-i18n/$pkgname-3.5.10
   make DESTDIR="${pkgdir}" install
 }
+
 package_trinity-i18n-bg() {
 groups=('trinity-i18n')
 pkgdesc="Trinity Bulgarian localization"
@@ -105,6 +112,7 @@ pkgdesc="Trinity Bulgarian localization"
   cd ${srcdir}/kde-i18n/$pkgname-3.5.10
   make DESTDIR="${pkgdir}" install
 }
+
 package_trinity-i18n-bn() {
 groups=('trinity-i18n')
 pkgdesc="Trinity Brumei localization"
@@ -112,6 +120,7 @@ pkgdesc="Trinity Brumei localization"
   cd ${srcdir}/kde-i18n/$pkgname-3.5.10
   make DESTDIR="${pkgdir}" install
 }
+
 package_trinity-i18n-br() {
 groups=('trinity-i18n')
 pkgdesc="Trinity Breton localization"
@@ -119,6 +128,7 @@ pkgdesc="Trinity Breton localization"
   cd ${srcdir}/kde-i18n/$pkgname-3.5.10
   make DESTDIR="${pkgdir}" install
 }
+
 package_trinity-i18n-bs() {
 groups=('trinity-i18n')
 pkgdesc="Trinity Bosnian localization"
@@ -126,13 +136,15 @@ pkgdesc="Trinity Bosnian localization"
   cd ${srcdir}/kde-i18n/$pkgname-3.5.10
   make DESTDIR="${pkgdir}" install
 }
-#package_trinity-i18n-ca() {
-#groups=('trinity-i18n')
-#pkgdesc="Trinity Catalan localization"
-#  msg "Packaging - $pkgname-$pkgver"
-#  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
-#  make DESTDIR="${pkgdir}" install
-#}
+
+package_trinity-i18n-ca() {
+groups=('trinity-i18n')
+pkgdesc="Trinity Catalan localization"
+  msg "Packaging - $pkgname-$pkgver"
+  cd ${srcdir}/kde-i18n/$pkgname-3.5.10
+  make DESTDIR="${pkgdir}" install
+}
+
 package_trinity-i18n-cs() {
 groups=('trinity-i18n')
 pkgdesc="Trinity Czech localization"
@@ -140,6 +152,7 @@ pkgdesc="Trinity Czech localization"
   cd ${srcdir}/kde-i18n/$pkgname-3.5.10
   make DESTDIR="${pkgdir}" install
 }
+
 package_trinity-i18n-csb() {
 groups=('trinity-i18n')
 pkgdesc="Trinity Kashubian localization"
@@ -147,6 +160,7 @@ pkgdesc="Trinity Kashubian localization"
   cd ${srcdir}/kde-i18n/$pkgname-3.5.10
   make DESTDIR="${pkgdir}" install
 }
+
 package_trinity-i18n-cy() {
 groups=('trinity-i18n')
 pkgdesc="Trinity Cyprus localization"
@@ -154,6 +168,7 @@ pkgdesc="Trinity Cyprus localization"
   cd ${srcdir}/kde-i18n/$pkgname-3.5.10
   make DESTDIR="${pkgdir}" install
 }
+
 package_trinity-i18n-da() {
 groups=('trinity-i18n')
 pkgdesc="Trinity Danish localization"
@@ -161,6 +176,7 @@ pkgdesc="Trinity Danish localization"
   cd ${srcdir}/kde-i18n/$pkgname-3.5.10
   make DESTDIR="${pkgdir}" install
 }
+
 package_trinity-i18n-de() {
 groups=('trinity-i18n')
 pkgdesc="Trinity German localization"
@@ -168,6 +184,7 @@ pkgdesc="Trinity German localization"
   cd ${srcdir}/kde-i18n/$pkgname-3.5.10
   make DESTDIR="${pkgdir}" install
 }
+
 package_trinity-i18n-el() {
 groups=('trinity-i18n')
 pkgdesc="Trinity Greek localization"
@@ -175,6 +192,7 @@ pkgdesc="Trinity Greek localization"
   cd ${srcdir}/kde-i18n/$pkgname-3.5.10
   make DESTDIR="${pkgdir}" install
 }
+
 package_trinity-i18n-en_gb() {
 groups=('trinity-i18n')
 pkgdesc="Trinity British English localization"
@@ -182,6 +200,7 @@ pkgdesc="Trinity British English localization"
   cd ${srcdir}/kde-i18n/trinity-i18n-en_GB-3.5.10
   make DESTDIR="${pkgdir}" install
 }
+
 package_trinity-i18n-eo() {
 groups=('trinity-i18n')
 pkgdesc="Trinity Esperanto localization"
@@ -189,6 +208,7 @@ pkgdesc="Trinity Esperanto localization"
   cd ${srcdir}/kde-i18n/$pkgname-3.5.10
   make DESTDIR="${pkgdir}" install
 }
+
 package_trinity-i18n-es() {
 groups=('trinity-i18n')
 pkgdesc="Trinity Spanish localization"
@@ -196,6 +216,7 @@ pkgdesc="Trinity Spanish localization"
   cd ${srcdir}/kde-i18n/$pkgname-3.5.10
   make DESTDIR="${pkgdir}" install
 }
+
 package_trinity-i18n-et() {
 groups=('trinity-i18n')
 pkgdesc="Trinity Estonian localization"
@@ -203,6 +224,7 @@ pkgdesc="Trinity Estonian localization"
   cd ${srcdir}/kde-i18n/$pkgname-3.5.10
   make DESTDIR="${pkgdir}" install
 }
+
 package_trinity-i18n-eu() {
 groups=('trinity-i18n')
 pkgdesc="Trinity Basque localization"
@@ -210,6 +232,7 @@ pkgdesc="Trinity Basque localization"
   cd ${srcdir}/kde-i18n/$pkgname-3.5.10
   make DESTDIR="${pkgdir}" install
 }
+
 package_trinity-i18n-fa() {
 groups=('trinity-i18n')
 pkgdesc="Trinity Farsi localization"
@@ -217,6 +240,7 @@ pkgdesc="Trinity Farsi localization"
   cd ${srcdir}/kde-i18n/$pkgname-3.5.10
   make DESTDIR="${pkgdir}" install
 }
+
 package_trinity-i18n-fi() {
 groups=('trinity-i18n')
 pkgdesc="Trinity Finnish localization"
@@ -224,6 +248,7 @@ pkgdesc="Trinity Finnish localization"
   cd ${srcdir}/kde-i18n/$pkgname-3.5.10
   make DESTDIR="${pkgdir}" install
 }
+
 package_trinity-i18n-fr() {
 groups=('trinity-i18n')
 pkgdesc="Trinity French localization"
@@ -231,6 +256,7 @@ pkgdesc="Trinity French localization"
   cd ${srcdir}/kde-i18n/$pkgname-3.5.10
   make DESTDIR="${pkgdir}" install
 }
+
 package_trinity-i18n-fy() {
 groups=('trinity-i18n')
 pkgdesc="Trinity Frisian localization"
diff --git a/arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD
index dfb45cdce..014797586 100644
--- a/arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdeaccessibility/PKGBUILD
@@ -15,7 +15,7 @@ provides=()
 conflicts=()
 replaces=()
 options=('libtool' '!strip')
-#source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdeaccessibility-3.5.13.tar.gz)
+source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdeaccessibility-3.5.13.tar.gz)
 source=(http://anduin.linuxfromscratch.org/sources/trinity/kdeaccessibility-3.5.13.tar.gz)
 md5sums=('ce31b01c1831046fb28aab172f2423bf')
 
diff --git a/arch/3.5.13/trinity-extras/trinity-kdeaddons/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdeaddons/PKGBUILD
index 624fd667f..d0c932c1d 100644
--- a/arch/3.5.13/trinity-extras/trinity-kdeaddons/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdeaddons/PKGBUILD
@@ -15,7 +15,7 @@ provides=($pkgname)
 conflicts=()
 replaces=()
 options=('libtool' '!strip')
-#source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdeaddons-3.5.13.tar.gz)
+source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdeaddons-3.5.13.tar.gz)
 source=(http://anduin.linuxfromscratch.org/sources/trinity/kdeaddons-3.5.13.tar.gz)
 md5sums=('f5fa96a5d99d1bc33600f609881eaee6')
 
diff --git a/arch/3.5.13/trinity-extras/trinity-kdeadmin/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdeadmin/PKGBUILD
index b6330d622..a06f0f493 100644
--- a/arch/3.5.13/trinity-extras/trinity-kdeadmin/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdeadmin/PKGBUILD
@@ -15,7 +15,7 @@ provides=($pkgname)
 conflicts=()
 replaces=()
 options=('libtool' '!strip')
-#source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdeadmin-3.5.13.tar.gz)
+source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdeadmin-3.5.13.tar.gz)
 source=(http://anduin.linuxfromscratch.org/sources/trinity/kdeadmin-3.5.13.tar.gz)
 md5sums=('b8bbabf353070a3e730464e0ce2960e2')
 
diff --git a/arch/3.5.13/trinity-extras/trinity-kdeartwork/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdeartwork/PKGBUILD
index e6af9b295..8006e28a1 100644
--- a/arch/3.5.13/trinity-extras/trinity-kdeartwork/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdeartwork/PKGBUILD
@@ -12,7 +12,7 @@ pkgdesc="Trinity artwork collection"
 depends=('trinity-kdebase' 'trinity-arts' 'xscreensaver' 'libart-lgpl' 'glproto')
 makedepends=('pkgconfig' 'cmake' 'imake')
 options=('libtool' '!strip')
-#source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdeartwork-3.5.13.tar.gz)
+source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdeartwork-3.5.13.tar.gz)
 source=(http://anduin.linuxfromscratch.org/sources/trinity/kdeartwork-3.5.13.tar.gz)
 md5sums=('24f85eb3e5a9106de48a3e81d2575ffe')
 
diff --git a/arch/3.5.13/trinity-extras/trinity-kdeedu/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdeedu/PKGBUILD
index c88bb8fa6..ba41f58d1 100644
--- a/arch/3.5.13/trinity-extras/trinity-kdeedu/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdeedu/PKGBUILD
@@ -15,7 +15,7 @@ provides=($pkgname)
 conflicts=()
 replaces=()
 options=('libtool' '!strip')
-#source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdeedu-3.5.13.tar.gz)
+source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdeedu-3.5.13.tar.gz)
 source=(http://anduin.linuxfromscratch.org/sources/trinity/kdeedu-3.5.13.tar.gz)
 md5sums=('37a14a67c4d00babc3015c6a31698cb0')
 
diff --git a/arch/3.5.13/trinity-extras/trinity-kdegames/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdegames/PKGBUILD
index 66a3a1184..e25dc7781 100644
--- a/arch/3.5.13/trinity-extras/trinity-kdegames/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdegames/PKGBUILD
@@ -10,12 +10,8 @@ groups=('trinity-extras')
 pkgdesc="Trinity games collection"
 depends=('trinity-kdelibs')
 makedepends=('pkgconfig' 'autoconf' 'automake')
-optdepends=()
-provides=($pkgname)
-conflicts=()
-replaces=()
 options=('libtool' '!strip')
-#source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdegames-3.5.13.tar.gz)
+source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdegames-3.5.13.tar.gz)
 source=(http://anduin.linuxfromscratch.org/sources/trinity/kdegames-3.5.13.tar.gz)
 md5sums=('6c63e161050939f53921bfceb923a19e')
 
diff --git a/arch/3.5.13/trinity-extras/trinity-kdegraphics/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdegraphics/PKGBUILD
index 2d061e968..362912390 100644
--- a/arch/3.5.13/trinity-extras/trinity-kdegraphics/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdegraphics/PKGBUILD
@@ -16,7 +16,7 @@ provides=('trinity-kdegraphics')
 conflicts=('trinity-kdegraphics')
 replaces=('trinity-kdegraphics')
 options=('libtool' '!strip')
-#source=('GSmartPointer.h.patch' 'http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdegraphics-3.5.13.tar.gz')
+source=('GSmartPointer.h.patch' 'http://mirror.ets.kth.se/trinity/releases/3.5.13/kdegraphics-3.5.13.tar.gz')
 source=('GSmartPointer.h.patch' 'http://anduin.linuxfromscratch.org/sources/trinity/kdegraphics-3.5.13.tar.gz')
 md5sums=('7b93c9bdf1208df453c9838519fab109' 'a75c254cd1060343cd04c6744bce6798')
 
diff --git a/arch/3.5.13/trinity-extras/trinity-kdemultimedia/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdemultimedia/PKGBUILD
index 2f48ed7e6..4c94c9af9 100644
--- a/arch/3.5.13/trinity-extras/trinity-kdemultimedia/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdemultimedia/PKGBUILD
@@ -15,7 +15,7 @@ provides=($pkgname)
 conflicts=()
 replaces=()
 options=('libtool' '!strip')
-#source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdemultimedia-3.5.13.tar.gz)
+source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdemultimedia-3.5.13.tar.gz)
 source=(http://anduin.linuxfromscratch.org/sources/trinity/kdemultimedia-3.5.13.tar.gz)
 md5sums=('6d906b8a8fd0928e01ecd600175381c0')
 
diff --git a/arch/3.5.13/trinity-extras/trinity-kdenetwork/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdenetwork/PKGBUILD
index 846c77ba0..d7265d8d9 100644
--- a/arch/3.5.13/trinity-extras/trinity-kdenetwork/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdenetwork/PKGBUILD
@@ -20,7 +20,7 @@ depends=('trinity-kdebase'
          'v4l-utils')
 makedepends=('pkgconfig' 'cmake' 'imake')
 options=('libtool' '!strip')
-#source=('http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdenetwork-3.5.13.tar.gz' 'kdenetwork.patch')
+source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdenetwork-3.5.13.tar.gz' 'kdenetwork.patch')
 source=('http://anduin.linuxfromscratch.org/sources/trinity/kdenetwork-3.5.13.tar.gz' 'kdenetwork.patch')
 md5sums=('349f197c9af4bf0d9b8773f26829415e'
          '8abe1847df7b7449027719238a27e359')
diff --git a/arch/3.5.13/trinity-extras/trinity-kdepim/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdepim/PKGBUILD
index ee5028ca4..47fb6f17e 100644
--- a/arch/3.5.13/trinity-extras/trinity-kdepim/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdepim/PKGBUILD
@@ -22,7 +22,7 @@ provides=('trinity-kdepim')
 conflicts=('trinity-kdepim')
 replaces=('trinity-kdepim')
 options=('libtool' '!strip')
-#source=('http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdepim-3.5.13.tar.gz')
+source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdepim-3.5.13.tar.gz')
 source=('http://anduin.linuxfromscratch.org/sources/trinity/kdepim-3.5.13.tar.gz')
 md5sums=('4488062d5400bdd99642fe0b72ebcf9a')
 
diff --git a/arch/3.5.13/trinity-extras/trinity-kdesdk/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdesdk/PKGBUILD
index d47464764..03b45de57 100644
--- a/arch/3.5.13/trinity-extras/trinity-kdesdk/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdesdk/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="Trinity Software Developement Kit"
 depends=('trinity-kdebase')
 makedepends=('pkgconfig' 'cmake' 'imake')
 options=('libtool' '!strip')
-#source=('http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdesdk-3.5.13.tar.gz' 'kdesdk.patch')
+source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdesdk-3.5.13.tar.gz' 'kdesdk.patch')
 source=('http://anduin.linuxfromscratch.org/sources/trinity/kdesdk-3.5.13.tar.gz' 'kdesdk.patch')
 md5sums=('130662f683be1a49d56a713c5ae87e46'
          'a1d0b533ae427847bd84e601c587f882')
diff --git a/arch/3.5.13/trinity-extras/trinity-kdetoys/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdetoys/PKGBUILD
index 63c39c42e..a84e77c1d 100644
--- a/arch/3.5.13/trinity-extras/trinity-kdetoys/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdetoys/PKGBUILD
@@ -15,7 +15,7 @@ provides=($pkgname)
 conflicts=()
 replaces=()
 options=('libtool' '!strip')
-#source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdetoys-3.5.13.tar.gz)
+source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdetoys-3.5.13.tar.gz)
 source=(http://anduin.linuxfromscratch.org/sources/trinity/kdetoys-3.5.13.tar.gz)
 md5sums=('823dd778c1e9e15972a509f4eee4434d')
 
diff --git a/arch/3.5.13/trinity-extras/trinity-kdeutils/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdeutils/PKGBUILD
index fd2e089f9..3cffc8e2e 100644
--- a/arch/3.5.13/trinity-extras/trinity-kdeutils/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdeutils/PKGBUILD
@@ -15,7 +15,7 @@ provides=($pkgname)
 conflicts=()
 replaces=()
 options=('libtool' '!strip')
-#source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdeutils-3.5.13.tar.gz)
+source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdeutils-3.5.13.tar.gz)
 source=(http://anduin.linuxfromscratch.org/sources/trinity/kdeutils-3.5.13.tar.gz)
 md5sums=('e2cd6695606c5c91b3380dcc7f1a6a83')
 
diff --git a/arch/3.5.13/trinity-extras/trinity-kdevelop/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdevelop/PKGBUILD
index 9b2ad0e28..e1b5520ef 100644
--- a/arch/3.5.13/trinity-extras/trinity-kdevelop/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdevelop/PKGBUILD
@@ -12,7 +12,7 @@ depends=('trinity-kdebase')
 #         'xorg'
 makedepends=('pkgconfig' 'cmake' 'imake')
 options=('libtool' '!strip')
-#source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdevelop-3.5.13.tar.gz)
+source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/kdevelop-3.5.13.tar.gz)
 source=(http://anduin.linuxfromscratch.org/sources/trinity/kdevelop-3.5.13.tar.gz)
 md5sums=('777bd77e4f2dc6a5b5b45a370dcf6da0')
 _svnmod=kdevelop
diff --git a/arch/3.5.13/trinity-extras/trinity-kdewebdev/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-kdewebdev/PKGBUILD
index aaaecb140..08276cd4f 100644
--- a/arch/3.5.13/trinity-extras/trinity-kdewebdev/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-kdewebdev/PKGBUILD
@@ -11,7 +11,7 @@ pkgdesc="Trinity Web development tools"
 depends=('trinity-kdebase')
 makedepends=('pkgconfig' 'cmake' 'imake')
 options=('libtool' '!strip')
-#source=('http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/kdewebdev-3.5.13.tar.gz' 'kdewebdev.patch')
+source=('http://mirror.ets.kth.se/trinity/releases/3.5.13/kdewebdev-3.5.13.tar.gz' 'kdewebdev.patch')
 source=('http://anduin.linuxfromscratch.org/sources/trinity/kdewebdev-3.5.13.tar.gz' 'kdewebdev.patch')
 md5sums=('4f56a6c4b5916615ca3615f8e8f868c6'
          '5ef6636db45e35d6dcda35332bdca931')
diff --git a/arch/3.5.13/trinity-extras/trinity-libkdcraw/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-libkdcraw/PKGBUILD
index 96d7e531b..c40895468 100644
--- a/arch/3.5.13/trinity-extras/trinity-libkdcraw/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-libkdcraw/PKGBUILD
@@ -15,7 +15,7 @@ provides=($pkgname)
 conflicts=()
 replaces=()
 options=('libtool' '!strip')
-source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/libraries/libkdcraw-3.5.13.tar.gz)
+source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/libraries/libkdcraw-3.5.13.tar.gz)
 md5sums=('770dd734dc427337a1a2e61b6b0874ae')
 
 _builddir=libraries/libkdcraw
diff --git a/arch/3.5.13/trinity-extras/trinity-libkexiv2/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-libkexiv2/PKGBUILD
index 5af441ec6..cc27f6430 100644
--- a/arch/3.5.13/trinity-extras/trinity-libkexiv2/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-libkexiv2/PKGBUILD
@@ -15,7 +15,7 @@ provides=($pkgname)
 conflicts=()
 replaces=()
 options=('libtool' '!strip')
-source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/libraries/libkexiv2-3.5.13.tar.gz)
+source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/libraries/libkexiv2-3.5.13.tar.gz)
 md5sums=('74b160da8ea95f25048757b5fe692f85')
 
 _builddir=libraries/libkexiv2
diff --git a/arch/3.5.13/trinity-extras/trinity-libkipi/PKGBUILD b/arch/3.5.13/trinity-extras/trinity-libkipi/PKGBUILD
index 8c367b699..4ef6aecc8 100644
--- a/arch/3.5.13/trinity-extras/trinity-libkipi/PKGBUILD
+++ b/arch/3.5.13/trinity-extras/trinity-libkipi/PKGBUILD
@@ -15,7 +15,7 @@ provides=($pkgname)
 conflicts=()
 replaces=()
 options=('libtool' '!strip')
-source=(http://mirror.its.uidaho.edu/pub/trinity/releases/3.5.13/libraries/libkipi-3.5.13.tar.gz)
+source=(http://mirror.ets.kth.se/trinity/releases/3.5.13/libraries/libkipi-3.5.13.tar.gz)
 md5sums=('22cb0ba7507cac99140cd1c0180cbe99')
 
 _builddir=libraries/libkipi