Wed Apr 4 00:01:33 UTC 2012

35 files changed, 649 insertions, 72 deletions

diff --git a/community-staging/yaz/PKGBUILD b/community-staging/yaz/PKGBUILD
new file mode 100644
index 000000000..26e54eb33
--- /dev/null
+++ b/community-staging/yaz/PKGBUILD
@@ -0,0 +1,38 @@
+# $Id: PKGBUILD 68807 2012-04-02 11:16:50Z pschmitz $
+# Maintainer: Ray Rashif <schiv@archlinux.org>
+# Contributor: Andrea Scarpino <andrea@archlinux.org>
+# Contributor: Stefan Husmann <stefan-husmann@t-online.de>
+# Contributor: William Rea <sillywilly@gmail.com>
+# Contributor: Robert Emil Berge <filoktetes@linuxophic.org>
+
+pkgname=yaz
+pkgver=4.2.29
+pkgrel=1
+pkgdesc="A toolkit supporting the development of Z39.50/SRW/SRU clients and servers"
+arch=('i686' 'x86_64')
+license=('BSD')
+url="http://www.indexdata.dk/yaz"
+depends=('openssl' 'libxslt' 'icu')
+options=('!libtool')
+source=("http://ftp.indexdata.dk/pub/$pkgname/$pkgname-$pkgver.tar.gz")
+md5sums=('584bcf12401f182a42091616c6cf7e0a')
+
+build() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  ./configure --prefix=/usr \
+              --enable-shared=yaz \
+              --with-openssl=/usr
+  make
+}
+
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+
+  make DESTDIR="$pkgdir/" install
+
+  install -Dm644 LICENSE \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community-testing/rsyslog/PKGBUILD b/community-testing/rsyslog/PKGBUILD
new file mode 100644
index 000000000..71e2690c4
--- /dev/null
+++ b/community-testing/rsyslog/PKGBUILD
@@ -0,0 +1,56 @@
+# $Id: PKGBUILD 68820 2012-04-02 22:25:03Z dreisner $
+# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+
+pkgname=rsyslog
+pkgver=6.2.0
+pkgrel=1
+pkgdesc="An enhanced multi-threaded syslogd with a focus on security and reliability"
+url="http://www.rsyslog.com/"
+arch=('i686' 'x86_64')
+license=('GPL3')
+depends=('zlib' 'libestr' 'libee')
+makedepends=('postgresql-libs>=8.4.1' 'libmysqlclient' 'net-snmp' 'gnutls')
+optdepends=('postgresql-libs: PostgreSQL Database Support'
+	    'libmysqlclient: MySQL Database Support'
+	    'net-snmp'
+	    'gnutls')
+backup=('etc/rsyslog.conf'
+	'etc/logrotate.d/rsyslog'
+	'etc/conf.d/rsyslog')
+options=('strip' 'zipman' '!libtool')
+source=("http://www.rsyslog.com/files/download/rsyslog/rsyslog-$pkgver.tar.gz"
+	'rsyslog'
+	'rsyslog.logrotate'
+	'rsyslog.conf.d')
+md5sums=('03e237abaa5d47f92c6e655f92f22532'
+         'a18bbcbb6ebdaa13a6ec6d9f3d9eb2da'
+         '8065db4bef3061a4f000ba58779f6829'
+         '1a0cd4530dd5d1439456d5ae230574d9')
+
+build() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  export LDFLAGS="-lestr"
+  ./configure --prefix=/usr \
+              --enable-mysql \
+              --enable-pgsql \
+              --enable-mail \
+              --enable-imfile \
+              --enable-imtemplate \
+              --enable-snmp \
+              --enable-gnutls \
+              --enable-inet \
+              --with-systemdsystemunitdir=/usr/lib/systemd/system
+  make
+}
+package() {
+  cd ${srcdir}/${pkgname}-${pkgver}
+  make install DESTDIR=${pkgdir}
+  # Install Daemons and Configuration Files
+  install -D -m755 ${srcdir}/${pkgname} ${pkgdir}/etc/rc.d/${pkgname}d
+  install -D -m644 ${pkgname}.conf ${pkgdir}/etc/${pkgname}.conf
+  install -D -m644 $srcdir/${pkgname}.logrotate ${pkgdir}/etc/logrotate.d/${pkgname}
+  install -D -m644 ${srcdir}/${pkgname}.conf.d ${pkgdir}/etc/conf.d/${pkgname}
+
+  # fix location of systemctl
+  sed -i 's@/bin/systemctl@/usr&@' "$pkgdir/usr/lib/systemd/system/rsyslog.service"
+}
diff --git a/community-testing/rsyslog/rsyslog b/community-testing/rsyslog/rsyslog
new file mode 100644
index 000000000..ee0145418
--- /dev/null
+++ b/community-testing/rsyslog/rsyslog
@@ -0,0 +1,39 @@
+#!/bin/bash
+
+. /etc/rc.conf
+. /etc/rc.d/functions
+. /etc/conf.d/rsyslog
+
+PID=`pidof -o %PPID /usr/sbin/rsyslogd`
+case "$1" in
+  start)
+    stat_busy "Starting RSyslogd"
+    [ -z "$PID" ] && /usr/sbin/rsyslogd $RSYSLOGD_ARGS
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      add_daemon rsyslogd
+      stat_done
+    fi
+    ;;
+  stop)
+    stat_busy "Stopping RSyslogd"
+    [ ! -z "$PID" ]  && kill $PID &> /dev/null
+    if [ $? -gt 0 ]; then
+      stat_fail
+    else
+      rm -f /var/run/rsyslogd.pid
+      rm -f /var/rsyslogd.persist
+      rm_daemon rsyslogd
+      stat_done
+    fi
+    ;;
+  restart)
+    $0 stop
+    sleep 1
+    $0 start
+    ;;
+  *)
+    echo "usage: $0 {start|stop|restart}"  
+esac
+exit 0
diff --git a/community-testing/rsyslog/rsyslog.conf.d b/community-testing/rsyslog/rsyslog.conf.d
new file mode 100644
index 000000000..e39f8c3b9
--- /dev/null
+++ b/community-testing/rsyslog/rsyslog.conf.d
@@ -0,0 +1,6 @@
+#
+# Parameters to be passed to rsyslogd
+# This should almost certainly include at least the current compatability
+# level, e.g. -c4
+#
+RSYSLOGD_ARGS="-c4"
diff --git a/community-testing/rsyslog/rsyslog.logrotate b/community-testing/rsyslog/rsyslog.logrotate
new file mode 100644
index 000000000..76306c560
--- /dev/null
+++ b/community-testing/rsyslog/rsyslog.logrotate
@@ -0,0 +1,7 @@
+/var/log/messages /var/log/secure /var/log/maillog /var/log/cron /var/log/spooler /var/log/boot.log {
+    missingok
+    sharedscripts
+    postrotate
+	/usr/bin/killall -HUP /usr/sbin/rsyslogd
+    endscript
+}
diff --git a/community/kphotoalbum/PKGBUILD b/community/kphotoalbum/PKGBUILD
index 834afe33f..18f4a4d22 100644
--- a/community/kphotoalbum/PKGBUILD
+++ b/community/kphotoalbum/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 57929 2011-11-04 16:33:01Z lcarlier $
+# $Id: PKGBUILD 68803 2012-04-02 09:49:04Z lcarlier $
 # Maintainer: Laurent Carlier <lordheavym@gmail.com>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Gilles CHAUVIN <gcnweb ][ gmail ? com>
@@ -6,31 +6,24 @@
 # Contributor: chfoxli <lg ][ romandie ? com>
 
 pkgname=kphotoalbum
-pkgver=4.1.1
-pkgrel=11
+pkgver=4.2
+pkgrel=1
 pkgdesc="KDE Photo Album, picture collection manager"
 url="http://www.kphotoalbum.org/"
 arch=('i686' 'x86_64')
 license=('GPL')
-depends=('kdebase-runtime' 'libkipi' 'libkexiv2' 'libkdcraw')
+depends=('kdebase-runtime' 'libkipi' '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')
+source=("http://download.kde.org/stable/${pkgname}/${pkgver}/src/${pkgname}-${pkgver}.tar.bz2")
+md5sums=('7cb484089477f3633657b67ce59b85f2')
 
 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
 
diff --git a/community/kphotoalbum/kphotoalbum.install b/community/kphotoalbum/kphotoalbum.install
index e70c054ec..6c87527e2 100644
--- a/community/kphotoalbum/kphotoalbum.install
+++ b/community/kphotoalbum/kphotoalbum.install
@@ -1,5 +1,6 @@
 post_install() {
 	xdg-icon-resource forceupdate --theme hicolor &> /dev/null
+	update-desktop-database -q
 }
 
 post_upgrade() {
diff --git a/community/wings3d/PKGBUILD b/community/wings3d/PKGBUILD
index abaced38c..e81b71cea 100644
--- a/community/wings3d/PKGBUILD
+++ b/community/wings3d/PKGBUILD
@@ -10,7 +10,7 @@ pkgdesc="3D modeling program"
 arch=('x86_64' 'i686')
 url="http://www.wings3d.com/"
 license=('GPL')
-depends=('esdl' 'bash')
+depends=('esdl' 'bash' 'desktop-file-utils')
 makedepends=('setconf' 'gendesk')
 optdepends=('povray: rendering support via POV-Ray'
             'kerkythea: rendering support via Kerkythea')
diff --git a/core/libarchive/PKGBUILD b/core/libarchive/PKGBUILD
index 22c56502f..e3f73850b 100644
--- a/core/libarchive/PKGBUILD
+++ b/core/libarchive/PKGBUILD
@@ -1,39 +1,20 @@
-# $Id: PKGBUILD 151635 2012-02-29 01:57:14Z dreisner $
+# $Id: PKGBUILD 155375 2012-04-02 16:12:53Z dan $
 # Maintainer: Dan McGee <dan@archlinux.org>
 
 pkgname=libarchive
-pkgver=3.0.3
-pkgrel=5
+pkgver=3.0.4
+pkgrel=1
 pkgdesc="library that can create and read several streaming archive formats"
 arch=('i686' 'x86_64')
 url="http://libarchive.googlecode.com/"
 license=('BSD')
 depends=('zlib' 'bzip2' 'xz>=5.0.0' 'acl' 'openssl>=1.0.0' 'expat')
-source=("http://libarchive.googlecode.com/files/libarchive-${pkgver}.tar.gz"
-        'interpret-non-posix-zips.patch'
-        'test-with-zip-mtime.patch'
-        'skip-fiemap-on-unavail.patch')
-md5sums=('ca4090f0099432a9ac5a8b6618dc3892'
-         'f02b88eb10877c7a7d527ed89c662e44'
-         '8366def6d7d70d424fa28a986c78c015'
-         'efa7cbda9fc64a4f1392324d0b5707e2')
-sha256sums=('c5fc7620f74a54b1717e4aed38aee85dc27a988ad1db7640f28eb63a82ea62d7'
-            '9d8240a360d61464dfc5a98342f520ad41b0f922261f2ace7ec1fefb8c289bdc'
-            'b7a8be5c1e3220960a9f67c9779b10d2663e25d72939546b4f01a49f1ee3a61f'
-            '05696eb87bf60520aff3a9d6afb4e40273ecca25e0a01a6d5a3669642f07b444')
+source=("https://github.com/downloads/libarchive/libarchive/libarchive-${pkgver}.tar.gz")
+md5sums=('af443ca9a10ddbcbf00f7ae34ca7fc16')
+sha256sums=('76e8d7c7b100ec4071e48c1b7d3f3ea1d22b39db3e45b7189f75b5ff4df90fac')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-
-  # http://code.google.com/p/libarchive/issues/detail?id=225
-  patch -Np0 <"$srcdir/interpret-non-posix-zips.patch"
-
-  # http://code.google.com/p/libarchive/issues/detail?id=231
-  patch -Np0 <"$srcdir/test-with-zip-mtime.patch"
-
-  # http://code.google.com/p/libarchive/issues/detail?id=238
-  patch -Np1 <"$srcdir/skip-fiemap-on-unavail.patch"
-
   ./configure --prefix=/usr --without-xml2
   make
 }
diff --git a/extra/audacious/PKGBUILD b/extra/audacious/PKGBUILD
index 7cbc2fab2..b068bd7f9 100644
--- a/extra/audacious/PKGBUILD
+++ b/extra/audacious/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 150581 2012-02-18 15:39:58Z bisson $
+# $Id: PKGBUILD 155354 2012-04-02 08:13:23Z bisson $
 # Contributor: Alexander Fehr <pizzapunk gmail com>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=audacious
-pkgver=3.2.1
+pkgver=3.2.2
 pkgrel=1
 pkgdesc='Lightweight, advanced audio player focused on audio quality'
 url='http://audacious-media-player.org/'
@@ -14,7 +14,7 @@ depends=('gtk3' 'dbus-glib' 'libguess' 'libsm' 'audacious-plugins'
          'hicolor-icon-theme' 'gtk-update-icon-cache' 'desktop-file-utils')
 optdepends=('unzip: zipped skins support')
 source=("http://distfiles.audacious-media-player.org/${pkgname}-${pkgver}.tar.bz2")
-sha1sums=('9183aef4d805d44b4aa456563aec7f104da97546')
+sha1sums=('50d2ef08d3dd48c2efb194a9fdf216fa4f8afd24')
 
 provides=('audacious-player')
 replaces=('audacious-player')
diff --git a/extra/gnuplot/PKGBUILD b/extra/gnuplot/PKGBUILD
index e383fb0e7..69d756d7a 100644
--- a/extra/gnuplot/PKGBUILD
+++ b/extra/gnuplot/PKGBUILD
@@ -1,17 +1,18 @@
-# $Id: PKGBUILD 154928 2012-03-31 08:57:52Z ronald $
+# $Id: PKGBUILD 155381 2012-04-02 17:44:27Z ronald $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=gnuplot 
 pkgver=4.6.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others" 
 arch=('i686' 'x86_64') 
 url="http://www.gnuplot.info" 
 license=('custom') 
 depends=('readline' 'gd' 'wxgtk' 'cairo' 'libjpeg' 'lua') 
-makedepends=('texinfo' 'emacs' 'texlive-core' 'texlive-latexextra')
+makedepends=('texinfo' 'emacs' 'texlive-core' 'texlive-latexextra' 'qt')
+optdepends=('qt: qt terminal')
 install=gnuplot.install 
 source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
 sha1sums=('9a43ae13546d97d4b174533ddac31a14e0edc9b2')
@@ -32,7 +33,8 @@ build() {
               --with-gihdir=/usr/share/gnuplot \
               --datadir=/usr/share \
               --with-readline=gnu \
-              --with-texdir=$pkgdir/usr/share/texmf/tex/latex/gnuplot
+              --with-texdir=$pkgdir/usr/share/texmf/tex/latex/gnuplot \
+              --enable-qt
   make pkglibexecdir=/usr/bin
 }
 
diff --git a/libre-testing/icedove-libre/PKGBUILD b/libre-testing/icedove-libre/PKGBUILD
new file mode 100644
index 000000000..f3c186937
--- /dev/null
+++ b/libre-testing/icedove-libre/PKGBUILD
@@ -0,0 +1,130 @@
+# Maintainer : Márcio Silva <coadde@adinet.com.uy>
+# Contributor: André Silva <andre.paulista@adinet.com.uy>
+
+_pgo=false
+
+# We're getting this from Debian Sid
+_debname=icedove
+_debver=10.0.3
+_debrel=3
+_debrepo=http://ftp.debian.org/debian/pool/main/
+debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
+
+_pkgname=icedove
+pkgname=icedove-libre
+pkgver=${_debver}
+pkgrel=1
+
+if [ -z "$pkgname" ]; then pkgname=$_pkgname; fi
+if $_pgo; then
+  pkgname+='-pgo'
+fi
+
+pkgdesc="A libre version of Debian Icedove, the Standalone Mail/News reader based on Mozilla thunderbird."
+arch=('i586' 'i686' 'x86_64' 'mips64el')
+license=('GPL2' 'MPL' 'LGPL')
+depends=('alsa-lib' 'dbus-glib' 'desktop-file-utils' 'gtk2' 'hicolor-icon-theme' 'hunspell' 'libevent' 'libnotify' 'libvpx' 'libxt' 'mime-types' 'mozilla-common' 'nss' 'sqlite3' 'startup-notification')
+makedepends=('unzip' 'zip' 'pkg-config' 'python2' 'wireless_tools' 'yasm' 'mesa' 'autoconf2.13')
+optdepends=('libcanberra: for sound support')
+if $_pgo; then
+  makedepends+=('xorg-server-xvfb')
+  options=(!ccache)
+fi
+
+url="http://packages.debian.org/source/sid/icedove"
+install=icedove.install
+source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
+        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
+        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.dsc"
+        mozconfig
+        mozconfig.pgo
+        icedove.desktop
+        channel-prefs.js
+        vendor.js)
+#       libvpx.patch)
+md5sums=('3efe2ef4d5471aae3b79531ce8aee9dc'
+         'cb3dba2916bdf2deb72248b0984c4302'
+         '57e21e997a75d85fcc0dcfe30b83f1ee'
+         '3c87a2c89bd778d7cb40fc4fb2ccc52d'
+         'ac29b01c189f20abae2f3eef1618ffc0'
+         'e785e0c267f4435ae1a9aa0b03bcacfb'
+         '476ec205162340fb0679f522c9d31c3b'
+         '5a53179d14ae9631b7afe5e4d0fc0b25')
+#         '5b2aaff7dfe7f1f94ad965905b20e782')
+
+if [ "$_pkgname" != "$pkgname" ]; then
+  provides+=("$_pkgname=$pkgver")
+  conflicts+=("$_pkgname")
+fi
+
+dpkg-source() {
+  # This will simulate dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
+  export QUILT_PATCHES=debian/patches
+  export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
+  export QUILT_DIFF_ARGS='--no-timestamps'
+  mv comm-esr10 "${_debname}-${_debver}"
+  mv debian "${_debname}-${_debver}"
+  cd "${_debname}-${_debver}"
+  quilt push -a
+  find .pc -name .timestamp -delete # why isn't "--no-timestamps" doing this?
+  cd ..
+}
+
+build() {
+# Don't run this if we're using -e
+if [ $NOEXTRACT -eq 0 ]; then
+  msg2 "Applying Debian patches..."
+  cd "${srcdir}"
+  dpkg-source -x ${_debname}_${_debver}-${_debrel}.dsc
+
+  msg2 "Starting normal build..."
+  mv "${_debname}-${_debver}" "$srcdir/mozilla-build"
+  cd "$srcdir/mozilla-build"
+
+#  patch -Np1 -i "$srcdir/libvpx.patch"
+
+  cp "$srcdir/mozconfig" .mozconfig # Load our build config, disable SafeSearch
+fi
+
+  if $_pgo; then
+    cat "$srcdir/mozconfig.pgo" >> .mozconfig
+  fi
+
+  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$_pkgname"
+  export PYTHON="/usr/bin/python2"
+
+  if $_pgo; then
+    LD_PRELOAD="" /usr/bin/Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 :99 &
+    LD_PRELOAD="" DISPLAY=:99 make -j1 -f client.mk profiledbuild MOZ_MAKE_FLAGS="$MAKEFLAGS"
+    kill $! || true
+  else
+    LD_PRELOAD="" make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
+  fi
+}
+
+package() {
+  cd "$srcdir/mozilla-build"
+  make -j1 -f client.mk DESTDIR="$pkgdir" install
+
+  install -m644 "$srcdir"/vendor.js "$pkgdir/usr/lib/$_pkgname/defaults/pref/"
+
+  brandingdir=other-licenses/branding/
+  icondir="$pkgdir/usr/share/icons/hicolor"
+  for i in 16x16 22x22 24x24 32x32 48x48 256x256; do
+      install -Dm644 $brandingdir/$_pkgname/mailicon${i/x*/}.png "$icondir/$i/apps/$_pkgname.png"
+  done
+
+  install -Dm644 "$srcdir/$_pkgname.desktop" \
+      "$pkgdir/usr/share/applications/$_pkgname.desktop"
+
+  rm -rf "$pkgdir"/usr/lib/$_pkgname/{dictionaries,hyphenation}
+  ln -sf /usr/share/hunspell "$pkgdir/usr/lib/$_pkgname/dictionaries"
+  ln -sf /usr/share/hyphen "$pkgdir/usr/lib/$_pkgname/hyphenation"
+
+  # We don't want the development stuff
+  rm -r "$pkgdir"/usr/{include,lib/$_pkgname-devel,share/idl}
+
+# Recommend free addons
+  cp --remove-destination "${srcdir}/channel-prefs.js" \
+     "${pkgdir}/usr/lib/$_pkgname/defaults/pref/channel-prefs.js"
+}
diff --git a/libre-testing/icedove-libre/channel-prefs.js b/libre-testing/icedove-libre/channel-prefs.js
new file mode 100644
index 000000000..13b1ba388
--- /dev/null
+++ b/libre-testing/icedove-libre/channel-prefs.js
@@ -0,0 +1,9 @@
+//@line 2 "/build/src/comm-release/mail/app/profile/channel-prefs.js"
+pref("app.update.channel", "default");
+
+//Recommend free addons
+pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html");
+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html");
+pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html");
+pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html");
+pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html");
diff --git a/libre-testing/icedove-libre/gcc46.patch b/libre-testing/icedove-libre/gcc46.patch
new file mode 100644
index 000000000..71a3686ea
--- /dev/null
+++ b/libre-testing/icedove-libre/gcc46.patch
@@ -0,0 +1,12 @@
+diff -Nur comm-1.9.2.orig//mozilla/gfx/ots/src/os2.cc comm-1.9.2/mozilla/gfx/ots/src/os2.cc
+--- comm-1.9.2.orig//mozilla/gfx/ots/src/os2.cc	2011-04-14 11:37:21.000000000 -0700
++++ comm-1.9.2/mozilla/gfx/ots/src/os2.cc	2011-04-29 09:10:23.635807433 -0700
+@@ -2,6 +2,8 @@
+ // Use of this source code is governed by a BSD-style license that can be
+ // found in the LICENSE file.
+ 
++#include <cstddef>
++
+ #include "os2.h"
+ 
+ #include "head.h"
diff --git a/libre-testing/icedove-libre/gnuzilla-addons.patch b/libre-testing/icedove-libre/gnuzilla-addons.patch
new file mode 100644
index 000000000..11949c1f1
--- /dev/null
+++ b/libre-testing/icedove-libre/gnuzilla-addons.patch
@@ -0,0 +1,36 @@
+--- usr/lib/icedove-3.1/defaults/pref/all-icedove.js	2011-03-04 17:28:11.000000000 -0300
++++ all-icedove.js	2011-03-08 11:22:31.437207173 -0300
+@@ -144,9 +144,9 @@
+ pref("extensions.update.interval", 86400);  // Check for updates to Extensions and
+                                             // Themes every day
+ // Non-symmetric (not shared by extensions) extension-specific [update] preferences
+-pref("extensions.getMoreExtensionsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/extensions/");
+-pref("extensions.getMoreThemesURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/themes/");
+-pref("extensions.getMorePluginsURL", "https://%LOCALE%.add-ons.mozilla.com/%LOCALE%/%APP%/%VERSION%/plugins/");
++pref("extensions.getMoreExtensionsURL", "http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getMoreThemesURL", "http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getMorePluginsURL", "http://www.gnu.org/software/gnuzilla/addons.html");
+ pref("extensions.dss.enabled", false);          // Dynamic Skin Switching
+ pref("extensions.dss.switchPending", false);    // Non-dynamic switch pending after next
+
+@@ -155,14 +155,14 @@
+
+ // Preferences for the Get Add-ons pane
+ pref("extensions.getAddons.showPane", true);
+-pref("extensions.getAddons.browseAddons", "https://addons.mozilla.org/%LOCALE%/%APP%");
++pref("extensions.getAddons.browseAddons", "http://www.gnu.org/software/gnuzilla/addons.html");
+ pref("extensions.getAddons.maxResults", 5);
+-pref("extensions.getAddons.recommended.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/recommended");
+-pref("extensions.getAddons.recommended.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/list/featured/all/10/%OS%/%VERSION%");
+-pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%");
+-pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/10/%OS%/%VERSION%");
++pref("extensions.getAddons.recommended.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.recommended.url", "http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html");
++pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html");
+
+-pref("xpinstall.whitelist.add", "addons.mozilla.org");
++pref("xpinstall.whitelist.add", "www.gnu.org");
+ pref("xpinstall.whitelist.add.36", "getpersonas.com");
+
+ pref("mail.shell.checkDefaultClient", true);
diff --git a/libre-testing/icedove-libre/icedove-appversion.patch b/libre-testing/icedove-libre/icedove-appversion.patch
new file mode 100644
index 000000000..3f7a54686
--- /dev/null
+++ b/libre-testing/icedove-libre/icedove-appversion.patch
@@ -0,0 +1,12 @@
+diff -Nru comm-1.9.2.orig/mail/installer/Makefile.in comm-1.9.2/mail/installer/Makefile.in
+--- comm-1.9.2.orig/mail/installer/Makefile.in	2010-04-30 22:41:37.000000000 +0300
++++ comm-1.9.2/mail/installer/Makefile.in	2010-05-05 20:20:29.551660469 +0300
+@@ -42,6 +42,8 @@
+ 
+ include $(DEPTH)/config/autoconf.mk
+ 
++MOZ_APP_VERSION="3.1"
++
+ include $(topsrcdir)/config/rules.mk
+ 
+ MOZ_PKG_REMOVALS = $(srcdir)/removed-files.in
diff --git a/libre-testing/icedove-libre/icedove-install-dir.patch b/libre-testing/icedove-libre/icedove-install-dir.patch
new file mode 100644
index 000000000..927ebb35d
--- /dev/null
+++ b/libre-testing/icedove-libre/icedove-install-dir.patch
@@ -0,0 +1,42 @@
+diff -Nur comm-esr10.orig/config/autoconf.mk.in comm-esr10/config/autoconf.mk.in
+--- config/autoconf.mk.in	2011-11-06 14:39:51.064983780 +0000
++++ config/autoconf.mk.in	2011-11-06 14:42:57.216735333 +0000
+@@ -66,8 +66,8 @@
+ mandir		= @mandir@
+ idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+
+-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir	= $(libdir)/$(MOZ_APP_NAME)
++sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
+
+ MOZDEPTH	= $(DEPTH)/mozilla
+ DIST		= $(MOZDEPTH)/dist
+diff -Nur comm-esr10.orig/mozilla/config/autoconf.mk.in comm-esr10/mozilla/config/autoconf.mk.in
+--- mozilla/config/autoconf.mk.in	2011-11-06 14:39:41.771562967 +0000
++++ mozilla/config/autoconf.mk.in	2011-11-06 14:44:18.404165515 +0000
+@@ -68,8 +68,8 @@
+ mandir		= @mandir@
+ idldir		= $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+
+-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir	= $(libdir)/$(MOZ_APP_NAME)
++sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
+
+ DIST		= $(DEPTH)/dist
+ LIBXUL_SDK      = @LIBXUL_SDK@
+diff -Nur comm-esr10.orig/mozilla/js/src/config/autoconf.mk.in comm-esr10/mozilla/js/src/config/autoconf.mk.in
+--- mozilla/js/src/config/autoconf.mk.in	2011-11-06 14:39:48.014955070 +0000
++++ mozilla/js/src/config/autoconf.mk.in	2011-11-06 14:44:32.977635875 +0000
+@@ -60,8 +60,8 @@
+ datadir		= @datadir@
+ mandir		= @mandir@
+
+-installdir	= $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
+-sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
++installdir	= $(libdir)/$(MOZ_APP_NAME)
++sdkdir		= $(libdir)/$(MOZ_APP_NAME)-devel
+
+ TOP_DIST	= @TOP_DIST@
+ ifneq (,$(filter /%,$(TOP_DIST)))
diff --git a/libre-testing/icedove-libre/icedove-preferences.patch b/libre-testing/icedove-libre/icedove-preferences.patch
new file mode 100644
index 000000000..b6424a421
--- /dev/null
+++ b/libre-testing/icedove-libre/icedove-preferences.patch
@@ -0,0 +1,30 @@
+diff -Nur comm-1.9.2.orig/mail/app/profile/all-icedove.js comm-1.9.2/mail/app/profile/all-icedove.js
+--- comm-1.9.2.orig/mail/app/profile/all-icedove.js	2010-06-23 20:43:08.000000000 +0300
++++ comm-1.9.2/mail/app/profile/all-icedove.js	2010-06-25 00:37:36.518929684 +0300
+@@ -125,7 +125,7 @@
+ pref("app.update.showInstalledUI", false);
+
+ // Release notes URL
+-pref("app.releaseNotesURL", "http://live.mozillamessaging.com/%APP%/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
++pref("app.releaseNotesURL", "http://www.mozillamessaging.com/%APP%/%VERSION%/releasenotes?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
+
+ // Base URL for web-based support pages.
+ pref("app.support.baseURL", "http://support.live.mozillamessaging.com/%LOCALE%/%APP%/%APPBUILDID%/");
+diff -Nur comm-1.9.2.orig/mail/branding/nightly/icedove-branding.js comm-1.9.2/mail/branding/nightly/icedove-branding.js
+--- comm-1.9.2.orig/mail/branding/nightly/icedove-branding.js	2010-06-23 20:43:08.000000000 +0300
++++ comm-1.9.2/mail/branding/nightly/icedove-branding.js	2010-06-25 00:36:10.605569121 +0300
+@@ -1,11 +1,11 @@
+ // Default start page
+-pref("mailnews.start_page.url","https://live.mozillamessaging.com/%APP%/start?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
++pref("mailnews.start_page.url","https://www.mozillamessaging.com/%APP%/%VERSION%/start?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
+
+ // first launch welcome page
+-pref("mailnews.start_page.welcome_url","https://live.mozillamessaging.com/%APP%/firstrun?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
++pref("mailnews.start_page.welcome_url","https://www.mozillamessaging.com/%APP%/%VERSION%/firstrun?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
+
+ // start page override to load after an update
+-pref("mailnews.start_page.override_url","https://live.mozillamessaging.com/%APP%/whatsnew?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
++pref("mailnews.start_page.override_url","https://www.mozillamessaging.com/%APP%/%VERSION%/whatsnew?locale=%LOCALE%&version=%VERSION%&os=%OS%&buildid=%APPBUILDID%");
+
+ // Interval: Time between checks for a new version (in seconds)
+ // nightly=8 hours, official=24 hours
diff --git a/libre-testing/icedove-libre/icedove-shared-error.patch b/libre-testing/icedove-libre/icedove-shared-error.patch
new file mode 100644
index 000000000..ae41bbc1e
--- /dev/null
+++ b/libre-testing/icedove-libre/icedove-shared-error.patch
@@ -0,0 +1,15 @@
+diff -up comm-central/mail/installer/Makefile.in.shared-error comm-central/mail/installer/Makefile.in
+--- comm-central/mail/installer/Makefile.in.shared-error	2009-09-16 13:47:43.000000000 +0200
++++ comm-central/mail/installer/Makefile.in	2009-09-16 13:48:25.000000000 +0200
+@@ -95,9 +95,11 @@ endif
+ # mozconfig instead.
+ ifndef MAIL_PKG_SHARED
+ ifndef BUILD_STATIC_LIBS
++ifeq (BUILD_STATIC_LIBS, 1)
+ $(error you need an "--enable-static" build to package a build)
+ endif
+ endif
++endif
+ 
+ # On mozilla-central, packager.mk uses core_abspath to redefine DIST
+ # As the comm-central config.mk doesn't set it, do it ourselves instead
diff --git a/libre-testing/icedove-libre/icedove.desktop b/libre-testing/icedove-libre/icedove.desktop
new file mode 100644
index 000000000..ef2cd76e9
--- /dev/null
+++ b/libre-testing/icedove-libre/icedove.desktop
@@ -0,0 +1,13 @@
+[Desktop Entry]
+Version=1.0
+Name=Icedove
+Comment=Mail & News Reader
+GenericName=Mail Client & News Reader
+Exec=icedove %u
+TryExec=icedove
+Icon=icedove
+Terminal=false
+Type=Application
+Categories=Network;Email;
+MimeType=message/rfc822;x-scheme-handler/mailto;
+StartupNotify=true
diff --git a/libre-testing/icedove-libre/icedove.install b/libre-testing/icedove-libre/icedove.install
new file mode 100644
index 000000000..4d4a283db
--- /dev/null
+++ b/libre-testing/icedove-libre/icedove.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/libre-testing/icedove-libre/libvpx.patch b/libre-testing/icedove-libre/libvpx.patch
new file mode 100644
index 000000000..d0f9a0f4c
--- /dev/null
+++ b/libre-testing/icedove-libre/libvpx.patch
@@ -0,0 +1,12 @@
+diff -Nur comm-release.orig/mozilla/configure.in comm-release/mozilla/configure.in
+--- comm-release.orig/mozilla/configure.in	2012-02-05 18:02:17.376830377 +0000
++++ comm-release/mozilla/configure.in	2012-02-05 18:03:25.246274275 +0000
+@@ -5629,7 +5629,7 @@
+             dnl v0.9.6 one to check for.
+             AC_TRY_COMPILE([
+                 #include <vpx/vpx_decoder.h>
+-                #if !defined(VPX_CODEC_USE_INPUT_PARTITION)
++                #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS)
+                     #error "test failed."
+                 #endif
+                 ],
diff --git a/libre-testing/icedove-libre/mozconfig b/libre-testing/icedove-libre/mozconfig
new file mode 100644
index 000000000..469047991
--- /dev/null
+++ b/libre-testing/icedove-libre/mozconfig
@@ -0,0 +1,49 @@
+mk_add_options MOZ_CO_PROJECT=mail
+ac_add_options --enable-application=mail
+
+ac_add_options --prefix=/usr
+ac_add_options --libdir=/usr/lib
+
+# System libraries
+ac_add_options --with-system-nspr
+ac_add_options --with-system-nss
+ac_add_options --with-system-jpeg
+ac_add_options --with-system-zlib
+ac_add_options --with-system-bz2
+ac_add_options --with-system-png
+ac_add_options --with-system-libevent
+ac_add_options --with-system-libvpx
+ac_add_options --enable-system-hunspell
+ac_add_options --enable-system-sqlite
+ac_add_options --enable-system-ffi
+ac_add_options --enable-system-cairo
+ac_add_options --enable-system-pixman
+ac_add_options --with-pthreads
+
+# Features
+ac_add_options --enable-startup-notification
+ac_add_options --enable-gio
+
+ac_add_options --disable-gnomevfs
+ac_add_options --disable-crashreporter
+ac_add_options --disable-updater
+ac_add_options --disable-tests
+ac_add_options --disable-mochitest
+ac_add_options --disable-installer
+
+# Optimization
+ac_add_options --enable-optimize
+
+export MOZILLA_OFFICIAL=1
+mk_add_options MOZILLA_OFFICIAL=1
+
+# Icedove
+ac_add_options --disable-official-branding
+ac_add_options --with-branding=debian/icedove-branding
+
+# Parabola
+ac_add_options --disable-safe-browsing
+export BUILD_OFFICIAL=1
+mk_add_options BUILD_OFFICIAL=1
+
+# Build-generated
diff --git a/libre-testing/icedove-libre/mozconfig.pgo b/libre-testing/icedove-libre/mozconfig.pgo
new file mode 100644
index 000000000..b0c249ebf
--- /dev/null
+++ b/libre-testing/icedove-libre/mozconfig.pgo
@@ -0,0 +1,4 @@
+# PGO
+ac_add_options --enable-profile-guided-optimization
+mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py'
+mk_add_options PYTHONPATH='$(OBJDIR)/_profile/pgo'
diff --git a/libre-testing/icedove-libre/mozilla-notify.patch b/libre-testing/icedove-libre/mozilla-notify.patch
new file mode 100644
index 000000000..952567b0e
--- /dev/null
+++ b/libre-testing/icedove-libre/mozilla-notify.patch
@@ -0,0 +1,12 @@
+diff -up comm-1.9.2/mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp.libnotify comm-1.9.2/mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp
+--- comm-1.9.2/mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp.libnotify	2010-10-27 09:05:36.000000000 +0200
++++ comm-1.9.2/mozilla/toolkit/system/gnome/nsAlertsIconListener.cpp	2010-11-08 13:28:04.564002379 +0100
+@@ -204,7 +204,7 @@ nsAlertsIconListener::ShowAlert(GdkPixbu
+ {
+   NotifyNotification* notify = notify_notification_new(mAlertTitle.get(),
+                                                        mAlertText.get(),
+-                                                       NULL, NULL);
++                                                       NULL);
+   if (!notify)
+     return NS_ERROR_OUT_OF_MEMORY;
+ 
diff --git a/libre-testing/icedove-libre/python2.7.patch b/libre-testing/icedove-libre/python2.7.patch
new file mode 100644
index 000000000..2d159d479
--- /dev/null
+++ b/libre-testing/icedove-libre/python2.7.patch
@@ -0,0 +1,11 @@
+--- configure.in	2010-10-13 08:37:29.000000000 -0700
++++ configure.in~	2010-10-19 10:32:06.360019362 -0700
+@@ -878,7 +878,7 @@
+     AC_MSG_RESULT([yes])    
+ fi
+ 
+-MOZ_PATH_PROGS(PYTHON, $PYTHON python2.6 python2.5 python2.4 python)
++MOZ_PATH_PROGS(PYTHON, $PYTHON python2.7 python2.6 python2.5 python2.4 python)
+ if test -z "$PYTHON"; then
+     AC_MSG_ERROR([python was not found in \$PATH])
+ fi
diff --git a/libre-testing/icedove-libre/rePKGBUILD b/libre-testing/icedove-libre/rePKGBUILD
new file mode 100644
index 000000000..771e93bc8
--- /dev/null
+++ b/libre-testing/icedove-libre/rePKGBUILD
@@ -0,0 +1,30 @@
+# This is an example rePKGBUILD file. Use this as a start to creating your own,
+# and remove these comments. For more information, see 'man PKGBUILD'.
+# NOTE: Please fill out the license field for your package! If it is unknown,
+# then please put 'unknown'.
+
+# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
+# Maintainer: Márcio Silva <coadde@adinet.com.uy>
+source PKGBUILD
+unset build package md5sums source
+_repo=extra
+options=(!strip)
+source=(PKGBUILD
+	http://mirrors.kernel.org/archlinux/${_repo}/os/$CARCH/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT
+	# files for pkg modifications
+    channel-prefs.js)
+
+build() {
+  cd "${srcdir}/"
+  rm -v .{INSTALL,PKGINFO} ${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT
+
+# Recommend free addons
+  cp --remove-destination "${srcdir}/channel-prefs.js" \
+     "${srcdir}/usr/lib/icedove/defaults/pref/channel-prefs.js"
+}
+
+package() {
+  find ${srcdir} -type l -maxdepth 1 -delete
+  cd ${srcdir}
+  cp -a ./* ${pkgdir}
+}
diff --git a/libre-testing/icedove-libre/vendor.js b/libre-testing/icedove-libre/vendor.js
new file mode 100644
index 000000000..170b505a8
--- /dev/null
+++ b/libre-testing/icedove-libre/vendor.js
@@ -0,0 +1,9 @@
+// Use LANG environment variable to choose locale
+pref("intl.locale.matchOS", true);
+
+// Disable default mailer checking.
+pref("mail.shell.checkDefaultMail", false);
+
+// Don't disable our bundled extensions in the application directory
+pref("extensions.autoDisableScopes", 11);
+pref("extensions.shownSelectionUI", true);
diff --git a/libre-testing/icedove-libre/xulrunner-png14.patch b/libre-testing/icedove-libre/xulrunner-png14.patch
new file mode 100644
index 000000000..1dc0ecda5
--- /dev/null
+++ b/libre-testing/icedove-libre/xulrunner-png14.patch
@@ -0,0 +1,11 @@
+--- mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp.orig	2010-01-17 00:15:53.979744638 +0100
++++ mozilla/modules/libpr0n/encoders/png/nsPNGEncoder.cpp	2010-01-17 00:16:07.855993411 +0100
+@@ -135,7 +135,7 @@
+ 
+   // initialize
+   mPNG = png_create_write_struct(PNG_LIBPNG_VER_STRING,
+-                                 png_voidp_NULL,
++                                 NULL,
+                                  ErrorCallback,
+                                  ErrorCallback);
+   if (! mPNG)
diff --git a/libre/abiword-libre/PKGBUILD b/libre/abiword-libre/PKGBUILD
index 834b0a8b8..4286d258a 100644
--- a/libre/abiword-libre/PKGBUILD
+++ b/libre/abiword-libre/PKGBUILD
@@ -1,13 +1,13 @@
 # $Id: PKGBUILD 146945 2012-01-19 14:58:28Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Maël Lavault <moimael@neuf.fr>
-# Contributor (Parabola): André Silva <andre.paulista@adinet.com.uy>
+# Maintainer (Parabola): André Silva <andre.paulista@adinet.com.uy>
 
 _pkgbase=abiword
 pkgbase=abiword-libre
 pkgname=('abiword-libre' 'abiword-libre-plugins')
 pkgver=2.8.6
-pkgrel=7
+pkgrel=7.1
 arch=('i686' 'x86_64' 'mips64el')
 license=('GPL')
 url="http://www.abisource.com"
@@ -24,9 +24,6 @@ md5sums=('f883b0a7f26229a9c66fd6a1a94381aa'
          '42e2614b6e0aad457d91f6ce20b6f225'
          '40e370e7e88c5437140ef18037abfbd3'
          '880b17db6f249d977d2a7cd012d9ce02')
-conflicts=('abiword')
-replaces=('abiword')
-provides=("abiword=$pkgver")
 
 build() {
   cd "${srcdir}/${_pkgbase}-${pkgver}"
@@ -59,8 +56,10 @@ package_abiword-libre() {
   pkgdesc="A fully-featured word processor that doesn't recommend unfree fonts"
   depends=('fribidi' 'wv' 'goffice' 'librsvg' 'enchant' 'desktop-file-utils')
   install=$pkgname.install
-  optdepends=('abiword-plugins')
-  conflicts=("abiword-plugins<${pkgver}-${pkgrel}")
+  optdepends=('abiword-libre-plugins')
+  conflicts=("abiword-libre-plugins<${pkgver}-${pkgrel}" 'abiword')
+  replaces=('abiword')
+  provides=("abiword=$pkgver")
 
   cd "${srcdir}/${_pkgbase}-${pkgver}"
   sed -i plugins/Makefile \
@@ -80,8 +79,12 @@ package_abiword-libre-plugins() {
   pkgdesc="Additional plugins for Abiword"
   depends=("abiword-libre=${pkgver}-${pkgrel}" 'loudmouth' 'libwpg' 'libwmf' 'link-grammar' 
            'gtkmathview' 'aiksaurus' 'libxslt' 'libsoup' 'libots' 'libgsf')
-
+  conflicts=('abiword-libre-plugins')
+  replaces=('abiword-libre-plugins')
+  provides=("abiword-libre-plugins=$pkgver")
+  
   cd "${srcdir}/${_pkgbase}-${pkgver}/plugins"
+  
   for dir in collab wpg wmf grammar mathview aiksaurus latex ots wordperfect; do
     make -C ${dir} DESTDIR="${pkgdir}" install
   done
diff --git a/staging/kdebase-konsole/PKGBUILD b/staging/kdebase-konsole/PKGBUILD
index de0f8c9b4..551833344 100644
--- a/staging/kdebase-konsole/PKGBUILD
+++ b/staging/kdebase-konsole/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 154862 2012-03-31 07:35:24Z andrea $
+# $Id: PKGBUILD 155358 2012-04-02 12:14:35Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdebase-konsole
 pkgver=4.8.2
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://kde.org/applications/system/konsole/'
 pkgdesc="Terminal"
@@ -12,7 +12,7 @@ groups=('kde' 'kdebase')
 depends=('kdebase-runtime' 'kdebase-lib')
 makedepends=('cmake' 'automoc4')
 source=("http://download.kde.org/stable/${pkgver}/src/konsole-${pkgver}.tar.xz")
-sha1sums=('a57ff4844a612ac0ece07435186d55fb95bf012d')
+sha1sums=('4e9e9d373ce77160b098dbf4fe24b319e7942ff1')
 
 build() {
   cd "${srcdir}"
diff --git a/staging/kdeedu-cantor/PKGBUILD b/staging/kdeedu-cantor/PKGBUILD
index 91ed54eff..a8e690f36 100644
--- a/staging/kdeedu-cantor/PKGBUILD
+++ b/staging/kdeedu-cantor/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 154868 2012-03-31 07:38:12Z andrea $
+# $Id: PKGBUILD 155366 2012-04-02 13:24:38Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-cantor
 pkgver=4.8.2
-pkgrel=1
+pkgrel=2
 pkgdesc="KDE Frontend to Mathematical Software"
 url="http://kde.org/applications/education/cantor/"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libspectre' 'kdeedu-analitza')
+depends=('kdebase-runtime' 'libspectre' 'kdeedu-analitza' 'libqalculate')
 makedepends=('cmake' 'automoc4' 'r')
 optdepends=('maxima: Maxima backend'
             'octave: Octave backend'
diff --git a/staging/kdeedu-kstars/PKGBUILD b/staging/kdeedu-kstars/PKGBUILD
index 112529752..eab13dd87 100644
--- a/staging/kdeedu-kstars/PKGBUILD
+++ b/staging/kdeedu-kstars/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 154879 2012-03-31 07:43:44Z andrea $
+# $Id: PKGBUILD 155369 2012-04-02 13:28:12Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-kstars
 pkgver=4.8.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Desktop Planetarium"
 url="http://kde.org/applications/education/kstars/"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'eigen' 'cfitsio' 'libindi')
-makedepends=('cmake' 'automoc4')
+depends=('kdebase-runtime' 'libindi')
+makedepends=('cmake' 'automoc4' 'eigen')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/kstars-${pkgver}.tar.xz")
 sha1sums=('6447338ebed2f822c4c852bcfe50264ccaba2acb')
diff --git a/staging/kdeedu-step/PKGBUILD b/staging/kdeedu-step/PKGBUILD
index 7a5702548..4ed0f0e39 100644
--- a/staging/kdeedu-step/PKGBUILD
+++ b/staging/kdeedu-step/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 154885 2012-03-31 07:46:56Z andrea $
+# $Id: PKGBUILD 155371 2012-04-02 14:03:22Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 
 pkgname=kdeedu-step
 pkgver=4.8.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Interactive Physical Simulator"
 url="http://kde.org/applications/education/step/"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'FDL')
 groups=('kde' 'kdeedu')
-depends=('kdebase-runtime' 'libqalculate' 'gsl' 'eigen')
-makedepends=('cmake' 'automoc4')
+depends=('kdebase-runtime' 'libqalculate' 'gsl')
+makedepends=('cmake' 'automoc4' 'eigen')
 install=${pkgname}.install
 source=("http://download.kde.org/stable/${pkgver}/src/step-${pkgver}.tar.xz")
 sha1sums=('0620924f7683c29e855482af8822067722ced080')
diff --git a/staging/kdesdk/PKGBUILD b/staging/kdesdk/PKGBUILD
index e4c4fb7c7..6aca16bb2 100644
--- a/staging/kdesdk/PKGBUILD
+++ b/staging/kdesdk/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 154904 2012-03-31 08:00:32Z andrea $
+# $Id: PKGBUILD 155368 2012-04-02 13:27:02Z andrea $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Pierre Schmitz <pierre@archlinux.de>
 
@@ -23,7 +23,7 @@ pkgname=('kdesdk-cervisia'
          'kdesdk-strigi-analyzer'
          'kdesdk-umbrello')
 pkgver=4.8.2
-pkgrel=1
+pkgrel=2
 arch=('i686' 'x86_64')
 url='http://www.kde.org'
 license=('GPL' 'LGPL' 'FDL')
@@ -32,7 +32,7 @@ makedepends=('cmake' 'automoc4' 'boost' 'subversion' 'antlr2' 'kdepimlibs'
              'kdebase-lib')
 source=("http://download.kde.org/stable/${pkgver}/src/${pkgbase}-${pkgver}.tar.xz"
         'fix-python2-path.patch')
-sha1sums=('d080aee7222b8cf3cede8eccf193f0694338056c'
+sha1sums=('8c02ce158f42fa80b5f8536d885e3e232614bc7f'
           '923cabd7a877cf9a68efeb24fbf3d5827e1d949e')
 
 build() {
@@ -236,7 +236,9 @@ package_kdesdk-scripts() {
 
   # Fix python 2 path
   sed -i 's|#!/usr/bin/env python|#!/usr/bin/env python2|' \
-    "${pkgdir}"/usr/bin/{{kde-systemsettings-tree,kdelnk2desktop,zonetab2pot}.py,kde_generate_export_header}
+    "${pkgdir}"/usr/bin/kde-systemsettings-tree.py
+  sed -i 's|#! /usr/bin/env python|#!/usr/bin/env python2|' \
+    "${pkgdir}"/usr/bin/{{kdelnk2desktop,zonetab2pot}.py,kde_generate_export_header}
 }
 
 package_kdesdk-strigi-analyzer() {