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

Conflicts:
	community/erlang/PKGBUILD
	community/virtkey/PKGBUILD
	community/yaws/PKGBUILD
	core/openldap/PKGBUILD
	extra/avahi/PKGBUILD
	extra/gdb/PKGBUILD

15 files changed, 105 insertions, 62 deletions

diff --git a/extra/avahi/PKGBUILD b/extra/avahi/PKGBUILD
index c050e4fc5..a4f008413 100644
--- a/extra/avahi/PKGBUILD
+++ b/extra/avahi/PKGBUILD
@@ -1,17 +1,19 @@
-# $Id: PKGBUILD 166539 2012-09-10 04:37:24Z bisson $
+# $Id: PKGBUILD 172143 2012-11-30 03:01:06Z bisson $
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=avahi
 pkgver=0.6.31
-pkgrel=4
+pkgrel=5
 pkgdesc='Multicast/unicast DNS-SD framework'
 url='http://www.avahi.org/'
 license=('LGPL')
 arch=('i686' 'x86_64' 'mips64el')
 options=('!libtool' '!emptydirs')
-depends=('expat' 'libdaemon' 'glib2' 'dbus' 'libcap' 'gdbm')
-optdepends=('gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
+<<<<<<< HEAD
+depends=('expat' 'libdaemon' 'glib2' 'libcap' 'gdbm')
+optdepends=('dbus: communicating with client applications'
+            'gtk3: avahi-discover-standalone, bshell, bssh, bvnc'
             'gtk2: gtk2 bindings')
 [ "$CARCH" != "mips64el" ] && optdepends+=('qt3: qt3 bindings')
 optdepends+=('qt: qt bindings'
@@ -20,7 +22,7 @@ optdepends+=('qt: qt bindings'
 [ "$CARCH" != "mips64el" ] && optdepends+=('mono: mono bindings')
 optdepends+=('dbus-python: avahi-discover'
             'nss-mdns: NSS support for mDNS')
-makedepends=('qt' 'pygtk' 'intltool' 'dbus-python'
+makedepends=('qt' 'pygtk' 'intltool' 'python2-dbus'
              'gobject-introspection' 'gtk3' 'xmltoman')
 [ "$CARCH" != "mips64el" ] && makedepends+=('qt3' 'mono' 'gtk-sharp-2')
 backup=('etc/avahi/hosts'
diff --git a/extra/cmake/PKGBUILD b/extra/cmake/PKGBUILD
index e1959589d..08946e8b8 100644
--- a/extra/cmake/PKGBUILD
+++ b/extra/cmake/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 171295 2012-11-17 01:49:16Z allan $
+# $Id: PKGBUILD 172096 2012-11-28 07:27:35Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=cmake
-pkgver=2.8.10.1
-pkgrel=2
+pkgver=2.8.10.2
+pkgrel=1
 pkgdesc="A cross-platform open-source make system"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.cmake.org/"
@@ -14,7 +14,7 @@ makedepends=('qt' 'emacs')
 optdepends=('qt: cmake-gui')
 install="${pkgname}.install"
 source=("http://www.cmake.org/files/v2.8/${pkgname}-${pkgver}.tar.gz")
-md5sums=('aabf16d8e957f99921a0095885381373')
+md5sums=('097278785da7182ec0aea8769d06860c')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD
index ac276f76c..628294c3e 100644
--- a/extra/dovecot/PKGBUILD
+++ b/extra/dovecot/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 170236 2012-11-05 18:50:40Z andyrtr $
+# $Id: PKGBUILD 172133 2012-11-29 19:39:59Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
 # Contributor: GARETTE Emmanuel <gnunux at laposte dot net>
 
 pkgname=dovecot
-pkgver=2.1.10
+pkgver=2.1.11
 pkgrel=2
 pkgdesc="An IMAP and POP3 server written with security primarily in mind"
 arch=('i686' 'x86_64' 'mips64el')
@@ -22,8 +22,8 @@ install=$pkgname.install
 source=(http://dovecot.org/releases/2.1/${pkgname}-${pkgver}.tar.gz{,.sig}
         dovecot.sh
         dovecot.tmpfilesd)
-md5sums=('a5a4b3c444cf37e2c6bb6df3af87e18e'
-         '9327f77a0090e7d389cf9f3b35ae7c04'
+md5sums=('28443208243171423437daaf89db7e18'
+         'b3dd87d3dac492c172c0f399a82e88df'
          '587159e84e2da6f83d70b3c706ba87cc'
          '342a28251d40f983c98c0d1f1bf3d07d')
 
@@ -79,4 +79,7 @@ package() {
   # systemd tmpfile
   install -d -m755 ${pkgdir}/usr/lib/tmpfiles.d
   install -m 644  ${srcdir}/dovecot.tmpfilesd ${pkgdir}/usr/lib/tmpfiles.d/dovecot.conf
+  
+  # fix some missing quotes that make pigeonhole fail to build
+  sed -i "s:LIBDOVECOT_LOGIN=-ldovecot-login -lssl -lcrypto:LIBDOVECOT_LOGIN=\'-ldovecot-login -lssl -lcrypto \':" ${pkgdir}/usr/lib/dovecot/dovecot-config
 }
diff --git a/extra/ekiga/PKGBUILD b/extra/ekiga/PKGBUILD
index 3fbe7f5cd..9cebddfe4 100644
--- a/extra/ekiga/PKGBUILD
+++ b/extra/ekiga/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 169861 2012-10-30 22:24:54Z heftig $
+# $Id: PKGBUILD 172100 2012-11-28 10:32:07Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 
 pkgname=ekiga
-pkgver=3.9.90
+pkgver=4.0.0
 pkgrel=1
 pkgdesc="VOIP/Videoconferencing app with full SIP and H.323 support (GnomeMeeting expanded and renamed)"
 url="http://www.ekiga.org"
@@ -16,7 +16,7 @@ options=(!emptydirs)
 groups=('gnome-extra')
 install=ekiga.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('d905169c257173196d235bad6501682cd07752a6a29577620cc4dfb91d8b77a9')
+sha256sums=('69c544fb0f2e9cb425b9dae131b01e256ad20fd597f1faf0c28f5930b0f1d998')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gdb/PKGBUILD b/extra/gdb/PKGBUILD
index bb3774375..766e61d64 100644
--- a/extra/gdb/PKGBUILD
+++ b/extra/gdb/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 165406 2012-08-18 05:25:03Z allan $
+# $Id: PKGBUILD 172148 2012-11-30 04:20:34Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 
 pkgname=gdb
-pkgver=7.5
-pkgrel=1.1
+pkgver=7.5.1
+pkgrel=1
 pkgdesc="The GNU Debugger"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/gdb/"
@@ -15,8 +15,8 @@ backup=('etc/gdb/gdbinit')
 options=('!libtool')
 install=gdb.install
 source=(http://ftp.gnu.org/gnu/gdb/${pkgname}-${pkgver}.tar.bz2{,.sig})
-md5sums=('24a6779a9fe0260667710de1b082ef61'
-         'c1d42158075135b539ecba166987bc15')
+md5sums=('3f48f468b24447cf24820054ff6e85b1'
+         '31ab569c78a01d3f946c6fe0336175fe')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/extra/harfbuzz/PKGBUILD b/extra/harfbuzz/PKGBUILD
index 104f1f079..46fad3772 100644
--- a/extra/harfbuzz/PKGBUILD
+++ b/extra/harfbuzz/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 171617 2012-11-20 14:32:42Z heftig $
+# $Id: PKGBUILD 172099 2012-11-28 10:31:24Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=harfbuzz
-pkgver=0.9.6
+pkgver=0.9.7
 pkgrel=1
 pkgdesc="OpenType text shaping engine."
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ makedepends=('icu' 'cairo' 'glib2' 'freetype2')
 optdepends=('cairo: hb-view program')
 options=(!libtool)
 source=(http://www.freedesktop.org/software/harfbuzz/release/${pkgname}-${pkgver}.tar.bz2)
-sha256sums=('394a849d6061993018754b0cc04110891ad215e3df3f6953b75dcc55a11f9d9b')
+sha256sums=('bd2999859f8828461fedae23e4af52d926ac32a73245f03ae2d2065205e9cf25')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/konversation/PKGBUILD b/extra/konversation/PKGBUILD
index c69944aff..ff8df1217 100644
--- a/extra/konversation/PKGBUILD
+++ b/extra/konversation/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 170102 2012-11-01 18:41:11Z stephane $
+# $Id: PKGBUILD 172103 2012-11-28 12:37:26Z stephane $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: James Rayner <iphitus@gmail.com>
@@ -6,18 +6,19 @@
 
 pkgname=konversation
 pkgver=1.4
-pkgrel=4
+pkgrel=5
 pkgdesc="A user friendly IRC client for KDE"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://konversation.kde.org"
 depends=('kdebase-runtime' 'kdepimlibs')
 makedepends=('automoc4' 'cmake' 'pkgconfig' 'docbook-xml')
 optdepends=('python: python scripting support'
-            'kdebase-konsole: open a terminal in konversation')
+            'kdebase-konsole: open a terminal in konversation'
+            'qca-ossl: Diffie-Hellman key exchange and Blowfish ECB/CBC support')
 license=('GPL2' 'FDL')
 install=${pkgname}.install
 options=('!makeflags')
-source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
+source=("http://download.kde.org/download.php?url=stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.xz")
 sha1sums=('90741721f68a02d4345b9006a8ae53bc49ef3777')
 
 build() {
diff --git a/extra/kshutdown/PKGBUILD b/extra/kshutdown/PKGBUILD
index e312b3db4..cf8efe0e2 100644
--- a/extra/kshutdown/PKGBUILD
+++ b/extra/kshutdown/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 157339 2012-04-27 07:13:20Z eric $
+# $Id: PKGBUILD 172105 2012-11-28 13:15:50Z stephane $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 
 pkgname=kshutdown
-pkgver=3.0beta4
+pkgver=3.0beta5
 pkgrel=1
 pkgdesc="Shutdown Utility for KDE"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ depends=('kdebase-workspace')
 makedepends=('cmake' 'automoc4')
 install='kshutdown.install'
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-source-${pkgver}.zip")
-sha1sums=('1dcdaa84b7e87560d9861209d6be6ea1d793ca78')
+sha1sums=('108e27a7d1cef505c296656f92ab071d8c53bce3')
 
 build() {
   cd "${srcdir}"
diff --git a/extra/live-media/PKGBUILD b/extra/live-media/PKGBUILD
index 5d307ee4b..90dd11b65 100644
--- a/extra/live-media/PKGBUILD
+++ b/extra/live-media/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 171909 2012-11-23 09:55:00Z giovanni $
+# $Id: PKGBUILD 172118 2012-11-29 17:09:42Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb@gmail.com>
 
 pkgname=live-media
-pkgver=2012.11.22
+pkgver=2012.11.29
 pkgrel=1
 pkgdesc="A set of C++ libraries for multimedia streaming"
 arch=('i686' 'x86_64' 'mips64el')
@@ -11,7 +11,7 @@ license=('LGPL')
 url="http://live555.com/liveMedia"
 depends=('gcc-libs')
 source=("http://live555.com/liveMedia/public/live.${pkgver}.tar.gz")
-md5sums=('ab793b94629c3d52193fa7b9c09902b3')
+md5sums=('42000c39b2a9beadef1f1a641897f61f')
 
 build() {
   cd ${srcdir}/live
diff --git a/extra/nmap/PKGBUILD b/extra/nmap/PKGBUILD
index 24f0a2900..5f6f3fbc2 100644
--- a/extra/nmap/PKGBUILD
+++ b/extra/nmap/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 165381 2012-08-17 08:46:12Z bisson $
+# $Id: PKGBUILD 172141 2012-11-30 02:54:16Z bisson $
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=nmap
-pkgver=6.01
-pkgrel=2
+pkgver=6.25
+pkgrel=1
 pkgdesc='Utility for network discovery and security auditing'
 url='http://nmap.org/'
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,20 +13,12 @@ license=('GPL')
 makedepends=('pygtk')
 optdepends=('pygtk: zenmap')
 depends=('pcre' 'openssl' 'libpcap' 'lua')
-source=("http://nmap.org/dist/${pkgname}-${pkgver}.tar.bz2"
-        'kdesu.patch')
-sha1sums=('e397e453893930d14e9bb33a847d15b94b7ee83a'
-          '159bc1243564d3a9dee820291bf07168870cbaf6')
+source=("http://nmap.org/dist/${pkgname}-${pkgver}.tar.bz2")
+sha1sums=('769943a1a5c10f67bf9738e26da42b3312db752f')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
-	# Show icon only if runnable; see FS#12045
-	echo 'TryExec=/usr/bin/pygtk-demo' >> zenmap/install_scripts/unix/zenmap.desktop 
-	echo 'TryExec=/usr/bin/pygtk-demo' >> zenmap/install_scripts/unix/zenmap-root.desktop 
-
-	patch -p1 -i ../kdesu.patch # FS#31158
-
 	./configure \
 		--prefix=/usr \
 		--libexecdir=/usr/lib \
@@ -37,6 +29,7 @@ build() {
 
 package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
+
 	make DESTDIR="${pkgdir}" install
 
 	rm "${pkgdir}"/usr/bin/uninstall_zenmap
diff --git a/extra/opal/PKGBUILD b/extra/opal/PKGBUILD
index 149f22f41..b308fb888 100644
--- a/extra/opal/PKGBUILD
+++ b/extra/opal/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 171267 2012-11-16 23:35:49Z ibiru $
+# $Id: PKGBUILD 172102 2012-11-28 10:32:11Z jgc $
 # Maintainer: Jan de Groot <jan@archlinux.org>
 # Contributor: Tom K <tomk@runbox.com>
 pkgname=opal
-pkgver=3.10.7
-pkgrel=3
+pkgver=3.10.9
+pkgrel=1
 pkgdesc="Open Phone Abstraction Library"
 arch=(i686 x86_64 'mips64el')
 url="http://www.opalvoip.org"
@@ -11,10 +11,10 @@ license=('GPL')
 depends=('ptlib' 'libtheora' 'x264' 'speex' 'gsm')
 makedepends=('ffmpeg')
 options=(!makeflags)
-source=(http://downloads.sourceforge.net/sourceforge/opalvoip/$pkgname-$pkgver.tar.bz2
+source=(http://ftp.gnome.org/pub/GNOME/sources/opal/${pkgver%.*}/opal-$pkgver.tar.xz
         opal-ffmpeg.patch)
-md5sums=('8686bb930668067eefadab115d2ee1c2'
-         '0f05c01dada644b37805667ba9e81aa5')
+sha256sums=('86c717a881f5283cfb58a5d52573c337b904115b90fa3e53c77fc543605e7950'
+            'd81542907ace54015b7c69c275b0c67f449eeb252ba971ba6ca728a5e20db231')
 
 build() {
   cd "${srcdir}/opal-${pkgver}"
diff --git a/extra/pango/PKGBUILD b/extra/pango/PKGBUILD
index 673c6c68d..a837649c3 100644
--- a/extra/pango/PKGBUILD
+++ b/extra/pango/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 170950 2012-11-14 01:23:57Z heftig $ 
+# $Id: PKGBUILD 172098 2012-11-28 10:31:22Z jgc $ 
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=pango
-pkgver=1.32.2
+pkgver=1.32.3
 pkgrel=1
 pkgdesc="A library for layout and rendering of text"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ options=('!libtool')
 install=pango.install
 source=(http://download.gnome.org/sources/${pkgname}/${pkgver:0:4}/${pkgname}-${pkgver}.tar.xz)
 url="http://www.pango.org/"
-sha256sums=('23124e01a7795374a6c2864b69ee49064de31b84b3776924461c0b8b42e8e5cb')
+sha256sums=('19a1a4fa021fcf96261de3cb809295ac06546f2a061c3c623141f2f4989b6a36')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/pigeonhole/PKGBUILD b/extra/pigeonhole/PKGBUILD
new file mode 100644
index 000000000..45de7f3cc
--- /dev/null
+++ b/extra/pigeonhole/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 172134 2012-11-29 19:40:00Z andyrtr $
+# Maintainer: Andreas Radke <andyrtr@archlinux.org>
+
+# Contributorr: Peter Lewis <plewis@aur.archlinux.org>
+# Contributor: Sebastian Köhler <sebkoehler@whoami.org.uk>
+
+# This must be built against the version of dovecot being used,
+# else mail delivery will fail.
+# Specify the version of dovecot to be used here:
+_dcpkgver=2.1.11
+# Make sure to bump pkgrel if changing this.
+
+pkgname=pigeonhole
+pkgver=0.3.3
+pkgrel=2
+pkgdesc="Fully rewritten Sieve implementation for Dovecot v2.1"
+arch=('i686' 'x86_64')
+url="http://pigeonhole.dovecot.org/"
+license=('LGPL')
+depends=('dovecot='$_dcpkgver)
+conflicts=('dovecot-sieve' 'pigeonhole-hg')
+source=("http://www.rename-it.nl/dovecot/2.1/dovecot-2.1-$pkgname-$pkgver.tar.gz"{,.sig}
+        "dovecot.conf")
+options=('!libtool')
+sha256sums=('1d581f6292c6e760b26a06193a0af266ba3b6f3a0431e6617fcf6e1c84f7dd0e'
+            '8604f9c52cff28506873cf4d0026c57ef73def5f05877126ea561774f1b8ffec'
+            'a457a1691cfa82495fc0503bfa4b61e54b149e63400fe0f568dff2c24a3f7858')
+
+build() {
+  cd "$srcdir/dovecot-2.1-$pkgname-$pkgver"
+
+  ./configure --prefix=/usr \
+    --with-dovecot=/usr/lib/dovecot \
+    --disable-static
+  make
+}
+
+package() {
+  cd "$srcdir/dovecot-2.1-$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir/" install
+  install -m 644 -D "$srcdir/dovecot.conf" "$pkgdir/etc/ld.so.conf.d/dovecot.conf"
+}
diff --git a/extra/pigeonhole/dovecot.conf b/extra/pigeonhole/dovecot.conf
new file mode 100644
index 000000000..061a50c90
--- /dev/null
+++ b/extra/pigeonhole/dovecot.conf
@@ -0,0 +1 @@
+/usr/lib/dovecot
diff --git a/extra/ptlib/PKGBUILD b/extra/ptlib/PKGBUILD
index 55b55a3a8..b2897cf99 100644
--- a/extra/ptlib/PKGBUILD
+++ b/extra/ptlib/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 169988 2012-10-30 23:00:40Z heftig $
+# $Id: PKGBUILD 172101 2012-11-28 10:32:09Z jgc $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=ptlib
-pkgver=2.10.7
-pkgrel=2
+pkgver=2.10.9
+pkgrel=1
 pkgdesc="Portable Windows Library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.opalvoip.org"
@@ -11,8 +11,8 @@ license=('GPL')
 depends=('sdl' 'libpulse' 'v4l-utils' 'libldap')
 replaces=('pwlib')
 conflicts=('pwlib')
-source=(http://downloads.sourceforge.net/sourceforge/opalvoip/$pkgname-$pkgver.tar.bz2)
-md5sums=('7fb74a97743fcc5f33d0f97dec7bc878')
+source=(http://ftp.gnome.org/pub/GNOME/sources/ptlib/${pkgver%.*}/ptlib-$pkgver.tar.xz)
+sha256sums=('d948e326ce238880ce9b52f9f0cd76a4897618e17cc08a347e4a713f36a575fe')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
@@ -22,7 +22,7 @@ build() {
       --enable-oss --enable-v4l2 \
       --disable-avc --enable-sdl \
       --enable-ipv6 --enable-v4l \
-      --enable-dc --disable-odbc \
+      --disable-dc --disable-odbc \
       --enable-expat --enable-httpforms
   make
 }