9 files changed, 61 insertions, 49 deletions
diff --git a/source/kdei/kde-l10n/kde-l10n.SlackBuild b/source/kdei/kde-l10n/kde-l10n.SlackBuild
index 04670e758..1c87ce70b 100755
--- a/source/kdei/kde-l10n/kde-l10n.SlackBuild
+++ b/source/kdei/kde-l10n/kde-l10n.SlackBuild
@@ -1,7 +1,7 @@
 #!/bin/sh
 
 # Copyright 2008  Robby Workman  Northport, AL, USA
-# Copyright 2009, 2010, 2011  Patrick J. Volkerding, Sebeka, MN, USA
+# Copyright 2009, 2010, 2011, 2012  Patrick J. Volkerding, Sebeka, MN, USA
 # All rights reserved.
 #
 # Redistribution and use of this script, with or without modification, is
@@ -30,14 +30,14 @@
 # language packs.
 
 if [ ! -r ./languages ]; then
-  for file in kde-l10n*bz2 ; do
+  for file in kde-l10n*xz ; do
     echo $file | cut -f 3 -d - >> ./languages
   done
 fi
 
-[ -z $VERSION ] && export VERSION=4.5.5
+[ -z $VERSION ] && export VERSION=4.8.5
 [ -z $ARCH ] && export ARCH=noarch
-[ -z $BUILD ] && export BUILD=3
+[ -z $BUILD ] && export BUILD=1
 
 # Use this as CFLAGS and CXXFLAGS:
 if [ -z "$SLKCFLAGS" ]; then
@@ -47,6 +47,8 @@ if [ -z "$SLKCFLAGS" ]; then
     export SLKCFLAGS="-O2"
   elif [ "$ARCH" = "x86_64" ]; then
     export SLKCFLAGS="-O2 -fPIC"
+  elif [ "$ARCH" = "armv7hl" ]; then
+    export SLKCFLAGS="-O2 -march=armv7-a -mfpu=vfpv3-d16"
   else
     export SLKCFLAGS="-O2"
   fi
@@ -63,8 +65,8 @@ TMP=${TMP:-/tmp}
 
 # This function will insert missing kdepim translations from kde-l10n-4.4.5:
 insert_kdepim() {
-  if [ -r $CWD/kdepim-l10n/kdepim-l10n-$(echo $PKGNAM | cut -f 3 -d -)-4.4.5.tar.bz2 ]; then
-    tar xvf $CWD/kdepim-l10n/kdepim-l10n-$(echo $PKGNAM | cut -f 3 -d -)-4.4.5.tar.bz2
+  if [ -r $CWD/kdepim-l10n/kdepim-l10n-$(echo $PKGNAM | cut -f 3 -d -)-4.4.5.tar.xz ]; then
+    tar xvf $CWD/kdepim-l10n/kdepim-l10n-$(echo $PKGNAM | cut -f 3 -d -)-4.4.5.tar.xz
   fi
   for dir in $(find . -type d -name messages) $(find . -type d -name docs) ; do
     ( cd $dir
@@ -95,7 +97,7 @@ rm -rf $PKG
 mkdir -p $TMP $PKG
 cd $TMP
 rm -rf $PKGNAM-$VERSION 
-tar xvf $CWD/$PKGNAM-$VERSION.tar.bz2 || exit 1
+tar xvf $CWD/$PKGNAM-$VERSION.tar.xz || exit 1
 cd $PKGNAM-$VERSION || exit 1
 insert_kdepim;
 chown -R root:root .
diff --git a/source/kdei/kde-l10n/kdepim-l10n/extract-kdepim-goodness.sh b/source/kdei/kde-l10n/kdepim-l10n/extract-kdepim-goodness.sh
index 6d39e755b..1c9162782 100755..100644
--- a/source/kdei/kde-l10n/kdepim-l10n/extract-kdepim-goodness.sh
+++ b/source/kdei/kde-l10n/kdepim-l10n/extract-kdepim-goodness.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# This script was used to extract the kdepim part from the last kde-l10n
+# This script was used to extract the kdepim parts from the last kde-l10n
 # release that contained them.  The resulting kdepim-l10n sources will be
 # merged into our language packages.
 
diff --git a/source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-fr-4.4.5.korganizer.docbook.reorganize.diff b/source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-fr-4.4.5.korganizer.docbook.reorganize.diff
deleted file mode 100644
index df6184ab3..000000000
--- a/source/kdei/kde-l10n/kdepim-l10n/kdepim-l10n-fr-4.4.5.korganizer.docbook.reorganize.diff
+++ /dev/null
@@ -1,34 +0,0 @@
---- ./docs/kdepim/korganizer/index.docbook.orig	2011-01-19 10:56:02.410999994 -0600
-+++ ./docs/kdepim/korganizer/index.docbook	2011-01-19 12:40:25.712999555 -0600
-@@ -108,6 +108,15 @@
- <releaseinfo
- >2.20.00</releaseinfo>
- 
-+<abstract
-+><para
-+>&korganizer; est un agenda personnel facile à utiliser (un <acronym
-+>PIM</acronym
-+>, acronyme anglais de <foreignphrase
-+>personal information manager</foreignphrase
-+>). Vous pouvez planifier des rendez-vous, des événements et des tâches à effectuer. &korganizer; vous remémorera les tâches en instances et vous aidera à respecter votre emploi du temps. </para
-+></abstract>
-+
- <keywordset>
- <keyword
- >KDE</keyword>
-@@ -127,15 +136,6 @@
- >rendez-vous</keyword>
- </keywordset>
- 
--<abstract
--><para
-->&korganizer; est un agenda personnel facile à utiliser (un <acronym
-->PIM</acronym
-->, acronyme anglais de <foreignphrase
-->personal information manager</foreignphrase
-->). Vous pouvez planifier des rendez-vous, des événements et des tâches à effectuer. &korganizer; vous remémorera les tâches en instances et vous aidera à respecter votre emploi du temps. </para
--></abstract>
--
- </bookinfo>
- 
- <chapter id="introduction">
diff --git a/source/kdei/kde-l10n/languages b/source/kdei/kde-l10n/languages
index a46f4cedc..8fe9df5d4 100644
--- a/source/kdei/kde-l10n/languages
+++ b/source/kdei/kde-l10n/languages
@@ -1,5 +1,6 @@
 ar
 bg
+bs
 ca
 ca@valencia
 cs
@@ -7,18 +8,15 @@ da
 de
 el
 en_GB
-eo
 es
 et
 eu
+fa
 fi
 fr
-fy
 ga
 gl
-gu
 he
-hi
 hr
 hu
 ia
@@ -28,11 +26,9 @@ it
 ja
 kk
 km
-kn
 ko
 lt
 lv
-ml
 nb
 nds
 nl
@@ -43,13 +39,17 @@ pt
 pt_BR
 ro
 ru
+si
 sk
 sl
 sr
 sv
+tg
 th
 tr
+ug
 uk
+vi
 wa
 zh_CN
 zh_TW
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-bs b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-bs
new file mode 100644
index 000000000..04f60af1a
--- /dev/null
+++ b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-bs
@@ -0,0 +1,11 @@
+kde-l10n-bs: kde-l10n-bs
+kde-l10n-bs:
+kde-l10n-bs: Bosnian language support for KDE.
+kde-l10n-bs:
+kde-l10n-bs:
+kde-l10n-bs:
+kde-l10n-bs:
+kde-l10n-bs:
+kde-l10n-bs:
+kde-l10n-bs:
+kde-l10n-bs:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ca@valencia b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ca@valencia
index 0f1a95772..f8ecb792e 100644
--- a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ca@valencia
+++ b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ca@valencia
@@ -1,4 +1,4 @@
-kde-l10n-ca: kde-l10n-ca@valencia
+kde-l10n-ca@valencia: kde-l10n-ca@valencia
 kde-l10n-ca@valencia:
 kde-l10n-ca@valencia: Catalan (Valencian) language support for KDE.
 kde-l10n-ca@valencia:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-fa b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-fa
new file mode 100644
index 000000000..28fd97993
--- /dev/null
+++ b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-fa
@@ -0,0 +1,11 @@
+kde-l10n-fa: kde-l10n-fa
+kde-l10n-fa:
+kde-l10n-fa: Farsi language support for KDE.
+kde-l10n-fa:
+kde-l10n-fa:
+kde-l10n-fa:
+kde-l10n-fa:
+kde-l10n-fa:
+kde-l10n-fa:
+kde-l10n-fa:
+kde-l10n-fa:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ug b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ug
new file mode 100644
index 000000000..d7d8234ec
--- /dev/null
+++ b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-ug
@@ -0,0 +1,11 @@
+kde-l10n-ug: kde-l10n-ug
+kde-l10n-ug:
+kde-l10n-ug: Uyghur language support for KDE.
+kde-l10n-ug:
+kde-l10n-ug:
+kde-l10n-ug:
+kde-l10n-ug:
+kde-l10n-ug:
+kde-l10n-ug:
+kde-l10n-ug:
+kde-l10n-ug:
diff --git a/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-vi b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-vi
new file mode 100644
index 000000000..ee4a6d544
--- /dev/null
+++ b/source/kdei/kde-l10n/slack-desc/slack-desc.kde-l10n-vi
@@ -0,0 +1,11 @@
+kde-l10n-vi: kde-l10n-vi
+kde-l10n-vi:
+kde-l10n-vi: Vietnamese language support for KDE.
+kde-l10n-vi:
+kde-l10n-vi:
+kde-l10n-vi:
+kde-l10n-vi:
+kde-l10n-vi:
+kde-l10n-vi:
+kde-l10n-vi:
+kde-l10n-vi: