Mon Oct 3 23:14:36 UTC 2011

author: root <root@rshg054.dnsready.net> 2011-10-03 23:14:36 +0000
committer: root <root@rshg054.dnsready.net> 2011-10-03 23:14:36 +0000
commit: 57d05f7209f022aa99a8850aafbeec4cb85c3b5b (patch)
tree: 8f6753258e8359d1314356a677cdb32ae94658ab
parent: ad84169d66d20378d28533c216b73c9a6646d6d7 (diff)
50 files changed, 1329 insertions, 155 deletions
diff --git a/community-staging/darktable/PKGBUILD b/community-staging/darktable/PKGBUILD
new file mode 100644
index 000000000..5b81d0475
--- /dev/null
+++ b/community-staging/darktable/PKGBUILD
@@ -0,0 +1,43 @@
+# $Id: PKGBUILD 56175 2011-10-02 21:04:18Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer:  Christian Himpel <chressie at gmail dot com>
+# Contributor: Johannes Hanika <hanatos at gmail dot com>
+
+pkgname=darktable
+pkgver=0.9.2
+_pkgver=0.9
+pkgrel=2
+pkgdesc="Utility to organize and develop raw images"
+arch=('i686' 'x86_64')
+url=http://darktable.sf.net/
+license=('GPL3')
+depends=('exiv2>=0.18' 'gconf>=2.26' 'intltool>=0.40' 'lcms2' 'lensfun>=0.2.3' 'libglade'
+	 'curl' 'libgnome-keyring' 'libgphoto2' 'libusb-compat' 'openexr' 'sqlite3')
+makedepends=('intltool>=0.40' 'cmake' 'sqlite3')
+optdepends=( 'librsvg')
+install=darktable.install
+options=(!libtool)
+source=(http://downloads.sourceforge.net/project/darktable/darktable/${_pkgver}/darktable-$pkgver.tar.gz)
+md5sums=('08377e80ad77c7b11f742f26fddb80f1')
+
+build() {
+  cd $srcdir/$pkgname-$pkgver
+  mkdir -p build
+  cd build
+  cmake \
+      -DCMAKE_INSTALL_PREFIX=/usr \
+      -DCMAKE_BUILD_TYPE=Release \
+      -DBUILD_USERMANUAL=False \
+      -DDONT_INSTALL_GCONF_SCHEMAS=True \
+      -DBINARY_PACKAGE_BUILD=1 \
+      ..
+  make
+}
+
+package() {
+  cd $srcdir/$pkgname-$pkgver/build
+  make DESTDIR=$pkgdir install
+  mv "${pkgdir}/usr/share/doc/darktable" "${pkgdir}/usr/share/doc/${pkgname}-${pkgver}"
+  mkdir -p "${pkgdir}/usr/share/gconf/schemas/"
+  mv "${pkgdir}/etc/gconf/schemas/darktable.schemas" "${pkgdir}/usr/share/gconf/schemas/"
+}
diff --git a/community-staging/darktable/darktable.install b/community-staging/darktable/darktable.install
new file mode 100644
index 000000000..b92aab488
--- /dev/null
+++ b/community-staging/darktable/darktable.install
@@ -0,0 +1,22 @@
+pkgname=darktable
+
+post_install() {
+  usr/sbin/gconfpkg --install ${pkgname}
+  [ -x `which update-desktop-database` ] &&  update-desktop-database -q
+}
+
+pre_upgrade() {
+  pre_remove
+}
+
+post_upgrade() {
+  post_install
+}
+
+pre_remove() {
+  usr/sbin/gconfpkg --uninstall ${pkgname}
+}
+
+post_remove() {
+  [ -x `which update-desktop-database` ] &&  update-desktop-database -q
+}
diff --git a/community-staging/kphotoalbum/PKGBUILD b/community-staging/kphotoalbum/PKGBUILD
new file mode 100644
index 000000000..1ce076b79
--- /dev/null
+++ b/community-staging/kphotoalbum/PKGBUILD
@@ -0,0 +1,47 @@
+# $Id: PKGBUILD 56162 2011-10-02 13:52:02Z lcarlier $
+# Maintainer: Laurent Carlier <lordheavym@gmail.com>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Gilles CHAUVIN <gcnweb ][ gmail ? com>
+# Contributor: Jonathan Schaeffer <joschaeffer ][ gmail ? com>
+# Contributor: chfoxli <lg ][ romandie ? com>
+
+pkgname=kphotoalbum
+pkgver=4.1.1
+pkgrel=10
+pkgdesc="KDE Photo Album, picture collection manager"
+url="http://www.kphotoalbum.org/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('kdebase-runtime' 'libkipi' 'libkexiv2' 'libkdcraw')
+makedepends=('cmake' 'automoc4' 'kdeedu-marble' 'kdemultimedia-mplayerthumbs')
+optdepends=('kdeedu-marble: integration with Marble'
+	'kipi-plugins: add extra functionality'
+	'kdemultimedia-mplayerthumbs: video thumbnails')
+install=${pkgname}.install
+source=("ftp://ftp.archlinux.org/other/community/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+        'fix-docbook-build.patch'
+        'fix-with-exiv2-0.21.patch')
+md5sums=('c00a5f179e487ac89fccf8dfb3cd6ef0'
+         '1b48553af74f0488fdad55758e911e3a'
+         '9238101a2d7450e6dd822778807dd7bd')
+
+build() {
+  cd ${srcdir}
+
+  patch -Np0 -i ${srcdir}/fix-docbook-build.patch
+  patch -Np0 -i ${srcdir}/fix-with-exiv2-0.21.patch
+
+  mkdir build
+  cd build
+
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_BUILD_TYPE=Release \
+    -DCMAKE_INSTALL_PREFIX=/usr
+  make
+}
+
+package() {
+  cd ${srcdir}/build
+
+  make DESTDIR=${pkgdir} install
+}
diff --git a/community-staging/kphotoalbum/fix-docbook-build.patch b/community-staging/kphotoalbum/fix-docbook-build.patch
new file mode 100644
index 000000000..575a4271e
--- /dev/null
+++ b/community-staging/kphotoalbum/fix-docbook-build.patch
@@ -0,0 +1,236 @@
+diff -up kphotoalbum-4.1.1/doc/index.docbook.docbook_fix kphotoalbum-4.1.1/doc/index.docbook
+--- kphotoalbum-4.1.1/doc/index.docbook.docbook_fix	2009-11-15 15:16:29.000000000 -0600
++++ kphotoalbum-4.1.1/doc/index.docbook	2010-06-13 13:03:02.815174744 -0500
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+   <!ENTITY kphotoalbum "<application>KPhotoAlbum</application>">
+   <!ENTITY kappname "&kphotoalbum;">
+   <!ENTITY package "kdeextragear-2">
+@@ -41,12 +41,6 @@
+     <date>2004-08-06</date>
+     <releaseinfo>2.0</releaseinfo>
+     
+-    <keywordset>
+-      <keyword>KDE</keyword>
+-      <keyword>kdeextragear-2</keyword>
+-      <keyword>KPhotoAlbum</keyword>
+-      <keyword>Image Database</keyword>
+-    </keywordset>
+     <abstract><para>
+   This is the user manual for &kphotoalbum;. If you are
+   not the type who likes reading documentation, but rather just want to try
+@@ -64,6 +58,12 @@ menu and select <guimenuitem>Run &kphoto
+ on long HTML document at <ulink
+ url="http://www.kphotoalbum.org/">&kphotoalbum;'s Homepage</ulink></para>
+ </abstract>
++    <keywordset>
++      <keyword>KDE</keyword>
++      <keyword>kdeextragear-2</keyword>
++      <keyword>KPhotoAlbum</keyword>
++      <keyword>Image Database</keyword>
++    </keywordset>
+   </bookinfo>
+   
+   &introduction;
+diff -up kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook
+--- kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook.docbook_fix	2009-11-15 15:17:07.000000000 -0600
++++ kphotoalbum-4.1.1/doc-translations/de_kphotoalbum/kphotoalbum/index.docbook	2010-06-13 13:10:06.145165665 -0500
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+   <!ENTITY kphotoalbum "<application
+ >KPhotoAlbum</application
+ >">
+@@ -65,16 +65,6 @@
+     <releaseinfo
+ >2.0</releaseinfo>
+     
+-    <keywordset>
+-      <keyword
+->KDE</keyword>
+-      <keyword
+->kdeextragear-2</keyword>
+-      <keyword
+->KPhotoAlbum</keyword>
+-      <keyword
+->Bilddatenbank</keyword>
+-    </keywordset>
+     <abstract
+ ><para
+ >Dies ist das Benutzerhandbuch für &kphotoalbum;. Wenn Sie nicht gerne Handbücher lesen, sondern lieber gleich Funktionen ausprobieren möchten, haben Sie folgende Alternativen zu diesem Handbuch: <itemizedlist>
+@@ -102,6 +92,12 @@
+ >HTML</acronym
+ >-Dokument zum Herunterladen.</para>
+ </abstract>
++    <keywordset>
++      <keyword>KDE</keyword>
++      <keyword>kdeextragear-2</keyword>
++      <keyword>KPhotoAlbum</keyword>
++      <keyword>Bilddatenbank</keyword>
++    </keywordset>
+   </bookinfo>
+   
+   &introduction;
+diff -up kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook
+--- kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook.docbook_fix	2009-11-15 15:17:20.000000000 -0600
++++ kphotoalbum-4.1.1/doc-translations/et_kphotoalbum/kphotoalbum/index.docbook	2010-06-13 13:11:18.860165964 -0500
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+   <!ENTITY kphotoalbum "<application
+ >KPhotoAlbum</application
+ >">
+@@ -65,16 +65,6 @@
+     <releaseinfo
+ >2.0</releaseinfo>
+     
+-    <keywordset>
+-      <keyword
+->KDE</keyword>
+-      <keyword
+->kdeextragear-2</keyword>
+-      <keyword
+->KPhotoAlbum</keyword>
+-      <keyword
+->Piltide andmebaas</keyword>
+-    </keywordset>
+     <abstract
+ ><para
+ >See on &kphotoalbum;i käsiraamat. Kui sa ei armasta eriti käsiraamatuid lugeda, vaid soovid lihtsalt proovida, mis mida teeb, siis on sinu ees lahti mitu võimalust: <itemizedlist>
+@@ -100,6 +90,12 @@
+ >&kphotoalbum;i koduleheküljelt</ulink
+ >.</para>
+ </abstract>
++    <keywordset>
++      <keyword>KDE</keyword>
++      <keyword>kdeextragear-2</keyword>
++      <keyword>KPhotoAlbum</keyword>
++      <keyword>Piltide andmebaas</keyword>
++    </keywordset>
+   </bookinfo>
+   
+   &introduction;
+diff -up kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook
+--- kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook.docbook_fix	2009-11-15 15:17:57.000000000 -0600
++++ kphotoalbum-4.1.1/doc-translations/it_kphotoalbum/kphotoalbum/index.docbook	2010-06-13 13:12:00.978165382 -0500
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+   <!ENTITY kphotoalbum "<application
+ >KPhotoAlbum</application
+ >">
+@@ -65,16 +65,6 @@
+     <releaseinfo
+ >2.0</releaseinfo>
+     
+-    <keywordset>
+-      <keyword
+->KDE</keyword>
+-      <keyword
+->kdeextragear-2</keyword>
+-      <keyword
+->KPhotoAlbum</keyword>
+-      <keyword
+->Banca dati immagini</keyword>
+-    </keywordset>
+     <abstract
+ ><para
+ >Questo è il manuale utente di &kphotoalbum;. Se non sei il tipo a cui piace leggere la documentazione, ma che preferisce provare a far funzionare le cose, eccoti delle alternative: <itemizedlist>
+@@ -100,6 +90,12 @@
+ >homepage di &kphotoalbum;</ulink
+ ></para>
+ </abstract>
++    <keywordset>
++       <keyword>KDE</keyword>
++       <keyword>kdeextragear-2</keyword>
++       <keyword>KPhotoAlbum</keyword>
++       <keyword>Banca dati immagini</keyword>
++    </keywordset>
+   </bookinfo>
+   
+   &introduction;
+diff -up kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook
+--- kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook.docbook_fix	2009-11-15 15:19:13.000000000 -0600
++++ kphotoalbum-4.1.1/doc-translations/sv_kphotoalbum/kphotoalbum/index.docbook	2010-06-13 13:12:45.765165840 -0500
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+   <!ENTITY kphotoalbum "<application
+ >KPhotoAlbum</application
+ >">
+@@ -65,16 +65,6 @@
+     <releaseinfo
+ >2.0</releaseinfo>
+     
+-    <keywordset>
+-      <keyword
+->KDE</keyword>
+-      <keyword
+->kdeextragear-2</keyword>
+-      <keyword
+->Kfotoalbum</keyword>
+-      <keyword
+->Bilddatabas</keyword>
+-    </keywordset>
+     <abstract
+ ><para
+ >Det här är användarmanualen för Kfotoalbum. Om du inte är den som gillar att läsa dokumentation, utan istället bara vill försöka dig på saker och ting, ges här några alternativ: <itemizedlist>
+@@ -100,6 +90,12 @@
+ >Kfotoalbums hemsida</ulink
+ ></para>
+ </abstract>
++    <keywordset>
++      <keyword>KDE</keyword>
++      <keyword>kdeextragear-2</keyword>
++      <keyword>Kfotoalbum</keyword>
++      <keyword>Bilddatabas</keyword>
++    </keywordset>
+   </bookinfo>
+   
+   &introduction;
+diff -up kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook.docbook_fix kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook
+--- kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook.docbook_fix	2009-11-15 15:19:26.000000000 -0600
++++ kphotoalbum-4.1.1/doc-translations/uk_kphotoalbum/kphotoalbum/index.docbook	2010-06-13 13:13:28.217166055 -0500
+@@ -1,5 +1,5 @@
+ <?xml version="1.0" ?>
+-<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.1.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
++<!DOCTYPE book PUBLIC "-//KDE//DTD DocBook XML V4.2-Based Variant V1.1//EN" "dtd/kdex.dtd" [
+   <!ENTITY kphotoalbum "<application
+ >KPhotoAlbum</application
+ >">
+@@ -65,16 +65,6 @@
+     <releaseinfo
+ >2.0</releaseinfo>
+     
+-    <keywordset>
+-      <keyword
+->KDE</keyword>
+-      <keyword
+->kdeextragear-2</keyword>
+-      <keyword
+->KPhotoAlbum</keyword>
+-      <keyword
+->База даних зображень</keyword>
+-    </keywordset>
+     <abstract
+ ><para
+ >Це інструкція користувача для &kphotoalbum;. Якщо ви не любитель або любителька читання документації і надаєте перевагу самостійному вивченню програми шляхом експериментів, ви можете піти одним з таких шляхів: <itemizedlist>
+@@ -100,6 +90,12 @@
+ >домашній сторінці &kphotoalbum;</ulink
+ ></para>
+ </abstract>
++    <keywordset>
++      <keyword>KDE</keyword>
++      <keyword>kdeextragear-2</keyword>
++      <keyword>KPhotoAlbum</keyword>
++      <keyword>База даних зображень</keyword>
++    </keywordset>
+   </bookinfo>
+   
+   &introduction;
diff --git a/community-staging/kphotoalbum/fix-with-exiv2-0.21.patch b/community-staging/kphotoalbum/fix-with-exiv2-0.21.patch
new file mode 100644
index 000000000..65baf235d
--- /dev/null
+++ b/community-staging/kphotoalbum/fix-with-exiv2-0.21.patch
@@ -0,0 +1,47 @@
+--- kphotoalbum-4.1.1/Exif/Info.cpp.orig	2010/08/16 08:04:32	1164187
++++ kphotoalbum-4.1.1/Exif/Info.cpp	2011/01/09 06:50:40	1213128
+@@ -106,6 +106,28 @@
+         return res;
+ 
+     QList<const Exiv2::TagInfo*> tags;
++    std::ostringstream s;
++
++#if (EXIV2_TEST_VERSION(0,21,0))
++    const Exiv2::GroupInfo* gi = Exiv2::ExifTags::groupList();
++    while (gi->tagList_ != 0) {
++	    Exiv2::TagListFct tl     = gi->tagList_;
++	    const Exiv2::TagInfo* ti = tl();
++
++	    while (ti->tag_ != 0xFFFF) {
++		    tags << ti;
++		    ++ti;
++	    }
++        ++gi;
++    }
++
++    for (QList<const Exiv2::TagInfo*>::iterator it = tags.begin(); it != tags.end(); ++it) {
++        while ( (*it)->tag_ != 0xffff ) {
++            res.insert(QString::fromLatin1(Exiv2::ExifKey(**it).key().c_str()));
++            ++(*it);
++        }
++    }
++#else
+     tags <<
+         Exiv2::ExifTags::ifdTagList() <<
+         Exiv2::ExifTags::exifTagList() <<
+@@ -121,7 +143,6 @@
+     // Now the ugly part -- exiv2 doesn't have any way to get a list of
+     // MakerNote tags in a reasonable form, so we have to parse it from strings
+ 
+-    std::ostringstream s;
+     for ( Exiv2::IfdId kind = Exiv2::canonIfdId; kind < Exiv2::lastIfdId;
+             kind = static_cast<Exiv2::IfdId>( kind + 1 ) ) {
+ #if EXIV2_TEST_VERSION(0,17,0)
+@@ -130,6 +151,7 @@
+         Exiv2::ExifTags::makerTaglist( s, kind );
+ #endif
+     }
++#endif
+ 
+     // IPTC tags use yet another format...
+     Exiv2::IptcDataSets::dataSetList( s );
diff --git a/community-staging/kphotoalbum/kphotoalbum.install b/community-staging/kphotoalbum/kphotoalbum.install
new file mode 100644
index 000000000..e70c054ec
--- /dev/null
+++ b/community-staging/kphotoalbum/kphotoalbum.install
@@ -0,0 +1,11 @@
+post_install() {
+	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+	post_install
+}
+
+post_remove() {
+	post_install
+}
diff --git a/community-staging/krename/PKGBUILD b/community-staging/krename/PKGBUILD
new file mode 100644
index 000000000..8a3bf3de2
--- /dev/null
+++ b/community-staging/krename/PKGBUILD
@@ -0,0 +1,31 @@
+# $Id: PKGBUILD 56158 2011-10-02 13:17:47Z ebelanger $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+
+pkgname=krename
+pkgver=4.0.7
+pkgrel=2
+pkgdesc="A very powerfull batch file renamer for KDE"
+arch=('i686' 'x86_64')
+url="http://www.krename.net"
+license=('GPL')
+depends=('kdelibs' 'taglib' 'xdg-utils')
+makedepends=('cmake' 'automoc4')
+options=('libtool')
+install=krename.install
+source=(http://downloads.sourceforge.net/project/krename/KDE4%20krename-stable/${pkgver}/${pkgname}-${pkgver}.tar.bz2)
+sha1sums=('c53d1819247a88bc4f49d52936f1e2bc7fa9850d')
+
+build() {
+  cd "${srcdir}"
+  mkdir build
+  cd build
+  cmake ../${pkgname}-${pkgver} \
+    -DCMAKE_INSTALL_PREFIX=/usr \
+    -DCMAKE_BUILD_TYPE=Release
+  make
+}
+
+package() {
+  cd "${srcdir}/build"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/community-staging/krename/krename.install b/community-staging/krename/krename.install
new file mode 100644
index 000000000..1c0de2e4f
--- /dev/null
+++ b/community-staging/krename/krename.install
@@ -0,0 +1,11 @@
+post_install() {
+  xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/community-staging/libextractor/PKGBUILD b/community-staging/libextractor/PKGBUILD
new file mode 100644
index 000000000..b37685dbc
--- /dev/null
+++ b/community-staging/libextractor/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 56177 2011-10-02 21:05:24Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s@gmail.com>
+# Contributor: damir <damir@archlinux.org>
+
+pkgname=libextractor
+pkgver=0.6.2
+pkgrel=3
+pkgdesc="A library used to extract meta-data from files of arbitrary type"
+arch=("i686" "x86_64")
+license=('GPL')
+url="http://gnunet.org/libextractor/"
+depends=('libvorbis' 'libtool' 'gtk2' 'libgsf' 'libmpeg2' 'texinfo')
+makedepends=('flac' 'poppler' 'exiv2' 'qt')
+optdepends=('flac'
+	    'poppler'
+	    'exiv2'
+	    'qt')
+options=('!libtool' '!makeflags')
+install=libextractor.install
+source=(http://ftpmirror.gnu.org/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('4b2af1167061430d58a101d5dfc6b4c7')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  ./configure --prefix=/usr --enable-shared --disable-static
+  make
+}
+
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make DESTDIR=${pkgdir} install
+  rm ${pkgdir}/usr/share/info/dir
+}
diff --git a/community-staging/libextractor/libextractor.install b/community-staging/libextractor/libextractor.install
new file mode 100644
index 000000000..24d668af5
--- /dev/null
+++ b/community-staging/libextractor/libextractor.install
@@ -0,0 +1,20 @@
+infodir=/usr/share/info
+filelist=(extractor.info.gz)
+
+post_install() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+pre_remove() {
+  [ -x usr/bin/install-info ] || return 0
+  for file in ${filelist[@]}; do
+    install-info --delete $infodir/$file $infodir/dir 2> /dev/null
+  done
+}
diff --git a/community-staging/rawstudio/PKGBUILD b/community-staging/rawstudio/PKGBUILD
new file mode 100644
index 000000000..3dd543393
--- /dev/null
+++ b/community-staging/rawstudio/PKGBUILD
@@ -0,0 +1,33 @@
+# $Id: PKGBUILD 56179 2011-10-02 21:06:25Z spupykin $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
+# Contributor: Roman Kyrylych <roman@archlinux.org>
+# Contributor: cdhotfire <cdhotfire@gmail.com>
+
+pkgname=rawstudio
+pkgver=2.0
+pkgrel=3
+pkgdesc="An open source raw-image converter written in GTK+"
+arch=('i686' 'x86_64')
+license=('GPL')
+url="http://rawstudio.org/"
+depends=('exiv2' 'libgphoto2' 'flickcurl' 'libjpeg' 'fftw' 'gconf' 'lensfun'
+	 'raptor1' 'lcms' 'gtk2')
+install=${pkgname}.install
+options=('!libtool')
+source=(http://rawstudio.org/files/release/${pkgname}-${pkgver}.tar.gz)
+md5sums=('b2f86b8ca6b83ad954e3104c4cb89e9b')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make prefix="${pkgdir}/usr" install
+  mkdir $pkgdir/usr/lib/rawstudio
+  mv $pkgdir/usr/share/rawstudio/plugins $pkgdir/usr/lib/rawstudio
+  ln -s ../../lib/rawstudio/plugins $pkgdir/usr/share/rawstudio/plugins
+}
diff --git a/community-staging/rawstudio/rawstudio.install b/community-staging/rawstudio/rawstudio.install
new file mode 100644
index 000000000..261adb7b4
--- /dev/null
+++ b/community-staging/rawstudio/rawstudio.install
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q || true
+}
+
+post_upgrade() {
+  update-desktop-database -q || true
+}
+
+post_remove() {
+  update-desktop-database -q || true
+}
diff --git a/community/bacula/PKGBUILD b/community/bacula/PKGBUILD
index b48447f75..4093fe1a7 100644
--- a/community/bacula/PKGBUILD
+++ b/community/bacula/PKGBUILD
@@ -5,7 +5,7 @@
 
 pkgname=bacula
 pkgver=5.0.3
-pkgrel=5
+pkgrel=6
 pkgdesc="An advanced backup tool with network and tape changer support (MySQL backend)"
 arch=("i686" "x86_64")
 url="http://www.${pkgname}.org"
diff --git a/community/bacula/bacula.install b/community/bacula/bacula.install
index 9b8a3669a..4d061ddfa 100644
--- a/community/bacula/bacula.install
+++ b/community/bacula/bacula.install
@@ -1,12 +1,12 @@
 post_install() {
   if [ -z "`grep '^bacula::' /etc/group`" ]; then
     echo "Adding bacula system group... "
-    groupadd -g 73 bacula >& /dev/null
+    groupadd -g 77 bacula >& /dev/null
   fi
 
   if [ -z "`grep '^bacula::' /etc/passwd`" ]; then
     echo "Adding bacula system user... "
-    useradd -u 73 -c "Bacula Daemon" -d / -g bacula -s /bin/false bacula
+    useradd -u 77 -c "Bacula Daemon" -d / -g bacula -s /bin/false bacula
   fi
 
   echo "Locking Bacula User Account..."
diff --git a/community/cairo-compmgr/PKGBUILD b/community/cairo-compmgr/PKGBUILD
index a023590bf..30c08cec2 100644
--- a/community/cairo-compmgr/PKGBUILD
+++ b/community/cairo-compmgr/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 45705 2011-04-27 13:34:55Z bluewind $
+# $Id: PKGBUILD 56166 2011-10-02 15:46:05Z bluewind $
 # Maintainer: Florian Pritz <flo@xinu.at>
 # Contributor: Adam Hani Schakaki (krzd) <krzd@krzd.net>
 # Contributor: Det <nimetonmaili at gmail a-dot com>
@@ -8,16 +8,16 @@
 # Contributor: Gianni Vialetto <g dot vialetto at gmail dot com>
 
 pkgname=cairo-compmgr
-pkgver=git20110320
-_commit=711fc7275b79cc802dc69658eb714ddc50666c06
-pkgrel=2
+pkgver=git2011102
+_commit=348f149af30bc829c2100d0e622c5dcaf43925b7
+pkgrel=3
 epoch=1
 pkgdesc="A Cairo based composite manager"
 arch=(i686 x86_64)
 url="http://cairo-compmgr.tuxfamily.org/"
 license=(GPL)
 makedepends=(gettext gtk-doc "intltool>=0.41" git)
-depends=("gtk2>=2.16.0" "vala>=0.11.6" libsm gconf)
+depends=("gtk2>=2.16.0" "vala>=0.14" libsm gconf)
 install=cairo-compmgr.install
 options=(!libtool)
 #source=(http://download.tuxfamily.org/ccm/$pkgname/$pkgname-$pkgver.tar.gz)
@@ -49,7 +49,7 @@ build() {
   cd "$srcdir/$__gitname-build"
   git checkout "$_commit"
 
-  sed -i 's!vala-0.10!libvala-0.12!' vapi/cairo-compmgr.deps configure.ac
+#  sed -i 's!vala-0.10!libvala-0.12!' vapi/cairo-compmgr.deps configure.ac
   ./autogen.sh --prefix=/usr
   make -j1
 }
diff --git a/community/fotoxx/PKGBUILD b/community/fotoxx/PKGBUILD
index 65ee90593..efa4b5a35 100644
--- a/community/fotoxx/PKGBUILD
+++ b/community/fotoxx/PKGBUILD
@@ -1,6 +1,6 @@
 # Maintainer: Stefan Husmann <stefan-husmann@t-online.de>
 pkgname=fotoxx
-pkgver=11.09.1
+pkgver=11.10
 pkgrel=1
 pkgdesc="A program for improving image files made with a digital camera"
 url="http://kornelix.squarespace.com/fotoxx"
@@ -9,7 +9,7 @@ license=('GPL3')
 depends=('gimp-ufraw' 'perl-exiftool' 'xdg-utils' 'desktop-file-utils')
 optdepends=('mashup: for composing pages to print from within fotoxx' 'brasero: for burning')
 source=("http://kornelix.squarespace.com/storage/downloads/$pkgname-$pkgver.tar.gz")
-md5sums=('a532c4ef6b00e682319a68416c9c0eeb')
+md5sums=('c312f980dab199f50fc76374d062135a')
 install=fotoxx.install
 
 build() {
diff --git a/community/glom/PKGBUILD b/community/glom/PKGBUILD
index 408a8d87d..0ceeb4893 100644
--- a/community/glom/PKGBUILD
+++ b/community/glom/PKGBUILD
@@ -1,38 +1,31 @@
-# $Id: PKGBUILD 52545 2011-07-26 04:39:23Z svenstaro $
+# $Id: PKGBUILD 56168 2011-10-02 16:56:39Z ibiru $
 # Maintainer: Roman Kyrylych <Roman.Kyrylych@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
 pkgname=glom
-pkgver=1.16.1
-pkgrel=7
+pkgver=1.19.11
+pkgrel=2
 pkgdesc="An easy-to-use database designer and user interface"
 arch=('i686' 'x86_64')
 url="http://www.glom.org/"
 license=('GPL')
-depends=('libgdamm' 'libxml++' 'gconfmm' 'pygtk'
-         'python2-gda' 'libgtksourceviewmm2' 'goocanvasmm' 'libepc' 
-         'iso-codes' 'postgresql' 'hicolor-icon-theme' 'shared-mime-info'
-         'gtkmm' 'boost-libs' 'gettext')
-makedepends=('intltool' 'gnome-doc-utils' 'boost' 'python-sphinx' 'mm-common')
+depends=('gettext' 'boost-libs' 'libgdamm' 'libxml++' 'python2-gobject' 'libepc' 'goocanvasmm' 'gtksourceviewmm' 'evince' 'postgresql')
+makedepends=('intltool' 'gnome-doc-utils' 'python-sphinx' 'boost')
 options=('!libtool')
 install=$pkgname.install
-source=(http://ftp.gnome.org/pub/GNOME/sources/glom/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-md5sums=('9ae56e0886f14a48cedaef9beb9c3cc9')
+source=(http://ftp.gnome.org/pub/GNOME/sources/glom/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('c28ead8b37d31550c295004de50e0dc09debd3af665691b852737330bf68514d')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
 
-  # doctooldir is now owned by mm-common-util instead of glibmm
-  # the following sed line can be removed once (if) upstream provides a fixed
-  # configure script
-  sed -i 's%\(MMDOCTOOLDIR=`$PKG_CONFIG --variable=doctooldir \)glibmm-2.4%\1mm-common-util%' configure
 
   ./configure --prefix=/usr \
     --with-postgres-utils=/usr/bin \
     --disable-scrollkeeper \
     --disable-update-mime-database \
-    --disable-static 
+    --disable-static
   make
 }
 
diff --git a/community/goocanvas/PKGBUILD b/community/goocanvas/PKGBUILD
index 1ab22f842..2fdcb31d8 100644
--- a/community/goocanvas/PKGBUILD
+++ b/community/goocanvas/PKGBUILD
@@ -1,22 +1,26 @@
-# $Id: PKGBUILD 41063 2011-03-03 15:31:20Z spupykin $
+# $Id: PKGBUILD 56140 2011-10-02 09:45:13Z ibiru $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=goocanvas
-pkgver=1.0.0
+pkgver=2.0.0
 pkgrel=1
 pkgdesc="A cairo canvas widget for GTK+"
 arch=(i686 x86_64)
 url="http://live.gnome.org/GooCanvas"
 options=('!libtool' 'docs')
 license=("LGPL")
-depends=('gtk2')
-source=(http://ftp.gnome.org/pub/GNOME/sources/goocanvas/1.0/goocanvas-$pkgver.tar.bz2)
-md5sums=('4858a22239e45cf374195bae520021c2')
+depends=('gtk3')
+source=(http://ftp.gnome.org/pub/GNOME/sources/goocanvas/2.0/goocanvas-$pkgver.tar.bz2)
+sha256sums=('9f8d7f700ad9617adef37e63f58cb2d038d799443e3756040f368ceea7f01331')
 
 build() {
   cd $srcdir/goocanvas-$pkgver
-  ./configure --prefix=/usr
+  ./configure --prefix=/usr --disable-static
   make
+}
+
+package() {
+  cd $srcdir/goocanvas-$pkgver
   make DESTDIR=$pkgdir install
 }
diff --git a/community/goocanvas1/PKGBUILD b/community/goocanvas1/PKGBUILD
new file mode 100644
index 000000000..f0124333e
--- /dev/null
+++ b/community/goocanvas1/PKGBUILD
@@ -0,0 +1,26 @@
+# $Id: PKGBUILD 56150 2011-10-02 11:40:26Z ibiru $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Contributor: William Rea <sillywilly@gmail.com>
+
+pkgname=goocanvas1
+pkgver=1.0.0
+pkgrel=1
+pkgdesc="A cairo canvas widget for GTK+"
+arch=(i686 x86_64)
+url="http://live.gnome.org/GooCanvas"
+options=('!libtool' 'docs')
+license=("LGPL")
+depends=('gtk2')
+source=(http://ftp.gnome.org/pub/GNOME/sources/goocanvas/1.0/goocanvas-$pkgver.tar.bz2)
+sha256sums=('1c072ef88567cad241fb4addee26e9bd96741b1503ff736d1c152fa6d865711e')
+
+build() {
+  cd $srcdir/goocanvas-$pkgver
+  ./configure --prefix=/usr --disable-static
+  make
+}
+
+package() {
+  cd $srcdir/goocanvas-$pkgver
+  make DESTDIR=$pkgdir install
+}
diff --git a/community/goocanvasmm/PKGBUILD b/community/goocanvasmm/PKGBUILD
index 536c2d7e0..b7476844b 100755
--- a/community/goocanvasmm/PKGBUILD
+++ b/community/goocanvasmm/PKGBUILD
@@ -3,21 +3,23 @@
 # Contributor: Laurent Meunier <laurent@deltalima.net>
 
 pkgname=goocanvasmm
-pkgver=0.15.4
+pkgver=1.90.5
 pkgrel=1
 pkgdesc='C++ wrappers for goocanvas'
 arch=('i686' 'x86_64')
 url='http://ftp.gnome.org/pub/gnome/sources/goocanvasmm/'
 license=('GPL')
-depends=('gegl' 'goocanvas' 'glibmm' 'gtkmm')
-source=("http://ftp.gnome.org/pub/gnome/sources/goocanvasmm/${pkgver:0:4}/goocanvasmm-${pkgver}.tar.bz2")
-md5sums=('cf462e8d2f36f4e02387eb094773b3e9')
+depends=('goocanvas' 'gtkmm3')
+options=('!libtool')
+source=(http://ftp.gnome.org/pub/gnome/sources/goocanvasmm/1.90/goocanvasmm-${pkgver}.tar.xz)
+sha256sums=('9648e6fc6c41fceea348571b7db4421748bab7fbd7799700245890b63ae1b4b6')
 
 build() {
   cd ${pkgname}-${pkgver}
 
   ./configure \
     --prefix=/usr \
+    --disable-static \
     --disable-documentation
 
   make
diff --git a/community/gtksourceviewmm/PKGBUILD b/community/gtksourceviewmm/PKGBUILD
new file mode 100644
index 000000000..ad2c08025
--- /dev/null
+++ b/community/gtksourceviewmm/PKGBUILD
@@ -0,0 +1,27 @@
+#$Id: PKGBUILD 56144 2011-10-02 10:45:47Z ibiru $
+# Maintainer: Ionut Biru <ibiru@archlinux.org>
+
+pkgname=gtksourceviewmm
+pkgver=3.2.0
+pkgrel=1
+pkgdesc="provides C++ bindings for gtksourceview library"
+arch=(i686 x86_64)
+url="http://gnome.org"
+license=('LGPL2.1')
+depends=('gtkmm3' 'gtksourceview3')
+options=(!libtool)
+source=("http://download.gnome.org/sources/$pkgname/3.2/$pkgname-$pkgver.tar.xz")
+sha256sums=('9dc0c44f00627e434a36ac7c3a34d9c30ebe45eb6dc682dc733a85dcead2ba66')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/ibus-chewing/PKGBUILD b/community/ibus-chewing/PKGBUILD
index 9fda24ce7..cbec4f962 100644
--- a/community/ibus-chewing/PKGBUILD
+++ b/community/ibus-chewing/PKGBUILD
@@ -1,3 +1,4 @@
+# $Id: PKGBUILD 56125 2011-10-02 04:43:30Z ebelanger $
 # Maintainer: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Rainy <rainylau(at)gmail(dot)com>
 # Contributor: Lee.MaRS <leemars@gmail.com>
@@ -5,35 +6,31 @@
 
 pkgname=ibus-chewing
 pkgver=1.3.9.2
-pkgrel=3
+pkgrel=4
 pkgdesc='Chinese Chewing Engine for IBus Framework'
 arch=('i686' 'x86_64')
 license=('GPL')
 url='http://ibus.googlecode.com'
 depends=('ibus' 'libchewing' 'libxtst' 'gconf')
 makedepends=('swig' 'cmake' 'gob2')
-install="${pkgname}.install"
+install=ibus-chewing.install
 source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}-Source.tar.gz")
 md5sums=('8d177d67647944f5d1f9cca0654eaccb')
 
 build() {
-  cd ${pkgname}-${pkgver}-Source
+  cd "${srcdir}/${pkgname}-${pkgver}-Source"
 
   cmake \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DSYSCONF_INSTALL_DIR=/usr/share \
+    -DLIBEXEC_DIR=/usr/lib/ibus \
     .
 
   make
 }
 
 package() {
-  cd ${pkgname}-${pkgver}-Source
+  cd "${srcdir}/${pkgname}-${pkgver}-Source"
 
-  make DESTDIR=${pkgdir} install
-
-  # check up on http://code.google.com/p/ibus/issues/detail?id=1172 to fix nonstandard path
-  install -d ${pkgdir}/usr/lib/ibus
-  mv ${pkgdir}/usr/libexec/ibus-engine-chewing ${pkgdir}/usr/lib/ibus/ibus-engine-chewing
-  sed -i 's#/usr/libexec/ibus-engine-chewing#/usr/lib/ibus/ibus-engine-chewing#' ${pkgdir}/usr/share/ibus/component/chewing.xml
+  make DESTDIR="${pkgdir}" install
 }
diff --git a/community/ibus-hangul/PKGBUILD b/community/ibus-hangul/PKGBUILD
index 6191465bf..c9385ed9b 100644
--- a/community/ibus-hangul/PKGBUILD
+++ b/community/ibus-hangul/PKGBUILD
@@ -1,22 +1,23 @@
-# $Id: PKGBUILD 53477 2011-08-03 21:36:31Z ebelanger $
+# $Id: PKGBUILD 56129 2011-10-02 08:05:56Z ebelanger $
 # Maintainer: Thomas Dziedzic < gostrc at gmail >
 # Contributor: Radim Hvizdák <hvizdakr at gmail dot com>
 
 pkgname=ibus-hangul
 pkgver=1.3.1
-pkgrel=1
+pkgrel=2
 pkgdesc='Korean input engine for IBus'
 arch=('i686' 'x86_64')
 url='http://ibus.googlecode.com'
 license=('GPL')
 depends=('ibus' 'libhangul')
 makedepends=('intltool')
-source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz")
-md5sums=('b71565bba3a1439a47212611b774ecf7')
+source=(http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz ibus-1.4.0.patch)
+md5sums=('b71565bba3a1439a47212611b774ecf7'
+         'edf93824ab2eead1307088d3edc24dbc')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-
+  patch -p1 -i "${srcdir}/ibus-1.4.0.patch"
   ./configure \
     --prefix=/usr \
     --libexecdir=/usr/lib/ibus
diff --git a/community/ibus-hangul/ibus-1.4.0.patch b/community/ibus-hangul/ibus-1.4.0.patch
new file mode 100644
index 000000000..0c043d374
--- /dev/null
+++ b/community/ibus-hangul/ibus-1.4.0.patch
@@ -0,0 +1,58 @@
+diff -Naur ibus-hangul-1.3.1-orig/configure.ac ibus-hangul-1.3.1/configure.ac
+--- ibus-hangul-1.3.1-orig/configure.ac	2011-10-02 03:36:02.000000000 -0400
++++ ibus-hangul-1.3.1/configure.ac	2011-10-02 03:37:01.000000000 -0400
+@@ -52,7 +52,7 @@
+ 
+ # check ibus
+ PKG_CHECK_MODULES(IBUS, [
+-    ibus-1.0 >= 1.2.99
++    ibus-1.0 >= 1.3.99
+ ])
+ 
+ # check libhangul
+diff -Naur ibus-hangul-1.3.1-orig/src/engine.c ibus-hangul-1.3.1/src/engine.c
+--- ibus-hangul-1.3.1-orig/src/engine.c	2011-10-02 03:36:02.000000000 -0400
++++ ibus-hangul-1.3.1/src/engine.c	2011-10-02 03:37:51.000000000 -0400
+@@ -175,8 +194,7 @@
+ void
+ ibus_hangul_init (IBusBus *bus)
+ {
+-    gboolean res;
+-    GValue value = { 0, };
++    GVariant* value;
+ 
+     hanja_table = hanja_table_load (NULL);
+ 
+@@ -187,22 +205,22 @@
+         g_object_ref_sink (config);
+ 
+     hangul_keyboard = g_string_new_len ("2", 8);
+-    res = ibus_config_get_value (config, "engine/Hangul",
+-                                         "HangulKeyboard", &value);
+-    if (res) {
+-        const gchar* str = g_value_get_string (&value);
++    value = ibus_config_get_value (config, "engine/Hangul",
++                                         "HangulKeyboard");
++    if (value != NULL) {
++        const gchar* str = g_variant_get_string (value, NULL);
+         g_string_assign (hangul_keyboard, str);
+-        g_value_unset(&value);
++        g_variant_unref(value);
+     }
+ 
+     hanja_key_list_init(&hanja_keys);
+ 
+-    res = ibus_config_get_value (config, "engine/Hangul",
+-                                         "HanjaKeys", &value);
+-    if (res) {
+-        const gchar* str = g_value_get_string (&value);
++    value = ibus_config_get_value (config, "engine/Hangul",
++                                         "HanjaKeys");
++    if (value != NULL) {
++        const gchar* str = g_variant_get_string (value, NULL);
+         hanja_key_list_set_from_string(&hanja_keys, str);
+-        g_value_unset(&value);
++        g_variant_unref(value);
+     } else {
+ 	hanja_key_list_append(&hanja_keys, IBUS_Hangul_Hanja, 0);
+ 	hanja_key_list_append(&hanja_keys, IBUS_F9, 0);
diff --git a/community/ibus-pinyin/PKGBUILD b/community/ibus-pinyin/PKGBUILD
index 199e4534d..c410dc245 100644
--- a/community/ibus-pinyin/PKGBUILD
+++ b/community/ibus-pinyin/PKGBUILD
@@ -1,28 +1,28 @@
-# $Id: PKGBUILD 31706 2010-11-04 13:42:40Z ibiru $
+# $Id: PKGBUILD 56127 2011-10-02 07:12:20Z ebelanger $
 # Contributor: Rainy <rainylau(at)gmail(dot)com>
 # Contributor: Lee.maRS<leemars at gmail.com>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=ibus-pinyin
-pkgver=1.3.11
-pkgrel=2
+pkgver=1.3.99.20110706
+pkgrel=1
 pkgdesc='The PinYin Engine for IBus Input Framework.'
 arch=('i686' 'x86_64')
 license=('LGPL')
 url='http://ibus.googlecode.com'
-depends=('ibus' 'libsigc++2.0' 'boost-libs')
-makedepends=('intltool' 'boost')
-install="${pkgname}.install"
+depends=('ibus')
+makedepends=('intltool')
+install=ibus-pinyin.install
 source=("http://ibus.googlecode.com/files/${pkgname}-${pkgver}.tar.gz"
         "http://ibus.googlecode.com/files/pinyin-database-1.2.99.tar.bz2")
-md5sums=('c49b2ccaae1f4e3c5cfbd25af6bea51a'
+md5sums=('0d9d5d78106c2d36c28a00b74aa9a6c3'
          'd0951b8daa7f56a2cbd3b6b4e42532e0')
 
 build() {
-  ln -sf ${srcdir}/pinyin-database-1.2.99.tar.bz2 \
-    ${srcdir}/${pkgname}-${pkgver}/data/db/open-phrase
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  cd ${pkgname}-${pkgver}
+  ln -sf "${srcdir}/pinyin-database-1.2.99.tar.bz2" \
+    "${srcdir}/${pkgname}-${pkgver}/data/db/open-phrase"
 
   sed -i -e "s|python|python2|" data/db/android/create_db.py \
       setup/ibus-setup-pinyin.in
@@ -36,7 +36,7 @@ build() {
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
-  make NO_INDEX=true DESTDIR=${pkgdir} install
+  make NO_INDEX=true DESTDIR="${pkgdir}" install
 }
diff --git a/community/ibus-pinyin/ibus-pinyin.install b/community/ibus-pinyin/ibus-pinyin.install
index d9ad92426..3771d9bec 100644
--- a/community/ibus-pinyin/ibus-pinyin.install
+++ b/community/ibus-pinyin/ibus-pinyin.install
@@ -1,6 +1,6 @@
 post_install() {
     echo "Creating INDEX. Please wait..."
-    cd /usr/share/ibus-pinyin/db
+    cd usr/share/ibus-pinyin/db
     echo "Creating index for android.db..."
     sqlite3 android.db '.read create_index.sql'
     echo "Creating index for open-phrase.db..."
diff --git a/community/libgda4/PKGBUILD b/community/libgda4/PKGBUILD
new file mode 100644
index 000000000..9c2580c99
--- /dev/null
+++ b/community/libgda4/PKGBUILD
@@ -0,0 +1,36 @@
+# $Id: PKGBUILD 56164 2011-10-02 14:06:33Z jelle $
+# Maintainer: tobias <tobias@archlinux.org>
+# Contributor: Tobias Kieslich <tobias@justdreams.de>
+
+pkgname=libgda4
+pkgver=4.2.9
+pkgrel=1
+pkgdesc="Data abstraction layer with mysql, pgsql, xml, sqlite providers"
+arch=(i686 x86_64)
+license=('GPL')
+depends=('gtksourceview2' 'libunique' 'libxslt' 'db' 'ncurses' 'libsoup'
+         'libmysqlclient' 'postgresql-libs' 'python2' 'libgnome-keyring'
+         'hicolor-icon-theme' 'desktop-file-utils')
+makedepends=('intltool' 'gobject-introspection' )
+options=('!libtool')
+url="http://www.gnome-db.org"
+install=libgda.install
+source=(http://ftp.gnome.org/pub/GNOME/sources/libgda/${pkgver%.*}/libgda-${pkgver}.tar.xz)
+sha256sums=('bbae913734b0bf0149b36d1b8617e343f08611c10219fa5ba24b84dfa782e814')
+
+build() {
+  cd "${srcdir}/libgda-${pkgver}"
+  sed -i '1s/python$/&2/' libgda-report/RML/trml*/trml*.py
+  ./configure --prefix=/usr --sysconfdir=/etc \
+      --with-bdb=/usr --with-bdb-libdir-name=lib \
+      --disable-static \
+      --disable-gtk-doc 
+  make
+}
+
+package() {
+  cd "${srcdir}/libgda-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  rm -rf $pkgdir/usr/share/icons
+  rm -rf $pkgdir/usr/share/gtk-doc
+}
diff --git a/community/libgda4/libgda.install b/community/libgda4/libgda.install
new file mode 100644
index 000000000..c317fbaca
--- /dev/null
+++ b/community/libgda4/libgda.install
@@ -0,0 +1,12 @@
+post_install() {
+  update-desktop-database -q
+  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
+}
+
+post_upgrade() {
+  post_install
+}
+
+post_remove() {
+  post_install
+}
diff --git a/community/libgdamm/PKGBUILD b/community/libgdamm/PKGBUILD
index cf58ad50a..1bca39c24 100644
--- a/community/libgdamm/PKGBUILD
+++ b/community/libgdamm/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 33284 2010-11-23 19:29:36Z heftig $
+# $Id: PKGBUILD 56138 2011-10-02 09:24:08Z ibiru $
+# Maintainer : Ionut Biru <ibiru@archlinux.org>
 # Contributor: Jan de Groot <jan@jgc.homeip.net>
 
 pkgbase=libgdamm
 pkgname=(libgdamm libgdamm-docs)
-pkgver=4.1.1
+pkgver=4.99.4
 pkgrel=1
 arch=('i686' 'x86_64')
-makedepends=('libgda>=4.2.1' 'libsigc++' 'glibmm>=2.24.2' 'glibmm-docs>=2.24.2')
+makedepends=('libgda' 'libsigc++' 'glibmm' 'glibmm-docs')
 url="http://gtkmm.sourceforge.net/"
 license=('LGPL')
 options=('!libtool' '!emptydirs')
-source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgbase/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
-md5sums=('6f57b0362698420cd855539cf61be388')
+source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgbase/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
+sha256sums=('08431875745abf85d0a1f0bde5ca273f400395b209fb6c4a5ca87fb87a5f67f0')
 
 build() {
   cd "${srcdir}/${pkgbase}-${pkgver}"
@@ -21,7 +22,7 @@ build() {
 
 package_libgdamm() {
   pkgdesc="C++ bindings for libgda"
-  depends=('libgda>=4.2.1' 'glibmm>=2.24.2' 'libsigc++')
+  depends=('libgda' 'glibmm' 'libsigc++')
   cd "${srcdir}/${pkgbase}-${pkgver}"
 
   sed -i -e 's/^doc_subdirs/#doc_subdirs/' Makefile
diff --git a/community/pygoocanvas/PKGBUILD b/community/pygoocanvas/PKGBUILD
index e37d43881..3f5affbc8 100644
--- a/community/pygoocanvas/PKGBUILD
+++ b/community/pygoocanvas/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 27121 2010-09-17 15:17:17Z schuay $
+# $Id: PKGBUILD 56152 2011-10-02 11:46:05Z ibiru $
 # Maintainer: Douglas Soares de Andrade <dsandrade@gmail.com>
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=pygoocanvas
 pkgver=0.14.1
-pkgrel=3
+pkgrel=4
 pkgdesc="GooCanvas python bindings"
 arch=('i686' 'x86_64')
 url="http://developer.berlios.de/projects/pygoocanvas"
 license=('LGPL')
-depends=('python2' 'goocanvas' 'pygtk')
+depends=('python2' 'goocanvas1' 'pygtk')
 makedepends=('pkgconfig')
-options=('!libtool' 'docs' 'force')
+options=('!libtool' 'docs')
 source=(http://ftp.gnome.org/pub/GNOME/sources/pygoocanvas/0.14/pygoocanvas-$pkgver.tar.bz2)
 md5sums=('e0e7b694af2f81a78b0838555d150252')
 
@@ -19,5 +19,9 @@ build() {
   cd "$srcdir/pygoocanvas-$pkgver"
   ./configure --prefix=/usr --disable-docs
   make
+}
+
+package() {
+   cd "$srcdir/pygoocanvas-$pkgver"
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/synfig/PKGBUILD b/community/synfig/PKGBUILD
index 4a0b6d1b9..d720c5fa5 100644
--- a/community/synfig/PKGBUILD
+++ b/community/synfig/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 55936 2011-09-26 09:39:06Z spupykin $
+# $Id: PKGBUILD 56131 2011-10-02 08:08:49Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Franco Iacomella <yaco@gnu.org>
 
 pkgname=synfig
-pkgver=0.63.01
+pkgver=0.63.02
 pkgrel=1
 pkgdesc="Professional vector animation program (CLI renderer only)"
 arch=(i686 x86_64)
@@ -17,7 +17,7 @@ replaces=('synfig-core')
 options=(!libtool)
 source=(http://downloads.sourceforge.net/project/synfig/synfig/$pkgver/synfig-$pkgver.tar.gz
 	build-fix.patch)
-md5sums=('2ff9271324c322266be048c4a0a22b5b'
+md5sums=('4286d5e1887275107d760d1b678aec24'
          '2de5e74159a38e4b1788c20d4c4b6f68')
 
 build() {
diff --git a/community/synfigstudio/PKGBUILD b/community/synfigstudio/PKGBUILD
index b10b44c2d..cd9990a7d 100644
--- a/community/synfigstudio/PKGBUILD
+++ b/community/synfigstudio/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 55938 2011-09-26 09:40:28Z spupykin $
+# $Id: PKGBUILD 56133 2011-10-02 08:10:11Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Franco Iacomella <yaco@gnu.org>
 
 pkgname=synfigstudio
-pkgver=0.63.01
+pkgver=0.63.02
 pkgrel=1
 pkgdesc="Professional vector animation program (GUI)"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ makedepends=('openexr' 'imagemagick' 'xorg-fonts-100dpi' 'xorg-fonts-75dpi'
 	     'xorg-fonts-misc' 'xorg-fonts-type1')
 install=synfigstudio.install
 source=(http://downloads.sourceforge.net/project/synfig/synfigstudio/$pkgver/synfigstudio-$pkgver.tar.gz)
-md5sums=('b77e3e8f449753dab07425d1d4460b72')
+md5sums=('939595974cc56551fa89ae4f4dddbfb0')
 
 build() {
   cd $srcdir/synfigstudio-$pkgver
diff --git a/community/tasks/PKGBUILD b/community/tasks/PKGBUILD
index 2d9e4f2e2..3204bd603 100644
--- a/community/tasks/PKGBUILD
+++ b/community/tasks/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 45229 2011-04-18 13:02:11Z spupykin $
+# $Id: PKGBUILD 56135 2011-10-02 08:11:48Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Geoffroy Carrier <geoffroy.carrier@aur.archlinux.org>
 # Contributor: lp76 <l.peduto@gmail.com>
 
 pkgname=tasks
 pkgver=0.19
-pkgrel=1
+pkgrel=2
 pkgdesc="A simple to do list application that uses libecal"
 arch=(i686 x86_64)
 url="http://pimlico-project.org/tasks.html"
 license=('GPL')
-depends=('evolution-data-server>=2.32.0' 'xdg-utils' 'gtk2')
+depends=('evolution-data-server>=3.2.0' 'xdg-utils' 'gtk2')
 makedepends=('intltool')
 install=tasks.install
 source=(http://pimlico-project.org/sources/tasks/$pkgname-$pkgver.tar.gz)
diff --git a/community/wt/PKGBUILD b/community/wt/PKGBUILD
index d0024d3f5..0ca32716f 100644
--- a/community/wt/PKGBUILD
+++ b/community/wt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 52510 2011-07-25 22:14:25Z spupykin $
+# $Id: PKGBUILD 56173 2011-10-02 20:43:18Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Denis Martinez <deuns.martinez@gmail.com>
 
 pkgname=wt
-pkgver=3.1.10
-pkgrel=3
+pkgver=3.1.11
+pkgrel=1
 pkgdesc="a C++ library and application server for developing and deploying web applications"
 arch=('i686' 'x86_64')
 url="http://www.webtoolkit.eu/"
@@ -23,14 +23,11 @@ optdepends=('openssl: for SSL support in built-in webserver'
             'mysql++: for the hangman example'
             'qt: for the Wt/Qt interopability example (wtwithqt)')
 backup=('etc/wt/wt_config.xml')
-source=(http://downloads.sourceforge.net/witty/$pkgname-${pkgver}.tar.gz
-	wt-boost-1.47.patch)
-md5sums=('535945f48f479e74b893adf5b1a857b7'
-         '9374ca2e0af1e951d585872ffface805')
+source=(http://downloads.sourceforge.net/witty/$pkgname-${pkgver}.tar.gz)
+md5sums=('0e1701db78a899d1f7e943098678cc7a')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
-  patch -Rp1 <$srcdir/wt-boost-1.47.patch
   mkdir -p build
   cd build
   cmake -DCONNECTOR_HTTP=ON -DCMAKE_INSTALL_PREFIX=/usr \
diff --git a/extra/claws-mail-extra-plugins/PKGBUILD b/extra/claws-mail-extra-plugins/PKGBUILD
index b263ff58b..e252bbe96 100644
--- a/extra/claws-mail-extra-plugins/PKGBUILD
+++ b/extra/claws-mail-extra-plugins/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 136389 2011-08-28 17:30:33Z andyrtr $
+# $Id: PKGBUILD 139484 2011-10-02 07:11:06Z andyrtr $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Mildred <mildred593 at online dot fr>
 
 pkgname=claws-mail-extra-plugins
 pkgver=3.7.10
-pkgrel=1
+pkgrel=2
 pkgdesc="Extra plugins for claws-mail"
 url="http://www.claws-mail.org/plugins.php?branch=EXT"
 license=('GPL3')
 arch=('i686' 'x86_64')
 depends=('claws-mail>=3.7.10')
 makedepends=('make' 'bc' 'perl>=5.10.1-5' 'libgtkhtml>=2.11.1-2' 'libnotify>=0.7'
-             'libxml2>=2.7.6' 'curl>=7.19.7' 'libytnef>=1.5-2' 'libwebkit>=1.3.13'
+             'libxml2>=2.7.6' 'curl>=7.19.7' 'libytnef>=1.5-2' 'libwebkit>=1.6.1'
              'pygtk>=2.16.0' 'libsoup-gnome' 'libcanberra' 'libgdata')
 optdepends=('libgtkhtml: for gtkhtml2_viewer plugin'
             'perl: for perl plugin'
@@ -32,15 +32,27 @@ conflicts=('claws-gtkhtml2_viewer' 'claws-mail-acpinotifier-plugin'
            'claws-webkit-plugin-svn' 'claws-mayflower-plugin-svn')
 replaces=('sylpheed-claws-extra-plugins')
 options=('!libtool' '!strip')
-source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2)
-md5sums=('fe782b2d4762c9727e22c1bb7979f7d6')
+source=(http://downloads.sourceforge.net/project/sylpheed-claws/extra%20plugins/$pkgver/claws-mail-extra-plugins-$pkgver.tar.bz2
+	webkit1.6.1.patch)
+md5sums=('fe782b2d4762c9727e22c1bb7979f7d6'
+         '8b94fa44072331b9c3926607eb42ba26')
+sha1sums=('c5200936cb4811022774e960dc3f43d19eb320cf'
+          '8efd800617406dfe58a14422f243a678c582a90d')
 
 build() {
   cd "$srcdir/claws-mail-extra-plugins-$pkgver"
 
+  # fix for new webkit api
+  pushd fancy*
+  patch -Np0 -i ${srcdir}/webkit1.6.1.patch
+  popd
+
   # fix for python2
   export PYTHON="/usr/bin/python2"
 
+  # fix gdata plugin build
+  sed -i -e "s:libgdata\ <\ 0.9.0:libgdata\ <\ 0.11.0:g" gdata_plugin-0.2/configure
+ 
   for dir in */; do
     [[ $dir != geolocation_plugin-* ]] && (
       cd $dir
diff --git a/extra/claws-mail-extra-plugins/webkit1.6.1.patch b/extra/claws-mail-extra-plugins/webkit1.6.1.patch
new file mode 100644
index 000000000..82bc5d062
--- /dev/null
+++ b/extra/claws-mail-extra-plugins/webkit1.6.1.patch
@@ -0,0 +1,106 @@
+--- src/fancy_viewer.c	2011-07-01 11:50:25.000000000 +0200
++++ src/fancy_viewer.c	2011-09-30 06:02:45.000000000 +0200
+@@ -83,8 +83,10 @@
+ static void download_file_cb(GtkWidget *widget, FancyViewer *viewer);
+ #endif
+ 
+-/*FIXME substitute webkitwebsettings.cpp functions with their API when available */
+-gchar* webkit_web_view_get_selected_text(WebKitWebView* webView);
++#if !WEBKIT_CHECK_VERSION (1,5,1)
++gchar* webkit_web_view_get_selected_text(WebKitWebView* web_view);
++#endif
++
+ /*------*/
+ static GtkWidget *fancy_get_widget(MimeViewer *_viewer)
+ {
+@@ -243,6 +245,8 @@
+ 
+ 	gtk_print_unix_dialog_set_manual_capabilities(print_dialog,
+ 												  GTK_PRINT_CAPABILITY_GENERATE_PS);
++	gtk_print_unix_dialog_set_manual_capabilities(print_dialog,
++												  GTK_PRINT_CAPABILITY_PREVIEW);
+ 
+ 	result = gtk_dialog_run (GTK_DIALOG (dialog));
+ 	gtk_widget_hide (dialog);
+@@ -293,7 +297,19 @@
+ {
+ 	debug_print("fancy_get_selection\n");
+ 	FancyViewer *viewer = (FancyViewer *) _viewer;
++#if WEBKIT_CHECK_VERSION(1,5,1)
++	viewer->doc = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(viewer->view));
++	viewer->window = webkit_dom_document_get_default_view (viewer->doc);
++	viewer->selection = webkit_dom_dom_window_get_selection (viewer->window);
++	if (viewer->selection == NULL)
++		return NULL;
++	viewer->range = webkit_dom_dom_selection_get_range_at(viewer->selection, 0, NULL);
++	if (viewer->range == NULL)
++		return NULL;
++	gchar *sel = webkit_dom_range_get_text (viewer->range);
++#else
+ 	gchar *sel = webkit_web_view_get_selected_text(viewer->view);
++#endif
+ 	if (!viewer->view || strlen(sel) == 0) {
+ 		g_free(sel);
+ 		return NULL;
+@@ -686,7 +702,15 @@
+ 	debug_print("Clicked on Search on Web\n");
+ 	if (webkit_web_view_has_selection(viewer->view)) {
+ 		gchar *search;
++#if WEBKIT_CHECK_VERSION(1,5,1)
++		viewer->doc = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(viewer->view));
++		viewer->window = webkit_dom_document_get_default_view (viewer->doc);
++		viewer->selection = webkit_dom_dom_window_get_selection (viewer->window);
++		viewer->range = webkit_dom_dom_selection_get_range_at(viewer->selection, 0, NULL);
++		gchar *tmp = webkit_dom_range_get_text (viewer->range);
++#else
+ 		gchar *tmp = webkit_web_view_get_selected_text(viewer->view);
++#endif
+ 		search = g_strconcat(GOOGLE_SEARCH, tmp, NULL);
+ 		webkit_web_view_open(viewer->view, search);
+ 		g_free(search);
+@@ -896,7 +920,6 @@
+ static gboolean populate_popup_cb (WebKitWebView *view, GtkWidget *menu, 
+ 								   FancyViewer *viewer)
+ {
+-	/*FIXME hack..until webkit does not give the proper way to handle it*/
+ 	Plugin *plugin = plugin_get_loaded_by_name("RSSyl");
+ 	gtk_container_foreach(GTK_CONTAINER(menu), 
+ 						  (GtkCallback)viewer_menu_handler, 
+@@ -941,7 +964,19 @@
+ 	if (webkit_web_view_can_copy_clipboard(view)) {
+ 		GtkClipboard *wv_clipboard = gtk_clipboard_get(GDK_SELECTION_PRIMARY);
+ 		const gchar *sel_text;
+-		sel_text = (const gchar*)webkit_web_view_get_selected_text(view);
++#if WEBKIT_CHECK_VERSION(1,5,1)
++		viewer->doc = webkit_web_view_get_dom_document(WEBKIT_WEB_VIEW(viewer->view));
++		viewer->window = webkit_dom_document_get_default_view (viewer->doc);
++		viewer->selection = webkit_dom_dom_window_get_selection (viewer->window);
++		if (viewer->selection == NULL)
++			return NULL;
++		viewer->range = webkit_dom_dom_selection_get_range_at(viewer->selection, 0, NULL);
++		if (viewer->range == NULL)
++			return NULL;
++		sel_text = (const *gchar)webkit_dom_range_get_text (viewer->range);
++#else
++		sel_text = (const *gchar)webkit_web_view_get_selected_text(viewer->view);
++#endif
+ 		gtk_clipboard_set_text(wv_clipboard, sel_text, -1);
+ 	}
+ 	return FALSE;
+--- src/fancy_viewer.h	2011-07-01 11:50:25.000000000 +0200
++++ src/fancy_viewer.h	2011-09-30 06:02:45.000000000 +0200
+@@ -113,6 +113,14 @@
+ 	gint              tag;
+ 	gint              loading;
+ 	gint              stop_previous;
++
++	/* DOM Objects */
++#if WEBKIT_CHECK_VERSION(1,5,1)
++	WebKitDOMDocument	  *doc;
++	WebKitDOMDOMWindow    *window;
++	WebKitDOMDOMSelection *selection;
++	WebKitDOMRange		  *range;
++#endif
+ };
+ #define OPEN_INTERNAL FALSE
+ #define OPEN_EXTERNAL TRUE
diff --git a/extra/gnome-python-extras/PKGBUILD b/extra/gnome-python-extras/PKGBUILD
index ed65bc42a..18d6b3de3 100644
--- a/extra/gnome-python-extras/PKGBUILD
+++ b/extra/gnome-python-extras/PKGBUILD
@@ -1,14 +1,14 @@
-# $Id: PKGBUILD 131702 2011-07-13 15:39:40Z ibiru $
+# $Id: PKGBUILD 139493 2011-10-02 11:50:40Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgbase=gnome-python-extras
-pkgname=('gnome-python-extras' 'python2-egg' 'python2-gda' 'python2-gksu2' 'python2-gtkhtml2' 'python2-gtkspell')
+pkgname=('gnome-python-extras' 'python2-egg' 'python2-gksu2' 'python2-gtkhtml2' 'python2-gtkspell')
 pkgver=2.25.3
-pkgrel=10
+pkgrel=11
 arch=('i686' 'x86_64')
 url="http://www.daa.com.au/~james/pygtk/"
 license=('GPL' 'LGPL')
-makedepends=('libgtkhtml' 'gtkspell' 'libgksu' 'libgnomeui' 'libgda' 'python2' 'pygtk' 'gnome-python')
+makedepends=('libgtkhtml' 'gtkspell' 'libgksu' 'libgnomeui' 'python2' 'pygtk' 'gnome-python')
 options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/gnome-python-extras/2.25/gnome-python-extras-${pkgver}.tar.bz2
 	gnome-python-extras-2.25.3-update-for-2.27.2.patch)
@@ -24,7 +24,7 @@ build() {
 
 package_gnome-python-extras() {
     pkgdesc="Gnome Python interfaces for libraries not part of the core platform"
-    depends=('python2-egg' 'python2-gda' 'python2-gksu2' 'python2-gtkhtml2' 'python2-gtkspell')
+    depends=('python2-egg' 'python2-gksu2' 'python2-gtkhtml2' 'python2-gtkspell')
 
     cd "${srcdir}/gnome-python-extras-${pkgver}"
     make install-pkgconfigDATA DESTDIR="${pkgdir}"
@@ -38,14 +38,6 @@ package_python2-egg(){
     make -C egg install DESTDIR="${pkgdir}"
 }
 
-package_python2-gda(){
-    pkgdesc="Python bindings for interacting with gda"
-    depends=('libgda' 'pygtk')
-
-    cd "${srcdir}/gnome-python-extras-${pkgver}"
-    make -C gda install DESTDIR="${pkgdir}"
-}
-
 package_python2-gksu2() {
     pkgdesc="Python bindings for the gksu2"
     depends=('libgksu' 'pygtk')
diff --git a/extra/liboauth/PKGBUILD b/extra/liboauth/PKGBUILD
new file mode 100644
index 000000000..1af7a2b70
--- /dev/null
+++ b/extra/liboauth/PKGBUILD
@@ -0,0 +1,29 @@
+# $Id: PKGBUILD 139509 2011-10-02 17:00:45Z heftig $
+# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
+# Contributor: Kaiting Chen <kaitocracy@gmail.com>
+# Contributor: Martin Häger <martin.haeger@gmail.com>
+
+pkgname=liboauth
+pkgver=0.9.4
+pkgrel=2
+pkgdesc='C library implementing OAuth Core RFC 5849'
+arch=('i686' 'x86_64')
+url='http://liboauth.sourceforge.net'
+license=('MIT')
+depends=('curl')
+options=('!libtool')
+source=("$url/pool/$pkgname-$pkgver.tar.gz")
+sha256sums=('77e372359caca5375fbcc63ac638f349e6c93c98d291992d8ebb9bb8291ca549')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr --disable-static
+  make
+
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  make DESTDIR="$pkgdir" install
+  install -Dm644 COPYING.MIT "$pkgdir/usr/share/licenses/$pkgname/COPYING"
+}
diff --git a/extra/mercurial/PKGBUILD b/extra/mercurial/PKGBUILD
index ba793daa7..eb16fa797 100644
--- a/extra/mercurial/PKGBUILD
+++ b/extra/mercurial/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 136368 2011-08-27 23:37:57Z giovanni $
+# $Id: PKGBUILD 139517 2011-10-02 23:55:56Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgname=mercurial
-pkgver=1.9.2
+pkgver=1.9.3
 pkgrel=1
 pkgdesc="A scalable distributed SCM tool"
 arch=('i686' 'x86_64')
@@ -12,9 +12,9 @@ license=('GPL')
 depends=('python2')
 optdepends=('tk: for the hgk GUI')
 backup=('etc/mercurial/hgrc')
-source=(http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz
-        mercurial.profile)
-md5sums=('0bda8040e2626e70d3d1a0654b0b03f2'
+source=("http://mercurial.selenic.com/release/${pkgname}-${pkgver}.tar.gz"
+        'mercurial.profile')
+md5sums=('f309b084aaf58773e9f4f4d66c49622a'
          '43e1d36564d4c7fbe9a091d3ea370a44')
 
 package() {
diff --git a/extra/vte/PKGBUILD b/extra/vte/PKGBUILD
index 863215a31..5cd10f758 100644
--- a/extra/vte/PKGBUILD
+++ b/extra/vte/PKGBUILD
@@ -1,66 +1,35 @@
-# $Id: PKGBUILD 136406 2011-08-29 07:32:55Z ibiru $
+# $Id: PKGBUILD 139491 2011-10-02 09:08:18Z ibiru $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
-pkgbase=vte
-pkgname=(vte vte3 vte-common)
+pkgname=vte
 pkgver=0.28.2
-pkgrel=1
-pkgdesc="Virtual Terminal Emulator widget for use with"
+pkgrel=2
+pkgdesc="Virtual Terminal Emulator widget for use with GTK2"
 arch=('i686' 'x86_64')
 license=('LGPL')
 options=('!libtool' '!emptydirs')
-makedepends=('pygtk' 'intltool' 'gobject-introspection' 'gtk2' 'gtk3' 'pygobject-devel' 'gtk-doc')
+depends=('gtk2' 'vte-common')
+makedepends=('pygtk' 'intltool' 'gobject-introspection' 'pygobject2-devel' 'gtk-doc')
 url="http://www.gnome.org"
 source=(http://ftp.gnome.org/pub/GNOME/sources/vte/0.28/vte-${pkgver}.tar.xz)
 sha256sums=('86cf0b81aa023fa93ed415653d51c96767f20b2d7334c893caba71e42654b0ae')
 
 build() {
-  cd "${srcdir}/${pkgbase}-${pkgver}"
+  cd "${srcdir}/${pkgname}-${pkgver}"
   #warning: type-punning to incomplete type might break strict-aliasing rules
   export CFLAGS="$CFLAGS -fno-strict-aliasing"
 
-  mkdir build-gtk2
-  pushd build-gtk2
-  PYTHON=python2 ../configure --prefix=/usr --sysconfdir=/etc \
+  PYTHON=/usr/bin/python2 ./configure --prefix=/usr --sysconfdir=/etc \
       --libexecdir=/usr/lib/vte \
       --localstatedir=/var --disable-static \
       --enable-introspection --with-gtk=2.0 \
       --enable-gtk-doc
   make
-  popd
-
-  mkdir build-gtk3
-  pushd build-gtk3
-  PYTHON=python2 ../configure --prefix=/usr --sysconfdir=/etc \
-      --libexecdir=/usr/lib/vte \
-      --localstatedir=/var --disable-static \
-      --enable-introspection --with-gtk=3.0 \
-      --enable-gtk-doc
-  make
-  popd
 }
 
-package_vte(){
-  pkgdesc+=" GTK2"
-  depends=('gtk2' 'vte-common')
-  cd "${srcdir}/${pkgbase}-${pkgver}"/build-gtk2
+package(){
+  cd "${srcdir}/${pkgname}-${pkgver}"
   make DESTDIR="${pkgdir}" install
 
   rm "${pkgdir}"/usr/lib/vte/gnome-pty-helper
 }
-
-package_vte3(){
-  pkgdesc+=" GTK3"
-  depends=('gtk3' 'vte-common')
-  cd "${srcdir}/${pkgbase}-${pkgver}"/build-gtk3
-  make DESTDIR="${pkgdir}" install
-
-  rm "${pkgdir}"/usr/lib/vte/gnome-pty-helper
-}
-
-package_vte-common() {
-  pkgdesc="Common files used by vte and vte3"
-  cd "${srcdir}/${pkgbase}-${pkgver}"/build-gtk3
-
-  make -C gnome-pty-helper DESTDIR="${pkgdir}" install
-}
diff --git a/staging/exiv2/PKGBUILD b/staging/exiv2/PKGBUILD
new file mode 100644
index 000000000..1e1b8eb3c
--- /dev/null
+++ b/staging/exiv2/PKGBUILD
@@ -0,0 +1,26 @@
+#$Id: PKGBUILD 139500 2011-10-02 12:29:57Z eric $
+# Maintainer: tobias <tobias@arhlinux.org>
+
+pkgname=exiv2
+pkgver=0.22
+pkgrel=1
+pkgdesc="Exif and Iptc metadata manipulation library and tools"
+arch=('i686' 'x86_64')
+url="http://exiv2.org"
+license=('GPL')
+depends=('gcc-libs' 'zlib' 'expat')
+options=('!libtool')
+source=("http://www.exiv2.org/${pkgname}-${pkgver}.tar.gz")
+md5sums=('84d7d5b1802529efca8ac3d6e6a97e3a')
+sha1sums=('35211d853a986fe1b008fca14db090726e8dcce3')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  CPPFLAGS="-D_FILE_OFFSET_BITS=64" ./configure --prefix=/usr
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/staging/geeqie/PKGBUILD b/staging/geeqie/PKGBUILD
new file mode 100644
index 000000000..4d866be76
--- /dev/null
+++ b/staging/geeqie/PKGBUILD
@@ -0,0 +1,30 @@
+# $Id: PKGBUILD 139502 2011-10-02 12:43:42Z eric $
+# Maintainer: Eric Bélanger <eric@archlinux.org>
+# Contributor: Lukas Jirkovsky <l.jirkovsky@gmail.com>
+
+pkgname=geeqie
+pkgver=1.0
+pkgrel=6
+pkgdesc="A lightweight image browser and viewer (fork of GQview)"
+arch=('i686' 'x86_64')
+url="http://geeqie.sourceforge.net/"
+license=('GPL3')
+depends=('exiv2' 'gtk2' 'lcms' 'desktop-file-utils')
+makedepends=('intltool' 'doxygen' 'gnome-doc-utils')
+optdepends=('librsvg: SVG rendering')
+replaces=('gqview-devel')
+install=geeqie.install
+source=(http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.gz)
+md5sums=('1d67ef990390224c5052697d93bb49c0')
+sha1sums=('8494a557d67d20e6ad720645ec789dd2b33a3266')
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  CPPFLAGS="-D_FILE_OFFSET_BITS=64" ./configure --prefix=/usr
+  make
+}
+
+package(){
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+}
diff --git a/staging/geeqie/geeqie.install b/staging/geeqie/geeqie.install
new file mode 100644
index 000000000..2eaa60550
--- /dev/null
+++ b/staging/geeqie/geeqie.install
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/staging/gimp-ufraw/PKGBUILD b/staging/gimp-ufraw/PKGBUILD
new file mode 100644
index 000000000..1f88b9839
--- /dev/null
+++ b/staging/gimp-ufraw/PKGBUILD
@@ -0,0 +1,35 @@
+# $Id: PKGBUILD 139504 2011-10-02 13:50:06Z eric $
+# Maintainer: Tobias Kieslich <tobias@archlinux.org>
+
+pkgname=gimp-ufraw
+pkgver=0.18
+pkgrel=2
+pkgdesc="Standalone or gimp plugin converter for raw files"
+url="http://ufraw.sourceforge.net/"
+arch=('i686' 'x86_64')
+license=('GPL')
+depends=('gtkimageview' 'exiv2' 'lcms' 'bzip2' 'desktop-file-utils')
+makedepends=('gimp' 'cinepaint')
+optdepends=('gimp: to use the gimp import plugin for raw images'
+            'cinepaint: to use the cinepaint import plugin for raw images')
+install=gimp-ufraw.install
+source=(http://downloads.sourceforge.net/ufraw/ufraw-${pkgver}.tar.gz)
+md5sums=('454f40a402928998a82e2645d9265d96')
+sha1sums=('41c9ad7aa7f1cbb63a6b0b330b3599b18a7e8cd2')
+
+build() {
+  cd "${srcdir}/ufraw-${pkgver}"
+
+  ./configure --prefix=/usr \
+              --enable-extras \
+              --enable-mime \
+              --enable-openmp
+  sed -i "s/-ffast-math -fomit-frame-pointer -W -Wall -O3/${CFLAGS}/" Makefile
+  make
+}
+
+package() {
+  cd "${srcdir}/ufraw-${pkgver}"
+  make DESTDIR="${pkgdir}" install
+  rm -f "${pkgdir}/usr/bin/dcraw"
+}
diff --git a/staging/gimp-ufraw/gimp-ufraw.install b/staging/gimp-ufraw/gimp-ufraw.install
new file mode 100644
index 000000000..80312d4a6
--- /dev/null
+++ b/staging/gimp-ufraw/gimp-ufraw.install
@@ -0,0 +1,11 @@
+post_install() {
+  update-desktop-database -q
+}
+
+post_upgrade() {
+  update-desktop-database -q
+}
+
+post_remove() {
+  update-desktop-database -q
+}
diff --git a/testing/krb5/PKGBUILD b/testing/krb5/PKGBUILD
new file mode 100644
index 000000000..ade7ee1d7
--- /dev/null
+++ b/testing/krb5/PKGBUILD
@@ -0,0 +1,85 @@
+# $Id: PKGBUILD 139515 2011-10-02 20:46:35Z stephane $
+# Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
+
+pkgname=krb5
+pkgver=1.9.1
+pkgrel=4
+pkgdesc="The Kerberos network authentication system"
+arch=('i686' 'x86_64')
+url="http://web.mit.edu/kerberos/"
+license=('custom')
+depends=('e2fsprogs' 'libldap' 'keyutils')
+makedepends=('perl')
+provides=('heimdal')
+replaces=('heimdal')
+conflicts=('heimdal')
+backup=('etc/krb5.conf' 'var/lib/krb5kdc/kdc.conf')
+source=(http://web.mit.edu/kerberos/dist/${pkgname}/1.9/${pkgname}-${pkgver}-signed.tar
+        krb5-kadmind
+        krb5-kdc
+        krb5-1.9.1-config-script.patch
+        krb5-1.9.1-canonicalize-fallback.patch)
+sha1sums=('e23a1795a237521493da9cf3443ac8b98a90c066'
+          '2aa229369079ed1bbb201a1ef72c47bf143f4dbe'
+          '77d2312ecd8bf12a6e72cc8fd871a8ac93b23393'
+          '7342410760cf44bfa01bb99bb4c49e12496cb46f'
+          '238c268fa6cb42fc7324ab54db9abda5cd77f833')
+options=('!emptydirs')
+
+build() {
+   tar zxvf ${pkgname}-${pkgver}.tar.gz
+   cd "${srcdir}/${pkgname}-${pkgver}/src"
+
+   # - Make krb5-config suppress CFLAGS output when called with --libs
+   #   cf https://bugzilla.redhat.com/show_bug.cgi?id=544391
+   #
+   # - Omit extra libraries because their interfaces are not exposed to applications
+   #   by libkrb5, unless do_deps is set to 1, which indicates that the caller
+   #   wants the whole list.
+   #
+   #   Patch from upstream : 
+   #   http://anonsvn.mit.edu/viewvc/krb5/trunk/src/krb5-config.in?r1=23662&r2=25236
+   patch -Np2 -i ${srcdir}/krb5-1.9.1-config-script.patch
+
+   # FS#25515
+   patch -Np2 -i ${srcdir}/krb5-1.9.1-canonicalize-fallback.patch
+
+   # FS#25384
+   sed -i "/KRB5ROOT=/s/\/local//" util/ac_check_krb5.m4
+
+   export CFLAGS+=" -fPIC -fno-strict-aliasing -fstack-protector-all"
+   export CPPFLAGS+=" -I/usr/include/et"
+   ./configure --prefix=/usr \
+               --mandir=/usr/share/man \
+               --localstatedir=/var/lib \
+               --enable-shared \
+               --with-system-et \
+               --with-system-ss \
+               --disable-rpath \
+               --without-tcl \
+               --enable-dns-for-realm \
+               --with-ldap
+   make
+}
+
+package() {
+   cd "${srcdir}/${pkgname}-${pkgver}/src"
+   make DESTDIR="${pkgdir}" EXAMPLEDIR="/usr/share/doc/${pkgname}/examples" install
+
+   # Sample KDC config file
+   install -dm 755 "${pkgdir}"/var/lib/krb5kdc
+   install -pm 644 config-files/kdc.conf "${pkgdir}"/var/lib/krb5kdc/kdc.conf
+
+   # Default configuration file
+   install -dm 755 "${pkgdir}"/etc
+   install -pm 644 config-files/krb5.conf "${pkgdir}"/etc/krb5.conf
+
+   install -dm 755 "${pkgdir}"/etc/rc.d
+   install -m 755 ../../krb5-kdc "${pkgdir}"/etc/rc.d
+   install -m 755 ../../krb5-kadmind  "${pkgdir}"/etc/rc.d
+
+   install -dm 755 "${pkgdir}"/usr/share/aclocal
+   install -m 644 util/ac_check_krb5.m4 "${pkgdir}"/usr/share/aclocal
+
+   install -Dm644 "${srcdir}"/${pkgname}-${pkgver}/NOTICE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
+}
diff --git a/testing/krb5/krb5-1.9.1-canonicalize-fallback.patch b/testing/krb5/krb5-1.9.1-canonicalize-fallback.patch
new file mode 100644
index 000000000..e5a38498f
--- /dev/null
+++ b/testing/krb5/krb5-1.9.1-canonicalize-fallback.patch
@@ -0,0 +1,58 @@
+diff -Naur krb5-1.9.1.ori/src/lib/krb5/krb/get_creds.c krb5-1.9.1/src/lib/krb5/krb/get_creds.c
+--- krb5-1.9.1.ori/src/lib/krb5/krb/get_creds.c	2011-02-09 16:55:36.000000000 -0500
++++ krb5-1.9.1/src/lib/krb5/krb/get_creds.c	2011-09-26 18:42:01.465190278 -0400
+@@ -470,13 +470,10 @@
+ 
+ /***** STATE_REFERRALS *****/
+ 
+-/*
+- * Possibly retry a request in the fallback realm after a referral request
+- * failure in the local realm.  Expects ctx->reply_code to be set to the error
+- * from a referral request.
+- */
++/* Possibly try a non-referral request after a referral request failure.
++ * Expects ctx->reply_code to be set to the error from a referral request. */
+ static krb5_error_code
+-try_fallback_realm(krb5_context context, krb5_tkt_creds_context ctx)
++try_fallback(krb5_context context, krb5_tkt_creds_context ctx)
+ {
+     krb5_error_code code;
+     char **hrealms;
+@@ -485,9 +482,10 @@
+     if (ctx->referral_count > 1)
+         return ctx->reply_code;
+ 
+-    /* Only fall back if the original request used the referral realm. */
++    /* If the request used a specified realm, make a non-referral request to
++     * that realm (in case it's a KDC which rejects KDC_OPT_CANONICALIZE). */
+     if (!krb5_is_referral_realm(&ctx->req_server->realm))
+-        return ctx->reply_code;
++        return begin_non_referral(context, ctx);
+ 
+     if (ctx->server->length < 2) {
+         /* We need a type/host format principal to find a fallback realm. */
+@@ -500,10 +498,10 @@
+     if (code != 0)
+         return code;
+ 
+-    /* Give up if the fallback realm isn't any different. */
++    /* If the fallback realm isn't any different, use the existing TGT. */
+     if (data_eq_string(ctx->server->realm, hrealms[0])) {
+         krb5_free_host_realm(context, hrealms);
+-        return ctx->reply_code;
++        return begin_non_referral(context, ctx);
+     }
+ 
+     /* Rewrite server->realm to be the fallback realm. */
+@@ -540,9 +538,9 @@
+     krb5_error_code code;
+     const krb5_data *referral_realm;
+ 
+-    /* Possibly retry with the fallback realm on error. */
++    /* Possibly try a non-referral fallback request on error. */
+     if (ctx->reply_code != 0)
+-        return try_fallback_realm(context, ctx);
++        return try_fallback(context, ctx);
+ 
+     if (krb5_principal_compare(context, ctx->reply_creds->server,
+                                ctx->server)) {
diff --git a/testing/krb5/krb5-1.9.1-config-script.patch b/testing/krb5/krb5-1.9.1-config-script.patch
new file mode 100644
index 000000000..a72a75edf
--- /dev/null
+++ b/testing/krb5/krb5-1.9.1-config-script.patch
@@ -0,0 +1,27 @@
+diff -Naur krb5-1.9.1.ori/src/krb5-config.in krb5-1.9.1/src/krb5-config.in
+--- krb5-1.9.1.ori/src/krb5-config.in	2010-01-19 13:44:57.000000000 -0500
++++ krb5-1.9.1/src/krb5-config.in	2011-09-26 18:27:09.018487087 -0400
+@@ -186,7 +186,7 @@
+ 	    -e 's#\$(RPATH_FLAG)#'"$RPATH_FLAG"'#' \
+ 	    -e 's#\$(LDFLAGS)#'"$LDFLAGS"'#' \
+ 	    -e 's#\$(PTHREAD_CFLAGS)#'"$PTHREAD_CFLAGS"'#' \
+-	    -e 's#\$(CFLAGS)#'"$CFLAGS"'#'`
++	    -e 's#\$(CFLAGS)##'`
+ 
+     if test $library = 'kdb'; then
+ 	lib_flags="$lib_flags -lkdb5 $KDB5_DB_LIB"
+@@ -214,9 +214,13 @@
+     fi
+ 
+     if test $library = 'krb5'; then
+-	lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err $GEN_LIB $LIBS $DL_LIB"
++	lib_flags="$lib_flags -lkrb5 -lk5crypto -lcom_err"
+     fi
+ 
++    # If we ever support a flag to generate output suitable for static
++    # linking, we would output "-lkrb5support $GEN_LIB $LIBS $DL_LIB"
++    # here.
++
+     echo $lib_flags
+ fi
+ 
diff --git a/testing/krb5/krb5-kadmind b/testing/krb5/krb5-kadmind
new file mode 100644
index 000000000..04df0dcff
--- /dev/null
+++ b/testing/krb5/krb5-kadmind
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# general config
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/sbin/kadmind`
+case "$1" in
+    start)
+        stat_busy "Starting Kerberos Admin Daemon"
+        if [ -z "$PID" ]; then
+           /usr/sbin/kadmind
+        fi
+        if [ ! -z "$PID" -o $? -gt 0 ]; then
+            stat_fail
+        else
+            add_daemon krb5-kadmind
+            stat_done
+        fi
+        ;;
+    stop)
+        stat_busy "Stopping Kerberos Admin Daemon"
+	    [ ! -z "$PID" ] && kill $PID &> /dev/null
+        if [ $? -gt 0 ]; then
+            stat_fail
+        else
+            rm_daemon krb5-kadmind
+            stat_done
+        fi
+        ;;
+    restart)
+        $0 stop
+	sleep 1
+        $0 start
+        ;;
+    *)
+        echo "usage: $0 {start|stop|restart}"
+	;;
+esac
+exit 0
diff --git a/testing/krb5/krb5-kdc b/testing/krb5/krb5-kdc
new file mode 100644
index 000000000..05a03411e
--- /dev/null
+++ b/testing/krb5/krb5-kdc
@@ -0,0 +1,40 @@
+#!/bin/bash
+
+# general config
+. /etc/rc.conf
+. /etc/rc.d/functions
+
+PID=`pidof -o %PPID /usr/sbin/krb5kdc`
+case "$1" in
+    start)
+        stat_busy "Starting Kerberos Authentication"
+        if [ -z "$PID" ]; then
+           /usr/sbin/krb5kdc
+        fi
+        if [ ! -z "$PID" -o $? -gt 0 ]; then
+            stat_fail
+        else
+            add_daemon krb5-kdc
+            stat_done
+        fi
+        ;;
+    stop)
+        stat_busy "Stopping Kerberos Authentication"
+	    [ ! -z "$PID" ] && kill $PID &> /dev/null
+        if [ $? -gt 0 ]; then
+            stat_fail
+        else
+            rm_daemon krb5-kdc
+            stat_done
+        fi
+        ;;
+    restart)
+        $0 stop
+	sleep 1
+        $0 start
+        ;;
+    *)
+        echo "usage: $0 {start|stop|restart}"
+	;;
+esac
+exit 0
author	root <root@rshg054.dnsready.net>	2011-10-03 23:14:36 +0000
committer	root <root@rshg054.dnsready.net>	2011-10-03 23:14:36 +0000
commit	57d05f7209f022aa99a8850aafbeec4cb85c3b5b (patch)
tree	8f6753258e8359d1314356a677cdb32ae94658ab
parent	ad84169d66d20378d28533c216b73c9a6646d6d7 (diff)