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

Conflicts:
	community/apitrace/PKGBUILD
	community/mksh/PKGBUILD
	community/net6/PKGBUILD
	community/xapian-core/PKGBUILD
	extra/garcon/PKGBUILD
	extra/mesa/PKGBUILD
	extra/scim/PKGBUILD
	extra/virtuoso/PKGBUILD
	extra/xfce4-appfinder/PKGBUILD
	extra/xfce4-panel/PKGBUILD
	extra/xfwm4/PKGBUILD

17 files changed, 118 insertions, 173 deletions

diff --git a/community/apitrace/PKGBUILD b/community/apitrace/PKGBUILD
index 1676111a2..4eab13710 100644
--- a/community/apitrace/PKGBUILD
+++ b/community/apitrace/PKGBUILD
@@ -1,34 +1,29 @@
-# $Id: PKGBUILD 85781 2013-03-07 07:29:48Z lcarlier $
+# $Id: PKGBUILD 89930 2013-05-05 19:53:46Z lcarlier $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Luca Bennati <lucak3 AT gmail DOT com>
 # Contributor: Glaucous <glakke1 at gmail dot com>
 
 pkgname=apitrace
-pkgver=3.0
+pkgver=4.0
 pkgrel=1
 pkgdesc="Graphics API Tracing"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/apitrace/apitrace"
 license=('custom')
-makedepends=('cmake' 'mesa' 'libgl>=9.1' 'python2' 'qtwebkit' 'qjson')
+makedepends=('cmake' 'mesa' 'libgl' 'python2' 'qtwebkit' 'qjson')
 optdepends=('qtwebkit: GUI support' 'qjson: GUI support')
-source=("https://github.com/apitrace/$pkgname/zipball/$pkgver"
-	gcc-4.7-fix.patch)
-md5sums=('d3c61c88684de9dc2641d974292b0c49'
-         '27a9a7aa14355b56fb48e2e17ff9911e')
+source=("https://github.com/apitrace/apitrace/archive/${pkgver}.zip")
+md5sums=('5b2e212d91d2f184d8608c712eab69a0')
 
 build() {
   cd ${srcdir}/apitrace-*
 
-  # Merged upstream
-  patch -Np1 -i ${srcdir}/gcc-4.7-fix.patch
-
   cmake . -Bbuild -DCMAKE_INSTALL_PREFIX=/usr -DPYTHON_EXECUTABLE='/usr/bin/python2'
   make -C build
 }
 
 package() {
-depends=('python2' 'libgl')
+  depends=('python2' 'libgl')
   cd ${srcdir}/apitrace-*
 
   make -C build DESTDIR="${pkgdir}/" install
diff --git a/community/geary/PKGBUILD b/community/geary/PKGBUILD
new file mode 100755
index 000000000..b9b769daa
--- /dev/null
+++ b/community/geary/PKGBUILD
@@ -0,0 +1,32 @@
+# $Id: PKGBUILD 89890 2013-05-04 23:09:02Z alucryd $
+# Maintainer: Maxime Gauduin <alucryd at gmail dot com>
+# Contributor : sebikul <sebikul@gmail.com>
+# Contributor : Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
+
+pkgname=geary
+pkgver=0.3.1
+pkgrel=4
+pkgdesc="A lightweight email client for the GNOME desktop"
+arch=('i686' 'x86_64')
+url="http://www.yorba.org/projects/geary/"
+license=('GPL3')
+depends=('desktop-file-utils' 'gmime' 'hicolor-icon-theme' 'libcanberra' 'libgee06' 'libgnome-keyring' 'libnotify' 'libunique3' 'webkitgtk3')
+makedepends=('cmake' 'gobject-introspection' 'intltool' 'vala')
+install=${pkgname}.install
+source=("http://www.yorba.org/download/${pkgname}/${pkgver%.?}/${pkgname}-${pkgver}.tar.xz")
+sha256sums=('a1bf8cc95022ce0894a340dea0ab94047ac7a7ea0066b8602b136c74e93ffaed')
+
+build() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+
+  ./configure --prefix=/usr --disable-{desktop-update,icon-update,schemas-compile}
+  make
+}
+
+package() {
+  cd "${srcdir}"/${pkgname}-${pkgver}
+
+  make DESTDIR="${pkgdir}" install
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/geary/geary.install b/community/geary/geary.install
new file mode 100755
index 000000000..20def33a9
--- /dev/null
+++ b/community/geary/geary.install
@@ -0,0 +1,17 @@
+post_install() {
+  glib-compile-schemas usr/share/glib-2.0/schemas
+  gtk-update-icon-cache -ftq usr/share/icons/hicolor
+  update-desktop-database -q
+}
+
+post_upgrade()
+{
+  post_install
+}
+
+post_remove()
+{
+  post_install
+}
+
+# vim: ts=2 sw=2 et:
diff --git a/community/kadu/PKGBUILD b/community/kadu/PKGBUILD
index a3a29e6ae..52b2303f9 100644
--- a/community/kadu/PKGBUILD
+++ b/community/kadu/PKGBUILD
@@ -1,24 +1,27 @@
-# $Id: PKGBUILD 82749 2013-01-23 20:16:18Z bpiotrowski $
+# $Id: PKGBUILD 89897 2013-05-05 09:24:04Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Mateusz Herych
 # Contributor: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
 
 pkgname=kadu
 pkgver=0.12.3
-pkgrel=2
+pkgrel=3
 pkgdesc='Qt-based Jabber/XMPP and Gadu-Gadu client'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.kadu.net/'
 license=('GPL')
 depends=('libgadu' 'libxss' 'enchant' 'phonon' 'qca-ossl'
          'libidn' 'libmpdclient' 'qtwebkit' 'xdg-utils')
-makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl')
+makedepends=('cmake' 'libao' 'libsndfile' 'libxtst' 'curl' 'optipng')
 install=kadu.install
 source=(http://download.kadu.im/stable/$pkgname-$pkgver.tar.bz2)
 sha256sums=('d607bbd0d00b01bfb70dd15f15c8be4076896a935041651e67a3887ad12ab8a8')
 
+prepare() {
+  find -name '*.png' -exec optipng -quiet -force -fix {} +
+}
+
 build() {
-  cd $srcdir
   mkdir build
   cd build
 
@@ -29,7 +32,7 @@ build() {
 }
 
 package() {
-  cd $srcdir/build
+  cd build
   make DESTDIR=$pkgdir LIBDIR=/usr/lib install
 
   mv $pkgdir/usr/sdk $pkgdir/usr/share/kadu/sdk
diff --git a/community/libhx/PKGBUILD b/community/libhx/PKGBUILD
index e43bb8af0..782cd278a 100644
--- a/community/libhx/PKGBUILD
+++ b/community/libhx/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 80149 2012-11-16 20:29:24Z spupykin $
+# $Id: PKGBUILD 89905 2013-05-05 14:47:57Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Max Roder <maxroder@web.de>
 # Contributor: Nathan Owe <ndowens.aur at gmail dot com>
 
 pkgname='libhx'
-pkgver=3.14
+pkgver=3.15
 pkgrel=1
 pkgdesc='A library providing queue, tree, I/O and utility functions'
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,7 +13,7 @@ license=('GPL')
 depends=()
 options=('!libtool')
 source=("http://downloads.sourceforge.net/${pkgname}/libHX-${pkgver}.tar.xz")
-md5sums=('a2a2dd32aaff33234e53517c6afd694a')
+md5sums=('0165d6aa994a094b2a170d93a48599e0')
 
 build() {
   cd ${srcdir}/libHX-${pkgver}
diff --git a/community/libinfinity/PKGBUILD b/community/libinfinity/PKGBUILD
index 420451b09..fa37455c0 100644
--- a/community/libinfinity/PKGBUILD
+++ b/community/libinfinity/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 69176 2012-04-10 00:10:15Z spupykin $
+# $Id: PKGBUILD 89907 2013-05-05 14:48:21Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: Gregory Haynes <greg@greghaynes.net>
 
 pkgname=libinfinity
-pkgver=0.5.2
+pkgver=0.5.3
 pkgrel=1
 pkgdesc="An implementation of the Infininote protocol written in GObject-based C"
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ optdepends=('avahi: zeroconf support'
             'gtk2: gtk support')
 options=('!libtool')
 source=("http://releases.0x539.de/${pkgname}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('1b2eee8150654baa7bba5900b96ffdc3')
+md5sums=('1a784b00fe26c6984c03cd5a09eb2cd6')
 
 build() {
   cd ${srcdir}/${pkgname}-${pkgver}
diff --git a/community/libmicrohttpd/PKGBUILD b/community/libmicrohttpd/PKGBUILD
index 68532b3a0..47a902e6c 100644
--- a/community/libmicrohttpd/PKGBUILD
+++ b/community/libmicrohttpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 88319 2013-04-16 13:28:55Z spupykin $
+# $Id: PKGBUILD 89934 2013-05-05 21:30:28Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Norberto Lopes <shelika@mail.telepac.pt>
 # Contributor: Kao Dome <kaodome@gmail.com>
@@ -6,7 +6,7 @@
 # Contributor: Mathias Rohnstock <linksoft@gmx.de>
 
 pkgname=libmicrohttpd
-pkgver=0.9.26
+pkgver=0.9.27
 pkgrel=1
 pkgdesc="a small C library that is supposed to make it easy to run an HTTP server as part of another application."
 arch=('i686' 'x86_64' 'mips64el')
@@ -16,7 +16,7 @@ options=('!libtool')
 depends=('gnutls' 'libgcrypt')
 install=libmicrohttpd.install
 source=(ftp://ftp.gnu.org/gnu/libmicrohttpd/$pkgname-$pkgver.tar.gz)
-md5sums=('bdac9b62fa3080890f9ab44cf29749fc')
+md5sums=('a10496b7f1b495aaf6897584da52f51b')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/community/libvirt/PKGBUILD b/community/libvirt/PKGBUILD
index 7e2817cb0..1619b5b1e 100644
--- a/community/libvirt/PKGBUILD
+++ b/community/libvirt/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 89422 2013-04-29 11:34:53Z spupykin $
+# $Id: PKGBUILD 89909 2013-05-05 14:49:00Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jonathan Wiersma <archaur at jonw dot org>
 
 pkgname=libvirt
-pkgver=1.0.4
-pkgrel=2
+pkgver=1.0.5
+pkgrel=1
 pkgdesc="API for controlling virtualization engines (openvz,kvm,qemu,virtualbox,xen,etc)"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://libvirt.org/"
@@ -36,7 +36,7 @@ source=("http://libvirt.org/sources/$pkgname-$pkgver.tar.gz"
 	libvirtd-guests.rc.d
 	libvirtd-guests.conf.d
 	libvirt.tmpfiles.d)
-md5sums=('97166bc42d7cacb037923907abe656ab'
+md5sums=('91c4145f49bcf92e89470fa3fb28fff6'
          'c43244c40a0437038c82089618e7beaa'
          '3ed0e24f5b5e25bf553f5427d64915e6'
          '0ee5b6c58590ff392a266f20f7928d1f'
diff --git a/community/mksh/PKGBUILD b/community/mksh/PKGBUILD
index 95e2c06a9..3acfd055e 100644
--- a/community/mksh/PKGBUILD
+++ b/community/mksh/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 89602 2013-04-30 10:04:38Z ttoepper $
+# $Id: PKGBUILD 89899 2013-05-05 12:20:12Z ttoepper $
 # Maintainer: Thorsten Töpper <atsutane-tu@freethoughts.de>
 # Contributor: Daniel Hommel <dhommel@gmail.com>
 
 pkgname=mksh
-pkgver=R45
+pkgver=R46
 pkgrel=1
 pkgdesc='The MirBSD Korn Shell - an enhanced version of the public domain ksh'
 url='https://www.mirbsd.org/mksh.htm'
 license=('custom')
 arch=('i686' 'x86_64' 'mips64el')
+depends=('gcc-libs')
 install=mksh.install
 source=("https://www.mirbsd.org/MirOS/dist/mir/mksh/$pkgname-$pkgver.tgz"
         'https://www.mirbsd.org/TaC-mksh.txt')
-depends=('gcc-libs')
-md5sums=('d3d90973119ae689d5300b690600e1dc'
-         '900968b95cd0231053c641428597bacd')
+md5sums=('77c108d8143a6e7670954d77517d216d'
+         'a231b325d5f2155a6c667a9323986718')
 
 build() {
   cd "$srcdir/$pkgname"
@@ -25,7 +25,7 @@ build() {
 
 package() {
   cd "$srcdir/$pkgname"
-  install -D -m 755 mksh "$pkgdir/bin/mksh"
+  install -D -m 755 mksh "$pkgdir/usr/bin/mksh"
   install -D -m 644 mksh.1 "$pkgdir/usr/share/man/man1/mksh.1"
   install -D -m 644 dot.mkshrc "$pkgdir/etc/skel/.mkshrc"
   install -D -m 644 "$srcdir/TaC-mksh.txt" "$pkgdir/usr/share/licenses/mksh/TaC-mksh.txt"
diff --git a/community/net6/PKGBUILD b/community/net6/PKGBUILD
index 06dd81737..efdd4dbaf 100644
--- a/community/net6/PKGBUILD
+++ b/community/net6/PKGBUILD
@@ -1,27 +1,28 @@
-# $Id: PKGBUILD 66249 2012-02-23 05:21:03Z spupykin $
+# $Id: PKGBUILD 89936 2013-05-05 21:30:50Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
 # Contributor: William Rea <sillywilly@gmail.com>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 
 pkgname=net6
-pkgver=1.3.12
-pkgrel=3.1
+pkgver=1.3.14
+pkgrel=1
 pkgdesc="A library that provides a TCP protocol abstraction for C++"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://gobby.0x539.de/"
 license=('LGPL')
 depends=('gnutls' 'libsigc++2.0')
 options=('!libtool')
-source=(http://releases.0x539.de/$pkgname/$pkgname-$pkgver.tar.gz
-	build-fix.patch)
-md5sums=('506776416d8aea2b9ea13a81f9145383'
-         'a200e6f132839782e3e5cfdf438e79d3')
+source=(http://releases.0x539.de/$pkgname/$pkgname-$pkgver.tar.gz)
+md5sums=('be6db739f71c5c08421bf6181e77f3b2')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
-  patch -p1 <$srcdir/build-fix.patch
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd ${srcdir}/$pkgname-$pkgver
   make DESTDIR=${pkgdir} install
 }
diff --git a/community/net6/build-fix.patch b/community/net6/build-fix.patch
deleted file mode 100644
index cfe79afeb..000000000
--- a/community/net6/build-fix.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-diff -wbBur net6-1.3.12/inc/encrypt.hpp net6-1.3.12.my/inc/encrypt.hpp
---- net6-1.3.12/inc/encrypt.hpp	2009-11-15 16:02:46.000000000 +0300
-+++ net6-1.3.12.my/inc/encrypt.hpp	2011-11-21 16:39:32.000000000 +0400
-@@ -34,7 +34,7 @@
- typedef gnutls_anon_server_credentials gnutls_anon_server_credentials_t;
- typedef gnutls_transport_ptr gnutls_transport_ptr_t;
- typedef gnutls_dh_params gnutls_dh_params_t;
--typedef gnutls_connection_end gnutls_connection_end_t;
-+//typedef gnutls_connection_end gnutls_connection_end_t;
- 
- class dh_params: private net6::non_copyable
- {
-diff -wbBur net6-1.3.12/src/encrypt.cpp net6-1.3.12.my/src/encrypt.cpp
---- net6-1.3.12/src/encrypt.cpp	2009-11-15 16:02:46.000000000 +0300
-+++ net6-1.3.12.my/src/encrypt.cpp	2011-11-21 16:39:49.000000000 +0400
-@@ -25,7 +25,7 @@
- {
- 	const unsigned int DH_BITS = 1024;
- 
--	net6::gnutls_session_t create_session(net6::gnutls_connection_end_t end)
-+	net6::gnutls_session_t create_session(gnutls_connection_end_t end)
- 	{
- 		net6::gnutls_session_t session;
- 		gnutls_init(&session, end);
-@@ -201,8 +201,6 @@
- 		net6_unix_send_func
- 	);
- #endif
--
--	gnutls_transport_set_lowat(session, 0);
- }
- 
- net6::tcp_encrypted_socket_base::~tcp_encrypted_socket_base()
diff --git a/community/openocd/PKGBUILD b/community/openocd/PKGBUILD
index 807f3888d..e8e28114f 100644
--- a/community/openocd/PKGBUILD
+++ b/community/openocd/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 80930 2012-12-07 05:30:32Z bpiotrowski $
+# $Id: PKGBUILD 89932 2013-05-05 20:07:45Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <barthalion@gmail.com>
 # Contributor: Matthias Bauch <matthias.bauch@gmail.com>
 # Contributor: Laszlo Papp <djszapi2 at gmail com>
 # Contributor: Samuel Tardieu <sam@rfc1149.net>
 
 pkgname=openocd
-pkgver=0.6.1
-pkgrel=2
+pkgver=0.7.0
+pkgrel=1
 pkgdesc='Debugging, in-system programming and boundary-scan testing for embedded target devices'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://openocd.berlios.de'
@@ -15,17 +15,17 @@ depends=('libftdi')
 options=(!strip !libtool)
 install=openocd.install
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('946421efc2414ff89bdaf3f588b230f8')
+sha256sums=('52237b786530c8460b221556c26fa4779f668b7dcb83ff14b8c5eb2050f38e63')
 
-_features=(amtjtagaccel arm-jtag-ew buspirate ep93xxat91rm9200gw16012 ft2232_libftdi ftdi jlink oocd_trace parport presto_libftdi rlink stlink ulink usbprog vsllink)
+_features=(amtjtagaccel arm-jtag-ew at91rm9200 buspirate ep93xx ft2232_libftdi ftdi gw16012 jlink oocd_trace opendous osbdm parport presto_libftdi remote-bitbang rlink stlink ti-icdi ulink usbprog vsllink)
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd $pkgname-$pkgver
   ./configure --prefix=/usr ${_features[@]/#/--enable-} --disable-werror
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make DESTDIR=$pkgdir install
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
 }
diff --git a/community/redis/PKGBUILD b/community/redis/PKGBUILD
index 6310d37d7..e1a879ac5 100644
--- a/community/redis/PKGBUILD
+++ b/community/redis/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 87476 2013-04-01 10:36:14Z spupykin $
+# $Id: PKGBUILD 89919 2013-05-05 14:50:37Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan-Erik Rediger <badboy at archlinux dot us>
 # Contributor: nofxx <x@<nick>.com>
 
 pkgname=redis
-pkgver=2.6.12
+pkgver=2.6.13
 pkgrel=1
 pkgdesc="Advanced key-value store"
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ source=("http://redis.googlecode.com/files/${pkgname}-${pkgver}.tar.gz"
 	"redis.d"
 	"redis.service"
 	"redis.logrotate")
-md5sums=('d2c87926a650e22c2491c5e4c260849c'
+md5sums=('c4be422013905c64af18b1ef140de21f'
          '8d843919d9f165e9a47e56cadb4ac2ed'
          '5ab9fdb200e15c13b450fda77fa030b6'
          '9e2d75b7a9dc421122d673fe520ef17f')
diff --git a/community/sarg/PKGBUILD b/community/sarg/PKGBUILD
index 63f0fe90f..5801e137a 100644
--- a/community/sarg/PKGBUILD
+++ b/community/sarg/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 83444 2013-02-01 09:35:37Z spupykin $
+# $Id: PKGBUILD 89921 2013-05-05 14:50:59Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: JJDaNiMoTh <jjdanimoth.aur@gmail.com>
 # Contributor: Tino Reichardt <milky-archlinux@mcmilk.de>
 
 pkgname=sarg
-pkgver=2.3.5
+pkgver=2.3.6
 pkgrel=1
 pkgdesc="Squid Analysis Report Generator"
 arch=('i686' 'x86_64' 'mips64el')
@@ -17,7 +17,7 @@ backup=('etc/sarg/css.tpl'
 	'etc/sarg/sarg.conf'
 	'etc/sarg/user_limit_block')
 source=(http://downloads.sourceforge.net/sourceforge/sarg/$pkgname-$pkgver.tar.gz)
-md5sums=('a10545aa0571f73789d81dcfca5bfb3c')
+md5sums=('399809d00671ae564468bf363c12fd7f')
 
 build() {
   cd ${srcdir}/$pkgname-$pkgver
diff --git a/community/xapian-core/PKGBUILD b/community/xapian-core/PKGBUILD
index 775a09403..8694bac37 100644
--- a/community/xapian-core/PKGBUILD
+++ b/community/xapian-core/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 74348 2012-07-25 06:16:56Z spupykin $
+# $Id: PKGBUILD 89923 2013-05-05 14:51:22Z spupykin $
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: William Rea <sillywilly@gmail.com>
 # Maintainer: Daniel J Griffiths <ghost1227@archlinux.us>
 
 pkgname=xapian-core
-pkgver=1.2.12
-pkgrel=1.1
+pkgver=1.2.15
+pkgrel=1
 pkgdesc='Open source search engine library.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://www.xapian.org/'
@@ -15,7 +15,7 @@ depends=('sh' 'gcc-libs' 'zlib' 'util-linux')
 # xapian config requires libxapian.la
 options=('libtool')
 source=("http://oligarchy.co.uk/xapian/${pkgver}/${pkgname}-${pkgver}.tar.gz")
-md5sums=('faf33a3945edbe4c848627750856cbeb')
+md5sums=('3af45069c6a14a7ecad2da24cbc3d2c5')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/xml2/01_use_libxml2_instead_of_libxml.patch b/community/xml2/01_use_libxml2_instead_of_libxml.patch
deleted file mode 100644
index 975060ed3..000000000
--- a/community/xml2/01_use_libxml2_instead_of_libxml.patch
+++ /dev/null
@@ -1,70 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 01_use_libxml2_instead_of_libxml.dpatch by Daniel Leidert
-## <daniel.leidert@wgdd.de>
-##
-## DP: Make use of libxml2 instead of libxml
-
-@DPATCH@
-diff -urNad xml2-0.4~/2xml.c xml2-0.4/2xml.c
---- xml2-0.4~/2xml.c	2003-12-24 21:28:48.000000000 +0100
-+++ xml2-0.4/2xml.c	2008-03-12 09:32:17.345380803 +0100
-@@ -24,7 +24,7 @@
- #include <assert.h>
- #include <ctype.h>
- 
--#include <HTMLparser.h>
-+#include <libxml/HTMLparser.h>
- 
- int do_html;
- int in_tag = 0;
-@@ -104,7 +104,7 @@
- 			fputs("/>",stdout);
- 		else {
- 			const htmlElemDesc *elem = NULL;
--			if (do_html) elem = htmlTagLookup(name);
-+			if (do_html) elem = htmlTagLookup((xmlChar *) name);
- 			finish_tag();
- 			if (NULL == elem || (!elem->endTag && !elem->empty)) {
- 				fputs("</",stdout);
-diff -urNad xml2-0.4~/Makefile.am xml2-0.4/Makefile.am
---- xml2-0.4~/Makefile.am	2008-02-07 16:58:13.000000000 +0100
-+++ xml2-0.4/Makefile.am	2008-03-12 09:32:17.345380803 +0100
-@@ -1,9 +1,9 @@
--AM_CPPFLAGS = $(XML_CFLAGS)
-+AM_CFLAGS = $(XML_CFLAGS)
- bin_PROGRAMS = xml2 2xml csv2 2csv
- xml2_SOURCES = xml2.c
--xml2_LDADD = -lxml
-+xml2_LDADD = $(XML_LIBS)
- 2xml_SOURCES = 2xml.c
--2xml_LDADD = -lxml
-+2xml_LDADD = $(XML_LIBS)
- csv2_SOURCES = csv2.c
- 2csv_SOURCES = 2csv.c
- 
-diff -urNad xml2-0.4~/configure.ac xml2-0.4/configure.ac
---- xml2-0.4~/configure.ac	2008-02-07 17:11:54.000000000 +0100
-+++ xml2-0.4/configure.ac	2008-03-12 09:32:17.345380803 +0100
-@@ -11,7 +11,7 @@
- AC_PROG_CC
- 
- # Checks for libraries.
--PKG_CHECK_MODULES(XML, libxml)
-+PKG_CHECK_MODULES(XML, libxml-2.0)
- AC_SUBST(XML_LIBS)
- AC_SUBST(XML_CFLAGS)
- 
-diff -urNad xml2-0.4~/xml2.c xml2-0.4/xml2.c
---- xml2-0.4~/xml2.c	2001-10-28 05:29:46.000000000 +0100
-+++ xml2-0.4/xml2.c	2008-03-12 09:32:17.345380803 +0100
-@@ -24,8 +24,8 @@
- #include <string.h>
- #include <ctype.h>
- 
--#include <parser.h>
--#include <HTMLparser.h>
-+#include <libxml/parser.h>
-+#include <libxml/HTMLparser.h>
- 
- struct node
- {
diff --git a/community/xml2/PKGBUILD b/community/xml2/PKGBUILD
index 409334ff4..87457b8ee 100644
--- a/community/xml2/PKGBUILD
+++ b/community/xml2/PKGBUILD
@@ -1,27 +1,27 @@
-# $Id: PKGBUILD 55027 2011-08-31 14:49:55Z spupykin $
+# $Id: PKGBUILD 89943 2013-05-05 21:39:24Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Orivej Desh <masecretaire@gmx.fr>
 # Maintainer: Orivej Desh <masecretaire@gmx.fr>
 
 pkgname=xml2
-pkgver=0.4
-pkgrel=2
+pkgver=0.5
+pkgrel=1
 pkgdesc="XML/Unix Processing Tools to convert XML and HTML to and from a line-oriented format more amenable to processing by classic Unix pipeline processing tools"
 arch=("i686" "x86_64" "mips64el")
 url="http://www.ofb.net/~egnor/xml2/"
 license=("GPL")
 depends=("libxml2")
-source=("http://download.ofb.net/gale/$pkgname-$pkgver.tar.gz"
-        "01_use_libxml2_instead_of_libxml.patch")
-md5sums=('8a0ef16fe0b3e1495307318c590c1ec0'
-         '9e810be33d2abbc8aabd8203db1f9654')
+source=("http://download.ofb.net/gale/$pkgname-$pkgver.tar.gz")
+md5sums=('48eacf64b01ca3a4a5afb1a36f5906e6')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-  patch -Np1 -i ../01_use_libxml2_instead_of_libxml.patch
-  autoreconf
   ./configure --prefix=/usr
   make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
   cd "$pkgdir/usr/bin"
   rm html2 2html