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

Conflicts:
	community/nbd/PKGBUILD
	kde-unstable/kdeplasma-addons/PKGBUILD
	kde-unstable/libkcompactdisc/PKGBUILD

7 files changed, 55 insertions, 30 deletions

diff --git a/community/converseen/PKGBUILD b/community/converseen/PKGBUILD
index e1dfd351c..7b44ecc55 100644
--- a/community/converseen/PKGBUILD
+++ b/community/converseen/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 63386 2012-02-01 00:49:48Z giovanni $
+# $Id: PKGBUILD 72015 2012-06-05 17:23:40Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: archtux <antonio.arias99999 at gmail.com>
 
 pkgname=converseen
-pkgver=0.4.9
+pkgver=0.5
 pkgrel=1
 pkgdesc="The batch image converter and resizer"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('imagemagick' 'qt' 'libwmf' 'openexr')
 makedepends=('cmake')
 install=converseen.install
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('81e6a717a020266f161d33980110a4f1')
+md5sums=('b1ed24de45456a76dac0e3bcbea0033f')
 
 build() {
   cd "${srcdir}"
diff --git a/community/dmd/PKGBUILD b/community/dmd/PKGBUILD
index 9eab4e27a..840f9311c 100644
--- a/community/dmd/PKGBUILD
+++ b/community/dmd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 69334 2012-04-14 03:33:13Z svenstaro $
+# $Id: PKGBUILD 72013 2012-06-05 15:38:07Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Chris Brannon <cmbrannon79@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
@@ -8,8 +8,7 @@
 pkgname=('dmd' 'libphobos')
 pkgbase=dmd
 pkgver=2.059
-pkgrel=1
-pkgdesc="The Digital Mars D compiler"
+pkgrel=3
 arch=('i686' 'x86_64')
 url="http://www.digitalmars.com/d/2.0/"
 source=(http://ftp.digitalmars.com/$pkgname.$pkgver.zip
@@ -39,12 +38,15 @@ build() {
 }
 
 package_dmd() {
+  pkgdesc="The Digital Mars D compiler"
+  backup=('etc/dmd.conf')
   depends=('libphobos' 'gcc-libs')
 
   install -Dm755 $srcdir/dmd2/src/dmd/dmd $pkgdir/usr/bin/dmd
 
   mkdir -p $pkgdir/etc
-  echo -e "[Environment]\nDFLAGS=-I/usr/include/d -I/usr/include/d/druntime/import -L-L/usr/lib -L-lrt" > $pkgdir/etc/dmd.conf
+  echo -e "[Environment]\nDFLAGS=-I/usr/include/d -I/usr/include/d/druntime/import -L-L/usr/lib -L-L/usr/lib32 -L--no-warn-search-mismatch -L--export-dynamic" > $pkgdir/etc/dmd.conf
+
 
   install -Dm644 $srcdir/dmd2/man/man1/dmd.1 $pkgdir/usr/share/man/man1/dmd.1
   install -Dm644 $srcdir/dmd2/man/man1/rdmd.1 $pkgdir/usr/share/man/man1/rdmd.1
@@ -67,6 +69,7 @@ package_dmd() {
 }
 
 package_libphobos() {
+  pkgdesc="The phobos D standard library for DMD"
   install -Dm644 $srcdir/dmd2/src/druntime/lib/libdruntime-linux${_archbits}.a $pkgdir/usr/lib/libdruntime.a
   install -Dm644 $srcdir/dmd2/src/phobos/generated/linux/release/$_archbits/libphobos2.a $pkgdir/usr/lib/libphobos2.a
 
diff --git a/community/lxinput/PKGBUILD b/community/lxinput/PKGBUILD
new file mode 100644
index 000000000..7ed91636f
--- /dev/null
+++ b/community/lxinput/PKGBUILD
@@ -0,0 +1,28 @@
+# $Id: PKGBUILD 72002 2012-06-05 13:35:16Z bpiotrowski $
+# Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
+# Contributor: Filipp "Scorp" Andjelo <scorp@mailueberfall.de>
+
+pkgname=lxinput
+pkgver=0.3.2
+pkgrel=2
+pkgdesc="A small program to configure keyboard and mouse for LXDE."
+arch=('i686' 'x86_64')
+url="http://lxde.org/"
+license=('GPL')
+groups=('lxde')
+depends=('gtk2>=2.12.0')
+makedepends=('pkgconfig' 'intltool')
+source=(http://downloads.sourceforge.net/sourceforge/lxde/${pkgname}-${pkgver}.tar.gz)
+md5sums=('5bf563d04984ef2a147433f3bdda687b')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+}
+
diff --git a/community/nbd/PKGBUILD b/community/nbd/PKGBUILD
index 1ee6a35e6..3cd23e4d8 100644
--- a/community/nbd/PKGBUILD
+++ b/community/nbd/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 69320 2012-04-13 16:10:58Z svenstaro $
+# $Id: PKGBUILD 72000 2012-06-05 13:31:36Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Christian Hesse <mail@eworm.de>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Gerhard Brauer <gerbra@archlinux.de>
 
 pkgname=nbd
-pkgver=3.0
-pkgrel=2
-pkgdesc="Tools for network block devices, allowing you to use remote block devices over TCP/IP."
+pkgver=3.1.1
+pkgrel=1
+pkgdesc="tools for network block devices, allowing you to use remote block devices over TCP/IP"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://nbd.sourceforge.net"
 license=('GPL')
@@ -16,7 +16,7 @@ source=(http://downloads.sourceforge.net/$pkgname/$pkgname-$pkgver.tar.bz2
 backup=('etc/nbd-server/config')
 depends=('glib2')
 install=nbd.install
-md5sums=('81f549155267536ad30851eb50ee8d1c'
+md5sums=('e0e9d96abe068ee4f6fecd58635450ac'
          '2d05d426b8c2708d5f8a0d028fcbae05'
          'e7b13a8b3369e11927d9917664557efa')
 
diff --git a/community/scite/PKGBUILD b/community/scite/PKGBUILD
index 3cf3c638e..e21b69923 100644
--- a/community/scite/PKGBUILD
+++ b/community/scite/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 70700 2012-05-15 08:39:01Z arodseth $
+# $Id: PKGBUILD 72018 2012-06-05 20:13:19Z 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.1.0
+pkgver=3.2.0
 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=('09b020a331f7c54edd731440fa1c717776021d5dc775e58965f8ef71673202e3')
+sha256sums=('2734a61acd823831e870b6ce04a39f6d163e83f93096044c66ff36be5bbcdf2e')
 
 build() {
   cd "$srcdir"
@@ -26,14 +26,11 @@ build() {
     sed '0,/CXXTFLAGS=/s//nop=/' -i scite/gtk/makefile
     setconf scite/gtk/makefile CXXTFLAGS "-DNDEBUG ${CXXFLAGS} $(CXXBASEFLAGS)"
   fi
-
   sed '0,/CXXFLAGS=/s//nop=/' -i scintilla/gtk/makefile
   setconf scintilla/gtk/makefile CXXFLAGS "-DNDEBUG ${CXXFLAGS} \$(CXXBASEFLAGS) \$(THREADFLAGS)"
   setconf scintilla/gtk/makefile CXXBASEFLAGS "-Wall -Wno-missing-braces -Wno-char-subscripts -pedantic ${CXXFLAGS} -DGTK -DSCI_LEXER \$(INCLUDEDIRS)"
-
   cd "$srcdir/scintilla/gtk"
   make
-
   cd "$srcdir/$pkgname/gtk"
   make
 }
@@ -42,12 +39,10 @@ package() {
   cd "$srcdir/$pkgname/gtk"
 
   make DESTDIR="$pkgdir" install
-
   install -Dm644 "$srcdir/$pkgname/License.txt" \
     "$pkgdir/usr/share/licenses/$pkgname/LICENSE-scite"
   install -Dm644 "$srcdir/scintilla/License.txt" \
     "$pkgdir/usr/share/licenses/$pkgname/LICENSE-scintilla"
-
   ln -sf SciTE "$pkgdir/usr/bin/scite"
 }
 
diff --git a/community/scite/scite.install b/community/scite/scite.install
index 686b22022..ad97d7bab 100644
--- a/community/scite/scite.install
+++ b/community/scite/scite.install
@@ -1,13 +1,13 @@
-post_install() {
+post_upgrade() {
   update-desktop-database -q
 }
 
-post_upgrade() {
-  post_install $1
+post_install() {
+  post_upgrade
 }
 
 post_remove() {
-  post_install $1
+  post_upgrade
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/tightvnc/PKGBUILD b/community/tightvnc/PKGBUILD
index 910446431..9d680a1ae 100644
--- a/community/tightvnc/PKGBUILD
+++ b/community/tightvnc/PKGBUILD
@@ -1,34 +1,33 @@
-# $Id: PKGBUILD 67960 2012-03-16 12:47:31Z arodseth $
+# $Id: PKGBUILD 72020 2012-06-05 20:37:51Z arodseth $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Paul Mattal <paul@archlinux.org>
+# Contributor: Andrew Hills <hills.as@gmail.com>
 
 pkgname=tightvnc
 pkgver=1.3.10
-pkgrel=7
+pkgrel=8
 pkgdesc="VNC Unix server && viewer"
 arch=('i686' 'x86_64')
 license=('GPL')
 url="http://www.tightvnc.com"
 depends=('libjpeg' 'zlib' 'libxaw' 'libxp' 'xorg-xauth' 'perl')
 makedepends=('imake' 'setconf')
-conflicts=('vnc')
 options=('!makeflags')
 source=("http://downloads.sf.net/sourceforge/vnc-tight/$pkgname-${pkgver}_unixsrc.tar.bz2"
-	'http://people.csail.mit.edu/jaffer/Color/rgb.txt')
+        'http://people.csail.mit.edu/jaffer/Color/rgb.txt')
 sha256sums=('f48c70fea08d03744ae18df6b1499976362f16934eda3275cead87baad585c0d'
             'af6c056a95ae725f98534db22b9a4916d17f2356fdca84a4a038211a82fa8a73')
 
 build() {
   cd $srcdir/vnc_unixsrc
 
-  setconf tightvncserver.conf '$colorPath' \"/usr/share/tightvnc\"\;
-  setconf vncserver '$colorPath' \"/usr/share/tightvnc\"\;
   setconf vncserver '$vncClasses' \"/usr/share/tightvnc\"\;
   setconf vncserver '$fontPath' \"/usr/share/fonts/misc/,/usr/share/fonts/75dpi/,/usr/share/fonts/100dpi/,/usr/share/fonts/Type1/\"\;
   xmkmf
   make World
   cd Xvnc
   ./configure
+  setconf programs/Xserver/dix/Makefile DEFAULTRGBDATABASE '/usr/share/tightvnc/rgb'
   setconf programs/Xserver/os/Makefile PROTO_DEFINES "-D_XOPEN_SOURCE=500L"
   setconf lib/font/fc/Makefile PROTO_DEFINES "-D_XOPEN_SOURCE=500L"
   make