Merge branch 'master' of ssh://parabolagnulinux.org:1863/home/parabola/abslibre-pre-mips64el

Conflicts:
	community/pawm/PKGBUILD
	extra/kdesdk/PKGBUILD

12 files changed, 53 insertions, 75 deletions

diff --git a/community/darkstat/PKGBUILD b/community/darkstat/PKGBUILD
index 2a9147aac..4e74b69b1 100644
--- a/community/darkstat/PKGBUILD
+++ b/community/darkstat/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 78624 2012-10-22 09:39:51Z spupykin $
+# $Id: PKGBUILD 78863 2012-10-26 09:24:08Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=darkstat
 pkgver=3.0.715
-pkgrel=5
+pkgrel=6
 pkgdesc="Network statistics gatherer (packet sniffer)"
 url="http://dmr.ath.cx/net/darkstat/"
 license=("GPL")
diff --git a/community/darkstat/darkstat.install b/community/darkstat/darkstat.install
index a8e6826ca..246bfd808 100644
--- a/community/darkstat/darkstat.install
+++ b/community/darkstat/darkstat.install
@@ -8,7 +8,7 @@ post_install() {
   fi
   useradd \
     --system \
-    --home "$daemon_chroot" \
+    --home /"$daemon_chroot" \
     --shell /bin/false \
     --no-user-group \
     --gid nobody "$daemon_name"
diff --git a/community/iasl/PKGBUILD b/community/iasl/PKGBUILD
index 865c7780d..a168569bc 100644
--- a/community/iasl/PKGBUILD
+++ b/community/iasl/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 75633 2012-08-27 20:02:12Z lcarlier $
+# $Id: PKGBUILD 78869 2012-10-26 09:53:06Z lcarlier $
 # Maintainer : Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Alessio 'mOlOk' Bolognino <themolok@gmail.com>
 
 pkgname=iasl
-pkgver=20120816
+pkgver=20121018
 pkgrel=1
 pkgdesc="Intel ACPI Source Language compiler"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,10 +13,10 @@ license=('custom')
 depends=('glibc')
 makedepends=('flex' 'bison')
 options=('!makeflags')
-install=iasl.install
+#install=iasl.install
 source=(http://acpica.org/download/acpica-unix-${pkgver}.tar.gz
 	LICENSE)
-md5sums=('eae80f528320717357b3cb5368ba580b'
+md5sums=('07b8137a6870e3dad862e5752c87de75'
          '8615526144f69ea4e870d9bc37df9b29')
 
 build() {
diff --git a/community/mcelog/PKGBUILD b/community/mcelog/PKGBUILD
index 9d60906c3..6de98e94e 100644
--- a/community/mcelog/PKGBUILD
+++ b/community/mcelog/PKGBUILD
@@ -1,23 +1,24 @@
-# $Id: PKGBUILD 77126 2012-10-05 11:04:13Z spupykin $
+# $Id: PKGBUILD 78891 2012-10-26 13:18:06Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Thomas Mudrunka <harvie@@email..cz>
 # Maintainer: Thomas Mudrunka <harvie@@email..cz>
 
 pkgname=mcelog
 pkgver=1.0pre3
-pkgrel=4
+pkgrel=5
 pkgdesc="Print machine check event log from x86-64 kernel"
 url="http://freshmeat.net/projects/mcelog/"
 license=("GPL")
 arch=('i686' 'x86_64' 'mips64el')
 options=('docs')
+backup=('etc/mcelog/mcelog.conf')
 #source=("ftp://ftp.kernel.org/pub/linux/utils/cpu/mce/${pkgname}-${pkgver}.tar.gz"
 source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.gz"
 	"${pkgname}.rc"
 	"mcelog.service")
 md5sums=('b42f2214de6f4feb992556149edc67fa'
          'f039a77d7bde3518d3d695b144816e8a'
-         '4e563f1124c09b3368532d37f9f4bba3')
+         'a8859012781f017624bbfe61c9d700bb')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/mcelog/mcelog.service b/community/mcelog/mcelog.service
index 62d8cbed0..c689bee77 100644
--- a/community/mcelog/mcelog.service
+++ b/community/mcelog/mcelog.service
@@ -2,15 +2,9 @@
 Description=Machine Check Exception Logging Daemon
 After=syslog.target
 
-# FIXME - due to upstream kernel bug always start the mcelog process
-# twice using the following ExecStartPre hack. This needs fixing.
-# There is a bug filed against systemd for the ExecStartPre bit
-# since it is not possible to specify that the ExecStarPre bit
-# is allowed and expected to fail without aborting the daemon.
-
 [Service]
-ExecStartPre=/etc/mcelog/mcelog.setup
-ExecStart=/usr/sbin/mcelog --ignorenodev --daemon --foreground
+PIDFile=/var/run/mcelog.pid
+ExecStart=/usr/sbin/mcelog --ignorenodev --daemon --foreground --pidfile /var/run/mcelog.pid
 StandardOutput=syslog
 
 [Install]
diff --git a/community/openmotif/PKGBUILD b/community/openmotif/PKGBUILD
index bc72582c1..a502f732d 100644
--- a/community/openmotif/PKGBUILD
+++ b/community/openmotif/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 75562 2012-08-27 08:58:52Z spupykin $
+# $Id: PKGBUILD 78895 2012-10-26 13:57:30Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Enrico Morelli <morelli@cerm.unifi.it>
 
 pkgname=openmotif
-pkgver=2.3.3
-pkgrel=2
+pkgver=2.3.4
+pkgrel=1
 pkgdesc="Open Motif"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.motifzone.org/"
@@ -13,34 +13,14 @@ depends=(libxext libxp libxft libxt libxmu libpng libjpeg)
 makedepends=(xbitmaps xproto printproto xextproto automake)
 conflicts=(lesstif)
 options=('!libtool')
-#source=(http://www.motifzone.org/files/public_downloads/openmotif/2.3/$pkgver/openmotif-$pkgver.tar.gz)
-source=(ftp://ftp.ics.com/openmotif/2.3/$pkgver/openmotif-$pkgver.tar.gz)
-md5sums=('fd27cd3369d6c7d5ef79eccba524f7be')
+source=("http://downloads.sourceforge.net/project/motif/Motif%20$pkgver%20Source%20Code/motif-$pkgver-src.tgz")
+md5sums=('612bb8127d0d31da6e5474edf8a5c247')
 
 build() {
-  _automakever=1.11
-
-  cd $srcdir/openmotif-$pkgver
-
-  sed -i 's|.*demos.*||g' Makefile.in Makefile.am
-  sed -i 's|doc \\|doc|g' Makefile.in Makefile.am
-  sed -i 's#if (!png_check_sig(sig, 8))#if (png_sig_cmp(sig, 0, 8))#' lib/Xm/Png.c
-
-  ln -s -f /usr/share/automake-${_automakever}/compile compile
-  ln -s -f /usr/share/libtool/config/config.guess config.guess
-  ln -s -f /usr/share/libtool/config/config.sub config.sub
-  ln -s -f /usr/share/automake-${_automakever}/depcomp depcomp
-  ln -s -f /usr/share/automake-${_automakever}/install-sh install-sh
-  ln -s -f /usr/share/automake-${_automakever}/missing missing
-  ln -s -f /usr/share/libtool/config/ltmain.sh ltmain.sh
-  touch NEWS AUTHORS
-
-  [ $NOEXTRACT -eq 1 ] || autoreconf -i
-  [ $CARCH == "x86_64" ] && export CFLAGS="$CFLAGS -fPIC"
-  [ $NOEXTRACT -eq 1 ] || ./configure --with-x --prefix=/usr
+  cd $srcdir/motif-$pkgver
+  export LDFLAGS="-lX11"
+  [ -x configure ] || ./autogen.sh --prefix=/usr
+  [ -f Makefile ] || ./configure --prefix=/usr
   make -j1
-
   make DESTDIR=$pkgdir install
-  # cleanup
-  (cd $pkgdir/usr/share/man/man3/ && mv Shell.3 OpenMotif-Shell.3)
 }
diff --git a/community/pawm/PKGBUILD b/community/pawm/PKGBUILD
index c2ba3afe9..dae4106da 100644
--- a/community/pawm/PKGBUILD
+++ b/community/pawm/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 66194 2012-02-23 02:43:04Z spupykin $
+# $Id: PKGBUILD 78889 2012-10-26 13:02:16Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=pawm
@@ -6,7 +6,8 @@ pkgver=2.3.0
 pkgrel=2
 pkgdesc="Puto Amo Window Manager is a full featured window manager, but without useless bells and whistles"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://www.pleyades.net/pawm/"
+#url="http://www.pleyades.net/pawm/"
+url="https://sites.google.com/site/pleyadestest/david/projects/pawm"
 license=("GPL")
 depends=('libxft' 'libxpm' 'libxrandr')
 makedepends=('cmake')
diff --git a/community/qtcreator/PKGBUILD b/community/qtcreator/PKGBUILD
index ebbbb7e76..8ea69e0df 100644
--- a/community/qtcreator/PKGBUILD
+++ b/community/qtcreator/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 74977 2012-08-10 23:21:48Z svenstaro $
+# $Id: PKGBUILD 78861 2012-10-26 04:03:40Z svenstaro $
 # Maintainer: Imanol Celaya <ornitorrincos@archlinux-es.org>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
@@ -7,9 +7,9 @@
 # Contributor: delor <bartekpiech gmail com>
 
 pkgname="qtcreator"
-pkgver=2.5.2
-_pkgver=2.5.2
-pkgrel=1
+pkgver=2.6.0rc
+_pkgver=2.6.0-rc
+pkgrel=2
 pkgdesc='Lightweight, cross-platform integrated development environment'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://qt.nokia.com/products/developer-tools'
@@ -26,17 +26,13 @@ optdepends=('qt-doc: for the integrated Qt documentation'
             'bzr: for bazaar support'
             'valgrind: for analyze support')
 install=qtcreator.install
-source=("http://get.qt.nokia.com/qtcreator/qt-creator-${_pkgver}-src.tar.gz"
-        'qtcreator.desktop'
-        'fix-glsl-shit.patch')
-md5sums=('4a9c09cdf4609753283c31451c84ceb8'
-         'f1f4680b9838ff0b8f4cf11eb850d662'
-         '7453f6aabe2d61754490a874a26c087b')
+source=("http://origin.releases.qt-project.org/qtcreator/${_pkgver}/qt-creator-${_pkgver}-src.tar.gz"
+        'qtcreator.desktop')
+md5sums=('df82e307dc9212fd69c1ee4e40501169'
+         '5aa242e0262fa22f75c3b59d3a4ec198')
 
 build() {
   cd ${srcdir}
-  
-  patch -Np1 -d $srcdir/qt-creator-$_pkgver-src < $srcdir/fix-glsl-shit.patch
 
   [[ -d build ]] && rm -r build
   mkdir build && cd build
@@ -50,8 +46,6 @@ package() {
 
   make INSTALL_ROOT="${pkgdir}/usr/" install
 
-  install -Dm644 ${srcdir}/qtcreator.desktop \
-    ${pkgdir}/usr/share/applications/qtcreator.desktop
-  install -Dm644 ${srcdir}/qt-creator-${_pkgver}-src/LGPL_EXCEPTION.TXT \
-    ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT
+  install -Dm644 ${srcdir}/qtcreator.desktop ${pkgdir}/usr/share/applications/qtcreator.desktop
+  install -Dm644 ${srcdir}/qt-creator-${_pkgver}-src/LGPL_EXCEPTION.TXT ${pkgdir}/usr/share/licenses/qtcreator/LGPL_EXCEPTION.TXT
 }
diff --git a/community/qtcreator/qtcreator.desktop b/community/qtcreator/qtcreator.desktop
index 0fd562bd9..1a507a156 100644
--- a/community/qtcreator/qtcreator.desktop
+++ b/community/qtcreator/qtcreator.desktop
@@ -1,10 +1,10 @@
 [Desktop Entry]
 Encoding=UTF-8
 Exec=/usr/bin/qtcreator
-Name=Qt-Creator
+Name=Qt Creator
 GenericName=C++ IDE
 X-KDE-StartupNotify=true
-Icon=/usr/share/icons/hicolor/128x128/apps/qtcreator.png
+Icon=/usr/share/icons/hicolor/512x512/apps/QtProject-qtcreator.png
 Terminal=false
 Type=Application
-Categories=Qt;Development
+Categories=Qt;Development;
diff --git a/community/scite/PKGBUILD b/community/scite/PKGBUILD
index 980e52cdc..4d3645b42 100644
--- a/community/scite/PKGBUILD
+++ b/community/scite/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 76433 2012-09-18 08:42:53Z arodseth $
+# $Id: PKGBUILD 78867 2012-10-26 09:46:22Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Thomas S Hatch <thatch45@gmail.com>
 # Contributor: Corrado 'bardo' Primier <corrado.primier@mail.polimi.it>
@@ -6,7 +6,7 @@
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=scite
-pkgver=3.2.2
+pkgver=3.2.3
 pkgrel=1
 pkgdesc='Editor with facilities for building and running programs'
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ makedepends=('setconf')
 backup=('usr/share/scite/SciTEGlobal.properties')
 install=$pkgname.install
 source=("http://downloads.sourceforge.net/sourceforge/scintilla/${pkgname}${pkgver//./}.tgz")
-sha256sums=('9f17fe2a5dc294bd1077bf64f713bb06733eec271bab770841e55474e6c781c8')
+sha256sums=('d0d324a5e420ff96db6cd1c6eeac23b6f4c046e7545e73c4625ab2add90e4a65')
 
 build() {
   cd "$srcdir"
diff --git a/community/tesseract/PKGBUILD b/community/tesseract/PKGBUILD
index 1ef985d0b..6b0fd6ffd 100644
--- a/community/tesseract/PKGBUILD
+++ b/community/tesseract/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 74642 2012-08-01 04:56:09Z spupykin $
+# $Id: PKGBUILD 78897 2012-10-26 13:58:28Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Andreas Hauser <andy-aur@splashground.de>
 
@@ -9,7 +9,7 @@ kor ell rus por bul lav lit pol dan-frak deu dan ces cat eng chi_tra chi_sim)
 pkgbase=tesseract
 pkgname=(tesseract $(for l in ${_langs[@]}; do echo tesseract-data-${l}; done))
 pkgver=3.01
-pkgrel=3
+pkgrel=5
 pkgdesc="An OCR programm"
 arch=(x86_64 i686 'mips64el')
 url="http://code.google.com/p/tesseract-ocr"
@@ -63,10 +63,11 @@ build() {
 }
 
 package_tesseract() {
-  cd $srcdir/$pkgname-$pkgver
+  install=tesseract.install
+  optdepends=($(for l in ${_langs[@]}; do echo tesseract-data-${l}; done))
 
+  cd $srcdir/$pkgname-$pkgver
   make DESTDIR=$pkgdir install
-
   mkdir -p $pkgdir/usr/share/tessdata
 }
 
diff --git a/community/tesseract/tesseract.install b/community/tesseract/tesseract.install
new file mode 100644
index 000000000..114b82821
--- /dev/null
+++ b/community/tesseract/tesseract.install
@@ -0,0 +1,7 @@
+post_install() {
+  echo "You must install one of tesseract-data-* packages or whole tesseract-data group"
+}
+
+post_upgrade() {
+  post_install
+}