Sun May 5 01:06:40 PDT 2013

34 files changed, 151 insertions, 355 deletions

diff --git a/community/converseen/PKGBUILD b/community/converseen/PKGBUILD
index 08052c8b2..c1e63667c 100644
--- a/community/converseen/PKGBUILD
+++ b/community/converseen/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 88356 2013-04-16 16:20:52Z giovanni $
+# $Id: PKGBUILD 89888 2013-05-04 21:16:10Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: archtux <antonio.arias99999 at gmail.com>
 
 pkgname=converseen
-pkgver=0.6
+pkgver=0.6.1
 pkgrel=1
 pkgdesc="The batch image converter and resizer"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('imagemagick' 'qt4' 'libwmf' 'openexr')
 makedepends=('cmake')
 install=converseen.install
 source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-md5sums=('fbb618d313980ed5ad754ba9ca06a05f')
+md5sums=('15bf5783d3df2c0063b5c5b37d5c495c')
 
 build() {
   cd "${srcdir}"
diff --git a/community/fcitx-libpinyin/PKGBUILD b/community/fcitx-libpinyin/PKGBUILD
index f536b3669..e69931850 100644
--- a/community/fcitx-libpinyin/PKGBUILD
+++ b/community/fcitx-libpinyin/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 86914 2013-03-24 12:50:46Z fyan $
+# $Id: PKGBUILD 89876 2013-05-04 04:07:04Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: poplarch <poplarch@gmail.com>
 
 pkgname=fcitx-libpinyin
-pkgver=0.2.91
+pkgver=0.2.92
 pkgrel=1
 pkgdesc="Fcitx Wrapper for libpinyin, Library to deal with pinyin"
 arch=('i686' 'x86_64')
@@ -11,7 +11,7 @@ url="https://github.com/fcitx/fcitx-libpinyin"
 license=('GPL')
 depends=('fcitx' 'libpinyin')
 makedepends=('cmake' 'intltool' 'wget')
-source=("https://github.com/fcitx/$pkgname/archive/$pkgver.tar.gz")
+source=("https://fcitx.googlecode.com/files/${pkgname}-${pkgver}_dict.tar.xz")
 install=$pkgname.install
 
 build() {
@@ -31,4 +31,4 @@ package() {
   cd "$srcdir/${pkgname}-${pkgver}/build"
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('060707cb5a296b2cc10542a01fe40de9')
+sha512sums=('bea86b1041fa311a9bbcd2a6d74ab36d9659ebb6c92122307d3bd4dc44bcb0567d4aeafe62f3b6fe6a85160b369722f391063b47765dc88ec9a9b569cfca640f')
diff --git a/community/ibus-libpinyin/PKGBUILD b/community/ibus-libpinyin/PKGBUILD
index 11e0dc7d4..40c189245 100644
--- a/community/ibus-libpinyin/PKGBUILD
+++ b/community/ibus-libpinyin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 86672 2013-03-21 01:30:22Z fyan $
+# $Id: PKGBUILD 89875 2013-05-04 04:07:03Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor:  Yangtse Su<yangtsesu@gmail.com>
 # Contributor:  Jekyll Wu<adaptee [at] gmail [dot] com>
@@ -7,13 +7,13 @@
 # Contributor: Lee.MaRS<leemars at gmail.com>
 
 pkgname=ibus-libpinyin
-pkgver=1.5.92
+pkgver=1.6.91
 pkgrel=1
 pkgdesc="Intelligent Pinyin engine based on libpinyin for IBus"
 arch=('i686' 'x86_64')
 license=('LGPL')
-url="https://github.com/libpinyin"
-depends=('ibus>=1.4' 'libpinyin')
+url="https://github.com/libpinyin/ibus-libpinyin"
+depends=('ibus' 'libpinyin')
 makedepends=('git' 'intltool' 'gnome-common')
 source=(https://github.com/libpinyin/ibus-libpinyin/archive/$pkgver.tar.gz
 	automake-1.13.patch)
@@ -49,5 +49,6 @@ package() {
   cd "$srcdir/$pkgname-build"
   make NO_INDEX=true DESTDIR="$pkgdir" install
 }
-md5sums=('2a355713221df7e47354f81cb14e183f'
-         '2a743114537a03830d5b4cd71226cfd0')
+
+sha512sums=('6e1fb4f1fe3c5c6c37e60c8228b79728c388ffd171b68cea87bc2131e27430cdad6eff174a41111cb0694559f6307be3578ea1c960629bbfc99c41f4dbfc344e'
+            'fbb30cddd1ec140860ce0d5a5a42ad644ae6a1794fb2e805f782fdb43436ad13d2f6f8149b5b68540bbb9beba16dbbdb1d14153cef7fb805de342a8d1bb77965')
diff --git a/community/libpinyin/00fec992f5c760f546a1db933fb08325fc9cccbf.patch b/community/libpinyin/00fec992f5c760f546a1db933fb08325fc9cccbf.patch
deleted file mode 100644
index c895adf4c..000000000
--- a/community/libpinyin/00fec992f5c760f546a1db933fb08325fc9cccbf.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 00fec992f5c760f546a1db933fb08325fc9cccbf Mon Sep 17 00:00:00 2001
-From: Peng Wu <alexepico@gmail.com>
-Date: Sat, 23 Mar 2013 09:52:46 +0800
-Subject: [PATCH] fixes import dict
-
----
- src/storage/phrase_large_table2.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/storage/phrase_large_table2.h b/src/storage/phrase_large_table2.h
-index 368d03d..34bb12d 100644
---- a/src/storage/phrase_large_table2.h
-+++ b/src/storage/phrase_large_table2.h
-@@ -133,7 +133,7 @@ static inline int reduce_tokens(const PhraseTokens tokens,
-     }
- 
-     /* the following line will be removed in future after code are verified. */
--    assert(0 == num || 1 == num);
-+    assert(0 <= num && num <= 3);
- 
-     return num;
- }
--- 
-1.8.1.5
-
diff --git a/community/libpinyin/PKGBUILD b/community/libpinyin/PKGBUILD
index 5eebe2071..c911aad0c 100644
--- a/community/libpinyin/PKGBUILD
+++ b/community/libpinyin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 88087 2013-04-11 09:30:02Z fyan $
+# $Id: PKGBUILD 89874 2013-05-04 04:07:02Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Yangtse <yangtsesu@gmail.com> 
 # Contributor: WU Jun <quark at lihdd dot net>
 
 pkgname=libpinyin
-pkgver=0.9.0
+pkgver=0.9.91
 pkgrel=1
 pkgdesc="Library to deal with pinyin"
 arch=('i686' 'x86_64')
@@ -13,14 +13,14 @@ license=('GPL')
 depends=('db' 'glib2')
 options=(!libtool)
 source=("https://github.com/libpinyin/libpinyin/archive/${pkgver}.tar.gz"
-        "http://downloads.sourceforge.net/libpinyin/model5.text.tar.gz")
-noextract=("model5.text.tar.gz")
+        "http://downloads.sourceforge.net/libpinyin/model6.text.tar.gz")
+noextract=("model6.text.tar.gz")
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  cp "${srcdir}/model5.text.tar.gz" "${srcdir}/${pkgname}-${pkgver}/data/"
-  sed -i '/wget.*model5\.text\.tar\.gz/ d' ${srcdir}/${pkgname}-${pkgver}/data/Makefile.am
+  cp "${srcdir}/model6.text.tar.gz" "${srcdir}/${pkgname}-${pkgver}/data/"
+  sed -i '/wget.*model6\.text\.tar\.gz/ d' ${srcdir}/${pkgname}-${pkgver}/data/Makefile.am
 
   aclocal && libtoolize --force && autoheader && automake -a && autoconf
   ./configure --prefix=/usr && make
@@ -30,5 +30,5 @@ package() {
   cd "${srcdir}/libpinyin-$pkgver"
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('e2237be88c6b9f1ed4f7c6e75a1738b4'
-         'a83812e2d3be5695be54f95d9d7a3aa0')
+sha512sums=('40263ff3b0e4ac6f68ed51d90b07c9431beec70d2b93ab3c0fec36a35b662380a022478bf15d81305a5e84c0eb95d662fed70c7213ff5c0d11a964b232bf1be2'
+            '8719d99b2efb22438ec067c046f8d45addb3e0d336e8d6ec4b8ed22370fe81366d19a34934bb059230f86e74c379acb62822ee3458850437880d531de8ff3e0e')
diff --git a/community/perl-xml-libxml/PKGBUILD b/community/perl-xml-libxml/PKGBUILD
index c635a8a13..7339477ad 100644
--- a/community/perl-xml-libxml/PKGBUILD
+++ b/community/perl-xml-libxml/PKGBUILD
@@ -1,9 +1,10 @@
-# $Id: PKGBUILD 86667 2013-03-21 00:57:39Z eric $
-# Maintainer: Justin "juster" Davis <jrcd83@gmail.com>
+# $Id: PKGBUILD 89886 2013-05-04 19:42:51Z jsteel $
+# Maintainer: Jonathan Steel <jsteel@aur.archlinux.org>
+# Contributor: Justin "juster" Davis <jrcd83@gmail.com>
 # Contributor: François Charette <francois.archlinux.org>
 
 pkgname=perl-xml-libxml
-pkgver=2.0014
+pkgver=2.0016
 pkgrel=1
 pkgdesc="Interface to the libxml library"
 arch=('i686' 'x86_64')
@@ -16,7 +17,7 @@ conflicts=('perl-libxml' 'perl-xml-libxml-common')
 options=('!emptydirs')
 install=perl-xml-libxml.install
 source=(http://www.cpan.org/authors/id/S/SH/SHLOMIF/XML-LibXML-$pkgver.tar.gz)
-md5sums=('a146e20c122b074dbb0d953fb8f65ca0')
+md5sums=('d3bbc3437f6b39eca5825e9d0b0c187a')
 
 build() {
   cd XML-LibXML-$pkgver
diff --git a/core/cryptsetup/PKGBUILD b/core/cryptsetup/PKGBUILD
index d1c646dc9..fbc39ee53 100644
--- a/core/cryptsetup/PKGBUILD
+++ b/core/cryptsetup/PKGBUILD
@@ -1,7 +1,7 @@
-# $Id: PKGBUILD 177948 2013-02-12 12:13:44Z thomas $
+# $Id: PKGBUILD 184226 2013-05-04 14:17:39Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=cryptsetup
-pkgver=1.6.0
+pkgver=1.6.1
 pkgrel=1
 pkgdesc="Userspace setup tool for transparent encryption of block devices using dm-crypt"
 arch=(i686 x86_64)
@@ -14,8 +14,8 @@ source=(http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2
         http://cryptsetup.googlecode.com/files/${pkgname}-${pkgver}.tar.bz2.asc
         encrypt_hook
         encrypt_install)
-md5sums=('99002ac59a65ea371e7a98200943cb80'
-         'd933e3e59998e491f674b42fd66d6183'
+md5sums=('f374d11e3b0e7ca0f805756fd02e34ff'
+         'SKIP'
          'c279d86d6dc18322c054d2272ebb9e90'
          '21c45f9cab3e0b5165f68358884fbd0f')
 
diff --git a/core/dbus/30-dbus b/core/dbus/30-dbus
index 69d2660da..42b3a5ff7 100644
--- a/core/dbus/30-dbus
+++ b/core/dbus/30-dbus
@@ -1,8 +1,6 @@
 #!/bin/bash
 
 # launches a session dbus instance
-
-dbuslaunch="`which dbus-launch 2>/dev/null`"
-if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
-  eval `$dbuslaunch --sh-syntax --exit-with-session`
+if [ -z "$DBUS_SESSION_BUS_ADDRESS" ] && type dbus-launch >/dev/null; then
+  eval $(dbus-launch --sh-syntax --exit-with-session)
 fi
diff --git a/core/dbus/PKGBUILD b/core/dbus/PKGBUILD
index 32b9a30bf..fc6448616 100644
--- a/core/dbus/PKGBUILD
+++ b/core/dbus/PKGBUILD
@@ -1,27 +1,24 @@
-# $Id: PKGBUILD 172792 2012-12-06 01:48:03Z tomegun $
+# $Id: PKGBUILD 184216 2013-05-03 22:55:42Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Link Dupont <link@subpop.net>
 #
 pkgname=dbus
-pkgver=1.6.8
-pkgrel=6
+pkgver=1.6.10
+pkgrel=1
 pkgdesc="Freedesktop.org message bus system"
 url="http://www.freedesktop.org/Software/dbus"
 arch=(i686 x86_64)
 license=('GPL' 'custom')
-# do not depend on systemd to avoid circular dep,
-# dep on shadow for install scriptlet FS#29341
-depends=('expat' 'coreutils' 'filesystem' 'shadow')
-makedepends=('libx11')
+depends=('expat' 'coreutils' 'filesystem')
+makedepends=('libx11' 'systemd')
 optdepends=('libx11: dbus-launch support')
 provides=('dbus-core')
 conflicts=('dbus-core')
 replaces=('dbus-core')
 options=(!libtool)
-install=dbus.install
-source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz #{,.asc}
-        30-dbus dbus systemd-user-session.patch)
+source=(http://dbus.freedesktop.org/releases/dbus/dbus-$pkgver.tar.gz
+        30-dbus systemd-user-session.patch)
 
 build() {
   cd dbus-$pkgver
@@ -47,13 +44,10 @@ package(){
 
   rm -rf "$pkgdir/var/run"
 
-  install -Dm755 ../dbus "$pkgdir/etc/rc.d/dbus"
-
   install -Dm755 ../30-dbus "$pkgdir/etc/X11/xinit/xinitrc.d/30-dbus"
 
   install -Dm644 COPYING "$pkgdir/usr/share/licenses/dbus/COPYING"
 }
-md5sums=('3bf059c7dd5eda5f539a1b7cfe7a14a2'
-         '9fafe8b28460aeaa6054309ef4c5ed92'
-         'f0364f3f5dc5f653bb05d39aa36e3264'
+md5sums=('de4970c20629aeb958a12132415b3630'
+         '3314d727fa57fc443fce25b5cbeebbcc'
          'd8a1bd529b3ddca671ee1a695a143db9')
diff --git a/core/dbus/dbus b/core/dbus/dbus
deleted file mode 100644
index bf532a274..000000000
--- a/core/dbus/dbus
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/bash
-
-# general config
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case $1 in
-    start)
-        stat_busy "Starting D-BUS system messagebus"
-        if [[ ! -d /run/dbus ]] ; then
-            install -m755 -g 81 -o 81 -d /run/dbus
-        fi
-
-        if ! dbus-daemon --system; then
-            stat_fail
-        else
-            add_daemon dbus
-            stat_done
-        fi
-        ;;
-    stop)
-        stat_busy "Stopping D-BUS system messagebus"
-        if ! { [[ -f /run/dbus/pid ]] && kill $(</run/dbus/pid); }; then
-            stat_fail
-        else
-            rm -f /run/dbus/pid
-            rm_daemon dbus
-            stat_done
-        fi
-        ;;
-    restart)
-        $0 stop
-        sleep 1
-        $0 start
-        ;;
-    reload)
-        stat_busy "Reloading D-BUS configuration"
-        if ! { [[ -f /run/dbus/pid ]] && dbus-send \
-                --system --type=method_call \
-                --dest=org.freedesktop.DBus \
-                / org.freedesktop.DBus.ReloadConfig; }; then
-            stat_fail
-        else
-            stat_done
-        fi
-        ;;
-    *)
-        echo "usage: $0 {start|stop|restart|reload}"
-        ;;
-esac
-exit 0
diff --git a/core/dbus/dbus.install b/core/dbus/dbus.install
deleted file mode 100644
index 01506cf96..000000000
--- a/core/dbus/dbus.install
+++ /dev/null
@@ -1,6 +0,0 @@
-post_upgrade() {
-  # Make sure new rc script can shutdown running dbus
-  if [ -f run/dbus.pid -a -d run/dbus ]; then
-    mv run/dbus.pid run/dbus/pid
-  fi
-}
diff --git a/core/dhcpcd/PKGBUILD b/core/dhcpcd/PKGBUILD
index d166ac667..58b63ab65 100644
--- a/core/dhcpcd/PKGBUILD
+++ b/core/dhcpcd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 179927 2013-03-12 12:59:52Z foutrelis $
+# $Id: PKGBUILD 184223 2013-05-04 10:58:11Z foutrelis $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: Tom Killian <tom.archlinux.org>
 # Contributor: Judd Vinet <jvinet.zeroflux.org>
 
 pkgname=dhcpcd
-pkgver=5.6.7
+pkgver=5.6.8
 pkgrel=1
 pkgdesc="RFC2131 compliant DHCP client daemon"
 url="http://roy.marples.name/projects/dhcpcd/"
@@ -17,7 +17,7 @@ backup=('etc/conf.d/dhcpcd' 'etc/dhcpcd.conf')
 options=('emptydirs')  # We Need the Empty /var/lib/dhcpcd Directory
 source=("http://roy.marples.name/downloads/$pkgname/$pkgname-$pkgver.tar.bz2" \
         'dhcpcd.conf.d' 'dhcpcd_.service' 'dhcpcd.service')
-sha1sums=('2f9f2f432e43181497c4909725e29239c9ff004a'
+sha1sums=('93c1a071eb406084d0a71c14e5707af4cd453917'
           'b67b9ce6a2faaca75fea356966a16be2283b7db0'
           '6245b8db7e6f39a0305571726bb693a53901c400'
           'e49e01041f831281a1cd0c97ca21204e0aa07fda')
diff --git a/core/openvpn/PKGBUILD b/core/openvpn/PKGBUILD
index 40fe8cad9..3b79a7ab8 100644
--- a/core/openvpn/PKGBUILD
+++ b/core/openvpn/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 177954 2013-02-12 12:13:51Z thomas $
+# $Id: PKGBUILD 184228 2013-05-04 14:17:41Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 
 pkgname=openvpn
-pkgver=2.3.0
-pkgrel=2
+pkgver=2.3.1
+pkgrel=1
 pkgdesc="An easy-to-use, robust, and highly configurable VPN (Virtual Private Network)"
 arch=(i686 x86_64)
 url="http://openvpn.net/index.php/open-source.html"
@@ -18,10 +18,10 @@ source=(http://swupdate.openvpn.net/community/releases/openvpn-${pkgver}.tar.gz
         http://build.openvpn.net/downloads/releases/easy-rsa-2.2.0_master.tar.gz.asc
         openvpn@.service
         openvpn-2.3.0-fix-systemd-ask-password-path.patch)
-md5sums=('56cffde5d5320e0b1ec364d3e486aca9'
-         '3f67e2fa605800a964dbbcfca644d283'
+md5sums=('57a3b64597fc37b7842a3fde354d8bbe'
+         'SKIP'
          'fbf818b6e1f212e77b9ce0e6d92584a1'
-         '46df49b85f9850fec287e311279bdbef'
+         'SKIP'
          '0846aa59d0b123d61030890f9a4135ae'
          'e1bd1523e38745e948c710db1a330bb1')
 options=(!libtool)
diff --git a/core/util-linux/PKGBUILD b/core/util-linux/PKGBUILD
index b5c31da6a..3894784c6 100644
--- a/core/util-linux/PKGBUILD
+++ b/core/util-linux/PKGBUILD
@@ -1,21 +1,22 @@
-# $Id: PKGBUILD 180085 2013-03-16 08:30:40Z pierre $
+# $Id: PKGBUILD 184217 2013-05-03 23:40:29Z dreisner $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=util-linux
-pkgver=2.22.2
-pkgrel=2
+pkgver=2.23
+pkgrel=1
 pkgdesc="Miscellaneous system utilities for Linux"
 url="http://www.kernel.org/pub/linux/utils/util-linux/"
 arch=('i686' 'x86_64')
 groups=('base' 'base-devel')
 depends=('pam' 'shadow' 'coreutils' 'glibc')
+makedepends=('systemd')
 # checkdepends=('bc')
 conflicts=('util-linux-ng' 'eject')
 provides=("util-linux-ng=${pkgver}" 'eject')
 license=('GPL2')
 options=('!libtool')
-source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.22/${pkgname}-${pkgver}.tar.xz
+source=(ftp://ftp.kernel.org/pub/linux/utils/${pkgname}/v2.23/${pkgname}-${pkgver}.tar.xz
         uuidd.tmpfiles
         pam-login
         pam-common
@@ -75,7 +76,7 @@ package() {
   # TODO(dreisner): offer this upstream?
   install -Dm644 "$srcdir/uuidd.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/uuidd.conf"
 }
-md5sums=('eeacbfdd2556acd899a2d0ffdb446185'
+md5sums=('cf5e9bb402371beaaffc3a5f276d5783'
          'a39554bfd65cccfd8254bb46922f4a67'
          '4368b3f98abd8a32662e094c54e7f9b1'
          'a31374fef2cba0ca34dfc7078e2969e4'
diff --git a/core/wpa_actiond/PKGBUILD b/core/wpa_actiond/PKGBUILD
index 825c0d011..4fe9e1e79 100644
--- a/core/wpa_actiond/PKGBUILD
+++ b/core/wpa_actiond/PKGBUILD
@@ -1,15 +1,17 @@
-# $Id: PKGBUILD 164502 2012-08-01 09:59:07Z thomas $
+# $Id: PKGBUILD 184227 2013-05-04 14:17:40Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=wpa_actiond
-pkgver=1.3
+pkgver=1.4
 pkgrel=1
 pkgdesc="Daemon that connects to wpa_supplicant and handles connect and disconnect events"
 arch=('i686' 'x86_64')
 url="http://projects.archlinux.org/wpa_actiond.git/"
 license=('GPL')
 depends=('glibc' 'wpa_supplicant')
-source=(ftp://ftp.archlinux.org/other/wpa_actiond/${pkgname}-${pkgver}.tar.xz)
-sha256sums=('4523b76980198666ac93f3a3772a10554ef608e6a18ab9eb1346303ee3a6f4b1')
+source=(ftp://ftp.archlinux.org/other/wpa_actiond/${pkgname}-${pkgver}.tar.xz
+        ftp://ftp.archlinux.org/other/wpa_actiond/${pkgname}-${pkgver}.tar.xz.sig)
+sha256sums=('e0e65e7c52a32796a0ff855ab18aa0b237d6b9afc87d4008c0380735abcb1a54'
+            'fb026e76979e3bb78dfb38ddc01b9cd57dc0885c9965d2e60c4d8a0ec95d6b74')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/extra/gcr/PKGBUILD b/extra/gcr/PKGBUILD
index 96eb71ee8..fc1107a6b 100644
--- a/extra/gcr/PKGBUILD
+++ b/extra/gcr/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 183360 2013-04-21 22:09:15Z heftig $
+# $Id: PKGBUILD 184241 2013-05-04 20:06:54Z heftig $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 
 pkgname=gcr
-pkgver=3.8.1
+pkgver=3.8.2
 pkgrel=1
 pkgdesc="A library for bits of crypto UI and parsing"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ options=(!libtool)
 install=gcr.install
 source=(http://download.gnome.org/sources/$pkgname/${pkgver::3}/$pkgname-$pkgver.tar.xz
         10-gcr.conf)
-sha256sums=('38f158d71ce8fb14dca74928053a3edf32751e142400d1429bec5fe0f4bbb8f0'
+sha256sums=('a1e615ce2cfd375f383bbdd289935a8e3e16901c3c6f032780847055e8bec2c1'
             '5f2eda7175ae9f23ee0e09d2beceb24fd2f6daafd7bddfcc1c1f5a3734eb60fc')
 
 build() {
diff --git a/extra/gnome-keyring/PKGBUILD b/extra/gnome-keyring/PKGBUILD
index 0a4c04796..a63dfba2c 100644
--- a/extra/gnome-keyring/PKGBUILD
+++ b/extra/gnome-keyring/PKGBUILD
@@ -1,8 +1,8 @@
-#$Id: PKGBUILD 183385 2013-04-21 22:10:00Z heftig $
+#$Id: PKGBUILD 184243 2013-05-04 20:20:08Z heftig $
 # Maintainer: Jan De Groot <jgc@archlinux.org>
 
 pkgname=gnome-keyring
-pkgver=3.8.1
+pkgver=3.8.2
 pkgrel=1
 pkgdesc="GNOME Password Management daemon"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ options=('!libtool' '!emptydirs')
 url="http://www.gnome.org"
 install=gnome-keyring.install
 source=(http://ftp.gnome.org/pub/gnome/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz)
-sha256sums=('56e0a47c021fb2d2fd2c723a0e1c9e46c9a0a81ed865ac1588c19aca16ca4f37')
+sha256sums=('f05692bb32db4d1afa65205ac4e68fa2b79107aca2393e237cf38f880cb7b868')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/gnumeric/PKGBUILD b/extra/gnumeric/PKGBUILD
index cf6214957..60251ada3 100644
--- a/extra/gnumeric/PKGBUILD
+++ b/extra/gnumeric/PKGBUILD
@@ -1,16 +1,17 @@
-# $Id: PKGBUILD 179971 2013-03-13 16:25:37Z jgc $
+# $Id: PKGBUILD 184239 2013-05-04 19:38:00Z foutrelis $
 # Maintainer: Eric Belanger <eric@archlinux.org>
 # Contributor: Kritoke <typeolinux@yahoo.com>
 
 pkgname=gnumeric
-pkgver=1.12.1
+pkgver=1.12.2
 pkgrel=1
 pkgdesc="A GNOME Spreadsheet Program"
 arch=('i686' 'x86_64')
 url="http://www.gnome.org/projects/gnumeric/"
 license=('GPL')
 depends=('goffice' 'desktop-file-utils' 'hicolor-icon-theme')
-makedepends=('intltool' 'psiconv' 'pygobject-devel' 'gnome-doc-utils' 'gobject-introspection')
+makedepends=('intltool' 'psiconv' 'pygobject-devel' 'gnome-doc-utils'
+             'gobject-introspection' 'optipng')
 optdepends=('python2-gobject: for python plugin support'
             'perl: for perl plugin support'
             'psiconv: for Psion 5 file support'
@@ -20,12 +21,13 @@ options=('!libtool')
 source=(http://ftp.gnome.org/pub/gnome/sources/${pkgname}/${pkgver%.*}/${pkgname}-${pkgver}.tar.xz
         gnumeric-1.12.1-automake-1.13.patch
         revert-warnings.patch)
-sha256sums=('0f5a7af3acae7db643eb00e8b4fca6a9e90162259c6a73e4214cfa8c96cc3901'
+sha256sums=('d6fda191c1c76be2ede21fe78b8c9f96d39aea82ccfb537775a83bf88d781874'
             '1eb57b931023d961e9d0f3675fe96b5559270fa38c97401cb06fc7aed9c8e275'
             'bcafca016b809000c2a5bf911e2e3dfa4de28f9e541d9964574cac5c7ce09e53')
 
-build() {
+prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
+
   patch -Np1 -i ../gnumeric-1.12.1-automake-1.13.patch
   patch -Np0 -i ../revert-warnings.patch
 
@@ -33,8 +35,16 @@ build() {
   sed -i -e 's/zz-application\/zz-winassoc-xls;//' gnumeric.desktop.in
 
   autoreconf -fi
+
+  # Fix invalid PNG images to work with libpng 1.6
+  # https://bugzilla.gnome.org/show_bug.cgi?id=699683
+  find -name '*.png' -exec optipng -quiet -force -fix {} +
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
   ./configure --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
-    --enable-ssindex --disable-schemas-compile --enable-introspection --enable-compile-warnings=no
+    --disable-schemas-compile --enable-introspection
   make
 }
 
diff --git a/extra/opus/PKGBUILD b/extra/opus/PKGBUILD
index 46008e22c..33b8e9bef 100644
--- a/extra/opus/PKGBUILD
+++ b/extra/opus/PKGBUILD
@@ -1,34 +1,34 @@
-# $Id: PKGBUILD 172981 2012-12-08 01:33:56Z eric $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
+# $Id: PKGBUILD 184222 2013-05-04 08:38:14Z heftig $
+# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
+# Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: DrZaius <lou[at]fakeoutdoorsman[dot]com>
 # Contributor: pumbur
 
 pkgname=opus
 pkgver=1.0.2
-pkgrel=1
+pkgrel=2
 pkgdesc="Codec designed for interactive speech and audio transmission over the Internet"
-arch=('i686' 'x86_64')
+arch=(i686 x86_64)
 url="http://www.opus-codec.org/"
-license=('custom')
-depends=('glibc')
+license=(BSD)
+depends=(glibc)
 options=('!libtool')
-source=("http://downloads.xiph.org/releases/${pkgname}/${pkgname}-${pkgver}.tar.gz")
+source=(http://downloads.us.xiph.org/releases/$pkgname/$pkgname-$pkgver.tar.gz)
 md5sums=('c503ad05a59ddb44deab96204401be03')
 
 build() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  ./configure --prefix=/usr
+  cd $pkgname-$pkgver
+  ./configure --prefix=/usr --enable-custom-modes
   make
 }
 
 check() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
+  cd $pkgname-$pkgver
   make check
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-  install -m755 -d "${pkgdir}/usr/share/licenses/opus"
-  install -m644 COPYING "${pkgdir}/usr/share/licenses/opus/"
+  cd $pkgname-$pkgver
+  make DESTDIR="$pkgdir" install
+  install -Dm644 COPYING "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/extra/v4l-utils/PKGBUILD b/extra/v4l-utils/PKGBUILD
index 28530bc73..7dc7aaa02 100644
--- a/extra/v4l-utils/PKGBUILD
+++ b/extra/v4l-utils/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 179004 2013-03-01 10:26:47Z andrea $
+# $Id: PKGBUILD 184233 2013-05-04 14:56:27Z thomas $
 # Maintainer: Thomas Bächler <thomas@archlinux.org>
 pkgname=v4l-utils
-pkgver=0.9.3
-pkgrel=2
+pkgver=0.9.5
+pkgrel=1
 pkgdesc="Userspace tools and conversion library for Video 4 Linux"
 arch=('i686' 'x86_64')
 url="http://freshmeat.net/projects/libv4l"
@@ -16,13 +16,11 @@ optdepends=('qt4')
 depends=('glibc' 'gcc-libs' 'sysfsutils' 'libjpeg-turbo')
 source=(http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2
         http://linuxtv.org/downloads/v4l-utils/${pkgname}-${pkgver}.tar.bz2.asc)
-sha256sums=('502db0d865a392d87bff22c4f3bcfb3d0755937b1c18496edd941fd2d1784a3d'
-            '120388a92c3b720bd82e7617a908f3f7e1071d3b9075e9b537b7c60fc3575b08')
+sha256sums=('6c9f1be981d5763069e0969ebe426c39da5a7d738865367e390e3b486f1b502c'
+            'SKIP')
 options=(!libtool)
 
 build() {
-  . /etc/profile.d/qt4.sh
-
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr --sysconfdir=/etc
diff --git a/extra/yp-tools/PKGBUILD b/extra/yp-tools/PKGBUILD
index e85a3e1e6..4fd34a023 100644
--- a/extra/yp-tools/PKGBUILD
+++ b/extra/yp-tools/PKGBUILD
@@ -1,20 +1,22 @@
-# $Id: PKGBUILD 165833 2012-08-31 12:24:13Z tomegun $
+# $Id: PKGBUILD 184213 2013-05-03 22:54:47Z tomegun $
 # Mantainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: dorphell <dorphell@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=yp-tools
-pkgver=2.12
-pkgrel=4
+pkgver=2.14
+pkgrel=2
 pkgdesc='Linux NIS Tools'
 arch=('i686' 'x86_64')
 url='http://www.linux-nis.org/nis/yp-tools/'
 license=('GPL2')
 depends=('ypbind-mt')
-#source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/$pkgname-$pkgver.tar.gz")
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-	'domainname.service')
+backup=('etc/nisdomainname')
+install=yp-tools.install
+source=("http://www.linux-nis.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
+	'domainname.service'
+	'domainname.conf')
 
 build() {
 	cd "$srcdir/$pkgname-$pkgver"
@@ -25,7 +27,9 @@ build() {
 package() {
 	cd "$srcdir/$pkgname-$pkgver"
 	make DESTDIR="$pkgdir" install
+	install -D -m644 ../domainname.conf "${pkgdir}/etc/nisdomainname"
 	install -D -m644 ../domainname.service "${pkgdir}/usr/lib/systemd/system/domainname.service"
 }
-md5sums=('ce1e06d86caa285fa8cd76fdf103f51e'
-         '8d354b76eb0df9a3b06637bfff87453b')
+md5sums=('ba1f121c17e3ad65368be173b977cd13'
+         '5a78cd2218936241133e5f61383a2dc8'
+         '74298e047121f528a2a5c221afd783ab')
diff --git a/extra/yp-tools/domainname.conf b/extra/yp-tools/domainname.conf
new file mode 100644
index 000000000..d43d5f53e
--- /dev/null
+++ b/extra/yp-tools/domainname.conf
@@ -0,0 +1,4 @@
+#
+# NIS domain to be set by domainname.service
+#
+NISDOMAINNAME=""
diff --git a/extra/yp-tools/domainname.service b/extra/yp-tools/domainname.service
index 035f767c8..7a1705688 100644
--- a/extra/yp-tools/domainname.service
+++ b/extra/yp-tools/domainname.service
@@ -3,7 +3,7 @@ Description=NIS Domainname
 
 [Service]
 Type=oneshot
-EnvironmentFile=/etc/conf.d/nisdomainname
+EnvironmentFile=/etc/nisdomainname
 ExecStart=/usr/bin/nisdomainname $NISDOMAINNAME
 RemainAfterExit=true
 
diff --git a/extra/yp-tools/yp-tools.install b/extra/yp-tools/yp-tools.install
new file mode 100644
index 000000000..19e8ecaf4
--- /dev/null
+++ b/extra/yp-tools/yp-tools.install
@@ -0,0 +1,5 @@
+post_upgrade() {
+	if [ "$(vercmp 2.14-2 "$2")" -eq 1 ]; then
+		printf '===> Configure your NIS domain name in /etc/nisdomainname\n'
+	fi
+}
diff --git a/extra/ypbind-mt/PKGBUILD b/extra/ypbind-mt/PKGBUILD
index d4ce1b4d9..56ade6c6c 100644
--- a/extra/ypbind-mt/PKGBUILD
+++ b/extra/ypbind-mt/PKGBUILD
@@ -1,32 +1,27 @@
-# $Id: PKGBUILD 162167 2012-06-22 13:00:20Z dreisner $
+# $Id: PKGBUILD 184214 2013-05-03 22:54:48Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=ypbind-mt
-pkgver=1.33
-pkgrel=5
+pkgver=1.37.1
+pkgrel=4
 pkgdesc='Linux NIS daemon'
 url='http://www.linux-nis.org/nis/ypbind-mt/'
 license=('GPL2')
 arch=('i686' 'x86_64')
 makedepends=('networkmanager')
-depends=('rpcbind' 'openslp' 'dbus-glib' 'yp-tools')
-backup=('etc/yp.conf' 'etc/conf.d/ypbind' 'etc/conf.d/nisdomainname')
-#source=("ftp://ftp.kernel.org/pub/linux/utils/net/NIS/${pkgname}-${pkgver}.tar.gz"
-source=("ftp://ftp.archlinux.org/other/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-        'nisdomainname.conf'
-        'ypbind.conf'
-        'ypbind'
+depends=('rpcbind' 'openslp' 'yp-tools')
+backup=('etc/yp.conf')
+source=("http://www.linux-nis.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
 	'ypbind.service')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 
 	./configure \
-		--prefix=/usr \
-		--enable-dbus-nm \
+		--prefix=/usr
 
 	make
 }
@@ -37,14 +32,8 @@ package() {
 	make DESTDIR="${pkgdir}" install
 
 	install -D -m644 etc/yp.conf "${pkgdir}"/etc/yp.conf
-	install -D -m755 ../ypbind "${pkgdir}"/etc/rc.d/ypbind
-	install -D -m644 ../ypbind.conf "${pkgdir}"/etc/conf.d/ypbind
-	install -D -m644 ../nisdomainname.conf "${pkgdir}"/etc/conf.d/nisdomainname
 	install -D -m644 ../ypbind.service "${pkgdir}"/usr/lib/systemd/system/ypbind.service
 	install -d -m755 "${pkgdir}"/var/yp/binding
 }
-md5sums=('692f68ed0476762be4228ce543a5b791'
-         'e83a85291ea2ee152a78f2c16b0b1185'
-         '229309a989abad27703ac2e6d07dc7ae'
-         '1f7a4c80414d580c9afb3a08267beed0'
-         '88a721095e334cd442f4649a151ba9be')
+md5sums=('8af8d35e7b9a7fcc3a1576697a04bd82'
+         '9083debd16fc49c6645372caa25969b5')
diff --git a/extra/ypbind-mt/ypbind b/extra/ypbind-mt/ypbind
deleted file mode 100755
index 6a5ef11e3..000000000
--- a/extra/ypbind-mt/ypbind
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-. /etc/conf.d/ypbind
-. /etc/conf.d/nisdomainname
-
-name=ypbind
-PID=$(pidof -o %PPID /usr/sbin/ypbind)
-
-case "$1" in
-start)
-	stat_busy "Starting $name daemon"
-	[[ -n $NISDOMAINNAME ]] && /usr/bin/domainname "$NISDOMAINNAME" &>/dev/null
-	[[ -z "$PID" ]] && /usr/sbin/ypbind $YPBIND_ARGS &>/dev/null \
-	&& { add_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-stop)
-	stat_busy "Stopping $name daemon"
-	[[ -n "$PID" ]] && kill $PID &>/dev/null \
-	&& { rm_daemon $name; stat_done; } \
-	|| { stat_fail; exit 1; }
-	;;
-restart)
-	$0 stop
-	sleep 1
-	$0 start
-	;;
-*)
-	echo "usage: $0 {start|stop|restart}"
-	exit 1
-	;;
-esac
diff --git a/extra/ypbind-mt/ypbind.conf b/extra/ypbind-mt/ypbind.conf
deleted file mode 100644
index fd0ebd491..000000000
--- a/extra/ypbind-mt/ypbind.conf
+++ /dev/null
@@ -1,4 +0,0 @@
-#
-# Parameters to be passed to ypbind
-#
-YPBIND_ARGS=""
diff --git a/extra/ypbind-mt/ypbind.service b/extra/ypbind-mt/ypbind.service
index c59231000..08e4fe14e 100644
--- a/extra/ypbind-mt/ypbind.service
+++ b/extra/ypbind-mt/ypbind.service
@@ -8,6 +8,9 @@ Before=systemd-user-sessions.service
 Type=forking
 PIDFile=/run/ypbind.pid
 ExecStart=/usr/sbin/ypbind
+# Terrible hack, upstream ypbind should sort something out
+# Wait for at most 10 seconds for a NIS master to become available
+ExecStartPost=/bin/sh -c "for i in 1 2 3 4 5 6 7 8 9 10; do ypwhich && break; sleep 1; done"
 
 [Install]
 WantedBy=multi-user.target
diff --git a/extra/ypserv/PKGBUILD b/extra/ypserv/PKGBUILD
index 694c43665..879df8781 100644
--- a/extra/ypserv/PKGBUILD
+++ b/extra/ypserv/PKGBUILD
@@ -1,12 +1,12 @@
-# $Id: PKGBUILD 168108 2012-10-06 00:49:54Z dreisner $
+# $Id: PKGBUILD 184215 2013-05-03 22:54:49Z tomegun $
 # Maintainer: Tom Gundersen <teg@jklm.no>
 # Contributor: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=ypserv
-pkgver=2.28
-pkgrel=2
+pkgver=2.31
+pkgrel=1
 pkgdesc='Linux NIS Server'
 arch=('i686' 'x86_64')
 url='http://www.linux-nis.org/nis/ypserv/'
@@ -15,16 +15,12 @@ depends=('gdbm' 'openslp' 'inetutils' 'yp-tools')
 optdepends=('gawk: for printcap support')
 backup=('etc/ypserv.conf' 'etc/netgroup' 'var/yp/securenets')
 source=("http://www.linux-nis.org/download/${pkgname}/${pkgname}-${pkgver}.tar.bz2"
-	'confpost.patch'
         'ypxfrd.service'
         'yppasswdd.service'
-	'ypserv.service'
-        'yppasswd'
-        'ypserv')
+	'ypserv.service')
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../confpost.patch
 	./configure --prefix=/usr
 	make
 }
@@ -36,19 +32,11 @@ package() {
 	install -D -m644 etc/netgroup "${pkgdir}"/etc/netgroup
 	install -D -m644 etc/ypserv.conf "${pkgdir}"/etc/ypserv.conf
 	install -D -m644 etc/securenets "${pkgdir}"/var/yp/securenets
-	install -D -m755 ../ypserv "${pkgdir}"/etc/rc.d/ypserv
-	install -D -m755 ../yppasswd "${pkgdir}"/etc/rc.d/yppasswd
 	install -D -m644 ../ypxfrd.service "${pkgdir}"/usr/lib/systemd/system/ypxfrd.service
 	install -D -m644 ../ypserv.service "${pkgdir}"/usr/lib/systemd/system/ypserv.service
 	install -D -m644 ../yppasswdd.service "${pkgdir}"/usr/lib/systemd/system/yppasswdd.service
-
-	# Provide native service for arch-daemons generator
-	ln -s yppasswdd.service "$pkgdir/usr/lib/systemd/system/yppasswd.service"
 }
-md5sums=('ed64f489bab494218fc5c5942b95d5b6'
-         '8acb314f30d6e531ac9efa8655f68ccb'
+md5sums=('4537b8f0e917edca8f57b70b9cbc37f3'
          'c80e253756446d59a90c4c21b1cb8740'
          '7cba3dd3544436c3c1f05e36c0018e92'
-         '3398271c3e0a054e64b06b99aa2dc63d'
-         '4bc84c48ed1bb9659698853acb5cfd76'
-         'c40befe5932f1b42efaced6b46809303')
+         '3398271c3e0a054e64b06b99aa2dc63d')
diff --git a/extra/ypserv/confpost.patch b/extra/ypserv/confpost.patch
deleted file mode 100644
index 489e4368a..000000000
--- a/extra/ypserv/confpost.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff -up ypserv-2.27/conf_post.h.qdbm ypserv-2.27/conf_post.h
---- ypserv-2.27/conf_post.h.qdbm	2012-02-01 14:18:01.780846425 +0100
-+++ ypserv-2.27/conf_post.h	2012-02-01 14:18:01.780846425 +0100
-@@ -0,0 +1,10 @@
-+/* Define common preprocessor symbol for HAVE_LIBGDBM and HAVE_LIBQDBM, since
-+ * libraries gdbm and qdbm have same symbol names. */
-+#undef HAVE_COMPAT_LIBGDBM
-+#ifdef HAVE_LIBGDBM
-+#define HAVE_COMPAT_LIBGDBM
-+#endif
-+#ifdef HAVE_LIBQDBM
-+#define HAVE_COMPAT_LIBGDBM
-+#endif
-+
diff --git a/extra/ypserv/yppasswd b/extra/ypserv/yppasswd
deleted file mode 100755
index c2b00b2ca..000000000
--- a/extra/ypserv/yppasswd
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting NIS Password Daemon"
-    /usr/sbin/rpc.yppasswdd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon yppasswd
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping NIS Password Daemon"
-    killall -q /usr/sbin/rpc.yppasswdd
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon yppasswd
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/extra/ypserv/ypserv b/extra/ypserv/ypserv
deleted file mode 100755
index c36e6901b..000000000
--- a/extra/ypserv/ypserv
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/bin/bash
-
-. /etc/rc.conf
-. /etc/rc.d/functions
-
-case "$1" in
-  start)
-    stat_busy "Starting NIS Server"
-    /usr/sbin/ypserv
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      add_daemon ypserv
-      stat_done
-    fi
-    ;;
-  stop)
-    stat_busy "Stopping NIS Server"
-    killall -q /usr/sbin/ypserv
-    if [ $? -gt 0 ]; then
-      stat_fail
-    else
-      rm_daemon ypserv
-      stat_done
-    fi
-    ;;
-  restart)
-    $0 stop
-    sleep 1
-    $0 start
-    ;;
-  *)
-    echo "usage: $0 {start|stop|restart}"  
-esac
diff --git a/libre/iceweasel-libre/PKGBUILD b/libre/iceweasel-libre/PKGBUILD
index 03dd71fba..314d5ca6d 100644
--- a/libre/iceweasel-libre/PKGBUILD
+++ b/libre/iceweasel-libre/PKGBUILD
@@ -14,7 +14,7 @@ _pgo=true
 
 # We're getting this from Debian Experimental
 _debname=iceweasel
-_debver=20.0.1
+_debver=20.0
 _debrel=1
 _debrepo=http://ftp.debian.org/debian/pool/main/
 debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
@@ -22,7 +22,7 @@ debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
 _pkgname=iceweasel
 pkgname=iceweasel-libre
 pkgver=$_debver.$_debrel
-pkgrel=1
+pkgrel=3
 
 pkgdesc="A libre version of Debian Iceweasel, the standalone web browser based on Mozilla Firefox."
 arch=(i686 x86_64 mips64el)
@@ -54,7 +54,7 @@ source=("$_debrepo/`debfile $_debname`_$_debver.orig.tar.bz2"
         Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
 md5sums=('22daa24b6490c654f131550cbf20fad3'
          '0c70ab52f35701558081df3d360361a2'
-         'f90c6a70d0a6d0a9e7f9a0eed6aeffd3'
+         '01f56b3ccbead0f665ed82fae0b8f290'
          '383e8e2a97a8b13fe56d153adb6878b6'
          '5addd418bf32b673fdfe80c8fefbea1a'
          '7b9e5996dd9fe0b186a43a297db1c6b5'
@@ -142,8 +142,7 @@ prepare() {
 
   # configure script misdetects the preprocessor without an optimization level
   # https://bugs.archlinux.org/task/34644
-  # TODO: re-enable when we're building with GCC >= 4.8 again
-  #sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
+  sed -i '/ac_cpp=/s/$CPPFLAGS/& -O2/' configure
 }
 
 build() {
diff --git a/libre/iceweasel-libre/mozconfig b/libre/iceweasel-libre/mozconfig
index c929b8972..d7961bf41 100644
--- a/libre/iceweasel-libre/mozconfig
+++ b/libre/iceweasel-libre/mozconfig
@@ -13,7 +13,9 @@ 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
+# Build with bundled libpng to avoid flickering tab loading icon
+# https://bugzilla.mozilla.org/show_bug.cgi?id=841734
+#ac_add_options --with-system-png
 ac_add_options --with-system-libevent
 ac_add_options --with-system-libvpx
 ac_add_options --enable-system-hunspell