Tue Mar 26 00:06:15 PDT 2013

author: root <root@rshg054.dnsready.net> 2013-03-26 00:06:16 -0700
committer: root <root@rshg054.dnsready.net> 2013-03-26 00:06:16 -0700
commit: c16968d4179be76966c262f854c9e1fb827dc3ec (patch)
tree: 3dc52f45dc9b7b4a2999ca42a28631072abb7e39 /extra
parent: 32793d9a5b60ef0591c71c12ad75121d9b155adf (diff)
32 files changed, 114 insertions, 325 deletions
diff --git a/extra/akonadi/PKGBUILD b/extra/akonadi/PKGBUILD
index 2576210ef..2a7e08f66 100644
--- a/extra/akonadi/PKGBUILD
+++ b/extra/akonadi/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 179115 2013-03-03 18:48:13Z andrea $
+# $Id: PKGBUILD 180678 2013-03-25 19:15:27Z bpiotrowski $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=akonadi
 pkgver=1.9.1
-pkgrel=1
+pkgrel=2
 pkgdesc="PIM layer, which provides an asynchronous API to access all kind of PIM data"
 arch=('i686' 'x86_64')
 url='http://community.kde.org/KDE_PIM/Akonadi'
 license=('LGPL')
-depends=('shared-mime-info' 'boost-libs' 'mysql' 'soprano')
+depends=('shared-mime-info' 'boost-libs' 'mariadb' 'soprano')
 makedepends=('pkgconfig' 'cmake' 'automoc4' 'boost')
 install="${pkgname}.install"
 source=("http://download.kde.org/stable/${pkgname}/src/${pkgname}-${pkgver}.tar.bz2")
diff --git a/extra/amarok/PKGBUILD b/extra/amarok/PKGBUILD
index ddb782380..9aedff0fd 100644
--- a/extra/amarok/PKGBUILD
+++ b/extra/amarok/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 178124 2013-02-16 22:48:44Z ioni $
+# $Id: PKGBUILD 180679 2013-03-25 19:15:28Z bpiotrowski $
 # Maintainer: Ronald van Haren <ronald@archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: damir <damir@archlinux.org>
@@ -6,12 +6,12 @@
 pkgname=amarok
 replaces=('amarok-base' 'amarok-engine-xine' 'amarok-base-mysqlfree')
 pkgver=2.7.0
-pkgrel=3
+pkgrel=4
 pkgdesc="The powerful music player for KDE"
 arch=("i686" "x86_64")
 url="http://amarok.kde.org/"
 license=('GPL2' 'LGPL2.1' 'FDL')
-depends=('kdebase-runtime' 'mysql' 'qtscriptgenerator' 'taglib-extras'
+depends=('kdebase-runtime' 'mariadb' 'qtscriptgenerator' 'taglib-extras'
         'liblastfm' 'ffmpeg' 'libofa' 'qjson')
 makedepends=('pkgconfig' 'automoc4' 'cmake' 'libgpod' 'libmtp' 'loudmouth'
              'libmygpo-qt' 'mesa' 'clamz')
diff --git a/extra/anjuta/PKGBUILD b/extra/anjuta/PKGBUILD
index 8f08a31e6..b84a86c2c 100644
--- a/extra/anjuta/PKGBUILD
+++ b/extra/anjuta/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 170895 2012-11-12 22:30:17Z heftig $
+# $Id: PKGBUILD 180677 2013-03-25 19:13:50Z bpiotrowski $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Harley Laue <losinggeneration@yahoo.com>
 
 pkgbase=anjuta
 pkgname=('libanjuta' 'anjuta')
 pkgver=3.6.2
-pkgrel=1
+pkgrel=2
 pkgdesc="GNOME Integrated Development Environment (IDE)"
 arch=('i686' 'x86_64')
 license=('GPL')
diff --git a/extra/cyrus-sasl/PKGBUILD b/extra/cyrus-sasl/PKGBUILD
index 2521c5a91..665bd7fbb 100644
--- a/extra/cyrus-sasl/PKGBUILD
+++ b/extra/cyrus-sasl/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 168631 2012-10-13 16:37:23Z thomas $
+# $Id: PKGBUILD 180680 2013-03-25 19:15:31Z bpiotrowski $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 # This package spans multiple repositories. 
@@ -8,13 +8,13 @@ pkgbase=('cyrus-sasl')
 pkgname=('cyrus-sasl' 'cyrus-sasl-gssapi' 'cyrus-sasl-ldap' 'cyrus-sasl-sql')
 #pkgname=libsasl
 pkgver=2.1.23
-pkgrel=11
+pkgrel=12
 pkgdesc="Cyrus Simple Authentication Service Layer (SASL) library"
 arch=('i686' 'x86_64')
 url="http://cyrusimap.web.cmu.edu/"
 license=('custom')
 options=('!makeflags' '!libtool')
-makedepends=('postgresql-libs' 'libmysqlclient' 'libldap' 'krb5' 'openssl')
+makedepends=('postgresql-libs' 'libmariadbclient' 'libldap' 'krb5' 'openssl')
 source=(ftp://ftp.andrew.cmu.edu/pub/cyrus-mail/cyrus-sasl-${pkgver}.tar.gz
         cyrus-sasl-2.1.19-checkpw.c.patch
         cyrus-sasl-2.1.22-crypt.patch
@@ -194,7 +194,7 @@ package_cyrus-sasl-ldap() {
 
 package_cyrus-sasl-sql() {
   pkgdesc="SQL auxprop module for Cyrus SASL"
-  depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmysqlclient')
+  depends=("libsasl=${pkgver}" 'postgresql-libs' 'libmariadbclient')
   replaces=('cyrus-sasl-plugins')
 
   cd "${srcdir}/cyrus-sasl-${pkgver}/plugins"
diff --git a/extra/dovecot/PKGBUILD b/extra/dovecot/PKGBUILD
index 6c621590f..8d3088f1e 100644
--- a/extra/dovecot/PKGBUILD
+++ b/extra/dovecot/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 177806 2013-02-09 09:15:39Z andyrtr $
+# $Id: PKGBUILD 180681 2013-03-25 19:15:32Z bpiotrowski $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Contributor: Paul Mattal <paul@mattal.com>
 # Contributor: Federico Quagliata (quaqo) <quaqo@despammed.com>
@@ -9,12 +9,12 @@
 
 pkgname=dovecot
 pkgver=2.1.15
-pkgrel=1
+pkgrel=2
 pkgdesc="An IMAP and POP3 server written with security primarily in mind"
 arch=('i686' 'x86_64')
 url="http://dovecot.org/"
 license=("LGPL")
-depends=('krb5' 'openssl' 'sqlite>=3.7.5' 'libmysqlclient>=5.5.10'
+depends=('krb5' 'openssl' 'sqlite>=3.7.5' 'libmariadbclient'
         'postgresql-libs>=9.0.3' 'bzip2' 'expat' 'curl')
 makedepends=('pam>=1.1.1' 'libcap>=2.19' 'libldap>=2.4.22' 'clucene')
 optdepends=('libldap: ldap plugin'
diff --git a/extra/gnokii/PKGBUILD b/extra/gnokii/PKGBUILD
index 8b4d0bfe0..19e1e1143 100644
--- a/extra/gnokii/PKGBUILD
+++ b/extra/gnokii/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 150512 2012-02-18 11:55:01Z pierre $
+# $Id: PKGBUILD 180682 2013-03-25 19:15:33Z bpiotrowski $
 # Maintainer:
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Roman Kyrylych <roman@archlinux.org>
@@ -6,15 +6,15 @@
 
 pkgname=gnokii
 pkgver=0.6.31
-pkgrel=1
+pkgrel=3
 pkgdesc="Tools and user space driver for use with mobile phones"
 arch=('i686' 'x86_64')
 url="http://www.gnokii.org/"
 license=('GPL')
 depends=('libusb-compat' 'libxpm' 'bluez' 'libical')
-makedepends=('gtk2' 'libmysqlclient' 'postgresql-libs' 'intltool')
+makedepends=('gtk2' 'libmariadbclient' 'postgresql-libs' 'intltool' 'mariadb')
 optdepends=('gtk2: xgnokii GUI'
-            'libmysqlclient: smsd mysql backend'
+            'libmariadbclient: smsd mysql backend'
             'postgresql-libs: smsd postgresql backend')
 backup=('etc/gnokiirc')
 options=('!libtool' '!makeflags')
diff --git a/extra/gummiboot/PKGBUILD b/extra/gummiboot/PKGBUILD
deleted file mode 100644
index 99ca11299..000000000
--- a/extra/gummiboot/PKGBUILD
+++ /dev/null
@@ -1,44 +0,0 @@
-# $Id: PKGBUILD 180605 2013-03-24 16:16:26Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Tobias Powalowski <tpowa@archlinux.org>
-# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
-# Contributor:  Mantas Mikulėnas <grawity@gmail.com>
-
-pkgname="gummiboot"
-pkgver="29"
-pkgrel="1"
-pkgdesc="Simple text-mode UEFI Boot Manager"
-url="http://freedesktop.org/wiki/Software/gummiboot"
-arch=('x86_64' 'i686')
-license=('LGPL2.1')
-makedepends=('gnu-efi-libs' 'docbook-xsl')
-depends=('util-linux')
-conflicts=('gummiboot-efi')
-provides=('gummiboot-efi')
-replaces=('gummiboot-efi')
-options=('!strip')
-source=("ftp://ftp.archlinux.org/other/packages/${pkgname}/${pkgname}-${pkgver}.tar.xz"
-        'loader.conf'
-        'arch.conf')
-install="gummiboot.install"
-
-build() {
-	cd "${srcdir}/${pkgname}-${pkgver}/"
-
-	./autogen.sh
-	./configure --sysconfdir=/etc --libexecdir=/usr/lib --libdir=/usr/lib
-	
-	make
-}
-
-package() {
-	## Install gummiboot example configuration files (can go away with systemd's kernel-install)
-	install -D -m0644 "${srcdir}/loader.conf" "${pkgdir}/usr/lib/gummiboot/loader/loader.conf"
-	install -D -m0644 "${srcdir}/arch.conf" "${pkgdir}/usr/lib/gummiboot/loader/entries/arch.conf"
-
-	cd "${srcdir}/${pkgname}-${pkgver}/"
-	make DESTDIR="${pkgdir}" install
-}
-md5sums=('7e133411b805ce6fb5dd3e3bd08b88a2'
-         '6ea803e5179d623716e3be0b636de658'
-         '82bda9612e3a361a74cf8de2a0134b15')
diff --git a/extra/gummiboot/arch.conf b/extra/gummiboot/arch.conf
deleted file mode 100644
index 6cf347026..000000000
--- a/extra/gummiboot/arch.conf
+++ /dev/null
@@ -1,7 +0,0 @@
-## This is just an exmaple config file.
-## Please edit the paths and kernel parameters according to your system.
-
-title   Arch Linux
-linux   /vmlinuz-linux
-initrd  /initramfs-linux.img
-options root=PARTUUID=XXXX rootfstype=XXXX add_efi_memmap
diff --git a/extra/gummiboot/gummiboot.install b/extra/gummiboot/gummiboot.install
deleted file mode 100644
index 770087361..000000000
--- a/extra/gummiboot/gummiboot.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-	echo ":: Run '/usr/bin/gummiboot install' to enable gummiboot"
-}
-
-post_upgrade() {
-	/usr/bin/gummiboot update
-}
-
-pre_remove() {
-	/usr/bin/gummiboot remove
-}
diff --git a/extra/gummiboot/loader.conf b/extra/gummiboot/loader.conf
deleted file mode 100644
index 75b67e0d5..000000000
--- a/extra/gummiboot/loader.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-timeout 10
-default arch
diff --git a/extra/libgda/PKGBUILD b/extra/libgda/PKGBUILD
index 903af6fb2..7adb0bc35 100644
--- a/extra/libgda/PKGBUILD
+++ b/extra/libgda/PKGBUILD
@@ -1,23 +1,23 @@
-# $Id: PKGBUILD 156892 2012-04-23 09:08:29Z ibiru $
+# $Id: PKGBUILD 180676 2013-03-25 19:13:49Z bpiotrowski $
 # Maintainer: tobias <tobias@archlinux.org>
 # Contributor: Tobias Kieslich <tobias@justdreams.de>
 
 pkgname=libgda
-pkgver=5.0.3
+pkgver=5.1.1
 pkgrel=1
 pkgdesc="Data abstraction layer with mysql, pgsql, xml, sqlite providers"
 arch=(i686 x86_64)
 license=('GPL')
 depends=('gtksourceview3' 'libxslt' 'json-glib' 'db' 'ncurses' 'libsoup'
-         'libmysqlclient' 'postgresql-libs' 'python2' 'libgnome-keyring'
+         'libmariadbclient' 'postgresql-libs' 'python2' 'libgnome-keyring'
          'hicolor-icon-theme' 'desktop-file-utils' 'graphviz' 'gdk-pixbuf2'
          'iso-codes' 'openssl' 'libgcrypt' 'libldap')
-makedepends=('intltool' 'gobject-introspection' 'openjdk6' 'gtk-doc' 'vala')
+makedepends=('intltool' 'gobject-introspection' 'gtk-doc' 'vala')
 options=('!libtool')
 url="http://www.gnome-db.org"
 install=libgda.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('82d204361b794103c366bb690484d25814bfc653cb97da0dfcf7c0a13409d1cc')
+sha256sums=('41a54e60d91758d1d239e5127c856ff0412a5709e92440e9107178af928ed5e1')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/lighttpd/PKGBUILD b/extra/lighttpd/PKGBUILD
index 22395da3c..daee6ab4a 100644
--- a/extra/lighttpd/PKGBUILD
+++ b/extra/lighttpd/PKGBUILD
@@ -1,29 +1,28 @@
-# $Id: PKGBUILD 173176 2012-12-12 00:31:57Z eric $
+# $Id: PKGBUILD 180683 2013-03-25 19:15:34Z bpiotrowski $
 # Maintainer: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=lighttpd
 pkgver=1.4.32
-pkgrel=2
+pkgrel=4
 pkgdesc='A secure, fast, compliant and very flexible web-server'
 license=('custom')
 arch=('i686' 'x86_64')
 url="http://www.lighttpd.net/"
-depends=('pcre' 'bzip2' 'libldap' 'util-linux')
-makedepends=('fcgi' 'libmysqlclient' 'lua51' 'libxml2' 'e2fsprogs' 'sqlite' 'gdbm' 'pkgconfig')
+depends=('pcre' 'bzip2' 'libldap' 'util-linux' 'systemd')
+makedepends=('fcgi' 'libmariadbclient' 'lua51' 'libxml2' 'e2fsprogs' 'sqlite' 'gdbm' 'pkgconfig')
 optdepends=('libxml2: mod_webdav'
             'lua51: mod_cml/mod_magnet'
-            'libmysqlclient: mod_mysql_vhost'
+            'libmariadbclient: mod_mysql_vhost'
             'sqlite: mod_webdav')
 backup=('etc/lighttpd/lighttpd.conf' 'etc/logrotate.d/lighttpd')
 options=('!libtool' 'emptydirs')
 install='lighttpd.install'
 source=("http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz"
         "http://download.lighttpd.net/lighttpd/releases-1.4.x/lighttpd-${pkgver}.tar.xz.asc"
-        'lighttpd.rc.d' 'lighttpd.logrotate.d' 'lighttpd.conf' 'lighttpd.tmpfiles' 'lighttpd.service')
+        'lighttpd.logrotate.d' 'lighttpd.conf' 'lighttpd.tmpfiles' 'lighttpd.service')
 sha256sums=('1368f80069ce71f5928cad59c8e60c0b95876942ca9e02c53853e54ae24aedc1'
             '5456a90967df6774386010baa3fa67dba1c80c3b7058c70c80931d8dea5093e7'
-            '186f4bb2364f82d4076a2ba7d3e088ffb356550493d92dd9d5eb57cac2839c17'
-            '6df18675691384c48b9137c8f18ca238055001f1077baf05cb8322247b475a77'
+            '41f6c0042bb61021553779f861910e335834f6c15e4411756cdc6233b31076fe'
             'ee56422fe48f2683ccb5ca2e3dc6bad79ea8e1cbd043b21d2ea73b87018e35aa'
             'd8a185145a7c08b4fd8c8e6c12dae3e176389dd9b1c66e239757b2ba5108c871'
             '708cefe97541edba73f572ed3836bd056462b1467e45e1912c9d960139929696')
@@ -57,7 +56,6 @@ package() {
 	cd $srcdir/$pkgname-$pkgver
 	make DESTDIR=$pkgdir install
 
-	install -D -m755 $srcdir/lighttpd.rc.d $pkgdir/etc/rc.d/lighttpd
 	install -D -m644 $srcdir/lighttpd.logrotate.d $pkgdir/etc/logrotate.d/lighttpd
 	install -D -m644 $srcdir/lighttpd.conf $pkgdir/etc/lighttpd/lighttpd.conf
 	install -d -m755 -o http -g http $pkgdir/var/{log,cache}/lighttpd/
diff --git a/extra/lighttpd/lighttpd.install b/extra/lighttpd/lighttpd.install
index 6b471f633..817bd5746 100644
--- a/extra/lighttpd/lighttpd.install
+++ b/extra/lighttpd/lighttpd.install
@@ -1,6 +1,6 @@
 post_install() {
 	if [[ ! -d run/lighttpd ]]; then
-		usr/bin/systemd-tmpfiles --create usr/lib/tmpfiles.d/lighttpd.conf
+		usr/bin/systemd-tmpfiles --create lighttpd.conf
 	fi
 }
 
diff --git a/extra/lighttpd/lighttpd.logrotate.d b/extra/lighttpd/lighttpd.logrotate.d
index 76f98785c..b424c692d 100644
--- a/extra/lighttpd/lighttpd.logrotate.d
+++ b/extra/lighttpd/lighttpd.logrotate.d
@@ -4,6 +4,6 @@
 	notifempty
 	sharedscripts
 	postrotate
-		/usr/bin/killall -HUP lighttpd-angel &>/dev/null || true
+		systemctl reload lighttpd.service || true
 	endscript
 }
diff --git a/extra/lighttpd/lighttpd.rc.d b/extra/lighttpd/lighttpd.rc.d
deleted file mode 100644
index c2c41b818..000000000
--- a/extra/lighttpd/lighttpd.rc.d
+++ /dev/null
@@ -1,127 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-
-pid_file='/run/lighttpd/lighttpd-angel.pid'
-
-get_pid() {
-	if [ -r "${pid_file}" ]; then
-		cat "${pid_file}"
-	else
-		pgrep -f /usr/sbin/lighttpd-angel
-	fi
-}
-
-test_config() {
-	stat_busy 'Checking configuration'
-	if [ $(id -u) -ne 0 ]; then
-		stat_append '(This script must be run as root)'
-		stat_die
-	fi
-
-	if [ ! -r /etc/lighttpd/lighttpd.conf ]; then
-		stat_append '(/etc/lighttpd/lighttpd.conf not found)'
-		stat_die
-	fi
-
-	/usr/sbin/lighttpd -t -f /etc/lighttpd/lighttpd.conf >/dev/null 2>&1
-	if [ $? -gt 0 ]; then
-		stat_append '(error in /etc/lighttpd/lighttpd.conf)'
-		stat_die
-	fi
-
-	stat_done
-}
-
-start() {
-	stat_busy 'Starting lighttpd'
-
-	local PID=$(get_pid)
-	if [ -z "$PID" ]; then
-		nohup /usr/sbin/lighttpd-angel -D -f /etc/lighttpd/lighttpd.conf >>/var/log/lighttpd/lighttpd-angel.log 2>&1 &
-		if [ $? -gt 0 ]; then
-			stat_die
-		else
-			echo $! > "${pid_file}"
-			add_daemon lighttpd
-			stat_done
-		fi
-	else
-		stat_die
-	fi
-}
-
-stop() {
-	stat_busy 'Stopping lighttpd'
-	local PID=$(get_pid)
-	[ -n "$PID" ] && kill $PID &> /dev/null
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-		[ -f "${pid_file}" ] && rm -f "${pid_file}"
-		rm_daemon lighttpd
-		stat_done
-	fi
-}
-
-gracefull-stop() {
-	stat_busy 'Stopping lighttpd gracefully'
-	local PID=$(get_pid)
-	[ -n "$PID" ] && kill -INT $PID &> /dev/null
-	if [ $? -gt 0 ]; then
-		stat_fail
-	else
-		[ -f "${pid_file}" ] && rm -f "${pid_file}"
-		rm_daemon lighttpd
-		stat_done
-	fi
-}
-
-reload() {
-	stat_busy 'Reloading lighttpd'
-	local PID=$(get_pid)
-	[ -n "$PID" ] && kill -HUP $PID &> /dev/null
-	if [ $? -gt 0 ]; then
-		stat_die
-	else
-		stat_done
-	fi
-}
-
-
-case "$1" in
-	start)
-		test_config
-		start
-		;;
-	stop)
-		test_config
-		stop
-		;;
-	gracefull-stop)
-		test_config
-		stop
-		;;
-	reload)
-		test_config
-		reload
-		;;
-	restart)
-		test_config
-		stop
-		while [ -n "$(get_pid)" ]; do
-			sleep 1
-		done
-		start
-		;;
-	status)
-		stat_busy 'Checking lighttpd status'
-		ck_status lighttpd
-		;;
-	*)
-	echo "usage: $0 {start|stop|gracefull-stop|reload|restart|status}"
-esac
-
-exit 0
diff --git a/extra/mysql-python/PKGBUILD b/extra/mysql-python/PKGBUILD
index 5f5cfc45b..63b2e43e4 100644
--- a/extra/mysql-python/PKGBUILD
+++ b/extra/mysql-python/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 177920 2013-02-10 18:57:08Z angvp $
+# $Id: PKGBUILD 180685 2013-03-25 19:15:36Z bpiotrowski $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: damir <damir@archlinux.org>
 
 pkgname=mysql-python
 pkgver=1.2.4
-pkgrel=1
+pkgrel=2
 pkgdesc="MySQL support for Python"
 arch=("i686" "x86_64")
 url="http://mysql-python.sourceforge.net/"
 license=('GPL2')
-depends=('python2' 'libmysqlclient')
-makedepends=('mysql' 'python2-distribute')
+depends=('python2' 'libmariadbclient')
+makedepends=('mariadb' 'python2-distribute')
 source=("http://pypi.python.org/packages/source/M/MySQL-python/MySQL-python-${pkgver}.zip")
 md5sums=('ddf2386daf10a97af115ffad2ed4a9a0')
 
diff --git a/extra/mysql/PKGBUILD b/extra/mysql/PKGBUILD
index 6e6557d1c..9ea78cd32 100644
--- a/extra/mysql/PKGBUILD
+++ b/extra/mysql/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 178940 2013-03-01 05:59:24Z bpiotrowski $
+# $Id: PKGBUILD 180684 2013-03-25 19:15:35Z bpiotrowski $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Douglas Soares de Andrade <douglas@archlinux.org>
 
 pkgbase=mysql
 pkgname=('libmysqlclient' 'mysql-clients' 'mysql')
 pkgver=5.5.30
-pkgrel=6
+pkgrel=7
 arch=('i686' 'x86_64')
 license=('GPL')
 url="https://www.mysql.com/products/community/"
@@ -66,6 +66,8 @@ build() {
 package_libmysqlclient(){
   pkgdesc="MySQL client libraries"
   depends=('openssl')
+  conflicts=('libmariadbclient')
+  provides=("libmariadbclient=$pkgver")
   
   cd build
   for dir in include libmysql libmysqld libservices; do
@@ -83,6 +85,8 @@ package_libmysqlclient(){
 package_mysql-clients(){
   pkgdesc="MySQL client tools"
   depends=('libmysqlclient')
+  conflicts=('mariadb-clients')
+  provides=("mariadb-clients=$pkgver")
   
   cd build
   make -C client DESTDIR="${pkgdir}" install
@@ -102,6 +106,8 @@ package_mysql(){
   backup=('etc/mysql/my.cnf')
   install=mysql.install
   depends=('mysql-clients' 'systemd-tools')
+  conflicts=('mariadb')
+  provides=("mariadb=$pkgver")
   options=('emptydirs')
 
   cd build
diff --git a/extra/perl-dbd-mysql/PKGBUILD b/extra/perl-dbd-mysql/PKGBUILD
index e2c2f9e4a..799766095 100644
--- a/extra/perl-dbd-mysql/PKGBUILD
+++ b/extra/perl-dbd-mysql/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 175923 2013-01-25 03:51:01Z eric $
+# $Id: PKGBUILD 180686 2013-03-25 19:15:37Z bpiotrowski $
 # Maintainer: kevin <kevin@archlinux.org>
 # Contributor: Eric Johnson <eric@coding-zone.com>
 
 pkgname=perl-dbd-mysql
 _realname=DBD-mysql
 pkgver=4.022
-pkgrel=1
+pkgrel=3
 pkgdesc="Perl/CPAN DBD::mysql module for interacting with MySQL via DBD"
 arch=('i686' 'x86_64')
 license=('GPL' 'PerlArtistic')
 url="http://search.cpan.org/dist/${_realname}/"
-depends=('libmysqlclient' 'perl-dbi')
-makedepends=('mysql')
+depends=('libmariadbclient' 'perl-dbi')
+makedepends=('mariadb')
 options=('!emptydirs')
 source=(http://search.cpan.org/CPAN/authors/id/C/CA/CAPTTOFU/${_realname}-${pkgver}.tar.gz)
 md5sums=('20fb571245e3b9ac275b8329025c4bf6')
diff --git a/extra/postfix/PKGBUILD b/extra/postfix/PKGBUILD
index 0b3bc8e9c..15848217b 100644
--- a/extra/postfix/PKGBUILD
+++ b/extra/postfix/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 178407 2013-02-21 10:10:12Z bisson $
+# $Id: PKGBUILD 180687 2013-03-25 19:15:38Z bpiotrowski $
 # Contributor: Jeff Brodnax <tullyarcher@bellsouth.net>
 # Contributor: Paul Mattal <paul@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=postfix
 pkgver=2.10.0
-pkgrel=3
+pkgrel=4
 pkgdesc='Fast, easy to administer, secure mail server'
 url='http://www.postfix.org/'
 license=('custom')
 arch=('i686' 'x86_64')
 depends=('pcre' 'libsasl' 'libldap' 'db'
-         'libmysqlclient' 'postgresql-libs' 'sqlite' 'tinycdb')
+         'libmariadbclient' 'postgresql-libs' 'sqlite' 'tinycdb')
 backup=('etc/postfix/'{access,aliases,canonical,generic,header_checks,main.cf,master.cf,relocated,transport,virtual})
 source=("ftp://ftp.porcupine.org/mirrors/postfix-release/official/${pkgname}-${pkgver}.tar.gz"
         'aliases.patch'
diff --git a/extra/psi/PKGBUILD b/extra/psi/PKGBUILD
deleted file mode 100644
index d3bee3fee..000000000
--- a/extra/psi/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# $Id: PKGBUILD 167954 2012-10-04 05:36:54Z pierre $
-# Maintainer: Pierre Schmitz <pierre@archlinux.de>
-
-pkgname=psi
-pkgver=0.15
-pkgrel=1
-pkgdesc='Instant messaging application designed for the Jabber IM'
-url='http://psi-im.org/'
-license=('GPL')
-arch=('i686' 'x86_64')
-depends=('qca-ossl' 'qca-gnupg' 'enchant' 'libxss' 'xdg-utils')
-makedepends=('icu')
-install='psi.install'
-source=("http://downloads.sourceforge.net/psi/psi-${pkgver}.tar.bz2"
-        'archlinux.patch')
-md5sums=('aea15f17cf93e7cea52f305523f761be'
-         '2ed44ef84007b5b7f9a3f0a4f5f6a86d')
-
-build() {
-	cd ${srcdir}/psi-${pkgver}
-	patch -p0 -i ${srcdir}/archlinux.patch
-	./configure --prefix=/usr --release --no-separate-debug-info
-	make
-}
-
-package() {
-	cd ${srcdir}/psi-${pkgver}
-	make INSTALL_ROOT=${pkgdir} install
-	rm -rf ${pkgdir}/usr/share/psi/certs/
-}
diff --git a/extra/psi/archlinux.patch b/extra/psi/archlinux.patch
deleted file mode 100644
index d9cbb454b..000000000
--- a/extra/psi/archlinux.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/systeminfo.cpp	2012-10-04 02:53:03.000000000 +0200
-+++ src/systeminfo.cpp	2012-10-04 07:18:45.111088591 +0200
-@@ -114,7 +114,7 @@
- 		{ LinuxSlackware,	OsAppendFile,	"/etc/slackware-version",	"Slackware Linux"	},
- 		{ LinuxPLD,		OsUseFile,	"/etc/pld-release",		"PLD Linux"		},
- 		{ LinuxAurox,		OsUseName,	"/etc/aurox-release",		"Aurox Linux"		},
--		{ LinuxArch,		OsUseFile,	"/etc/arch-release",		"Arch Linux"		},
-+		{ LinuxArch,		OsUseName,	"/etc/arch-release",		"Arch Linux"		},
- 		{ LinuxLFS,		OsAppendFile,	"/etc/lfs-release",		"LFS Linux"		},
- 
- 		// untested
diff --git a/extra/psi/psi.install b/extra/psi/psi.install
deleted file mode 100644
index 464d2e625..000000000
--- a/extra/psi/psi.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
-	update-desktop-database -q &> /dev/null
-}
-
-post_upgrade() {
-	post_install
-}
-
-post_remove() {
-	post_install
-}
diff --git a/extra/qt3/PKGBUILD b/extra/qt3/PKGBUILD
index 39c4c5767..cf8e4d40a 100644
--- a/extra/qt3/PKGBUILD
+++ b/extra/qt3/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 168609 2012-10-13 11:48:48Z andyrtr $
+# $Id: PKGBUILD 180688 2013-03-25 19:15:40Z bpiotrowski $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=qt3
 pkgver=3.3.8b
-pkgrel=2
+pkgrel=3
 epoch=1
 pkgdesc="The QT3 gui toolkit"
 arch=('i686' 'x86_64')
@@ -11,11 +11,11 @@ url="http://www.trolltech.com/products/qt/index.html"
 license=('GPL')
 depends=('libpng' 'libxmu' 'libxcursor' 'libxinerama' 'glu' 'libxft'
          'libxrandr' 'libmng')
-makedepends=('mysql' 'postgresql' 'unixodbc' 'sqlite' 'mesa')
-optdepends=('libmysqlclient' 'postgresql-libs' 'unixodbc')
+makedepends=('mariadb' 'postgresql' 'unixodbc' 'sqlite' 'mesa')
+optdepends=('libmariadbclient' 'postgresql-libs' 'unixodbc')
 options=('!libtool')
 install=qt.install
-source=(ftp://ftp.trolltech.com/qt/source/qt-x11-free-${pkgver}.tar.gz
+source=(ftp://ftp.qt-project.org/qt/source/qt-x11-free-${pkgver}.tar.gz
         qt.profile qt3-png15.patch qt-copy-kde-patches.tar.bz2 qt-patches.tar.bz2
         eastern_asian_languagues.diff qt-odbc.patch gcc-4.6.patch)
 sha1sums=('745def6250dc7f337dbb265e20bf38dcb41fd854'
diff --git a/extra/qt4/PKGBUILD b/extra/qt4/PKGBUILD
index 2efcd355f..5ba2885b6 100644
--- a/extra/qt4/PKGBUILD
+++ b/extra/qt4/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 179054 2013-03-02 09:03:00Z andrea $
+# $Id: PKGBUILD 180689 2013-03-25 19:15:41Z bpiotrowski $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
 pkgname=qt4
 pkgver=4.8.4
-pkgrel=13
+pkgrel=16
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL')
@@ -12,10 +12,10 @@ pkgdesc='A cross-platform application and UI framework'
 depends=('libtiff' 'libpng' 'libmng' 'sqlite' 'ca-certificates' 'dbus'
         'fontconfig' 'libgl' 'libxrandr' 'libxv' 'libxi' 'alsa-lib'
         'xdg-utils' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('postgresql-libs' 'mysql' 'unixodbc' 'cups' 'gtk2' 'libfbclient'
+makedepends=('postgresql-libs' 'mariadb' 'unixodbc' 'cups' 'gtk2' 'libfbclient'
              'mesa-libgl')
 optdepends=('postgresql-libs: PostgreSQL driver'
-            'libmysqlclient: MySQL driver'
+            'libmariadbclient: MariaDB driver'
             'unixodbc: ODBC driver'
             'libfbclient: Firebird/iBase driver'
             'libxinerama: Xinerama support'
@@ -28,11 +28,13 @@ replaces=('qt<=4.8.4')
 conflicts=('qt')
 _pkgfqn="qt-everywhere-opensource-src-${pkgver}"
 source=("http://releases.qt-project.org/${pkgname}/source/${_pkgfqn}.tar.gz"
-        'qtconfig.desktop' 'qt4.profile'
+        'qtconfig-qt4.desktop' 'assistant-qt4.desktop' 'designer-qt4.desktop' 'linguist-qt4.desktop'
         'improve-cups-support.patch')
 md5sums=('89c5ecba180cae74c66260ac732dc5cb'
-         '20ca06ef59775d749b9451ce7437fa9a'
-         '4ed0bd79a310e2b5d34fc71760b99139'
+         'a16638f4781e56e7887ff8212a322ecc'
+         '4f0152ba6d645e81218b23ba8beeb42d'
+         '283a00ff7f662dca481b70d6daa826e0'
+         '027683880235708d4bc270a7ef961183'
          'c439c7731c25387352d8453ca7574971')
 
 build() {
@@ -86,11 +88,9 @@ package() {
     # install missing icons and desktop files
     install -D -m644 src/gui/dialogs/images/qtlogo-64.png \
       "${pkgdir}/usr/share/icons/hicolor/64x64/apps/qt4logo.png"
-    install -Dm644 "${srcdir}"/qtconfig.desktop \
-      "${pkgdir}/usr/share/applications/qtconfig4.desktop"
-
-    # install the profile
-    install -D -m755 "${srcdir}"/qt4.profile "${pkgdir}"/etc/profile.d/qt4.sh
+    install -d "${pkgdir}"/usr/share/applications
+    install -m644 "${srcdir}"/{assistant,designer,linguist,qtconfig}-qt4.desktop \
+      "${pkgdir}/usr/share/applications/"
 
     # Useful symlinks for cmake and configure scripts
     install -d "${pkgdir}"/usr/bin
diff --git a/extra/qt4/assistant-qt4.desktop b/extra/qt4/assistant-qt4.desktop
new file mode 100644
index 000000000..d2904beb2
--- /dev/null
+++ b/extra/qt4/assistant-qt4.desktop
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=Qt4 Assistant 
+Comment=Shows Qt4 documentation and examples
+Exec=assistant-qt4
+Icon=assistant
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development;Documentation;
diff --git a/extra/qt4/designer-qt4.desktop b/extra/qt4/designer-qt4.desktop
new file mode 100644
index 000000000..514146e78
--- /dev/null
+++ b/extra/qt4/designer-qt4.desktop
@@ -0,0 +1,11 @@
+[Desktop Entry]
+Name=Qt4 Designer
+GenericName=Interface Designer
+Comment=Design GUIs for Qt4 applications
+Exec=designer-qt4
+Icon=designer
+MimeType=application/x-designer;
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development;
diff --git a/extra/qt4/linguist-qt4.desktop b/extra/qt4/linguist-qt4.desktop
new file mode 100644
index 000000000..61036b307
--- /dev/null
+++ b/extra/qt4/linguist-qt4.desktop
@@ -0,0 +1,10 @@
+[Desktop Entry]
+Name=Qt4 Linguist 
+Comment=Add translations to Qt4 applications
+Exec=linguist-qt4
+Icon=linguist
+MimeType=text/vnd.trolltech.linguist;application/x-linguist;
+Terminal=false
+Encoding=UTF-8
+Type=Application
+Categories=Qt;Development;
diff --git a/extra/qt4/qt4.profile b/extra/qt4/qt4.profile
deleted file mode 100644
index 3129ddce5..000000000
--- a/extra/qt4/qt4.profile
+++ /dev/null
@@ -1 +0,0 @@
-export PATH=$PATH:/usr/lib/qt4/bin
diff --git a/extra/qt4/qtconfig.desktop b/extra/qt4/qtconfig-qt4.desktop
index 1573ef461..578963124 100644
--- a/extra/qt4/qtconfig.desktop
+++ b/extra/qt4/qtconfig-qt4.desktop
@@ -1,7 +1,7 @@
 [Desktop Entry]
 Name=Qt4 Config 
 Comment=Configure Qt4 behavior, styles, fonts
-Exec=/usr/lib/qt4/bin/qtconfig
+Exec=qtconfig-qt4
 Icon=qt4logo
 Terminal=false
 Type=Application
diff --git a/extra/qt5/PKGBUILD b/extra/qt5/PKGBUILD
index bd1016efa..e9cf73b33 100644
--- a/extra/qt5/PKGBUILD
+++ b/extra/qt5/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 179117 2013-03-03 18:53:03Z andrea $
+# $Id: PKGBUILD 180690 2013-03-25 19:15:43Z bpiotrowski $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgbase=qt5
@@ -16,14 +16,14 @@ pkgname=('qt5-base'
          'qt5-webkit'
          'qt5-xmlpatterns')
 pkgver=5.0.1
-pkgrel=6
+pkgrel=10
 arch=('i686' 'x86_64')
 url='http://qt-project.org/'
 license=('GPL3' 'LGPL')
 makedepends=('libxcb' 'xcb-proto' 'xcb-util' 'xcb-util-image' 'xcb-util-wm' 'xcb-util-keysyms'
             'mesa-libgl' 'at-spi2-core' 'alsa-lib' 'gstreamer0.10-base-plugins'
             'libjpeg-turbo' 'cups' 'libpulse' 'hicolor-icon-theme' 'desktop-file-utils'
-            'postgresql-libs' 'libmysqlclient' 'sqlite' 'unixodbc' 'libfbclient'
+            'postgresql-libs' 'libmariadbclient' 'sqlite' 'unixodbc' 'libfbclient'
             'python2' 'ruby' 'gperf' 'libxslt' 'libxcomposite' 'fontconfig'
             'libmng' 'openal' 'gtk2')
 groups=('qt' 'qt5')
@@ -80,9 +80,9 @@ package_qt5-base() {
   pkgdesc='A cross-platform application and UI framework'
   depends=('libjpeg-turbo' 'xcb-util-keysyms' 'libgl' 'dbus' 'fontconfig' 'systemd'
            'xcb-util-wm' 'libxrender' 'libxi' 'sqlite' 'libpng' 'xcb-util-image'
-           'hicolor-icon-theme' 'xdg-utils')
+           'hicolor-icon-theme' 'xdg-utils' 'icu')
   optdepends=('postgresql-libs: PostgreSQL driver'
-              'libmysqlclient: MySQL driver'
+              'libmariadbclient: MariaDB driver'
               'unixodbc: ODBC driver'
               'libfbclient: Firebird/iBase driver')
   install='qt5-base.install'
@@ -254,7 +254,7 @@ package_qt5-tools() {
 
 package_qt5-webkit() {
   pkgdesc='A cross-platform application and UI framework (QtWebKit)'
-  depends=('qt5-declarative' 'gstreamer0.10-base' 'icu' 'libxslt' 'libxcomposite')
+  depends=('qt5-declarative' 'gstreamer0.10-base' 'libxslt' 'libxcomposite')
 
   cd ${_pkgfqn}/qtwebkit
   make INSTALL_ROOT="${pkgdir}" install
diff --git a/extra/smartmontools/PKGBUILD b/extra/smartmontools/PKGBUILD
index 6af79cbcd..145d9297c 100644
--- a/extra/smartmontools/PKGBUILD
+++ b/extra/smartmontools/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 177000 2013-02-03 16:40:55Z giovanni $
+# $Id: PKGBUILD 180692 2013-03-25 19:47:01Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jeff Mickey <jeff@archlinux.org>
 # Contributor: Jani Talikka <jani.talikka@gmail.com>
 # Contributor: Ralf Barth <archlinux.org@haggy.org>
 
 pkgname=smartmontools
-pkgver=6.0
-pkgrel=2
+pkgver=6.1
+pkgrel=1
 pkgdesc="Control and monitor S.M.A.R.T. enabled ATA and SCSI Hard Drives"
 url="http://smartmontools.sourceforge.net"
 license=('GPL')
@@ -16,7 +16,7 @@ backup=('etc/smartd.conf'
         'etc/conf.d/smartd')
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.gz"
         'smartd.conf')
-md5sums=('5646a07f5f4bee8e2e649de8c6b7ae87'
+md5sums=('83a3a681f8183ed858392d550ae1cca6'
          '28c1b80c41dac52d433961dcfb4f70e0')
 
 build() {
diff --git a/extra/xdg-user-dirs-gtk/PKGBUILD b/extra/xdg-user-dirs-gtk/PKGBUILD
index 59c62223c..6078686b4 100644
--- a/extra/xdg-user-dirs-gtk/PKGBUILD
+++ b/extra/xdg-user-dirs-gtk/PKGBUILD
@@ -1,8 +1,8 @@
-#  $Id: PKGBUILD 170124 2012-11-03 07:24:35Z eric $
+#  $Id: PKGBUILD 180620 2013-03-25 01:38:50Z eric $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 
 pkgname=xdg-user-dirs-gtk
-pkgver=0.9
+pkgver=0.10
 pkgrel=1
 pkgdesc="Creates user dirs and asks to relocalize them"
 arch=(i686 x86_64)
@@ -12,8 +12,8 @@ makedepends=('intltool')
 options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 groups=('gnome')
-source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver:0:3}/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('4b908252515eb95b27427ef7c6b0e096febde716c0c89e8f03a79d23882b79c8')
+source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.xz)
+sha256sums=('739a1a89baf34aa7261e924a21d2ae646b0475b67b3db3daa84327a99132d83e')
 
 build() {
   cd $pkgname-$pkgver
author	root <root@rshg054.dnsready.net>	2013-03-26 00:06:16 -0700
committer	root <root@rshg054.dnsready.net>	2013-03-26 00:06:16 -0700
commit	c16968d4179be76966c262f854c9e1fb827dc3ec (patch)
tree	3dc52f45dc9b7b4a2999ca42a28631072abb7e39 /extra
parent	32793d9a5b60ef0591c71c12ad75121d9b155adf (diff)