Sat Mar 22 03:47:24 UTC 2014

19 files changed, 235 insertions, 484 deletions

diff --git a/community/gtkglextmm/PKGBUILD b/community/gtkglextmm/PKGBUILD
index f90b68c1b..18d1b835d 100644
--- a/community/gtkglextmm/PKGBUILD
+++ b/community/gtkglextmm/PKGBUILD
@@ -1,30 +1,39 @@
-# $Id: PKGBUILD 102157 2013-12-06 11:32:53Z giovanni $
+# $Id: PKGBUILD 108043 2014-03-21 17:27:23Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Bastien Bouclet <bastien.bouclet@gmail.com>
 # Contributor: SpepS <dreamspepser at yahoo dot it>
 
 pkgname=gtkglextmm
 pkgver=1.2.0
-pkgrel=9
+pkgrel=10
 pkgdesc="Cpp C++ bindings for gtkglext"
 arch=('i686' 'x86_64')
 url="http://gtkglext.sourceforge.net/"
+license=('GPL')
 depends=('gtkmm' 'gtkglext')
 makedepends=('mesa')
-license=('GPL')
 source=("http://downloads.sourceforge.net/sourceforge/gtkglext/${pkgname}-${pkgver}.tar.bz2"
-        'gdkspanfunc.patch')
+        'gtkglextmm-1.2.0-aclocal.patch'
+        'fix_ftbfs_gtk_2_20.patch'
+        'fix_ftbfs_gtk_2_36.patch'
+        'fix_ftbfs_gtk_2_37.patch')
 md5sums=('27c05f4d45c5fd07b6fb0f044add3056'
-         'd7c8ea33c748a6857ee629c16b2d9bff')
+         '1f331ecdaa6ea3f9eaec8f0e54d6cd82'
+         '60a2e7518a148ea3be59669770ee5aaa'
+         'dd08d68c5e076dfa3293b00dd4150633'
+         'c39860d898a9ce24af3762fd351c5266')
 
-build() {
+prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
 
-  # FS#24706
-  patch -Np1 -i "${srcdir}/gdkspanfunc.patch"
+  patch -Np1 -i "${srcdir}/gtkglextmm-1.2.0-aclocal.patch"
+  patch -Np1 -i "${srcdir}/fix_ftbfs_gtk_2_20.patch"
+  patch -Np1 -i "${srcdir}/fix_ftbfs_gtk_2_36.patch"
+  patch -Np1 -i "${srcdir}/fix_ftbfs_gtk_2_37.patch"
+}
 
-  # automake 1.8 fix
-  sed -i "s|\(AC_DEFUN(\)\(AC_.*_MULTIHEAD\)|\1[\2]|" m4macros/gtkglextmm.m4
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr \
               --disable-gtkglext-test \
diff --git a/community/gtkglextmm/fix_ftbfs_gtk_2_20.patch b/community/gtkglextmm/fix_ftbfs_gtk_2_20.patch
new file mode 100644
index 000000000..1755f93e3
--- /dev/null
+++ b/community/gtkglextmm/fix_ftbfs_gtk_2_20.patch
@@ -0,0 +1,28 @@
+Description: Fix FTBFS due to missing GdkSpanFunc definition
+ .
+ The sequence of #include directives is important - if gtk/gtkglwidget.h
+ is included first, before widget.h, it includes gdk.h without undefing
+ GDK_DISABLE_DEPRECATED - this leads to GdkSpanFunc not being defined
+ and compilation errors. 
+ The fix is to first include widget.h which includes the right gdkmm header
+ which defines GDK_DISABLE_DEPRECATED before including gdk.h.
+Forwarded: no
+Bug-Ubuntu: http://launchpad.net/bugs/662572
+
+Index: gtkglextmm-1.2.0/gtkglext/gtkmm/gl/widget.cc
+===================================================================
+--- gtkglextmm-1.2.0.orig/gtkglext/gtkmm/gl/widget.cc	2010-12-08 13:31:59.651270000 +0100
++++ gtkglextmm-1.2.0/gtkglext/gtkmm/gl/widget.cc	2010-12-08 13:32:10.871270000 +0100
+@@ -17,10 +17,10 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
+  */
+ 
+-#include <gtk/gtkglwidget.h>
+-
+ #include "widget.h"
+ 
++#include <gtk/gtkglwidget.h>
++
+ namespace Gtk
+ {
+   namespace GL
diff --git a/community/gtkglextmm/fix_ftbfs_gtk_2_36.patch b/community/gtkglextmm/fix_ftbfs_gtk_2_36.patch
new file mode 100644
index 000000000..88e271e3e
--- /dev/null
+++ b/community/gtkglextmm/fix_ftbfs_gtk_2_36.patch
@@ -0,0 +1,121 @@
+Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/wrap_init.cc
+===================================================================
+--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/wrap_init.cc	2013-05-16 23:40:48.363207736 +0200
++++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/wrap_init.cc	2013-05-16 23:42:40.193801834 +0200
+@@ -1,15 +1,8 @@
+-
+-#include <glib.h>
+-
+ // Disable the 'const' function attribute of the get_type() functions.
+ // GCC would optimize them out because we don't use the return value.
+ #undef  G_GNUC_CONST
+ #define G_GNUC_CONST /* empty */
+ 
+-#include <gdkmm/gl/wrap_init.h>
+-#include <glibmm/error.h>
+-#include <glibmm/object.h>
+-
+ // #include the widget headers so that we can call the get_type() static methods:
+ 
+ #include "tokens.h"
+@@ -19,6 +12,12 @@
+ #include "pixmap.h"
+ #include "window.h"
+ 
++#include <glib.h>
++
++#include <gdkmm/gl/wrap_init.h>
++#include <glibmm/error.h>
++#include <glibmm/object.h>
++
+ extern "C"
+ {
+ 
+Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/query.cc
+===================================================================
+--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/query.cc	2013-05-16 23:40:48.363207736 +0200
++++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/query.cc	2013-05-16 23:42:40.193801834 +0200
+@@ -17,10 +17,10 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
+  */
+ 
+-#include <gdk/gdkglquery.h>
+-
+ #include "query.h"
+ 
++#include <gdk/gdkglquery.h>
++
+ namespace Gdk
+ {
+   namespace GL
+Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/pixmapext.cc
+===================================================================
+--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/pixmapext.cc	2013-05-16 23:40:48.363207736 +0200
++++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/pixmapext.cc	2013-05-16 23:42:40.193801834 +0200
+@@ -17,11 +17,11 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
+  */
+ 
++#include "pixmapext.h"
++
+ #include <gdk/gdkgldrawable.h>
+ #include <gdk/gdkglpixmap.h>
+ 
+-#include "pixmapext.h"
+-
+ namespace Gdk
+ {
+   namespace GL
+Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/windowext.cc
+===================================================================
+--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/windowext.cc	2013-05-16 23:40:48.363207736 +0200
++++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/windowext.cc	2013-05-16 23:42:40.193801834 +0200
+@@ -17,11 +17,11 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
+  */
+ 
++#include "windowext.h"
++
+ #include <gdk/gdkgldrawable.h>
+ #include <gdk/gdkglwindow.h>
+ 
+-#include "windowext.h"
+-
+ namespace Gdk
+ {
+   namespace GL
+Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/font.cc
+===================================================================
+--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/font.cc	2004-05-18 08:01:49.000000000 +0200
++++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/font.cc	2013-05-16 23:43:07.637456821 +0200
+@@ -17,10 +17,10 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
+  */
+ 
+-#include <gdk/gdkglfont.h>
+-
+ #include "font.h"
+ 
++#include <gdk/gdkglfont.h>
++
+ namespace Gdk
+ {
+   namespace GL
+Index: gtkglextmm-1.2.0/gdkglext/gdkmm/gl/init.cc
+===================================================================
+--- gtkglextmm-1.2.0.orig/gdkglext/gdkmm/gl/init.cc	2003-02-27 10:49:24.000000000 +0100
++++ gtkglextmm-1.2.0/gdkglext/gdkmm/gl/init.cc	2013-05-16 23:44:38.320316782 +0200
+@@ -19,11 +19,11 @@
+ 
+ #include <cstdlib>
+ 
+-#include <gdk/gdkglinit.h>
+-
+ #include "wrap_init.h"
+ #include "init.h"
+ 
++#include <gdk/gdkglinit.h>
++
+ namespace Gdk
+ {
+   namespace GL
diff --git a/community/gtkglextmm/fix_ftbfs_gtk_2_37.patch b/community/gtkglextmm/fix_ftbfs_gtk_2_37.patch
new file mode 100644
index 000000000..0cec958de
--- /dev/null
+++ b/community/gtkglextmm/fix_ftbfs_gtk_2_37.patch
@@ -0,0 +1,24 @@
+diff --git a/gtkglext/gtkmm/gl/drawingarea.cc b/gtkglext/gtkmm/gl/drawingarea.cc
+index 82bb7f4..5a8c5e3 100644
+--- a/gtkglext/gtkmm/gl/drawingarea.cc
++++ b/gtkglext/gtkmm/gl/drawingarea.cc
+@@ -17,6 +17,7 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
+  */
+ 
++#include <glibmm.h>
+ #include "drawingarea.h"
+ 
+ namespace Gtk
+diff --git a/gtkglext/gtkmm/gl/widget.cc b/gtkglext/gtkmm/gl/widget.cc
+index 598d6e2..2d6833b 100644
+--- a/gtkglext/gtkmm/gl/widget.cc
++++ b/gtkglext/gtkmm/gl/widget.cc
+@@ -17,6 +17,7 @@
+  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
+  */
+ 
++#include <glibmm.h>
+ #include "widget.h"
+ 
+ #include <gtk/gtkglwidget.h>
diff --git a/community/gtkglextmm/gdkspanfunc.patch b/community/gtkglextmm/gdkspanfunc.patch
deleted file mode 100644
index ae5672a8c..000000000
--- a/community/gtkglextmm/gdkspanfunc.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/gtkglext/gtkmm/gl/widget.cc	2004-05-18 03:01:50.000000000 -0300
-+++ b/gtkglext/gtkmm/gl/widget.cc	2011-06-12 17:57:13.075541070 -0300
-@@ -17,9 +17,8 @@
-  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307  USA.
-  */
- 
--#include <gtk/gtkglwidget.h>
--
- #include "widget.h"
-+#include <gtk/gtkglwidget.h>
- 
- namespace Gtk
- {
diff --git a/community/gtkglextmm/gtkglextmm-1.2.0-aclocal.patch b/community/gtkglextmm/gtkglextmm-1.2.0-aclocal.patch
new file mode 100644
index 000000000..b0843d521
--- /dev/null
+++ b/community/gtkglextmm/gtkglextmm-1.2.0-aclocal.patch
@@ -0,0 +1,11 @@
+--- a/m4macros/gtkglextmm.m4	2004-05-18 08:29:34.000000000 +0200
++++ b/m4macros/gtkglextmm.m4	2006-05-31 16:46:09.000000000 +0200
+@@ -222,7 +222,7 @@
+ dnl AC_GTKGLEXTMM_SUPPORTS_MULTIHEAD([ACTION-IF-SUPPORTED [, ACTION-IF-NOT-SUPPORTED]])
+ dnl Checks whether gtkglextmm supports multihead.
+ dnl
+-AC_DEFUN(AC_GTKGLEXTMM_SUPPORTS_MULTIHEAD,
++AC_DEFUN([AC_GTKGLEXTMM_SUPPORTS_MULTIHEAD],
+ [ AC_LANG_SAVE
+   AC_LANG_CPLUSPLUS
+   AC_CACHE_CHECK([whether gtkglextmm supports multihead],
diff --git a/community/hercules/PKGBUILD b/community/hercules/PKGBUILD
index 9a1396446..2a0609717 100644
--- a/community/hercules/PKGBUILD
+++ b/community/hercules/PKGBUILD
@@ -1,32 +1,32 @@
-# $Id: PKGBUILD 99809 2013-10-31 01:50:39Z allan $
+# $Id: PKGBUILD 108015 2014-03-21 00:37:09Z eric $
 # Maintainer: Alexander Rødseth <rodseth@gmail.com>
 # Contributor: Kevin Piche <kevin@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=hercules
-pkgver=3.08
+pkgver=3.10
 pkgrel=1
-arch=('x86_64' 'i686')
 pkgdesc='Software implementation of System/370 and ESA/390'
+arch=('i686' 'x86_64')
 url='http://www.hercules-390.eu/'
-source=("http://downloads.hercules-390.eu/$pkgname-$pkgver.tar.gz")
 license=('custom')
 depends=('bzip2' 'libgcrypt' 'zlib' 'perl')
-sha256sums=('85e217773587f2278d4b6cb6bc815e042cfc982d0fc14baa0da4a84dea399e9d')
+options=('!makeflags')
+source=("http://downloads.hercules-390.eu/$pkgname-$pkgver.tar.gz")
+sha256sums=('26264569b7d78bbc3b6221926051ac3761c4a792dfc84d591d3230de40aa46fa')
 
 build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
+  cd $pkgname-$pkgver
   # Change module extension from .la to .so.
   sed '/HDL_MODULE_SUFFIX/ s/\.la/.so/' -i hdl.h
   ./configure --prefix=/usr
-  make -j1
+  make
 }
 
 package() {
-  cd "$srcdir/$pkgname-$pkgver"
+  cd $pkgname-$pkgver
 
-  make prefix="$pkgdir/usr" install
+  make DESTDIR="$pkgdir" install
   install -Dm644 COPYRIGHT \
     "$pkgdir/usr/share/licenses/hercules/qpl1"
 }
diff --git a/community/julius/PKGBUILD b/community/julius/PKGBUILD
index 8e14904d7..eb5cd7444 100644
--- a/community/julius/PKGBUILD
+++ b/community/julius/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 103609 2014-01-08 10:39:22Z arcanis $
+# $Id: PKGBUILD 108040 2014-03-21 16:24:18Z arcanis $
 # Maintainer: Evgeniy Alekseev <arcanis.arch at gmail dot com>
 # Contributor: Matt Harrison <matt at mistbyte dot com>
 # Contributor: Muhammad Qadri <Muhammad dot A dot Qadri at gmail dot com>
 
 pkgname=julius
-pkgver=4.3
+pkgver=4.3.1
 pkgrel=1
 pkgdesc="A high-performance, two-pass large vocabulary continuous speech recognition decoder software"
 arch=("i686" "x86_64")
@@ -12,8 +12,8 @@ url="http://julius.sourceforge.jp/"
 license=("custom")
 depends=("libpulse")
 optdepends=("voxforge-am-julius: acoustic models")
-source=("http://iij.dl.sourceforge.jp/${pkgname}/60153/${pkgname}-${pkgver}.tar.gz")
-md5sums=("48b36e9104b55c409a60947f7ba05bb3")
+source=("http://dl.sourceforge.jp/${pkgname}/60273/${pkgname}-${pkgver}.tar.gz")
+md5sums=("7868d89ac1fa729f477a7c700efaf087")
 
 prepare() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/mate-calc/PKGBUILD b/community/mate-calc/PKGBUILD
deleted file mode 100644
index 0651c0b4c..000000000
--- a/community/mate-calc/PKGBUILD
+++ /dev/null
@@ -1,30 +0,0 @@
-# Maintainer : Martin Wimpress <code@flexion.org>
-
-pkgname=mate-calc
-pkgver=1.8.0
-pkgrel=2
-pkgdesc="Calculator for the Mate desktop environment"
-url="http://mate-desktop.org"
-arch=('i686' 'x86_64')
-license=('LGPL' 'GPL')
-depends=('dconf' 'gtk2')
-makedepends=('mate-common' 'perl-xml-parser' 'yelp-tools')
-optdepends=('yelp: for reading MATE help documents')
-options=('!emptydirs')
-groups=('mate-extra')
-source=("http://pub.mate-desktop.org/releases/1.8/${pkgname}-${pkgver}.tar.xz")
-sha1sums=('d63156db75d8110f0cabf82a12c74c5b9836f327')
-install=${pkgname}.install
-
-build() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    ./configure \
-        --prefix=/usr \
-        --with-gtk=2.0
-    make
-}
-
-package() {
-    cd "${srcdir}/${pkgname}-${pkgver}"
-    make DESTDIR="${pkgdir}" install
-}
diff --git a/community/mate-calc/mate-calc.install b/community/mate-calc/mate-calc.install
deleted file mode 100644
index 3a06d45b9..000000000
--- a/community/mate-calc/mate-calc.install
+++ /dev/null
@@ -1,11 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas/
-}
-
-post_upgrade() {
-    post_install
-}
-
-post_remove() {
-    post_install
-}
diff --git a/community/pitivi/PKGBUILD b/community/pitivi/PKGBUILD
index 8849804ba..0f3060f0d 100644
--- a/community/pitivi/PKGBUILD
+++ b/community/pitivi/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 100501 2013-11-05 10:06:09Z spupykin $
+# $Id: PKGBUILD 108019 2014-03-21 08:50:40Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Abhishek Dasgupta <abhidg@gmail.com>
 # Contributor: Gabor Nyekhelyi (n0gabor) <n0gabor@vipmail.hu>
 
 pkgname=pitivi
-pkgver=0.92
+pkgver=0.93
 pkgrel=1
 pkgdesc="Editor for audio/video projects using the GStreamer framework"
 arch=('i686' 'x86_64')
@@ -20,7 +20,7 @@ optdepends=('frei0r-plugins: additional video effects, clip transformation featu
             'gst-plugins-ugly: additional multimedia codecs')
 install=$pkgname.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/$pkgver/$pkgname-$pkgver.tar.xz)
-md5sums=('6c84db8a647c9151c3890e9cd15a8fc1')
+md5sums=('27fa7e560b6da0cc8f83466c1346b96e')
 
 build() {
   cd "$srcdir/$pkgname-$pkgver"
diff --git a/community/springlobby/PKGBUILD b/community/springlobby/PKGBUILD
index 02fda8147..13f6de688 100644
--- a/community/springlobby/PKGBUILD
+++ b/community/springlobby/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 104963 2014-01-28 18:12:41Z svenstaro $
+# $Id: PKGBUILD 108052 2014-03-21 20:04:05Z svenstaro $
 # Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
 # Contributor: DuGi <dugi@irc.pl>
 
 pkgname=springlobby
-pkgver=0.180
-pkgrel=3
+pkgver=0.182
+pkgrel=1
 pkgdesc="A free cross-platform lobby client for the Spring RTS project."
 arch=('i686' 'x86_64')
 url="http://springlobby.info/"
@@ -15,7 +15,7 @@ optdepends=('sdl' 'sdl_sound' 'sdl_mixer')
 makedepends=('boost' 'asio' 'cmake')
 install=springlobby.install
 source=(http://www.springlobby.info/tarballs/${pkgname}-${pkgver}.tar.bz2)
-md5sums=('4e33b20be873660649cf7c369ce81373')
+md5sums=('d20ce337747374b9a4ec51c5fa6f5202')
 
 build() {
   cd $srcdir/${pkgname}-$pkgver
diff --git a/community/srm/PKGBUILD b/community/srm/PKGBUILD
index 27dd11989..a09fc5f8b 100644
--- a/community/srm/PKGBUILD
+++ b/community/srm/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 104066 2014-01-15 08:27:26Z giovanni $
+# $Id: PKGBUILD 108034 2014-03-21 15:42:25Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Tom Newsom <Jeepster@gmx.co.uk>
 
 pkgname=srm
-pkgver=1.2.12
+pkgver=1.2.13
 pkgrel=1
 pkgdesc="A secure replacement for rm(1) that overwrites data before unlinking"
 arch=('i686' 'x86_64')
 url="http://srm.sourceforge.net/"
 license=('custom')
 depends=('glibc')
-source=("http://downloads.sourceforge.net/sourceforge/${pkgname}/${pkgname}-${pkgver}.tar.xz")
-md5sums=('395c42753e9d98d6f815ac28a42ba87a')
+source=("http://sourceforge.net/projects/${pkgname}/files/${pkgver}/${pkgname}-${pkgver}.tar.gz")
+md5sums=('123f8fbf086a5c50aadb2a23991b9416')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/usbview/PKGBUILD b/community/usbview/PKGBUILD
index 8a0a59b05..e3e5774d3 100644
--- a/community/usbview/PKGBUILD
+++ b/community/usbview/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 81972 2013-01-05 07:30:40Z giovanni $
+# $Id: PKGBUILD 108036 2014-03-21 16:04:00Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Jason Chu <jason@archlinux.org>
 
 pkgname=usbview
 pkgver=2.0
-pkgrel=2
+pkgrel=3
 pkgdesc="Display the topology of devices on the USB bus"
 arch=('i686' 'x86_64')
 url="http://www.kroah.com/linux/usb/"
@@ -15,12 +15,12 @@ install=${pkgname}.install
 source=("http://www.kroah.com/linux/usb/${pkgname}-${pkgver}.tar.gz")
 md5sums=('565f2e79f3924d14ab5b4d8aced557e5')
 
-build() {
-  cd "${srcdir}"
-  gendesk -n
-  sed -i "s:Application;:Application;System:g" "${srcdir}"/${pkgname}.desktop
+prepare() {
+  gendesk -n --pkgname "$pkgname" --pkgdesc "$pkgdesc" --name "Usbview" --categories "Application;System"
+}
 
-  cd "${pkgname}-${pkgver}"
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
 
   ./configure --prefix=/usr \
               --sysconfdir=/etc \
diff --git a/extra/webkitgtk2/PKGBUILD b/extra/webkitgtk2/PKGBUILD
deleted file mode 100644
index 7ac1d56aa..000000000
--- a/extra/webkitgtk2/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-# $Id: PKGBUILD 198483 2013-10-30 15:08:20Z allan $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-
-pkgname=webkitgtk2
-pkgver=1.10.2
-pkgrel=8
-pkgdesc="GTK+ Web content engine library for GTK+ 2.0"
-arch=(i686 x86_64)
-url="http://webkitgtk.org/"
-license=(custom)
-depends=(libxt libxslt sqlite libsoup enchant libgl geoclue gtk2 gstreamer0.10-base
-         icu)
-makedepends=(gperf gobject-introspection python2 mesa ruby gtk-doc)
-optdepends=()
-provides=("libwebkit=${pkgver}")
-conflicts=(libwebkit)
-replaces=(libwebkit)
-options=(!emptydirs)
-source=(http://webkitgtk.org/releases/webkitgtk-${pkgver}.tar.xz
-        bison3.patch)
-sha256sums=('19234f8e4edfaefe91ed06471a2aa8c71d26dd55d33787eede1dcfc9a3a96d9c'
-            '0996b25d17be61470678c18db9bfad1bf807aac410690fb8935370dbc8b3ce34')
-
-prepare() {
-  cd webkitgtk-$pkgver
-  patch -Np1 -i ../bison3.patch
-}
-
-build() {
-  cd webkitgtk-$pkgver
-
-  # Suppress a *lot* of gcc 4.8 warnings
-  CPPFLAGS+=" -Wno-unused-local-typedefs"
-
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-    --libexecdir=/usr/lib/$pkgname \
-    --enable-introspection \
-    --disable-webkit2 \
-    --with-gstreamer=0.10 \
-    --with-gtk=2.0
-
-  # https://bugzilla.gnome.org/show_bug.cgi?id=655517
-  sed -i 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-
-  make all stamp-po
-}
-
-package() {
-  cd webkitgtk-$pkgver
-  make -j1 DESTDIR="$pkgdir" install
-  install -Dm644 Source/WebKit/LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-  rm -r "$pkgdir/usr/share/gtk-doc/html/webkitgtk"
-}
diff --git a/extra/webkitgtk2/bison3.patch b/extra/webkitgtk2/bison3.patch
deleted file mode 100644
index 9c9dabb82..000000000
--- a/extra/webkitgtk2/bison3.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -u -r webkitgtk-1.10.2/Source/ThirdParty/ANGLE/src/compiler/glslang.y webkitgtk-1.10.2-bison3/Source/ThirdParty/ANGLE/src/compiler/glslang.y
---- webkitgtk-1.10.2/Source/ThirdParty/ANGLE/src/compiler/glslang.y	2012-11-23 21:12:16.000000000 +0100
-+++ webkitgtk-1.10.2-bison3/Source/ThirdParty/ANGLE/src/compiler/glslang.y	2013-10-12 20:42:54.531301735 +0200
-@@ -47,6 +47,7 @@
- %expect 1 /* One shift reduce conflict because of if | else */
- %pure-parser
- %parse-param {TParseContext* context}
-+%lex-param {YYLEX_PARAM}
- 
- %union {
-     struct {
diff --git a/libre/linux-libre-tools/02-parabola-paths.patch b/libre/linux-libre-tools/02-parabola-paths.patch
deleted file mode 100644
index 223e7d783..000000000
--- a/libre/linux-libre-tools/02-parabola-paths.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-# Seblu was here
---- a/tools/perf/config/Makefile	2014-02-13 23:00:14.000000000 +0100
-+++ b/tools/perf/config/Makefile	2014-02-17 20:01:33.370539725 +0100
-@@ -561,7 +561,7 @@
- bindir = $(prefix)/$(bindir_relative)
- mandir = share/man
- infodir = share/info
--perfexecdir = libexec/perf-core
-+perfexecdir = lib/perf
- sharedir = $(prefix)/share
- template_dir = share/perf-core/templates
- htmldir = share/doc/perf-doc
-@@ -573,7 +573,7 @@
- ETC_PERFCONFIG = etc/perfconfig
- endif
- ifeq ($(IS_X86_64),1)
--lib = lib64
-+lib = lib
- else
- lib = lib
- endif
diff --git a/libre/linux-libre-tools/PKGBUILD b/libre/linux-libre-tools/PKGBUILD
deleted file mode 100644
index c20fee223..000000000
--- a/libre/linux-libre-tools/PKGBUILD
+++ /dev/null
@@ -1,263 +0,0 @@
-# $Id: PKGBUILD 105883 2014-02-17 19:21:42Z seblu $
-# Maintainer: Sébastien Luttringer <seblu@archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-pkgbase=linux-libre-tools
-pkgname=(
-  'acpidump-libre'
-  'cgroup_event_listener-libre'
-  'cpupower-libre'
-  'libtraceevent-libre'
-  'linux-libre-tools-meta'
-  'perf-libre'
-  'tmon-libre'
-  'usbip-libre'
-  'x86_energy_perf_policy-libre'
-)
-_basekernel=3.13
-#_sublevel=3
-#_pkgver=$_basekernel.$_sublevel
-pkgver=$_basekernel
-pkgrel=2
-license=('GPL2')
-arch=('i686' 'x86_64' 'mips64el')
-url='http://linux-libre.fsfla.org/'
-options=('!strip')
-# split packages need all package dependencies set manually in makedepends
-# kernel source deps
-makedepends=('asciidoc' 'xmlto')
-# perf-libre deps
-makedepends+=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'numactl')
-# cpupower-libre deps
-makedepends+=('pciutils')
-# usbip-libre deps
-makedepends+=('glib2' 'sysfsutils')
-# tmon-libre deps
-makedepends+=('ncurses')
-groups=("$pkgbase")
-source=("http://linux-libre.fsfla.org/pub/linux-libre/releases/$_basekernel-gnu/linux-libre-$_basekernel-gnu.tar.xz"
-        #"http://linux-libre.fsfla.org/pub/linux-libre/releases/$_pkgver-gnu/patch-$_basekernel-gnu-$_pkgver-gnu.xz"
-        'cpupower.default'
-        'cpupower.systemd'
-        'cpupower.service'
-        'usbipd.service'
-        '01-fix-perf-python.patch'
-        '02-parabola-paths.patch')
-sha256sums=('6e68eef826b17ae9d7df01ac13e46ef5d978670071d1b05aed775bdbff8fed96'
-            #'561644a6a5d4c434dcd1f1e1dc48c4d8924bfa0407f697b66b7e6de02451acbb'
-            '4fa509949d6863d001075fa3e8671eff2599c046d20c98bb4a70778595cd1c3f'
-            'fbf6e0ce6eb0ef15703fe212958de6ca46e62188900b5e9f9272ed3cc9cfd54e'
-            'a89284d0ecb556ca53a66d1c2087b5fd6d0a901ab2769cd3aebb93f4478905dc'
-            '2e187734d8aec58a3046d79883510d779aa93fb3ab20bd3132c1a607ebe5498f'
-            'fce128f5e0abfa6916d5cb881456d892d1b163b9639166a4c6c1d53e4dc5086a'
-            'eb866a589a26b1979ffb2fe08be09417e277a4befac34bdb279a6bb3a27b0570')
-
-prepare() {
-  cd linux-$pkgver
-  # apply stable patching set
-  if (( NOEXTRACT == 0 )) && [[ -e "$srcdir"/patch-$_basekernel-gnu-$_pkgver-gnu ]]; then
-    msg2 'Applying stable patch set'
-    patch -Np1 -i "$srcdir"/patch-$_basekernel-gnu-$_pkgver-gnu
-  fi
-  patch -N -p1 -i "$srcdir/01-fix-perf-python.patch"
-  patch -N -p1 -i "$srcdir/02-parabola-paths.patch"
-}
-
-build() {
-  msg2 'libtraceevent-libre'
-  pushd linux-$pkgver/tools/lib/traceevent
-  make
-  popd
-
-  msg2 'perf-libre'
-  pushd linux-$pkgver/tools/perf
-  make \
-    WERROR=0 \
-    DESTDIR="$pkgdir/usr" \
-    perfexecdir='lib/perf' \
-    PYTHON=python2 \
-    PYTHON_CONFIG=python2-config \
-    NO_GTK2=1 \
-    PERF_VERSION=$pkgver-$pkgrel \
-    all man
-  popd
-
-  msg2 'cpupower-libre'
-  pushd linux-$pkgver/tools/power/cpupower
-  # we cannot use --as-needed
-  #LDFLAGS=${LDFLAGS:+"$LDFLAGS,--no-as-needed"}
-  make VERSION=$pkgver-$pkgrel
-  popd
-
-  msg2 'x86_energy_perf_policy-libre'
-  pushd linux-$pkgver/tools/power/x86/x86_energy_perf_policy
-  make
-  popd
-
-  msg2 'usbip-libre'
-  pushd linux-$pkgver/drivers/staging/usbip/userspace
-  # fix missing man page
-  sed -i 's/usbip_bind_driver.8//' Makefile.am
-  ./autogen.sh
-  ./configure --prefix=/usr --sbindir=/usr/bin
-  make
-  popd
-
-  msg2 'tmon-libre'
-  pushd linux-$pkgver/tools/thermal/tmon
-  make
-  popd
-
-  msg2 'acpidump-libre'
-  pushd linux-$pkgver/tools/power/acpi
-  make
-  popd
-
-  msg2 'cgroup_event_listener-libre'
-  pushd linux-$pkgver/tools/cgroup
-  make
-  popd
-}
-
-package_linux-libre-tools-meta() {
-  pkgdesc='Linux kernel tools meta package'
-  groups=()
-  depends=(
-    'acpidump-libre'
-    'cgroup_event_listener-libre'
-    'cpupower-libre'
-    'libtraceevent-libre'
-    'linux-libre-tools-meta'
-    'perf-libre'
-    'tmon-libre'
-    'usbip-libre'
-    'x86_energy_perf_policy-libre'
-  )
-  replaces=('linux-tools-meta')
-  conflicts=('linux-tools-meta')
-  provides=("linux-tools-meta=$pkgver") 
-}
-
-package_libtraceevent-libre() {
-  pkgdesc='Linux kernel trace event library'
-  depends=('glibc')
-  replaces=('libtraceevent')
-  conflicts=('libtraceevent')
-  provides=("libtraceevent=$pkgver")
-
-  cd linux-$pkgver/tools/lib/traceevent
-  install -dm 755 "$pkgdir/usr/lib"
-  install -m 644 libtraceevent.a libtraceevent.so "$pkgdir/usr/lib"
-}
-
-package_perf-libre() {
-  pkgdesc='Linux kernel performance auditing tool'
-  depends=('perl' 'python2' 'libnewt' 'elfutils' 'audit' 'libunwind' 'binutils'
-           'numactl')
-  replaces=('perf')  
-  conflicts=('perf')
-  provides=("perf=$pkgver")
-
-  cd linux-$pkgver/tools/perf
-  make \
-    WERROR=0 \
-    DESTDIR="$pkgdir/usr" \
-    perfexecdir='lib/perf' \
-    PYTHON=python2 \
-    PYTHON_CONFIG=python2-config \
-    NO_GTK2=1 \
-    PERF_VERSION=$pkgver-$pkgrel \
-    install install-man
-  # move completion in new directory
-  cd "$pkgdir"
-  install -Dm644 usr/etc/bash_completion.d/perf usr/share/bash-completion/perf
-  rm -r usr/etc
-}
-
-package_cpupower-libre() {
-  pkgdesc='Linux kernel tool to examine and tune power saving related features of your processor'
-  backup=('etc/default/cpupower')
-  depends=('bash' 'pciutils')
-  replaces=('cpupower' 'cpufrequtils')
-  conflicts=('cpupower' 'cpufrequtils')
-  provides=("cpupower=$pkgver")
-  install=cpupower.install
-
-  pushd linux-$pkgver/tools/power/cpupower
-  make \
-    DESTDIR="$pkgdir" \
-    sbindir='/usr/bin' \
-    mandir='/usr/share/man' \
-    docdir='/usr/share/doc/cpupower' \
-    install install-man
-  popd
-  # install startup scripts
-  install -Dm 644 cpupower.default "$pkgdir/etc/default/cpupower"
-  install -Dm 644 cpupower.service "$pkgdir/usr/lib/systemd/system/cpupower.service"
-  install -Dm 755 cpupower.systemd "$pkgdir/usr/lib/systemd/scripts/cpupower"
-}
-
-package_x86_energy_perf_policy-libre() {
-  pkgdesc='Read or write MSR_IA32_ENERGY_PERF_BIAS'
-  depends=('glibc')
-  replaces=('x86_energy_perf_policy')
-  conflicts=('x86_energy_perf_policy')
-  provides=("x86_energy_perf_policy=$pkgver")
-
-  cd linux-$pkgver/tools/power/x86/x86_energy_perf_policy
-  install -Dm 755 x86_energy_perf_policy "$pkgdir/usr/bin/x86_energy_perf_policy"
-  install -Dm 644 x86_energy_perf_policy.8 "$pkgdir/usr/share/man/man8/x86_energy_perf_policy.8"
-}
-
-package_usbip-libre() {
-  pkgdesc='An USB device sharing system over IP network'
-  depends=('glib2' 'sysfsutils')
-  replaces=('usbip')
-  conflicts=('usbip')
-  provides=("usbip=$pkgver")
-
-  pushd linux-$pkgver/drivers/staging/usbip/userspace
-  make install DESTDIR="$pkgdir"
-  popd
-  # module loading
-  install -Dm 644 /dev/null "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
-  printf 'usbip-core\nusbip-host\n' > "$pkgdir/usr/lib/modules-load.d/$pkgname.conf"
-  # systemd
-  install -Dm 644 usbipd.service "$pkgdir/usr/lib/systemd/system/usbipd.service"
-}
-
-package_tmon-libre() {
-  pkgdesc='Monitoring and Testing Tool for Linux kernel thermal subsystem'
-  depends=('glibc' 'ncurses')
-  replaces=('tmon')
-  conflicts=('tmon')
-  provides=("tmon=$pkgver")
-
-  cd linux-$pkgver/tools/thermal/tmon
-  make install INSTALL_ROOT="$pkgdir"
-}
-
-package_acpidump-libre() {
-  pkgdesc='Dump system ACPI tables to an ASCII file'
-  depends=('glibc')
-  replaces=('acpidump')
-  conflicts=('acpidump' 'iasl')
-  provides=("acpidump=$pkgver")
-
-  cd linux-$pkgver/tools/power/acpi
-  install -Dm755 acpidump "$pkgdir/usr/bin/acpidump"
-  install -Dm644 acpidump.8 "$pkgdir/usr/share/man/man8/acpidump.8"
-}
-
-package_cgroup_event_listener-libre() {
-  pkgdesc='Simple listener of cgroup events'
-  depends=('glibc')
-  replaces=('cgroup_event_listener')
-  conflicts=('cgroup_event_listener')
-  provides=("cgroup_event_listener=$pkgver")
-
-  cd linux-$pkgver/tools/cgroup
-  install -Dm755 cgroup_event_listener "$pkgdir/usr/bin/cgroup_event_listener"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/nonprism/grilo-plugins-nonprism/PKGBUILD b/nonprism/grilo-plugins-nonprism/PKGBUILD
deleted file mode 100644
index 6a93de196..000000000
--- a/nonprism/grilo-plugins-nonprism/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 206112 2014-02-18 14:55:21Z heftig $
-# Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-_pkgname=grilo-plugins
-pkgname=grilo-plugins-nonprism
-pkgver=0.2.11
-pkgrel=1
-pkgdesc="Plugins for Grilo, without libgdata support and gnome-online-accounts recommendation"
-url="http://www.gnome.org"
-arch=(i686 x86_64)
-license=(LGPL)
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
-depends=(grilo sqlite libgcrypt)
-makedepends=(gupnp-av gmime libtracker-sparql libdmapsharing
-             json-glib intltool avahi itstool)
-optdepends=('gupnp-av: uPnP plugin'
-            'gmime: Podcasts plugin'
-            'libtracker-sparql: Tracker plugin'
-            'libdmapsharing: DMAP sharing plugin'
-            'json-glib: TMDb plugin'
-            'avahi: Freebox plugin')
-options=('!emptydirs')
-groups=('gnome')
-source=(http://ftp.gnome.org/pub/gnome/sources/${_pkgname}/${pkgver%.*}/${_pkgname}-${pkgver}.tar.xz)
-sha256sums=('a2ac4ad28f3ead53d00d99653b2fb2d19cd5d9cfc33a16e7e82477223d089944')
-
-build() {
-  cd $_pkgname-$pkgver
-  ./configure --prefix=/usr --sysconfdir=/etc --disable-static \
-    --enable-shoutcast --disable-pocket
-  make
-}
-
-package() {
-  cd $_pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}