Mon Jun 24 00:07:29 PDT 2013

26 files changed, 589 insertions, 678 deletions

diff --git a/community/ascii/PKGBUILD b/community/ascii/PKGBUILD
index 608a6fb5d..3c43cdbf1 100644
--- a/community/ascii/PKGBUILD
+++ b/community/ascii/PKGBUILD
@@ -3,15 +3,15 @@
 # Contributor: Damir Perisa <damir.perisa@bluewin.ch>
 
 pkgname=ascii
-pkgver=3.11
-pkgrel=2
+pkgver=3.12
+pkgrel=1
 pkgdesc="Utility for conversion between various byte representations and the ASCII character table"
 arch=('i686' 'x86_64')
 url="http://www.catb.org/~esr/ascii"
 license=('BSD')
 depends=('glibc')
 source=("http://www.catb.org/~esr/ascii/ascii-${pkgver}.tar.gz")
-md5sums=('ba8a9392f8aa8c6b7a52923fba870579')
+md5sums=('d06267813ac83ed511b7330f43fcc4ee')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/community/pidgin-lwqq/PKGBUILD b/community/pidgin-lwqq/PKGBUILD
index fc9e4b6fd..b18337ac2 100644
--- a/community/pidgin-lwqq/PKGBUILD
+++ b/community/pidgin-lwqq/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 92611 2013-06-10 02:46:36Z fyan $
+# $Id: PKGBUILD 93040 2013-06-23 03:02:10Z fyan $
 # Maintainer: Felix Yan <felixonmars@gmail.com>
 
 pkgname=pidgin-lwqq
-pkgver=0.1e.20130608
+pkgver=0.1f
 _commit=66b7498a7530a1c47dabbe05c0726a9188353217
 pkgrel=1
 pkgdesc="A pidgin plugin based on lwqq, a excellent safe useful library for webqq protocol"
@@ -14,7 +14,8 @@ optdepends=('pidgin: Multi-protocol instant messaging client'
 	    'telepathy-haze: Empathy plugin support')
 makedepends=('git' 'cmake')
 install=$pkgname.install
-source=("git://github.com/xiehuc/pidgin-lwqq.git#commit=$_commit")
+#source=("git://github.com/xiehuc/pidgin-lwqq.git#commit=$_commit")
+source=("git://github.com/xiehuc/pidgin-lwqq.git#tag=$pkgver")
 md5sums=('SKIP')
 
 build()
diff --git a/community/rekonq/PKGBUILD b/community/rekonq/PKGBUILD
index 0f62663b4..884a97be5 100644
--- a/community/rekonq/PKGBUILD
+++ b/community/rekonq/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 90424 2013-05-12 10:14:44Z andrea $
+# $Id: PKGBUILD 93061 2013-06-23 17:21:00Z andrea $
 # Maintainer: Peter Lewis <plewis@aur.archlinux.org>
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Panagiotis Papadopoulos <pano_90 AT gmx DOT net>
 
 pkgname=rekonq
-pkgver=2.3.0
-pkgrel=2
+pkgver=2.3.1
+pkgrel=1
 pkgdesc='A WebKit based web browser for KDE'
 arch=('i686' 'x86_64')
 url='http://rekonq.kde.org/'
@@ -16,7 +16,7 @@ optdepends=('kdebase-konqueror: search engines support'
             'qca-ossl: to use the sync handler')
 install=${pkgname}.install
 source=("http://downloads.sourceforge.net/${pkgname}/${pkgname}-${pkgver}.tar.bz2")
-sha256sums=('f84fe975e79cbdcd218eb73d5371ee5ca0e11a2aea0d1d890ba9f24a505cf65c')
+sha256sums=('1c552bad65c640bcd1a7550d45ad37ad93e16e75f14cf71685363e04f4c2a658')
 
 build(){
   mkdir build
diff --git a/community/shapelib/PKGBUILD b/community/shapelib/PKGBUILD
index 75f0ecee7..d3b997720 100644
--- a/community/shapelib/PKGBUILD
+++ b/community/shapelib/PKGBUILD
@@ -1,30 +1,40 @@
-# $Id: PKGBUILD 90199 2013-05-08 13:40:53Z bpiotrowski $
-# Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
+# $Id: PKGBUILD 93041 2013-06-23 03:50:51Z foutrelis $
+# Maintainer:  Federico Cinelli <cinelli@aur.archlinux.org>
+# Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: Bob Finch <w9ya@arrl.net>
 
 pkgname=shapelib
 pkgver=1.3.0
-pkgrel=1
+pkgrel=2
 pkgdesc='simple C API for reading and writing ESRI Shapefiles'
 arch=('i686' 'x86_64')
 url='http://shapelib.maptools.org/'
 license=('LGPL' 'MIT')
 options=('!libtool')
-source=(http://download.osgeo.org/$pkgname/$pkgname-$pkgver.tar.gz
-        LICENSE)
+source=("http://download.osgeo.org/$pkgname/$pkgname-$pkgver.tar.gz"
+        "LICENSE")
 sha256sums=('23d474016158ab5077db2f599527631706ba5c0dc7c4178a6a1d685bb014f68f'
             '67e45b04045e27a9d6f64f92b295831b8739b32668ce497d3fa02999e349a789')
 
 build() {
-  cd ${pkgname}-${pkgver}
+  cd "$pkgname-$pkgver"
   
+  sed -i -e s:'-fPIC':"${CFLAGS} -fPIC": Makefile
   make lib
 }
 
 package() {
-  cd ${pkgname}-${pkgver}
+  cd "$pkgname-$pkgver"
 
-  install -d ${pkgdir}/usr/{lib,include}
-  make PREFIX=${pkgdir}/usr lib_install
-  install -D -m644 ${srcdir}/LICENSE ${pkgdir}/usr/share/licenses/${pkgname}/LICENSE
+  install -dm755 "$pkgdir"/usr/{lib,include}
+
+  # Fix the broken makefile
+  sed -i -e s:/usr/local:${pkgdir}/usr: Makefile
+  sed -i -e s:/usr/bin/install:/bin/install: Makefile
+  make lib_install
+  
+  # Fix world readable bit not set
+  chmod 644 $pkgdir/usr/include/shapefil.h
+
+  install -D -m644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
diff --git a/community/virtualbox-modules-lts/PKGBUILD b/community/virtualbox-modules-lts/PKGBUILD
index 4dba9fb7f..361c29a4c 100644
--- a/community/virtualbox-modules-lts/PKGBUILD
+++ b/community/virtualbox-modules-lts/PKGBUILD
@@ -1,24 +1,26 @@
-# $Id: PKGBUILD 88762 2013-04-22 09:40:39Z tpowa $
+# $Id: PKGBUILD 93065 2013-06-23 17:40:20Z seblu $
 # Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Ionut Biru <ibiru@archlinux.org>
 # Contributor: Sébastien Luttringer
 
 pkgbase=virtualbox-modules-lts
 pkgname=('virtualbox-host-modules-lts' 'virtualbox-guest-modules-lts')
-pkgver=4.2.12
-pkgrel=2
+pkgver=4.2.14
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
-makedepends=('linux-lts-headers'
+makedepends=('linux-lts'
+             'linux-lts-headers'
              "virtualbox-host-dkms>=$pkgver"
              "virtualbox-guest-dkms>=$pkgver"
              'expac'
+             'sed'
              'bc')
 
 build() {
-  _kernver=$(expac -Q '%v' linux-lts-headers)-lts
-
+  _kernmaj=$(expac -Q '%v' linux-lts|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
+  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-lts/version)
   # dkms need modification to be run as user
   cp -r /var/lib/dkms .
   echo "dkms_tree='$srcdir/dkms'" > dkms.conf
@@ -31,40 +33,38 @@ build() {
 }
 
 package_virtualbox-host-modules-lts(){
-  _kernver=$(expac -Q '%v' linux-lts-headers)-lts
-  _extraver=extramodules-${_kernver%.*}-lts
-
+  _kernmaj=$(expac -Q '%v' linux-lts|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
+  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-lts/version)
   pkgdesc='Host kernel modules for VirtualBox'
-  depends=("linux-lts>=${_kernver%.*}" "linux-lts<$(echo "${_kernver%.*}+0.1"|bc)")
+  depends=("linux-lts>=$_kernmaj" "linux-lts<$(echo "$_kernmaj+0.1"|bc)")
   replaces=('virtualbox-modules-lts')
   conflicts=('virtualbox-modules-lts')
   provides=("virtualbox-host-modules=$pkgver")
   install=virtualbox-host-modules-lts.install
 
-  install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
   cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module"
-  install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
+  install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-lts/"
+  install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-lts/"
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-host-modules-lts.install"
+  sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-host-modules-lts.install"
 }
 
 package_virtualbox-guest-modules-lts(){
-  _kernver=$(expac -Q '%v' linux-lts-headers)-lts
-  _extraver=extramodules-${_kernver%.*}-lts
-
+  _kernmaj=$(expac -Q '%v' linux-lts|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
+  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-lts/version)
   pkgdesc='Guest kernel modules for VirtualBox'
   license=('GPL')
-  depends=("linux-lts>=${_kernver%.*}" "linux-lts<$(echo "${_kernver%.*}+0.1"|bc)")
+  depends=("linux-lts>=$_kernmaj" "linux-lts<$(echo "$_kernmaj+0.1"|bc)")
   replaces=('virtualbox-archlinux-modules-lts')
   conflicts=('virtualbox-archlinux-modules-lts')
   provides=("virtualbox-host-modules=$pkgver")
   install=virtualbox-guest-modules-lts.install
 
-  install -dm755 "$pkgdir/usr/lib/modules/$_extraver"
   cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
-  install -m644 * "$pkgdir/usr/lib/modules/$_extraver"
+  install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-lts/"
+  install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-lts/"
   find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extraver'/" "$startdir/virtualbox-guest-modules-lts.install"
+  sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-guest-modules-lts.install"
 }
 
 # vim:set ts=2 sw=2 et:
diff --git a/community/virtualbox-modules-lts/virtualbox-guest-modules-lts.install b/community/virtualbox-modules-lts/virtualbox-guest-modules-lts.install
index d2984a743..82bda9855 100644
--- a/community/virtualbox-modules-lts/virtualbox-guest-modules-lts.install
+++ b/community/virtualbox-modules-lts/virtualbox-guest-modules-lts.install
@@ -1,16 +1,18 @@
-EXTRAMODULES='extramodules-3.0-lts'
+VERSION=''
 
 post_install() {
 cat << EOF
 ===> You may want to load vboxguest, vboxsf and vboxvideo
 EOF
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+  depmod $VERSION
 }
 
 post_upgrade() {
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+  depmod $VERSION
 }
 
 post_remove() {
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+  depmod $VERSION
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/virtualbox-modules-lts/virtualbox-host-modules-lts.install b/community/virtualbox-modules-lts/virtualbox-host-modules-lts.install
index 07ecf7311..6c1a57d3a 100644
--- a/community/virtualbox-modules-lts/virtualbox-host-modules-lts.install
+++ b/community/virtualbox-modules-lts/virtualbox-host-modules-lts.install
@@ -1,18 +1,20 @@
-EXTRAMODULES='extramodules-3.0-lts'
+VERSION=''
 
 post_install() {
 cat << EOF
 ===> You must load vboxdrv module before starting VirtualBox:
 ===> # modprobe vboxdrv
 EOF
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+  depmod $VERSION
 }
 
 post_upgrade() {
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-    echo 'In order to use the new version, reload all virtualbox modules manually.'
+  depmod $VERSION
+  echo 'In order to use the new version, reload all virtualbox modules manually.'
 }
 
 post_remove() {
-    depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
+  depmod $VERSION
 }
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/virtualbox-modules/PKGBUILD b/community/virtualbox-modules/PKGBUILD
index dc4eac812..e3862c973 100644
--- a/community/virtualbox-modules/PKGBUILD
+++ b/community/virtualbox-modules/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 93018 2013-06-22 10:01:54Z tpowa $
+# $Id: PKGBUILD 93064 2013-06-23 17:40:06Z seblu $
 # Maintainer: Ionut Biru <ibiru@archlinux.org>
 # Maintainer: Sébastien Luttringer
 
 pkgbase=virtualbox-modules
 pkgname=('virtualbox-host-modules' 'virtualbox-guest-modules')
-pkgver=4.2.12
-pkgrel=9
+pkgver=4.2.14
+pkgrel=1
 arch=('i686' 'x86_64')
 url='http://virtualbox.org'
 license=('GPL')
diff --git a/core/e2fsprogs/PKGBUILD b/core/e2fsprogs/PKGBUILD
index 2f2a5b09c..37a944403 100644
--- a/core/e2fsprogs/PKGBUILD
+++ b/core/e2fsprogs/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 187024 2013-06-03 11:15:03Z allan $
-# Maintainer: Ronald van Haren <ronald.archlinux.org> 
+# $Id: PKGBUILD 188851 2013-06-23 03:24:28Z foutrelis $
+# Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Contributor: judd <jvinet@zeroflux.org>
 
 pkgname=e2fsprogs
-pkgver=1.42.7
-pkgrel=2
+pkgver=1.42.8
+pkgrel=1
 pkgdesc="Ext2/3/4 filesystem utilities"
 arch=('i686' 'x86_64')
 license=('GPL' 'LGPL' 'MIT')
@@ -16,7 +16,7 @@ source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pk
         'MIT-LICENSE')
 backup=('etc/mke2fs.conf')
 install=${pkgname}.install
-sha1sums=('897ed5bab4f021834d00ec047ed83766d56ce0a8'
+sha1sums=('79cdb2374a9c0e68f01739598679db06d546b897'
           'f4a0d5b0cdb980e3fedd6f5e7dde0b0ffb7bbdfb')
 
 build() {
@@ -26,7 +26,7 @@ build() {
   sed -i '/init\.d/s|^|#|' misc/Makefile.in
 
   ./configure --prefix=/usr --with-root-prefix="" --libdir=/usr/lib \
-      --enable-elf-shlibs --disable-fsck --disable-uuidd \
+      --sbindir=/usr/bin --enable-elf-shlibs --disable-fsck --disable-uuidd \
       --disable-libuuid --disable-libblkid
 
   make
@@ -37,7 +37,7 @@ package() {
   make DESTDIR="${pkgdir}" install install-libs
 
   sed -i -e 's/^AWK=.*/AWK=awk/' "${pkgdir}/usr/bin/compile_et"
-  
+
   # remove references to build directory
   sed -i -e 's#^SS_DIR=.*#SS_DIR="/usr/share/ss"#' "${pkgdir}/usr/bin/mk_cmds"
   sed -i -e 's#^ET_DIR=.*#ET_DIR="/usr/share/et"#' "${pkgdir}/usr/bin/compile_et"
@@ -45,11 +45,4 @@ package() {
   # install MIT license
   install -Dm644 "${srcdir}/MIT-LICENSE" \
     "${pkgdir}/usr/share/licenses/${pkgname}/MIT-LICENSE"
-
-  # usrmove
-  cd "$pkgdir"
-  mv sbin/* usr/bin/
-  rmdir sbin
-  mv usr/sbin/* usr/bin/
-  rmdir usr/sbin
 }
diff --git a/core/nfs-utils/PKGBUILD b/core/nfs-utils/PKGBUILD
index 3a1f08c0a..7822b0465 100644
--- a/core/nfs-utils/PKGBUILD
+++ b/core/nfs-utils/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 186779 2013-05-31 07:19:12Z tpowa $
+# $Id: PKGBUILD 188861 2013-06-23 11:12:05Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
 # Contributor: John Proctor <jproctor@prium.net>
 # Contributor: dibblethewrecker <dibblethewrecker.at.jiwe.org>
@@ -7,14 +7,14 @@
 
 pkgname=nfs-utils
 pkgver=1.2.8
-pkgrel=6
+pkgrel=8
 pkgdesc="Support programs for Network File Systems"
 arch=('i686' 'x86_64')
 url='http://nfs.sourceforge.net'
 license=('GPL')
 backup=(etc/{exports,idmapd.conf,nfsmount.conf} etc/conf.d/{nfs-common.conf,nfs-server.conf})
-depends=('glibc' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue' 'device-mapper' 'sqlite')
-makedepends=('pkgconfig' 'autoconf' 'automake')
+depends=('glibc' 'e2fsprogs' 'rpcbind' 'libtirpc>=0.2.1' 'librpcsecgss>=0.19-2' 'nfsidmap' 'libevent>=2.0.10' 'libgssglue' 'device-mapper')
+makedepends=('pkgconfig' 'autoconf' 'automake' 'sqlite')
 source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.bz2
 	nfs-common.conf
 	nfs-server.conf
@@ -36,6 +36,8 @@ source=(http://downloads.sourceforge.net/project/nfs/${pkgname}/${pkgver}/${pkgn
         id_resolver.conf
         start-statd.patch)
 install=nfs-utils.install
+optdepends=('sqlite: for nfsdcltrack usage')
+
 md5sums=('6e7d97de51e428a0b8698c16ca23db77'
          'f73f197a16b02c3e248488ec35c4cf43'
          '9cef69bc686cc5dcac23fbb51450747d'
@@ -70,6 +72,7 @@ build() {
   ./configure --prefix=/usr --sbindir=/usr/bin --enable-nfsv4 --enable-nfsv41 --enable-gss \
               --without-tcp-wrappers --with-statedir=/var/lib/nfs \
               --enable-ipv6 --sysconfdir=/etc --enable-libmount-mount \
+              --with-gssglue \
               --enable-mountconfig --with-start-statd=/usr/bin/start-statd
   # move mount helpers to /usr/bin
   sed -i -e 's#sbindir = /sbin#sbindir = /usr/bin#g' utils/mount/Makefile
diff --git a/extra/gimp/PKGBUILD b/extra/gimp/PKGBUILD
index 2b76a03ef..c35a97223 100644
--- a/extra/gimp/PKGBUILD
+++ b/extra/gimp/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 184384 2013-05-06 19:37:31Z foutrelis $
+# $Id: PKGBUILD 188883 2013-06-23 21:29:32Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=gimp
-pkgver=2.8.4
-pkgrel=2
+pkgver=2.8.6
+pkgrel=1
 pkgdesc="GNU Image Manipulation Program"
 arch=('i686' 'x86_64')
 url="http://www.gimp.org/"
 license=('GPL' 'LGPL')
 depends=('pygtk' 'lcms' 'libxpm' 'libwmf' 'libxmu' 'librsvg' 'libmng' 'dbus-glib' \
          'libexif' 'gegl' 'jasper' 'desktop-file-utils' 'hicolor-icon-theme' 'babl')
-makedepends=('intltool' 'libwebkit' 'poppler-glib' 'alsa-lib' 'iso-codes' 'curl' 'ghostscript')
+makedepends=('intltool' 'webkitgtk2' 'poppler-glib' 'alsa-lib' 'iso-codes' 'curl' 'ghostscript')
 optdepends=('gutenprint: for sophisticated printing only as gimp has built-in cups print support'
-            'libwebkit: for the help browser'
+            'webkitgtk2: for the help browser'
             'poppler-glib: for pdf support'
             'alsa-lib: for MIDI event controller module'
             'curl: for URI support'
@@ -22,7 +22,7 @@ conflicts=('gimp-devel')
 install=gimp.install
 source=(ftp://ftp.gimp.org/pub/gimp/v${pkgver%.*}/${pkgname}-${pkgver}.tar.bz2 linux.gpl 
         uri-backend-libcurl.patch)
-md5sums=('392592e8755d046317878d226145900f'
+md5sums=('12b3fdf33d1f07ae79b412a9e38b9693'
          'bb27bc214261d36484093e857f015f38'
          'e894f4b2ffa92c71448fdd350e9b78c6')
 
diff --git a/extra/gnu-efi-libs/PKGBUILD b/extra/gnu-efi-libs/PKGBUILD
index f6d0c4c42..7c7d3f940 100644
--- a/extra/gnu-efi-libs/PKGBUILD
+++ b/extra/gnu-efi-libs/PKGBUILD
@@ -1,79 +1,47 @@
-# $Id: PKGBUILD 180092 2013-03-16 15:44:29Z tpowa $
 # Maintainer: Tobias Powalowski <tpowa@archlinux.org>
-# Maintainer : Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
+# Contributor: Keshav Padram <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 # Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
 
 _pkgver="3.0"
 pkgname="gnu-efi-libs"
-pkgver="${_pkgver}t"
+pkgver="${_pkgver}u"
 pkgrel="2"
-pkgdesc="Library for building x86_64 and i386 UEFI Applications using GNU toolchain"
+pkgdesc="Library for building UEFI Applications using GNU toolchain"
 url="http://sourceforge.net/projects/gnu-efi/"
 license=('GPL')
-arch=('i686' 'x86_64')
-makedepends=('pciutils')
-if [[ "${CARCH}" == "x86_64" ]]; then
-	makedepends+=('lib32-glibc')
-fi
-conflicts=('gnu-efi')
-provides=('gnu-efi')
-replaces=('gnu-efi')
+arch=('x86_64' 'i686')
 options=('!strip' '!makeflags')
-source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz"
-        'disable-ms_abi-flag.patch')         
-_build_gnu-efi-libs-x86_64() {	
-	cp -r "${srcdir}/gnu-efi-${_pkgver}" "${srcdir}/gnu-efi-${_pkgver}-x86_64"
-	cd "${srcdir}/gnu-efi-${_pkgver}-x86_64/"
-	ARCH="x86_64" make
-	ARCH="x86_64" make -C apps all	
-}
+makedepends=('pciutils')
 
-_build_gnu-efi-libs-i386() {
-	cp -r "${srcdir}/gnu-efi-${_pkgver}" "${srcdir}/gnu-efi-${_pkgver}-i386"
-	cd "${srcdir}/gnu-efi-${_pkgver}-i386/"	
-	ARCH="ia32" make
-	ARCH="ia32" make -C apps all	
-}
+source=("http://download.sourceforge.net/gnu-efi/gnu-efi_${pkgver}.orig.tar.gz")
+md5sums=('d15d3c700e79a1e2938544d73edc572d')
 
-build() {
-        cd ${srcdir}/gnu-efi-${_pkgver}
-        # fix broken ms_abi flags, causing weird issues with bootloaders
-        patch -Np1 -i ../disable-ms_abi-flag.patch
-	## Fix Makefiles to enable compile for both UEFI arch
-	sed 's|INSTALLROOT=/usr/local|INSTALLROOT ?= /usr/lib|g' -i Make.defaults
-	sed 's|LIBDIR=lib|LIBDIR ?= lib|g' -i Make.defaults
-	sed 's|ARCH	   :=|ARCH	   ?=|g' -i Make.defaults
-	sed 's|-fno-strict-aliasing|-fno-strict-aliasing -fno-stack-protector|g' -i Make.defaults
-	if [[ "${CARCH}" == "x86_64" ]]; then
-		_build_gnu-efi-libs-x86_64
-	fi
-	_build_gnu-efi-libs-i386	
-}
-
-_package_gnu-efi-libs-x86_64() {
-	cd "${srcdir}/gnu-efi-${_pkgver}-x86_64/"	
-	make ARCH="x86_64" PREFIX="" INSTALLROOT="${pkgdir}/usr/" LIBDIR="lib" install
-	install -d "${pkgdir}/usr/share/gnu-efi/x86_64/"
-	install -D -m0644 "${srcdir}/gnu-efi-${_pkgver}-x86_64/apps"/*.efi "${pkgdir}/usr/share/gnu-efi/x86_64/"
-}
+[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64"
+[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="ia32"
 
-_package_gnu-efi-libs-i386() {	
-	cd "${srcdir}/gnu-efi-${_pkgver}-i386/"
-	make ARCH="ia32" PREFIX="" INSTALLROOT="${pkgdir}/usr/" LIBDIR="${_LIBDIR32}" install
-	install -d "${pkgdir}/usr/share/gnu-efi/i386/"
-	install -D -m0644 "${srcdir}/gnu-efi-${_pkgver}-i386/apps"/*.efi "${pkgdir}/usr/share/gnu-efi/i386/"	
+build() {
+	
+	cd "${srcdir}/gnu-efi-${_pkgver}/"
+	
+	## Unset all compiler FLAGS
+	unset CFLAGS
+	unset CPPFLAGS
+	unset CXXFLAGS
+	unset LDFLAGS
+	unset MAKEFLAGS
+	
+	make -j1
+	make -j1 -C apps all
+	
 }
 
 package() {
-	if [[ "${CARCH}" == "x86_64" ]]; then
-		_package_gnu-efi-libs-x86_64
-		
-		_LIBDIR32="lib32"
-		_package_gnu-efi-libs-i386
-	else
-		_LIBDIR32="lib"
-		_package_gnu-efi-libs-i386
-	fi	
+	
+	cd "${srcdir}/gnu-efi-${_pkgver}/"
+	
+	make INSTALLROOT="${pkgdir}" PREFIX="/usr" LIBDIR="/usr/lib" install
+	
+	install -d "${pkgdir}/usr/share/gnu-efi/apps/${_EFI_ARCH}/"
+	install -D -m0644 "${srcdir}/gnu-efi-${_pkgver}/apps"/*.efi "${pkgdir}/usr/share/gnu-efi/apps/${_EFI_ARCH}/"
+	
 }
-md5sums=('95916208cf543699799230ac1ea14272'
-         '783755e5f691f4c5c629f94d759b727b')
diff --git a/extra/gnu-efi-libs/disable-ms_abi-flag.patch b/extra/gnu-efi-libs/disable-ms_abi-flag.patch
deleted file mode 100644
index e363e6481..000000000
--- a/extra/gnu-efi-libs/disable-ms_abi-flag.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-diff --git a/Make.defaults b/Make.defaults
-index 38da180..aa1f4de 100644
---- a/Make.defaults
-+++ b/Make.defaults
-@@ -54,9 +54,9 @@ GCCNEWENOUGH := $(shell ([ $(GCCVERSION) -gt "4" ] || ([ $(GCCVERSION) -eq "4" ]
- 
- CPPFLAGS   = -DCONFIG_$(ARCH)
- ifeq ($(GCCNEWENOUGH),1)
--CPPFLAGS   += -DGNU_EFI_USE_MS_ABI -maccumulate-outgoing-args --std=c11
-+CPPFLAGS   += -maccumulate-outgoing-args --std=c11
- endif
--CFLAGS	   = $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-merge-constants
-+CFLAGS	   = $(ARCH3264) -O2 -fpic -Wall -fshort-wchar -fno-strict-aliasing -fno-stack-protector -fno-merge-constants
- ASFLAGS    = $(ARCH3264)
- LDFLAGS	   = -nostdlib
- INSTALL	   = install
diff --git a/extra/gnu-efi-libs/gnu-efi-libs-x86_64-call-fix.patch b/extra/gnu-efi-libs/gnu-efi-libs-x86_64-call-fix.patch
deleted file mode 100644
index 8bda35c6b..000000000
--- a/extra/gnu-efi-libs/gnu-efi-libs-x86_64-call-fix.patch
+++ /dev/null
@@ -1,327 +0,0 @@
-diff -ur gnu-efi-3.0/lib/x86_64/efi_stub.S gnu-efi-3.0-mod/lib/x86_64/efi_stub.S
---- gnu-efi-3.0/lib/x86_64/efi_stub.S	2012-04-30 17:35:44.000000000 +0200
-+++ gnu-efi-3.0-mod/lib/x86_64/efi_stub.S	2012-10-12 00:39:09.300289985 +0200
-@@ -4,6 +4,7 @@
-  * Copyright (C) 2007 Intel Corp
-  *	Bibo Mao <bibo.mao@intel.com>
-  *	Huang Ying <ying.huang@intel.com>
-+ * Copyright (C) 2012 Felipe Contreras <felipe.contreras@gmail.com>
-  */
- 
- /*
-@@ -14,152 +15,94 @@
-  *
-  * Basically here are the conversion rules:
-  * a) our function pointer is in %rdi
-- * b) ELF gives us 8-byte aligned %rsp, so we need to pad out to 16-byte
-- *    alignment.
-- * c) inside each call thunker, we can only adjust the stack by
-- *    multiples of 16 bytes. "offset" below refers to however much
-- *    we allocate inside a thunker.
-- * d) rsi through r8 (elf) aka rcx through r9 (ms) require stack space
-+ * b) rsi through r8 (elf) aka rcx through r9 (ms) require stack space
-  *    on the MS side even though it's not getting used at all.
-- * e) arguments are as follows: (elf -> ms)
-+ * c) 8(%rsp) is always aligned to 16 in ELF, so %rsp is shifted 8 bytes extra
-+ * d) arguments are as follows: (elf -> ms)
-  *   1) rdi -> rcx (32 saved)
-  *   2) rsi -> rdx (32 saved)
-- *   3) rdx -> r8 ( 32 saved)
-+ *   3) rdx -> r8 (32 saved)
-  *   4) rcx -> r9 (32 saved)
-- *   5) r8 -> 32(%rsp) (48 saved)
-+ *   5) r8 -> 32(%rsp) (32 saved)
-  *   6) r9 -> 40(%rsp) (48 saved)
-- *   7) pad+offset+0(%rsp) -> 48(%rsp) (64 saved)
-- *   8) pad+offset+8(%rsp) -> 56(%rsp) (64 saved)
-- *   9) pad+offset+16(%rsp) -> 64(%rsp) (80 saved)
-- *  10) pad+offset+24(%rsp) -> 72(%rsp) (80 saved)
-- *  11) pad+offset+32(%rsp) -> 80(%rsp) (96 saved)
-- *  12) pad+offset+40(%rsp) -> 88(%rsp) (96 saved)
-- * f) because the first argument we recieve in a thunker is actually the
-+ *   7) 8(%rsp) -> 48(%rsp) (48 saved)
-+ *   8) 16(%rsp) -> 56(%rsp) (64 saved)
-+ *   9) 24(%rsp) -> 64(%rsp) (64 saved)
-+ *  10) 32(%rsp) -> 72(%rsp) (80 saved)
-+ * e) because the first argument we recieve in a thunker is actually the
-  *    function to be called, arguments are offset as such:
-  *   0) rdi -> caller
-  *   1) rsi -> rcx (32 saved)
-  *   2) rdx -> rdx (32 saved)
-  *   3) rcx -> r8 (32 saved)
-  *   4) r8 -> r9 (32 saved)
-- *   5) r9 -> 32(%rsp) (48 saved)
-- *   6) pad+offset+0(%rsp) -> 40(%rsp) (48 saved)
-- *   7) pad+offset+8(%rsp) -> 48(%rsp) (64 saved)
-- *   8) pad+offset+16(%rsp) -> 56(%rsp) (64 saved)
-- *   9) pad+offset+24(%rsp) -> 64(%rsp) (80 saved)
-- *  10) pad+offset+32(%rsp) -> 72(%rsp) (80 saved)
-- *  11) pad+offset+40(%rsp) -> 80(%rsp) (96 saved)
-- *  12) pad+offset+48(%rsp) -> 88(%rsp) (96 saved)
-- * e) arguments need to be moved in opposite order to avoid clobbering
-- * f) pad_stack leaves the amount of padding it added in %r11 for functions
-- *    to use
-- * g) efi -> elf calls don't need to pad the stack, because the 16-byte
-- *    alignment is also always 8-byte aligned.
-+ *   5) r9 -> 32(%rsp) (32 saved)
-+ *   6) 8(%rsp) -> 40(%rsp) (48 saved)
-+ *   7) 16(%rsp) -> 48(%rsp) (48 saved)
-+ *   8) 24(%rsp) -> 56(%rsp) (64 saved)
-+ *   9) 32(%rsp) -> 64(%rsp) (64 saved)
-+ *  10) 40(%rsp) -> 72(%rsp) (80 saved)
-+ * f) arguments need to be moved in opposite order to avoid clobbering
-  */
- 
- #define ENTRY(name)	\
- 	.globl name;	\
- 	name:
- 
--#define out(val)		\
--	push %rax ;		\
--	mov val, %rax ;		\
--	out %al, $128 ;		\
--	pop %rax
--
--#define pad_stack							\
--	subq $8, %rsp ; /* must be a multiple of 16 - sizeof(%rip) */	\
--	/* stash some handy integers */					\
--	mov $0x8, %rax ;						\
--	mov $0x10, %r10 ;						\
--	/* see if we need padding */					\
--	and %rsp, %rax ;						\
--	/* store the pad amount in %r11 */				\
--	cmovnz %rax, %r11 ;						\
--	cmovz %r10, %r11 ;						\
--	/* insert the padding */					\
--	subq %r11, %rsp ;						\
--	/* add the $8 we saved above in %r11 */				\
--	addq $8, %r11 ;							\
--	/* store the pad amount */					\
--	mov %r11, (%rsp) ;						\
--	/* compensate for %rip being stored on the stack by call */	\
--	addq $8, %r11
--
--#define unpad_stack							\
--	/* fetch the pad amount	we saved (%r11 has been clobbered) */	\
--	mov (%rsp), %r11 ;						\
--	/* remove the padding */					\
--	addq %r11, %rsp
--
- ENTRY(efi_call0)
--	pad_stack
--	subq $32, %rsp
-+	subq $40, %rsp
- 	call *%rdi
--	addq $32, %rsp
--	unpad_stack
-+	addq $40, %rsp
- 	ret
- 
- ENTRY(efi_call1)
--	pad_stack
--	subq $32, %rsp
-+	subq $40, %rsp
- 	mov  %rsi, %rcx
- 	call *%rdi
--	addq $32, %rsp
--	unpad_stack
-+	addq $40, %rsp
- 	ret
- 
- ENTRY(efi_call2)
--	pad_stack
--	subq $32, %rsp
-+	subq $40, %rsp
- 	/* mov %rdx, %rdx */
- 	mov  %rsi, %rcx
- 	call *%rdi
--	addq $32, %rsp
--	unpad_stack
-+	addq $40, %rsp
- 	ret
- 
- ENTRY(efi_call3)
--	pad_stack
--	subq $32, %rsp
-+	subq $40, %rsp
- 	mov  %rcx, %r8
- 	/* mov %rdx, %rdx */
- 	mov  %rsi, %rcx
- 	call *%rdi
--	addq $32, %rsp
--	unpad_stack
-+	addq $40, %rsp
- 	ret
- 
- ENTRY(efi_call4)
--	pad_stack
--	subq $32, %rsp
-+	subq $40, %rsp
- 	mov %r8, %r9
- 	mov %rcx, %r8
- 	/* mov %rdx, %rdx */
- 	mov %rsi, %rcx
- 	call *%rdi
--	addq $32, %rsp
--	unpad_stack
-+	addq $40, %rsp
- 	ret
- 
- ENTRY(efi_call5)
--	pad_stack
--	subq $48, %rsp
-+	subq $40, %rsp
- 	mov %r9, 32(%rsp)
- 	mov %r8, %r9
- 	mov %rcx, %r8
- 	/* mov %rdx, %rdx */
- 	mov %rsi, %rcx
- 	call *%rdi
--	addq $48, %rsp
--	unpad_stack
-+	addq $40, %rsp
- 	ret
- 
- ENTRY(efi_call6)
--	pad_stack
--	subq $48, %rsp
--	addq $48, %r11
--	addq %rsp, %r11
--	mov (%r11), %rax
-+	subq $56, %rsp
-+	mov 56+8(%rsp), %rax
- 	mov %rax, 40(%rsp)
- 	mov %r9, 32(%rsp)
- 	mov %r8, %r9
-@@ -167,20 +110,14 @@
- 	/* mov %rdx, %rdx */
- 	mov %rsi, %rcx
- 	call *%rdi
--	addq $48, %rsp
--	unpad_stack
-+	addq $56, %rsp
- 	ret
- 
- ENTRY(efi_call7)
--	pad_stack
--	subq $64, %rsp
--	addq $64, %r11
--	addq $8, %r11
--	addq %rsp, %r11
--	mov (%r11), %rax
-+	subq $56, %rsp
-+	mov 56+16(%rsp), %rax
- 	mov %rax, 48(%rsp)
--	subq $8, %r11
--	mov (%r11), %rax
-+	mov 56+8(%rsp), %rax
- 	mov %rax, 40(%rsp)
- 	mov %r9, 32(%rsp)
- 	mov %r8, %r9
-@@ -188,23 +125,16 @@
- 	/* mov %rdx, %rdx */
- 	mov %rsi, %rcx
- 	call *%rdi
--	addq $64, %rsp
--	unpad_stack
-+	addq $56, %rsp
- 	ret
- 
- ENTRY(efi_call8)
--	pad_stack
--	subq $64, %rsp
--	addq $64, %r11
--	addq $16, %r11
--	addq %rsp, %r11
--	mov (%r11), %rax
-+	subq $72, %rsp
-+	mov 72+24(%rsp), %rax
- 	mov %rax, 56(%rsp)
--	subq $8, %r11
--	mov (%r11), %rax
-+	mov 72+16(%rsp), %rax
- 	mov %rax, 48(%rsp)
--	subq $8, %r11
--	mov (%r11), %rax
-+	mov 72+8(%rsp), %rax
- 	mov %rax, 40(%rsp)
- 	mov %r9, 32(%rsp)
- 	mov %r8, %r9
-@@ -212,26 +142,18 @@
- 	/* mov %rdx, %rdx */
- 	mov %rsi, %rcx
- 	call *%rdi
--	addq $64, %rsp
--	unpad_stack
-+	addq $72, %rsp
- 	ret
- 
- ENTRY(efi_call9)
--	pad_stack
--	subq $80, %rsp
--	addq $80, %r11
--	addq $24, %r11
--	addq %rsp, %r11
--	mov (%r11), %rax
-+	subq $72, %rsp
-+	mov 72+32(%rsp), %rax
- 	mov %rax, 64(%rsp)
--	subq $8, %r11
--	mov (%r11), %rax
-+	mov 72+24(%rsp), %rax
- 	mov %rax, 56(%rsp)
--	subq $8, %r11
--	mov (%r11), %rax
-+	mov 72+16(%rsp), %rax
- 	mov %rax, 48(%rsp)
--	subq $8, %r11
--	mov (%r11), %rax
-+	mov 72+8(%rsp), %rax
- 	mov %rax, 40(%rsp)
- 	mov %r9, 32(%rsp)
- 	mov %r8, %r9
-@@ -239,29 +161,20 @@
- 	/* mov %rdx, %rdx */
- 	mov %rsi, %rcx
- 	call *%rdi
--	addq $80, %rsp
--	unpad_stack
-+	addq $72, %rsp
- 	ret
- 
- ENTRY(efi_call10)
--	pad_stack
--	subq $80, %rsp
--	addq $80, %r11
--	addq $32, %r11
--	addq %rsp, %r11
--	mov (%r11), %rax
-+	subq $88, %rsp
-+	mov 88+40(%rsp), %rax
- 	mov %rax, 72(%rsp)
--	subq $8, %r11
--	mov (%r11), %rax
-+	mov 88+32(%rsp), %rax
- 	mov %rax, 64(%rsp)
--	subq $8, %r11
--	mov (%r11), %rax
-+	mov 88+24(%rsp), %rax
- 	mov %rax, 56(%rsp)
--	subq $8, %r11
--	mov (%r11), %rax
-+	mov 88+16(%rsp), %rax
- 	mov %rax, 48(%rsp)
--	subq $8, %r11
--	mov (%r11), %rax
-+	mov 88+8(%rsp), %rax
- 	mov %rax, 40(%rsp)
- 	mov %r9, 32(%rsp)
- 	mov %r8, %r9
-@@ -269,6 +182,5 @@
- 	/* mov %rdx, %rdx */
- 	mov %rsi, %rcx
- 	call *%rdi
--	addq $80, %rsp
--	unpad_stack
-+	addq $88, %rsp
- 	ret
diff --git a/extra/libgsf/PKGBUILD b/extra/libgsf/PKGBUILD
index cfe96699a..dc54ceef7 100644
--- a/extra/libgsf/PKGBUILD
+++ b/extra/libgsf/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 178924 2013-02-28 19:13:21Z ioni $
+# $Id: PKGBUILD 188871 2013-06-23 17:47:47Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 # Contributor: Sarah Hay <sarahhay@mb.sympatico.ca>
 
 pkgname=libgsf
-pkgver=1.14.26
+pkgver=1.14.27
 pkgrel=1
 arch=(i686 x86_64)
 pkgdesc="The GNOME Structured File Library is a utility library for reading and writing structured file formats"
@@ -13,7 +13,7 @@ options=('!libtool')
 depends=('libxml2' 'gdk-pixbuf2' 'bzip2')
 makedepends=('intltool' 'gobject-introspection')
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/1.14/$pkgname-$pkgver.tar.xz)
-sha256sums=('8919e725aadd785380350c8dec7427d82cf33164bc9a9a549df9440a0c3da6d5')
+sha256sums=('a012e63bedd6003cea9ae8fa78944516b50c334767163b88527c6b2332bc3e6c')
 
 build() {
   cd "$pkgname-$pkgver"
diff --git a/extra/libxv/PKGBUILD b/extra/libxv/PKGBUILD
index 39d7808fd..60f1f46fb 100644
--- a/extra/libxv/PKGBUILD
+++ b/extra/libxv/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 186943 2013-06-01 09:51:55Z andyrtr $
+# $Id: PKGBUILD 188854 2013-06-23 08:21:34Z lcarlier $
 # Maintainer: Andreas Radke <andyrtr@archlinux.org>
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libxv
-pkgver=1.0.8
+pkgver=1.0.9
 pkgrel=1
 pkgdesc="X11 Video extension library"
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ depends=('libxext' 'videoproto')
 makedepends=('pkgconfig')
 options=('!libtool')
 source=("${url}/releases/individual/lib/libXv-${pkgver}.tar.bz2")
-sha256sums=('4f00eb5347390909cea4e53a69425839d2a6a44e0e0613321d59e7e4aeaf73d7')
+sha256sums=('a874dbf864d0271bbe795af67ef5b3f20096c92fc11eacbf0d2af00e32bc5b4b')
 
 build() {
   cd "${srcdir}/libXv-${pkgver}"
diff --git a/extra/monodevelop-debugger-gdb/PKGBUILD b/extra/monodevelop-debugger-gdb/PKGBUILD
index 2c527a93e..3aa47b9dd 100644
--- a/extra/monodevelop-debugger-gdb/PKGBUILD
+++ b/extra/monodevelop-debugger-gdb/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 178507 2013-02-24 19:41:09Z daniel $
+# $Id: PKGBUILD 188885 2013-06-23 21:47:27Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 
 pkgname=monodevelop-debugger-gdb
-pkgver=4.0
+pkgver=4.0.9
 pkgrel=1
 pkgdesc="Mono Debugger support"
 arch=('i686' 'x86_64') # also "any" pkg?
 url="http://monodevelop.com"
 license=('GPL')
-depends=('monodevelop>=3.0.6' 'gdb')
+depends=('monodevelop>=4.0.9' 'gdb')
 makedepends=('mono')
 options=('!makeflags')
-source=(http://download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2)
-md5sums=('35424c9cb2218840c015f49821219c5b')
+source=(http://origin-download.mono-project.com/sources/$pkgname/$pkgname-$pkgver.tar.bz2)
+md5sums=('6735424b41449221b0471c5ba6cf307e')
 
 build() {
   export MONO_SHARED_DIR="${srcdir}/.wabi"
@@ -29,3 +29,4 @@ package() {
   make DESTDIR="${pkgdir}" install
 }
 
+
diff --git a/extra/monodevelop/PKGBUILD b/extra/monodevelop/PKGBUILD
index e1eba8ade..c44244a7d 100644
--- a/extra/monodevelop/PKGBUILD
+++ b/extra/monodevelop/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 186330 2013-05-24 20:45:12Z daniel $
+# $Id: PKGBUILD 188887 2013-06-23 21:49:24Z daniel $
 # Maintainer: Daniel Isenmann <daniel@archlinux.org>
 # Contributor: Timm Preetz <timm@preetz.us>
 # Contributor: Giovanni Scafora <giovanni@archlinux.org>
 
 pkgname=monodevelop
-pkgver=4.0.8
+pkgver=4.0.9
 pkgrel=1
 pkgdesc="An IDE primarily designed for C# and other .NET languages"
 
@@ -17,9 +17,9 @@ depends=('mono>=2.10.8' 'mono-addins>=0.6.2' 'gnome-sharp' 'desktop-file-utils'
 makedepends=('rsync' 'git')
 options=(!makeflags)
 install=monodevelop.install
-source=(http://download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.gz
+source=(http://origin-download.mono-project.com/sources/${pkgname}/${pkgname}-${pkgver}.tar.bz2
         monodevelop-core-addins.pc.in.patch)
-md5sums=('84a03fabcd3399807c7bf2c2027c87bf'
+md5sums=('b54461118aab6c8f9d4520d9cbf84d84'
          '8466d032735130e37d4091a793a7966c')
 
 build() {
@@ -30,7 +30,7 @@ build() {
   # fix location for MonoDevelop.Gettext.dll - breaks gdb build
   # patch -Np0 -i ${srcdir}/monodevelop-core-addins.pc.in.patch
   
-  ./configure --prefix=/usr --profile stable
+  ./configure --prefix=/usr
   LD_PRELOAD="" make
 }
 
diff --git a/libre/gloobus-preview-libre/PKGBUILD b/libre/gloobus-preview-libre/PKGBUILD
new file mode 100644
index 000000000..12bff5f1d
--- /dev/null
+++ b/libre/gloobus-preview-libre/PKGBUILD
@@ -0,0 +1,90 @@
+# $Id: PKGBUILD 91027 2013-05-18 11:44:36Z bgyorgy $
+# Maintainer: Balló György <ballogyor+arch at gmail dot com>
+
+_pkgname=gloobus-preview
+pkgname=gloobus-preview-libre
+pkgver=0.4.5.290
+_pkgver=0.4.5-ubuntu11~ppa290
+pkgrel=1
+pkgdesc="Gnome application designed to enable a full screen preview of any kind of file (using bsdtar to preview RAR archives)"
+arch=('i686' 'x86_64')
+url="http://gloobus.net/"
+license=('GPL')
+depends=('gstreamer0.10-base-plugins' 'gtksourceview3' 'poppler-glib' 'python2-dbus' 'python2-gconf' 'taglib' 'xdg-utils')
+makedepends=('boost' 'bzr' 'djvulibre' 'libspectre')
+optdepends=('djvulibre: Preview DjVu documents'
+            'gstreamer0.10-bad-plugins: Extra media codecs'
+            'gstreamer0.10-good-plugins: Extra media codecs'
+            'gstreamer0.10-ffmpeg: Extra media codecs'
+            'gstreamer0.10-ugly-plugins: Extra media codecs'
+            'libspectre: Preview PostScript documents'
+            'p7zip: View content of 7z archives'
+            'unoconv: Preview LibreOffice compatible documents'
+            'unzip: View content of .ZIP archives')
+options=('!libtool')
+install=$_pkgname.install
+source=(https://launchpad.net/~gloobus-dev/+archive/$_pkgname/+files/${_pkgname}_$_pkgver.orig.tar.xz
+        gloobus-sushi::bzr+http://bazaar.launchpad.net/~gloobus-dev/gloobus-sushi/gloobus-sushi
+        fix-gtksource-include.patch
+        fix-unoconv.patch
+        use-xdg-open.patch
+	gloobus-preview-usr-bsdtar-for-rar.patch)
+md5sums=('27b3db2043ecaf47fa928940bbb4f32a'
+         'SKIP'
+         'ca15a3e31cec01d3d4fc5a4e1720f692'
+         '03379c173e67ad1b6804bc609336451d'
+         'd6d9e2b3e001f0ea8440cccdf90480af'
+         'eeab61846c861540bb16ca00fa14cdb6')
+
+prepare() {
+  cd "$srcdir/$_pkgname-$_pkgver"
+
+  # Python2 fix
+  sed -i 's@^#!.*python$@#!/usr/bin/python2@' src/gloobus-preview-configuration
+
+  # Fix build
+  patch -Np1 -i "$srcdir/fix-gtksource-include.patch"
+  sed -i 's/-Werror//' configure.ac src/Makefile.am
+
+  # Fix unoconv support
+  patch -Np1 -i "$srcdir/fix-unoconv.patch"
+
+  # Use xdg-open
+  patch -Np1 -i "$srcdir/use-xdg-open.patch"
+
+  # Use bsdtar if unrar is not found.
+  patch -Np0 -i "$srcdir/gloobus-preview-usr-bsdtar-for-rar.patch"
+
+  ### Prepare gloobus-sushi
+  cd "$srcdir/gloobus-sushi"
+
+  # Python2 fix
+  sed -i 's/python /python2 /' src/gloobus-sushi.in
+}
+
+
+build() {
+  cd "$srcdir/$_pkgname-$_pkgver"
+
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var \
+               --disable-static
+  make
+
+  ### Build gloobus-sushi
+  cd "$srcdir/gloobus-sushi"
+
+  ./autogen.sh --prefix=/usr --sysconfdir=/etc --localstatedir=/var
+  make
+}
+
+package() {
+  cd "$srcdir/$_pkgname-$_pkgver"
+  make DESTDIR="$pkgdir" install
+
+  ### Install gloobus-sushi
+  cd "$srcdir/gloobus-sushi"
+  make DESTDIR="$pkgdir" install
+
+  # Rename service file to avoid conflict with sushi
+  mv "$pkgdir"/usr/share/dbus-1/services/{org.gnome.Sushi.service,net.gloobus.Sushi.service}
+}
diff --git a/libre/gloobus-preview-libre/fix-gtksource-include.patch b/libre/gloobus-preview-libre/fix-gtksource-include.patch
new file mode 100644
index 000000000..053169a43
--- /dev/null
+++ b/libre/gloobus-preview-libre/fix-gtksource-include.patch
@@ -0,0 +1,39 @@
+diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-interface-text.h gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-interface-text.h
+--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-interface-text.h	2012-04-06 15:07:29.000000000 +0200
++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-interface-text.h	2013-05-17 06:27:37.833360264 +0200
+@@ -1,8 +1,7 @@
+ #ifndef _ITEXT_
+ #define _ITEXT_
+ 
+-#include <gtksourceview/gtksourceview.h>
+-#include <gtksourceview/gtksourcelanguagemanager.h>
++#include <gtksourceview/gtksource.h>
+ //sudo ln -s /usr/include/gtksourceview-2.0/gtksourceview/ /usr/include/gtksourceview
+ 
+ #include "gloobus-preview-interface-main.h"
+diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-plugin-manager.cpp gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-plugin-manager.cpp
+--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-plugin-manager.cpp	2012-04-06 15:07:29.000000000 +0200
++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-plugin-manager.cpp	2013-05-17 06:28:19.300984059 +0200
+@@ -1,6 +1,6 @@
+ #include "gloobus-preview-plugin-manager.h"
+ #include <dlfcn.h>
+-#include <gtksourceview/gtksourcelanguagemanager.h>
++#include <gtksourceview/gtksource.h>
+ 
+ vector<gp_plugin_container*> PluginManager::plugins;
+ map<string, int> PluginManager::filetypes;
+diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-text/plugin-text.h gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-text/plugin-text.h
+--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-text/plugin-text.h	2012-04-06 15:07:29.000000000 +0200
++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-text/plugin-text.h	2013-05-17 06:26:26.788384315 +0200
+@@ -3,10 +3,7 @@
+ 
+ #ifndef PLUGIN_LOADER
+ 
+-#include <gtksourceview/gtksourceview.h>
+-#include <gtksourceview/gtksourcelanguagemanager.h>
+-#include <gtksourceview/gtksourcestylescheme.h>
+-#include <gtksourceview/gtksourcestyleschememanager.h>
++#include <gtksourceview/gtksource.h>
+ #include <gio/gio.h>
+ 
+ #include "../gloobus-preview-config.h"
diff --git a/libre/gloobus-preview-libre/fix-unoconv.patch b/libre/gloobus-preview-libre/fix-unoconv.patch
new file mode 100644
index 000000000..f918f3019
--- /dev/null
+++ b/libre/gloobus-preview-libre/fix-unoconv.patch
@@ -0,0 +1,46 @@
+diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-pdf/office-loader.cpp gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-pdf/office-loader.cpp
+--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-pdf/office-loader.cpp	2012-04-06 15:07:29.000000000 +0200
++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-pdf/office-loader.cpp	2013-05-18 10:24:33.558221788 +0200
+@@ -87,7 +87,7 @@
+ 
+     if( NULL == uri && Utils::isProgramAvailable("unoconv") ) {
+         gchar *path = g_file_get_path(file);
+-        gchar *cmd = g_strdup_printf("unoconv --stdout \"%s\" > \"%s\"", path, tmp);
++        gchar *cmd = g_strdup_printf("unoconv -f pdf -o \"%s\" \"%s\"", tmp, path);
+ 
+         if( system(cmd) == 0) {
+             uri = pathToUri(tmp);
+@@ -123,4 +123,4 @@
+ {
+     path = "file://" + path;
+     return g_uri_escape_string(path.c_str(), G_URI_RESERVED_CHARS_ALLOWED_IN_PATH, false);
+-}
+\ No newline at end of file
++}
+diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-pdf/office-plugin.h gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-pdf/office-plugin.h
+--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/plugin-pdf/office-plugin.h	2012-04-06 15:07:29.000000000 +0200
++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/plugin-pdf/office-plugin.h	2013-05-18 10:33:02.352806550 +0200
+@@ -6,15 +6,21 @@
+ PluginManager::register_plugin("office");
+ 
+ PluginManager::register_filetype("application/vnd.oasis.opendocument.text", 1);
++PluginManager::register_filetype("application/vnd.openxmlformats-officedocument.wordprocessingml.document", 1);
+ PluginManager::register_filetype("application/msword", 1);
+ PluginManager::register_filetype("application/rtf", 1);
+ PluginManager::register_filetype("application/vnd.ms-excel", 1);
+ PluginManager::register_filetype("application/vnd.oasis.opendocument.spreadsheet", 1);
++PluginManager::register_filetype("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet", 1);
+ PluginManager::register_filetype("application/vnd.ms-powerpoint", 1);
++PluginManager::register_filetype("application/vnd.oasis.opendocument.presentation", 1);
++PluginManager::register_filetype("application/vnd.openxmlformats-officedocument.presentationml.presentation", 1);
+ PluginManager::register_filetype("application/vnd.sun.xml.calc", 1);
++PluginManager::register_filetype("application/vnd.oasis.opendocument.graphics", 1);
++
+ 
+ // TODO: add more filetypes supported by abiword and/or OpenOffice
+ 
+ #endif
+ 
+-#endif /* OFFICE_PLUGIN_H */
+\ No newline at end of file
++#endif /* OFFICE_PLUGIN_H */
diff --git a/libre/gloobus-preview-libre/gloobus-preview-usr-bsdtar-for-rar.patch b/libre/gloobus-preview-libre/gloobus-preview-usr-bsdtar-for-rar.patch
new file mode 100644
index 000000000..f5b7c8e00
--- /dev/null
+++ b/libre/gloobus-preview-libre/gloobus-preview-usr-bsdtar-for-rar.patch
@@ -0,0 +1,57 @@
+------------------------------------------------------------
+revno: 291
+committer: Michał Masłowski <mtjm@mtjm.eu>
+branch nick: gloobus-preview
+timestamp: Sun 2013-06-23 14:43:35 +0200
+message:
+  Use bsdtar to open RAR archives if unrar is not available.
+  
+  Needs bsdtar from libarchive 3.0 or newer, not tested with older
+  versions nor checking for them.
+diff:
+=== modified file 'src/plugin-compressed/plugin-compressed.cpp'
+--- src/plugin-compressed/plugin-compressed.cpp	2012-04-06 11:25:47 +0000
++++ src/plugin-compressed/plugin-compressed.cpp	2013-06-23 12:43:35 +0000
+@@ -52,8 +52,9 @@
+ 		cmd_args.push_back("--");
+ 		line_parser = &iCompressed::parse_line_7z;
+ 	}
+-	else if ( type == GP_COMPRESSED_RAR
+-			|| type == GP_COMPRESSED_RAR_X )
++	else if ( (type == GP_COMPRESSED_RAR
++				|| type == GP_COMPRESSED_RAR_X)
++			&& interface::is_program_available("unrar") )
+ 	{
+ 		cmd_args.push_back("unrar");
+ 		cmd_args.push_back("vb");
+@@ -70,9 +71,15 @@
+ 			|| type == GP_COMPRESSED_TAR_LZOP
+ 			|| type == GP_COMPRESSED_TAR_X
+ 			|| type == GP_COMPRESSED_TAR_XZ
+-			|| type == GP_COMPRESSED_TAR_Z )
++			|| type == GP_COMPRESSED_TAR_Z
++			|| type == GP_COMPRESSED_RAR
++			|| type == GP_COMPRESSED_RAR_X )
+ 	{
+-		cmd_args.push_back("tar");
++		if ( type == GP_COMPRESSED_RAR
++	       		|| type == GP_COMPRESSED_RAR_X )
++			cmd_args.push_back("bsdtar");
++		else
++			cmd_args.push_back("tar");
+ 		cmd_args.push_back("-tf");
+ 		line_parser = &iCompressed::parse_line_rar;
+ 	}
+
+=== modified file 'src/plugin-compressed/plugin-compressed.h'
+--- src/plugin-compressed/plugin-compressed.h	2010-03-27 15:55:08 +0000
++++ src/plugin-compressed/plugin-compressed.h	2013-06-23 12:43:35 +0000
+@@ -102,7 +102,7 @@
+ 	PluginManager::register_filetype(GP_COMPRESSED_7Z, 1);
+ }
+ 
+-if(interface::is_program_available("unrar")) {
++if(interface::is_program_available("unrar") || interface::is_program_available("bsdtar")) {
+ 	PluginManager::register_filetype(GP_COMPRESSED_RAR, 1);
+ 	PluginManager::register_filetype(GP_COMPRESSED_RAR_X, 1);
+ }
diff --git a/libre/gloobus-preview-libre/gloobus-preview.install b/libre/gloobus-preview-libre/gloobus-preview.install
new file mode 100644
index 000000000..16ad7278f
--- /dev/null
+++ b/libre/gloobus-preview-libre/gloobus-preview.install
@@ -0,0 +1,12 @@
+post_install() {
+  xdg-icon-resource forceupdate
+  gdk-pixbuf-query-loaders --update-cache
+}
+
+post_upgrade() {
+  post_install $1
+}
+
+post_remove() {
+  post_install $1
+}
diff --git a/libre/gloobus-preview-libre/use-xdg-open.patch b/libre/gloobus-preview-libre/use-xdg-open.patch
new file mode 100644
index 000000000..68e219e6a
--- /dev/null
+++ b/libre/gloobus-preview-libre/use-xdg-open.patch
@@ -0,0 +1,20 @@
+diff -Naur gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-window.cpp gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-window.cpp
+--- gloobus-preview-0.4.5-ubuntu11~ppa290.orig/src/gloobus-preview-window.cpp	2012-04-06 15:07:29.000000000 +0200
++++ gloobus-preview-0.4.5-ubuntu11~ppa290/src/gloobus-preview-window.cpp	2013-05-18 09:49:24.833574800 +0200
+@@ -560,12 +560,12 @@
+     string label(gtk_menu_item_get_label(item));
+     if(label ==  _("Settings"))
+         cmd = "gloobus-preview-configuration";
+-    else if(label ==  _("Report a Bug"))
+-        cmd = "gnome-open \"https://bugs.launchpad.net/gloobus-preview/\"";
++    else if(label ==  _("Report a Problem"))
++        cmd = "xdg-open \"https://bugs.launchpad.net/gloobus-preview/\"";
+     else if(label == _("Blog"))
+-        cmd = "gnome-open \"http://gloobus.wordpress.com\"" ;
++        cmd = "xdg-open \"http://gloobus.wordpress.com\"" ;
+     else if(label == _("Donate"))
+-        cmd = "gnome-open \"https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=guitarboy000%40gmail%2ecom&item_name=Gloobus%2c%20A%20Quicklook%20for%20linux&no_shipping=0&no_note=1&tax=0&currency_code=EUR&lc=US&bn=PP%2dDonationsBF&chars\"" ;
++        cmd = "xdg-open \"https://www.paypal.com/cgi-bin/webscr?cmd=_donations&business=guitarboy000%40gmail%2ecom&item_name=Gloobus%2c%20A%20Quicklook%20for%20linux&no_shipping=0&no_note=1&tax=0&currency_code=EUR&lc=US&bn=PP%2dDonationsBF&chars\"" ;
+     else if(label == _("About"))
+         ui->create_about();
+     else if(label == _("Quit"))
diff --git a/libre/grub/PKGBUILD b/libre/grub/PKGBUILD
index 522c1517d..21220a209 100644
--- a/libre/grub/PKGBUILD
+++ b/libre/grub/PKGBUILD
@@ -1,96 +1,95 @@
-# Maintainer: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Keshav P R <(the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
+# Maintainer : Tobias Powalowski <tpowa@archlinux.org>
+# Maintainer : Ronald van Haren <ronald.archlinux.org>
+# Contributor: Keshav Padram (the.ridikulus.rat) (aatt) (gemmaeiil) (ddoott) (ccoomm)>
 # Maintainer (Parabola): André Silva <emulatorman@lavabit.com>
 
-_grub_lua_ver=24
-_grub_ntldr_ver=21
-_grub_915_ver=9
+## grub-extras lua and gpxe fail to build
 
-pkgname=('grub-common' 'grub-bios' 'grub-efi-i386')
-pkgbase=grub
+[[ "${CARCH}" == "x86_64" ]] && _EFI_ARCH="x86_64"
+[[ "${CARCH}" == "i686" ]] && _EFI_ARCH="i386"
+
+pkgname=grub
+pkgdesc="GNU GRand Unified Bootloader (2), (Parabola rebranded)"
 pkgver=2.00
-pkgrel=5
+pkgrel=1
 url="https://www.gnu.org/software/grub/"
-arch=('i686' 'x86_64')
+arch=('x86_64' 'i686')
 license=('GPL3')
+backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom')
+install="${pkgname}.install"
+options=('!makeflags')
+
+conflicts=('grub-legacy' 'grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
+replaces=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
+provides=('grub-common' 'grub-bios' "grub-efi-${_EFI_ARCH}")
+
 makedepends=('xz' 'freetype2' 'bdf-unifont' 'ttf-dejavu' 'python' 'autogen'
-             'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse')
+             'texinfo' 'help2man' 'gettext' 'device-mapper' 'fuse' 'bzr')
+depends=('sh' 'xz' 'gettext' 'device-mapper')
+optdepends=('freetype2: For grub-mkfont usage'
+            'fuse: For grub-mount usage'
+            'dosfstools: For EFI support' 
+            'efibootmgr: For grub-install EFI support'
+            'libisoburn: Provides xorriso for generating grub rescue iso using grub-mkrescue'
+            'os-prober: To detect other OSes when generating grub.cfg in BIOS systems'
+            'mtools: For grub-mkrescue FAT FS support')
 
 source=("http://ftp.gnu.org/gnu/grub/grub-${pkgver}.tar.xz"
-        "ftp://ftp.archlinux.org/other/grub2/grub2_extras_lua_r${_grub_lua_ver}.tar.xz"
-        "ftp://ftp.archlinux.org/other/grub2/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz"
-        "ftp://ftp.archlinux.org/other/grub2/grub2_extras_915resolution_r${_grub_915_ver}.tar.xz"
+        '0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch'
+        'grub-2.00-fix-docs.patch'
         'parabola_grub_mkconfig_fixes.patch'
-        'grub.default'
-        'grub.cfg'
         '60_memtest86+'
-        'grub_bzr_export.sh'
-        '0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch'
-        'grub-2.00-fix-docs.patch')
-md5sums=('a1043102fbc7bcedbf53e7ee3d17ab91'
-         '704ea9f250b6137f05fa0197fd07053a'
-         '77f7d5f8ce395663cd7fff4d37099957'
-         'a80e2b1d3bab778c3b6117d5a698992f'
-         'c776aaf2cc35488a7c531b59e697470d'
-         '52d374e0194e3f2e39ff7c92ecd58a6c'
-         '255eafb440b8c285b20431366c2d2d27'
-         'be55eabc102f2c60b38ed35c203686d6'
-         'f343ed2340ebc86c427873641bb72419'
-         'ab751d1d8cd3fd47e5ee24d71ecc31ed'
-         '342dd18472a24e5fd252458b24f39a29')
-
-noextract=("grub2_extras_lua_r${_grub_lua_ver}.tar.xz"
-           "grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz"
-           "grub2_extras_915resolution_r${_grub_915_ver}.tar.xz")
-
+        'grub.default'
+        'grub.cfg')
+
+for _DIR_ in 915resolution ntldr-img ; do
+	source+=("grub-extras-${_DIR_}::bzr+bzr://bzr.savannah.gnu.org/grub-extras/${_DIR_}/")
+done
+
+source+=("grub-extras-lua::bzr+bzr://bzr.savannah.gnu.org/grub-extras/lua/#revision=24"
+         "grub-extras-gpxe::bzr+bzr://bzr.savannah.gnu.org/grub-extras/gpxe/#revision=13")
+
+sha1sums=('274d91e96b56a5b9dd0a07accff69dbb6dfb596b'
+          'b68565bc155094bade390c257c3f31bc55ae244b'
+          '1dc08391bb13f8e23faa21a76cc4cc4b25467702'
+          'c631ec04d458c60a3ceffe60d2d1806d54554d9c'
+          '2aa2deeb7d7dc56f389aa1487b7a57b0d44ce559'
+          '06b926320cb2add6c157d59d46e553b89dd3aa03'
+          '662ec5f0d44122b66666a788387ec69389295b2c'
+          'SKIP'
+          'SKIP'
+          'SKIP'
+          'SKIP')
 
 _build_grub-common_and_bios() {
-
-	## copy the source for building the common/bios package
-	cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub_bios-${pkgver}"
-	cd "${srcdir}/grub_bios-${pkgver}"
-
-	## Apply Parabola specific fixes to enable grub-mkconfig detect kernels and initramfs
-	patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch"
-	echo
-
-	## fix unifont.bdf location so that grub-mkfont can create *.pf2 files
-	sed 's|/usr/share/fonts/unifont|/usr/share/fonts/unifont /usr/share/fonts/misc|g' -i "${srcdir}/grub_bios-${pkgver}/configure.ac"
-
-	## fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme
-	sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "${srcdir}/grub_bios-${pkgver}/configure.ac"
-
-	## add the grub-extra sources
-	export GRUB_CONTRIB="${srcdir}/grub_bios-${pkgver}/grub-extras/"
-	install -d "${srcdir}/grub_bios-${pkgver}/grub-extras"
-
-	bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \
-		-C "${srcdir}/grub_bios-${pkgver}/grub-extras"
-
-	bsdtar xf "${srcdir}/grub2_extras_ntldr-img_r${_grub_ntldr_ver}.tar.xz" \
-		-C "${srcdir}/grub_bios-${pkgver}/grub-extras"
-
-	bsdtar xf "${srcdir}/grub2_extras_915resolution_r${_grub_915_ver}.tar.xz" \
-		-C "${srcdir}/grub_bios-${pkgver}/grub-extras"
-
-	## Requires python2
-	# sed 's|python |python2 |g' -i "${srcdir}/grub_bios-${pkgver}/autogen.sh"
-
-	# fix compiling with gcc48
-        patch -Np1 -i ${srcdir}/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch
-
-	#fix docs compiling
-        patch -Np1 -i ${srcdir}/grub-2.00-fix-docs.patch
-
-        ## start the actual build process
-	cd "${srcdir}/grub_bios-${pkgver}"
+	
+	## Copy the source for building the common/bios package
+	cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-bios-${pkgver}"
+	cd "${srcdir}/grub-bios-${pkgver}/"
+	
+	## Add the grub-extra sources
+	export GRUB_CONTRIB="${srcdir}/grub-bios-${pkgver}/grub-extras/"
+	
+	install -d "${srcdir}/grub-bios-${pkgver}/grub-extras"
+	for _DIR_ in 915resolution ntldr-img lua gpxe ; do
+		cp -r "${srcdir}/grub-extras-${_DIR_}" "${srcdir}/grub-bios-${pkgver}/grub-extras/${_DIR_}"
+	done
+	
+	## Unset all compiler FLAGS for bios build
+	unset CFLAGS
+	unset CPPFLAGS
+	unset CXXFLAGS
+	unset LDFLAGS
+	unset MAKEFLAGS
+	
+	## Start the actual build process
+	cd "${srcdir}/grub-bios-${pkgver}/"
 	./autogen.sh
 	echo
-
-	CFLAGS="" ./configure \
+	
+	CFLAGS="-fno-stack-protector" ./configure \
 		--with-platform="pc" \
 		--target="i386" \
-		--host="${CARCH}-unknown-linux-gnu" \
 		"${_EFIEMU}" \
 		--enable-mm-debug \
 		--enable-nls \
@@ -105,43 +104,43 @@ _build_grub-common_and_bios() {
 		--infodir="/usr/share/info" \
 		--datarootdir="/usr/share" \
 		--sysconfdir="/etc" \
-		--program-prefix="" \
+	 	--program-prefix="" \
 		--with-bootdir="/boot" \
 		--with-grubdir="grub" \
 		--disable-werror
 	echo
-
-	CFLAGS="" make
+	
+	make
 	echo
-
 }
 
-_build_grub-efi-i386() {
-
-	## copy the source for building the efi package
-	cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub_efi-${pkgver}"
-	cd "${srcdir}/grub_efi-${pkgver}"
-
-	export GRUB_CONTRIB="${srcdir}/grub_efi-${pkgver}/grub-extras/"
-	install -d "${srcdir}/grub_efi-${pkgver}/grub-extras"
-
-	bsdtar xf "${srcdir}/grub2_extras_lua_r${_grub_lua_ver}.tar.xz" \
-		-C "${srcdir}/grub_efi-${pkgver}/grub-extras"
-
-        # fix compiling with gcc48
-        patch -Np1 -i ${srcdir}/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch
-
-	#fix docs compiling
-        patch -Np1 -i ${srcdir}/grub-2.00-fix-docs.patch
-
-	cd "${srcdir}/grub_efi-${pkgver}"
+_build_grub-efi() {
+	
+	## Copy the source for building the efi package
+	cp -r "${srcdir}/grub-${pkgver}" "${srcdir}/grub-efi-${pkgver}"
+	cd "${srcdir}/grub-efi-${pkgver}/"
+	
+	export GRUB_CONTRIB="${srcdir}/grub-efi-${pkgver}/grub-extras/"
+	
+	install -d "${srcdir}/grub-efi-${pkgver}/grub-extras/"
+	for _DIR_ in lua gpxe ; do
+		cp -r "${srcdir}/grub-extras-${_DIR_}" "${srcdir}/grub-bios-${pkgver}/grub-extras/${_DIR_}"
+	done
+	
+	## Unset all compiler FLAGS for efi build
+	unset CFLAGS
+	unset CPPFLAGS
+	unset CXXFLAGS
+	unset LDFLAGS
+	unset MAKEFLAGS
+	
+	cd "${srcdir}/grub-efi-${pkgver}/"
 	./autogen.sh
 	echo
-
-	CFLAGS="" ./configure \
+	
+	./configure \
 		--with-platform="efi" \
-		--target="i386" \
-		--host="${CARCH}-unknown-linux-gnu" \
+		--target="${_EFI_ARCH}" \
 		--disable-efiemu \
 		--enable-mm-debug \
 		--enable-nls \
@@ -161,108 +160,91 @@ _build_grub-efi-i386() {
 		--with-grubdir="grub" \
 		--disable-werror
 	echo
-
-	CFLAGS="" make
+	
+	make
 	echo
-
+	
 }
 
 build() {
-
-	## set architecture dependent variables
+	
+	## Set ARCH dependent variables
 	if [[ "${CARCH}" == 'x86_64' ]]; then
 		_EFIEMU="--enable-efiemu"
 	else
 		_EFIEMU="--disable-efiemu"
 	fi
-
-	_HOST="${CARCH}"
-
-	cd "${srcdir}/grub-${pkgver}"
-	# _get_locale_files
-
+	
+	cd "${srcdir}/grub-${pkgver}/"
+	
+	## Fix compiling with gcc48
+	patch -Np1 -i "${srcdir}/0069-Backport-gnulib-fixes-for-C11.-Fixes-Savannah-bug-37.patch"
+	echo
+	
+	## Fix docs compiling
+	patch -Np1 -i "${srcdir}/grub-2.00-fix-docs.patch"
+	echo
+	
+	## Apply Parabola specific fixes to enable grub-mkconfig detect kernels and initramfs
+	patch -Np1 -i "${srcdir}/parabola_grub_mkconfig_fixes.patch"
+	echo
+	
+	## fix unifont.bdf location so that grub-mkfont can create *.pf2 files
+	sed 's|/usr/share/fonts/unifont|/usr/share/fonts/unifont /usr/share/fonts/misc|g' -i "${srcdir}/grub-${pkgver}/configure.ac"
+	
+	## fix DejaVuSans.ttf location so that grub-mkfont can create *.pf2 files for starfield theme
+	sed 's|/usr/share/fonts/dejavu|/usr/share/fonts/dejavu /usr/share/fonts/TTF|g' -i "${srcdir}/grub-${pkgver}/configure.ac"
+	
+	## Requires python2
+	# sed 's|python |python2 |g' -i "${srcdir}/grub-${pkgver}/autogen.sh"
+	
 	_build_grub-common_and_bios
 	echo
-
-	_build_grub-efi-i386
+	
+	_build_grub-efi
 	echo
 
 }
 
-package_grub-common() {
-
-	pkgdesc="GNU GRand Unified Bootloader - Utilities and Common Files (Parabola rebranded)"
-	depends=('sh' 'xz' 'gettext' 'device-mapper')
-        optdepends=('freetype2: for grub-mkfont usage'
-                    'fuse: for grub-mount usage')
-	conflicts=('grub-legacy' 'grub')
-	replaces=('grub2-common')
-	provides=('grub2-common')
-	backup=('boot/grub/grub.cfg' 'etc/default/grub' 'etc/grub.d/40_custom')
-	optdepends=('libisoburn: provides xorriso for generating grub rescue iso using grub-mkrescue'
-	            'os-prober: to detect other OSes when generating grub.cfg in BIOS systems'
-	            'mtools: for grub-mkrescue FAT FS support')
-	install="grub.install"
-	options=('strip' 'purge' 'docs' 'zipman' '!emptydirs')
-
-	cd "${srcdir}/grub_bios-${pkgver}"
+_package_grub-common_and_bios() {
+	
+	cd "${srcdir}/grub-bios-${pkgver}/"
 	make DESTDIR="${pkgdir}/" bashcompletiondir="/usr/share/bash-completion/completions" install
 	echo
-
-	## install extra /etc/grub.d/ files
-	install -D -m0755 "${srcdir}/60_memtest86+" "${pkgdir}/etc/grub.d/60_memtest86+"
-
-	## install /etc/default/grub (used by grub-mkconfig)
-	install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
-
-	## install grub.cfg (needed so it doesn't get removed on upgrading because it was previously here)
-	install -D -m0644 "${srcdir}/grub.cfg" "${pkgdir}/boot/grub/grub.cfg"
-
-	# remove platform specific files
-	rm -rf "${pkgdir}/usr/lib/grub/i386-pc/"
-
-}
-
-package_grub-bios() {
-
-	pkgdesc="GNU GRand Unified Bootloader - i386 PC BIOS Modules"
-	depends=("grub-common=${pkgver}")
-	options=('!strip' '!emptydirs')
-	replaces=('grub2-bios')
-	provides=('grub2-bios')
-
-	cd "${srcdir}/grub_bios-${pkgver}"
-	make DESTDIR="${pkgdir}/" install
-	echo
-
-	## remove non platform-specific files
-	rm -rf "${pkgdir}"/{boot,etc,usr/{share,bin,sbin}}
-
+	
 	## remove gdb debugging related files
 	rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.module || true
 	rm -f "${pkgdir}/usr/lib/grub/i386-pc"/*.image || true
 	rm -f "${pkgdir}/usr/lib/grub/i386-pc"/{kernel.exec,gdb_grub,gmodule.pl} || true
-
+	
+	## Install extra /etc/grub.d/ files
+	install -D -m0755 "${srcdir}/60_memtest86+" "${pkgdir}/etc/grub.d/60_memtest86+"
+	
+	## Install /etc/default/grub (used by grub-mkconfig)
+	install -D -m0644 "${srcdir}/grub.default" "${pkgdir}/etc/default/grub"
+	
+	## Install grub.cfg for backup array
+	install -D -m0644 "${srcdir}/grub.cfg" "${pkgdir}/boot/grub/grub.cfg"
+	
 }
 
-package_grub-efi-i386() {
-
-	pkgdesc="GNU GRand Unified Bootloader - i386 UEFI Modules"
-	depends=("grub-common=${pkgver}" 'dosfstools' 'efibootmgr')
-	options=('!strip' '!emptydirs')
-	replaces=('grub2-efi-i386')
-	provides=('grub2-efi-i386')
-
-	cd "${srcdir}/grub_efi-${pkgver}"
+_package_grub-efi() {
+	
+	cd "${srcdir}/grub-efi-${pkgver}/"
 	make DESTDIR="${pkgdir}/" install
 	echo
-
-	## remove non platform-specific files
-	rm -rf "${pkgdir}"/{boot,etc,usr/{share,bin,sbin}}
-
+	
 	## remove gdb debugging related files
-	rm -f "${pkgdir}/usr/lib/grub/i386-efi"/*.module || true
-	rm -f "${pkgdir}/usr/lib/grub/i386-efi"/*.image || true
-	rm -f "${pkgdir}/usr/lib/grub/i386-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true
+	rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.module || true
+	rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/*.image || true
+	rm -f "${pkgdir}/usr/lib/grub/${_EFI_ARCH}-efi"/{kernel.exec,gdb_grub,gmodule.pl} || true
+	
+}
 
+package() {
+	
+	_package_grub-efi
+	
+	_package_grub-common_and_bios
+	
 }
diff --git a/pcr/perl-geo-ipfree/PKGBUILD b/pcr/perl-geo-ipfree/PKGBUILD
new file mode 100644
index 000000000..394e38ca1
--- /dev/null
+++ b/pcr/perl-geo-ipfree/PKGBUILD
@@ -0,0 +1,28 @@
+_author=bricas
+_perlmod=Geo-IPfree
+pkgname=perl-geo-ipfree
+pkgver=1.131650
+pkgrel=1
+pkgdesc="An IPv4 to country lookup database"
+arch=('any')
+url="http://search.cpan.org/~$_author/$_perlmod-$pkgver/"
+license=('GPL' 'PerlArtistic')
+depends=('perl>=5.10.0')
+options=(!emptydirs)
+source=(http://search.cpan.org/CPAN/authors/id/B/BR/BRICAS/$_perlmod-$pkgver.tar.gz)
+md5sums=('23d71e4f9a872184d9b4c6903c5a2b98')
+
+build() {
+  cd "$srcdir/$_perlmod-$pkgver"
+
+  # Install module in vendor directories.
+  PERL_MM_USE_DEFAULT=1 perl Makefile.PL INSTALLDIRS=vendor
+  make
+}
+
+package() {
+  cd "$srcdir/$_perlmod-$pkgver"
+  make install DESTDIR="$pkgdir/"
+}
+
+# vim:set ts=2 sw=2 et: