Thu Jan 9 03:54:24 UTC 2014

author: Nicolás Reynolds <fauno@endefensadelsl.org> 2014-01-09 03:58:56 +0000
committer: Nicolás Reynolds <fauno@endefensadelsl.org> 2014-01-09 03:58:56 +0000
commit: ebfbe6aa4a09806147654dd9e8d512cd68921e0d (patch)
tree: 645198602e94164a4130285756f401ae0b0756fd
parent: 3092fe0e20f490a5f9b8b9602ffc039a22be60c0 (diff)
188 files changed, 440 insertions, 9666 deletions
diff --git a/community/cantata/PKGBUILD b/community/cantata/PKGBUILD
index a787619fd..c7b699bc6 100644
--- a/community/cantata/PKGBUILD
+++ b/community/cantata/PKGBUILD
@@ -1,23 +1,24 @@
-# $Id: PKGBUILD 101406 2013-11-24 23:10:10Z cinelli $
+# $Id: PKGBUILD 103640 2014-01-08 16:42:15Z bgyorgy $
 # Maintainer:  Federico Cinelli <cinelli@aur.archlinux.org>
 # Contributor: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Mcder3 <mcder3[at]gmail[dot]com>
 # Contributor: MisterFred <mister.fred[at]free[dot]fr>
 
 pkgname=cantata
-pkgver=1.1.3
+pkgver=1.2.2
 pkgdesc="A KDE client for the music player daemon (MPD)"
-pkgrel=2
+pkgrel=1
 arch=('i686' 'x86_64')
 url="http://kde-apps.org/content/show.php/Cantata?content=147733"
 license=('GPL')
-depends=('kdebase-runtime' 'libmtp' 'libcddb' 'libmusicbrainz5' 'mpg123' 'taglib-extras')
+depends=('kdebase-runtime' 'libmtp' 'libcddb' 'libmusicbrainz5' 'mpg123' 'qjson' 'taglib-extras')
 optdepends=('perl-uri: dynamic playlist'
 	    'mpd: playback')
 makedepends=('cmake' 'automoc4')
 install="$pkgname.install"
 source=("http://cantata.googlecode.com/files/$pkgname-$pkgver.tar.bz2")
-md5sums=('22691c1ba9e0f94200f6cdb849be726a')
+sha1sums=('89d84736ba4a43be7dc892af6fcbad5957075e19')
+
 build() {
   cd "$srcdir/$pkgname-$pkgver"
   mkdir build
@@ -25,7 +26,7 @@ build() {
   cmake . \
     -DCMAKE_INSTALL_PREFIX=/usr \
     -DCMAKE_BUILD_TYPE=Release \
-    -DENABLE_PHONON=ON
+    -DENABLE_HTTP_STREAM_PLAYBACK=ON
 
   make
 }
diff --git a/community/cppcheck/PKGBUILD b/community/cppcheck/PKGBUILD
index 261d32e4a..5319a5d1d 100644
--- a/community/cppcheck/PKGBUILD
+++ b/community/cppcheck/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 98518 2013-10-12 16:47:42Z jelle $
+# $Id: PKGBUILD 103594 2014-01-08 08:36:43Z jelle $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 
 pkgname=cppcheck
-pkgver=1.62.1
+pkgver=1.63.1
 pkgrel=1
 pkgdesc="A tool for static C/C++ code analysis"
 arch=('i686' 'x86_64')
@@ -11,8 +11,7 @@ license=('GPL')
 depends=('qt5-base')
 makedepends=('docbook-xsl')
 source=(https://github.com/danmar/cppcheck/archive/${pkgver}.tar.gz)
-sha1sums=('2494a603bd505cc6ae5bd67286410a66cf7996b2')
-
+sha1sums=('19ad7251603356a82dc75a836dfad9629a3d12a0')
 
 build() {
    cd "${srcdir}/${pkgname}-${pkgver}"
diff --git a/community/docker/PKGBUILD b/community/docker/PKGBUILD
index 03fbb4c64..26e4b08ba 100644
--- a/community/docker/PKGBUILD
+++ b/community/docker/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 103353 2014-01-04 01:37:48Z seblu $
+# $Id: PKGBUILD 103654 2014-01-08 20:31:31Z seblu $
 # Maintainer: Sébastien "Seblu" Luttringer
 
 pkgname=docker
-pkgver=0.7.3
+pkgver=0.7.4
 pkgrel=1
 epoch=1
 pkgdesc='Pack, ship and run any application as a lightweight container'
diff --git a/community/dunst/PKGBUILD b/community/dunst/PKGBUILD
index 88f684eec..468590807 100644
--- a/community/dunst/PKGBUILD
+++ b/community/dunst/PKGBUILD
@@ -1,20 +1,19 @@
-# $Id: PKGBUILD 88586 2013-04-20 15:35:54Z dwallace $
+# $Id: PKGBUILD 103648 2014-01-08 18:46:24Z bgyorgy $
 # Maintainer: Daniel Wallace <danielwallace at gtmanfred dot com>
 # Contributor: feuri
 
 pkgname=dunst
 pkgver=1.0.0
-pkgrel=1
-pkgdesc="a dmenu-ish notification system "
+pkgrel=2
+pkgdesc="Customizable and lightweight notification-daemon"
 arch=('i686' 'x86_64')
-url="http://knopwob.github.com/dunst"
-license=(MIT)
+url="http://www.knopwob.org/dunst/"
+license=(BSD)
 depends=(libxinerama libxss libxdg-basedir pango)
-optdepends=("libnotify: notify-send"
-            "dbus: start dunst on demand")
-makedepends=(libnotify dbus 'perl')
+makedepends=(libnotify)
 provides=(notification-daemon)
-source=("${pkgname}-${pkgver}.tar.bz2::http://www.knopwob.org/public/dunst-release/$pkgname-$pkgver.tar.bz2")
+source=("http://www.knopwob.org/public/dunst-release/$pkgname-$pkgver.tar.bz2")
+md5sums=('bb5fee3cdf6ee30f7e11b7edd35e6723')
 
 build() {
 	make -C "$srcdir/$pkgname-$pkgver" X11INC=/usr/include/X11 X11LIB=/usr/lib/X11
@@ -24,5 +23,5 @@ package() {
 	make -C "$pkgname-$pkgver" DESTDIR="${pkgdir}" PREFIX=/usr install
 	install -Dm644 "${srcdir}/$pkgname-$pkgver/LICENSE" "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }
+
 # vim:set ts=2 sw=2 et:
-md5sums=('bb5fee3cdf6ee30f7e11b7edd35e6723')
diff --git a/community/elasticsearch/PKGBUILD b/community/elasticsearch/PKGBUILD
index edcc42159..f25e85294 100644
--- a/community/elasticsearch/PKGBUILD
+++ b/community/elasticsearch/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 102806 2013-12-20 13:45:23Z mtorromeo $
+# $Id: PKGBUILD 103596 2014-01-08 09:32:01Z mtorromeo $
 # Maintainer: Massimiliano Torromeo <massimiliano.torromeo@gmail.com>
 # Contributor: Marcello "mererghost" Rocha <https://github.com/mereghost>
 # Refactored by Blaž "Speed" Hrastnik <https://github.com/archSeer>
 
 pkgname=elasticsearch
-pkgver=0.90.8
-pkgrel=2
+pkgver=0.90.9
+pkgrel=1
 pkgdesc="Distributed RESTful search engine built on top of Lucene"
 arch=('i686' 'x86_64')
 url="http://www.elasticsearch.org/"
@@ -34,7 +34,7 @@ prepare() {
     done
   done
 
-  sed 's|$ES_HOME/lib|/usr/lib/elasticsearch|g' -i bin/elasticsearch.in.sh
+  sed 's|$ES_HOME/lib|/usr/lib/elasticsearch|g' -i bin/elasticsearch.in.sh bin/plugin
 
   echo -e '\nJAVA_OPTS="$JAVA_OPTS -Des.path.conf=/etc/elasticsearch"' >> bin/elasticsearch.in.sh
 
@@ -70,6 +70,6 @@ package() {
   install -Dm644 "$srcdir/elasticsearch-tmpfile.conf" "$pkgdir/usr/lib/tmpfiles.d/elasticsearch.conf"
 }
 
-sha256sums=('4006e9aa9382f386e79a1c44a14c1aef34765eb5480fb6b29a2facf62ab3a321'
+sha256sums=('5521c4dc775c18ee4abd6cd6ad94cdc1f106d63fddd3d97cfae1ec25b3f01095'
             '09a4027780d73103c26f311c64774dcbc47b5e1d54789c1f2d9c697f518f2eeb'
             '48b5a876e14819270c85f8ca626a011e01d10a2728758ced9a4d5bcf5c1fd23f')
diff --git a/community/gdal/PKGBUILD b/community/gdal/PKGBUILD
index f1502a297..4dbdfe523 100644
--- a/community/gdal/PKGBUILD
+++ b/community/gdal/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 102765 2013-12-19 13:49:34Z fyan $
+# $Id: PKGBUILD 103623 2014-01-08 12:17:02Z bgyorgy $
 # Maintainer: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
 # Contributor: dibblethewrecker dibblethewrecker.at.jiwe.dot.org
 # Contributor: William Rea <sillywilly@gmail.com>
 
 pkgname=gdal
-pkgver=1.10.0
-pkgrel=6
+pkgver=1.10.1
+pkgrel=1
 pkgdesc="A translator library for raster geospatial data formats"
 arch=('i686' 'x86_64')
 url="http://www.gdal.org/"
 license=('custom')
-depends=('curl' 'geos' 'giflib' 'hdf5' 'libgeotiff' 'libjpeg' 'libpng' 'libtiff' 'netcdf'  'python2' 'python2-numpy' 'cfitsio' 'sqlite' 'libmariadbclient' 'postgresql-libs')
+depends=('curl' 'geos' 'giflib' 'hdf5' 'libgeotiff' 'libjpeg' 'libpng' 'libtiff' 'netcdf' 'poppler' 'python2' 'python2-numpy' 'cfitsio' 'sqlite' 'libmariadbclient' 'postgresql-libs')
 makedepends=('perl' 'swig' 'chrpath')
 optdepends=('postgresql: postgresql database support'
             'mariadb: mariadb database support'
@@ -19,7 +19,7 @@ optdepends=('postgresql: postgresql database support'
 changelog=$pkgname.changelog
 source=(http://download.osgeo.org/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz
         gdal-1.5.1-python-install.patch)
-sha256sums=('1a9ca12bcc3a55f66bcd6654d5ff12eeddb3a26b622dd7c8872febb4f5a97487'
+sha256sums=('9984f0314c0bd831eb59fb646c2bc5e13cf1378be4f51499045166cbe62be6ea'
             '55a0a961b2d1caddf80f18b6763a96690b0b6443fbd5a0c89e29503ded3bcea6')
 
 build() {
@@ -39,7 +39,7 @@ build() {
 
   ./configure --prefix=/usr --with-netcdf --with-libtiff --with-sqlite3 \
               --with-geotiff --with-mysql --with-python --without-libtool --with-curl \
-              --with-hdf5 --with-perl --with-geos --with-png
+              --with-hdf5 --with-perl --with-geos --with-png --with-poppler
 
 # workaround for bug #13646
   sed -i 's/PY_HAVE_SETUPTOOLS=1/PY_HAVE_SETUPTOOLS=/g' ./GDALmake.opt
diff --git a/community/julius/PKGBUILD b/community/julius/PKGBUILD
new file mode 100644
index 000000000..8e14904d7
--- /dev/null
+++ b/community/julius/PKGBUILD
@@ -0,0 +1,56 @@
+# $Id: PKGBUILD 103609 2014-01-08 10:39:22Z 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
+pkgrel=1
+pkgdesc="A high-performance, two-pass large vocabulary continuous speech recognition decoder software"
+arch=("i686" "x86_64")
+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")
+
+prepare() {
+  cd "${srcdir}/${pkgname}-${pkgver}"
+  
+  # replace /lib/cpp with /usr/bin/cpp since Arch Linux doesn't have /lib/cpp anymore
+  sed -i "s|/lib/cpp|/usr/bin/cpp|g" "julius/configure"
+  sed -i "s|/lib/cpp|/usr/bin/cpp|g" "jcontrol/configure"
+  sed -i "s|/lib/cpp|/usr/bin/cpp|g" "libjulius/configure"
+  sed -i "s|/lib/cpp|/usr/bin/cpp|g" "gramtools/configure"
+  sed -i "s|/lib/cpp|/usr/bin/cpp|g" "libsent/configure"
+  sed -i "s|/lib/cpp|/usr/bin/cpp|g" "configure"
+  
+  # Add -02 to CPPFLAGS to prevent issue with -D_FORTIFY_SOURCE=2
+  CPPFLAGS="$CPPFLAGS -O2"
+}
+
+build() {
+  cd "${srcdir}/${pkgname}-${pkgver}/"
+  ./configure \
+    --prefix="/usr/" \
+    --mandir='${prefix}/share/man' \
+    --enable-words-int \
+    --enable-msd \
+    --enable-gmm-vad \
+    --enable-decoder-vad \
+    --enable-power-reject \
+    --enable-wpair
+  make
+}
+
+package() {
+  cd "${srcdir}/${pkgname}-${pkgver}/"
+  
+  make prefix="${pkgdir}/usr" install
+  install -D "LICENSE.txt" "${pkgdir}/usr/share/licenses/julius/LICENSE"
+  # remove empty lib directory
+  rm -r "${pkgdir}/usr/lib"
+}
+
+# vim:set ts=2 sw=2 et:
diff --git a/community/lxappearance/PKGBUILD b/community/lxappearance/PKGBUILD
index 120f419df..2d4a6aab9 100644
--- a/community/lxappearance/PKGBUILD
+++ b/community/lxappearance/PKGBUILD
@@ -1,10 +1,10 @@
-#$Id: PKGBUILD 103242 2013-12-31 06:53:57Z bpiotrowski $
+#$Id: PKGBUILD 103634 2014-01-08 14:31:20Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <bpiotrowski@archlinux.org>
 # Contributor: Angel Velasquez <angvp@archlinux.org>  
 # Contributor: Geoffroy Carrier <geoffroy.carrier@koon.fr>
 
 pkgname=lxappearance
-pkgver=0.5.4
+pkgver=0.5.5
 pkgrel=1
 pkgdesc='Feature-rich GTK+ theme switcher of the LXDE Desktop'
 arch=('i686' 'x86_64')
@@ -14,7 +14,7 @@ groups=('lxde')
 depends=('gtk2' 'dbus-glib')
 makedepends=('intltool')
 source=(http://downloads.sourceforge.net/sourceforge/lxde/$pkgname-$pkgver.tar.xz)
-md5sums=('c7b8c18368f757a8a60f21cb46d7d9b3')
+md5sums=('a67113681d9d0a6d936289909aed5782')
 
 build() {
   cd $pkgname-$pkgver
diff --git a/community/lz4/01-fix-include.patch b/community/lz4/01-fix-include.patch
deleted file mode 100644
index 960fb3674..000000000
--- a/community/lz4/01-fix-include.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/programs/Makefile	2014-01-07 22:03:45.197517981 +0100
-+++ b/programs/Makefile	2014-01-07 22:03:43.126477362 +0100
-@@ -34,7 +34,7 @@
- DESTDIR=
- PREFIX=/usr
- CC=gcc
--CFLAGS+= -I. -std=c99 -Wall -W -Wundef -DLZ4_VERSION=\"$(RELEASE)\"
-+CFLAGS+= -I.. -std=c99 -Wall -W -Wundef -DLZ4_VERSION=\"$(RELEASE)\"
- 
- BINDIR=$(PREFIX)/bin
- MANDIR=$(PREFIX)/share/man/man1
diff --git a/community/lz4/PKGBUILD b/community/lz4/PKGBUILD
index 748e8a8bd..ecd472fe6 100644
--- a/community/lz4/PKGBUILD
+++ b/community/lz4/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 103558 2014-01-07 22:36:39Z seblu $
+# $Id: PKGBUILD 103658 2014-01-08 20:57:01Z seblu $
 # Maintainer: Sébastien Luttringer
 
 # Contacted by mail, author use svn commit as release version.
 # He only push tested release code into svn and support using revision as version
 
 pkgname=lz4
-pkgver=111
+pkgver=112
 pkgrel=1
 pkgdesc='Very fast lossless compression algorithm'
 arch=('i686' 'x86_64')
@@ -13,20 +13,12 @@ url='https://code.google.com/p/lz4/'
 license=('GPL2')
 makedepends=('svn')
 depends=('glibc')
-source=("$pkgname::svn+http://lz4.googlecode.com/svn/trunk/#revision=$pkgver"
-        '01-fix-include.patch')
-md5sums=('SKIP'
-         '522618c085bb30924f540c3b2c18a7e4')
-
-prepare() {
-  patch -d $pkgname -p 1 < 01-fix-include.patch
-}
+source=("$pkgname::svn+http://lz4.googlecode.com/svn/trunk/#revision=$pkgver")
+md5sums=('SKIP')
 
 build() {
   cd $pkgname
   make
-  cd programs
-  make
 }
 
 package() {
diff --git a/community/mixxx/PKGBUILD b/community/mixxx/PKGBUILD
index de26827ae..e53fb324b 100644
--- a/community/mixxx/PKGBUILD
+++ b/community/mixxx/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 92429 2013-06-05 10:08:34Z lfleischer $
+# $Id: PKGBUILD 103651 2014-01-08 19:58:08Z bgyorgy $
 # Maintainer: Lukas Fleischer <archlinux at cryptocrack dot de>
 # Contributor: Ali H. Caliskan <ali.h.caliskan AT gmail DOT com>
 # Contributor: Ryan Coyner <rcoyner@gmail.com>
@@ -6,20 +6,20 @@
 
 pkgname=mixxx
 pkgver=1.11.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Free, open source software for digital DJ'ing."
 arch=('i686' 'x86_64')
 url='http://www.mixxx.org'
 license=('GPL')
 depends=('fftw' 'libid3tag' 'libmad' 'libogg' 'libshout' 'libsndfile' 'portaudio' 'portmidi'
-         'taglib' 'qtwebkit' 'vamp-plugin-sdk' 'libusbx' 'protobuf')
+         'taglib' 'qtwebkit' 'vamp-plugin-sdk' 'libusbx' 'protobuf' 'faad2' 'libmp4v2')
 makedepends=('mesa' 'scons' 'libshout' 'glu')
 source=("http://downloads.mixxx.org/${pkgname}-${pkgver}/${pkgname}-${pkgver}-src.tar.gz")
 md5sums=('89ee8ba60824919d8dd1194287bda259')
 
 build() {
   cd "${srcdir}/${pkgname}-${pkgver}"
-  scons qtdir=/usr/lib/qt4 prefix=/usr
+  scons qtdir=/usr/lib/qt4 prefix=/usr faad=1
 }
 
 package() {
diff --git a/community/noise/PKGBUILD b/community/noise/PKGBUILD
index e34eb3062..02dc4a26e 100644
--- a/community/noise/PKGBUILD
+++ b/community/noise/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 99111 2013-10-24 13:13:25Z alucryd $
+# $Id: PKGBUILD 103644 2014-01-08 17:47:17Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd at gmail dot com>
 
 pkgname=noise
 pkgver=0.2.4
-pkgrel=2
+pkgrel=3
 pkgdesc="Simple, fast, and good looking music player"
 arch=('i686' 'x86_64')
 url="https://launchpad.net/noise"
diff --git a/community/openntpd/PKGBUILD b/community/openntpd/PKGBUILD
index 4eafda56d..3e7145661 100644
--- a/community/openntpd/PKGBUILD
+++ b/community/openntpd/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 91455 2013-05-22 23:28:35Z seblu $
+# $Id: PKGBUILD 103646 2014-01-08 18:14:53Z bgyorgy $
 # Maintainer: Vesa Kaihlavirta <vegai@iki.fi>
 # Contributor: Mark Rosenstand <mark@borkware.net>
 # Contributor: Giorgio Lando <patroclo7@gmail.com> (adjtimex patch)
@@ -6,7 +6,7 @@
 
 pkgname=openntpd
 pkgver=3.9p1
-pkgrel=22
+pkgrel=23
 pkgdesc='Free, easy to use implementation of the Network Time Protocol.'
 url='http://www.openntpd.org/'
 arch=('x86_64' 'i686')
@@ -47,8 +47,9 @@ package() {
   make DESTDIR="$pkgdir" install
   install -Dm644 "$srcdir/$pkgname-$pkgver/LICENCE" \
     "$pkgdir/usr/share/licenses/$pkgname/LICENCE"
-  sed -i 's/\*/0.0.0.0/' $pkgdir/etc/ntpd.conf
+  sed -i 's/\*/0.0.0.0/' "$pkgdir/etc/ntpd.conf"
 
+  install -d -o 87 "pkgdir/var/lib/ntp"
   install -Dm644 "$srcdir/openntpd.tmpfiles" "$pkgdir/usr/lib/tmpfiles.d/openntpd.conf"
   install -Dm644 "$srcdir/openntpd.service" "$pkgdir/usr/lib/systemd/system/openntpd.service"
 
diff --git a/community/prosody/PKGBUILD b/community/prosody/PKGBUILD
index ff410fe44..4a69a863a 100644
--- a/community/prosody/PKGBUILD
+++ b/community/prosody/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 97026 2013-09-10 15:54:28Z spupykin $
+# $Id: PKGBUILD 103602 2014-01-08 10:35:14Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Dwayne Bent <dbb@dbb.io>
 # Contributor: Paul-Sebastian Manole <brokenthorn@gmail.com>
 # Contributor: Timothée Ravier <tim@siosm.fr>
 
 pkgname=prosody
-pkgver=0.9.1
+pkgver=0.9.2
 pkgrel=1
 pkgdesc="Lightweight and extensible Jabber/XMPP server written in Lua"
 arch=('i686' 'x86_64')
@@ -34,6 +34,18 @@ sha256sums=('6cdea6fd6027bec621f7995709ca825a29aa5e066b321bfbb7785925c9f32cd5'
             'db37b1b6bcd648f264164c5db5e754fc077671c74df6079c101384e146f4d6da'
             '3f5cc5db2cfe74c4edf91f60e692e04c3504025e893d0880114d52728a2c4bc4'
             '16fbfb54bf21bb73ce9d9acacb60d47f237c35e842c5a00f1153f72f0d2f7f6b')
+sha256sums=('a2df64d23b7853a9f03126750d33b98193c93b8331b2622d9ebf1fe54f8feb2d'
+            'SKIP'
+            '5a2466b73bd069fb73be97a4e23b24e4c8dd1adb7db871cb8f5ab4094c1f967f'
+            'db37b1b6bcd648f264164c5db5e754fc077671c74df6079c101384e146f4d6da'
+            '3f5cc5db2cfe74c4edf91f60e692e04c3504025e893d0880114d52728a2c4bc4'
+            '16fbfb54bf21bb73ce9d9acacb60d47f237c35e842c5a00f1153f72f0d2f7f6b')
+sha256sums=('a2df64d23b7853a9f03126750d33b98193c93b8331b2622d9ebf1fe54f8feb2d'
+            'SKIP'
+            '5a2466b73bd069fb73be97a4e23b24e4c8dd1adb7db871cb8f5ab4094c1f967f'
+            'db37b1b6bcd648f264164c5db5e754fc077671c74df6079c101384e146f4d6da'
+            '3f5cc5db2cfe74c4edf91f60e692e04c3504025e893d0880114d52728a2c4bc4'
+            '16fbfb54bf21bb73ce9d9acacb60d47f237c35e842c5a00f1153f72f0d2f7f6b')
 
 prepare() {
   cd ${pkgname}-${pkgver}
diff --git a/community/python-pillow/PKGBUILD b/community/python-pillow/PKGBUILD
index 6bc90397f..a43b9566d 100644
--- a/community/python-pillow/PKGBUILD
+++ b/community/python-pillow/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 102812 2013-12-21 01:57:46Z kkeen $
+# $Id: PKGBUILD 103590 2014-01-08 04:03:33Z kkeen $
 # Maintainer: Kyle Keen <keenerd@gmail.com>
 # Contributor: minder
 
 pkgbase=python-pillow
 pkgname=(python-pillow python2-pillow)
-pkgver=2.2.2
+pkgver=2.3.0
 pkgrel=1
 _appname=Pillow
 _py2basever=2.7
@@ -15,7 +15,7 @@ url="http://python-imaging.github.io/"
 license=('BSD')
 makedepends=('python-setuptools' 'python2-setuptools' 'lcms' 'libwebp' 'tk' 'sane')
 source=("http://pypi.python.org/packages/source/P/$_appname/$_appname-$pkgver.zip")
-md5sums=('6a76a16f6db45744ff2e9327bf0608b4')
+md5sums=('56b6614499aacb7d6b5983c4914daea7')
 
 build() {
   cd "$srcdir"
diff --git a/community/python-psycopg2/PKGBUILD b/community/python-psycopg2/PKGBUILD
index 2cdabb5cf..35181419b 100644
--- a/community/python-psycopg2/PKGBUILD
+++ b/community/python-psycopg2/PKGBUILD
@@ -1,11 +1,11 @@
-# $Id: PKGBUILD 93151 2013-06-26 09:20:17Z spupykin $
+# $Id: PKGBUILD 103604 2014-01-08 10:35:30Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
 # Maintainer: Douglas Soares de Andrade <dsa@aur.archlinux.org>
 
 pkgbase=python-psycopg2
 pkgname=('python-psycopg2' 'python2-psycopg2')
-pkgver=2.5.1
+pkgver=2.5.2
 pkgrel=1
 pkgdesc="A PostgreSQL database adapter for the Python programming language."
 arch=('i686' 'x86_64')
@@ -13,7 +13,7 @@ url="http://initd.org/psycopg/"
 license=('LGPL3')
 makedepends=('python2' 'python' 'postgresql-libs>=8.4.1')
 source=(http://initd.org/psycopg/tarballs/PSYCOPG-2-5/psycopg2-$pkgver.tar.gz)
-md5sums=('1b433f83d50d1bc61e09026e906d84c7')
+md5sums=('53d81793fbab8fee6e732a0425d50047')
 
 build() {
   cd "$srcdir/psycopg2-$pkgver"
diff --git a/community/python-sqlalchemy/PKGBUILD b/community/python-sqlalchemy/PKGBUILD
index f8a0e4a28..58c27c81f 100644
--- a/community/python-sqlalchemy/PKGBUILD
+++ b/community/python-sqlalchemy/PKGBUILD
@@ -1,17 +1,17 @@
-# $Id: PKGBUILD 103389 2014-01-05 15:48:26Z jelle $ 
+# $Id: PKGBUILD 103642 2014-01-08 17:00:04Z bgyorgy $ 
 # Maintainer: Angel Velasquez <angvp@archlinux.org> 
 # Contributor: Sébastien Luttringer <seblu@aur.archlinux.org>
 
 pkgbase=python-sqlalchemy
 pkgname=('python-sqlalchemy' 'python2-sqlalchemy')
-pkgver=0.9.0
+pkgver=0.9.1
 pkgrel=1
 arch=('i686' 'x86_64') # python2 package contain .so
 url="http://www.sqlalchemy.org/"
 license=('custom: MIT')
 makedepends=('python' 'python2' 'python-setuptools' 'python2-setuptools' 'python-nose' 'python2-nose')
 source=("https://pypi.python.org/packages/source/S/SQLAlchemy/SQLAlchemy-$pkgver.tar.gz")
-md5sums=('acfd77b6ca71678237b1066a3fda05b0')
+md5sums=('4d59a03e56ee37fc7b53ff1ef5f4310d')
 
 build() {
   cp -a SQLAlchemy-$pkgver SQLAlchemy2-$pkgver
@@ -31,6 +31,7 @@ check() {
 package_python-sqlalchemy() {
   pkgdesc='Python SQL toolkit and Object Relational Mapper'
   depends=('python')
+  optdepends=('python-psycopg2: connect to PostgreSQL database')
 
   cd SQLAlchemy-${pkgver}
   python setup.py install --root="${pkgdir}"
@@ -41,6 +42,7 @@ package_python-sqlalchemy() {
 package_python2-sqlalchemy() {
   pkgdesc='Python 2 SQL toolkit and Object Relational Mapper'
   depends=('python2')
+  optdepends=('python2-psycopg2: connect to PostgreSQL database')
 
   cd SQLAlchemy2-$pkgver
   python2 setup.py install --root="$pkgdir"
diff --git a/community/python2-greenlet/PKGBUILD b/community/python2-greenlet/PKGBUILD
index ea9605f52..5341f84a3 100644
--- a/community/python2-greenlet/PKGBUILD
+++ b/community/python2-greenlet/PKGBUILD
@@ -4,9 +4,9 @@
 # Contributor: Ralf Schmitt <ralf@systemexit.de>
 
 pkgname=python2-greenlet
-pkgver=0.4.1
+pkgver=0.4.2
 pkgrel=1
-pkgdesc="python coroutine library"
+pkgdesc="Lightweight in-process concurrent programming"
 license=("MIT")
 url="http://pypi.python.org/pypi/greenlet"
 depends=('python2')
@@ -14,14 +14,14 @@ source=(http://pypi.python.org/packages/source/g/greenlet/greenlet-$pkgver.zip)
 arch=('i686' 'x86_64')
 
 build() {
-	cd "$srcdir/greenlet-$pkgver"
+	cd greenlet-$pkgver
 	python2 setup.py build
 }
 
 package() {
-	cd "$srcdir/greenlet-$pkgver"
+	cd greenlet-$pkgver
 	python2 setup.py install --root="$pkgdir"
 	install -Dm0644 LICENSE.PSF "$pkgdir/usr/share/licenses/$pkgname/LICENSE.PSF"
 }
 
-sha512sums=('bb33db07b8b86ba8ccec920748cfc207d27eed0b76218cf06c3b1706a1e9350be62a99a92e05c8e683a7c3ab1e232dbb46259380c7e5f2c6b140a3a96a36f8bf')
+sha512sums=('9596b740921e4a80bcb43adb725a7a4ea428dadc10ba55f8840837ba685b010c273a4a2bd62c5ba4bfdf27ce87c914a83714d762bacafb8e0a3cd7e2a9675992')
diff --git a/community/python2-imaging/PKGBUILD b/community/python2-imaging/PKGBUILD
deleted file mode 100644
index b44c571c2..000000000
--- a/community/python2-imaging/PKGBUILD
+++ /dev/null
@@ -1,54 +0,0 @@
-# $Id: PKGBUILD 83335 2013-01-29 19:26:55Z kkeen $
-# Maintainer: Kyle Keen <keenerd@gmail.com>
-# Contributor: Stéphane Gaudreault <stephane@archlinux.org>
-# Contributor: Allan McRae <allan@archlinux.org>
-# Contributor: simo <simo@archlinux.org>
-
-pkgname=python2-imaging
-pkgver=1.1.7
-pkgrel=8
-pkgdesc="PIL. Provides image processing capabilities for python"
-arch=('i686' 'x86_64')
-url="http://www.pythonware.com/products/pil/index.htm"
-license=('custom:"pil"')
-depends=('python2' 'libjpeg' 'freetype2' 'lcms') 
-makedepends=('tk' 'sane')
-optdepends=('tk: for the ImageTK module'
-            'sane: for the ImageSane module')
-provides=("pil=${pkgver}" "python-imaging=${pkgver}")
-conflicts=('pil' 'python-imaging')
-replaces=('pil' 'python-imaging')
-source=(http://effbot.org/downloads/Imaging-${pkgver}.tar.gz)
-md5sums=('fc14a54e1ce02a0225be8854bfba478e')
-
-build() {
-  cd "${srcdir}/Imaging-${pkgver}"
-
-  # FS#33452
-  export CFLAGS="$CFLAGS -fno-strict-aliasing"
-
-  python2 setup.py build_ext
-  cd Sane
-  python2 setup.py build_ext
-}
-
-package() {
-  cd "${srcdir}/Imaging-${pkgver}"
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-  
-  pushd Sane
-  python2 setup.py install --root="${pkgdir}" --optimize=1
-  popd
-  
-  install -dm755 "${pkgdir}/usr/include/python2.7/"
-  install -m644 -t "${pkgdir}/usr/include/python2.7/" libImaging/*.h 
-
-  # do not have files ending in .py in /usr/bin
-  for f in pildriver pilprint pilconvert pilfile pilfont; do
-    mv "${pkgdir}"/usr/bin/${f}{.py,}
-  done
-
-  # Install license
-  install -Dm644 "${srcdir}/Imaging-${pkgver}/README" \
-                 "${pkgdir}/usr/share/licenses/${pkgname}/README"
-}
diff --git a/community/qcad/PKGBUILD b/community/qcad/PKGBUILD
index df11349c0..d84674d90 100644
--- a/community/qcad/PKGBUILD
+++ b/community/qcad/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 102798 2013-12-20 11:28:08Z spupykin $
+# $Id: PKGBUILD 103632 2014-01-08 14:10:43Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Contributor: Stefan Husmann <stefan-husmann@t-online.de>
 # Contributor: Giovanni Scafora <linuxmania@gmail.com>
@@ -6,7 +6,7 @@
 
 pkgname=qcad
 pkgver=3.4.5.0
-pkgrel=1
+pkgrel=2
 pkgdesc="A 2D CAD package based upon Qt"
 arch=('i686' 'x86_64')
 url="http://www.ribbonsoft.com/qcad.html"
@@ -59,7 +59,7 @@ package() {
   install -Dm644 $srcdir/QCad.desktop ${pkgdir}/usr/share/applications/QCad.desktop
 
   install -dm0755 $pkgdir/usr/bin
-  echo -e '#!/bin/sh\ncd /usr/share/qcad\nLD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"/usr/share/qcad" exec /usr/share/qcad/qcad-bin "$@"' >$pkgdir/usr/bin/qcad
+  echo -e '#!/bin/sh\nLD_LIBRARY_PATH=${LD_LIBRARY_PATH:+$LD_LIBRARY_PATH:}"/usr/share/qcad" exec /usr/share/qcad/qcad-bin "$@"' >$pkgdir/usr/bin/qcad
 
   chmod 0755 $pkgdir/usr/bin/qcad
 }
diff --git a/community/rbutil/PKGBUILD b/community/rbutil/PKGBUILD
index a3a793537..83cd61e2d 100755
--- a/community/rbutil/PKGBUILD
+++ b/community/rbutil/PKGBUILD
@@ -1,20 +1,20 @@
-# $Id: PKGBUILD 96229 2013-08-22 00:02:57Z alucryd $
+# $Id: PKGBUILD 103630 2014-01-08 13:34:03Z alucryd $
 # Maintainer: Maxime Gauduin <alucryd@gmail.com>
 # Contributor: said <atvordhosbn@gmail.com>
 # Contributor: clinx <clinx.hacker@googlemail.com>
 
 pkgname=rbutil
-pkgver=1.3.1
-pkgrel=4
+pkgver=1.4.0
+pkgrel=1
 pkgdesc="Rockbox Utility"
 arch=('i686' 'x86_64')
 url="http://www.rockbox.org/twiki/bin/view/Main/RockboxUtility"
 license=("GPL")
-depends=('qt4' 'libusbx')
-makedepends=('gendesk')
+depends=('qt5-base' 'libusbx')
+makedepends=('gendesk' 'qt5-tools')
 optdepends=('speex: voice files support')
 source=("http://download.rockbox.org/${pkgname}/source/RockboxUtility-v${pkgver}-src.tar.bz2")
-sha256sums=('6c04b5c7eaad1762577908dedb9e40f5b0cee675150ae5ba844ea2c9bea294ca')
+sha256sums=('bc28a58ac1f62055a39b072e7b41a162f407a8b83172c84790568235d4637e4c')
 
 prepare() {
   gendesk -n --pkgname "${pkgname}" --pkgdesc "${pkgdesc}" --name="Rockbox Utility" --exec="RockboxUtility" --categories="Application;Utility;" --comment="Rockbox automated installer"
@@ -23,8 +23,8 @@ prepare() {
 build() {
   cd RockboxUtility-v${pkgver}/${pkgname}/rbutilqt
 
-  lrelease-qt4 rbutilqt.pro
-  qmake-qt4
+  lrelease-qt5 rbutilqt.pro
+  qmake-qt5
   make
 }
 
diff --git a/community/rbutil/rbutil.desktop b/community/rbutil/rbutil.desktop
deleted file mode 100755
index 920b6a452..000000000
--- a/community/rbutil/rbutil.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Rockbox Utility
-GenericName=Rockbox Utility
-Comment=Configure Rockbox
-Encoding=UTF-8
-Exec=rbutil
-Icon=rbutil.png
-Categories=Application;Qt;AudioVideo;Audio;
-StartupNotify=false
-Terminal=false
-Type=Application
diff --git a/community/synce-core/PKGBUILD b/community/synce-core/PKGBUILD
index 4ed45b1af..55dd9c6eb 100644
--- a/community/synce-core/PKGBUILD
+++ b/community/synce-core/PKGBUILD
@@ -1,16 +1,16 @@
-# $Id: PKGBUILD 100285 2013-11-02 08:49:32Z spupykin $
+# $Id: PKGBUILD 103618 2014-01-08 11:37:39Z spupykin $
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
 # Maintainer: Jan Was <janek.jan@gmail.com>
 
 pkgname=synce-core
 pkgver=0.17
-pkgrel=2
+pkgrel=3
 pkgdesc="provide a means of communication with a Windows CE device - libraries"
 arch=('i686' 'x86_64')
 url="http://synce.sourceforge.net/"
 license=('GPL')
 depends=('dbus-glib' 'udev' 'python2')
-makedepends=('dhclient')
+makedepends=('dhclient' 'pyrex')
 provides=('synce-libsynce' 'synce-librapi')
 replaces=('synce-libsynce' 'synce-librapi')
 conflicts=('synce-libsynce' 'synce-librapi')
diff --git a/community/umurmur/PKGBUILD b/community/umurmur/PKGBUILD
index 6af6b8cb3..c191297ef 100644
--- a/community/umurmur/PKGBUILD
+++ b/community/umurmur/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 101363 2013-11-23 15:13:00Z bpiotrowski $
+# $Id: PKGBUILD 103638 2014-01-08 15:18:58Z bpiotrowski $
 # Maintainer:  Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
 # Contributor: Robert Knauer <robert@privatdemail.net>
 # Contributor: xav <xav at ethertricks dot net>
 
 pkgname=umurmur
-pkgver=0.2.13
+pkgver=0.2.14
 pkgrel=1
 pkgdesc='Minimalistic Mumble server'
 arch=('i686' 'x86_64')
@@ -15,7 +15,7 @@ install=$pkgname.install
 backup=('etc/umurmur/umurmur.conf')
 source=(http://umurmur.googlecode.com/files/umurmur-$pkgver.tar.gz
         umurmur.service)
-md5sums=('04d0ea7a90b7858c16df26317b318bf4'
+md5sums=('e22121b4b91f4c9de43f858f6defa0b0'
          'd9d556e4ffa77e193fb40ce508804720')
 
 build() {
diff --git a/core/glibc/PKGBUILD b/core/glibc/PKGBUILD
index 3deb8cd15..0f823bd59 100644
--- a/core/glibc/PKGBUILD
+++ b/core/glibc/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 201557 2013-12-15 06:41:32Z allan $
+# $Id: PKGBUILD 203338 2014-01-08 11:40:24Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 
 # toolchain build order: linux-api-headers->glibc->binutils->gcc->binutils->glibc
@@ -8,7 +8,7 @@
 
 pkgname=glibc
 pkgver=2.18
-pkgrel=11
+pkgrel=12
 pkgdesc="GNU C Library"
 arch=('i686' 'x86_64')
 url="http://www.gnu.org/software/libc"
@@ -31,6 +31,7 @@ source=(http://ftp.gnu.org/gnu/libc/${pkgname}-${pkgver}.tar.xz{,.sig}
         glibc-2.18-getaddrinfo-assertion.patch
         glibc-2.18-scanf-parse-0e-0.patch
         glibc-2.18-strstr-hackfix.patch
+        glibc-2.18-xattr-compat-hack.patch
         nscd.service
         nscd.tmpfiles
         locale.gen.txt
@@ -46,6 +47,7 @@ md5sums=('88fbbceafee809e82efd52efa1e3c58f'
          'd4d86add33f22125777e0ecff06bc9bb'
          '01d19fe9b2aea489cf5651530e0369f2'
          '4441f6dfe7d75ced1fa75e54dd21d36e'
+         '7ca96c68a37f2a4ab91792bfa0160a24'
          'd5fab2cd3abea65aa5ae696ea4a47d6b'
          'da662ca76e7c8d7efbc7986ab7acea2d'
          '07ac979b6ab5eeb778d55f041529d623'
@@ -80,6 +82,9 @@ prepare() {
 
   # hack fix for strstr issues on x86
   patch -p1 -i $srcdir/glibc-2.18-strstr-hackfix.patch
+  
+  # hack fix for {linux,sys}/xattr.h incompatibility
+  patch -p1 -i $srcdir/glibc-2.18-xattr-compat-hack.patch
 
   mkdir ${srcdir}/glibc-build
 }
@@ -161,8 +166,9 @@ package() {
     ${srcdir}/glibc-${pkgver}/localedata/SUPPORTED >> ${pkgdir}/etc/locale.gen
 
   # remove the static libraries that have a shared counterpart
-  # note: keep libc, libdl, libm, libpthread for binutils testsuite
-  rm $pkgdir/usr/lib/lib{anl,BrokenLocale,crypt,nsl,resolv,rt,util}.a
+  # libc, libdl, libm and libpthread are required for toolchain testsuites
+  # in addition libcrypt appears widely required
+  rm $pkgdir/usr/lib/lib{anl,BrokenLocale,nsl,resolv,rt,util}.a
 
   # Do not strip the following files for improved debugging support
   # ("improved" as in not breaking gdb and valgrind...):
diff --git a/core/glibc/glibc-2.18-xattr-compat-hack.patch b/core/glibc/glibc-2.18-xattr-compat-hack.patch
new file mode 100644
index 000000000..7486922d7
--- /dev/null
+++ b/core/glibc/glibc-2.18-xattr-compat-hack.patch
@@ -0,0 +1,19 @@
+diff -Naur glibc-2.18-orig/misc/sys/xattr.h glibc-2.18/misc/sys/xattr.h
+--- glibc-2.18-orig/misc/sys/xattr.h	2013-08-11 08:52:55.000000000 +1000
++++ glibc-2.18/misc/sys/xattr.h	2014-01-07 15:45:50.533969040 +1000
+@@ -26,13 +26,8 @@
+ 
+ /* The following constants should be used for the fifth parameter of
+    `*setxattr'.  */
+-enum
+-{
+-  XATTR_CREATE = 1,	/* set value, fail if attr already exists.  */
+-#define XATTR_CREATE	XATTR_CREATE
+-  XATTR_REPLACE = 2	/* set value, fail if attr does not exist.  */
+-#define XATTR_REPLACE	XATTR_REPLACE
+-};
++#define XATTR_CREATE	1
++#define XATTR_REPLACE	2
+ 
+ /* Set the attribute NAME of the file pointed to by PATH to VALUE (which
+    is SIZE bytes long).  Return 0 on success, -1 for errors.  */
diff --git a/core/libcap/PKGBUILD b/core/libcap/PKGBUILD
index e12d59559..0ea9b736d 100644
--- a/core/libcap/PKGBUILD
+++ b/core/libcap/PKGBUILD
@@ -1,31 +1,24 @@
-#$Id: PKGBUILD 203064 2014-01-03 09:18:41Z allan $
+#$Id: PKGBUILD 203339 2014-01-08 11:40:25Z allan $
 # Maintainer: Allan McRae <allan@archlinux.org>
 # Contributor: Hugo Doria <hugo@archlinux.org>
 
 pkgname=libcap
-pkgver=2.23
-pkgrel=2
+pkgver=2.24
+pkgrel=1
 pkgdesc="POSIX 1003.1e capabilities"
 arch=('i686' 'x86_64')
 url="http://sites.google.com/site/fullycapable/"
 license=('GPL2')
 depends=('glibc' 'attr')
 options=('!staticlibs')
-source=(https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.23.tar.xz
-        libcap-2.23-header.patch)
-md5sums=('09a185e4b0aa8a81a51c1e4d0eba7db0'
-         '945984c4bf5e601c24a7c80f001fb2c6')
+source=(https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-${pkgver}.tar.xz)
+md5sums=('d43ab9f680435a7fff35b4ace8d45b80')
 
 prepare() {
   cd ${srcdir}/${pkgname}-${pkgver}
 
   # install into /usr/bin
   sed -i "/SBINDIR/s#sbin#bin#" Make.Rules
-
-  # fix header path issues
-  patch -p1 -i $srcdir/libcap-2.23-header.patch
-  # and fix the build with that patch
-  sed -i "s#uapi/##" libcap/Makefile
 }
 
 build() {
diff --git a/core/libcap/libcap-2.23-header.patch b/core/libcap/libcap-2.23-header.patch
deleted file mode 100644
index 74c45e0a4..000000000
--- a/core/libcap/libcap-2.23-header.patch
+++ /dev/null
@@ -1,350 +0,0 @@
-From c3290668646b767058e55b29f7b8f4be4af2e660 Mon Sep 17 00:00:00 2001
-From: Andrew G Morgan <morgan@kernel.org>
-Date: Thu, 02 Jan 2014 01:56:31 +0000
-Subject: Fix up the uapi/linux include scheme.
-
-In adopting this uapi header file (without kernel internals), I previously
-messed up on the apparent location of the files. Thanks to Tom Gundersen for
-the clarification. Also, delete the non-uapi copies of things since they
-are no longer needed to build the library and tools.
-
-Signed-off-by: Andrew G Morgan <morgan@kernel.org>
----
-diff --git a/Make.Rules b/Make.Rules
-index 9ca6c89..5b58c59 100644
---- a/Make.Rules
-+++ b/Make.Rules
-@@ -45,8 +45,8 @@ MINOR=23
- 
- # Compilation specifics
- 
--KERNEL_HEADERS := $(topdir)/libcap/include
--IPATH += -fPIC -I$(topdir)/libcap/include -I$(KERNEL_HEADERS)
-+KERNEL_HEADERS := $(topdir)/libcap/include/uapi
-+IPATH += -fPIC -I$(KERNEL_HEADERS) -I$(topdir)/libcap/include
- 
- CC := gcc
- CFLAGS := -O2 -D_LARGEFILE64_SOURCE -D_FILE_OFFSET_BITS=64
-diff --git a/libcap/include/linux/capability.h b/libcap/include/linux/capability.h
-deleted file mode 100644
-index a6ee1f9..0000000
---- a/libcap/include/linux/capability.h
-+++ /dev/null
-@@ -1,219 +0,0 @@
--/*
-- * This is <linux/capability.h>
-- *
-- * Andrew G. Morgan <morgan@kernel.org>
-- * Alexander Kjeldaas <astor@guardian.no>
-- * with help from Aleph1, Roland Buresund and Andrew Main.
-- *
-- * See here for the libcap library ("POSIX draft" compliance):
-- *
-- * ftp://www.kernel.org/pub/linux/libs/security/linux-privs/kernel-2.6/
-- */
--#ifndef _LINUX_CAPABILITY_H
--#define _LINUX_CAPABILITY_H
--
--#include <uapi/linux/capability.h>
--
--
--#define _KERNEL_CAPABILITY_VERSION _LINUX_CAPABILITY_VERSION_3
--#define _KERNEL_CAPABILITY_U32S    _LINUX_CAPABILITY_U32S_3
--
--extern int file_caps_enabled;
--
--typedef struct kernel_cap_struct {
--	__u32 cap[_KERNEL_CAPABILITY_U32S];
--} kernel_cap_t;
--
--/* exact same as vfs_cap_data but in cpu endian and always filled completely */
--struct cpu_vfs_cap_data {
--	__u32 magic_etc;
--	kernel_cap_t permitted;
--	kernel_cap_t inheritable;
--};
--
--#define _USER_CAP_HEADER_SIZE  (sizeof(struct __user_cap_header_struct))
--#define _KERNEL_CAP_T_SIZE     (sizeof(kernel_cap_t))
--
--
--struct file;
--struct inode;
--struct dentry;
--struct user_namespace;
--
--struct user_namespace *current_user_ns(void);
--
--extern const kernel_cap_t __cap_empty_set;
--extern const kernel_cap_t __cap_init_eff_set;
--
--/*
-- * Internal kernel functions only
-- */
--
--#define CAP_FOR_EACH_U32(__capi)  \
--	for (__capi = 0; __capi < _KERNEL_CAPABILITY_U32S; ++__capi)
--
--/*
-- * CAP_FS_MASK and CAP_NFSD_MASKS:
-- *
-- * The fs mask is all the privileges that fsuid==0 historically meant.
-- * At one time in the past, that included CAP_MKNOD and CAP_LINUX_IMMUTABLE.
-- *
-- * It has never meant setting security.* and trusted.* xattrs.
-- *
-- * We could also define fsmask as follows:
-- *   1. CAP_FS_MASK is the privilege to bypass all fs-related DAC permissions
-- *   2. The security.* and trusted.* xattrs are fs-related MAC permissions
-- */
--
--# define CAP_FS_MASK_B0     (CAP_TO_MASK(CAP_CHOWN)		\
--			    | CAP_TO_MASK(CAP_MKNOD)		\
--			    | CAP_TO_MASK(CAP_DAC_OVERRIDE)	\
--			    | CAP_TO_MASK(CAP_DAC_READ_SEARCH)	\
--			    | CAP_TO_MASK(CAP_FOWNER)		\
--			    | CAP_TO_MASK(CAP_FSETID))
--
--# define CAP_FS_MASK_B1     (CAP_TO_MASK(CAP_MAC_OVERRIDE))
--
--#if _KERNEL_CAPABILITY_U32S != 2
--# error Fix up hand-coded capability macro initializers
--#else /* HAND-CODED capability initializers */
--
--# define CAP_EMPTY_SET    ((kernel_cap_t){{ 0, 0 }})
--# define CAP_FULL_SET     ((kernel_cap_t){{ ~0, ~0 }})
--# define CAP_FS_SET       ((kernel_cap_t){{ CAP_FS_MASK_B0 \
--				    | CAP_TO_MASK(CAP_LINUX_IMMUTABLE), \
--				    CAP_FS_MASK_B1 } })
--# define CAP_NFSD_SET     ((kernel_cap_t){{ CAP_FS_MASK_B0 \
--				    | CAP_TO_MASK(CAP_SYS_RESOURCE), \
--				    CAP_FS_MASK_B1 } })
--
--#endif /* _KERNEL_CAPABILITY_U32S != 2 */
--
--# define cap_clear(c)         do { (c) = __cap_empty_set; } while (0)
--
--#define cap_raise(c, flag)  ((c).cap[CAP_TO_INDEX(flag)] |= CAP_TO_MASK(flag))
--#define cap_lower(c, flag)  ((c).cap[CAP_TO_INDEX(flag)] &= ~CAP_TO_MASK(flag))
--#define cap_raised(c, flag) ((c).cap[CAP_TO_INDEX(flag)] & CAP_TO_MASK(flag))
--
--#define CAP_BOP_ALL(c, a, b, OP)                                    \
--do {                                                                \
--	unsigned __capi;                                            \
--	CAP_FOR_EACH_U32(__capi) {                                  \
--		c.cap[__capi] = a.cap[__capi] OP b.cap[__capi];     \
--	}                                                           \
--} while (0)
--
--#define CAP_UOP_ALL(c, a, OP)                                       \
--do {                                                                \
--	unsigned __capi;                                            \
--	CAP_FOR_EACH_U32(__capi) {                                  \
--		c.cap[__capi] = OP a.cap[__capi];                   \
--	}                                                           \
--} while (0)
--
--static inline kernel_cap_t cap_combine(const kernel_cap_t a,
--				       const kernel_cap_t b)
--{
--	kernel_cap_t dest;
--	CAP_BOP_ALL(dest, a, b, |);
--	return dest;
--}
--
--static inline kernel_cap_t cap_intersect(const kernel_cap_t a,
--					 const kernel_cap_t b)
--{
--	kernel_cap_t dest;
--	CAP_BOP_ALL(dest, a, b, &);
--	return dest;
--}
--
--static inline kernel_cap_t cap_drop(const kernel_cap_t a,
--				    const kernel_cap_t drop)
--{
--	kernel_cap_t dest;
--	CAP_BOP_ALL(dest, a, drop, &~);
--	return dest;
--}
--
--static inline kernel_cap_t cap_invert(const kernel_cap_t c)
--{
--	kernel_cap_t dest;
--	CAP_UOP_ALL(dest, c, ~);
--	return dest;
--}
--
--static inline int cap_isclear(const kernel_cap_t a)
--{
--	unsigned __capi;
--	CAP_FOR_EACH_U32(__capi) {
--		if (a.cap[__capi] != 0)
--			return 0;
--	}
--	return 1;
--}
--
--/*
-- * Check if "a" is a subset of "set".
-- * return 1 if ALL of the capabilities in "a" are also in "set"
-- *	cap_issubset(0101, 1111) will return 1
-- * return 0 if ANY of the capabilities in "a" are not in "set"
-- *	cap_issubset(1111, 0101) will return 0
-- */
--static inline int cap_issubset(const kernel_cap_t a, const kernel_cap_t set)
--{
--	kernel_cap_t dest;
--	dest = cap_drop(a, set);
--	return cap_isclear(dest);
--}
--
--/* Used to decide between falling back on the old suser() or fsuser(). */
--
--static inline int cap_is_fs_cap(int cap)
--{
--	const kernel_cap_t __cap_fs_set = CAP_FS_SET;
--	return !!(CAP_TO_MASK(cap) & __cap_fs_set.cap[CAP_TO_INDEX(cap)]);
--}
--
--static inline kernel_cap_t cap_drop_fs_set(const kernel_cap_t a)
--{
--	const kernel_cap_t __cap_fs_set = CAP_FS_SET;
--	return cap_drop(a, __cap_fs_set);
--}
--
--static inline kernel_cap_t cap_raise_fs_set(const kernel_cap_t a,
--					    const kernel_cap_t permitted)
--{
--	const kernel_cap_t __cap_fs_set = CAP_FS_SET;
--	return cap_combine(a,
--			   cap_intersect(permitted, __cap_fs_set));
--}
--
--static inline kernel_cap_t cap_drop_nfsd_set(const kernel_cap_t a)
--{
--	const kernel_cap_t __cap_fs_set = CAP_NFSD_SET;
--	return cap_drop(a, __cap_fs_set);
--}
--
--static inline kernel_cap_t cap_raise_nfsd_set(const kernel_cap_t a,
--					      const kernel_cap_t permitted)
--{
--	const kernel_cap_t __cap_nfsd_set = CAP_NFSD_SET;
--	return cap_combine(a,
--			   cap_intersect(permitted, __cap_nfsd_set));
--}
--
--extern bool has_capability(struct task_struct *t, int cap);
--extern bool has_ns_capability(struct task_struct *t,
--			      struct user_namespace *ns, int cap);
--extern bool has_capability_noaudit(struct task_struct *t, int cap);
--extern bool has_ns_capability_noaudit(struct task_struct *t,
--				      struct user_namespace *ns, int cap);
--extern bool capable(int cap);
--extern bool ns_capable(struct user_namespace *ns, int cap);
--extern bool inode_capable(const struct inode *inode, int cap);
--extern bool file_ns_capable(const struct file *file, struct user_namespace *ns, int cap);
--
--/* audit system wants to get cap info from files as well */
--extern int get_vfs_caps_from_disk(const struct dentry *dentry, struct cpu_vfs_cap_data *cpu_caps);
--
--#endif /* !_LINUX_CAPABILITY_H */
-diff --git a/libcap/include/sys/capability.h b/libcap/include/sys/capability.h
-index 56fc7fd..64ac50e 100644
---- a/libcap/include/sys/capability.h
-+++ b/libcap/include/sys/capability.h
-@@ -26,7 +26,7 @@ extern "C" {
- #ifndef __user
- #define __user
- #endif
--#include <uapi/linux/capability.h>
-+#include <linux/capability.h>
- #include <linux/xattr.h>
- 
- /*
-diff --git a/libcap/include/linux/prctl.h b/libcap/include/uapi/linux/prctl.h
-index a3baeb2..289760f 100644
---- a/libcap/include/linux/prctl.h
-+++ b/libcap/include/uapi/linux/prctl.h
-@@ -102,4 +102,51 @@
- 
- #define PR_MCE_KILL_GET 34
- 
-+/*
-+ * Tune up process memory map specifics.
-+ */
-+#define PR_SET_MM		35
-+# define PR_SET_MM_START_CODE		1
-+# define PR_SET_MM_END_CODE		2
-+# define PR_SET_MM_START_DATA		3
-+# define PR_SET_MM_END_DATA		4
-+# define PR_SET_MM_START_STACK		5
-+# define PR_SET_MM_START_BRK		6
-+# define PR_SET_MM_BRK			7
-+# define PR_SET_MM_ARG_START		8
-+# define PR_SET_MM_ARG_END		9
-+# define PR_SET_MM_ENV_START		10
-+# define PR_SET_MM_ENV_END		11
-+# define PR_SET_MM_AUXV			12
-+# define PR_SET_MM_EXE_FILE		13
-+
-+/*
-+ * Set specific pid that is allowed to ptrace the current task.
-+ * A value of 0 mean "no process".
-+ */
-+#define PR_SET_PTRACER 0x59616d61
-+# define PR_SET_PTRACER_ANY ((unsigned long)-1)
-+
-+#define PR_SET_CHILD_SUBREAPER	36
-+#define PR_GET_CHILD_SUBREAPER	37
-+
-+/*
-+ * If no_new_privs is set, then operations that grant new privileges (i.e.
-+ * execve) will either fail or not grant them.  This affects suid/sgid,
-+ * file capabilities, and LSMs.
-+ *
-+ * Operations that merely manipulate or drop existing privileges (setresuid,
-+ * capset, etc.) will still work.  Drop those privileges if you want them gone.
-+ *
-+ * Changing LSM security domain is considered a new privilege.  So, for example,
-+ * asking selinux for a specific new context (e.g. with runcon) will result
-+ * in execve returning -EPERM.
-+ *
-+ * See Documentation/prctl/no_new_privs.txt for more details.
-+ */
-+#define PR_SET_NO_NEW_PRIVS	38
-+#define PR_GET_NO_NEW_PRIVS	39
-+
-+#define PR_GET_TID_ADDRESS	40
-+
- #endif /* _LINUX_PRCTL_H */
-diff --git a/libcap/include/linux/securebits.h b/libcap/include/uapi/linux/securebits.h
-index 3340617..985aac9 100644
---- a/libcap/include/linux/securebits.h
-+++ b/libcap/include/uapi/linux/securebits.h
-@@ -1,14 +1,11 @@
--#ifndef _LINUX_SECUREBITS_H
--#define _LINUX_SECUREBITS_H 1
-+#ifndef _UAPI_LINUX_SECUREBITS_H
-+#define _UAPI_LINUX_SECUREBITS_H
- 
- /* Each securesetting is implemented using two bits. One bit specifies
-    whether the setting is on or off. The other bit specify whether the
-    setting is locked or not. A setting which is locked cannot be
-    changed from user-level. */
- #define issecure_mask(X)	(1 << (X))
--#ifdef __KERNEL__
--#define issecure(X)		(issecure_mask(X) & current_cred_xxx(securebits))
--#endif
- 
- #define SECUREBITS_DEFAULT 0x00000000
- 
-@@ -51,4 +48,4 @@
- 				 issecure_mask(SECURE_KEEP_CAPS))
- #define SECURE_ALL_LOCKS	(SECURE_ALL_BITS << 1)
- 
--#endif /* !_LINUX_SECUREBITS_H */
-+#endif /* _UAPI_LINUX_SECUREBITS_H */
---
-cgit v0.9.2
diff --git a/extra/amule/PKGBUILD b/extra/amule/PKGBUILD
index 3be84143d..947b841d3 100644
--- a/extra/amule/PKGBUILD
+++ b/extra/amule/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 203013 2013-12-31 17:11:59Z giovanni $
+# $Id: PKGBUILD 203346 2014-01-08 13:17:00Z giovanni $
 # Maintainer: Giovanni Scafora <giovanni@archlinux.org>
 # Contributor: Henrik Ronellenfitsch <searinox@web.de>
 # Contributor: Alessio Sergi <sergi.alessio {at} gmail.com>
@@ -6,7 +6,7 @@
 # Contributor: Anatol Pomozov <anatol.pomozov@gmail.com>
 
 pkgname=amule
-pkgver=10829
+pkgver=10830
 pkgrel=1
 pkgdesc="An eMule-like client for ed2k p2p network"
 arch=('i686' 'x86_64')
@@ -17,7 +17,7 @@ install=amule.install
 source=("http://amule.sourceforge.net/tarballs/aMule-SVN-r${pkgver}.tar.bz2"
         'amuled.systemd'
         'amuleweb.systemd')
-md5sums=('843693d449b81899267d6756ce55a6e0'
+md5sums=('8ba572ed1c87909ee24652d96f93dc40'
          '59772c41860e238f1c822feb8ca8d47f'
          '05975c5d94bfc41fddb894d98b1115d5')
 
diff --git a/extra/calligra/PKGBUILD b/extra/calligra/PKGBUILD
index 0045ad4b5..176d85456 100644
--- a/extra/calligra/PKGBUILD
+++ b/extra/calligra/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 200653 2013-12-01 09:50:18Z andyrtr $
+# $Id: PKGBUILD 203352 2014-01-08 14:45:06Z lcarlier $
 # Maintainer: Andrea Scarpino <andrea@archlinux.org>
 # Contributor: Ronald van Haren <ronald.archlinux.org>
 
@@ -18,13 +18,13 @@ pkgname=('calligra-braindump'
          'calligra-stage'
          'calligra-words')
 pkgver=2.7.5
-pkgrel=2
+pkgrel=3
 arch=('i686' 'x86_64')
 url='http://www.calligra-suite.org/'
 license=('FDL1.2' 'GPL2' 'LGPL')
 makedepends=('cmake' 'automoc4' 'boost' 'kdepimlibs' 'eigen2' 'kdeedu-marble'
              'lcms2' 'libmariadbclient' 'freetds' 'xbase' 'libwpg' 'opencolorio'
-             'libwps' 'gsl' 'glew' 'fftw' 'opengtl' 'poppler-qt' 'libkdcraw'
+             'libwps' 'gsl' 'glew' 'fftw' 'poppler-qt' 'libkdcraw'
              'openjpeg' 'kdegraphics-okular' 'pstoedit' 'vc')
 groups=('calligra')
 source=("http://download.kde.org/stable/${pkgbase}-${pkgver}/${pkgbase}-${pkgver}.tar.xz")
@@ -148,7 +148,7 @@ package_calligra-stage() {
 package_calligra-krita() {
   pkgdesc="Edit and paint images"
   depends=('calligra-plugins' 'kdebase-runtime' 'eigen2'
-           'opencolorio' 'libkdcraw' 'fftw' 'glew' 'opengtl')
+           'opencolorio' 'libkdcraw' 'fftw' 'glew')
   conflicts=('koffice-krita' 'calligra-krita-doc')
   replaces=('koffice-krita' 'calligra-krita-doc')
   install=calligra-krita.install
diff --git a/extra/clamav/PKGBUILD b/extra/clamav/PKGBUILD
index 4b7a8e00a..affde1857 100644
--- a/extra/clamav/PKGBUILD
+++ b/extra/clamav/PKGBUILD
@@ -1,36 +1,36 @@
-# $Id: PKGBUILD 197893 2013-10-30 11:31:17Z allan $
+# $Id: PKGBUILD 203336 2014-01-08 07:29:58Z bisson $
 # Contributor: Dale Blount <dale@archlinux.org>
 # Contributor: Gregor Ibic <gregor.ibic@intelicom.si>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 
 pkgname=clamav
 pkgver=0.98
-pkgrel=1
+pkgrel=2
 pkgdesc='Anti-virus toolkit for Unix'
 url='http://www.clamav.net/'
 license=('GPL')
 arch=('i686' 'x86_64')
-depends=('bzip2' 'libltdl')
-backup=('etc/logrotate.d/clamav')
+depends=('bzip2' 'libltdl' 'gcc-libs')
 source=("http://downloads.sourceforge.net/project/${pkgname}/${pkgname}/${pkgver}/${pkgname}-${pkgver}.tar.gz"
-        'service'
-        'service.fresh'
         'logrotate'
         'tmpfiles.d'
-        'config.patch')
+        'clamd.conf'
+        'freshclam.conf'
+        'clamd.service'
+        'freshclamd.service')
 sha1sums=('1e6a7284721387646c713a8d32fa8b5a897985db'
-          'b6ac0c5de1e5b41232b10d4f84e86201c370eaeb'
-          'cda9a087e5593992150cb456e34c5f6f589aca82'
           'bb488a56b0f6a0760446cde89c1e3321e2717b78'
           'a224ea9b4d0f4f196827347d54bed51e11c197ea'
-          '00dfadd93d11186793cb1161745f9dd7370beb99')
+          '887f624eb305f2446f55d8339e2972ad0cfe2b79'
+          'b767837d0279ad30b92c314cb762b73e5ad0415e'
+          'b6ac0c5de1e5b41232b10d4f84e86201c370eaeb'
+          'cda9a087e5593992150cb456e34c5f6f589aca82')
 
-install=install
+backup=('etc/clamav/clamd.conf'
+        'etc/clamav/freshclam.conf'
+        'etc/logrotate.d/clamav')
 
-prepare() {
-	cd "${srcdir}/${pkgname}-${pkgver}"
-	patch -p1 -i ../config.patch
-}
+install=install
 
 build() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
@@ -48,8 +48,10 @@ package() {
 	cd "${srcdir}/${pkgname}-${pkgver}"
 	make DESTDIR="${pkgdir}" install
 
-	install -Dm644 ../service.fresh "${pkgdir}"/usr/lib/systemd/system/freshclamd.service
-	install -Dm644 ../service "${pkgdir}"/usr/lib/systemd/system/clamd.service
+	install -Dm644 ../clamd.conf "${pkgdir}"/etc/clamav/clamd.conf
+	install -Dm644 ../freshclam.conf "${pkgdir}"/etc/clamav/freshclam.conf
+	install -Dm644 ../freshclamd.service "${pkgdir}"/usr/lib/systemd/system/freshclamd.service
+	install -Dm644 ../clamd.service "${pkgdir}"/usr/lib/systemd/system/clamd.service
 	install -Dm644 ../tmpfiles.d "${pkgdir}"/usr/lib/tmpfiles.d/clamav.conf
 	install -Dm644 ../logrotate "${pkgdir}"/etc/logrotate.d/clamav
 
diff --git a/extra/clamav/clamd.conf b/extra/clamav/clamd.conf
new file mode 100644
index 000000000..d231ec9f0
--- /dev/null
+++ b/extra/clamav/clamd.conf
@@ -0,0 +1,6 @@
+LogFile /var/log/clamav/clamd.log
+LogTime yes
+PidFile /run/clamav/clamd.pid
+TemporaryDirectory /tmp
+LocalSocket /var/lib/clamav/clamd.sock
+User clamav
diff --git a/extra/clamav/service b/extra/clamav/clamd.service
index 86608c40e..86608c40e 100644
--- a/extra/clamav/service
+++ b/extra/clamav/clamd.service
diff --git a/extra/clamav/config.patch b/extra/clamav/config.patch
deleted file mode 100644
index 0b552b3f9..000000000
--- a/extra/clamav/config.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -arU 0 old/etc/clamd.conf.sample new/etc/clamd.conf.sample
---- old/etc/clamd.conf.sample	2010-12-02 19:31:21.773357389 +0100
-+++ new/etc/clamd.conf.sample	2010-12-02 19:31:45.873357389 +0100
-@@ -14 +14 @@
--#LogFile /tmp/clamd.log
-+LogFile /var/log/clamav/clamd.log
-@@ -34 +34 @@
--#LogTime yes
-+LogTime yes
-@@ -61 +61 @@
--#PidFile /var/run/clamd.pid
-+PidFile /run/clamav/clamd.pid
-@@ -65 +65 @@
--#TemporaryDirectory /var/tmp
-+TemporaryDirectory /tmp
-@@ -80 +80 @@
--#LocalSocket /tmp/clamd.socket
-+LocalSocket /var/lib/clamav/clamd.sock
-@@ -190 +190 @@
--#User clamav
-+User clamav
-diff -arU 0 old/etc/freshclam.conf.sample new/etc/freshclam.conf.sample
---- old/etc/freshclam.conf.sample	2010-12-02 19:31:21.773357389 +0100
-+++ new/etc/freshclam.conf.sample	2010-12-02 19:31:51.190024057 +0100
-@@ -17 +17 @@
--#UpdateLogFile /var/log/freshclam.log
-+UpdateLogFile /var/log/clamav/freshclam.log
-@@ -121 +121 @@
--#NotifyClamd /path/to/clamd.conf
-+NotifyClamd /etc/clamav/clamd.conf
diff --git a/extra/clamav/freshclam.conf b/extra/clamav/freshclam.conf
new file mode 100644
index 000000000..db513fd3e
--- /dev/null
+++ b/extra/clamav/freshclam.conf
@@ -0,0 +1,3 @@
+UpdateLogFile /var/log/clamav/freshclam.log
+DatabaseMirror database.clamav.net
+NotifyClamd /etc/clamav/clamd.conf
diff --git a/extra/clamav/service.fresh b/extra/clamav/freshclamd.service
index a0a72c2e6..a0a72c2e6 100644
--- a/extra/clamav/service.fresh
+++ b/extra/clamav/freshclamd.service
diff --git a/extra/enlightenment16/PKGBUILD b/extra/enlightenment16/PKGBUILD
index 467f168f7..2e20fd922 100644
--- a/extra/enlightenment16/PKGBUILD
+++ b/extra/enlightenment16/PKGBUILD
@@ -1,18 +1,18 @@
-# $Id: PKGBUILD 201529 2013-12-13 21:18:56Z ronald $
+# $Id: PKGBUILD 203364 2014-01-08 20:08:26Z ronald $
 # Maintainer: Eric Bélanger <eric@archlinux.org>
 
 pkgname=enlightenment16
 _pkgname=enlightenment
 pkgver=1.0.13
 _themever=1.0.1
-pkgrel=3
+pkgrel=4
 pkgdesc="A fast, flexible, and very extensible Window Manager"
 arch=('i686' 'x86_64')
 url="http://www.enlightenment.org"
 license=('BSD' 'custom')
 depends=('libxinerama' 'imlib2' 'perl' 'pango' 'libxcomposite' \
          'libxrandr' 'libpulse')
-replaces=('enlightenment<=1.0.13')
+replaces=('enlightenment>=1.0.13')
 source=(http://downloads.sourceforge.net/sourceforge/${_pkgname}/e16-${pkgver}.tar.gz \
         http://downloads.sourceforge.net/enlightenment/e16-themes-${_themever}.tar.gz)
 sha1sums=('bcb74385fb6d0732f735f27264ae02b539d136c9'
diff --git a/extra/graphicsmagick/PKGBUILD b/extra/graphicsmagick/PKGBUILD
index 09b123e8e..ab01cf9e2 100644
--- a/extra/graphicsmagick/PKGBUILD
+++ b/extra/graphicsmagick/PKGBUILD
@@ -1,4 +1,4 @@
-# $Id: PKGBUILD 203038 2014-01-02 10:14:56Z bisson $
+# $Id: PKGBUILD 203337 2014-01-08 07:32:11Z bisson $
 # Maintainer: Ronald van Haren <ronald.archlinux.org>
 # Maintainer: Gaetan Bisson <bisson@archlinux.org>
 # Contributor: Jaroslav Lichtblau <dragonlord@aur.archlinux.org>
@@ -6,7 +6,7 @@
 
 pkgname=graphicsmagick
 pkgver=1.3.19
-pkgrel=1
+pkgrel=2
 pkgdesc='Image processing system'
 url='http://www.graphicsmagick.org/'
 arch=('i686' 'x86_64')
@@ -32,8 +32,7 @@ build() {
 		--with-modules \
 		--with-perl \
 		--with-gs-font-dir=/usr/share/fonts/Type1 \
-		--with-quantum-depth=32 \
-		--with-openmp \
+		--with-quantum-depth=16 \
 		--with-threads
 	make
 }
diff --git a/extra/libdrm/PKGBUILD b/extra/libdrm/PKGBUILD
index 917431975..e5c9232ed 100644
--- a/extra/libdrm/PKGBUILD
+++ b/extra/libdrm/PKGBUILD
@@ -1,8 +1,8 @@
-# $Id: PKGBUILD 200740 2013-12-03 19:25:26Z lcarlier $
+# $Id: PKGBUILD 203374 2014-01-08 20:56:58Z lcarlier $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=libdrm
-pkgver=2.4.50
+pkgver=2.4.51
 pkgrel=1
 pkgdesc="Userspace interface to kernel DRM services"
 arch=(i686 x86_64)
@@ -14,7 +14,7 @@ replaces=('libdrm-new' 'libdrm-nouveau')
 url="http://dri.freedesktop.org/"
 source=(http://dri.freedesktop.org/$pkgname/$pkgname-$pkgver.tar.bz2
         COPYING)
-sha256sums=('3823d24cda800c2cd36995e01830b890edb8fb1bebf97d5ea4318b8c3933b045'
+sha256sums=('0bb75284ff56e1188cd2d0721f7cb8830aafcea5c6ca72dfd7b947ea652b951c'
             '9631d4f694952e3e6ae5a05534c2e93e994e47d3413677a3a00e45c8cef6db93')
 
 build() {
diff --git a/extra/librsvg/PKGBUILD b/extra/librsvg/PKGBUILD
index 59c078568..35829b988 100644
--- a/extra/librsvg/PKGBUILD
+++ b/extra/librsvg/PKGBUILD
@@ -1,15 +1,15 @@
-# $Id: PKGBUILD 199931 2013-11-19 18:03:47Z heftig $
+# $Id: PKGBUILD 203350 2014-01-08 14:05:06Z heftig $
 # Maintainer: Jan de Groot <jgc@archlinux.org>
 
 pkgname=librsvg
 pkgver=2.40.1
-pkgrel=1
+pkgrel=3
 epoch=1
 pkgdesc="A SVG viewing library"
 arch=(i686 x86_64)
 license=('LGPL')
 depends=('gdk-pixbuf2' 'pango' 'libcroco')
-makedepends=('intltool' 'gtk3' 'gobject-introspection')
+makedepends=('intltool' 'gtk3' 'gobject-introspection' 'vala')
 optdepends=('gtk3: for rsvg-view-3')
 options=('!emptydirs')
 url="https://live.gnome.org/LibRsvg"
@@ -19,7 +19,7 @@ sha256sums=('8813b4fe776d5e7acbce28bacbaed30ccb0cec3734eb3632c711a16ebe2961d7')
 
 build() {
   cd $pkgname-$pkgver
-  ./configure --prefix=/usr --disable-static
+  ./configure --prefix=/usr --disable-static --enable-vala
   make
 }
 
diff --git a/extra/nasm/PKGBUILD b/extra/nasm/PKGBUILD
index 8ef22a31f..9d653f380 100644
--- a/extra/nasm/PKGBUILD
+++ b/extra/nasm/PKGBUILD
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD 192097 2013-08-05 20:37:17Z eric $
+# $Id: PKGBUILD 203305 2014-01-07 23:23:24Z eric $
 # Maintainer: Stéphane Gaudreault <stephane@archlinux.org>
 # Contributor: Aaron Griffin <aaron@archlinux.org>
 
 pkgname=nasm
-pkgver=2.10.09
+pkgver=2.11
 pkgrel=1
 pkgdesc="An 80x86 assembler designed for portability and modularity"
 arch=('i686' 'x86_64')
@@ -12,7 +12,7 @@ license=('BSD')
 depends=('glibc')
 install=nasm.install
 source=(http://www.nasm.us/pub/nasm/releasebuilds/${pkgver}/${pkgname}-${pkgver}.tar.xz)
-sha1sums=('062dd7315b307870917e708a96b6862481cefc54')
+sha1sums=('7cc2568ce804fa17d972d159f161adc3f6d25750')
 
 build() {
   cd ${pkgname}-${pkgver}
diff --git a/extra/opengtl/PKGBUILD b/extra/opengtl/PKGBUILD
deleted file mode 100644
index 8d4402ab9..000000000
--- a/extra/opengtl/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 188593 2013-06-16 17:21:06Z foutrelis $
-# Maintainer:
-# Contributor: Ronald van Haren <ronald.archlinux.org>
-# Contributor: Andries Radu <admiral0@live.it>
-
-pkgname=opengtl
-pkgver=0.9.18
-pkgrel=3
-pkgdesc="A set of libraries for using and integrating transformation algorithms (such as filter or color conversion) in graphics applications"
-url="http://www.opengtl.org"
-arch=('i686' 'x86_64')
-license=('GPL')
-depends=('gcc-libs' 'llvm-libs')
-makedepends=('cmake' 'libpng' 'llvm')
-optdepends=('libpng: for using the png extension')
-source=(http://download.opengtl.org/OpenGTL-$pkgver.tar.bz2
-        opengtl-0.9.18-llvm-3.3.patch
-        opengtl-0.9.18-memcpy.patch)
-sha256sums=('f094b3d2a1a60519975bb3badc05e704f2b93c7a3d2cb753041f2ff27cfcd9f8'
-            'c43418bc039660ae86cb86b8b8175342793cb1361c699faa9b6342bc896e3d6c'
-            '357cc2e538bbaaffe7d58956959d8a7fbae09741d4a87488a5a8c51ec645d23a')
-
-prepare() {
-  mkdir build
-
-  # Fix build with LLVM 3.3 (patch from Fedora)
-  patch -d OpenGTL-$pkgver -Np1 -i "$srcdir/opengtl-0.9.18-llvm-3.3.patch"
-
-  # Fix build with libpng 1.6
-  patch -d OpenGTL-$pkgver -Np1 -i "$srcdir/opengtl-0.9.18-memcpy.patch"
-}
-
-build() {
-  cd "$srcdir/build"
-  cmake ../OpenGTL-$pkgver \
-    -DCMAKE_INSTALL_PREFIX=/usr \
-    -DCMAKE_BUILD_TYPE=Release \
-    -DCMAKE_SKIP_RPATH=ON
-  make
-}
-
-package() {
-  cd "$srcdir/build"
-  make DESTDIR="$pkgdir" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/extra/opengtl/opengtl-0.9.18-llvm-3.3.patch b/extra/opengtl/opengtl-0.9.18-llvm-3.3.patch
deleted file mode 100644
index 80280979f..000000000
--- a/extra/opengtl/opengtl-0.9.18-llvm-3.3.patch
+++ /dev/null
@@ -1,732 +0,0 @@
-diff -up OpenGTL-0.9.18/CMakeLists.txt.jx OpenGTL-0.9.18/CMakeLists.txt
---- OpenGTL-0.9.18/CMakeLists.txt.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/CMakeLists.txt	2013-05-08 15:39:25.090057193 -0400
-@@ -78,8 +78,8 @@ else(MSVC)
-   FIND_LLVM_LIBS( ${LLVM_CONFIG_EXECUTABLE} "native bitwriter linker bitreader jit interpreter support ipo" LLVM_LIBS LLVM_NATIVE_OBJECTS )
- endif(MSVC)
- 
--if( NOT MSVC AND NOT (LLVM_VERSION STREQUAL "3.1" OR LLVM_VERSION STREQUAL "3.0" OR LLVM_VERSION STREQUAL "3.2svn"  OR LLVM_VERSION STREQUAL "3.2" ) ) # There is no way with MSVC to know the llvm version
--  message(FATAL_ERROR "LLVM 3.0 or 3.1 or 3.2 is required.")
-+if( NOT MSVC AND NOT (LLVM_VERSION STREQUAL "3.3svn" OR LLVM_VERSION STREQUAL "3.3" ) ) # There is no way with MSVC to know the llvm version
-+  message(FATAL_ERROR "LLVM 3.3 is required.")
- endif()
- 
- if(MSVC)
-diff -up OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/Compiler.cpp.jx OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/Compiler.cpp
---- OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/Compiler.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/Compiler.cpp	2013-05-08 15:39:25.091057197 -0400
-@@ -27,10 +27,10 @@
- #include <climits>
- 
- // LLVM
--#include <llvm/InstrTypes.h>
-+#include <llvm/IR/InstrTypes.h>
- // #include <llvm/Linker.h>
--#include <llvm/DerivedTypes.h>
--#include <llvm/Module.h>
-+#include <llvm/IR/DerivedTypes.h>
-+#include <llvm/IR/Module.h>
- // #include <llvm/Transforms/Utils/Cloning.h>
- // Library Loader
- #ifdef LLVM_27_OR_28
-@@ -214,7 +214,7 @@ bool Compiler::compile(bool _isStandardL
-   return success;
- }
- 
--#include <llvm/ValueSymbolTable.h>
-+#include <llvm/IR/ValueSymbolTable.h>
- 
- bool Compiler::importModule(const GTLCore::String& name)
- {
-diff -up OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/ParserNG.cpp.jx OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/ParserNG.cpp
---- OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/ParserNG.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenCTL/OpenCTL/compiler/ParserNG.cpp	2013-05-08 15:39:25.091057197 -0400
-@@ -19,9 +19,9 @@
- 
- #include "ParserNG.h"
- 
--#include <llvm/Constants.h>
--#include <llvm/DerivedTypes.h>
--#include <llvm/Type.h>
-+#include <llvm/IR/Constants.h>
-+#include <llvm/IR/DerivedTypes.h>
-+#include <llvm/IR/Type.h>
- 
- #include <GTLCore/LLVMBackend/CodeGenerator_p.h>
- #include <GTLCore/CompilationMessage.h>
-diff -up OpenGTL-0.9.18/OpenCTL/OpenCTL/Module.cpp.jx OpenGTL-0.9.18/OpenCTL/OpenCTL/Module.cpp
---- OpenGTL-0.9.18/OpenCTL/OpenCTL/Module.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenCTL/OpenCTL/Module.cpp	2013-05-08 15:39:25.091057197 -0400
-@@ -38,7 +38,7 @@
- using namespace OpenCTL;
- 
- // LLVM
--#include <llvm/Module.h>
-+#include <llvm/IR/Module.h>
- #include <llvm/Bitcode/ReaderWriter.h>
- #ifdef LLVM_27_OR_28
- #include <llvm/System/Path.h>
-@@ -47,8 +47,7 @@ using namespace OpenCTL;
- #include <llvm/Support/Path.h>
- #include <llvm/Support/DynamicLibrary.h>
- #endif
--#include <llvm/Module.h>
--#include <llvm/LLVMContext.h>
-+#include <llvm/IR/LLVMContext.h>
- 
- struct Module::Private {
-   Private() : moduleData(0), isStandardLibrary(false) {}
-diff -up OpenGTL-0.9.18/OpenCTL/OpenCTL/Program.cpp.jx OpenGTL-0.9.18/OpenCTL/OpenCTL/Program.cpp
---- OpenGTL-0.9.18/OpenCTL/OpenCTL/Program.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenCTL/OpenCTL/Program.cpp	2013-05-08 15:39:25.091057197 -0400
-@@ -20,16 +20,16 @@
- #include "Program.h"
- 
- // LLVM
--#include <llvm/DerivedTypes.h>
--#include <llvm/Instructions.h>
--#include <llvm/Module.h>
-+#include <llvm/IR/DerivedTypes.h>
-+#include <llvm/IR/Instructions.h>
-+#include <llvm/IR/Module.h>
- #include <llvm/Transforms/Utils/Cloning.h>
- 
- // Passes
- #include <llvm/PassManager.h>
- #include <llvm/Analysis/LoopPass.h>
- #include <llvm/Analysis/Verifier.h>
--#include <llvm/GlobalVariable.h>
-+#include <llvm/IR/GlobalVariable.h>
- 
- // GTLCore
- #include "GTLCore/Buffer.h"
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/AccessorExpression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/AccessorExpression.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/AccessorExpression.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/AccessorExpression.cpp	2013-05-08 15:39:25.092057201 -0400
-@@ -20,9 +20,9 @@
- #include "AccessorExpression.h"
- 
- #include <llvm/ADT/ArrayRef.h>
--#include <llvm/Constants.h>
--#include <llvm/Function.h>
--#include <llvm/Instructions.h>
-+#include <llvm/IR/Constants.h>
-+#include <llvm/IR/Function.h>
-+#include <llvm/IR/Instructions.h>
- 
- #include "../LLVMBackend/CodeGenerator_p.h"
- #include "../LLVMBackend/ExpressionResult_p.h"
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/BinaryExpression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/BinaryExpression.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/BinaryExpression.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/BinaryExpression.cpp	2013-05-08 15:39:25.092057201 -0400
-@@ -19,7 +19,7 @@
- 
- #include "BinaryExpression.h"
- 
--#include <llvm/Instructions.h>
-+#include <llvm/IR/Instructions.h>
- 
- #include <GTLCore/Debug.h>
- #include <GTLCore/LLVMBackend/CodeGenerator_p.h>
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/CompoundExpression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/CompoundExpression.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/CompoundExpression.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/CompoundExpression.cpp	2013-05-08 15:39:25.092057201 -0400
-@@ -19,10 +19,10 @@
- 
- #include "CompoundExpression.h"
- 
--#include <llvm/Constants.h>
--#include <llvm/DerivedTypes.h>
--#include <llvm/GlobalVariable.h>
--#include <llvm/Instructions.h>
-+#include <llvm/IR/Constants.h>
-+#include <llvm/IR/DerivedTypes.h>
-+#include <llvm/IR/GlobalVariable.h>
-+#include <llvm/IR/Instructions.h>
- 
- #include "../LLVMBackend/CodeGenerator_p.h"
- #include "../Debug.h"
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/ConstantCompoundExpression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/ConstantCompoundExpression.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/ConstantCompoundExpression.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/ConstantCompoundExpression.cpp	2013-05-08 15:39:25.092057201 -0400
-@@ -19,10 +19,10 @@
- 
- #include "ConstantCompoundExpression.h"
- 
--#include <llvm/Constants.h>
--#include <llvm/DerivedTypes.h>
--#include <llvm/GlobalVariable.h>
--#include <llvm/Instructions.h>
-+#include <llvm/IR/Constants.h>
-+#include <llvm/IR/DerivedTypes.h>
-+#include <llvm/IR/GlobalVariable.h>
-+#include <llvm/IR/Instructions.h>
- 
- #include "../LLVMBackend/CodeGenerator_p.h"
- #include "../Debug.h"
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Expression.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Expression.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Expression.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Expression.cpp	2013-05-08 15:39:25.093057205 -0400
-@@ -19,11 +19,11 @@
- 
- #include "Expression.h"
- 
--#include <llvm/Constant.h>
--#include <llvm/Constants.h>
--#include <llvm/Function.h>
--#include <llvm/GlobalVariable.h>
--#include <llvm/Instructions.h>
-+#include <llvm/IR/Constant.h>
-+#include <llvm/IR/Constants.h>
-+#include <llvm/IR/Function.h>
-+#include <llvm/IR/GlobalVariable.h>
-+#include <llvm/IR/Instructions.h>
- 
- #include "GTLCore/LLVMBackend/CodeGenerator_p.h"
- #include "GTLCore/LLVMBackend/ExpressionResult_p.h"
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/FunctionDeclaration.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/FunctionDeclaration.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/FunctionDeclaration.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/FunctionDeclaration.cpp	2013-05-08 15:39:25.093057205 -0400
-@@ -19,10 +19,10 @@
- 
- #include "FunctionDeclaration.h"
- 
--#include <llvm/DerivedTypes.h>
--#include <llvm/Function.h>
--#include <llvm/Instructions.h>
--#include <llvm/Type.h>
-+#include <llvm/IR/DerivedTypes.h>
-+#include <llvm/IR/Function.h>
-+#include <llvm/IR/Instructions.h>
-+#include <llvm/IR/Type.h>
- 
- #include <GTLCore/LLVMBackend/CodeGenerator_p.h>
- #include <GTLCore/LLVMBackend/ExpressionResult_p.h>
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/GarbageCollectionStatement.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/GarbageCollectionStatement.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/GarbageCollectionStatement.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/GarbageCollectionStatement.cpp	2013-05-08 15:39:25.093057205 -0400
-@@ -21,8 +21,8 @@
- 
- #include <stdlib.h>
- 
--#include <llvm/Constant.h>
--#include <llvm/Instructions.h>
-+#include <llvm/IR/Constant.h>
-+#include <llvm/IR/Instructions.h>
- 
- #include "../Type.h"
- #include "../LLVMBackend/CodeGenerator_p.h"
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Statement.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Statement.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Statement.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Statement.cpp	2013-05-08 15:39:25.093057205 -0400
-@@ -21,12 +21,12 @@
- 
- // LLVM
- #include <llvm/ADT/ArrayRef.h>
--#include <llvm/BasicBlock.h>
--#include <llvm/Constants.h>
--#include <llvm/Function.h>
--#include <llvm/GlobalVariable.h>
--#include <llvm/Instructions.h>
--#include <llvm/Module.h>
-+#include <llvm/IR/BasicBlock.h>
-+#include <llvm/IR/Constants.h>
-+#include <llvm/IR/Function.h>
-+#include <llvm/IR/GlobalVariable.h>
-+#include <llvm/IR/Instructions.h>
-+#include <llvm/IR/Module.h>
- 
- // GTLCore
- #include <GTLCore/LLVMBackend/CodeGenerator_p.h>
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Tree.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Tree.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Tree.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/AST/Tree.cpp	2013-05-08 15:39:25.094057209 -0400
-@@ -19,9 +19,9 @@
- 
- #include "Tree.h"
- 
--#include <llvm/Constant.h>
--#include <llvm/GlobalVariable.h>
--#include <llvm/Type.h>
-+#include <llvm/IR/Constant.h>
-+#include <llvm/IR/GlobalVariable.h>
-+#include <llvm/IR/Type.h>
- 
- #include "FunctionDeclaration.h"
- 
-@@ -37,8 +37,8 @@
- #include "GTLCore/LLVMBackend/Visitor_p.h"
- 
- #include "Expression.h"
--#include <llvm/Module.h>
--#include <llvm/DerivedTypes.h>
-+#include <llvm/IR/Module.h>
-+#include <llvm/IR/DerivedTypes.h>
- 
- using namespace GTLCore::AST;
- 
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Debug.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Debug.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/Debug.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/Debug.cpp	2013-05-08 15:39:25.094057209 -0400
-@@ -22,9 +22,9 @@
- #include <map>
- #include <fstream>
- 
--#include <llvm/Module.h>
--#include <llvm/Value.h>
--#include <llvm/Type.h>
-+#include <llvm/IR/Module.h>
-+#include <llvm/IR/Value.h>
-+#include <llvm/IR/Type.h>
- #include <llvm/Support/Path.h>
- #include <llvm/Support/raw_ostream.h>
- 
-@@ -418,9 +418,9 @@ namespace GTLCore {
- 
- #ifdef OPENGTL_ENABLE_DEBUG_OUTPUT
- 
--#include <llvm/DerivedTypes.h>
--#include <llvm/Function.h>
--#include <llvm/Type.h>
-+#include <llvm/IR/DerivedTypes.h>
-+#include <llvm/IR/Function.h>
-+#include <llvm/IR/Type.h>
- 
- void compareFunctionParameters( llvm::Value* func, const std::vector<llvm::Value*>& params  )
- {
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/FunctionCaller_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/FunctionCaller_p.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/FunctionCaller_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/FunctionCaller_p.cpp	2013-05-08 15:39:25.094057209 -0400
-@@ -21,9 +21,9 @@
- 
- #include <llvm/ExecutionEngine/GenericValue.h>
- #include <llvm/ExecutionEngine/ExecutionEngine.h>
--#include <llvm/Function.h>
--
--#include <llvm/DerivedTypes.h> // <- I don't understand why I need to include that file to be able to display llvm::Type on the standard output
-+#include <llvm/IR/Function.h>
-+#include <llvm/IR/Instructions.h>
-+#include <llvm/IR/DerivedTypes.h> // <- I don't understand why I need to include that file to be able to display llvm::Type on the standard output
- 
- #include "VirtualMachine_p.h"
- 
-@@ -35,7 +35,6 @@
- #include "LLVMBackend/GenerationContext_p.h"
- #include "ModuleData_p.h"
- #include "LLVMBackend/CodeGenerator_p.h"
--#include <llvm/Instructions.h>
- #include "Type_p.h"
- #include <GTLCore/Parameter.h>
- #include "PrimitiveTypesTraits_p.h"
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Function_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Function_p.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/Function_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/Function_p.cpp	2013-05-08 15:39:25.094057209 -0400
-@@ -21,9 +21,9 @@
- 
- #include <cstdarg>
- 
--#include <llvm/DerivedTypes.h>
--#include <llvm/Module.h>
--#include <llvm/Type.h>
-+#include <llvm/IR/DerivedTypes.h>
-+#include <llvm/IR/Module.h>
-+#include <llvm/IR/Type.h>
- 
- #include "Parameter.h"
- 
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/CodeGenerator_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/CodeGenerator_p.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/CodeGenerator_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/CodeGenerator_p.cpp	2013-05-08 15:39:25.095057213 -0400
-@@ -19,12 +19,12 @@
- 
- #include "CodeGenerator_p.h"
- 
--#include <llvm/CallingConv.h>
--#include <llvm/Constants.h>
--#include <llvm/Function.h>
--#include <llvm/Instructions.h>
--#include <llvm/Module.h>
--#include <llvm/Value.h>
-+#include <llvm/IR/CallingConv.h>
-+#include <llvm/IR/Constants.h>
-+#include <llvm/IR/Function.h>
-+#include <llvm/IR/Instructions.h>
-+#include <llvm/IR/Module.h>
-+#include <llvm/IR/Value.h>
- 
- #include "GTLCore/Debug.h"
- #include "ExpressionResult_p.h"
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ContextManager_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ContextManager_p.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ContextManager_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ContextManager_p.cpp	2013-05-08 15:39:25.095057213 -0400
-@@ -20,7 +20,7 @@
- #include "ContextManager_p.h"
- 
- #include <llvm/Support/ThreadLocal.h>
--#include <llvm/LLVMContext.h>
-+#include <llvm/IR/LLVMContext.h>
- 
- using namespace LLVMBackend;
- 
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionGenerationContext_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionGenerationContext_p.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionGenerationContext_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionGenerationContext_p.cpp	2013-05-08 15:39:25.095057213 -0400
-@@ -20,7 +20,7 @@
- #include "ExpressionGenerationContext_p.h"
- 
- #include "GTLCore/Debug.h"
--#include <llvm/BasicBlock.h>
-+#include <llvm/IR/BasicBlock.h>
- 
- #include "GTLCore/Macros_p.h"
- 
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionResult_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionResult_p.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionResult_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/ExpressionResult_p.cpp	2013-05-08 15:39:25.095057213 -0400
-@@ -19,8 +19,8 @@
- 
- #include "ExpressionResult_p.h"
- 
--#include "llvm/Constant.h"
--#include "llvm/DerivedTypes.h"
-+#include "llvm/IR/Constant.h"
-+#include "llvm/IR/DerivedTypes.h"
- 
- #include "../Type.h"
- #include "../Type_p.h"
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/GenerationContext_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/GenerationContext_p.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/GenerationContext_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/GenerationContext_p.cpp	2013-05-08 15:39:25.096057217 -0400
-@@ -22,8 +22,8 @@
- #include "GTLCore/ModuleData_p.h"
- #include "GTLCore/Debug.h"
- 
--#include "llvm/BasicBlock.h"
--#include "llvm/Function.h"
-+#include "llvm/IR/BasicBlock.h"
-+#include "llvm/IR/Function.h"
- 
- #include "GTLCore/AST/Statement.h"
- 
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/Visitor_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/Visitor_p.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/Visitor_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/LLVMBackend/Visitor_p.cpp	2013-05-08 15:39:25.096057217 -0400
-@@ -20,12 +20,12 @@
- #include "Visitor_p.h"
- 
- // LLVM
--#include <llvm/BasicBlock.h>
--#include <llvm/Constants.h>
--#include <llvm/Function.h>
--#include <llvm/Instructions.h>
--#include <llvm/Module.h>
--#include <llvm/GlobalVariable.h>
-+#include <llvm/IR/BasicBlock.h>
-+#include <llvm/IR/Constants.h>
-+#include <llvm/IR/Function.h>
-+#include <llvm/IR/Instructions.h>
-+#include <llvm/IR/Module.h>
-+#include <llvm/IR/GlobalVariable.h>
- 
- // GTLCore
- #include "CodeGenerator_p.h"
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/ModuleData_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/ModuleData_p.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/ModuleData_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/ModuleData_p.cpp	2013-05-08 15:41:21.422512114 -0400
-@@ -21,7 +21,7 @@
- 
- #include <sstream>
- 
--#include <llvm/Module.h>
-+#include <llvm/IR/Module.h>
- #include <llvm/PassManager.h>
- #include <llvm/Target/TargetMachine.h>
- #include <llvm/Analysis/Verifier.h>
-@@ -242,7 +242,7 @@ void ModuleData::doLink()
-   GTL_ASSERT( not m_llvmLinkedModule );
-   m_llvmLinkedModule = m_llvmModule;
-   m_llvmModule = llvm::CloneModule( m_llvmModule );
--  llvm::Linker linker("", m_llvmLinkedModule);
-+  llvm::Linker linker(m_llvmLinkedModule);
-   std::string errorMessage;
-   foreach( const llvm::Module* mod, m_linkModuleWith )
-   {
-@@ -270,18 +270,11 @@ void ModuleData::doLink()
-         hide.push_back(name);
-       }
-     }
--    linker.LinkInModule( clone, &errorMessage );
-+    linker.linkInModule( clone, &errorMessage );
-     
-     GTL_DEBUG("Linking error: " << errorMessage );
-     delete clone;
-   }
--  foreach( const GTLCore::String& mod, m_linkModuleWithArchives )
--  {
--    bool v = false;
--    linker.LinkInArchive( llvm::sys::Path( (const std::string&) mod), v);
--  }
--  
--  linker.releaseModule();
-   
-   // Hide symbols
-   foreach(GTLCore::String name, hide)
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Type.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Type.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/Type.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/Type.cpp	2013-05-08 15:39:25.096057217 -0400
-@@ -25,7 +25,7 @@
- 
- #include <iostream>
- 
--#include <llvm/DerivedTypes.h>
-+#include <llvm/IR/DerivedTypes.h>
- 
- #include "wrappers/StructWrap.h"
- #include "SharedPointer.h"
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Type_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Type_p.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/Type_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/Type_p.cpp	2013-05-08 15:39:25.097057221 -0400
-@@ -30,8 +30,8 @@
- 
- using namespace GTLCore;
- 
--#include <llvm/Type.h>
--#include <llvm/DerivedTypes.h>
-+#include <llvm/IR/Type.h>
-+#include <llvm/IR/DerivedTypes.h>
- 
- Type::StructDataMember::Information::~Information()
- {
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/Value_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/Value_p.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/Value_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/Value_p.cpp	2013-05-08 15:39:25.097057221 -0400
-@@ -19,8 +19,8 @@
- 
- #include "Value_p.h"
- 
--#include <llvm/DerivedTypes.h>
--#include <llvm/Type.h>
-+#include <llvm/IR/DerivedTypes.h>
-+#include <llvm/IR/Type.h>
- 
- #include "Debug.h"
- #include "Value.h"
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/VariableNG_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/VariableNG_p.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/VariableNG_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/VariableNG_p.cpp	2013-05-08 15:39:25.097057221 -0400
-@@ -19,8 +19,8 @@
- 
- #include "VariableNG_p.h"
- 
--#include <llvm/Constants.h>
--#include <llvm/Instructions.h>
-+#include <llvm/IR/Constants.h>
-+#include <llvm/IR/Instructions.h>
- 
- #include "LLVMBackend/CodeGenerator_p.h"
- #include "Debug.h"
-diff -up OpenGTL-0.9.18/OpenGTL/GTLCore/VirtualMachine_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLCore/VirtualMachine_p.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLCore/VirtualMachine_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLCore/VirtualMachine_p.cpp	2013-05-08 15:39:25.097057221 -0400
-@@ -21,10 +21,10 @@
- 
- // JIT
- #include <llvm/ExecutionEngine/ExecutionEngine.h>
--#include <llvm/Module.h>
--#include <llvm/DerivedTypes.h>
-+#include <llvm/IR/Module.h>
-+#include <llvm/IR/DerivedTypes.h>
- #include <llvm/Target/TargetOptions.h>
--#include <llvm/LLVMContext.h>
-+#include <llvm/IR/LLVMContext.h>
- #include <llvm/Support/CommandLine.h>
- #include <llvm/Support/Threading.h>
- #include <llvm/Support/ErrorHandling.h>
-@@ -48,7 +48,8 @@ struct VirtualMachine::Private {
- VirtualMachine* VirtualMachine::Private::virtualMachine = 0;
- int VirtualMachine::Private::optimLevel = 2;
- 
--void gtl_llvm_error_handler(void *user_data, const std::string& reason)
-+void gtl_llvm_error_handler(void *user_data, const std::string& reason,
-+			    bool gen_crash_diag)
- {
-   GTL_ABORT(reason);
- }
-@@ -58,11 +59,7 @@ VirtualMachine::VirtualMachine() : d(new
- {
-   d->executionEngine = 0;
-   
--#ifdef LLVM_27
--  llvm::llvm_install_error_handler(&gtl_llvm_error_handler);
--#else
--  llvm::install_fatal_error_handler(&gtl_llvm_error_handler);
--#endif
-+  llvm::install_fatal_error_handler(gtl_llvm_error_handler);
-   
-   llvm::llvm_start_multithreaded();
- 
-diff -up OpenGTL-0.9.18/OpenGTL/GTLFragment/Compiler_p.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLFragment/Compiler_p.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLFragment/Compiler_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLFragment/Compiler_p.cpp	2013-05-08 15:39:25.097057221 -0400
-@@ -19,7 +19,7 @@
- 
- #include "Compiler_p.h"
- 
--#include <llvm/Module.h>
-+#include <llvm/IR/Module.h>
- #include <llvm/PassManager.h>
- 
- #include "GTLCore/AST/Expression.h"
-diff -up OpenGTL-0.9.18/OpenGTL/GTLFragment/Library.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLFragment/Library.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLFragment/Library.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLFragment/Library.cpp	2013-05-08 15:39:25.098057225 -0400
-@@ -22,9 +22,9 @@
- 
- #include <sstream>
- 
--#include <llvm/Module.h>
-+#include <llvm/IR/Module.h>
- #include <llvm/Support/DynamicLibrary.h>
--#include <llvm/LLVMContext.h>
-+#include <llvm/IR/LLVMContext.h>
- 
- #include "GTLCore/CompilationMessage.h"
- #include "GTLCore/Function.h"
-diff -up OpenGTL-0.9.18/OpenGTL/GTLFragment/Wrapper.cpp.jx OpenGTL-0.9.18/OpenGTL/GTLFragment/Wrapper.cpp
---- OpenGTL-0.9.18/OpenGTL/GTLFragment/Wrapper.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenGTL/GTLFragment/Wrapper.cpp	2013-05-08 15:39:25.098057225 -0400
-@@ -29,7 +29,7 @@
- 
- #include "Library.h"
- #include <GTLCore/Function_p.h>
--#include <llvm/Module.h>
-+#include <llvm/IR/Module.h>
- #include <GTLCore/Type_p.h>
- 
- using namespace GTLFragment;
-diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/CodeGenerator_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/CodeGenerator_p.cpp
---- OpenGTL-0.9.18/OpenShiva/OpenShiva/CodeGenerator_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenShiva/OpenShiva/CodeGenerator_p.cpp	2013-05-08 15:39:25.098057225 -0400
-@@ -21,14 +21,14 @@
- 
- #include <vector>
- 
--#include <llvm/CallingConv.h>
--#include <llvm/Constants.h>
--#include <llvm/Constant.h>
--#include <llvm/DerivedTypes.h>
--#include <llvm/Function.h>
--#include <llvm/Instructions.h>
--#include <llvm/Module.h>
--#include <llvm/Value.h>
-+#include <llvm/IR/CallingConv.h>
-+#include <llvm/IR/Constants.h>
-+#include <llvm/IR/Constant.h>
-+#include <llvm/IR/DerivedTypes.h>
-+#include <llvm/IR/Function.h>
-+#include <llvm/IR/Instructions.h>
-+#include <llvm/IR/Module.h>
-+#include <llvm/IR/Value.h>
- 
- #include "GTLCore/LLVMBackend/CodeGenerator_p.h"
- #include "GTLCore/LLVMBackend/ExpressionResult_p.h"
-diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/ColorToPixelOverloadOperatorFactory_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/ColorToPixelOverloadOperatorFactory_p.cpp
---- OpenGTL-0.9.18/OpenShiva/OpenShiva/ColorToPixelOverloadOperatorFactory_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenShiva/OpenShiva/ColorToPixelOverloadOperatorFactory_p.cpp	2013-05-08 15:39:25.098057225 -0400
-@@ -28,13 +28,13 @@
- #include "CodeGenerator_p.h"
- #include <GTLFragment/wrappers/ColorWrap_p.h>
- #include <GTLCore/Type_p.h>
--#include <llvm/Value.h>
--#include <llvm/DerivedTypes.h>
--#include <llvm/CallingConv.h>
--#include <llvm/Module.h>
-+#include <llvm/IR/Value.h>
-+#include <llvm/IR/DerivedTypes.h>
-+#include <llvm/IR/CallingConv.h>
-+#include <llvm/IR/Module.h>
- #include <GTLCore/LLVMBackend/ExpressionGenerationContext_p.h>
- #include <GTLCore/LLVMBackend/CodeGenerator_p.h>
--#include <llvm/Instructions.h>
-+#include <llvm/IR/Instructions.h>
- #include <GTLCore/TypesManager.h>
- 
- using namespace OpenShiva;
-diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/Kernel.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/Kernel.cpp
---- OpenGTL-0.9.18/OpenShiva/OpenShiva/Kernel.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenShiva/OpenShiva/Kernel.cpp	2013-05-08 15:39:25.099057228 -0400
-@@ -22,7 +22,7 @@
- #include <sstream>
- #include <fstream>
- 
--#include <llvm/Module.h>
-+#include <llvm/IR/Module.h>
- 
- #include "GTLCore/CompilationMessage.h"
- #include "GTLCore/Function.h"
-@@ -48,7 +48,7 @@
- #include "wrappers/ImageWrap_p.h"
- #include "wrappers/RegionWrap_p.h"
- #include <GTLCore/AST/Tree.h>
--#include <llvm/DerivedTypes.h>
-+#include <llvm/IR/DerivedTypes.h>
- 
- using namespace OpenShiva;
- 
-diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelConvertExpressionFactory_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelConvertExpressionFactory_p.cpp
---- OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelConvertExpressionFactory_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelConvertExpressionFactory_p.cpp	2013-05-08 15:39:25.099057228 -0400
-@@ -19,7 +19,8 @@
- 
- #include "PixelConvertExpressionFactory_p.h"
- 
--#include <llvm/Instructions.h>
-+#include <llvm/IR/Instructions.h>
-+#include <llvm/IR/Function.h>
- 
- #include "GTLCore/Type.h"
- #include "GTLCore/AST/ConvertExpression.h"
-@@ -34,7 +35,6 @@
- #include <GTLCore/VariableNG_p.h>
- #include <GTLCore/LLVMBackend/Visitor_p.h>
- #include <GTLFragment/wrappers/ColorWrap_p.h>
--#include <llvm/Function.h>
- #include <GTLCore/Type_p.h>
- 
- using namespace OpenShiva;
-diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelVisitor_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelVisitor_p.cpp
---- OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelVisitor_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenShiva/OpenShiva/PixelVisitor_p.cpp	2013-05-08 15:39:25.099057228 -0400
-@@ -20,11 +20,11 @@
- #include "PixelVisitor_p.h"
- 
- // LLVM
--#include <llvm/Constant.h>
--#include <llvm/Constants.h>
--#include <llvm/BasicBlock.h>
--#include <llvm/Instructions.h>
--#include <llvm/Function.h>
-+#include <llvm/IR/Constant.h>
-+#include <llvm/IR/Constants.h>
-+#include <llvm/IR/BasicBlock.h>
-+#include <llvm/IR/Instructions.h>
-+#include <llvm/IR/Function.h>
- 
- #include "GTLCore/LLVMBackend/ExpressionResult_p.h"
- #include "GTLCore/LLVMBackend/ExpressionGenerationContext_p.h"
-diff -up OpenGTL-0.9.18/OpenShiva/OpenShiva/Wrapper_p.cpp.jx OpenGTL-0.9.18/OpenShiva/OpenShiva/Wrapper_p.cpp
---- OpenGTL-0.9.18/OpenShiva/OpenShiva/Wrapper_p.cpp.jx	2012-12-29 06:27:12.000000000 -0500
-+++ OpenGTL-0.9.18/OpenShiva/OpenShiva/Wrapper_p.cpp	2013-05-08 15:39:25.099057228 -0400
-@@ -22,9 +22,9 @@
- #include <map>
- #include <vector>
- 
--#include <llvm/DerivedTypes.h>
--#include <llvm/Function.h>
--#include <llvm/Module.h>
-+#include <llvm/IR/DerivedTypes.h>
-+#include <llvm/IR/Function.h>
-+#include <llvm/IR/Module.h>
- 
- #include "GTLCore/Function_p.h"
- #include "GTLCore/Macros.h"
diff --git a/extra/opengtl/opengtl-0.9.18-memcpy.patch b/extra/opengtl/opengtl-0.9.18-memcpy.patch
deleted file mode 100644
index 3e6ecd557..000000000
--- a/extra/opengtl/opengtl-0.9.18-memcpy.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff -r 99a2017746c0 Extensions/PngDC/PngDC.cpp
---- a/Extensions/PngDC/PngDC.cpp	Wed Jan 30 05:28:12 2013 +1100
-+++ b/Extensions/PngDC/PngDC.cpp	Tue Apr 16 01:59:10 2013 +1000
-@@ -20,6 +20,7 @@
- #include "PngDC.h"
- 
- #include <png.h>
-+#include <string.h>
- 
- #include <config-endian.h>
- 
diff --git a/extra/seahorse/PKGBUILD b/extra/seahorse/PKGBUILD
index 6a0f7a8f5..924f58be1 100644
--- a/extra/seahorse/PKGBUILD
+++ b/extra/seahorse/PKGBUILD
@@ -1,10 +1,10 @@
-# $Id: PKGBUILD 198425 2013-10-30 14:47:52Z allan $
+# $Id: PKGBUILD 203359 2014-01-08 18:28:24Z heftig $
 # Maintainer: Jan Alexander Steffens (heftig) <jan.steffens@gmail.com>
 # Contributor: Jan de Groot <jgc@archlinux.org>
 # Contributor: Michel Brabants <michel.linux@tiscali.be>
 
 pkgname=seahorse
-pkgver=3.10.1
+pkgver=3.10.2
 pkgrel=1
 pkgdesc="GNOME application for managing PGP keys."
 arch=(i686 x86_64)
@@ -19,7 +19,7 @@ groups=(gnome-extra)
 install=seahorse.install
 source=(http://ftp.gnome.org/pub/GNOME/sources/$pkgname/${pkgver%.*}/$pkgname-$pkgver.tar.xz
         seahorse-ssh-askpass.sh)
-sha256sums=('1df307481988c272d5648a335b2e8bb545b568a00c3f2ca2f3aa732badb46985'
+sha256sums=('89cabf19f77a55f220bc61a3b97e4db845a0980f0f1d9c66147cc9a4ced8cd16'
             '400ea9a6084acc93f1dbd4223b95622bbd48071b763063328efba00de378b68c')
 
 build() {
diff --git a/libre-testing/ath9k-htc-firmware-git/LICENSE b/libre-testing/ath9k-htc-firmware-git/LICENSE
deleted file mode 100644
index 7668bcb97..000000000
--- a/libre-testing/ath9k-htc-firmware-git/LICENSE
+++ /dev/null
@@ -1,33 +0,0 @@
-Copyright (c) 2013 Qualcomm Atheros, Inc.
-
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted (subject to the limitations in the
-disclaimer below) provided that the following conditions are met:
-
- * Redistributions of source code must retain the above copyright
-   notice, this list of conditions and the following disclaimer.
-
- * Redistributions in binary form must reproduce the above copyright
-   notice, this list of conditions and the following disclaimer in the
-   documentation and/or other materials provided with the
-   distribution.
-
- * Neither the name of Qualcomm Atheros nor the names of its
-   contributors may be used to endorse or promote products derived
-   from this software without specific prior written permission.
-
-NO EXPRESS OR IMPLIED LICENSES TO ANY PARTY'S PATENT RIGHTS ARE
-GRANTED BY THIS LICENSE.  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT
-HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED
-WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE
-LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
-CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
-SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
-BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
-WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
-OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
-IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/libre-testing/ath9k-htc-firmware-git/PKGBUILD b/libre-testing/ath9k-htc-firmware-git/PKGBUILD
deleted file mode 100644
index ceee17e13..000000000
--- a/libre-testing/ath9k-htc-firmware-git/PKGBUILD
+++ /dev/null
@@ -1,81 +0,0 @@
-# Maintainer: André Silva <emulatorman@parabola.nu>
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-
-pkgname=ath9k-htc-firmware-git
-pkgver=$(LC_ALL=C date -u +%Y%m%d)
-pkgrel=1
-pkgdesc='Free firmware files for the Qualcomm Atheros AR7010 and AR9271 USB 802.11n NICs'
-arch=('any')
-url=('http://wireless.kernel.org/en/users/Drivers/ath9k_htc')
-license=('BSD')
-makedepends=('git' 'cmake' 'xtensa-unknown-elf-binutils' 'xtensa-unknown-elf-gcc')
-conflicts=('ath9k-htc-firmware')
-provides=('ath9k-htc-firmware')
-source=("git://github.com/olerem/open-ath9k-htc-firmware"
-        #"git://github.com/qca/open-ath9k-htc-firmware"
-        'LICENSE')
-md5sums=('SKIP'
-         '5163b2711bc481c77045850610b7dd31')
-
-prepare() {
-
-  cd $srcdir/open-ath9k-htc-firmware/target_firmware
-  mkdir -p build/{k2,magpie}
-
-}
-
-build() {
-
-  cd $srcdir/open-ath9k-htc-firmware
-
-  # use suspend_fix branch to fix "ath9k_htc: Target is unresponsive"
-  git checkout suspend_fix
-
-  export CTARGET="xtensa-unknown-elf"
-  export CFLAGS="-mtext-section-literals -O2 -pipe --param=ssp-buffer-size=4"
-  export CXXFLAGS="${CFLAGS}"
-
-  cat > target_firmware/build/toolchain.cmake <<EOF
-INCLUDE(CMakeForceCompiler)
-
-SET(CMAKE_SYSTEM_PROCESSOR xtensa)
-SET(COMPILER_PREFIX "xtensa-unknown-elf")
-SET(CMAKE_FIND_ROOT_PATH /usr/xtensa-unknown-elf)
-
-CMAKE_FORCE_C_COMPILER(/usr/bin/xtensa-unknown-elf-gcc GNU)
-EOF
-
-  cd $srcdir/open-ath9k-htc-firmware/target_firmware/build/k2
-
-  cmake -DCMAKE_TOOLCHAIN_FILE=$srcdir/open-ath9k-htc-firmware/target_firmware/build/toolchain.cmake "$@" -DTARGET_K2=ON ../..
-  cd -
-
-  cd $srcdir/open-ath9k-htc-firmware/target_firmware/build/magpie
-
-  cmake -DCMAKE_TOOLCHAIN_FILE=$srcdir/open-ath9k-htc-firmware/target_firmware/build/toolchain.cmake "$@" -DTARGET_MAGPIE=ON ../..
-  cd -
-
-  cd $srcdir/open-ath9k-htc-firmware/target_firmware
-
-  make -C build/k2
-  make -C build/magpie
-
-}
-
-package() {
-
-  # create firmware folder to put the free firmware files there
-  install -d -m755 $pkgdir/usr/lib/firmware
-
-  cd $srcdir/open-ath9k-htc-firmware/target_firmware
-
-  # move firmware files to firmware folder
-  cp build/{k2,magpie}/htc_*.fw $pkgdir/usr/lib/firmware
-
-  # create license folder to put the license file there
-  install -d -m755 $pkgdir/usr/share/licenses/$pkgname
-
-  # put LICENSE to license folder
-  install -m644 $srcdir/LICENSE $pkgdir/usr/share/licenses/$pkgname
-  
-}
diff --git a/libre-testing/b43-tools-git/PKGBUILD b/libre-testing/b43-tools-git/PKGBUILD
deleted file mode 100644
index 42e331f7b..000000000
--- a/libre-testing/b43-tools-git/PKGBUILD
+++ /dev/null
@@ -1,53 +0,0 @@
-#Contributor: Konstantinos Karantias <kostis[at]gtklocker[dot]com>
-#Contributor: Jussi Timperi <jussi.timperi[at]gmail[dot]com>
-
-pkgname=b43-tools-git
-pkgver=20110214
-pkgrel=1
-pkgdesc="Tools for the Broadcom 43xx series WLAN chip."
-arch=('i686' 'x86_64' 'ppc')
-url="http://bu3sch.de/gitweb?p=b43-tools.git;a=summary"
-license=('GPL2' 'GPL3')
-depends=('python2')
-makedepends=('git' 'bison' 'flex' 'python2')
-provides=('b43-tools')
-source=()
-md5sums=()
-
-_gitroot="git://git.bu3sch.de/b43-tools.git"
-_gitname="b43-tools"
-
-build() {
-  cd "$srcdir"
-  msg "Connecting to GIT server...."
-
-  if [ -d $_gitname ] ; then
-    cd $_gitname && git pull origin
-    msg "The local files are updated."
-  else
-    git clone $_gitroot
-  fi
-
-  msg "GIT checkout done or server timeout"
-  msg "Starting make..."
-
-  rm -rf "$srcdir/$_gitname-build"
-  git clone "$srcdir/$_gitname" "$srcdir/$_gitname-build"
-  cd "$srcdir/$_gitname-build"
-
-  sed -i -e 's/\/man\//\/share\/man\//g' fwcutter/Makefile
-
-  make -C assembler
-  make -C disassembler
-  make -C fwcutter
-  make -C ssb_sprom
-}
-
-package() {
-  cd $srcdir/b43-tools-build/debug/; python2 install.py install --root "$pkgdir/"; cd ..
-
-  make -C assembler PREFIX="$pkgdir/usr/" install
-  make -C disassembler PREFIX="$pkgdir/usr/" install
-  make -C fwcutter PREFIX="$pkgdir/usr/" install
-  make -C ssb_sprom PREFIX="$pkgdir/usr/" install
-} 
diff --git a/libre-testing/icecat/PKGBUILD b/libre-testing/icecat/PKGBUILD
deleted file mode 100644
index b153ad518..000000000
--- a/libre-testing/icecat/PKGBUILD
+++ /dev/null
@@ -1,180 +0,0 @@
-# Maintainer: Márcio Silva <coadde@lavabit.com>
-# Contributor (Parabola): Luke Shumaker <lukeshu@sbcglobal.net>
-# Contributor (Parabola): fauno <fauno@kiwwwi.com.ar>
-# Contributor (Parabola): vando <facundo@esdebian.org>
-# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
-
-# Maintainer (ConnochaetOS): Henry Jensen <hjensen@connochaetos.org>
-
-# Maintainer (Arch) : Ionut Biru <ibiru@archlinux.org>
-# Contributor (Arch): Jakub Schmidtke <sjakub@gmail.com>
-
-# Contributor: Figue <ffigue at gmail>
-# Thank you very much to the older contributors:
-# Contributor: evr <evanroman at gmail>
-# Contributor: Muhammad 'MJ' Jassim <UnbreakableMJ@gmail.com>
-
-# Version Configuration ##############################################
-
-_pgo=false
-
-pkgname=icecat
-pkgver=17.0.1
-pkgrel=2
-
-######################################################################
-
-if [[ -z $pkgbase ]]; then pkgbase=$pkgname; fi
-if $_pgo; then pkgname+='-pgo'; fi
-if [ "$pkgbase" != "$pkgname" ]; then
-  provides+=("$pkgbase=$pkgver")
-  conflicts+=("$pkgbase")
-fi
-
-pkgdesc="The GNUzilla web browser, based on Mozilla Firefox."
-arch=(
-  'i686'
-  'mips64el'
-  'x86_64'
-)
-license=(
-  'GPL2'
-  'LGPL'
-  'MPL'
-)
-depends=(
-  'alsa-lib'
-  'dbus-glib'
-  'desktop-file-utils'
-  'gtk2'
-  'hicolor-icon-theme'
-  'hunspell'
-  'libevent'
-  'libnotify'
-  'libvpx'
-  'libxt'
-  'mime-types'
-  'mozilla-common'
-  'mozilla-searchplugins'
-  'nss>=3.13.3'
-  'sqlite'
-  'startup-notification'
-)
-makedepends=(
-  'autoconf2.13'
-  'diffutils'
-  'imagemagick'
-  'imake'
-  'libidl2'
-  'librsvg'
-  'libxslt'
-  'mesa'
-  'python2'
-  'unzip'
-  'wireless_tools'
-  'zip'
-)
-[[ $CARCH != mips64el ]] && makedepends+=('yasm')
-if $_pgo; then
-  makedepends+=('xorg-server-xvfb')
-  options+=(!ccache)
-fi
-optdepends=('wireless_tools: Location detection via available WiFi networks')
-url=http://www.gnu.org/software/gnuzilla/
-install=firefox.install
-options=(!emptydirs)
-source=(ftp://ftp.gnu.org/gnu/gnuzilla/${pkgver::4}/$pkgname-$pkgver.tar.gz
-	mozilla-bug-756390.patch::https://bugzilla.mozilla.org/attachment.cgi?id=629706
-        bug-xulrunner-copy-stub.patch libre.patch mozconfig.pgo
-        mozconfig $pkgbase.desktop firefox-install-dir.patch vendor.js shared-libs.patch)
-md5sums=('c88a29aa92fc41a07e777a0e63ac5f7e'
-         '78bbfc17be8ef2104699875300a22316'
-         '3009b176cc5f9b1e416b1bf7c45b064b'
-         '6e9f9c6e8c63333e708d7d9e4f4ca161'
-         'e4cd438a0b2a42dfb14bc7716e901e5f'
-         'd71509923cfede3e634756fee899e492'
-         'daa249d183fcf09942ff30db1b279f1e'
-         '150ac0fb3ac7b2114c8e8851a9e0516c'
-         '09428128596f92b46caaba5852738f8e'
-         '52e52f840a49eb1d14be1c0065b03a93')
-
-build() {
-  mv $pkgname-$pkgver mozilla-release
-  cd mozilla-release
-
-  cp ../mozconfig .mozconfig
-  if $_pgo; then cat ../mozconfig.pgo >> .mozconfig; fi
-  patch -Np1 -i ../firefox-install-dir.patch
-  patch -Np1 -i ../shared-libs.patch
-  patch -Np1 -i ../libre.patch
-  patch -Np1 -i ../bug-xulrunner-copy-stub.patch
-  patch -Np1 -i ../mozilla-bug-756390.patch
-
-  # Fix PRE_RELEASE_SUFFIX
-  sed -i '/^PRE_RELEASE_SUFFIX := ""/s/ ""//' \
-    browser/base/Makefile.in
-
-  # This is a bug, we should fix it.
-  if [[ $CARCH == mips64el ]]; then
-      # Fix MIPS N32 support.
-      sed -i 's/defined(_ABIO32)/(defined(_ABIO32) || defined(_ABIN32))/' \
-          js/src/assembler/wtf/Platform.h
-      # Disable JIT.
-      sed -ri 's/#define ENABLE_(JIT|ASSEMBLER) 1/#define ENABLE_\1 0/' \
-          js/src/assembler/wtf/Platform.h
-      sed -ri 's/ENABLE_(JIT|ASSEMBLER)=1/ENABLE_\1=0/' js/src/Makefile.in
-      echo 'ac_add_options --disable-methodjit' >> .mozconfig
-      echo 'ac_add_options --disable-tracejit' >> .mozconfig
-      echo 'ac_add_options --disable-jemalloc' >> .mozconfig
-  fi
-
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/$pkgbase"
-  export PYTHON="/usr/bin/python2"
-  export MOZ_MAKE_FLAGS="$MAKEFLAGS"
-  unset MAKEFLAGS
-
-  if $_pgo; then
-    export MOZ_PGO=1
-    export DISPLAY=:99
-    Xvfb -nolisten tcp -extension GLX -screen 0 1280x1024x24 $DISPLAY &
-  fi
-
-  _fail=0
-  make -f client.mk build || _fail=1
-
-  if $_pgo; then
-    kill $! || true
-  fi
-  return $_fail
-}
-
-package() {
-  cd mozilla-release
-  make -j1 -f client.mk DESTDIR="$pkgdir" install
-
-  install -Dm644 ../vendor.js "$pkgdir/usr/lib/$pkgbase/defaults/preferences/vendor.js"
-
-  brandingdir=browser/branding/unofficial
-  for i in 16 32 48; do
-      install -Dm644 $brandingdir/default$i.png \
-        "$pkgdir/usr/share/icons/hicolor/${i}x${i}/apps/$pkgbase.png"
-  done
-
-  install -Dm644 ../$pkgbase.desktop \
-    "$pkgdir/usr/share/applications/$pkgbase.desktop"
-
-  # Use system-provided dictionaries
-  rm -rf "$pkgdir"/usr/lib/$pkgbase/{dictionaries,hyphenation}
-  ln -s /usr/share/hunspell "$pkgdir/usr/lib/$pkgbase/dictionaries"
-  ln -s /usr/share/hyphen "$pkgdir/usr/lib/$pkgbase/hyphenation"
-  # use mozilla-searchplugins
-  rm -rf "$pkgdir"/usr/lib/$pkgbase/searchplugins
-  ln -s /usr/lib/mozilla/searchplugins "$pkgdir/usr/lib/$pkgbase/searchplugins"
-
-  # We don't want the development stuff
-  rm -r "$pkgdir"/usr/{include,lib/$pkgbase-devel,share/idl}
-
-  #workaround for now
-  #https://bugzilla.mozilla.org/show_bug.cgi?id=658850
-  ln -sf $pkgbase "$pkgdir/usr/lib/$pkgbase/$pkgbase-bin"
-}
diff --git a/libre-testing/icecat/bug-xulrunner-copy-stub.patch b/libre-testing/icecat/bug-xulrunner-copy-stub.patch
deleted file mode 100644
index 8ccf127df..000000000
--- a/libre-testing/icecat/bug-xulrunner-copy-stub.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/browser/app/Makefile.in
-+++ b/browser/app/Makefile.in
-@@ -233,7 +233,7 @@
- else
- ifdef LIBXUL_SDK
- libs::
--	cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/firefox$(BIN_SUFFIX)
-+	cp $(LIBXUL_DIST)/bin/$(XULRUNNER_STUB_NAME)$(BIN_SUFFIX) $(DIST)/bin/icecat$(BIN_SUFFIX)
- endif
- endif
- 
diff --git a/libre-testing/icecat/firefox-install-dir.patch b/libre-testing/icecat/firefox-install-dir.patch
deleted file mode 100644
index 9c115f0eb..000000000
--- a/libre-testing/icecat/firefox-install-dir.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-diff -Nur mozilla-release.orig/config/baseconfig.mk mozilla-release/config/baseconfig.mk
---- mozilla-release.orig/config/baseconfig.mk	2012-10-09 07:34:41.762092280 +0000
-+++ mozilla-release/config/baseconfig.mk	2012-10-09 07:40:53.052771576 +0000
-@@ -1,9 +1,9 @@
- INCLUDED_AUTOCONF_MK = 1
- 
--includedir := $(includedir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--idldir = $(datadir)/idl/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+includedir := $(includedir)/$(MOZ_APP_NAME)
-+idldir = $(datadir)/idl/$(MOZ_APP_NAME)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
- DIST = $(DEPTH)/dist
- 
- # We do magic with OBJ_SUFFIX in config.mk, the following ensures we don't
-diff -Nur mozilla-release.orig/js/src/config/baseconfig.mk mozilla-release/js/src/config/baseconfig.mk
---- mozilla-release.orig/js/src/config/baseconfig.mk	2012-10-09 07:34:58.411973276 +0000
-+++ mozilla-release/js/src/config/baseconfig.mk	2012-10-09 07:39:55.143186168 +0000
-@@ -1,7 +1,7 @@
- INCLUDED_AUTOCONF_MK = 1
- 
--installdir = $(libdir)/$(MOZ_APP_NAME)-$(MOZ_APP_VERSION)
--sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel-$(MOZ_APP_VERSION)
-+installdir = $(libdir)/$(MOZ_APP_NAME)
-+sdkdir = $(libdir)/$(MOZ_APP_NAME)-devel
- 
- ifneq (,$(filter /%,$(TOP_DIST)))
- DIST = $(TOP_DIST)
diff --git a/libre-testing/icecat/firefox.install b/libre-testing/icecat/firefox.install
deleted file mode 100644
index c1fe8284a..000000000
--- a/libre-testing/icecat/firefox.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
-
diff --git a/libre-testing/icecat/icecat.desktop b/libre-testing/icecat/icecat.desktop
deleted file mode 100644
index 668d5104f..000000000
--- a/libre-testing/icecat/icecat.desktop
+++ /dev/null
@@ -1,116 +0,0 @@
-[Desktop Entry]
-Name=IceCat
-GenericName=Web Browser
-GenericName[af]=Web Blaaier
-GenericName[ar]=متصفح ويب
-GenericName[az]=Veb Səyyahı
-GenericName[bg]=Браузър
-GenericName[bn]=ওয়েব ব্রাউজার
-GenericName[br]=Furcher ar Gwiad
-GenericName[bs]=WWW Preglednik
-GenericName[ca]=Fullejador web
-GenericName[cs]=WWW prohlížeč
-GenericName[cy]=Porydd Gwe
-GenericName[da]=Browser
-GenericName[de]=Web-Browser
-GenericName[el]=Περιηγητής Ιστού
-GenericName[eo]=TTT-legilo
-GenericName[es]=Navegador web
-GenericName[et]=Veebilehitseja
-GenericName[eu]=Web arakatzailea
-GenericName[fa]=مرورگر وب
-GenericName[fi]=WWW-selain
-GenericName[fo]=Alnótsfar
-GenericName[fr]=Navigateur web
-GenericName[gl]=Navegador Web
-GenericName[he]=דפדפן אינטרנט
-GenericName[hi]=वेब ब्राउज़र
-GenericName[hr]=Web preglednik
-GenericName[hu]=Webböngésző
-GenericName[is]=Vafri
-GenericName[it]=Browser Web
-GenericName[ja]=ウェブブラウザ
-GenericName[ko]=웹 브라우저
-GenericName[lo]=ເວັບບຣາວເຊີ
-GenericName[lt]=Žiniatinklio naršyklė
-GenericName[lv]=Web Pārlūks
-GenericName[mk]=Прелистувач на Интернет 
-GenericName[mn]=Веб-Хөтөч
-GenericName[nb]=Nettleser
-GenericName[nds]=Nettkieker
-GenericName[nl]=Webbrowser
-GenericName[nn]=Nettlesar
-GenericName[nso]=Seinyakisi sa Web
-GenericName[pa]=ਵੈਬ ਝਲਕਾਰਾ
-GenericName[pl]=Przeglądarka WWW
-GenericName[pt]=Navegador Web
-GenericName[pt_BR]=Navegador Web
-GenericName[ro]=Navigator de web
-GenericName[ru]=Веб-браузер
-GenericName[se]=Fierpmádatlogan
-GenericName[sk]=Webový prehliadač
-GenericName[sl]=Spletni brskalnik
-GenericName[sr]=Веб претраживач
-GenericName[sr@Latn]=Veb pretraživač
-GenericName[ss]=Ibrawuza yeWeb 
-GenericName[sv]=Webbläsare
-GenericName[ta]=வலை உலாவி
-GenericName[tg]=Тафсиргари вэб
-GenericName[th]=เว็บบราวเซอร์
-GenericName[tr]=Web Tarayıcı
-GenericName[uk]=Навігатор Тенет
-GenericName[uz]=Веб-браузер
-GenericName[ven]=Buronza ya Webu
-GenericName[vi]=Trình duyệt Web
-GenericName[wa]=Betchteu waibe
-GenericName[xh]=Umkhangeli zincwadi we Web
-GenericName[zh_CN]=网页浏览器
-GenericName[zh_TW]=網頁瀏覽器
-GenericName[zu]=Umcingi we-Web
-Comment=Browse the World Wide Web
-Comment[ar]=تصفح الشبكة العنكبوتية العالمية
-Comment[ast]=Restola pela Rede
-Comment[bn]=ইন্টারনেট ব্রাউজ করুন
-Comment[ca]=Navegueu per la web
-Comment[cs]=Prohlížení stránek World Wide Webu
-Comment[da]=Surf på internettet
-Comment[de]=Im Internet surfen
-Comment[el]=Μπορείτε να περιηγηθείτε στο διαδίκτυο (Web)
-Comment[es]=Navegue por la web
-Comment[et]=Lehitse veebi
-Comment[fa]=صفحات شبکه جهانی اینترنت را مرور نمایید
-Comment[fi]=Selaa Internetin WWW-sivuja
-Comment[fr]=Naviguer sur le Web
-Comment[gl]=Navegar pola rede
-Comment[he]=גלישה ברחבי האינטרנט
-Comment[hr]=Pretražite web
-Comment[hu]=A világháló böngészése
-Comment[it]=Esplora il web
-Comment[ja]=ウェブを閲覧します
-Comment[ko]=웹을 돌아 다닙니다
-Comment[ku]=Li torê bigere
-Comment[lt]=Naršykite internete
-Comment[nb]=Surf på nettet
-Comment[nl]=Verken het internet
-Comment[nn]=Surf på nettet
-Comment[no]=Surf på nettet
-Comment[pl]=Przeglądanie stron WWW
-Comment[pt]=Navegue na Internet
-Comment[pt_BR]=Navegue na Internet
-Comment[ro]=Navigați pe Internet
-Comment[ru]=Доступ в Интернет
-Comment[sk]=Prehliadanie internetu
-Comment[sl]=Brskajte po spletu
-Comment[sv]=Surfa på webben
-Comment[ug]=دۇنيادىكى توربەتلەرنى كۆرگىلى بولىدۇ
-Comment[uk]=Перегляд сторінок Інтернету
-Comment[vi]=Để duyệt các trang web
-Comment[zh_CN]=浏览互联网
-Comment[zh_TW]=瀏覽網際網路
-Exec=/usr/lib/icecat/icecat %u
-Icon=icecat
-Terminal=false
-Type=Application
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;
-StartupNotify=true
-Categories=Network;WebBrowser;
diff --git a/libre-testing/icecat/libre.patch b/libre-testing/icecat/libre.patch
deleted file mode 100644
index 497b8cd10..000000000
--- a/libre-testing/icecat/libre.patch
+++ /dev/null
@@ -1,108 +0,0 @@
-diff -urN a/browser/app/profile/firefox.js b/browser/app/profile/firefox.js
---- a/browser/app/profile/firefox.js
-+++ b/browser/app/profile/firefox.js
-@@ -1150,11 +1150,9 @@
- // (This is intentionally on the high side; see bug 746055.)
- pref("image.mem.max_decoded_image_kb", 256000);
- 
--// Example social provider
--pref("social.manifest.facebook", "{\"origin\":\"https://www.facebook.com\",\"name\":\"Facebook Messenger\",\"workerURL\":\"https://www.facebook.com/desktop/fbdesktop2/socialfox/fbworker.js.php\",\"iconURL\":\"data:image/x-icon;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8%2F9hAAAAX0lEQVQ4jWP4%2F%2F8%2FAyUYTFhHzjgDxP9JxGeQDSBVMxgTbUBCxer%2Fr999%2BQ8DJBuArJksA9A10s8AXIBoA0B%2BR%2FY%2FjD%2BEwoBoA1yT5v3PbdmCE8MAshhID%2FUMoDgzUYIBj0Cgi7ar4coAAAAASUVORK5CYII%3D\",\"sidebarURL\":\"https://www.facebook.com/desktop/fbdesktop2/?socialfox=true\"}");
- // Comma-separated list of nsIURI::prePaths that are allowed to activate
- // built-in social functionality.
--pref("social.activation.whitelist", "https://www.facebook.com");
-+pref("social.activation.whitelist", "");
- pref("social.sidebar.open", true);
- pref("social.sidebar.unload_timeout_ms", 10000);
- pref("social.active", false);
-diff -urN a/browser/locales/en-US/chrome/browser-region/region.properties b/browser/locales/en-US/chrome/browser-region/region.properties
---- a/browser/locales/en-US/chrome/browser-region/region.properties
-+++ b/browser/locales/en-US/chrome/browser-region/region.properties
-@@ -10,23 +10,11 @@
- browser.search.order.2=Google
- browser.search.order.3=Yahoo
- 
--# This is the default set of web based feed handlers shown in the reader
--# selection UI
--browser.contentHandlers.types.0.title=Bloglines
--browser.contentHandlers.types.0.uri=http://www.bloglines.com/login?r=/sub/%s
--browser.contentHandlers.types.1.title=My Yahoo
--browser.contentHandlers.types.1.uri=http://add.my.yahoo.com/rss?url=%s
--browser.contentHandlers.types.2.title=Google
--browser.contentHandlers.types.2.uri=http://fusion.google.com/add?feedurl=%s
--
--# Keyword URL (for location bar searches)
--keyword.URL=http://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&gfns=1&q=
--
- # URL for site-specific search engines
- # TRANSLATION NOTE: {moz:domain} and {searchTerms} are placeholders for the site
- # to be searched and the user's search query. Place them in the appropriate location
- # for your locale's URL but do not translate them.
--browser.search.siteSearchURL=https://www.google.com/search?ie=UTF-8&oe=UTF-8&sourceid=navclient&q=site%3A{moz:domain}+{searchTerms}
-+browser.search.siteSearchURL=https://duckduckgo.com/html/?q=site%3A{moz:domain}+{searchTerms}
- 
- # increment this number when anything gets changed in the list below.  This will
- # cause Firefox to re-read these prefs and inject any new handlers into the 
-@@ -34,3 +22,11 @@
- # means that it's not possible to update the name of existing handler, so 
- # don't make any spelling errors here.
- gecko.handlerService.defaultHandlersVersion=3
-+
-+# The default set of protocol handlers for irc:
-+gecko.handlerService.schemes.irc.0.name=Freenode
-+gecko.handlerService.schemes.irc.0.uriTemplate=https://webchat.freenode.net/?channels=%s
-+
-+# The default set of protocol handlers for ircs:
-+gecko.handlerService.schemes.ircs.0.name=Freenode
-+gecko.handlerService.schemes.ircs.0.uriTemplate=https://webchat.freenode.net/?channels=%s
-diff -Nur a/dom/ipc/test.xul b/dom/ipc/test.xul
---- a/dom/ipc/test.xul
-+++ b/dom/ipc/test.xul
-@@ -294,6 +294,6 @@
-                oncommand="document.getElementById('page').QueryInterface(Components.interfaces.nsIFrameLoaderOwner).frameLoader.delayRemoteDialogs = this.checked;"/>
-   </toolbar>
- 
--  <browser type="content" src="http://www.google.com/" flex="1" id="page" remote="true"/>
-+  <browser type="content" src="https://duckduckgo.com/html" flex="1" id="page" remote="true"/>
-   <label id="messageLog" value="" crop="center"/>
- </window>
-diff -Nur a/layout/ipc/test-ipcbrowser.xul b/layout/ipc/test-ipcbrowser.xul
---- a/layout/ipc/test-ipcbrowser.xul
-+++ b/layout/ipc/test-ipcbrowser.xul
-@@ -69,6 +69,6 @@
-        label="setViewportScale"/>
-   </toolbar>
- 
--  <browser type="content" src="http://www.google.com/" flex="1" id="content"
-+  <browser type="content" src="https://duckduckgo.com/html" flex="1" id="content"
-            remote="true"/>
- </window>
-diff -Nur a/browser/locales/generic/profile/bookmarks.html.in b/browser/locales/generic/profile/bookmarks.html.in
---- a/browser/locales/generic/profile/bookmarks.html.in
-+++ b/browser/locales/generic/profile/bookmarks.html.in
-@@ -11,13 +11,20 @@
-     <DT><H3 PERSONAL_TOOLBAR_FOLDER="true" ID="rdf:#$FvPhC3">@bookmarks_toolbarfolder@</H3>
- <DD>@bookmarks_toolbarfolder_description@
-     <DL><p>
--        <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/central/" ID="rdf:#$GvPhC3">@getting_started@</A>
-+        <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D" ID="rdf:#$GvPhC3">Parabola GNU/Linux-libre</A>
-     </DL><p>
--    <DT><H3 ID="rdf:#$ZvPhC3">@firefox_heading@</H3>
-+    <DT><H3 ID="rdf:#$YvPhC3">Parabola GNU/Linux-libre</H3>
-     <DL><p>
--        <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/help/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$22iCK1">@firefox_help@</A>
--        <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/customize/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$32iCK1">@firefox_customize@</A>
--        <DT><A HREF="http://www.mozilla.com/@AB_CD@/firefox/community/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$42iCK1">@firefox_community@</A>
--        <DT><A HREF="http://www.mozilla.com/@AB_CD@/about/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAAK/INwWK6QAAABl0RVh0U29mdHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAHWSURBVHjaYvz//z8DJQAggJiQOe/fv2fv7Oz8rays/N+VkfG/iYnJfyD/1+rVq7ffu3dPFpsBAAHEAHIBCJ85c8bN2Nj4vwsDw/8zQLwKiO8CcRoQu0DxqlWrdsHUwzBAAIGJmTNnPgYa9j8UqhFElwPxf2MIDeIrKSn9FwSJoRkAEEAM0DD4DzMAyPi/G+QKY4hh5WAXGf8PDQ0FGwJ22d27CjADAAIIrLmjo+MXA9R2kAHvGBA2wwx6B8W7od6CeQcggKCmCEL8bgwxYCbUIGTDVkHDBia+CuotgACCueD3TDQN75D4xmAvCoK9ARMHBzAw0AECiBHkAlC0Mdy7x9ABNA3obAZXIAa6iKEcGlMVQHwWyjYuL2d4v2cPg8vZswx7gHyAAAK7AOif7SAbOqCmn4Ha3AHFsIDtgPq/vLz8P4MSkJ2W9h8ggBjevXvHDo4FQUQg/kdypqCg4H8lUIACnQ/SOBMYI8bAsAJFPcj1AAEEjwVQqLpAbXmH5BJjqI0gi9DTAAgDBBCcAVLkgmQ7yKCZxpCQxqUZhAECCJ4XgMl493ug21ZD+aDAXH0WLM4A9MZPXJkJIIAwTAR5pQMalaCABQUULttBGCCAGCnNzgABBgAMJ5THwGvJLAAAAABJRU5ErkJggg==" ID="rdf:#$52iCK1">@firefox_about@</A>
-+        <DT><A HREF="https://parabolagnulinux.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre</A>
-+        <DT><A HREF="https://parabolagnulinux.org/packages/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre Packages</A>
-+        <DT><A HREF="https://wiki.parabolagnulinux.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre Wiki</A>
-+        <DT><A HREF="https://labs.parabola.nu/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAEAIABoBAAAFgAAACgAAAAQAAAAIAAAAAEAIAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AihUrGP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AIcXLSJvFCcn////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AbRIkcP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AGwTI0JWEBtB////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wCAAAACVQ8crP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AFYQHJI9ChRL////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wBlKzZHPQoUzgAAAAH///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AknV8I0sdJv8kBgxU////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AMTExA1uTlX1JAYLyf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8A////AP///wC5ubkLhG1x6CQGDP0PAAARzJmZBf///wD///8A////AP///wD///8A////AP///wD///8A////AP///wD///8AxsbGCZB+g/QkBgz/DQMDUdu2tgfMn5koxo2NOsxmmQX///8A////AP///wD///8A////AP///wD///8A////AJ2JjX+NeX3/JAYM/wwCA5T///8A////AL+AgAi/foFfuG51l7JgaXCvY3E2/4CAAv///wD///8A////AJlveHOzqqv6UCUt/yQGDP8MAgTW////AP///wD///8A////AKqAgAawXmhnqk9b36VNW/KjT13mqGh16Kl+hvCbdHz/YyYx/z0KFP8kBgz/DAIE7f///wD///8A////AP///wD///8A////AJlmZgWkQU5inDFD0ZUhNv+FFyz/bRMk/1UPHP89ChT/JAYM/wwCA9v///8A////AP///wD///8A////AP///wD///8A////AP///wCTIDMohRYtfW0TJMBVDxzQPQoU3SUGDcoMBARA//8AAP//AAD//wAA//8AAP/3AAD/9wAA//sAAP/7AAD/+QAA//kAAP/5AAD/+AAA9/AAAPwAAAD/AAAA/+EAAA%3D%3D">Parabola GNU/Linux-libre Labs</A>
-+    </DL><p>
-+    <DT><H3 ID="rdf:#$ZvPhC3">Free Software Foundation</H3>
-+    <DL><p>
-+        <DT><A HREF="http://www.fsf.org/" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAIAAACQkWg2AAAACXBIWXMAAAsTAAALEwEAmpwYAAADG0lEQVQoFQEQA+/8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAEAAAD///8AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAABAQECAAAAAAAAAAAAAAAAAAAA2qOp7tTXAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQAAAP///wAAAAAAAOCyt7pUXQcSEgcQDwAAAP///wAAAAAAAAD//x9NSDqNhQEBAQQAAAAAAAAAAAAAAAAQJiQGDQ0aPToZPjoAAQEAAAAAAAAAAAABAQEpZV4AAAAAAAAAAAAA////////////////pSIv05KZ////////////////////////////////AAAAAQAAAP///6krNwAAAAAAAPHc3ggSEQcSEQAAAAAAAAAAABY3NEGelQAAAAAAAAEBAQEAAAD///+YARAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGDg1g690CBgYAAAABAQEEAAAAAAAAS7etAAAAAAAAwGVtHklFIlJOAAAAAAAAAAAAAAAA+/X2BwYGAAAAAAAABAAAAAAAAB1IQwAAAAAAAAYNDBAmJB1IQwAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAIAAAAAAAAAAAAAAAAAAAAAAgL//v4AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAACAAAAAAAAAAAAAAAAAAAAAQEB//7/AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAgAAAAAAAAAAAAAAAAAAAAECAv/+/gAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD////////////////cqK3qzM////////////////////////////////8AAAABAAAA////AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAQEBAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAGuLjDf9F8oBAAAAAElFTkSuQmCC">Free Software Foundation</A>
-+        <DT><A HREF="http://libreplanet.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAC/v78AAAAAAPLy9ABsbakA/f3+APn5+QC6ur0A6urqAEpLbQACBLQApKW3AAULuQDMzMwAGBiDAL29vQCgocsAgnzJALu82QA+PpsAAQOvAOjo6ADZ2dkAysrKALS0zwD5+foAAgKRAAYGdQD19fUADhOjAAQJyACrnqIAxMTLAOnp7gDm5uYAzczNACgobwDg2dEAQkaeAA0RkAAUFnEA0MvQAIBzgAANDYsAk5OyAOTk5ADy8vYA1dXVAD8/cADGxsYA+fn7AAMHvgBzZnQApqauAAEGuQDExMQAAAGmAAoLmgADCMQAxMTdAAwPlwD+/v4ABg7MAF5ehADg4OAA0dHRAAAAoQAYEXAAwsLCALCxwQBnadkAAQGWAPz8/ACgoLgAbm6RANvb5wDr6+sA0dHSALe3uQADB8AAzc3NAGFhbAABAZcAOTtlALi4xwAAAJoA/Pz9AAQHnwADBJcACQl4AFVa3AChl6EAAgW2ABscdAABAq4A2NjYAAAAmwDAwMoAAQKmAAcMswDR0eQAAQSxANvX2wB4aXcAAQGpAAAAkwDW1tYAAgSpACIZZAAAAaEA+vr8AKuirAACBbcA8vLyALOztgADBZYAAACcAAACpwAEA6QAAQKnAPT09QD///8AvL3UADIpigDw8PAABwWOAK6dogBub4kAiozDANLS0gAFC8gAAgW4AP39/QAAAJ0A0NDQAMHBwQDp6ewACg2RAAIFqAAKCokA+/v7AAkOnwAAAaMA7OzsAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAeHh4eHh4eHh4eHh4eHh4AXh4eHhlbikzZlooeHh4eAF4eHh4hX1JVFweInh4eHgBeHh4XmlAGXNGSB8VeHh4AXg8LhaGcV9zKg0wQF54eAF4K0NNOGthjXNCUwAMS3gBPC82iW+CCRN2Iz4wTwx4AW0GgCc5OU41VnSKTBoOiwEFTz8hHIF5RANdQVRfNIMBeBUhe0o9jB0Pcjdzc1E8AXgsB3AbUlkQRVtnhHNoeAF4i45wJCAlYjJbdYRfY3gBeDwmEn4XMToKZDd6WDx4AXh4VTsIfwt3FGpsfAR4eAF4eHgEEYhQAodXYDx4eHgBeHh4eHg8GC1HPHh4eHh4AQABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAAAAQAAAAEAAAABAAA%3D">LibrePlanet</A>
-+        <DT><A HREF="http://www.gnu.org/software/gnuzilla/addons.html" ICON="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACAAAAAgBAMAAACBVGfHAAAAGFBMVEVFRUV+fn6mpqa/v7/Ozs7Y2Njg4OD8/Pwuhn+TAAAAAWJLR0QAiAUdSAAAAAlwSFlzAAALEQAACxEBf2RfkQAAAAd0SU1FB9MBDhQ6Gd8s57cAAAEVSURBVBgZBcGxVtpgGADQL9gHSBzqSognzMixmcWWzB6pmRHhnyvku6/fewMAIPD3TwHmQxHs6vr+A16bphNum/vV0x429201hcPjAGBTDZGnR/Kw1U181+u4HXvOdSxjUcztz8jjg1xGVBG9XPYxt4PviKiaWLg168iXtbrq+mPT1utjNcR1U73deRnL43M2sRgj3+oYs8uL3rLphPd2QWmHbMu/VS/cnk6UdtSW657g9yBlcZ0UAkUWzPvyRaAYmfd+HT4IZtvC59ibEJxXiqJjQpBpNEufBYE0McoOAunGhRMEFIPc7h4goJigQEBxk8u7AgEpL3IEAUZfcgAByGFXQACm5+4MAuB19QMEgI8CAgDgP4rivVgoKP6ZAAAAAElFTkSuQmCC">Free addons</A>
-+        <DT><A HREF="http://www.h-node.org/" ICON="data:image/x-icon;base64,AAABAAEAEBAAAAAAAABoBQAAFgAAACgAAAAQAAAAIAAAAAEACAAAAAAAAAEAAAAAAAAAAAAAAAEAAAAAAAC7zrYAWYhNANjj1QA9fEcAEEwBAHTQkwAeVRkAPXMvALvOtwASVQEAHFcUAH/bpgB60p8AKnQmAGO1fgAjaRwALmA1AA5EAQDM2sgAN3ApAG7EjgC5zbQAVJxrAChwIgC0ya8ALmczAHXJmQBNf0EAgd6oADhwKgC8z7cA7vPtANTg0QANPwAARIhSADtyLQBzzpQAus21AEeKVQDC070AieyzALzPuAB93qEALGYvAO/z7gBEiVAAasWFAFuJTwBKil4AXotSAEuKXgAORQEAD0gBABlDFwBWpmoALGYwAGCNVQAbYBAAHGAQABBOAQCI6rIAjPG3AB1bDgAaXg4A////AGaRWwB/2qYAUYJEAEx+PwAZXAwAm7eUAD51MADN28oAJmwhACRiFAAzeTYAasaFAB9eDwBkt34Aus62AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAPT09PT09PT09PT09PT09PT09PT0OIjALPRQmMkI9PT09PT09OkcHNQU+Q0oQPT09PT09PToVGDQtI0ABKz09PT09PT06JRg0Nh1ALxk9PT09PT09OiUYIS4TQC83PT09PT09PTpPSDsGG0BEAz09PT09PT06T0BGMRIsTRY9PT09PT09OgACJx8gQwooPT09PT09PToICAkJCUkkPT09PT09PT05HggETio9PT09PT09PT09Px4IERw9PT09PT09PT09PUUpCDMMPT09PT09PT09PT0NOEEEGj09PT09PT09PT09TBcPSzw9PT09PT09PT09PT09PT09PT09PT09PQAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA%3D">h-node</A>
-     </DL><p>
- </DL><p>
diff --git a/libre-testing/icecat/mozconfig b/libre-testing/icecat/mozconfig
deleted file mode 100644
index c5cea7185..000000000
--- a/libre-testing/icecat/mozconfig
+++ /dev/null
@@ -1,51 +0,0 @@
-. $topsrcdir/browser/config/mozconfig
-
-# System libraries
-ac_add_options --disable-system-cairo
-ac_add_options --enable-system-ffi
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-pixman
-ac_add_options --enable-system-sqlite
-ac_add_options --with-pthreads
-ac_add_options --with-system-bz2
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-png
-ac_add_options --with-system-zlib
-
-# Features
-ac_add_options --disable-crashreporter
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-installer
-ac_add_options --disable-safe-browsing
-ac_add_options --disable-tests
-ac_add_options --disable-updater
-ac_add_options --enable-gio
-#ac_add_options --enable-gstreamer
-ac_add_options --enable-startup-notification
-
-# Vendor settings
-ac_add_options --enable-optimize="-pipe -O3"
-ac_add_options --libdir=/usr/lib
-ac_add_options --prefix=/usr
-# Needed to enable breakpad in application.ini
-export MOZILLA_OFFICIAL=1
-
-# Application settings
-ac_add_options --disable-official-branding
-# since with-user-appdir with .gnuzilla doesn't do the trick,
-# use app-basename instead
-ac_add_options --with-app-basename=icecat
-ac_add_options --with-branding=browser/branding/unofficial
-ac_add_options --with-distribution-id=org.gnu.gnuzilla
-ac_add_options --with-user-appdir=.mozilla
-export MOZ_PHOENIX=1
-mk_add_options MOZ_PHOENIX=1
-
-# Other
-mk_add_options MOZ_OBJDIR=@TOPSRCDIR@/moz-objdir
-
-# Build-generated
diff --git a/libre-testing/icecat/mozconfig.pgo b/libre-testing/icecat/mozconfig.pgo
deleted file mode 100644
index 57d11eed0..000000000
--- a/libre-testing/icecat/mozconfig.pgo
+++ /dev/null
@@ -1,2 +0,0 @@
-# PGO
-mk_add_options PROFILE_GEN_SCRIPT='$(PYTHON) $(MOZ_OBJDIR)/_profile/pgo/profileserver.py 10'
diff --git a/libre-testing/icecat/shared-libs.patch b/libre-testing/icecat/shared-libs.patch
deleted file mode 100644
index 1f22b2b0d..000000000
--- a/libre-testing/icecat/shared-libs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/browser/installer/Makefile.in
---- mozilla-release.orig/browser/installer/Makefile.in	2012-07-17 16:19:29.480356991 +0000
-+++ mozilla-release/browser/installer/Makefile.in	2012-07-17 17:32:41.250937293 +0000
-@@ -50,7 +50,7 @@
- MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
- # Some files have been already bundled with xulrunner
- ifndef SYSTEM_LIBXUL
--MOZ_PKG_FATAL_WARNINGS = 1
-+MOZ_PKG_FATAL_WARNINGS = 0
- endif
- 
- MOZ_NONLOCALIZED_PKG_LIST = \
diff --git a/libre-testing/icecat/vendor.js b/libre-testing/icecat/vendor.js
deleted file mode 100644
index 3218a8dbb..000000000
--- a/libre-testing/icecat/vendor.js
+++ /dev/null
@@ -1,21 +0,0 @@
-// Use LANG environment variable to choose locale
-pref("intl.locale.matchOS", true);
-
-// Disable default browser checking.
-pref("browser.shell.checkDefaultBrowser", false);
-
-// Don't disable our bundled extensions in the application directory
-pref("extensions.autoDisableScopes", 11);
-pref("extensions.shownSelectionUI", true);
-
-// Default search engine
-pref("browser.search.defaultenginename", "DuckDuckGo HTML");
-
-// Search engine order (order displayed in the search bar dropdown)
-pref("browser.search.order.1", "DuckDuckGo HTML");
-pref("browser.search.order.2", "DuckDuckGo Lite");
-pref("browser.search.order.3", "Seeks Search");
-
-// Make sure that safebrowsing is disabled
-pref("browser.safebrowsing.enabled", false);
-pref("browser.safebrowsing.malware.enabled", false);
diff --git a/libre-testing/icewm-themes-libre/PKGBUILD b/libre-testing/icewm-themes-libre/PKGBUILD
deleted file mode 100644
index a6cb0a6ba..000000000
--- a/libre-testing/icewm-themes-libre/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 65600 2012-02-21 09:25:34Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Alessio 'mOLOk' Bolognino <themolok@gmail.com>
-# Maintainer (Parabola): Ben Peterson <mulenmar@yahoo.com>
-
-pkgname=icewm-themes-libre
-_pkgname=icewm-themes
-pkgver=1.2.26
-pkgrel=4
-pkgdesc="Themes for Ice Window Manager. (no trademarked themes)"
-arch=('any')
-license=("GPLv2")
-url=http://www.debian.org
-depends=(icewm)
-source=(http://ftp.debian.org/debian/pool/main/i/icewm-themes/icewm-themes_$pkgver.orig.tar.gz)
-md5sums=('c0fd0de59e6f74c9c86c0bc334eb6b9e')
-replaces=('icewm-themes')
-
-
-build() {
-  cd $srcdir/$_pkgname-$pkgver
-  mkdir -p $pkgdir/usr/share/icewm/themes
-  cp -r $srcdir/$_pkgname-$pkgver/* $pkgdir/usr/share/icewm/themes/
-
-  # Remove themes with Microsoft® Windows® trademarks
-  rm $pkgdir/usr/share/icewm/themes/fake95 -rf
-  rm $pkgdir/usr/share/icewm/themes/GlamICE -rf
-
-  # Remove themes with Apple® trademarks (changing capitalizations doesn't make
-  # it free)
-  rm $pkgdir/usr/share/icewm/themes/liQuid -rf
-  rm $pkgdir/usr/share/icewm/themes/sortofaqua -rf
-  rm $pkgdir/usr/share/icewm/themes/aquablue -rf
-  rm $pkgdir/usr/share/icewm/themes/jim-mac -rf
-
-  # Remove themes with other trademarks
-  rm $pkgdir/usr/share/icewm/themes/slashdot -rf
-  rm $pkgdir/usr/share/icewm/themes/Slashdot -rf
-  rm $pkgdir/usr/share/icewm/themes/yamm -rf
- 
-  # Remove themes with copyright violations
-  rm $pkgdir/usr/share/icewm/themes/Urbicande -rf
-
-
-  find $pkgdir -type d -exec chmod 755 {} \;
-  find $pkgdir -type f -exec chmod 644 {} \;
-}
diff --git a/libre-testing/libretools/PKGBUILD b/libre-testing/libretools/PKGBUILD
new file mode 100644
index 000000000..7daf4c071
--- /dev/null
+++ b/libre-testing/libretools/PKGBUILD
@@ -0,0 +1,91 @@
+# Maintainer: Joshua Haase <hahj87@gmail.com
+# Contributor: Luke Shumaker <lukeshu@sbcglobal.net>
+# Contributor: fauno <fauno@kiwwwi.com.ar>
+# Contributor: Márcio Silva <coadde@lavabit.com>
+
+pkgbase=libretools
+pkgname=(libretools libretools-mips64el librelib gitget)
+pkgdesc="Programs for Parabola development"
+url="https://projects.parabolagnulinux.org/packages/libretools.git/"
+license=('GPL3' 'GPL2')
+
+pkgver=20140106.1
+_libretools_commit=39b13f63d0fd89bfa3cae1feb8744fb100eb5651
+_devtools_commit=534d2015b45e013b37e1edbb997bd4df27d7b8fd
+
+_packages_url=https://projects.parabolagnulinux.org/packages
+source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2
+	$_packages_url/devtools-par.git/snapshot/devtools-par-$_devtools_commit.tar.bz2)
+
+pkgrel=1
+arch=('any')
+makedepends=(emacs ronn) # emacs --batch is used during the build to process text
+checkdepends=(sh-roundup)
+
+build() {
+  cd "$srcdir"
+  ln -sf devtools-par-$_devtools_commit devtools-par
+  cd "$srcdir/$pkgbase-$_libretools_commit"
+  make build-libretools build-libretools-mips64el build-librelib build-doc
+}
+
+check() {
+  cd "$srcdir/$pkgbase-$_libretools_commit"
+
+  SUDO_USER= make check TESTENVFLAGS='--no-network --no-sudo'
+}
+
+package_librelib() {
+  pkgdesc="Shell library portion of libretools"
+  depends=(
+    wget # `aur` and `lib/blacklist.sh`
+  )
+
+  cd "$srcdir/$pkgbase-$_libretools_commit"
+  make install-librelib DESTDIR="$pkgdir"
+}
+
+package_gitget() {
+  depends=("librelib=$pkgver" git)
+
+  provides=("libregit=$pkgver")
+  conflicts=("libregit")
+  replaces=("libregit")
+
+  cd "$srcdir/$pkgbase-$_libretools_commit"
+  make install-gitget DESTDIR="$pkgdir"
+}
+
+package_libretools() {
+  backup=(etc/libretools.conf etc/libretools.d/chroot.conf etc/libretools.d/librefetch.conf)
+  install=libretools.install
+  replaces=(chroottools)
+  conflicts=(devtools)
+
+  depends=(
+    "librelib=$pkgver"
+    "gitget=$pkgver" # `createworkdir`
+    arch-install-scripts # `archroot` uses `pacstrap`
+    openssh # `librerelease`
+    rsync # `librerelease` and `makechrootpkg.sh`
+    subversion # `diff-unfree`
+    tokyocabinet # `treepkg`
+  )
+  optdepends=('namcap: to check package files')
+
+  cd "$srcdir/$pkgbase-$_libretools_commit"
+  make install-libretools install-doc DESTDIR="$pkgdir"
+}
+
+package_libretools-mips64el() {
+  pkgdesc="Scripts for Parabola development (for mips64el architecture)"
+  depends=("$pkgbase=$pkgver"
+    git # mips-add
+  )
+
+  cd "$srcdir/$pkgbase-$_libretools_commit"
+  make install-libretools-mips64el DESTDIR="$pkgdir"
+}
+
+md5sums=('246274cf5974d6adee536edbdb2447c0'
+         'ec69dffa68829f063224de19bbd55fa9')
diff --git a/libre-testing/libretools/libretools.install b/libre-testing/libretools/libretools.install
new file mode 100644
index 000000000..a451add36
--- /dev/null
+++ b/libre-testing/libretools/libretools.install
@@ -0,0 +1,64 @@
+#!/bin/sh
+
+_edit_code="          'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'"
+_edit_cmnt='#%s # commented out by the libretools post_install script'
+
+_add_cmnt='# The following line is added by the libretools post_install script'
+_add_code='[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=({https,libre}"::/usr/bin/librefetch -p \"\$BUILDFILE\" -- %u %o")'
+
+# This line was installed by previous versions of this script
+_old_code='[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=("libre::/usr/bin/librefetch -p \"\$BUILDFILE\" %u %o")'
+
+# has_line $line
+has_line() { grep -Fxq -- "$1" etc/makepkg.conf; }
+# add_line $line
+add_line() { printf '%s\n' "$1" >> etc/makepkg.conf; }
+# del_line $line
+del_line() {
+	local lineno=($(grep -Fxn -- "$1" etc/makepkg.conf | cut -d: -f1))
+	if [[ "${#lineno[@]}" -gt 0 ]]; then
+		sed -i "$(printf '%dd;' "${lineno[@]}")" etc/makepkg.conf;
+	fi
+}
+# rep_line $orig $replacement_bre
+rep_line() {
+	local lineno=($(grep -Fxn -- "$1" etc/makepkg.conf | cut -d: -f1))
+	if [[ "${#lineno[@]}" == 1 ]]; then
+		sed -i "${lineno}s|.*|${2//|/\\|}|" etc/makepkg.conf;
+	fi
+}
+
+# arg 1:  the new package version
+post_install() {
+	if grep -q 'librefetch' etc/makepkg.conf; then
+		libremessages msg2 "libretools: librefetch is already in /etc/makepkg.conf"
+		if has_line "$_old_code"; then
+			libremessages msg2 "libretools: removing old librefetch entry in /etc/makepkg.conf"
+			del_line "$_old_code"
+			post_install
+		else
+			return 0
+		fi
+	else
+		libremessages msg2 "libretools: adding librefetch to /etc/makepkg.conf"
+		rep_line "$_edit_code" "$(printf "$_edit_cmnt" '&')"
+		add_line "$_add_cmnt"
+		add_line "$_add_code"
+	fi
+}
+
+## arg 1:  the new package version
+## arg 2:  the old package version
+post_upgrade() {
+	post_install
+}
+
+pre_remove() {
+	libremessages msg2 "libretools: removing librefetch from /etc/makepkg.conf"
+
+	rep_line "$(printf "$_edit_cmnt" "$_edit_code")" "$_edit_code"
+	del_line "$_add_cmnt"
+	del_line "$_add_code"
+
+	del_line "$_old_code"
+}
diff --git a/libre-testing/openfwwf/PKGBUILD b/libre-testing/openfwwf/PKGBUILD
deleted file mode 100644
index 30168b159..000000000
--- a/libre-testing/openfwwf/PKGBUILD
+++ /dev/null
@@ -1,21 +0,0 @@
-# Contributor: Jussi Timperi <jussi.timperi at gmail dot com>
-
-pkgname=openfwwf
-pkgver=5.2
-pkgrel=1
-pkgdesc="Open firmware for some Broadcom 43xx series WLAN chips."
-arch=('any')
-url="http://www.ing.unibs.it/openfwwf/"
-license=('GPL2')
-makedepends=('b43-tools')
-source=(http://www.ing.unibs.it/openfwwf/firmware/$pkgname-$pkgver.tar.gz)
-md5sums=('e045a135453274e439ae183f8498b0fa')
-
-build() {
-  cd "$srcdir/$pkgname-$pkgver"
-
-  make || return 1
-  make PREFIX="$pkgdir/lib/firmware/b43" install
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre-testing/systemd/0001-Reinstate-TIMEOUT-handling.patch b/libre-testing/systemd/0001-Reinstate-TIMEOUT-handling.patch
deleted file mode 100644
index 2092fef90..000000000
--- a/libre-testing/systemd/0001-Reinstate-TIMEOUT-handling.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From 2127f99fb43d2ef950e95329ce40bdd5da8b015c Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Fri, 25 May 2012 19:43:24 -0400
-Subject: [PATCH] Reinstate TIMEOUT= handling
-
-This is mostly to deal with ipw2?00 drivers which have yet to be fixed
-in the kernel.
----
- src/libudev/libudev-device.c  |   19 +++++++++++++++++++
- src/libudev/libudev-private.h |    1 +
- src/udev/udevd.c              |   13 ++++++++++---
- 3 files changed, 30 insertions(+), 3 deletions(-)
-
-diff --git a/src/libudev/libudev-device.c b/src/libudev/libudev-device.c
-index a8277d1..5966189 100644
---- a/src/libudev/libudev-device.c
-+++ b/src/libudev/libudev-device.c
-@@ -68,6 +68,7 @@ struct udev_device {
-         struct udev_list tags_list;
-         unsigned long long int seqnum;
-         unsigned long long int usec_initialized;
-+        int timeout;
-         int devlink_priority;
-         int refcount;
-         dev_t devnum;
-@@ -89,6 +90,21 @@ struct udev_device {
-         bool db_persist;
- };
-
-+int udev_device_get_timeout(struct udev_device *udev_device)
-+{
-+        return udev_device->timeout;
-+}
-+
-+static int udev_device_set_timeout(struct udev_device *udev_device, int timeout)
-+{
-+        char num[32];
-+
-+        udev_device->timeout = timeout;
-+        snprintf(num, sizeof(num), "%u", timeout);
-+        udev_device_add_property(udev_device, "TIMEOUT", num);
-+        return 0;
-+}
-+
- /**
-  * udev_device_get_seqnum:
-  * @udev_device: udev device
-@@ -362,6 +378,8 @@ void udev_device_add_property_from_string_parse(struct udev_device *udev_device,
-
-                 util_strscpyl(path, sizeof(path), TEST_PREFIX "/sys", &property[8], NULL);
-                 udev_device_set_syspath(udev_device, path);
-+        } else if (strncmp(property, "TIMEOUT=", 8) == 0) {
-+                udev_device_set_timeout(udev_device, strtoull(&property[8], NULL, 10));
-         } else if (startswith(property, "SUBSYSTEM=")) {
-                 udev_device_set_subsystem(udev_device, &property[10]);
-         } else if (startswith(property, "DEVTYPE=")) {
-@@ -605,6 +623,7 @@ struct udev_device *udev_device_new(struct udev *udev)
-         udev_list_init(udev, &udev_device->sysattr_value_list, true);
-         udev_list_init(udev, &udev_device->sysattr_list, false);
-         udev_list_init(udev, &udev_device->tags_list, true);
-+        udev_device->timeout = -1;
-         udev_device->watch_handle = -1;
-         /* copy global properties */
-         udev_list_entry_foreach(list_entry, udev_get_properties_list_entry(udev))
-diff --git a/src/libudev/libudev-private.h b/src/libudev/libudev-private.h
-index 4eb4a59..99aefeb 100644
---- a/src/libudev/libudev-private.h
-+++ b/src/libudev/libudev-private.h
-@@ -70,6 +70,7 @@ const char *udev_device_get_id_filename(struct udev_device *udev_device);
- void udev_device_set_is_initialized(struct udev_device *udev_device);
- int udev_device_add_tag(struct udev_device *udev_device, const char *tag);
- void udev_device_cleanup_tags_list(struct udev_device *udev_device);
-+int udev_device_get_timeout(struct udev_device *udev_device);
- unsigned long long udev_device_get_usec_initialized(struct udev_device *udev_device);
- void udev_device_set_usec_initialized(struct udev_device *udev_device, unsigned long long usec_initialized);
- int udev_device_get_devlink_priority(struct udev_device *udev_device);
-diff --git a/src/udev/udevd.c b/src/udev/udevd.c
-index 0d85960..cd24462 100644
---- a/src/udev/udevd.c
-+++ b/src/udev/udevd.c
-@@ -384,7 +384,7 @@ out:
-         }
- }
-
--static void event_run(struct event *event)
-+static void event_run(struct event *event, bool force)
- {
-         struct udev_list_node *loop;
-
-@@ -410,7 +410,7 @@ static void event_run(struct event *event)
-                 return;
-         }
-
--        if (children >= children_max) {
-+        if (!force && children >= children_max) {
-                 if (children_max > 1)
-                         log_debug("maximum number (%i) of children reached\n", children);
-                 return;
-@@ -444,6 +444,13 @@ static int event_queue_insert(struct udev_device *dev)
-
-         event->state = EVENT_QUEUED;
-         udev_list_node_append(&event->node, &event_list);
-+
-+        /* run all events with a timeout set immediately */
-+        if (udev_device_get_timeout(dev) > 0) {
-+                event_run(event, true);
-+                return 0;
-+        }
-+
-         return 0;
- }
-
-@@ -549,7 +556,7 @@ static void event_queue_start(struct udev *udev)
-                 if (is_devpath_busy(event))
-                         continue;
-
--                event_run(event);
-+                event_run(event, false);
-         }
- }
-
---
-1.7.10.2
diff --git a/libre-testing/systemd/PKGBUILD b/libre-testing/systemd/PKGBUILD
deleted file mode 100644
index 3d7649c01..000000000
--- a/libre-testing/systemd/PKGBUILD
+++ /dev/null
@@ -1,152 +0,0 @@
-# Maintainer: Dave Reisner <dreisner@archlinux.org>
-# Contributor: Tom Gundersen <teg@jklm.no>
-
-pkgbase=systemd
-pkgname=('systemd')
-pkgver=184
-pkgrel=2
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.freedesktop.org/wiki/Software/systemd"
-license=('GPL2' 'LGPL2.1' 'MIT')
-makedepends=('acl' 'cryptsetup' 'dbus-core' 'docbook-xsl' 'gobject-introspection' 'gperf'
-             'gtk-doc' 'intltool' 'kmod' 'libcap' 'libxslt' 'linux-api-headers' 'pam' 'xz')
-options=('!libtool')
-source=("http://www.freedesktop.org/software/$pkgname/$pkgname-$pkgver.tar.xz"
-        'initcpio-hook-udev'
-        'initcpio-install-udev'
-        'initcpio-install-timestamp'
-        '0001-Reinstate-TIMEOUT-handling.patch'
-        'os-release'
-        'locale.sh')
-md5sums=('6be0a2519fd42b988a1a2a56e5bd40c1'
-         'e99e9189aa2f6084ac28b8ddf605aeb8'
-         '59e91c4d7a69b7bf12c86a9982e37ced'
-         'df69615503ad293c9ddf9d8b7755282d'
-         '5543be25f205f853a21fa5ee68e03f0d'
-         '752636def0db3c03f121f8b4f44a63cd'
-         'f15956945052bb911e5df81cf5e7e5dc')
-
-build() {
-  cd "$pkgname-$pkgver"
-
-  # still waiting on ipw2x00 to get fixed...
-  patch -Np1 <"$srcdir/0001-Reinstate-TIMEOUT-handling.patch"
-
-  ./configure \
-      --libexecdir=/usr/lib \
-      --localstatedir=/var \
-      --sysconfdir=/etc \
-      --enable-split-usr \
-      --enable-introspection \
-      --enable-gtk-doc \
-      --disable-audit \
-      --disable-ima \
-      --with-pamlibdir=/usr/lib/security \
-      --with-distro=arch \
-      --with-usb-ids-path=/usr/share/hwdata/usb.ids \
-      --with-pci-ids-path=/usr/share/hwdata/pci.ids \
-      --with-firmware-path=/usr/lib/firmware/updates:/lib/firmware/updates:/usr/lib/firmware:/lib/firmware
-
-  make
-}
-
-package_systemd() {
-  pkgdesc="system and service manager"
-  depends=('acl' 'dbus-core' "libsystemd=$pkgver" 'kmod' 'libcap' 'pam'
-           "systemd-tools=$pkgver" 'util-linux' 'xz')
-  optdepends=('dbus-python: systemd-analyze'
-              'initscripts: legacy support for hostname and vconsole setup'
-              'initscripts-systemd: native boot and initialization scripts'
-              'python2-cairo: systemd-analyze'
-              'systemd-arch-units: collection of native unit files for Arch daemon/init scripts'
-              'systemd-sysvcompat: symlink package to provide sysvinit binaries')
-  backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
-          etc/dbus-1/system.d/org.freedesktop.hostname1.conf
-          etc/dbus-1/system.d/org.freedesktop.login1.conf
-          etc/dbus-1/system.d/org.freedesktop.locale1.conf
-          etc/dbus-1/system.d/org.freedesktop.timedate1.conf
-          etc/systemd/system.conf
-          etc/systemd/user.conf
-          etc/systemd/logind.conf
-          etc/systemd/journald.conf)
-  install="systemd.install"
-
-  cd "$pkgname-$pkgver"
-
-  make DESTDIR="$pkgdir" install
-
-  install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
-  printf "d /run/console 0755 root root\n" > "$pkgdir/usr/lib/tmpfiles.d/console.conf"
-
-  install -dm755 "$pkgdir/bin"
-  ln -s ../usr/lib/systemd/systemd "$pkgdir/bin/systemd"
-
-  # fix systemd-analyze for python2
-  sed -i '1s/python$/python2/' "$pkgdir/usr/bin/systemd-analyze"
-
-  # move bash-completion and symlink for loginctl
-  install -Dm644 "$pkgdir/etc/bash_completion.d/systemd-bash-completion.sh" \
-    "$pkgdir/usr/share/bash-completion/completions/systemctl"
-  ln -s systemctl "$pkgdir/usr/share/bash-completion/completions/loginctl"
-  rm -rf "$pkgdir/etc/bash_completion.d"
-
-  # don't write units to /etc by default -- we'll enable this on post_install
-  # as a sane default
-  rm "$pkgdir/etc/systemd/system/getty.target.wants/getty@tty1.service"
-  rmdir "$pkgdir/etc/systemd/system/getty.target.wants"
-
-  ### split off libsystemd (libs, includes, pkgconfig, man3)
-  rm -rf "$srcdir/_libsystemd"
-  install -dm755 "$srcdir"/_libsystemd/usr/{include,lib/pkgconfig}
-  cd "$srcdir"/_libsystemd
-  mv "$pkgdir/usr/lib"/libsystemd-*.so* usr/lib
-  mv "$pkgdir/usr/include/systemd" usr/include
-  mv "$pkgdir/usr/lib/pkgconfig"/libsystemd-*.pc usr/lib/pkgconfig
-
-  ### split out manpages for sysvcompat
-  rm -rf "$srcdir/_sysvcompat"
-  install -dm755 "$srcdir"/_sysvcompat/usr/share/man/man8/
-  mv "$pkgdir"/usr/share/man/man8/{telinit,halt,reboot,poweroff,runlevel,shutdown}.8 \
-     "$srcdir"/_sysvcompat/usr/share/man/man8
-
-  ### split out systemd-tools/udev
-  rm -rf "$srcdir/_tools"
-  install -dm755 \
-      "$srcdir"/_tools/etc/udev \
-      "$srcdir"/_tools/usr/bin \
-      "$srcdir"/_tools/usr/include \
-      "$srcdir"/_tools/usr/lib/{systemd/system,udev} \
-      "$srcdir"/_tools/usr/lib/systemd/system/{sysinit,sockets}.target.wants \
-      "$srcdir"/_tools/usr/lib/girepository-1.0 \
-      "$srcdir"/_tools/usr/share/pkgconfig \
-      "$srcdir"/_tools/usr/share/gir-1.0 \
-      "$srcdir"/_tools/usr/share/gtk-doc/html/{g,lib}udev \
-      "$srcdir"/_tools/usr/share/man/man{1,5,7,8}
-
-  cd "$srcdir/_tools"
-  mv "$pkgdir"/etc/udev etc
-  mv "$pkgdir"/etc/{binfmt,modules-load,sysctl,tmpfiles}.d etc
-  mv "$pkgdir"/usr/bin/udevadm usr/bin
-  mv "$pkgdir"/usr/lib/pkgconfig usr/lib
-  mv "$pkgdir"/usr/lib/systemd/systemd-udevd usr/lib/systemd
-  mv "$pkgdir"/usr/lib/systemd/system/systemd-udev* usr/lib/systemd/system
-  mv "$pkgdir"/usr/lib/systemd/system/sysinit.target.wants/systemd-udev* usr/lib/systemd/system/sysinit.target.wants
-  mv "$pkgdir"/usr/lib/systemd/system/sockets.target.wants/systemd-udev* usr/lib/systemd/system/sockets.target.wants
-  mv "$pkgdir"/usr/lib/lib{,g}udev* usr/lib
-  mv "$pkgdir"/usr/lib/{binfmt,sysctl,modules-load,tmpfiles}.d usr/lib
-  mv "$pkgdir"/usr/lib/udev usr/lib
-  mv "$pkgdir"/usr/include/{libudev.h,gudev-1.0} usr/include
-  mv "$pkgdir"/usr/lib/girepository-1.0 usr/lib
-  mv "$pkgdir"/usr/share/pkgconfig/udev.pc usr/share/pkgconfig
-  mv "$pkgdir"/usr/share/gir-1.0 usr/share
-  mv "$pkgdir"/usr/share/gtk-doc/html/{g,lib}udev usr/share/gtk-doc/html
-  mv "$pkgdir"/usr/share/man/man7/udev.7 usr/share/man/man7
-  mv "$pkgdir"/usr/share/man/man8/{systemd-udevd,udevadm}.8 usr/share/man/man8
-  mv "$pkgdir"/usr/share/man/man1/systemd-{ask-password,delta,detect-virt}.1 usr/share/man/man1
-  mv "$pkgdir"/usr/share/man/man5/{binfmt,modules-load,sysctl,tmpfiles}.d.5 usr/share/man/man5
-  mv "$pkgdir"/usr/share/man/man5/{hostname,{vconsole,locale}.conf}.5 usr/share/man/man5
-  mv "$pkgdir"/usr/bin/systemd-{ask-password,delta,detect-virt,tmpfiles,tty-ask-password-agent} usr/bin
-  mv "$pkgdir"/usr/lib/systemd/systemd-{ac-power,binfmt,cryptsetup,modules-load,random-seed,remount-fs,reply-password,sysctl,timestamp,vconsole-setup} usr/lib/systemd
-}
-
-# vim: ft=sh syn=sh et
diff --git a/libre-testing/systemd/initcpio-hook-udev b/libre-testing/systemd/initcpio-hook-udev
deleted file mode 100644
index 75da7e4a8..000000000
--- a/libre-testing/systemd/initcpio-hook-udev
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/usr/bin/ash
-
-run_earlyhook() {
-    udevd --daemon --resolve-names=never
-    udevd_running=1
-}
-
-run_hook() {
-    msg ":: Triggering uevents..."
-    udevadm trigger --action=add --type=subsystems
-    udevadm trigger --action=add --type=devices
-    udevadm settle
-}
-
-run_cleanuphook() {
-    udevadm control --exit
-    udevadm info --cleanup-db
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/libre-testing/systemd/initcpio-install-timestamp b/libre-testing/systemd/initcpio-install-timestamp
deleted file mode 100644
index 259cc705b..000000000
--- a/libre-testing/systemd/initcpio-install-timestamp
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-build() {
-    add_binary /usr/lib/systemd/systemd-timestamp /usr/bin/systemd-timestamp
-}
-
-help() {
-    cat <<HELPEOF
-Provides support for RD_TIMESTAMP in early userspace, which can be read by a
-program such as systemd-analyze to determine boot time.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/libre-testing/systemd/initcpio-install-udev b/libre-testing/systemd/initcpio-install-udev
deleted file mode 100644
index 762429983..000000000
--- a/libre-testing/systemd/initcpio-install-udev
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-build() {
-    local rules tool
-
-    add_file "/etc/udev/udev.conf"
-    add_binary /usr/lib/systemd/systemd-udevd /usr/bin/udevd
-    add_binary /usr/bin/udevadm
-
-    for rules in 50-udev-default.rules 60-persistent-storage.rules 80-drivers.rules; do
-        add_file "/usr/lib/udev/rules.d/$rules"
-    done
-    for tool in ata_id scsi_id; do
-        add_file "/usr/lib/udev/$tool"
-    done
-
-    add_runscript
-}
-
-help() {
-    cat <<HELPEOF
-This hook will use udev to create your root device node and detect the needed
-modules for your root device. It is also required for firmware loading in
-initramfs. It is recommended to use this hook.
-HELPEOF
-}
-
-# vim: set ft=sh ts=4 sw=4 et:
diff --git a/libre-testing/systemd/locale.sh b/libre-testing/systemd/locale.sh
deleted file mode 100644
index 11f1bbbee..000000000
--- a/libre-testing/systemd/locale.sh
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh
-
-if [ ! -r /etc/locale.conf ]; then
-  return
-fi
-
-. /etc/locale.conf
-
-if [ "${LANG+x}" = 'x' ]; then
-  export LANG
-fi
-
-if [ "${LC_CTYPE+x}" = 'x' ]; then
-  export LC_CTYPE
-fi
-
-if [ "${LC_NUMERIC+x}" = 'x' ]; then
-  export LC_NUMERIC
-fi
-
-if [ "${LC_TIME+x}" = 'x' ]; then
-  export LC_TIME
-fi
-
-if [ "${LC_COLLATE+x}" = 'x' ]; then
-  export LC_COLLATE
-fi
-
-if [ "${LC_MONETARY+x}" = 'x' ]; then
-  export LC_MONETARY
-fi
-
-if [ "${LC_MESSAGES+x}" = 'x' ]; then
-  export LC_MESSAGES
-fi
-
-if [ "${LC_PAPER+x}" = 'x' ]; then
-  export LC_PAPER
-fi
-
-if [ "${LC_NAME+x}" = 'x' ]; then
-  export LC_NAME
-fi
-
-if [ "${LC_ADDRESS+x}" = 'x' ]; then
-  export LC_ADDRESS
-fi
-
-if [ "${LC_TELEPHONE+x}" = 'x' ]; then
-  export LC_TELEPHONE
-fi
-
-if [ "${LC_MEASUREMENT+x}" = 'x' ]; then
-  export LC_MEASUREMENT
-fi
-
-if [ "${LC_IDENTIFICATION+x}" = 'x' ]; then
-  export LC_IDENTIFICATION
-fi
diff --git a/libre-testing/systemd/os-release b/libre-testing/systemd/os-release
deleted file mode 100644
index 65253e9c3..000000000
--- a/libre-testing/systemd/os-release
+++ /dev/null
@@ -1,7 +0,0 @@
-NAME=Parabola
-ID=parabola
-ID_LIKE=arch
-PRETTY_NAME="Parabola GNU/Linux-libre"
-ANSI_COLOR="1;35"
-HOME_URL="https://parabolagnulinux.org/"
-BUG_REPORT_URL="https://labs.parabola.nu/"
diff --git a/libre-testing/systemd/rePKGBUILD b/libre-testing/systemd/rePKGBUILD
deleted file mode 100644
index bd7d396db..000000000
--- a/libre-testing/systemd/rePKGBUILD
+++ /dev/null
@@ -1,52 +0,0 @@
-# This is an example rePKGBUILD file. Use this as a start to creating your own,
-# and remove these comments. For more information, see 'man PKGBUILD'.
-# NOTE: Please fill out the license field for your package! If it is unknown,
-# then please put 'unknown'.
-
-# Maintainer: Nicolas Reynolds <fauno@kiwwwi.com.ar>
-# Maintainer: André Silva <emulatorman@parabola.nu>
-source PKGBUILD
-unset build package md5sums source check
-_repo=testing
-pkgname='systemd'
-options=(!strip)
-source=(PKGBUILD
-	http://mirrors.kernel.org/archlinux/${_repo}/os/$CARCH/${pkgbase}-${pkgver}-${pkgrel}-${CARCH}${PKGEXT}
-	# files for pkg modifications
-	os-release)
-
-build() {
-  cd "${srcdir}/"
-  rm -v .{INSTALL,PKGINFO} $pkgname-$pkgver-$pkgrel-$CARCH$PKGEXT || true
-  # put actions for package modifications below this line
-
-  rm -v etc/os-release
-}
-
-package_systemd() {
-  pkgdesc="system and service manager (Parabola rebranded)"
-  depends=('acl' 'dbus-core' "libsystemd=$pkgver" 'kmod' 'libcap' 'pam'
-           "systemd-tools=$pkgver" 'util-linux' 'xz')
-  optdepends=('dbus-python: systemd-analyze'
-              'initscripts: legacy support for hostname and vconsole setup'
-              'initscripts-systemd: native boot and initialization scripts'
-              'python2-cairo: systemd-analyze'
-              'systemd-arch-units: collection of native unit files for Arch daemon/init scripts'
-              'systemd-sysvcompat: symlink package to provide sysvinit binaries')
-  backup=(etc/dbus-1/system.d/org.freedesktop.systemd1.conf
-          etc/dbus-1/system.d/org.freedesktop.hostname1.conf
-          etc/dbus-1/system.d/org.freedesktop.login1.conf
-          etc/dbus-1/system.d/org.freedesktop.locale1.conf
-          etc/dbus-1/system.d/org.freedesktop.timedate1.conf
-          etc/systemd/system.conf
-          etc/systemd/user.conf
-          etc/systemd/logind.conf
-          etc/systemd/journald.conf)
-  install="systemd.install"
-
-  # Install Parabola os-release
-  install -Dm644 "$srcdir/os-release" "$pkgdir/etc/os-release"
-
-  find ${srcdir} -maxdepth 1 -type l -delete
-  cp -a ${srcdir}/* ${pkgdir}
-}
diff --git a/libre-testing/systemd/systemd-tools.install b/libre-testing/systemd/systemd-tools.install
deleted file mode 100644
index c1c19d15d..000000000
--- a/libre-testing/systemd/systemd-tools.install
+++ /dev/null
@@ -1,29 +0,0 @@
-# arg 1:  the new package version
-# arg 2:  the old package version
-
-post_upgrade() {
-  if [ "$(vercmp $2 174)" -lt 0 ]; then
-    echo " * We now use upstream rules for assigning devices to the 'disk', 'optical',"
-    echo "   'scanner' and 'video' groups. Beware of any changes."
-    echo " * We no longer create symlinks from /dev/<dev> to /dev/<dev>0."
-    echo " * For security reasons, we no longer add devices to the 'storage' group. Use"
-    echo "   udisks and friends, or add custom rules to /etc/udev.d/rules/, if you want"
-    echo "   this functionality back."
-    echo " * We no longer create the static nodes on install needed for an initrd-less"
-    echo "   boot where devtmpfs is not mounted by the kernel, this only affects fresh"
-    echo "   installs."
-  fi
-  if [ "$(vercmp $2 175)" -lt 0 ]; then
-    echo " * devtmpfs support is now a hard requirement. Users of the official Arch"
-    echo "   kernels have this enabled."
-  fi
-  if [ "$(vercmp $2 181)" -lt 0 ]; then
-    echo " * udev-compat has been removed, and should be uninstalled."
-    echo " * Framebuffers are no longer blacklisted by default."
-    echo " * binaries moved from /sbin to /usr/bin"
-  fi
-  if [ "$(vercmp $2 181-3)" -lt 0 ]; then
-    echo " * if your kernel does not provide /dev/loop-control, you need to manually"
-    echo "   load the 'loop' module before using losetup"
-  fi
-}
diff --git a/libre-testing/systemd/systemd.install b/libre-testing/systemd/systemd.install
deleted file mode 100644
index 0b10f9537..000000000
--- a/libre-testing/systemd/systemd.install
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/bin/sh
-
-sd_booted() {
-  [ -e sys/fs/cgroup/systemd ]
-}
-
-post_install() {
-  if [ ! -f etc/machine-id ]; then
-    systemd-machine-id-setup
-  fi
-
-  # enable getty@tty1 by default, but don't track the file
-  systemctl enable getty@.service
-
-  echo ":: Append 'init=/bin/systemd' to your kernel command line in your"
-  echo "   bootloader to replace sysvinit with systemd"
-}
-
-post_upgrade() {
-  if [ ! -f etc/machine-id ]; then
-    systemd-machine-id-setup
-  fi
-
-  if sd_booted; then
-    # we moved the binary in 44-2 to /usr, so a reexec leads to a
-    # coredump. refuse this reexec and warn the user that they should
-    # reboot instead.
-    if [ "$(vercmp 44-2 "$2")" -eq 1 ]; then
-      echo "warning: refusing to reexec systemd. the system should be rebooted."
-    else
-      systemctl daemon-reload
-      systemctl daemon-reexec
-    fi
-  fi
-
-  # getty@tty1.service is no longer enabled by default, but we don't want to break
-  # existing setups.
-  if [ "$(vercmp 183 "$2")" -eq 1 ]; then
-    # systemctl seems to be whiny on sysvinit. this will succeed unless something
-    # horrific happens, so just mask the error.
-    systemctl -q enable getty@.service || true
-  fi
-}
-
-post_remove() {
-  if getent group lock >/dev/null; then
-    groupdel lock
-  fi
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre-testing/unace-libre/PKGBUILD b/libre-testing/unace-libre/PKGBUILD
deleted file mode 100644
index 8708694c6..000000000
--- a/libre-testing/unace-libre/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# Maintainer: Borgo
-pkgname=unace-libre
-_pkgname=unace
-pkgver=1.2b
-pkgrel=2
-pkgdesc="Extract, view and test ACE 1.x archives"
-arch=('i686' 'x86_64')
-url="http://www.emerge.de/"
-license=('GPL')
-depends=()
-provides=('unace')
-conflicts=('unace')
-replaces=('unace')
-source=(ftp://ftp.debian.org/debian/pool/main/u/unace/$_pkgname\_$pkgver.orig.tar.gz
-        ftp://ftp.debian.org/debian/pool/main/u/unace/$_pkgname\_$pkgver-7.diff.gz)
-md5sums=('51360df61997db28787b60ea7321d83f'
-         '9cd1e411ed0e77d024ff78585079a5a5') #generate with 'makepkg -g'
-
-build() {
-  cd "$srcdir/$_pkgname$pkgver"
-  patch -p1 -i ../$_pkgname\_$pkgver-7.diff
-  for p in $(<debian/patches/series)
-  do
-    patch -p1 -i debian/patches/$p
-  done
-  cp unix/makefile unix/gccmaked .
-# assume little-endian, debian/test-endian.c is not used
-  make dep
-  make
-}
-
-package() {
-  cd "$srcdir/$_pkgname$pkgver"
-  install -Dm755 unace "$pkgdir/usr/bin/unace"
-  install -Dm644 debian/unace.1 "$pkgdir/usr/share/man/man1/unace.1"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre-testing/unar/PKGBUILD b/libre-testing/unar/PKGBUILD
deleted file mode 100644
index 4bb523a89..000000000
--- a/libre-testing/unar/PKGBUILD
+++ /dev/null
@@ -1,96 +0,0 @@
-# Contributor: Cedric Girard <girard.cedric@gmail.com>
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=(
-  'unar'
-  'libuniversaldetector'
-  'libxadmaster'
-  'libxadmaster-libxad')
-pkgver=0.99
-pkgrel=1
-arch=('x86_64' 'i686')
-url="http://wakaba.c3.cx/s/apps/unarchiver.html"
-license=('LGPL2.1')
-depends=('gnustep-base-libre>=1.23.0' 'openssl' 'bzip2' 'icu' 'gcc-libs' 'zlib')
-conflicts=('gnustep-base>=1.24')
-makedepends=('gcc-objc')
-source=("https://theunarchiver.googlecode.com/files/unar${pkgver}_src.zip")
-
-build() {
-  cd "$srcdir/XADMaster"
-
-  # remove some OS X object files that were accidentally included in the dist
-  # (we've all done it)
-  find "$srcdir" -name '*.o' -delete
-
-  # build everything
-  . /usr/share/GNUstep/Makefiles/GNUstep.sh
-  make -f Makefile.linux
-
-  # make libxad into a lib file
-  cd libxad
-  rm -f libxad.a
-  ar rcs libxad.a all.o clients.o unix/emulation.o unix/init.o
-
-  # compress man pages
-  cd "$srcdir/Extra"
-  gzip -c unar.1 > unar.1.gz
-  gzip -c lsar.1 > lsar.1.gz
-}
-
-package_unar() {
-  pkgdesc="The unar/lsar command line wrappers around libXADMaster"
-
-  cd "$srcdir/XADMaster"
-  install -d "$pkgdir/usr/bin"
-  install -m755 unar lsar "$pkgdir/usr/bin"
-
-  cd "$srcdir/Extra"
-  install -d "$pkgdir/usr/share/man/man1"
-  install unar.1.gz lsar.1.gz "$pkgdir/usr/share/man/man1"
-}
-
-package_libuniversaldetector() {
-  pkgdesc="Some fancy-schmancy Objective-C library that detects things?"
-
-  cd "$srcdir/UniversalDetector"
-  install -d "$pkgdir/usr/lib/"
-  install libUniversalDetector.a "$pkgdir/usr/lib/"
-  install -d "$pkgdir/usr/include/"
-  install UniversalDetector.h "$pkgdir/usr/include/"
-}
-
-package_libxadmaster() {
-  pkgdesc="An Objective-C library built around libxad adding support for other formats"
-  depends+=('libuniversaldetector')
-
-  header_files='
-    CommandLineCommon.h
-    NSStringPrinting.h
-    XADArchive.h
-    XADRegex.h
-    XADSimpleUnarchiver.h
-    XADUnarchiver.h
-    '
-
-  cd "$srcdir/XADMaster"
-  install -d "$pkgdir/usr/lib"
-  install libXADMaster.a "$pkgdir/usr/lib"
-  install -d "$pkgdir/usr/include/XADMaster"
-  install $header_files "$pkgdir/usr/include/XADMaster"
-}
-
-package_libxadmaster-libxad() {
-  pkgdesc="A fork of libxad, the port of the Amiga 'xadmaster.library' to *NIX"
-  depends=('glibc')
-  provides=('libxad')
-  conflicts=('libxad')
-
-  cd "$srcdir/XADMaster/libxad"
-  install -d "$pkgdir/usr/lib"
-  install libxad.a "$pkgdir/usr/lib"
-  install -d "$pkgdir/usr/include/libxad"
-  install include/* "$pkgdir/usr/include/libxad"
-}
-
-md5sums=('2169b920cf62956e495cfd5e0780a41e')
diff --git a/libre-testing/unarchiver/PKGBUILD b/libre-testing/unarchiver/PKGBUILD
deleted file mode 100644
index 0df133a6c..000000000
--- a/libre-testing/unarchiver/PKGBUILD
+++ /dev/null
@@ -1,93 +0,0 @@
-# Contributor: Cedric Girard <girard.cedric@gmail.com>
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=(
-  'unarchiver'
-  'unar'
-  'libuniversaldetector'
-  'libxadmaster'
-  'libxadmaster-libxad')
-pkgver=2.7.1
-pkgrel=4
-arch=('x86_64' 'i686')
-url="http://wakaba.c3.cx/s/apps/unarchiver.html"
-license=('LGPL2.1')
-depends=('gnustep-base-libre>=1.23.0' 'openssl' 'bzip2' 'icu' 'gcc-libs' 'zlib')
-conflicts=('gnustep-base>=1.24')
-makedepends=('gcc-objc')
-source=("http://theunarchiver.googlecode.com/files/TheUnarchiver${pkgver}_src.zip")
-
-build() {
-  cd "$srcdir/The Unarchiver/XADMaster"
-
-  # build everything
-  . /usr/share/GNUstep/Makefiles/GNUstep.sh
-  make -f Makefile.linux
-
-  # make libxad into a lib file
-  cd libxad
-  rm -f libxad.a
-  ar rcs libxad.a all.o clients.o unix/emulation.o unix/init.o
-}
-
-package_unarchiver() {
-  pkgdesc="An Objective-C application for uncompressing archive files"
-  arch=('any')
-  depends=(${depends[@]} 'unar>=0.4')
-}
-
-package_unar() {
-  pkgver=0.4
-  pkgdesc="The unar/lsar command line wrappers around libXADMaster"
-
-  cd "$srcdir/The Unarchiver/XADMaster"
-  install -d "$pkgdir/usr/bin"
-  install -m755 unar lsar "$pkgdir/usr/bin"
-}
-
-package_libuniversaldetector() {
-  pkgver=0.4
-  pkgdesc="Some fancy-schmancy Objective-C library that detects things?"
-
-  cd "$srcdir/The Unarchiver/UniversalDetector"
-  install -d "$pkgdir/usr/lib"
-  install libUniversalDetector.a "$pkgdir/usr/lib"
-  install -d "$pkgdir/usr/include"
-  install UniversalDetector.h "$pkgdir/usr/include"
-}
-
-package_libxadmaster() {
-  pkgver=0.4
-  pkgdesc="An Objective-C library built around libxad adding support for other formats"
-  depends+=('libuniversaldetector')
-
-  header_files='
-    CommandLineCommon.h
-    NSStringPrinting.h
-    XADArchive.h
-    XADRegex.h
-    XADUnarchiver.h
-    '
-
-  cd "$srcdir/The Unarchiver/XADMaster"
-  install -d "$pkgdir/usr/lib"
-  install libXADMaster.a "$pkgdir/usr/lib"
-  install -d "$pkgdir/usr/include/XADMaster"
-  install $header_files "$pkgdir/usr/include/XADMaster"
-}
-
-package_libxadmaster-libxad() {
-  pkgver=0.4 # forked from 13.0.2005.06.23 (commit 1.24)
-  pkgdesc="A fork of libxad, the port of the Amiga 'xadmaster.library' to *NIX"
-  depends=('glibc')
-  provides=('libxad')
-  conflicts=('libxad')
-
-  cd "$srcdir/The Unarchiver/XADMaster/libxad"
-  install -d "$pkgdir/usr/lib"
-  install libxad.a "$pkgdir/usr/lib"
-  install -d "$pkgdir/usr/include/libxad"
-  install include/* "$pkgdir/usr/include/libxad"
-}
-
-md5sums=('498ea1c984d5783322e070a71922b422')
diff --git a/libre-testing/xadmaster/PKGBUILD b/libre-testing/xadmaster/PKGBUILD
deleted file mode 100644
index 8f358aae6..000000000
--- a/libre-testing/xadmaster/PKGBUILD
+++ /dev/null
@@ -1,56 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-# NOTE: This currently does not build.
-
-pkgname=xadmaster
-pkgver=13.0.2006.06.21
-pkgrel=1
-pkgdesc="The port of the Amiga 'xadmaster.library' to *NIX"
-arch=('i686' 'x86_64')
-url="http://www.dstoecker.eu/xadmaster.html"
-license=('LGPL2.1')
-groups=()
-depends=('glibc')
-makedepends=('cvs')
-provides=('libxad')
-conflicts=('libxad')
-replaces=()
-backup=()
-options=()
-install=
-source=()
-noextract=()
-md5sums=()
-
-_cvsroot=:pserver:anonymous@libxad.cvs.sourceforge.net:/cvsroot/libxad
-_cvsmod=libxad
-
-build() {
-  cd "$srcdir"
-  msg "Connecting to $_cvsmod.sourceforge.net CVS server...."
-
-  if [[ -d "$_cvsmod/CVS" ]]; then
-    cd "$_cvsmod"
-    cvs -z3 update -d
-  else
-    cvs -z3 -d "$_cvsroot" co -D "$pkgver" -f "$_cvsmod"
-    cd "$_cvsmod"
-  fi
-
-  msg "CVS checkout done or server timeout"
-  msg "Starting build..."
-
-  rm -rf "$srcdir/$_cvsmod-build"
-  cp -r "$srcdir/$_cvsmod" "$srcdir/$_cvsmod-build"
-  cd "$srcdir/$_cvsmod-build"
-
-  # BUILD
-  cd portable
-  autoconf # FIXME: On my system this fails, I don't know what to do
-  ./configure --prefix=/usr
-  make
-}
-
-package() {
-  cd "$srcdir/$_cvsmod-build"
-  make DESTDIR="$pkgdir/" install
-}
diff --git a/libre/aif-libre/PKGBUILD b/libre/aif-libre/PKGBUILD
deleted file mode 100644
index 7decd9531..000000000
--- a/libre/aif-libre/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id$
-# Maintainer: Dieter Plaetinck <dieter@plaetinck.be>
-
-pkgname=aif-libre
-pkgver=2011.08.31
-pkgrel=1
-pkgdesc="The ArchLinux Installation Framework (Parabola Rebranded)"
-arch=('any')
-url="https://projects.parabolagnulinux.org/aif.git"
-license=('GPL3')
-depends=('util-linux-ng' 'bash' 'pacman' 'coreutils' 'grub' 'grep' 'mkinitcpio' 'awk' 'sed' 'libui-sh')
-optdepends=('markdown: to generate the html installation guide'
-            'cryptsetup: for encryption support'
-            'lvm2: for LVM support'
-            'dhcpd: for dhcp networking support'
-            'e2fsprogs: Ext support'
-            'jfsutils: JFS support'
-            'reiserfsprogs: ReiserFS support'
-            'xfsprogs: XFS support'
-            'ntp: setting date with NTP'
-            'dialog: for ncurses support'
-            'curl: for the aif-report-issues.sh script'
-            )
-replaces=('aif')
-conflicts=('aif')
-provides=('aif')
-source=($url/snapshot/aif-${pkgver}.tar.bz2)
-md5sums=('02428484aaf6ce35f2abcccd921c8330')
-
-build() {
-
-  cd $srcdir/aif-$pkgver/
-  
-  make DESTDIR="$pkgdir/" install
-
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/audacity-libre/PKGBUILD b/libre/audacity-libre/PKGBUILD
deleted file mode 100644
index 876c9e71b..000000000
--- a/libre/audacity-libre/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 153455 2012-03-14 17:15:15Z eric $
-# Maintainer: Eric Bélanger <eric@archlinux.org>
-# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
-
-_pkgname=audacity
-pkgname=audacity-libre
-pkgver=2.0.0
-pkgrel=1
-pkgdesc="A program that lets you manipulate digital audio waveforms, libre"
-arch=('i686' 'x86_64')
-url="http://audacity.sourceforge.net/"
-license=('GPL')
-depends=('libmad' 'libid3tag' 'wxgtk' 'lame-libre' 'hicolor-icon-theme'
-	 'desktop-file-utils' 'jack' 'soundtouch' 'ffmpeg')
-options=('!makeflags')
-install=audacity-libre.install
-source=(http://audacity.googlecode.com/files/${_pkgname}-minsrc-${pkgver}.tar.bz2
-	remove-unfree-nyquist.patch
-	audacity-libre.install)
-sha1sums=('0175474e63c51aaa97df9b45574f7f307f1d3bc8'
-          'cda4587458aecf15c41102f86c3b466f80acd0f3'
-          '59e511af919f62b07dd62bab251c56bef6344d70')
-provides=("audacity=$pkgver")
-replaces=('audacity')
-conflicts=('audacity')
-
-build() {
-  cd "${srcdir}/${_pkgname}-src-${pkgver}"
-
-# Removing nyquist
-        rm -rfv {,lib-src/lib}nyquist
-        find -iname '*nyquist*' -print0 | xargs -0 \
-            rm -rfv 
-        patch -Np0 -i ../remove-unfree-nyquist.patch || return 1
-
-  WX_CONFIG=/usr/bin/wx-config ./configure --prefix=/usr \
-    --with-portaudio --with-libsamplerate \
-    --without-libresample --with-libmad \
-    --with-ffmpeg --with-id3tag --with-libflac \
-    --with-vorbis --with-libexpat \
-    --with-libsndfile --with-soundtouch \
-    --enable-unicode --without-taglib \
-    --disable-nyquist #unfree
-  make
-}
-
-package() {
-  cd "${srcdir}/${_pkgname}-src-${pkgver}"
-  make DESTDIR="${pkgdir}" install
-}
diff --git a/libre/audacity-libre/audacity-libre.install b/libre/audacity-libre/audacity-libre.install
deleted file mode 100644
index 028c9f62a..000000000
--- a/libre/audacity-libre/audacity-libre.install
+++ /dev/null
@@ -1,13 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  update-mime-database usr/share/mime &> /dev/null
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/libre/audacity-libre/remove-unfree-nyquist.patch b/libre/audacity-libre/remove-unfree-nyquist.patch
deleted file mode 100644
index b2f9f31e3..000000000
--- a/libre/audacity-libre/remove-unfree-nyquist.patch
+++ /dev/null
@@ -1,24 +0,0 @@
---- Makefile.in.orig	2011-07-01 13:27:11.000000000 -0300
-+++ Makefile.in	2011-07-01 13:27:39.000000000 -0300
-@@ -41,12 +41,6 @@ install: audacity $(EXTRAINSTALLTARGETS)
- 		$(INSTALL) -m 644 help/audacity.1.gz \
- 		$(DESTDIR)$(MANDIR)/man1/$(AUDACITY_NAME).1.gz
- 
--	# install nyquist
--	$(INSTALL) -d $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/nyquist
--	$(INSTALL) -m 644 nyquist/*.lsp nyquist/nyquist-plot.txt $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/nyquist
--	$(INSTALL) -d $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/nyquist/rawwaves
--	$(INSTALL) -m 644 nyquist/rawwaves/*.raw $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/nyquist/rawwaves
--
- 	# install plug-ins
- 	$(INSTALL) -d $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/plug-ins
- 	$(INSTALL) -m 644 plug-ins/*.ny $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/plug-ins
-@@ -103,8 +97,6 @@ uninstall: $(EXTRAUNINSTALLTARGETS)
- 	rm -rf $(DESTDIR)$(DATADIR)/doc/$(AUDACITY_NAME)
- 	# remove man page
- 	rm -rf $(DESTDIR)$(MANDIR)/man1/$(AUDACITY_NAME).1.gz
--	# remove nyquist
--	rm -rf $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/nyquist
- 	# remove plug-ins
- 	rm -rf $(DESTDIR)$(DATADIR)/$(AUDACITY_NAME)/plug-ins
- 	# remove locales
diff --git a/libre/blender-libre/PKGBUILD b/libre/blender-libre/PKGBUILD
index fffb0926b..cbd87f8b2 100644
--- a/libre/blender-libre/PKGBUILD
+++ b/libre/blender-libre/PKGBUILD
@@ -63,7 +63,7 @@ conflicts=($_pkgname)
 [[ $_spn == true ]] && conflicts+=($_pkgname-libre)
 replaces=$_pkgname
 options=(!strip)
-install=$_pkgname.install
+install=$_pkgname-libre.install
 source=http://download.$_pkgname.org/source/$_pkgname-$pkgver.tar.gz
 sha512sums=f4de1f5a0a7868ee509b57ef65962a6c2af4c2bc7328db6ebe7b8e05f771c06efea92977f7a64433e8383382a33dbd73cb42b2bf872e63410e55c19ddd133142
 
diff --git a/libre/cdfs-libre/PKGBUILD b/libre/cdfs-libre/PKGBUILD
deleted file mode 100644
index 1d1fdac79..000000000
--- a/libre/cdfs-libre/PKGBUILD
+++ /dev/null
@@ -1,47 +0,0 @@
-# $Id: PKGBUILD 93210 2013-06-28 18:33:45Z foutrelis $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: J. Santiago Hirschfeld <jsantiagoh@yahoo.com.ar>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-_pkgname=cdfs
-pkgname=cdfs-libre
-pkgver=2.6.27
-_extramodules=extramodules-3.9-LIBRE # Don't forget to update cdfs.install
-pkgrel=48
-pkgdesc="File system module that 'exports' all tracks and boot images on a CD as normal files (built for the linux-libre kernel package)"
-arch=(i686 x86_64 mips64el)
-url="http://www.elis.UGent.be/~ronsse/cdfs/"
-license=('GPL')
-depends=('linux-libre>=3.9' 'linux-libre<3.10')
-makedepends=('linux-libre-headers')
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
-install=cdfs.install
-source=("http://www.elis.UGent.be/~ronsse/cdfs/download/$_pkgname-$pkgver.tar.bz2"
-	"cdfs-3.0.patch"
-	"cdfs-3.2.patch"
-	"cdfs-3.4.patch"
-	"cdfs-3.8.patch")
-md5sums=('ac64c014a90e3c488394832ea29605b3'
-         'aba7da94a9dcbb8a93ea423cb6958fef'
-         'e934407b3460257a301822ffc4ab3933'
-         '9215e7bdac728bd2f889fb525e543454'
-         'b036fd72b033294605bec2b60a73e3bd')
-
-build() {
-  _kernver="$(cat /usr/lib/modules/${_extramodules}/version)"
-
-  cd $srcdir/$_pkgname-$pkgver
-  patch -p1 <$srcdir/cdfs-3.0.patch
-  patch -p1 <$srcdir/cdfs-3.2.patch
-  patch -p1 <$srcdir/cdfs-3.4.patch
-  patch -p1 <$srcdir/cdfs-3.8.patch
-  make KDIR=/usr/lib/modules/${_kernver}/build
-  sed -i "s/EXTRAMODULES='.*'/EXTRAMODULES='$_extramodules'/" $startdir/cdfs.install
-}
-
-package() {
-  cd $srcdir/$_pkgname-$pkgver
-  install -Dm0644 cdfs.ko $pkgdir/usr/lib/modules/$_extramodules/cdfs.ko
-}
diff --git a/libre/cdfs-libre/cdfs-3.0.patch b/libre/cdfs-libre/cdfs-3.0.patch
deleted file mode 100644
index 20194b848..000000000
--- a/libre/cdfs-libre/cdfs-3.0.patch
+++ /dev/null
@@ -1,274 +0,0 @@
-diff -wbBur cdfs-2.6.27/cddata.c cdfs-2.6.27.my/cddata.c
---- cdfs-2.6.27/cddata.c	2009-12-21 17:04:03.000000000 +0300
-+++ cdfs-2.6.27.my/cddata.c	2011-07-24 21:18:44.000000000 +0400
-@@ -83,7 +83,7 @@
- #else
-   .mmap             = generic_file_readonly_mmap,
- #if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,27)
--  .sendfile         = generic_file_sendfile
-+//  .sendfile         = generic_file_sendfile
- #else
-   .splice_read      = generic_file_splice_read
- #endif
-diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c
---- cdfs-2.6.27/root.c	2009-12-21 16:38:31.000000000 +0300
-+++ cdfs-2.6.27.my/root.c	2011-07-25 13:16:59.000000000 +0400
-@@ -32,19 +30,14 @@
-  *	Added code to transform /proc/cdfs into a sequential synthetic file.  *
-  *++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*/
- 
--
- #include <linux/seq_file.h>
--
--#ifndef OLD_KERNEL
- #include <linux/statfs.h>
--#endif
-+#include <linux/sched.h>
- 
- extern struct seq_operations cdfs_operations;
- extern struct _track_info *dummy_track_p;
- 
--#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24) 
- struct inode *cdfs_iget(struct super_block *sp, unsigned long ino); 
--#endif
- /*============================================================================*
-  *  cdfs_open()                                                               *
-  *	Description:                                                          *
-@@ -115,15 +108,8 @@
- 
- /********************************************************************/
- 
--#ifdef OLD_KERNEL
--static struct super_block * cdfs_mount(struct super_block *sb, void *data, int silent){
--  kdev_t dev = sb->s_dev;
--  int i, j, t;
--  struct cdrom_tochdr  hdr;
--#else
- static int cdfs_fill_super(struct super_block *sb, void *data, int silent){
-   int i, t;
--#endif
-   struct cdrom_tocentry   entry;   
-   int no_audio=0, no_data=0;
-   cd * this_cd;
-@@ -131,24 +117,13 @@
- 
-   PRINT("cdfs_mount\n");
- 
--#ifdef OLD_KERNEL
--  MOD_INC_USE_COUNT;
--
--  set_blocksize(dev, CD_FRAMESIZE);  // voor bread met ide-cd
--#else
-   sb_set_blocksize(sb, CD_FRAMESIZE);  // voor bread met ide-cd
--#endif
- 
-   sb->s_blocksize = CD_FRAMESIZE;
-   sb->s_blocksize_bits = 11;
- 
-   if (!(this_cd = cdfs_info(sb) = kmalloc(sizeof(cd), GFP_KERNEL))){
--#ifdef OLD_KERNEL
--    MOD_DEC_USE_COUNT;     
--    return NULL;
--#else
-     return -ENOMEM;
--#endif
-   }
- 
-   this_cd->mode           = MODE;
-@@ -160,13 +135,8 @@
- 
-   // Initialize cache for maximum sector size
-   if (!(this_cd->cache = kmalloc(CD_FRAMESIZE_RAWER*CACHE_SIZE, GFP_KERNEL))) {
--#ifdef OLD_KERNEL
--    MOD_DEC_USE_COUNT;
--    return NULL;
--#else
-     kfree(cdfs_info(sb));
-     return -ENOMEM;
--#endif
-   }
- 
-   // Cache is still invalid
-@@ -183,23 +153,13 @@
-   if (this_cd->toc_scsi){
-     if (cdfs_toc_read_full(sb)){
-       printk("TOC read failed\n");
--#ifdef OLD_KERNEL
--      MOD_DEC_USE_COUNT;
--      return NULL;
--#else
-       goto invalid;
--#endif
-     }
-   } else {
-     //if (cdfs_ioctl(sb, CDROMREADTOCHDR, (unsigned long)&hdr)){
-     if (cdfs_toc_read(sb)){
-       printk("cdfs_toc_read failed\n");
--#ifdef OLD_KERNEL
--      MOD_DEC_USE_COUNT;
--      return NULL;
--#else
-       goto invalid;
--#endif
-     }
-   }
- 
-@@ -365,11 +325,7 @@
-   sb->s_flags |= MS_RDONLY;
-   sb->s_op     = &cdfs_ops;
-   /* always get inode status */
--#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24)
-   retinode=cdfs_iget(sb, 0);
--#else
--  retinode=iget(sb, 0);
--#endif
-   if ( IS_ERR(retinode) )
-     return PTR_ERR(retinode);
- 
-@@ -379,16 +335,12 @@
- 
-   cdfs_proc_cd = this_cd;
- 
--#ifdef OLD_KERNEL
--  return sb;
--#else
-   return 0;
- 
- invalid:
-   kfree(this_cd->cache);
-   kfree(cdfs_info(sb));
-   return -EINVAL;
--#endif
- }
- 
- /************************************************************************/
-@@ -410,27 +362,12 @@
-   // Remove /proc entry
-   cdfs_proc_cd = NULL; 
-   kfree(cdfs_info(sb));
--
--#ifdef OLD_KERNEL
--  MOD_DEC_USE_COUNT;
--#endif
--
- }
- 
- /************************************************************************/
- 
--#ifdef OLD_KERNEL
--static int cdfs_statfs(struct super_block *sb, struct statfs *buf) {
--  cd * this_cd = cdfs_info(sb);
--#else
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
- static int cdfs_statfs(struct dentry *d, struct kstatfs *buf) {
-   cd * this_cd = cdfs_info(d->d_sb);
--#else
--static int cdfs_statfs(struct super_block *sb, struct kstatfs *buf) {
--  cd * this_cd = cdfs_info(sb);
--#endif
--#endif
-   PRINT("rmfs_statfs\n");
- 
-   buf->f_type    = CDFS_MAGIC;
-@@ -460,11 +397,7 @@
- 
- /************************************************************************/
- 
--#ifdef OLD_KERNEL
--static struct dentry * cdfs_lookup(struct inode *dir, struct dentry *dentry){
--#else
- static struct dentry * cdfs_lookup(struct inode *dir, struct dentry *dentry, struct nameidata *nd){
--#endif
-   struct inode * inode;
-   int i;
-   cd * this_cd = cdfs_info(dir->i_sb);
-@@ -480,15 +413,9 @@
- /* Use goto and read inode with iget()/cdfs_iget() */
- /* Thanks to David Howells for patch and Master class in his mail */
- found:
--#if LINUX_VERSION_CODE > KERNEL_VERSION(2,6,24)
- inode = cdfs_iget(dir->i_sb, i);
- if (IS_ERR(inode))
-   return ERR_CAST(inode);
--#else
--  inode = iget(dir->i_sb, i);
--  if (!inode)
--    return ERR_PTR(-ENOMEM);
--#endif
- d_add(dentry, inode);
- return NULL;
- }
-@@ -529,12 +456,8 @@
-     i->i_fop   = &cdfs_dir_operations;
-   } else {                                          /* file */
-     i->i_size  = this_cd->track[i->i_ino].size;
--#ifdef OLD_KERNEL
--    i->i_mtime = i->i_atime = i->i_ctime = this_cd->track[i->i_ino].time;
--#else
-     i->i_mtime.tv_sec = i->i_atime.tv_sec = i->i_ctime.tv_sec = this_cd->track[i->i_ino].time;
-     i->i_mtime.tv_nsec = i->i_atime.tv_nsec = i->i_ctime.tv_nsec = 0;
--#endif
-     i->i_mode  = this_cd->mode;
-     if ((this_cd->track[i->i_ino].type==DATA) && this_cd->track[i->i_ino].iso_size) {
-       i->i_fop          = &cdfs_cddata_file_operations; 
-@@ -587,33 +510,21 @@
- /******************************************************************/
- 
- static struct super_operations cdfs_ops = {
--#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,25)
--  .read_inode = cdfs_read_inode,
--#endif
-   .put_super  = cdfs_umount,
-   .statfs     = cdfs_statfs
- };
- 
--#ifdef OLD_KERNEL
--static DECLARE_FSTYPE_DEV(cdfs_fs_type, FSNAME, cdfs_mount);
--#else
--#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,18)
--static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) {
--  return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super, mnt);
--#else
--static struct super_block *cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data) {
--  return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super);
--#endif
--}
-+//static int cdfs_get_sb(struct file_system_type *fs_type, int flags, const char *dev_name, void *data, struct vfsmount *mnt) {
-+//  return get_sb_bdev(fs_type, flags, dev_name, data, cdfs_fill_super, mnt);
-+//}
- 
- static struct file_system_type cdfs_fs_type = {
-   .owner    = THIS_MODULE,
-   .name     = "cdfs",
--  .get_sb   = cdfs_get_sb,
-+//  .get_sb   = cdfs_get_sb,
-   .kill_sb  = kill_block_super,
-   .fs_flags = FS_REQUIRES_DEV
- };
--#endif
- 
- /******************************************************/
- 
-@@ -621,10 +532,6 @@
- MODULE_DESCRIPTION("CDfs: a CD filesystem");
- MODULE_LICENSE("GPL"); 
- 
--#ifdef OLD_KERNEL
--EXPORT_NO_SYMBOLS;
--#endif
--
- /******************************************************************/
- 
- static int __init cdfs_init(void) {
-@@ -676,11 +583,7 @@
-   
-   if (!options) return;
-   
--#ifdef OLD_KERNEL
--  for (this_char = strtok(options,","); this_char; this_char = strtok(NULL,",")) {
--#else
-   while ((this_char = strsep(&options,",")) != NULL) {
--#endif
-     
-     if (!strcmp(this_char,"single")) 
-       this_cd->single=TRUE;
diff --git a/libre/cdfs-libre/cdfs-3.2.patch b/libre/cdfs-libre/cdfs-3.2.patch
deleted file mode 100644
index d3300bdbc..000000000
--- a/libre/cdfs-libre/cdfs-3.2.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c
---- cdfs-2.6.27/root.c	2009-12-21 16:38:31.000000000 +0300
-+++ cdfs-2.6.27.my/root.c	2012-01-18 11:23:03.000000000 +0400
-@@ -517,7 +517,7 @@
-   
-   i->i_uid        = this_cd->uid;
-   i->i_gid        = this_cd->gid;
--  i->i_nlink      = 1;
-+  i->__i_nlink      = 1;
-   i->i_op         = &cdfs_inode_operations;
-   i->i_fop        = NULL;
-   i->i_data.a_ops = NULL;
diff --git a/libre/cdfs-libre/cdfs-3.4.patch b/libre/cdfs-libre/cdfs-3.4.patch
deleted file mode 100644
index 5c2cb9b24..000000000
--- a/libre/cdfs-libre/cdfs-3.4.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -wbBur cdfs-2.6.27/root.c cdfs-2.6.27.my/root.c
---- cdfs-2.6.27/root.c	2009-12-21 16:38:31.000000000 +0300
-+++ cdfs-2.6.27.my/root.c	2012-06-15 17:09:27.000000000 +0400
-@@ -375,7 +375,7 @@
- 
-   PRINT("retinode = %ld\n", retinode->i_ino);
- 
--  sb->s_root   = d_alloc_root(retinode);
-+  sb->s_root   = d_make_root(retinode);
- 
-   cdfs_proc_cd = this_cd;
- 
diff --git a/libre/cdfs-libre/cdfs-3.8.patch b/libre/cdfs-libre/cdfs-3.8.patch
deleted file mode 100644
index 10d9c8b47..000000000
--- a/libre/cdfs-libre/cdfs-3.8.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -upr cdfs-2.6.27.orig/daemon.c cdfs-2.6.27/daemon.c
---- cdfs-2.6.27.orig/daemon.c	2009-12-21 16:02:50.000000000 +0200
-+++ cdfs-2.6.27/daemon.c	2013-02-21 06:14:45.000000000 +0200
-@@ -158,7 +158,6 @@ int kcdfsd_thread(void *unused){
-   exit_files(current);  /* daemonize doesn't do exit_files */
-   daemonize();
- #else
--  daemonize("k"FSNAME"d");
- 
-   /* Allow SIGTERM to quit properly when removing module */
-   /* By default with daemonize all signals are dropped */
-diff -upr cdfs-2.6.27.orig/root.c cdfs-2.6.27/root.c
---- cdfs-2.6.27.orig/root.c	2009-12-21 15:38:31.000000000 +0200
-+++ cdfs-2.6.27/root.c	2013-02-21 06:15:20.000000000 +0200
-@@ -25,6 +25,7 @@
- #include "cdfs.h"
- 
- #include <linux/module.h>
-+#include <linux/kthread.h>
- 
- 
- /*++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++*
-@@ -643,14 +644,15 @@ static int __init cdfs_init(void) {
-   cdfs_proc_cd=NULL;
- 
-   // start kernel thread
--  if ((kcdfsd_pid = kernel_thread(kcdfsd_thread, NULL, CLONE_FS | CLONE_FILES | CLONE_SIGHAND)) >0 ) {
--    return 0;
--  } else {
--    printk(FSNAME" kernel_thread failed.\n");
-+  kcdfsd_pid = kthread_run(kcdfsd_thread, NULL, "kcdfsd_thread");
-+  if (IS_ERR(kcdfsd_pid)) {
-+    printk(FSNAME" kthread_run failed.\n");
-     if (cdfs_proc_entry) remove_proc_entry(FSNAME, NULL);
-     unregister_filesystem(&cdfs_fs_type);
-     return -1;
-   }
-+
-+  return 0;
- }
- 
- /******************************************************************/
diff --git a/libre/cdfs-libre/cdfs.install b/libre/cdfs-libre/cdfs.install
deleted file mode 100644
index 14b056a11..000000000
--- a/libre/cdfs-libre/cdfs.install
+++ /dev/null
@@ -1,14 +0,0 @@
-post_install() {
-  EXTRAMODULES='extramodules-3.9-LIBRE'
-  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_upgrade() {
-  EXTRAMODULES='extramodules-3.9-LIBRE'
-  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_remove() {
-  EXTRAMODULES='extramodules-3.9-LIBRE'
-  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
diff --git a/libre/cgminer-libre/PKGBUILD b/libre/cgminer-libre/PKGBUILD
deleted file mode 100644
index 09608d1fa..000000000
--- a/libre/cgminer-libre/PKGBUILD
+++ /dev/null
@@ -1,101 +0,0 @@
-# $Id: PKGBUILD 100525 2013-11-05 13:41:39Z fyan $
-# Maintainer: Felix Yan <felixonmars@gmail.com>
-# Contributor: monson <holymonson@gmail.com>
-# Contributor: Thomas Dziedzic < gostrc at gmail >
-# Contributor: David Manouchehri <david@davidmanouchehri.com>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-_pkgname=cgminer
-pkgname=cgminer-libre
-pkgver=3.7.2
-#_pkgver=3.6.6
-_pkgver=$pkgver
-pkgrel=1
-pkgdesc="Multi-threaded multi-pool GPU, FPGA and ASIC miner for bitcoin and derivative coins, without nonfree OpenCL recommendation"
-url='http://forum.bitcoin.org/index.php?topic=28402.0'
-license=('GPL3')
-arch=('i686' 'x86_64' 'mips64el')
-depends=('curl' 'mesa-libcl' 'libusbx' 'jansson')
-makedepends=('opencl-headers' 'git')
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
-source=("git+https://github.com/ckolivas/${_pkgname}.git#tag=v$_pkgver"
-        "$_pkgname.conf.d"
-        "$_pkgname.service")
-backup=("etc/conf.d/$_pkgname" "etc/$_pkgname.conf")
-
-[ "$CARCH" == "x86_64" ] && makedepends+=('yasm')
-
-prepare() {
-  cd $_pkgname
-  # We have latest jansson and libusb - just use them
-
-  sed -e 's|^AC_CONFIG_SUBDIRS.*compat/jansson-2\.5.*||' \
-      -e 's|JANSSON_LIBS="compat/jansson-2\.5/src/\.libs/libjansson\.a"|JANSSON_LIBS=-ljansson|' \
-      -e 's|compat/Makefile||' \
-      -i ./configure.ac
-
-  sed -e 's|^JANSSON_INCLUDES= .*||' \
-      -e 's|^USBUTILS_INCLUDES = .*|USBUTILS_INCLUDES = -I/usr/include/libusb-1.0|' \
-      -e 's|^SUBDIRS.*|SUBDIRS = lib ccan|' \
-      -i ./Makefile.am
-
-  #sed "s|ac_subdirs_all='compat/libusb\-1.0\ncompat/jansson-2.5'||" -i ./configure
-  #sed 's|subdirs="$subdirs compat/libusb\-1.0"||' -i ./configure
-  #sed 's|subdirs="$subdirs compat/jansson\-2.5"||' -i ./configure
-  #sed 's|LIBUSB_LIBS="compat/libusb-1.0/libusb/.libs/libusb-1.0.a"|LIBUSB_LIBS=-lusb-1.0|' -i ./configure
-  #sed 's|JANSSON_LIBS="compat/jansson-2.5/src/.libs/libjansson.a"|JANSSON_LIBS=-ljansson|' -i ./configure
-  #sed 's|compat/Makefile ||' -i ./configure
-
-  #sed 's|JANSSON_INCLUDES = .*||' -i ./Makefile.in
-  #sed 's|USBUTILS_INCLUDES = .*|USBUTILS_INCLUDES = -I/usr/include/libusb-1.0|' -i ./Makefile.in
-  #sed 's|SUBDIRS = lib compat ccan|SUBDIRS = lib ccan|' -i ./Makefile.in
-
-  rm -r compat
-}
-
-build() {
-  cd $_pkgname
-  
-  # Here you may want to use custom CFLAGS
-  #export CFLAGS="-O2 -march=native -mtune=native -msse2"
-  
-  # ./configure \
-
-  ./autogen.sh \
-    --prefix=/usr \
-    --enable-scrypt \
-    --enable-opencl \
-    --enable-bflsc \
-    --enable-bitforce \
-    --enable-icarus \
-    --enable-modminer \
-    --enable-avalon \
-    --enable-klondike \
-    --enable-bitfury \
-    --enable-hashfast \
-    --enable-knc \
-    --with-system-libusb \
-    --disable-adl # For license issues
-  
-  make
-}
-
-package() {
-  cd $_pkgname
-
-  make DESTDIR="$pkgdir" install
-
-  install -d "$pkgdir/usr/share/$_pkgname"
-  install -m755 miner.php api-example.* "$pkgdir/usr/share/$_pkgname"
-
-  install -Dm644 "$srcdir"/$_pkgname.service "$pkgdir"/usr/lib/systemd/system/$_pkgname.service
-  install -Dm644 "$srcdir"/$_pkgname.conf.d "$pkgdir"/etc/conf.d/$_pkgname
-  sed 's#/usr/local/bin#/usr/bin#g' example.conf > $_pkgname.conf
-  install -Dm644 $_pkgname.conf "$pkgdir"/etc/$_pkgname.conf
-}
-
-sha512sums=('SKIP'
-            '99c38bc395848f9712ce172343d31f5c60f5d8ac1cfe2f48df8f3ec6c488fc275763a79c5ef36b99f32faa465b5a65284b38e8a63ef9b144075ee13971313b41'
-            '3317b60c6b1f14c47d8ee636113ef40a4023ab14054129de80a37947b381fd2b647a7053f4e1bb639efa225a514e862fa531908714c34040dda2d6221dde7f5f')
diff --git a/libre/cgminer-libre/cgminer.conf.d b/libre/cgminer-libre/cgminer.conf.d
deleted file mode 100644
index 88ec535d6..000000000
--- a/libre/cgminer-libre/cgminer.conf.d
+++ /dev/null
@@ -1,11 +0,0 @@
-# Use JSON-format configuration. (recommended)
-CGMINER_CONF="/etc/cgminer.conf"
-
-# Uncommend this if you prefer simple command-line arguments.
-#CGMINER_CONF=""
-#CGMINER_PROTOCOL="http"
-#CGMINER_IP="127.0.0.1"
-#CGMINER_PORT="8332"
-#CGMINER_USER="username"
-#CGMINER_PASS="password"
-CGMINER_ARGS="--syslog"
diff --git a/libre/cgminer-libre/cgminer.service b/libre/cgminer-libre/cgminer.service
deleted file mode 100644
index 84461879f..000000000
--- a/libre/cgminer-libre/cgminer.service
+++ /dev/null
@@ -1,8 +0,0 @@
-[Unit]
-Description=Multi-threaded multi-pool CPU and GPU miner for bitcoin
-
-[Service]
-ExecStart=/usr/bin/cgminer -T --config /etc/cgminer.conf --syslog
-
-[Install]
-WantedBy=multi-user.target
diff --git a/libre/claws-mail-libre/PKGBUILD b/libre/claws-mail-libre/PKGBUILD
deleted file mode 100644
index 723f4c5d2..000000000
--- a/libre/claws-mail-libre/PKGBUILD
+++ /dev/null
@@ -1,76 +0,0 @@
-# $Id$
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Maintainer (Parabola): Márcio Silva <coadde@lavabit.com>
-
-_pkgname=claws-mail
-pkgname=$_pkgname-libre
-pkgver=3.9.2
-pkgrel=3
-pkgdesc='A GTK+ based e-mail client, without nonfree PalmOS handheld devices support'
-arch=('i686' 'x86_64' 'mips64el')
-license=('GPL3')
-url="http://www.$_pkgname.org"
-depends=('gtk2' 'gnutls' 'startup-notification' 'enchant'
-         'gpgme' 'libetpan>=1.1-4' 'libsm' 'dbus-glib' 'hicolor-icon-theme' 'desktop-file-utils')
-makedepends=('compface' 'spamassassin' 'bogofilter' 'valgrind' 
-             # dependencies for plugins
-             'libsoup' 'libgdata' 'webkitgtk2' 'libnotify' 'libcanberra' 'poppler-glib' 'pygtk') 
-             #'libchamplain' needed for geolocation plugin, disabled for now - most time it's not compatible with current gnome releases
-optdepends=('python2:           needed for some tools and python plugin'
-            'perl:              needed for some tools and perl plugin'
-            'spamassassin:      adds support for spamfiltering'
-            'bogofilter:        adds support for spamfiltering'
-            'libnotify:         for notification plugin'
-            'libcanberra:       for notification plugin'
-            'dbus:              for notification plugin'
-            'libxml2:           for gtkhtml2_viewer and rssyl plugins'
-            'curl:              for gtkhtml2_viewer, vcalendar, rssyl and spamreport plugins'
-            'libarchive:        for archive plugin and various other plugins'
-            'libytnef:          for tnef_parse plugin'
-            'webkitgtk2:        for the fancy webkit html plugin'
-            'libsoup:           for the fancy webkit html plugin'
-	        'libgdata:          for gdata plugin'
-	        'poppler-glib:      for pdf viewer plugin'
-	        'ghostscript:       for pdf viewer plugin')
-replaces=("$_pkgname" "sylpheed-claws" "$_pkgname-extra-plugins")
-conflicts=("$_pkgname" "$_pkgname-extra-plugins")
-provides=("$_pkgname=$pkgver" 'claws')
-options=(!libtool)
-install=$_pkgname.install
-source=(http://downloads.sourceforge.net/sourceforge/sylpheed-claws/$_pkgname-$pkgver.tar.bz2{,.asc})
-md5sums=('90de2a265e65fbd9dffdbf428bb0ee28'
-         'SKIP')
-
-build() {
-  cd $srcdir/$_pkgname-$pkgver
-
-  # fixes for python2
-  export PYTHON="/usr/bin/python2"
-  sed -i 's@^#!.*python.*@#!/usr/bin/python2@' tools/*.py
-  sed -i 's:python -c:python2 -c:g' configure
-
-  setarch $CARCH ./configure --prefix=/usr --disable-static \
-    --enable-enchant \
-    --enable-gnutls \
-    --enable-ldap \
-    --enable-crash-dialog \
-    --enable-pgpmime-plugin \
-    --enable-spamassassin-plugin \
-    --enable-bogofilter-plugin \
-    --disable-jpilot \
-    #--help
-  setarch $CARCH make
-}
-
-package() {
-  cd $srcdir/$_pkgname-$pkgver
-  setarch $CARCH make DESTDIR=$pkgdir install
-
-  # build and install extra tools
-  cd tools
-  setarch $CARCH make
-   # all executables and .conf files ; only top directory
-  find -maxdepth 1 -type f -and -perm /111 -or -name '*.conf' | while read i ; do
-    install -D -m755 $i $pkgdir/usr/lib/$_pkgname/tools/$i
-  done
-}
diff --git a/libre/claws-mail-libre/claws-mail.install b/libre/claws-mail-libre/claws-mail.install
deleted file mode 100644
index 4d2f155d4..000000000
--- a/libre/claws-mail-libre/claws-mail.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-  echo "install \"html2ps\" from AUR to add support for printing html mails with fancy plugin"
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_upgrade() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
-post_remove() {
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-  update-desktop-database -q
-}
-
diff --git a/libre/clementine-libre/PKGBUILD b/libre/clementine-libre/PKGBUILD
index 82baa8f5d..bbccfc541 100644
--- a/libre/clementine-libre/PKGBUILD
+++ b/libre/clementine-libre/PKGBUILD
@@ -26,14 +26,16 @@ replaces=('clementine')
 conflicts=('clementine')
 provides=("clementine=$pkgver")
 install=clementine.install
-source=("http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz"
-        'remove-nonfree-artwork-and-spotify.patch'
-        'moognu.png')
-sha256sums=('db556e8bf230e2535636f5736a62ffe24ce154481fb05123e8395ab4aa64654e'
-            '13c12cb47a9bb4585014512ebf2c9e81f8ab35afee255f35360acb0f388e21db'
-            'c6918617769152f3617c61f721819e69d03f671b85760b11cfe45abd53955bc4')
+source=("https://repo.parabolagnulinux.org/sources/${pkgname}-${pkgver}.tar.gz")
+sha256sums=('c376dd2cc346ad1f9828d3731e2bfb03cd0b4d06ea2b23d4b2caaf9351812ec2')
+mksource=("http://clementine-player.googlecode.com/files/${_pkgname}-${pkgver}.tar.gz"
+          'remove-nonfree-artwork-and-spotify.patch'
+          'moognu.png')
+mksha256sums=('db556e8bf230e2535636f5736a62ffe24ce154481fb05123e8395ab4aa64654e'
+              '13c12cb47a9bb4585014512ebf2c9e81f8ab35afee255f35360acb0f388e21db'
+              'c6918617769152f3617c61f721819e69d03f671b85760b11cfe45abd53955bc4')
 
-prepare() {
+mksource() {
   cd ${_pkgname}-${pkgver}
 
   # remove nonfree nonfree artwork and spotify references on files
diff --git a/libre/distcc-nozeroconf/PKGBUILD b/libre/distcc-nozeroconf/PKGBUILD
deleted file mode 100644
index 2537b2f87..000000000
--- a/libre/distcc-nozeroconf/PKGBUILD
+++ /dev/null
@@ -1,59 +0,0 @@
-# $Id: PKGBUILD 90657 2013-05-13 14:21:37Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer: Judd Vinet <jvinet@zeroflux.org>
-# Contributor: Giovanni Scafora <giovanni@archlinux.org>
-
-_pkgname=distcc
-pkgname=distcc-nozeroconf
-pkgver=3.1
-provides=("$_pkgname=$pkgver")
-conflicts=("$_pkgname")
-pkgrel=11
-pkgdesc="A distributed C, C++, Obj C compiler (without zeroconf support)"
-arch=('i686' 'x86_64')
-url="http://code.google.com/p/distcc/"
-license=('GPL')
-depends=('gcc' 'popt')
-makedepends=('gtk2' 'pkgconfig' 'python2')
-optdepends=('gtk2: for distccmon-gnome'
-	    'python2')
-backup=('etc/conf.d/distccd'
-	'etc/distcc/hosts')
-source=(http://distcc.googlecode.com/files/${_pkgname}-${pkgver}.tar.bz2
-	distccd.conf.d
-	distccd.service)
-md5sums=('a1a9d3853df7133669fffec2a9aab9f3'
-         '239aae53250e3e35288cba566bc0bbf1'
-         '09f0688da9c1840e518d2593bd5c3830')
-
-build() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-
-  [ -f Makefile ] || PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-	--with-gtk \
-	--sysconfdir=/etc \
-	--mandir=/usr/share/man \
-	--without-avahi
-
-  make WERROR_CFLAGS= INCLUDESERVER_PYTHON=/usr/bin/python2
-}
-
-check() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-#  make TEST_PYTHON=/usr/bin/python2 check
-}
-
-package() {
-  cd "${srcdir}/${_pkgname}-${pkgver}"
-  make DESTDIR="${pkgdir}/" INCLUDESERVER_PYTHON=/usr/bin/python2 install
-  install -D -m644 ${srcdir}/distccd.conf.d ${pkgdir}/etc/conf.d/distccd
-
-  install -d ${pkgdir}/usr/lib/${_pkgname}/bin
-  ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/cc
-  ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/gcc
-  ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/g++
-  ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/c++
-  ln -sf /usr/bin/${_pkgname} ${pkgdir}/usr/lib/${_pkgname}/bin/cpp
-
-  install -Dm0644 $srcdir/distccd.service $pkgdir/usr/lib/systemd/system/distccd.service
-}
diff --git a/libre/distcc-nozeroconf/distccd.conf.d b/libre/distcc-nozeroconf/distccd.conf.d
deleted file mode 100644
index 2fe7a4cc6..000000000
--- a/libre/distcc-nozeroconf/distccd.conf.d
+++ /dev/null
@@ -1,7 +0,0 @@
-#
-# Parameters to be passed to distccd
-#
-# You must explicitly add IPs (or subnets) that are allowed to connect,
-# using the --allow switch.  See the distccd manpage for more info.
-#
-DISTCC_ARGS="--allow 127.0.0.1"
diff --git a/libre/distcc-nozeroconf/distccd.service b/libre/distcc-nozeroconf/distccd.service
deleted file mode 100644
index 0b72fecc3..000000000
--- a/libre/distcc-nozeroconf/distccd.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=A distributed C/C++ compiler
-Documentation=man:distccd(1)
-After=network.target
-
-[Service]
-User=nobody
-EnvironmentFile=/etc/conf.d/distccd
-ExecStart=/usr/bin/distccd --no-detach --daemon $DISTCC_ARGS
-
-[Install]
-WantedBy=multi-user.target
diff --git a/libre/foomatic-filters-libre/PKGBUILD b/libre/foomatic-filters-libre/PKGBUILD
deleted file mode 100644
index c05a01e86..000000000
--- a/libre/foomatic-filters-libre/PKGBUILD
+++ /dev/null
@@ -1,38 +0,0 @@
-# $Id: PKGBUILD 185778 2013-05-18 16:33:20Z andyrtr $
-# Maintainer: Andreas Radke <andyrtr@archlinux.org>
-# Contributor (Parabola): André Silva <emulatorman@parabola.nu>
- 
-pkgbase="foomatic"
-pkgname=('foomatic-filters-libre')
-arch=('i686' 'x86_64' 'mips64el') # needs to be changed  in the subpackages when makepkg will support it
-_snapdate=20130518
-_filtersver=4.0.17
-pkgver=${_filtersver}_${_snapdate}
-pkgrel=1
-epoch=1
-makedepends=('cups' 'perl' 'libxml2' 'enscript' 'perl' 'net-snmp' 'bash')
-source=(http://www.openprinting.org/download/foomatic/$pkgbase-filters-${_filtersver}.tar.gz)
-url="http://www.linuxprinting.org/foomatic.html"
-options=('!emptydirs')
-md5sums=('b05f5dcbfe359f198eef3df5b283d896')
-
-package_foomatic-filters-libre() {
-
- pkgdesc="Foomatic - Filter scripts used by the printer spoolers to convert the incoming PostScript data into the printer's native format, without nonfree scripts"
-# arch=('i686' 'x86_64')
- license=('GPL')
- backup=(etc/foomatic/filter.conf)
- depends=('glibc' 'dbus-core')
- provides=("foomatic-filters=${pkgver}")
- replaces=('foomatic-filters')
- conflicts=('foomatic-filters')
- optdepends=('perl:      for the "beh" Backend End Handler used by cups'
-            'net-snmp:  certain (mostly HP) printers need it to work')
-
-   cd ${srcdir}/foomatic-filters-${_filtersver}
-   # remove nonfree scripts
-   rm -rfv test/{lsbfuncs,shfuncs,tcm,tetapi}.sh
-   ./configure --prefix=/usr --sysconfdir=/etc
-   make
-   make DESTDIR=${pkgdir} install
-}
diff --git a/libre/gsoap-legacy/LICENSE b/libre/gsoap-legacy/LICENSE
deleted file mode 100644
index 00b8ad810..000000000
--- a/libre/gsoap-legacy/LICENSE
+++ /dev/null
@@ -1,163 +0,0 @@
-gSOAP Public License
-Version 1.3a
-The gSOAP public license is derived from the Mozilla Public License (MPL1.1). The sections that were deleted from the original MPL1.1 text are 1.0.1, 2.1.(c),(d), 2.2.(c),(d), 8.2.(b), 10, and 11. Section 3.8 was added. The modified sections are 2.1.(b), 2.2.(b), 3.2 (simplified), 3.5 (deleted the last sentence), and 3.6 (simplified).
-1  DEFINITIONS.
-
-1.0.1.
-1.1. "Contributor"
-    means each entity that creates or contributes to the creation of Modifications.
-1.2. "Contributor Version"
-    means the combination of the Original Code, prior Modifications used by a Contributor, and the Modifications made by that particular Contributor.
-1.3. "Covered Code"
-    means the Original Code, or Modifications or the combination of the Original Code, and Modifications, in each case including portions thereof.
-1.4. "Electronic Distribution Mechanism"
-    means a mechanism generally accepted in the software development community for the electronic transfer of data.
-1.5. "Executable"
-    means Covered Code in any form other than Source Code.
-1.6. "Initial Developer"
-    means the individual or entity identified as the Initial Developer in the Source Code notice required by Exhibit A.
-1.7. "Larger Work"
-    means a work which combines Covered Code or portions thereof with code not governed by the terms of this License.
-1.8. "License"
-    means this document.
-1.8.1. "Licensable"
-    means having the right to grant, to the maximum extent possible, whether at the time of the initial grant or subsequently acquired, any and all of the rights conveyed herein.
-1.9. "Modifications"
-    means any addition to or deletion from the substance or structure of either the Original Code or any previous Modifications. When Covered Code is released as a series of files, a Modification is:
-
-    A.
-        Any addition to or deletion from the contents of a file containing Original Code or previous Modifications.
-    B.
-        Any new file that contains any part of the Original Code, or previous Modifications. 
-
-1.10. "Original Code"
-    means Source Code of computer software code which is described in the Source Code notice required by Exhibit A as Original Code, and which, at the time of its release under this License is not already Covered Code governed by this License.
-1.10.1. "Patent Claims"
-    means any patent claim(s), now owned or hereafter acquired, including without limitation, method, process, and apparatus claims, in any patent Licensable by grantor.
-1.11. "Source Code"
-    means the preferred form of the Covered Code for making modifications to it, including all modules it contains, plus any associated interface definition files, scripts used to control compilation and installation of an Executable, or source code differential comparisons against either the Original Code or another well known, available Covered Code of the Contributor's choice. The Source Code can be in a compressed or archival form, provided the appropriate decompression or de-archiving software is widely available for no charge.
-1.12. "You" (or "Your")
-    means an individual or a legal entity exercising rights under, and complying with all of the terms of, this License or a future version of this License issued under Section 6.1. For legal entities, "You" includes any entity which controls, is controlled by, or is under common control with You. For purposes of this definition, "control" means (a) the power, direct or indirect, to cause the direction or management of such entity, whether by contract or otherwise, or (b) ownership of more than fifty percent (50%) of the outstanding shares or beneficial ownership of such entity.
-
-2  SOURCE CODE LICENSE.
-
-2.1. The Initial Developer Grant.
-
-    The Initial Developer hereby grants You a world-wide, royalty-free, non-exclusive license, subject to third party intellectual property claims:
-
-    (a)
-        under intellectual property rights (other than patent or trademark) Licensable by Initial Developer to use, reproduce, modify, display, perform, sublicense and distribute the Original Code (or portions thereof) with or without Modifications, and/or as part of a Larger Work; and
-    (b)
-        under patents now or hereafter owned or controlled by Initial Developer, to make, have made, use and sell ("offer to sell and import") the Original Code, Modifications, or portions thereof, but solely to the extent that any such patent is reasonably necessary to enable You to utilize, alone or in combination with other software, the Original Code, Modifications, or any combination or portions thereof.
-    (c)
-    (d)
-
-
-2.2. Contributor Grant.
-
-    Subject to third party intellectual property claims, each Contributor hereby grants You a world-wide, royalty-free, non-exclusive license
-
-    (a)
-        under intellectual property rights (other than patent or trademark) Licensable by Contributor, to use, reproduce, modify, display, perform, sublicense and distribute the Modifications created by such Contributor (or portions thereof) either on an unmodified basis, with other Modifications, as Covered Code and/or as part of a Larger Work; and
-    (b)
-        under patents now or hereafter owned or controlled by Contributor, to make, have made, use and sell ("offer to sell and import") the Contributor Version (or portions thereof), but solely to the extent that any such patent is reasonably necessary to enable You to utilize, alone or in combination with other software, the Contributor Version (or portions thereof).
-    (c)
-    (d)
-
-3  DISTRIBUTION OBLIGATIONS.
-
-3.1. Application of License.
-
-    The Modifications which You create or to which You contribute are governed by the terms of this License, including without limitation Section 2.2. The Source Code version of Covered Code may be distributed only under the terms of this License or a future version of this License released under Section 6.1, and You must include a copy of this License with every copy of the Source Code You distribute. You may not offer or impose any terms on any Source Code version that alters or restricts the applicable version of this License or the recipients' rights hereunder. However, You may include an additional document offering the additional rights described in Section 3.5.
-
-3.2. Availability of Source Code.
-
-    Any Modification created by You will be provided to the Initial Developer in Source Code form and are subject to the terms of the License.
-
-3.3. Description of Modifications.
-
-    You must cause all Covered Code to which You contribute to contain a file documenting the changes You made to create that Covered Code and the date of any change. You must include a prominent statement that the Modification is derived, directly or indirectly, from Original Code provided by the Initial Developer and including the name of the Initial Developer in (a) the Source Code, and (b) in any notice in an Executable version or related documentation in which You describe the origin or ownership of the Covered Code.
-
-3.4. Intellectual Property Matters.
-
-    (a) Third Party Claims.
-        If Contributor has knowledge that a license under a third party's intellectual property rights is required to exercise the rights granted by such Contributor under Sections 2.1 or 2.2, Contributor must include a text file with the Source Code distribution titled "LEGAL" which describes the claim and the party making the claim in sufficient detail that a recipient will know whom to contact. If Contributor obtains such knowledge after the Modification is made available as described in Section 3.2, Contributor shall promptly modify the LEGAL file in all copies Contributor makes available thereafter and shall take other steps (such as notifying appropriate mailing lists or newsgroups) reasonably calculated to inform those who received the Covered Code that new knowledge has been obtained.
-    (b) Contributor APIs.
-        If Contributor's Modifications include an application programming interface and Contributor has knowledge of patent licenses which are reasonably necessary to implement that API, Contributor must also include this information in the LEGAL file.
-    (c) Representations.
-        Contributor represents that, except as disclosed pursuant to Section 3.4(a) above, Contributor believes that Contributor's Modifications are Contributor's original creation(s) and/or Contributor has sufficient rights to grant the rights conveyed by this License.
-
-
-3.5. Required Notices.
-
-    You must duplicate the notice in Exhibit A in each file of the Source Code. If it is not possible to put such notice in a particular Source Code file due to its structure, then You must include such notice in a location (such as a relevant directory) where a user would be likely to look for such a notice. If You created one or more Modification(s) You may add your name as a Contributor to the notice described in Exhibit A. You must also duplicate this License in any documentation for the Source Code where You describe recipients' rights or ownership rights relating to Covered Code. You may choose to offer, and to charge a fee for, warranty, support, indemnity or liability obligations to one or more recipients of Covered Code. However, You may do so only on Your own behalf, and not on behalf of the Initial Developer or any Contributor.
-
-3.6. Distribution of Executable Versions.
-
-    You may distribute Covered Code in Executable form only if the requirements of Section 3.1-3.5 have been met for that Covered Code. You may distribute the Executable version of Covered Code or ownership rights under a license of Your choice, which may contain terms different from this License, provided that You are in compliance with the terms of this License and that the license for the Executable version does not attempt to limit or alter the recipient's rights in the Source Code version from the rights set forth in this License. If You distribute the Executable version under a different license You must make it absolutely clear that any terms which differ from this License are offered by You alone, not by the Initial Developer or any Contributor. If you distribute executable versions containing Covered Code as part of a product, you must reproduce the notice in Exhibit B in the documentation and/or other materials provided with the product.
-
-3.7. Larger Works.
-
-    You may create a Larger Work by combining Covered Code with other code not governed by the terms of this License and distribute the Larger Work as a single product. In such a case, You must make sure the requirements of this License are fulfilled for the Covered Code.
-
-3.8. Restrictions.
-
-    You may not remove any product identification, copyright, proprietary notices or labels from gSOAP.
-
-4  INABILITY TO COMPLY DUE TO STATUTE OR REGULATION.
-If it is impossible for You to comply with any of the terms of this License with respect to some or all of the Covered Code due to statute, judicial order, or regulation then You must: (a) comply with the terms of this License to the maximum extent possible; and (b) describe the limitations and the code they affect. Such description must be included in the LEGAL file described in Section 3.4 and must be included with all distributions of the Source Code. Except to the extent prohibited by statute or regulation, such description must be sufficiently detailed for a recipient of ordinary skill to be able to understand it.
-5  APPLICATION OF THIS LICENSE.
-This License applies to code to which the Initial Developer has attached the notice in Exhibit A and to related Covered Code.
-6  VERSIONS OF THE LICENSE.
-
-6.1. New Versions.
-
-    Grantor may publish revised and/or new versions of the License from time to time. Each version will be given a distinguishing version number.
-
-6.2. Effect of New Versions.
-
-    Once Covered Code has been published under a particular version of the License, You may always continue to use it under the terms of that version. You may also choose to use such Covered Code under the terms of any subsequent version of the License.
-
-6.3. Derivative Works.
-
-    If You create or use a modified version of this License (which you may only do in order to apply it to code which is not already Covered Code governed by this License), You must (a) rename Your license so that the phrase "gSOAP" or any confusingly similar phrase do not appear in your license (except to note that your license differs from this License) and (b) otherwise make it clear that Your version of the license contains terms which differ from the gSOAP Public License. (Filling in the name of the Initial Developer, Original Code or Contributor in the notice described in Exhibit A shall not of themselves be deemed to be modifications of this License.)
-
-7  DISCLAIMER OF WARRANTY.
-COVERED CODE IS PROVIDED UNDER THIS LICENSE ON AN "AS IS" BASIS, WITHOUT WARRANTY OF ANY KIND, WHETHER EXPRESS, IMPLIED OR STATUTORY, INCLUDING, WITHOUT LIMITATION, THE IMPLIED WARRANTIES OF MERCHANTABILITY, OF FITNESS FOR A PARTICULAR PURPOSE, NONINFRINGEMENT OF THIRD PARTY INTELLECTUAL PROPERTY RIGHTS, AND ANY WARRANTY THAT MAY ARISE BY REASON OF TRADE USAGE, CUSTOM, OR COURSE OF DEALING. WITHOUT LIMITING THE FOREGOING, YOU ACKNOWLEDGE THAT THE SOFTWARE IS PROVIDED "AS IS" AND THAT THE AUTHORS DO NOT WARRANT THE SOFTWARE WILL RUN UNINTERRUPTED OR ERROR FREE. LIMITED LIABILITY THE ENTIRE RISK AS TO RESULTS AND PERFORMANCE OF THE SOFTWARE IS ASSUMED BY YOU. UNDER NO CIRCUMSTANCES WILL THE AUTHORS BE LIABLE FOR ANY SPECIAL, INDIRECT, INCIDENTAL, EXEMPLARY OR CONSEQUENTIAL DAMAGES OF ANY KIND OR NATURE WHATSOEVER, WHETHER BASED ON CONTRACT, WARRANTY, TORT (INCLUDING NEGLIGENCE), STRICT LIABILITY OR OTHERWISE, ARISING OUT OF OR IN ANY WAY RELATED TO THE SOFTWARE, EVEN IF THE AUTHORS HAVE BEEN ADVISED ON THE POSSIBILITY OF SUCH DAMAGE OR IF SUCH DAMAGE COULD HAVE BEEN REASONABLY FORESEEN, AND NOTWITHSTANDING ANY FAILURE OF ESSENTIAL PURPOSE OF ANY EXCLUSIVE REMEDY PROVIDED. SUCH LIMITATION ON DAMAGES INCLUDES, BUT IS NOT LIMITED TO, DAMAGES FOR LOSS OF GOODWILL, LOST PROFITS, LOSS OF DATA OR SOFTWARE, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION OR IMPAIRMENT OF OTHER GOODS. IN NO EVENT WILL THE AUTHORS BE LIABLE FOR THE COSTS OF PROCUREMENT OF SUBSTITUTE SOFTWARE OR SERVICES. YOU ACKNOWLEDGE THAT THIS SOFTWARE IS NOT DESIGNED FOR USE IN ON-LINE EQUIPMENT IN HAZARDOUS ENVIRONMENTS SUCH AS OPERATION OF NUCLEAR FACILITIES, AIRCRAFT NAVIGATION OR CONTROL, OR LIFE-CRITICAL APPLICATIONS. THE AUTHORS EXPRESSLY DISCLAIM ANY LIABILITY RESULTING FROM USE OF THE SOFTWARE IN ANY SUCH ON-LINE EQUIPMENT IN HAZARDOUS ENVIRONMENTS AND ACCEPTS NO LIABILITY IN RESPECT OF ANY ACTIONS OR CLAIMS BASED ON THE USE OF THE SOFTWARE IN ANY SUCH ON-LINE EQUIPMENT IN HAZARDOUS ENVIRONMENTS BY YOU. FOR PURPOSES OF THIS PARAGRAPH, THE TERM "LIFE-CRITICAL APPLICATION" MEANS AN APPLICATION IN WHICH THE FUNCTIONING OR MALFUNCTIONING OF THE SOFTWARE MAY RESULT DIRECTLY OR INDIRECTLY IN PHYSICAL INJURY OR LOSS OF HUMAN LIFE. THIS DISCLAIMER OF WARRANTY CONSTITUTES AN ESSENTIAL PART OF THIS LICENSE. NO USE OF ANY COVERED CODE IS AUTHORIZED HEREUNDER EXCEPT UNDER THIS DISCLAIMER.
-8  TERMINATION.
-
-8.1.
-    This License and the rights granted hereunder will terminate automatically if You fail to comply with terms herein and fail to cure such breach within 30 days of becoming aware of the breach. All sublicenses to the Covered Code which are properly granted shall survive any termination of this License. Provisions which, by their nature, must remain in effect beyond the termination of this License shall survive.
-8.2.
-8.3.
-    If You assert a patent infringement claim against Participant alleging that such Participant's Contributor Version directly or indirectly infringes any patent where such claim is resolved (such as by license or settlement) prior to the initiation of patent infringement litigation, then the reasonable value of the licenses granted by such Participant under Sections 2.1 or 2.2 shall be taken into account in determining the amount or value of any payment or license.
-8.4.
-    In the event of termination under Sections 8.1 or 8.2 above, all end user license agreements (excluding distributors and resellers) which have been validly granted by You or any distributor hereunder prior to termination shall survive termination.
-
-9  LIMITATION OF LIABILITY.
-UNDER NO CIRCUMSTANCES AND UNDER NO LEGAL THEORY, WHETHER TORT (INCLUDING NEGLIGENCE), CONTRACT, OR OTHERWISE, SHALL YOU, THE INITIAL DEVELOPER, ANY OTHER CONTRIBUTOR, OR ANY DISTRIBUTOR OF COVERED CODE, OR ANY SUPPLIER OF ANY OF SUCH PARTIES, BE LIABLE TO ANY PERSON FOR ANY INDIRECT, SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES OF ANY CHARACTER INCLUDING, WITHOUT LIMITATION, DAMAGES FOR LOSS OF GOODWILL, WORK STOPPAGE, COMPUTER FAILURE OR MALFUNCTION, OR ANY AND ALL OTHER COMMERCIAL DAMAGES OR LOSSES, EVEN IF SUCH PARTY SHALL HAVE BEEN INFORMED OF THE POSSIBILITY OF SUCH DAMAGES. THIS LIMITATION OF LIABILITY SHALL NOT APPLY TO LIABILITY FOR DEATH OR PERSONAL INJURY RESULTING FROM SUCH PARTY'S NEGLIGENCE TO THE EXTENT APPLICABLE LAW PROHIBITS SUCH LIMITATION. SOME JURISDICTIONS DO NOT ALLOW THE EXCLUSION OR LIMITATION OF INCIDENTAL OR CONSEQUENTIAL DAMAGES, SO THIS EXCLUSION AND LIMITATION MAY NOT APPLY TO YOU.
-10  U.S. GOVERNMENT END USERS.
-11  MISCELLANEOUS.
-12  RESPONSIBILITY FOR CLAIMS.
-As between Initial Developer and the Contributors, each party is responsible for claims and damages arising, directly or indirectly, out of its utilization of rights under this License and You agree to work with Initial Developer and Contributors to distribute such responsibility on an equitable basis. Nothing herein is intended or shall be deemed to constitute any admission of liability.
-EXHIBIT A.
-"The contents of this file are subject to the gSOAP Public License Version 1.3 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at
-
-    http://genivia.com/Products/gsoap/license.pdf 
-
-More information on licensing options, support contracts, and consulting can be found at
-
-    http://genivia.com/Products/gsoap/contract.html 
-
-Software distributed under the License is distributed on an "AS IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the specific language governing rights and limitations under the License.
-The Original Code of the gSOAP Software is: stdsoap.h, stdsoap2.h, stdsoap.c, stdsoap2.c, stdsoap.cpp, stdsoap2.cpp, soapcpp2.h, soapcpp2.c, soapcpp2_lex.l, soapcpp2_yacc.y, error2.h, error2.c, symbol2.c, init2.c, soapdoc2.html, and soapdoc2.pdf, httpget.h, httpget.c, stl.h, stldeque.h, stllist.h, stlvector.h, stlset.h.
-The Initial Developer of the Original Code is Robert A. van Engelen. Portions created by Robert A. van Engelen are Copyright (C) 2001-2004 Robert A. van Engelen, Genivia inc. All Rights Reserved.
-Contributor(s):
-
-"________________________."
-
-[Note: The text of this Exhibit A may differ slightly form the text of the notices in the Source Code files of the Original code. You should use the text of this Exhibit A rather than the text found in the Original Code Source Code for Your Modifications.]
-EXHIBIT B.
-"Part of the software embedded in this product is gSOAP software.
-Portions created by gSOAP are Copyright (C) 2001-2004 Robert A. van Engelen, Genivia inc. All Rights Reserved.
-THE SOFTWARE IN THIS PRODUCT WAS IN PART PROVIDED BY GENIVIA INC AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." 
diff --git a/libre/gsoap-legacy/PKGBUILD b/libre/gsoap-legacy/PKGBUILD
deleted file mode 100644
index addcd690a..000000000
--- a/libre/gsoap-legacy/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id$
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Contributor: Tor Krill <tor@krill.nu>
-# Contributor: Lee.MaRS <leemars@gmail.com>
-
-_pkgname=gsoap
-pkgname=gsoap-legacy
-pkgver=2.8.11
-pkgrel=1
-pkgdesc="Offers an XML language binding to ease the development of SOAP/XML Web services in C and C/C++ (legacy version)"
-url="http://www.cs.fsu.edu/~engelen/soap.html"
-arch=('i686' 'x86_64')
-license=('GPL' 'custom')
-depends=('openssl' 'zlib' 'gcc-libs')
-makedepends=('autoconf' 'automake')
-conflicts=('gsoap')
-source=(http://prdownloads.sourceforge.net/gsoap2/${_pkgname}_${pkgver}.zip
-	LICENSE)
-md5sums=('ea2d7ee876d274a188b8fbb365702eec'
-         '27aaa3f5166db94d44044c11a7b2c37b')
-
-build() {
-  cd $srcdir/gsoap-2.8
-  [ -f Makefile ] || CXXFLAGS=-fPIC CFLAGS=-fPIC LDFLAGS=-fPIC ./configure --prefix=/usr
-  make -j1
-}
-
-package() {
-  cd $srcdir/gsoap-2.8
-  make DESTDIR=$pkgdir install
-  mkdir -p $pkgdir/usr/share/gsoap/import
-  mkdir -p $pkgdir/usr/share/gsoap/WS
-  cp -R gsoap/import $pkgdir/usr/share/gsoap/
-  cp -R gsoap/WS $pkgdir/usr/share/gsoap/
-  install -D ../LICENSE $pkgdir/usr/share/licenses/$_pkgname/LICENSE
-}
diff --git a/libre/icecat-adblock-plus/PKGBUILD b/libre/icecat-adblock-plus/PKGBUILD
deleted file mode 100644
index 1837c0119..000000000
--- a/libre/icecat-adblock-plus/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 94536 2013-07-26 13:15:58Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-_pkgname=firefox-adblock-plus
-pkgname=icecat-adblock-plus
-pkgver=2.3.1
-_addons_file=206960
-pkgrel=1
-pkgdesc="plugin for icecat which block ads and banners"
-arch=('any')
-url="http://adblockplus.org/"
-license=('GPL')
-depends=("icecat")
-provides=$_pkgname=$pkgver
-makedepends=('unzip')
-noextract=("adblock_plus-$pkgver-fx+tb+fn+sm.xpi")
-source=(https://addons.mozilla.org/firefox/downloads/file/${_addons_file}/adblock_plus-$pkgver-fx+tb+fn+sm.xpi)
-md5sums=('0ce162b71d2398b46f4e8cc4ddd64cbb')
-
-package() {
-#  _ffver=`pacman -Q icecat | cut -f2 -d\ | cut -f1-2 -d.`
-#  depends=("icecat>=${_ffver}" "icecat<=${_ffver/0/99}")
-
-  cd $srcdir
-  [ $NOEXTRACT -eq 1 ] || unzip adblock_plus-$pkgver-fx+tb+fn+sm.xpi
-  local emid=$(sed -n -e '/<\?em:id>\?/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q' install.rdf)
-  local dstdir=$pkgdir/usr/lib/icecat/browser/extensions/${emid}
-  [ -n ${emid} ] || return 1
-  install -d $dstdir
-#  sed -i 's#<em:maxVersion>.*</em:maxVersion>#<em:maxVersion>20.*</em:maxVersion>#' install.rdf
-  cp -R * $dstdir
-  rm $dstdir/*.xpi
-  find $pkgdir -type d -exec chmod 0755 {} \;
-  find $pkgdir -type f -exec chmod 0644 {} \;
-}
diff --git a/libre/iceweasel-adblock-plus/PKGBUILD b/libre/iceweasel-adblock-plus/PKGBUILD
deleted file mode 100644
index b3c11d563..000000000
--- a/libre/iceweasel-adblock-plus/PKGBUILD
+++ /dev/null
@@ -1,36 +0,0 @@
-# $Id: PKGBUILD 94536 2013-07-26 13:15:58Z spupykin $
-# Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-_pkgname=firefox-adblock-plus
-pkgname=iceweasel-adblock-plus
-pkgver=2.3.1
-_addons_file=206960
-pkgrel=1
-pkgdesc="plugin for iceweasel which block ads and banners"
-arch=('any')
-url="http://adblockplus.org/"
-license=('GPL')
-depends=("iceweasel-libre")
-provides=$_pkgname=$pkgver
-makedepends=('unzip')
-noextract=("adblock_plus-$pkgver-fx+tb+fn+sm.xpi")
-source=(https://addons.mozilla.org/firefox/downloads/file/${_addons_file}/adblock_plus-$pkgver-fx+tb+fn+sm.xpi)
-md5sums=('0ce162b71d2398b46f4e8cc4ddd64cbb')
-
-package() {
-#  _ffver=`pacman -Q iceweasel-libre | cut -f2 -d\ | cut -f1-2 -d.`
-#  depends=("iceweasel-libre>=${_ffver}" "iceweasel-libre<=${_ffver/0/99}")
-
-  cd $srcdir
-  [ $NOEXTRACT -eq 1 ] || unzip adblock_plus-$pkgver-fx+tb+fn+sm.xpi
-  local emid=$(sed -n -e '/<\?em:id>\?/!d; s/.*\([\"{].*[}\"]\).*/\1/; s/\"//g; p; q' install.rdf)
-  local dstdir=$pkgdir/usr/lib/iceweasel/browser/extensions/${emid}
-  [ -n ${emid} ] || return 1
-  install -d $dstdir
-#  sed -i 's#<em:maxVersion>.*</em:maxVersion>#<em:maxVersion>20.*</em:maxVersion>#' install.rdf
-  cp -R * $dstdir
-  rm $dstdir/*.xpi
-  find $pkgdir -type d -exec chmod 0755 {} \;
-  find $pkgdir -type f -exec chmod 0644 {} \;
-}
diff --git a/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch b/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch
deleted file mode 100644
index a9b7a2423..000000000
--- a/libre/initscripts/0001-remove-run-nologin-before-leaving-rc.multi.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From 55bd14c586f0f64b8ee5515161be1aa1098d3226 Mon Sep 17 00:00:00 2001
-From: Dave Reisner <dreisner@archlinux.org>
-Date: Tue, 3 Jul 2012 22:28:05 -0400
-Subject: [initscripts][PATCH] remove /run/nologin before leaving rc.multi
-To: arch-projects@archlinux.org
-
-systemd-186 writes this file when running systemd-tmpfiles, but
-initscripts never removes it. This disallows all non-root logins.
-
-Reported-by: Dan McGee <dan@archlinux.org>
-Signed-off-by: Dave Reisner <dreisner@archlinux.org>
----
- rc.multi | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/rc.multi b/rc.multi
-index daf2372..7d4acaa 100755
---- a/rc.multi
-+++ b/rc.multi
-@@ -31,4 +31,6 @@ run_hook multi_end
- 
- bootlogd_stop
- 
-+rm -f /run/nologin
-+
- # vim: set ts=2 sw=2 noet:
--- 
-1.7.11.1
-
diff --git a/libre/initscripts/PKGBUILD b/libre/initscripts/PKGBUILD
deleted file mode 100644
index 1f68a6356..000000000
--- a/libre/initscripts/PKGBUILD
+++ /dev/null
@@ -1,37 +0,0 @@
-# $Id: PKGBUILD 167943 2012-10-03 23:12:35Z tomegun $
-# Maintainer: Tom Gundersen <teg@jklm.no>
-# Contributor: Thomas Bächler <thomas@archlinux.org>
-# Contributor: Aaron Griffin <aaron@archlinux.org>
-# Maintainer (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
-
-pkgname=initscripts
-pkgver=2012.10.5
-pkgrel=1
-pkgdesc="System initialization/bootup scripts (Parabola branding)"
-arch=('any')
-url="https://parabolagnulinux.org"
-license=('GPL2')
-groups=('base')
-provides=('initscripts-systemd')
-conflicts=('initscripts-systemd')
-replaces=('initscripts-systemd')
-backup=(etc/inittab etc/rc.conf etc/rc.local etc/rc.local.shutdown)
-depends=('glibc' 'bash' 'coreutils' 'systemd-tools' 'iproute2' 'ncurses' 'findutils' 'sysvinit-tools')
-optdepends=('dhcpcd: DHCP network configuration'
-            'bridge-utils: Legacy network bridging support'
-            'net-tools: Legacy network support'
-            'wireless_tools: Legacy wireless networking'
-            'sysvinit: Legacy init support')
-makedepends=(asciidoc)
-install=initscripts.install
-source=("https://repo.parabolagnulinux.org/other/${pkgname}-${pkgver}.tar.xz"{,.sig})
-
-package() {
-  cd ${srcdir}/${pkgname}-${pkgver}
-
-  make DESTDIR=${pkgdir} install
-}
-md5sums=('16039aeb4c996194d9466a8c66a06f5a'
-         '522804c7981c32c3c779964844d64377')
-md5sums=('3be94446496bda58051141e0d3863a7b'
-         '3f03d3a5c7d8b7e1ddebb13334441440')
diff --git a/libre/initscripts/initscripts.install b/libre/initscripts/initscripts.install
deleted file mode 100644
index 557faafe4..000000000
--- a/libre/initscripts/initscripts.install
+++ /dev/null
@@ -1,26 +0,0 @@
-post_upgrade() {
-  if [ "$(vercmp $2 2009.07)" -lt 0 ]; then
-    echo "==> Adjusting /etc/inittab for transition to /dev/tty standard."
-    echo "==> Original file saved as /etc/inittab.pacsave"
-    sed -i'.pacsave' 's#vc/\([0-9]\)#tty\1#' /etc/inittab
-  fi
-  if [ "$(vercmp $2 2011.06.1)" -lt 0 ]; then
-    echo "Blacklisting of modules is no longer supported in rc.conf,"
-    echo "please add blacklist entries to /etc/modprobe.d/ instead."
-  fi
-  if [ "$(vercmp $2 2011.07.2)" -lt 0 ]; then
-    echo "VERBOSE= in rc.conf no longer has any effect."
-    echo "Please append 'quiet' to your kernel command line."
-  fi
-  if [ "$(vercmp $2 2011.10.1)" -lt 0 ]; then
-    echo "If using non-bash-compatible shell, please set LANG in /etc/locale.conf,"
-    echo "as LOCALE in /etc/rc.conf no longer works."
-  fi
-  if [ "$(vercmp $2 2012.08.1)" -lt 0 ]; then
-    echo "----"
-    echo "> initscripts now ships a compatibility layer to make systemd use MODULES and"
-    echo "> DAEMONS from rc.conf; and run rc.local and rc.local.shutdown on boot and"
-    echo "> shutdown, respectively. Refer to arch-modules-load(8) and arch-daemons(8)."
-    echo "----"
-  fi
-}
diff --git a/libre/initscripts/split-hwclock-calls.diff b/libre/initscripts/split-hwclock-calls.diff
deleted file mode 100644
index c0a6a4fd6..000000000
--- a/libre/initscripts/split-hwclock-calls.diff
+++ /dev/null
@@ -1,21 +0,0 @@
-diff --git a/rc.sysinit b/rc.sysinit
-index eb49e2b..8f9727b 100755
---- a/rc.sysinit
-+++ b/rc.sysinit
-@@ -34,7 +34,6 @@ bootlogd -p /run/bootlogd.pid
- 
- run_hook sysinit_start
- 
--HWCLOCK_PARAMS="--systz"
- case $HARDWARECLOCK in
- 	"") ;;
- 	UTC) HWCLOCK_PARAMS+=" --utc --noadjfile";;
-@@ -54,7 +53,7 @@ if [[ $HWCLOCK_PARAMS ]]; then
- 
- 	[[ $TIMEZONE ]] && export TZ=$TIMEZONE
- 
--	hwclock $HWCLOCK_PARAMS && stat_done || stat_fail
-+	{ hwclock $HWCLOCK_PARAMS && hwclock --systz; } && stat_done || stat_fail
- 
- 	unset TZ
- fi
diff --git a/libre/initscripts/wireless.conf.d b/libre/initscripts/wireless.conf.d
deleted file mode 100644
index 47540ef40..000000000
--- a/libre/initscripts/wireless.conf.d
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# Settings for wireless cards
-#
-# For each wireless interface declared in INTERFACES (in rc.conf), declare
-# a wlan_${IF} variable that contains the arguments to be passed to
-# iwconfig(8).  Then list the original interface name in the
-# WLAN_INTERFACES array.
-#
-
-#wlan_eth0="eth0 mode managed essid default"
-#WLAN_INTERFACES=(eth0)
-
diff --git a/libre/lesspipe-libre/PKGBUILD b/libre/lesspipe-libre/PKGBUILD
deleted file mode 100644
index 48d5ebe0f..000000000
--- a/libre/lesspipe-libre/PKGBUILD
+++ /dev/null
@@ -1,42 +0,0 @@
-# $Id: PKGBUILD 14692 2010-04-07 09:06:46Z spupykin $
-# Maintainer: Angel 'angvp' Velasquez <angvp[at]archlinux.com.ve>
-# Contributor: solsTiCe d'Hiver <solstice.dhiver@gmail.com>
-
-_pkgname=lesspipe
-pkgname=lesspipe-libre
-pkgver=1.71
-pkgrel=1
-pkgdesc='an input filter for the pager less'
-depends=('less')
-arch=('i686' 'x86_64')
-license=('GPL')
-optdepends=('rpmextract: support for rpm files'
-	    'fastjar: support for jar files'
-	    'unzip: support for zip files'
-	    'p7zip: support for 7za files'
-	    'cabextract: support for cab files'
-	    'cdrkit: support for iso files'
-	    'html2text: support for html files'
-	    'antiword: support for word file'
-	    'unrtf: support for rtf file'
-	    'imagemagick: support for some image file')
-url="http://www-zeuthen.desy.de/~friebel/unix/lesspipe.html"
-source=(http://www-zeuthen.desy.de/~friebel/unix/less/lesspipe.tar.gz \
-	lesspipe.sh)
-md5sums=('6d921dc4ce9809d405cb8d694ac7cbbd'
-         '675b56f560c600f43108adfd98222251')
-provides=("$_pkgname=$pkgver")
-conflicts=("$_pkgname")
-replaces=("$_pkgname")
-
-build() {
-  cd $srcdir/$_pkgname-$pkgver
-
-  ./configure --prefix=/usr --yes
-  make || return 1
-  mkdir -p $pkgdir/usr/share/man/man1
-  make install PREFIX=$pkgdir/usr || return 1
-
-  install -D $srcdir/lesspipe.sh $pkgdir/etc/profile.d/lesspipe.sh
-}
-
diff --git a/libre/lesspipe-libre/lesspipe.sh b/libre/lesspipe-libre/lesspipe.sh
deleted file mode 100644
index 05526e46c..000000000
--- a/libre/lesspipe-libre/lesspipe.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-export LESSOPEN='|/usr/bin/lesspipe.sh %s'
-
diff --git a/libre/lesspipe-libre/rePKGBUILD b/libre/lesspipe-libre/rePKGBUILD
deleted file mode 100644
index cb388a715..000000000
--- a/libre/lesspipe-libre/rePKGBUILD
+++ /dev/null
@@ -1,26 +0,0 @@
-# Maintainer: Nicolás Reynolds <fauno@kiwwwi.com.ar>
-source PKGBUILD
-#CARCH=x86_64
-unset build package md5sums source
-_repo=community       # Put the repo here
-_mirror=http://mirrors.kernel.org/archlinux  # Put mirror here
-source=(PKGBUILD
-        "${_mirror}/${_repo}/os/${CARCH}/${pkgname%-libre}-$pkgver-$pkgrel-$CARCH$PKGEXT"
-        # files for pkg modifications below this line
-        )
-options=(!strip)
-
-build() {
-  cd "${srcdir}/"
-  rm .{INSTALL,PKGINFO} || true
-  # put actions for package modifications below this line
-
-}
-
-package() {
-  find ${srcdir} -maxdepth 1 -type l -delete
-  cp -a ${srcdir}/* ${pkgdir}
-}
-
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/libretools/PKGBUILD b/libre/libretools/PKGBUILD
index 7daf4c071..569706f80 100644
--- a/libre/libretools/PKGBUILD
+++ b/libre/libretools/PKGBUILD
@@ -9,9 +9,9 @@ pkgdesc="Programs for Parabola development"
 url="https://projects.parabolagnulinux.org/packages/libretools.git/"
 license=('GPL3' 'GPL2')
 
-pkgver=20140106.1
-_libretools_commit=39b13f63d0fd89bfa3cae1feb8744fb100eb5651
-_devtools_commit=534d2015b45e013b37e1edbb997bd4df27d7b8fd
+pkgver=20131112
+_libretools_commit=0f03eb7ac94ad72f551eb1b2470b850d6bcf8bf0
+_devtools_commit=021653a0acecc8763e1bbe90dbb770b4e6df4390
 
 _packages_url=https://projects.parabolagnulinux.org/packages
 source=($_packages_url/libretools.git/snapshot/libretools-$_libretools_commit.tar.bz2
@@ -64,8 +64,8 @@ package_libretools() {
 
   depends=(
     "librelib=$pkgver"
-    "gitget=$pkgver" # `createworkdir`
     arch-install-scripts # `archroot` uses `pacstrap`
+    git # `createworkdir`
     openssh # `librerelease`
     rsync # `librerelease` and `makechrootpkg.sh`
     subversion # `diff-unfree`
@@ -87,5 +87,5 @@ package_libretools-mips64el() {
   make install-libretools-mips64el DESTDIR="$pkgdir"
 }
 
-md5sums=('246274cf5974d6adee536edbdb2447c0'
-         'ec69dffa68829f063224de19bbd55fa9')
+md5sums=('81e6d3d6fe1964a407a4520ce0916c0d'
+         '656008e8e35e6adba527b7bfc367b9f7')
diff --git a/libre/libretools/libretools.install b/libre/libretools/libretools.install
index a451add36..d46990da8 100644
--- a/libre/libretools/libretools.install
+++ b/libre/libretools/libretools.install
@@ -1,49 +1,14 @@
 #!/bin/sh
 
-_edit_code="          'https::/usr/bin/curl -fLC - --retry 3 --retry-delay 3 -o %o %u'"
-_edit_cmnt='#%s # commented out by the libretools post_install script'
-
-_add_cmnt='# The following line is added by the libretools post_install script'
-_add_code='[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=({https,libre}"::/usr/bin/librefetch -p \"\$BUILDFILE\" -- %u %o")'
-
-# This line was installed by previous versions of this script
-_old_code='[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=("libre::/usr/bin/librefetch -p \"\$BUILDFILE\" %u %o")'
-
-# has_line $line
-has_line() { grep -Fxq -- "$1" etc/makepkg.conf; }
-# add_line $line
-add_line() { printf '%s\n' "$1" >> etc/makepkg.conf; }
-# del_line $line
-del_line() {
-	local lineno=($(grep -Fxn -- "$1" etc/makepkg.conf | cut -d: -f1))
-	if [[ "${#lineno[@]}" -gt 0 ]]; then
-		sed -i "$(printf '%dd;' "${lineno[@]}")" etc/makepkg.conf;
-	fi
-}
-# rep_line $orig $replacement_bre
-rep_line() {
-	local lineno=($(grep -Fxn -- "$1" etc/makepkg.conf | cut -d: -f1))
-	if [[ "${#lineno[@]}" == 1 ]]; then
-		sed -i "${lineno}s|.*|${2//|/\\|}|" etc/makepkg.conf;
-	fi
-}
+_makepkgconf_append='[[ ! -x /usr/bin/librefetch ]] || DLAGENTS+=("libre::/usr/bin/librefetch -p \"\$BUILDFILE\" %u %o")'
 
 # arg 1:  the new package version
 post_install() {
-	if grep -q 'librefetch' etc/makepkg.conf; then
+	if grep -q 'libre::' etc/makepkg.conf; then
 		libremessages msg2 "libretools: librefetch is already in /etc/makepkg.conf"
-		if has_line "$_old_code"; then
-			libremessages msg2 "libretools: removing old librefetch entry in /etc/makepkg.conf"
-			del_line "$_old_code"
-			post_install
-		else
-			return 0
-		fi
 	else
-		libremessages msg2 "libretools: adding librefetch to /etc/makepkg.conf"
-		rep_line "$_edit_code" "$(printf "$_edit_cmnt" '&')"
-		add_line "$_add_cmnt"
-		add_line "$_add_code"
+		libremessages msg2 "libretools: Adding librefetch to /etc/makepkg.conf"
+		printf '%s\n' "$_makepkgconf_append" >> etc/makepkg.conf
 	fi
 }
 
@@ -54,11 +19,10 @@ post_upgrade() {
 }
 
 pre_remove() {
-	libremessages msg2 "libretools: removing librefetch from /etc/makepkg.conf"
-
-	rep_line "$(printf "$_edit_cmnt" "$_edit_code")" "$_edit_code"
-	del_line "$_add_cmnt"
-	del_line "$_add_code"
-
-	del_line "$_old_code"
+	if fgrep -q "$_makepkgconf_append" etc/makepkg.conf; then
+		libremessages msg2 "libretools: removing librefetch from /etc/makepkg.conf"
+		sed -i '/libre::/d' etc/makepkg.conf
+	else
+		libremessages msg2 "libretools: librefetch is not in /etc/makepkg.conf as we added it"
+	fi
 }
diff --git a/libre/libui-sh/PKGBUILD b/libre/libui-sh/PKGBUILD
deleted file mode 100644
index 075d8c0a6..000000000
--- a/libre/libui-sh/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# $Id$
-# Maintainer: Dieter Plaetinck <dieter@plaetinck.be>
-
-pkgname=libui-sh
-pkgver=2011.10.09
-pkgrel=2
-pkgdesc="a shell library providing useful UI functions"
-arch=('any')
-url="http://github.com/Dieterbe/libui-sh/"
-license=('GPL3')
-depends=('bash')
-optdepends=('dialog: for ncurses support')
-source=(ftp://ftp.archlinux.org/other/libui-sh/libui-sh-$pkgver.tar.gz)
-md5sums=('6f855b407d791ab66b78f839835ed915')
-
-build() {
-
-  cd $srcdir/libui-sh-$pkgver/
-  
-  make DESTDIR="$pkgdir/" install
-
-}
-
-# vim:set ts=2 sw=2 et:
-
diff --git a/libre/newton-dynamics-libre/PKGBUILD b/libre/newton-dynamics-libre/PKGBUILD
deleted file mode 100644
index 58569aafc..000000000
--- a/libre/newton-dynamics-libre/PKGBUILD
+++ /dev/null
@@ -1,50 +0,0 @@
-# $Id: PKGBUILD 84449 2013-02-19 04:20:15Z svenstaro $
-# Maintainer: Sven-Hendrik Haase <sh@lutzhaase.com>
-# Contributor: Josh Taylor (deficite) <joshtaylor.mail@gmail.com> 
-# Contributor: Christophe Robin (bombstrike) <crobin@php.net> 
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-_pkgname=newton-dynamics
-pkgname=newton-dynamics-libre
-pkgver=2.36
-pkgrel=1
-pkgdesc="A simple physics API"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://www.newtondynamics.com"
-license=('custom')
-depends=()
-makedepends=('unar')
-replaces=$_pkgname
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
-source=("http://newton-dynamics.googlecode.com/files/newton-dynamics-${pkgver}.rar")
-noextract=("newton-dynamics-${pkgver}.rar")
-md5sums=('0dffa112d0a6ea39ad9e904e555da69a')
-
-build() {
-  _srcdir="${srcdir}/newton-dynamics-${pkgver}"
-  [[ "$CARCH" = "i686" ]]  && platform="linux32"
-  [[ "$CARCH" = "x86_64" ]] && platform="linux64"
-  builddir="${_srcdir}/coreLibrary_200/projets/${platform}"
-
-  # clean build directory
-  [[ -d "${_srcdir}" ]] && rm -Rf "${_srcdir}"
-
-  # decompress package
-  cd "${srcdir}"
-  unar "newton-dynamics-${pkgver}.rar"
-
-  # needed for building
-  mkdir -p "${_srcdir}/packages/${platform}"
-  
-  ## build lib
-  cd "${builddir}"
-  sed -i 's/ -o libNewton.so/ -lpthread -lstdc++ -o libNewton.so/' makefile
-  sed -i 's/Debug\.cpp.*$/Debug \\/g' makefile
-  make
-}
-
-package() {
-  install -D -m644 "${builddir}/libNewton.a" "${pkgdir}/usr/lib/libNewton.a"
-  install -D -m755 "${builddir}/libNewton.so" "${pkgdir}/usr/lib/libNewton.so"
-  install -D -m644 "${_srcdir}/coreLibrary_200/source/newton/Newton.h" "${pkgdir}/usr/include/Newton.h"
-}
diff --git a/libre/newton-dynamics-libre/assert-fix.patch b/libre/newton-dynamics-libre/assert-fix.patch
deleted file mode 100644
index 83dfdd790..000000000
--- a/libre/newton-dynamics-libre/assert-fix.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: source/core/dgTypes.cpp
-===================================================================
---- source/core/dgTypes.cpp	(revision 506)
-+++ source/core/dgTypes.cpp	(working copy)
-@@ -515,7 +515,7 @@
- 		return 0;
- 	}
- 	_ASSERTE (compareCount <= dgInt32 (strideInBytes / sizeof (dgFloat64)));
--	_ASSERT (strideInBytes == dgInt32 (sizeof (dgFloat64) * (strideInBytes / sizeof (dgFloat64))));
-+	_ASSERTE (strideInBytes == dgInt32 (sizeof (dgFloat64) * (strideInBytes / sizeof (dgFloat64))));
- 
- 	dgInt32 stride = strideInBytes / dgInt32 (sizeof (dgFloat64));
- 	dgInt32 stride2 = stride + 2;
diff --git a/libre/pngcrush/PKGBUILD b/libre/pngcrush/PKGBUILD
deleted file mode 100644
index f44ace016..000000000
--- a/libre/pngcrush/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net>
-
-pkgname=pngcrush
-pkgver=1.7.65
-pkgrel=1
-pkgdesc="A tool for optimizing the compression of PNG files"
-arch=('i686' 'x86_64' 'mips64el')
-url="http://pmt.sourceforge.net/pngcrush/"
-license=('custom')
-depends=('libpng' 'zlib')
-source=(http://downloads.sourceforge.net/pmt/$pkgname-$pkgver-nolib.tar.xz)
-
-build() {
-  cd "$srcdir"/$pkgname-$pkgver-nolib
-  sed -n '10,17s/^\s*//p' cexcept.h > LICENSE.cexcept.txt
-  sed -rn '97,142s/ \* ?//p' pngcrush.c > LICENSE.pngcrush.txt
-  make
-}
-
-package() {
-  cd "$srcdir"/$pkgname-$pkgver-nolib
-  install -Dm755 $pkgname "$pkgdir"/usr/bin/$pkgname
-  install -Dm644 LICENSE.cexcept.txt "$pkgdir"/usr/share/licenses/$pkgname/cexcept.txt
-  install -Dm644 LICENSE.pngcrush.txt "$pkgdir"/usr/share/licenses/$pkgname/pngcrush.txt
-}
-
-md5sums=('b4130246c14c1cffc6c2014ff86f1008')
diff --git a/libre/ruby-hpricot/PKGBUILD b/libre/ruby-hpricot/PKGBUILD
deleted file mode 100644
index ad9aefc36..000000000
--- a/libre/ruby-hpricot/PKGBUILD
+++ /dev/null
@@ -1,25 +0,0 @@
-# Maintainer: Luke Shumaker <lukeshu@sbcglobal.net
-
-_gemname=hpricot
-pkgname=ruby-$_gemname
-pkgver=0.8.6
-pkgdesc="_why's old HTML parser"
-url="http://github.com/hpricot/hpricot"
-license=('custom:MIT')
-
-pkgrel=1
-arch=('i686' 'x86_64')
-depends=('ruby')
-makedepends=('rubygems')
-source=(http://rubygems.org/downloads/${_gemname}-${pkgver}.gem)
-noextract=(${_gemname}-${pkgver}.gem)
-md5sums=('b0f1f02448037f4f6243c33d5f818fa4')
-
-package() {
-  cd "${srcdir}"
-  local _gemdir="$(ruby -rubygems -e'puts Gem.default_dir')"
-  gem install --no-user-install --ignore-dependencies -i "$pkgdir$_gemdir" -n "$pkgdir/usr/bin" \
-    "$_gemname-$pkgver.gem"
-  install -Dm644 "$pkgdir$_gemdir"/gems/$_gemname-$pkgver/COPYING \
-                 "$pkgdir"/usr/share/licenses/$pkgname/COPYING
-}
diff --git a/libre/sdl-libre/PKGBUILD b/libre/sdl-libre/PKGBUILD
index e745c3dbe..a25558a7e 100644
--- a/libre/sdl-libre/PKGBUILD
+++ b/libre/sdl-libre/PKGBUILD
@@ -21,22 +21,24 @@ makedepends=('alsa-lib' 'mesa' 'libpulse' 'glu')
 optdepends=('alsa-lib: ALSA audio driver'
             'libpulse: PulseAudio audio driver')
 options=('staticlibs')
-source=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
-        sdl-1.2.14-fix-mouse-clicking.patch
-        sdl-1.2.14-disable-mmx.patch
-        fix_joystick_misc_axes.diff
-        libsdl-1.2.15-resizing.patch
-        sdl_x11sym.patch
-        libre.patch)
-md5sums=('9d96df8417572a2afb781a7c4c811a85'
-         '04d8c179f125e04bcd4c9d60e013c2d7'
-         'e5c16b7611f62c7cb25f0534eff68852'
-         '687586a108b597a2a6b73070c1d37e51'
-         '3dd50347d8856160a9cbd7f80383a1f8'
-         '148b285bccee9d21bb96db807363b962'
-         '5c665f72b8a2adc97a91f6db6f2da79a')
+mksource=(http://www.libsdl.org/release/SDL-${pkgver}.tar.gz
+          sdl-1.2.14-fix-mouse-clicking.patch
+          sdl-1.2.14-disable-mmx.patch
+          fix_joystick_misc_axes.diff
+          libsdl-1.2.15-resizing.patch
+          sdl_x11sym.patch
+          libre.patch)
+source=https://repo.parabolagnulinux.org/sources/SDL-libre-${pkgver}.tar.gz
+mkmd5sums=('9d96df8417572a2afb781a7c4c811a85'
+           '04d8c179f125e04bcd4c9d60e013c2d7'
+           'e5c16b7611f62c7cb25f0534eff68852'
+           '687586a108b597a2a6b73070c1d37e51'
+           '3dd50347d8856160a9cbd7f80383a1f8'
+           '148b285bccee9d21bb96db807363b962'
+           '5c665f72b8a2adc97a91f6db6f2da79a')
+md5sums=SKIP
 
-prepare() {
+mksource() {
   cd SDL-$pkgver
   patch -Np1 -i ../sdl-1.2.14-fix-mouse-clicking.patch
   patch -Np1 -i ../sdl-1.2.14-disable-mmx.patch
diff --git a/libre/seamonkey-libre/PKGBUILD b/libre/seamonkey-libre/PKGBUILD
deleted file mode 100644
index dd4bcd0a9..000000000
--- a/libre/seamonkey-libre/PKGBUILD
+++ /dev/null
@@ -1,62 +0,0 @@
-# $Id: PKGBUILD 157354 2012-04-27 20:50:49Z ibiru $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-_pkgname=seamonkey
-pkgname=seamonkey-libre
-pkgver=2.9
-pkgrel=1
-pkgdesc="SeaMonkey internet suite, with GNUZilla addons"
-arch=('i686' 'x86_64')
-license=('MPL')
-depends=('alsa-lib'  'dbus-glib'  'desktop-file-utils'  'gtk2' 'hunspell'  'libevent'  'libnotify'  'libvpx'  'libxt' 'mime-types'  'mozilla-common'  'nss'  'sqlite'  'startup-notification')
-makedepends=('unzip' 'zip' 'pkg-config'  'python2' 'yasm' 'wireless_tools' 'mesa' 'autoconf2.13')
-replaces=('mozilla' 'seamonkey')
-conflicts=('seamonkey')
-provides=("seamonkey=$pkgver")
-install=$_pkgname.install
-url="http://www.mozilla.org/projects/seamonkey"
-source=(ftp://releases.mozilla.org/pub/mozilla.org/$_pkgname/releases/$pkgver/source/$_pkgname-$pkgver.source.tar.bz2
-        mozconfig
-        seamonkey.desktop
-        seamonkey-2.0-lang.patch
-        gcc47.patch
-        clrf.patch
-        gnuzilla-addons.patch)
-md5sums=('4af38acf517a8ab850e6aa7a6b085325'
-         'b8887c39a190e3168a9c7e4355ae3dd4'
-         '6119a2254716752c9d08e366f8d4c048'
-         '25b6fe16ac24cd5c852213e5c1adb272'
-         '1e3ad86899c61f0993c429d10913edb4'
-         'abe8f73faa71ea2a1e4c6f5a33f56c27'
-         'f7beeb1f94390957259212dd1dbc171f')
-
-build() {
-  cd "$srcdir/comm-release"
-  patch -Np1 -i "$srcdir/seamonkey-2.0-lang.patch"
-  patch -Np1 -i "$srcdir/gcc47.patch"
-  patch -Np1 -i "$srcdir/clrf.patch"
-  patch -Np1 -i "${srcdir}/gnuzilla-addons.patch"
-
-  cp "$srcdir/mozconfig" .mozconfig
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/seamonkey-$pkgver"
-
-  make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
-}
-
-package() {
-  cd "$srcdir/comm-release"
-
-  make -j1 -f client.mk DESTDIR="$pkgdir" install
-
-  rm -rf "$pkgdir"/usr/lib/seamonkey-$pkgver/{dictionaries,hyphenation}
-  ln -sf /usr/share/hunspell "$pkgdir/usr/lib/seamonkey-$pkgver/dictionaries"
-  ln -sf /usr/share/hyphen "$pkgdir/usr/lib/seamonkey-$pkgver/hyphenation"
-
-  install -m755 -d "$pkgdir/usr/share/applications"
-  install -m755 -d "$pkgdir/usr/share/pixmaps"
-  install -m644 suite/branding/nightly/icons/gtk/seamonkey.png \
-                "$pkgdir/usr/share/pixmaps/"
-  install -m644 "$srcdir/seamonkey.desktop" "$pkgdir/usr/share/applications/"
-
-  rm -f "$pkgdir/usr/lib/pkgconfig/"seamonkey-ns{s,pr}.pc
-  rm -r "$pkgdir"/usr/{include,lib/seamonkey-devel-$pkgver,share/idl}
-}
diff --git a/libre/seamonkey-libre/clrf.patch b/libre/seamonkey-libre/clrf.patch
deleted file mode 100644
index 5a77f2b01..000000000
--- a/libre/seamonkey-libre/clrf.patch
+++ /dev/null
@@ -1,265 +0,0 @@
-diff -Nur comm-release.orig/mailnews/base/search/src/nsMsgSearchAdapter.cpp comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp
---- comm-release.orig/mailnews/base/search/src/nsMsgSearchAdapter.cpp	2012-04-25 01:09:10.468804374 +0000
-+++ comm-release/mailnews/base/search/src/nsMsgSearchAdapter.cpp	2012-04-25 01:09:45.928528202 +0000
-@@ -688,7 +688,7 @@
-     PL_strcat(encoding, "{");
-     lengthStr.AppendInt((PRInt32) strlen(value));
-     PL_strcat(encoding, lengthStr.get());
--    PL_strcat(encoding, "}"CRLF);
-+    PL_strcat(encoding, "}" CRLF);
-     PL_strcat(encoding, value);
-     return NS_OK;
-   }
-diff -Nur comm-release.orig/mailnews/base/src/nsMsgFolderCompactor.cpp comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp
---- comm-release.orig/mailnews/base/src/nsMsgFolderCompactor.cpp	2012-04-25 01:09:10.475470988 +0000
-+++ comm-release/mailnews/base/src/nsMsgFolderCompactor.cpp	2012-04-25 01:09:45.928528202 +0000
-@@ -758,7 +758,7 @@
-           }
-         }
-       }
--#define EXTRA_KEYWORD_HDR "                                                                                 "MSG_LINEBREAK
-+#define EXTRA_KEYWORD_HDR "                                                                                 " MSG_LINEBREAK
- 
-        // if status offset isn't in the first block, this code won't work. There's no good reason
-       // for the status offset not to be at the beginning of the message anyway.
-@@ -1216,7 +1216,7 @@
-         // check if there's an envelope header; if not, write one.
-         if (strncmp(m_dataBuffer, "From ", 5))
-         {
--          m_fileStream->Write("From "CRLF, 7, &bytesWritten);
-+          m_fileStream->Write("From " CRLF, 7, &bytesWritten);
-           m_offlineMsgSize += bytesWritten;
-         }
-       }
-diff -Nur comm-release.orig/mailnews/compose/src/nsSmtpProtocol.cpp comm-release/mailnews/compose/src/nsSmtpProtocol.cpp
---- comm-release.orig/mailnews/compose/src/nsSmtpProtocol.cpp	2012-04-25 01:09:10.542137136 +0000
-+++ comm-release/mailnews/compose/src/nsSmtpProtocol.cpp	2012-04-25 01:09:45.928528202 +0000
-@@ -1722,7 +1722,7 @@
- {
-   m_sendDone = true;
-   nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
--  SendData(url, "QUIT"CRLF); // send a quit command to close the connection with the server.
-+  SendData(url, "QUIT" CRLF); // send a quit command to close the connection with the server.
-   m_nextState = SMTP_RESPONSE;
-   m_nextStateAfterResponse = SMTP_DONE;
-   return(0);
-@@ -1969,7 +1969,7 @@
-     {
-       nsCOMPtr<nsIURI> url = do_QueryInterface(m_runningURL);
-       // send a quit command to close the connection with the server.
--      if (SendData(url, "QUIT"CRLF) == NS_OK)
-+      if (SendData(url, "QUIT" CRLF) == NS_OK)
-       {
-         m_nextState = SMTP_RESPONSE;
-         m_nextStateAfterResponse = SMTP_ERROR_DONE;
-@@ -2118,4 +2118,3 @@
-     NS_ENSURE_SUCCESS(rv,rv);
-     return rv;
- }
--
-diff -Nur comm-release.orig/mailnews/imap/src/nsImapMailFolder.cpp comm-release/mailnews/imap/src/nsImapMailFolder.cpp
---- comm-release.orig/mailnews/imap/src/nsImapMailFolder.cpp	2012-04-25 01:09:10.605469976 +0000
-+++ comm-release/mailnews/imap/src/nsImapMailFolder.cpp	2012-04-25 01:09:45.928528202 +0000
-@@ -8309,7 +8309,7 @@
-           bool needMoreData = false;
-           char * newLine = nsnull;
-           PRUint32 numBytesInLine = 0;
--          const char *envelope = "From "CRLF;
-+          const char *envelope = "From " CRLF;
-           offlineStore->Write(envelope, strlen(envelope), &bytesWritten);
-           fileSize += bytesWritten;
-           do
-diff -Nur comm-release.orig/mailnews/imap/src/nsImapProtocol.cpp comm-release/mailnews/imap/src/nsImapProtocol.cpp
---- comm-release.orig/mailnews/imap/src/nsImapProtocol.cpp	2012-04-25 01:09:10.605469976 +0000
-+++ comm-release/mailnews/imap/src/nsImapProtocol.cpp	2012-04-25 01:09:45.931861509 +0000
-@@ -1409,7 +1409,7 @@
- {
-   // PRInt32 oldRecent = GetServerStateParser().NumberOfRecentMessages();
-   nsCAutoString commandBuffer(GetServerCommandTag());
--  commandBuffer.Append(" IDLE"CRLF);
-+  commandBuffer.Append(" IDLE" CRLF);
- 
-   do
-   {
-@@ -3287,7 +3287,7 @@
-     commandString.Append(messageIds);
-     commandString.Append(" (");
-     commandString.Append(attribute);
--    commandString.Append(")"CRLF);
-+    commandString.Append(")" CRLF);
-     nsresult rv = SendData(commandString.get());
- 
-     if (NS_SUCCEEDED(rv))
-@@ -5283,7 +5283,7 @@
- 
-   IncrementCommandTagNumber();
-   nsCAutoString command(GetServerCommandTag());
--  command.Append(" expunge"CRLF);
-+  command.Append(" expunge" CRLF);
- 
-   nsresult rv = SendData(command.get());
-   if (NS_SUCCEEDED(rv))
-@@ -5359,7 +5359,7 @@
-   command.Append(gAppName);
-   command.Append("\" \"version\" \"");
-   command.Append(gAppVersion);
--  command.Append("\")"CRLF);
-+  command.Append("\")" CRLF);
- 
-   nsresult rv = SendData(command.get());
-   if (NS_SUCCEEDED(rv))
-@@ -5816,7 +5816,7 @@
-     nsCAutoString correctedPassword;
-     EscapeUserNamePasswordString(password.get(), &correctedPassword);
-     command.Append(correctedPassword);
--    command.Append("\""CRLF);
-+    command.Append("\"" CRLF);
-     rv = SendData(command.get(), true /* suppress logging */);
-     NS_ENSURE_SUCCESS(rv, rv);
-     ParseIMAPandCheckForNewMail();
-@@ -7447,7 +7447,7 @@
-   nsCString command(GetServerCommandTag());
-   command += " create \"";
-   command += escapedName;
--  command += "\""CRLF;
-+  command += "\"" CRLF;
- 
-   nsresult rv = SendData(command.get());
-   if(NS_SUCCEEDED(rv))
-@@ -7550,7 +7550,7 @@
-   nsCString command (GetServerCommandTag());
-   command += " lsub \"\" \"";
-   command += escapedPattern;
--  command += "\""CRLF;
-+  command += "\"" CRLF;
- 
-   PR_Free(boxnameWithOnlineDirectory);
- 
-@@ -7579,7 +7579,7 @@
-   command += useXLIST ?
-     " xlist \"\" \"" : " list \"\" \"";
-   command += escapedPattern;
--  command += "\""CRLF;
-+  command += "\"" CRLF;
- 
-   PR_Free(boxnameWithOnlineDirectory);
- 
-@@ -7600,7 +7600,7 @@
-   nsCString command (GetServerCommandTag());
-   command += " subscribe \"";
-   command += escapedName;
--  command += "\""CRLF;
-+  command += "\"" CRLF;
- 
-   nsresult rv = SendData(command.get());
-   if (NS_SUCCEEDED(rv))
-@@ -7618,7 +7618,7 @@
-   nsCString command (GetServerCommandTag());
-   command += " unsubscribe \"";
-   command += escapedName;
--  command += "\""CRLF;
-+  command += "\"" CRLF;
- 
-   nsresult rv = SendData(command.get());
-   if (NS_SUCCEEDED(rv))
-@@ -7632,7 +7632,7 @@
-   if (m_urlInProgress)
-     return;
-   nsCAutoString command (GetServerCommandTag());
--  command += " IDLE"CRLF;
-+  command += " IDLE" CRLF;
-   nsresult rv = SendData(command.get());
-   if (NS_SUCCEEDED(rv))
-   {
-@@ -7659,7 +7659,7 @@
-   nsCOMPtr <nsIAsyncInputStream> asyncInputStream = do_QueryInterface(m_inputStream);
-   if (asyncInputStream)
-     asyncInputStream->AsyncWait(nsnull, 0, 0, nsnull);
--  nsresult rv = SendData("DONE"CRLF);
-+  nsresult rv = SendData("DONE" CRLF);
-   // set a short timeout if we don't want to wait for a response
-   if (m_transport && !waitForResponse)
-     m_transport->SetTimeout(nsISocketTransport::TIMEOUT_READ_WRITE, 5);
-@@ -7728,8 +7728,8 @@
-   PRUint32 msgsHandled = 0;
-   const char *formatString;
-   formatString = (idsAreUid)
--      ? "%s uid store %s %s"CRLF
--      : "%s store %s %s"CRLF;
-+      ? "%s uid store %s %s" CRLF
-+      : "%s store %s %s" CRLF;
- 
-   do
-   {
-diff -Nur comm-release.orig/mailnews/imap/src/nsImapServerResponseParser.cpp comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp
---- comm-release.orig/mailnews/imap/src/nsImapServerResponseParser.cpp	2012-04-25 01:09:10.605469976 +0000
-+++ comm-release/mailnews/imap/src/nsImapServerResponseParser.cpp	2012-04-25 01:09:45.931861509 +0000
-@@ -185,7 +185,7 @@
-   
-   NS_ASSERTION(aCurrentCommand && *aCurrentCommand != '\r' && 
-     *aCurrentCommand != '\n' && *aCurrentCommand != ' ', "Invailid command string");
--  bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE"CRLF);
-+  bool sendingIdleDone = !strcmp(aCurrentCommand, "DONE" CRLF);
-   if (sendingIdleDone)
-     fWaitingForMoreClientInput = false;
- 
-diff -Nur comm-release.orig/mailnews/local/src/nsPop3Protocol.cpp comm-release/mailnews/local/src/nsPop3Protocol.cpp
---- comm-release.orig/mailnews/local/src/nsPop3Protocol.cpp	2012-04-25 01:09:10.492137526 +0000
-+++ comm-release/mailnews/local/src/nsPop3Protocol.cpp	2012-04-25 01:09:45.931861509 +0000
-@@ -2483,7 +2483,7 @@
-         return(MK_OUT_OF_MEMORY);
-     m_pop3ConData->next_state_after_response = POP3_GET_LIST;
-     m_listpos = 0;
--    return SendData(m_url, "LIST"CRLF);
-+    return SendData(m_url, "LIST" CRLF);
- }
- 
- 
-diff -Nur comm-release.orig/mailnews/mime/src/mimedrft.cpp comm-release/mailnews/mime/src/mimedrft.cpp
---- comm-release.orig/mailnews/mime/src/mimedrft.cpp	2012-04-25 01:09:10.488804218 +0000
-+++ comm-release/mailnews/mime/src/mimedrft.cpp	2012-04-25 01:09:45.931861509 +0000
-@@ -1473,7 +1473,7 @@
-                 *newbody = 0;
-                 PL_strcatn(newbody, newbodylen, "<PRE>");
-                 PL_strcatn(newbody, newbodylen, body);
--                PL_strcatn(newbody, newbodylen, "</PRE>"CRLF);
-+                PL_strcatn(newbody, newbodylen, "</PRE>" CRLF);
-                 PR_Free(body);
-                 body = newbody;
-               }
-diff -Nur comm-release.orig/mailnews/mime/src/mimemult.cpp comm-release/mailnews/mime/src/mimemult.cpp
---- comm-release.orig/mailnews/mime/src/mimemult.cpp	2012-04-25 01:09:10.488804218 +0000
-+++ comm-release/mailnews/mime/src/mimemult.cpp	2012-04-25 01:12:53.383735715 +0000
-@@ -280,7 +280,7 @@
-             MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK));
-             MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: attachment; filename=\""));
-             MimeWriteAString(obj, fileName);
--            MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK));
-+            MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK));
-             MimeWriteAString(obj, NS_LITERAL_CSTRING("X-Mozilla-External-Attachment-URL: "));
-             MimeWriteAString(obj, obj->options->state->detachedFilePath);
-             MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK));
-@@ -293,10 +293,10 @@
-             status = MimeWriteAString(obj, header);
-             if (status < 0) 
-               return status;
--            status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK"Content-Transfer-Encoding: 8bit"MSG_LINEBREAK));
-+            status = MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK "Content-Transfer-Encoding: 8bit" MSG_LINEBREAK));
-             MimeWriteAString(obj, NS_LITERAL_CSTRING("Content-Disposition: inline; filename=\"Deleted: "));
-             MimeWriteAString(obj, fileName);
--            MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK"X-Mozilla-Altered: AttachmentDeleted; date=\""));
-+            MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK "X-Mozilla-Altered: AttachmentDeleted; date=\""));
-           }
-           nsCString result;
-           char timeBuffer[128];
-@@ -306,8 +306,8 @@
-                                  "%a %b %d %H:%M:%S %Y",
-                                  &now);
-           MimeWriteAString(obj, nsDependentCString(timeBuffer));
--          MimeWriteAString(obj, NS_LITERAL_CSTRING("\""MSG_LINEBREAK));
--          MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK"You deleted an attachment from this message. The original MIME headers for the attachment were:"MSG_LINEBREAK));
-+          MimeWriteAString(obj, NS_LITERAL_CSTRING("\"" MSG_LINEBREAK));
-+          MimeWriteAString(obj, NS_LITERAL_CSTRING(MSG_LINEBREAK "You deleted an attachment from this message. The original MIME headers for the attachment were:" MSG_LINEBREAK));
-           MimeHeaders_write_raw_headers(mult->hdrs, obj->options, false);
-         }
-         PRInt32 old_nchildren = container->nchildren;
diff --git a/libre/seamonkey-libre/gcc47.patch b/libre/seamonkey-libre/gcc47.patch
deleted file mode 100644
index 080502c23..000000000
--- a/libre/seamonkey-libre/gcc47.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc comm-release/mozilla/ipc/chromium/src/base/file_util_linux.cc
---- comm-release.orig/mozilla/ipc/chromium/src/base/file_util_linux.cc	2012-04-24 23:15:57.347221336 +0000
-+++ comm-release/mozilla/ipc/chromium/src/base/file_util_linux.cc	2012-04-24 23:18:34.116046872 +0000
-@@ -5,6 +5,9 @@
- #include "base/file_util.h"
- 
- #include <fcntl.h>
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
- 
- #include <string>
- #include <vector>
-diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc comm-release/mozilla/ipc/chromium/src/base/message_pump_libevent.cc
---- comm-release.orig/mozilla/ipc/chromium/src/base/message_pump_libevent.cc	2012-04-24 23:15:57.353887955 +0000
-+++ comm-release/mozilla/ipc/chromium/src/base/message_pump_libevent.cc	2012-04-24 23:18:34.116046872 +0000
-@@ -6,6 +6,9 @@
- 
- #include <errno.h>
- #include <fcntl.h>
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
- 
- #include "eintr_wrapper.h"
- #include "base/logging.h"
-diff -Nur comm-release.orig/mozilla/ipc/chromium/src/base/time_posix.cc comm-release/mozilla/ipc/chromium/src/base/time_posix.cc
---- comm-release.orig/mozilla/ipc/chromium/src/base/time_posix.cc	2012-04-24 23:15:57.350554645 +0000
-+++ comm-release/mozilla/ipc/chromium/src/base/time_posix.cc	2012-04-24 23:18:34.116046872 +0000
-@@ -13,6 +13,9 @@
- #else
- #include <time.h>
- #endif
-+#if defined(ANDROID) || defined(OS_POSIX)
-+#include <unistd.h>
-+#endif
- 
- #include <limits>
- 
diff --git a/libre/seamonkey-libre/gnuzilla-addons.patch b/libre/seamonkey-libre/gnuzilla-addons.patch
deleted file mode 100644
index 32a28b3e4..000000000
--- a/libre/seamonkey-libre/gnuzilla-addons.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -Naur comm-release.orig/suite/browser/browser-prefs.js comm-release/suite/browser/browser-prefs.js
---- comm-release.orig/suite/browser/browser-prefs.js	2012-03-13 02:23:17.000000000 -0300
-+++ comm-release/suite/browser/browser-prefs.js		2012-04-11 01:57:44.005731215 -0300
-@@ -587,11 +587,10 @@
- // Preferences for AMO integration
- pref("extensions.getAddons.cache.enabled", true);  // also toggles personalized recommendations
- pref("extensions.getAddons.maxResults", 15);
--pref("extensions.getAddons.get.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%");
--pref("extensions.getAddons.getWithPerformance.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/guid:%IDS%?src=seamonkey&appOS=%OS%&appVersion=%VERSION%&tMain=%TIME_MAIN%&tFirstPaint=%TIME_FIRST_PAINT%&tSessionRestored=%TIME_SESSION_RESTORED%");
--pref("extensions.getAddons.search.browseURL", "https://addons.mozilla.org/%LOCALE%/%APP%/search?q=%TERMS%");
--pref("extensions.getAddons.search.url", "https://services.addons.mozilla.org/%LOCALE%/%APP%/api/%API_VERSION%/search/%TERMS%/all/%MAX_RESULTS%/%OS%/%VERSION%/%COMPATIBILITY_MODE%?src=seamonkey");
--pref("extensions.webservice.discoverURL", "https://services.addons.mozilla.org/%LOCALE%/%APP%/discovery/pane/%VERSION%/%OS%");
-+pref("extensions.getAddons.get.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.browseURL", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.getAddons.search.url", "http://www.gnu.org/software/gnuzilla/addons.html");
-+pref("extensions.webservice.discoverURL", "http://www.gnu.org/software/gnuzilla/addons.html");
- 
- // getMoreThemes is used by our UI under our switch theme menu
- pref("extensions.getMoreThemesURL", "chrome://branding/locale/brand.properties");
-@@ -716,7 +715,7 @@
- #endif
- 
- // plugin finder service url
--pref("pfs.datasource.url", "https://pfs.mozilla.org/plugins/PluginFinderService.php?mimetype=%PLUGIN_MIMETYPE%&appID=%APP_ID%&appVersion=%APP_VERSION%&clientOS=%CLIENT_OS%&chromeLocale=%CHROME_LOCALE%");
-+pref("pfs.datasource.url", "http://www.gnu.org/software/gnuzilla/addons.html");
- pref("plugins.update.url", "http://www.mozilla.com/%LOCALE%/plugincheck/");
- pref("plugins.update.notifyUser", false);
- pref("plugins.hide_infobar_for_outdated_plugin", false);
diff --git a/libre/seamonkey-libre/libvpx.patch b/libre/seamonkey-libre/libvpx.patch
deleted file mode 100644
index d0f9a0f4c..000000000
--- a/libre/seamonkey-libre/libvpx.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur comm-release.orig/mozilla/configure.in comm-release/mozilla/configure.in
---- comm-release.orig/mozilla/configure.in	2012-02-05 18:02:17.376830377 +0000
-+++ comm-release/mozilla/configure.in	2012-02-05 18:03:25.246274275 +0000
-@@ -5629,7 +5629,7 @@
-             dnl v0.9.6 one to check for.
-             AC_TRY_COMPILE([
-                 #include <vpx/vpx_decoder.h>
--                #if !defined(VPX_CODEC_USE_INPUT_PARTITION)
-+                #if !defined(VPX_CODEC_USE_INPUT_FRAGMENTS)
-                     #error "test failed."
-                 #endif
-                 ],
diff --git a/libre/seamonkey-libre/mozconfig b/libre/seamonkey-libre/mozconfig
deleted file mode 100644
index 4d04c96d5..000000000
--- a/libre/seamonkey-libre/mozconfig
+++ /dev/null
@@ -1,36 +0,0 @@
-ac_add_options --enable-application=suite
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-ffi
-#ac_add_options --enable-system-cairo
-ac_add_options --with-pthreads
-
-# Features
-ac_add_options --enable-startup-notification
-ac_add_options --enable-safe-browsing
-ac_add_options --enable-gio
-
-ac_add_options --disable-gnomevfs
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --disable-mochitest
-ac_add_options --disable-installer
-
-# Optimization
-ac_add_options --enable-optimize
-
-export MOZILLA_OFFICIAL=1
-mk_add_options MOZILLA_OFFICIAL=1
diff --git a/libre/seamonkey-libre/python27.patch b/libre/seamonkey-libre/python27.patch
deleted file mode 100644
index f00681fd2..000000000
--- a/libre/seamonkey-libre/python27.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- configure.in~	2010-10-20 17:43:42.843358798 -0700
-+++ configure.in	2010-10-20 17:43:16.373359032 -0700
-@@ -874,7 +874,7 @@
-     AC_MSG_RESULT([yes])    
- fi
- 
--AC_PATH_PROGS(PYTHON, $PYTHON python2.5 python2.4 python)
-+AC_PATH_PROGS(PYTHON, $PYTHON python2.7 python2.5 python2.4 python)
- if test -z "$PYTHON"; then
-     AC_MSG_ERROR([python was not found in \$PATH])
- fi
diff --git a/libre/seamonkey-libre/seamonkey-2.0-lang.patch b/libre/seamonkey-libre/seamonkey-2.0-lang.patch
deleted file mode 100644
index b9f4a5cde..000000000
--- a/libre/seamonkey-libre/seamonkey-2.0-lang.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- comm-1.9.1/mozilla/modules/libpref/src/init/all.js	2009-10-11 02:12:44.000000000 +0200
-+++ comm-1.9.1/mozilla/modules/libpref/src/init/all.js	2009-09-16 02:56:45.000000000 +0200
-@@ -890,7 +890,7 @@
- pref("intl.charset.detector",               "chrome://global/locale/intl.properties");
- pref("intl.charset.default",                "chrome://global-platform/locale/intl.properties");
- pref("intl.ellipsis",                       "chrome://global-platform/locale/intl.properties");
--pref("intl.locale.matchOS",                 false);
-+pref("intl.locale.matchOS",                 true);
- // fallback charset list for Unicode conversion (converting from Unicode)
- // currently used for mail send only to handle symbol characters (e.g Euro, trademark, smartquotes)
- // for ISO-8859-1
diff --git a/libre/seamonkey-libre/seamonkey.desktop b/libre/seamonkey-libre/seamonkey.desktop
deleted file mode 100644
index dd92a2432..000000000
--- a/libre/seamonkey-libre/seamonkey.desktop
+++ /dev/null
@@ -1,11 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Exec=seamonkey %u
-Icon=seamonkey
-Type=Application
-Terminal=false
-MultipleArgs=false
-Name=SeaMonkey internet suite
-MimeType=text/html;text/xml;application/xhtml+xml;application/vnd.mozilla.xul+xml;text/mml;x-scheme-handler/http;x-scheme-handler/https;message/rfc822;x-scheme-handler/mailto;
-StartupNotify=false
-Categories=Application;Network;
diff --git a/libre/seamonkey-libre/seamonkey.install b/libre/seamonkey-libre/seamonkey.install
deleted file mode 100644
index 709ad81f2..000000000
--- a/libre/seamonkey-libre/seamonkey.install
+++ /dev/null
@@ -1,12 +0,0 @@
-post_install() {
-  update-desktop-database -q
-  gtk-update-icon-cache -q -t -f usr/share/icons/hicolor
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/libre/ttf-thai-libre/PKGBUILD b/libre/ttf-thai-libre/PKGBUILD
deleted file mode 100644
index 3d1d4ec3d..000000000
--- a/libre/ttf-thai-libre/PKGBUILD
+++ /dev/null
@@ -1,27 +0,0 @@
-# Maintainer: Henry Jensen <hjensen@connochaetos.org>
-
-pkgname=ttf-thai-libre
-pkgver=0.4.14
-pkgrel=1
-pkgdesc="A collection of basic Thai fonts, libre version"
-arch=(any)
-license=('GPL')
-depends=(xorg-fonts-encodings xorg-fonts-alias xorg-font-utils fontconfig)
-makedepends=(fontforge)
-provides=('thai-ttf' "ttf-thai=$pkgver")
-conflicts=('ttf-thai')
-replaces=('ttf-thai')
-url="http://www.connochaetos.org"
-install=ttf.install
-source=(http://www.connochaetos.org/misc/thaifonts-scalable-libre-${pkgver}.tar.gz)
-md5sums=('205436d69d273aca33dbbf31c61fa6b9')
-
-build() {
-  cd ${srcdir}/thaifonts-scalable-libre-${pkgver}
-  ./configure --prefix=/usr --with-ttfdir=/usr/share/fonts/TTF --sysconfdir=/etc
-  make
-  make DESTDIR=${pkgdir}/ install
-  rm ${pkgdir}/usr/share/fonts/TTF/fonts.dir
-  rm ${pkgdir}/usr/share/fonts/TTF/fonts.scale
-}
-
diff --git a/libre/ttf-thai-libre/ttf.install b/libre/ttf-thai-libre/ttf.install
deleted file mode 100644
index 203190187..000000000
--- a/libre/ttf-thai-libre/ttf.install
+++ /dev/null
@@ -1,15 +0,0 @@
-post_install() {
-  echo -n "Updating font cache... "
-  fc-cache -fs > /dev/null
-  mkfontscale usr/share/fonts/TTF
-  mkfontdir usr/share/fonts/TTF
-  echo "done."
-}
-
-post_upgrade() {
-  post_install $1
-}
-
-post_remove() {
-  post_install $1
-}
diff --git a/libre/ununrar/PKGBUILD b/libre/ununrar/PKGBUILD
deleted file mode 100644
index e4ac77b11..000000000
--- a/libre/ununrar/PKGBUILD
+++ /dev/null
@@ -1,22 +0,0 @@
-# Maintainer: Michał Masłowski  <mtjm@mtjm.eu>
-
-pkgname=ununrar
-pkgver=0.0a0dev20130105
-pkgrel=1
-pkgdesc="An unrar-compatible interface to Unarchiver"
-arch=('any')
-url="http://hg.mtjm.eu/ununrar/"
-license=('AGPL')
-depends=('python2' 'python2-distribute' 'unarchiver')
-provides=('unrar' 'unrar-libre')
-conflicts=('unrar' 'unrar-libre')
-options=(!emptydirs)
-source=("http://mtjm.eu/releases/Ununrar-${pkgver}.tar.gz")
-sha512sums=('d8872d529b8e813b44f353f2958712c7e602776810ed51c6de7b6364e024cde9058e724569f83445a324edf41ca25757f3d94d67018ba18e3db027a9ee6c9200')
-
-package() {
-  cd "$srcdir/Ununrar-$pkgver"
-  python2 setup.py install --root=$pkgdir/ --optimize=1
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/virtualbox-libre-modules-lts/PKGBUILD b/libre/virtualbox-libre-modules-lts/PKGBUILD
deleted file mode 100644
index 6a5f9eff8..000000000
--- a/libre/virtualbox-libre-modules-lts/PKGBUILD
+++ /dev/null
@@ -1,74 +0,0 @@
-# $Id: PKGBUILD 93525 2013-07-05 00:46:26Z seblu $
-# Maintainer: Bartłomiej Piotrowski <nospam@bpiotrowski.pl>
-# Contributor: Ionut Biru <ibiru@archlinux.org>
-# Contributor: Sébastien Luttringer <seblu@aur.archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Contributor (Parabola): Jorge López <jorginho@lavabit.com>
-
-pkgbase=virtualbox-libre-modules-lts
-pkgname=('virtualbox-libre-host-modules-lts' 'virtualbox-libre-guest-modules-lts')
-pkgver=4.2.16
-pkgrel=1.1
-arch=('i686' 'x86_64')
-url='http://virtualbox.org'
-license=('GPL')
-makedepends=('linux-libre-lts'
-             'linux-libre-lts-headers'
-             "virtualbox-libre-host-dkms>=$pkgver"
-             "virtualbox-libre-guest-dkms>=$pkgver"
-             'expac'
-             'sed'
-             'bc')
-
-build() {
-  _kernmaj=$(expac -Q '%v' linux-libre-lts|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
-  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-LIBRE-LTS/version)
-  # dkms need modification to be run as user
-  cp -r /var/lib/dkms .
-  echo "dkms_tree='$srcdir/dkms'" > dkms.conf
-  # build host modules
-  msg2 'Host modules'
-  dkms --dkmsframework dkms.conf build "vboxhost/$pkgver" -k "$_kernver"
-  # build guest modules
-  msg2 'Guest modules'
-  dkms --dkmsframework dkms.conf build "vboxguest/$pkgver" -k "$_kernver"
-}
-
-package_virtualbox-libre-host-modules-lts(){
-  _kernmaj=$(expac -Q '%v' linux-libre-lts|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
-  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-LIBRE-LTS/version)
-  pkgdesc='Host kernel modules for VirtualBox (built for the linux-libre-lts kernel package)'
-#  depends=("linux-libre-lts>=${_kernver%.*}" "linux-libre-lts<$(echo "${_kernver%.*}+0.1"|bc)")
-  depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1')
-  replaces=('virtualbox-host-modules-lts' 'virtualbox-modules-lts' 'virtualbox-libre-modules-lts')
-  conflicts=('virtualbox-host-modules-lts' 'virtualbox-modules-lts' 'virtualbox-libre-modules-lts')
-  provides=("virtualbox-host-modules-lts=$pkgver" "virtualbox-libre-host-modules=$pkgver")
-  install=virtualbox-libre-host-modules-lts.install
-
-  cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module"
-  install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-LIBRE-LTS/"
-  install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-LIBRE-LTS/"
-  find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-libre-host-modules-lts.install"
-}
-
-package_virtualbox-libre-guest-modules-lts(){
-  _kernmaj=$(expac -Q '%v' linux-libre-lts|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
-  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-LIBRE-LTS/version)
-  pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre-lts kernel package)'
-  license=('GPL')
-#  depends=("linux-libre-lts>=${_kernver%.*}" "linux-libre-lts<$(echo "${_kernver%.*}+0.1"|bc)")
-  depends=('linux-libre-lts>=3.0' 'linux-libre-lts<3.1')
-  replaces=('virtualbox-guest-modules-lts' 'virtualbox-archlinux-modules-lts' 'virtualbox-libre-parabola-modules-lts')
-  conflicts=('virtualbox-guest-modules-lts' 'virtualbox-archlinux-modules-lts' 'virtualbox-libre-parabola-modules-lts')
-  provides=("virtualbox-guest-modules-lts=$pkgver" "virtualbox-libre-host-modules=$pkgver")
-  install=virtualbox-libre-guest-modules-lts.install
-
-  cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
-  install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-LIBRE-LTS/"
-  install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-LIBRE-LTS/"
-  find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-libre-guest-modules-lts.install"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/virtualbox-libre-modules-lts/build.sh b/libre/virtualbox-libre-modules-lts/build.sh
deleted file mode 100755
index 895bea0b1..000000000
--- a/libre/virtualbox-libre-modules-lts/build.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if (( $# != 1 )); then
-  echo "usage: $0 extra"
-  echo "       $0 testing"
-  exit 1
-fi
-
-here=$PWD
-cd /var/empty
-linux32 makechrootpkg -cu -I "$here"/../../virtualbox/trunk/virtualbox-libre-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
-linux32 makechrootpkg -I "$here"/../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-i686.pkg.tar.xz  -r /var/lib/archbuild/$1-i686
-cd "$here"
-linux32 makechrootpkg -n -r /var/lib/archbuild/$1-i686
-
-cd /var/empty
-makechrootpkg -cu -I "$here"/../../virtualbox/trunk/virtualbox-libre-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
-makechrootpkg -I "$here"/../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-x86_64.pkg.tar.xz  -r /var/lib/archbuild/$1-x86_64
-cd "$here"
-makechrootpkg -n -r /var/lib/archbuild/$1-x86_64
-
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/virtualbox-libre-modules-lts/virtualbox-libre-guest-modules-lts.install b/libre/virtualbox-libre-modules-lts/virtualbox-libre-guest-modules-lts.install
deleted file mode 100644
index 923bd68e3..000000000
--- a/libre/virtualbox-libre-modules-lts/virtualbox-libre-guest-modules-lts.install
+++ /dev/null
@@ -1,21 +0,0 @@
-_depmod() {
-  EXTRAMODULES='extramodules-3.0-LIBRE-LTS'
-  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_install() {
-  cat << EOF
-===> You may want to load vboxguest, vboxsf and vboxvideo
-EOF
-  _depmod
-}
-
-post_upgrade() {
-  _depmod
-}
-
-post_remove() {
-  _depmod
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/virtualbox-libre-modules-lts/virtualbox-libre-host-modules-lts.install b/libre/virtualbox-libre-modules-lts/virtualbox-libre-host-modules-lts.install
deleted file mode 100644
index 97212dba1..000000000
--- a/libre/virtualbox-libre-modules-lts/virtualbox-libre-host-modules-lts.install
+++ /dev/null
@@ -1,23 +0,0 @@
-_depmod() {
-  EXTRAMODULES='extramodules-3.0-LIBRE-LTS'
-  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_install() {
-  cat << EOF
-===> You must load vboxdrv module before starting VirtualBox:
-===> # modprobe vboxdrv
-EOF
-  _depmod
-}
-
-post_upgrade() {
-  _depmod
-  echo 'In order to use the new version, reload all virtualbox modules manually.'
-}
-
-post_remove() {
-  _depmod
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/virtualbox-libre-modules/PKGBUILD b/libre/virtualbox-libre-modules/PKGBUILD
deleted file mode 100644
index cc0d6741d..000000000
--- a/libre/virtualbox-libre-modules/PKGBUILD
+++ /dev/null
@@ -1,76 +0,0 @@
-# $Id: PKGBUILD 94381 2013-07-22 13:58:51Z tpowa $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Maintainer: Sébastien Luttringer
-# Maintainer (Parabola): Jorge López <jorginho@lavabit.com>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-
-pkgbase=virtualbox-libre-modules
-pkgname=('virtualbox-libre-host-modules' 'virtualbox-libre-guest-modules')
-pkgver=4.2.16
-pkgrel=3
-arch=('i686' 'x86_64')
-url='http://virtualbox.org'
-license=('GPL')
-makedepends=('linux-libre>=3.10' 'linux-libre<3.11'
-             'linux-libre-headers>=3.10' 'linux-libre-headers<3.11'
-             "virtualbox-libre-host-dkms>=$pkgver"
-             "virtualbox-libre-guest-dkms>=$pkgver"
-             'expac'
-             'sed'
-             'bc')
-
-# remember to also adjust the .install files and the package deps below
-_extramodules=extramodules-3.10-LIBRE
-
-build() {
-  _kernmaj=$(expac -Q '%v' linux-libre|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
-  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-LIBRE/version)
-  # dkms need modification to be run as user
-  cp -r /var/lib/dkms .
-  echo "dkms_tree='$srcdir/dkms'" > dkms.conf
-  # build host modules
-  msg2 'Host modules'
-  dkms --dkmsframework dkms.conf build "vboxhost/$pkgver" -k "$_kernver"
-  # build guest modules
-  msg2 'Guest modules'
-  dkms --dkmsframework dkms.conf build "vboxguest/$pkgver" -k "$_kernver"
-}
-
-package_virtualbox-libre-host-modules(){
-  _kernmaj=$(expac -Q '%v' linux-libre|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
-  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-LIBRE/version)
-  pkgdesc='Host kernel modules for VirtualBox (built for the linux-libre kernel package)'
-  #depends=("linux-libre>=$_kernmaj" "linux-libre<$(echo "$_kernmaj+0.1"|bc)")
-  depends=('linux-libre>=3.10' 'linux-libre<3.11')
-  provides=("virtualbox-host-modules=${pkgver}")
-  replaces=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules')
-  conflicts=('virtualbox-host-modules' 'virtualbox-modules' 'virtualbox-libre-modules')
-  install=virtualbox-libre-host-modules.install
-
-  cd "dkms/vboxhost/$pkgver/$_kernver/$CARCH/module"
-  install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-LIBRE/"
-  install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-LIBRE/"
-  find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-libre-host-modules.install"
-}
-
-package_virtualbox-libre-guest-modules(){
-  _kernmaj=$(expac -Q '%v' linux-libre|sed -r 's/([[:digit:]]+\.[[:digit:]]+).*/\1/')
-  _kernver=$(< /usr/lib/modules/extramodules-$_kernmaj-LIBRE/version)
-  pkgdesc='Guest kernel modules for VirtualBox (built for the linux-libre kernel package)'
-  license=('GPL')
-  #depends=("linux-libre>=$_kernmaj" "linux-libre<$(echo "$_kernmaj+0.1"|bc)")
-  depends=('linux-libre>=3.10' 'linux-libre<3.11')
-  provides=("virtualbox-guest-modules=${pkgver}")
-  replaces=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules')
-  conflicts=('virtualbox-guest-modules' 'virtualbox-archlinux-modules' 'virtualbox-parabola-modules')
-  install=virtualbox-libre-guest-modules.install
-
-  cd "dkms/vboxguest/$pkgver/$_kernver/$CARCH/module"
-  install -dm755 "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-LIBRE/"
-  install -m644 * "$pkgdir/usr/lib/modules/extramodules-$_kernmaj-LIBRE/"
-  find "$pkgdir" -name '*.ko' -exec gzip -9 {} +
-  sed -ie "s/VERSION='.*'/VERSION='$_kernver'/" "$startdir/virtualbox-libre-guest-modules.install"
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/virtualbox-libre-modules/build.sh b/libre/virtualbox-libre-modules/build.sh
deleted file mode 100755
index 895bea0b1..000000000
--- a/libre/virtualbox-libre-modules/build.sh
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/bin/bash
-
-set -e
-
-if (( $# != 1 )); then
-  echo "usage: $0 extra"
-  echo "       $0 testing"
-  exit 1
-fi
-
-here=$PWD
-cd /var/empty
-linux32 makechrootpkg -cu -I "$here"/../../virtualbox/trunk/virtualbox-libre-host-dkms-*-i686.pkg.tar.xz -r /var/lib/archbuild/$1-i686
-linux32 makechrootpkg -I "$here"/../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-i686.pkg.tar.xz  -r /var/lib/archbuild/$1-i686
-cd "$here"
-linux32 makechrootpkg -n -r /var/lib/archbuild/$1-i686
-
-cd /var/empty
-makechrootpkg -cu -I "$here"/../../virtualbox/trunk/virtualbox-libre-host-dkms-*-x86_64.pkg.tar.xz -r /var/lib/archbuild/$1-x86_64
-makechrootpkg -I "$here"/../../virtualbox/trunk/virtualbox-libre-guest-dkms-*-x86_64.pkg.tar.xz  -r /var/lib/archbuild/$1-x86_64
-cd "$here"
-makechrootpkg -n -r /var/lib/archbuild/$1-x86_64
-
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
deleted file mode 100755
index eb1707471..000000000
--- a/libre/virtualbox-libre-modules/virtualbox-libre-guest-modules.install
+++ /dev/null
@@ -1,21 +0,0 @@
-_depmod() {
-  EXTRAMODULES='extramodules-3.10-LIBRE'
-  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_install() {
-  cat << EOF
-===> You may want to load vboxguest, vboxsf and vboxvideo
-EOF
-  _depmod
-}
-
-post_upgrade() {
-  _depmod
-}
-
-post_remove() {
-  _depmod
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install b/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install
deleted file mode 100755
index df643c9a6..000000000
--- a/libre/virtualbox-libre-modules/virtualbox-libre-host-modules.install
+++ /dev/null
@@ -1,23 +0,0 @@
-_depmod() {
-  EXTRAMODULES='extramodules-3.10-LIBRE'
-  depmod $(cat /usr/lib/modules/$EXTRAMODULES/version)
-}
-
-post_install() {
-  cat << EOF
-===> You must load vboxdrv module before starting VirtualBox:
-===> # modprobe vboxdrv
-EOF
-  _depmod
-}
-
-post_upgrade() {
-  _depmod
-  echo 'In order to use the new version, reload all virtualbox modules manually.'
-}
-
-post_remove() {
-  _depmod
-}
-
-# vim:set ts=2 sw=2 et:
diff --git a/libre/virtualbox-libre/001-vboxdrv-reference.patch b/libre/virtualbox-libre/001-vboxdrv-reference.patch
deleted file mode 100644
index b75c3c565..000000000
--- a/libre/virtualbox-libre/001-vboxdrv-reference.patch
+++ /dev/null
@@ -1,57 +0,0 @@
-diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp
---- VirtualBox-4.1.6_OSE.orig/src/VBox/Frontends/VirtualBox/src/main.cpp	2011-11-04 17:22:13.636083176 +0000
-+++ VirtualBox-4.1.6_OSE/src/VBox/Frontends/VirtualBox/src/main.cpp	2011-11-04 17:48:58.915541368 +0000
-@@ -75,10 +75,9 @@
-   "The VirtualBox Linux kernel driver (vboxdrv) is either not loaded or "
-   "there is a permission problem with /dev/vboxdrv. Please reinstall the kernel "
-   "module by executing<br/><br/>"
--  "  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
--  "as root. If it is available in your distribution, you should install the "
--  "DKMS package first. This package keeps track of Linux kernel changes and "
--  "recompiles the vboxdrv kernel module if necessary."
-+  "  <font color=blue>'pacman -S virtualbox-libre-host-modules'</font><br/><br/>"
-+  "as root. If you don't use our stock kernel, install virtualbox-libre-host-source and "
-+  "execute dkms autoinstall ."
-   );
- 
- QString g_QStrHintOtherWrongDriverVersion = QApplication::tr(
-@@ -90,11 +89,8 @@
- 
- QString g_QStrHintLinuxWrongDriverVersion = QApplication::tr(
-   "The VirtualBox kernel modules do not match this version of "
--  "VirtualBox. The installation of VirtualBox was apparently not "
--  "successful. Executing<br/><br/>"
--  "  <font color=blue>'/etc/init.d/vboxdrv setup'</font><br/><br/>"
--  "may correct this. Make sure that you do not mix the "
--  "OSE version and the PUEL version of VirtualBox."
-+  "VirtualBox. Reload the modules or if you don't use our stock kernel execute<br/><br/> "
-+  "  <font color=blue>'dkms autoinstall'</font><br/><br/>"
-   );
- 
- QString g_QStrHintOtherNoDriver = QApplication::tr(
-diff -Nur VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh
---- VirtualBox-4.1.6_OSE.orig/src/VBox/Installer/linux/VBox.sh	2011-11-04 17:22:13.549415814 +0000
-+++ VirtualBox-4.1.6_OSE/src/VBox/Installer/linux/VBox.sh	2011-11-04 17:56:50.735874087 +0000
-@@ -32,17 +32,18 @@
-     cat << EOF
- WARNING: The vboxdrv kernel module is not loaded. Either there is no module
-          available for the current kernel (`uname -r`) or it failed to
--         load. Please recompile the kernel module and install it by
-+         load. Please reinstall the kernel module virtualbox-libre-host-modules or
-+         if you don't use our stock kernel compile the modules with
- 
--           sudo /etc/init.d/vboxdrv setup
-+           sudo dkms autoinstall
- 
-          You will not be able to start VMs until this problem is fixed.
- EOF
- elif [ ! -c /dev/vboxdrv ]; then
-     cat << EOF
--WARNING: The character device /dev/vboxdrv does not exist. Try
-+WARNING: The character device /dev/vboxdrv does not exist. Try to load the module
- 
--           sudo /etc/init.d/vboxdrv restart
-+           sudo modprobe vboxdrv
- 
-          and if that is not successful, try to re-install the package.
- 
diff --git a/libre/virtualbox-libre/002-change_default_driver_dir.patch b/libre/virtualbox-libre/002-change_default_driver_dir.patch
deleted file mode 100755
index d8531499d..000000000
--- a/libre/virtualbox-libre/002-change_default_driver_dir.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-diff -Nur VirtualBox-4.1.0_OSE.orig/src/VBox/Additions/common/crOpenGL/fakedri_drv.c VirtualBox-4.1.0_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c
---- VirtualBox-4.1.0_OSE.orig/src/VBox/Additions/common/crOpenGL/fakedri_drv.c	2011-07-19 15:11:37.903456612 +0000
-+++ VirtualBox-4.1.0_OSE/src/VBox/Additions/common/crOpenGL/fakedri_drv.c	2011-07-19 15:12:41.024021274 +0000
-@@ -36,13 +36,8 @@
- //#define DEBUG_DRI_CALLS
- 
- //@todo this could be different...
--#ifdef RT_ARCH_AMD64
--# define DRI_DEFAULT_DRIVER_DIR "/usr/lib64/dri:/usr/lib/dri:/usr/lib/x86_64-linux-gnu/dri"
-+# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/xorg/modules/dri"
- # define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
--#else
--# define DRI_DEFAULT_DRIVER_DIR "/usr/lib/dri:/usr/lib/i386-linux-gnu/dri"
--# define DRI_XORG_DRV_DIR "/usr/lib/xorg/modules/drivers/"
--#endif
- 
- #ifdef DEBUG_DRI_CALLS
-  #define SWDRI_SHOWNAME(pext, func) \
diff --git a/libre/virtualbox-libre/003-gcc-48.patch b/libre/virtualbox-libre/003-gcc-48.patch
deleted file mode 100644
index 3039ea2c6..000000000
--- a/libre/virtualbox-libre/003-gcc-48.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-Index: configure
-===================================================================
---- a/configure	(revision 45449)
-+++ a/configure	(revision 45450)
-@@ -416,7 +416,7 @@
-       elif [ $cc_maj -lt 3 \
-              -o \( $cc_maj -eq 3 -a $cc_min -lt 2 \) \
-              -o \( $cc_maj -eq 4 -a $cc_min -lt 1 -a "$OS" != "darwin" \) \
--             -o \( $cc_maj -eq 4 -a $cc_min -gt 7 \) \
-+             -o \( $cc_maj -eq 4 -a $cc_min -gt 8 \) \
-              -o $cc_maj -gt 4 ]; then
-         log_failure "gcc version $cc_ver found, expected gcc 3.x with x>1 or gcc 4.x with 0<x<8"
-         fail really
-Index: Config.kmk
-===================================================================
---- a/Config.kmk	(revision 45449)
-+++ a/Config.kmk	(revision 45450)
-@@ -1503,7 +1503,7 @@
- #
- # Compiler optimization flags.
- #
--VBOX_GCC_WARN     ?= -Wall $(VBOX_GCC_Wextra) $(VBOX_GCC_Wno-missing-field-initializers) -Wno-unused -Wno-trigraphs $(VBOX_GCC_fdiagnostics-show-option)
-+VBOX_GCC_WARN     ?= -Wall $(VBOX_GCC_Wextra) $(VBOX_GCC_Wno-missing-field-initializers) -Wno-unused -Wno-trigraphs $(VBOX_GCC_fdiagnostics-show-option) $(VBOX_GCC_no-unused-parameter)
- VBOX_GCC_WARN_PEDANTIC = -Wshadow $(VBOX_GCC_WARN) -Wno-long-long
- ifdef VBOX_WITH_MASOCHISTIC_WARNINGS
-  VBOX_GCC_WARN_PEDANTIC += -Wunused-variable -Wunused-function -Wunused-label -Wunused-parameter
-@@ -2285,6 +2285,12 @@
- 	$(QUIET)$(APPEND) '$@' ' endif'
- 	$(QUIET)$(APPEND) '$@' 'endif'
- endif
-+# Prevent warnings about unused parameters as of gcc-4.8 as this warning is now very verbose
-+	$(QUIET)$(APPEND) '$@' 'ifneq ($$(VBOX_GCC_VERSION_CXX),)'
-+	$(QUIET)$(APPEND) '$@' ' ifneq ($$(int-ge $$(VBOX_GCC_VERSION_CXX),40800),)'
-+	$(QUIET)$(APPEND) '$@' '  VBOX_GCC_no-unused-parameter ?= -Wno-unused-parameter'
-+	$(QUIET)$(APPEND) '$@' ' endif'
-+	$(QUIET)$(APPEND) '$@' 'endif'
- ifeq ($(KBUILD_TARGET),solaris)
- 	$(QUIET)$(APPEND) '$@' 'VBOX_GCC_msave-args            ?= $(call VBOX_GCC_CHECK_CXX,-msave-args,)'
- # Detect the solaris assembler. It is used by the the 4.x gcc compilers,
diff --git a/libre/virtualbox-libre/003-linux-3.8.patch b/libre/virtualbox-libre/003-linux-3.8.patch
deleted file mode 100644
index 0c6d9fbbf..000000000
--- a/libre/virtualbox-libre/003-linux-3.8.patch
+++ /dev/null
@@ -1,15 +0,0 @@
---- a/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c	(revision 43343)
-+++ b/src/VBox/Additions/common/VBoxGuest/VBoxGuest-linux.c	(revision 44317)
-@@ -196,7 +196,11 @@
- 
- 
- /** PCI hotplug structure. */
--static const struct pci_device_id __devinitdata g_VBoxGuestPciId[] =
-+static const struct pci_device_id
-+#if LINUX_VERSION_CODE < KERNEL_VERSION(3, 8, 0)
-+__devinitdata
-+#endif
-+g_VBoxGuestPciId[] =
- {
-     {
-         vendor:     VMMDEV_VENDORID,
diff --git a/libre/virtualbox-libre/004-system-xorg.patch b/libre/virtualbox-libre/004-system-xorg.patch
deleted file mode 100644
index c527f7f20..000000000
--- a/libre/virtualbox-libre/004-system-xorg.patch
+++ /dev/null
@@ -1,245 +0,0 @@
-diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/common/crOpenGL/Makefile.kmk
---- VirtualBox-4.2.10.orig/src/VBox/Additions/common/crOpenGL/Makefile.kmk	2013-03-19 18:55:28.774951223 +0000
-+++ VirtualBox-4.2.10/src/VBox/Additions/common/crOpenGL/Makefile.kmk	2013-03-19 18:58:06.337193736 +0000
-@@ -63,18 +63,12 @@
- VBoxOGL_INCS           = .
- if1of ($(KBUILD_TARGET), linux solaris freebsd)
-  VBoxOGL_INCS     += \
--	$(VBOX_PATH_X11_ROOT)/libXdamage-1.1 \
--	$(VBOX_PATH_X11_ROOT)/libXcomposite-0.4.0 \
--	$(VBOX_PATH_X11_ROOT)/libXext-1.3.1 \
--	$(VBOX_PATH_X11_ROOT)/libXfixes-4.0.3 \
--	$(VBOX_PATH_X11_ROOT)/damageproto-1.1.0 \
--	$(VBOX_PATH_X11_ROOT)/compositeproto-0.4 \
--	$(VBOX_PATH_X11_ROOT)/fixesproto-4.0 \
--	$(VBOX_PATH_X11_ROOT)/libx11-1.1.5-other \
--	$(VBOX_PATH_X11_ROOT)/xextproto-7.1.1 \
--	$(VBOX_PATH_X11_ROOT)/xproto-7.0.18 \
-+	/usr/include/x11 \
-+	/usr/include/xorg \
-+	/usr/include/pixman-1 \
- 	$(VBOX_MESA_INCS) \
--	$(PATH_ROOT)/src/VBox/Additions/x11/x11include/libdrm-2.4.13
-+	/usr/include/drm \
-+	/usr/include/libdrm
-  VBoxOGL_DEFS     += VBOX_NO_NATIVEGL
- endif
- 
-diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk
---- VirtualBox-4.2.10.orig/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk	2013-03-19 18:55:28.778284533 +0000
-+++ VirtualBox-4.2.10/src/VBox/Additions/common/VBoxGuestLib/Makefile.kmk	2013-03-19 18:56:00.468064457 +0000
-@@ -40,8 +40,8 @@
- 	VBoxGuestR3LibShared
- ifndef VBOX_ONLY_TESTSUITE
-  if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd)
--  LIBRARIES += \
--  	VBoxGuestR3LibXFree86
-+#  LIBRARIES += \
-+#  	VBoxGuestR3LibXFree86
-  endif
- endif
- LIBRARIES.win.amd64 += VBoxGuestR3Lib-x86 VBoxGuestR3LibShared-x86
-diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/x11/Makefile.kmk
---- VirtualBox-4.2.10.orig/src/VBox/Additions/x11/Makefile.kmk	2013-03-19 18:55:28.974949837 +0000
-+++ VirtualBox-4.2.10/src/VBox/Additions/x11/Makefile.kmk	2013-03-19 18:56:00.468064457 +0000
-@@ -17,6 +17,10 @@
- SUB_DEPTH = ../../../..
- include $(KBUILD_PATH)/subheader.kmk
- 
-+ifn1of ($(XSERVER_VERSION), 13 14 15 16 17 18 19 110 111)
-+ XSERVER_VERSION := 17
-+endif
-+
- # Include sub-makefiles.
- if1of ($(KBUILD_TARGET), freebsd linux netbsd openbsd solaris)
-  include $(PATH_SUB_CURRENT)/VBoxClient/Makefile.kmk
-diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxmouse/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/x11/vboxmouse/Makefile.kmk
---- VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxmouse/Makefile.kmk	2013-03-19 18:55:28.818284256 +0000
-+++ VirtualBox-4.2.10/src/VBox/Additions/x11/vboxmouse/Makefile.kmk	2013-03-19 18:56:00.468064457 +0000
-@@ -29,7 +29,6 @@
- # vboxmouse_drv
- #
- if1of ($(KBUILD_TARGET), linux)
-- SYSMODS += vboxmouse_drv
-  vboxmouse_drv_TEMPLATE = VBOXGUESTR3XF86MOD
-  vboxmouse_drv_DEFS.linux = linux
-  vboxmouse_drv_DEFS.x86 += __i386__
-@@ -69,7 +68,6 @@
- #
- # vboxmouse_drv_70
- #
--DLLS += vboxmouse_drv_70
- vboxmouse_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_70_DEFS = \
- 	XFree86Server IN_MODULE XFree86Module XFree86LOADER XINPUT XORG_7X IN_XF86_MODULE DONT_DEFINE_WRAPPERS NO_ANSIC
-@@ -85,7 +83,6 @@
- #
- # vboxmouse_drv_71
- #
--DLLS += vboxmouse_drv_71
- vboxmouse_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_71_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- vboxmouse_drv_71_INCS := \
-@@ -100,7 +97,6 @@
- #
- # vboxmouse_drv_13
- #
--DLLS += vboxmouse_drv_13
- vboxmouse_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_13_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- vboxmouse_drv_13_INCS := \
-@@ -114,7 +110,6 @@
- #
- # vboxmouse_drv_14
- #
--DLLS += vboxmouse_drv_14
- vboxmouse_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_14_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- vboxmouse_drv_14_INCS := \
-@@ -128,7 +123,6 @@
- #
- # vboxmouse_drv_15
- #
--DLLS += vboxmouse_drv_15
- vboxmouse_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_15_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- vboxmouse_drv_15_INCS := \
-@@ -142,7 +136,6 @@
- #
- # vboxmouse_drv_16
- #
--DLLS += vboxmouse_drv_16
- vboxmouse_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxmouse_drv_16_DEFS := $(vboxmouse_drv_70_DEFS) NO_ANSIC
- vboxmouse_drv_16_INCS := \
-diff -Nur VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk VirtualBox-4.2.10/src/VBox/Additions/x11/vboxvideo/Makefile.kmk
---- VirtualBox-4.2.10.orig/src/VBox/Additions/x11/vboxvideo/Makefile.kmk	2013-03-19 18:55:28.974949837 +0000
-+++ VirtualBox-4.2.10/src/VBox/Additions/x11/vboxvideo/Makefile.kmk	2013-03-19 18:56:00.468064457 +0000
-@@ -53,7 +53,6 @@
- # vboxvideo_drv
- #
- if1of ($(KBUILD_TARGET), linux)
-- SYSMODS += vboxvideo_drv
- endif   # target linux
- vboxvideo_drv_TEMPLATE = VBOXGUESTR3XF86MOD
- vboxvideo_drv_DEFS.linux = linux
-@@ -128,7 +127,6 @@
- #         base keywords instead of using .solaris or .linux.
- #         Also it is *important* to use := and not = when deriving a property.
- #
--DLLS += vboxvideo_drv_70
- vboxvideo_drv_70_TEMPLATE = VBOXGUESTR3XORGMOD
- if1of ($(KBUILD_TARGET), linux)
-  vboxvideo_drv_70_CFLAGS += \
-@@ -149,7 +147,6 @@
- #
- # vboxvideo_drv_71
- #
--DLLS += vboxvideo_drv_71
- vboxvideo_drv_71_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_71_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_71_DEFS := $(vboxvideo_70_DEFS) XORG_VERSION_CURRENT=700100000
-@@ -164,7 +161,6 @@
- #
- # vboxvideo_drv_13
- #
--DLLS += vboxvideo_drv_13
- vboxvideo_drv_13_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_13_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_13_DEFS := $(vboxvideo_13_DEFS) XORG_VERSION_CURRENT=100300000
-@@ -178,7 +174,6 @@
- #
- # vboxvideo_drv_14
- #
--DLLS += vboxvideo_drv_14
- vboxvideo_drv_14_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_14_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_14_DEFS := $(vboxvideo_13_DEFS) XORG_VERSION_CURRENT=100400000
-@@ -192,7 +187,6 @@
- #
- # vboxvideo_drv_15
- #
--DLLS += vboxvideo_drv_15
- vboxvideo_drv_15_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_15_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_15_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100503000
-@@ -213,7 +207,6 @@
- #
- # vboxvideo_drv_16
- #
--DLLS += vboxvideo_drv_16
- vboxvideo_drv_16_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_16_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_16_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100600000
-@@ -227,7 +220,6 @@
- #
- # vboxvideo_drv_17
- #
--DLLS += vboxvideo_drv_17
- vboxvideo_drv_17_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_17_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_17_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100699000
-@@ -241,7 +233,6 @@
- #
- # vboxvideo_drv_18
- #
--DLLS += vboxvideo_drv_18
- vboxvideo_drv_18_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_18_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_18_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100800000
-@@ -255,7 +246,6 @@
- #
- # vboxvideo_drv_19
- #
--DLLS += vboxvideo_drv_19
- vboxvideo_drv_19_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_19_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_19_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=100900000
-@@ -269,7 +259,6 @@
- #
- # vboxvideo_drv_110
- #
--DLLS += vboxvideo_drv_110
- vboxvideo_drv_110_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_110_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_110_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101000000
-@@ -283,7 +272,6 @@
- #
- # vboxvideo_drv_111
- #
--DLLS += vboxvideo_drv_111
- vboxvideo_drv_111_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_111_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_111_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101100000
-@@ -297,7 +285,6 @@
- #
- # vboxvideo_drv_112
- #
--DLLS += vboxvideo_drv_112
- vboxvideo_drv_112_TEMPLATE = VBOXGUESTR3XORGMOD
- vboxvideo_drv_112_CFLAGS := $(vboxvideo_drv_70_CFLAGS)
- vboxvideo_drv_112_DEFS := $(vboxvideo_15_DEFS) XORG_VERSION_CURRENT=101200000
-@@ -341,6 +328,23 @@
- endif
- 
- 
-+vboxvideo_drv_$(XSERVER_VERSION)_NAME := vboxvideo_drv
-+vboxvideo_drv_$(XSERVER_VERSION)_INCS := \
-+	/usr/include/xorg \
-+	/usr/include/x11 \
-+	/usr/include/pixman-1 \
-+	/usr/include/X11/dri \
-+	/usr/include/drm \
-+	/usr/include/libdrm
-+vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(PATH_ROOT)/src/VBox/Runtime/include
-+DLLS += vboxvideo_drv_$(XSERVER_VERSION)
-+
-+# required for lenny backports
-+ifeq ($(XSERVER_VERSION),14)
-+	vboxvideo_drv_$(XSERVER_VERSION)_INCS += $(VBOX_PATH_X11_XORG_1_4)/xorg
-+endif
-+
-+
- # Check the undefined symbols in the X.Org modules against lists of allowed
- # symbols.  Not very elegant, but it will catch problems early.
- 
diff --git a/libre/virtualbox-libre/10-vboxdrv.rules b/libre/virtualbox-libre/10-vboxdrv.rules
deleted file mode 100644
index 37403ae2f..000000000
--- a/libre/virtualbox-libre/10-vboxdrv.rules
+++ /dev/null
@@ -1,5 +0,0 @@
-KERNEL=="vboxdrv", NAME="vboxdrv", OWNER="root", GROUP="root", MODE="0600" ENV{ACL_MANAGE}="1"
-SUBSYSTEM=="usb_device", ACTION=="add", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
-SUBSYSTEM=="usb", ACTION=="add", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh $major $minor $attr{bDeviceClass} vboxusers"
-SUBSYSTEM=="usb_device", ACTION=="remove", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
-SUBSYSTEM=="usb", ACTION=="remove", ENV{DEVTYPE}=="usb_device", RUN="/usr/share/virtualbox/VBoxCreateUSBNode.sh --remove $major $minor"
diff --git a/libre/virtualbox-libre/60-vboxguest.rules b/libre/virtualbox-libre/60-vboxguest.rules
deleted file mode 100644
index 6285f7249..000000000
--- a/libre/virtualbox-libre/60-vboxguest.rules
+++ /dev/null
@@ -1,2 +0,0 @@
-ACTION=="add", KERNEL=="vboxguest", SUBSYSTEM=="misc", OWNER="root", MODE="0600"
-ACTION=="add", KERNEL=="vboxuser", SUBSYSTEM=="misc", OWNER="root", MODE="0666"
diff --git a/libre/virtualbox-libre/LocalConfig.kmk b/libre/virtualbox-libre/LocalConfig.kmk
deleted file mode 100644
index 6eca06d9b..000000000
--- a/libre/virtualbox-libre/LocalConfig.kmk
+++ /dev/null
@@ -1,20 +0,0 @@
-VBOX_WITH_ADDITION_DRIVERS =
-VBOX_WITH_INSTALLER = 1
-VBOX_WITH_LINUX_ADDITIONS = 1
-VBOX_WITH_X11_ADDITIONS = 1
-VBOX_WITH_TESTCASES =
-VBOX_WITH_TESTSUITE =
-VBOX_WITH_ORIGIN :=
-VBOX_PATH_APP_PRIVATE_ARCH := /usr/lib/virtualbox
-VBOX_PATH_SHARED_LIBS := $(VBOX_PATH_APP_PRIVATE_ARCH)
-VBOX_WITH_RUNPATH := $(VBOX_PATH_APP_PRIVATE_ARCH)
-VBOX_PATH_APP_PRIVATE := /usr/share/virtualbox
-VBOX_PATH_APP_DOCS := /usr/share/virtualbox
-VBOX_PATH_PACKAGE_DOCS := $(VBOX_PATH_APP_DOCS)
-VBOX_WITH_REGISTRATION_REQUEST =
-VBOX_WITH_UPDATE_REQUEST =
-VBOX_WITH_VNC := 1
-VBOX_BLD_PYTHON = python2
-VBOX_JAVA_HOME = /usr/lib/jvm/java-7-openjdk
-VBOX_GCC_WERR =
-VBOX_GCC_WARN =
diff --git a/libre/virtualbox-libre/PKGBUILD b/libre/virtualbox-libre/PKGBUILD
deleted file mode 100644
index b53a9f61e..000000000
--- a/libre/virtualbox-libre/PKGBUILD
+++ /dev/null
@@ -1,339 +0,0 @@
-# $Id: PKGBUILD 93521 2013-07-05 00:32:42Z seblu $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-# Maintainer: Sébastien Luttringer <seblu@aur.archlinux.org>
-# Maintainer (Parabola): André Silva <emulatorman@parabola.nu>
-# Contributor (Parabola): Nicolas Reynolds <fauno@kiwwwi.com.ar>
-# Contributor (Parabola): Márcio Silva <coadde@lavabit.com>
-# Contributor (Parabola): Jorge López <jorginho@lavabit.com>
-# Contributor (Parabola): Esteban Carnevale <alfplayer@mailoo.org>
-
-pkgbase=virtualbox-libre
-pkgname=('virtualbox-libre'
-         'virtualbox-libre-host-dkms'
-         'virtualbox-libre-guest-dkms'
-         'virtualbox-libre-sdk'
-         'virtualbox-libre-guest-utils')
-pkgver=4.2.16
-pkgrel=1
-arch=('i686' 'x86_64')
-url='http://virtualbox.org'
-license=('GPL' 'custom')
-makedepends=('alsa-lib'
-             'bin86'
-             'cdrkit'
-             'curl'
-             'dev86'
-             'device-mapper'
-             'glu'
-             'gsoap-legacy'
-             'iasl'
-             'jdk7-openjdk'
-             'libidl2'
-             'libpulse'
-             'libstdc++5'
-             'libxcomposite'
-             'libxcursor'
-             'libxinerama'
-             'libxml2'
-             'libxmu'
-             'libxrandr'
-             'libxslt'
-             'libxtst'
-             'linux-libre-headers'
-             'mesa'
-             'python2'
-             'qt4'
-             'sdl'
-             'sdl_ttf'
-             'vde2'
-             'xalan-c'
-             'xf86driproto'
-             'xorg-server-devel')
-[[ $CARCH == "x86_64" ]] && makedepends=("${makedepends[@]}" 'gcc-multilib' 'lib32-glibc')
-source=("http://download.virtualbox.org/virtualbox/$pkgver/VirtualBox-$pkgver.tar.bz2"
-        '10-vboxdrv.rules'
-        '60-vboxguest.rules'
-        'LocalConfig.kmk'
-        'vboxservice.service'
-        'vboxweb.service'
-        '001-vboxdrv-reference.patch'
-        '002-change_default_driver_dir.patch'
-        '004-system-xorg.patch'
-        'os_blag_64.png'
-        'os_blag.png'
-        'os_dragora_64.png'
-        'os_dragora.png'
-        'os_dynebolic.png'
-        'os_gnewsense_64.png'
-        'os_gnewsense.png'
-        'os_gnu_64.png'
-        'os_gnu.png'
-        'os_musix_64.png'
-        'os_musix.png' 
-        'os_parabola_64.png'
-        'os_parabola.png'
-        'os_trisquel_64.png'
-        'os_trisquel.png'
-        'os_ututo_64.png'
-        'os_ututo.png'
-        'os_venenux.png'
-        'libre.patch'
-        'free-distros.patch')
-md5sums=('c4a36e2099a317f4715cd3861cdae238'
-         '5f85710e0b8606de967716ded7b2d351'
-         'ed1341881437455d9735875ddf455fbe'
-         '58d6e5bb4b4c1c6f3f0b3daa6aaeed03'
-         '07c5f6d86c4b7839d719c8ee0c53653b'
-         'bc9efed88e0469cd7fc460d5a5cd7b4b'
-         'f4e4c7895ede9c524109589bf16ae660'
-         '97e193f050574dd272a38e5ee5ebe62b'
-         '4da461f8c90caa123b47c62479f426b4'
-         '8538dba8686d7449cb481c9bae9d722a'
-         '545c925b46f2ac95e5f8ae407fad101a'
-         'f6416f509c2e5460e4dc624e0a57f3c1'
-         'bbfb59dd517c020a23701b480187a355'
-         'efacfdb61918286ea9bc89866b8fd239'
-         '7c3eb09995e8bafeef414374e44ad4ce'
-         'a49ed3ab6bd0fb084de0ab3dd97ae93e'
-         '6b432b3305ed446125eef052c38355a6'
-         'a70022a468bd3e9daf01818d2d74ac3c'
-         '380eb2ab6cad3da198094585853c129c'
-         'a60bb9a98abcc3c34156f9051d00df9a'
-         '3a908ef6952bcf987e63ef2fe4e98d24'
-         '02e87c39c353634cecacf98f1707fa15'
-         '0cf41a41e7a415d404d5584e047fd450'
-         '449cde3b58390284b59c5d663de3edc9'
-         'c7951fe6888d939f3a7d0dafe477e82b'
-         '4da8eeb2ece7e475fc7a0d1003da26c6'
-         '5e4187af59726d71c5be48d0cd816c34'
-         '9e0b199059faa3f99def5b0ba6e74009'
-         '1e2274facace125e6c2c8fcd7966fca7')
-
-prepare() {
-    cd "VirtualBox-$pkgver"
-    # Apply patches
-    for _p in "$srcdir"/*.patch; do
-        [[ -e $_p ]] || continue
-        msg2 "Apply patch ${_p##*/}"
-        patch -Np1 -i "$_p"
-    done
-
- ## Removing Nonfree directories and Nonfree files
-    rm -rv "./include/VBox/ExtPack"
-    rm -rv "./src/VBox/ExtPacks"
-    rm -rv "./src/VBox/Main/src-helper-apps"
-    rm -rv "./src/VBox/Main/include/ExtPackManagerImpl.h"
-    rm -rv "./src/VBox/Main/include/ExtPackUtil.h"
-    rm -rv "./src/VBox/Main/src-all/ExtPackManagerImpl.cpp"
-    rm -rv "./src/VBox/Main/src-all/ExtPackUtil.cpp"
-
- ## Removing Oracle VM VirtualBox Extension Pack icons
-    rm -v "./src/VBox/Resources/darwin/virtualbox-vbox-extpack.icns"
-    rm -v "./src/VBox/Resources/other/virtualbox-vbox-extpack-"{16px,20px,24px,32px,40px,48px,64px,72px,80px,96px,128px,256px,512px}.png
-    rm -v "./src/VBox/Resources/win/OSE/virtualbox-vbox-extpack.ico"
-    rm -v "./src/VBox/Frontends/VirtualBox/images/extension_pack_"{16px,32px,disabled{_16px,_32px},install{_16px,_32px},install_disabled{_16px,_32px},uninstall{_16px,_32px},uninstall_disabled{_16px,_32px}}.png
-
- ## Adding distros icons
-    for i in {dynebolic,venenux,{gnu,parabola,gnewsense,blag,dragora,ututo,musix,trisquel}{,_64}}; do
-      cp -v "$srcdir/os_${i}.png" "./src/VBox/Frontends/VirtualBox/images"
-    done
-}
-
-build() {
-    cd "VirtualBox-$pkgver"
-    cp "$srcdir/LocalConfig.kmk" .
-    # fake makeself binary to compile without nofatal
-    ln -s /bin/echo makeself
-    export PATH="$CWD:$PATH"
-
-    ./configure --disable-docs \
-        --enable-webservice \
-        --enable-vde \
-        --disable-kmods
-    source ./env.sh
-    kmk all
-
-    # fix python2
-    sed -i 's_^#!.*/usr/bin/python_#!/usr/bin/python2_' "out/linux.$BUILD_PLATFORM_ARCH/release/bin/vboxshell.py"
-
-    # build rdesktop-vrdp (broken from LocalConfig.kmk)
-    pushd src/VBox/RDP/client
-    cp "$srcdir/LocalConfig.kmk" .
-    # fix keymap path FS#32548
-    sed -i 's:/opt/VirtualBox:/usr/share/virtualbox:' Makefile.kmk
-    kmk all
-    popd
-}
-
-package_virtualbox-libre() {
-    pkgdesc='Powerful x86 virtualization for enterprise as well as home use, with free distros presets (nonfree Extension Pack and Guest Additions ISO image support removed)'
-    depends=('curl'
-             'libpng'
-             'libxcursor'
-             'libxinerama'
-             'libxml2'
-             'libxmu'
-             'sdl'
-             'shared-mime-info'
-             'virtualbox-libre-host-modules')
-    optdepends=('qt4: VirtualBox GUI support'
-                'vde2: Virtual Distributed Ethernet support'
-                'virtualbox-libre-sdk: Developer kit'
-                'virtualbox-libre-host-dkms: Host kernel source modules for non-stock kernels'
-                'net-tools: Host-only or bridged networking support')
-    backup=('etc/vbox/vbox.cfg')
-    replaces=('virtualbox' 'virtualbox-ose')
-    conflicts=('virtualbox' 'virtualbox-ose')
-    provides=("virtualbox=$pkgver")
-    install=virtualbox-libre.install
-
-    source "VirtualBox-$pkgver/env.sh"
-    cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
-    install -dm755 "$pkgdir"/usr/{bin,lib/virtualbox/components,share/virtualbox/nls,share/virtualbox/rdesktop-vrdp-keymaps}
-
-    #Binaries and Wrapper with Launchers
-    install -m 0755 VBox.sh "$pkgdir/usr/bin/VBox"
-
-    for i in VBoxHeadless VBoxManage VBoxSDL VirtualBox vboxwebsrv VBoxBalloonCtrl; do
-        ln -sf VBox "$pkgdir/usr/bin/$i"
-        ln -sf VBox "$pkgdir/usr/bin/${i,,}"
-    done
-    install -m 0755 VBoxTunctl "$pkgdir/usr/bin"
-    install -m 0755 rdesktop-vrdp "$pkgdir/usr/bin"
-
-    #components
-    install -m 0755 components/* -t "$pkgdir/usr/lib/virtualbox/components"
-
-    #lib
-    install -m 0755 *.so "$pkgdir/usr/lib/virtualbox"
-    install -m 0644 *.gc *.r0  VBoxEFI*.fd "$pkgdir/usr/lib/virtualbox"
-
-    #setuid root binaries
-    install -m 4755 VBoxSDL VirtualBox VBoxHeadless VBoxNetDHCP VBoxNetAdpCtl -t "$pkgdir/usr/lib/virtualbox"
-    #other binaries
-    install -m 0755 VBoxManage VBoxSVC VBoxXPCOMIPCD VBoxTestOGL VBoxBalloonCtrl vboxwebsrv webtest -t "$pkgdir/usr/lib/virtualbox"
-
-    #language
-    install -m 0755 nls/*.qm -t "$pkgdir/usr/share/virtualbox/nls"
-
-    #rdesktop keymaps
-    install -m 0644 rdesktop-vrdp-keymaps/* "$pkgdir/usr/share/virtualbox/rdesktop-vrdp-keymaps"
-
-    #useless scripts
-    install -m 0755 VBoxCreateUSBNode.sh VBoxSysInfo.sh -t "$pkgdir/usr/share/virtualbox"
-
-    #icons
-    install -D -m 0644 VBox.png "$pkgdir/usr/share/pixmaps/VBox.png"
-
-    pushd icons
-    for i in *; do
-        install -d "$pkgdir/usr/share/icons/hicolor/$i/mimetypes"
-        cp $i/* "$pkgdir/usr/share/icons/hicolor/$i/mimetypes"
-    done
-    popd
-
-    #desktop
-    install -D -m 0644 virtualbox.desktop "$pkgdir/usr/share/applications/virtualbox.desktop"
-    install -D -m 0644 virtualbox.xml "$pkgdir/usr/share/mime/packages/virtualbox.xml"
-
-    #install configuration
-    mkdir -p "$pkgdir/etc/vbox"
-    echo 'INSTALL_DIR=/usr/lib/virtualbox' > "$pkgdir/etc/vbox/vbox.cfg"
-
-    #udev and licence
-    install -D -m 0644 "$srcdir/VirtualBox-${pkgver}/COPYING" \
-        "$pkgdir/usr/share/licenses/virtualbox/LICENSE"
-    install -D -m 0644 "$srcdir/10-vboxdrv.rules" \
-        "$pkgdir/usr/lib/udev/rules.d/10-vboxdrv.rules"
-
-    # install systemd service
-    install -D -m644 "$srcdir/vboxweb.service" \
-        "$pkgdir/usr/lib/systemd/system/vboxweb.service"
-}
-
-package_virtualbox-libre-sdk() {
-    pkgdesc='VirtualBox Software Developer Kit (SDK)'
-    depends=('python2')
-    replaces=('virtualbox-sdk')
-    conflicts=('virtualbox-sdk')
-    provides=("virtualbox-sdk=$pkgver")
-
-    install -dm755 "$pkgdir/usr/lib/virtualbox"
-
-    source "VirtualBox-$pkgver/env.sh"
-    cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
-
-    install -D -m 0755 vboxshell.py "$pkgdir/usr/lib/virtualbox/vboxshell.py"
-    #python sdk
-    pushd sdk/installer
-    VBOX_INSTALL_PATH="/usr/lib/virtualbox" python2 vboxapisetup.py install --root "$pkgdir"
-    popd
-    rm -rf sdk/installer
-    mv sdk "$pkgdir/usr/lib/virtualbox"
-}
-
-package_virtualbox-libre-host-dkms() {
-    pkgdesc='VirtualBox Host kernel modules sources'
-    depends=('dkms' 'gcc' 'make')
-    provides=("virtualbox-host-dkms=$pkgver" 'virtualbox-libre-host-modules')
-    replaces=('virtualbox-host-dkms' 'virtualbox-source' 'virtualbox-libre-source' 'virtualbox-host-source' 'virtualbox-libre-host-source')
-    conflicts=('virtualbox-host-dkms' 'virtualbox-source' 'virtualbox-libre-source' 'virtualbox-host-source' 'virtualbox-libre-host-source')
-    optdepends=('linux-libre-headers'
-                'linux-libre-lts-headers')
-    install=virtualbox-libre-host-dkms.install
-
-    install -dm755 "$pkgdir/usr/src"
-    source "VirtualBox-$pkgver/env.sh"
-    cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin"
-    cp -r src "$pkgdir/usr/src/vboxhost-$pkgver"
-}
-
-package_virtualbox-libre-guest-dkms() {
-    pkgdesc='VirtualBox Guest kernel modules sources'
-    depends=('dkms' 'gcc' 'make')
-    provides=("virtualbox-guest-dkms=$pkgver" 'virtualbox-libre-guest-modules')
-    replaces=('virtualbox-guest-dkms' 'virtualbox-archlinux-source' 'virtualbox-parabola-source' 'virtualbox-guest-source' 'virtualbox-libre-guest-source')
-    conflicts=('virtualbox-guest-dkms' 'virtualbox-archlinux-source' 'virtualbox-parabola-source'  'virtualbox-guest-source' 'virtualbox-libre-guest-source')
-    optdepends=('linux-libre-headers'
-                'linux-libre-lts-headers')
-    install=virtualbox-libre-guest-dkms.install
-
-    install -dm755 "$pkgdir/usr/src"
-    source "VirtualBox-$pkgver/env.sh"
-    cd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
-    cp -r src "$pkgdir/usr/src/vboxguest-$pkgver"
-}
-
-package_virtualbox-libre-guest-utils(){
-    pkgdesc='VirtualBox Guest userspace utilities'
-    depends=('virtualbox-libre-guest-modules' 'gcc-libs' 'libxmu' 'xorg-xrandr' 'libxfixes')
-    optdepends=('virtualbox-libre-guest-dkms: Guest kernel source modules for non-stock kernels')
-    provides=("virtualbox-guest-utils=$pkgver")
-    replaces=('virtualbox-guest-utils' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions' 'virtualbox-guest-additions' 'virtualbox-libre-guest-additions')
-    conflicts=('virtualbox-guest-utils' 'virtualbox-archlinux-additions' 'virtualbox-parabola-additions' 'virtualbox-guest-additions' 'virtualbox-libre-guest-additions')
-    install=virtualbox-libre-guest-utils.install
-
-    source "VirtualBox-$pkgver/env.sh"
-    pushd "VirtualBox-$pkgver/out/linux.$BUILD_PLATFORM_ARCH/release/bin/additions"
-    install -d "$pkgdir/usr/bin"
-    install -m755 VBoxClient VBoxControl VBoxService mount.vboxsf "$pkgdir/usr/bin"
-    install -m755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/98vboxadd-xclient \
-        "$pkgdir"/usr/bin/VBoxClient-all
-    install -m755 -D "$srcdir"/VirtualBox-$pkgver/src/VBox/Additions/x11/Installer/vboxclient.desktop \
-        "$pkgdir"/etc/xdg/autostart/vboxclient.desktop
-    install -D vboxvideo_drv.so \
-        "$pkgdir/usr/lib/xorg/modules/drivers/vboxvideo.so"
-    install -d "$pkgdir/usr/lib/xorg/modules/dri"
-    install -m755 VBoxOGL*.so "$pkgdir/usr/lib"
-    ln -s /usr/lib/VBoxOGL.so "$pkgdir/usr/lib/xorg/modules/dri/vboxvideo_dri.so"
-    install -m755 -D pam_vbox.so "$pkgdir/usr/lib/security/pam_vbox.so"
-    popd
-    # install udev rules
-    install -D -m 0644 60-vboxguest.rules \
-        "$pkgdir/usr/lib/udev/rules.d/60-vboxguest.rules"
-    # install systemd service file
-    install -D -m644 vboxservice.service \
-        "$pkgdir/usr/lib/systemd/system/vboxservice.service"
-}
-
-# vim:set ts=4 sw=4 et:
diff --git a/libre/virtualbox-libre/free-distros.patch b/libre/virtualbox-libre/free-distros.patch
deleted file mode 100644
index 025a2b9f4..000000000
--- a/libre/virtualbox-libre/free-distros.patch
+++ /dev/null
@@ -1,1803 +0,0 @@
-diff --git a/src/VBox/Main/src-all/Global.cpp b/src/VBox/Main/src-all/Global.cpp
-index 2cd5a81..f234d58 100644
---- a/src/VBox/Main/src-all/Global.cpp
-+++ b/src/VBox/Main/src-all/Global.cpp
-@@ -33,293 +33,369 @@ const Global::OSType Global::sOSTypes[] =
-       VBOXOSTYPE_Unknown,         VBOXOSHINT_NONE,
-         64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-       StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97 },
--    { "Windows", "Microsoft Windows", "Windows31",          "Windows 3.1",
--      VBOXOSTYPE_Win31,           VBOXOSHINT_FLOPPY,
--        32,   4,  1 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
--    { "Windows", "Microsoft Windows", "Windows95",          "Windows 95",
--      VBOXOSTYPE_Win95,           VBOXOSHINT_FLOPPY,
--        64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
--    { "Windows", "Microsoft Windows", "Windows98",          "Windows 98",
--      VBOXOSTYPE_Win98,           VBOXOSHINT_FLOPPY,
--        64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
--    { "Windows", "Microsoft Windows", "WindowsMe",          "Windows ME",
--      VBOXOSTYPE_WinMe,           VBOXOSHINT_FLOPPY | VBOXOSHINT_USBTABLET,
--        128,  4,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Windows", "Microsoft Windows", "WindowsNT4",         "Windows NT 4",
--      VBOXOSTYPE_WinNT4,          VBOXOSHINT_NONE,
--       128,  16,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
--    { "Windows", "Microsoft Windows", "Windows2000",        "Windows 2000",
--      VBOXOSTYPE_Win2k,            VBOXOSHINT_USBTABLET,
--       168,  16,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Windows", "Microsoft Windows", "WindowsXP",          "Windows XP",
--      VBOXOSTYPE_WinXP,            VBOXOSHINT_USBTABLET,
--       192,  16, 10 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Windows", "Microsoft Windows", "WindowsXP_64",       "Windows XP (64 bit)",
--      VBOXOSTYPE_WinXP_x64,       VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
--       192,  16, 10 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Windows", "Microsoft Windows", "Windows2003",        "Windows 2003",
--      VBOXOSTYPE_Win2k3,           VBOXOSHINT_USBTABLET,
--       256,  16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Windows", "Microsoft Windows", "Windows2003_64",     "Windows 2003 (64 bit)",
--      VBOXOSTYPE_Win2k3_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
--       256,  16, 20 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_HDA  },
--    { "Windows", "Microsoft Windows", "WindowsVista",       "Windows Vista",
--      VBOXOSTYPE_WinVista,         VBOXOSHINT_USBTABLET,
--       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
--    { "Windows", "Microsoft Windows", "WindowsVista_64",    "Windows Vista (64 bit)",
--      VBOXOSTYPE_WinVista_x64,    VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
--       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
--    { "Windows", "Microsoft Windows", "Windows2008",        "Windows 2008",
--      VBOXOSTYPE_Win2k8,           VBOXOSHINT_USBTABLET,
--       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
--    { "Windows", "Microsoft Windows", "Windows2008_64",     "Windows 2008 (64 bit)",
--      VBOXOSTYPE_Win2k8_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
--       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
--    { "Windows", "Microsoft Windows", "Windows7",           "Windows 7",
--      VBOXOSTYPE_Win7,             VBOXOSHINT_USBTABLET,
--       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
--    { "Windows", "Microsoft Windows", "Windows7_64",        "Windows 7 (64 bit)",
--      VBOXOSTYPE_Win7_x64,        VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
--       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
--    { "Windows", "Microsoft Windows", "Windows8",           "Windows 8",
--      VBOXOSTYPE_Win8,             VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE,
--       1024,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
--    { "Windows", "Microsoft Windows", "Windows8_64",        "Windows 8 (64 bit)",
--      VBOXOSTYPE_Win8_x64,        VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
--       2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
--    { "Windows", "Microsoft Windows", "Windows81",          "Windows 8.1",
--      VBOXOSTYPE_Win8,             VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE,
--       1024,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
--    { "Windows", "Microsoft Windows", "Windows81_64",       "Windows 8.1 (64 bit)",
--      VBOXOSTYPE_Win8_x64,        VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
--       2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
--    { "Windows", "Microsoft Windows", "Windows2012_64",     "Windows 2012 (64 bit)",
--      VBOXOSTYPE_Win2k12_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
--       2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
--    { "Windows", "Microsoft Windows", "WindowsNT",          "Other Windows",
--      VBOXOSTYPE_WinNT,           VBOXOSHINT_NONE,
--       512,  16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
--        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Linux22",            "Linux 2.2",
-+    { "GNU",       "GNU",             "GNU",                "GNU",
-+      VBOXOSTYPE_GNU,         VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       256,   4,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "GNU",       "GNU",             "GNU_64",             "GNU (64 bit)",
-+      VBOXOSTYPE_GNU_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       256,   4,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "GNU-Hurd",  "GNU-Hurd",        "GNUHurd",            "GNU-Hurd",
-+      VBOXOSTYPE_GNUHurd,         VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       256,   4,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "GNU/Linux",   "GNU/Linux",             "Linux22",            "GNU/Linux with kernel v2.2",
-       VBOXOSTYPE_Linux22,         VBOXOSHINT_RTCUTC,
-         64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Linux24",            "Linux 2.4",
-+    { "GNU/Linux",   "GNU/Linux",             "Linux24",            "GNU/Linux with kernel v2.4",
-       VBOXOSTYPE_Linux24,         VBOXOSHINT_RTCUTC,
-        128,   4,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Linux24_64",         "Linux 2.4 (64 bit)",
-+    { "GNU/Linux",   "GNU/Linux",             "Linux24_64",         "GNU/Linux with kernel v2.4 (64 bit)",
-       VBOXOSTYPE_Linux24_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
-        128,   4,  4 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Linux26",            "Linux 2.6",
-+    { "GNU/Linux",   "GNU/Linux",             "Linux26",            "GNU/Linux with kernel v2.6",
-       VBOXOSTYPE_Linux26,         VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        256,   4,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Linux26_64",         "Linux 2.6 (64 bit)",
-+    { "GNU/Linux",   "GNU/Linux",             "Linux26_64",         "GNU/Linux with kernel v2.6 (64 bit)",
-       VBOXOSTYPE_Linux26_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        256,   4,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "ArchLinux",          "Arch Linux",
-+    { "GNU/Linux",   "GNU/Linux",             "Linux",              "Other GNU/Linux",
-+      VBOXOSTYPE_Linux,           VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       256,  12,  8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "Parabola",           "Parabola GNU/Linux-libre",
-+      VBOXOSTYPE_Parabola,       VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "Parabola_64",        "Parabola GNU/Linux-libre (64 bit)",
-+      VBOXOSTYPE_Parabola_x64,   VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "gNewSense",          "gNewSense",
-+      VBOXOSTYPE_gNewSense,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "gNewSense_64",       "gNewSense (64 bit)",
-+      VBOXOSTYPE_gNewSense_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97},
-+    { "Free Distros", "Free GNU/Linux Distros",       "Blag",               "Blag Linux and GNU",
-+      VBOXOSTYPE_Blag,      VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       768,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "Blag_64",            "Blag Linux and GNU (64 bit)",
-+      VBOXOSTYPE_Blag_x64,  VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       768,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "Dragora",            "Dragora",
-+      VBOXOSTYPE_Dragora,       VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "Dragora_64",         "Dragora (64 bit)",
-+      VBOXOSTYPE_Dragora_x64,   VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "Ututo",              "Ututo XS",
-+      VBOXOSTYPE_Ututo,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "Ututo_64",           "Ututo XS (64 bit)",
-+      VBOXOSTYPE_Ututo_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "Musix",              "Musix",
-+      VBOXOSTYPE_Musix,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "Musix_64",           "Musix (64 bit)",
-+      VBOXOSTYPE_Musix_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97},
-+    { "Free Distros", "Free GNU/Linux Distros",       "Trisquel",           "Trisquel",
-+      VBOXOSTYPE_Trisquel,          VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_USBTABLET,
-+       512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "Trisquel_64",        "Trisquel (64 bit)",
-+      VBOXOSTYPE_Trisquel_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Free Distros", "Free GNU/Linux Distros",       "Dynebolic",          "Dyne:bolic",
-+      VBOXOSTYPE_Dynebolic,         VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       256,   4,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "ArchLinux",          "Arch Linux",
-       VBOXOSTYPE_ArchLinux,       VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "ArchLinux_64",       "Arch Linux (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "ArchLinux_64",       "Arch Linux (64 bit)",
-       VBOXOSTYPE_ArchLinux_x64,   VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Debian",             "Debian",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Debian",             "Debian",
-       VBOXOSTYPE_Debian,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Debian_64",          "Debian (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Debian_64",          "Debian (64 bit)",
-       VBOXOSTYPE_Debian_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97},
--    { "Linux",   "Linux",             "OpenSUSE",           "openSUSE",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "OpenSUSE",           "openSUSE",
-       VBOXOSTYPE_OpenSUSE,        VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "OpenSUSE_64",        "openSUSE (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "OpenSUSE_64",        "openSUSE (64 bit)",
-       VBOXOSTYPE_OpenSUSE_x64,    VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Fedora",             "Fedora",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Fedora",             "Fedora",
-       VBOXOSTYPE_FedoraCore,      VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        768,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Fedora_64",          "Fedora (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Fedora_64",          "Fedora (64 bit)",
-       VBOXOSTYPE_FedoraCore_x64,  VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        768,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Gentoo",             "Gentoo",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Gentoo",             "Gentoo",
-       VBOXOSTYPE_Gentoo,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Gentoo_64",          "Gentoo (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Gentoo_64",          "Gentoo (64 bit)",
-       VBOXOSTYPE_Gentoo_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Mandriva",           "Mandriva",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Mandriva",           "Mandriva",
-       VBOXOSTYPE_Mandriva,        VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Mandriva_64",        "Mandriva (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Mandriva_64",        "Mandriva (64 bit)",
-       VBOXOSTYPE_Mandriva_x64,    VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "RedHat",             "Red Hat",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "RedHat",             "Red Hat",
-       VBOXOSTYPE_RedHat,          VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE,
-        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "RedHat_64",          "Red Hat (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "RedHat_64",          "Red Hat (64 bit)",
-       VBOXOSTYPE_RedHat_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
-        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Turbolinux",         "Turbolinux",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Turbolinux",         "Turbolinux",
-       VBOXOSTYPE_Turbolinux,      VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Turbolinux_64",      "Turbolinux (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Turbolinux_64",      "Turbolinux (64 bit)",
-       VBOXOSTYPE_Turbolinux_x64,  VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Ubuntu",             "Ubuntu",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Ubuntu",             "Ubuntu",
-       VBOXOSTYPE_Ubuntu,          VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE | VBOXOSHINT_USBTABLET,
-        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Ubuntu_64",          "Ubuntu (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Ubuntu_64",          "Ubuntu (64 bit)",
-       VBOXOSTYPE_Ubuntu_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-        512,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Xandros",            "Xandros",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Xandros",            "Xandros",
-       VBOXOSTYPE_Xandros,         VBOXOSHINT_RTCUTC,
-        256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Xandros_64",         "Xandros (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Xandros_64",         "Xandros (64 bit)",
-       VBOXOSTYPE_Xandros_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
-        256,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Oracle",             "Oracle",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Oracle",             "Oracle",
-       VBOXOSTYPE_Oracle,          VBOXOSHINT_RTCUTC | VBOXOSHINT_PAE,
-        512,  12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Oracle_64",          "Oracle (64 bit)",
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",             "Oracle_64",          "Oracle (64 bit)",
-       VBOXOSTYPE_Oracle_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_PAE | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_RTCUTC,
-        512,  12, 12 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Linux",   "Linux",             "Linux",              "Other Linux",
--      VBOXOSTYPE_Linux,           VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
--       256,  12,  8 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+    { "Non-free Distros",   "Non-free GNU/Linux Distros",       "Venenux",            "Venenux",
-+      VBOXOSTYPE_Venenux,          VBOXOSHINT_RTCUTC | VBOXOSHINT_USBTABLET,
-+       384,  12,  8 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows31",          "Windows 3.1",
-+      VBOXOSTYPE_Win31,           VBOXOSHINT_FLOPPY,
-+        32,   4,  1 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows95",          "Windows 95",
-+      VBOXOSTYPE_Win95,           VBOXOSHINT_FLOPPY,
-+        64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows98",          "Windows 98",
-+      VBOXOSTYPE_Win98,           VBOXOSHINT_FLOPPY,
-+        64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
-+    { "Non-free OSs", "Non-free Operating Systems", "WindowsMe",          "Windows ME",
-+      VBOXOSTYPE_WinMe,           VBOXOSHINT_FLOPPY | VBOXOSHINT_USBTABLET,
-+        128,  4,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Non-free OSs", "Non-free Operating Systems", "WindowsNT4",         "Windows NT 4",
-+      VBOXOSTYPE_WinNT4,          VBOXOSHINT_NONE,
-+       128,  16,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows2000",        "Windows 2000",
-+      VBOXOSTYPE_Win2k,            VBOXOSHINT_USBTABLET,
-+       168,  16,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Non-free OSs", "Non-free Operating Systems", "WindowsXP",          "Windows XP",
-+      VBOXOSTYPE_WinXP,            VBOXOSHINT_USBTABLET,
-+       192,  16, 10 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Non-free OSs", "Non-free Operating Systems", "WindowsXP_64",       "Windows XP (64 bit)",
-+      VBOXOSTYPE_WinXP_x64,       VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
-+       192,  16, 10 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows2003",        "Windows 2003",
-+      VBOXOSTYPE_Win2k3,           VBOXOSHINT_USBTABLET,
-+       256,  16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows2003_64",     "Windows 2003 (64 bit)",
-+      VBOXOSTYPE_Win2k3_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
-+       256,  16, 20 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "WindowsVista",       "Windows Vista",
-+      VBOXOSTYPE_WinVista,         VBOXOSHINT_USBTABLET,
-+       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "WindowsVista_64",    "Windows Vista (64 bit)",
-+      VBOXOSTYPE_WinVista_x64,    VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
-+       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows2008",        "Windows 2008",
-+      VBOXOSTYPE_Win2k8,           VBOXOSHINT_USBTABLET,
-+       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows2008_64",     "Windows 2008 (64 bit)",
-+      VBOXOSTYPE_Win2k8_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
-+       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows7",           "Windows 7",
-+      VBOXOSTYPE_Win7,             VBOXOSHINT_USBTABLET,
-+       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows7_64",        "Windows 7 (64 bit)",
-+      VBOXOSTYPE_Win7_x64,        VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
-+       512,  16, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows8",           "Windows 8",
-+      VBOXOSTYPE_Win8,             VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE,
-+       1024,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows8_64",        "Windows 8 (64 bit)",
-+      VBOXOSTYPE_Win8_x64,        VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
-+       2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows81",          "Windows 8.1",
-+      VBOXOSTYPE_Win8,             VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET | VBOXOSHINT_PAE,
-+       1024,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows81_64",       "Windows 8.1 (64 bit)",
-+      VBOXOSTYPE_Win8_x64,        VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
-+       2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "Windows2012_64",     "Windows 2012 (64 bit)",
-+      VBOXOSTYPE_Win2k12_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
-+       2048,128, 25 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-+        StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_HDA  },
-+    { "Non-free OSs", "Non-free Operating Systems", "WindowsNT",          "Other Windows",
-+      VBOXOSTYPE_WinNT,           VBOXOSHINT_NONE,
-+       512,  16, 20 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Solaris", "Solaris",           "Solaris",            "Oracle Solaris 10 5/09 and earlier",
-+    { "Non-free OSs", "Non-free Operating Systems",           "Solaris",            "Oracle Solaris 10 5/09 and earlier",
-       VBOXOSTYPE_Solaris,         VBOXOSHINT_NONE,
-        768,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Solaris", "Solaris",           "Solaris_64",         "Oracle Solaris 10 5/09 and earlier (64 bit)",
-+    { "Non-free OSs", "Non-free Operating Systems",           "Solaris_64",         "Oracle Solaris 10 5/09 and earlier (64 bit)",
-       VBOXOSTYPE_Solaris_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
-       1536,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Solaris", "Solaris",           "OpenSolaris",        "Oracle Solaris 10 10/09 and later",
-+    { "Non-free OSs", "Non-free Operating Systems",           "OpenSolaris",        "Oracle Solaris 10 10/09 and later",
-       VBOXOSTYPE_OpenSolaris,     VBOXOSHINT_USBTABLET,
-        768,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Solaris", "Solaris",           "OpenSolaris_64",     "Oracle Solaris 10 10/09 and later (64 bit)",
-+    { "Non-free OSs", "Non-free Operating Systems",           "OpenSolaris_64",     "Oracle Solaris 10 10/09 and later (64 bit)",
-       VBOXOSTYPE_OpenSolaris_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
-       1536,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Solaris", "Solaris",           "Solaris11_64",       "Oracle Solaris 11 (64 bit)",
-+    { "Non-free OSs", "Non-free Operating Systems",           "Solaris11_64",       "Oracle Solaris 11 (64 bit)",
-       VBOXOSTYPE_Solaris11_x64, VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_USBTABLET,
-       1536,  12, 16 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_IntelAhci, StorageBus_SATA,
-         StorageControllerType_IntelAhci, StorageBus_SATA, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "BSD",     "BSD",               "FreeBSD",            "FreeBSD",
-+    { "Non-free OSs", "Non-free Operating Systems",               "FreeBSD",            "FreeBSD",
-       VBOXOSTYPE_FreeBSD,         VBOXOSHINT_NONE,
-        128,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "BSD",     "BSD",               "FreeBSD_64",         "FreeBSD (64 bit)",
-+    { "Non-free OSs", "Non-free Operating Systems",               "FreeBSD_64",         "FreeBSD (64 bit)",
-       VBOXOSTYPE_FreeBSD_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
-        128,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "BSD",     "BSD",               "OpenBSD",            "OpenBSD",
-+    { "Non-free OSs", "Non-free Operating Systems",               "OpenBSD",            "OpenBSD",
-       VBOXOSTYPE_OpenBSD,         VBOXOSHINT_HWVIRTEX,
-         64,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "BSD",     "BSD",               "OpenBSD_64",         "OpenBSD (64 bit)",
-+    { "Non-free OSs", "Non-free Operating Systems",               "OpenBSD_64",         "OpenBSD (64 bit)",
-       VBOXOSTYPE_OpenBSD_x64,     VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
-         64,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "BSD",     "BSD",               "NetBSD",             "NetBSD",
-+    { "Non-free OSs", "Non-free Operating Systems",               "NetBSD",             "NetBSD",
-       VBOXOSTYPE_NetBSD,          VBOXOSHINT_NONE,
-         64,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "BSD",     "BSD",               "NetBSD_64",          "NetBSD (64 bit)",
-+    { "Non-free OSs", "Non-free Operating Systems",               "NetBSD_64",          "NetBSD (64 bit)",
-       VBOXOSTYPE_NetBSD_x64,      VBOXOSHINT_64BIT | VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC,
-         64,   4,  2 * _1G64, NetworkAdapterType_I82540EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "OS2",     "IBM OS/2",          "OS2Warp3",           "OS/2 Warp 3",
-+    { "Non-free OSs", "Non-free Operating Systems",          "OS2Warp3",           "OS/2 Warp 3",
-       VBOXOSTYPE_OS2Warp3,        VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY,
-         48,   4,  1 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
--    { "OS2",     "IBM OS/2",          "OS2Warp4",           "OS/2 Warp 4",
-+    { "Non-free OSs", "Non-free Operating Systems",          "OS2Warp4",           "OS/2 Warp 4",
-       VBOXOSTYPE_OS2Warp4,        VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY,
-         64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
--    { "OS2",     "IBM OS/2",          "OS2Warp45",          "OS/2 Warp 4.5",
-+    { "Non-free OSs", "Non-free Operating Systems",          "OS2Warp45",          "OS/2 Warp 4.5",
-       VBOXOSTYPE_OS2Warp45,       VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY,
-         128,  4,  2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
--    { "OS2",     "IBM OS/2",          "OS2eCS",             "eComStation",
-+    { "Non-free OSs", "Non-free Operating Systems",          "OS2eCS",             "eComStation",
-       VBOXOSTYPE_ECS,             VBOXOSHINT_HWVIRTEX,
-         256,  4,  2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "OS2",     "IBM OS/2",          "OS2",                "Other OS/2",
-+    { "Non-free OSs", "Non-free Operating Systems",          "OS2",                "Other OS/2",
-       VBOXOSTYPE_OS2,             VBOXOSHINT_HWVIRTEX | VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB,
-         96,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 1, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
--    { "MacOS",   "Mac OS X",          "MacOS",              "Mac OS X",
-+    { "Non-free OSs", "Non-free Operating Systems",          "MacOS",              "Mac OS X",
-       VBOXOSTYPE_MacOS,           VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET,
-       2048,   4, 20 * _1G64, NetworkAdapterType_I82543GC, 0,
-        StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA,
-       ChipsetType_ICH9, AudioControllerType_HDA  },
--    { "MacOS",   "Mac OS X",          "MacOS_64",           "Mac OS X (64 bit)",
-+    { "Non-free OSs", "Non-free Operating Systems",          "MacOS_64",           "Mac OS X (64 bit)",
-       VBOXOSTYPE_MacOS_x64,       VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_EFI | VBOXOSHINT_PAE |  VBOXOSHINT_64BIT | VBOXOSHINT_USBHID | VBOXOSHINT_HPET | VBOXOSHINT_USBTABLET,
-       2048,   4, 20 * _1G64, NetworkAdapterType_I82543GC, 0,
-       StorageControllerType_ICH6, StorageBus_IDE, StorageControllerType_IntelAhci, StorageBus_SATA,
-       ChipsetType_ICH9, AudioControllerType_HDA  },
--    { "Other",   "Other",             "DOS",                "DOS",
-+    { "Non-free OSs", "Non-free Operating Systems",             "DOS",                "DOS",
-       VBOXOSTYPE_DOS,             VBOXOSHINT_FLOPPY | VBOXOSHINT_NOUSB,
-         32,   4,  500 * _1M, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_SB16  },
--    { "Other",   "Other",             "Netware",            "Netware",
-+    { "Non-free OSs", "Non-free Operating Systems",             "Netware",            "Netware",
-       VBOXOSTYPE_Netware,         VBOXOSHINT_HWVIRTEX,
-        512,   4,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Other",   "Other",             "L4",                 "L4",
-+    { "Non-free OSs", "Non-free Operating Systems",             "L4",                 "L4",
-       VBOXOSTYPE_L4,              VBOXOSHINT_NONE,
-         64,   4,  2 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Other",   "Other",             "QNX",                "QNX",
-+    { "Non-free OSs", "Non-free Operating Systems",             "QNX",                "QNX",
- #ifdef VBOX_WITH_RAW_RING1
-       VBOXOSTYPE_QNX,             VBOXOSHINT_NONE,
- #else
-@@ -327,7 +403,7 @@ const Global::OSType Global::sOSTypes[] =
- #endif
-        512,   4,  4 * _1G64, NetworkAdapterType_Am79C973, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-       StorageControllerType_PIIX4, StorageBus_IDE, ChipsetType_PIIX3, AudioControllerType_AC97  },
--    { "Other",   "Other",             "JRockitVE",          "JRockitVE",
-+    { "Non-free OSs", "Non-free Operating Systems",             "JRockitVE",          "JRockitVE",
-         VBOXOSTYPE_JRockitVE,     VBOXOSHINT_HWVIRTEX | VBOXOSHINT_IOAPIC | VBOXOSHINT_PAE,
-         1024, 4,  8 * _1G64, NetworkAdapterType_I82545EM, 0, StorageControllerType_PIIX4, StorageBus_IDE,
-         StorageControllerType_BusLogic, StorageBus_SCSI, ChipsetType_PIIX3, AudioControllerType_AC97  },
-diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
-index bd5bd86..c7a8c87 100644
---- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageBasic1.cpp
-@@ -44,10 +44,80 @@ struct osTypePattern
- 
- static const osTypePattern gs_OSTypePattern[] =
- {
--    /* DOS: */
--    { QRegExp("DOS", Qt::CaseInsensitive), "DOS" },
-+    /* Code names for free GNU/Linux distributions */
-+    { QRegExp("((Taranis)|(Dagda)|(Brigantia)).*64", Qt::CaseInsensitive), "Trisquel_64" },
-+    { QRegExp("(Taranis)|(Dagda)|(Brigantia)", Qt::CaseInsensitive), "Trisquel" },
-+    { QRegExp("((metad)|(parkes)|(three)).*64", Qt::CaseInsensitive), "gNewSense_64" },
-+    { QRegExp("(deltah)|(metad)|(parkes)|(three)", Qt::CaseInsensitive), "gNewSense" },
-+    { QRegExp("((90k)|(119k)|(140k)|(160k)|(90000)|(119000)|(140000)|(160000)|(Spartakus)).*64", Qt::CaseInsensitive), "Blag_64" },
-+    { QRegExp("(90k)|(119k)|(140k)|(160k)|(90000)|(119000)|(140000)|(160000)|(Spartakus)", Qt::CaseInsensitive), "Blag" },
-+
-+    /* Regular names of free GNU/Linux distributions */
-+    { QRegExp("Pa.*64", Qt::CaseInsensitive), "Parabola_64" },
-+    { QRegExp("Pa", Qt::CaseInsensitive), "Parabola" },
-+    { QRegExp("((gNe)|(new)|(Sen)).*64", Qt::CaseInsensitive), "gNewSense_64" },
-+    { QRegExp("(gNe)|(new)|(Sen)", Qt::CaseInsensitive), "gNewSense" },
-+    { QRegExp("Bla.*64", Qt::CaseInsensitive), "Blag_64" },
-+    { QRegExp("Bla", Qt::CaseInsensitive), "Blag" },
-+    { QRegExp("Dra.*64", Qt::CaseInsensitive), "Dragora_64" },
-+    { QRegExp("Dra", Qt::CaseInsensitive), "Dragora" },
-+    { QRegExp("((Utu)|(XS)).*64", Qt::CaseInsensitive), "Ututo_64" },
-+    { QRegExp("(Utu)|(XS)", Qt::CaseInsensitive), "Ututo" },
-+    { QRegExp("Mus.*64", Qt::CaseInsensitive), "Musix_64" },
-+    { QRegExp("Mus", Qt::CaseInsensitive), "Musix" },
-+    { QRegExp("Tri.*64", Qt::CaseInsensitive), "Trisquel_64" },
-+    { QRegExp("Tri", Qt::CaseInsensitive), "Trisquel" },
-+    { QRegExp("Dyn", Qt::CaseInsensitive), "Dynebolic" },
-+
-+    /* Code names for non-free GNU/Linux distributions: */
-+    { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)|(raring)).*64", Qt::CaseInsensitive), "Ubuntu_64" },
-+    { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)|(raring)", Qt::CaseInsensitive), "Ubuntu" },
-+    { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(jessie)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" },
-+    { QRegExp("(sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(jessie)|(sid)", Qt::CaseInsensitive), "Debian" },
-+    { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)).*64", Qt::CaseInsensitive), "Fedora_64" },
-+    { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)", Qt::CaseInsensitive), "Fedora" },
- 
--    /* Windows: */
-+    /* Regular names of non-free GNU/Linux distributions: */
-+    { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" },
-+    { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" },
-+    { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" },
-+    { QRegExp("Deb", Qt::CaseInsensitive), "Debian" },
-+    { QRegExp("((SU)|(Nov)|(SLE)).*64", Qt::CaseInsensitive), "OpenSUSE_64" },
-+    { QRegExp("(SU)|(Nov)|(SLE)", Qt::CaseInsensitive), "OpenSUSE" },
-+    { QRegExp("Fe.*64", Qt::CaseInsensitive), "Fedora_64" },
-+    { QRegExp("Fe", Qt::CaseInsensitive), "Fedora" },
-+    { QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive), "Gentoo_64" },
-+    { QRegExp("(Gen)|(Sab)", Qt::CaseInsensitive), "Gentoo" },
-+    { QRegExp("((Man)|(Mag)).*64", Qt::CaseInsensitive), "Mandriva_64" },
-+    { QRegExp("((Man)|(Mag))", Qt::CaseInsensitive), "Mandriva" },
-+    { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "RedHat_64" },
-+    { QRegExp("(Red)|(rhel)|(cen)", Qt::CaseInsensitive), "RedHat" },
-+    { QRegExp("Tur.*64", Qt::CaseInsensitive), "Turbolinux_64" },
-+    { QRegExp("Tur", Qt::CaseInsensitive), "Turbolinux" },
-+    { QRegExp("Ub.*64", Qt::CaseInsensitive), "Ubuntu_64" },
-+    { QRegExp("Ub", Qt::CaseInsensitive), "Ubuntu" },
-+    { QRegExp("Xa.*64", Qt::CaseInsensitive), "Xandros_64" },
-+    { QRegExp("Xa", Qt::CaseInsensitive), "Xandros" },
-+    { QRegExp("((Or)|(oel)).*64", Qt::CaseInsensitive), "Oracle_64" },
-+    { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" },
-+    { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" },
-+    { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" },
-+    { QRegExp("Ven", Qt::CaseInsensitive), "Venenux" },
-+
-+    /* Regular names of generic GNU, GNU/Linux and GNU-Hurd Operating Systems */
-+    { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" },
-+    { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?4.*64", Qt::CaseInsensitive), "Linux24_64" },
-+    { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?4", Qt::CaseInsensitive), "Linux24" },
-+    { QRegExp("((((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?6)|(LFS)).*64", Qt::CaseInsensitive), "Linux26_64" },
-+    { QRegExp("(((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*2.?6)|(LFS)", Qt::CaseInsensitive), "Linux26" },
-+    { QRegExp("((GNU[/|!-]{,1}Li)|(Li)|(lnx)).*64", Qt::CaseInsensitive), "Linux26_64" },
-+    { QRegExp("(GNU[/|!-]{,1}Li)|(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" },
-+    { QRegExp("(GNU-Hu)|(GNU[/|!-]{,1}Hu)|(Hu)", Qt::CaseInsensitive), "GNUHurd" },
-+    { QRegExp("GNU.*64", Qt::CaseInsensitive), "GNU_64" },
-+    { QRegExp("GNU", Qt::CaseInsensitive), "GNU" },
-+
-+    /* Regular names of non-free operating systems: */
-+    { QRegExp("DOS", Qt::CaseInsensitive), "DOS" },
-     { QRegExp("Wi.*98", Qt::CaseInsensitive), "Windows98" },
-     { QRegExp("Wi.*95", Qt::CaseInsensitive), "Windows95" },
-     { QRegExp("Wi.*Me", Qt::CaseInsensitive), "WindowsMe" },
-@@ -70,63 +140,16 @@ static const osTypePattern gs_OSTypePattern[] =
-     { QRegExp("(Wi.*8)|(W8)", Qt::CaseInsensitive), "Windows8" },
-     { QRegExp("Wi.*3", Qt::CaseInsensitive), "Windows31" },
-     { QRegExp("Wi", Qt::CaseInsensitive), "WindowsXP" },
--
--    /* Solaris: */
-     { QRegExp("So.*11", Qt::CaseInsensitive), "Solaris11_64" },
-     { QRegExp("((Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)).*64", Qt::CaseInsensitive), "OpenSolaris_64" },
-     { QRegExp("(Op.*So)|(os20[01][0-9])|(So.*10)|(India)|(Neva)", Qt::CaseInsensitive), "OpenSolaris" },
-     { QRegExp("So.*64", Qt::CaseInsensitive), "Solaris_64" },
-     { QRegExp("So", Qt::CaseInsensitive), "Solaris" },
--
--    /* OS/2: */
-     { QRegExp("OS[/|!-]{,1}2.*W.*4.?5", Qt::CaseInsensitive), "OS2Warp45" },
-     { QRegExp("OS[/|!-]{,1}2.*W.*4", Qt::CaseInsensitive), "OS2Warp4" },
-     { QRegExp("OS[/|!-]{,1}2.*W", Qt::CaseInsensitive), "OS2Warp3" },
-     { QRegExp("(OS[/|!-]{,1}2.*e)|(eCS.*)", Qt::CaseInsensitive), "OS2eCS" },
-     { QRegExp("OS[/|!-]{,1}2", Qt::CaseInsensitive), "OS2" },
--
--    /* Code names for Linux distributions: */
--    { QRegExp("((edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)|(raring)).*64", Qt::CaseInsensitive), "Ubuntu_64" },
--    { QRegExp("(edgy)|(feisty)|(gutsy)|(hardy)|(intrepid)|(jaunty)|(karmic)|(lucid)|(maverick)|(natty)|(oneiric)|(precise)|(quantal)|(raring)", Qt::CaseInsensitive), "Ubuntu" },
--    { QRegExp("((sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(jessie)|(sid)).*64", Qt::CaseInsensitive), "Debian_64" },
--    { QRegExp("(sarge)|(etch)|(lenny)|(squeeze)|(wheezy)|(jessie)|(sid)", Qt::CaseInsensitive), "Debian" },
--    { QRegExp("((moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)).*64", Qt::CaseInsensitive), "Fedora_64" },
--    { QRegExp("(moonshine)|(werewolf)|(sulphur)|(cambridge)|(leonidas)|(constantine)|(goddard)|(laughlin)|(lovelock)|(verne)|(beefy)|(spherical)", Qt::CaseInsensitive), "Fedora" },
--
--    /* Regular names of Linux distributions: */
--    { QRegExp("Arc.*64", Qt::CaseInsensitive), "ArchLinux_64" },
--    { QRegExp("Arc", Qt::CaseInsensitive), "ArchLinux" },
--    { QRegExp("Deb.*64", Qt::CaseInsensitive), "Debian_64" },
--    { QRegExp("Deb", Qt::CaseInsensitive), "Debian" },
--    { QRegExp("((SU)|(Nov)|(SLE)).*64", Qt::CaseInsensitive), "OpenSUSE_64" },
--    { QRegExp("(SU)|(Nov)|(SLE)", Qt::CaseInsensitive), "OpenSUSE" },
--    { QRegExp("Fe.*64", Qt::CaseInsensitive), "Fedora_64" },
--    { QRegExp("Fe", Qt::CaseInsensitive), "Fedora" },
--    { QRegExp("((Gen)|(Sab)).*64", Qt::CaseInsensitive), "Gentoo_64" },
--    { QRegExp("(Gen)|(Sab)", Qt::CaseInsensitive), "Gentoo" },
--    { QRegExp("((Man)|(Mag)).*64", Qt::CaseInsensitive), "Mandriva_64" },
--    { QRegExp("((Man)|(Mag))", Qt::CaseInsensitive), "Mandriva" },
--    { QRegExp("((Red)|(rhel)|(cen)).*64", Qt::CaseInsensitive), "RedHat_64" },
--    { QRegExp("(Red)|(rhel)|(cen)", Qt::CaseInsensitive), "RedHat" },
--    { QRegExp("Tur.*64", Qt::CaseInsensitive), "Turbolinux_64" },
--    { QRegExp("Tur", Qt::CaseInsensitive), "Turbolinux" },
--    { QRegExp("Ub.*64", Qt::CaseInsensitive), "Ubuntu_64" },
--    { QRegExp("Ub", Qt::CaseInsensitive), "Ubuntu" },
--    { QRegExp("Xa.*64", Qt::CaseInsensitive), "Xandros_64" },
--    { QRegExp("Xa", Qt::CaseInsensitive), "Xandros" },
--    { QRegExp("((Or)|(oel)).*64", Qt::CaseInsensitive), "Oracle_64" },
--    { QRegExp("(Or)|(oel)", Qt::CaseInsensitive), "Oracle" },
--    { QRegExp("Knoppix", Qt::CaseInsensitive), "Linux26" },
--    { QRegExp("Dsl", Qt::CaseInsensitive), "Linux24" },
--    { QRegExp("((Li)|(lnx)).*2.?2", Qt::CaseInsensitive), "Linux22" },
--    { QRegExp("((Li)|(lnx)).*2.?4.*64", Qt::CaseInsensitive), "Linux24_64" },
--    { QRegExp("((Li)|(lnx)).*2.?4", Qt::CaseInsensitive), "Linux24" },
--    { QRegExp("((((Li)|(lnx)).*2.?6)|(LFS)).*64", Qt::CaseInsensitive), "Linux26_64" },
--    { QRegExp("(((Li)|(lnx)).*2.?6)|(LFS)", Qt::CaseInsensitive), "Linux26" },
--    { QRegExp("((Li)|(lnx)).*64", Qt::CaseInsensitive), "Linux26_64" },
--    { QRegExp("(Li)|(lnx)", Qt::CaseInsensitive), "Linux26" },
--
--    /* Other: */
-     { QRegExp("L4", Qt::CaseInsensitive), "L4" },
-     { QRegExp("((Fr.*B)|(fbsd)).*64", Qt::CaseInsensitive), "FreeBSD_64" },
-     { QRegExp("(Fr.*B)|(fbsd)", Qt::CaseInsensitive), "FreeBSD" },
-@@ -139,6 +162,8 @@ static const osTypePattern gs_OSTypePattern[] =
-     { QRegExp("(Mac)|(Tig)|(Leop)|(osx)", Qt::CaseInsensitive), "MacOS" },
-     { QRegExp("Net", Qt::CaseInsensitive), "Netware" },
-     { QRegExp("Rocki", Qt::CaseInsensitive), "JRockitVE" },
-+
-+    /* Other: */
-     { QRegExp("Ot", Qt::CaseInsensitive), "Other" },
- };
- 
-@@ -233,11 +258,13 @@ UIWizardNewVMPageBasic1::UIWizardNewVMPageBasic1(const QString &strGroup)
-     /* Create widgets: */
-     QVBoxLayout *pMainLayout = new QVBoxLayout(this);
-     {
-+        pMainLayout->setContentsMargins(8, 6, 8, 6);
-         m_pLabel = new QIRichTextLabel(this);
-+        m_pLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
-         m_pNameAndSystemEditor = new UINameAndSystemEditor(this);
--        pMainLayout->addWidget(m_pLabel);
--        pMainLayout->addWidget(m_pNameAndSystemEditor);
--        pMainLayout->addStretch();
-+        m_pNameAndSystemEditor->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Expanding);
-+        pMainLayout->addWidget(m_pLabel, 1);
-+        pMainLayout->addWidget(m_pNameAndSystemEditor, 1);
-     }
- 
-     /* Setup connections: */
-diff --git a/src/VBox/Main/xml/Settings.cpp b/src/VBox/Main/xml/Settings.cpp
-index 8cb1e12..20e3eda 100644
---- a/src/VBox/Main/xml/Settings.cpp
-+++ b/src/VBox/Main/xml/Settings.cpp
-@@ -3405,7 +3405,18 @@ const struct {
-     { "netware", "Netware" },
-     { "solaris", "Solaris" },
-     { "opensolaris", "OpenSolaris" },
--    { "l4", "L4" }
-+    { "l4", "L4" },
-+    { "gnu", "GNU" },
-+    { "gnuhurd", "GNUHurd" },
-+    { "parabola", "Parabola" },
-+    { "gnewsense", "gNewSense" },
-+    { "blag", "Blag" },
-+    { "dragora", "Dragora" },
-+    { "ututo", "Ututo" },
-+    { "musix", "Musix" },
-+    { "trisquel", "Trisquel" },
-+    { "dynebolic", "Dynebolic" },
-+    { "venenux", "Venenux" }
- };
- 
- void MachineConfigFile::convertOldOSType_pre1_5(Utf8Str &str)
-diff --git a/src/VBox/Main/xml/SettingsConverter.xsl b/src/VBox/Main/xml/SettingsConverter.xsl
-index 9a31a4c..7db11ad 100644
---- a/src/VBox/Main/xml/SettingsConverter.xsl
-+++ b/src/VBox/Main/xml/SettingsConverter.xsl
-@@ -763,6 +763,17 @@ Value '<xsl:value-of select="@type"/>' of 'HardDisk::type' attribute is invalid.
-         <xsl:when test="@OSType='solaris'">Solaris</xsl:when>
-         <xsl:when test="@OSType='opensolaris'">OpenSolaris</xsl:when>
-         <xsl:when test="@OSType='l4'">L4</xsl:when>
-+        <xsl:when test="@OSType='gnu'">GNU</xsl:when>
-+        <xsl:when test="@OSType='gnuhurd'">GNUHurd</xsl:when>
-+        <xsl:when test="@OSType='parabola'">Parabola</xsl:when>
-+        <xsl:when test="@OSType='gnewsense'">gNewSense</xsl:when>
-+        <xsl:when test="@OSType='blag'">Blag</xsl:when>
-+        <xsl:when test="@OSType='dragora'">Dragora</xsl:when>
-+        <xsl:when test="@OSType='ututo'">Ututo</xsl:when>
-+        <xsl:when test="@OSType='musix'">Musix</xsl:when>
-+        <xsl:when test="@OSType='trisquel'">Trisquel</xsl:when>
-+        <xsl:when test="@OSType='dynebolic'">Dynebolic</xsl:when>
-+        <xsl:when test="@OSType='venenux'">Venenux</xsl:when>
-       </xsl:choose>
-     </xsl:attribute>
-     <xsl:apply-templates select="@*[name()!='OSType']" mode="v1.5"/>
-diff --git a/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc b/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
-index 4523dad..38ae21a 100644
---- a/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
-+++ b/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc
-@@ -71,6 +71,24 @@
-         <file alias="os_oracle_64.png">images/os_oracle_64.png</file>
-         <file alias="os_macosx.png">images/os_macosx.png</file>
-         <file alias="os_macosx_64.png">images/os_macosx_64.png</file>
-+        <file alias="os_parabola.png">images/os_parabola.png</file>
-+        <file alias="os_parabola_64.png">images/os_parabola_64.png</file>
-+        <file alias="os_gnewsense.png">images/os_gnewsense.png</file>
-+        <file alias="os_gnewsense_64.png">images/os_gnewsense_64.png</file>
-+        <file alias="os_blag.png">images/os_blag.png</file>
-+        <file alias="os_blag_64.png">images/os_blag_64.png</file>
-+        <file alias="os_ututo.png">images/os_ututo.png</file>
-+        <file alias="os_ututo_64.png">images/os_ututo_64.png</file>
-+        <file alias="os_gnu.png">images/os_gnu.png</file>
-+        <file alias="os_gnu_64.png">images/os_gnu_64.png</file>
-+        <file alias="os_musix.png">images/os_musix.png</file>
-+        <file alias="os_musix_64.png">images/os_musix_64.png</file>
-+        <file alias="os_dragora.png">images/os_dragora.png</file>
-+        <file alias="os_dragora_64.png">images/os_dragora_64.png</file>
-+        <file alias="os_dynebolic.png">images/os_dynebolic.png</file>
-+        <file alias="os_venenux.png">images/os_venenux.png</file>
-+        <file alias="os_trisquel.png">images/os_trisquel.png</file>
-+        <file alias="os_trisquel_64.png">images/os_trisquel_64.png</file>
-         <file alias="hd_16px.png">images/hd_16px.png</file>
-         <file alias="hd_disabled_16px.png">images/hd_disabled_16px.png</file>
-         <file alias="hd_32px.png">images/hd_32px.png</file>
-diff --git a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
-index 8af9597..39a8d39 100644
---- a/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp
-@@ -4336,11 +4336,11 @@ void VBoxGlobal::init()
-         {"OS2Warp45",       ":/os_os2warp45.png"},
-         {"OS2eCS",          ":/os_os2ecs.png"},
-         {"OS2",             ":/os_os2_other.png"},
--        {"Linux22",         ":/os_linux22.png"},
--        {"Linux24",         ":/os_linux24.png"},
--        {"Linux24_64",      ":/os_linux24_64.png"},
--        {"Linux26",         ":/os_linux26.png"},
--        {"Linux26_64",      ":/os_linux26_64.png"},
-+        {"Linux22",         ":/os_gnu.png"},
-+        {"Linux24",         ":/os_gnu.png"},
-+        {"Linux24_64",      ":/os_gnu_64.png"},
-+        {"Linux26",         ":/os_gnu.png"},
-+        {"Linux26_64",      ":/os_gnu_64.png"},
-         {"ArchLinux",       ":/os_archlinux.png"},
-         {"ArchLinux_64",    ":/os_archlinux_64.png"},
-         {"Debian",          ":/os_debian.png"},
-@@ -4363,7 +4363,7 @@ void VBoxGlobal::init()
-         {"Xandros_64",      ":/os_xandros_64.png"},
-         {"Oracle",          ":/os_oracle.png"},
-         {"Oracle_64",       ":/os_oracle_64.png"},
--        {"Linux",           ":/os_linux_other.png"},
-+        {"Linux",           ":/os_gnu.png"},
-         {"FreeBSD",         ":/os_freebsd.png"},
-         {"FreeBSD_64",      ":/os_freebsd_64.png"},
-         {"OpenBSD",         ":/os_openbsd.png"},
-@@ -4379,6 +4379,25 @@ void VBoxGlobal::init()
-         {"MacOS",           ":/os_macosx.png"},
-         {"MacOS_64",        ":/os_macosx_64.png"},
-         {"JRockitVE",       ":/os_jrockitve.png"},
-+        {"GNU",             ":/os_gnu.png"},
-+        {"GNU_64",          ":/os_gnu_64.png"},
-+        {"GNUHurd",         ":/os_gnu.png"},
-+        {"Parabola",        ":/os_parabola.png"},
-+        {"Parabola_64",     ":/os_parabola_64.png"},
-+        {"gNewSense",       ":/os_gnewsense.png"},
-+        {"gNewSense_64",    ":/os_gnewsense_64.png"},
-+        {"Blag",            ":/os_blag.png"},
-+        {"Blag_64",         ":/os_blag_64.png"},
-+        {"Dragora",         ":/os_dragora.png"},
-+        {"Dragora_64",      ":/os_dragora_64.png"},
-+        {"Ututo",           ":/os_ututo.png"},
-+        {"Ututo_64",        ":/os_ututo_64.png"},
-+        {"Musix",           ":/os_musix.png"},
-+        {"Musix_64",        ":/os_musix_64.png"},
-+        {"Trisquel",        ":/os_trisquel.png"},
-+        {"Trisquel_64",     ":/os_trisquel_64.png"},
-+        {"Dynebolic",       ":/os_dynebolic.png"},
-+        {"Venenux",         ":/os_venenux.png"},
-     };
-     for (uint n = 0; n < SIZEOF_ARRAY (kOSTypeIcons); ++ n)
-     {
-diff --git a/include/VBox/ostypes.h b/include/VBox/ostypes.h
-index cbc0b73..31516cd 100644
---- a/include/VBox/ostypes.h
-+++ b/include/VBox/ostypes.h
-@@ -116,6 +116,25 @@ typedef enum VBOXOSTYPE
-     VBOXOSTYPE_MacOS            = 0xB0000,
-     VBOXOSTYPE_MacOS_x64        = 0xB0100,
-     VBOXOSTYPE_JRockitVE        = 0xC0000,
-+    VBOXOSTYPE_GNU              = 0xD0000,
-+    VBOXOSTYPE_GNU_x64          = 0xD0100,
-+    VBOXOSTYPE_GNUHurd          = 0xE0000,
-+    VBOXOSTYPE_Parabola         = 0xF0000,
-+    VBOXOSTYPE_Parabola_x64     = 0xF0100,
-+    VBOXOSTYPE_gNewSense        = 0xF1000,
-+    VBOXOSTYPE_gNewSense_x64    = 0xF1100,
-+    VBOXOSTYPE_Blag             = 0xF2000,
-+    VBOXOSTYPE_Blag_x64         = 0xF2100,
-+    VBOXOSTYPE_Dragora          = 0xF3000,
-+    VBOXOSTYPE_Dragora_x64      = 0xF3100,
-+    VBOXOSTYPE_Ututo            = 0xF4000,
-+    VBOXOSTYPE_Ututo_x64        = 0xF4100,
-+    VBOXOSTYPE_Musix            = 0xF5000,
-+    VBOXOSTYPE_Musix_x64        = 0xF5100,
-+    VBOXOSTYPE_Trisquel         = 0xF6000,
-+    VBOXOSTYPE_Trisquel_x64     = 0xF6100,
-+    VBOXOSTYPE_Dynebolic        = 0xF7000,
-+    VBOXOSTYPE_Venenux          = 0xF8000,
- /** The bit number which indicates 64-bit or 32-bit. */
- #define VBOXOSTYPE_x64_BIT       8
-     /** The mask which indicates 64-bit. */
-diff --git a/src/VBox/Main/src-server/ApplianceImpl.cpp b/src/VBox/Main/src-server/ApplianceImpl.cpp
-index 05fc3b6..dc06073 100644
---- a/src/VBox/Main/src-server/ApplianceImpl.cpp
-+++ b/src/VBox/Main/src-server/ApplianceImpl.cpp
-@@ -84,7 +84,31 @@ g_osTypes[] =
-     { ovf::CIMOSType_CIMOS_MACOS,                                VBOXOSTYPE_MacOS },
-     { ovf::CIMOSType_CIMOS_MACOS,                                VBOXOSTYPE_MacOS_x64 },            // there is no CIM 64-bit type for this
- 
--    // Linuxes
-+    // Custom GNU and GNU-Hurd OS
-+    { ovf::CIMOSType_CIMOS_GNU,                                  VBOXOSTYPE_GNU },
-+    { ovf::CIMOSType_CIMOS_GNU_64,                               VBOXOSTYPE_GNU_x64 },
-+    { ovf::CIMOSType_CIMOS_GNUHurd,                              VBOXOSTYPE_GNUHurd },
-+    
-+    // Free GNU/Linux distros
-+    { ovf::CIMOSType_CIMOS_gNewSense,                            VBOXOSTYPE_gNewSense },
-+    { ovf::CIMOSType_CIMOS_gNewSense_64,                         VBOXOSTYPE_gNewSense_x64 },
-+    { ovf::CIMOSType_CIMOS_Dragora,                              VBOXOSTYPE_Dragora },
-+    { ovf::CIMOSType_CIMOS_Dragora_64,                           VBOXOSTYPE_Dragora_x64 },
-+    { ovf::CIMOSType_CIMOS_Musix,                                VBOXOSTYPE_Musix },
-+    { ovf::CIMOSType_CIMOS_Musix_64,                             VBOXOSTYPE_Musix_x64 },
-+    { ovf::CIMOSType_CIMOS_Trisquel,                             VBOXOSTYPE_Trisquel },
-+    { ovf::CIMOSType_CIMOS_Trisquel_64,                          VBOXOSTYPE_Trisquel_x64 },
-+    { ovf::CIMOSType_CIMOS_Dynebolic,                            VBOXOSTYPE_Dynebolic },
-+    
-+    // Free GNU/Linux distros that we have support for but CIM doesn't
-+    { ovf::CIMOSType_CIMOS_Linux_2_6_x,                          VBOXOSTYPE_Parabola },
-+    { ovf::CIMOSType_CIMOS_Linux_2_6_x_64,                       VBOXOSTYPE_Parabola_x64 },
-+    { ovf::CIMOSType_CIMOS_Linux_2_6_x,                          VBOXOSTYPE_Blag },
-+    { ovf::CIMOSType_CIMOS_Linux_2_6_x_64,                       VBOXOSTYPE_Blag_x64 },
-+    { ovf::CIMOSType_CIMOS_Linux_2_6_x,                          VBOXOSTYPE_Ututo },
-+    { ovf::CIMOSType_CIMOS_Linux_2_6_x_64,                       VBOXOSTYPE_Ututo_x64 },
-+
-+    // Non-free GNU/Linux distros
-     { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux,                VBOXOSTYPE_RedHat },
-     { ovf::CIMOSType_CIMOS_RedHatEnterpriseLinux_64,             VBOXOSTYPE_RedHat_x64 },
-     { ovf::CIMOSType_CIMOS_Solaris_64,                           VBOXOSTYPE_Solaris_x64 },
-@@ -104,13 +128,14 @@ g_osTypes[] =
-     { ovf::CIMOSType_CIMOS_Ubuntu_64,                            VBOXOSTYPE_Ubuntu_x64 },
-     { ovf::CIMOSType_CIMOS_Debian,                               VBOXOSTYPE_Debian },
-     { ovf::CIMOSType_CIMOS_Debian_64,                            VBOXOSTYPE_Debian_x64 },
-+    { ovf::CIMOSType_CIMOS_Venenux,                              VBOXOSTYPE_Venenux },
-     { ovf::CIMOSType_CIMOS_Linux_2_4_x,                          VBOXOSTYPE_Linux24 },
-     { ovf::CIMOSType_CIMOS_Linux_2_4_x_64,                       VBOXOSTYPE_Linux24_x64 },
-     { ovf::CIMOSType_CIMOS_Linux_2_6_x,                          VBOXOSTYPE_Linux26 },
-     { ovf::CIMOSType_CIMOS_Linux_2_6_x_64,                       VBOXOSTYPE_Linux26_x64 },
-     { ovf::CIMOSType_CIMOS_Linux_64,                             VBOXOSTYPE_Linux26_x64 },
- 
--    // types that we have support for but CIM doesn't
-+    // Non-free GNU/Linux distros and non-free operating systems types that we have support for but CIM doesn't
-     { ovf::CIMOSType_CIMOS_Linux_2_6_x,                          VBOXOSTYPE_ArchLinux },
-     { ovf::CIMOSType_CIMOS_Linux_2_6_x_64,                       VBOXOSTYPE_ArchLinux_x64 },
-     { ovf::CIMOSType_CIMOS_Linux_2_6_x,                          VBOXOSTYPE_FedoraCore },
-@@ -151,53 +176,72 @@ struct osTypePattern
- /* These are the 32-Bit ones. They are sorted by priority. */
- static const osTypePattern g_osTypesPattern[] =
- {
--    {"Windows NT",    VBOXOSTYPE_WinNT4},
--    {"Windows XP",    VBOXOSTYPE_WinXP},
--    {"Windows 2000",  VBOXOSTYPE_Win2k},
--    {"Windows 2003",  VBOXOSTYPE_Win2k3},
--    {"Windows Vista", VBOXOSTYPE_WinVista},
--    {"Windows 2008",  VBOXOSTYPE_Win2k8},
--    {"SUSE",          VBOXOSTYPE_OpenSUSE},
--    {"Novell",        VBOXOSTYPE_OpenSUSE},
--    {"Red Hat",       VBOXOSTYPE_RedHat},
--    {"Mandriva",      VBOXOSTYPE_Mandriva},
--    {"Ubuntu",        VBOXOSTYPE_Ubuntu},
--    {"Debian",        VBOXOSTYPE_Debian},
--    {"QNX",           VBOXOSTYPE_QNX},
--    {"Linux 2.4",     VBOXOSTYPE_Linux24},
--    {"Linux 2.6",     VBOXOSTYPE_Linux26},
--    {"Linux",         VBOXOSTYPE_Linux},
--    {"OpenSolaris",   VBOXOSTYPE_OpenSolaris},
--    {"Solaris",       VBOXOSTYPE_OpenSolaris},
--    {"FreeBSD",       VBOXOSTYPE_FreeBSD},
--    {"NetBSD",        VBOXOSTYPE_NetBSD},
--    {"Windows 95",    VBOXOSTYPE_Win95},
--    {"Windows 98",    VBOXOSTYPE_Win98},
--    {"Windows Me",    VBOXOSTYPE_WinMe},
--    {"Windows 3.",    VBOXOSTYPE_Win31},
--    {"DOS",           VBOXOSTYPE_DOS},
--    {"OS2",           VBOXOSTYPE_OS2}
-+    {"Windows NT",         VBOXOSTYPE_WinNT4},
-+    {"Windows XP",         VBOXOSTYPE_WinXP},
-+    {"Windows 2000",       VBOXOSTYPE_Win2k},
-+    {"Windows 2003",       VBOXOSTYPE_Win2k3},
-+    {"Windows Vista",      VBOXOSTYPE_WinVista},
-+    {"Windows 2008",       VBOXOSTYPE_Win2k8},
-+    {"SUSE",               VBOXOSTYPE_OpenSUSE},
-+    {"Novell",             VBOXOSTYPE_OpenSUSE},
-+    {"Red Hat",            VBOXOSTYPE_RedHat},
-+    {"Mandriva",           VBOXOSTYPE_Mandriva},
-+    {"Ubuntu",             VBOXOSTYPE_Ubuntu},
-+    {"Debian",             VBOXOSTYPE_Debian},
-+    {"QNX",                VBOXOSTYPE_QNX},
-+    {"GNU/Linux 2.4",      VBOXOSTYPE_Linux24},
-+    {"GNU/Linux 2.6",      VBOXOSTYPE_Linux26},
-+    {"GNU/Linux",          VBOXOSTYPE_Linux},
-+    {"OpenSolaris",        VBOXOSTYPE_OpenSolaris},
-+    {"Solaris",            VBOXOSTYPE_OpenSolaris},
-+    {"FreeBSD",            VBOXOSTYPE_FreeBSD},
-+    {"NetBSD",             VBOXOSTYPE_NetBSD},
-+    {"Windows 95",         VBOXOSTYPE_Win95},
-+    {"Windows 98",         VBOXOSTYPE_Win98},
-+    {"Windows Me",         VBOXOSTYPE_WinMe},
-+    {"Windows 3.",         VBOXOSTYPE_Win31},
-+    {"DOS",                VBOXOSTYPE_DOS},
-+    {"OS2",                VBOXOSTYPE_OS2},
-+    {"Parabola",           VBOXOSTYPE_Parabola},
-+    {"gNewSense",          VBOXOSTYPE_gNewSense},
-+    {"Blag",               VBOXOSTYPE_Blag},
-+    {"Dragora",            VBOXOSTYPE_Dragora},
-+    {"Ututo XS",           VBOXOSTYPE_Ututo},
-+    {"Musix",              VBOXOSTYPE_Musix},
-+    {"Trisquel",           VBOXOSTYPE_Trisquel},
-+    {"Dyne:bolic",         VBOXOSTYPE_Dynebolic},
-+    {"Venenux",            VBOXOSTYPE_Venenux},
-+    {"GNU",                VBOXOSTYPE_GNU},
-+    {"GNU-Hurd",           VBOXOSTYPE_GNUHurd},
- };
- 
- /* These are the 64-Bit ones. They are sorted by priority. */
- static const osTypePattern g_osTypesPattern64[] =
- {
--    {"Windows XP",    VBOXOSTYPE_WinXP_x64},
--    {"Windows 2003",  VBOXOSTYPE_Win2k3_x64},
--    {"Windows Vista", VBOXOSTYPE_WinVista_x64},
--    {"Windows 2008",  VBOXOSTYPE_Win2k8_x64},
--    {"SUSE",          VBOXOSTYPE_OpenSUSE_x64},
--    {"Novell",        VBOXOSTYPE_OpenSUSE_x64},
--    {"Red Hat",       VBOXOSTYPE_RedHat_x64},
--    {"Mandriva",      VBOXOSTYPE_Mandriva_x64},
--    {"Ubuntu",        VBOXOSTYPE_Ubuntu_x64},
--    {"Debian",        VBOXOSTYPE_Debian_x64},
--    {"Linux 2.4",     VBOXOSTYPE_Linux24_x64},
--    {"Linux 2.6",     VBOXOSTYPE_Linux26_x64},
--    {"Linux",         VBOXOSTYPE_Linux26_x64},
--    {"OpenSolaris",   VBOXOSTYPE_OpenSolaris_x64},
--    {"Solaris",       VBOXOSTYPE_OpenSolaris_x64},
--    {"FreeBSD",       VBOXOSTYPE_FreeBSD_x64},
-+    {"Windows XP",         VBOXOSTYPE_WinXP_x64},
-+    {"Windows 2003",       VBOXOSTYPE_Win2k3_x64},
-+    {"Windows Vista",      VBOXOSTYPE_WinVista_x64},
-+    {"Windows 2008",       VBOXOSTYPE_Win2k8_x64},
-+    {"SUSE",               VBOXOSTYPE_OpenSUSE_x64},
-+    {"Novell",             VBOXOSTYPE_OpenSUSE_x64},
-+    {"Red Hat",            VBOXOSTYPE_RedHat_x64},
-+    {"Mandriva",           VBOXOSTYPE_Mandriva_x64},
-+    {"Ubuntu",             VBOXOSTYPE_Ubuntu_x64},
-+    {"Debian",             VBOXOSTYPE_Debian_x64},
-+    {"GNU/Linux 2.4",      VBOXOSTYPE_Linux24_x64},
-+    {"GNU/Linux 2.6",      VBOXOSTYPE_Linux26_x64},
-+    {"GNU/Linux",          VBOXOSTYPE_Linux26_x64},
-+    {"OpenSolaris",        VBOXOSTYPE_OpenSolaris_x64},
-+    {"Solaris",            VBOXOSTYPE_OpenSolaris_x64},
-+    {"FreeBSD",            VBOXOSTYPE_FreeBSD_x64},
-+    {"Parabola",           VBOXOSTYPE_Parabola_x64},
-+    {"gNewSense",          VBOXOSTYPE_gNewSense_x64},
-+    {"Blag",               VBOXOSTYPE_Blag_x64},
-+    {"Dragora",            VBOXOSTYPE_Dragora_x64},
-+    {"Ututo XS",           VBOXOSTYPE_Ututo_x64},
-+    {"Musix",              VBOXOSTYPE_Musix_x64},
-+    {"Trisquel",           VBOXOSTYPE_Trisquel_x64},
-+    {"GNU",                VBOXOSTYPE_GNU_x64},
- };
- 
- /**
-diff --git a/src/VBox/Main/include/ovfreader.h b/src/VBox/Main/include/ovfreader.h
-index e1e21d5..6d2da12 100644
---- a/src/VBox/Main/include/ovfreader.h
-+++ b/src/VBox/Main/include/ovfreader.h
-@@ -145,8 +145,20 @@ enum CIMOSType_T
-     CIMOSType_CIMOS_CentOS_64 = 107,
-     CIMOSType_CIMOS_OracleEnterpriseLinux = 108,
-     CIMOSType_CIMOS_OracleEnterpriseLinux_64 = 109,
--    CIMOSType_CIMOS_eComStation = 110
-+    CIMOSType_CIMOS_eComStation = 110,
-     // no new types added with CIM 2.26.0
-+    CIMOSType_CIMOS_gNewSense = 111,
-+    CIMOSType_CIMOS_gNewSense_64 = 112,
-+    CIMOSType_CIMOS_Dragora = 113,
-+    CIMOSType_CIMOS_Dragora_64 = 114,
-+    CIMOSType_CIMOS_Musix = 115,
-+    CIMOSType_CIMOS_Musix_64 = 116,
-+    CIMOSType_CIMOS_Trisquel = 117,
-+    CIMOSType_CIMOS_Trisquel_64 = 118,
-+    CIMOSType_CIMOS_Dynebolic = 119,
-+    CIMOSType_CIMOS_Venenux = 120,
-+    CIMOSType_CIMOS_GNU = 121,
-+    CIMOSType_CIMOS_GNU_64 = 122
- };
- 
- 
-diff --git a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp
-index 59749be..8e2b425 100644
---- a/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp
-@@ -141,7 +141,7 @@ void UIMachineSettingsDisplay::setGuestOSType(CGuestOSType guestOSType)
- #ifdef VBOX_WITH_VIDEOHWACCEL
-     /* Check if 2D video acceleration supported by the guest OS type: */
-     QString strguestOSTypeFamily = m_guestOSType.GetFamilyId();
--    m_f2DVideoAccelerationSupported = strguestOSTypeFamily == "Windows";
-+    m_f2DVideoAccelerationSupported = strguestOSTypeFamily == "Non-free OSs";
- #endif /* VBOX_WITH_VIDEOHWACCEL */
- #ifdef VBOX_WITH_CRHGSMI
-     /* Check if WDDM mode supported by the guest OS type: */
-diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp b/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
-index f67cfc2..438ffee 100644
---- a/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.cpp
-@@ -32,6 +32,11 @@ enum
-     TypeID = Qt::UserRole + 1
- };
- 
-+const char* FreedomLabel = "We hope you don't use non-free "
-+                           "GNU/Linux distros and non-free operating "
-+                           "systems, since to use them is to surrender "
-+                           "your freedom.";
-+
- UINameAndSystemEditor::UINameAndSystemEditor(QWidget *pParent)
-     : QIWithRetranslateUI<QWidget>(pParent)
- {
-@@ -39,55 +44,91 @@ UINameAndSystemEditor::UINameAndSystemEditor(QWidget *pParent)
-     qRegisterMetaType<CGuestOSType>();
- 
-     /* Create widgets: */
--    QGridLayout *pMainLayout = new QGridLayout(this);
-+    QVBoxLayout *pMainLayout = new QVBoxLayout(this);
-     {
-         pMainLayout->setContentsMargins(0, 0, 0, 0);
--        m_pNameLabel = new QLabel(this);
--        {
--            m_pNameLabel->setAlignment(Qt::AlignRight);
--            m_pNameLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
--        }
--        m_pNameEditor = new QLineEdit(this);
--        {
--            m_pNameEditor->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
--            m_pNameLabel->setBuddy(m_pNameEditor);
--        }
--        m_pFamilyLabel = new QLabel(this);
--        {
--            m_pFamilyLabel->setAlignment(Qt::AlignRight);
--            m_pFamilyLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
--        }
--        m_pFamilyCombo = new QComboBox(this);
--        {
--            m_pFamilyCombo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
--            m_pFamilyLabel->setBuddy(m_pFamilyCombo);
--        }
--        m_pTypeLabel = new QLabel(this);
--        {
--            m_pTypeLabel->setAlignment(Qt::AlignRight);
--            m_pTypeLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
--        }
--        m_pTypeCombo = new QComboBox(this);
--        {
--            m_pTypeCombo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
--            m_pTypeLabel->setBuddy(m_pTypeCombo);
--        }
--        QVBoxLayout *pIconLayout = new QVBoxLayout;
--        {
--            m_pTypeIcon = new QLabel(this);
-+
-+	/* Top QWidget */
-+	m_pGlobalCnt = new QFrame;
-+        m_pGlobalCnt->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
-+
-+	QVBoxLayout *pGlobalLayout = new QVBoxLayout(m_pGlobalCnt);
-+	{
-+	    m_pGridCnt = new QFrame;
-+            m_pGridCnt->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
-+	    m_pGridCnt->setMinimumWidth(500);
-+
-+	    QGridLayout *pGridLayout = new QGridLayout(m_pGridCnt);
-             {
--                m_pTypeIcon->setFixedSize(32, 32);
--            }
--            pIconLayout->addWidget(m_pTypeIcon);
--            pIconLayout->addStretch();
--        }
--        pMainLayout->addWidget(m_pNameLabel, 0, 0);
--        pMainLayout->addWidget(m_pNameEditor, 0, 1, 1, 2);
--        pMainLayout->addWidget(m_pFamilyLabel, 1, 0);
--        pMainLayout->addWidget(m_pFamilyCombo, 1, 1);
--        pMainLayout->addWidget(m_pTypeLabel, 2, 0);
--        pMainLayout->addWidget(m_pTypeCombo, 2, 1);
--        pMainLayout->addLayout(pIconLayout, 1, 2, 2, 1);
-+	        pGridLayout->setContentsMargins(4, 4, 4, 4);
-+	        m_pNameLabel = new QLabel(m_pGridCnt);
-+	        {
-+	            m_pNameLabel->setAlignment(Qt::AlignRight);
-+	            m_pNameLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-+	        }
-+	        m_pNameEditor = new QLineEdit(m_pGridCnt);
-+	        {
-+	            m_pNameEditor->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-+	            m_pNameLabel->setBuddy(m_pNameEditor);
-+	        }
-+	        m_pFamilyLabel = new QLabel(m_pGridCnt);
-+	        {
-+	            m_pFamilyLabel->setAlignment(Qt::AlignRight);
-+	            m_pFamilyLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-+	        }
-+	        m_pFamilyCombo = new QComboBox(m_pGridCnt);
-+	        {
-+	            m_pFamilyCombo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
-+	            m_pFamilyLabel->setBuddy(m_pFamilyCombo);
-+	        }
-+	        m_pTypeLabel = new QLabel(m_pGridCnt);
-+	        {
-+	            m_pTypeLabel->setAlignment(Qt::AlignRight);
-+	            m_pTypeLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
-+	        }
-+	        m_pTypeCombo = new QComboBox(m_pGridCnt);
-+	        {
-+	            m_pTypeCombo->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
-+	            m_pTypeLabel->setBuddy(m_pTypeCombo);
-+	        }
-+	        QVBoxLayout *pIconLayout = new QVBoxLayout;
-+                {
-+	            m_pTypeIcon = new QLabel;
-+	            {
-+	                m_pTypeIcon->setFixedSize(32, 32);
-+	            }
-+	            pIconLayout->addWidget(m_pTypeIcon);
-+	            pIconLayout->addStretch();
-+	        }
-+
-+	        pGridLayout->addWidget(m_pNameLabel, 0, 0);
-+	        pGridLayout->addWidget(m_pNameEditor, 0, 1, 1, 2);
-+	        pGridLayout->addWidget(m_pFamilyLabel, 1, 0);
-+	        pGridLayout->addWidget(m_pFamilyCombo, 1, 1);
-+	        pGridLayout->addWidget(m_pTypeLabel, 2, 0);
-+	        pGridLayout->addWidget(m_pTypeCombo, 2, 1);
-+	        pGridLayout->addLayout(pIconLayout, 1, 2, 2, 1);
-+	    }
-+
-+	    m_pFreedomLabel = new QLabel(m_pGlobalCnt);
-+	    {
-+                m_pFreedomLabel->setStyleSheet("color: red;"
-+                                               "border-radius: 4px;"
-+                                               "padding: 2px;"
-+                                               "background-color: #DDDDDD;");
-+	        m_pFreedomLabel->setWordWrap(true);
-+		m_pFreedomLabel->setAlignment(Qt::AlignCenter);
-+	        m_pFreedomLabel->setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
-+		m_pFreedomLabel->hide();
-+	    }
-+
-+	    pGlobalLayout->addStretch();
-+	    pGlobalLayout->addWidget(m_pGridCnt, 0, Qt::AlignCenter);
-+	    pGlobalLayout->addWidget(m_pFreedomLabel);
-+	    pGlobalLayout->addStretch();
-+	}
-+
-+        pMainLayout->addWidget(m_pGlobalCnt);
-     }
- 
-     /* Check if host supports (AMD-V or VT-x) and long mode: */
-@@ -165,6 +206,7 @@ void UINameAndSystemEditor::retranslateUi()
-     m_pTypeCombo->setWhatsThis(tr("Displays the operating system type that "
-                                   "you plan to install into this virtual machine "
-                                   "(called a guest operating system)."));
-+    m_pFreedomLabel->setText(tr(FreedomLabel));
- }
- 
- void UINameAndSystemEditor::sltFamilyChanged(int iIndex)
-@@ -210,6 +252,20 @@ void UINameAndSystemEditor::sltFamilyChanged(int iIndex)
-     /* Else simply select the first one present: */
-     else m_pTypeCombo->setCurrentIndex(0);
- 
-+    /* Hide or show the freedom label if it is translated to the active language */
-+    int isEnglish = QLocale::system().language();
-+    if (m_pFreedomLabel->text() != FreedomLabel || isEnglish == 1 || isEnglish == 31)
-+    {
-+        if (strFamilyId == "Non-free OSs" || strFamilyId == "Non-free Distros")
-+        {
-+	    m_pFreedomLabel->show();
-+        }
-+        else
-+        {
-+            m_pFreedomLabel->hide();
-+        }
-+    }
-+
-     /* Update all the stuff: */
-     sltTypeChanged(m_pTypeCombo->currentIndex());
- 
-diff --git a/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h b/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h
-index 6a698c0..3c23845 100644
---- a/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h
-+++ b/src/VBox/Frontends/VirtualBox/src/widgets/UINameAndSystemEditor.h
-@@ -30,6 +30,7 @@
- class QLabel;
- class QLineEdit;
- class QComboBox;
-+class QFrame;
- 
- /* QWidget reimplementation providing editor for basic VM parameters: */
- class UINameAndSystemEditor : public QIWithRetranslateUI<QWidget>
-@@ -76,6 +77,8 @@ private slots:
- private:
- 
-     /* Widgets: */
-+    QFrame *m_pGlobalCnt;
-+    QFrame *m_pGridCnt;
-     QLabel *m_pNameLabel;
-     QLabel *m_pFamilyLabel;
-     QLabel *m_pTypeLabel;
-@@ -83,6 +86,7 @@ private:
-     QLineEdit *m_pNameEditor;
-     QComboBox *m_pFamilyCombo;
-     QComboBox *m_pTypeCombo;
-+    QLabel *m_pFreedomLabel;
- 
-     /* Variables: */
-     CGuestOSType m_type;
-diff --git a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp
-index 100cb8c..5ab98ad 100644
---- a/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp
-+++ b/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp
-@@ -19,7 +19,7 @@
- 
- /* Global includes: */
- #include <QVBoxLayout>
--#include <QHBoxLayout>
-+#include <QVBoxLayout>
- #include <QGroupBox>
- #include <QGridLayout>
- #include <QSpacerItem>
-@@ -47,8 +47,11 @@ UIWizardNewVMPageExpert::UIWizardNewVMPageExpert(const QString &strGroup)
-         m_pNameAndSystemCnt = new QGroupBox(this);
-         {
-             m_pNameAndSystemCnt->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
--            QHBoxLayout *pNameAndSystemCntLayout = new QHBoxLayout(m_pNameAndSystemCnt);
-+	    m_pNameAndSystemCnt->setFixedHeight(170);
-+
-+            QVBoxLayout *pNameAndSystemCntLayout = new QVBoxLayout(m_pNameAndSystemCnt);
-             {
-+                pNameAndSystemCntLayout->setContentsMargins(8, 2, 8, 2);
-                 m_pNameAndSystemEditor = new UINameAndSystemEditor(m_pNameAndSystemCnt);
-                 pNameAndSystemCntLayout->addWidget(m_pNameAndSystemEditor);
-             }
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts
-index cea825b..7ade350 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_bg.ts
-@@ -7235,6 +7235,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>Показва вида на операционната система, която планирате да инсталирате на виртуалната машина (наричана виртуална операционна система).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">Надяваме се, че не ползвате несвободни дистрибуции на GNU/Линукс и несвободни операционни системи, тъй като използването им означава, че се отказвате от свободата си.</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts
-index e41d97d..f449069 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca.ts
-@@ -7667,6 +7667,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished">Mostra el tipus de sistema operatiu que voleu instal·lar a dins d&apos;aquesta màquina virtual (anomenat sistema operatiu client).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts
-index e82fc7c..a98be2c 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ca_VA.ts
-@@ -7667,6 +7667,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished">Mostra el tipus de sistema operatiu que voleu instal·lar a dins d&apos;esta màquina virtual (anomenat sistema operatiu client).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts
-index 176f417..bb58906 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_cs.ts
-@@ -7659,6 +7659,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>Zobrazuje typ operačního systému, který se chystáte instalovat na tento virtuální počítač (nazývaný hostovaný operační systém).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManager</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts
-index 3f88de8..1d48468 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_da.ts
-@@ -7085,6 +7085,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>Viser typen af operativsystem som du planlægger at installere i denne virtuelle maskine (kaldet gæsteoperativsystemet).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts
-index 14a3721..945d554 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_de.ts
-@@ -4838,6 +4838,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>Zeigt den Typ des Betriebssystems, das Sie in der virtuellen Maschine installieren wollen (auch als Gast bezeichnet).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">Wir hoffen, dass keine unfreie GNU/Linux-Distributionen und unfreie Betriebssysteme genutzt werden, da deren Nutzung bedeutet, die Freiheit aufzugeben.</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts
-index 4e52534..3d7dba6 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_es.ts
-@@ -7518,6 +7518,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>Muestra el tipo de sistema operativo que planea instalar en esta máquina virtual (llamado sistema operativo invitado).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">Esperamos que no uses distros no libres de GNU/Linux y sistemas operativos no libres, ya que al hacerlo pierdes tu libertad.</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts
-index 275e1e6..34171eb 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_eu.ts
-@@ -5951,6 +5951,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished">Makina birtual honetan instalatzea pentsatzen duzun sistema eragilea erakusten du (sistema eragile bezeroa deiturikoa).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts
-index f902373..625da36 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fa_IR.ts
-@@ -4850,6 +4850,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>نوع سیستم عاملی که شما قصد دارید داخل ماشین مجازی را نصب کنید نشان میدهد،که بعنوان سیستم عامل مهمان شناخته میشود.</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts
-index 3f31f8f..9248344 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fi.ts
-@@ -6717,6 +6717,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished">Näyttää virtuaalikoneeseen asennettavan käyttöjärjestelmän tyypin.</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts
-index b918edb..a6868a4 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_fr.ts
-@@ -6432,6 +6432,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished">Affiche le type du système d&apos;exploitation (dit système d&apos;exploitation invité) que vous allez installer dans cette machine virtuelle.</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">Nous espérons que vous n&apos;utilisez pas de distribution GNU/Linux non libre ni de système d&apos;exploitation non libre car, si vous le faites, vous abdiquez votre liberté.</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts
-index b04f31b..77a389f 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_gl_ES.ts
-@@ -6508,6 +6508,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished">Mostrar o tipo do sistema operativo  que planeas instalar nesta máquina virtual (chamado un sistema operativo convidado).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts
-index 76d4371..c1aff65 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_hu.ts
-@@ -7486,6 +7486,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>A tervezett vendég operációs rendszer típusa.</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts
-index 349d776..fb81c2c 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_id.ts
-@@ -6768,6 +6768,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished"></translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts
-index 61f6a37..70e66b9 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_it.ts
-@@ -8063,6 +8063,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>Visualizza il tipo di sistema operativo che intendi installare nella macchina virtuale (chiamato sistema operativo Guest).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">Sconsigliamo di utilizzare distribuzioni GNU/Linux non libere e sistemi operativi non liberi, poiché usarli equivale a cedere la propria libertà.</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManager</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts
-index 9ab3823..40006f9 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ja.ts
-@@ -8727,6 +8727,11 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>仮想マシンで実行するOS(ゲストOSと呼びます)のタイプを表示します。</translation>
-     </message>
-+    <message>
-+        <location filename="../src/widgets/UINameAndSystemEditor.cpp" line="180"/>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">わたしたちは、あなたが不自由なGNU/Linuxディストロや不自由なオペレーティング・システムを使わないことを願います。それを使うことは、あなた自身の自由を放棄することだからです。</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts
-index be82aab..7d73e23 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_km_KH.ts
-@@ -6451,6 +6451,10 @@ medium</comment>
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished">បង្ហាញប្រភេទប្រព័ន្ធប្រតិបត្តិការដែលអ្នកមានគម្រោងដំឡើងម៉ាស៊ីននិម្មិតនេះ (បានហៅប្រព័ន្ធប្រតិបត្តិរបស់ម៉ាស៊ីនភ្ញៀវ) ។</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts
-index 05ccf51..3fb2a07 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ko.ts
-@@ -7351,6 +7351,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>이 가상 머신에 설치할 운영 체제(게스트 운영 체제라고도 함) 종류를 표시합니다.</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">자유롭지 못한 GNU/Linux 배포판과 독점 운영체제를 사용하는 것은 우 리의 자유를 포기하는 것과 마찬가지 이므로,  사용하지 않을 것을 권유합니다.</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts
-index 3e06e93..cadd54b 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_lt.ts
-@@ -6767,6 +6767,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished">Rodo operacinės sistemos tipą, kurį ketinate įdiegti šioje virtualioje mašinoje (pastaroji dar vadinama svečio operacine sistema).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts
-index 2b81abd..610dad8 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_nl.ts
-@@ -5894,6 +5894,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>Toont het type besturingssysteem dat u van plan bent op deze virtuele machine te installeren (dit wordt het gastbesturingssysteem genoemd).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">Hopelijk gebruik je geen niet-vrije GNU/Linux distributies of gesloten besturingssystemen want daarmee geef je je vrijheid op.</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts
-index 7122389..ca0b4b2 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pl.ts
-@@ -7311,6 +7311,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished"></translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">Mamy nadzieję, że nie używasz niewolnych dystrybucji GNU/Linuksa aniniewolnych systemów operacyjnych, gdyż używanie ich to oddanie Twojej wolności.</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts
-index ebcba39..0bb693b 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt.ts
-@@ -6816,6 +6816,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished">Mostra o tipo de sistema operativo que planeia instalar nesta máquina virtual (chamado de sistema operativo convidado).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts
-index 6a82c7e..c866fa4 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_pt_BR.ts
-@@ -8029,6 +8029,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>Exibe o tipo de sistema operacional que você planeja instalar nesta máquina virtual (chamado de sistema operacional convidado).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">Esperamos que não se usem distros não-livres de GNU/Linux e sistemas operacionais não-livres, pois ao usá-los abre-se mão de sua liberdade.</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManager</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts
-index 3b79282..345725c 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ro.ts
-@@ -6919,6 +6919,10 @@ Acest director este folosit, dacă nu este explicit specificat altfel, atunci c
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished">Afișează tipul sistemului de operare pe care plănuiți să îl instalați în această mașină virtuală (denumit sistem de operare musafir).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts
-index c2230a2..653f436 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_ru.ts
-@@ -7406,6 +7406,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>Определяет версию операционной системы, которую вы хотите установить на эту виртуальную машину (эта операционная система называется &quot;гостевая ОС&quot;).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">Мы надеемся, что вы не пользуетесь несвободными дистрибутивами GNU/Linux и несвободными операционными системами, поскольку пользование ими означает, что вы отказываетесь от своей свободы.</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts
-index 40eec9d..dcecd31 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sk.ts
-@@ -6762,6 +6762,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished">Zobrazí typ operačného systému, ktorý sa chystáte nainštalovať na tento virtuálny stroj (nazýva sa hosťovský operačný systém).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts
-index 9eeef05..649c108 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sr.ts
-@@ -7171,6 +7171,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished">Показује тип система који планирате да инсталирате на машину (позвано гост систем).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts
-index 800d10b..239a8d4 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_sv.ts
-@@ -7768,6 +7768,10 @@ serial ports</comment>
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished"></translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">Vi hoppas att du inte använder en begränsad, icke fri GNU/Linux distribution eller annat kommersiellt operativsystem, eftersom att du ger bort din frihet genom att göra detta.</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManager</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts
-index cdb888e..4c8d86c 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_tr.ts
-@@ -6312,6 +6312,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>Bu sanal makine içerisine kurmayı planladığınız işletim sistemi türünü gösterir (misafir işletim sistemi olarak adlandırılır).</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts
-index 8b51e82..2557231 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_uk.ts
-@@ -7179,6 +7179,10 @@ p, li { white-space: pre-wrap; }
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>Показує тип операційної системи, котру ви плануєте встановити на цю віртуальну машину, тобто гостьова операційна система.</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManager</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts
-index 2690322..0ea229a 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_xx_YY.ts
-@@ -4810,6 +4810,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation type="unfinished"></translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts
-index 5b567f7..8709191 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_CN.ts
-@@ -5858,6 +5858,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>显示你要安装到虚拟电脑的操作系统类型.</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished">我们真心希望您能拒绝使用非自由的操作系统，包括非自由的GNU/Linux发 行版。因为使用非自由的软件将会损害您的权利。</translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
-diff --git a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts
-index 5d1d136..095c169 100644
---- a/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts
-+++ b/src/VBox/Frontends/VirtualBox/nls/VirtualBox_zh_TW.ts
-@@ -4834,6 +4834,10 @@
-         <source>Displays the operating system type that you plan to install into this virtual machine (called a guest operating system).</source>
-         <translation>顯示計畫安裝到此虛擬機器的作業系統類型 (稱為客體作業系統)。</translation>
-     </message>
-+    <message>
-+        <source>We hope you don&apos;t use non-free GNU/Linux distros and non-free operating systems, since to use them is to surrender your freedom.</source>
-+        <translation type="unfinished"></translation>
-+    </message>
- </context>
- <context>
-     <name>UINetworkManagerDialog</name>
diff --git a/libre/virtualbox-libre/libre.patch b/libre/virtualbox-libre/libre.patch
deleted file mode 100644
index 7f236a678..000000000
--- a/libre/virtualbox-libre/libre.patch
+++ /dev/null
@@ -1,1085 +0,0 @@
---- VirtualBox-4.2.12.orig/Config.kmk	2013-04-12 07:33:55.000000000 -0300
-+++ VirtualBox-4.2.12/Config.kmk	2013-05-23 18:48:57.560690206 -0300
-@@ -56,9 +56,6 @@
- PROPS_SYSMODS_ACCUMULATE_L   += INTERMEDIATES
- PROPS_MISCBINS_ACCUMULATE_L  += INTERMEDIATES
- 
--# Misc names used bye the install paths below.
--VBOX_PUEL_MANGLED_NAME := Oracle_VM_VirtualBox_Extension_Pack
--
- # Install paths
- ## @todo This will change after 4.1 is branched off!
- # What is now 'bin' and 'lib' will be moved down under 'staged/', except on
-@@ -129,9 +126,6 @@
- endif
- 
- INST_DOC              = doc/
--INST_EXTPACK          = $(INST_BIN)ExtensionPacks/
--INST_EXTPACK_CERTS    = $(INST_BIN)ExtPackCertificates/
--INST_EXTPACK_PUEL     = $(INST_EXTPACK)$(VBOX_PUEL_MANGLED_NAME)/
- INST_PACKAGES         = packages/
- 
- VBOX_PATH_SDK         = $(patsubst %/,%,$(PATH_STAGE)/$(INST_SDK))
-@@ -140,7 +134,6 @@
- VBOX_PATH_ADDITIONS   = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS))
- VBOX_PATH_ADDITIONS_ISO = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS_ISO))
- VBOX_PATH_ADDITIONS_LIB = $(patsubst %/,%,$(PATH_STAGE)/$(INST_ADDITIONS_LIB))
--VBOX_PATH_EXTPACK_PUEL= $(patsubst %/,%,$(PATH_STAGE)/$(INST_EXTPACK_PUEL))
- VBOX_PATH_PACKAGES    = $(patsubst %/,%,$(PATH_STAGE)/$(INST_PACKAGES))
- 
- 
-@@ -215,7 +208,6 @@
-  export VBOX_ADDITIONS_SH_MODE     = release
-  export VBOX_DOCUMENTATION_SH_MODE = release
-  export VBOX_EFI_SH_MODE           = release
-- export VBOX_EXTPACKS_SH_MODE      = release
- endif
- 
- # Some info on the vendor
-@@ -368,8 +360,6 @@
- VBOX_WITH_USB = 1
- # Enable the USB 1.1 controller plus virtual USB HID devices.
- VBOX_WITH_VUSB = 1
--# Enable the USB 2.0 controller.
--VBOX_WITH_EHCI = 1
- # Enable the ISCSI feature.
- VBOX_WITH_ISCSI = 1
- # Enable INIP support in the ISCSI feature.
-@@ -441,9 +431,6 @@
- ifdef VBOX_WITH_USB
-  VBOX_WITH_VUSB = 1
- endif
--ifdef VBOX_WITH_EHCI
-- VBOX_WITH_EHCI_IMPL = 1
--endif
- ifdef VBOX_WITH_PCI_PASSTHROUGH
-  VBOX_WITH_PCI_PASSTHROUGH_IMPL = 1
- endif
-@@ -584,8 +571,6 @@
- if1of ($(KBUILD_TARGET), darwin freebsd linux solaris win)
-  VBOX_WITH_CROGL = 1
- endif
--# Enable the VNC server extension pack (GPL only).
--#VBOX_WITH_EXTPACK_VNC = 1
- # Enable S3 support (requires libcurl)
- VBOX_WITH_S3 = 1
- # Enable Host=>Guest Drag'n'Drop
-@@ -625,17 +610,6 @@
- endif
- ## @}
- 
--
--## @name Extension pack
--## @{
--# Enables the extension pack feature.
--VBOX_WITH_EXTPACK = 1
--# Enables separating code into the Oracle VM VirtualBox Extension Pack, dubbed PUEL.
--VBOX_WITH_EXTPACK_PUEL = 1
--# Enables building+packing the Oracle VM VirtualBox Extension Pack, includes VBOX_WITH_EXTPACK_PUEL
--VBOX_WITH_EXTPACK_PUEL_BUILD = 1
--## @}
--
- ## @name Misc
- ## @{
- # Enable Seamless mode
-@@ -826,14 +800,6 @@
- # Skip stuff.
- #
- 
--ifdef VBOX_ONLY_EXTPACKS
-- # Clear some VBOX_WITH_XXX variables instead of adding ifdefs all over the place.
-- VBOX_WITH_DEBUGGER =
-- VBOX_WITH_ADDITIONS =
-- VBOX_WITH_VBOXDRV =
-- VBOX_WITH_TESTCASES =
--endif
--
- # VBOX_QUICK can be used by core developers to speed to the build
- ifdef VBOX_QUICK
-  # undefine variables by assigning blank.
-@@ -888,7 +854,6 @@
-  VBOX_WITH_TESTSUITE=
-  VBOX_WITH_QTGUI=
-  VBOX_WITH_USB=
-- VBOX_WITH_EHCI=
-  VBOX_WITH_DOCS=
-  VBOX_WITH_PDM_ASYNC_COMPLETION=
-  VBOX_WITH_KCHMVIEWER=
-@@ -910,7 +875,6 @@
-  VBOX_WITH_CROGL=
-  VBOX_WITH_DEBUGGER=
-  VBOX_WITH_DOCS=
-- VBOX_WITH_EHCI=
-  VBOX_WITH_HARDENING=
-  VBOX_WITH_HEADLESS=
-  VBOX_WITH_HGCM=
-@@ -983,7 +947,7 @@
- #
- # Indicate VBOX_ONLY build if any of the VBOX_ONLY_* variables are set.
- #
--VBOX_ONLY_BUILD := $(strip $(foreach x, ADDITIONS DOCS EXTPACKS SDK TESTSUITE\
-+VBOX_ONLY_BUILD := $(strip $(foreach x, ADDITIONS DOCS SDK TESTSUITE\
- 	, $(if-expr defined(VBOX_ONLY_$(x)),VBOX_ONLY_$(x))))
- if $(words $(VBOX_ONLY_BUILD)) > 1
-  $(error VBox: More than one VBOX_ONLY build enabled! $(VBOX_ONLY_BUILD))
-@@ -1001,9 +965,6 @@
- #
- ifdef VBOX_OSE
-  VBOX_WITH_VRDP=
-- VBOX_WITH_EHCI_IMPL=
-- VBOX_WITH_EXTPACK_PUEL=
-- VBOX_WITH_EXTPACK_PUEL_BUILD=
-  VBOX_WITH_PCI_PASSTHROUGH_IMPL=
-  VBOX_WITH_OS2_ADDITIONS_BIN=
-  VBOX_WITH_SECURELABEL=
-@@ -1135,10 +1096,6 @@
-  VBOX_WITH_KCHMVIEWER=
- endif
- 
--ifdef VBOX_WITH_EXTPACK_PUEL_BUILD
-- VBOX_WITH_EXTPACK_PUEL = 1
--endif
--
- #
- # Mark OSE builds clearly, helps figuring out limitations more easily.
- #
-@@ -1743,9 +1700,6 @@
- # bin2c (convert binary files into C arrays)
- VBOX_BIN2C      ?= $(PATH_OBJ)/bin2c/bin2c$(HOSTSUFF_EXE)
- 
--# RTManifest (extension pack manifest utility)
--VBOX_RTMANIFEST ?= $(PATH_OBJ)/bldRTManifest/bldRTManifest$(HOSTSUFF_EXE)
--
- # VBoxCmp (simple /bin/cmp with more sensible output)
- VBOX_VBOXCMP    ?= $(PATH_OBJ)/VBoxCmp/VBoxCmp$(HOSTSUFF_EXE)
- 
-@@ -2633,13 +2587,6 @@
-  SDK_VBOX_OPENSSL2_LIBS = $(NO_SUCH_VARIABLE)
- endif
- 
--SDK_VBoxOpenSslExtPack                 = Internal use only.
--SDK_VBoxOpenSslExtPack_INCS            = $(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)
--SDK_VBoxOpenSslExtPack_ORDERDEPS       = $(crypto-headers_1_TARGET)
--SDK_VBoxOpenSslExtPack_LIBS    = \
--	$(PATH_STAGE_LIB)/VBoxExtPack-libssl$(VBOX_SUFF_LIB) \
--	$(PATH_STAGE_LIB)/VBoxExtPack-libcrypto$(VBOX_SUFF_LIB)
--
- SDK_VBOX_BLD_OPENSSL      = .
- SDK_VBOX_BLD_OPENSSL_EXTENDS = VBOX_OPENSSL
- SDK_VBOX_BLD_OPENSSL_LIBS ?= \
-@@ -4100,99 +4047,6 @@
- TEMPLATE_VBOXMAINCLIENTDLL_LDFLAGS.darwin = $(filter-out -bind_at_load,$(TEMPLATE_VBOXMAINCLIENTEXE_LDFLAGS.darwin))
- 
- 
--
--#
--# Templates used for building the extension packs.
--#
--ifdef VBOX_WITH_EXTPACK
-- # Base templates (native or portable).
-- TEMPLATE_VBoxR3ExtPack = For the ring-3 context extension pack modules.
-- if 1 # Native for now.
--  TEMPLATE_VBoxR3ExtPack_EXTENDS = VBOXR3DLLNOXCPT
--  TEMPLATE_VBoxR3ExtPack_DEFS = $(TEMPLATE_VBOXR3DLLNOXCPT_DEFS) VBOX_IN_EXTPACK VBOX_IN_EXTPACK_R3
-- else
--  TEMPLATE_VBoxR3ExtPack_EXTENDS = VBOXNOCRTGCC
--  TEMPLATE_VBoxR3ExtPack_DEFS = $(TEMPLATE_VBOXNOCRTGCC_DEFS) VBOX_IN_EXTPACK VBOX_IN_EXTPACK_R3 IPRT_NO_CRT IN_RING3
--  TEMPLATE_VBoxR3ExtPack_INCS = $(PATH_ROOT)/include/iprt/nocrt $(TEMPLATE_VBOXR3DLLNOXCPT_INCS)
-- endif
-- ifneq ($(KBUILD_TARGET),win)
--  TEMPLATE_VBoxR3ExtPack_CXXFLAGS = $(TEMPLATE_VBOXR3DLLNOXCPT_CXXFLAGS) -fno-rtti
-- endif
-- TEMPLATE_VBoxR3ExtPack_INST = $(INST_EXTPACK)YouShallOverrideThis/
-- ifeq ($(KBUILD_TARGET),linux)
--  TEMPLATE_VBoxR3ExtPack_LDFLAGS = $(filter-out '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RUNPATH)' '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)', $(TEMPLATE_VBOXR3DLLNOXCPT_LDFLAGS))
-- else
--  if !defined(VBOX_WITH_RUNPATH) && defined(VBOX_WITH_RELATIVE_RUNPATH)
--   TEMPLATE_VBoxR3ExtPack_LDFLAGS = '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)/../../..' $(filter-out '$(VBOX_GCC_RPATH_OPT)$(VBOX_WITH_RELATIVE_RUNPATH)', $(TEMPLATE_VBOXR3DLLNOXCPT_LDFLAGS))
--  endif
-- endif
-- ifdef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
--  if1of ($(KBUILD_TARGET), win os2)
--   TEMPLATE_VBoxR3ExtPack_LIBS = \
--   	$(TEMPLATE_LIBS_VBOXR3) \
--   	$(PATH_STAGE_LIB)/VMMR3Imp$(VBOX_SUFF_LIB) \
--   	$(PATH_STAGE_LIB)/VBoxRTImp$(VBOX_SUFF_LIB)
--  else
--   TEMPLATE_VBoxR3ExtPack_LIBS = \
--   	$(TEMPLATE_LIBS_VBOXR3) \
--   	$(PATH_STAGE_LIB)/VMMR3Imp$(VBOX_SUFF_DLL) \
--   	$(PATH_STAGE_LIB)/VBoxRTImp$(VBOX_SUFF_DLL)
--  endif
-- else
--  TEMPLATE_VBoxR3ExtPack_LIBS = \
--  	$(TEMPLATE_LIBS_VBOXR3) \
--  	$(LIB_RUNTIME) \
--  	$(LIB_VMM)
-- endif
--
-- TEMPLATE_VBoxR0ExtPack = For the ring-0 context extension pack modules.
-- TEMPLATE_VBoxR0ExtPack_EXTENDS = VBoxR0
-- TEMPLATE_VBoxR0ExtPack_EXTENDS_BY = appending
-- TEMPLATE_VBoxR0ExtPack_INST = $(INST_EXTPACK)YouShallOverrideThis/
-- TEMPLATE_VBoxR0ExtPack_DEFS = VBOX_IN_EXTPACK VBOX_IN_EXTPACK_R0
-- if1of ($(VBOX_LDR_FMT), pe lx)
--  TEMPLATE_VBoxR0ExtPack_LIBS = \
--	$(PATH_STAGE_LIB)/VMMR0Imp$(VBOX_SUFF_LIB) \
--	$(PATH_STAGE_LIB)/SUPR0$(VBOX_SUFF_LIB)
-- endif
--
-- TEMPLATE_VBoxRcExtPack = For the raw-mode context extension pack modules.
-- TEMPLATE_VBoxRcExtPack_EXTENDS = VBoxRc
-- TEMPLATE_VBoxRcExtPack_EXTENDS_BY = appending
-- TEMPLATE_VBoxRcExtPack_SYSSUFF = .rc
-- TEMPLATE_VBoxRcExtPack_INST = $(INST_EXTPACK)YouShallOverrideThis/
-- TEMPLATE_VBoxRcExtPack_DEFS = VBOX_IN_EXTPACK VBOX_IN_EXTPACK_RC
-- if1of ($(VBOX_LDR_FMT32), pe lx)
--  TEMPLATE_VBoxRcExtPack_LIBS = \
--	$(PATH_STAGE_LIB)/VMMRCBuiltin$(VBOX_SUFF_LIB) \
--	$(PATH_STAGE_LIB)/VMMRCImp$(VBOX_SUFF_LIB)
-- endif
--
-- TEMPLATE_VBoxInsExtPack = For the install targets of an extension pack.
-- TEMPLATE_VBoxInsExtPack_MODE = 0644
-- TEMPLATE_VBoxInsExtPack_INST = $(INST_EXTPACK)YouShallOverrideThis/
--
-- # For each individual extension pack
-- ifdef VBOX_WITH_EXTPACK_PUEL
--  TEMPLATE_VBoxR3ExtPackPuel = For the ring-3 context modules in the PUEL extension pack.
--  TEMPLATE_VBoxR3ExtPackPuel_EXTENDS = VBoxR3ExtPack
--  TEMPLATE_VBoxR3ExtPackPuel_INST = $(INST_EXTPACK_PUEL)$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
--
--  TEMPLATE_VBoxR0ExtPackPuel = For the ring-0 context modules in the PUEL extension pack.
--  TEMPLATE_VBoxR0ExtPackPuel_EXTENDS = VBoxR0ExtPack
--  TEMPLATE_VBoxR0ExtPackPuel_INST = $(INST_EXTPACK_PUEL)$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
--
--  TEMPLATE_VBoxRcExtPackPuel = For the raw-mode context modules in the PUEL extension pack.
--  TEMPLATE_VBoxRcExtPackPuel_EXTENDS = VBoxRcExtPack
--  TEMPLATE_VBoxRcExtPackPuel_INST = $(INST_EXTPACK_PUEL)$(KBUILD_TARGET).$(KBUILD_TARGET_ARCH)/
--
--  TEMPLATE_VBoxInsExtPackPuel = For the install targets of an extension pack.
--  TEMPLATE_VBoxInsExtPackPuel_EXTENDS = VBoxR0ExtPack
--  TEMPLATE_VBoxInsExtPackPuel_INST = $(INST_EXTPACK_PUEL)
--endif
--endif # VBOX_WITH_EXTPACK
--
--
- #
- # Qt 4
- # Qt 4
---- VirtualBox-4.2.6.orig/configure	2012-12-19 16:24:34.000000000 -0200
-+++ VirtualBox-4.2.6/configure		2012-12-27 14:26:25.743442978 -0200
-@@ -90,8 +90,6 @@
- WITH_HARDENING=1
- WITH_UDPTUNNEL=1
- WITH_VDE=0
--WITH_VNC=0
--WITH_EXTPACK=1
- WITH_DOCS=1
- BUILD_LIBXML2=
- BUILD_LIBCURL=
-@@ -124,8 +122,6 @@
- MESA="-lGL"
- INCZ=""
- LIBZ="-lz"
--INCVNCSERVER=""
--LIBVNCSERVER="-lvncserver"
- INCDEVMAPPER=""
- LIBDEVMAPPER="-ldevmapper"
- CXX_FLAGS=""
-@@ -930,47 +926,6 @@
- }
- 
- #
--# Check for libvncserver, needed for VNC in OSE
--#
--check_vncserver()
--{
--  test_header libvncserver
--  cat > $ODIR.tmp_src.cc <<EOF
--#include <cstdio>
--#include <rfb/rfbconfig.h>
--
--extern "C" int main()
--{
--  const char* v=LIBVNCSERVER_VERSION;
--  unsigned int major = 0, minor = 0, micro = 0;
--
--  for (; *v !='.' && *v != '\0'; v++) major = major*10 + *v-'0';
--  if (*v == '.') v++;
--  for (; *v !='.' && *v != '\0'; v++) minor = minor*10 + *v-'0';
--  if (*v == '.') v++;
--  for (; *v !='.' && *v != '\0'; v++) micro = micro*10 + *v-'0';
--
--  printf("found version %s", LIBVNCSERVER_PACKAGE_VERSION);
--  if (major*10000 + minor*100 + micro >= 900)
--  {
--    printf(", OK.\n");
--    return 0;
--  }
--  else
--  {
--    printf(", expected version 0.9 or higher\n");
--    return 1;
--  }
--}
--EOF
--  if test_compile "$LIBVNCSERVER $INCVNCSERVER" libvncserver libvncserver; then
--    if test_execute; then
--      cnf_append "VBOX_WITH_EXTPACK_VNC" "1"
--    fi
--  fi
--}
--
--#
- # Check for libcurl, needed by S3
- #
- check_curl()
-@@ -2173,8 +2128,6 @@
- [ $WITH_KMODS   -eq 1 ] && echo "  --disable-kmods          don't build Linux kernel modules (host and guest)"
- [ $WITH_OPENGL  -eq 1 ] && echo "  --disable-opengl         disable OpenGL support (2D & 3D)"
- [ $WITH_GSOAP   -eq 0 ] && echo "  --enable-webservice      enable the webservice stuff"
--[ $OSE          -eq 1 ] && echo "  --enable-vnc             enable the VNC server"
--[ $OSE          -eq 0 ] && echo "  --disable-extpack        don't build the extpack"
- [ $WITH_DOCS    -eq 1 ] && echo "  --disable-docs           don't build the documentation"
- [ "$OS" = "linux" -o "$OS" = "freebsd" ] && echo "  --enable-vde             enable VDE networking"
- cat << EOF
-@@ -2346,15 +2299,9 @@
-     --enable-webservice)
-       [ $WITH_GSOAP -eq 0 ] && WITH_GSOAP=1
-       ;;
--    --enable-vnc)
--      WITH_VNC=1
--      ;;
-     --disable-hardening)
-       WITH_HARDENING=0
-       ;;
--    --disable-extpack)
--      WITH_EXTPACK=0
--      ;;
-     --disable-docs)
-       WITH_DOCS=0
-       ;;
-@@ -2512,15 +2459,6 @@
-   echo >> $CNF
- fi
- 
--# extpack
--if [ $OSE -eq 0 ]; then
--  if [ $WITH_EXTPACK -eq 1 ]; then
--    BUILD_LIBSSL=1
--  else
--    cnf_append "VBOX_WITH_EXTPACK_PUEL_BUILD" ""
--  fi
--fi
--
- # headless
- if [ -n "$HEADLESS" ]; then
-   cnf_append "VBOX_HEADLESS" "1"
-@@ -2646,15 +2584,6 @@
-   cnf_append "VBOX_WITH_DOCS_PACKING" ""
- fi
- 
--# VNC server support
--if [ $OSE -ge 1 ]; then
--  if [ $WITH_VNC = 1 ]; then
--    check_vncserver
--  else
--    cnf_append "VBOX_WITH_EXTPACK_VNC" ""
--  fi
--fi
--
- # success!
- echo
- echo "Successfully generated '$CNF' and '$ENV'."
---- VirtualBox-4.2.12.orig/Makefile.kmk	2013-04-12 07:33:55.000000000 -0300
-+++ VirtualBox-4.2.12/Makefile.kmk	2013-05-10 15:04:21.967970195 -0300
-@@ -388,7 +388,6 @@
- 	include/VBox \
- 	include/VBox/vmm \
- 	include/VBox/com \
--	include/VBox/ExtPack \
- 	include/VBox/HostServices \
- 	include/VBox/GuestHost \
- 	include/VBox/HGSMI \
-@@ -1010,200 +1009,6 @@
- 
- 
- #
--# Build the extension packs, all of them.
--#
--# This is tailored (hardcoded) for the extension pack build box.
--#
--# The fetching must be done in serial fashion, while the building should be
--# more flexible wrt to -jN.
--#
--extpacks-fetch:
--	+ $(KMK) -C tools fetch VBOX_ONLY_EXTPACKS=1
--	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=darwin  BUILD_TARGET_ARCH=amd64 BUILD_TARGET=darwin   VBOX_ONLY_EXTPACKS=1
--	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=darwin  BUILD_TARGET_ARCH=x86   BUILD_TARGET=darwin   VBOX_ONLY_EXTPACKS=1
--#	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=freebsd BUILD_TARGET_ARCH=amd64 BUILD_TARGET=freebsd  VBOX_ONLY_EXTPACKS=1
--#	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=freebsd BUILD_TARGET_ARCH=x86   BUILD_TARGET=freebsd  VBOX_ONLY_EXTPACKS=1
--	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=linux   BUILD_TARGET_ARCH=amd64 BUILD_TARGET=linux    VBOX_ONLY_EXTPACKS=1
--	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=linux   BUILD_TARGET_ARCH=x86   BUILD_TARGET=linux    VBOX_ONLY_EXTPACKS=1
--#	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=os2     BUILD_TARGET_ARCH=x86   BUILD_TARGET=os2      VBOX_ONLY_EXTPACKS=1
--	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=solaris BUILD_TARGET_ARCH=amd64 BUILD_TARGET=solaris  VBOX_ONLY_EXTPACKS=1
--	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=solaris BUILD_TARGET_ARCH=x86   BUILD_TARGET=solaris  VBOX_ONLY_EXTPACKS=1
--	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=amd64 KBUILD_TARGET=win     BUILD_TARGET_ARCH=amd64 BUILD_TARGET=win	     VBOX_ONLY_EXTPACKS=1
--	+ $(KMK) -C tools fetch KBUILD_TARGET_ARCH=x86   KBUILD_TARGET=win     BUILD_TARGET_ARCH=x86   BUILD_TARGET=win	     VBOX_ONLY_EXTPACKS=1
--
--
--extpacks-build: \
--	extpacks-build-win.amd64 \
--	extpacks-build-win.x86 \
--	extpacks-build-solaris.amd64 \
--	extpacks-build-solaris.x86 \
--	extpacks-build-os2.x86 \
--	extpacks-build-linux.amd64 \
--	extpacks-build-linux.x86 \
--	extpacks-build-darwin.amd64 \
--	extpacks-build-darwin.x86 \
--	extpacks-build-freebsd.amd64 \
--	extpacks-build-freebsd.x86
--
--VBOX_EXTPACKS_BUILD.amd64 = VBOX_ONLY_EXTPACKS=1 \
--	KBUILD_TYPE=$(KBUILD_TYPE) BUILD_TYPE=$(KBUILD_TYPE) \
--	KBUILD_TARGET_ARCH=amd64 BUILD_TARGET_ARCH=amd64 \
--	VBOX_SVN_REV=$(VBOX_SVN_REV)
--
--VBOX_EXTPACKS_BUILD.x86 = VBOX_ONLY_EXTPACKS=1 \
--	KBUILD_TYPE=$(KBUILD_TYPE) BUILD_TYPE=$(KBUILD_TYPE) \
--	KBUILD_TARGET_ARCH=x86 BUILD_TARGET_ARCH=x86 \
--	VBOX_SVN_REV=$(VBOX_SVN_REV)
--
--# Automatically determine the extpack build subdir name. Used for figuring out
--# directory names inside the extension pack building VMs.
--VBOX_EXTPACKS_BUILD_SUBDIRNAME := $(lastword $(subst /, ,$(PATH_ROOT)))
--
--# When building in parallel on a Windows host, make sure we finish the host
--# bit before kicking off any UNIX guest or we'll run into file sharing issues.
--ifeq ($(KBUILD_TARGET),win)
--VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST = extpacks-build-win.x86 extpacks-build-win.amd64
--else
--VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST =
--endif
--
--extpacks-build-win.amd64:
--ifeq ($(KBUILD_TARGET),win)
--	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
--else
--	$(call VBOX_BLD_VM_MSG_BEGIN,Windows/amd64 extension packs)
--	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_WIN_AMD64_IP) " echo $@ && cd e:/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
--	$(call VBOX_BLD_VM_MSG_END__,Windows/amd64 extension packs)
--endif
--
--extpacks-build-win.x86:
--ifeq ($(KBUILD_TARGET),win)
--	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
--else
--	$(call VBOX_BLD_VM_MSG_BEGIN,Windows/x86 extension packs)
--	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_WIN_X86_IP) " echo $@ && cd e:/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh kmk $(VBOX_EXTPACKS_BUILD.x86) all"
--	$(call VBOX_BLD_VM_MSG_END__,Windows/x86 extension packs)
--endif
--
--ifeq ($(KBUILD_TARGET),solaris)
--extpacks-build-solaris.amd64:
--	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
--
--extpacks-build-solaris.x86: extpacks-build-solaris.amd64
--	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) VBOX_WITH_COMBINED_SOLARIS_GUEST_PACKAGE=1 all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
--
--else
--# Serialize 32-bit and 64-bit ASSUMING the same VM builds both.
--extpacks-build-solaris.rsync-into-vm: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
--	$(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,solaris,*) . $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
--
--extpacks-build-solaris.build-it: extpacks-build-solaris.rsync-into-vm
--	$(call VBOX_BLD_VM_MSG_BEGIN,Solaris/amd64 extension packs)
--	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_SOLARIS_IP) " echo $@/amd64 && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
--	$(call VBOX_BLD_VM_MSG_END__,Solaris/amd64 extension packs)
--	$(call VBOX_BLD_VM_MSG_BEGIN,Solaris/x86 extension packs)
--	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_SOLARIS_IP) " echo $@/x86   && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
--	$(call VBOX_BLD_VM_MSG_END__,Solaris/x86 extension packs)
--
--extpacks-build-solaris.rsync-out-of-vm: extpacks-build-solaris.build-it
--	$(VBOX_KMK_TIME) rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/solaris.x86 out/
--	$(VBOX_KMK_TIME) rsync -a --delete $(VBOX_BLD_VM_SOLARIS_IP):/mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/solaris.amd64 out/
--
--.NOTPARALLEL: extpacks-build-solaris.rsync-out-of-vm extpacks-build-solaris.rsync-into-vm
--.PHONY:       extpacks-build-solaris.rsync-out-of-vm extpacks-build-solaris.rsync-into-vm extpacks-build-solaris.build-it
--
--extpacks-build-solaris.amd64: extpacks-build-solaris.rsync-out-of-vm
--extpacks-build-solaris.x86: extpacks-build-solaris.rsync-out-of-vm
--endif
--
--extpacks-build-os2.x86:
--#ifeq ($(KBUILD_TARGET),os2)
--#	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
--#else
--#	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_OS2_IP) " cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) "
--#endif
--
--extpacks-build-linux.amd64:   $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
--ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.amd64)
--	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
--else
--	$(call VBOX_BLD_VM_MSG_BEGIN,Linux/amd64 extension packs)
--	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_LNX_AMD64_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
--	$(call VBOX_BLD_VM_MSG_END__,Linux/amd64 extension packs)
--endif
--
--extpacks-build-linux.x86:   $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
--ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),linux.x86)
--	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
--else
--	$(call VBOX_BLD_VM_MSG_BEGIN,Linux/x86 extension packs)
--	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_LNX_NEW_X86_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
--	$(call VBOX_BLD_VM_MSG_END__,Linux/x86 extension packs)
--endif
--
--extpacks-build-freebsd.amd64: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
--#ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),freebsd.amd64)
--#	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
--#else
--#	$(call VBOX_BLD_VM_MSG_BEGIN,FreeBSD/amd64 extension packs)
--#	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_FBSD_AMD64_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
--#	$(call VBOX_BLD_VM_MSG_END__,FreeBSD/amd64 extension packs)
--#endif
--
--extpacks-build-freebsd.x86: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
--#ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),freebsd.x86)
--#	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
--#else
--#	$(call VBOX_BLD_VM_MSG_BEGIN,FreeBSD/x86 extension packs)
--#	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_FBSD_X86_IP) " echo $@ && cd /mnt/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
--#	$(call VBOX_BLD_VM_MSG_END__,FreeBSD/x86 extension packs)
--#endif
--
--extpacks-build-darwin.amd64: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
--ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),darwin.amd64)
--	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.amd64) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
--else
--	$(call VBOX_BLD_VM_MSG_BEGIN,Darwin/amd64 extension packs)
--	$(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,darwin,amd64) . $(VBOX_BLD_VM_DARWIN_AMD64_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
--	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_DARWIN_AMD64_IP) " echo $@ && cd /Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.amd64) all"
--	$(VBOX_KMK_TIME) rsync -am -v --delete $(VBOX_BLD_VM_DARWIN_AMD64_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/darwin.amd64 out/
--	$(call VBOX_BLD_VM_MSG_END__,Darwin/amd64 extension packs)
--endif
--
--extpacks-build-darwin.x86: $(VBOX_EXTPACKS_BUILD_WIN_HOST_FIRST)
--ifeq ($(KBUILD_TARGET).$(KBUILD_TARGET_ARCH),darwin.x86)
--	+ $(VBOX_KMK_TIME) $(KMK) $(VBOX_EXTPACKS_BUILD.x86) all $(VBOX_EXTPACKS_HOST_BUILD_TWEAK)
--else
--	$(call VBOX_BLD_VM_MSG_BEGIN,Darwin/x86 extension packs)
--	$(VBOX_KMK_TIME) $(call VBOX_RSYNC_IN_FN,darwin,x86) . $(VBOX_BLD_VM_DARWIN_X86_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)
--	$(VBOX_KMK_TIME) ssh vbox@$(VBOX_BLD_VM_DARWIN_X86_IP) " echo $@ && cd /Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME) && tools/env.sh --no-wine kmk $(VBOX_EXTPACKS_BUILD.x86) all"
--	$(VBOX_KMK_TIME) rsync -am -v --delete $(VBOX_BLD_VM_DARWIN_X86_IP):/Users/vbox/tinderbox/$(VBOX_EXTPACKS_BUILD_SUBDIRNAME)/out/darwin.x86 out/
--	$(call VBOX_BLD_VM_MSG_END__,Darwin/x86 extension packs)
--endif
--
--
--extpacks-packing:
--	+ $(KMK) VBOX_ONLY_EXTPACKS=1 \
--		VBOX_WITH_EXTPACK_OS_ARCHS="darwin.amd64 darwin.x86 linux.amd64 linux.x86 solaris.amd64 solaris.x86 win.amd64 win.x86" \
--		packing
--# +++ freebsd.amd64 freebsd.x86 os2.x86 ^^^
--
--.PHONY: \
--	extpacks-build-win.x86 \
--	extpacks-build-win.amd64 \
--	extpacks-build-solaris.amd64 \
--	extpacks-build-solaris.x86 \
--	extpacks-build-os2.x86 \
--	extpacks-build-linux.amd64 \
--	extpacks-build-linux.x86 \
--	extpacks-build-freebsd.amd64 \
--	extpacks-build-freebsd.x86 \
--	extpacks-build-darwin.amd64 \
--	extpacks-build-darwin.x86 \
--	extpacks-packing
--
--
--#
- # Build the test suite, all of it.
- #
- # This is currently tailored (hardcoded) for the additions build box just like
---- VirtualBox-4.1.18.orig/src/VBox/Devices/build/VBoxDD.cpp		2012-06-20 10:15:51.000000000 -0300
-+++ VirtualBox-4.1.18/src/VBox/Devices/build/VBoxDD.cpp			2012-07-24 16:18:03.964493454 -0300
-@@ -132,11 +132,6 @@
-     if (RT_FAILURE(rc))
-         return rc;
- #endif
--#ifdef VBOX_WITH_EHCI_IMPL
--    rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceEHCI);
--    if (RT_FAILURE(rc))
--        return rc;
--#endif
- #ifdef VBOX_ACPI
-     rc = pCallbacks->pfnRegister(pCallbacks, &g_DeviceACPI);
-     if (RT_FAILURE(rc))
---- VirtualBox-4.1.18.orig/src/VBox/Devices/build/VBoxDD.h		2012-06-20 10:15:51.000000000 -0300
-+++ VirtualBox-4.1.18/src/VBox/Devices/build/VBoxDD.h			2012-07-24 16:20:35.939205389 -0300
-@@ -62,7 +62,6 @@
- extern const PDMDEVREG g_DeviceICH6_HDA;
- extern const PDMDEVREG g_DeviceAudioSniffer;
- extern const PDMDEVREG g_DeviceOHCI;
--extern const PDMDEVREG g_DeviceEHCI;
- extern const PDMDEVREG g_DeviceACPI;
- extern const PDMDEVREG g_DeviceDMA;
- extern const PDMDEVREG g_DeviceFloppyController;
---- VirtualBox-4.1.18.orig/include/Makefile.kmk		2012-06-20 10:07:49.000000000 -0300
-+++ VirtualBox-4.1.18/include/Makefile.kmk		2012-07-24 21:11:57.007068865 -0300
-@@ -51,7 +51,6 @@
- 	VBox/vd-cache-plugin.h \
- 	VBox/vmm/uvm.h \
- 	VBox/vscsi.h \
--	$(wildcard VBox/ExtPack/*.h ) \
- 	iprt/alloca.h \
- 	iprt/tcp.h \
- 	iprt/localipc.h \
---- VirtualBox-4.2.0.orig/src/Makefile.kmk	2012-08-03 09:28:25.000000000 -0300
-+++ VirtualBox-4.2.0/src/Makefile.kmk		2012-09-19 03:01:57.588337894 -0300
-@@ -23,10 +23,8 @@
- if !defined(VBOX_ONLY_ADDITIONS)
-  include $(PATH_SUB_CURRENT)/libs/Makefile.kmk
- endif
--if defined(VBOX_ONLY_EXTPACKS) && !defined(VBOX_ONLY_EXTPACKS_USE_IMPLIBS) && defined(VBOX_WITH_REM)
-- include $(PATH_SUB_CURRENT)/recompiler/Makefile.kmk
- 
--else if !defined(VBOX_ONLY_BUILD)
-+if !defined(VBOX_ONLY_BUILD)
-  # Normal build.
-  if1of ($(KBUILD_TARGET_ARCH), x86 amd64)
-   ifdef VBOX_WITH_REM
---- VirtualBox-4.2.0.orig/src/VBox/Makefile.kmk		2012-05-30 07:39:32.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Makefile.kmk		2012-09-19 00:03:08.577726965 -0300
-@@ -33,19 +33,6 @@
-  include $(PATH_SUB_CURRENT)/HostDrivers/Makefile.kmk
-  include $(PATH_SUB_CURRENT)/Frontends/Makefile.kmk
- 
--else ifdef VBOX_ONLY_EXTPACKS
-- include $(PATH_SUB_CURRENT)/Runtime/Makefile.kmk
-- include $(PATH_SUB_CURRENT)/Devices/Makefile.kmk
-- include $(PATH_SUB_CURRENT)/HostDrivers/Makefile.kmk
-- include $(PATH_SUB_CURRENT)/ExtPacks/Makefile.kmk
-- ifdef VBOX_WITH_VRDP
--  include $(PATH_SUB_CURRENT)/RDP/Makefile.kmk
-- endif
-- include $(PATH_SUB_CURRENT)/VMM/Makefile.kmk
-- ifndef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
--  include $(PATH_SUB_CURRENT)/Disassembler/Makefile.kmk
-- endif
--
- else ifdef VBOX_ONLY_SDK
-  include $(PATH_SUB_CURRENT)/Main/Makefile.kmk
-  ifdef VBOX_WITH_VRDP
-@@ -92,7 +79,6 @@
-  if1of ($(KBUILD_TARGET_ARCH), amd64 x86)
-   include $(PATH_SUB_CURRENT)/NetworkServices/Makefile.kmk
-  endif
-- include $(PATH_SUB_CURRENT)/ExtPacks/Makefile.kmk
-  ifdef VBOX_WITH_INSTALLER
-   include $(PATH_SUB_CURRENT)/Installer/Makefile.kmk 		        # Keep this last.
-  endif
---- VirtualBox-4.2.12.orig/src/libs/Makefile.kmk	2013-04-12 07:39:14.000000000 -0300
-+++ VirtualBox-4.2.12/src/libs/Makefile.kmk		2013-04-13 02:00:29.294392443 -0300
-@@ -48,13 +48,6 @@
-  include $(PATH_SUB_CURRENT)/kStuff/Makefile.kmk
- endif
- 
--# OpenSSL.
--if !defined(VBOX_ONLY_SDK) \
-- && (   "$(SDK_VBOX_OPENSSL_INCS)" == "$(SDK_VBOX_OPENSSL_VBOX_DEFAULT_INCS)" \
--     || defined(VBOX_WITH_EXTPACK_PUEL_BUILD))
-- include $(PATH_SUB_CURRENT)/openssl-0.9.8y/Makefile.kmk
--endif
--
- # libjpeg for VRDP video redirection
- if defined(VBOX_WITH_VRDP) && defined(VBOX_WITH_VRDP_VIDEO_CHANNEL)
-  include $(PATH_SUB_CURRENT)/jpeg-8a/Makefile.kmk
---- VirtualBox-4.2.0.orig/src/VBox/Devices/Makefile.kmk		2012-08-03 09:28:25.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Devices/Makefile.kmk		2012-09-19 02:54:35.912748288 -0300
-@@ -25,9 +25,7 @@
- 
- # Include sub-makefiles.
- include $(PATH_SUB_CURRENT)/testcase/Makefile.kmk
--if defined(VBOX_WITH_INTEL_PXE) || defined(VBOX_ONLY_EXTPACKS)
-- include $(PATH_SUB_CURRENT)/PC/PXE/Makefile.kmk
--else if defined(VBOX_WITH_PXE_ROM)
-+if defined(VBOX_WITH_PXE_ROM)
-  if !defined(VBOX_WITHOUT_ETHERBOOT)
-   include $(PATH_SUB_CURRENT)/PC/Etherboot-src/Makefile.kmk
-  endif
-@@ -71,9 +69,6 @@
-  ifdef VBOX_WITH_USB
-   VBoxDDU_DEFS           += VBOX_WITH_USB IN_USBLIB
-   VBoxDDU_SDKS.win        = ReorderCompilerIncs $(VBOX_WINPSDK) $(VBOX_WINDDK)
--  if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
--   VBoxDDU_DEFS          += VBOX_WITH_EHCI_IMPL
--  endif
-   ifdef VBOX_WITH_NEW_USB_CODE_ON_DARWIN
-    VBoxDDU_DEFS.darwin   += VBOX_WITH_NEW_USB_CODE_ON_DARWIN
-   endif
-@@ -326,15 +321,7 @@
-    	Storage/UsbMsd.cpp
-   endif
- 
--  if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
--   VBoxDD_DEFS          += VBOX_WITH_EHCI_IMPL
--  endif
-   VBoxDD_DEFS           += VBOX_WITH_USB
--  if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
--   VBoxDD_DEFS          += VBOX_WITH_EHCI_IMPL
--   VBoxDD_SOURCES       += \
-- 	USB/DevEHCI.cpp
--  endif
- 
-  endif # VBOX_WITH_USB
- 
-@@ -869,11 +856,6 @@
- 
-   ifdef VBOX_WITH_USB
-    VBoxDDGC_DEFS        += VBOX_WITH_USB
--   if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
--    VBoxDDGC_DEFS       += VBOX_WITH_EHCI_IMPL
--    VBoxDDGC_SOURCES    += \
--  	USB/DevEHCI.cpp
--   endif
-   endif
- 
-   ifdef VBOX_WITH_VIDEOHWACCEL
-@@ -1020,11 +1002,6 @@
-  endif
-  ifdef VBOX_WITH_USB
-  VBoxDDR0_DEFS          += VBOX_WITH_USB
--  if defined(VBOX_WITH_EHCI_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
--   VBoxDDR0_DEFS        += VBOX_WITH_EHCI_IMPL
--   VBoxDDR0_SOURCES     += \
-- 	USB/DevEHCI.cpp
--  endif
-  endif
- 
-  if defined(VBOX_WITH_PCI_PASSTHROUGH_IMPL) && !defined(VBOX_WITH_EXTPACK_PUEL)
-@@ -1163,50 +1140,5 @@
- endif # !VBOX_ONLY_EXTPACKS
- 
- 
--if defined(VBOX_WITH_EXTPACK_PUEL) && defined(VBOX_WITH_EXTPACK_PUEL_BUILD)
-- #
-- # The EHCI (USB 2.0) Extension Pack Modules.
-- #
-- if defined(VBOX_WITH_USB)
--  DLLS += VBoxEhciR3
--  VBoxEhciR3_TEMPLATE = VBoxR3ExtPackPuel
--  VBoxEhciR3_SOURCES  = USB/DevEHCI.cpp
--
--  SYSMODS += VBoxEhciR0
--  VBoxEhciR0_TEMPLATE = VBoxR0ExtPackPuel
--  VBoxEhciR0_SOURCES  = USB/DevEHCI.cpp
--
--  ifdef VBOX_WITH_RAW_MODE
--   SYSMODS += VBoxEhciRC
--   VBoxEhciRC_TEMPLATE = VBoxRcExtPackPuel
--   VBoxEhciRC_SOURCES  = USB/DevEHCI.cpp
--  endif
-- endif
--
-- if defined(VBOX_WITH_PCI_PASSTHROUGH)
--  DLLS += VBoxPciRawR3
--  VBoxPciRawR3_TEMPLATE = VBoxR3ExtPackPuel
--  VBoxPciRawR3_SOURCES  = Bus/DevPciRaw.cpp
--
--  DLLS += VBoxPciRawDrv
--  VBoxPciRawDrv_TEMPLATE = VBoxR3ExtPackPuel
--  VBoxPciRawDrv_SOURCES = Bus/DrvPciRaw.cpp
--
--  SYSMODS += VBoxPciRawR0
--  VBoxPciRawR0_TEMPLATE = VBoxR0ExtPackPuel
--  VBoxPciRawR0_SOURCES  = Bus/DevPciRaw.cpp
--
--  Bus/DevPciRaw.cpp_INCS   = Bus
-- endif
--
--
-- #
-- # The Intel PXE rom.
-- #
-- INSTALLS += VBoxExtPackPuelInsRoms
-- VBoxExtPackPuelInsRoms_TEMPLATE = VBoxInsExtPackPuel
-- VBoxExtPackPuelInsRoms_SOURCES = PC/PXE/PXE-Intel.rom=>PXE-Intel.rom
--endif # VBOX_WITH_EXTPACK_PUEL
--
- include $(FILE_KBUILD_SUB_FOOTER)
- 
---- VirtualBox-4.2.0.orig/src/VBox/Main/Makefile.kmk	2012-09-04 09:48:44.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Main/Makefile.kmk		2012-09-19 00:46:39.251763337 -0300
-@@ -233,14 +233,12 @@
- 	$(if $(VBOX_USB_WITH_SYSFS),VBOX_USB_WITH_SYSFS,) \
- 	$(if $(VBOX_USB_WITH_INOTIFY),VBOX_USB_WITH_INOTIFY,) \
- 	$(if $(VBOX_WITH_LIVE_MIGRATION),VBOX_WITH_LIVE_MIGRATION,) \
--	$(if $(VBOX_WITH_EXTPACK),VBOX_WITH_EXTPACK,) \
- 	$(if $(VBOX_WITH_VUSB),VBOX_WITH_VUSB,) \
- 	$(if $(VBOX_WITH_S3),VBOX_WITH_S3,) \
- 	$(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH,)
- ifdef VBOX_WITH_USB
-  VBoxSVC_DEFS += \
- 	VBOX_WITH_USB \
--	$(if $(VBOX_WITH_EHCI),VBOX_WITH_EHCI,) \
- 	$(if $(VBOX_WITH_NEW_USB_CODE_ON_DARWIN),VBOX_WITH_NEW_USB_CODE_ON_DARWIN,)
- endif
- VBoxSVC_DEFS.win += VBOX_COM_OUTOFPROC_MODULE
-@@ -293,7 +291,6 @@
- 	src-all/SharedFolderImpl.cpp \
- 	src-all/VirtualBoxBase.cpp \
- 	src-all/VirtualBoxErrorInfoImpl.cpp \
--	$(if $(VBOX_WITH_EXTPACK),src-all/ExtPackManagerImpl.cpp src-all/ExtPackUtil.cpp,) \
- 	src-server/ApplianceImpl.cpp \
- 	src-server/ApplianceImplExport.cpp \
- 	src-server/ApplianceImplImport.cpp \
-@@ -538,8 +535,6 @@
- 	$(if $(VBOX_WITH_DRAG_AND_DROP),VBOX_WITH_DRAG_AND_DROP,) \
- 	$(if $(VBOX_WITH_DRAG_AND_DROP_GH),VBOX_WITH_DRAG_AND_DROP_GH,) \
- 	$(if $(VBOX_WITH_USB),VBOX_WITH_USB,) \
--	$(if-expr defined(VBOX_WITH_EHCI) && defined(VBOX_WITH_USB),VBOX_WITH_EHCI,) \
--	$(if $(VBOX_WITH_EXTPACK),VBOX_WITH_EXTPACK,) \
- 	$(if $(VBOX_WITH_PCI_PASSTHROUGH),VBOX_WITH_PCI_PASSTHROUGH,) \
- 	$(if $(VBOX_WITH_VPX),VBOX_WITH_VPX,)
- 
-@@ -605,7 +600,6 @@
- 	src-all/SharedFolderImpl.cpp \
- 	src-all/VirtualBoxBase.cpp \
- 	src-all/VirtualBoxErrorInfoImpl.cpp \
--	$(if $(VBOX_WITH_EXTPACK),src-all/ExtPackManagerImpl.cpp src-all/ExtPackUtil.cpp,) \
- 	$(if $(VBOX_WITH_USB_VIDEO),src-client/UsbWebcamInterface.cpp,) \
- 	$(if $(VBOX_WITH_USB_CARDREADER),src-client/UsbCardReader.cpp,) \
- 	src-client/Nvram.cpp \
-@@ -733,22 +727,6 @@
- 	$(if $(VBOX_BLEEDING_EDGE),VBOX_BLEEDING_EDGE=\"$(VBOX_BLEEDING_EDGE)\",)
- 
- 
--#
--# The VBoxExtPackHelperApp.
--#
--ifdef VBOX_WITH_EXTPACK
-- PROGRAMS += VBoxExtPackHelperApp
-- VBoxExtPackHelperApp_TEMPLATE = VBoxR3SetUidToRoot
-- VBoxExtPackHelperApp_LDFLAGS.darwin = -framework Security
-- VBoxExtPackHelperApp_LDFLAGS.win = /SUBSYSTEM:windows
-- VBoxExtPackHelperApp_SOURCES = \
--	src-helper-apps/VBoxExtPackHelperApp.cpp \
--	src-all/ExtPackUtil.cpp
-- VBoxExtPackHelperApp_LIBS = \
--	$(LIB_RUNTIME)
--endif # VBOX_WITH_EXTPACK
--
--
- endif # !VBOX_ONLY_SDK (the ifndef is far above)
- 
- 
---- VirtualBox-4.1.18.orig/src/VBox/Frontends/VirtualBox/Makefile.kmk		2012-07-24 23:25:04.575825175 -0300
-+++ VirtualBox-4.1.18/src/VBox/Frontends/VirtualBox/Makefile.kmk		2012-07-24 23:25:04.619156084 -0300
-@@ -888,7 +888,6 @@
- 	$(VBOX_MACOSX_ICON_FILE)=>Resources/virtualbox.icns \
- 	$(VBOX_BRAND_GUI_VBOX_64PX_PNG)=>Resources/virtualbox.png \
- 	$(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-vbox.icns=>Resources/virtualbox-vbox.icns \
--	$(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-vbox-extpack.icns=>Resources/virtualbox-vbox-extpack.icns \
- 	$(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-ovf.icns=>Resources/virtualbox-ovf.icns \
- 	$(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-ova.icns=>Resources/virtualbox-ova.icns \
- 	$(PATH_ROOT)/src/VBox/Resources/darwin/virtualbox-vdi.icns=>Resources/virtualbox-vdi.icns \
---- VirtualBox-4.2.0.orig/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc		2012-05-30 07:39:18.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Frontends/VirtualBox/VirtualBox2.qrc		2012-09-19 00:51:25.413310527 -0300
-@@ -169,18 +169,6 @@
-         <file alias="status_check_32px.png">images/status_check_32px.png</file>
-         <file alias="status_error_16px.png">images/status_error_16px.png</file>
-         <file alias="status_error_32px.png">images/status_error_32px.png</file>
--        <file alias="extension_pack_16px.png">images/extension_pack_16px.png</file>
--        <file alias="extension_pack_disabled_16px.png">images/extension_pack_disabled_16px.png</file>
--        <file alias="extension_pack_32px.png">images/extension_pack_32px.png</file>
--        <file alias="extension_pack_disabled_32px.png">images/extension_pack_disabled_32px.png</file>
--        <file alias="extension_pack_install_16px.png">images/extension_pack_install_16px.png</file>
--        <file alias="extension_pack_install_disabled_16px.png">images/extension_pack_install_disabled_16px.png</file>
--        <file alias="extension_pack_install_32px.png">images/extension_pack_install_32px.png</file>
--        <file alias="extension_pack_install_disabled_32px.png">images/extension_pack_install_disabled_32px.png</file>
--        <file alias="extension_pack_uninstall_16px.png">images/extension_pack_uninstall_16px.png</file>
--        <file alias="extension_pack_uninstall_disabled_16px.png">images/extension_pack_uninstall_disabled_16px.png</file>
--        <file alias="extension_pack_uninstall_32px.png">images/extension_pack_uninstall_32px.png</file>
--        <file alias="extension_pack_uninstall_disabled_32px.png">images/extension_pack_uninstall_disabled_32px.png</file>
-         <file alias="proxy_16px.png">images/proxy_16px.png</file>
-         <file alias="proxy_disabled_16px.png">images/proxy_disabled_16px.png</file>
-         <file alias="proxy_32px.png">images/proxy_32px.png</file>
---- VirtualBox-4.1.18.orig/src/VBox/Installer/linux/Makefile.kmk	2012-07-25 00:32:00.780012664 -0300
-+++ VirtualBox-4.1.18/src/VBox/Installer/linux/Makefile.kmk		2012-07-25 00:32:00.806677728 -0300
-@@ -170,11 +170,6 @@
- 	VBox.sh \
- 	VBox.png
- 
--ifdef VBOX_WITH_EXTPACK
-- VBOX_LNX_STRIP_BIN += \
--	VBoxExtPackHelperApp
--endif
--
- # Qt4 GUI
- ifdef VBOX_WITH_QTGUI
-  include $(PATH_ROOT)/src/VBox/Frontends/VirtualBox/nls/ApprovedLanguages.kmk
-@@ -286,7 +281,7 @@
- 
- VBOX_MIME_ICONS = \
- 	$(addprefix $(PATH_ROOT)/src/VBox/Resources/other/,\
--	    $(foreach f,ova ovf vbox vbox-extpack vdi vmdk vhd hdd, \
-+	    $(foreach f,ova ovf vbox vdi vmdk vhd hdd, \
- 	        $(foreach s,16 20 24 32 48 64 72 96 128 256,\
- 		    virtualbox-$(f)-$(s)px.png=>$(s)x$(s)/virtualbox-$(f).png)))
- 
---- VirtualBox-4.1.18.orig/src/VBox/Installer/win/Makefile.kmk		2012-07-25 00:34:52.253398525 -0300
-+++ VirtualBox-4.1.18/src/VBox/Installer/win/Makefile.kmk		2012-07-25 00:34:52.300062531 -0300
-@@ -435,7 +435,6 @@
- 		-E 'VBOX_WITH_DEBUGGER_GUI=$(if-expr defined(VBOX_WITH_DEBUGGER_GUI) && defined(VBOX_WITH_QTGUI),yes,no)' \
- 		-E 'VBOX_WITH_DOCS_PACKING=$(if $(VBOX_WITH_DOCS_PACKING),yes,no)' \
- 		-E 'VBOX_WITH_EFIFW_PACKING=$(if $(VBOX_WITH_EFIFW_PACKING),yes,no)' \
--		-E 'VBOX_WITH_EXTPACK=$(if $(VBOX_WITH_EXTPACK),yes,no)' \
- 		-E 'VBOX_WITH_GUEST_CONTROL=$(if $(VBOX_WITH_GUEST_CONTROL),yes,no)' \
- 		-E 'VBOX_WITH_GUEST_PROPS=$(if $(VBOX_WITH_GUEST_PROPS),yes,no)' \
- 		-E 'VBOX_WITH_NETFLT=$(if $(VBOX_WITH_NETFLT),yes,no)' \
---- VirtualBox-4.2.0.orig/src/VBox/Installer/darwin/Makefile.kmk	2012-09-08 06:36:03.000000000 -0300
-+++ VirtualBox-4.2.0/src/VBox/Installer/darwin/Makefile.kmk		2012-09-19 00:55:08.991167973 -0300
-@@ -497,7 +497,6 @@
- 	MacOS/VirtualBoxVM \
- 	MacOS/VBoxNetAdpCtl \
- 	MacOS/VBoxNetDHCP \
--	MacOS/VBoxExtPackHelperApp \
- 	MacOS/VBoxBalloonCtrl \
- 	MacOS/VBoxAutostart
- ifdef VBOX_WITH_WEBSERVICES
-@@ -522,7 +521,6 @@
- 	Resources/virtualbox.icns \
- 	Resources/virtualbox.png \
- 	Resources/virtualbox-vbox.icns \
--	Resources/virtualbox-vbox-extpack.icns \
- 	Resources/virtualbox-ovf.icns \
- 	Resources/virtualbox-ova.icns \
- 	Resources/virtualbox-vdi.icns \
---- VirtualBox-4.1.18/src/VBox/Installer/solaris/Makefile.kmk.orig	2012-07-25 00:38:48.476398293 -0300
-+++ VirtualBox-4.1.18/src/VBox/Installer/solaris/Makefile.kmk		2012-07-25 00:38:48.516396159 -0300
-@@ -185,12 +185,12 @@
- 
- VBOX_MIME_ICONS = \
- 	$(addprefix $(PATH_ROOT)/src/VBox/Resources/other/,\
--	    $(foreach f,ova ovf vbox vbox-extpack vdi vmdk vhd hdd, \
-+	    $(foreach f,ova ovf vbox vdi vmdk vhd hdd, \
- 	        $(foreach s,16 20 24 32 48 64 72 96 128 256,\
- 	            virtualbox-$(f)-$(s)px.png=>$(s)x$(s)/mimetypes/virtualbox-$(f).png)))
- 
- SOLARIS_COMMON_ICONS = \
--	$(foreach f,ova ovf vbox vbox-extpack vdi vmdk vhd hdd, \
-+	$(foreach f,ova ovf vbox vdi vmdk vhd hdd, \
- 	    $(foreach s,16 20 24 32 48 64 72 96 128 256,\
- 	        $(s)x$(s)/mimetypes/virtualbox-$(f).png))
- 
-@@ -210,7 +210,6 @@
- 	$(if $(VBOX_WITH_VBOXSDL),VBoxSDL,) \
- 	$(if $(VBOX_WITH_NETADP),VBoxNetAdpCtl,) \
- 	VBoxNetDHCP \
--	$(if $(VBOX_WITH_EXTPACK),VBoxExtPackHelperApp,) \
- 	VBoxSVC \
- 	$(if $(VBOX_WITH_CROGL),VBoxTestOGL,) \
- 	VBoxXPCOMIPCD \
---- VirtualBox-4.1.18.orig/src/VBox/Runtime/Makefile.kmk	2012-07-25 00:40:58.745522450 -0300
-+++ VirtualBox-4.1.18/src/VBox/Runtime/Makefile.kmk		2012-07-25 00:40:58.782186960 -0300
-@@ -53,15 +53,6 @@
-  #
-  LIBRARIES += RuntimeR3 RuntimeBldProg
- 
--else ifdef VBOX_ONLY_EXTPACKS_USE_IMPLIBS
-- #
-- # Build docs only - need just regular R3 runtime.
-- #
-- LIBRARIES += RuntimeBldProg
-- LIBRARIES.solaris += RuntimeR0Stub
-- LIBRARIES.win += RuntimeR0Stub RuntimeRCStub
-- include $(PATH_SUB_CURRENT)/tools/Makefile.kmk
--
- else # !VBOX_ONLY_ADDITIONS && !VBOX_ONLY_TESTSUITE && !VBOX_ONLY_DOCS
- 
-  #
-diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp
---- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp	2013-04-12 07:38:01.000000000 -0300
-+++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.cpp		2013-05-23 18:59:56.434051894 -0300
-@@ -650,27 +650,6 @@
-     }
- };
- 
--class PerformInstallGuestToolsAction : public UIActionSimple
--{
--    Q_OBJECT;
--
--public:
--
--    PerformInstallGuestToolsAction(QObject *pParent)
--        : UIActionSimple(pParent, ":/guesttools_16px.png", ":/guesttools_disabled_16px.png")
--    {
--        retranslateUi();
--    }
--
--protected:
--
--    void retranslateUi()
--    {
--        setText(vboxGlobal().insertKeyToActionText(menuText(QApplication::translate("UIActionPool", "&Install Guest Additions...")), gMS->shortcut(UIMachineShortcuts::InstallGuestAdditionsShortcut)));
--        setStatusTip(QApplication::translate("UIActionPool", "Mount the Guest Additions installation image"));
--    }
--};
--
- #ifdef VBOX_WITH_DEBUGGER_GUI
- class MenuDebugAction : public UIActionMenu
- {
-@@ -889,7 +868,6 @@
-     m_pool[UIActionIndexRuntime_Simple_NetworkAdaptersDialog] = new ShowNetworkAdaptersDialogAction(this);
-     m_pool[UIActionIndexRuntime_Simple_SharedFoldersDialog] = new ShowSharedFoldersDialogAction(this);
-     m_pool[UIActionIndexRuntime_Toggle_VRDEServer] = new ToggleVRDEServerAction(this);
--    m_pool[UIActionIndexRuntime_Simple_InstallGuestTools] = new PerformInstallGuestToolsAction(this);
- 
- #ifdef VBOX_WITH_DEBUGGER_GUI
-     /* 'Debug' actions: */
-diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h
---- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h	2013-04-12 07:38:01.000000000 -0300
-+++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIActionPoolRuntime.h		2013-05-24 11:26:13.789861574 -0300
-@@ -62,7 +62,6 @@
-     UIActionIndexRuntime_Menu_SharedFolders,
-     UIActionIndexRuntime_Simple_SharedFoldersDialog,
-     UIActionIndexRuntime_Toggle_VRDEServer,
--    UIActionIndexRuntime_Simple_InstallGuestTools,
- 
- #ifdef VBOX_WITH_DEBUGGER_GUI
-     /* 'Debugger' menu actions: */
-diff -Nur VirtualBox-4.2.14.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp VirtualBox-4.2.14/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp
---- VirtualBox-4.2.14.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp	2013-06-21 09:26:42.000000000 -0300
-+++ VirtualBox-4.2.14/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp	2013-06-24 18:08:12.915719347 -0300
-@@ -704,7 +704,6 @@
-     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Menu_SharedFolders));
-     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersDialog));
-     m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer));
--    m_pRunningOrPausedActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_InstallGuestTools));
- 
-     /* Move actions into running-n-paused-n-stuck actions group: */
-     m_pRunningOrPausedOrStuckActions->addAction(gActionPool->action(UIActionIndexRuntime_Simple_PowerOff));
-@@ -765,8 +764,6 @@
-             this, SLOT(sltOpenSharedFoldersDialog()));
-     connect(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer), SIGNAL(toggled(bool)),
-             this, SLOT(sltSwitchVrde(bool)));
--    connect(gActionPool->action(UIActionIndexRuntime_Simple_InstallGuestTools), SIGNAL(triggered()),
--            this, SLOT(sltInstallGuestAdditions()));
- 
- #ifdef VBOX_WITH_DEBUGGER_GUI
-     /* "Debug" actions connections: */
-diff -Nur VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp
---- VirtualBox-4.2.12.orig/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp	2013-04-12 07:38:01.000000000 -0300
-+++ VirtualBox-4.2.12/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineMenuBar.cpp		2013-05-24 11:28:03.193841501 -0300
-@@ -244,8 +244,6 @@
-     pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_NetworkAdaptersDialog));
-     pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_SharedFoldersDialog));
-     pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Toggle_VRDEServer));
--    pMenu->addSeparator();
--    pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_InstallGuestTools));
- }
- 
- #ifdef VBOX_WITH_DEBUGGER_GUI
diff --git a/libre/virtualbox-libre/os_blag.png b/libre/virtualbox-libre/os_blag.png
deleted file mode 100644
index 61995ca10..000000000
--- a/libre/virtualbox-libre/os_blag.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_blag_64.png b/libre/virtualbox-libre/os_blag_64.png
deleted file mode 100644
index aa4463a97..000000000
--- a/libre/virtualbox-libre/os_blag_64.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_dragora.png b/libre/virtualbox-libre/os_dragora.png
deleted file mode 100644
index d1df45880..000000000
--- a/libre/virtualbox-libre/os_dragora.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_dragora_64.png b/libre/virtualbox-libre/os_dragora_64.png
deleted file mode 100644
index 64bcecf20..000000000
--- a/libre/virtualbox-libre/os_dragora_64.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_dynebolic.png b/libre/virtualbox-libre/os_dynebolic.png
deleted file mode 100644
index 67b07d4c0..000000000
--- a/libre/virtualbox-libre/os_dynebolic.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_gnewsense.png b/libre/virtualbox-libre/os_gnewsense.png
deleted file mode 100644
index 76d9e38b3..000000000
--- a/libre/virtualbox-libre/os_gnewsense.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_gnewsense_64.png b/libre/virtualbox-libre/os_gnewsense_64.png
deleted file mode 100644
index 8859c34e8..000000000
--- a/libre/virtualbox-libre/os_gnewsense_64.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_gnu.png b/libre/virtualbox-libre/os_gnu.png
deleted file mode 100644
index 26c4550f9..000000000
--- a/libre/virtualbox-libre/os_gnu.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_gnu_64.png b/libre/virtualbox-libre/os_gnu_64.png
deleted file mode 100644
index 4161634e9..000000000
--- a/libre/virtualbox-libre/os_gnu_64.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_gnuhurd.png b/libre/virtualbox-libre/os_gnuhurd.png
deleted file mode 100644
index 26c4550f9..000000000
--- a/libre/virtualbox-libre/os_gnuhurd.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_gnulinux.png b/libre/virtualbox-libre/os_gnulinux.png
deleted file mode 100644
index 26c4550f9..000000000
--- a/libre/virtualbox-libre/os_gnulinux.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_gnulinux_64.png b/libre/virtualbox-libre/os_gnulinux_64.png
deleted file mode 100644
index 4161634e9..000000000
--- a/libre/virtualbox-libre/os_gnulinux_64.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_musix.png b/libre/virtualbox-libre/os_musix.png
deleted file mode 100644
index fb7b94577..000000000
--- a/libre/virtualbox-libre/os_musix.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_musix_64.png b/libre/virtualbox-libre/os_musix_64.png
deleted file mode 100644
index a1bbbbf3a..000000000
--- a/libre/virtualbox-libre/os_musix_64.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_os64base.png b/libre/virtualbox-libre/os_os64base.png
deleted file mode 100644
index 7aec20314..000000000
--- a/libre/virtualbox-libre/os_os64base.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_os64base.xcf b/libre/virtualbox-libre/os_os64base.xcf
deleted file mode 100644
index d8e28e35e..000000000
--- a/libre/virtualbox-libre/os_os64base.xcf
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_osbase.png b/libre/virtualbox-libre/os_osbase.png
deleted file mode 100644
index 00f197fca..000000000
--- a/libre/virtualbox-libre/os_osbase.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_osbase.xcf b/libre/virtualbox-libre/os_osbase.xcf
deleted file mode 100644
index c4463c857..000000000
--- a/libre/virtualbox-libre/os_osbase.xcf
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_parabola.png b/libre/virtualbox-libre/os_parabola.png
deleted file mode 100644
index 757abc484..000000000
--- a/libre/virtualbox-libre/os_parabola.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_parabola_64.png b/libre/virtualbox-libre/os_parabola_64.png
deleted file mode 100644
index 5ac7c2767..000000000
--- a/libre/virtualbox-libre/os_parabola_64.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_trisquel.png b/libre/virtualbox-libre/os_trisquel.png
deleted file mode 100644
index c6f0d3d7a..000000000
--- a/libre/virtualbox-libre/os_trisquel.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_trisquel_64.png b/libre/virtualbox-libre/os_trisquel_64.png
deleted file mode 100644
index ebca3dd43..000000000
--- a/libre/virtualbox-libre/os_trisquel_64.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_ututo.png b/libre/virtualbox-libre/os_ututo.png
deleted file mode 100644
index e1dffb575..000000000
--- a/libre/virtualbox-libre/os_ututo.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_ututo_64.png b/libre/virtualbox-libre/os_ututo_64.png
deleted file mode 100644
index 158468e0a..000000000
--- a/libre/virtualbox-libre/os_ututo_64.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/os_venenux.png b/libre/virtualbox-libre/os_venenux.png
deleted file mode 100644
index 5e0c1585d..000000000
--- a/libre/virtualbox-libre/os_venenux.png
+++ /dev/null
diff --git a/libre/virtualbox-libre/vboxservice.service b/libre/virtualbox-libre/vboxservice.service
deleted file mode 100644
index bbd61617d..000000000
--- a/libre/virtualbox-libre/vboxservice.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-Description=VirtualBox Guest Service
-ConditionVirtualization=oracle
-
-[Service]
-ExecStart=/usr/bin/VBoxService -f
-
-[Install]
-WantedBy=multi-user.target
diff --git a/libre/virtualbox-libre/vboxweb.service b/libre/virtualbox-libre/vboxweb.service
deleted file mode 100644
index 303381597..000000000
--- a/libre/virtualbox-libre/vboxweb.service
+++ /dev/null
@@ -1,11 +0,0 @@
-[Unit]
-Description=VirtualBox Web Service
-After=network.target
-
-[Service]
-Type=forking
-PIDFile=/run/vboxweb.pid
-ExecStart=/usr/bin/vboxwebsrv --pidfile /run/vboxweb.pid  --background
-
-[Install]
-WantedBy=multi-user.target
diff --git a/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install b/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install
deleted file mode 100644
index 067c5b35e..000000000
--- a/libre/virtualbox-libre/virtualbox-libre-guest-dkms.install
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-# arg 1:  the new package version
-post_install() {
-  dkms add vboxguest/${1%-*}
-  cat << EOF
-==> To build and install your modules run: dkms install vboxguest/${1%-*}
-==> To do this automatically at startup run: systemctl enable dkms.service
-EOF
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-pre_upgrade() {
-  pre_remove "$2"
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install "$1"
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  # Remove modules using dkms
-  [ -n "${1%-*}" ] && dkms remove vboxguest/${1%-*} --all >/dev/null || true
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/virtualbox-libre/virtualbox-libre-guest-utils.install b/libre/virtualbox-libre/virtualbox-libre-guest-utils.install
deleted file mode 100755
index 38bbe807d..000000000
--- a/libre/virtualbox-libre/virtualbox-libre-guest-utils.install
+++ /dev/null
@@ -1,31 +0,0 @@
-#!/bin/sh
-
-# arg 1:  the new package version
-post_install() {
-  getent group vboxsf > /dev/null || groupadd -g 109 vboxsf
-  true
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install "$1"
-  # rename /etc/rc.d/vboxservice
-  if [ "`vercmp $2 4.1.18-3`" -lt 0 ]; then
-    cat << EOF
-==> rc.d vbox-service script was renamed to vboxservice.
-EOF
-  fi
-  # fix gid of vboxsf
-  if [ "`vercmp $2 4.1.18-4`" -lt 0 ]; then
-    groupmod -g 109 vboxsf
-  fi
-  true
-}
-
-# arg 1:  the old package version
-post_remove() {
-  groupdel vboxsf >/dev/null 2>&1 || true
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/virtualbox-libre/virtualbox-libre-host-dkms.install b/libre/virtualbox-libre/virtualbox-libre-host-dkms.install
deleted file mode 100644
index 8bc316e49..000000000
--- a/libre/virtualbox-libre/virtualbox-libre-host-dkms.install
+++ /dev/null
@@ -1,30 +0,0 @@
-#/bin/sh
-
-# arg 1:  the new package version
-post_install() {
-  dkms add vboxhost/${1%-*}
-  cat << EOF
-==> To build and install your modules run: dkms install vboxhost/${1%-*}
-==> To do this automatically at startup run: systemctl enable dkms.service
-EOF
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-pre_upgrade() {
-  pre_remove "$2"
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install "$1"
-}
-
-# arg 1:  the old package version
-pre_remove() {
-  # Remove modules using dkms
-  [ -n "${1%-*}" ] && dkms remove vboxhost/${1%-*} --all >/dev/null || true
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/virtualbox-libre/virtualbox-libre.install b/libre/virtualbox-libre/virtualbox-libre.install
deleted file mode 100644
index ad4f70f76..000000000
--- a/libre/virtualbox-libre/virtualbox-libre.install
+++ /dev/null
@@ -1,39 +0,0 @@
-#!/bin/sh
-
-utils() {
-  if [ -x usr/bin/update-mime-database ]; then
-    update-mime-database usr/share/mime > /dev/null 2>&1
-  fi
-
-  if [ -x usr/bin/xdg-icon-resource ]; then
-    xdg-icon-resource forceupdate --theme hicolor > /dev/null 2>&1
-  fi
-
-  if [ -x usr/bin/update-desktop-database ]; then
-    usr/bin/update-desktop-database -q
-  fi
-
-  if [ -x usr/bin/udevadm ]; then
-    usr/bin/udevadm control --reload
-  fi
-}
-
-# arg 1:  the new package version
-post_install() {
-  getent group vboxusers >/dev/null || usr/sbin/groupadd -g 108 vboxusers
-  utils
-}
-
-# arg 1:  the new package version
-# arg 2:  the old package version
-post_upgrade() {
-  post_install "$1"
-}
-
-# arg 1:  the old package version
-post_remove() {
-  groupdel vboxusers >/dev/null 2>&1 || true
-  utils
-}
-
-# vim:set ts=2 sw=2 ft=sh et:
diff --git a/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch b/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
deleted file mode 100644
index b7bd659a0..000000000
--- a/libre/xulrunner-libre/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
+++ /dev/null
@@ -1,281 +0,0 @@
-From: Mike Hommey <mh@glandium.org>
-Date: Tue, 5 Jun 2012 08:57:06 +0200
-Subject: Bug 756390 - Make the "Reset Firefox" feature more generic
-
-diff --git a/browser/components/migration/content/migration.js b/browser/components/migration/content/migration.js
-index 0e8ccf5..fa46c08 100644
---- a/browser/components/migration/content/migration.js
-+++ b/browser/components/migration/content/migration.js
-@@ -249,7 +249,7 @@ var MigrationWizard = {
-     }
- 
-     var brandBundle = document.getElementById("brandBundle");
--    // These strings don't exist when not using official branding. If that's
-+    // These strings may not exist when not using official branding. If that's
-     // the case, just skip this page.
-     try {
-       var pageTitle = brandBundle.getString("homePageMigrationPageTitle");
-@@ -281,8 +281,8 @@ var MigrationWizard = {
-       case "chrome":
-         source = "sourceNameChrome";
-         break;
--      case "firefox":
--        source = "sourceNameFirefox";
-+      case "self":
-+        source = "brand";
-         break;
-     }
- 
-@@ -292,7 +292,12 @@ var MigrationWizard = {
-     var oldHomePageURL = this._migrator.sourceHomePageURL;
- 
-     if (oldHomePageURL && source) {
--      var appName = MigrationUtils.getLocalizedString(source);
-+      var appName;
-+      if (source == "brand") {
-+        appName = brandBundle.GetStringFromName("brandFullName");
-+      } else {
-+        appName = MigrationUtils.getLocalizedString(source);
-+      }
-       var oldHomePageLabel =
-         brandBundle.getFormattedString("homePageImport", [appName]);
-       var oldHomePage = document.getElementById("oldHomePage");
-diff --git a/browser/components/migration/content/migration.xul b/browser/components/migration/content/migration.xul
-index f030756..23e37ff 100644
---- a/browser/components/migration/content/migration.xul
-+++ b/browser/components/migration/content/migration.xul
-@@ -42,7 +42,7 @@
- #elifdef XP_UNIX
-       <radio id="chrome"    label="&importFromChrome.label;"    accesskey="&importFromChrome.accesskey;"/>
- #endif
--      <radio id="firefox"   label="&importFromFirefox.label;"   accesskey="&importFromFirefox.accesskey;"/>
-+      <radio id="self"      hidden="true"/>
-       <radio id="nothing"   label="&importFromNothing.label;"   accesskey="&importFromNothing.accesskey;" hidden="true"/>
-     </radiogroup>
-     <label id="noSources" hidden="true">&noMigrationSources.label;</label>
-diff --git a/browser/components/migration/src/BrowserProfileMigrators.manifest b/browser/components/migration/src/BrowserProfileMigrators.manifest
-index d7fec75..d531b83 100644
---- a/browser/components/migration/src/BrowserProfileMigrators.manifest
-+++ b/browser/components/migration/src/BrowserProfileMigrators.manifest
-@@ -3,7 +3,7 @@ contract @mozilla.org/toolkit/profile-migrator;1 {6F8BB968-C14F-4D6F-9733-6C6737
- component {4cec1de4-1671-4fc3-a53e-6c539dc77a26} ChromeProfileMigrator.js
- contract @mozilla.org/profile/migrator;1?app=browser&type=chrome {4cec1de4-1671-4fc3-a53e-6c539dc77a26}
- component {91185366-ba97-4438-acba-48deaca63386} FirefoxProfileMigrator.js
--contract @mozilla.org/profile/migrator;1?app=browser&type=firefox {91185366-ba97-4438-acba-48deaca63386}
-+contract @mozilla.org/profile/migrator;1?app=browser&type=self {91185366-ba97-4438-acba-48deaca63386}
- #ifdef HAS_IE_MIGRATOR
- component {3d2532e3-4932-4774-b7ba-968f5899d3a4} IEProfileMigrator.js
- contract @mozilla.org/profile/migrator;1?app=browser&type=ie {3d2532e3-4932-4774-b7ba-968f5899d3a4}
-diff --git a/browser/components/migration/src/FirefoxProfileMigrator.js b/browser/components/migration/src/FirefoxProfileMigrator.js
-index 52722e9..0448444 100644
---- a/browser/components/migration/src/FirefoxProfileMigrator.js
-+++ b/browser/components/migration/src/FirefoxProfileMigrator.js
-@@ -88,7 +88,7 @@ Object.defineProperty(FirefoxProfileMigrator.prototype, "startupOnlyMigrator", {
- 
- 
- FirefoxProfileMigrator.prototype.classDescription = "Firefox Profile Migrator";
--FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=firefox";
-+FirefoxProfileMigrator.prototype.contractID = "@mozilla.org/profile/migrator;1?app=browser&type=self";
- FirefoxProfileMigrator.prototype.classID = Components.ID("{91185366-ba97-4438-acba-48deaca63386}");
- 
- this.NSGetFactory = XPCOMUtils.generateNSGetFactory([FirefoxProfileMigrator]);
-diff --git a/browser/components/migration/src/MigrationUtils.jsm b/browser/components/migration/src/MigrationUtils.jsm
-index 1f60879..fc83a99 100644
---- a/browser/components/migration/src/MigrationUtils.jsm
-+++ b/browser/components/migration/src/MigrationUtils.jsm
-@@ -403,11 +403,6 @@ this.MigrationUtils = Object.freeze({
-    * @see nsIStringBundle
-    */
-   getLocalizedString: function MU_getLocalizedString(aKey, aReplacements) {
--    const OVERRIDES = {
--      "4_firefox": "4_firefox_history_and_bookmarks"
--    };
--    aKey = OVERRIDES[aKey] || aKey;
--
-     if (aReplacements === undefined)
-       return getMigrationBundle().GetStringFromName(aKey);
-     return getMigrationBundle().formatStringFromName(
-@@ -622,6 +617,17 @@ this.MigrationUtils = Object.freeze({
-   },
- 
-   /**
-+   * Returns whether a given migration type is supported.
-+   *
-+   * @param  aKey   Migrator key
-+   * @returns whether the migrator key is supported.
-+   */
-+  canMigrate:
-+  function MU_canMigrate(aMigratorKey) {
-+    return "@mozilla.org/profile/migrator;1?app=browser&type=" + aMigratorKey in Cc;
-+  },
-+
-+  /**
-    * Cleans up references to migrators and nsIProfileInstance instances.
-    */
-   finishMigration: function MU_finishMigration() {
-diff --git a/browser/components/migration/src/ProfileMigrator.js b/browser/components/migration/src/ProfileMigrator.js
-index f67823b..36016b8 100644
---- a/browser/components/migration/src/ProfileMigrator.js
-+++ b/browser/components/migration/src/ProfileMigrator.js
-@@ -12,6 +12,7 @@ function ProfileMigrator() {
- 
- ProfileMigrator.prototype = {
-   migrate: MigrationUtils.startupMigration.bind(MigrationUtils),
-+  canMigrate: MigrationUtils.canMigrate.bind(MigrationUtils),
-   QueryInterface: XPCOMUtils.generateQI([Components.interfaces.nsIProfileMigrator]),
-   classDescription: "Profile Migrator",
-   contractID: "@mozilla.org/toolkit/profile-migrator;1",
-diff --git a/browser/locales/en-US/chrome/browser/migration/migration.dtd b/browser/locales/en-US/chrome/browser/migration/migration.dtd
-index 21cf405..f3c1a6b 100644
---- a/browser/locales/en-US/chrome/browser/migration/migration.dtd
-+++ b/browser/locales/en-US/chrome/browser/migration/migration.dtd
-@@ -17,8 +17,6 @@
- <!ENTITY importFromSafari.accesskey     "S">
- <!ENTITY importFromChrome.label         "Chrome">
- <!ENTITY importFromChrome.accesskey     "C">
--<!ENTITY importFromFirefox.label        "Firefox">
--<!ENTITY importFromFirefox.accesskey    "X">
- 
- <!ENTITY noMigrationSources.label       "No programs that contain bookmarks, history or password data could be found.">
- 
-diff --git a/browser/locales/en-US/chrome/browser/migration/migration.properties b/browser/locales/en-US/chrome/browser/migration/migration.properties
-index 260bc29..52b32cc 100644
---- a/browser/locales/en-US/chrome/browser/migration/migration.properties
-+++ b/browser/locales/en-US/chrome/browser/migration/migration.properties
-@@ -8,7 +8,6 @@ profileName_format=%S %S
- sourceNameIE=Internet Explorer
- sourceNameSafari=Safari
- sourceNameChrome=Google Chrome
--sourceNameFirefox=Mozilla Firefox
- 
- importedBookmarksFolder=From %S
- 
-@@ -24,22 +23,22 @@ importedSafariReadingList=Reading List (From Safari)
- 2_ie=Cookies
- 2_safari=Cookies
- 2_chrome=Cookies
--2_firefox=Cookies
-+2_self=Cookies
- 
- 4_ie=Browsing History
- 4_safari=Browsing History
- 4_chrome=Browsing History
--4_firefox_history_and_bookmarks=Browsing History and Bookmarks
-+4_self=Browsing History and Bookmarks
- 
- 8_ie=Saved Form History
- 8_safari=Saved Form History
- 8_chrome=Saved Form History
--8_firefox=Saved Form History
-+8_self=Saved Form History
- 
- 16_ie=Saved Passwords
- 16_safari=Saved Passwords
- 16_chrome=Saved Passwords
--16_firefox=Saved Passwords
-+16_self=Saved Passwords
- 
- 32_ie=Favorites
- 32_safari=Bookmarks
-@@ -48,4 +47,4 @@ importedSafariReadingList=Reading List (From Safari)
- 64_ie=Other Data
- 64_safari=Other Data
- 64_chrome=Other Data
--64_firefox=Bookmarks Backups
-+64_self=Bookmarks Backups
-diff --git a/toolkit/content/jar.mn b/toolkit/content/jar.mn
-index 96cedd3..a0f8a75 100644
---- a/toolkit/content/jar.mn
-+++ b/toolkit/content/jar.mn
-@@ -42,7 +42,7 @@ toolkit.jar:
- +  content/global/mozilla.xhtml               (mozilla.xhtml)
-    content/global/nsDragAndDrop.js            (nsDragAndDrop.js)
-    content/global/resetProfile.css            (resetProfile.css)
--*  content/global/resetProfile.js             (resetProfile.js)
-+   content/global/resetProfile.js             (resetProfile.js)
-    content/global/resetProfile.xul            (resetProfile.xul)
-    content/global/resetProfileProgress.xul    (resetProfileProgress.xul)
-    content/global/treeUtils.js                (treeUtils.js)
-diff --git a/toolkit/content/resetProfile.js b/toolkit/content/resetProfile.js
-index dcb4065..09c1146 100644
---- a/toolkit/content/resetProfile.js
-+++ b/toolkit/content/resetProfile.js
-@@ -36,13 +36,13 @@ function resetSupported() {
-                        getService(Ci.nsIToolkitProfileService);
-   let currentProfileDir = Services.dirsvc.get("ProfD", Ci.nsIFile);
- 
--#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";
--#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";
--
-   // Reset is only supported for the default profile if the self-migrator used for reset exists.
-   try {
--    return currentProfileDir.equals(profileService.selectedProfile.rootDir) &&
--             ("@mozilla.org/profile/migrator;1?app=" + MOZ_BUILD_APP + "&type=" + MOZ_APP_NAME in Cc);
-+    if (currentProfileDir.equals(profileService.selectedProfile.rootDir) &&
-+        "@mozilla.org/toolkit/profile-migrator;1" in Cc) {
-+      let pm = Cc["@mozilla.org/toolkit/profile-migrator;1"].createInstance(Ci.nsIProfileMigrator);
-+      return ("canMigrate" in pm) && pm.canMigrate("self");
-+    }
-   } catch (e) {
-     // Catch exception when there is no selected profile.
-     Cu.reportError(e);
-@@ -53,9 +53,6 @@ function resetSupported() {
- function getMigratedData() {
-   Components.utils.import("resource:///modules/MigrationUtils.jsm");
- 
--#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";
--#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";
--
-   // From migration.properties
-   const MIGRATED_TYPES = [
-     4,  // History and Bookmarks
-@@ -68,7 +65,7 @@ function getMigratedData() {
-   let dataTypes = [];
-   for (let itemID of MIGRATED_TYPES) {
-     try {
--      let typeName = MigrationUtils.getLocalizedString(itemID + "_" + MOZ_APP_NAME);
-+      let typeName = MigrationUtils.getLocalizedString(itemID + "_self");
-       dataTypes.push(typeName);
-     } catch (x) {
-       // Catch exceptions when the string for a data type doesn't exist.
-diff --git a/toolkit/profile/nsIProfileMigrator.idl b/toolkit/profile/nsIProfileMigrator.idl
-index f35c227..7062886 100644
---- a/toolkit/profile/nsIProfileMigrator.idl
-+++ b/toolkit/profile/nsIProfileMigrator.idl
-@@ -37,7 +37,7 @@ interface nsIProfileStartup : nsISupports
-  * @client   Toolkit (Startup code)
-  * @obtainable service, contractid("@mozilla.org/toolkit/profile-migrator;1")
-  */
--[scriptable, uuid(3df284a5-2258-4d46-a664-761ecdc04c22)]
-+[scriptable, uuid(96d9ab66-082c-4a9e-82ad-f8c21b391342)]
- interface nsIProfileMigrator : nsISupports 
- {
-   /**
-@@ -60,6 +60,14 @@ interface nsIProfileMigrator : nsISupports
-    * @note The startup code ignores COM exceptions thrown from this method.
-    */
-   void migrate(in nsIProfileStartup aStartup, in ACString aKey);
-+
-+  /**
-+   * Returns whether a given migration type is supported.
-+   *
-+   * @param  aKey   Migrator key
-+   * @returns whether the migrator key is supported.
-+   */
-+  bool canMigrate(in ACString aKey);
- };
- 
- %{C++
-diff --git a/toolkit/xre/nsAppRunner.cpp b/toolkit/xre/nsAppRunner.cpp
-index 1045665..04bd1aa 100644
---- a/toolkit/xre/nsAppRunner.cpp
-+++ b/toolkit/xre/nsAppRunner.cpp
-@@ -3698,7 +3698,7 @@ XREMain::XRE_mainRun()
-         if (gDoProfileReset) {
-           // Automatically migrate from the current application if we just
-           // reset the profile.
--          aKey = MOZ_APP_NAME;
-+          aKey = "self";
-         }
-         pm->Migrate(&mDirProvider, aKey);
-       }
diff --git a/libre/xulrunner-libre/PKGBUILD b/libre/xulrunner-libre/PKGBUILD
deleted file mode 100644
index 5b21529b4..000000000
--- a/libre/xulrunner-libre/PKGBUILD
+++ /dev/null
@@ -1,98 +0,0 @@
-# $Id: PKGBUILD 180163 2013-03-18 13:29:32Z jgc $
-# Maintainer: Jan de Groot <jgc@archlinux.org>
-# Contributor: Alexander Baldeck <alexander@archlinux.org>
-
-# With many changes from iceweasel-libre.
-
-# We're getting this from Debian Experimental
-_debname=iceweasel
-_debver=19.0.2
-_debrel=1
-_debrepo=http://ftp.debian.org/debian/pool/main/
-debfile() { echo $@|sed -r 's@(.).*@\1/&/&@'; }
-
-_pkgname=xulrunner
-pkgname=xulrunner-libre
-pkgver=${_debver}.${_debrel}
-pkgrel=1
-pkgdesc="Mozilla Runtime Environment (built from Debian Iceweasel source code)"
-arch=('i686' 'x86_64' 'mips64el')
-license=('MPL' 'GPL' 'LGPL')
-depends=('gtk2' 'mozilla-common' 'nss>=3.14.1' 'libxt' 'libxrender' 'hunspell' 'startup-notification' 'mime-types' 'dbus-glib' 'alsa-lib' 'libevent' 'sqlite>=3.7.4' 'libvpx' 'python2')
-makedepends=('zip' 'unzip' 'pkg-config' 'diffutils' 'yasm' 'mesa' 'autoconf2.13' 'quilt')
-url="http://wiki.mozilla.org/XUL:Xul_Runner"
-source=("${_debrepo}/`debfile ${_debname}`_${_debver}.orig.tar.bz2"
-        "${_debrepo}/`debfile ${_debname}`_${_debver}-${_debrel}.debian.tar.gz"
-        mozconfig
-        mozilla-pkgconfig.patch
-        shared-libs.patch
-        Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch)
-options=('!emptydirs')
-conflicts=('xulrunner')
-provides=("xulrunner=${_debver}")
-replaces=('xulrunner-oss' 'xulrunner')
-md5sums=('ceda63e01012f9940542d862fd755a65'
-         '7fa6e0fb544d01516d3232f26023c570'
-         '7f3317c25308a631ca31d8d280991bb4'
-         '27271ce647a83906ef7a24605e840d61'
-         '52e52f840a49eb1d14be1c0065b03a93'
-         '2fde2f4bc158b217f3d71b33ef0bc626')
-
-build() {
-  # WebRTC build tries to execute "python" and expects Python 2
-  # Workaround taken from chromium PKGBUILD on Archlinux
-  mkdir "$srcdir/python2-path"
-  ln -s /usr/bin/python2 "$srcdir/python2-path/python"
-  export PATH="$srcdir/python2-path:$PATH"
-
-  export LDFLAGS="$LDFLAGS -Wl,-rpath,/usr/lib/xulrunner-${_debver::4}"
-  export PYTHON="/usr/bin/python2"
-
-  export QUILT_PATCHES=debian/patches
-  export QUILT_REFRESH_ARGS='-p ab --no-timestamps --no-index'
-  export QUILT_DIFF_ARGS='--no-timestamps'
-
-  mv mozilla-release "${_debname}-${_debver}"
-  mv debian "${_debname}-${_debver}"
-  cd "${_debname}-${_debver}"
-
-  # Doesn't apply and seems unimportant
-  rm -v debian/patches/l10n/Place-google-and-gmail-before-yandex.patch || true
-
-  # This patch doesn't works in some parts due that has patches for others locales languages, source code doesn't has it
-  rm -v debian/patches/debian-hacks/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch || true
-
-  quilt push -a
-  find .pc -name .timestamp -delete # why isn't "--no-timestamps" doing this?
-
-  cp "$srcdir/mozconfig" .mozconfig
-
-  # Adding fixed Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch
-  patch -Np1 -i "$srcdir/Bug-756390-Make-the-Reset-Firefox-feature-more-gener.patch"
-
-  # Fails, claiming the page size to have changed.
-  [ "$CARCH" = "mips64el" ] && echo 'ac_add_options --disable-jemalloc' >> .mozconfig
-
-  #fix libdir/sdkdir - fedora
-  patch -Np1 -i "$srcdir/mozilla-pkgconfig.patch"
-  patch -Np1 -i "$srcdir/shared-libs.patch"
-
-  make -j1 -f client.mk build MOZ_MAKE_FLAGS="$MAKEFLAGS"
-}
-
-package() {
-  cd "${_debname}-${_debver}"
-  make -j1 -f client.mk DESTDIR="$pkgdir" install
-
-  rm -rf "$pkgdir"/usr/lib/xulrunner-${_debver::4}/{dictionaries,hyphenation}
-  ln -sf /usr/share/hunspell "$pkgdir/usr/lib/xulrunner-${_debver::4}/dictionaries"
-  ln -sf /usr/share/hyphen "$pkgdir/usr/lib/xulrunner-${_debver::4}/hyphenation"
-
-  # add xulrunner library path to ld.so.conf
-  install -d $pkgdir/etc/ld.so.conf.d
-  echo "/usr/lib/xulrunner-${_debver::4}" > $pkgdir/etc/ld.so.conf.d/xulrunner.conf
-
-  chmod +x "${pkgdir}/usr/lib/xulrunner-devel-${_debver::4}/sdk/bin/xpt.py"
-  sed -i 's|!/usr/bin/env python$|!/usr/bin/env python2|' \
-    "$pkgdir"/usr/lib/xulrunner-devel-${_debver::4}/sdk/bin/{xpt,header,typelib,xpidl}.py
-}
diff --git a/libre/xulrunner-libre/mozconfig b/libre/xulrunner-libre/mozconfig
deleted file mode 100644
index 7c6cd106d..000000000
--- a/libre/xulrunner-libre/mozconfig
+++ /dev/null
@@ -1,32 +0,0 @@
-. $topsrcdir/xulrunner/config/mozconfig
-
-ac_add_options --prefix=/usr
-ac_add_options --libdir=/usr/lib
-
-# System libraries
-ac_add_options --with-system-nspr
-ac_add_options --with-system-nss
-ac_add_options --with-system-jpeg
-ac_add_options --with-system-zlib
-ac_add_options --with-system-bz2
-ac_add_options --with-system-png
-ac_add_options --with-system-libevent
-ac_add_options --with-system-libvpx
-ac_add_options --enable-system-hunspell
-ac_add_options --enable-system-sqlite
-ac_add_options --enable-system-ffi
-#ac_add_options --enable-system-cairo
-ac_add_options --enable-system-pixman
-ac_add_options --with-pthreads
-
-# Features
-ac_add_options --enable-startup-notification
-#ac_add_options --enable-gstreamer
-
-ac_add_options --disable-crashreporter
-ac_add_options --disable-updater
-ac_add_options --disable-tests
-ac_add_options --disable-installer
-
-# Parabola features
-ac_add_options --disable-safe-browsing
diff --git a/libre/xulrunner-libre/mozilla-pkgconfig.patch b/libre/xulrunner-libre/mozilla-pkgconfig.patch
deleted file mode 100644
index 037d4aee0..000000000
--- a/libre/xulrunner-libre/mozilla-pkgconfig.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-diff -Nur mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in mozilla-release/xulrunner/installer/libxul-embedding.pc.in
---- mozilla-release.orig/xulrunner/installer/libxul-embedding.pc.in	2011-12-19 22:11:38.100005674 +0000
-+++ mozilla-release/xulrunner/installer/libxul-embedding.pc.in	2011-12-19 22:14:35.095147521 +0000
-@@ -6,5 +6,6 @@
- Name: libxul-embedding
- Description: Static library for version-independent embedding of the Mozilla runtime
- Version: %MOZILLA_VERSION%
-+Requires: %NSPR_NAME% >= %NSPR_VERSION%
- Libs: -L${sdkdir}/lib -lxpcomglue -ldl
- Cflags: -DXPCOM_GLUE -I${includedir} %WCHAR_CFLAGS%
-diff -Nur mozilla-release.orig/xulrunner/installer/libxul.pc.in mozilla-release/xulrunner/installer/libxul.pc.in
---- mozilla-release.orig/xulrunner/installer/libxul.pc.in	2011-12-19 22:11:38.126672110 +0000
-+++ mozilla-release/xulrunner/installer/libxul.pc.in	2011-12-19 22:14:04.375412141 +0000
-@@ -1,5 +1,6 @@
- prefix=%prefix%
- sdkdir=%sdkdir%
-+libdir=%libdir%
- includedir=%includedir%
- idldir=%idldir%
- 
-diff -Nur mozilla-release.orig/xulrunner/installer/Makefile.in mozilla-release/xulrunner/installer/Makefile.in
---- mozilla-release.orig/xulrunner/installer/Makefile.in	2011-12-19 22:11:38.126672110 +0000
-+++ mozilla-release/xulrunner/installer/Makefile.in	2011-12-19 22:18:28.743135321 +0000
-@@ -108,6 +108,7 @@
- 	-e "s|%includedir%|$(includedir)|" \
- 	-e "s|%idldir%|$(idldir)|" \
- 	-e "s|%sdkdir%|$(sdkdir)|" \
-+	-e "s|%libdir%|$(installdir)|" \
- 	-e "s|%MOZ_APP_NAME%|$(MOZ_APP_NAME)|" \
- 	-e "s|%MOZILLA_VERSION%|$(MOZ_APP_VERSION)|" \
- 	-e "s|%WCHAR_CFLAGS%|$(WCHAR_CFLAGS)|" \
-diff -Nur mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in mozilla-release/xulrunner/installer/mozilla-js.pc.in
---- mozilla-release.orig/xulrunner/installer/mozilla-js.pc.in	2011-12-19 22:11:38.126672110 +0000
-+++ mozilla-release/xulrunner/installer/mozilla-js.pc.in	2011-12-19 22:18:55.569571004 +0000
-@@ -7,4 +7,4 @@
- Version: %MOZILLA_VERSION%
- Requires: %NSPR_NAME% >= %NSPR_VERSION%
- Libs: -L${sdkdir}/lib %MOZ_JS_LINK%
--Cflags: -I${includedir} -DXP_UNIX -DJS_THREADSAFE
-+Cflags: -I${includedir} -I${includedir}/js -DXP_UNIX -DJS_THREADSAFE
diff --git a/libre/xulrunner-libre/shared-libs.patch b/libre/xulrunner-libre/shared-libs.patch
deleted file mode 100644
index 1f22b2b0d..000000000
--- a/libre/xulrunner-libre/shared-libs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -Nur mozilla-release.orig/browser/installer/Makefile.in mozilla-release/browser/installer/Makefile.in
---- mozilla-release.orig/browser/installer/Makefile.in	2012-07-17 16:19:29.480356991 +0000
-+++ mozilla-release/browser/installer/Makefile.in	2012-07-17 17:32:41.250937293 +0000
-@@ -50,7 +50,7 @@
- MOZ_PKG_MANIFEST_P = $(srcdir)/package-manifest.in
- # Some files have been already bundled with xulrunner
- ifndef SYSTEM_LIBXUL
--MOZ_PKG_FATAL_WARNINGS = 1
-+MOZ_PKG_FATAL_WARNINGS = 0
- endif
- 
- MOZ_NONLOCALIZED_PKG_LIST = \
diff --git a/nonprism/empathy-nonprism/PKGBUILD b/nonprism/empathy-nonprism/PKGBUILD
deleted file mode 100644
index b528dd888..000000000
--- a/nonprism/empathy-nonprism/PKGBUILD
+++ /dev/null
@@ -1,40 +0,0 @@
-# $Id: PKGBUILD 195042 2013-09-24 18:47:37Z heftig $
-# Maintainer: Ionut Biru <ibiru@archlinux.org>
-
-_pkgname=empathy
-pkgname=empathy-nonprism
-pkgver=3.10.0
-pkgrel=1
-pkgdesc="A GNOME instant messaging client using the Telepathy framework, without telepathy-haze recommendation"
-arch=(i686 x86_64)
-url="http://live.gnome.org/Empathy"
-license=(GPL2)
-depends=(clutter-gst clutter-gtk folks gcr iso-codes libcanberra libpulse webkitgtk telepathy-farstream telepathy-glib telepathy-logger telepathy-mission-control geoclue2 geocode-glib cheese libchamplain)
-makedepends=(intltool itstool docbook-xsl python2)
-optdepends=('telepathy-gabble: XMPP/Jabber support'
-            'telepathy-idle: IRC support'
-            'telepathy-salut: Link-local XMPP support'
-            'telepathy-rakia: SIP support')
-options=('!libtool' '!makeflags')
-groups=(gnome)
-install=empathy.install
-replaces=("$_pkgname" 'empathy-coherence')
-conflicts=$_pkgname
-provides=$_pkgname=$pkgver
-source=(http://ftp.gnome.org/pub/GNOME/sources/$_pkgname/${pkgver%.*}/$_pkgname-$pkgver.tar.xz)
-sha256sums=('5580bdba9faec0518b3328d5dc23f03dc0cf25ccf6c14902f306838c23d5918f')
-
-build() {
-  cd $_pkgname-$pkgver
-  PYTHON=/usr/bin/python2 ./configure --prefix=/usr \
-      --sysconfdir=/etc  \
-      --libexecdir=/usr/lib/empathy \
-      --disable-static
-  sed -i -e 's/ -shared / -Wl,-O1,--as-needed\0/g' libtool
-  make
-}
-
-package() {
-  cd $_pkgname-$pkgver
-  make DESTDIR="$pkgdir" install
-}
diff --git a/nonprism/empathy-nonprism/empathy.install b/nonprism/empathy-nonprism/empathy.install
deleted file mode 100644
index 4c5b64313..000000000
--- a/nonprism/empathy-nonprism/empathy.install
+++ /dev/null
@@ -1,16 +0,0 @@
-post_install() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    update-desktop-database -q
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-    echo "To use Empathy you need to install at least one Telepathy connection manager."
-}
-
-post_upgrade() {
-    glib-compile-schemas /usr/share/glib-2.0/schemas
-    update-desktop-database -q
-    gtk-update-icon-cache -q -t -f /usr/share/icons/hicolor
-}
-
-post_remove() {
-    post_upgrade
-}
-\ No newline at end of file
diff --git a/pcr/youtube-dl-current/PKGBUILD b/pcr/youtube-dl-current/PKGBUILD
index bc1c2f19b..4a251fa93 100644
--- a/pcr/youtube-dl-current/PKGBUILD
+++ b/pcr/youtube-dl-current/PKGBUILD
@@ -5,7 +5,7 @@
 pkgname=youtube-dl-current
 _pkgname=youtube-dl
 provides=(youtube-dl)
-pkgver=2014.01.07
+pkgver=2014.01.07.5
 pkgrel=1
 pkgdesc="A small command-line program to download videos from YouTube.com and a few more sites"
 arch=('any')
@@ -28,5 +28,5 @@ package() {
     "${pkgdir}/usr/share/bash-completion/completions/youtube-dl"
   install -Dm644 LICENSE "${pkgdir}/usr/share/licenses/${_pkgname}/LICENSE"
 }
-md5sums=('7ab1afd30e2e952917bace66d379d880'
+md5sums=('de485f1333b9e42ebaaaac16ca4c60b4'
          'SKIP')
author	Nicolás Reynolds <fauno@endefensadelsl.org>	2014-01-09 03:58:56 +0000
committer	Nicolás Reynolds <fauno@endefensadelsl.org>	2014-01-09 03:58:56 +0000
commit	ebfbe6aa4a09806147654dd9e8d512cd68921e0d (patch)
tree	645198602e94164a4130285756f401ae0b0756fd
parent	3092fe0e20f490a5f9b8b9602ffc039a22be60c0 (diff)