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

Conflicts:
	community/cksfv/PKGBUILD
	extra/clutter-gtk2/PKGBUILD
	extra/gnuplot/PKGBUILD
	extra/mx/PKGBUILD

41 files changed, 921 insertions, 610 deletions

diff --git a/community/cksfv/PKGBUILD b/community/cksfv/PKGBUILD
index 214e52a44..90f7bf4e7 100644
--- a/community/cksfv/PKGBUILD
+++ b/community/cksfv/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 57202 2011-10-23 23:26:43Z andrea $
+# $Id: PKGBUILD 86750 2013-03-21 21:05:54Z eric $
 # Maintainer: Jaroslaw Swierczynski <swiergot@aur.archlinux.org>
 # Contributor: Wijnand Modderman <wijanand+aur@archlinux.nl>
 
@@ -7,20 +7,20 @@ pkgver=1.3.14
 pkgrel=2.1
 pkgdesc="SFV (Simple File Verification) Checker"
 arch=('i686' 'x86_64' 'mips64el')
-url="http://zakalwe.virtuaalipalvelin.net/~shd/foss/cksfv/"
+url="http://zakalwe.fi/~shd/foss/cksfv"
 license=('GPL')
 depends=('glibc')
 source=(http://zakalwe.fi/~shd/foss/cksfv/files/$pkgname-$pkgver.tar.gz)
 md5sums=('2e15289753ea0b90b6ea86993f93b383')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
-  ./configure --prefix=/usr --package-prefix=$pkgdir
+  cd "$srcdir/$pkgname-$pkgver"
+  ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make install
-  chmod 644 $pkgdir/usr/share/man/man1/$pkgname.1
+  cd "$srcdir/$pkgname-$pkgver"
+  make BINDIR="$pkgdir/usr/bin" MANDIR="$pkgdir/usr/share/man" install
+  chmod 644 "$pkgdir/usr/share/man/man1/$pkgname.1"
 }
diff --git a/community/fcitx-libpinyin/PKGBUILD b/community/fcitx-libpinyin/PKGBUILD
index 7209e0699..4073cf949 100644
--- a/community/fcitx-libpinyin/PKGBUILD
+++ b/community/fcitx-libpinyin/PKGBUILD
@@ -1,19 +1,18 @@
-# $Id: PKGBUILD 81661 2012-12-26 06:37:02Z fyan $
+# $Id: PKGBUILD 86671 2013-03-21 01:29:43Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: poplarch <poplarch@gmail.com>
 
 pkgname=fcitx-libpinyin
-pkgver=0.2.1
-pkgrel=3
+pkgver=0.2.90
+pkgrel=1
 pkgdesc="Fcitx Wrapper for libpinyin, Library to deal with pinyin"
 arch=('i686' 'x86_64' 'mips64el')
 url="https://github.com/fcitx/fcitx-libpinyin"
 license=('GPL')
-depends=('fcitx>=4.2.0' 'libpinyin>=0.3.0')
+depends=('fcitx' 'libpinyin')
 makedepends=('cmake' 'intltool' 'wget')
-provides=('fcitx-libpinyin')
 source=("http://fcitx.googlecode.com/files/${pkgname}-${pkgver}.tar.xz")
-install='fcitx-libpinyin.install'
+install=$pkgname.install
 
 build() {
   cd "$srcdir/${pkgname}-${pkgver}"
@@ -32,4 +31,4 @@ package() {
   cd "$srcdir/${pkgname}-${pkgver}/build"
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('9ff621f6f16ab426ff01652b1ffc06a7')
+md5sums=('b19526c18102d8c240f2933d21bbbc81')
diff --git a/community/frei0r-plugins/PKGBUILD b/community/frei0r-plugins/PKGBUILD
index 71094aa94..2b4c27802 100644
--- a/community/frei0r-plugins/PKGBUILD
+++ b/community/frei0r-plugins/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 79555 2012-11-07 13:11:40Z spupykin $
+# $Id: PKGBUILD 86724 2013-03-21 13:55:20Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 
 pkgname=frei0r-plugins
-pkgver=1.3
-pkgrel=6
+pkgver=1.4
+pkgrel=1
 pkgdesc="A minimalistic plugin API for video sources and filters"
 arch=(i686 x86_64 'mips64el')
 url="http://www.piksel.org/frei0r"
@@ -12,15 +12,15 @@ depends=('gcc-libs' 'gavl>=1.0.0' 'opencv>=2.4.3')
 makedepends=('doxygen')
 options=('!emptydirs')
 source=(http://ftp.dyne.org/frei0r/releases/frei0r-plugins-$pkgver.tar.gz)
-md5sums=('a2eb63feeeb0c5cf439ccca276cbf70c')
+md5sums=('202375d1bcb545c1b6eb8f34e0260ec5')
 
 build() {
-  cd "$srcdir/frei0r-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
   ./configure --prefix=/usr
   make
 }
 
 package() {
-  cd "$srcdir/frei0r-$pkgver"
+  cd "$srcdir/$pkgname-$pkgver"
   make DESTDIR="$pkgdir" install
 }
diff --git a/community/ibus-libpinyin/PKGBUILD b/community/ibus-libpinyin/PKGBUILD
index 0f9c45631..2d26691f2 100644
--- a/community/ibus-libpinyin/PKGBUILD
+++ b/community/ibus-libpinyin/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 79787 2012-11-12 15:24:58Z fyan $
+# $Id: PKGBUILD 86672 2013-03-21 01:30:22Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor:  Yangtse Su<yangtsesu@gmail.com>
 # Contributor:  Jekyll Wu<adaptee [at] gmail [dot] com>
@@ -7,7 +7,7 @@
 # Contributor: Lee.MaRS<leemars at gmail.com>
 
 pkgname=ibus-libpinyin
-pkgver=1.4.93
+pkgver=1.5.92
 pkgrel=1
 pkgdesc="Intelligent Pinyin engine based on libpinyin for IBus"
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,17 +15,19 @@ license=('LGPL')
 url="https://github.com/libpinyin"
 depends=('ibus>=1.4' 'libpinyin')
 makedepends=('git' 'intltool' 'gnome-common')
-source=(https://github.com/downloads/libpinyin/ibus-libpinyin/${pkgname}-${pkgver}.tar.gz)
-md5sums=("95f6143323deddaf6d82020dcc14a1af")
+source=(https://github.com/libpinyin/ibus-libpinyin/archive/$pkgver.tar.gz
+	automake-1.13.patch)
 
 build() {
-  cd ${srcdir}
-  rm -rf "${srcdir}/${pkgname}-build"
-  cp -r "${srcdir}/${pkgname}-${pkgver}" "${srcdir}/${pkgname}-build"
-  cd "${srcdir}/${pkgname}-build"
+  cd "$srcdir"
+  rm -rf "$srcdir/$pkgname-build"
+  cp -r "$srcdir/$pkgname-$pkgver" "$srcdir/$pkgname-build"
+  cd "$srcdir/$pkgname-build"
+
+  patch -Np1 -i "$srcdir/automake-1.13.patch"
 
   msg "Starting make..."
-  cd "${srcdir}/${pkgname}-build"
+  cd "$srcdir/$pkgname-build"
 
   # python2 fix
   for file in $(find . -name '*.py' -print); do
@@ -37,11 +39,15 @@ build() {
     sed -i 's_exec python_exec python2_' $file
   done
 
+  export REQUIRED_AUTOMAKE_VERSION=1.13 automake_progs=automake-1.13
+
   ./autogen.sh --prefix=/usr --libexecdir=/usr/lib/$pkgname
   make
 }
 
 package() {
-  cd "${srcdir}/${pkgname}-build"
-  make NO_INDEX=true DESTDIR=${pkgdir} install
+  cd "$srcdir/$pkgname-build"
+  make NO_INDEX=true DESTDIR="$pkgdir" install
 }
+md5sums=('2a355713221df7e47354f81cb14e183f'
+         '2a743114537a03830d5b4cd71226cfd0')
diff --git a/community/ibus-libpinyin/automake-1.13.patch b/community/ibus-libpinyin/automake-1.13.patch
new file mode 100644
index 000000000..f7f7cc0c9
--- /dev/null
+++ b/community/ibus-libpinyin/automake-1.13.patch
@@ -0,0 +1,10 @@
+--- a/autogen.sh	2013-03-18 22:55:12.210703327 +0800
++++ b/autogen.sh	2013-03-18 23:01:11.842675010 +0800
+@@ -19,6 +19,6 @@
+ }
+ 
+ ACLOCAL_FLAGS="$ACLOCAL_FLAGS -I m4"
+-REQUIRED_AUTOMAKE_VERSION=1.8
++REQUIRED_AUTOMAKE_VERSION=1.13
+ 
+ . gnome-autogen.sh "$@"
diff --git a/community/kaa-imlib2/PKGBUILD b/community/kaa-imlib2/PKGBUILD
index 9fa2cf127..d882cbb7a 100644
--- a/community/kaa-imlib2/PKGBUILD
+++ b/community/kaa-imlib2/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 68027 2012-03-17 01:32:31Z giovanni $
+# $Id: PKGBUILD 86681 2013-03-21 01:58:58Z eric $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: DonVla <donvla@users.sourceforge.net>
 
@@ -13,7 +13,7 @@ arch=('i686' 'x86_64' 'mips64el')
 source=(http://downloads.sourceforge.net/freevo/$pkgname-$pkgver.tar.gz)
 md5sums=('64828ede785ab0dd2d3c1f2f36c99342')
 
-build() {
-  cd $srcdir/$pkgname-$pkgver
-  python2 setup.py install --prefix=$pkgdir/usr
+package() {
+  cd "$srcdir/$pkgname-$pkgver"
+  python2 setup.py install --prefix="$pkgdir/usr"
 }
diff --git a/community/keepassx/PKGBUILD b/community/keepassx/PKGBUILD
index 73014bc24..0aa0f4d34 100644
--- a/community/keepassx/PKGBUILD
+++ b/community/keepassx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 85366 2013-03-01 10:34:27Z andrea $
+# $Id: PKGBUILD 86727 2013-03-21 15:05:26Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Greg Bouzakis <gregbouzakis@gmail.com>
 # Contributor: Alexander Fehr <pizzapunk gmail com>
@@ -19,7 +19,7 @@ md5sums=('1df67bb22b2e08df49f09e61d156f508')
 build() {
   cd $srcdir/$pkgname-$pkgver
   sed -i '1,1i#include <unistd.h>' src/lib/random.cpp
-  qmake
+  qmake-qt4
   make
 }
 
diff --git a/community/lazarus/PKGBUILD b/community/lazarus/PKGBUILD
index 32392804c..bfdee003e 100644
--- a/community/lazarus/PKGBUILD
+++ b/community/lazarus/PKGBUILD
@@ -1,13 +1,13 @@
-# $Id: PKGBUILD 86248 2013-03-14 10:44:31Z spupykin $
+# $Id: PKGBUILD 86718 2013-03-21 12:30:37Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Jens Adam (byte/jra) <j_adam@web.de>
 # Contributor: BlackIkeEagle <ike DOT devolder AT gmail DOT com>
 
 pkgbase=lazarus
 pkgname=('lazarus' 'lazarus-gtk2' 'lazarus-qt')
-pkgver=1.0.6
+pkgver=1.0.8
 _pkgsubver=0
-pkgrel=2
+pkgrel=1
 url='http://www.lazarus.freepascal.org/'
 license=('GPL2' 'MPL' 'custom:LGPL')
 arch=('i686' 'x86_64' 'mips64el')
@@ -15,7 +15,7 @@ makedepends=('fpc' 'fpc-src' 'gtk2' 'qt4pas' 'rsync')
 options=('!emptydirs' '!makeflags')
 source=("http://downloads.sourceforge.net/project/lazarus/Lazarus%20Zip%20_%20GZip/Lazarus%20$pkgver/lazarus-$pkgver-${_pkgsubver}.tar.gz"
 	'lazcontrols2.diff')
-md5sums=('bfab7c877996df911d883ca749c7cc4e'
+md5sums=('ef5085859be265a189db4aa20c648c2d'
          '288bca6ad5ade79deec34c3602daaaa9')
 
 build() {
diff --git a/community/lib32-sqlite/PKGBUILD b/community/lib32-sqlite/PKGBUILD
deleted file mode 100644
index b14b6c738..000000000
--- a/community/lib32-sqlite/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# $Id: PKGBUILD 86647 2013-03-20 22:06:02Z lcarlier $
-# Maintainer: Biru Ionut <ionut@archlinux.ro>
-# Contributor: Mikko Seppälä <t-r-a-y@mbnet.fi>
-# Contributor: Kaos < gianlucaatlas dot gmail dot com >
-
-_pkgbasename=sqlite
-pkgname=lib32-sqlite
-_amalgamationver=3071600
-#_docver=${_amalgamationver}
-_docver=3071600
-pkgver=3.7.16
-pkgrel=1
-pkgdesc="A C library that implements an SQL database engine (32-bit)"
-arch=('x86_64')
-license=('custom')
-url="http://www.sqlite.org/"
-depends=(lib32-glibc $_pkgbasename)
-makedepends=('tcl' 'gcc-multilib' 'lib32-readline')
-source=(http://www.sqlite.org/2013/sqlite-autoconf-${_amalgamationver}.tar.gz)
-options=(!libtool)
-md5sums=('919aedd0c84e1d8fb07129251dbe05bf')
-provides=("lib32-sqlite3=$pkgver")
-replaces=("lib32-sqlite3")
-conflicts=("lib32-sqlite3")
-
-build() {
-  cd ${srcdir}/sqlite-autoconf-${_amalgamationver}
-
-  export CC="gcc -m32"
-  export CXX="g++ -m32"
-  export PKG_CONFIG_PATH="/usr/lib32/pkgconfig"
-
-  export LTLINK_EXTRAS="-ldl"
-  export CFLAGS="$CFLAGS -DSQLITE_ENABLE_FTS3=1 -DSQLITE_ENABLE_COLUMN_METADATA=1 -DSQLITE_ENABLE_UNLOCK_NOTIFY -DSQLITE_SECURE_DELETE"
-
-  ./configure --prefix=/usr --libdir=/usr/lib32 \
-    --enable-threadsafe \
-    --disable-static
-
-  # rpath removal
-  sed -i 's|^hardcode_libdir_flag_spec=.*|hardcode_libdir_flag_spec=""|g' libtool
-  sed -i 's|^runpath_var=LD_RUN_PATH|runpath_var=DIE_RPATH_DIE|g' libtool
-
-  make
-}
-
-
-package() {
-  cd ${srcdir}/sqlite-autoconf-${_amalgamationver}
-
-  make DESTDIR=${pkgdir} install
-
-  rm -rf "${pkgdir}"/usr/{include,share,bin}
-  mkdir -p "$pkgdir/usr/share/licenses"
-  ln -s $_pkgbasename "$pkgdir/usr/share/licenses/$pkgname"
-}
diff --git a/community/libpinyin/PKGBUILD b/community/libpinyin/PKGBUILD
index 0400e7448..9e48633d8 100644
--- a/community/libpinyin/PKGBUILD
+++ b/community/libpinyin/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 84313 2013-02-16 09:44:07Z fyan $
+# $Id: PKGBUILD 86670 2013-03-21 01:28:41Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 # Contributor: Yangtse <yangtsesu@gmail.com> 
 # Contributor: WU Jun <quark at lihdd dot net>
 
 pkgname=libpinyin
-pkgver=0.8.1
+pkgver=0.8.93
 pkgrel=1
 pkgdesc="Library to deal with pinyin."
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,13 +13,13 @@ license=('GPL')
 depends=('db' 'glib2')
 options=(!libtool)
 source=("https://github.com/libpinyin/libpinyin/archive/${pkgver}.tar.gz"
-        "http://downloads.sourceforge.net/libpinyin/model.text.tar.gz")
-noextract=("model.text.tar.gz")
+        "http://downloads.sourceforge.net/libpinyin/model5.text.tar.gz")
+noextract=("model5.text.tar.gz")
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  cp "${srcdir}/model.text.tar.gz" "${srcdir}/${pkgname}-${pkgver}/data/"
-  sed -i '/wget.*model\.text\.tar\.gz/ d' ${srcdir}/${pkgname}-${pkgver}/data/Makefile.am
+  cp "${srcdir}/model5.text.tar.gz" "${srcdir}/${pkgname}-${pkgver}/data/"
+  sed -i '/wget.*model5\.text\.tar\.gz/ d' ${srcdir}/${pkgname}-${pkgver}/data/Makefile.am
 
   aclocal && libtoolize --force && autoheader && automake -a && autoconf
   ./configure --prefix=/usr && make
@@ -29,5 +29,5 @@ package() {
   cd "${srcdir}/libpinyin-$pkgver"
   make DESTDIR="${pkgdir}" install
 }
-md5sums=('5127f673efe08dd27dc96ef8a7953956'
-         '59be0e37b0834e41be9786d3b2fcc129')
+md5sums=('1d9a768496c8a4368d3488639cadd554'
+         'a83812e2d3be5695be54f95d9d7a3aa0')
diff --git a/community/mlt/PKGBUILD b/community/mlt/PKGBUILD
index 9a224af1d..fcfce8731 100644
--- a/community/mlt/PKGBUILD
+++ b/community/mlt/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 85375 2013-03-01 10:35:52Z andrea $
+# $Id: PKGBUILD 86716 2013-03-21 12:08:21Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Fabian Schoelzel <myfirstname.mylastname@googlemail.com>
 # Contributor: funkyou <spamopfer@nickname.berlin.de>
@@ -8,7 +8,7 @@
 pkgbase=mlt
 pkgname=('mlt' 'mlt-python-bindings')
 pkgver=0.8.8
-pkgrel=3
+pkgrel=4
 pkgdesc="An open source multimedia framework"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.mltframework.org"
@@ -16,15 +16,15 @@ license=('GPL')
 makedepends=('sdl_image' 'libsamplerate' 'libdv' 'qt4' 'sox' 'libxml2' 'gtk2' 'ffmpeg'
 	     'frei0r-plugins' 'swig' 'python2' "jack" "ladspa")
 source=(http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz
-	ffmpeg.patch)
+	fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch)
 md5sums=('06de4052cffd6760c468d7da9557edae'
-         'c28b4691d1715432d4de0055f4e2f5eb')
+         '8227e7a1b059b1b16901166d2a508317')
 
 build() {
   # mlt
   cd "$srcdir/mlt-$pkgver"
 
-#  patch -p1 <$srcdir/ffmpeg.patch
+  patch -p1 <$srcdir/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch
 
   [ $CARCH == "i686" ] && SSE2=--disable-sse2 || SSE2=
 #  SSE2=--disable-sse2
diff --git a/community/mlt/ffmpeg.patch b/community/mlt/ffmpeg.patch
deleted file mode 100644
index 7bd4903db..000000000
--- a/community/mlt/ffmpeg.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-diff -wbBur mlt-0.8.2/src/modules/avformat/consumer_avformat.c mlt-0.8.2.my/src/modules/avformat/consumer_avformat.c
---- mlt-0.8.2/src/modules/avformat/consumer_avformat.c	2012-08-28 20:25:58.000000000 +0400
-+++ mlt-0.8.2.my/src/modules/avformat/consumer_avformat.c	2012-11-06 16:03:07.269782436 +0400
-@@ -237,11 +237,7 @@
- 		mlt_properties_set_data( properties, "acodec", codecs, 0, (mlt_destructor) mlt_properties_close, NULL );
- 		mlt_properties_set_data( doc, "audio_codecs", codecs, 0, NULL, NULL );
- 		while ( ( codec = av_codec_next( codec ) ) )
--#if LIBAVCODEC_VERSION_INT >= ((54<<16)+(0<<8)+0)
--			if ( ( codec->encode || codec->encode2 ) && codec->type == CODEC_TYPE_AUDIO )
--#else
--			if ( codec->encode && codec->type == CODEC_TYPE_AUDIO )
--#endif
-+			if ( ( codec->encode2 ) && codec->type == CODEC_TYPE_AUDIO )
- 			{
- 				snprintf( key, sizeof(key), "%d", mlt_properties_count( codecs ) );
- 				mlt_properties_set( codecs, key, codec->name );
-@@ -261,11 +257,7 @@
- 		mlt_properties_set_data( properties, "vcodec", codecs, 0, (mlt_destructor) mlt_properties_close, NULL );
- 		mlt_properties_set_data( doc, "video_codecs", codecs, 0, NULL, NULL );
- 		while ( ( codec = av_codec_next( codec ) ) )
--#if LIBAVCODEC_VERSION_INT >= ((54<<16)+(0<<8)+0)
--			if ( (codec->encode || codec->encode2) && codec->type == CODEC_TYPE_VIDEO )
--#else
--			if ( codec->encode && codec->type == CODEC_TYPE_VIDEO )
--#endif
-+			if ( (codec->encode2) && codec->type == CODEC_TYPE_VIDEO )
- 			{
- 				snprintf( key, sizeof(key), "%d", mlt_properties_count( codecs ) );
- 				mlt_properties_set( codecs, key, codec->name );
diff --git a/community/mlt/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch b/community/mlt/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch
new file mode 100644
index 000000000..eb81f33f4
--- /dev/null
+++ b/community/mlt/fix-segmentation-fault-at-exit-by-calling-av_lockmgr.patch
@@ -0,0 +1,37 @@
+From ef749d7b526f0762a00a369ea35b5b12c18142fb Mon Sep 17 00:00:00 2001
+From: Nicolas Boichat <nicolas@boichat.ch>
+Date: Wed, 20 Mar 2013 16:50:56 +0800
+Subject: [PATCH] Fix Segmentation fault at exit by calling
+ av_lockmgr_register( NULL );
+
+---
+ src/modules/avformat/factory.c | 6 ++++++
+ 1 file changed, 6 insertions(+)
+
+diff --git a/src/modules/avformat/factory.c b/src/modules/avformat/factory.c
+index ddf05fe..a273537 100644
+--- a/src/modules/avformat/factory.c
++++ b/src/modules/avformat/factory.c
+@@ -83,6 +83,11 @@ static int avformat_lockmgr(void **mutex, enum AVLockOp op)
+    return 0;
+ }
+ 
++static void avformat_exit( )
++{
++	av_lockmgr_register( NULL );
++}
++
+ static void avformat_init( )
+ {
+ 	// Initialise avformat if necessary
+@@ -98,6 +103,7 @@ static void avformat_init( )
+ 		avformat_network_init();
+ #endif
+ 		av_log_set_level( mlt_log_get_level() );
++		atexit(avformat_exit);
+ 	}
+ }
+ 
+-- 
+1.8.1.5
+
diff --git a/community/ngspice/PKGBUILD b/community/ngspice/PKGBUILD
index 4832e84b2..7d3af5c40 100644
--- a/community/ngspice/PKGBUILD
+++ b/community/ngspice/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 64619 2012-02-17 10:58:48Z kkeen $
+# $Id: PKGBUILD 86760 2013-03-21 22:59:23Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: Abhishek Dasgupta <abhidg@gmail.com>
 # Contributor: Jason Taylor <jftaylor21@gmail.com>
 
 pkgname=ngspice
-pkgver=24
-pkgrel=2
+pkgver=25
+pkgrel=1
 pkgdesc='Mixed-level/Mixed-signal circuit simulator based on Spice3f5, Ciber1b1, and Xspice.'
 url='http://ngspice.sourceforge.net'
 license=('BSD')
 arch=('i686' 'x86_64' 'mips64el')
 depends=('libxaw' 'libedit' 'gcc-libs')
 source=("http://downloads.sourceforge.net/$pkgname/$pkgver/ngspice-$pkgver.tar.gz")
-sha1sums=('a6bb0e65c1c07d48f1d3e4df44fc17f6262952eb')
+sha1sums=('745c3c32385b7d5c808836e393fe7699f8568860')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/nodejs/PKGBUILD b/community/nodejs/PKGBUILD
index a6e1ffd22..692e42ba0 100644
--- a/community/nodejs/PKGBUILD
+++ b/community/nodejs/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 86233 2013-03-13 19:40:21Z bpiotrowski $
+# $Id: PKGBUILD 86736 2013-03-21 18:07:50Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Thomas Dziedzic < gostrc at gmail >
 # Contributor: James Campos <james.r.campos@gmail.com>
@@ -8,7 +8,7 @@
 # Contributor: TIanyi Cui <tianyicui@gmail.com>
 
 pkgname=nodejs
-pkgver=0.10.0
+pkgver=0.10.1
 pkgrel=1
 pkgdesc='Evented I/O for V8 javascript'
 arch=('i686' 'x86_64' 'mips64el')
@@ -18,7 +18,7 @@ depends=('openssl' 'python2')
 checkdepends=('curl') # curl used for check()
 options=('!emptydirs')
 source=(http://nodejs.org/dist/v${pkgver}/node-v${pkgver}.tar.gz)
-sha256sums=('1624dc37866ebfb5431e3393e6b049cf238cac8ad4d20c6d567263b1259177ab')
+sha256sums=('2628dbf42fb3ec3927e595dc66f2f96e3c23455990dea690e300296d92afe4d3')
 
 build() {
   cd node-v${pkgver}
diff --git a/community/parole/PKGBUILD b/community/parole/PKGBUILD
index 03c6c4f9f..f6aaeb034 100644
--- a/community/parole/PKGBUILD
+++ b/community/parole/PKGBUILD
@@ -1,33 +1,29 @@
-# $Id: PKGBUILD 85793 2013-03-07 10:58:27Z spupykin $
+# $Id: PKGBUILD 86731 2013-03-21 15:51:02Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: TDY <tdy@gmx.com>
 
 pkgname=parole
 pkgver=0.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A modern media player based on the GStreamer framework"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://goodies.xfce.org/projects/applications/parole/"
 license=('GPL')
-depends=('gstreamer0.10-base>=0.10.11' 'hicolor-icon-theme' 'libnotify>=0.4.1'
+depends=('gstreamer' 'gst-plugins-base-libs' 'hicolor-icon-theme' 'libnotify>=0.4.1'
          'libxfce4ui>=4.7.0' 'taglib>=1.4' 'desktop-file-utils')
 makedepends=('pkgconfig>=0.9.0' 'xfce4-dev-tools')
 optdepends=('xulrunner>=1.9.1: browser plugin')
 conflicts=('parole-media-player-git')
 options=('!libtool')
 install=parole.install
-#source=(http://archive.xfce.org/src/apps/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.bz2)
 source=(http://git.xfce.org/apps/parole/snapshot/parole-$pkgver.tar.bz2)
 md5sums=('03eb2df373adaae56959a548553ef72e')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
-
   sed -i 's|AM_CONFIG_HEADER|AC_CONFIG_HEADER|g' configure.ac.in
-
-  [ -x configure ] || ./autogen.sh
-
-  ./configure --prefix=/usr --libexecdir=/usr/lib --enable-taglib --enable-libnotify
+  ./autogen.sh --prefix=/usr --libexecdir=/usr/lib \
+    --enable-taglib --enable-libnotify --with-gstreamer=1.0
   make
 }
 
diff --git a/community/perl-clone/PKGBUILD b/community/perl-clone/PKGBUILD
index 463484cb4..f07ed1629 100644
--- a/community/perl-clone/PKGBUILD
+++ b/community/perl-clone/PKGBUILD
@@ -3,30 +3,26 @@
 # Contributor: Alex Dioso <adioso->gmail*com>
 
 pkgname=perl-clone
-pkgver=0.31
-pkgrel=5
+pkgver=0.34
+pkgrel=1
 pkgdesc='Recursive copy of nested objects.'
 arch=('i686' 'x86_64' 'mips64el')
 url='http://search.cpan.org/~RDF/Clone'
 license=('GPL' 'PerlArtistic')
 depends=('perl>=5.10.0')
 options=('!emptydirs')
-source=("http://www.cpan.org/authors/id/R/RD/RDF/Clone-${pkgver}.tar.gz")
-md5sums=('65f34e7280d7b7dfb72ab6224e5767f5')
+source=("http://search.cpan.org/CPAN/authors/id/G/GA/GARU/Clone-$pkgver.tar.gz")
+md5sums=('6475432d91b1820eff1ae877ea5c8e3b')
 
 build() {
   cd  Clone-${pkgver}
-
   PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
-
   make
 }
 
 package() {
   cd  Clone-${pkgver}
-
   make DESTDIR=${pkgdir} install
-
   find ${pkgdir} -name '.packlist' -delete
   find ${pkgdir} -name '*.pod' -delete
 }
diff --git a/community/perl-gd/PKGBUILD b/community/perl-gd/PKGBUILD
index 826760ba9..edb1da252 100644
--- a/community/perl-gd/PKGBUILD
+++ b/community/perl-gd/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 71781 2012-06-02 10:30:30Z bluewind $
+# $Id: PKGBUILD 86698 2013-03-21 10:52:41Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Sergej Pupykin <pupykin.s+aur@gmail.com>
 
 pkgname=perl-gd
-pkgver=2.46
-pkgrel=3
+pkgver=2.49
+pkgrel=1
 pkgdesc="Interface to Gd Graphics Library"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://search.cpan.org/dist/GD"
@@ -12,7 +12,7 @@ license=('GPL' 'PerlArtistic')
 depends=('gd')
 options=('!emptydirs')
 source=(http://www.cpan.org/authors/id/L/LD/LDS/GD-$pkgver.tar.gz)
-md5sums=('ea86a94eb45330eae27ecbfd5c2f43bb')
+md5sums=('c58b6556bddbe147c41f4e17a0de9bea')
 
 build() {
   cd  $srcdir/GD-$pkgver
diff --git a/community/perl-gstreamer/PKGBUILD b/community/perl-gstreamer/PKGBUILD
index ce3a83bab..d5baa978c 100644
--- a/community/perl-gstreamer/PKGBUILD
+++ b/community/perl-gstreamer/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 71787 2012-06-02 10:30:42Z bluewind $
+# $Id: PKGBUILD 86700 2013-03-21 10:53:05Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Corrado Primier <bardo@aur.archlinux.org>
 
 pkgname=perl-gstreamer
-pkgver=0.17
+pkgver=0.18
 pkgrel=1
 pkgdesc="Interface to the GStreamer library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('GPL' 'PerlArtistic')
 depends=('glib-perl>=1.180' 'gstreamer0.10' 'perl-extutils-pkgconfig>=1.07' 'perl-extutils-depends>=0.205')
 options=('!emptydirs')
 source=(http://search.cpan.org/CPAN/authors/id/X/XA/XAOC/GStreamer-$pkgver.tar.gz)
-md5sums=('8fe097daf0e2534452a3f69af05ec9fd')
+md5sums=('7ac748677f00d1fd966b09e10448cff6')
 
 build() {
   cd  GStreamer-${pkgver}
diff --git a/community/perl-linux-pid/PKGBUILD b/community/perl-linux-pid/PKGBUILD
index 76714a174..44c6e2894 100644
--- a/community/perl-linux-pid/PKGBUILD
+++ b/community/perl-linux-pid/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 71809 2012-06-02 10:31:26Z bluewind $
+# $Id: PKGBUILD 86747 2013-03-21 21:01:12Z eric $
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Angel Velasquez <angvp@archlinux.org>
 # Generator  : CPANPLUS::Dist::Arch 1.12
@@ -12,33 +12,31 @@ license=('PerlArtistic' 'GPL')
 options=('!emptydirs')
 depends=('perl')
 url='http://search.cpan.org/dist/Linux-Pid'
-source=('http://search.cpan.org/CPAN/authors/id/R/RG/RGARCIA/Linux-Pid-0.04.tar.gz')
+source=('http://search.cpan.org/CPAN/authors/id/R/RG/RGARCIA/Linux-Pid-$pkgver.tar.gz')
 md5sums=('130c4d299f827abf1f2285fddf03fccb')
-_distdir="${srcdir}/Linux-Pid-0.04"
 
 build() {
   ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""                 \
       PERL_AUTOINSTALL=--skipdeps                            \
-      PERL_MM_OPT="INSTALLDIRS=vendor DESTDIR='$pkgdir'"     \
-      PERL_MB_OPT="--installdirs vendor --destdir '$pkgdir'" \
+      PERL_MM_OPT="INSTALLDIRS=vendor"     \
+      PERL_MB_OPT="--installdirs vendor" \
       MODULEBUILDRC=/dev/null
 
-    cd "$_distdir"
+    cd Linux-Pid-$pkgver
     /usr/bin/perl Makefile.PL
     make
   )
 }
 
 check() {
-  cd "$_distdir"
+  cd Linux-Pid-$pkgver
   ( export PERL_MM_USE_DEFAULT=1 PERL5LIB=""
     make test
   )
 }
 
 package() {
-  cd "$_distdir"
-  make install
-  find "$pkgdir" -name .packlist -o -name perllocal.pod -delete
+  cd Linux-Pid-$pkgver
+  make DESTDIR="$pkgdir" install
 }
 
diff --git a/community/perl-xml-libxml/PKGBUILD b/community/perl-xml-libxml/PKGBUILD
index 065fff58a..55cf37bb5 100644
--- a/community/perl-xml-libxml/PKGBUILD
+++ b/community/perl-xml-libxml/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 71839 2012-06-02 10:32:30Z bluewind $
+# $Id: PKGBUILD 86667 2013-03-21 00:57:39Z eric $
 # Maintainer: Justin "juster" Davis <jrcd83@gmail.com>
 # Contributor: François Charette <francois.archlinux.org>
 
 pkgname=perl-xml-libxml
-pkgver=1.98
+pkgver=2.0014
 pkgrel=1
 pkgdesc="Interface to the libxml library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -13,22 +13,23 @@ depends=('libxml2' 'perl-xml-sax>=0.11' 'perl-xml-namespacesupport>=1.07')
 provides=('perl-libxml' 'perl-xml-libxml-common')
 replaces=('perl-libxml' 'perl-xml-libxml-common')
 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=('78c2e293d02e92ca99b07e9a768380ca')
+source=(http://www.cpan.org/authors/id/S/SH/SHLOMIF/XML-LibXML-$pkgver.tar.gz)
+md5sums=('a146e20c122b074dbb0d953fb8f65ca0')
 
 build() {
-  cd $srcdir/XML-LibXML-$pkgver
+  cd XML-LibXML-$pkgver
   PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
   make
 }
 
 check() {
-  cd $srcdir/XML-LibXML-$pkgver
+  cd XML-LibXML-$pkgver
   make test
 }
 
 package() {
-  cd $srcdir/XML-LibXML-$pkgver
-  make pure_install doc_install DESTDIR=$pkgdir
+  cd XML-LibXML-$pkgver
+  make pure_install doc_install DESTDIR="$pkgdir"
 }
diff --git a/community/perl-xml-libxslt/PKGBUILD b/community/perl-xml-libxslt/PKGBUILD
index 454ae378f..09a6ce057 100644
--- a/community/perl-xml-libxslt/PKGBUILD
+++ b/community/perl-xml-libxslt/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 71841 2012-06-02 10:32:34Z bluewind $
+# $Id: PKGBUILD 86669 2013-03-21 01:03:52Z eric $
 # Maintainer: Justin "juster" Davis <jrcd83@gmail.com>
 # Contributor: François Charette <firmicus ατ gmx δοτ net>
 
 pkgname=perl-xml-libxslt
-pkgver=1.77
+pkgver=1.80
 pkgrel=1
 pkgdesc="Interface to the gnome libxslt library"
 arch=('i686' 'x86_64' 'mips64el')
@@ -12,7 +12,7 @@ license=('GPL')
 depends=('perl-xml-libxml' 'libxslt')
 options=('!emptydirs')
 source=(http://www.cpan.org/authors/id/S/SH/SHLOMIF/XML-LibXSLT-$pkgver.tar.gz)
-md5sums=('a9cf4adb3637a0a42eb69a2998fa488e')
+md5sums=('bd8d0eaeee311a6dc148963a3f7753c6')
 
 build() {
   cd "$srcdir/XML-LibXSLT-$pkgver"
diff --git a/community/units/PKGBUILD b/community/units/PKGBUILD
index 3df5af8aa..cf6b7fc64 100644
--- a/community/units/PKGBUILD
+++ b/community/units/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 84848 2013-02-25 10:40:35Z spupykin $
+# $Id: PKGBUILD 86729 2013-03-21 15:11:16Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jeff Mickey <jeff@archlinux.org>
 # Contributor: Steve Sansom <snsansom@gmail.com>
 
 pkgname=units
 pkgver=2.01
-pkgrel=1
+pkgrel=2
 pkgdesc="converts between different units"
 arch=('i686' 'x86_64' 'mips64el')
 url="http://www.gnu.org/software/units/units.html"
@@ -13,14 +13,12 @@ depends=('readline')
 license=("GPL")
 options=('!makeflags')
 install=units.install
-source=(http://ftp.gnu.org/gnu/units/$pkgname-$pkgver.tar.gz
-	build-fix.patch)
-md5sums=('81bf85937c56fbbd04b16f2f3f9d8526'
-         'dbb20e628ce0879fe82393f585e9dab6')
+source=(http://ftp.gnu.org/gnu/units/$pkgname-$pkgver.tar.gz)
+md5sums=('81bf85937c56fbbd04b16f2f3f9d8526')
 
 build() {
   cd $srcdir/$pkgname-$pkgver
-#  patch -p1 <$srcdir/build-fix.patch
+  sed -i 's|/usr/bin/python|/usr/bin/python2|' units_cur
   ./configure --prefix=/usr --datadir=/usr/share
   make
 }
diff --git a/community/units/build-fix.patch b/community/units/build-fix.patch
deleted file mode 100644
index 7361a9e91..000000000
--- a/community/units/build-fix.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-diff -wbBur units-2.00.org/Makefile.in units-2.00/Makefile.in
---- units-2.00.org/Makefile.in	2012-05-03 00:37:55.000000000 +0400
-+++ units-2.00/Makefile.in	2012-07-04 12:54:20.000000000 +0400
-@@ -84,10 +84,10 @@
- 	sed -e "s:outfile = 'currency.units':outfile='@UDAT@currency.units':" units_cur > units_cur_inst
- 
- install-support: definitions.units currency.units units_cur_inst
--	$(srcdir)/mkinstalldirs @UDAT@  $(DESTDIR)$(bindir) 
--	$(INSTALL_DATA) $(srcdir)/definitions.units @UDAT@definitions.units
--	$(INSTALL_DATA) $(srcdir)/currency.units @UDAT@currency.units
--	$(INSTALL_DATA) $(srcdir)/locale.map @UDAT@locale.map
-+	$(srcdir)/mkinstalldirs $(DESTDIR)/@UDAT@  $(DESTDIR)$(bindir) 
-+	$(INSTALL_DATA) $(srcdir)/definitions.units $(DESTDIR)/@UDAT@definitions.units
-+	$(INSTALL_DATA) $(srcdir)/currency.units $(DESTDIR)/@UDAT@currency.units
-+	$(INSTALL_DATA) $(srcdir)/locale.map $(DESTDIR)/@UDAT@locale.map
- 	$(INSTALL_PROGRAM) units_cur_inst $(DESTDIR)$(bindir)/`echo units_cur|sed '$(transform)'`
- 
- install: units@EXEEXT@ install-doc install-support
-diff -wbBur units-2.00.org/units_cur units-2.00/units_cur
---- units-2.00.org/units_cur	2012-05-01 04:51:35.000000000 +0400
-+++ units-2.00/units_cur	2012-07-04 12:53:47.000000000 +0400
-@@ -1,4 +1,4 @@
--#!/usr/bin/python
-+#!/usr/bin/python2
- 
- import urllib
- import datetime
diff --git a/community/xbmc/PKGBUILD b/community/xbmc/PKGBUILD
index 1601e1e13..0d7e662b4 100644
--- a/community/xbmc/PKGBUILD
+++ b/community/xbmc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 83330 2013-01-29 17:21:13Z spupykin $
+# $Id: PKGBUILD 86733 2013-03-21 16:26:32Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Brad Fanella <bradfanella@archlinux.us>
 # Contributor: [vEX] <niechift.dot.vex.at.gmail.dot.com>
@@ -8,8 +8,8 @@
 _prefix=/usr
 
 pkgname=xbmc
-pkgver=12.0
-pkgrel=1
+pkgver=12.1
+pkgrel=3
 pkgdesc="A software media player and entertainment hub for digital media"
 arch=('i686' 'x86_64')
 url="http://xbmc.org"
@@ -33,11 +33,9 @@ optdepends=('libcec: support for Pulse-Eight USB-CEC adapter'
 	    'xorg-xinit: autostart xbmc')
 install="${pkgname}.install"
 source=("http://mirrors.xbmc.org/releases/source/xbmc-$pkgver.tar.gz"
-	"xbmc.service"
-	"cdio.patch")
-md5sums=('a79128b9d094a046947bfd9bb4550809'
-         '76fae229ebc3bcfaab7e7f27e4fb51f5'
-         '49c0a7cbfca3666a24e8824950bd371b')
+	"xbmc.service")
+md5sums=('8955473f84cb2a0513c0f3efd7e68843'
+         '76fae229ebc3bcfaab7e7f27e4fb51f5')
 
 build() {
   cd "${srcdir}/xbmc-$pkgver"
@@ -45,12 +43,6 @@ build() {
   # fix lsb_release dependency
   sed -i -e 's:/usr/bin/lsb_release -d:cat /etc/arch-release:' xbmc/utils/SystemInfo.cpp
 
-#  sed -i -e 's:AM_CONFIG_HEADER:AC_CONFIG_HEADER:' \
-#	lib/libid3tag/libid3tag/configure.ac \
-#	lib/libdvd/libdvdcss/configure.ac
-
-#  patch -p1 <$srcdir/cdio.patch
-
   # Bootstrapping XBMC
   ./bootstrap
 
diff --git a/community/xbmc/cdio.patch b/community/xbmc/cdio.patch
deleted file mode 100644
index 0f74deaa4..000000000
--- a/community/xbmc/cdio.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -wbBur xbmc-11.0/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp xbmc-11.0.my/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp
---- xbmc-11.0/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp	2012-03-22 02:07:50.000000000 +0400
-+++ xbmc-11.0.my/xbmc/music/tags/MusicInfoTagLoaderCDDA.cpp	2013-01-09 14:40:10.670040454 +0400
-@@ -27,6 +27,10 @@
- #include "storage/MediaManager.h"
- #include "utils/log.h"
- 
-+#define CDTEXT_TITLE CDTEXT_FIELD_TITLE
-+#define CDTEXT_PERFORMER CDTEXT_FIELD_PERFORMER
-+#define CDTEXT_GENRE CDTEXT_FIELD_GENRE
-+
- using namespace MUSIC_INFO;
- 
- #ifdef HAS_DVD_DRIVE
-diff -wbBur xbmc-11.0/xbmc/storage/cdioSupport.cpp xbmc-11.0.my/xbmc/storage/cdioSupport.cpp
---- xbmc-11.0/xbmc/storage/cdioSupport.cpp	2012-03-22 02:07:50.000000000 +0400
-+++ xbmc-11.0.my/xbmc/storage/cdioSupport.cpp	2013-01-09 14:51:40.276801092 +0400
-@@ -648,15 +648,18 @@
-   CSingleLock lock(*m_cdio);
- 
-   // Get the CD-Text , if any
--  cdtext_t *pcdtext = (cdtext_t *)::cdio_get_cdtext(cdio, trackNum);
-+  cdtext_t *pcdtext = (cdtext_t *)::cdio_get_cdtext(cdio);
- 
-   if (pcdtext == NULL)
-     return ;
- 
-   // same ids used in libcdio and for our structure + the ids are consecutive make this copy loop safe.
-   for (int i = 0; i < MAX_CDTEXT_FIELDS; i++)
--    if (pcdtext->field[i])
--      xcdt[(cdtext_field_t)i] = pcdtext->field[(cdtext_field_t)i];
-+  {
-+    char *data = cdtext_get(pcdtext, (cdtext_field_t)i, trackNum);
-+    if (data != NULL)
-+      xcdt[(cdtext_field_t)i] = data;
-+  }
- }
- 
- CCdInfo* CCdIoSupport::GetCdInfo(char* cDeviceFileName)
diff --git a/extra/clutter-gtk2/PKGBUILD b/extra/clutter-gtk2/PKGBUILD
deleted file mode 100644
index 09c283747..000000000
--- a/extra/clutter-gtk2/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 160400 2012-06-01 15:37:09Z ibiru $
-# Maintainer: Jan "heftig" Steffens <jan.steffens@gmail.com>
-
-pkgname=clutter-gtk2
-_pkgbasename=clutter-gtk
-pkgver=0.10.8
-pkgrel=3
-pkgdesc="GTK clutter widget"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://clutter-project.org/"
-options=('!libtool')
-license=('LGPL')
-depends=('clutter' 'gtk2')
-makedepends=('gobject-introspection' 'gtk-doc')
-source=(http://www.clutter-project.org/sources/${_pkgbasename}/${pkgver%.*}/${_pkgbasename}-${pkgver}.tar.bz2
-        gir.patch
-        libm.patch)
-sha256sums=('7867f951568871d9f68cbe8a3644fd53d2138f725b7ba61ffc0053eb64e80814'
-            'a7bb2e41b155a293fef3a58f9d0486788564a5da9373b00cc5209bdbdcb1ec66'
-            '7d5532702eb3c18fff2144f8d501f77d3d9c9c23e6904374f05634fea2d7a8ef')
-
-build() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  patch -Np1 -i "$srcdir/gir.patch"
-  patch -Np1 -i "$srcdir/libm.patch"
-  autoreconf -i
-  export CFLAGS+=" -lgthread-2.0"
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgbasename}-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-
-  rm -r "$pkgdir/usr/share/gtk-doc"
-}
diff --git a/extra/clutter-gtk2/gir.patch b/extra/clutter-gtk2/gir.patch
deleted file mode 100644
index 81b56f3a1..000000000
--- a/extra/clutter-gtk2/gir.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From 4de105a2bbd201c8e60f3e8777794a4cd532afdc Mon Sep 17 00:00:00 2001
-From: Emmanuele Bassi <ebassi@linux.intel.com>
-Date: Tue, 28 Sep 2010 13:52:25 +0000
-Subject: build: Add common CFLAGS to the introspection scanner
-
----
-diff --git a/clutter-gtk/Makefile.am b/clutter-gtk/Makefile.am
-index 6e267b4..cec5cce 100644
---- a/clutter-gtk/Makefile.am
-+++ b/clutter-gtk/Makefile.am
-@@ -15,6 +15,8 @@ AM_CPPFLAGS = \
- 	-DCLUTTER_DISABLE_DEPRECATED		\
- 	$(CLUTTER_GTK_DEBUG_CFLAGS)
- 
-+common_cflags = $(CLUTTER_CFLAGS) $(GTK_CFLAGS)
-+
- # please, keep these lists sorted alphabetically
- sources_c = \
- 	$(srcdir)/gtk-clutter-embed.c 		\
-@@ -36,7 +38,7 @@ lib_LTLIBRARIES = libclutter-gtk-@CLUTTER_GTK_API_VERSION@.la
- libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_SOURCES = $(sources_c)
- libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LIBADD = $(CLUTTER_LIBS) $(GTK_LIBS)
- libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_LDFLAGS = $(CLUTTER_LT_LDFLAGS)
--libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_CFLAGS = $(MAINTAINER_CFLAGS) $(GTK_CFLAGS) $(CLUTTER_CFLAGS) 
-+libclutter_gtk_@CLUTTER_GTK_API_VERSION@_la_CFLAGS = $(common_cflags) $(MAINTAINER_CFLAGS)
- 
- cluttergtkheadersdir = $(includedir)/clutter-1.0/clutter-gtk
- cluttergtkheaders_HEADERS = $(sources_h) $(srcdir)/clutter-gtk.h
-@@ -48,7 +50,7 @@ GtkClutter-@CLUTTER_GTK_API_VERSION@.gir: $(INTROSPECTION_SCANNER) Makefile libc
- 	$(AM_V_GEN)$(INTROSPECTION_SCANNER) -v \
- 		--namespace GtkClutter --nsversion=@CLUTTER_GTK_API_VERSION@ \
- 		--strip-prefix=GtkClutter \
--		$(INCLUDES) $(AM_CPPFLAGS) \
-+		$(INCLUDES) $(AM_CPPFLAGS) $(common_cflags) \
- 		--add-include-path=$(srcdir) --add-include=path=. \
- 		--include=Clutter-1.0 \
- 		--include=GdkPixbuf-2.0 \
---
-cgit v0.8.3.1-30-gff3a
diff --git a/extra/clutter-gtk2/libm.patch b/extra/clutter-gtk2/libm.patch
deleted file mode 100644
index 17e47ef40..000000000
--- a/extra/clutter-gtk2/libm.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Nur clutter-gtk-0.10.8.orig/configure.ac clutter-gtk-0.10.8/configure.ac
---- clutter-gtk-0.10.8.orig/configure.ac	2012-01-21 14:52:17.627228994 +0000
-+++ clutter-gtk-0.10.8/configure.ac	2012-01-21 15:04:37.317308303 +0000
-@@ -57,6 +57,9 @@
- LT_PREREQ([2.2.6])
- LT_INIT([disable-static])
- 
-+AC_CHECK_LIBM
-+AC_SUBST(LIBM)
-+
- m4_define([clutter_req_version], [1.2.0])
- m4_define([gtk_req_version], [2.19.5])
- m4_define([flavour_default], [x11])
-diff -Nur clutter-gtk-0.10.8.orig/examples/Makefile.am clutter-gtk-0.10.8/examples/Makefile.am
---- clutter-gtk-0.10.8.orig/examples/Makefile.am	2012-01-21 14:52:17.600561077 +0000
-+++ clutter-gtk-0.10.8/examples/Makefile.am	2012-01-21 15:00:04.549770032 +0000
-@@ -22,18 +22,18 @@
- 
- gtk_clutter_test_SOURCES = gtk-clutter-test.c
- gtk_clutter_test_DEPENDENCIES = $(common_deps)
--gtk_clutter_test_LDADD = $(common_ldadd)
-+gtk_clutter_test_LDADD = $(common_ldadd) $(LIBM)
- 
- gtk_clutter_events_SOURCES = gtk-clutter-events.c
- gtk_clutter_events_DEPENDENCIES = $(common_deps)
--gtk_clutter_events_LDADD = $(common_ldadd)
-+gtk_clutter_events_LDADD = $(common_ldadd) $(LIBM)
- 
- gtk_clutter_multistage_SOURCES = gtk-clutter-multistage.c
- gtk_clutter_multistage_DEPENDENCIES = $(common_deps)
--gtk_clutter_multistage_LDADD = $(common_ldadd)
-+gtk_clutter_multistage_LDADD = $(common_ldadd) $(LIBM)
- 
- gtk_clutter_viewport_SOURCES = gtk-clutter-viewport.c
- gtk_clutter_viewport_DEPENDENCIES = $(common_deps)
--gtk_clutter_viewport_LDADD = $(common_ldadd)
-+gtk_clutter_viewport_LDADD = $(common_ldadd) $(LIBM)
- 
- EXTRA_DIST = redhand.png
diff --git a/extra/dhcp/PKGBUILD b/extra/dhcp/PKGBUILD
index 849c303cb..13140a531 100644
--- a/extra/dhcp/PKGBUILD
+++ b/extra/dhcp/PKGBUILD
@@ -1,31 +1,30 @@
-# $Id: PKGBUILD 170145 2012-11-03 17:35:36Z heftig $
+# $Id: PKGBUILD 180410 2013-03-21 12:04:16Z jgc $
 # Maintainer: Daniel Isenmann <daniel @archlinux.org>
 
 pkgbase=dhcp
 pkgname=('dhcp' 'dhclient')
 
 # separate patch levels with a period to maintain proper versioning.
-pkgver=4.2.4.2
-_pkgver=4.2.4-P2
-
+pkgver=4.2.5
+_pkgver=4.2.5
 pkgrel=1
 arch=('i686' 'x86_64' 'mips64el')
 license=('custom:isc-dhcp')
 url="https://www.isc.org/software/dhcp"
-makedepends=('bash' 'iproute2' 'net-tools')
+makedepends=('bash' 'iproute2')
 source=(ftp://ftp.isc.org/isc/${pkgbase}/${_pkgver}/${pkgbase}-${_pkgver}.tar.gz{,.asc}
         dhcp4 dhcp6 dhcp dhcpd4.service dhcpd6.service
-        dhcp-4.1.1-missing-ipv6-not-fatal.patch
-        dhclient-script-pathFixes.patch)
-md5sums=('fe36056f2d274fa4b82a5422f192e65f'
-         '1f20126efd33c34d52a4148db780921f'
+        dhcp-4.2.5-client_script-1.patch
+        dhcp-4.2.5-missing_ipv6-1.patch)
+md5sums=('6489e919ac093d17249270ee9be1020e'
+         '022bc7038b3061cfb31da4736e7ab8a8'
          'c49b1497837ba56c54e401a66e1bab9b'
          '12c2f3ae47ed23eb698eb7f1bfd80f20'
          '8f357e46e1efcbb746f38737a3f977a2'
          '439ee2f145a1e86dd644cb94a854f8e7'
          '588aa85b6fe228c45623185a58d11992'
-         'fd64aeb4f399dcc41ea43089a3811094'
-         '541b415a25a169eaf64b681405f79a80')
+         '9e4dcf90beec15bfcb6631809cdcc780'
+         'da655f02f1cf4d95b4708e84e69edbc8')
 
 build() {
   cd "${srcdir}/${pkgbase}-${_pkgver}"
@@ -34,7 +33,9 @@ build() {
   sed '/^CFLAGS="$CFLAGS/ s/INGS"/INGS -D_GNU_SOURCE"/' -i configure
 
   # Make not having ipv6 non-fatal.
-  patch -Np0 -i "${srcdir}/dhcp-4.1.1-missing-ipv6-not-fatal.patch"
+  patch -Np1 -i ../dhcp-4.2.5-missing_ipv6-1.patch
+  # Make dhcp client script suck less.
+  patch -Np1 -i ../dhcp-4.2.5-client_script-1.patch
 
   ./configure --prefix=/usr --sysconfdir=/etc \
       --with-srv-lease-file=/var/lib/dhcp/dhcpd.leases \
@@ -43,13 +44,10 @@ build() {
       --with-cli6-lease-file=/var/lib/dhclient/dhclient6.leases
 
   make
-
-  patch -i "${srcdir}/dhclient-script-pathFixes.patch" client/scripts/linux
 }
 
 package_dhcp(){
   pkgdesc="A DHCP server, client, and relay agent"
-  depends=('openssl>=0.9.8a')
   backup=('etc/dhcpd.conf' 'etc/conf.d/dhcp')
   install=dhcp.install
   
@@ -64,6 +62,9 @@ package_dhcp(){
   install -D -m644 "${srcdir}/dhcpd4.service" "${pkgdir}/usr/lib/systemd/system/dhcpd4.service"
   install -D -m644 "${srcdir}/dhcpd6.service" "${pkgdir}/usr/lib/systemd/system/dhcpd6.service"
 
+  # move back to config. This file is in backup array, so pacman will not overwrite a changed config.
+  mv "${pkgdir}/etc/dhcpd.conf.example" "${pkgdir}/etc/dhcpd.conf"
+
   # Remove dhclient
   make -C client DESTDIR="${pkgdir}" uninstall
   
@@ -73,13 +74,14 @@ package_dhcp(){
 
 package_dhclient(){
   pkgdesc="A standalone DHCP client from the dhcp package"
-  depends=('bash' 'iproute2' 'net-tools')
+  depends=('bash' 'iproute2')
+  provides=('dhcp-client')
 
   cd "${srcdir}/${pkgbase}-${_pkgver}"
   make -C client DESTDIR="${pkgdir}" install
 
-  # move dhclient.conf to dhclient.conf.example
-  mv "${pkgdir}"/etc/dhclient.conf{,.example}
+  install -m755 -d "${pkgdir}/usr/share/dhclient"
+  mv "${pkgdir}/etc/dhclient.conf.example" "${pkgdir}/usr/share/dhclient/"
   
   install -d "${pkgdir}/var/lib/dhclient"
 
diff --git a/extra/dhcp/dhclient-script-pathFixes.patch b/extra/dhcp/dhclient-script-pathFixes.patch
deleted file mode 100644
index a4143ddde..000000000
--- a/extra/dhcp/dhclient-script-pathFixes.patch
+++ /dev/null
@@ -1,136 +0,0 @@
---- linux	2011-05-18 20:01:54.000000000 +0000
-+++ linux_new	2011-12-21 18:45:41.487171012 +0000
-@@ -23,7 +23,7 @@
- # of the $1 in its args.
- 
- # 'ip' just looks too weird.  /sbin/ip looks less weird.
--ip=/sbin/ip
-+ip=/usr/sbin/ip
- 
- make_resolv_conf() {
-   if [ x"$new_domain_name_servers" != x ]; then
-@@ -122,9 +122,9 @@
- if [ x$reason = xPREINIT ]; then
-   if [ x$alias_ip_address != x ]; then
-     # Bring down alias interface. Its routes will disappear too.
--    ifconfig $interface:0- inet 0
-+    /sbin/ifconfig $interface:0- inet 0
-   fi
--  ifconfig $interface 0 up
-+  /sbin/ifconfig $interface 0 up
- 
-   # We need to give the kernel some time to get the interface up.
-   sleep 1
-@@ -151,25 +151,25 @@
-   if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \
- 		[ x$alias_ip_address != x$old_ip_address ]; then
-     # Possible new alias. Remove old alias.
--    ifconfig $interface:0- inet 0
-+    /sbin/ifconfig $interface:0- inet 0
-   fi
-   if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then
-     # IP address changed. Bringing down the interface will delete all routes,
-     # and clear the ARP cache.
--    ifconfig $interface inet 0 down
-+    /sbin/ifconfig $interface inet 0 down
- 
-   fi
-   if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
-      [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
- 
--    ifconfig $interface inet $new_ip_address $new_subnet_arg \
-+    /sbin/ifconfig $interface inet $new_ip_address $new_subnet_arg \
- 					$new_broadcast_arg $mtu_arg
-     # Add a network route to the computed network address.
-     for router in $new_routers; do
-       if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
--	route add -host $router dev $interface
-+	/sbin/route add -host $router dev $interface
-       fi
--      route add default gw $router $metric_arg dev $interface
-+      /sbin/route add default gw $router $metric_arg dev $interface
-     done
-   else
-     # we haven't changed the address, have we changed other options           
-@@ -177,21 +177,21 @@
-     if [ x$new_routers != x ] && [ x$new_routers != x$old_routers ] ; then
-       # if we've changed routers delete the old and add the new.
-       for router in $old_routers; do
--        route del default gw $router
-+        /sbin/route del default gw $router
-       done
-       for router in $new_routers; do
-         if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
--	  route add -host $router dev $interface
-+	  /sbin/route add -host $router dev $interface
- 	fi
--	route add default gw $router $metric_arg dev $interface
-+	/sbin/route add default gw $router $metric_arg dev $interface
-       done
-     fi
-   fi
-   if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
-    then
--    ifconfig $interface:0- inet 0
--    ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
--    route add -host $alias_ip_address $interface:0
-+    /sbin/ifconfig $interface:0- inet 0
-+    /sbin/ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
-+    /sbin/route add -host $alias_ip_address $interface:0
-   fi
-   make_resolv_conf
-   exit_with_hooks 0
-@@ -201,42 +201,42 @@
-    || [ x$reason = xSTOP ]; then
-   if [ x$alias_ip_address != x ]; then
-     # Turn off alias interface.
--    ifconfig $interface:0- inet 0
-+    /sbin/ifconfig $interface:0- inet 0
-   fi
-   if [ x$old_ip_address != x ]; then
-     # Shut down interface, which will delete routes and clear arp cache.
--    ifconfig $interface inet 0 down
-+    /sbin/ifconfig $interface inet 0 down
-   fi
-   if [ x$alias_ip_address != x ]; then
--    ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
--    route add -host $alias_ip_address $interface:0
-+    /sbin/ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
-+    /sbin/route add -host $alias_ip_address $interface:0
-   fi
-   exit_with_hooks 0
- fi
- 
- if [ x$reason = xTIMEOUT ]; then
-   if [ x$alias_ip_address != x ]; then
--    ifconfig $interface:0- inet 0
-+    /sbin/ifconfig $interface:0- inet 0
-   fi
--  ifconfig $interface inet $new_ip_address $new_subnet_arg \
-+  /sbin/ifconfig $interface inet $new_ip_address $new_subnet_arg \
- 					$new_broadcast_arg $mtu_arg
-   set $new_routers
-   if ping -q -c 1 $1; then
-     if [ x$new_ip_address != x$alias_ip_address ] && \
- 			[ x$alias_ip_address != x ]; then
--      ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
--      route add -host $alias_ip_address dev $interface:0
-+      /sbin/ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
-+      /sbin/route add -host $alias_ip_address dev $interface:0
-     fi
-     for router in $new_routers; do
-       if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
--	route add -host $router dev $interface
-+	/sbin/route add -host $router dev $interface
-       fi
--      route add default gw $router $metric_arg dev $interface
-+      /sbin/route add default gw $router $metric_arg dev $interface
-     done
-     make_resolv_conf
-     exit_with_hooks 0
-   fi
--  ifconfig $interface inet 0 down
-+  /sbin/ifconfig $interface inet 0 down
-   exit_with_hooks 1
- fi
- 
diff --git a/extra/dhcp/dhcp-4.2.5-client_script-1.patch b/extra/dhcp/dhcp-4.2.5-client_script-1.patch
new file mode 100644
index 000000000..e96be1c4c
--- /dev/null
+++ b/extra/dhcp/dhcp-4.2.5-client_script-1.patch
@@ -0,0 +1,648 @@
+Submitted By:            Armin K. <krejzi at email dot com>
+Date:                    2012-08-14
+Initial Package Version: 4.2.4-P1
+Upstream Status:         Rejected by upstream.
+Origin:                  Based on Debian's dhclient-script, but modified for BLFS
+Description:             This patch replaces original linux script for dhcp client with
+                         better one which is based on Debian's dhclient-script, but modified
+                         to be used on LFS/BLFS. It also removes net-tools dependency.
+                         Modified for archlinux: restored exit/enter hooks path.
+
+--- dhcp.orig/client/scripts/linux	2012-07-13 08:10:30.000000000 +0200
++++ dhcp/client/scripts/linux	2012-08-14 21:00:29.786634932 +0200
+@@ -1,318 +1,346 @@
+ #!/bin/bash
++
+ # dhclient-script for Linux. Dan Halbert, March, 1997.
+ # Updated for Linux 2.[12] by Brian J. Murrell, January 1999.
+-# No guarantees about this. I'm a novice at the details of Linux
+-# networking.
+-
+-# Notes:
+-
+-# 0. This script is based on the netbsd script supplied with dhcp-970306.
+-
+-# 1. ifconfig down apparently deletes all relevant routes and flushes
+-# the arp cache, so this doesn't need to be done explicitly.
+-
+-# 2. The alias address handling here has not been tested AT ALL.
+-# I'm just going by the doc of modern Linux ip aliasing, which uses
+-# notations like eth0:0, eth0:1, for each alias.
++# Modified for Debian.  Matt Zimmerman and Eloy Paris, December 2003
++# Modified to remove useless tests for antiquated kernel versions that
++# this doesn't even work with anyway, and introduces a dependency on /usr
++# being mounted, which causes cosmetic errors on hosts that NFS mount /usr
++# Andrew Pollock, February 2005
++# Modified to work on point-to-point links. Andrew Pollock, June 2005
++# Modified to support passing the parameters called with to the hooks. Andrew Pollock, November 2005
++# Modified to use the script with Linux From Scratch by Armin K., May 2012
+ 
+-# 3. I have to calculate the network address, and calculate the broadcast
+-# address if it is not supplied. This might be much more easily done
+-# by the dhclient C code, and passed on.
+-
+-# 4. TIMEOUT not tested. ping has a flag I don't know, and I'm suspicious
+-# of the $1 in its args.
+-
+-# 'ip' just looks too weird.  /sbin/ip looks less weird.
+-ip=/sbin/ip
++# The alias handling in here probably still sucks. -mdz
+ 
++# update /etc/resolv.conf based on received values
+ make_resolv_conf() {
+-  if [ x"$new_domain_name_servers" != x ]; then
+-    cat /dev/null > /etc/resolv.conf.dhclient
+-    chmod 644 /etc/resolv.conf.dhclient
+-    if [ x"$new_domain_search" != x ]; then
+-      echo search $new_domain_search >> /etc/resolv.conf.dhclient
+-    elif [ x"$new_domain_name" != x ]; then
+-      # Note that the DHCP 'Domain Name Option' is really just a domain
+-      # name, and that this practice of using the domain name option as
+-      # a search path is both nonstandard and deprecated.
+-      echo search $new_domain_name >> /etc/resolv.conf.dhclient
+-    fi
+-    for nameserver in $new_domain_name_servers; do
+-      echo nameserver $nameserver >>/etc/resolv.conf.dhclient
+-    done
+-
+-    mv /etc/resolv.conf.dhclient /etc/resolv.conf
+-  elif [ "x${new_dhcp6_name_servers}" != x ] ; then
+-    cat /dev/null > /etc/resolv.conf.dhclient6
+-    chmod 644 /etc/resolv.conf.dhclient6
++    local new_resolv_conf
+ 
+-    if [ "x${new_dhcp6_domain_search}" != x ] ; then
+-      echo search ${new_dhcp6_domain_search} >> /etc/resolv.conf.dhclient6
++    # DHCPv4
++    if [ -n "$new_domain_search" ] || [ -n "$new_domain_name" ] ||
++       [ -n "$new_domain_name_servers" ]; then
++        new_resolv_conf=/etc/resolv.conf.dhclient-new
++        rm -f $new_resolv_conf
++
++        if [ -n "$new_domain_name" ]; then
++            echo domain ${new_domain_name%% *} >>$new_resolv_conf
++        fi
++
++        if [ -n "$new_domain_search" ]; then
++            if [ -n "$new_domain_name" ]; then
++                domain_in_search_list=""
++                for domain in $new_domain_search; do
++                    if [ "$domain" = "${new_domain_name}" ] ||
++                       [ "$domain" = "${new_domain_name}." ]; then
++                        domain_in_search_list="Yes"
++                    fi
++                done
++                if [ -z "$domain_in_search_list" ]; then
++                    new_domain_search="$new_domain_name $new_domain_search"
++                fi
++            fi
++            echo "search ${new_domain_search}" >> $new_resolv_conf
++        elif [ -n "$new_domain_name" ]; then
++            echo "search ${new_domain_name}" >> $new_resolv_conf
++        fi
++
++        if [ -n "$new_domain_name_servers" ]; then
++            for nameserver in $new_domain_name_servers; do
++                echo nameserver $nameserver >>$new_resolv_conf
++            done
++        else # keep 'old' nameservers
++            sed -n /^\w*[Nn][Aa][Mm][Ee][Ss][Ee][Rr][Vv][Ee][Rr]/p /etc/resolv.conf >>$new_resolv_conf
++        fi
++
++        chown --reference=/etc/resolv.conf $new_resolv_conf
++        chmod --reference=/etc/resolv.conf $new_resolv_conf
++        mv -f $new_resolv_conf /etc/resolv.conf
++    # DHCPv6
++    elif [ -n "$new_dhcp6_domain_search" ] || [ -n "$new_dhcp6_name_servers" ]; then
++        new_resolv_conf=/etc/resolv.conf.dhclient-new
++        rm -f $new_resolv_conf
++
++        if [ -n "$new_dhcp6_domain_search" ]; then
++            echo "search ${new_dhcp6_domain_search}" >> $new_resolv_conf
++        fi
++
++        if [ -n "$new_dhcp6_name_servers" ]; then
++            for nameserver in $new_dhcp6_name_servers; do
++                # append %interface to link-local-address nameservers
++                if [ "${nameserver##fe80::}" != "$nameserver" ] ||
++                   [ "${nameserver##FE80::}" != "$nameserver" ]; then
++                    nameserver="${nameserver}%${interface}"
++                fi
++                echo nameserver $nameserver >>$new_resolv_conf
++            done
++        else # keep 'old' nameservers
++            sed -n /^\w*[Nn][Aa][Mm][Ee][Ss][Ee][Rr][Vv][Ee][Rr]/p /etc/resolv.conf >>$new_resolv_conf
++        fi
++
++        chown --reference=/etc/resolv.conf $new_resolv_conf
++        chmod --reference=/etc/resolv.conf $new_resolv_conf
++        mv -f $new_resolv_conf /etc/resolv.conf
+     fi
+-    shopt -s nocasematch 
+-    for nameserver in ${new_dhcp6_name_servers} ; do
+-      # If the nameserver has a link-local address
+-      # add a <zone_id> (interface name) to it.
+-      if  [[ "$nameserver" =~ ^fe80:: ]]
+-      then
+-	zone_id="%$interface"
+-      else
+-	zone_id=
+-      fi
+-      echo nameserver ${nameserver}$zone_id >> /etc/resolv.conf.dhclient6
+-    done
+-    shopt -u nocasematch 
++}
+ 
+-    mv /etc/resolv.conf.dhclient6 /etc/resolv.conf
+-  fi
++# set host name
++set_hostname() {
++    local current_hostname
++
++    if [ -n "$new_host_name" ]; then
++        current_hostname=$(hostname)
++
++        # current host name is empty, '(none)' or 'localhost' or differs from new one from DHCP
++        if [ -z "$current_hostname" ] ||
++           [ "$current_hostname" = '(none)' ] ||
++           [ "$current_hostname" = 'localhost' ] ||
++           [ "$current_hostname" = "$old_host_name" ]; then
++           if [ "$new_host_name" != "$old_host_name" ]; then
++               hostname "$new_host_name"
++           fi
++        fi
++    fi
+ }
+ 
+-# Must be used on exit.   Invokes the local dhcp client exit hooks, if any.
++# Must be used on exit. Invokes the local dhcp client exit hooks, if any.
+ exit_with_hooks() {
+   exit_status=$1
+-  if [ -f /etc/dhclient-exit-hooks ]; then
+-    . /etc/dhclient-exit-hooks
++  if [ -f /etc/dhclient-exit-hooks ]; then
++    . /etc/dhclient-exit-hooks
+   fi
+-# probably should do something with exit status of the local script
+   exit $exit_status
+ }
+ 
++# The 576 MTU is only used for X.25 and dialup connections
++# where the admin wants low latency.  Such a low MTU can cause
++# problems with UDP traffic, among other things.  As such,
++# disallow MTUs from 576 and below by default, so that broken
++# MTUs are ignored, but higher stuff is allowed (1492, 1500, etc).
++if [ -z "$new_interface_mtu" ] || [ "$new_interface_mtu" -le 576 ]; then
++    new_interface_mtu=''
++fi
++
++# The action starts here
++
+ # Invoke the local dhcp client enter hooks, if they exist.
+-if [ -f /etc/dhclient-enter-hooks ]; then
++if [ -f /etc/dhclient-enter-hooks ]; then
+   exit_status=0
+-  . /etc/dhclient-enter-hooks
+-  # allow the local script to abort processing of this state
+-  # local script must set exit_status variable to nonzero.
++  . /etc/dhclient-enter-hooks
+   if [ $exit_status -ne 0 ]; then
+     exit $exit_status
+   fi
+ fi
+ 
+-###
+-### DHCPv4 Handlers
+-###
+-
+-if [ x$new_broadcast_address != x ]; then
+-  new_broadcast_arg="broadcast $new_broadcast_address"
+-fi
+-if [ x$old_broadcast_address != x ]; then
+-  old_broadcast_arg="broadcast $old_broadcast_address"
+-fi
+-if [ x$new_subnet_mask != x ]; then
+-  new_subnet_arg="netmask $new_subnet_mask"
+-fi
+-if [ x$old_subnet_mask != x ]; then
+-  old_subnet_arg="netmask $old_subnet_mask"
+-fi
+-if [ x$alias_subnet_mask != x ]; then
+-  alias_subnet_arg="netmask $alias_subnet_mask"
+-fi
+-if [ x$new_interface_mtu != x ]; then
+-  mtu_arg="mtu $new_interface_mtu"
+-fi
+-if [ x$IF_METRIC != x ]; then
+-  metric_arg="metric $IF_METRIC"
+-fi
+-
+-if [ x$reason = xMEDIUM ]; then
+-  # Linux doesn't do mediums (ok, ok, media).
+-  exit_with_hooks 0
+-fi
+-
+-if [ x$reason = xPREINIT ]; then
+-  if [ x$alias_ip_address != x ]; then
+-    # Bring down alias interface. Its routes will disappear too.
+-    ifconfig $interface:0- inet 0
+-  fi
+-  ifconfig $interface 0 up
+-
+-  # We need to give the kernel some time to get the interface up.
+-  sleep 1
+-
+-  exit_with_hooks 0
+-fi
+-
+-if [ x$reason = xARPCHECK ] || [ x$reason = xARPSEND ]; then
+-  exit_with_hooks 0
+-fi
+-  
+-if [ x$reason = xBOUND ] || [ x$reason = xRENEW ] || \
+-   [ x$reason = xREBIND ] || [ x$reason = xREBOOT ]; then
+-  current_hostname=`hostname`
+-  if [ x$current_hostname = x ] || \
+-     [ x$current_hostname = "x(none)" ] || \
+-     [ x$current_hostname = xlocalhost ] || \
+-     [ x$current_hostname = x$old_host_name ]; then
+-    if [ x$new_host_name != x$old_host_name ]; then
+-      hostname "$new_host_name"
+-    fi
+-  fi
+-    
+-  if [ x$old_ip_address != x ] && [ x$alias_ip_address != x ] && \
+-		[ x$alias_ip_address != x$old_ip_address ]; then
+-    # Possible new alias. Remove old alias.
+-    ifconfig $interface:0- inet 0
+-  fi
+-  if [ x$old_ip_address != x ] && [ x$old_ip_address != x$new_ip_address ]; then
+-    # IP address changed. Bringing down the interface will delete all routes,
+-    # and clear the ARP cache.
+-    ifconfig $interface inet 0 down
++# Execute the operation
++case "$reason" in
+ 
+-  fi
+-  if [ x$old_ip_address = x ] || [ x$old_ip_address != x$new_ip_address ] || \
+-     [ x$reason = xBOUND ] || [ x$reason = xREBOOT ]; then
++    ### DHCPv4 Handlers
+ 
+-    ifconfig $interface inet $new_ip_address $new_subnet_arg \
+-					$new_broadcast_arg $mtu_arg
+-    # Add a network route to the computed network address.
+-    for router in $new_routers; do
+-      if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
+-	route add -host $router dev $interface
+-      fi
+-      route add default gw $router $metric_arg dev $interface
+-    done
+-  else
+-    # we haven't changed the address, have we changed other options           
+-    # that we wish to update?
+-    if [ x$new_routers != x ] && [ x$new_routers != x$old_routers ] ; then
+-      # if we've changed routers delete the old and add the new.
+-      for router in $old_routers; do
+-        route del default gw $router
+-      done
+-      for router in $new_routers; do
+-        if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
+-	  route add -host $router dev $interface
+-	fi
+-	route add default gw $router $metric_arg dev $interface
+-      done
+-    fi
+-  fi
+-  if [ x$new_ip_address != x$alias_ip_address ] && [ x$alias_ip_address != x ];
+-   then
+-    ifconfig $interface:0- inet 0
+-    ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+-    route add -host $alias_ip_address $interface:0
+-  fi
+-  make_resolv_conf
+-  exit_with_hooks 0
+-fi
++    MEDIUM|ARPCHECK|ARPSEND)
++        # Do nothing
++        ;;
++    PREINIT)
++        # The DHCP client is requesting that an interface be
++        # configured as required in order to send packets prior to
++        # receiving an actual address. - dhclient-script(8)
++
++        # ensure interface is up
++        ip link set dev ${interface} up
++
++        if [ -n "$alias_ip_address" ]; then
++            # flush alias IP from interface
++            ip -4 addr flush dev ${interface} label ${interface}:0
++        fi
++
++        ;;
++
++    BOUND|RENEW|REBIND|REBOOT)
++        set_hostname
++
++        if [ -n "$old_ip_address" ] && [ -n "$alias_ip_address" ] &&
++           [ "$alias_ip_address" != "$old_ip_address" ]; then
++            # alias IP may have changed => flush it
++            ip -4 addr flush dev ${interface} label ${interface}:0
++        fi
++
++        if [ -n "$old_ip_address" ] &&
++           [ "$old_ip_address" != "$new_ip_address" ]; then
++            # leased IP has changed => flush it
++            ip -4 addr flush dev ${interface} label ${interface}
++        fi
++
++        if [ -z "$old_ip_address" ] ||
++           [ "$old_ip_address" != "$new_ip_address" ] ||
++           [ "$reason" = "BOUND" ] || [ "$reason" = "REBOOT" ]; then
++            # new IP has been leased or leased IP changed => set it
++            ip -4 addr add ${new_ip_address}${new_subnet_mask:+/$new_subnet_mask} \
++                ${new_broadcast_address:+broadcast $new_broadcast_address} \
++                dev ${interface} label ${interface}
++
++            if [ -n "$new_interface_mtu" ]; then
++                # set MTU
++                ip link set dev ${interface} mtu ${new_interface_mtu}
++            fi
++
++            # set if_metric if IF_METRIC is set or there's more than one router
++            if_metric="$IF_METRIC"
++            if [ "${new_routers%% *}" != "${new_routers}" ]; then
++                if_metric=${if_metric:-1}
++            fi
++
++            for router in $new_routers; do
++                if [ "$new_subnet_mask" = "255.255.255.255" ]; then
++                    # point-to-point connection => set explicit route
++                    ip -4 route add ${router} dev $interface >/dev/null 2>&1
++                fi
++
++                # set default route
++                ip -4 route add default via ${router} dev ${interface} \
++                    ${if_metric:+metric $if_metric} >/dev/null 2>&1
++
++                if [ -n "$if_metric" ]; then
++                    if_metric=$((if_metric+1))
++                fi
++            done
++        fi
++
++        if [ -n "$alias_ip_address" ] &&
++           [ "$new_ip_address" != "$alias_ip_address" ]; then
++            # separate alias IP given, which may have changed
++            # => flush it, set it & add host route to it
++            ip -4 addr flush dev ${interface} label ${interface}:0
++            ip -4 addr add ${alias_ip_address}${alias_subnet_mask:+/$alias_subnet_mask} \
++                dev ${interface} label ${interface}:0
++            ip -4 route add ${alias_ip_address} dev ${interface} >/dev/null 2>&1
++        fi
++
++        # update /etc/resolv.conf
++        make_resolv_conf
++
++        ;;
++
++    EXPIRE|FAIL|RELEASE|STOP)
++        if [ -n "$alias_ip_address" ]; then
++            # flush alias IP
++            ip -4 addr flush dev ${interface} label ${interface}:0
++        fi
++
++        if [ -n "$old_ip_address" ]; then
++            # flush leased IP
++            ip -4 addr flush dev ${interface} label ${interface}
++        fi
++
++        if [ -n "$alias_ip_address" ]; then
++            # alias IP given => set it & add host route to it
++            ip -4 addr add ${alias_ip_address}${alias_network_arg} \
++                dev ${interface} label ${interface}:0
++            ip -4 route add ${alias_ip_address} dev ${interface} >/dev/null 2>&1
++        fi
++
++        ;;
++
++    TIMEOUT)
++        if [ -n "$alias_ip_address" ]; then
++            # flush alias IP
++            ip -4 addr flush dev ${interface} label ${interface}:0
++        fi
++
++        # set IP from recorded lease
++        ip -4 addr add ${new_ip_address}${new_subnet_mask:+/$new_subnet_mask} \
++            ${new_broadcast_address:+broadcast $new_broadcast_address} \
++            dev ${interface} label ${interface}
++
++        if [ -n "$new_interface_mtu" ]; then
++            # set MTU
++            ip link set dev ${interface} mtu ${new_interface_mtu}
++        fi
++
++        # if there is no router recorded in the lease or the 1st router answers pings
++        if [ -z "$new_routers" ] || ping -q -c 1 "${new_routers%% *}"; then
++            if [ -n "$alias_ip_address" ] &&
++               [ "$new_ip_address" != "$alias_ip_address" ]; then
++                # separate alias IP given => set up the alias IP & add host route to it
++                ip -4 addr add ${alias_ip_address}${alias_subnet_mask:+/$alias_subnet_mask} \
++                    dev ${interface} label ${interface}:0
++                ip -4 route add ${alias_ip_address} dev ${interface} >/dev/null 2>&1
++            fi
++
++            # set if_metric if IF_METRIC is set or there's more than one router
++            if_metric="$IF_METRIC"
++            if [ "${new_routers%% *}" != "${new_routers}" ]; then
++                if_metric=${if_metric:-1}
++            fi
++
++            # set default route
++            for router in $new_routers; do
++                ip -4 route add default via ${router} dev ${interface} \
++                    ${if_metric:+metric $if_metric} >/dev/null 2>&1
++
++                if [ -n "$if_metric" ]; then
++                    if_metric=$((if_metric+1))
++                fi
++            done
++
++            # update /etc/resolv.conf
++            make_resolv_conf
++        else
++            # flush all IPs from interface
++            ip -4 addr flush dev ${interface}
++            exit_with_hooks 1
++        fi
++
++        ;;
++
++    ### DHCPv6 Handlers
++    # TODO handle prefix change: ?based on ${old_ip6_prefix} and ${new_ip6_prefix}?
++
++    PREINIT6)
++        # ensure interface is up
++        ip link set ${interface} up
++
++        # flush any stale global permanent IPs from interface
++        ip -6 addr flush dev ${interface} scope global permanent
++
++        ;;
++
++    BOUND6|RENEW6|REBIND6)
++        if [ "${new_ip6_address}" ] && [ "${new_ip6_prefixlen}" ]; then
++            # set leased IP
++            ip -6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \
++                dev ${interface} scope global
++        fi
++
++        # update /etc/resolv.conf
++        if [ "${reason}" = BOUND6 ] ||
++           [ "${new_dhcp6_name_servers}" != "${old_dhcp6_name_servers}" ] ||
++           [ "${new_dhcp6_domain_search}" != "${old_dhcp6_domain_search}" ]; then
++            make_resolv_conf
++        fi
++
++        ;;
++
++    DEPREF6)
++        if [ -z "${cur_ip6_prefixlen}" ]; then
++            exit_with_hooks 1
++        fi
++
++        # set preferred lifetime of leased IP to 0
++        ip -6 addr change ${cur_ip6_address}/${cur_ip6_prefixlen} \
++            dev ${interface} scope global preferred_lft 0
++
++        ;;
++
++    EXPIRE6|RELEASE6|STOP6)
++        if [ -z "${old_ip6_address}" ] || [ -z "${old_ip6_prefixlen}" ]; then
++            exit_with_hooks 1
++        fi
++
++        # delete leased IP
++        ip -6 addr del ${old_ip6_address}/${old_ip6_prefixlen} \
++            dev ${interface}
+ 
+-if [ x$reason = xEXPIRE ] || [ x$reason = xFAIL ] || [ x$reason = xRELEASE ] \
+-   || [ x$reason = xSTOP ]; then
+-  if [ x$alias_ip_address != x ]; then
+-    # Turn off alias interface.
+-    ifconfig $interface:0- inet 0
+-  fi
+-  if [ x$old_ip_address != x ]; then
+-    # Shut down interface, which will delete routes and clear arp cache.
+-    ifconfig $interface inet 0 down
+-  fi
+-  if [ x$alias_ip_address != x ]; then
+-    ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+-    route add -host $alias_ip_address $interface:0
+-  fi
+-  exit_with_hooks 0
+-fi
+-
+-if [ x$reason = xTIMEOUT ]; then
+-  if [ x$alias_ip_address != x ]; then
+-    ifconfig $interface:0- inet 0
+-  fi
+-  ifconfig $interface inet $new_ip_address $new_subnet_arg \
+-					$new_broadcast_arg $mtu_arg
+-  set $new_routers
+-  if ping -q -c 1 $1; then
+-    if [ x$new_ip_address != x$alias_ip_address ] && \
+-			[ x$alias_ip_address != x ]; then
+-      ifconfig $interface:0 inet $alias_ip_address $alias_subnet_arg
+-      route add -host $alias_ip_address dev $interface:0
+-    fi
+-    for router in $new_routers; do
+-      if [ "x$new_subnet_mask" = "x255.255.255.255" ] ; then
+-	route add -host $router dev $interface
+-      fi
+-      route add default gw $router $metric_arg dev $interface
+-    done
+-    make_resolv_conf
+-    exit_with_hooks 0
+-  fi
+-  ifconfig $interface inet 0 down
+-  exit_with_hooks 1
+-fi
+-
+-###
+-### DHCPv6 Handlers
+-###
+-
+-if [ x$reason = xPREINIT6 ] ; then
+-  # Ensure interface is up.
+-  ${ip} link set ${interface} up
+-
+-  # Remove any stale addresses from aborted clients.
+-  ${ip} -f inet6 addr flush dev ${interface} scope global permanent
+-
+-  exit_with_hooks 0
+-fi
+-
+-if [ x${old_ip6_prefix} != x ] || [ x${new_ip6_prefix} != x ] ; then
+-    echo Prefix ${reason} old=${old_ip6_prefix} new=${new_ip6_prefix}
+-
+-    exit_with_hooks 0
+-fi
+-
+-if [ x$reason = xBOUND6 ] ; then
+-  if [ x${new_ip6_address} = x ] || [ x${new_ip6_prefixlen} = x ] ; then
+-    exit_with_hooks 2;
+-  fi
+-
+-  ${ip} -f inet6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \
+-	dev ${interface} scope global
+-
+-  # Check for nameserver options.
+-  make_resolv_conf
+-
+-  exit_with_hooks 0
+-fi
+-
+-if [ x$reason = xRENEW6 ] || [ x$reason = xREBIND6 ] ; then
+-  if [ x${new_ip6_address} = x ] || [ x${new_ip6_prefixlen} = x ] ; then
+-    exit_with_hooks 2;
+-  fi
+-
+-  ${ip} -f inet6 addr add ${new_ip6_address}/${new_ip6_prefixlen} \
+-	dev ${interface} scope global
+-
+-  # Make sure nothing has moved around on us.
+-
+-  # Nameservers/domains/etc.
+-  if [ "x${new_dhcp6_name_servers}" != "x${old_dhcp6_name_servers}" ] ||
+-     [ "x${new_dhcp6_domain_search}" != "x${old_dhcp6_domain_search}" ] ; then
+-    make_resolv_conf
+-  fi
+-
+-  exit_with_hooks 0
+-fi
+-
+-if [ x$reason = xDEPREF6 ] ; then
+-  if [ x${new_ip6_prefixlen} = x ] ; then
+-    exit_with_hooks 2;
+-  fi
+-
+-  ${ip} -f inet6 addr change ${new_ip6_address}/${new_ip6_prefixlen} \
+-       dev ${interface} scope global preferred_lft 0
+-
+-  exit_with_hooks 0
+-fi
+-
+-if [ x$reason = xEXPIRE6 -o x$reason = xRELEASE6 -o x$reason = xSTOP6 ] ; then
+-  if [ x${old_ip6_address} = x ] || [ x${old_ip6_prefixlen} = x ] ; then
+-    exit_with_hooks 2;
+-  fi
+-
+-  ${ip} -f inet6 addr del ${old_ip6_address}/${old_ip6_prefixlen} \
+-	dev ${interface}
+-
+-  exit_with_hooks 0
+-fi
++        ;;
++esac
+ 
+ exit_with_hooks 0
diff --git a/extra/dhcp/dhcp-4.1.1-missing-ipv6-not-fatal.patch b/extra/dhcp/dhcp-4.2.5-missing_ipv6-1.patch
index cc5ddb843..3a034c052 100644
--- a/extra/dhcp/dhcp-4.1.1-missing-ipv6-not-fatal.patch
+++ b/extra/dhcp/dhcp-4.2.5-missing_ipv6-1.patch
@@ -1,6 +1,15 @@
---- common/discover.c	2009-09-29 21:44:49.000000000 +0200
-+++ common/discover.c_new	2010-06-30 19:40:02.000000000 +0200
-@@ -443,7 +443,7 @@
+Submitted By: Ken Moffat <ken at linuxfromscratch dot org>
+Date: 2011-11-23
+Initial Package Version: 4.2.2
+Upstream Status: unknown
+Origin: found at fedora
+Description: Allow dhcp4 to work even if the kernel doesn't support ipv6.
+Fixed up by hand to apply to 4.2.2 (to me, it looks identical to the 4.2.0
+version, but patch failed in one hunk when I tried to apply that one).
+
+--- dhcp-4.2.2/common/discover.c.orig	2011-07-19 23:22:48.000000000 +0100
++++ dhcp-4.2.2/common/discover.c	2011-09-06 01:28:15.000000000 +0100
+@@ -455,7 +455,7 @@
  	}
  
  #ifdef DHCPv6
@@ -9,7 +18,7 @@
  		ifaces->fp6 = fopen("/proc/net/if_inet6", "r");
  		if (ifaces->fp6 == NULL) {
  			log_error("Error opening '/proc/net/if_inet6' to "
-@@ -454,6 +454,8 @@
+@@ -466,6 +466,8 @@
  			ifaces->fp = NULL;
  			return 0;
  		}
@@ -18,7 +27,7 @@
  	}
  #endif
  
-@@ -721,7 +723,7 @@
+@@ -733,7 +735,7 @@
  		return 1;
  	}
  #ifdef DHCPv6
@@ -27,12 +36,12 @@
  		if (local_family == AF_INET6)
  			return next_iface6(info, err, ifaces);
  	}
-@@ -740,7 +742,8 @@
+@@ -752,7 +754,8 @@
  	ifaces->sock = -1;
  #ifdef DHCPv6
  	if (local_family == AF_INET6) {
 -		fclose(ifaces->fp6);
-+		if(ifaces->fp6)
++		if (ifaces->fp6)
 +			fclose(ifaces->fp6);
  		ifaces->fp6 = NULL;
  	}
diff --git a/extra/gnuplot/PKGBUILD b/extra/gnuplot/PKGBUILD
index 50507d12e..45dc8ccf7 100644
--- a/extra/gnuplot/PKGBUILD
+++ b/extra/gnuplot/PKGBUILD
@@ -1,23 +1,26 @@
-# $Id: PKGBUILD 173172 2012-12-12 00:31:46Z eric $
+# $Id: PKGBUILD 180427 2013-03-21 20:41:25Z eric $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: damir <damir@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=gnuplot 
-pkgver=4.6.1
-pkgrel=2.1
+pkgver=4.6.2
+pkgrel=1
 pkgdesc="Plotting package which outputs to X11, PostScript, PNG, GIF, and others" 
 arch=('i686' 'x86_64' 'mips64el') 
 url="http://www.gnuplot.info" 
 license=('custom') 
 depends=('readline' 'gd' 'wxgtk' 'cairo' 'libjpeg' 'lua') 
 makedepends=('texinfo' 'emacs' 'texlive-core' 'texlive-latexextra')
+options=('!makeflags')
 install=gnuplot.install 
-source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz")
-sha1sums=('1ea21a628223159b0297ae65fe8293afd5aab3c0')
+source=("http://downloads.sourceforge.net/sourceforge/$pkgname/$pkgname-$pkgver.tar.gz" 
+        gnuplot-doc2texi-el.patch)
+sha1sums=('88748d4bc9bd41ba8a267a35b6e5b7427cd997cd'
+          '46f381fafa2f6c6e3bfefa1e7b999729e260a2e8')
 
 build() {
-  cd $srcdir/$pkgname-$pkgver
+  cd "$srcdir/$pkgname-$pkgver"
 
   # fix default source location; use the GDFONTPATH variable to modify at runtime 
   sed -i 's|/usr/X11R6/lib/X11/fonts/truetype|/usr/share/fonts/TTF|' src/variable.c
@@ -26,28 +29,22 @@ build() {
   -e 's|$(X11ROOT)/X11R6/lib/X11/fonts/Type1|$(X11ROOT)/usr/share/fonts/Type1|' \
   src/variable.c
 
-  ./configure --prefix=/usr --mandir=/usr/share/man \
-              --infodir=/usr/share/info \
+  (cd docs; patch -p0 -i "$srcdir/gnuplot-doc2texi-el.patch")
+
+  ./configure --prefix=/usr \
               --libexecdir=/usr/bin \
               --with-gihdir=/usr/share/gnuplot \
-              --datadir=/usr/share \
-              --with-readline=gnu \
-              --with-texdir=$pkgdir/usr/share/texmf/tex/latex/gnuplot
-  make pkglibexecdir=/usr/bin
+              --with-readline=gnu
+  make
 }
 
 
 package() {
-  cd $srcdir/$pkgname-$pkgver
-  make prefix=$pkgdir/usr libexecdir=$pkgdir/usr/bin \
-         mandir=$pkgdir/usr/share/man \
-        infodir=$pkgdir/usr/share/info \
-        pkglibexecdir=$pkgdir/usr/bin \
-        GIHDIR=$pkgdir/usr/share/gnuplot \
-        datadir=$pkgdir/usr/share install
-
-  install -Dm644 lisp/dotemacs $pkgdir/usr/share/emacs/site-lisp/dotemacs
-  install -Dm644 Copyright $pkgdir/usr/share/licenses/$pkgname/Copyright
-
-  rm -f $pkgdir/usr/share/texmf-dist/ls-R
+  cd "$srcdir/$pkgname-$pkgver"
+  make pkglibexecdir=/usr/bin DESTDIR="$pkgdir" install
+
+  install -Dm644 lisp/dotemacs "$pkgdir/usr/share/emacs/site-lisp/dotemacs"
+  install -Dm644 Copyright "$pkgdir/usr/share/licenses/$pkgname/Copyright"
+
+  rm -f "$pkgdir/usr/share/texmf-dist/ls-R"
 }
diff --git a/extra/gnuplot/gnuplot-doc2texi-el.patch b/extra/gnuplot/gnuplot-doc2texi-el.patch
new file mode 100644
index 000000000..49f7d3f0a
--- /dev/null
+++ b/extra/gnuplot/gnuplot-doc2texi-el.patch
@@ -0,0 +1,13 @@
+Index: doc2texi.el
+===================================================================
+RCS file: /cvsroot/gnuplot/gnuplot/docs/doc2texi.el,v
+retrieving revision 1.32
+diff -r1.32 doc2texi.el
+518c518
+<                   (replace-match (concat "4  " node) nil nil))
+---
+>                   (replace-match (concat "3  " node) nil nil))
+521c521
+<                   (replace-match "5 " nil nil))
+---
+>                   (replace-match "4 " nil nil))
diff --git a/community/gupnp-dlna/PKGBUILD b/extra/gupnp-dlna/PKGBUILD
index dba60702f..f142ec75d 100644
--- a/community/gupnp-dlna/PKGBUILD
+++ b/extra/gupnp-dlna/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 68452 2012-03-24 21:52:20Z bgyorgy $
+# $Id: PKGBUILD 180467 2013-03-21 22:39:20Z heftig $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=gupnp-dlna
diff --git a/extra/miro/PKGBUILD b/extra/miro/PKGBUILD
index d36381c98..81bd3704a 100644
--- a/extra/miro/PKGBUILD
+++ b/extra/miro/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 178135 2013-02-16 22:48:53Z ioni $
+# $Id: PKGBUILD 180405 2013-03-21 02:05:09Z eric $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 
 pkgname=miro
@@ -21,7 +21,7 @@ source=("http://ftp.osuosl.org/pub/pculture.org/${pkgname}/src/${pkgname}-${pkgv
 sha1sums=('1144f98149ff07208b994a7cedb45a4beaaa451f'
           'ce0f42be2a0a3ac99f07b5abfabf0975928c841c')
 
-build() {
+package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
   cd linux
diff --git a/extra/mx/PKGBUILD b/extra/mx/PKGBUILD
deleted file mode 100644
index d7d1170f9..000000000
--- a/extra/mx/PKGBUILD
+++ /dev/null
@@ -1,28 +0,0 @@
-# $Id: PKGBUILD 160919 2012-06-07 00:15:28Z heftig $
-# Contributor: Andrea Scarpino <andrea@archlinux.org>
-# Contributor: Guenther Wutz <admin@wutzara.de>
-
-pkgname=mx
-pkgver=1.4.6
-pkgrel=1.1
-pkgdesc="A widget toolkit using Clutter"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.clutter-project.org"
-license=('LGPL')
-depends=('clutter' 'libxrandr' 'dbus-glib' 'gtk2' 'startup-notification')
-makedepends=('intltool' 'gobject-introspection' 'gtk-doc')
-options=('!libtool')
-source=("http://source.clutter-project.org/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz")
-sha256sums=('20fd8e1463d84c791c20dd1e021bc18041b05ad095a1acbaace7bf0dd43d09f2')
-
-build() {
-  cd ${pkgname}-${pkgver}
-
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd ${pkgname}-${pkgver}
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/community/rygel/PKGBUILD b/extra/rygel/PKGBUILD
index 40be1228e..2967d1613 100644
--- a/community/rygel/PKGBUILD
+++ b/extra/rygel/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 81715 2012-12-27 20:10:52Z bgyorgy $
+# $Id: PKGBUILD 180471 2013-03-21 22:40:51Z heftig $
 # Maintainer: Balló György <ballogyor+arch at gmail dot com>
 
 pkgname=rygel
diff --git a/community/rygel/rygel.install b/extra/rygel/rygel.install
index 2c455e952..2c455e952 100644
--- a/community/rygel/rygel.install
+++ b/extra/rygel/rygel.install
diff --git a/pcr/python2-potr/PKGBUILD b/pcr/python2-potr/PKGBUILD
new file mode 100644
index 000000000..39613ad95
--- /dev/null
+++ b/pcr/python2-potr/PKGBUILD
@@ -0,0 +1,39 @@
+# Maintainer: Michael Düll <mail@akurei.me> PGP-Key: AAAEE882
+
+pkgname=python2-potr
+pkgver=1.0.0beta6
+pkgrel=3
+pkgdesc="This is a pure Python OTR implementation; it does not bind to libotr."
+arch=(any)
+url="https://github.com/afflux/pure-python-otr"
+license=('LGPL')
+depends=('python2' 'python2-crypto')
+conflicts=('python-potr-git' 'python-potr')
+replaces=('python-potr')
+options=(!emptydirs)
+source=("https://github.com/afflux/pure-python-otr/tarball/${pkgver}")
+
+PYTHON=`which python2`
+
+build() {
+  cd $srcdir/afflux*
+  set_python2
+  $PYTHON ./setup.py build
+}
+
+package() {
+  cd $srcdir/afflux*
+  $PYTHON ./setup.py install --root=$pkgdir/
+}
+
+# To use python2 instead of default python v3.
+set_python2() {
+  for file in $(find . -name '*.py' -print); do
+    sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "${file}"
+    sed -i 's_^#!.*/usr/bin/env.*python_#!/usr/bin/env python2_' "${file}"
+  done
+}
+
+
+# vim:set ts=2 sw=2 et:
+sha512sums=('323ad31e782409b7bd93539dfc0088de8b114075b88de81123b732aff609fbb2a2c06221c52266225ce54e20e9856b25759bae84c93244a1258ccba3825c8b1c')